diff options
436 files changed, 10566 insertions, 1119 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index ef03a93a2..2cd1014d0 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -71,6 +71,10 @@ Contributing Changes ==================== This section describes the usual flows of contribution to this repository. +For a detailed description of how to contribute to Adélie Linux, review the +Handbook_. + +.. _Handbook: https://help.adelielinux.org/html/devel/ GitLab Pull Requests @@ -89,7 +93,8 @@ GitLab Pull Requests #. Add (or remove) changed files using ``git add`` and ``git rm``. -#. Commit your changes to the tree using the command ``repoman commit``. +#. Commit your changes to the tree using the commands ``git commit -S`` and + ``git push``. #. Visit your forked repository in a Web browser. @@ -109,7 +114,7 @@ Mailing List #. Add (or remove) changed files using ``git add`` and ``git rm``. -#. Commit your changes to the tree using the command ``repoman commit``. +#. Commit your changes to the tree using the command ``git commit -S``. #. Use the command ``git format-patch HEAD^`` to create a patch file for your commit. diff --git a/legacy/mkcfm/APKBUILD b/legacy/mkcfm/APKBUILD new file mode 100644 index 000000000..ab4c152a3 --- /dev/null +++ b/legacy/mkcfm/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=mkcfm +pkgver=1.0.1 +pkgrel=0 +pkgdesc="Utility for creating summaries of font metric files" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libfontenc-dev libfs-dev libx11-dev libxfont-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/mkcfm-$pkgver.tar.gz + constise.patch + " + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="fabd9e2a711b960356178f9b52a2e720c4f33699c125dd82831d7e5a84f33dee230ff1d4c1a4019900fc190779f1c7770a775037c06a226723038e6440900fd2 mkcfm-1.0.1.tar.gz +6dffe376f23a18c536004df70788c2725098c5a8d068538a98be0e1fbcda93709ba7968c862095d5bb807be652978ba9fd5b3f097eb8dc88343ade0989dc3a83 constise.patch" diff --git a/legacy/mkcfm/constise.patch b/legacy/mkcfm/constise.patch new file mode 100644 index 000000000..aff209ecf --- /dev/null +++ b/legacy/mkcfm/constise.patch @@ -0,0 +1,11 @@ +--- mkcfm-1.0.1/mkcfm.c.old 2005-12-08 17:54:40.000000000 +0000 ++++ mkcfm-1.0.1/mkcfm.c 2018-12-31 07:32:01.460000000 +0000 +@@ -194,7 +194,7 @@ + + + Atom +-MakeAtom(char *p, unsigned len, int makeit) ++MakeAtom(const char *p, unsigned len, int makeit) + { + return *p; + } diff --git a/legacy/xbacklight/APKBUILD b/legacy/xbacklight/APKBUILD new file mode 100644 index 000000000..215baad9a --- /dev/null +++ b/legacy/xbacklight/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xbacklight +pkgver=1.2.2 +pkgrel=0 +pkgdesc="X11 backlight brightness adjustment utility" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="!acpilight" # both provide /usr/bin/xbacklight +makedepends="util-macros xcb-util-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xbacklight-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="4dca70ef8e3494b19ea126c46395807cddc007b2b09a133810daeb77ae27fa36ac4eec7813828248fc195abe27f59700cfa58ee65ef3a020a51f73e5107678ec xbacklight-1.2.2.tar.bz2" diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD index fecfdbe3e..22eeeba55 100644 --- a/system/adelie-base/APKBUILD +++ b/system/adelie-base/APKBUILD @@ -1,24 +1,23 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adelie-base -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=1 pkgdesc="The Adélie Linux Base System" -url="http://adelielinux.org/" +url="https://www.adelielinux.org/" arch="noarch" options="!check !fhs" license="NCSA" _core_depends="apk-tools adelie-keys musl-utils shadow shimmy grep procps bash - coreutils diffutils findutils sharutils + coreutils diffutils findutils util-linux net-tools - sysklogd - patch sed nvi psmisc less" -depends="adelie-core debianutils libarchive-tools file zsh binutils - console-setup sysklogd man-db tzdata gettys-openrc" + nvi sed psmisc less tzdata" +depends="adelie-core binutils console-setup debianutils file gettys-openrc + libarchive-tools man-db patch sed sharutils sysklogd zsh" makedepends="" makedepends_host="$depends" -subpackages="adelie-core:core $pkgname-doc $pkgname-posix $pkgname-lsb dev-kit:devkit" +subpackages="adelie-core:core $pkgname-doc $pkgname-posix $pkgname-lsb dev-kit:devkit docs" provides="alpine-base" source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.xz group @@ -44,6 +43,7 @@ package() { install -m644 "$srcdir"/group "$pkgdir"/etc/group install -m644 "$srcdir"/passwd "$pkgdir"/etc/passwd install -m640 -g shadow "$builddir"/tree/etc/shadow "$pkgdir"/etc/shadow + echo '' > "$pkgdir"/etc/shells # stupid inflatable stupid busybox local i @@ -87,13 +87,19 @@ lsb() { } devkit() { - depends="build-tools fakeroot gzip libarchive-tools mawk xz" + depends="build-tools libarchive-tools" pkgdesc="The Adélie Linux Development Kit" mkdir -p "$subpkgdir" return 0 } -sha512sums="6afa6750162d91d005fa1a0a789e06e9599be7063ed6847376c3b740a22afb273d405760f52249de233476c8b578c469a6e2d17b8f01d7f7ef8dd7b4fc5f9a4c adelie-base-0.9.0.tar.xz +docs() { + pkgdesc="Metapackage that will magically install all documentation for your system" + mkdir -p "$subpkgdir" + return 0 +} + +sha512sums="be6f4375d4bc3f014b33a536c24c84ab288c6d3fb525a7a069723e8e522342ce6c6cd800417ada28ecb6f31550c73c12075e2e1eb9e7734fc0d37bb3e9471434 adelie-base-0.9.1.tar.xz 37260d9315fd8d8b0df3dfb5bd3e1035a47ba1e43f33aa195e3feca6d169da282c1b067ef4603e7e9acaedbfef8b58cf490c00bdca444d43c9d570355ad29eac group 1288d9d1ee77e1159bacbc94a44b2ae9c6dff94c5001be6e560cd5859f86181c47341317025d4999bc7d57cfcebb7974804514d981b7bd66ffd00c5edaf5360c passwd 5b87e0c73e7d73715467b09c9c228b14abfdc1567b3d8a3e6ef86694a9d016c798c22411c9c8ccf41920fbe185199f6d6dbd45d4bceb6652ab4a7bea87c4fe51 addgroup diff --git a/system/binutils/APKBUILD b/system/binutils/APKBUILD index 4cd3901ec..67f81db9d 100644 --- a/system/binutils/APKBUILD +++ b/system/binutils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> pkgname=binutils pkgver=2.31.1 -pkgrel=1 +pkgrel=2 pkgdesc="Tools necessary to build programs" url="http://www.gnu.org/software/binutils/" depends="" @@ -16,6 +16,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" [ "${CARCH}" != "ppc" ] || options='!check' source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz binutils-ld-fix-static-linking.patch + CVE-2018-19931.patch + CVE-2018-19932.patch disable-gnu-mbind.patch disable-ifunc-tests.patch disable-preinit-array-tests.patch @@ -35,7 +37,10 @@ fi # secfixes: # 2.28-r1: -# - CVE-2017-7614 +# - CVE-2017-7614 +# 2.31.1-r2: +# - CVE-2018-19931 +# - CVE-2018-19932 build() { local _sysroot=/ @@ -114,6 +119,8 @@ libs() { sha512sums="0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30 binutils-2.31.1.tar.xz ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch +4cfece75605ea17df676692e9ed2a5f8b3221fdb93fca9655f67260a9f4fd4f9e5a62141f51ba9bb7819f4628cdda4fd3f2f82e947ba197980f2b0c2c58a147c CVE-2018-19931.patch +68d1699d66aeb9dabb76d2e56e881fe73e55cc9594741107bf9f1a23fd2c1dc4421d02317bfc0218b02ad1372d3a8a577044578fffbfd8504ca238be835c5ff0 CVE-2018-19932.patch d378fdf1964f8f2bd0b1e62827ac5884bdf943aa435ec89c29fc84bb045d406b733fffaff8fdd8bd1cba8ddea7701c4cf6ccf3ed76a8a3df9c72b447737575a6 disable-gnu-mbind.patch 474ab24097bbb5b24433620549e5234fe65c547824c1342f693c718ffbc81e2d968259cce2d650b55200dd1ec89da207ea2db10c551cd9941285c4600b4297b2 disable-ifunc-tests.patch 3537752e63cef0b5ef136d003ff7e814ba66b12624d817430112d0f291a792e8960fa69a78036f526af835441b3ee483d6a53d55c7b3dd8ee96f0399682dbcbe disable-preinit-array-tests.patch diff --git a/system/binutils/CVE-2018-19931.patch b/system/binutils/CVE-2018-19931.patch new file mode 100644 index 000000000..99a9797e3 --- /dev/null +++ b/system/binutils/CVE-2018-19931.patch @@ -0,0 +1,31 @@ +From 5f60af5d24d181371d67534fa273dd221df20c07 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Fri, 30 Nov 2018 11:45:33 +0000 +Subject: [PATCH] Fix a memory exhaustion bug when attempting to allocate room + for an impossible number of program headers. + + * elfcode.h (elf_object_p): Check for corrupt input files with + more program headers than can actually fit in the file. +--- + bfd/elfcode.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/bfd/elfcode.h b/bfd/elfcode.h +index f224c8b..16ed8e5 100644 +--- a/bfd/elfcode.h ++++ b/bfd/elfcode.h +@@ -784,6 +784,11 @@ elf_object_p (bfd *abfd) + if (i_ehdrp->e_phnum > ((bfd_size_type) -1) / sizeof (*i_phdr)) + goto got_wrong_format_error; + #endif ++ /* Check for a corrupt input file with an impossibly large number ++ of program headers. */ ++ if (bfd_get_file_size (abfd) > 0 ++ && i_ehdrp->e_phnum > bfd_get_file_size (abfd)) ++ goto got_no_match; + amt = (bfd_size_type) i_ehdrp->e_phnum * sizeof (*i_phdr); + elf_tdata (abfd)->phdr = (Elf_Internal_Phdr *) bfd_alloc (abfd, amt); + if (elf_tdata (abfd)->phdr == NULL) +-- +2.9.3 + diff --git a/system/binutils/CVE-2018-19932.patch b/system/binutils/CVE-2018-19932.patch new file mode 100644 index 000000000..383aae70f --- /dev/null +++ b/system/binutils/CVE-2018-19932.patch @@ -0,0 +1,47 @@ +From beab453223769279cc1cef68a1622ab8978641f7 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Fri, 30 Nov 2018 11:43:12 +0000 +Subject: [PATCH] Remove an abort in the bfd library and add a check for an + integer overflow when mapping sections to segments. + + PR 23932 + * elf.c (IS_CONTAINED_BY_LMA): Add a check for a negative section + size. + (rewrite_elf_program_header): If no sections are mapped into a + segment return an error. +--- + bfd/elf.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/bfd/elf.c b/bfd/elf.c +index 604971d..79a76be 100644 +--- a/bfd/elf.c ++++ b/bfd/elf.c +@@ -6644,6 +6644,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd) + the given segment. LMA addresses are compared. */ + #define IS_CONTAINED_BY_LMA(section, segment, base) \ + (section->lma >= base \ ++ && (section->lma + SECTION_SIZE (section, segment) >= section->lma) \ + && (section->lma + SECTION_SIZE (section, segment) \ + <= SEGMENT_END (segment, base))) + +@@ -7167,7 +7168,15 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd) + suggested_lma = output_section; + } + +- BFD_ASSERT (map->count > 0); ++ /* PR 23932. A corrupt input file may contain sections that cannot ++ be assigned to any segment - because for example they have a ++ negative size - or segments that do not contain any sections. */ ++ if (map->count == 0) ++ { ++ bfd_set_error (bfd_error_bad_value); ++ free (sections); ++ return FALSE; ++ } + + /* Add the current segment to the list of built segments. */ + *pointer_to_map = map; +-- +2.9.3 + diff --git a/system/bison/APKBUILD b/system/bison/APKBUILD index 921a1fdf3..a0a27f08f 100644 --- a/system/bison/APKBUILD +++ b/system/bison/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bison pkgver=3.1 -pkgrel=0 +pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch="all" [ -n "$BOOTSTRAP" ] && options="!check" @@ -11,6 +11,7 @@ url="https://www.gnu.org/software/bison/bison.html" depends="m4" checkdepends="bison flex" makedepends="perl" +provider_priority=1 subpackages="$pkgname-doc $pkgname-lang" source="ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz" diff --git a/system/cryptsetup/APKBUILD b/system/cryptsetup/APKBUILD index 5534c96fc..d3ba1d2ee 100644 --- a/system/cryptsetup/APKBUILD +++ b/system/cryptsetup/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=cryptsetup -pkgver=2.0.5 +pkgver=2.0.6 pkgrel=0 pkgdesc="Setup tool for block device encryption" url="https://gitlab.com/cryptsetup/cryptsetup" @@ -62,7 +62,7 @@ libs() { mv "$pkgdir"/lib "$subpkgdir"/ } -sha512sums="92ecbcbfe715c704a968305712980ce048c41416d0729ab5f8552daaa404bdddecca0d24b9c835634b96762dcab02693fbd96a6a72d41eaff245fd57fa311c7f cryptsetup-2.0.5.tar.gz +sha512sums="9e3458122e34c86d21b9a9c0c648e8e6134d7e2058bc00514137c5136782cea493cf0db5b0c2884fac759c0c2ea185e99d4a223d6f338c1cb3f5281eadd6626e cryptsetup-2.0.6.tar.gz 301e3e3da5a899e0a6f01f44fbf37bb6a3f5b6a4fb41243bae6d3b7aea747276e784626cd1b19721cc264652c10ae8c560c4d20094e33bb82fb2fae0160682c0 flush-stdout.patch 74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd 81dad61cdecf1dc529b26eb3cdc15979a582c876b01268f88e7a71c8fae6911137c03bfa63fee64e064e5fb31f673610be27ecab9fc432229f13e7040698bd5c dmcrypt.initd" diff --git a/system/easy-kernel-power8-64k/APKBUILD b/system/easy-kernel-power8-64k/APKBUILD index 16ddcd148..1b75a06f4 100644 --- a/system/easy-kernel-power8-64k/APKBUILD +++ b/system/easy-kernel-power8-64k/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> _pkgname=easy-kernel-power8-64k -pkgver=4.14.76 -pkgrel=11 +pkgver=4.14.88 +pkgrel=13 pkgname=$_pkgname-$pkgver-mc$pkgrel _kflavour=power8-64k pkgdesc="The Linux kernel, packaged for POWER8 and POWER9 computers (with 64K page size)" @@ -77,7 +77,7 @@ modules() { } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -d8bfe29549e0a1a7e86d8ead682e93e704c8d0b4b454f8a75306aa7ef5d628cab3a65847e27502866ed5901aff189eb440d47d8e07c2c34ebb7d2d82b717a64b linux-4.14-mc11.patch.xz +bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch 6e155f1109666ee907baf7f586d856366ba8afb6f008d48489c0bc269438a8280534266d3e37b449e44ce964688ea48f041bb36214eb495d59b84e55cdf49c19 config-ppc64 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch" diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD index 638ad465d..477e7ea04 100644 --- a/system/easy-kernel-power8/APKBUILD +++ b/system/easy-kernel-power8/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> _pkgname=easy-kernel-power8 -pkgver=4.14.76 -pkgrel=11 +pkgver=4.14.88 +pkgrel=13 pkgname=$_pkgname-$pkgver-mc$pkgrel pkgdesc="The Linux kernel, packaged for POWER8 and POWER9 computers" url="https://kernel.org/" @@ -83,7 +83,7 @@ src() { mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel-p8 } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -d8bfe29549e0a1a7e86d8ead682e93e704c8d0b4b454f8a75306aa7ef5d628cab3a65847e27502866ed5901aff189eb440d47d8e07c2c34ebb7d2d82b717a64b linux-4.14-mc11.patch.xz +bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch 7eaa8840cbcb78afcc95a2e57a0fe92d6016f0ee6b5e1530e647ddb2799dae709ff57ac86bdfdefd32be1f3b1aec789cdc6b49f81c3186291672a8945bc474dd config-ppc64 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch" diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index 56cf73ae5..3e20840fd 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> _pkgname=easy-kernel -pkgver=4.14.76 -pkgrel=11 +pkgver=4.14.88 +pkgrel=13 pkgname=$_pkgname-$pkgver-mc$pkgrel pkgdesc="The Linux kernel, packaged for your convenience" url="https://kernel.org/" @@ -10,7 +10,7 @@ arch="all" options="!check !dbg !strip !tracedeps" license="GPL-2.0-only" depends="" -makedepends="bc gzip lzop openssl-dev xz" +makedepends="bc gzip kmod lzop openssl-dev xz" install="" provides="easy-kernel=$pkgver-r$pkgrel" subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules @@ -107,13 +107,13 @@ src() { mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -d8bfe29549e0a1a7e86d8ead682e93e704c8d0b4b454f8a75306aa7ef5d628cab3a65847e27502866ed5901aff189eb440d47d8e07c2c34ebb7d2d82b717a64b linux-4.14-mc11.patch.xz +bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch cfa1c2b523875967c42bfd8fcfeeb80b1c4c9887c4399b4767f0ac0525769a9e8c5cddaec831e1adfa546ac2d66f68ef23dc594a286532f4b9890401efd75c67 config-ppc64 1112f6c3fcfd7fdc0ef4d5e85df5d3adea430a9c7b4c2b34508a215f7ba14c863ccd7a5e17f13ed46c518bafec30cfb3ced70c465137c14ef5fc998b6cbcca1f config-ppc -438a66561200d570b3bf6ab0481d9725a9f482b1fcf852a90f99c6db5aa4ee02d2b67b57235bb7afc01515a79289407cbe111536340824d7a391ce1a658c9a76 config-x86_64 -e8f7749877c5b2574e7e853b757477b8f99d757b43225d4f83d611c20215b8b2690cc85369608c2dc8f7d6a619136a2d7dde4648031e37d2ae4dcc5ba85652c8 config-pmmx -0174e758ea318171c8036426ed0ad22aaafbdbac755732a46397686ec8dd24e977447f6fc275d59eed43ea047fc8a36061b7ad0d5862d522222455a60c943027 config-aarch64 +d72613826070cfab9cea882419c13985109200b387bd96614628e5eadb25f8da8b64c4844e345b724c29f7e6cf0619c649e536cb6cfe552a878d3a977cbb31fe config-x86_64 +40402578479993f78310459dcba783c806e0d2ebf6ad54854ffa338d3332f718ea4e8cf2c2f542584e1672504074122bba70a7ef918be7926f4a97abc20416d3 config-pmmx +231c346e601c1d032a03d6cb19ed3d6e0f538f84d6c9980e3f47236ba9dc3f076ea23f91d68813b7d5c9eea40200f69cef31697f89f514112c09c5762ab2c48a config-aarch64 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch fdd94b9de7b374f1812dec0f9971c05f5e52177ca4a16c8071daa620c18265b38f656f528e7045a24f30af01f05e53e54546fb0a9e93773cf191866e87de505d kernel.h af093e91e8c8371629948e2e574f8764078564bc027ba5b2f87886f8827d9a63ba7a43717552fe7e3cc9212b2fd55b8633b12900c3d8cdc6c035d52b389c39e5 uapi-ether.patch" diff --git a/system/easy-kernel/config-aarch64 b/system/easy-kernel/config-aarch64 index 05764460a..69fbd943c 100644 --- a/system/easy-kernel/config-aarch64 +++ b/system/easy-kernel/config-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.33-mc6 Kernel Configuration +# Linux/arm64 4.14.88-mc13 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -495,6 +495,7 @@ CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_834220=y CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y +CONFIG_ARM64_ERRATUM_1024718=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -596,6 +597,7 @@ CONFIG_XEN=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_ARM64_SSBD=y # CONFIG_ARMV8_DEPRECATED is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set @@ -1867,6 +1869,7 @@ CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_IPQ806X=m CONFIG_DWMAC_MESON=m CONFIG_DWMAC_ROCKCHIP=m +# CONFIG_DWMAC_SOCFPGA is not set CONFIG_DWMAC_SUNXI=m CONFIG_DWMAC_SUN8I=m # CONFIG_STMMAC_PCI is not set @@ -2925,6 +2928,12 @@ CONFIG_ROCKCHIP_THERMAL=m CONFIG_MTK_THERMAL=y # +# Broadcom thermal drivers +# +# CONFIG_BCM2835_THERMAL is not set +CONFIG_BCM_NS_THERMAL=y + +# # Samsung thermal drivers # CONFIG_EXYNOS_THERMAL=y diff --git a/system/easy-kernel/config-pmmx b/system/easy-kernel/config-pmmx index 3eba58ce7..1484fc1b2 100644 --- a/system/easy-kernel/config-pmmx +++ b/system/easy-kernel/config-pmmx @@ -416,7 +416,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y CONFIG_X86_MPPARSE=y CONFIG_X86_BIGSMP=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=y +CONFIG_RETPOLINE=n # CONFIG_INTEL_RDT is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_GOLDFISH is not set diff --git a/system/easy-kernel/config-x86_64 b/system/easy-kernel/config-x86_64 index 22db9c048..ba0b3beeb 100644 --- a/system/easy-kernel/config-x86_64 +++ b/system/easy-kernel/config-x86_64 @@ -440,7 +440,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y # CONFIG_X86_X2APIC is not set CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=y +CONFIG_RETPOLINE=n # CONFIG_INTEL_RDT is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_VSMP is not set diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 4446e214a..b642f8137 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=git -pkgver=2.19.1 +pkgver=2.19.2 pkgrel=0 pkgdesc="A distributed version control system" url="https://www.git-scm.com/" @@ -11,6 +11,8 @@ depends="perl-error" replaces="git-perl perl-git" # secfixes: +# 2.19.2: +# - CVE-2018-19486 # 2.14.1: # - CVE-2017-1000117 @@ -166,7 +168,7 @@ subtree_doc() { gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1 } -sha512sums="a1bc1032b1de9eb9ea8b7c385cd009f64247e13066e0a91e9682e35400ded05f88c23b523cca4782f57544060d6ba0f9d3bec944399cda5771a4945c38bb9b98 git-2.19.1.tar.xz +sha512sums="1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96 git-2.19.2.tar.xz ef6c31ac1474fa128aecf86eda75653fdd0fe7a09d35914c1a03749abf9c92cbc01f8064b2b697ca796fa18bec717b9bcb1aac6d36d02ce8ed4270d4728e72f0 dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" diff --git a/system/libcap/APKBUILD b/system/libcap/APKBUILD index 5fc9e4941..64763b21b 100644 --- a/system/libcap/APKBUILD +++ b/system/libcap/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=libcap -pkgver=2.25 -pkgrel=2 +pkgver=2.26 +pkgrel=0 pkgdesc="POSIX 1003.1e capabilities" arch="all" options="!check" @@ -26,4 +26,4 @@ package() { make lib=/lib prefix=/usr RAISE_SETFCAP=no DESTDIR="$pkgdir" install } -sha512sums="c3ab491885292adc171cde542b96f1295e84132febb50112a46575c3bde3a3eb6fcf733f7a756b4b656e013c0abb5ed6571db24799f8c0b23d8f759f992864f9 libcap-2.25.tar.xz" +sha512sums="1c2d59f007226405a924950b2c2090393527e06f0692a84e6463e33915a070df61a9070b8f30a624d5630ddd39290eac117e5d440577d1edd48510195b9d12f0 libcap-2.26.tar.xz" diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD index 08f4342dd..dbbfe640c 100644 --- a/system/musl/APKBUILD +++ b/system/musl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=musl pkgver=1.1.20 -pkgrel=4 +pkgrel=5 pkgdesc="System library (libc) implementation" url="http://www.musl-libc.org/" arch="all" @@ -11,7 +11,7 @@ license="MIT" depends="" depends_dev="!uclibc-dev" makedepends="$depends_dev" -subpackages="$pkgname-dev $pkgname-dbg" +subpackages="$pkgname-dev" case "$BOOTSTRAP" in nocc) pkgname="musl-dev" subpackages="" @@ -32,6 +32,7 @@ source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz dcngettext-null-deref.patch getaddrinfo-regression.patch ppc64-atomic.patch + dynamic-binary-stack-size.patch ldconfig getent.c @@ -127,6 +128,7 @@ b967339d9048161583523e847be91779adb0e16cc225d6ff85ef51748269b2dab08a0b8e558ad014 a08d1b170356beea333ace1da12f8a8399ca80c5d9c32ff2fcd8562537a670214f566e4b1219a11b32129078e22fbf7009bb277b7de8550a89352a64b3b5090d dcngettext-null-deref.patch e3953a3a73ef11696dd3eb216e18b152ae35198d8bff686d157e27bc90fb558f9a0be518025a90534e9afd6ea1bf731ffdb6fcb202bb9368f2c8eec7ca886141 getaddrinfo-regression.patch aae9110eccb8cd7dcd3c957fcb01ed524598f79f7fa1a16b9993af40793545d1ec211e7e6aeabe7af7715d94cc26a473ea0acf6d6e66019bf65f03d4b8e24a4b ppc64-atomic.patch +654f76c96ed0e69e19b1a20569e83751bb207a8c181b26742f505638095dde3f4dd3f785deb92c49a603bd15cd8d4932129f567de8cd2edffdd8551c4dfd6976 dynamic-binary-stack-size.patch cce2f1eeb61e55674469c26871a573cce61d739c3defe9c8f56f2b774f6ba5435849ad542a6714120efddc98c297098e9c98a1a424ac593df2243d4aa479f9a9 ldconfig 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c" diff --git a/system/musl/dynamic-binary-stack-size.patch b/system/musl/dynamic-binary-stack-size.patch new file mode 100644 index 000000000..e2e3f12d3 --- /dev/null +++ b/system/musl/dynamic-binary-stack-size.patch @@ -0,0 +1,97 @@ +From 7b3348a98c139b4b4238384e52d4b0eb237e4833 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Tue, 18 Sep 2018 23:54:18 -0400 +Subject: support setting of default thread stack size via PT_GNU_STACK header + +this facilitates building software that assumes a large default stack +size without any patching to call pthread_setattr_default_np or +pthread_attr_setstacksize at each thread creation site, using just +LDFLAGS. + +normally the PT_GNU_STACK header is used only to reflect whether +executable stack is desired, but with GNU ld at least, passing +-Wl,-z,stack-size=N will set a size on the program header. with this +patch, that size will be incorporated into the default stack size +(subject to increase-only rule and DEFAULT_STACK_MAX limit). + +both static and dynamic linking honor the program header. for dynamic +linking, all libraries loaded at program start, including preloaded +ones, are considered. dlopened libraries are not considered, for +several reasons. extra logic would be needed to defer processing until +the load of the new library is commited, synchronization woud be +needed since other threads may be running concurrently, and the +effectiveness woud be limited since the larger size would not apply to +threads that already existed at the time of dlopen. programs that will +dlopen code expecting a large stack need to declare the requirement +themselves, or pthread_setattr_default_np can be used. +--- + ldso/dynlink.c | 12 ++++++++++++ + src/env/__init_tls.c | 5 +++++ + 2 files changed, 17 insertions(+) + +diff --git a/ldso/dynlink.c b/ldso/dynlink.c +index e4829c3a..3ecbddfa 100644 +--- a/ldso/dynlink.c ++++ b/ldso/dynlink.c +@@ -22,6 +22,7 @@ + #include "dynlink.h" + + static void error(const char *, ...); ++extern size_t __default_stacksize; + + #define MAXP2(a,b) (-(-(a)&-(b))) + #define ALIGN(x,y) ((x)+(y)-1 & -(y)) +@@ -609,6 +610,12 @@ static void *map_library(int fd, struct dso *dso) + } else if (ph->p_type == PT_GNU_RELRO) { + dso->relro_start = ph->p_vaddr & -PAGE_SIZE; + dso->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE; ++ } else if (ph->p_type == PT_GNU_STACK) { ++ if (!runtime && ph->p_memsz > __default_stacksize) { ++ __default_stacksize = ++ ph->p_memsz < (8<<20) ? ++ ph->p_memsz : (8<<20); ++ } + } + if (ph->p_type != PT_LOAD) continue; + nsegs++; +@@ -1238,6 +1245,12 @@ static void kernel_mapped_dso(struct dso *p) + } else if (ph->p_type == PT_GNU_RELRO) { + p->relro_start = ph->p_vaddr & -PAGE_SIZE; + p->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE; ++ } else if (ph->p_type == PT_GNU_STACK) { ++ if (!runtime && ph->p_memsz > __default_stacksize) { ++ __default_stacksize = ++ ph->p_memsz < (8<<20) ? ++ ph->p_memsz : (8<<20); ++ } + } + if (ph->p_type != PT_LOAD) continue; + if (ph->p_vaddr < min_addr) +diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c +index e0224243..96d0e284 100644 +--- a/src/env/__init_tls.c ++++ b/src/env/__init_tls.c +@@ -8,6 +8,8 @@ + #include "atomic.h" + #include "syscall.h" + ++extern size_t __default_stacksize; ++ + int __init_tp(void *p) + { + pthread_t td = p; +@@ -90,6 +91,11 @@ static void static_init_tls(size_t *aux) + base = (size_t)_DYNAMIC - phdr->p_vaddr; + if (phdr->p_type == PT_TLS) + tls_phdr = phdr; ++ if (phdr->p_type == PT_GNU_STACK && ++ phdr->p_memsz > __default_stacksize) ++ __default_stacksize = ++ phdr->p_memsz < (8<<20) ? ++ phdr->p_memsz : (8<<20); + } + + if (tls_phdr) { +-- +cgit v1.2.1 + diff --git a/system/perl-cpanel-json-xs/APKBUILD b/system/perl-cpanel-json-xs/APKBUILD index cd896f89b..76e9a74a9 100644 --- a/system/perl-cpanel-json-xs/APKBUILD +++ b/system/perl-cpanel-json-xs/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-cpanel-json-xs _pkgreal=Cpanel-JSON-XS -pkgver=4.07 +pkgver=4.08 pkgrel=0 pkgdesc="cPanel's fork of JSON::XS, fast and correct serialising" url="https://metacpan.org/release/Cpanel-JSON-XS" @@ -40,4 +40,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="f8136702c7da4c04d210025ee6c9e5095c07f67012f1ad2f35e8dcce204bd826569c036f87e50e34b30c461a149cba4f4da66ee60e30c9f7e5f402fadf529a57 Cpanel-JSON-XS-4.07.tar.gz" +sha512sums="7236923791b244e022cea00f3c8697905a8187edddaf0b197ee6f8a4afe958c42ea37f655e0db8e4c66a07427b7888e68ae1dc08849ef7cbb518155b2d9c65f5 Cpanel-JSON-XS-4.08.tar.gz" diff --git a/system/perl-dbd-sqlite/APKBUILD b/system/perl-dbd-sqlite/APKBUILD index e0febf493..de26fcf57 100644 --- a/system/perl-dbd-sqlite/APKBUILD +++ b/system/perl-dbd-sqlite/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-dbd-sqlite _pkgname=DBD-SQLite -pkgver=1.58 +pkgver=1.60 pkgrel=0 pkgdesc="Perl DBI SQLite module" url="https://metacpan.org/release/DBD-SQLite" @@ -40,5 +40,5 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="080d1e304fb0d43926ce0345df3367132c317ba113bdc11952c0a159bc68d988a024828a28e66be267f82e07731dee225723854fb80914ba7c476b27dbdeb212 DBD-SQLite-1.58.tar.gz +sha512sums="b5fd203898815ada13ec04477fa0ad90ec2f53761d9b1ed7cce7d06a674e31d3810e745658aea150a3a58fc18adb889e5e50e795e8575318ab4cc757c1ff1c9e DBD-SQLite-1.60.tar.gz 00961932f9f89d9b46e6134150c2628aadd4cfa7159cb1604de023fedc919087fbf982b72fd51610e1ca390234cd939e74430b270131d0b30cedb97ba6203b49 perl-DBD-SQLite-bz543982.patch" diff --git a/system/perl-module-scandeps/APKBUILD b/system/perl-module-scandeps/APKBUILD index e8a1cdc73..776899508 100644 --- a/system/perl-module-scandeps/APKBUILD +++ b/system/perl-module-scandeps/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-module-scandeps _pkgreal=Module-ScanDeps -pkgver=1.25 +pkgver=1.26 pkgrel=0 pkgdesc="Recursively scan Perl code for dependencies" url="https://metacpan.org/release/Module-ScanDeps" @@ -42,4 +42,4 @@ check() { make test } -sha512sums="1d1d10b55147e68238465fc1e5e9248d926151394034f0bde32c0030ff9bbd685ebb1ed0c6c924769a2e38c2dc15621990b454438db5ef5699aeed378f02aec7 Module-ScanDeps-1.25.tar.gz" +sha512sums="b4b54813f55b82c20073ede9be90ab3680a636c3c8743ae03ccd0d7a26097f3d05b3e55d8b0d7d414e4156eaa686dc6eec0541ebe6c89a5c896dcd98845eb10f Module-ScanDeps-1.26.tar.gz" diff --git a/system/perl-test-simple/APKBUILD b/system/perl-test-simple/APKBUILD index 078869136..6b0514b39 100644 --- a/system/perl-test-simple/APKBUILD +++ b/system/perl-test-simple/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-simple _pkgreal=Test-Simple -pkgver=1.302140 +pkgver=1.302141 pkgrel=0 pkgdesc="Basic utilities for writing Perl tests" url="https://metacpan.org/release/Test-Simple" @@ -47,4 +47,4 @@ doc() { replaces="perl-doc" } -sha512sums="fb823470165e321f68bf761cb9fd31d9e2b3efb42a7ac25602f4a33624e3b8287f6210d502c6afe7723b5ad50c4b1fed2a1db166f151f9b9155d2bca4600766f Test-Simple-1.302140.tar.gz" +sha512sums="3560308cc62441c4b4214b002a9c98cd9e0191fcf655295031b58f5ed6f43c26def278fb2669bca0c6fa1e803c2feb90a8700f840bd91cddd649573ad896e261 Test-Simple-1.302141.tar.gz" diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD index a492a84bd..5f4410851 100644 --- a/system/perl/APKBUILD +++ b/system/perl/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Proxy-For: solar pkgname=perl -pkgver=5.26.2 +pkgver=5.26.3 pkgrel=0 pkgdesc="Larry Wall's Practical Extraction and Report Language" url="http://www.perl.org/" @@ -18,6 +18,12 @@ source="http://www.cpan.org/src/5.0/perl-$pkgver.tar.gz " # secfixes: +# 5.26.3-r0: +# - CVE-2018-12015 +# - CVE-2018-18311 +# - CVE-2018-18312 +# - CVE-2018-18313 +# - CVE-2018-18314 # 5.26.1-r0: # - CVE-2017-12837 # - CVE-2017-12883 @@ -109,4 +115,4 @@ dev() { default_dev } -sha512sums="166d767f748a911b969fc8008069f087927cbdd9ee21b375b31e5feb5afc2be8d80d68f8c291accee6fdf3be90e9dc2fc870cb9c0bd1cc68c6e001e4ed38d564 perl-5.26.2.tar.gz" +sha512sums="03914ed51163c998a6afa45610a13cf50124a2c68d291c344b0d52fa15c27fc5d5d4f5dc117516078a03dfd51250097b87c8d5e2b17c7858a4c8c536aecd05af perl-5.26.3.tar.gz" diff --git a/system/sqlite/APKBUILD b/system/sqlite/APKBUILD index 0510abfdb..f363490d0 100644 --- a/system/sqlite/APKBUILD +++ b/system/sqlite/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sqlite -pkgver=3.25.2 +pkgver=3.26.0 _a=${pkgver%%.*} _b=${pkgver#${_a}.} _b=${_b%%.*} @@ -17,14 +17,14 @@ esac [ $_d -lt 10 ] && _d=0$_d _ver=${_a}${_b}${_c}${_d} -pkgrel=2 +pkgrel=0 pkgdesc="C library that implements an SQL database engine" url="https://sqlite.org/" arch="all" license="Public-Domain" depends="" makedepends="libedit-dev" -source="http://www.sqlite.org/2018/$pkgname-autoconf-$_ver.tar.gz +source="https://sqlite.org/2018/$pkgname-autoconf-$_ver.tar.gz license.txt" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" @@ -50,7 +50,7 @@ build() { --host=$CHOST \ --prefix=/usr \ --enable-threadsafe \ - --disable-static \ + --enable-static \ --enable-editline \ --enable-dynamic-extensions @@ -82,5 +82,5 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="5ef9a6dfbb0822257af1a3a379785a95ab02edecbbb53b57074ddd0b8dc294fc07cbb9a8a7acc4e1640fb1743525ed6331fecebbddce01bc017330b20e127ad9 sqlite-autoconf-3250200.tar.gz +sha512sums="8c3306b3814a0e9bc69b741f62bdb6efc9f1e07163ca3e3a1581994465de163a7924223522e812d6b3663c1525c7012a6f6d73ad333556eba9f97ce9326fbdb8 sqlite-autoconf-3260000.tar.gz 5bde14bec5bf18cc686b8b90a8b2324c8c6600bca1ae56431a795bb34b8b5ae85527143f3b5f0c845c776bce60eaa537624104cefc3a47b3820d43083f40c6e9 license.txt" diff --git a/system/tcl/APKBUILD b/system/tcl/APKBUILD index 4e2769d35..854222be1 100644 --- a/system/tcl/APKBUILD +++ b/system/tcl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=tcl -pkgver=8.6.8 +pkgver=8.6.9 pkgrel=0 pkgdesc="The Tcl scripting language" url="http://tcl.sourceforge.net/" @@ -76,5 +76,5 @@ dev() { done } -sha512sums="14fb8fd880ecedda61119556f404fa1da34146f82dbf771be2ab322c6c575a898e194016dc3300f6764008d8f3bf59b07e31723bf8a3aafdcee6b4ef7667b18e tcl8.6.8-src.tar.gz +sha512sums="707fc0fb4f45c85e8f21692e5035d727cde27d87a2e1cd2e748ad373ebd3517aeca25ecaef3382a2f0e0a1feff96ce94a62b87abcf085e1a0afe2a23ef460112 tcl8.6.9-src.tar.gz cd52cbe80fd2be227c9018dbe38fa0888302293402e7a57f2e231c195b7c1902f1b58bc87d19c9d123915ca757e871abf084c0ef23b1a7f187bc03ba93904cc2 tcl-stat64.patch" diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index 7bc2766c2..2f64f96d8 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vim -pkgver=8.1.0490 +pkgver=8.1.0606 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -80,5 +80,5 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="1237ad835f65699ca095fbae4ac1039807638d4de7cc00ec83a56ba975ba224103740f6d6ee9e15b0135bc444eef747a5e15b88346e32f7ae4d436f183a44935 vim-8.1.0490.tar.gz +sha512sums="df02717611d7b2f54f3b60ff9f73259a6ff3228b841d7d2d429fa0eedd98ce0a140a6a3839b50bd67ce5724d86f816042d6cbb0930fd040d30216f98f2d7e6ec vim-8.1.0606.tar.gz 3a6c9bc187a6f45fd78e91dcc44d4d661c1ae1f2655e3a66bb36245ad1dc41e8d0e6061ec3aee6d323f96058b4a5501a87e3327e539cfd026f68cf81d455d721 vimrc" diff --git a/user/acpid/APKBUILD b/user/acpid/APKBUILD new file mode 100644 index 000000000..aa674dfbb --- /dev/null +++ b/user/acpid/APKBUILD @@ -0,0 +1,57 @@ +# Maintainer: multiplexd <multi@in-addr.xyz> +# Contributor: Morten Linderud <foxboron@archlinux.org> +# Contributor: Sébastien Luttringer +# Contributor: xduugu +# Contributor: Manolis Tzanidakis +# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us> +# Contributor: multiplexd <multi@in-addr.xyz> + +pkgname=acpid +pkgver=2.0.31 +pkgrel=0 +pkgdesc="Daemon for handling ACPI power management events" +url="https://sourceforge.net/projects/acpid2/" +arch="all" +options="!check" # No test suite. +license="GPL-2.0+ AND GPL-2.0-only" +depends="" +makedepends="" +subpackages="$pkgname-doc $pkgname-openrc" +source="http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.tar.xz + handler.sh + default + acpid.initd + acpid.confd" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + + install -m 755 -D "$srcdir"/acpid.initd \ + "$pkgdir"/etc/init.d/acpid + install -m 644 -D "$srcdir"/acpid.confd \ + "$pkgdir"/etc/conf.d/acpid + install -m 644 -D "$srcdir"/default \ + "$pkgdir"/etc/acpi/events/default + install -m 755 -D "$srcdir"/handler.sh \ + "$pkgdir"/etc/acpi/handler.sh +} + +sha512sums="05eb96cdae698731b14caa89aa01239a0f16ce732f897d295447753aab7c8d49227c9b9ce901c6fd3bfdb117688e6ed80ec61aea0f64d75c9c0afe2aea2aa91a acpid-2.0.31.tar.xz +f5935340391a927b2c0b8d36f6b9579d740299a46c210f762483336f2685e80bdfc237dd5ac5eeed5e458eff2fa436cd36e3277c4ee2085e05662e1525c56edd handler.sh +2ca236168ce6aaa56c980568c781d6e51590870b7a7936c74bf72532ef3f6c60a369f37597202f3a236d60637fd0daa6611d4ae0348484011ff71871a9914246 default +7381d30b5c6478cdbf5dff93ae95baa0b3b1fe0a04b02cf491831f1657d6f71b8eef121b7e78f3201d11a5856bfb30df0a57437c76e6fbe05ad88cd45e86ae64 acpid.initd +518cb397b2aa63b893ead1be08f32fe436d19b72663dee66834cfbc112b003333f0df8b9e4f1ffe64b813783f657d3fe8b9a0c5e992d5665583357e68b266705 acpid.confd" diff --git a/user/acpid/acpid.confd b/user/acpid/acpid.confd new file mode 100644 index 000000000..9aadb4cd8 --- /dev/null +++ b/user/acpid/acpid.confd @@ -0,0 +1,6 @@ +# /etc/conf.d/acpid: config file for /etc/init.d/acpid + +# Options to pass to the acpid daemon. +# See the acpid(8) man page for more info. + +ACPID_ARGS="" diff --git a/user/acpid/acpid.initd b/user/acpid/acpid.initd new file mode 100644 index 000000000..f8076d43b --- /dev/null +++ b/user/acpid/acpid.initd @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload" +command="/usr/sbin/acpid" +command_args="${ACPID_ARGS}" +description="Daemon for Advanced Configuration and Power Interface" + +depend() { + need localmount + use logger +} + +reload() { + ebegin "Reloading acpid configuration" + start-stop-daemon --exec $command --signal HUP + eend $? +} diff --git a/user/acpid/default b/user/acpid/default new file mode 100644 index 000000000..96f031dbf --- /dev/null +++ b/user/acpid/default @@ -0,0 +1,2 @@ +event=.* +action=/etc/acpi/handler.sh %e diff --git a/user/acpid/handler.sh b/user/acpid/handler.sh new file mode 100644 index 000000000..8e291bc2b --- /dev/null +++ b/user/acpid/handler.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +logger "Received ACPI event: ${@}" + diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index 6b707e295..02b6f62c8 100644 --- a/user/ark/APKBUILD +++ b/user/ark/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ark pkgver=18.08.3 -pkgrel=0 +pkgrel=1 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" arch="all" options="!check" # requires other formats not packaged and manual user input license="GPL-2.0-only" -depends="lzop unrar unzip zip" +depends="lzop unzip zip" makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev kcrash-dev kdbusaddons-dev kdoctools-dev ki18n-dev kiconthemes-dev kitemmodels-dev kio-dev kservice-dev kparts-dev kpty-dev libarchive-dev diff --git a/user/aspell-dict-af/APKBUILD b/user/aspell-dict-af/APKBUILD new file mode 100644 index 000000000..b06ffd33f --- /dev/null +++ b/user/aspell-dict-af/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-af +pkgver=0.50.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Afrikaans dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +license="LGPL-2.1-only" +options="!check" # no tests +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/af/aspell-af-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-af-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="8ca7b892745bebe5dfda1319141c5efc53fbad1444066d585cc2d6479c51c85c31307a6977a0647b0c4add4a5b7baa9adb370996e25db4e1c98f1c10991fd649 aspell-af-0.50-0.tar.bz2" diff --git a/user/aspell-dict-am/APKBUILD b/user/aspell-dict-am/APKBUILD new file mode 100644 index 000000000..a4be5ad68 --- /dev/null +++ b/user/aspell-dict-am/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-am +pkgver=0.03.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Amharic dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="Public-Domain" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/am/aspell6-am-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-am-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="a9b323266a8d3f72a5684a2d24465d99539069bf330d4c417f6b56f7fb5b5c3479cd18265c4bafa901c86c411eaec3de7798c08c54c565418b5ecccd2a91a6f0 aspell6-am-0.03-1.tar.bz2" diff --git a/user/aspell-dict-ar/APKBUILD b/user/aspell-dict-ar/APKBUILD new file mode 100644 index 000000000..34ffabad4 --- /dev/null +++ b/user/aspell-dict-ar/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-ar +pkgver=1.2.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Arabic dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/ar/aspell6-ar-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-ar-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7f645dab6e27da404d599f40da2baf469293105cbaf440bf9abf9268423b36e0faa11d1afcf5c32a8e1d93eadad356af6486a960c7bca97777948c844108f4bc aspell6-ar-1.2-0.tar.bz2" diff --git a/user/aspell-dict-ast/APKBUILD b/user/aspell-dict-ast/APKBUILD new file mode 100644 index 000000000..c8fdd5708 --- /dev/null +++ b/user/aspell-dict-ast/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-ast +pkgver=0.01 +pkgrel=0 +pkgdesc="Asturian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +license="LGPL-2.1-only" +options="!check" # no tests +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/ast/aspell6-ast-$pkgver.tar.bz2" +builddir="$srcdir/aspell6-ast-$pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="700a45c230218e57549cf4b2caaa9e86c4b8da68a3ed937fa391814816c1e0d16265d77658e209af66550e647f418663eb76952efed973e6b1f88570b90d77bc aspell6-ast-0.01.tar.bz2" diff --git a/user/aspell-dict-az/APKBUILD b/user/aspell-dict-az/APKBUILD new file mode 100644 index 000000000..62cc4508d --- /dev/null +++ b/user/aspell-dict-az/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-az +pkgver=0.02.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Azerbaijani dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +license="GPL-2.0-only" +options="!check" # no tests +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/az/aspell6-az-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-az-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="69a0858addf72259898fc4fd3a22a572b97227915a08a632ea1d8645c2636c702ce09f66961afbfbb3473b9404a4fe73c9b02c2e694a641385e4bbd2c61c9b26 aspell6-az-0.02-0.tar.bz2" diff --git a/user/aspell-dict-be/APKBUILD b/user/aspell-dict-be/APKBUILD new file mode 100644 index 000000000..a25306568 --- /dev/null +++ b/user/aspell-dict-be/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-be +pkgver=0.01 +pkgrel=0 +pkgdesc="Belarusian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +license="LGPL-2.1-only" +options="!check" # no tests +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/be/aspell5-be-$pkgver.tar.bz2" +builddir="$srcdir/aspell5-be-$pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="320334c9944c44c9a61d24798ecd7603c4dc9fee99035d48d19759ecf2c1ac8ae21a0afde050d6527566e2404c1df4f75e313cec598b7faa93506142ea3c1022 aspell5-be-0.01.tar.bz2" diff --git a/user/aspell-dict-bg/APKBUILD b/user/aspell-dict-bg/APKBUILD new file mode 100644 index 000000000..3af15fa3a --- /dev/null +++ b/user/aspell-dict-bg/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-bg +pkgver=4.1.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Bulgarian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +license="GPL-2.0-only" +options="!check" # no tests +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/bg/aspell6-bg-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-bg-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="73ba292e9e78be21a9bd32d802a3f87b5b8200b64fcdc6e8bb47c834eb9dfd855a3397e8deb83e7879dc0dab7b118ae117832032fb9a450976c929bf12926881 aspell6-bg-4.1-0.tar.bz2" diff --git a/user/aspell-dict-bn/APKBUILD b/user/aspell-dict-bn/APKBUILD new file mode 100644 index 000000000..a2a9c9eac --- /dev/null +++ b/user/aspell-dict-bn/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-bn +pkgver=0.01.1.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Bengali dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +license="GPL-2.0-only" +options="!check" # no tests +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/bn/aspell6-bn-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-bn-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d8fe29b100284aa6b2e909811b9eb09bd5decea4c056f2ed6a24de9d5adb48714827a2e892fdf38274d1e1a44b2a93415fccf90b4c4d85512f3052c7f7939d22 aspell6-bn-0.01.1-1.tar.bz2" diff --git a/user/aspell-dict-br/APKBUILD b/user/aspell-dict-br/APKBUILD new file mode 100644 index 000000000..60204987a --- /dev/null +++ b/user/aspell-dict-br/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-br +pkgver=0.50.2 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Breton dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +license="GPL-2.0-only" +options="!check" # no tests +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/br/aspell-br-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-br-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="02f2ce7a350adb87a0f32dd4748f067230a0f3faf195f8c7237bc0520cc0a7aa6475f96de933ae650611f8b9a41deaaeb57c2228ed95950a41e5defccba9e67c aspell-br-0.50-2.tar.bz2" diff --git a/user/aspell-dict-ca/APKBUILD b/user/aspell-dict-ca/APKBUILD new file mode 100644 index 000000000..9facc23cf --- /dev/null +++ b/user/aspell-dict-ca/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-ca +pkgver=2.1.5.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Catalan dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +license="GPL-2.0-only" +options="!check" # no tests +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/ca/aspell6-ca-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-ca-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="9f3baef829948a4979c03dcc380caf3fa249912fa94d375a41df4d34d62ffdbf781a777eb437d101bdf99873e9d515a4d27ebef08f71ff435f07e845194c9f0a aspell6-ca-2.1.5-1.tar.bz2" diff --git a/user/aspell-dict-cs/APKBUILD b/user/aspell-dict-cs/APKBUILD new file mode 100644 index 000000000..768829bb9 --- /dev/null +++ b/user/aspell-dict-cs/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-cs +pkgver=20040614.1 +_pkgver=${pkgver%.*}-${pkgver#*.} +pkgrel=0 +pkgdesc="Czech dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +license="GPL-2.0-only" +options="!check" # no tests +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/cs/aspell6-cs-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-cs-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="b4d3e46907a00c7de4d19766dc29f089ec119b736de1340ff5f56be9d0a1c8c90fa2b156173f312c13c589750ec7551e79bd7aa092d31fa6d5f05ed0b4b12c9a aspell6-cs-20040614-1.tar.bz2" diff --git a/user/aspell-dict-csb/APKBUILD b/user/aspell-dict-csb/APKBUILD new file mode 100644 index 000000000..c2ceff90b --- /dev/null +++ b/user/aspell-dict-csb/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-csb +pkgver=0.02.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Kashubian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +license="GPL-2.0-only" +options="!check" # no tests +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/csb/aspell6-csb-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-csb-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="6ed05de10f1647ee98db588df0275721d25e1eea375f73ebf03cb02841f8eb9c0f7aa56f944e0f9b72884ccf99036445b5cddebfea00d77a8c714ed8a50d8eb1 aspell6-csb-0.02-0.tar.bz2" diff --git a/user/aspell-dict-cy/APKBUILD b/user/aspell-dict-cy/APKBUILD new file mode 100644 index 000000000..4cdd1a287 --- /dev/null +++ b/user/aspell-dict-cy/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-cy +pkgver=0.50.3 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Welsh dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/cy/aspell-cy-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-cy-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="feb68ea9749788a45725a5bc706ea2c24e73bada4fbce907bbe3b884d16875458516dd53fe7f5d62179cafe40117416f7068c1e6e0292353447c2ed7a494ad6b aspell-cy-0.50-3.tar.bz2" diff --git a/user/aspell-dict-da/APKBUILD b/user/aspell-dict-da/APKBUILD new file mode 100644 index 000000000..230fabcdd --- /dev/null +++ b/user/aspell-dict-da/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-da +pkgver=1.4.42.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Danish dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/da/aspell5-da-$_pkgver.tar.bz2" +builddir="$srcdir/aspell5-da-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="d431464b254670b56179ed19a03efe91e65e4dad3e3132f264830cde35f3da200179b39bd1ac21565287bbc1143fd74079c9082f2639fbc4573f2dfffbbecbc6 aspell5-da-1.4.42-1.tar.bz2" diff --git a/user/aspell-dict-de-alt/APKBUILD b/user/aspell-dict-de-alt/APKBUILD new file mode 100644 index 000000000..0d8effa19 --- /dev/null +++ b/user/aspell-dict-de-alt/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-de-alt +pkgver=2.1.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="German (Old Spelling) dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/de-alt/aspell6-de-alt-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-de-alt-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="823324bc299e9adbbe5308681a5f74ee2a76a32816e8abc9d19c3da0c4eae756eaf1a3c76e2d75449b51010854ab869379073b1fe377e505662187d6c38230b4 aspell6-de-alt-2.1-1.tar.bz2" diff --git a/user/aspell-dict-de/APKBUILD b/user/aspell-dict-de/APKBUILD new file mode 100644 index 000000000..90b8097a5 --- /dev/null +++ b/user/aspell-dict-de/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-de +pkgver=20030222.1 +_pkgver=${pkgver%.*}-${pkgver#*.} +pkgrel=0 +pkgdesc="German dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/de/aspell6-de-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-de-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="2005b56938565b11b761ace31006c1accfd32d401685cc5676cc4d85406bedda81b1df062949359f1bd6972073d3713204d87c7f81d9535fa956cdf130dd8db6 aspell6-de-20030222-1.tar.bz2" diff --git a/user/aspell-dict-el/APKBUILD b/user/aspell-dict-el/APKBUILD new file mode 100644 index 000000000..37149af35 --- /dev/null +++ b/user/aspell-dict-el/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-el +pkgver=0.08.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Greek dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/el/aspell6-el-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-el-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="ea4ca962afc552e5525bbb84c7a8f980a2cc07265de748c68fb322c1dbfc52b0ba07b4a561966bb89e850ec60b11a3f21befa6ca8b66501e9ad8b5314ddd1f47 aspell6-el-0.08-0.tar.bz2" diff --git a/user/aspell-dict-en/APKBUILD b/user/aspell-dict-en/APKBUILD new file mode 100644 index 000000000..c3a848440 --- /dev/null +++ b/user/aspell-dict-en/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-en +pkgver=2018.04.16.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="English dictionaries for aspell" +url="http://aspell.net/" +arch="noarch" +options="!check" # no tests +license="BSD-3-Clause AND Public-Domain" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-en-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="70447f5f11a6a2d96e58376ac06e78add59e4eb237ca40ed0752f481dabe1a6e9e227fd20ba95a5612de1bb4357cd65760a31c94efe66f8499b9ed031e9846c2 aspell6-en-2018.04.16-0.tar.bz2" diff --git a/user/aspell-dict-eo/APKBUILD b/user/aspell-dict-eo/APKBUILD new file mode 100644 index 000000000..a03d2b2c8 --- /dev/null +++ b/user/aspell-dict-eo/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-eo +pkgver=2.1.20000225.a2 +_pkgver=${pkgver%.*}${pkgver#*.*.*.} +_pkgver=${_pkgver%[0-9]}-${pkgver#*.*.*.[a-z]} +pkgrel=0 +pkgdesc="Esperanto dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/eo/aspell6-eo-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-eo-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="172ff88745e36abccf47ed8526868e3c2fd1f41c6da15893e723ef70bb29fc0e4b4e614f1eae8b3db8206f971f9a9cd9ec627fce2dae611804a276118367dfda aspell6-eo-2.1.20000225a-2.tar.bz2" diff --git a/user/aspell-dict-es/APKBUILD b/user/aspell-dict-es/APKBUILD new file mode 100644 index 000000000..9216f3bec --- /dev/null +++ b/user/aspell-dict-es/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-es +pkgver=1.11.2 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Spanish dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/es/aspell6-es-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-es-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="5d0159f24d6bff43db682a4beb25e82dd362c205acf7c9e0d728808c0e54a8a566befe26316f384099c72e6c429713f8ad7d2dc66a8f04a15e1d5a9cfe2290d8 aspell6-es-1.11-2.tar.bz2" diff --git a/user/aspell-dict-et/APKBUILD b/user/aspell-dict-et/APKBUILD new file mode 100644 index 000000000..d352e745e --- /dev/null +++ b/user/aspell-dict-et/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-et +pkgver=0.1.21.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Estonian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/et/aspell6-et-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-et-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="b3ed1249dbbb3caf12047407d85a3397f5e9561a59d71e33d6f29f18b9a83baa3f3c8d5a02a22cf0861212ff7b3ea1d33e38a943352e70be3703e0c42ff739ae aspell6-et-0.1.21-1.tar.bz2" diff --git a/user/aspell-dict-fa/APKBUILD b/user/aspell-dict-fa/APKBUILD new file mode 100644 index 000000000..d08a32657 --- /dev/null +++ b/user/aspell-dict-fa/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-fa +pkgver=0.11.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Persian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/fa/aspell6-fa-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-fa-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="1ed97d3bf8397fe9b3c9215ca3ca6630a06ae5fa1c47b2bbdf9821fbe069b9c097d1e145a6303202cec85047f9cd50bef2bde3adbca0caeb05625932c5f3bfe4 aspell6-fa-0.11-0.tar.bz2" diff --git a/user/aspell-dict-fi/APKBUILD b/user/aspell-dict-fi/APKBUILD new file mode 100644 index 000000000..6a4666ded --- /dev/null +++ b/user/aspell-dict-fi/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-fi +pkgver=0.7.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Finnish dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/fi/aspell6-fi-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-fi-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="d1f27bc8e36033cba6ddaa978f2facfe8d134ab70124ec80d5397dba2b533b512755312feaf2afa838f68e4449479953a8b951264fbbfc28cdfd9457f67f67f7 aspell6-fi-0.7-0.tar.bz2" diff --git a/user/aspell-dict-fo/APKBUILD b/user/aspell-dict-fo/APKBUILD new file mode 100644 index 000000000..eef2193a8 --- /dev/null +++ b/user/aspell-dict-fo/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-fo +pkgver=0.2.16.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Faroese dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/fo/aspell5-fo-$_pkgver.tar.bz2" +builddir="$srcdir/aspell5-fo-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="7e99f105cff0e682e2761ba1f91646a3ce657858be819cc598775303d6c08f2c5bd524f72bc0c0b52383aeaf591af56e910e19796732be627d8ab11ad6149126 aspell5-fo-0.2.16-1.tar.bz2" diff --git a/user/aspell-dict-fr/APKBUILD b/user/aspell-dict-fr/APKBUILD new file mode 100644 index 000000000..0685c068f --- /dev/null +++ b/user/aspell-dict-fr/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-fr +pkgver=0.50.3 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="French dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/fr/aspell-fr-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-fr-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="bb5d1faada9283521096a19a8f5abada2a19cc02717f6dde57846ef46a4df253113b10a2bb72d2b0e32e4a3ab24b541a5acd9f4595b908d2f6cd2fc448d8bc3b aspell-fr-0.50-3.tar.bz2" diff --git a/user/aspell-dict-fy/APKBUILD b/user/aspell-dict-fy/APKBUILD new file mode 100644 index 000000000..6eee693fe --- /dev/null +++ b/user/aspell-dict-fy/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-fy +pkgver=0.12.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Frisian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/fy/aspell6-fy-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-fy-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="f63b5436c78a5c0ebec3be1d3c24dced09a264c68e8ad39716e0e9e6bd984aca627bdc875f88b521f87b7f4d147edfce3fc0f4dc4b22fc8ef8d1aa5090fb9bda aspell6-fy-0.12-0.tar.bz2" diff --git a/user/aspell-dict-ga/APKBUILD b/user/aspell-dict-ga/APKBUILD new file mode 100644 index 000000000..d845f8f46 --- /dev/null +++ b/user/aspell-dict-ga/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-ga +pkgver=4.5.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Irish dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/ga/aspell5-ga-$_pkgver.tar.bz2" +builddir="$srcdir/aspell5-ga-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="e68003e08d75e172e6223c7011795f40a386776559c2f05e049de196f0d5dcbe570a5ec704e6543b519eba5c847054d30b19e462c7ee228eddac4d72ccd82db0 aspell5-ga-4.5-0.tar.bz2" diff --git a/user/aspell-dict-gd/APKBUILD b/user/aspell-dict-gd/APKBUILD new file mode 100644 index 000000000..fa14b77b8 --- /dev/null +++ b/user/aspell-dict-gd/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-gd +pkgver=0.1.1.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Scottish Gaelic dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/gd/aspell5-gd-$_pkgver.tar.bz2" +builddir="$srcdir/aspell5-gd-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="d388bf3476f440c7773a69a0758b8e9cdddf01b64579f6d92fde38e7363c5c3b321a76c7a4e4587b0810159a35eec8d33d1cd2de49068d73f9e0e4dfa60fbc5c aspell5-gd-0.1.1-1.tar.bz2" diff --git a/user/aspell-dict-gl/APKBUILD b/user/aspell-dict-gl/APKBUILD new file mode 100644 index 000000000..e586b4682 --- /dev/null +++ b/user/aspell-dict-gl/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-gl +pkgver=0.5.a2 +_pkgver=${pkgver%.*}${pkgver#*.*.} +_pkgver=${_pkgver%[0-9]}-${pkgver#*.*.[a-z]} +pkgrel=0 +pkgdesc="Galician dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/gl/aspell6-gl-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-gl-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="9c8aae22d23e1cce9c5c94844c35ec3eaa5b76e5049712b714993e7c628a0b8ee250de2ad1b646a6ecffe32ebc0e4f0009a4db041b6f8bde5d021cf71c5cd714 aspell6-gl-0.5a-2.tar.bz2" diff --git a/user/aspell-dict-grc/APKBUILD b/user/aspell-dict-grc/APKBUILD new file mode 100644 index 000000000..39bd4b1b8 --- /dev/null +++ b/user/aspell-dict-grc/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-grc +pkgver=0.02.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Ancient Greek dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/grc/aspell6-grc-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-grc-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="17999e20621efc67ab42d83b0e149d19b18bcfd20966da35d217a3e5682c0728287bec4bce28af34f4e343943a1dac49f85077693ca30bd1ff7cbaaeda453ddd aspell6-grc-0.02-0.tar.bz2" diff --git a/user/aspell-dict-gu/APKBUILD b/user/aspell-dict-gu/APKBUILD new file mode 100644 index 000000000..04fac1de1 --- /dev/null +++ b/user/aspell-dict-gu/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-gu +pkgver=0.03.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Gujarati dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/gu/aspell6-gu-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-gu-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="0cc252bd1112b8f06cb4ea9000b00d036dc405d8fbb9c380beff949ea138903b5807afa8f1419f4d8f57329a7bb1a4b7f4bd733170e5f09ac7786ac39beb87c6 aspell6-gu-0.03-0.tar.bz2" diff --git a/user/aspell-dict-gv/APKBUILD b/user/aspell-dict-gv/APKBUILD new file mode 100644 index 000000000..a2aa1779e --- /dev/null +++ b/user/aspell-dict-gv/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-gv +pkgver=0.50.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Manx Gaelic dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/gv/aspell-gv-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-gv-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="6ec0893bb853c9600b49958802572edfed2127b749b2e4ee5ce051863526fefbae367cf2686ccae2f3c27fa168a8c3a8611eae3561853553594fb097fd78e37d aspell-gv-0.50-0.tar.bz2" diff --git a/user/aspell-dict-he/APKBUILD b/user/aspell-dict-he/APKBUILD new file mode 100644 index 000000000..99166d52a --- /dev/null +++ b/user/aspell-dict-he/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-he +pkgver=1.0.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Hebrew dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/he/aspell6-he-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-he-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="4db335c1566432ac8e18bace1f1ab892e47765b9dfb342f981b52637ee6768f592b7d9793c229e7f67f7f4770e6ef4abb9b2dd66da0feef9cc42bfd316adad88 aspell6-he-1.0-0.tar.bz2" diff --git a/user/aspell-dict-hi/APKBUILD b/user/aspell-dict-hi/APKBUILD new file mode 100644 index 000000000..26223d8df --- /dev/null +++ b/user/aspell-dict-hi/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-hi +pkgver=0.02.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Hindi dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/hi/aspell6-hi-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-hi-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="298743e1e5988e26081d89ee6cdea3b2f3185ad81b3449b5fa3f644a2beaf488320f9468fbeeb7e6c7bcb3ae4b7116bd02f64c4e6f4c60f80c1a7c3b84946a93 aspell6-hi-0.02-0.tar.bz2" diff --git a/user/aspell-dict-hil/APKBUILD b/user/aspell-dict-hil/APKBUILD new file mode 100644 index 000000000..bc4d3af07 --- /dev/null +++ b/user/aspell-dict-hil/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-hil +pkgver=0.11.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Hiligaynon dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/hil/aspell5-hil-$_pkgver.tar.bz2" +builddir="$srcdir/aspell5-hil-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="274c353f48da1a769a454cff0fa54d0e5cfd84a2da7ed979693335aa8e45c5c562b0f92cc5bdeb77a5ff54d0f79f747e792ff4e3f8a0427bbd131879659af432 aspell5-hil-0.11-0.tar.bz2" diff --git a/user/aspell-dict-hr/APKBUILD b/user/aspell-dict-hr/APKBUILD new file mode 100644 index 000000000..917f599cb --- /dev/null +++ b/user/aspell-dict-hr/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-hr +pkgver=0.51.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Croatian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/hr/aspell-hr-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-hr-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="d6d891f3e55252fdbc5e0534c623cc42311c25cd1219351ce8a8160c3c3c49a6f219706e02f2c1c27174ef77c64e17f8cc25844befb17a43802b0a09ab42b1ad aspell-hr-0.51-0.tar.bz2" diff --git a/user/aspell-dict-hsb/APKBUILD b/user/aspell-dict-hsb/APKBUILD new file mode 100644 index 000000000..95fc32a90 --- /dev/null +++ b/user/aspell-dict-hsb/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-hsb +pkgver=0.02.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Upper Sorbian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/hsb/aspell6-hsb-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-hsb-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="b8e49bf6d85e149365378a33b56ab61767c34ddfd4545eedeedad012b2b396dff54bb3dcba56fb4d3c0a92a0c3e13fddf0548591568295709d91f18c45ca1274 aspell6-hsb-0.02-0.tar.bz2" diff --git a/user/aspell-dict-hu/APKBUILD b/user/aspell-dict-hu/APKBUILD new file mode 100644 index 000000000..690fa6841 --- /dev/null +++ b/user/aspell-dict-hu/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-hu +pkgver=0.99.4.2.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.*.} +pkgrel=0 +pkgdesc="Hungarian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/hu/aspell6-hu-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-hu-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="95922401f2a8aeac61b117c464b4b83b8101fbe1e0ee758b3284a67c188348db55d900c2898eaa8639ee2db99c3b27e85f9677fc6a4d54caae57dd72101cb320 aspell6-hu-0.99.4.2-0.tar.bz2" diff --git a/user/aspell-dict-hus/APKBUILD b/user/aspell-dict-hus/APKBUILD new file mode 100644 index 000000000..892165847 --- /dev/null +++ b/user/aspell-dict-hus/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-hus +pkgver=0.03.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Huastec Tenek dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/hus/aspell6-hus-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-hus-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="2d1f8458f04bda64068ddd3c5017ed129c2b7549e2474acdcc39f76283dae1a0fe557ab67526fa31ce300f615bd5d2ded4aa0414f3a5b6ee8e59389c8ac20c70 aspell6-hus-0.03-1.tar.bz2" diff --git a/user/aspell-dict-hy/APKBUILD b/user/aspell-dict-hy/APKBUILD new file mode 100644 index 000000000..6cd26a147 --- /dev/null +++ b/user/aspell-dict-hy/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-hy +pkgver=0.10.0.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Armenian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/hy/aspell6-hy-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-hy-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="b2157c1d04e4d4726851fe4cda91fcc3cf0dba8d5cfaaea74deed77d9c5f94473e13784526f884ba483789a098dd3efee936c456606913a731a165ec3eb145a3 aspell6-hy-0.10.0-0.tar.bz2" diff --git a/user/aspell-dict-ia/APKBUILD b/user/aspell-dict-ia/APKBUILD new file mode 100644 index 000000000..722c08f15 --- /dev/null +++ b/user/aspell-dict-ia/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-ia +pkgver=0.50.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Interlingua dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/ia/aspell-ia-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-ia-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="5cdd7b91393043d7b537166c1df100aa76e911cf1c389b34b916839e907abc3cdbdc368f2876a5ecfbd625414b67858950e9d79af184560b9ddd667030dc608d aspell-ia-0.50-1.tar.bz2" diff --git a/user/aspell-dict-id/APKBUILD b/user/aspell-dict-id/APKBUILD new file mode 100644 index 000000000..cda3e6217 --- /dev/null +++ b/user/aspell-dict-id/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-id +pkgver=1.2.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Indonesian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/id/aspell5-id-$_pkgver.tar.bz2" +builddir="$srcdir/aspell5-id-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="bc33c5d6c68027304b0dc299454f8dd221e0138b079bcc423e287fda5e9204b0d6dc14a5a0617b4d018259e011c979453ee13b9050be5516d2379e86ac9cb86a aspell5-id-1.2-0.tar.bz2" diff --git a/user/aspell-dict-is/APKBUILD b/user/aspell-dict-is/APKBUILD new file mode 100644 index 000000000..1bdaab2f5 --- /dev/null +++ b/user/aspell-dict-is/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-is +pkgver=0.51.1.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Icelandic dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/is/aspell-is-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-is-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="b96aeb407c1de700a20ca18bbd9e1bc1a4c086379ef7fbd0467178d11b9ed70e547a81a4659619e7385f89926638cb2a5e807cc701b444a7bf0d246905795bf2 aspell-is-0.51.1-0.tar.bz2" diff --git a/user/aspell-dict-it/APKBUILD b/user/aspell-dict-it/APKBUILD new file mode 100644 index 000000000..8657914d9 --- /dev/null +++ b/user/aspell-dict-it/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-it +pkgver=2.2.20050523.0 +_pkgver=${pkgver%.*.*}_${pkgver#*.*.} +_pkgver=${_pkgver%.*}-${_pkgver#*.*_*.} +pkgrel=0 +pkgdesc="Italian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/it/aspell6-it-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-it-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="2a2ccdbb8bb52e8e08525a40f985c1a2987c00d5e9fd39f57b8dc8689f3503f63751efe9ae4bec45fc5efea64666cd64abbda3e437ad0819f15b5a96987cda5a aspell6-it-2.2_20050523-0.tar.bz2" diff --git a/user/aspell-dict-kn/APKBUILD b/user/aspell-dict-kn/APKBUILD new file mode 100644 index 000000000..560e222c3 --- /dev/null +++ b/user/aspell-dict-kn/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-kn +pkgver=0.01.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Kannada dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/kn/aspell6-kn-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-kn-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="892f93c0ed33f4aedb240d8c673d7888318760ccb2ca0cfb8377a2770f757c5410583a7c18314f3fb7cd58704a531e8931bc8be44d9de80b1421d2238e4229c3 aspell6-kn-0.01-1.tar.bz2" diff --git a/user/aspell-dict-ku/APKBUILD b/user/aspell-dict-ku/APKBUILD new file mode 100644 index 000000000..5770b2ebb --- /dev/null +++ b/user/aspell-dict-ku/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-ku +pkgver=0.20.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Kurdi dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/ku/aspell5-ku-$_pkgver.tar.bz2" +builddir="$srcdir/aspell5-ku-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="b1aadc13e4cc494bb7b8bdb1ef96215abb72dfe2ec398d4c383984a2540323117d18a940c675ed0266cbbdf14958525975083a9fe35e93b7885c8f0216362d84 aspell5-ku-0.20-1.tar.bz2" diff --git a/user/aspell-dict-ky/APKBUILD b/user/aspell-dict-ky/APKBUILD new file mode 100644 index 000000000..86cb8c757 --- /dev/null +++ b/user/aspell-dict-ky/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-ky +pkgver=0.01.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Kirghiz dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/ky/aspell6-ky-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-ky-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="94389905505ffc0c469dd5f4ea31e2e76fed695e8cb7b903e248a57a8677e45311e525a07c43da0be87bfdc7825b1af4ae8dd1993d35948dd1ace4b1af9fa307 aspell6-ky-0.01-0.tar.bz2" diff --git a/user/aspell-dict-la/APKBUILD b/user/aspell-dict-la/APKBUILD new file mode 100644 index 000000000..b2d3473b0 --- /dev/null +++ b/user/aspell-dict-la/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-la +pkgver=20020503.0 +_pkgver=${pkgver%.*}-${pkgver#*.} +pkgrel=0 +pkgdesc="Latin dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2" +builddir="$srcdir/aspell6-la-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="b167541050546edfdb6148f06952eb07f67c8a5115d40ea777d566b722d4476147e986de06ebc8ffdfdadf1f201e3c1b5f000527ca489da96e2b3f764e487e5f aspell6-la-20020503-0.tar.bz2" diff --git a/user/aspell-dict-lt/APKBUILD b/user/aspell-dict-lt/APKBUILD new file mode 100644 index 000000000..256ba69e1 --- /dev/null +++ b/user/aspell-dict-lt/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-lt +pkgver=1.2.1.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Lithuanian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/lt/aspell6-lt-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-lt-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="d0dcea087a926f7defbab0180d9c04c93a53da8843fe374f7f59284362453ee6b198568066053ad591df4c194d7c3b0ac59331611698b78e2ded558aa5e7775b aspell6-lt-1.2.1-0.tar.bz2" diff --git a/user/aspell-dict-lv/APKBUILD b/user/aspell-dict-lv/APKBUILD new file mode 100644 index 000000000..bd102c589 --- /dev/null +++ b/user/aspell-dict-lv/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-lv +pkgver=0.5.5.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Latvian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/lv/aspell6-lv-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-lv-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="94a9c6da3fd29f17fbe5d02cd4764bf24379abef526725bb34c0726f7ff385fcb876df24b741bc66518295c3bb75c800aa6010130454c6dc1d6372d12d2eb98e aspell6-lv-0.5.5-1.tar.bz2" diff --git a/user/aspell-dict-mg/APKBUILD b/user/aspell-dict-mg/APKBUILD new file mode 100644 index 000000000..0a1963250 --- /dev/null +++ b/user/aspell-dict-mg/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-mg +pkgver=0.03.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Malagasy dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/mg/aspell5-mg-$_pkgver.tar.bz2" +builddir="$srcdir/aspell5-mg-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="a9c0861b925b40bf9bba5e1d02f3e225a516f929a2e72c6760ec5bedbc513e18e8bda0205e83e17c09b6a37256877e54576c8085e6000f67783147d4cd9ec6df aspell5-mg-0.03-0.tar.bz2" diff --git a/user/aspell-dict-mi/APKBUILD b/user/aspell-dict-mi/APKBUILD new file mode 100644 index 000000000..dbcd853e0 --- /dev/null +++ b/user/aspell-dict-mi/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-mi +pkgver=0.50.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Maori dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/mi/aspell-mi-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-mi-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="cba0a646612f6cd24d1e1d91326dcf1c7a6ec01c04ad0661a95fcd745b4d1a3bb50aef84c382d3a6c9108d4e9589ee7661f4988930c7198950396eeb029062a0 aspell-mi-0.50-0.tar.bz2" diff --git a/user/aspell-dict-mk/APKBUILD b/user/aspell-dict-mk/APKBUILD new file mode 100644 index 000000000..f620067e3 --- /dev/null +++ b/user/aspell-dict-mk/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-mk +pkgver=0.50.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Macedonian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/mk/aspell-mk-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-mk-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="6bcd57338ce76b7daf22a4be28a2f583c6c1d73ff2d8d5db2e3d5122d89c41617d44a40019dfe647c8e1e07509bee20be6ba136e872710bd77871adbac29e947 aspell-mk-0.50-0.tar.bz2" diff --git a/user/aspell-dict-ml/APKBUILD b/user/aspell-dict-ml/APKBUILD new file mode 100644 index 000000000..074c106af --- /dev/null +++ b/user/aspell-dict-ml/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-ml +pkgver=0.03.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Malayalam dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/ml/aspell6-ml-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-ml-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="78c3bc296a70a3b205427bcffe29b69ae6f673ffd22fd8a1ef5550ae271ed1f7704fff15c4948dcee2d7722c5d4b279766ef74d0661969b13bbca4d3a53971da aspell6-ml-0.03-1.tar.bz2" diff --git a/user/aspell-dict-mn/APKBUILD b/user/aspell-dict-mn/APKBUILD new file mode 100644 index 000000000..cbaad148f --- /dev/null +++ b/user/aspell-dict-mn/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-mn +pkgver=0.06.2 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Mongolian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/mn/aspell6-mn-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-mn-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="c0cf603169eaf8b4b858fd7573374d1ec47b9794e2514cb241b8fc3b053bce715dad6a15bd73eeef443f0d6a4308ffb384acae825d33315ee983a69ceacf9201 aspell6-mn-0.06-2.tar.bz2" diff --git a/user/aspell-dict-mr/APKBUILD b/user/aspell-dict-mr/APKBUILD new file mode 100644 index 000000000..029d4001a --- /dev/null +++ b/user/aspell-dict-mr/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-mr +pkgver=0.10.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Marathi dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-mr-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="4137a9d6f3dc67db81479a2df628c33c3989214a629f48fc9bb6421e4ce723bdf559eb2f0981c2172315ec140ccd160a10b9556a6618f2fd3383dec184352732 aspell6-mr-0.10-0.tar.bz2" diff --git a/user/aspell-dict-ms/APKBUILD b/user/aspell-dict-ms/APKBUILD new file mode 100644 index 000000000..a8187eb00 --- /dev/null +++ b/user/aspell-dict-ms/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-ms +pkgver=0.50.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Malay dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/ms/aspell-ms-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-ms-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="270a6ad18d9b317588e781eab84b59c83450383d703fab815856b3afa58a19ffa0eec3c7cbc418993302703d586cb92678878aea51fff753733f7583d8c2b0e9 aspell-ms-0.50-0.tar.bz2" diff --git a/user/aspell-dict-mt/APKBUILD b/user/aspell-dict-mt/APKBUILD new file mode 100644 index 000000000..e7c3cef1c --- /dev/null +++ b/user/aspell-dict-mt/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-mt +pkgver=0.50.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Maltese dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/mt/aspell-mt-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-mt-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="aadcc59b0dbbfdf4d715bfe6735bfa2a91e6fae382634a25c0cdf8367710050b2daeac1db18df3a71184720ff9339a852983c8a266f8c97e0ffba1e8be50eaa1 aspell-mt-0.50-0.tar.bz2" diff --git a/user/aspell-dict-nb/APKBUILD b/user/aspell-dict-nb/APKBUILD new file mode 100644 index 000000000..7dd694e35 --- /dev/null +++ b/user/aspell-dict-nb/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-nb +pkgver=0.50.1.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Norwegian (Bokmal) dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/nb/aspell-nb-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-nb-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="e30dcf7e757ab1ceb5de349927f9cfa4d9de4015bd9cc9449739fd2f17f6f033f698e71da0270b4e1ebd76be2195c42422630266ad9cadd2173184706d651c13 aspell-nb-0.50.1-0.tar.bz2" diff --git a/user/aspell-dict-nds/APKBUILD b/user/aspell-dict-nds/APKBUILD new file mode 100644 index 000000000..688ce1c4e --- /dev/null +++ b/user/aspell-dict-nds/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-nds +pkgver=0.01.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Low Saxon dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/nds/aspell6-nds-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-nds-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="88ef6f6773e8699a5200ff8ae3ef9935fee21958fa35868bc10d37c22b55ea721ad9c59ab4843fdc6fedbf5a9ed10c7ea144548713742b8094b99c3c46a552a5 aspell6-nds-0.01-0.tar.bz2" diff --git a/user/aspell-dict-nl/APKBUILD b/user/aspell-dict-nl/APKBUILD new file mode 100644 index 000000000..3d288aa76 --- /dev/null +++ b/user/aspell-dict-nl/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-nl +pkgver=0.50.2 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Dutch dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/nl/aspell-nl-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-nl-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="bee6218b476f8655fa325940ba5ea1035ff483b5b47b9b547f60fd63786e8ff08daa03a30dd0ccd988c2f01827bb06075021e1a1fa79c640db82e72a3ccd3152 aspell-nl-0.50-2.tar.bz2" diff --git a/user/aspell-dict-nn/APKBUILD b/user/aspell-dict-nn/APKBUILD new file mode 100644 index 000000000..14be7c042 --- /dev/null +++ b/user/aspell-dict-nn/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-nn +pkgver=0.50.1.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Norwegian (Nynorsk) dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/nn/aspell-nn-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-nn-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="a4db6fe937a62758f51d713e246f70ea6e0b2726c8ddb23af084925394a2d8168442fccbd74378f4773db121f0d506d848c01573138e974efc79f295f3ebe551 aspell-nn-0.50.1-1.tar.bz2" diff --git a/user/aspell-dict-ny/APKBUILD b/user/aspell-dict-ny/APKBUILD new file mode 100644 index 000000000..258dcd0a7 --- /dev/null +++ b/user/aspell-dict-ny/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-ny +pkgver=0.01.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Chichewa dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/ny/aspell5-ny-$_pkgver.tar.bz2" +builddir="$srcdir/aspell5-ny-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="52f4526d605a2f0577217af1dc8e44da20484fe7f725ceee1f8fdf9ba0fc1457910d55567ea9287465cbf37955af9a11b2caba084cece59aec29755cb147cb05 aspell5-ny-0.01-0.tar.bz2" diff --git a/user/aspell-dict-or/APKBUILD b/user/aspell-dict-or/APKBUILD new file mode 100644 index 000000000..97703ffa8 --- /dev/null +++ b/user/aspell-dict-or/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-or +pkgver=0.03.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Oriya dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/or/aspell6-or-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-or-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="4f5c13e37054266a782cc9d9aa6a03de77ca383907ce05f23ab5812581b815276f4d79a2f8626226f30a59f8ab9ecf0f0186835f7f30881e4a358f99a75b708a aspell6-or-0.03-1.tar.bz2" diff --git a/user/aspell-dict-pa/APKBUILD b/user/aspell-dict-pa/APKBUILD new file mode 100644 index 000000000..83d4ae61f --- /dev/null +++ b/user/aspell-dict-pa/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-pa +pkgver=0.01.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Punjabi dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/pa/aspell6-pa-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-pa-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="6a0d2d7f1b1a935b6ac4b373963e525083d16c26953cce5d7a29d391aaed36f5430d27ea69efe59f081230822830dc4d4143bc155049bb5384580ffd66b5ee61 aspell6-pa-0.01-1.tar.bz2" diff --git a/user/aspell-dict-pl/APKBUILD b/user/aspell-dict-pl/APKBUILD new file mode 100644 index 000000000..f57d8bec4 --- /dev/null +++ b/user/aspell-dict-pl/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-pl +pkgver=6.0.20061121.0 +_pkgver=${pkgver%.*.*}_${pkgver#*.*.} +_pkgver=${_pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Polish dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/pl/aspell6-pl-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-pl-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="424842fd3b4b2a00445590527a64393044e067b32ab973d07d90d5f35cd146ea7ae88c4f4b473a68759aa0d27a5c0fcd75b9ef0bb8ceb76e731eafd3aefc81c6 aspell6-pl-6.0_20061121-0.tar.bz2" diff --git a/user/aspell-dict-pt_BR/APKBUILD b/user/aspell-dict-pt_BR/APKBUILD new file mode 100644 index 000000000..5ac5dc4e8 --- /dev/null +++ b/user/aspell-dict-pt_BR/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-pt_BR +pkgver=20090702.0 +_pkgver=${pkgver%.*}-${pkgver#*.} +pkgrel=0 +pkgdesc="Brazilian Portuguese dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-pt_BR-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="4c2606dad177881db7b7996c707a8d5a087fc9ec6ac46fac08b2bbb9c7acb51c7f0b3cb936f46257d03dd8e4e7a23b0244331db68a8208f5b7625d79ea6522d1 aspell6-pt_BR-20090702-0.tar.bz2" diff --git a/user/aspell-dict-pt_PT/APKBUILD b/user/aspell-dict-pt_PT/APKBUILD new file mode 100644 index 000000000..72c92641b --- /dev/null +++ b/user/aspell-dict-pt_PT/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-pt_PT +pkgver=20070510.0 +_pkgver=${pkgver%.*}-${pkgver#*.} +pkgrel=0 +pkgdesc="Portuguese dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/pt_PT/aspell6-pt_PT-20070510-0.tar.bz2" +builddir="$srcdir/aspell6-pt_PT-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="eab60bfed51e4b044519e8e91fa2a4abb45d02431372310a45334c80abafd2022982331f3c0d39294d5029674d75536ad153877c23db01971f4b3d54b7b90cd6 aspell6-pt_PT-20070510-0.tar.bz2" diff --git a/user/aspell-dict-qu/APKBUILD b/user/aspell-dict-qu/APKBUILD new file mode 100644 index 000000000..4641181d7 --- /dev/null +++ b/user/aspell-dict-qu/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-qu +pkgver=0.02.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Quechua dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/qu/aspell6-qu-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-qu-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="aac1caea88e9bd896ec5a9a2e7fa4a569626fa5e6f6bf1188614db10ca2b34196b589c496027b3bc562ef9435245e215b428a49e91a8d0eb215801ae8c9bb512 aspell6-qu-0.02-0.tar.bz2" diff --git a/user/aspell-dict-ro/APKBUILD b/user/aspell-dict-ro/APKBUILD new file mode 100644 index 000000000..a116d1d50 --- /dev/null +++ b/user/aspell-dict-ro/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-ro +pkgver=3.3.2 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Romanian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/ro/aspell5-ro-$_pkgver.tar.bz2" +builddir="$srcdir/aspell5-ro-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="0027334b6201e24b038d78d5b01b8495a661dc41df44b099b6c27156d11f33c26db1dd7bc9dbf45263695820b20da3891da58a30584f5e285579dec199b5acd3 aspell5-ro-3.3-2.tar.bz2" diff --git a/user/aspell-dict-ru/APKBUILD b/user/aspell-dict-ru/APKBUILD new file mode 100644 index 000000000..cd2b6d5f5 --- /dev/null +++ b/user/aspell-dict-ru/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-ru +pkgver=0.99f7.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Russian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2" +builddir="$srcdir/aspell6-ru-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="789fe15f5502b54008a41f2afb5635dcb7bb0a36e61b300ee48b2429c339793f5c4808d6063f13f1f8455ce251912433890e7d01ca59d8b0924ecd2987ceb430 aspell6-ru-0.99f7-1.tar.bz2" diff --git a/user/aspell-dict-rw/APKBUILD b/user/aspell-dict-rw/APKBUILD new file mode 100644 index 000000000..accb77d6c --- /dev/null +++ b/user/aspell-dict-rw/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-rw +pkgver=0.50.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Kinyarwanda dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/rw/aspell-rw-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-rw-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="a987fe90b091c5f8d4c28713ad50ca917d2a8fd120df55bd413e3112913cb7e9e8fdc740994aa881bbfdd9ac38fa5ebe728c9e62e25a0e7cc8eac13c2380c56a aspell-rw-0.50-0.tar.bz2" diff --git a/user/aspell-dict-sc/APKBUILD b/user/aspell-dict-sc/APKBUILD new file mode 100644 index 000000000..8e447c831 --- /dev/null +++ b/user/aspell-dict-sc/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-sc +pkgver=1.0 +pkgrel=0 +pkgdesc="Sardinian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/sc/aspell5-sc-$pkgver.tar.bz2" +builddir="$srcdir/aspell5-sc-$pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="3cad49510894645b9bc97bbae877641e64af0440a2abcb6f96197da95390d4dd59d1374008c0ade9dc17772a32c367b9b03e6be65e7f190268365f25069d2a23 aspell5-sc-1.0.tar.bz2" diff --git a/user/aspell-dict-sk/APKBUILD b/user/aspell-dict-sk/APKBUILD new file mode 100644 index 000000000..df481fad4 --- /dev/null +++ b/user/aspell-dict-sk/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-sk +pkgver=2.01.2 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Slovak dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/sk/aspell6-sk-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-sk-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="020de459d4ff9c6e0c88428d43c9feea346bf8fadb9fa1233e9e54471ee23f970524a9a47cc6a45d04d6857387c9d9d1ecc1af2062325298354ee6c2d9c314b4 aspell6-sk-2.01-2.tar.bz2" diff --git a/user/aspell-dict-sl/APKBUILD b/user/aspell-dict-sl/APKBUILD new file mode 100644 index 000000000..ab8dc8621 --- /dev/null +++ b/user/aspell-dict-sl/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-sl +pkgver=0.50.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Slovenian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/sl/aspell-sl-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-sl-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="17b74bd3c6d7fbda0b4f6d14ee529f47f39c349642593312c160eb4e7eb6eb40f704e9c34e6fb33ef9e829b861e92a224196f55326fa4d02197d12912fd4b44f aspell-sl-0.50-0.tar.bz2" diff --git a/user/aspell-dict-sr/APKBUILD b/user/aspell-dict-sr/APKBUILD new file mode 100644 index 000000000..601515fcb --- /dev/null +++ b/user/aspell-dict-sr/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-sr +pkgver=0.02 +pkgrel=0 +pkgdesc="Serbian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/sr/aspell6-sr-$pkgver.tar.bz2" +builddir="$srcdir/aspell6-sr-$pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="3334d98779c9eff74ca85e5168e51375e38f831ff3f2b9164d0773cf220bd9ca0076d282086bed6258c643cfae70124d985931982db6c885b8d53fc35fb0c395 aspell6-sr-0.02.tar.bz2" diff --git a/user/aspell-dict-sv/APKBUILD b/user/aspell-dict-sv/APKBUILD new file mode 100644 index 000000000..cbdf4dfc8 --- /dev/null +++ b/user/aspell-dict-sv/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-sv +pkgver=0.51.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Swedish dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/sv/aspell-sv-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-sv-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="f995f3ae1a1380a5dbb171786c2cf3d46670c4bc012792a1d241ff0f3de61046766583e3704c57618eb0690aa0e915b64130114420358a3f46b5b59a37d45e5c aspell-sv-0.51-0.tar.bz2" diff --git a/user/aspell-dict-sw/APKBUILD b/user/aspell-dict-sw/APKBUILD new file mode 100644 index 000000000..d904ac81a --- /dev/null +++ b/user/aspell-dict-sw/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-sw +pkgver=0.50.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Swahili dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/sw/aspell-sw-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-sw-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="5d89a68c292b45a188f611a14bc355c955810f79c32c7784b2e3ba5a4307b48d572e5a7ca882a344b7635eabe6aa6c2f5d789e9506f3a3f4e69c93fd3675e423 aspell-sw-0.50-0.tar.bz2" diff --git a/user/aspell-dict-ta/APKBUILD b/user/aspell-dict-ta/APKBUILD new file mode 100644 index 000000000..50cbf030c --- /dev/null +++ b/user/aspell-dict-ta/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-ta +pkgver=20040424.1 +_pkgver=${pkgver%.*}-${pkgver#*.} +pkgrel=0 +pkgdesc="Tamil dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/ta/aspell6-ta-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-ta-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="8809948f25bf197207c3cbd865bf4c7e73cee552fd1518533d48fcabdc79c95765df253d9ef6c7f904748f24898f04acdeb64800ce9856ced8ccab086ddb664e aspell6-ta-20040424-1.tar.bz2" diff --git a/user/aspell-dict-te/APKBUILD b/user/aspell-dict-te/APKBUILD new file mode 100644 index 000000000..fbd2bbef9 --- /dev/null +++ b/user/aspell-dict-te/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-te +pkgver=0.01.2 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Telugu dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/te/aspell6-te-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-te-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="09566d44de03e3e990f575d8e665bad9079f7bafec2474a6aa4a430a1ff71641dd4989d24bc5ecf3b19ca8c4f61b9365ea792b16f271c89bffaab159e8ed0129 aspell6-te-0.01-2.tar.bz2" diff --git a/user/aspell-dict-tet/APKBUILD b/user/aspell-dict-tet/APKBUILD new file mode 100644 index 000000000..392c24a62 --- /dev/null +++ b/user/aspell-dict-tet/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-tet +pkgver=0.1.1 +pkgrel=0 +pkgdesc="Tetum dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/tet/aspell5-tet-$pkgver.tar.bz2" +builddir="$srcdir/aspell5-tet-$pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="6dc691b40cedd054a677197219f97ae5afc21bcf4820bf452d23963ae04a716bf7e38d1cff0eb050e13fd24fd2e8f3b0d24f9b19e7de3868faeca8aa16881802 aspell5-tet-0.1.1.tar.bz2" diff --git a/user/aspell-dict-tk/APKBUILD b/user/aspell-dict-tk/APKBUILD new file mode 100644 index 000000000..f02b20fd0 --- /dev/null +++ b/user/aspell-dict-tk/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-tk +pkgver=0.01.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Turkmen dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/tk/aspell5-tk-$_pkgver.tar.bz2" +builddir="$srcdir/aspell5-tk-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="0a4a0c3be9b9322187677d47f56c091f6c3ae2662b8d6831e9fa2e18720277f76c79e9e0c65ee37474459a19dc5a99519af8492645b241cdc076775afc4a700f aspell5-tk-0.01-0.tar.bz2" diff --git a/user/aspell-dict-tl/APKBUILD b/user/aspell-dict-tl/APKBUILD new file mode 100644 index 000000000..7146e8b7f --- /dev/null +++ b/user/aspell-dict-tl/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-tl +pkgver=0.02.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Tagalog dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/tl/aspell5-tl-$_pkgver.tar.bz2" +builddir="$srcdir/aspell5-tl-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="2bff0f0191104312b8674ef65ee77a8e80225bc9bb6afe651aeb94a03db8781e8545b5b09f0143f557092c868f0873c17c55055b8cdd66f18a648ba2c805a6f0 aspell5-tl-0.02-1.tar.bz2" diff --git a/user/aspell-dict-tn/APKBUILD b/user/aspell-dict-tn/APKBUILD new file mode 100644 index 000000000..4a404b4da --- /dev/null +++ b/user/aspell-dict-tn/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-tn +pkgver=1.0.1.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Setswana dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/tn/aspell5-tn-$_pkgver.tar.bz2" +builddir="$srcdir/aspell5-tn-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="ff3258c3eec392f45b34ba7754bbd6af7ffa0ac812fc1743985fec301755be81387a3e567b36ff145a7a3f9b906e991efde8b4fafc33be14f07a581f4af111dc aspell5-tn-1.0.1-0.tar.bz2" diff --git a/user/aspell-dict-tr/APKBUILD b/user/aspell-dict-tr/APKBUILD new file mode 100644 index 000000000..6e32881a1 --- /dev/null +++ b/user/aspell-dict-tr/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-tr +pkgver=0.50.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Turkish dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/tr/aspell-tr-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-tr-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="0054eef2089a916695b7501676d9cedb1d14defdea76deb01656a6a644b4e646db46470040227814f750e0d69dcc72b1023967eb7924b42ddcefd3d604709059 aspell-tr-0.50-0.tar.bz2" diff --git a/user/aspell-dict-uk/APKBUILD b/user/aspell-dict-uk/APKBUILD new file mode 100644 index 000000000..d812753ad --- /dev/null +++ b/user/aspell-dict-uk/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-uk +pkgver=1.4.0.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Ukrainian dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/uk/aspell6-uk-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-uk-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="2e66465d17695dd3147241f13d611571f8a80a15886c69728d2f34019fb4834e56e4c0834d9e898927522b54d75f78a32dd3435b2c16eb86cf9cfa11070f0799 aspell6-uk-1.4.0-0.tar.bz2" diff --git a/user/aspell-dict-uz/APKBUILD b/user/aspell-dict-uz/APKBUILD new file mode 100644 index 000000000..cc9e0b28a --- /dev/null +++ b/user/aspell-dict-uz/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-uz +pkgver=0.6.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Uzbek dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/uz/aspell6-uz-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-uz-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="0542a83c149ad761d8bb964be556bfb2387404fce21e0e38d3c0fa8efef2d1587db0fa80140cf7de72da7f08bbb807ff931a95bb63c2a84771a197f5841e545b aspell6-uz-0.6-0.tar.bz2" diff --git a/user/aspell-dict-vi/APKBUILD b/user/aspell-dict-vi/APKBUILD new file mode 100644 index 000000000..12a23ae79 --- /dev/null +++ b/user/aspell-dict-vi/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-vi +pkgver=0.01.1.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Vietnamese dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/vi/aspell6-vi-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-vi-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="d6b0a85ea3edf3193327f6df1b9c24947663fe711f060f10122e2c60aea2717d70277fd516fa685d9886c725baeebfc72d3f33e240ee8d182be669da716bb5c5 aspell6-vi-0.01.1-1.tar.bz2" diff --git a/user/aspell-dict-wa/APKBUILD b/user/aspell-dict-wa/APKBUILD new file mode 100644 index 000000000..35ed79b6b --- /dev/null +++ b/user/aspell-dict-wa/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-wa +pkgver=0.50.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Walloon dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/wa/aspell-wa-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-wa-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="67e8fbb80a2622b921e28a37b978fc998713f7e281beccc921afd8e289ac76094f589e905da2e9386c585fcfae53179ca1e9b24a39c8a021cb3f2685461e3a8c aspell-wa-0.50-0.tar.bz2" diff --git a/user/aspell-dict-yi/APKBUILD b/user/aspell-dict-yi/APKBUILD new file mode 100644 index 000000000..f3b55aaaa --- /dev/null +++ b/user/aspell-dict-yi/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-yi +pkgver=0.01.1.1 +_pkgver=${pkgver%.*}-${pkgver#*.*.*.} +pkgrel=0 +pkgdesc="Yiddish dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/yi/aspell6-yi-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-yi-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="a8d96ba192e61193469596ce1bf6e808bbb03e3fa3a75e545bdee4b6cfa607b681d0a9631465d004ce6e0e25453af732391e76b134138acc7c28991a3664f346 aspell6-yi-0.01.1-1.tar.bz2" diff --git a/user/aspell-dict-zu/APKBUILD b/user/aspell-dict-zu/APKBUILD new file mode 100644 index 000000000..6beb5fb89 --- /dev/null +++ b/user/aspell-dict-zu/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=aspell-dict-zu +pkgver=0.50.0 +_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgrel=0 +pkgdesc="Zulu dictionaries for aspell" +url="http://aspell.net" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="aspell" +makedepends="debianutils-which" +source="ftp://ftp.gnu.org/gnu/aspell/dict/zu/aspell-zu-$_pkgver.tar.bz2" +builddir="$srcdir/aspell-zu-$_pkgver" + +build() { + cd "$builddir" + ./configure --vars DESTDIR="$pkgdir" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} +sha512sums="c79679a41e8aa1b80532c9eea0cf49c3a4bcdaa00f3d0d9e9f6eb7f4037992e40eaad0af711e5d5c29935afe6d0a2fb1c7b49dfdb2add07526a64cb2efac6ea9 aspell-zu-0.50-0.tar.bz2" diff --git a/user/aspell/APKBUILD b/user/aspell/APKBUILD index a2cc79f32..8da5b4041 100644 --- a/user/aspell/APKBUILD +++ b/user/aspell/APKBUILD @@ -2,17 +2,16 @@ # Maintainer: pkgname=aspell pkgver=0.60.6.1 -pkgrel=13 +pkgrel=14 pkgdesc="Libre spell checker software" url="http://aspell.net/" arch="all" license="LGPL-2.0+" -subpackages="$pkgname-compat::noarch $pkgname-utils $pkgname-dev $pkgname-doc - $pkgname-lang $pkgname-libs" -depends= -depends_dev="$pkgname-utils" +subpackages="$pkgname-compat::noarch $pkgname-dev $pkgname-doc + $pkgname-lang" +depends="perl" makedepends="ncurses-dev perl" -install= +provides="aspell-utils" source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" prepare() { @@ -52,18 +51,4 @@ compat() { mv spell ispell "$subpkgdir"/usr/bin/ } -utils() { - pkgdesc="Utilities for aspell" - depends="$pkgname perl" - install -d "$subpkgdir"/usr/bin - cd "$pkgdir"/usr/bin - mv pre* aspell-import run-with-aspell word-list-compress "$subpkgdir"/usr/bin/ -} - -libs() { - default_libs - mv "$pkgdir"/usr/share "$subpkgdir"/usr - rm -fr "$pkgdir"/usr/lib -} - sha512sums="f310c7590be98406589b5c26ca36a2ecfe4733f0b40fd6c176b96b7955ef2b5cd0ec9a3d770cf132146ae7a896042b4b698945112995ee1ae66adcfa5542247f aspell-0.60.6.1.tar.gz" diff --git a/user/bash-completion/APKBUILD b/user/bash-completion/APKBUILD new file mode 100644 index 000000000..42575f687 --- /dev/null +++ b/user/bash-completion/APKBUILD @@ -0,0 +1,69 @@ +# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> +# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> +# Maintainer: zlg <zlg+adelie@zlg.space> +pkgname=bash-completion +pkgver=2.8 +pkgrel=0 +pkgdesc="Command-line tab-completion for bash" +url="https://github.com/scop/bash-completion" +arch="noarch" +license="GPL-2.0-or-later" +depends="bash" +makedepends="" +subpackages="$pkgname-doc" +source="https://github.com/scop/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz" + +# Provided with util-linux and networkmanager: +_conflicting=" + cal + chsh + dmesg + eject + hd + hexdump + hwclock + ionice + look + ncal + newgrp + renice + rfkill + rtcwake + su + nmcli + umount + mount + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make -j1 DESTDIR="$pkgdir" install + + mkdir -p "$pkgdir"/usr/share/doc/$pkgname/ + install -m644 AUTHORS CHANGES CONTRIBUTING.md README.md \ + "$pkgdir"/usr/share/doc/$pkgname/ + + cd "$pkgdir"/usr/share/bash-completion/completions + for c in $_conflicting; do + rm -f $c + done +} + +sha512sums="d839ef5a98811a2aade7ebdc0bc84c84a41c74db384f89913b06f3c25add1ba22528ac25392b19d27280685d258c74dcdc11247cbaae5b8d82f2c0b546abc268 bash-completion-2.8.tar.xz" diff --git a/user/beforelight/APKBUILD b/user/beforelight/APKBUILD new file mode 100644 index 000000000..88fef1821 --- /dev/null +++ b/user/beforelight/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=beforelight +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Example screen saver for X.Org" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros libx11-dev libxscrnsaver-dev libxt-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/beforelight-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + chmod a+w config.sub + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f6cc794159cda89ac060a43d190fa72419dbcf503a97093b4c0f05315389085ff804c2891e00da2843709e97633973010165f9d68ceb0dcc76eed150f9c75968 beforelight-1.0.5.tar.bz2" diff --git a/user/bitmap/APKBUILD b/user/bitmap/APKBUILD new file mode 100644 index 000000000..4cf034029 --- /dev/null +++ b/user/bitmap/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=bitmap +pkgver=1.0.8 +pkgrel=0 +pkgdesc="X Bitmap (XBM) editor and utilities" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros libx11-dev libxaw-dev libxmu-dev xbitmaps + xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/bitmap-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="caa9f112254d59b3d0ad2d455dd8a896923250984f82135b8b7bf79a8645aff2e1a1c4cae6c8b1ba0cb2fcd89c4a6724091cb8c50b22d6524a53cca64585e303 bitmap-1.0.8.tar.bz2" diff --git a/user/breeze-gtk/APKBUILD b/user/breeze-gtk/APKBUILD index b4be30ab5..3b55131e2 100644 --- a/user/breeze-gtk/APKBUILD +++ b/user/breeze-gtk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=breeze-gtk -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="GTK+ style that matches KDE Breeze" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59c4f9433011a6699a2e9b8eef4053aa3c7b25d1cb8668a14fcba42c513d232501988ca5c4cedc00375cde917dd7cd1f8e8948c2d3447083f51fdfc4bd061adb breeze-gtk-5.12.6.tar.xz" +sha512sums="5be51fc6a884e4f3338b3ad3044b918f7267205c5234b2053edd4773be42b90fb8f665e339a40c1d49d6eea16e90e1e51f58f149002568e2e7ce0be69ee412d9 breeze-gtk-5.12.7.tar.xz" diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD index 26e22d9d1..e36e44a62 100644 --- a/user/breeze/APKBUILD +++ b/user/breeze/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=breeze -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Default KDE Plasma 5 style" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8353ff97a4a85e5c21bb2e5b234f60a272679d0ec204a30a9afe808fdd3ccf92df10dc8fd04bb87ff8f885460813bbac08f5a92d592d002a2f3a44539f00d4bf breeze-5.12.6.tar.xz" +sha512sums="c0e564fa6df64c225ea7754271c138d4b4304068c5fcf2e0502f109af3478f37d2781ac13d068b0818c819c8f60d6c4a333ff8940334c3ee5030607f80080b99 breeze-5.12.7.tar.xz" diff --git a/user/cairo/APKBUILD b/user/cairo/APKBUILD index 676764645..36e88f395 100644 --- a/user/cairo/APKBUILD +++ b/user/cairo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=cairo -pkgver=1.14.12 -pkgrel=2 +pkgver=1.16.0 +pkgrel=0 pkgdesc="A vector graphics library" url="https://cairographics.org/" arch="all" @@ -76,6 +76,6 @@ tools() { "$subpkgdir"/usr/lib/cairo/ } -sha512sums="ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1 cairo-1.14.12.tar.xz +sha512sums="9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f cairo-1.16.0.tar.xz d8185f4ec74f44c4746acf7e79bba7ff7ffd9d35bdabeb25e10b4e12825942d910931aa857f1645e5c8185bcb40a1f1ffe1e7e647428e9ea66618b2aec52fac3 fontconfig-ultimate-2016-04-23.tar.gz 86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch" diff --git a/user/cgit/APKBUILD b/user/cgit/APKBUILD new file mode 100644 index 000000000..70be3a769 --- /dev/null +++ b/user/cgit/APKBUILD @@ -0,0 +1,64 @@ +# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: zlg <zlg+adelie@zlg.space> +pkgname=cgit +pkgver=1.2.1 +pkgrel=1 +_gitver=2.18.0 +pkgdesc="A fast Web interface for Git" +url="https://git.zx2c4.com/cgit/" +arch="all" +license="GPL-2.0-only" +makedepends="openssl-dev zlib-dev lua5.3-libs lua5.3-dev asciidoctor gettext-tiny-dev" +subpackages="$pkgname-doc" +source="http://git.zx2c4.com/$pkgname/snapshot/$pkgname-$pkgver.tar.xz + https://www.kernel.org/pub/software/scm/git/git-$_gitver.tar.xz + " + +# Git makeopts come first +_makeopts="NO_CURL=1 + NO_REGEX=NeedsStartEnd + NO_SVN_TESTS=YesPlease + NO_SYS_POLL_H=1 + NO_TCLTK=YesPlease + ASCIIDOC=asciidoctor + LUA_PKGCONFIG=lua + prefix=/usr" + +prepare() { + cd "$builddir" + + # check that upstream git ver corresponds with ours + local _ver=$(awk -F'[ \t]*=[ \t]*' '/^GIT_VER/ { print $2 }' Makefile) + if [ "$_ver" != "$_gitver" ]; then + error "Please set _gitver in APKBUILD to $_ver" + return 1 + fi + + rm -rf git + mv ../git-$_gitver git + + default_prepare +} + +build() { + cd "$builddir" + sed -i -e 's:a2x -f:asciidoctor -b:' Makefile + make $_makeopts all doc-man +} + +check() { + cd "$builddir" + make $_makeopts test +} + +package() { + cd "$builddir" + make $_makeopts DESTDIR="$pkgdir" \ + CGIT_SCRIPT_PATH=/usr/share/webapps/cgit \ + install install-man + ln -s cgit.cgi "$pkgdir"/usr/share/webapps/cgit/cgit +} + +sha512sums="c7380df9afbc3735ef9e4f196f4f5bbd26cf52e473fa6f435e7d0c00dc295cc8de6bee6bfb1857144025c8591d41a6a74efb1af551e8610848d90ac40fcfab36 cgit-1.2.1.tar.xz +db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46 git-2.18.0.tar.xz" diff --git a/user/claws-mail/APKBUILD b/user/claws-mail/APKBUILD new file mode 100644 index 000000000..319bf9998 --- /dev/null +++ b/user/claws-mail/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=claws-mail +pkgver=3.17.3 +pkgrel=0 +pkgdesc="User-friendly, lightweight, and fast email client" +url="https://www.claws-mail.org/" +arch="all" +license="GPL-3.0-only" +depends="compface" +makedepends="compface-dev curl-dev dbus-glib-dev enchant-dev gnutls-dev + gpgme-dev gtk+2.0-dev libcanberra-gtk2 libcanberra-dev libetpan-dev + libical-dev libnotify-dev librsvg-dev openldap-dev + startup-notification-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-perl-plugin \ + --disable-static + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8 claws-mail-3.17.3.tar.xz" diff --git a/user/compface/APKBUILD b/user/compface/APKBUILD new file mode 100644 index 000000000..0c742f166 --- /dev/null +++ b/user/compface/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=compface +pkgver=1.5.2 +pkgrel=0 +pkgdesc="Utilities and library for using the X-Face format" +url="http://freshmeat.sourceforge.net/projects/compface/" +arch="all" +options="!check" # No test suite. +license="MIT" +depends="" +depends_dev="" +makedepends="$depends_dev" +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.xemacs.org/pub/xemacs/aux/compface-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + cd "$builddir" + make prefix="$pkgdir"/usr MANDIR="$pkgdir"/usr/share/man install +} + +sha512sums="0da9ee4c5fb2b5c712466d9fa6170e5687b23c038e6304baa42d7ede6d9bd50a1b84da416eb853a420c01a6b9eccd5e7d92a4ebc26295714b85254c05c9e3360 compface-1.5.2.tar.gz" diff --git a/user/cups/APKBUILD b/user/cups/APKBUILD index 4159e28e8..378aeb1ae 100644 --- a/user/cups/APKBUILD +++ b/user/cups/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=cups -pkgver=2.2.9 +pkgver=2.2.10 pkgrel=0 pkgdesc="The CUPS Printing System" url="https://www.cups.org/" @@ -127,7 +127,7 @@ _mv() { done } -sha512sums="423d2a215a115d5f78ce73118e8a2e566662e5d7f8acbffea39e1bfefb2f48f94841c8b85d731b0786b682dc579df8dfb5508570225b5205a182fbb2cd6dd2a5 cups-2.2.9-source.tar.gz +sha512sums="1393987a263ebf20089dd3008ae4ed770a27a1f289032604eb9e18f2e863bd0e4215a70118f5a6d3940875625278b6798fbc9070e791ec559179c6cf7dc7b05f cups-2.2.10-source.tar.gz cf64211da59e79285f99d437c02fdd7db462855fb2920ec9563ba47bd8a9e5cbd10555094940ceedeb41ac805c4f0ddb9147481470112a11a76220d0298aef79 cups.logrotate 2c2683f755a220166b3a1653fdd1a6daa9718c8f0bbdff2e2d5e61d1133306260d63a83d3ff41619b5cf84c4913fae5822b79553e2822858f38fa3613f4c7082 cupsd.initd 7a8cd9ac33b0dd4627c72df4275db8ccd7cf8e201bce3833719b42f532f526bb347b842e3ea1ef0d61855b5c6e1088b5d20b68942f2c2c0acf504d8d9728efd3 cups-no-export-ssllibs.patch diff --git a/user/cyrus-sasl/APKBUILD b/user/cyrus-sasl/APKBUILD index d8b789fd3..9f73f1ee2 100644 --- a/user/cyrus-sasl/APKBUILD +++ b/user/cyrus-sasl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: pkgname=cyrus-sasl -pkgver=2.1.26 -pkgrel=13 +pkgver=2.1.27 +pkgrel=0 pkgdesc="Cyrus Simple Authentication Service Layer (SASL)" url="https://www.cyrusimap.org/sasl/" arch="all" @@ -16,27 +16,12 @@ makedepends="db-dev openssl-dev heimdal-dev autoconf automake libtool" source="ftp://ftp.cyrusimap.org/$pkgname/$pkgname-$pkgver.tar.gz saslauthd.initd - cyrus-sasl-2.1.25-avoid_pic_overwrite.patch - cyrus-sasl-2.1.26-size_t.patch - CVE-2013-4122.patch " # secfixes: # 2.1.26-r7: # - CVE-2013-4122 -prepare() { - cd "$builddir" - default_prepare - - # the libtool they ship is broken - sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in - rm -rf config/config.guess config/config.sub config/ltconfig \ - config/ltmain.sh config/libtool.m4 autom4te.cache - libtoolize -c && aclocal -I config -I cmulocal \ - && automake -a -c && autoheader && autoconf -} - build() { cd "$builddir" ./configure \ @@ -93,8 +78,5 @@ libsasl() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0 cyrus-sasl-2.1.26.tar.gz -71a00a22f91f0fb6ba2796acede321a0f071b1d7a99616f0e36c354213777f30575c340b6df392dcbfc103ba7640d046144882f6a7b505f59709bb5c429b44d8 saslauthd.initd -033e3634116e1d3b316052dbe0b671cca0fcfb6063fca1a97d990c422c2ce05109a1e424e84ed9928dc0312a325a7248f2d2e3f9547f84453b36331c01f63be5 cyrus-sasl-2.1.25-avoid_pic_overwrite.patch -fe4c3e6d5230eb50b9e6885129760a12e7bce316b41a3e58b2c550fa83526b91205cd827f7d1367751313559875d32982b95b024b1a22300ac5b35214e7c2b78 cyrus-sasl-2.1.26-size_t.patch -08964bc3ad713e137b8f05f9bac345d79676d14784bc37525f195e8e2a3e6740428237b64f7eeeacc0c71ed6cf1664c6e9c2267ac6df327761d92174a1853744 CVE-2013-4122.patch" +sha512sums="d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b cyrus-sasl-2.1.27.tar.gz +71a00a22f91f0fb6ba2796acede321a0f071b1d7a99616f0e36c354213777f30575c340b6df392dcbfc103ba7640d046144882f6a7b505f59709bb5c429b44d8 saslauthd.initd" diff --git a/user/cyrus-sasl/CVE-2013-4122.patch b/user/cyrus-sasl/CVE-2013-4122.patch deleted file mode 100644 index 38f2595a5..000000000 --- a/user/cyrus-sasl/CVE-2013-4122.patch +++ /dev/null @@ -1,117 +0,0 @@ -From dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d Mon Sep 17 00:00:00 2001 -From: mancha <mancha1@hush.com> -Date: Thu, 11 Jul 2013 10:08:07 +0100 -Subject: Handle NULL returns from glibc 2.17+ crypt() - -Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL -(w/ NULL return) if the salt violates specifications. Additionally, -on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords -passed to crypt() fail with EPERM (w/ NULL return). - -When using glibc's crypt(), check return value to avoid a possible -NULL pointer dereference. - -Patch by mancha1@hush.com. - -diff --git a/pwcheck/pwcheck_getpwnam.c b/pwcheck/pwcheck_getpwnam.c -index 4b34222..400289c 100644 ---- a/pwcheck/pwcheck_getpwnam.c -+++ b/pwcheck/pwcheck_getpwnam.c -@@ -32,6 +32,7 @@ char *userid; - char *password; - { - char* r; -+ char* crpt_passwd; - struct passwd *pwd; - - pwd = getpwnam(userid); -@@ -41,7 +42,7 @@ char *password; - else if (pwd->pw_passwd[0] == '*') { - r = "Account disabled"; - } -- else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) { -+ else if (!(crpt_passwd = crypt(password, pwd->pw_passwd)) || strcmp(pwd->pw_passwd, (const char *)crpt_passwd) != 0) { - r = "Incorrect password"; - } - else { -diff --git a/pwcheck/pwcheck_getspnam.c b/pwcheck/pwcheck_getspnam.c -index 2b11286..6d607bb 100644 ---- a/pwcheck/pwcheck_getspnam.c -+++ b/pwcheck/pwcheck_getspnam.c -@@ -32,13 +32,15 @@ char *userid; - char *password; - { - struct spwd *pwd; -+ char *crpt_passwd; - - pwd = getspnam(userid); - if (!pwd) { - return "Userid not found"; - } - -- if (strcmp(pwd->sp_pwdp, crypt(password, pwd->sp_pwdp)) != 0) { -+ crpt_passwd = crypt(password, pwd->sp_pwdp); -+ if (!crpt_passwd || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) != 0) { - return "Incorrect password"; - } - else { -diff --git a/saslauthd/auth_getpwent.c b/saslauthd/auth_getpwent.c -index fc8029d..d4ebe54 100644 ---- a/saslauthd/auth_getpwent.c -+++ b/saslauthd/auth_getpwent.c -@@ -77,6 +77,7 @@ auth_getpwent ( - { - /* VARIABLES */ - struct passwd *pw; /* pointer to passwd file entry */ -+ char *crpt_passwd; /* encrypted password */ - int errnum; - /* END VARIABLES */ - -@@ -105,7 +106,8 @@ auth_getpwent ( - } - } - -- if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) { -+ crpt_passwd = crypt(password, pw->pw_passwd); -+ if (!crpt_passwd || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) { - if (flags & VERBOSE) { - syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login); - } -diff --git a/saslauthd/auth_shadow.c b/saslauthd/auth_shadow.c -index 677131b..1988afd 100644 ---- a/saslauthd/auth_shadow.c -+++ b/saslauthd/auth_shadow.c -@@ -210,8 +210,8 @@ auth_shadow ( - RETURN("NO Insufficient permission to access NIS authentication database (saslauthd)"); - } - -- cpw = strdup((const char *)crypt(password, sp->sp_pwdp)); -- if (strcmp(sp->sp_pwdp, cpw)) { -+ cpw = crypt(password, sp->sp_pwdp); -+ if (!cpw || strcmp(sp->sp_pwdp, (const char *)cpw)) { - if (flags & VERBOSE) { - /* - * This _should_ reveal the SHADOW_PW_LOCKED prefix to an -@@ -221,10 +221,8 @@ auth_shadow ( - syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'", - sp->sp_pwdp, cpw); - } -- free(cpw); - RETURN("NO Incorrect password"); - } -- free(cpw); - - /* - * The following fields will be set to -1 if: -@@ -286,7 +284,7 @@ auth_shadow ( - RETURN("NO Invalid username"); - } - -- if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) { -+ if (!(cpw = crypt(password, upw->upw_passwd)) || (strcmp(upw->upw_passwd, (const char *)cpw) != 0)) { - if (flags & VERBOSE) { - syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s", - password, upw->upw_passwd); --- -cgit v0.10.2 - diff --git a/user/cyrus-sasl/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch b/user/cyrus-sasl/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch deleted file mode 100644 index 2e5b1750d..000000000 --- a/user/cyrus-sasl/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch +++ /dev/null @@ -1,27 +0,0 @@ -Author: Fabian Fagerholm <fabbe@debian.org> -Description: This patch makes sure the non-PIC version of libsasldb.a, which -is created out of non-PIC objects, is not going to overwrite the PIC version, -which is created out of PIC objects. The PIC version is placed in .libs, and -the non-PIC version in the current directory. This ensures that both non-PIC -and PIC versions are available in the correct locations. ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -78,7 +78,7 @@ endif - - libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) - @echo adding static plugins and dependencies -- $(AR) cru .libs/$@ $(SASL_STATIC_OBJS) -+ $(AR) cru $@ $(SASL_STATIC_OBJS) - @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ - if test ! -f $$i; then continue; fi; . $$i; \ - for j in $$dependency_libs foo; do \ ---- a/sasldb/Makefile.am -+++ b/sasldb/Makefile.am -@@ -63,6 +63,6 @@ libsasldb_a_SOURCES = - EXTRA_libsasldb_a_SOURCES = - - libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC) -- $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC) -+ $(AR) cru $@ $(SASL_DB_BACKEND_STATIC) - - diff --git a/user/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch b/user/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch deleted file mode 100644 index cde823835..000000000 --- a/user/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cyrus-sasl-2.1.26/include/sasl.h.size_t cyrus-sasl-2.1.26/include/sasl.h ---- cyrus-sasl-2.1.26/include/sasl.h.size_t 2012-10-12 09:05:48.000000000 -0500 -+++ cyrus-sasl-2.1.26/include/sasl.h 2013-01-31 13:21:04.007739327 -0600 -@@ -223,6 +223,8 @@ extern "C" { - * they must be called before all other SASL functions: - */ - -+#include <sys/types.h> -+ - /* memory allocation functions which may optionally be replaced: - */ - typedef void *sasl_malloc_t(size_t); diff --git a/user/dejagnu/APKBUILD b/user/dejagnu/APKBUILD index d2ee84eb2..53018f36f 100644 --- a/user/dejagnu/APKBUILD +++ b/user/dejagnu/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dejagnu -pkgver=1.6 -pkgrel=1 +pkgver=1.6.2 +pkgrel=0 pkgdesc="Framework for testing other programs" url="https://www.gnu.org/software/dejagnu/" arch="noarch" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc dejagnu-1.6.tar.gz" +sha512sums="ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042 dejagnu-1.6.2.tar.gz" diff --git a/user/dialog/APKBUILD b/user/dialog/APKBUILD index 9b10cf914..a7dc72010 100644 --- a/user/dialog/APKBUILD +++ b/user/dialog/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dialog -_realver=1.3-20181022 +_realver=1.3-20181107 pkgver=${_realver/-/.} pkgrel=0 pkgdesc="Script interpreter providing curses widgets" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5d7891086ab6d2f4a815538513b09754a56368bbb0ec3bd107346fd2ed6ae10fa858173447fa609cce28a91e234ed8067d9439efeb973593fff2df1e811a8925 dialog-1.3-20181022.tgz" +sha512sums="69cb367bc9a1d6dcd69b74f7eae9b4318f0bfd9c0eae48144da119df10f7f81ed4c215a8882d72dfbbd9ff41c5e591c80b168b9552e014454cc80c9aa37dca55 dialog-1.3-20181107.tgz" diff --git a/user/editres/APKBUILD b/user/editres/APKBUILD new file mode 100644 index 000000000..f0f7bd1d8 --- /dev/null +++ b/user/editres/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=editres +pkgver=1.0.7 +pkgrel=0 +pkgdesc="Examine Xt widgets and edit X11 resources dynamically" +url="http://www.rahul.net/kenton/editres.html" +arch="all" +license="X11" +depends="" +makedepends="util-macros libx11-dev libxaw-dev libxmu-dev libxt-dev + xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/editres-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="b9c928b556116bf50cf4b6ea779bdc9fedf29f5db3e6a8cc75c122578c92e1cc530a81b226ec24aad183b8ebc2de570f200314b0d9ce7883b6e3306007365b32 editres-1.0.7.tar.bz2" diff --git a/user/eigen/APKBUILD b/user/eigen/APKBUILD index 9dcef042e..125cf77fe 100644 --- a/user/eigen/APKBUILD +++ b/user/eigen/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bradley J Chambers <brad.chambers@gmail.com> # Maintainer: pkgname=eigen -pkgver=3.3.5 -pkgrel=1 +pkgver=3.3.7 +pkgrel=0 pkgdesc="Eigen is a C++ template library for linear algebra" url="http://eigen.tuxfamily.org/index.php?title=Main_Page" arch="noarch" @@ -11,9 +11,7 @@ license="MPL-2.0" depends="" makedepends="" subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::http://bitbucket.org/eigen/$pkgname/get/$pkgver.tar.gz - prototype.patch - " +source="$pkgname-$pkgver.tar.gz::http://bitbucket.org/eigen/$pkgname/get/$pkgver.tar.gz" prepare() { mv "$srcdir"/eigen-eigen-* "$builddir" # directory name contains hash @@ -26,5 +24,4 @@ package() { cp -r "$builddir"/unsupported "$pkgdir"/usr/include/eigen3 } -sha512sums="32398be114924ed10ea063bc2b857176bf28b3d5fb915344e972765e3f72e7b72f4a4cee1742e70029e391fdd06f854aa2ab1613b107bd41fbfaf32f0c44463e eigen-3.3.5.tar.gz -bbecc8323dbbd37b624ae8816ce9c3ee3f1791b10847f5d56a957d00197fd13ff5cc2026b2eb644d5eb0f77f74fc20b25f98070befbd1c2dfd98e9c596778942 prototype.patch" +sha512sums="34cf600914cce719d61511577ef9cd26fbdcb7a6fad1d0ab8396f98b887fac6a5577d3967e84a8f56225cc50de38f3b91f34f447d14312028383e32b34ea1972 eigen-3.3.7.tar.gz" diff --git a/user/eigen/prototype.patch b/user/eigen/prototype.patch deleted file mode 100644 index d1205b7dd..000000000 --- a/user/eigen/prototype.patch +++ /dev/null @@ -1,22 +0,0 @@ -From fc10b565bf15aa3438d3586e759ea88a8091411d Mon Sep 17 00:00:00 2001 -From: Gael Guennebaud <g.gael@free.fr> -Date: Fri, 8 Jun 2018 09:56:01 +0200 -Subject: [PATCH] fix prototype - ---- - unsupported/Eigen/src/IterativeSolvers/DGMRES.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/unsupported/Eigen/src/IterativeSolvers/DGMRES.h b/unsupported/Eigen/src/IterativeSolvers/DGMRES.h -index f40b80eda..be039e07f 100644 ---- a/unsupported/Eigen/src/IterativeSolvers/DGMRES.h -+++ b/unsupported/Eigen/src/IterativeSolvers/DGMRES.h -@@ -173,7 +173,7 @@ class DGMRES : public IterativeSolverBase<DGMRES<_MatrixType,_Preconditioner> > - /** - * Set the restart value (default is 30) - */ -- Index set_restart(const Index restart) { m_restart=restart; } -+ void set_restart(const Index restart) { m_restart=restart; } - - /** - * Set the number of eigenvalues to deflate at each restart diff --git a/user/enchant/APKBUILD b/user/enchant/APKBUILD index daa149747..a09bd4291 100644 --- a/user/enchant/APKBUILD +++ b/user/enchant/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: pkgname=enchant pkgver=1.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="A wrapper library for generic spell checking" url="https://abiword.github.io/enchant/" arch="all" -options="!check" # We need to ship dictionaries before testing will work... license="LGPL-2.0+" subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="aspell-dev bash dbus-glib-dev file glib-dev hunspell-dev" +checkdepends="aspell-dict-en" source="https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/enchant-1.6.1.tar.gz hunspell-build-fix.patch" @@ -24,7 +24,7 @@ build() { } check() { - cd "$builddir" + cd "$builddir"/tests make check } diff --git a/user/encodings/APKBUILD b/user/encodings/APKBUILD index 84c49ddab..d5c5adbea 100644 --- a/user/encodings/APKBUILD +++ b/user/encodings/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=encodings pkgver=1.0.4 -pkgrel=2 +pkgrel=3 pkgdesc="Font encoding files for X11" url="https://www.X.Org/" arch="noarch" @@ -21,8 +21,7 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - --with-encodingsdir=/usr/share/fonts/encodings + --prefix=/usr make } diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD index d9ced3064..12c8c21c6 100644 --- a/user/exiv2/APKBUILD +++ b/user/exiv2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=exiv2 pkgver=0.26 -pkgrel=1 +pkgrel=2 pkgdesc="Exif, IPTC and XMP metadata library and tools" url="http://www.exiv2.org" arch="all" @@ -14,9 +14,14 @@ subpackages="$pkgname-dev $pkgname-doc" source="http://www.exiv2.org/builds/exiv2-$pkgver-trunk.tar.gz 0000-pthread-init-fix.patch 0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch + CVE-2018-19535.patch " builddir="$srcdir"/exiv2-trunk +# secfixes: +# 0.26-r2: +# - CVE-2018-19535 + prepare() { cd "$builddir" default_prepare @@ -38,4 +43,5 @@ package() { sha512sums="d1e9cab886e279b045768dd9ec781f07d2d36d573119403d0b76dc571442173aae6972f86ec55c3ea53fb3ee9ca3571eb8fd63a2a6643a970852813e88634a86 exiv2-0.26-trunk.tar.gz 9721d359708c385be7c86a8f8a63de43b05b2578a29b4339861e82873aa81a98a7ee7252847b6c55529341187d40f552c488589b416fd9d1e27418925929c018 0000-pthread-init-fix.patch -485bd340169f69a3ce356e59e9138250cc14592f4477bb73827c799fe465535954469634fc58a1856f690f0e0b4171cba6fdd3391d43c0efc5e89652b93eb3ce 0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch" +485bd340169f69a3ce356e59e9138250cc14592f4477bb73827c799fe465535954469634fc58a1856f690f0e0b4171cba6fdd3391d43c0efc5e89652b93eb3ce 0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch +ac145a9b4df21e7f5fdd3099e6ae4c1e12ae2cdccc455d0262c5d38b8e07ce6437036a19264bd04b1cb1fffd01d89672044ca82fddd5e71dcd0d84d48356ab12 CVE-2018-19535.patch" diff --git a/user/exiv2/CVE-2018-19535.patch b/user/exiv2/CVE-2018-19535.patch new file mode 100644 index 000000000..ba9355012 --- /dev/null +++ b/user/exiv2/CVE-2018-19535.patch @@ -0,0 +1,239 @@ +From 03173751b4d7053d6ddf52a15904e8f751f78f56 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com> +Date: Sun, 2 Sep 2018 14:39:52 +0200 +Subject: [PATCH 2/5] Fix bug in PngChunk::readRawProfile + +- Now it takes into account text.size_ when searching for a newline +char. +--- + src/pngchunk.cpp | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp +index 58281b3ff..755872c94 100644 +--- a/src/pngchunk.cpp ++++ b/src/pngchunk.cpp +@@ -629,11 +629,19 @@ namespace Exiv2 { + + + sp = (char*)text.pData_+1; ++ int pointerPos = 1; + + // Look for newline +- +- while (*sp != '\n') ++ while (*sp != '\n' && pointerPos < (text.size_ - 1)) ++ { + sp++; ++ pointerPos++; ++ } ++ ++ if (pointerPos == (text.size_ - 1)) ++ { ++ return DataBuf(); ++ } + + // Look for length + + +From cf3ba049a2792ec2a4a877e343f5dd9654da53dc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com> +Date: Mon, 3 Sep 2018 08:51:08 +0200 +Subject: [PATCH 3/5] Fix more issues in PngChunk::readRawProfile + +--- + src/pngchunk.cpp | 36 +++++++++++++----------- + 1 file changed, 20 insertions(+), 16 deletions(-) + +diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp +index 755872c94..9b3faf1aa 100644 +--- a/src/pngchunk.cpp ++++ b/src/pngchunk.cpp +@@ -606,11 +606,6 @@ namespace Exiv2 { + DataBuf PngChunk::readRawProfile(const DataBuf& text,bool iTXt) + { + DataBuf info; +- register long i; +- register unsigned char *dp; +- const char *sp; +- unsigned int nibbles; +- long length; + unsigned char unhex[103]={0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0, +@@ -627,8 +622,7 @@ namespace Exiv2 { + return info; + } + +- +- sp = (char*)text.pData_+1; ++ const char *sp = (char*)text.pData_+1; + int pointerPos = 1; + + // Look for newline +@@ -638,20 +632,30 @@ namespace Exiv2 { + pointerPos++; + } + ++ // Look for length ++ while ((*sp == '\0' || *sp == ' ' || *sp == '\n') && pointerPos < (text.size_ - 1)) ++ { ++ sp++; ++ pointerPos++; ++ } ++ + if (pointerPos == (text.size_ - 1)) + { + return DataBuf(); + } + +- // Look for length ++ long length = (long) atol(sp); + +- while (*sp == '\0' || *sp == ' ' || *sp == '\n') ++ while (*sp != ' ' && *sp != '\n' && pointerPos < (text.size_ - 1)) ++ { + sp++; ++ pointerPos++; ++ } + +- length = (long) atol(sp); +- +- while (*sp != ' ' && *sp != '\n') +- sp++; ++ if (pointerPos == (text.size_ - 1)) ++ { ++ return DataBuf(); ++ } + + // Allocate space + +@@ -674,10 +678,10 @@ namespace Exiv2 { + + // Copy profile, skipping white space and column 1 "=" signs + +- dp = (unsigned char*)info.pData_; +- nibbles = length * 2; ++ unsigned char *dp = (unsigned char*)info.pData_; ++ unsigned int nibbles = length * 2; + +- for (i = 0; i < (long) nibbles; i++) ++ for (long i = 0; i < (long) nibbles; i++) + { + while (*sp < '0' || (*sp > '9' && *sp < 'a') || *sp > 'f') + { + +From 8b480bc5b2cc2abb8cf6fe4e16c24e58916464d2 Mon Sep 17 00:00:00 2001 +From: Robin Mills <robin@clanmills.com> +Date: Mon, 10 Sep 2018 20:54:53 +0200 +Subject: [PATCH 4/5] Fixes in PngChunk::readRawProfile + +--- + src/pngchunk.cpp | 55 ++++++++++++++++++++++---------------------- + 1 file changed, 27 insertions(+), 28 deletions(-) + +diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp +index 9b3faf1aa..f81b560aa 100644 +--- a/src/pngchunk.cpp ++++ b/src/pngchunk.cpp +@@ -607,11 +607,11 @@ namespace Exiv2 { + { + DataBuf info; + unsigned char unhex[103]={0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, +- 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, +- 0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0, +- 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, +- 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,10,11,12, +- 13,14,15}; ++ 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, ++ 0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0, ++ 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, ++ 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,10,11,12, ++ 13,14,15}; + if (text.size_ == 0) { + return DataBuf(); + } +@@ -622,52 +622,51 @@ namespace Exiv2 { + return info; + } + +- const char *sp = (char*)text.pData_+1; +- int pointerPos = 1; ++ const char *sp = (char*) text.pData_+1; // current byte (space pointer) ++ const char *eot = (char*) text.pData_+text.size_; // end of text + + // Look for newline +- while (*sp != '\n' && pointerPos < (text.size_ - 1)) ++ while (*sp != '\n' && sp < eot ) + { + sp++; +- pointerPos++; ++ if ( sp == eot ) ++ { ++ return DataBuf(); ++ } + } ++ sp++ ; // step over '\n' + + // Look for length +- while ((*sp == '\0' || *sp == ' ' || *sp == '\n') && pointerPos < (text.size_ - 1)) ++ while ( (*sp == '\0' || *sp == ' ' || *sp == '\n') && sp < eot ) + { + sp++; +- pointerPos++; +- } +- +- if (pointerPos == (text.size_ - 1)) +- { +- return DataBuf(); ++ if (sp == eot ) ++ { ++ return DataBuf(); ++ } + } + +- long length = (long) atol(sp); +- +- while (*sp != ' ' && *sp != '\n' && pointerPos < (text.size_ - 1)) ++ const char* startOfLength = sp; ++ while ( ('0' <= *sp && *sp <= '9') && sp < eot) + { + sp++; +- pointerPos++; ++ if (sp == eot ) ++ { ++ return DataBuf(); ++ } + } ++ sp++ ; // step over '\n' + +- if (pointerPos == (text.size_ - 1)) +- { +- return DataBuf(); +- } ++ long length = (long) atol(startOfLength); + + // Allocate space +- + if (length == 0) + { + #ifdef DEBUG + std::cerr << "Exiv2::PngChunk::readRawProfile: Unable To Copy Raw Profile: invalid profile length\n"; + #endif + } +- + info.alloc(length); +- + if (info.size_ != length) + { + #ifdef DEBUG +@@ -678,7 +677,7 @@ namespace Exiv2 { + + // Copy profile, skipping white space and column 1 "=" signs + +- unsigned char *dp = (unsigned char*)info.pData_; ++ unsigned char *dp = (unsigned char*)info.pData_; // decode pointer + unsigned int nibbles = length * 2; + + for (long i = 0; i < (long) nibbles; i++) + diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index b396a291e..8d576a7ed 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpeg -pkgver=4.0.2 -pkgrel=1 +pkgver=4.1 +pkgrel=0 pkgdesc="Record, convert, and stream audio and video" url="https://ffmpeg.org/" arch="all" @@ -19,7 +19,6 @@ makedepends="gnutls-dev lame-dev libvorbis-dev xvidcore-dev zlib-dev libvdpau-de ladspa-dev libcdio-dev libcdio-paranoia-dev wavpack-dev libwebp-dev" source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch - altivec-fix.patch " # secfixes: @@ -100,6 +99,5 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="2dc2b8c66d9c31b6d06da5da336ef45415e3c24fac8c9063cd47f7d4cf688ec4846f88cdd9e841b956cea81e56bb3c6b7655aef503400c7367c32910c28990ac ffmpeg-4.0.2.tar.xz -32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch -225a87ad4b5564e2cbf35e669cc54adddf7f8ca05fbcfc27ed92f4406d0fd3b27558477afaf4c3c13079b19035d0761d8b2f8af9bc25fcfd727183faa606e4f6 altivec-fix.patch" +sha512sums="59db7e8a6238048c04c3b0bd5885aea2bf7951f79949fc0659a8d235c4cd809ac0c1a74544a4c218a38c8c739eea76f5ee1231bfb96439487212c6e65591780e ffmpeg-4.1.tar.xz +32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" diff --git a/user/ffmpeg/altivec-fix.patch b/user/ffmpeg/altivec-fix.patch deleted file mode 100644 index e0d6230a3..000000000 --- a/user/ffmpeg/altivec-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c0f58c3d4da82aaf5774b1bc3a11b8a416664e18 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Sat, 21 Jul 2018 00:42:00 -0500 -Subject: [PATCH] libavcodec/ppc: Fix HEVC AltiVec routines - -GCC requires the argument to vec_splat_u32 to be a literal. The easiest -way to accomplish this is to change 'shift' to be const in scale (as it -is in the transform routine above), and convert both routines to be -inline. This way, GCC can coerce the values to literals. - -Tested on a 970 (Apple G5) and POWER9 (Talos II); passed fate and played -a clip of Big Buck Bunny correctly. - -Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> ---- - libavcodec/ppc/hevcdsp.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/libavcodec/ppc/hevcdsp.c b/libavcodec/ppc/hevcdsp.c -index 4b1037d792..c8679c2de2 100644 ---- a/libavcodec/ppc/hevcdsp.c -+++ b/libavcodec/ppc/hevcdsp.c -@@ -41,8 +41,9 @@ static const vec_u8 mask[2] = { - { 0x04, 0x05, 0x0C, 0x0D, 0x14, 0x15, 0x1C, 0x1D, 0x06, 0x07, 0x0E, 0x0F, 0x16, 0x17, 0x1E, 0x1F }, - }; - --static void transform4x4(vec_s16 src_01, vec_s16 src_23, vec_s32 res[4], -- const int shift, int16_t *coeffs) -+static av_always_inline void transform4x4(vec_s16 src_01, vec_s16 src_23, -+ vec_s32 res[4], const int shift, -+ int16_t *coeffs) - { - vec_s16 src_02, src_13; - vec_s32 zero = vec_splat_s32(0); -@@ -67,7 +68,8 @@ static void transform4x4(vec_s16 src_01, vec_s16 src_23, vec_s32 res[4], - res[3] = vec_sub(e0, o0); - } - --static void scale(vec_s32 res[4], vec_s16 res_packed[2], int shift) -+static av_always_inline void scale(vec_s32 res[4], vec_s16 res_packed[2], -+ const int shift) - { - int i; - vec_u32 v_shift = vec_splat_u32(shift); --- -2.17.1 - diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD index feca61fdf..8a9a805e1 100644 --- a/user/firefox-esr/APKBUILD +++ b/user/firefox-esr/APKBUILD @@ -4,7 +4,7 @@ pkgname=firefox-esr pkgver=52.9.0 _pkgver=$pkgver _xulver=$pkgver -pkgrel=3 +pkgrel=4 pkgdesc="Firefox web browser" url="https://www.mozilla.org/en-US/firefox/organizations/faq/" arch="all" @@ -38,6 +38,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox disable-moz-stackwalk.patch missing-header-s390x.patch ffmpeg4.patch + shut-up-warning.patch firefox.desktop firefox-safe.desktop" @@ -247,5 +248,6 @@ e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb1 4797d2d89ac63a57abb826b8ea9f751314ce66946194033deb9d78c2ff377b88106fd2c7bc5034dc13ad03dd5085b1893c3ccae1a9e63fde35655bb0921f7188 disable-moz-stackwalk.patch 6beba471b6a7fc229a9c105d58137f80cec07219e52bb9a666c787b37ca88635d6ec2eba651eccb5096429c2965709c9475c89839c255c3545f8c96c5d40f403 missing-header-s390x.patch 1e2d0321afb0fc3bb0f6e1f1d7c0621f574414fa3d2696ec30c0e4ebf7738aa4f74a15017f18fae3561f1bc72932ccfb7e5be0e608b878fca5558fb265c16860 ffmpeg4.patch +21100340ff03f4257fa6a4b59e206d4d1b71c074ebae392ba616f9e6e6d4988a22eec69b40534221f9453ec3a58397fa4ab99b87abdcb7d22fabb13f9cc577d2 shut-up-warning.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop" diff --git a/user/firefox-esr/shut-up-warning.patch b/user/firefox-esr/shut-up-warning.patch new file mode 100644 index 000000000..ffba50436 --- /dev/null +++ b/user/firefox-esr/shut-up-warning.patch @@ -0,0 +1,11 @@ +--- firefox-52.9.0esr/gfx/2d/HelpersCairo.h.old 2017-04-11 02:13:04.000000000 +0000 ++++ firefox-52.9.0esr/gfx/2d/HelpersCairo.h 2018-12-08 18:45:01.880000000 +0000 +@@ -160,7 +160,7 @@ + case SurfaceFormat::R5G6B5_UINT16: + return CAIRO_FORMAT_RGB16_565; + default: +- gfxCriticalError() << "Unknown image format " << (int)format; ++ //gfxCriticalError() << "Unknown image format " << (int)format; + return CAIRO_FORMAT_ARGB32; + } + } diff --git a/user/font-adobe-100dpi/APKBUILD b/user/font-adobe-100dpi/APKBUILD new file mode 100644 index 000000000..4547cee87 --- /dev/null +++ b/user/font-adobe-100dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-adobe-100dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="100dpi X11 fonts from Adobe" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-adobe-100dpi-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987 font-adobe-100dpi-1.0.3.tar.bz2" diff --git a/user/font-adobe-75dpi/APKBUILD b/user/font-adobe-75dpi/APKBUILD new file mode 100644 index 000000000..8f3f7ac0c --- /dev/null +++ b/user/font-adobe-75dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-adobe-75dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="75dpi X11 fonts from Adobe" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-adobe-75dpi-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d font-adobe-75dpi-1.0.3.tar.bz2" diff --git a/user/font-adobe-utopia-100dpi/APKBUILD b/user/font-adobe-utopia-100dpi/APKBUILD new file mode 100644 index 000000000..ffd9eb443 --- /dev/null +++ b/user/font-adobe-utopia-100dpi/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-adobe-utopia-100dpi +pkgver=1.0.4 +pkgrel=0 +pkgdesc="100dpi Utopia X11 font from Adobe" +url="https://www.X.Org/" +arch="noarch" +# Okay. +# This is really hairy, but Fedora Legal says the TUG license can apply to the +# X11 distribution[1][2]; it's almost MIT style, but you have to rename the +# font if you modify it in any way. +# [1]: https://fedoraproject.org/wiki/Legal_considerations_for_fonts +# [2]: https://src.fedoraproject.org/cgit/rpms/xorg-x11-fonts.git/tree/xorg-x11-fonts.spec +license="Utopia" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b font-adobe-utopia-100dpi-1.0.4.tar.bz2" diff --git a/user/font-adobe-utopia-75dpi/APKBUILD b/user/font-adobe-utopia-75dpi/APKBUILD new file mode 100644 index 000000000..da04ba89e --- /dev/null +++ b/user/font-adobe-utopia-75dpi/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-adobe-utopia-75dpi +pkgver=1.0.4 +pkgrel=0 +pkgdesc="75dpi Utopia X11 font from Adobe" +url="https://www.X.Org/" +arch="noarch" +# Okay. +# This is really hairy, but Fedora Legal says the TUG license can apply to the +# X11 distribution[1][2]; it's almost MIT style, but you have to rename the +# font if you modify it in any way. +# [1]: https://fedoraproject.org/wiki/Legal_considerations_for_fonts +# [2]: https://src.fedoraproject.org/cgit/rpms/xorg-x11-fonts.git/tree/xorg-x11-fonts.spec +license="Utopia" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92 font-adobe-utopia-75dpi-1.0.4.tar.bz2" diff --git a/user/font-adobe-utopia-type1/APKBUILD b/user/font-adobe-utopia-type1/APKBUILD new file mode 100644 index 000000000..12443931b --- /dev/null +++ b/user/font-adobe-utopia-type1/APKBUILD @@ -0,0 +1,51 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-adobe-utopia-type1 +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Type 1 Utopia X11 font from Adobe" +url="https://www.X.Org/" +arch="noarch" +# Okay. +# This is really hairy, but Fedora Legal says the TUG license can apply to the +# X11 distribution[1][2]; it's almost MIT style, but you have to rename the +# font if you modify it in any way. +# [1]: https://fedoraproject.org/wiki/Legal_considerations_for_fonts +# [2]: https://src.fedoraproject.org/cgit/rpms/xorg-x11-fonts.git/tree/xorg-x11-fonts.spec +license="Utopia" +depends="encodings font-alias fontconfig mkfontdir mkfontscale" +makedepends="util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-adobe-utopia-type1-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + + find "$pkgdir" -name fonts.scale -exec rm {} + +} + +sha512sums="53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6 font-adobe-utopia-type1-1.0.4.tar.bz2" diff --git a/user/font-alias/APKBUILD b/user/font-alias/APKBUILD index 91fc0705b..dee7f9487 100644 --- a/user/font-alias/APKBUILD +++ b/user/font-alias/APKBUILD @@ -1,18 +1,19 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-alias pkgver=1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Font alias definitions from X.Org" url="https://www.X.Org/" arch="noarch" -license="unknown:BSD-Style" +license="MIT" depends="" makedepends="util-macros" source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" prepare() { - update_config_sub + cd "$builddir" default_prepare + update_config_sub } build() { @@ -20,8 +21,7 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - --with-fontrootdir=/usr/share/fonts + --prefix=/usr make } diff --git a/user/font-arabic-misc/APKBUILD b/user/font-arabic-misc/APKBUILD new file mode 100644 index 000000000..e36be36a0 --- /dev/null +++ b/user/font-arabic-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-arabic-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Arabic X11 fonts" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-arabic-misc-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0 font-arabic-misc-1.0.3.tar.bz2" diff --git a/user/font-bh-100dpi/APKBUILD b/user/font-bh-100dpi/APKBUILD new file mode 100644 index 000000000..507bd19cc --- /dev/null +++ b/user/font-bh-100dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bh-100dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="100dpi X11 fonts from Bigelow & Holmes" +url="https://www.X.Org/" +arch="noarch" +license="Lucida" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-bh-100dpi-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2 font-bh-100dpi-1.0.3.tar.bz2" diff --git a/user/font-bh-75dpi/APKBUILD b/user/font-bh-75dpi/APKBUILD new file mode 100644 index 000000000..6a1287b10 --- /dev/null +++ b/user/font-bh-75dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bh-75dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="75dpi X11 fonts from Bigelow & Holmes" +url="https://www.X.Org/" +arch="noarch" +license="Lucida" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-bh-75dpi-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50 font-bh-75dpi-1.0.3.tar.bz2" diff --git a/user/font-bh-lucidatypewriter-100dpi/APKBUILD b/user/font-bh-lucidatypewriter-100dpi/APKBUILD new file mode 100644 index 000000000..afa5b8a83 --- /dev/null +++ b/user/font-bh-lucidatypewriter-100dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bh-lucidatypewriter-100dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="100dpi Lucida Typewriter X11 font from Bigelow & Holmes" +url="https://www.X.Org/" +arch="noarch" +license="Lucida" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2" diff --git a/user/font-bh-lucidatypewriter-75dpi/APKBUILD b/user/font-bh-lucidatypewriter-75dpi/APKBUILD new file mode 100644 index 000000000..e1e9508dc --- /dev/null +++ b/user/font-bh-lucidatypewriter-75dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bh-lucidatypewriter-75dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="75dpi Lucida Typewriter X11 font from Bigelow & Holmes" +url="https://www.X.Org/" +arch="noarch" +license="Lucida" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13 font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2" diff --git a/user/font-bitstream-100dpi/APKBUILD b/user/font-bitstream-100dpi/APKBUILD new file mode 100644 index 000000000..27c9f4848 --- /dev/null +++ b/user/font-bitstream-100dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bitstream-100dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="100dpi X11 fonts from Bitstream" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd font-bitstream-100dpi-1.0.3.tar.bz2" diff --git a/user/font-bitstream-75dpi/APKBUILD b/user/font-bitstream-75dpi/APKBUILD new file mode 100644 index 000000000..a456b9bd6 --- /dev/null +++ b/user/font-bitstream-75dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bitstream-75dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="75dpi X11 fonts from Bitstream" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-bitstream-75dpi-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650 font-bitstream-75dpi-1.0.3.tar.bz2" diff --git a/user/font-bitstream-speedo/APKBUILD b/user/font-bitstream-speedo/APKBUILD new file mode 100644 index 000000000..dcee83640 --- /dev/null +++ b/user/font-bitstream-speedo/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bitstream-speedo +pkgver=1.0.2 +pkgrel=0 +pkgdesc="Speedo X11 fonts from Bitstream" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir mkfontscale" +makedepends="util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-bitstream-speedo-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + + find "$pkgdir" -name fonts.scale -exec rm {} + +} + +sha512sums="78816cc0dd0c9ba3f1de6ba39754bdf19253fea3583ef1bf459ead4b74f2587bc38bbc0bfdc5066a8055c1c45091e44987f6d15e98b6cf4ee18f60c2431349fb font-bitstream-speedo-1.0.2.tar.bz2" diff --git a/user/font-bitstream-type1/APKBUILD b/user/font-bitstream-type1/APKBUILD new file mode 100644 index 000000000..328b0f874 --- /dev/null +++ b/user/font-bitstream-type1/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bitstream-type1 +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Type 1 X11 fonts from Bitstream" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="fontconfig mkfontdir mkfontscale" +makedepends="util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-bitstream-type1-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + + find "$pkgdir" -name fonts.scale -exec rm {} + +} + +sha512sums="71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61 font-bitstream-type1-1.0.3.tar.bz2" diff --git a/user/font-cronyx-cyrillic/APKBUILD b/user/font-cronyx-cyrillic/APKBUILD new file mode 100644 index 000000000..ee537b55b --- /dev/null +++ b/user/font-cronyx-cyrillic/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-cronyx-cyrillic +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Cyrillic X11 fonts from Cronyx" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-cronyx-cyrillic-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456 font-cronyx-cyrillic-1.0.3.tar.bz2" diff --git a/user/font-cursor-misc/APKBUILD b/user/font-cursor-misc/APKBUILD index 8056a774b..fe6d4610b 100644 --- a/user/font-cursor-misc/APKBUILD +++ b/user/font-cursor-misc/APKBUILD @@ -1,20 +1,20 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-cursor-misc pkgver=1.0.3 -pkgrel=2 -pkgdesc="Cursor fonts from X.Org" +pkgrel=3 +pkgdesc="X11 cursor fonts" url="https://www.X.Org/" arch="noarch" -options="!check" # Can't test fonts. license="Public-Domain" -depends="encodings font-alias fontconfig mkfontdir mkfontscale util-macros" -makedepends="bdftopcf font-util-dev" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" prepare() { cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { @@ -22,18 +22,19 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - --with-fontdir=/usr/share/fonts/misc + --prefix=/usr make } +check() { + cd "$builddir" + make check +} + package() { cd "$builddir" - make -j1 DESTDIR="$pkgdir" \ - MKFONTDIR=: \ - MKFONTSCALE=: \ - FCCACHE=: \ - install + make -j1 DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + } sha512sums="7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83 font-cursor-misc-1.0.3.tar.bz2" diff --git a/user/font-daewoo-misc/APKBUILD b/user/font-daewoo-misc/APKBUILD new file mode 100644 index 000000000..a71dba0aa --- /dev/null +++ b/user/font-daewoo-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-daewoo-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="X11 fonts from Daewoo" +url="https://www.X.Org/" +arch="noarch" +license="X11" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-daewoo-misc-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06 font-daewoo-misc-1.0.3.tar.bz2" diff --git a/user/font-dec-misc/APKBUILD b/user/font-dec-misc/APKBUILD new file mode 100644 index 000000000..36045bbca --- /dev/null +++ b/user/font-dec-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-dec-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="X11 fonts from Digital" +url="https://www.X.Org/" +arch="noarch" +license="X11" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-dec-misc-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6 font-dec-misc-1.0.3.tar.bz2" diff --git a/user/font-isas-misc/APKBUILD b/user/font-isas-misc/APKBUILD new file mode 100644 index 000000000..6dd2a8b08 --- /dev/null +++ b/user/font-isas-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-isas-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Chinese X11 fonts from Academia Sinica" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-isas-misc-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b font-isas-misc-1.0.3.tar.bz2" diff --git a/user/font-jis-misc/APKBUILD b/user/font-jis-misc/APKBUILD new file mode 100644 index 000000000..67cad5057 --- /dev/null +++ b/user/font-jis-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-jis-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Japanese Industrial Standard X11 fonts" +url="https://www.X.Org/" +arch="noarch" +license="Public-Domain" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-jis-misc-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c font-jis-misc-1.0.3.tar.bz2" diff --git a/user/font-micro-misc/APKBUILD b/user/font-micro-misc/APKBUILD new file mode 100644 index 000000000..7c72642fe --- /dev/null +++ b/user/font-micro-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-micro-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Smol X11 font" +url="https://www.X.Org/" +arch="noarch" +license="Public-Domain" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-micro-misc-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69 font-micro-misc-1.0.3.tar.bz2" diff --git a/user/font-misc-cyrillic/APKBUILD b/user/font-misc-cyrillic/APKBUILD new file mode 100644 index 000000000..e66c9ccd8 --- /dev/null +++ b/user/font-misc-cyrillic/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-misc-cyrillic +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Cyrillic X11 fonts" +url="https://www.X.Org/" +arch="noarch" +license="MIT AND Public-Domain" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf mkfontdir util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-misc-cyrillic-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf font-misc-cyrillic-1.0.3.tar.bz2" diff --git a/user/font-misc-ethiopic/APKBUILD b/user/font-misc-ethiopic/APKBUILD new file mode 100644 index 000000000..e04621e66 --- /dev/null +++ b/user/font-misc-ethiopic/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-misc-ethiopic +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Ethiopic X11 fonts" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir mkfontscale" +makedepends="util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-misc-ethiopic-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + + find "$pkgdir" -name fonts.scale -exec rm {} + +} + +sha512sums="b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d font-misc-ethiopic-1.0.3.tar.bz2" diff --git a/user/font-misc-misc/APKBUILD b/user/font-misc-misc/APKBUILD index 6a8278eac..1a7cf7b53 100644 --- a/user/font-misc-misc/APKBUILD +++ b/user/font-misc-misc/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-misc-misc pkgver=1.1.2 -pkgrel=2 -pkgdesc="Miscellaneous fonts included with X.Org" +pkgrel=3 +pkgdesc="Miscellaneous X11 fonts included with X.Org" url="https://www.X.Org/" arch="noarch" -options="!check" # Can't test fonts. license="Public-Domain" -depends="encodings font-alias fontconfig mkfontdir mkfontscale util-macros" -makedepends="bdftopcf font-util-dev" +depends="encodings font-alias fontconfig mkfontdir mkfontscale" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" prepare() { @@ -22,19 +22,19 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - --with-fontdir=/usr/share/fonts/misc + --prefix=/usr make } +check() { + cd "$builddir" + make check +} + package() { cd "$builddir" - make -j1 \ - DESTDIR="$pkgdir" \ - MKFONTDIR=: \ - MKFONTSCALE=: \ - FCCACHE=: \ - install + make -j1 DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + } sha512sums="d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74 font-misc-misc-1.1.2.tar.bz2" diff --git a/user/font-mutt-misc/APKBUILD b/user/font-mutt-misc/APKBUILD new file mode 100644 index 000000000..62a4437ff --- /dev/null +++ b/user/font-mutt-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-mutt-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="MUTT X11 font family" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-mutt-misc-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db font-mutt-misc-1.0.3.tar.bz2" diff --git a/user/font-schumacher-misc/APKBUILD b/user/font-schumacher-misc/APKBUILD new file mode 100644 index 000000000..4b3008fe5 --- /dev/null +++ b/user/font-schumacher-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-schumacher-misc +pkgver=1.1.2 +pkgrel=0 +pkgdesc="X11 fonts from Dale Schumacher" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-schumacher-misc-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a font-schumacher-misc-1.1.2.tar.bz2" diff --git a/user/font-screen-cyrillic/APKBUILD b/user/font-screen-cyrillic/APKBUILD new file mode 100644 index 000000000..8dc59ebe6 --- /dev/null +++ b/user/font-screen-cyrillic/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-screen-cyrillic +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Cyrillic X11 fonts" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-screen-cyrillic-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51 font-screen-cyrillic-1.0.4.tar.bz2" diff --git a/user/font-sony-misc/APKBUILD b/user/font-sony-misc/APKBUILD index cb7690e89..7ce54a805 100644 --- a/user/font-sony-misc/APKBUILD +++ b/user/font-sony-misc/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-sony-misc pkgver=1.0.3 -pkgrel=2 -pkgdesc="Sony fonts" +pkgrel=3 +pkgdesc="X11 fonts from Sony" url="https://www.X.Org/" arch="noarch" -options="!check" # Cannot test a font. license="MIT" depends="encodings font-alias fontconfig mkfontdir mkfontscale" -makedepends="bdftopcf font-util-dev" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" prepare() { @@ -22,18 +22,19 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - --with-fontdir=/usr/share/fonts/misc + --prefix=/usr make } +check() { + cd "$builddir" + make check +} + package() { cd "$builddir" - make -j1 DESTDIR="$pkgdir" \ - MKFONTDIR=: \ - MKFONTSCALE=: \ - FCCACHE=: \ - install + make -j1 DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + } sha512sums="c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d font-sony-misc-1.0.3.tar.bz2" diff --git a/user/font-sun-misc/APKBUILD b/user/font-sun-misc/APKBUILD new file mode 100644 index 000000000..e004d9738 --- /dev/null +++ b/user/font-sun-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-sun-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="X11 fonts from Sun Microsystems" +url="https://www.X.Org/" +arch="noarch" +license="X11" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-sun-misc-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275 font-sun-misc-1.0.3.tar.bz2" diff --git a/user/font-winitzki-cyrillic/APKBUILD b/user/font-winitzki-cyrillic/APKBUILD new file mode 100644 index 000000000..03e93b01f --- /dev/null +++ b/user/font-winitzki-cyrillic/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-winitzki-cyrillic +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Cyrillic X11 fonts from Serge Winitzki" +url="https://www.X.Org/" +arch="noarch" +license="Public-Domain" +depends="encodings font-alias fontconfig mkfontdir" +makedepends="bdftopcf util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-winitzki-cyrillic-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7 font-winitzki-cyrillic-1.0.3.tar.bz2" diff --git a/user/font-xfree86-type1/APKBUILD b/user/font-xfree86-type1/APKBUILD new file mode 100644 index 000000000..f82b76bcf --- /dev/null +++ b/user/font-xfree86-type1/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-xfree86-type1 +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Type 1 X11 fonts from the XFree86 project" +url="https://www.X.Org/" +arch="noarch" +license="X11" +depends="fontconfig mkfontdir mkfontscale" +makedepends="util-macros" +subpackages="" +source="https://www.x.org/releases/individual/font/font-xfree86-type1-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + + find "$pkgdir" -name fonts.scale -exec rm {} + +} + +sha512sums="2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c font-xfree86-type1-1.0.4.tar.bz2" diff --git a/user/fonttosfnt/APKBUILD b/user/fonttosfnt/APKBUILD new file mode 100644 index 000000000..62d1ddcae --- /dev/null +++ b/user/fonttosfnt/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fonttosfnt +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Wrap X11 bitmap fonts in TrueType containers" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="freetype-dev libfontenc-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/fonttosfnt-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="dba990098c95b07bc7240699a5c9ea11f056fbfddd70f669ae283548cbf20d756b28d817a99548c23ba81de9792877296ab6f35ee3c630e5c3cd8f14650ce297 fonttosfnt-1.0.5.tar.bz2" diff --git a/user/freetds/APKBUILD b/user/freetds/APKBUILD index 9bb50f742..ec1d26e66 100644 --- a/user/freetds/APKBUILD +++ b/user/freetds/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=freetds -pkgver=1.00.104 +pkgver=1.00.109 pkgrel=0 pkgdesc="Tabular Datastream Library" url="http://www.freetds.org/" @@ -40,5 +40,5 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="e1a1f2831bd893cc738e0e5029512d60e38ca3e26ad0df59916cb100dd90f9bf2a82273533a316928dc6152d80266692415dd2e16a8f7edb029c3439ebe8986c freetds-1.00.104.tar.gz +sha512sums="0c0742414aea533635a9d9b550d0cde10c14226a48d5ec9d353dfa07199d6788ae505e8e671945003a824a4049f11ddac1e4229eed51ac795c91dbf16ed6a4ef freetds-1.00.109.tar.gz d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6 fix-includes.patch" diff --git a/user/fslsfonts/APKBUILD b/user/fslsfonts/APKBUILD new file mode 100644 index 000000000..5734d3301 --- /dev/null +++ b/user/fslsfonts/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fslsfonts +pkgver=1.0.5 +pkgrel=0 +pkgdesc="List fonts offered by an X font server" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libfs-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/fslsfonts-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3a30598ace981c7396bfe44f0d8f76d40fca3f77158dceb3914a524594a12187dcad0b0f225fa81f251f0b7896bf046cec4ba610b4676da9be311eec5d8c6cc2 fslsfonts-1.0.5.tar.bz2" diff --git a/user/fstobdf/APKBUILD b/user/fstobdf/APKBUILD new file mode 100644 index 000000000..0c39dcfba --- /dev/null +++ b/user/fstobdf/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fstobdf +pkgver=1.0.6 +pkgrel=0 +pkgdesc="Create X11 bitmap font from font server font" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libfs-dev util-macros libx11-dev xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/fstobdf-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="ec5b8f62019ba51725bb47241d4fc244412f354e7c12094ed884109a88e3db9d25d41a6142fd002e6c49877b4c7f2c5dde549682dcc05f7ce102621d2c71671f fstobdf-1.0.6.tar.bz2" diff --git a/user/garcon/APKBUILD b/user/garcon/APKBUILD index 01174f637..953bb230e 100644 --- a/user/garcon/APKBUILD +++ b/user/garcon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=garcon -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=0 pkgdesc="freedesktop.org menu library for the XFCE desktop environment" url="https://xfce.org" @@ -12,7 +12,6 @@ makedepends="intltool glib-dev libxfce4util-dev gtk+3.0-dev libxfce4util-dev subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" langdir="/usr/lib/locale" source="http://archive.xfce.org/src/xfce/garcon/0.6/garcon-$pkgver.tar.bz2" -sha512sums="36c5b1ba3c91e613853cd5e986176c8cbd2a509fafde1b302334deda872b7f7073fd06ba341220b030d8d5728346b7339368190b225203f33c023dd96f3ed1a3 garcon-0.6.1.tar.bz2" build() { cd "$builddir" @@ -36,3 +35,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="7a96c33b47302fa989862098bc5b8ed64515a60e19a4b8dbb049398cf847d64584f93f85b1f6e1327653b22f0b44a805b737258bbc9ac69197639ef7f13f20b1 garcon-0.6.2.tar.bz2" diff --git a/user/gnupg/APKBUILD b/user/gnupg/APKBUILD index 9cf3b093a..400967285 100644 --- a/user/gnupg/APKBUILD +++ b/user/gnupg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnupg -pkgver=2.2.10 +pkgver=2.2.11 pkgrel=0 pkgdesc="GNU Privacy Guard 2 - PGP replacement" url="https://www.gnupg.org/" @@ -41,6 +41,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a4477828f268fa69125cf1822f8a721e67f8f4008bd9817b701989393bd93689aac8fee1f4d34d918911d53afabdcbb1c84d40e8a4489d7a29b5a769d330fddd gnupg-2.2.10.tar.bz2 +sha512sums="8aa8beea877993b6eef155e1a503ffdde9963ff04a24e6a3dea7979efeeeeeab57e942a80ad46ef254d27a83e8cb2e3008da7749afa8e39eade190c0499f95d9 gnupg-2.2.11.tar.bz2 c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch" diff --git a/user/gobject-introspection/APKBUILD b/user/gobject-introspection/APKBUILD index 0a45a5fe1..85345d331 100644 --- a/user/gobject-introspection/APKBUILD +++ b/user/gobject-introspection/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=gobject-introspection -pkgver=1.58.0 -pkgrel=0 +pkgver=1.58.2 +pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" arch="all" @@ -13,7 +13,9 @@ makedepends="$depends_dev bison flex glib-dev libffi-dev meson ninja python3-dev checkdepends="sed" subpackages="$pkgname-doc $pkgname-dev" replaces="libgirepository" -source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" +source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + we-are-in-a-pickle.patch + " prepare() { cd "$builddir" @@ -46,4 +48,5 @@ dev() { replaces="gobject-introspection" } -sha512sums="838fda0ddf1889f402eb03edbb82ace28b01b2392fb62be9bb32721aa7aadca6e906f9286c54c2c90d15cd77b258513eb939f2992daf726089755e23a8a17b78 gobject-introspection-1.58.0.tar.xz" +sha512sums="b516527a910702b26f8034ded463bdd28bb9db782ac77947ac2178ae3a41bd9e0390fff6155aca6e9ec92c6cf051314134322efae6937bd9cbcb4033df65c677 gobject-introspection-1.58.2.tar.xz +106e36c04ab9035b92d7f34251c3af2c37fbbc538d2b96027735565df74314eb90a93288f1bc62c08742ff6ba525d72ea03306e3b32f48724a09548788466d3d we-are-in-a-pickle.patch" diff --git a/user/gobject-introspection/we-are-in-a-pickle.patch b/user/gobject-introspection/we-are-in-a-pickle.patch new file mode 100644 index 000000000..5262e2887 --- /dev/null +++ b/user/gobject-introspection/we-are-in-a-pickle.patch @@ -0,0 +1,28 @@ +From 945438608433a554b8d7077af648d60a9daf59f9 Mon Sep 17 00:00:00 2001 +From: Christoph Reiter <reiter.christoph@gmail.com> +Date: Sat, 8 Dec 2018 18:44:31 +0100 +Subject: [PATCH] cachestore: don't try to catch nonexisting + pickle.BadPickleGet. Fixes #159 + +pickle.loads() can pretty much throw any kind of exception and we can't +handle it besides ignoring it, so just catch all. +--- + giscanner/cachestore.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/giscanner/cachestore.py b/giscanner/cachestore.py +index 58b3193c..857dc725 100644 +--- a/giscanner/cachestore.py ++++ b/giscanner/cachestore.py +@@ -178,7 +178,7 @@ class CacheStore(object): + return None + try: + data = pickle.load(fd) +- except (AttributeError, EOFError, ValueError, pickle.BadPickleGet): ++ except Exception: + # Broken cache entry, remove it + self._remove_filename(store_filename) + data = None +-- +2.18.1 + diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index 605f4de3e..1b05bffec 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gvim _pkgreal=vim -pkgver=8.1.0490 +pkgver=8.1.0606 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -74,4 +74,4 @@ package() { ln -s gvim rgvim } -sha512sums="1237ad835f65699ca095fbae4ac1039807638d4de7cc00ec83a56ba975ba224103740f6d6ee9e15b0135bc444eef747a5e15b88346e32f7ae4d436f183a44935 vim-8.1.0490.tar.gz" +sha512sums="df02717611d7b2f54f3b60ff9f73259a6ff3228b841d7d2d429fa0eedd98ce0a140a6a3839b50bd67ce5724d86f816042d6cbb0930fd040d30216f98f2d7e6ec vim-8.1.0606.tar.gz" diff --git a/user/highlight/APKBUILD b/user/highlight/APKBUILD index b2860f006..4e1f96eb5 100644 --- a/user/highlight/APKBUILD +++ b/user/highlight/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=highlight -pkgver=3.47 +pkgver=3.48 pkgrel=0 pkgdesc="Fast and flexible source code highlighter" url="http://www.andre-simon.de/doku/highlight/highlight.html" @@ -22,4 +22,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="286dcc0db33c8b250852f7b607eb313afbd83da7ead6bde8a35ed5b7f59438b0345725a31dd5969347af10aba0c981f6bf2ce5683b801c45ee27b2b3c6ed21ed highlight-3.47.tar.bz2" +sha512sums="b6508c3f0ed108126d07690b3ea878ac68814ae15ae3986096b2325f90d997bf467f2b3eeaa89da4feb2b8b39393a44e2ee0b89dc4584a7a7d4ca57475397451 highlight-3.48.tar.bz2" diff --git a/user/hunspell/APKBUILD b/user/hunspell/APKBUILD index 979afbf9f..6222d58a5 100644 --- a/user/hunspell/APKBUILD +++ b/user/hunspell/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=hunspell -pkgver=1.6.2 -pkgrel=2 +pkgver=1.7.0 +pkgrel=0 pkgdesc="Spell checker and morphological analyzer library and program" url="https://hunspell.github.io/" arch="all" @@ -38,4 +38,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11 hunspell-1.6.2.tar.gz" +sha512sums="8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 hunspell-1.7.0.tar.gz" diff --git a/user/ico/APKBUILD b/user/ico/APKBUILD new file mode 100644 index 000000000..8f6c2d7dd --- /dev/null +++ b/user/ico/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ico +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Example animation for testing X.Org" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/ico-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6 ico-1.0.5.tar.bz2" diff --git a/user/imagemagick/APKBUILD b/user/imagemagick/APKBUILD index 5a9989bdb..9f8cdbae9 100644 --- a/user/imagemagick/APKBUILD +++ b/user/imagemagick/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=imagemagick -pkgver=7.0.8.14 +pkgver=7.0.8.17 _abiver=7 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 @@ -81,4 +81,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="0a5f3357f4ce5b245d60b178d81b58c3483effb45b669791d4686514a8c3b0ad04244e31caf0a4a614e73e3e071c17d851992670917ebcf2761c977d77c58dd6 ImageMagick-7.0.8-14.tar.xz" +sha512sums="b55408059f85b6fcecae40ccb0a924d73936f6877454cd5ed03e9e0b338ddc9954e0b4c089a2c7545d444deaba24fe90c69a3bb218a6d6165ebe782f6e9413e1 ImageMagick-7.0.8-17.tar.xz" diff --git a/user/itstool/APKBUILD b/user/itstool/APKBUILD index 6d6b66814..7fdfc40cc 100644 --- a/user/itstool/APKBUILD +++ b/user/itstool/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=itstool -pkgver=2.0.4 -pkgrel=4 +pkgver=2.0.5 +pkgrel=0 pkgdesc="ITS-based XML translation tool" url="http://itstool.org/" arch="noarch" @@ -38,5 +38,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f5cfa9c75710f9cc43a61caeb92ca04ec77023bce6fb14d770dda82efde2e5d9050245618c249d309227a3d43555cb1739f5fe680b4a370786ed4631fa9ee4b7 itstool-2.0.4.tar.bz2 +sha512sums="67c55b83e43b5a4626a6633305b2e48a06a5defdf7725e78b00409edea213d166cb3d870a58eb402c48968bddd7c1778d9852acfa0ddebdd363f34ac13f32aa7 itstool-2.0.5.tar.bz2 eb426e7cc9f151154f47b93ef46d6fcfb5fa0982be3bf78863ebf5ea009a89de252a6c63dfb090d76003c47107ebb5d1ac2a7d1ef7db08defe19e32f996dbdbd fix-segfault.patch" diff --git a/user/kactivitymanagerd/APKBUILD b/user/kactivitymanagerd/APKBUILD index b6bea08a8..0cc1627dc 100644 --- a/user/kactivitymanagerd/APKBUILD +++ b/user/kactivitymanagerd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivitymanagerd -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Service to manage KDE Plasma activities" url="https://www.kde.org/" @@ -46,4 +46,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ddd088b7d947e589e173eeefc005d6ab6c58f6588a851d21b5c27e9d106881c4950045b74592dd56749465ca46c10762fd704a86a97588b1c34cdc6fd9d72d2 kactivitymanagerd-5.12.6.tar.xz" +sha512sums="3825a79e9f1092af177606d8eb4acaeb0a7022eecc09a5066d6f8f404319e313bc16c7d5f8c22e34f19cbfbfd1dfabd1e01c8df954f8cbdd147c06492ce67245 kactivitymanagerd-5.12.7.tar.xz" diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD new file mode 100644 index 000000000..68dc6519c --- /dev/null +++ b/user/kcachegrind/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kcachegrind +pkgver=18.08.3 +pkgrel=0 +pkgdesc="Profile data visualisation tool and call graph viewer" +url="https://kcachegrind.github.io/html/Home.html" +arch="all" +license="GPL-2.0-only" +depends="binutils graphviz" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev + karchive-dev kconfig-dev kcoreaddons-dev kdoctools-dev ki18n-dev kio-dev + kwidgetsaddons-dev kxmlgui-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/applications/$pkgver/src/kcachegrind-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="abbbf7ba539da1fa71d31e4603d1b8a76178a48bf503c735ebce9bbc9887e9ec64b2338ce77de2f38114faa27dee51e19af61cf4d3e9fbbe942a417edf2558c1 kcachegrind-18.08.3.tar.xz" diff --git a/user/kde-cli-tools/APKBUILD b/user/kde-cli-tools/APKBUILD index bc87f1d58..1bc604c64 100644 --- a/user/kde-cli-tools/APKBUILD +++ b/user/kde-cli-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-cli-tools -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE command-like utilities" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f45a0781660609bbbfa3a7b1cf3fe16cc8a29797061f0ddaeab1182d3065442c167a5fdfa43fab84d5dcc382a6b393138d63ea68e5615fbd93c5cd76b121872d kde-cli-tools-5.12.6.tar.xz" +sha512sums="44dd8a9b999dd0f4fb9f5953da7b9af805ba0508b18bbcb8420418049318b095d9553b1723e1ddab8b7d3d48ed42ca75fb0ede17043c2a82c95769938130ad77 kde-cli-tools-5.12.7.tar.xz" diff --git a/user/kde-gtk-config/APKBUILD b/user/kde-gtk-config/APKBUILD index b7f88f151..cf0ef1c81 100644 --- a/user/kde-gtk-config/APKBUILD +++ b/user/kde-gtk-config/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-gtk-config -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE System Settings panel for configuring GTK+ application styles" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="05682cf2acef5532aef62b68ca4c3602df1a0141fe791cc0ad3b7ea7893e00327b3b98d515c95db4333e4e6a7c19b3b98f7d9a47e551c571d5492591f7225882 kde-gtk-config-5.12.6.tar.xz" +sha512sums="b6698fba63f5a9d3d58112ecd2c198e9edb9b0ad9d6c8a670bef3f0e836fcf0c5f2c5444d6cbdf7370f2bfcfe5ad8a770b513ebb7a693c19624bf52bf9d02056 kde-gtk-config-5.12.7.tar.xz" diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD index 07eea36a0..2d45df4ff 100644 --- a/user/kde-system/APKBUILD +++ b/user/kde-system/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-system pkgver=18.08.3 -pkgrel=0 +pkgrel=1 pkgdesc="System utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/system/" arch="noarch" options="!check" # Empty meta package, no point in testing. license="NCSA" depends="dolphin kdf khelpcenter kinfocenter konsole krfb ksysguard ksystemlog - kwalletmanager xdg-utils yakuake" + kwalletmanager partitionmanager xdg-utils yakuake" makedepends="" source="org.adelie-linux.about-system.desktop" diff --git a/user/kde/APKBUILD b/user/kde/APKBUILD new file mode 100644 index 000000000..1538ef0f5 --- /dev/null +++ b/user/kde/APKBUILD @@ -0,0 +1,17 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kde +pkgver=5 +pkgrel=0 +pkgdesc="The K Desktop Environment" +url="https://www.kde.org/" +arch="noarch" +license="NCSA" +options="!check" # Metapacakge +subpackages="" +depends="adelie-kde-theme kde-education kde-games kde-graphics kde-multimedia + kde-system kde-utilities plasma-desktop" +source="" + +package() { + mkdir -p $pkgdir +} diff --git a/user/kdecoration/APKBUILD b/user/kdecoration/APKBUILD index 913d98e0b..31d3b27db 100644 --- a/user/kdecoration/APKBUILD +++ b/user/kdecoration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdecoration -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Window decoration plugin library" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1d31414f8d2bd8b82c1c09aca1b76f5efb60200411f1606d543f5b27ed470df4dcb891481cf58d80d2f411ccccf2f6eb4dae6064d5e3a7a2a7c51d354b562691 kdecoration-5.12.6.tar.xz" +sha512sums="acebb17f42e46dfcb57b5f94e2612e0c4f773ad15e911543281c578de4a409b8f65a028b458afd01f578abb69906316b3c6f2b6d6edd4918b302a8a26227ad95 kdecoration-5.12.7.tar.xz" diff --git a/user/kdeplasma-addons/APKBUILD b/user/kdeplasma-addons/APKBUILD index ab283e343..0c929b5f6 100644 --- a/user/kdeplasma-addons/APKBUILD +++ b/user/kdeplasma-addons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdeplasma-addons -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Extra applets and toys for KDE Plasma" url="https://www.kde.org/" @@ -49,4 +49,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5bf0834d204b4ec1dfeb80ca52d4babd067768e77f5937280573608b59099f535065c2804bf2359651f9d8d78e310fec598de55bbcb0089a54e3c8d52c00daf9 kdeplasma-addons-5.12.6.tar.xz" +sha512sums="7af90cee5605dd1b3548c033216b57128e3ef99043168a165b75d3a97fd54794182ffb97846bac91cf806ba4e1a82365a5d61c58f8537de43364c626de392bc7 kdeplasma-addons-5.12.7.tar.xz" diff --git a/user/kinfocenter/APKBUILD b/user/kinfocenter/APKBUILD index 81e5c3807..ad9169bfc 100644 --- a/user/kinfocenter/APKBUILD +++ b/user/kinfocenter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kinfocenter -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Information about the running computer" url="https://www.kde.org/applications/system/kinfocenter/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="521d588d73bb32fa2020b8c4faacbdaa86e65fca421829566fb9a21a15750f6d9c912c2d948f8a11ffcd304d51d5f062c79147fc8703c345fd4a1153dc937ff6 kinfocenter-5.12.6.tar.xz" +sha512sums="440e1d9c6be280fee95681148f6f9c069529431f3367fd5938663afa840cd191c85fd995b9a0a4fb6ae143d2c74415cafcfc99e4a7d7e25dc99fdd3820608f9b kinfocenter-5.12.7.tar.xz" diff --git a/user/kpmcore/APKBUILD b/user/kpmcore/APKBUILD new file mode 100644 index 000000000..102059e09 --- /dev/null +++ b/user/kpmcore/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kpmcore +pkgver=3.3.0 +pkgrel=0 +pkgdesc="Core routines for KDE Partition Manager" +url="https://www.kde.org/applications/system/kdepartitionmanager" +arch="all" +license="LGPL-2.1+" +depends="" +depends_dev="libatasmart-dev parted-dev qt5-qtbase-dev" +makedepends="$depends_dev cmake extra-cmake-modules kcoreaddons-dev ki18n-dev + kwidgetsaddons-dev util-linux-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/kpmcore/$pkgver/src/kpmcore-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="62a0a341fbbec426291e2c9dd183a20466fce48ffaa360dd816c58402ee03c1f61c4ef7887d0a66c4693d77c2183a5da3477b828ba4ac2ed405f684ffb27125e kpmcore-3.3.0.tar.xz" diff --git a/user/krb5/APKBUILD b/user/krb5/APKBUILD index 84d2855a9..c3d8ad2ff 100644 --- a/user/krb5/APKBUILD +++ b/user/krb5/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krb5 -pkgver=1.16.1 +pkgver=1.16.2 pkgrel=0 case $pkgver in *.*.*) _ver=${pkgver%.*};; @@ -96,7 +96,7 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="fa4ec14a4ffe690861e2dd7ea39d7698af2058ce181bb733ea891f80279f4dde4bb891adec5ccb0eaddf737306e6ceb1fe3744a2946e6189a7d7d2dd3bc5ba84 krb5-1.16.1.tar.gz +sha512sums="738c071a90e0f38680bb17bdcf950310bc4549f3cb851e1d34de11239ae88178e6ee1a5e5d48c6d3efef544339b07d22dba5347dd763a4266d8d4df7cf47afc9 krb5-1.16.2.tar.gz 5a3782ff17b383f8cd0415fd13538ab56afd788130d6ad640e9f2682b7deaae7f25713ce358058ed771091040dccf62a3bc87e6fd473d505ec189a95debcc801 mit-krb5_krb5-config_LDFLAGS.patch 43b9885b7eb8d0d60920def688de482f2b1701288f9acb1bb21dc76b2395428ff304961959eb04ba5eafd0412bae35668d6d2c8223424b9337bc051eadf51682 krb5kadmind.initd ede15f15bbbc9d0227235067abe15245bb9713aea260d397379c63275ce74aea0db6c91c15d599e40c6e89612d76f3a0f8fdd21cbafa3f30d426d4310d3e2cec krb5kdc.initd diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD index 1760cb88e..5157a19ff 100644 --- a/user/kscreenlocker/APKBUILD +++ b/user/kscreenlocker/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kscreenlocker -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Secure X11 screen locker" url="https://www.kde.org/" @@ -48,6 +48,6 @@ package() { install -m644 "$srcdir"/kde-np.pam "$pkgdir"/etc/pam.d/kde-np } -sha512sums="4d9320027b8c3150f75bb2afeb4c708f0230a9cfe239c28edf5db1c90e247a391a7643f876b3d9afd9e6afadb830f962b05c05125d11253f5542aac2b48f8956 kscreenlocker-5.12.6.tar.xz +sha512sums="76554e8ad6872705e903bda5f55f650d859b282b400ca739f346e392ce7961891057c8a8a43b5dcb85c83860e4744252500c338e5d99fd67a33df529a7e040c6 kscreenlocker-5.12.7.tar.xz 56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3 kde.pam 565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd kde-np.pam" diff --git a/user/ksysguard/APKBUILD b/user/ksysguard/APKBUILD index 45feb6a49..33810d40e 100644 --- a/user/ksysguard/APKBUILD +++ b/user/ksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksysguard -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE system monitor utility" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ca0d21e6ed8fc8b042c6a0fbbfd0fa57811bf0e90da323df32c7905f8ce96155b67916d3038f8a993ab8e12383c1a3131d5d3bfb028cc374ea46129046f5ad81 ksysguard-5.12.6.tar.xz +sha512sums="745958c74914d9b21373919b0e54cf7d1dd0621769aa8a480bac924862c494c68c86fa36c019fb13d71d8d86c8d923161290ef9a967b98c1182df88da63bbb35 ksysguard-5.12.7.tar.xz 13a26451c459cff1d3b00af27c953d10c55e7e8f43ef7a6f0f54dd05dcb612546545c0170089e9499bb041f004cdacf19cb112d247a8ccf8fd4e77fea0d1c8bc ksysguard-5.6.5-rindex-header.patch" diff --git a/user/kwin/APKBUILD b/user/kwin/APKBUILD index 28dc12821..e25ff42ac 100644 --- a/user/kwin/APKBUILD +++ b/user/kwin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwin -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Modern, stylish window manager (requires OpenGL)" url="https://www.kde.org/" @@ -52,4 +52,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ee9edab9d63d86e95c7853ecfb60e440c6cfcb49252040a36fb9bd61b78ee90290fe276be4cc504acf2a31abdafd8693f23b6165432fd9aa23f5cdb08d3706ee kwin-5.12.6.tar.xz" +sha512sums="acb58cd5681727aa2ebcfb75d2abc3ea636811b490d8b15a4b89e55cfb81ce8aeed9568a52d4d1c3274852f26823ec5301a6721d9be64ba9a2b65e04f6029760 kwin-5.12.7.tar.xz" diff --git a/user/lbxproxy/APKBUILD b/user/lbxproxy/APKBUILD new file mode 100644 index 000000000..f72865a4f --- /dev/null +++ b/user/lbxproxy/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=lbxproxy +pkgver=1.0.3 +pkgrel=0 +pkgdesc="X11 proxy server for the Low Bandwidth extension" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libice-dev liblbxutil-dev libx11-dev libxext-dev util-macros + xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/lbxproxy-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + chmod a+w config.sub + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e025101ba6743f98717958c3ff561df3f0fea7b491b2a41639cb8a84ffe9d82d980dcaaa8f50408e3a1a8ecfbd29fbe599a16a0f5de454b05ff82bc2629f68f2 lbxproxy-1.0.3.tar.bz2" diff --git a/user/libcanberra/APKBUILD b/user/libcanberra/APKBUILD index 9e105c892..9d2431be0 100644 --- a/user/libcanberra/APKBUILD +++ b/user/libcanberra/APKBUILD @@ -14,7 +14,7 @@ depends_dev="alsa-lib-dev gstreamer-dev gtk+2.0-dev gtk+3.0-dev libogg-dev makedepends="$depends_dev lynx" subpackages="$pkgname-dev $pkgname-doc $pkgname-gtk2 $pkgname-gtk3 $pkgname-gstreamer $pkgname-pulse" -source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz" +source="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.xz" prepare() { cd "$builddir" diff --git a/user/libcddb/APKBUILD b/user/libcddb/APKBUILD index de8b4f6ff..f28442f59 100644 --- a/user/libcddb/APKBUILD +++ b/user/libcddb/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=libcddb pkgver=1.3.2 -pkgrel=4 +pkgrel=5 pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)." url="https://sourceforge.net/projects/libcddb/" arch="all" @@ -12,7 +12,9 @@ license="LGPL-2.0+" depends="" makedepends="" subpackages="$pkgname-dev" -source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + connect-ppc64.patch + " prepare() { cd "$builddir" @@ -37,4 +39,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a libcddb-1.3.2.tar.bz2" +sha512sums="0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a libcddb-1.3.2.tar.bz2 +70f6644c7b4f40d556d81b87bcdf7a07b96f48dd741a25c6918c44bc38edd2598cc46f50a23d7c77ea8d98c9193c7ef589c277801a7ac098e9845b0a7f086993 connect-ppc64.patch" diff --git a/user/libcddb/connect-ppc64.patch b/user/libcddb/connect-ppc64.patch new file mode 100644 index 000000000..0c79fdc4d --- /dev/null +++ b/user/libcddb/connect-ppc64.patch @@ -0,0 +1,41 @@ +--- libcddb-1.3.2/lib/cddb_net.c.old 2009-03-01 03:28:07.000000000 +0000 ++++ libcddb-1.3.2/lib/cddb_net.c 2019-01-03 06:43:42.480000000 +0000 +@@ -273,7 +273,7 @@ + int timeout_connect(int sockfd, const struct sockaddr *addr, + size_t len, int timeout) + { +- int got_error = 0; ++ int got_error = 0, conn_result; + + /* set socket to non-blocking */ + #ifdef BEOS +@@ -299,7 +299,7 @@ + #endif /* BEOS */ + + /* try connecting */ +- if (connect(sockfd, addr, len) == -1) { ++ if ((conn_result = connect(sockfd, addr, len)) == -1) { + /* check whether we can continue */ + if (errno == EINPROGRESS) { + int rv; +@@ -333,6 +333,9 @@ + } + } + } ++ } else if (conn_result == 0) { ++ /* it worked without needing timeout */ ++ got_error = 0; + } else { + /* connect failed */ + got_error = -1; +--- libcddb-1.3.2/lib/cddb_net.c.old 2009-03-01 03:28:07.000000000 +0000 ++++ libcddb-1.3.2/lib/cddb_net.c 2019-01-03 07:30:27.050000000 +0000 +@@ -325,6 +325,8 @@ + default: + /* we got connected, check error condition */ + l = sizeof(rv); ++ /* Work around Linux/ppc64 bug */ ++ rv = 0; + getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &rv, &l); + if (rv) { + /* something went wrong, simulate normal connect behaviour */ diff --git a/user/libetpan/APKBUILD b/user/libetpan/APKBUILD new file mode 100644 index 000000000..386ec21e5 --- /dev/null +++ b/user/libetpan/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libetpan +pkgver=1.9.2 +pkgrel=0 +pkgdesc="Mail library for C" +url="https://www.etpan.org/libetpan.html" +arch="all" +license="BSD-3-Clause" +depends="" +depends_dev="" +makedepends="$depends_dev autoconf automake libtool + cyrus-sasl-dev db-dev expat-dev openssl-dev zlib-dev" +subpackages="$pkgname-dev" +source="libetpan-$pkgver.tar.gz::https://github.com/dinhviethoa/libetpan/archive/$pkgver.tar.gz" + +build() { + cd "$builddir" + ./autogen.sh \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3e2e1de77fae2212374e909d15ed8564eee90883c38fee0ca69f58785733b1ac2df848da1bda6f55577d647e0ad27bc3057199e70b6ef01f2a7e2823b24113ba libetpan-1.9.2.tar.gz" diff --git a/user/libfm/APKBUILD b/user/libfm/APKBUILD index a954db7e9..fc1021a8e 100644 --- a/user/libfm/APKBUILD +++ b/user/libfm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> # Maintainer: pkgname=libfm -pkgver=1.3.0.2 +pkgver=1.3.1 pkgrel=0 pkgdesc="Library for file management" url="https://wiki.lxde.org/en/PCManFM" @@ -38,4 +38,4 @@ dev() { replaces="libfm-extra-dev" } -sha512sums="179cc0350509cb1a8a60b89f8145169857926c7cc3dadb9f61078d4dba79709b248b3d05862e78c11747f1fc4e45825ad6f4916d423ae5e346e5274d34197445 libfm-1.3.0.2.tar.xz" +sha512sums="f385cf7bf2f4800c11dd6474cd20009cbe1208f1d08570b61954ea8bd84c56cc49880cbf84d4b2aa4b91eb6929d017ebc427649391059b786d7e6fc4535e4f14 libfm-1.3.1.tar.xz" diff --git a/user/libfontenc/APKBUILD b/user/libfontenc/APKBUILD index 508804ee8..666a58e81 100644 --- a/user/libfontenc/APKBUILD +++ b/user/libfontenc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libfontenc pkgver=1.1.3 -pkgrel=3 +pkgrel=4 pkgdesc="X11 font encoding library" url="https://www.X.Org/" arch="all" @@ -19,8 +19,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-static \ - --with-encodingsdir=/usr/share/fonts/encodings + --disable-static make } diff --git a/user/libfs/APKBUILD b/user/libfs/APKBUILD new file mode 100644 index 000000000..fd242d2f0 --- /dev/null +++ b/user/libfs/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libfs +pkgver=1.0.7 +pkgrel=0 +pkgdesc="X11 Font Server client library" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="xtrans" +depends_dev="util-macros" +makedepends="$depends_dev xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://www.x.org/releases/individual/lib/libFS-$pkgver.tar.bz2" +builddir="$srcdir/libFS-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3596e87710c14706ab345377799e9b2dbab79500fd75b4213f9615bf7db7df3265b4dbc65fdeca9d32343b848013780cfa1a43e76229665ce80246332bb8b96f libFS-1.0.7.tar.bz2" diff --git a/user/libgphoto2/APKBUILD b/user/libgphoto2/APKBUILD index 1654e66cf..76e277987 100644 --- a/user/libgphoto2/APKBUILD +++ b/user/libgphoto2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libgphoto2 -pkgver=2.5.20 +pkgver=2.5.21 pkgrel=0 pkgdesc="Digital camera library" url="http://www.gphoto.org" @@ -46,4 +46,4 @@ package() { "$pkgdir/lib/udev/rules.d/54-gphoto.rules" } -sha512sums="13364a8fdfe137a21ebf04dfd2b30b20c7fb652e11e1b98cd06176e9a1576ef8f67121523111395100ed39d1d3e6e5d6d458b86d58502f7056a1c06a5623640a libgphoto2-2.5.20.tar.bz2" +sha512sums="08e5d6a7b7603b92d3e24d3ee7843aa980525f25b7315e7ca6f17a6a1e059748471d9cf0b19392ea965cf0eb094386be275fcb5b97de1d9e7df6c66fe92a81c6 libgphoto2-2.5.21.tar.bz2" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index d334cfc01..76b3f44f7 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput -pkgver=1.12.2 +pkgver=1.12.3 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" @@ -34,4 +34,4 @@ package() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="f7122a1d18dd2d0072a34fd9897ebe25a065100b3754052d7ec133bddb56d5c2a5a94950cfc8366ef5d117180c28b3ff99b1a62f3ab95df5ac22f86721fbdc67 libinput-1.12.2.tar.xz" +sha512sums="cdc512cb53442ae85d5a23e10db9dd3548bcca0de24d7fcc48954a60773563d84d9b10278b6a693ade95d0789bb5d42bbb8b7cf1c178fe85401cb09a5402ff02 libinput-1.12.3.tar.xz" diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD index ac7096323..f5d322a6f 100644 --- a/user/libkscreen/APKBUILD +++ b/user/libkscreen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkscreen -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE Plasma screen management software" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="71c600e0a5d310fe075c9a82360ee176c575b7860e15372882126847e9b7a103ed088a5d616a0168139c7b36f81312ad1f5fd6371894e56d7a900db81c8e2316 libkscreen-5.12.6.tar.xz" +sha512sums="fb24d0f4f79468d4246e912f4b7e814df398911cdbd475e18263e89502ecca35c9e4974b7f0af92afa8cba3081056f8f27b0f051eb287c682dd37b35568b3c5c libkscreen-5.12.7.tar.xz" diff --git a/user/libksysguard/APKBUILD b/user/libksysguard/APKBUILD index 3af4475cc..f74519692 100644 --- a/user/libksysguard/APKBUILD +++ b/user/libksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libksysguard -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE system monitor library" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3dc937f43f03352df6f503eb0b2d493a8f7b9ab9f017e06ce5f8d111ca10690f98736b0f7c6b8942e99f192e9c9ba98b1c0fd2d8515e0ce416c775e000a13d9e libksysguard-5.12.6.tar.xz" +sha512sums="78a063606567632c19a7f1c9d2e7d69634432f3e49bb08a3162805aeb94e0930f2d43e9372207512558b785b8c7e20fdca801de35c055e456ac3cb812bd96efa libksysguard-5.12.7.tar.xz" diff --git a/user/liblbxutil/APKBUILD b/user/liblbxutil/APKBUILD new file mode 100644 index 000000000..def4dc83c --- /dev/null +++ b/user/liblbxutil/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=liblbxutil +pkgver=1.1.0 +pkgrel=0 +pkgdesc="Utility library for X11 Low Bandwidth extension" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="xorgproto-dev zlib-dev" +subpackages="$pkgname-dev" +source="https://www.x.org/releases/individual/lib/liblbxutil-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + chmod a+w config.sub + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="93bdefef297d46a301dd1cab35ad186438e340822ba5aac20e9d8f4c51cd66e4118b0d9f4afc48ef33a67c6e413f551bcb59089d01597ed175b400902b9f23f4 liblbxutil-1.1.0.tar.bz2" diff --git a/user/libpaper/APKBUILD b/user/libpaper/APKBUILD index 74ff2a04f..927b5e73a 100644 --- a/user/libpaper/APKBUILD +++ b/user/libpaper/APKBUILD @@ -1,8 +1,7 @@ # Maintainer: pkgname=libpaper -pkgver=1.1.24 -_pkgver=${pkgver}+nmu5 -pkgrel=5 +pkgver=1.1.26 +pkgrel=0 pkgdesc="Library for handling paper characteristics" url="https://packages.debian.org/unstable/source/libpaper" arch="all" @@ -11,8 +10,7 @@ license="GPL-2.0-only" subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="" -source="http://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_${_pkgver}.tar.gz" -builddir="$srcdir"/$pkgname-$_pkgver +source="http://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_$pkgver.tar.gz" prepare() { cd "$builddir" @@ -34,4 +32,4 @@ package() { make prefix="$pkgdir"/usr install } -sha512sums="4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56 libpaper_1.1.24+nmu5.tar.gz" +sha512sums="6c54d28004c2dc95cfcc58467026d87b1590d35c9acf09d85568be0c558a04c183e0657afe3278dc894825428372ae60ccf417ece955b7d358fd9ce7b3d78b76 libpaper_1.1.26.tar.gz" diff --git a/user/libpng/APKBUILD b/user/libpng/APKBUILD index 5b1a3352d..e3504e859 100644 --- a/user/libpng/APKBUILD +++ b/user/libpng/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=libpng -pkgver=1.6.35 +pkgver=1.6.36 pkgrel=0 pkgdesc="Portable Network Graphics library" url="http://www.libpng.org/" @@ -55,6 +55,6 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="e4312a4b33e02ad975864d8f1b0c29427625257983962ddd043f258643c18ddcb15a118405282f04d1310817e454a95111e2d4569de494d01d649c7171fd3127 libpng-1.6.35.tar.gz -fe02147399a3cf3bf86d12589f876cf685fd5edf140d0e8b92f58fc6f113f8b2fce9ab9c19d5b3c8bff381d7e657faa6a2c6b1b6640472c2f1b59dedc598ef52 libpng-1.6.35-apng.patch.gz +sha512sums="8b9c54c5555d6a736eaf298cbbae1e08199001202bacabc6212d75fa619e2ecf06bcf36db0321bfdb90a3dc5cde361c8d951002701637a557c34eae80f5d0936 libpng-1.6.36.tar.gz +8fa213204768b058459ffd5eae6b3661c3f185d3baf1913da4337e7b7855e567f2525e7f67411c32fa8cb177a5f93d538c3d0ce17a94d4aa71bd9cffabe8b311 libpng-1.6.36-apng.patch.gz e3fae918f14bc34e7c126892f69527c6e1b4d72593835ece839d9a28cff55a886b2030f877cf9e29b2c97abf2e47bbb5ba54584828edd2a841c2556f330b9c7e libpng-fix-arm-neon.patch" diff --git a/user/libqalculate/APKBUILD b/user/libqalculate/APKBUILD index 313c3f823..0a02a5926 100644 --- a/user/libqalculate/APKBUILD +++ b/user/libqalculate/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libqalculate -pkgver=2.8.0 -pkgrel=1 +pkgver=2.8.1 +pkgrel=0 pkgdesc="Library implementing a powerful, versatile desktop calculator" url="https://qalculate.github.io/" arch="all" @@ -13,7 +13,6 @@ depends_dev="gmp-dev mpfr-dev" makedepends="$depends_dev curl-dev icu-dev intltool libxml2-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang qalc" source="https://github.com/Qalculate/libqalculate/releases/download/v$pkgver/libqalculate-$pkgver.tar.gz - without-readline.patch " build() { @@ -44,5 +43,4 @@ qalc() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="4e38b2086850b7f4ce4de0061232ac36bcdb83f0be3c6d412183087b2c7f94955b08054ad572a1f0dabff732cb82ee41c387eb906209ccadba6477cc019a3e72 libqalculate-2.8.0.tar.gz -9bedf6666a761411ab95add94fd1936864d3f1b6d0aeff4e304f272b7fcd2aec07f830f3bb27956bf792b2b5069fd9e20c7d920d3903e4d89be163b6f1ea2474 without-readline.patch" +sha512sums="a258bf4f67db70263626ac77822afc75fd7a9e5af2feb1930314daff219865b28c43e82fef6ceae4f3f23957447d6eaebdc709e606d28457bca0f47eefb9274a libqalculate-2.8.1.tar.gz" diff --git a/user/libqalculate/without-readline.patch b/user/libqalculate/without-readline.patch deleted file mode 100644 index 329cbb866..000000000 --- a/user/libqalculate/without-readline.patch +++ /dev/null @@ -1,262 +0,0 @@ -From 9398f8f70a98e731e29f58439bdc75faa554dd04 Mon Sep 17 00:00:00 2001 -From: Hanna K <hanna.knutsson@protonmail.com> -Date: Wed, 31 Oct 2018 08:27:06 +0100 -Subject: [PATCH] Fix compilation without readline; Use bold text for mode - headings - ---- - src/qalc.cc | 118 ++++++++++++++++------------------------------------ - 1 file changed, 37 insertions(+), 81 deletions(-) - -diff --git a/src/qalc.cc b/src/qalc.cc -index 0621913..db15a1a 100644 ---- a/src/qalc.cc -+++ b/src/qalc.cc -@@ -409,10 +409,12 @@ bool check_exchange_rates() { - #ifdef HAVE_LIBREADLINE - # define CHECK_IF_SCREEN_FILLED if(!cfile) {rcount++; if(rcount + 3 >= rows) {FPUTS_UNICODE(_("\nPress Enter to continue."), stdout); fflush(stdout); rl_read_key(); puts(""); rcount = 1;}} - # define CHECK_IF_SCREEN_FILLED_PUTS(x) if(!cfile) {rcount += countRows(x, cols); if(rcount + 2 >= rows) {FPUTS_UNICODE(_("\nPress Enter to continue."), stdout); fflush(stdout); rl_read_key(); puts(""); rcount = 1;}} PUTS_UNICODE(x); -+# define CHECK_IF_SCREEN_FILLED_HEADING(x) rcount += 2; CHECK_IF_SCREEN_FILLED; if(rcount > 1) {puts("");} PUTS_BOLD(x); puts(""); if(rcount == 1) {rcount = 3;} - # define INIT_SCREEN_CHECK int rows, cols, rcount = 0; if(!cfile) rl_get_screen_size(&rows, &cols); - #else - # define CHECK_IF_SCREEN_FILLED - # define CHECK_IF_SCREEN_FILLED_PUTS(x) PUTS_UNICODE(x); -+# define CHECK_IF_SCREEN_FILLED_HEADING(x) puts(""); PUTS_BOLD(x); puts(""); - # define INIT_SCREEN_CHECK {} - #endif - -@@ -907,7 +909,7 @@ void set_option(string str) { - #define STR_AND_TABS_T3(x) str = x; pctl = unicode_length(str); if(pctl >= 16) {str += "\t";} else if(pctl >= 8) {str += "\t\t";} else {str += "\t\t\t";} - #define STR_AND_TABS_T4(x) str = x; pctl = unicode_length(str); if(pctl >= 24) {str += "\t";} else if(pctl >= 16) {str += "\t\t";} else if(pctl >= 8) {str += "\t\t\t";} else {str += "\t\t\t\t";} - #define PRINT_AND_COLON_TABS(x) FPUTS_UNICODE(x, stdout); pctl = unicode_length_check(x); if(pctl >= 32) fputs("\t", stdout); else if(pctl >= 24) fputs("\t\t", stdout); else if(pctl >= 16) fputs("\t\t\t", stdout); else if(pctl >= 8) fputs("\t\t\t\t", stdout); else fputs("\t\t\t\t\t", stdout); --#define PUTS_BOLD(x) str = "\033[1m"; str += x; str += "\033[0m"; puts(str.c_str()); -+#define PUTS_BOLD(x) str = "\033[1m"; str += x; str += "\033[0m"; PUTS_UNICODE(str.c_str()); - - bool equalsIgnoreCase(const string &str1, const string &str2, size_t i2, size_t i2_end, size_t minlength) { - if(str1.empty() || str2.empty()) return false; -@@ -2318,12 +2320,11 @@ int main(int argc, char *argv[]) { - //qalc command - } else if(EQUALS_IGNORECASE_AND_LOCAL(str, "mode", _("mode"))) { - INIT_SCREEN_CHECK -- puts(""); CHECK_IF_SCREEN_FILLED -+ - int pctl; - -- PUTS_UNICODE(_("Algebraic Mode")); -- puts(""); -- rcount += 2; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Algebraic Mode")); -+ - PRINT_AND_COLON_TABS(_("algebra mode")); - switch(evalops.structuring) { - case STRUCTURING_NONE: {PUTS_UNICODE(_("none")); break;} -@@ -2355,11 +2356,8 @@ int main(int argc, char *argv[]) { - if(value.empty()) value = _("unknown"); - PRINT_AND_COLON_TABS(_("assumptions")); PUTS_UNICODE(value.c_str()); CHECK_IF_SCREEN_FILLED - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Calculation")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Calculation")); -+ - PRINT_AND_COLON_TABS(_("angle unit")); - switch(evalops.parse_options.angle_unit) { - case ANGLE_UNIT_RADIANS: {PUTS_UNICODE(_("rad")); break;} -@@ -2378,11 +2376,8 @@ int main(int argc, char *argv[]) { - PRINT_AND_COLON_TABS(_("interval")); PUTS_UNICODE(b2oo(CALCULATOR->usesIntervalArithmetic(), false)); CHECK_IF_SCREEN_FILLED - PRINT_AND_COLON_TABS(_("precision")) printf("%i\n", CALCULATOR->getPrecision()); CHECK_IF_SCREEN_FILLED - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Enabled Objects")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Enabled Objects")); -+ - PRINT_AND_COLON_TABS(_("calculate functions")); PUTS_UNICODE(b2oo(evalops.calculate_functions, false)); CHECK_IF_SCREEN_FILLED - PRINT_AND_COLON_TABS(_("calculate variables")); PUTS_UNICODE(b2oo(evalops.calculate_variables, false)); CHECK_IF_SCREEN_FILLED - PRINT_AND_COLON_TABS(_("complex numbers")); PUTS_UNICODE(b2oo(evalops.allow_complex, false)); CHECK_IF_SCREEN_FILLED -@@ -2393,11 +2388,8 @@ int main(int argc, char *argv[]) { - PRINT_AND_COLON_TABS(_("variables")); PUTS_UNICODE(b2oo(evalops.parse_options.variables_enabled, false)); CHECK_IF_SCREEN_FILLED - PRINT_AND_COLON_TABS(_("variable units")); PUTS_UNICODE(b2oo(CALCULATOR->variableUnitsEnabled(), false)); CHECK_IF_SCREEN_FILLED - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Generic Display Options")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Generic Display Options")); -+ - PRINT_AND_COLON_TABS(_("abbreviations")); PUTS_UNICODE(b2oo(printops.abbreviate_names, false)); CHECK_IF_SCREEN_FILLED - PRINT_AND_COLON_TABS(_("division sign")); - switch(printops.division_sign) { -@@ -2420,11 +2412,8 @@ int main(int argc, char *argv[]) { - PRINT_AND_COLON_TABS(_("spell out logical")); PUTS_UNICODE(b2oo(printops.spell_out_logical_operators, false)); CHECK_IF_SCREEN_FILLED - PRINT_AND_COLON_TABS(_("unicode")); PUTS_UNICODE(b2oo(printops.use_unicode_signs, false)); CHECK_IF_SCREEN_FILLED - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Numerical Display")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Numerical Display")); -+ - PRINT_AND_COLON_TABS(_("base")); - switch(printops.base) { - case BASE_ROMAN_NUMERALS: {PUTS_UNICODE(_("roman")); break;} -@@ -2513,11 +2502,8 @@ int main(int argc, char *argv[]) { - PRINT_AND_COLON_TABS(_("show ending zeroes")); PUTS_UNICODE(b2oo(printops.show_ending_zeroes, false)); CHECK_IF_SCREEN_FILLED - PRINT_AND_COLON_TABS(_("two's complement")); PUTS_UNICODE(b2oo(printops.twos_complement, false)); CHECK_IF_SCREEN_FILLED - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Parsing")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Parsing")); -+ - PRINT_AND_COLON_TABS(_("decimal comma")); - if(b_decimal_comma < 0) {PUTS_UNICODE(_("locale"));} - else if(b_decimal_comma == 0) {PUTS_UNICODE(_("off"));} -@@ -2552,11 +2538,8 @@ int main(int argc, char *argv[]) { - CHECK_IF_SCREEN_FILLED - PRINT_AND_COLON_TABS(_("rpn syntax")); PUTS_UNICODE(b2oo(evalops.parse_options.rpn, false)); CHECK_IF_SCREEN_FILLED - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Units")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Units")); -+ - PRINT_AND_COLON_TABS(_("all prefixes")); PUTS_UNICODE(b2oo(printops.use_all_prefixes, false)); CHECK_IF_SCREEN_FILLED - PRINT_AND_COLON_TABS(_("autoconversion")); - switch(evalops.auto_post_conversion) { -@@ -2583,11 +2566,8 @@ int main(int argc, char *argv[]) { - } - CHECK_IF_SCREEN_FILLED - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Other")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Other")); -+ - PRINT_AND_COLON_TABS(_("rpn")); PUTS_UNICODE(b2oo(rpn_mode, false)); CHECK_IF_SCREEN_FILLED - PRINT_AND_COLON_TABS(_("save definitions")); PUTS_UNICODE(b2yn(save_defs_on_exit, false)); CHECK_IF_SCREEN_FILLED - PRINT_AND_COLON_TABS(_("save mode")); PUTS_UNICODE(b2yn(save_mode_on_exit, false)); CHECK_IF_SCREEN_FILLED -@@ -3011,11 +2991,8 @@ int main(int argc, char *argv[]) { - CHECK_IF_SCREEN_FILLED_PUTS(""); - CHECK_IF_SCREEN_FILLED_PUTS(_("Available options and accepted values are (the current value is marked with '*'):")); - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Algebraic Mode")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Algebraic Mode")); -+ - STR_AND_TABS_2(_("algebra mode"), evalops.structuring, _("none"), _("simplify"), _("factorize")); - STR_AND_TABS_BOOL(_("assume nonzero denominators"), evalops.assume_denominators_nonzero); - STR_AND_TABS_BOOL(_("warn nonzero denominators"), evalops.warn_about_denominators_assumed_nonzero); -@@ -3049,21 +3026,15 @@ int main(int argc, char *argv[]) { - if(ass->type() == ASSUMPTION_TYPE_INTEGER) str += "*"; - str += ")"; CHECK_IF_SCREEN_FILLED_PUTS(str.c_str()); - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Calculation")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Calculation")); -+ - STR_AND_TABS_3(_("angle unit"), evalops.parse_options.angle_unit, _("none"), _("radians"), _("degrees"), _("gradians")); - STR_AND_TABS_2(_("approximation"), evalops.approximation, _("exact"), _("try exact"), _("approximate")); - STR_AND_TABS_BOOL(_("interval"), CALCULATOR->usesIntervalArithmetic()); - STR_AND_TABS(_("precision")); str += "(> 0) "; str += i2s(CALCULATOR->getPrecision()); str += "*"; CHECK_IF_SCREEN_FILLED_PUTS(str.c_str()); - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Enabled Objects")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Enabled Objects")); -+ - STR_AND_TABS_BOOL(_("calculate functions"), evalops.calculate_functions); - STR_AND_TABS_BOOL(_("calculate variables"), evalops.calculate_variables); - STR_AND_TABS_BOOL(_("complex numbers"), evalops.allow_complex); -@@ -3074,11 +3045,8 @@ int main(int argc, char *argv[]) { - STR_AND_TABS_BOOL(_("variables"), evalops.parse_options.variables_enabled); - STR_AND_TABS_BOOL(_("variable units"), CALCULATOR->variableUnitsEnabled()); - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Generic Display Options")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Generic Display Options")); -+ - STR_AND_TABS_BOOL(_("abbreviations"), printops.abbreviate_names); - STR_AND_TABS_2(_("division sign"), printops.division_sign, "/", SIGN_DIVISION_SLASH, SIGN_DIVISION); - STR_AND_TABS_BOOL(_("excessive parentheses"), printops.excessive_parenthesis); -@@ -3088,12 +3056,9 @@ int main(int argc, char *argv[]) { - STR_AND_TABS_BOOL(_("spacious"), printops.spacious); - STR_AND_TABS_BOOL(_("spell out logical"), printops.spell_out_logical_operators); - STR_AND_TABS_BOOL(_("unicode"), printops.use_unicode_signs); -- -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Numerical Display")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Numerical Display")); -+ - STR_AND_TABS(_("base")); str += "(2 - 36"; str += ", "; str += _("bin"); - if(printops.base == BASE_BINARY) str += "*"; - str += ", "; str += _("oct"); -@@ -3154,11 +3119,8 @@ int main(int argc, char *argv[]) { - STR_AND_TABS_BOOL(_("show ending zeroes"), printops.show_ending_zeroes); - STR_AND_TABS_BOOL(_("two's complement"), printops.twos_complement); - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Parsing")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Parsing")); -+ - STR_AND_TABS(_("decimal comma")); str += "("; str += _("locale"); - if(b_decimal_comma < 0) str += "*"; - str += ", "; str += _("off"); -@@ -3191,11 +3153,8 @@ int main(int argc, char *argv[]) { - STR_AND_TABS_2(_("read precision"), evalops.parse_options.read_precision, _("off"), _("always"), _("when decimals")) - STR_AND_TABS_BOOL(_("rpn syntax"), evalops.parse_options.rpn); - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Units")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Units")); -+ - STR_AND_TABS_BOOL(_("all prefixes"), printops.use_all_prefixes); - STR_AND_TABS(_("autoconversion")); - str += (_("none")); -@@ -3222,11 +3181,8 @@ int main(int argc, char *argv[]) { - if(auto_update_exchange_rates > 0) {str += " "; str += i2s(auto_update_exchange_rates); str += "*";} - CHECK_IF_SCREEN_FILLED_PUTS(str.c_str()); - -- rcount += 2; CHECK_IF_SCREEN_FILLED -- if(rcount > 1) puts(""); -- PUTS_UNICODE(_("Other")); -- puts(""); -- if(rcount == 1) rcount = 3; -+ CHECK_IF_SCREEN_FILLED_HEADING(_("Other")); -+ - STR_AND_TABS_BOOL(_("rpn"), rpn_mode); - STR_AND_TABS_YESNO(_("save definitions"), save_defs_on_exit); - STR_AND_TABS_YESNO(_("save mode"), save_mode_on_exit); diff --git a/user/libwacom/APKBUILD b/user/libwacom/APKBUILD index d2ab224f4..c5faa796f 100644 --- a/user/libwacom/APKBUILD +++ b/user/libwacom/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ivan Tham <pickfire@riseup.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libwacom -pkgver=0.31 +pkgver=0.32 pkgrel=0 pkgdesc="Tablet description library" url="http://linuxwacom.sourceforge.net/" @@ -37,4 +37,4 @@ package() { > "$pkgdir"/usr/lib/udev/rules.d/65-libwacom.rules } -sha512sums="fb1fd470000bf3a620c4dd2293fff483bf6e1ffddaffc176e7b88f13d44347f4b322e1827b53ce61ae25e2d99f36c50767c201f38161498969c7c8215dad1c36 libwacom-0.31.tar.bz2" +sha512sums="d7001bb355d4b269e61bf95f0b71621088e76d6894a4a1d002b6a0904a20dd75e0b4fb85368fd20ccafbbfbb1c7ff17150a39962554c8f27f9fcad48c397125b libwacom-0.32.tar.bz2" diff --git a/user/libwebp/APKBUILD b/user/libwebp/APKBUILD index e1d1c7184..7970ad4ef 100644 --- a/user/libwebp/APKBUILD +++ b/user/libwebp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> # Maintainer: pkgname=libwebp -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=0 pkgdesc="Libraries for working with WebP images" url="https://developers.google.com/speed/webp/" @@ -42,4 +42,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="2af7036957722a3f1533fa2da0da15c76d7eb8ac98ec4ad5cf71dd4262f3d7c9897fb6b50befab83b7de22f0abceeb2c0ff52d60927513d40f8a41aa6a9abd99 libwebp-1.0.0.tar.gz" +sha512sums="44e0c278b4569c03c39a1e047bccd7b4270bda12feae0dadc54f8a61fd6a66be011229f1e7e853f64749bcd9ea9e8146989e2b632459b67a4aaea4a8033a1361 libwebp-1.0.1.tar.gz" diff --git a/user/libxfont/APKBUILD b/user/libxfont/APKBUILD new file mode 100644 index 000000000..918cbc02e --- /dev/null +++ b/user/libxfont/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libxfont +pkgver=1.5.4 +pkgrel=0 +pkgdesc="X11 Font library" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="xtrans" +makedepends="freetype-dev libfontenc-dev util-macros xmlto xorgproto-dev" +subpackages="$pkgname-dev" +source="https://www.x.org/releases/individual/lib/libXfont-$pkgver.tar.bz2" +builddir="$srcdir/libXfont-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3 libXfont-1.5.4.tar.bz2" diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD index dee436ffd..1be241d58 100644 --- a/user/lighttpd/APKBUILD +++ b/user/lighttpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lighttpd -pkgver=1.4.51 +pkgver=1.4.52 pkgrel=0 pkgdesc="A secure, fast, compliant and very flexible web-server" url="http://www.lighttpd.net/" @@ -101,7 +101,7 @@ mod_webdav() { _mv_mod mod_webdav } -sha512sums="ee4f150c30322dae50760b99cddd0bd935195ee21e042809fa8d303425d12081c23c00d8ea8fcd3d023b6b414a46b9b953edc4ed25400fe39f10487f0956561f lighttpd-1.4.51.tar.xz +sha512sums="3c604f441c001641681b958012524c9a2e801314b07d9741d4b5e086e7585d676516e3fe587e0ff69f1f937c11b9a290f2173866d6b90019117b6be299972a72 lighttpd-1.4.52.tar.xz f2f3c5c7731550237fd75a8de66275f427eaf897cffff7ac7ef44178328ad8fad6c4ec6654759bfc665cbaf7991ddcdf0aaa916831c8b6aa440192d57b242038 lighttpd.initd 9d2ab5deb7353ebf290e90936b511941df440859c78589d0bcf130ef69a5e9c79e4d318548b6b118df002083c46f7476230a28954b7a10a9dbd05040e02b1291 lighttpd.confd 0536b4f21d2e8659f7831b45998c13d9f6051ae7ecde13be01f372f837d255bfc4e211de48a7686cc743d53aa9c08ab3f10ec19788896dcf8356b90053ca7a16 lighttpd.logrotate diff --git a/user/listres/APKBUILD b/user/listres/APKBUILD new file mode 100644 index 000000000..987002899 --- /dev/null +++ b/user/listres/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=listres +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Tool to list Xt resources" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libxaw-dev libxmu-dev libxt-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/listres-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="925bceab6ff96fcf91f58ba2f858905d6e2eff7074ba29cfc02def7c19fb493545837884f1070dc004422451f749cd459000c01e8c9bb51a7cce7f7ab4067b8a listres-1.0.4.tar.bz2" diff --git a/user/live-media/APKBUILD b/user/live-media/APKBUILD index 06bf46ea3..2c0272784 100644 --- a/user/live-media/APKBUILD +++ b/user/live-media/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=live-media -pkgver=2018.10.17 +pkgver=2018.11.26 pkgrel=0 pkgdesc="Libraries for multimedia streaming" url="http://live555.com/liveMedia" @@ -53,4 +53,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="df1880059505acc66f0b4b4e45a655da78888082b36635eb201970fb9dd79d5bc87ba2d251032be226604e59e59e31fe1ff229911b6410f18e4c65b01166dd54 live.2018.10.17.tar.gz" +sha512sums="fa0fa88986d526314d53d54b3ee128a5305e5c81aacd40b22a79ee73bbd2476e406a8b485ef46e5d970902afea2417e2e8cccbce637b74725087e077c5528fd4 live.2018.11.26.tar.gz" diff --git a/user/lm_sensors/APKBUILD b/user/lm_sensors/APKBUILD index e16b0bc35..3b46a20f1 100644 --- a/user/lm_sensors/APKBUILD +++ b/user/lm_sensors/APKBUILD @@ -1,27 +1,23 @@ # Maintainer: pkgname=lm_sensors -pkgver=3.4.0 -pkgrel=5 +pkgver=3.5.0 +pkgrel=0 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring." -url="https://hwmon.wiki.kernel.org/" +url="https://hwmon.wiki.kernel.org/lm_sensors" arch="all" options="!check" # No test suite. license="GPL-2.0-only AND LGPL-2.1+ AND GPL-2.0+" depends="bash sysfsutils" makedepends="bison flex perl rrdtool-dev cmd:which" subpackages="$pkgname-dev $pkgname-doc $pkgname-detect $pkgname-sensord - $pkgname-sensord-openrc:sensord_openrc" -#install=sensors.install - -# 2015-11-11 (bpiotrowski): upstream website is down, Fedora mirrored the file -#source="http://dl.lm-sensors.org/lm-sensors/releases/$pkgname-$pkgver.tar.bz2 -source="http://pkgs.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-3.4.0.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-3.4.0.tar.bz2 - sensors-detect-alpine.patch - musl-fix-includes.patch + $pkgname-sensord-openrc:sensord_openrc:noarch" +source="$pkgname-$pkgver.tar.gz::https://github.com/lm-sensors/lm-sensors/archive/V3-5-0.tar.gz + use-module-load.d-dir.patch fancontrol.initd sensord.confd sensord.initd " +builddir="$srcdir/${pkgname/_/-}-${pkgver//./-}" prepare() { cd "$builddir" @@ -77,9 +73,8 @@ sensord_openrc() { install -Dm755 "$srcdir"/sensord.confd "$subpkgdir"/etc/conf.d/sensord } -sha512sums="993064bd14b855c1ae8c057e89313df5b3d5efe441fb2e8c3e508f42bb15658564df2563fac8fabbdb0d650dfdbc694037736c748d45cb9d85dfb8fb5a3d1ea9 lm_sensors-3.4.0.tar.bz2 -794cf2aaa2a9e809c6b67f4c888a89064bba3e5b9333a9f0101a92372c25012e506fa48e86523f57cf30e5c2a808bc38058fd8640c870ea6b48faab44794cfbb sensors-detect-alpine.patch -333751cb580c94f2d32ef5520d2f2acc0ef7e1cd4a6390ea75cae4c755fbdfcade1805c979ba3319905f1267bdc120a6746e6f70d89e0c72a8c2faefd34a9e79 musl-fix-includes.patch +sha512sums="bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1 lm_sensors-3.5.0.tar.gz +794cf2aaa2a9e809c6b67f4c888a89064bba3e5b9333a9f0101a92372c25012e506fa48e86523f57cf30e5c2a808bc38058fd8640c870ea6b48faab44794cfbb use-module-load.d-dir.patch 04756c3844033dc7897e1348181140a43f8470c1bb863f1524b21bbe6be2f13fbf17ac3a68270c96a70d8c148124fea569d1ef75619bbe383e15ec705ea18b21 fancontrol.initd a77d81ab7ded085ba19e4c637e93268f889ccb8ce9e008a210ae135cb6e2140be07e5d455cf7fcc1084fd57cfbfb3f2bb37207123aebe9566f78b5183806fd7d sensord.confd 9a19874c158e82ab076ed5fb96a40d4bfb4957bfd5a2ce66aa207c06e577bc1b048336c0046a9f856f6d00dc10e68a0dc9726f6e726a8f7bfd50c4043ee1e26a sensord.initd" diff --git a/user/lm_sensors/musl-fix-includes.patch b/user/lm_sensors/musl-fix-includes.patch deleted file mode 100644 index 501f2dd76..000000000 --- a/user/lm_sensors/musl-fix-includes.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- lm_sensors-3.3.4.orig/prog/dump/isadump.c -+++ lm_sensors-3.3.4/prog/dump/isadump.c -@@ -36,13 +36,7 @@ - #include "util.h" - #include "superio.h" - -- --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - #ifdef __powerpc__ - unsigned long isa_io_base = 0; /* XXX for now */ ---- lm_sensors-3.3.4.orig/prog/dump/isaset.c -+++ lm_sensors-3.3.4/prog/dump/isaset.c -@@ -32,13 +32,7 @@ - #include <string.h> - #include "util.h" - -- --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - #ifdef __powerpc__ - unsigned long isa_io_base = 0; /* XXX for now */ ---- lm_sensors-3.3.4.orig/prog/dump/superio.c -+++ lm_sensors-3.3.4/prog/dump/superio.c -@@ -20,12 +20,7 @@ - */ - - #include <stdlib.h> -- --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - #include "superio.h" - ---- lm_sensors-3.3.4.orig/prog/dump/util.c -+++ lm_sensors-3.3.4/prog/dump/util.c -@@ -11,12 +11,7 @@ - #include <stdio.h> - #include "util.h" - --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - /* Return 1 if we should continue, 0 if we should abort */ - int user_ack(int def) diff --git a/user/lm_sensors/sensors-detect-alpine.patch b/user/lm_sensors/use-module-load.d-dir.patch index 319fcec06..319fcec06 100644 --- a/user/lm_sensors/sensors-detect-alpine.patch +++ b/user/lm_sensors/use-module-load.d-dir.patch diff --git a/user/luit/APKBUILD b/user/luit/APKBUILD new file mode 100644 index 000000000..09e135e12 --- /dev/null +++ b/user/luit/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=luit +pkgver=1.1.1 +pkgrel=0 +pkgdesc="Filter for UTF-8 X11 terminals" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libfontenc-dev libx11-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/luit-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e834e89fca9987f6d82701f53d3c450cc64b93a804b11465b4a7ec5cb3a5c4ef30115df57dec3cbdbafa46e4a4f1bb4759b723123e2ff2f6b1c12207015638e6 luit-1.1.1.tar.bz2" diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD index 7b21a9c87..a49fea8d7 100644 --- a/user/lxqt-desktop/APKBUILD +++ b/user/lxqt-desktop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-desktop pkgver=0.13.0 -pkgrel=0 +pkgrel=1 arch="noarch" pkgdesc="Complete LXQt desktop" url="https://lxqt.org" @@ -31,5 +31,5 @@ package() { install -D -m644 "$srcdir"/startlxqt.1 "$pkgdir"/usr/share/man/man1/startlxqt.1 } sha512sums="e954a41cad44cad7ef3a7695c28396540556ee7bc374ee00f95c4117988d84f6989de7a030ddf11e426b895577e392100f8c5696f0cc3fdc03c2500498580af0 org.adelie-linux.about-lxqt.desktop -f520387e49335df3fb7fa972e3f1336e4841feb24c073dc0b777a400274087a00ec4c9f89bda4556d80a0622854d7131f771c866c921174473456a9a80582a5c startlxqt +682ed40cfaf88af1c53839bab3b7de3feaeda037a52852b3761485f4008b311e5706e5498f2874d383b0f79d555f7239629ad25f050ae05089ec6e939b43ce56 startlxqt 4a56f5bd9364cac0cb32dd119ff209452249efff9de3be20297c1db6524dd1ef24ed7249f22a738a82dab4e61481e11dcceaf9e9474620fa1ca0b1616aa7dfe7 startlxqt.1" diff --git a/user/lxqt-desktop/startlxqt b/user/lxqt-desktop/startlxqt index 09b73f337..a11a37ae9 100755 --- a/user/lxqt-desktop/startlxqt +++ b/user/lxqt-desktop/startlxqt @@ -24,7 +24,7 @@ fi export XDG_DATA_DIRS if [ -z "$XDG_CONFIG_DIRS" ]; then - export XDG_CONFIG_DIRS="/etc/xdg" + export XDG_CONFIG_DIRS="/etc/xdg:/usr/share" else if ! contains "$XDG_CONFIG_DIRS" '/etc/xdg'; then XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:/etc/xdg" diff --git a/user/meson/APKBUILD b/user/meson/APKBUILD index 05bf48dcc..0aabeb17e 100644 --- a/user/meson/APKBUILD +++ b/user/meson/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=meson -pkgver=0.47.2 +pkgver=0.48.2 pkgrel=0 pkgdesc="Fast, user-friendly build system" url="http://mesonbuild.com/" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="a1ac5691a5319ccf196d9443aea61e6c3ee9f09a9f638a3a7b5e5381b4c14372253c845be74fa2b59f42b9697671f12bce92c46bcb5cb629aeebd68e044e0021 meson-0.47.2.tar.gz" +sha512sums="6d8a7f8089a56bb96c01e7ced4b8cb3ffc95c1d35e7940573dbd77fa563d42c19cf9e1477e0712ca7e504d469579d9c7ac2656a2bea63f46a8fcafd66d541193 meson-0.48.2.tar.gz" diff --git a/user/milou/APKBUILD b/user/milou/APKBUILD index eedc7df4c..fe9b06d4a 100644 --- a/user/milou/APKBUILD +++ b/user/milou/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=milou -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Search and launch plasmoid" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3feb387c9698117a7646132d43f0ae5dfb42341b2725a3bbeb6cd8653fb1e6a2fe79aa538aa532b1b808140376f665a7c746b923fc8fcc2fa4ef5015757da6ff milou-5.12.6.tar.xz" +sha512sums="e46395992fd53ec9f230790d4e0eccfb91f925729088f0c8d602524828ce4ff2a55bbcab843daa66c57eff20393c291f9e0f860a4b4b11fc834374b386fcfdbd milou-5.12.7.tar.xz" diff --git a/user/mkcomposecache/APKBUILD b/user/mkcomposecache/APKBUILD new file mode 100644 index 000000000..dbd363bf0 --- /dev/null +++ b/user/mkcomposecache/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=mkcomposecache +pkgver=1.2 +pkgrel=0 +pkgdesc="Utility to manipulate X11 Compose key cache files" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libx11-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/mkcomposecache-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e81101dbf3324341a2aa6b12a6f1a67bf18484f69edc86e38f78f30b2e62d4d3a98d65dbd05540dfe437d739b5cdd330d1e381da87ec3fe4fe7c42fcef58aad7 mkcomposecache-1.2.tar.bz2" diff --git a/user/mkfontdir/APKBUILD b/user/mkfontdir/APKBUILD index ef3ed4edc..45629cd20 100644 --- a/user/mkfontdir/APKBUILD +++ b/user/mkfontdir/APKBUILD @@ -1,15 +1,16 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mkfontdir pkgver=1.0.7 -pkgrel=2 +pkgrel=3 pkgdesc="Font file index utility from X.Org" url="https://www.X.Org/" arch="noarch" license="X11 AND MIT" -depends="mkfontscale" +depends="encodings mkfontscale" makedepends="util-macros" subpackages="$pkgname-doc" -triggers="$pkgname.trigger=/usr/share/fonts/*" +triggers="$pkgname.trigger=/usr/share/fonts/* + $pkgname.trigger=/usr/share/fonts/X11/*" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" prepare() { diff --git a/user/mkfontdir/mkfontdir.trigger b/user/mkfontdir/mkfontdir.trigger index 4fce36a11..3024d71f1 100644 --- a/user/mkfontdir/mkfontdir.trigger +++ b/user/mkfontdir/mkfontdir.trigger @@ -1,6 +1,6 @@ #!/bin/sh for i in "$@"; do - mkfontdir "$i" + mkfontdir -e "/usr/share/fonts/X11/encodings" -e "/usr/share/fonts/X11/encodings/large" -- "$i" done diff --git a/user/mkfontscale/APKBUILD b/user/mkfontscale/APKBUILD index 812fd97af..c2d81ec73 100644 --- a/user/mkfontscale/APKBUILD +++ b/user/mkfontscale/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mkfontscale pkgver=1.1.3 -pkgrel=0 +pkgrel=1 pkgdesc="Scalable font file creator for X.Org" url="https://www.X.Org/" arch="all" @@ -9,7 +9,8 @@ license="MIT" subpackages="$pkgname-doc" depends="" makedepends="freetype-dev libfontenc-dev util-macros xorgproto-dev zlib-dev" -triggers="$pkgname.trigger=/usr/share/fonts/*" +triggers="$pkgname.trigger=/usr/share/fonts/* + $pkgname.trigger=/usr/share/fonts/X11/*" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { diff --git a/user/mlt/APKBUILD b/user/mlt/APKBUILD index 0e2bda030..eedfc1e65 100644 --- a/user/mlt/APKBUILD +++ b/user/mlt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=mlt -pkgver=6.10.0 +pkgver=6.12.0 pkgrel=0 pkgdesc="MLT multimedia framework" url="https://www.mltframework.org/" @@ -45,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d0c353e961bb77a4ff952dd40f7f8dac37743e7027d6928b880a02ec65a98a42503e5de33275357ab256be8fa11ee2d7a53cbd2b1a7c777d711fef18980aa8c5 mlt-6.10.0.tar.gz +sha512sums="ed2cc0eeda45558ae6f1ec8780dfd413641953dc12dc32dccf655649f68f8e6088d39fefb7bef7bae042a41096976004446019d82ea162785bc487009cb97680 mlt-6.12.0.tar.gz c7c9fe70475ccf78c719c1ca6e1a7f2189e08abe04d556fe558dd787799bd7808d61326cfb2818eefe4a6868eed300b0c0d1480aa3df302b65b79a9a9aacc1b1 mlt-6.8.0-locale-header.patch" diff --git a/user/nasm/APKBUILD b/user/nasm/APKBUILD index f2449ffed..2c6f00c52 100644 --- a/user/nasm/APKBUILD +++ b/user/nasm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=nasm -pkgver=2.13.03 +pkgver=2.14 pkgrel=0 pkgdesc="80x86 assembler designed for portability and modularity" url="https://www.nasm.us/" @@ -28,7 +28,7 @@ check() { package() { cd "$builddir" - make INSTALLROOT="$pkgdir" install + make DESTDIR="$pkgdir" install } -sha512sums="d7a6b4cee8dfd603d8d4c976e5287b5cc542fa0b466ff989b743276a6e28114e64289bf02a7819eca63142a5278aa6eed57773007e5f589e15768e6456a8919d nasm-2.13.03.tar.bz2" +sha512sums="9a87935b90a8eaa5adcad7efc058e429483d451c8acb8fd051f0dca760eb649839f40e45f91a551ecf89da4320a32299daa21f8ecb9384a18a5359ccb0e74894 nasm-2.14.tar.bz2" diff --git a/user/nettle/APKBUILD b/user/nettle/APKBUILD index 2fadf7330..f13680455 100644 --- a/user/nettle/APKBUILD +++ b/user/nettle/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: pkgname=nettle -pkgver=3.4 +pkgver=3.4.1 pkgrel=0 pkgdesc="Low-level cryptographic library" url="http://www.lysator.liu.se/~nisse/nettle/" @@ -49,5 +49,5 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b nettle-3.4.tar.gz +sha512sums="26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f nettle-3.4.1.tar.gz c7d9741a7a37d225f3f0db16d355e13b04cc0f1ac56882a6ff31ef15c1a1a0aee7a70cf1ec8bbf2c46b9b0dcec153da7a7aa6b8909a72d76dd4d669cbbaceaa4 nettle-2.4-makefile.patch" diff --git a/user/nextcloud/APKBUILD b/user/nextcloud/APKBUILD new file mode 100644 index 000000000..6f86863ac --- /dev/null +++ b/user/nextcloud/APKBUILD @@ -0,0 +1,257 @@ +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Contributor: Leonardo Arena <rnalrd@alpinelinux.org> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=nextcloud +pkgver=14.0.3 +pkgrel=0 +pkgdesc="Self-hosted file sync and groupware server" +url="https://nextcloud.com" +arch="noarch" +options="!check" # No test suite. +license="AGPL-3.0+ AND AGPL-3.0-only AND MIT AND Apache-2.0 AND (MIT OR GPL-2.0-only) AND BSD-3-Clause AND (Apache-2.0 OR GPL-2.0-only) AND GPL-3.0+ AND BSD-2-Clause AND PHP-3.0 AND (Apache-2.0 OR MPL-2.0)" +depends=" + ca-certificates + php7 + php7-ctype + php7-curl + php7-dom + php7-fileinfo + php7-gd + php7-iconv + php7-intl + php7-json + php7-mbstring + php7-openssl + php7-pcntl + php7-pdo + php7-posix + php7-session + php7-simplexml + php7-xml + php7-xmlreader + php7-xmlwriter + php7-zip + $pkgname-sqlite +" +makedepends="libxml2-utils" +provides=" + $pkgname-accessibility=$pkgver-r$pkgrel + $pkgname-dav=$pkgver-r$pkgrel + $pkgname-federatedfilesharing=$pkgver-r$pkgrel + $pkgname-files=$pkgver-r$pkgrel + $pkgname-provisioning_api=$pkgver-r$pkgrel + $pkgname-support=$pkgver-r$pkgrel +" +install="$pkgname.pre-install $pkgname.post-upgrade + $pkgname-initscript.post-install" +pkgusers="nextcloud" +pkggroups="www-data" +subpackages="$pkgname-doc $pkgname-initscript $pkgname-mysql $pkgname-pgsql + $pkgname-sqlite $pkgname-default-apps:_default_apps" +source="https://download.nextcloud.com/server/releases/$pkgname-$pkgver.zip + nextcloud14-dont-chmod.patch + dont-update-htaccess.patch + disable-integrity-check-as-default.patch + iconv-ascii-translit-not-supported.patch + use-external-docs-if-local-not-avail.patch + + $pkgname-config.php + $pkgname.logrotate + $pkgname.confd + $pkgname.cron + fpm-pool.conf + occ +" +builddir="$srcdir/$pkgname" + +# List of bundled apps to separate into subpackages. Keep it in sync! +# Note: Don't add "files", "dav", and "provisioning_api" here, these should +# be always installed. +_apps="activity + admin_audit + comments + encryption + federation + files_external + files_pdfviewer + files_sharing + files_texteditor + files_trashbin + files_versions + files_videoplayer + firstrunwizard + gallery + logreader + lookup_server_connector + nextcloud_announcements + notifications + oauth2 + password_policy + serverinfo + sharebymail + survey_client + systemtags + theming + twofactor_backupcodes + user_external + user_ldap + workflowengine +" +for _i in $_apps; do + subpackages="$subpackages $pkgname-$_i:_package_app" +done + +# Directory for apps shipped with Nextcloud. +_appsdir="usr/share/webapps/$pkgname/apps" + +build() { + cd "$builddir" +} + +package() { + local basedir="var/lib/$pkgname" + local datadir="$basedir/data" + local wwwdir="usr/share/webapps/$pkgname" + local confdir="etc/$pkgname" + + mkdir -p "$pkgdir/${wwwdir%/*}" + cp -a "$builddir" "$pkgdir/$wwwdir" + + chmod +x "$pkgdir/$wwwdir/occ" + chmod 664 "$pkgdir/$wwwdir/.htaccess" "$pkgdir/$wwwdir/.user.ini" + + # Let's not ship upstream's 'updatenotification' app and updater, which + # has zero chance of working and a big chance of blowing things up. + rm -r "$pkgdir/$wwwdir/apps/updatenotification" \ + "$pkgdir/$wwwdir/lib/private/Updater" + + # Replace bundled CA bundle with ours. + ln -sf /etc/ssl/certs/ca-certificates.crt \ + "$pkgdir/$wwwdir/resources/config/ca-bundle.crt" + + install -dm 770 -o nextcloud -g www-data \ + "$pkgdir/$confdir" "$pkgdir/$datadir" "$pkgdir/$basedir/appstore" + install -dm 775 -o nextcloud -g www-data "$pkgdir/var/log/$pkgname" + + # Create symlink from web root to site-apps, so web server can find + # assets w/o explicit configuration for this layout. + ln -s "/$basedir/appstore" "$pkgdir/$wwwdir/appstore" + + mv $pkgdir/$wwwdir/config/* "$pkgdir/$confdir/" + rm -r "$pkgdir/$wwwdir/config" + ln -s "/$confdir" "$pkgdir/$wwwdir/config" + + mkdir -p "$pkgdir/usr/share/doc/$pkgname" + mv "$pkgdir/$wwwdir/core/doc" "$pkgdir/usr/share/doc/$pkgname/core" + + install -m 660 -o nextcloud -g www-data \ + "$srcdir/$pkgname-config.php" "$pkgdir/$confdir/config.php" + + install -Dm 644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname" + install -Dm 755 "$srcdir/occ" "$pkgdir/usr/bin/occ" + + install -dm 700 -o nextcloud "$pkgdir/var/log/nextcloud" + + # Clean some unnecessary files. + find "$pkgdir" -name '.gitignore' -delete \ + -o -name '.bower.json' -delete \ + -o -name 'README*' -delete \ + -o -name 'CHANGELOG*' -delete \ + -o -name 'CONTRIBUTING*' -delete + find . -name '.github' -type d -prune -exec rm -r {} \; +} + +doc() { + default_doc + + local target="$subpkgdir/usr/share/webapps/$pkgname/core/doc" + mkdir -p "${target%/*}" + ln -s "/usr/share/doc/$pkgname/core" "$target" +} + +initscript() { + pkgdesc="Init script that runs Nextcloud with php-fpm" + depends="$pkgname php7-fpm" + + install -Dm 644 "$srcdir/fpm-pool.conf" "$subpkgdir/etc/php/php-fpm.d/$pkgname.conf" + install -Dm 644 "$srcdir/$pkgname.confd" "$subpkgdir/etc/conf.d/$pkgname" + install -Dm 755 "$srcdir/$pkgname.cron" "$subpkgdir/etc/periodic/15min/$pkgname" + + mkdir -p "$subpkgdir/etc/init.d" + ln -s php-fpm "$subpkgdir/etc/init.d/$pkgname" + + install -dm 700 -o nextcloud "$subpkgdir/var/tmp/$pkgname" +} + +pgsql() { + pkgdesc="Nextcloud PostgreSQL support" + depends="$pkgname php7-pgsql php7-pdo_pgsql" + mkdir -p "$subpkgdir" +} + +sqlite() { + pkgdesc="Nextcloud SQLite support" + depends="$pkgname php7-sqlite3 php7-pdo_sqlite" + mkdir -p "$subpkgdir" +} + +mysql() { + pkgdesc="Nextcloud MySQL support" + depends="$pkgname php7-pdo_mysql" + mkdir -p "$subpkgdir" +} + +_default_apps() { + pkgdesc="Nextcloud default apps" + depends="$pkgname" + + local path; for path in $pkgdir/$_appsdir/*; do + if grep -q '<default_enable\s*/>' "$path/appinfo/info.xml"; then + depends="$depends $pkgname-${path##*/}" + fi + done + + mkdir -p "$subpkgdir" +} + +_package_app() { + local appname="${subpkgname#$pkgname-}" + local appinfo="$pkgdir/$_appsdir/$appname/appinfo/info.xml" + + local name="$(xmllint --xpath '//info/name/text()' "$appinfo" 2>/dev/null)" + pkgdesc="Nextcloud ${name:-$appname} app" + + case "$appname" in + encryption) php_deps="php7-openssl";; + files_external) php_deps="php7-ftp";; + # TODO: add php7-imap, php7-smbclient + user_external) php_deps="php7-ftp";; + user_ldap) php_deps="php7-ldap";; + esac + + case "$appname" in + files_sharing) app_deps="$pkgname-federatedfilesharing";; + # Announcements are delivered via the notifications pane + nextcloud_announcements) app_deps="$pkgname-notifications";; + # workflowengine provides admin panel to manage systemtags + systemtags) app_deps="$pkgname-workflowengine";; + esac + + depends="$pkgname $php_deps $app_deps" + + mkdir -p "$subpkgdir/$_appsdir" + mv "$pkgdir/$_appsdir/$appname" "$subpkgdir/$_appsdir/" +} + +sha512sums="f3b8bf22f4c17e038352a9f6c202d79220b5d9a19a2148c486cf22558d626095ab5c35f02ddf64292165e34572e199c72a44318b5c19a6dd5113f0ee0f6e937f nextcloud-14.0.3.zip +63690b8d8ffe6d4896c5b666aa9d493b501aa3e171c6557e7a003599049f0d36f266a2a257a9535dea055bca1e84208b219c6cd5e4ecd70dd064e1dd1007203a nextcloud14-dont-chmod.patch +aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731 dont-update-htaccess.patch +d2100a837fef1eeae5f706650ab4c985d9e00f61efa5526ef76c7c1f5811c3906eb6c3c13c151eff9677a0c303faab64411a5a84d6792728bc520d2c618d7d5b disable-integrity-check-as-default.patch +de1b433c2fb2582b599cb25e718e454fc4b93543a5a60eee39a03bcccf35d281594611395bdebe02319bedd9a894507eef97010ebdfca381e0f1a09df283d375 iconv-ascii-translit-not-supported.patch +478f5cd7c5d30380ea619d3e8ec623217a06a09b27534266f00297545c7d276b068c5d984673eebc5676e8bac7f45112549498944ce3fa678ac8a69541d7c430 use-external-docs-if-local-not-avail.patch +4d01c89d5fd86190fb3bd6a5ca97bc623ec55d92cbf030c18c5811d711cea557485d334a6588e458eea4e0b3ad82f4defd7cb5a9d4f393ce4d5b32abf45db596 nextcloud-config.php +7388458a9e8b7afd3d3269718306410ffa59c3c23da4bef367a4d7f6d2570136fae9dd421b19c1441e7ffb15a5405e18bb5da67b1a15f9f45e8b98d3fda532ba nextcloud.logrotate +dcc57735d7d4af4a7ebbdd1186d301e51d2ae4675022aea6bf1111222dfa188a3a490ebd6e7c8a7ac30046cb7d93f81cec72a51acbc60d0c10b7fb64630c637a nextcloud.confd +921b0e5f087f24e705dce62c078dea4d2f524c40a746ed7b19f1cff3405b9ea489c10a6dbcea87be6068f575be565b77b02c9f2c3ae6a7fb85367dbe3b7300c5 nextcloud.cron +b829ed942916660065dd1030f9f35fa2f8c45a36dc791417108761c15b081777c302f305fd6490ea47d0ae41b8589c8d62e01e0f163105bd6b29fd3bed36ddcd fpm-pool.conf +959852e34f010e635470829d66713f3e22c47717ec2c6487759eed2b6aeff9fd1421fe0271d494a02781bd1c98beb2823583623ee2cf03057cd5db794627d6c2 occ" diff --git a/user/nextcloud/disable-integrity-check-as-default.patch b/user/nextcloud/disable-integrity-check-as-default.patch new file mode 100644 index 000000000..54ea7a51e --- /dev/null +++ b/user/nextcloud/disable-integrity-check-as-default.patch @@ -0,0 +1,15 @@ +We patch some files and Nextcloud's integrity check doesn't like it... +APK ensures integrity of all installed files, so this Nextcloud's integrity +check doesn't add any value. + +--- a/lib/private/IntegrityCheck/Checker.php ++++ b/lib/private/IntegrityCheck/Checker.php +@@ -111,7 +111,7 @@ + */ + $isIntegrityCheckDisabled = false; + if ($this->config !== null) { +- $isIntegrityCheckDisabled = $this->config->getSystemValue('integrity.check.disabled', false); ++ $isIntegrityCheckDisabled = $this->config->getSystemValue('integrity.check.disabled', true); + } + if ($isIntegrityCheckDisabled === true) { + return false; diff --git a/user/nextcloud/dont-update-htaccess.patch b/user/nextcloud/dont-update-htaccess.patch new file mode 100644 index 000000000..aecaebc71 --- /dev/null +++ b/user/nextcloud/dont-update-htaccess.patch @@ -0,0 +1,32 @@ +Don't mess with .htaccess files. + +Patch ported from https://src.fedoraproject.org/cgit/rpms/nextcloud.git/tree/nextcloud-9.1.0-dont_update_htacess.patch + +--- a/core/register_command.php ++++ b/core/register_command.php +@@ -135,7 +135,6 @@ + $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader())); + $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector())); + $application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig())); +- $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess()); + $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory())); + + $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(\OC\Installer::class))); + +--- a/lib/private/Updater.php ++++ b/lib/private/Updater.php +@@ -233,14 +233,6 @@ + throw new \Exception('Updates between multiple major versions and downgrades are unsupported.'); + } + +- // Update .htaccess files +- try { +- Setup::updateHtaccess(); +- Setup::protectDataDirectory(); +- } catch (\Exception $e) { +- throw new \Exception($e->getMessage()); +- } +- + // create empty file in data dir, so we can later find + // out that this is indeed an ownCloud data directory + // (in case it didn't exist before) diff --git a/user/nextcloud/fpm-pool.conf b/user/nextcloud/fpm-pool.conf new file mode 100644 index 000000000..189962928 --- /dev/null +++ b/user/nextcloud/fpm-pool.conf @@ -0,0 +1,198 @@ +; vi: ft=dosini +[global] +; Error log file +; Default Value: log/php-fpm.log +error_log = /var/log/nextcloud/php-fpm.log + +; Log level +; Possible Values: alert, error, warning, notice, debug +; Default Value: notice +log_level = warning + +; If this number of child processes exit with SIGSEGV or SIGBUS within the time +; interval set by emergency_restart_interval then FPM will restart. A value +; of '0' means 'Off'. +; Default Value: 0 +emergency_restart_threshold = 10 + +; Interval of time used by emergency_restart_interval to determine when +; a graceful restart will be initiated. This can be useful to work around +; accidental corruptions in an accelerator's shared memory. +; Available Units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +emergency_restart_interval = 1m + +; Time limit for child processes to wait for a reaction on signals from master. +; Available units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +process_control_timeout = 10s + + +[nextcloud] +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses on a +; specific port; +; '/path/to/unix/socket' - to listen on a unix socket (the path is *not* +; relative to chroot!) +; Note: This value is mandatory. +listen = /run/nextcloud/fastcgi.sock + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0666 +listen.mode = 0660 + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static ... a fixed number of child processes. +; dynamic ... the number of child processes are set dynamically. +; ondemand ... no children are created at startup; children will be forked +; when new requests will connect. +; Note: This value is mandatory. +pm = ondemand + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. +; This value sets the limit on the number of simultaneous requests that will be +; served. +; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' +; Note: This value is mandatory. +pm.max_children = 10 + +; The number of seconds after which an idle process will be killed. +; Note: Used only when pm is set to 'ondemand' +; Default Value: 10s +pm.process_idle_timeout = 120s + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +pm.status_path = + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +ping.path = /ping + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +; Note: the path is *not* relative to chroot. +;slowlog = /var/log/nextcloud/php-fpm.slow.log + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +;catch_workers_output = yes + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. +; +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. +; +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr/lib/php7.x) + +; Allow HTTP file uploads. +php_admin_flag[file_uploads] = true + +; Maximal size of a file that can be uploaded via web interface. +php_admin_value[memory_limit] = 512M +php_admin_value[post_max_size] = 513M +php_admin_value[upload_max_filesize] = 513M + +; Where to store temporary files. +php_admin_value[session.save_path] = /var/tmp/nextcloud +php_admin_value[sys_temp_dir] = /var/tmp/nextcloud +php_admin_value[upload_tmp_dir] = /var/tmp/nextcloud + +; Log errors to specified file. +php_admin_flag[log_errors] = on +php_admin_value[error_log] = /var/log/nextcloud/php.error.log + +; OPcache error_log file name. Empty string assumes "stderr" +php_admin_value[opcache.error_log] = /var/log/nextcloud/php.error.log + +; Output buffering is a mechanism for controlling how much output data +; (excluding headers and cookies) PHP should keep internally before pushing that +; data to the client. If your application's output exceeds this setting, PHP +; will send that data in chunks of roughly the size you specify. +; This must be disabled for ownCloud. +php_admin_flag[output_buffering] = false + +; Overload(replace) single byte functions by mbstring functions. +; This must be disabled for ownCloud. +php_admin_flag[mbstring.func_overload] = false + +; Never populate the $HTTP_RAW_POST_DATA variable. +; http://php.net/always-populate-raw-post-data +php_admin_value[always_populate_raw_post_data] = -1 + +; Disable certain functions for security reasons. +; http://php.net/disable-functions +php_admin_value[disable_functions] = exec,passthru,shell_exec,system,proc_open,curl_multi_exec,show_source + +; Set recommended settings for OpCache. +; https://docs.nextcloud.com/server/13/admin_manual/configuration_server/server_tuning.html#enable-php-opcache +php_admin_flag[opcache.enable] = true +php_admin_flag[opcache.enable_cli] = true +php_admin_flag[opcache.save_comments] = true +php_admin_value[opcache.interned_strings_buffer] = 8 +php_admin_value[opcache.max_accelerated_files] = 10000 +php_admin_value[opcache.memory_consumption] = 128 +php_admin_value[opcache.revalidate_freq] = 1 diff --git a/user/nextcloud/iconv-ascii-translit-not-supported.patch b/user/nextcloud/iconv-ascii-translit-not-supported.patch new file mode 100644 index 000000000..bb13a9514 --- /dev/null +++ b/user/nextcloud/iconv-ascii-translit-not-supported.patch @@ -0,0 +1,13 @@ +iconv on Alpine does not support conversion to ASCII//TRANSLIT + +--- a/apps/user_ldap/lib/Access.php ++++ b/apps/user_ldap/lib/Access.php +@@ -1318,7 +1318,7 @@ + } + + // Transliteration to ASCII +- $transliterated = @iconv('UTF-8', 'ASCII//TRANSLIT', $name); ++ $transliterated = @iconv('UTF-8', 'ASCII', $name); + if($transliterated !== false) { + // depending on system config iconv can work or not + $name = $transliterated; diff --git a/user/nextcloud/nextcloud-config.php b/user/nextcloud/nextcloud-config.php new file mode 100644 index 000000000..83b1400e6 --- /dev/null +++ b/user/nextcloud/nextcloud-config.php @@ -0,0 +1,45 @@ +<?php +$CONFIG = array ( + 'datadirectory' => '/var/lib/nextcloud/data', + 'logfile' => '/var/log/nextcloud/nextcloud.log', + 'apps_paths' => array ( + // Read-only location for apps shipped with Nextcloud and installed by apk. + 0 => array ( + 'path' => '/usr/share/webapps/nextcloud/apps', + 'url' => '/apps', + 'writable' => false, + ), + // Writable location for apps installed from AppStore. + 1 => array ( + 'path' => '/var/lib/nextcloud/appstore', + 'url' => '/appstore', + 'writable' => true, + ), + ), + 'updatechecker' => false, + + // Uncomment to enable pretty URLs: + //'overwrite.cli.url' => 'http://localhost/nextcloud/', + //'htaccess.RewriteBase' => '/nextcloud/', + + // Addtionally, for nginx and lighttpd pretty URLs: + //'check_for_working_htaccess' => false, + // Additionally, for lighttpd pretty URLs: + //'htaccess.IgnoreFrontController' => true, + + // Uncomment to enable Zend APCu memcache: + //'memcache.local' => '\OC\Memcache\APCu', + + // Uncomment this and add user nextcloud to the redis group to enable Redis + // cache for file locking. This is highly recommended, see + // https://github.com/nextcloud/server/issues/9305. + //'memcache.locking' => '\OC\Memcache\Redis', + //'redis' => array( + // 'host' => '/run/redis/redis.sock', + // 'port' => 0, + // 'dbindex' => 0, + // 'timeout' => 1.5, + //), + + 'installed' => false, +); diff --git a/user/nextcloud/nextcloud-initscript.post-install b/user/nextcloud/nextcloud-initscript.post-install new file mode 100644 index 000000000..6b7fdf671 --- /dev/null +++ b/user/nextcloud/nextcloud-initscript.post-install @@ -0,0 +1,24 @@ +#!/bin/sh + +# It's not needed to be writable for www-data group when running with php-fpm. +for dir in /etc/nextcloud \ + /etc/nextcloud/config.php \ + /var/lib/nextcloud/data \ + /var/lib/nextcloud/appstore +do + chmod g-w $dir +done +chgrp root /etc/nextcloud/config.php + +# This must be writable (only) by nextcloud user. +chmod 750 /var/log/nextcloud + +cat <<"EOF" +* +* Point your web server to /run/nextcloud/fastcgi.sock and start +* Nextcloud with `service nextcloud start`. You can modify php-fpm +* settings in /etc/php7/fpm.d/nextcloud.conf. +* +EOF + +exit 0 diff --git a/user/nextcloud/nextcloud.confd b/user/nextcloud/nextcloud.confd new file mode 100644 index 000000000..b24f26d7f --- /dev/null +++ b/user/nextcloud/nextcloud.confd @@ -0,0 +1,8 @@ +# Config file for /etc/init.d/nextcloud + +name="Nextcloud" +user="nextcloud" +group="www-data" + +# Uncomment if you use Nextcloud with Redis for caching. +#rc_need="redis" diff --git a/user/nextcloud/nextcloud.cron b/user/nextcloud/nextcloud.cron new file mode 100644 index 000000000..21a5b566a --- /dev/null +++ b/user/nextcloud/nextcloud.cron @@ -0,0 +1,6 @@ +#!/bin/sh + +# Run only when nextcloud service is started. +if rc-service nextcloud -q status >/dev/null 2>&1; then + su nextcloud -s /bin/sh -c 'php -f /usr/share/webapps/nextcloud/cron.php' +fi diff --git a/user/nextcloud/nextcloud.logrotate b/user/nextcloud/nextcloud.logrotate new file mode 100644 index 000000000..19e17fdf4 --- /dev/null +++ b/user/nextcloud/nextcloud.logrotate @@ -0,0 +1,6 @@ +/var/log/nextcloud/*.log { + daily + compress + copytruncate + su nextcloud www-data +} diff --git a/user/nextcloud/nextcloud.post-upgrade b/user/nextcloud/nextcloud.post-upgrade new file mode 100644 index 000000000..e4ad291ac --- /dev/null +++ b/user/nextcloud/nextcloud.post-upgrade @@ -0,0 +1,8 @@ +#!/bin/sh + +ver_new="$1" +ver_old="$2" + +if [ "${ver_new%-r*}" != "${ver_old%-r*}" ]; then + echo '* Run "occ upgrade" to finish upgrade of your NextCloud instance!' >&2 +fi diff --git a/user/nextcloud/nextcloud.pre-install b/user/nextcloud/nextcloud.pre-install new file mode 100644 index 000000000..e9cf53919 --- /dev/null +++ b/user/nextcloud/nextcloud.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S -g 82 www-data 2>/dev/null +adduser -S -D -H -h /var/lib/nextcloud -s /sbin/nologin -G www-data -g Nextcloud nextcloud 2>/dev/null + +exit 0 diff --git a/user/nextcloud/nextcloud14-dont-chmod.patch b/user/nextcloud/nextcloud14-dont-chmod.patch new file mode 100644 index 000000000..13b5e3efb --- /dev/null +++ b/user/nextcloud/nextcloud14-dont-chmod.patch @@ -0,0 +1,44 @@ +--- a/lib/private/Config.php ++++ b/lib/private/Config.php +@@ -240,9 +240,6 @@ + touch ($this->configFilePath); + $filePointer = fopen($this->configFilePath, 'r+'); + +- // Prevent others not to read the config +- chmod($this->configFilePath, 0640); +- + // File does not exist, this can happen when doing a fresh install + if(!is_resource ($filePointer)) { + // TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order +--- a/lib/private/Log/File.php ++++ b/lib/private/Log/File.php +@@ -134,9 +134,6 @@ + } + $entry = json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR); + $handle = @fopen($this->logFile, 'a'); +- if ((fileperms($this->logFile) & 0777) != 0640) { +- @chmod($this->logFile, 0640); +- } + if ($handle) { + fwrite($handle, $entry."\n"); + fclose($handle); +--- a/lib/private/TempManager.php ++++ b/lib/private/TempManager.php +@@ -95,7 +95,6 @@ + if($postFix !== '') { + $fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix); + touch($fileNameWithPostfix); +- chmod($fileNameWithPostfix, 0600); + $this->current[] = $fileNameWithPostfix; + return $fileNameWithPostfix; + } +--- a/lib/private/legacy/util.php ++++ b/lib/private/legacy/util.php +@@ -1008,7 +1008,6 @@ + . ' cannot be listed by other users.'); + $perms = substr(decoct(@fileperms($dataDirectory)), -3); + if (substr($perms, -1) !== '0') { +- chmod($dataDirectory, 0770); + clearstatcache(); + $perms = substr(decoct(@fileperms($dataDirectory)), -3); + if ($perms[2] !== '0') { diff --git a/user/nextcloud/occ b/user/nextcloud/occ new file mode 100644 index 000000000..1e3c095ad --- /dev/null +++ b/user/nextcloud/occ @@ -0,0 +1,10 @@ +#!/bin/sh + +NEXTCLOUD_DIR='/usr/share/webapps/nextcloud' +: ${NEXTCLOUD_USER:="nextcloud"} + +if [ "$(id -un)" != "$NEXTCLOUD_USER" ]; then + exec su -s /bin/sh "$NEXTCLOUD_USER" -c '$0 "$@"' -- $NEXTCLOUD_DIR/occ "$@" +else + exec $NEXTCLOUD_DIR/occ "$@" +fi diff --git a/user/nextcloud/use-external-docs-if-local-not-avail.patch b/user/nextcloud/use-external-docs-if-local-not-avail.patch new file mode 100644 index 000000000..19145b5ce --- /dev/null +++ b/user/nextcloud/use-external-docs-if-local-not-avail.patch @@ -0,0 +1,65 @@ +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Tue, 27 Jun 2017 02:07:00 +0200 +Subject: [PATCH] Show link to external docs if local is not installed + +--- a/settings/help.php ++++ b/settings/help.php +@@ -34,22 +34,36 @@ + OC_Util::addStyle( "settings", "settings" ); + \OC::$server->getNavigationManager()->setActiveEntry('help'); + ++$localDocs = true; + + if(isset($_GET['mode']) and $_GET['mode'] === 'admin') { +- $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' ); ++ if (file_exists(\OC::$SERVERROOT . '/core/doc/admin/index.html')) { ++ $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' ); ++ } else { ++ $url=\OC::$server->query(\OCP\Defaults::class)->buildDocLinkToKey('admin-manual'); ++ $localDocs=false; ++ } + $style1=''; + $style2=' active'; + }else{ + $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' ); ++ if (file_exists( \OC::$SERVERROOT . '/core/doc/user/index.html' )) { ++ $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' ); ++ } else { ++ $url=\OC::$server->query(\OCP\Defaults::class)->buildDocLinkToKey('user-manual'); ++ $localDocs=false; ++ } + $style1=' active'; + $style2=''; + } + ++ + $url1=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user'; + $url2=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin'; + + $tmpl = new OC_Template( "settings", "help", "user" ); + $tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser())); ++$tmpl->assign( "localDocs", $localDocs ); + $tmpl->assign( "url", $url ); + $tmpl->assign( "url1", $url1 ); + $tmpl->assign( "url2", $url2 ); + +--- a/settings/templates/help.php ++++ b/settings/templates/help.php +@@ -42,6 +42,17 @@ + </div> + + <div id="app-content" class="help-includes"> ++<?php if ($_['localDocs']) { ?> + <iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe"> + </iframe> ++<?php } else { ?> ++ <div class="section"> ++ <h2>Local documentation is not installed</h2> ++ <p>Please use ++ <a href="<?php print_unescaped($_['url']); ?>" target="_blank" rel="noreferrer"> ++ <?php p($l->t('online documentation')); ?> ↗ ++ </a> ++ </p> ++ </div> ++<?php } ?> + </div> diff --git a/user/nghttp2/APKBUILD b/user/nghttp2/APKBUILD index 50b89c95d..41c43ab9b 100644 --- a/user/nghttp2/APKBUILD +++ b/user/nghttp2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=nghttp2 -pkgver=1.33.0 +pkgver=1.35.1 pkgrel=0 pkgdesc="Experimental HTTP/2 client, server and proxy" url="https://nghttp2.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74 nghttp2-1.33.0.tar.xz" +sha512sums="fcd3f79f913afbeee1c75003bb39df918e6122bbf728b3ad4192d5849d8fb96705e04f5505465d63f25a565b2f1da6abd8fabdebb6e3347500f7abd31980861d nghttp2-1.35.1.tar.xz" diff --git a/user/oclock/APKBUILD b/user/oclock/APKBUILD new file mode 100644 index 000000000..d75964c02 --- /dev/null +++ b/user/oclock/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=oclock +pkgver=1.0.4 +pkgrel=0 +pkgdesc="The original round X11 clock applet" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxext-dev libxkbfile-dev libxmu-dev libxt-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/oclock-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7 oclock-1.0.4.tar.bz2" diff --git a/user/opus/APKBUILD b/user/opus/APKBUILD index fa25fbc54..7b76e2a0a 100644 --- a/user/opus/APKBUILD +++ b/user/opus/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=opus -pkgver=1.2.1 -pkgrel=2 +pkgver=1.3 +pkgrel=0 pkgdesc="Codec designed for speech and audio transmission" url="http://www.opus-codec.org/" arch="all" @@ -39,4 +39,4 @@ package() { "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -sha512sums="4a98d0a7dbd1a313e89407576805fd733c1192e8ef7e1137e3260025478a1cf1c5a8b71b48c372a0cffe6340524137fe47f181651888284f8221fb4d673f7cd5 opus-1.2.1.tar.gz" +sha512sums="438635667e72c326d6d06a30e0b3a5564ba6cf5d484066456e1118e1c2fe3a61b959d0afa77a1084b177b72f9230618b6b55c78bc4e24e9127a09fd345b42518 opus-1.3.tar.gz" diff --git a/user/oxygen/APKBUILD b/user/oxygen/APKBUILD index 6a5bef177..6933df4d5 100644 --- a/user/oxygen/APKBUILD +++ b/user/oxygen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=oxygen -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="'Oxygen' theme for KDE" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7f558f92dc218a8218c6b87fd432985ef446d88e7a73911bc557481bd7d0ccdda7a9ebb350c6f71547f3c35cda1f844cda8aa735e0fcbdb413aedb25b9d0d8de oxygen-5.12.6.tar.xz" +sha512sums="20e448f223c13f60b929d3fe0be4070868ddf9189a1108b2a798ce08ca654db082798c6389e6dbd06dcc72fff061e3178c805c9f1fb595b1649235e0ec5231ff oxygen-5.12.7.tar.xz" diff --git a/user/partitionmanager/APKBUILD b/user/partitionmanager/APKBUILD new file mode 100644 index 000000000..33c6e3bdf --- /dev/null +++ b/user/partitionmanager/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=partitionmanager +pkgver=3.3.1 +pkgrel=0 +pkgdesc="Qt-based partition manager" +url="https://www.kde.org/applications/system/kdepartitionmanager" +arch="all" +license="GPL-3.0+" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev + kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev + kiconthemes-dev kio-dev kjobwidgets-dev kservice-dev kwidgetsaddons-dev + kxmlgui-dev kpmcore-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/partitionmanager/$pkgver/src/partitionmanager-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="9189004c27a118510ddf7f148d2a245a7e17d0d0c038ea7486fc50638f2897f947ef2a2a92f0196c277b14e8dafb2f1e2f20978cce5927c04299232ecf8260b0 partitionmanager-3.3.1.tar.xz" diff --git a/user/pciutils/APKBUILD b/user/pciutils/APKBUILD index 92964b95f..f198c08c8 100644 --- a/user/pciutils/APKBUILD +++ b/user/pciutils/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: pkgname=pciutils pkgver=3.6.2 -pkgrel=0 +pkgrel=1 pkgdesc="PCI bus configuration space access library and tools" url="http://mj.ucw.cz/pciutils.html" arch="all" options="!check" # No test suite. license="GPL-2.0-only" -depends="hwdata-pci" -makedepends="linux-headers" +depends="hwids-pci" +makedepends="eudev-dev kmod-dev linux-headers cmd:which" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" source="https://www.kernel.org/pub/software/utils/$pkgname/$pkgname-$pkgver.tar.gz fix-linking-pci-malloc-Makefile.patch @@ -33,15 +33,11 @@ package() { SHARED=yes \ SHAREDIR="$pkgdir"/usr/share/hwdata \ MANDIR="$pkgdir"/usr/share/man \ - install - - install -d "$pkgdir"/usr/lib - ln -s libpci.so.${pkgver%%.*} "$pkgdir"/usr/lib/libpci.so - install -D -m 644 lib/libpci.pc "$pkgdir"/usr/lib/pkgconfig/libpci.pc - for i in config.h header.h pci.h types.h; do - install -D -m 644 lib/${i} "$pkgdir"/usr/include/pci/${i} - done + install install-lib + rm "$pkgdir"/usr/sbin/update-pciids + rm "$pkgdir"/usr/share/man/man8/update-pciids.8 + rm -r "$pkgdir"/usr/share/hwdata } sha512sums="a9332f07755ab8af6ba99a5fa3cf739b0f3688276902673b9fe981955c4fa732c3d0ccaa150942ecaf4b263a10c2653f5454aa87492cac1dd805f33500fac489 pciutils-3.6.2.tar.gz diff --git a/user/pcsc-tools/APKBUILD b/user/pcsc-tools/APKBUILD index fe617b27a..07fd60e32 100644 --- a/user/pcsc-tools/APKBUILD +++ b/user/pcsc-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=pcsc-tools -pkgver=1.5.3 +pkgver=1.5.4 pkgrel=0 pkgdesc="Tools for scanning for and interacting with PC/SC devices" url="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/" @@ -11,8 +11,6 @@ depends="perl" makedepends="pcsc-lite-dev" subpackages="$pkgname-doc" source="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-$pkgver.tar.bz2" -sha512sums="da5b362b7a3a6d47dd309ff217e6dd8af29298501db5e898ecd68762020ce62fc982132205f9bbee159a7d7eac549fdb8f25395416bb52bc0d0c888a5b0fa1a0 pcsc-tools-1.5.3.tar.bz2" -builddir="$srcdir/pcsc-tools-$pkgver" build() { cd "$builddir" @@ -36,3 +34,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="c64b9445dcdf72a7e5627380894c1f627ebcb343a497524ee185b64110c2c2b8b6138cae5610439991ab9756fd89ea5de0e054e68698b220d11606b38f7a90c6 pcsc-tools-1.5.4.tar.bz2" diff --git a/user/perl-perl-tidy/APKBUILD b/user/perl-perl-tidy/APKBUILD index 84361f161..0c905e7ce 100644 --- a/user/perl-perl-tidy/APKBUILD +++ b/user/perl-perl-tidy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-perl-tidy -pkgver=20180220 +pkgver=20181120 pkgrel=0 pkgdesc="Indent and reformat Perl scripts" url="https://metacpan.org/release/Perl-Tidy" @@ -30,4 +30,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="93bdf2c18efdd9d62d5bb666ded9d9502a722370049a2a51f9d41107d7fa67acd91dfdd184a11eaab287f11a901ad686585e959f09407b0493719d19ce5d842e Perl-Tidy-20180220.tar.gz" +sha512sums="5b75178f9fd874fa173a562d765091c66a8fc56b1efc16ace9cf0f6215688d7a334b7d68255aad20aa9da87bf79f9cc72604a52c56398952157512f01e53b5ca Perl-Tidy-20181120.tar.gz" diff --git a/user/perl-test-cleannamespaces/APKBUILD b/user/perl-test-cleannamespaces/APKBUILD index 718bc3a27..71eb1e9d7 100644 --- a/user/perl-test-cleannamespaces/APKBUILD +++ b/user/perl-test-cleannamespaces/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-cleannamespaces -pkgver=0.23 +pkgver=0.24 pkgrel=0 pkgdesc="Check Perl code for uncleaned imports" url="https://metacpan.org/release/Test-CleanNamespaces" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="c40587c09bcd6a6ebc6801e12a3d33fcd2695b650fe02546a8a6da7d038ba5b1218d730a09f3b8942824a0506aca3edfcbcdf204906569dad5c46816b91e8a99 Test-CleanNamespaces-0.23.tar.gz" +sha512sums="f99d3dea0af3ae654819c72ed9672234953edf5c8e5f3c6271a578761ee371e2ed670df07a8a8c2adba91c42404ac94b8d479acc91ae16a4536c0f2fd99809a7 Test-CleanNamespaces-0.24.tar.gz" diff --git a/user/php7-apcu/APKBUILD b/user/php7-apcu/APKBUILD new file mode 100644 index 000000000..aa487a4e6 --- /dev/null +++ b/user/php7-apcu/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: +pkgname=php7-apcu +_pkgname=${pkgname#php7-} +pkgver=5.1.14 +pkgrel=0 +pkgdesc="Userland cache for PHP" +url="https://github.com/krakjoe/apcu" +arch="all" +license="PHP-3.01" +depends="php7" +makedepends="php7-dev" +subpackages="" +source="$pkgname-$pkgver.tar.gz::https://github.com/krakjoe/${_pkgname}/archive/v${pkgver}.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + cd "$builddir" + phpize + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-apcu + make +} + +check() { + cd "$builddir" + # The tests have a prompt at the end for sending stats + make NO_INTERACTION=1 test +} + +package() { + cd "$builddir" + # It didn't listen to DESTDIR + make INSTALL_ROOT="$pkgdir" install +} + +sha512sums="fe39d46d2905732296a70b79ab0977909c9ff7cb571118f35831e75a9a018edf909992954e39f79cc4710f9fdec93e6067068afea02304345e4ff6babc65a7d0 php7-apcu-5.1.14.tar.gz" diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD index 8ed53f99d..89ab74709 100644 --- a/user/php7/APKBUILD +++ b/user/php7/APKBUILD @@ -26,7 +26,7 @@ pkgname=php7 _pkgname=php pkgver=7.2.11 -pkgrel=1 +pkgrel=2 _apiver=20170718 pkgdesc="The PHP7 language runtime engine" url="https://php.net/" @@ -76,6 +76,7 @@ source="http://php.net/distributions/$_pkgname-$pkgver.tar.bz2 $_pkgname-fpm.logrotate $_pkgname-module.conf disabled-tests.list + CVE-2018-19935.patch install-pear.patch fpm-paths.patch allow-build-recode-and-imap-together.patch @@ -223,6 +224,8 @@ enable_ext 'zip' \ # 7.2.8-r0: # - CVE-2015-9253 # - CVE-2018-12882 +# 7.2.11-r2: +# - CVE-2018-19935 prepare() { cd "$builddir" @@ -527,6 +530,7 @@ sha512sums="a6bdd639648ae7845467e01303d0b4f4b85fd541409be97a5a605e91a9c994609e4e 01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb php-fpm.logrotate a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48 php-module.conf b1008eabc86fcff88336fe2961e3229c159c930a05d97359136c381c5c1cc572a33110308a3e5ef5e31c60327f76c9ef02b375cd2ea8ff9caa7deeddc216f4ce disabled-tests.list +4b6e4a8062808fcc54321b159f0b8bfef93267e0824f698f6ab06fc82796d62878a2e73cb44ef4bbad231658f9c0ee819ece1f7ca7517e56eea54309c92128c7 CVE-2018-19935.patch f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505 install-pear.patch a77dd3bdf9dc7a0f2c06ff3e7c425d062bbaa29902c17402ce98701dc99499be863ad543aa5e6a7d1c249702d6afb193398dd3199ae58e42b32b95d434fb1883 fpm-paths.patch f8ecae241a90cbc3e98aa4deb3d5d35ef555f51380e29f4e182a8060dffeb84be74f030a14c6b452668471030d78964f52795ca74275db05543ccad20ef1f2cc allow-build-recode-and-imap-together.patch diff --git a/user/php7/CVE-2018-19935.patch b/user/php7/CVE-2018-19935.patch new file mode 100644 index 000000000..e24310f42 --- /dev/null +++ b/user/php7/CVE-2018-19935.patch @@ -0,0 +1,52 @@ +From 648fc1e369fc05fb9200a42c7938912236b2a318 Mon Sep 17 00:00:00 2001 +From: Stanislav Malyshev <stas@php.net> +Date: Sun, 11 Nov 2018 10:04:01 -0800 +Subject: [PATCH] Fix #77020: null pointer dereference in imap_mail + +If an empty $message is passed to imap_mail(), we must not set message +to NULL, since _php_imap_mail() is not supposed to handle NULL pointers +(opposed to pointers to NUL). + +(cherry picked from commit 7edc639b9ff1c3576773d79d016abbeed1f93846) +--- + ext/imap/php_imap.c | 1 - + ext/imap/tests/bug77020.phpt | 15 +++++++++++++++ + 2 files changed, 15 insertions(+), 1 deletion(-) + create mode 100644 ext/imap/tests/bug77020.phpt + +diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c +index 9e626a4..01d1a5f 100644 +--- a/ext/imap/php_imap.c ++++ b/ext/imap/php_imap.c +@@ -4116,7 +4116,6 @@ PHP_FUNCTION(imap_mail) + if (!ZSTR_LEN(message)) { + /* this is not really an error, so it is allowed. */ + php_error_docref(NULL, E_WARNING, "No message string in mail command"); +- message = NULL; + } + + if (_php_imap_mail(ZSTR_VAL(to), ZSTR_VAL(subject), ZSTR_VAL(message), headers?ZSTR_VAL(headers):NULL, cc?ZSTR_VAL(cc):NULL, +diff --git a/ext/imap/tests/bug77020.phpt b/ext/imap/tests/bug77020.phpt +new file mode 100644 +index 0000000..8a65232 +--- /dev/null ++++ b/ext/imap/tests/bug77020.phpt +@@ -0,0 +1,15 @@ ++--TEST-- ++Bug #77020 (null pointer dereference in imap_mail) ++--SKIPIF-- ++<?php ++if (!extension_loaded('imap')) die('skip imap extension not available'); ++?> ++--FILE-- ++<?php ++imap_mail('1', 1, NULL); ++?> ++===DONE=== ++--EXPECTF-- ++Warning: imap_mail(): No message string in mail command in %s on line %d ++%s ++===DONE=== +-- +2.1.4 + diff --git a/user/pixman/APKBUILD b/user/pixman/APKBUILD index 607a49afb..b694941e9 100644 --- a/user/pixman/APKBUILD +++ b/user/pixman/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pixman -pkgver=0.34.0 -pkgrel=5 +pkgver=0.36.0 +pkgrel=0 pkgdesc="Low-level pixel manipulation library" url="https://www.X.Org/" arch="all" @@ -9,7 +9,6 @@ license="MIT" subpackages="$pkgname-dev $pkgname-dbg" makedepends="perl linux-headers" source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2 - float-header-fix.patch stacksize-reduction.patch " @@ -35,6 +34,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="755a3f5596e7bd9710abc8e5bfd341adaf2177f5b21f7aaae7f85b8fb57580ea48df586ad32bf6adef6ce0430e7cadaa57754a2fa466bc4b15bf70ee64cd1418 pixman-0.34.0.tar.bz2 -5064da221fe406e58169df0b07df7123ccf65487e654dba9e0903122480363c2b4e11ec0a14ac546658c747934509f2f66e3d0d078d6dd0ac92505c24b0e9ee9 float-header-fix.patch +sha512sums="ed99c85a8ce11f52659da61bff599c0405ae0069c30434bdef7238bc9f18e83e6d534cddf38c14d753943edbaeba580c5005ad7575f27e469ca7be7878678d21 pixman-0.36.0.tar.bz2 3d75e7328e6eaaa6e8f4defa4402db815764369f94b81be38fba07933267fe24b03b591dd4c3f3544cb090650153728bfbdd81a91acaf19524c3d08f61427f63 stacksize-reduction.patch" diff --git a/user/pixman/float-header-fix.patch b/user/pixman/float-header-fix.patch deleted file mode 100644 index 5c151a14f..000000000 --- a/user/pixman/float-header-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ./pixman/pixman-private.h.orig -+++ ./pixman/pixman-private.h -@@ -1,5 +1,3 @@ --#include <float.h> -- - #ifndef PIXMAN_PRIVATE_H - #define PIXMAN_PRIVATE_H - -@@ -30,6 +28,7 @@ - #include <stdio.h> - #include <string.h> - #include <stddef.h> -+#include <float.h> - - #include "pixman-compiler.h" - diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD index ff190ce4d..4b06e92d6 100644 --- a/user/plasma-desktop/APKBUILD +++ b/user/plasma-desktop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-desktop -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Modern, functional, integrated libre desktop environment" url="https://www.kde.org/info/plasma-desktop" @@ -54,4 +54,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="435add4f2133f3e54023ad42b1360dc3ea3c44789692a38e5d95fcc825a1b7a9e3bdc05d03a375c687f3f0544c8f2ea4ccf047ec099ea3da32ed539ca57c8d76 plasma-desktop-5.12.6.tar.xz" +sha512sums="671108c3c1c46bc0dfdbc2eb1438654c84ee3bc098c137466ab28d230651f20251894b3008a030a0c3bf2aa4904cca61418c458f41a023042630c6f80d4bf41d plasma-desktop-5.12.7.tar.xz" diff --git a/user/plasma-integration/APKBUILD b/user/plasma-integration/APKBUILD index a00124a5f..2b3981303 100644 --- a/user/plasma-integration/APKBUILD +++ b/user/plasma-integration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-integration -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="Qt platform theme plugin for Plasma" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df231e8041fb94f01b0950890f784d118ca0aa1a34e7e483f78351de237cc2ba46a05be9c7addc5a2c5d319be7e17b6e2c5f171da28aa7cfd9b34b585a3c8155 plasma-integration-5.12.6.tar.xz" +sha512sums="b33b1b2d044f36b3dad8bf854acb9a1f94be527c9c9b84d18a58323ab249a63276ee91553b6d92fd77b347a52d6dc4c10c080e0333dd31d4ef1f6058cb557fe0 plasma-integration-5.12.7.tar.xz" diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD index fdc9f4906..3d60e96e2 100644 --- a/user/plasma-workspace/APKBUILD +++ b/user/plasma-workspace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-workspace -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE Plasma 5 workspace" url="https://www.kde.org/plasma-desktop" @@ -58,4 +58,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="efa67214814a0193c3359bc7599174eab29f93826dcad61310f0fc7ce946ac779f35f2e8d0b231360dfd2ddeda398b8b12bf4a155ad6746e60e56a388f446488 plasma-workspace-5.12.6.tar.xz" +sha512sums="e9d4a85b11264eebbce0845eefa5d01818e944c2179d5cbc3e23b720118894d88fbfe96467c68849a3fa89728cecff248cd7f9dfc0ab133e50dad28ecc957623 plasma-workspace-5.12.7.tar.xz" diff --git a/user/polkit/APKBUILD b/user/polkit/APKBUILD index ea5cb0c02..5b5dfdacd 100644 --- a/user/polkit/APKBUILD +++ b/user/polkit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=polkit pkgver=0.115 -pkgrel=1 +pkgrel=3 pkgdesc="Toolkit for controlling system-wide privileges" url="https://www.freedesktop.org/wiki/Software/polkit/" arch="all" @@ -14,13 +14,18 @@ makedepends="glib-dev gobject-introspection-dev gtk-doc intltool linux-pam-dev subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" pkgusers="polkitd" pkggroups="polkitd" -install="$pkgname.pre-install" +install="$pkgname.pre-install $pkgname.pre-upgrade" source="https://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar.gz 0001-make-netgroup-support-optional.patch + CVE-2018-19788.patch fix-consolekit-db-stat.patch fix-test-fgetpwent.patch " +# secfixes: +# 0.115-r2: +# - CVE-2018-19788 + prepare() { cd "$builddir" default_prepare @@ -63,5 +68,6 @@ package() { sha512sums="1153011fa93145b2c184e6b3446d3ca21b38918641aeccd8fac3985ac3e30ec6bc75be6973985fde90f2a24236592f1595be259155061c2d33358dd17c4ee4fc polkit-0.115.tar.gz 6d68d90e6dc9594175631c99699d4d949fba6d2d1ad66680897f9a17e9dc3c17b44f2bc06ed4f6149931e17a96baaf481981fb0698aace7c81a67c06c2806c29 0001-make-netgroup-support-optional.patch +4a2a11c1de8ef11def9c32b4b595fd45066aeaeb0cb42665846e3c7b8c6f5b7d3a782d722a25889afdb6a4414abed0837a359692342baaeb770d0e9712818ce1 CVE-2018-19788.patch 95493ef842b46ce9e724933a5d86083589075fb452435057b8f629643cac7c7eff67a24fd188087987e98057f0130757fad546d0c090767da3d71ebaf8485a24 fix-consolekit-db-stat.patch 966825aded565432f4fda9e54113a773b514ebf7ee7faa83bcb8b97d218ae84a8707d6747bbc3cb8a828638d692fdef34c05038f150ad38e02a29f2c782aba5b fix-test-fgetpwent.patch" diff --git a/user/polkit/CVE-2018-19788.patch b/user/polkit/CVE-2018-19788.patch new file mode 100644 index 000000000..6a2845aca --- /dev/null +++ b/user/polkit/CVE-2018-19788.patch @@ -0,0 +1,183 @@ +From 35af308b530f36c1a0a912387106a59b3ab92027 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Mon, 3 Dec 2018 10:28:58 +0100 +Subject: [PATCH 1/2] Use default of -1 for uid/gid in class initialization + +This doesn't seem to change anything in polkitd behaviour, but it +seems cleaner to default to -1 which here means "unset". +--- + src/polkit/polkitunixgroup.c | 4 ++-- + src/polkit/polkitunixuser.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/polkit/polkitunixgroup.c b/src/polkit/polkitunixgroup.c +index c57a1aa..095cca0 100644 +--- a/src/polkit/polkitunixgroup.c ++++ b/src/polkit/polkitunixgroup.c +@@ -131,9 +131,9 @@ polkit_unix_group_class_init (PolkitUnixGroupClass *klass) + g_param_spec_int ("gid", + "Group ID", + "The UNIX group ID", +- 0, ++ -1, + G_MAXINT, +- 0, ++ -1, + G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | +diff --git a/src/polkit/polkitunixuser.c b/src/polkit/polkitunixuser.c +index 8bfd3a1..a5285f4 100644 +--- a/src/polkit/polkitunixuser.c ++++ b/src/polkit/polkitunixuser.c +@@ -144,9 +144,9 @@ polkit_unix_user_class_init (PolkitUnixUserClass *klass) + g_param_spec_int ("uid", + "User ID", + "The UNIX user ID", +- 0, ++ -1, + G_MAXINT, +- 0, ++ -1, + G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | +-- +2.18.1 + + +From fbaab32cb4ed9ed5f1e3eea6cd317d443aa427dc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Mon, 3 Dec 2018 12:51:26 +0100 +Subject: [PATCH 2/2] Check gid and uid initalization in PolkitUnixUser and + Group objects + +When a user or group above INT32_MAX is created, the numeric uid or +gid wraps around to negative when the value is assigned to gint, and +polkit gets confused. Let's refuse such uids and gids. + +This patch just refuses to initialize uid and gid values to negative. +A nicer fix is to change the underlying type to e.g. gint64 to allow +the full range of values in uid_t and gid_t to be represented. But +this cannot be done without breaking the API, so likely new functions +will have to be added (a polkit_unix_user_new variant that takes a +gint64, and the same for _group_new, _set_uid, _get_uid, _set_gid, +_get_gid, etc.). This will require a bigger patch. + +Fixes https://gitlab.freedesktop.org/polkit/polkit/issues/74. + +Example sessions from uid=4000000000: + +Dec 03 14:35:08 krowka polkitd[21432]: system-bus-name::1.41869 is inquiring whether system-bus-name::1.79432 is authorized for org.freedesktop.systemd1.manage-units +Dec 03 14:35:08 krowka polkitd[21432]: user of caller is unix-user:root +Dec 03 14:35:08 krowka polkitd[21432]: polkit_unix_user_new: assertion 'uid >= 0' failed +Dec 03 14:35:08 krowka polkitd[21432]: polkit_identity_to_string: assertion 'POLKIT_IS_IDENTITY (identity)' failed +Dec 03 14:35:08 krowka polkitd[21432]: user of subject is (null) +Dec 03 14:35:08 krowka polkitd[21432]: polkit_identity_equal: assertion 'POLKIT_IS_IDENTITY (b)' failed +Dec 03 14:35:08 krowka polkitd[21432]: checking whether system-bus-name::1.79432 is authorized for org.freedesktop.systemd1.manage-units +Dec 03 14:35:08 krowka polkitd[21432]: polkit_unix_user_new: assertion 'uid >= 0' failed +Dec 03 14:35:08 krowka polkitd[21432]: +Dec 03 14:35:08 krowka polkitd[21432]: polkit_authorization_result_get_is_challenge: assertion 'POLKIT_IS_AUTHORIZATION_RESULT (result)' failed +Dec 03 14:35:08 krowka polkitd[21432]: g_object_ref: assertion 'G_IS_OBJECT (object)' failed +Dec 03 14:35:08 krowka polkitd[21432]: g_object_ref: assertion 'G_IS_OBJECT (object)' failed +Dec 03 14:35:08 krowka polkitd[21432]: polkit_authorization_result_get_details: assertion 'POLKIT_IS_AUTHORIZATION_RESULT (result)' failed +Dec 03 14:35:08 krowka polkitd[21432]: polkit_authorization_result_get_is_challenge: assertion 'POLKIT_IS_AUTHORIZATION_RESULT (result)' failed +Dec 03 14:35:08 krowka polkitd[21432]: polkit_authorization_result_get_is_authorized: assertion 'POLKIT_IS_AUTHORIZATION_RESULT (result)' failed +Dec 03 14:35:08 krowka polkitd[21432]: g_object_unref: assertion 'G_IS_OBJECT (object)' failed +Dec 03 14:35:08 krowka polkitd[21432]: g_object_unref: assertion 'G_IS_OBJECT (object)' failed +--- + src/polkit/polkitunixgroup.c | 9 ++++++++- + src/polkit/polkitunixuser.c | 7 +++++++ + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/src/polkit/polkitunixgroup.c b/src/polkit/polkitunixgroup.c +index 095cca0..53db862 100644 +--- a/src/polkit/polkitunixgroup.c ++++ b/src/polkit/polkitunixgroup.c +@@ -71,6 +71,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixGroup, polkit_unix_group, G_TYPE_OBJECT, + static void + polkit_unix_group_init (PolkitUnixGroup *unix_group) + { ++ unix_group->gid = -1; + } + + static void +@@ -100,11 +101,14 @@ polkit_unix_group_set_property (GObject *object, + GParamSpec *pspec) + { + PolkitUnixGroup *unix_group = POLKIT_UNIX_GROUP (object); ++ gint val; + + switch (prop_id) + { + case PROP_GID: +- unix_group->gid = g_value_get_int (value); ++ val = g_value_get_int (value); ++ g_return_if_fail (val >= 0); ++ unix_group->gid = val; + break; + + default: +@@ -169,6 +173,7 @@ polkit_unix_group_set_gid (PolkitUnixGroup *group, + gint gid) + { + g_return_if_fail (POLKIT_IS_UNIX_GROUP (group)); ++ g_return_if_fail (gid >= 0); + group->gid = gid; + } + +@@ -183,6 +188,8 @@ polkit_unix_group_set_gid (PolkitUnixGroup *group, + PolkitIdentity * + polkit_unix_group_new (gint gid) + { ++ g_return_val_if_fail (gid >= 0, NULL); ++ + return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_GROUP, + "gid", gid, + NULL)); +diff --git a/src/polkit/polkitunixuser.c b/src/polkit/polkitunixuser.c +index a5285f4..ef6403e 100644 +--- a/src/polkit/polkitunixuser.c ++++ b/src/polkit/polkitunixuser.c +@@ -72,6 +72,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixUser, polkit_unix_user, G_TYPE_OBJECT, + static void + polkit_unix_user_init (PolkitUnixUser *unix_user) + { ++ unix_user->uid = -1; + unix_user->name = NULL; + } + +@@ -112,10 +113,13 @@ polkit_unix_user_set_property (GObject *object, + GParamSpec *pspec) + { + PolkitUnixUser *unix_user = POLKIT_UNIX_USER (object); ++ gint val; + + switch (prop_id) + { + case PROP_UID: ++ val = g_value_get_int (value); ++ g_return_if_fail (val >= 0); + unix_user->uid = g_value_get_int (value); + break; + +@@ -182,6 +186,7 @@ polkit_unix_user_set_uid (PolkitUnixUser *user, + gint uid) + { + g_return_if_fail (POLKIT_IS_UNIX_USER (user)); ++ g_return_if_fail (uid >= 0); + user->uid = uid; + } + +@@ -196,6 +201,8 @@ polkit_unix_user_set_uid (PolkitUnixUser *user, + PolkitIdentity * + polkit_unix_user_new (gint uid) + { ++ g_return_val_if_fail (uid >= 0, NULL); ++ + return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_USER, + "uid", uid, + NULL)); +-- +2.18.1 + diff --git a/user/polkit/polkit.pre-upgrade b/user/polkit/polkit.pre-upgrade new file mode 100644 index 000000000..816f89236 --- /dev/null +++ b/user/polkit/polkit.pre-upgrade @@ -0,0 +1,5 @@ +#!/bin/sh + +useradd -r -s /sbin/nologin -d /usr/lib/polkit-1 -M -U polkitd 2>/dev/null + +exit 0 diff --git a/user/powerdevil/APKBUILD b/user/powerdevil/APKBUILD index 0a741eff9..91da76bb6 100644 --- a/user/powerdevil/APKBUILD +++ b/user/powerdevil/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=powerdevil -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE Plasma power management utilities" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b77e1990e59bae684d19fd796789aa0216d111952941642c354fc760e862cd5008c923aa5f1783c8699818fdfd36333a2ad56832834e3ce2232905ec399e0846 powerdevil-5.12.6.tar.xz" +sha512sums="e85f93f494d2ce86676269c1bfe49d59a855bbcd5f260bc3205e3b2ef38de5dd17ee47397eca3280e9dcb484c80b79c670a1b2e089891d5090e9ee935504d4c9 powerdevil-5.12.7.tar.xz" diff --git a/user/proxymngr/APKBUILD b/user/proxymngr/APKBUILD new file mode 100644 index 000000000..00215b164 --- /dev/null +++ b/user/proxymngr/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=proxymngr +pkgver=1.0.4 +pkgrel=0 +pkgdesc="X11 proxy manager service" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="lbxproxy" +makedepends="libice-dev libxt-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/proxymngr-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="dce0d93558e674ce82197476d204488505079c8aa5192387e57c06844c4ea83da1cf45238e0a63e2bbf9867388ca1175125b6d7b4036085be89b3de353887fd2 proxymngr-1.0.4.tar.bz2" diff --git a/user/py3-markdown/APKBUILD b/user/py3-markdown/APKBUILD new file mode 100644 index 000000000..ef362e1f9 --- /dev/null +++ b/user/py3-markdown/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: zlg <zlg+adelie@zlg.space> +pkgname=py3-markdown +_pkgname=Markdown +pkgver=3.0.1 +pkgrel=0 +pkgdesc="A Python implementation of Markdown" +url="https://python-markdown.github.io/" +arch="noarch" +options="!check" # needs flake8 +license="BSD-3-Clause" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + cd "$builddir" + python3 setup.py build +} + +package() { + cd "$builddir" + python3 setup.py install --root="$pkgdir" +} + +sha512sums="c648c1b8ecb3c907ff2bd636ec6c08b4b629967fb916913f77db641f6d61b83d16929af2f15f5695c8cdb9614031606110e02a7e0bbb3aab0be38a8e285f12f1 Markdown-3.0.1.tar.gz" diff --git a/user/py3-pygments/APKBUILD b/user/py3-pygments/APKBUILD new file mode 100644 index 000000000..59055ed48 --- /dev/null +++ b/user/py3-pygments/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Peter Bui <pnutzh4x0r@gmail.com> +# Contributor: Matt Smith <mcs@darkregion.net> +# Maintainer: zlg <zlg+packages@zlg.space> +pkgname=py3-pygments +_pkgname=Pygments +pkgver=2.2.0 +pkgrel=0 +pkgdesc="A syntax highlighting package written in Python." +url="http://pygments.org/" +arch="noarch" +options="!check" # needs nose, flake8 +license="BSD-2-Clause" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + cd "$builddir" + python3 setup.py build +} + +# Reactivate once nose and flake8 are packaged +check() { + cd "$builddir" + sed -i -e 's:python:python3:' Makefile + make test +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +doc() { + cd "$builddir" + install -m 644 -D doc/pygmentize.1 "$pkgdir"/usr/share/man/man1/pygmentize.1 +} + +sha512sums="cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29 Pygments-2.2.0.tar.gz" diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD index 2859cdb51..972b0f957 100644 --- a/user/py3-pygobject/APKBUILD +++ b/user/py3-pygobject/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=py3-pygobject -pkgver=3.30.2 +pkgver=3.30.4 pkgrel=0 pkgdesc="Python bindings for GObject libraries" url="https://pygobject.readthedocs.io/" @@ -28,4 +28,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="a643b800fbaf659957879ca8b4fa4cc3556a8e6bb4d061ffe205204d7ea197baf77d8836a733562552fa9ee56c7831359313c2403062cc46b5d72d5d7fd3030e pygobject-3.30.2.tar.bz2" +sha512sums="8c86955033690b199d12e4e853443e4078fc0eb7c2c23599aba1e083b743ae3b6c9e2031c4277c6a1140ac787540639865e743e1504dd15bf160b977b4a8dee5 pygobject-3.30.4.tar.bz2" diff --git a/user/py3-zope-component/APKBUILD b/user/py3-zope-component/APKBUILD index e915703cf..6c283d12c 100644 --- a/user/py3-zope-component/APKBUILD +++ b/user/py3-zope-component/APKBUILD @@ -3,16 +3,16 @@ pkgname=py3-zope-component _pkgname=zope.component pkgver=4.5 -pkgrel=0 +pkgrel=1 pkgdesc="Zope Component Architecture" url="https://pypi.python.org/pypi/zope.component" arch="noarch" options="!check" # needs nose license="ZPL-2.1" -depends="python3 py3-zope-interface py3-zope-event" +depends="python3 py3-zope-deferredimport py3-zope-deprecation py3-zope-event py3-zope-hookable py3-zope-interface py3-zope-proxy" makedepends="python3-dev" subpackages="" -source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/zope.component/archive/$pkgver.tar.gz" +source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/archive/$pkgver.tar.gz" builddir="$srcdir"/$_pkgname-$pkgver build() { diff --git a/user/py3-zope-deferredimport/APKBUILD b/user/py3-zope-deferredimport/APKBUILD new file mode 100644 index 000000000..c66f10723 --- /dev/null +++ b/user/py3-zope-deferredimport/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: zlg <zlg+adelie@zlg.space> +pkgname=py3-zope-deferredimport +_pkgname=zope.deferredimport +pkgver=4.3 +pkgrel=0 +pkgdesc="Zope module that allows for lazy module importing" +url="https://github.com/zopefoundation/zope.deferredimport" +arch="noarch" +options="!check" # needs zope.testrunner +license="ZPL-2.1" +depends="python3" +makedepends="python3-dev py3-zope-proxy" +subpackages="" +source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/archive/$pkgver.tar.gz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + cd "$builddir" + python3 setup.py build +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="0b62cf6caa7709dbb6b0ae85bf9c5e24909c79af57da8e3d081e69ff9f73fc60fbe5a83cdfe795551eeee3c045d3783a09cb3e6eb3964a44e6fbbea149ca3f8a py3-zope-deferredimport-4.3.tar.gz" diff --git a/user/py3-zope-deprecation/APKBUILD b/user/py3-zope-deprecation/APKBUILD new file mode 100644 index 000000000..f21a1fdeb --- /dev/null +++ b/user/py3-zope-deprecation/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: zlg <zlg+adelie@zlg.space> +pkgname=py3-zope-deprecation +_pkgname=zope.deprecation +pkgver=4.4.0 +pkgrel=0 +pkgdesc="A function to mark deprecated parts of an API" +url="https://github.com/zopefoundation/zope.deprecation" +arch="noarch" +options="!check" # needs zope.testrunner +license="ZPL-2.1" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/archive/$pkgver.tar.gz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + cd "$builddir" + python3 setup.py build +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="d8632a3442eee059383014bb3341b30897ad8f9206b71bc586c873c4cccf5f87296edaf18f1e1c93878f480e3b0e8e1c1936ac19ed327f4ab227402ebbc73e0e zope.deprecation-4.4.0.tar.gz" diff --git a/user/py3-zope-hookable/APKBUILD b/user/py3-zope-hookable/APKBUILD new file mode 100644 index 000000000..a2b4493be --- /dev/null +++ b/user/py3-zope-hookable/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: zlg <zlg+adelie@zlg.space> +pkgname=py3-zope-hookable +_pkgname=zope.hookable +pkgver=4.2.0 +pkgrel=0 +pkgdesc="A library that provides an interface for hookable functions" +url="https://github.com/zopefoundation/zope.hookable" +arch="all" +options="!check" # needs zope.testing +license="ZPL-2.1" +depends="python3" +makedepends="python3-dev py3-tox coverage" +subpackages="" +source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/archive/$pkgver.tar.gz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + cd "$builddir" + python3 setup.py build +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="aeeafff7e5c7cbe3d5944864278896f926086514e75be1d5956e32fc0a3769ac11b008c3855a0816084c7deb64f14c65db49852dac2beaf06420a304af6ebb69 zope.hookable-4.2.0.tar.gz" diff --git a/user/py3-zope-proxy/APKBUILD b/user/py3-zope-proxy/APKBUILD new file mode 100644 index 000000000..37a7b35b2 --- /dev/null +++ b/user/py3-zope-proxy/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: zlg <zlg+adelie@zlg.space> +pkgname=py3-zope-proxy +_pkgname=zope.proxy +pkgver=4.3.1 +pkgrel=0 +pkgdesc="Zope module for class and function proxies" +url="https://github.com/zopefoundation/zope.proxy" +arch="all" +options="!check" # needs zope.testrunner, zope.security +license="ZPL-2.1" +depends="python3 py3-zope-interface" +makedepends="python3-dev" +subpackages="" +source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/archive/$pkgver.tar.gz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + cd "$builddir" + python3 setup.py build +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="1072258c35bf23162c4f347060ea79979cbfc551c308e809b7e63f1d9434f566b665954edf3d2ab0b72161fb74b0e707c5904775876188306411ed0401424612 zope.proxy-4.3.1.tar.gz" diff --git a/user/qt-creator/APKBUILD b/user/qt-creator/APKBUILD index 84f7f2cb7..46b61e3c8 100644 --- a/user/qt-creator/APKBUILD +++ b/user/qt-creator/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt-creator -pkgver=4.7.2 +pkgver=4.8.0 pkgrel=0 pkgdesc="Cross-platform multi-language programming IDE" url="https://doc.qt.io/qtcreator/index.html" @@ -29,4 +29,4 @@ package() { make install INSTALL_ROOT="$pkgdir"/usr } -sha512sums="b7278a7882747acc9be0484e10426becd942746e9b7b9cea7d57e3af72c261c02431c8682e1f9d6e61c5884d5aa06e503716d22157e61d3787327c3c00a452bc qt-creator-opensource-src-4.7.2.tar.gz" +sha512sums="ab107f798dd269a4b487f7838f053c27f20195800db7cbb0e1225282a2b241887102e30c69763b815f0a061d73565c6a358f815647755843e8417b66bebee81c qt-creator-opensource-src-4.8.0.tar.gz" diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD index bc81a6442..08e623af5 100644 --- a/user/qt5-qtbase/APKBUILD +++ b/user/qt5-qtbase/APKBUILD @@ -1,51 +1,28 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtbase _pkgname=qtbase-opensource-src -pkgver=5.9.6 -pkgrel=1 +pkgver=5.9.7 +pkgrel=0 pkgdesc="Qt 5.9 base components" url="https://www.qt.io/" arch="all" license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions" _sub="$pkgname-sqlite $pkgname-odbc $pkgname-postgresql $pkgname-tds $pkgname-x11" -depends_dev="mesa-dev libice-dev libsm-dev libx11-dev libxext-dev - openssl-dev fontconfig-dev freetype-dev glib-dev libpng-dev zlib-dev - sqlite-dev dbus-dev perl $_sub" +depends_dev="dbus-dev fontconfig-dev freetype-dev glib-dev libice-dev + libpng-dev libsm-dev libx11-dev libxext-dev mesa-dev openssl-dev perl + sqlite-dev zlib-dev $_sub" makedepends="$depends_dev - at-spi2-core-dev - bison - cups-dev - eudev-dev - flex - freetds-dev - freetype-dev - gperf - gtk+2.0-dev - harfbuzz-dev - hicolor-icon-theme - icu-dev - libinput-dev - libjpeg-turbo-dev - libxkbcommon-dev - libxi-dev - libxrandr-dev - libxrender-dev - libxslt-dev - libxv-dev - mtdev-dev - pcre2-dev - postgresql-dev - unixodbc-dev - xcb-util-dev - xcb-util-image-dev - xcb-util-keysyms-dev - xcb-util-wm-dev - xcb-util-renderutil-dev - cmd:which + at-spi2-core-dev bison cups-dev eudev-dev flex freetds-dev freetype-dev + gperf gtk+2.0-dev harfbuzz-dev hicolor-icon-theme icu-dev + libexecinfo-dev libinput-dev libjpeg-turbo-dev libxkbcommon-dev + libxi-dev libxrandr-dev libxrender-dev libxslt-dev libxv-dev mtdev-dev + pcre2-dev postgresql-dev unixodbc-dev xcb-util-dev xcb-util-image-dev + xcb-util-keysyms-dev xcb-util-wm-dev xcb-util-renderutil-dev cmd:which " subpackages="$pkgname-dev $pkgname-doc $_sub" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz + link-to-execinfo.patch qt-musl-iconv-no-bom.patch " @@ -59,7 +36,7 @@ prepare() { sed -i -e "s|-O2|$CXXFLAGS|" \ -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \ -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \ - mkspecs/common/*.conf + mkspecs/common/linux.conf } build() { @@ -70,7 +47,7 @@ build() { ./configure -confirm-license -opensource \ -archdatadir "$_qt5_prefix" \ - -bindir "$_qt5_prefix"/bin \ + -bindir "$_qt5_prefix"/bin \ -datadir "$_qt5_datadir" \ -dbus-linked \ -docdir /usr/share/doc/qt5 \ @@ -79,8 +56,8 @@ build() { -icu \ -importdir "$_qt5_prefix"/imports \ -libexecdir "$_qt5_prefix"/libexec \ - -no-rpath \ -no-pch \ + -no-rpath \ -nomake examples \ -opengl \ -openssl-linked \ @@ -195,5 +172,6 @@ x11() { return 0 } -sha512sums="e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb qtbase-opensource-src-5.9.6.tar.xz +sha512sums="7121837501b810f31863fbb3a6ea7189d3e38789ff25eb49b639a69b73913761c8cba18b65046519693d2f5c8755c2197feff1df1ec3d88676d00c649a326e1e qtbase-opensource-src-5.9.7.tar.xz +ee78a44e28ba5f728914bfc3d8d5b467896c7de11a02d54b0bce11e40a4338b1f776c1fcc30cbd436df4f548c1ab0b4fe801f01b162ddd5c0f892893e227acfd link-to-execinfo.patch 7d68421a14f0259535c977d8a521c98918193c107b76ac664571b12f5b0d7588a0d0e1297af412a26753a393b21f3f44c3274fa8ab5bc87f03705a3a03acb444 qt-musl-iconv-no-bom.patch" diff --git a/user/qt5-qtbase/link-to-execinfo.patch b/user/qt5-qtbase/link-to-execinfo.patch new file mode 100644 index 000000000..e7cb6ea18 --- /dev/null +++ b/user/qt5-qtbase/link-to-execinfo.patch @@ -0,0 +1,10 @@ +--- qtbase-opensource-src-5.9.7/mkspecs/common/linux.conf.old 2018-12-06 18:58:21.200000000 +0000 ++++ qtbase-opensource-src-5.9.7/mkspecs/common/linux.conf 2018-12-06 19:08:00.980000000 +0000 +@@ -28,6 +28,7 @@ + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl ++QMAKE_LIBS_EXECINFO = -lexecinfo + QMAKE_LIBS_X11 = -lXext -lX11 -lm + QMAKE_LIBS_EGL = -lEGL + QMAKE_LIBS_OPENGL = -lGL diff --git a/user/qt5-qtdeclarative/APKBUILD b/user/qt5-qtdeclarative/APKBUILD index f1b687ec6..2db5a1d17 100644 --- a/user/qt5-qtdeclarative/APKBUILD +++ b/user/qt5-qtdeclarative/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtdeclarative _pkgname=${pkgname/qt5-/}-opensource-src -pkgver=5.9.6 -pkgrel=1 +pkgver=5.9.7 +pkgrel=0 pkgdesc="Qt 5 - Qt Declarative and Qt Quick 2" url="https://www.qt.io/" arch="all" @@ -35,5 +35,5 @@ package() { done } -sha512sums="1fc7a542c60e8c13ba9b791d7b83a916fc1ffb1d3ab505405055a13d597a2c406f29bbd9309603af5bf56492874efeee33ab0128af1fa44866d66d689147ac39 qtdeclarative-opensource-src-5.9.6.tar.xz +sha512sums="bccddeca26c317083fcebc182dd3221dcbe9af665c502bfb636907f2c17a6edd8874a964910423c9eaa6e5c68bf5a13520193ba77f915be08ba1982348d2a9ee qtdeclarative-opensource-src-5.9.7.tar.xz 065ab2440fd0a81e76fe8873b0991929fad3d4189c8938e0205e94478a6cdce81ef710e3bad19cd5ca0b5ea0f8b3cd1b366969ddede51070496d1d02ace59220 add-execinfo.patch" diff --git a/user/qt5-qtgraphicaleffects/APKBUILD b/user/qt5-qtgraphicaleffects/APKBUILD index 0e7de1aaa..c4a476b9f 100644 --- a/user/qt5-qtgraphicaleffects/APKBUILD +++ b/user/qt5-qtgraphicaleffects/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtgraphicaleffects _pkgname=qtgraphicaleffects-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Pre-made visual effects for QML" url="https://www.qt.io/" @@ -29,4 +29,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="a319dd594bd9048242512cefddf8db0474677d48a03c7616633d7e3b7dd6637ff2c7cce206d25d3938a6b3f3cc7ffc037630e5923caea0bfa7612e99522e36ea qtgraphicaleffects-opensource-src-5.9.6.tar.xz" +sha512sums="914e70403b9529071f13b3f7af596f4b06f1988d59e0ea5915cc6f5b8b2e1b38eaab50e2cbe5a895d0f5be4f99c3ec62b32d629083ff3dc1fce413acb2615c0f qtgraphicaleffects-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtmultimedia/APKBUILD b/user/qt5-qtmultimedia/APKBUILD index cf71e6071..9b677708a 100644 --- a/user/qt5-qtmultimedia/APKBUILD +++ b/user/qt5-qtmultimedia/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtmultimedia _pkgname=qtmultimedia-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Audio, video, radio, and camera libraries" url="https://www.qt.io/" @@ -28,4 +28,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="2d5f1341ef1f2d7e99ced28945f70b283630ce4ed9ac968c34ffc7d215c59a9b895681ee519aca64fe8a41ae574577ce834e486281db7e1f337245f9b6506207 qtmultimedia-opensource-src-5.9.6.tar.xz" +sha512sums="a5c947cb8764e63e81187db01caefa588bab77705b03ed0dff09433b0831f55f2461c64f2ce99085c7bfcac795ae67dd69ac7a992ef8d04c043d237e2c95e4c6 qtmultimedia-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtpositioning/APKBUILD b/user/qt5-qtpositioning/APKBUILD index e10d6b170..5bb8daf6f 100644 --- a/user/qt5-qtpositioning/APKBUILD +++ b/user/qt5-qtpositioning/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtpositioning _pkgname=qtlocation-opensource-src -pkgver=5.9.6 -pkgrel=1 +pkgver=5.9.7 +pkgrel=0 pkgdesc="Qt 5 - Geolocation services" url="https://www.qt.io/" arch="all" @@ -33,5 +33,5 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="63071f88b6b742701a0f26a11edb20e50a7a9f158c8a79dcdfd39668197963e5d505a1de828acad273ebc54f15f51fa1089ed03953cc46ca9c68ddad647ac06a qtlocation-opensource-src-5.9.6.tar.xz +sha512sums="a0ee0d699ecf568eb9371ff0743f9ec65f568e235e8964a2e3187a3135fc943795101c8922fbe560779f7878f44a630383234a65ed67aea35d084ce04eeb7a96 qtlocation-opensource-src-5.9.7.tar.xz 8590335ae90ade1c685ff99fb4319d1b7448d2ae15ba999e3dc9a29e62eda3db587d8ee366dc68fad6eb9e0872532d50f0bdc74f4689a554ca095ad24967418c no-getting-thread-names.patch" diff --git a/user/qt5-qtquickcontrols/APKBUILD b/user/qt5-qtquickcontrols/APKBUILD index 466046164..7666875ce 100644 --- a/user/qt5-qtquickcontrols/APKBUILD +++ b/user/qt5-qtquickcontrols/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtquickcontrols _pkgname=qtquickcontrols-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - controls for use with Qt Quick" url="https://www.qt.io/" @@ -27,4 +27,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="1a48ede02a0a0ddca6475ec952684045638a61a0db9f545b8ad8b2115f93f3a5586655a24138545d168196a3990f2c6dbef18530af546c60026e1eac91ca832e qtquickcontrols-opensource-src-5.9.6.tar.xz" +sha512sums="87b8af09035f77bf02e6995a173d381536c50896604dcd884f7adede4d70464d5ee28161fda7b449ad851a728254cee00b7984099c4c9f024623a16157c0a656 qtquickcontrols-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtquickcontrols2/APKBUILD b/user/qt5-qtquickcontrols2/APKBUILD index 3d1ca5113..274ff17bf 100644 --- a/user/qt5-qtquickcontrols2/APKBUILD +++ b/user/qt5-qtquickcontrols2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtquickcontrols2 _pkgname=qtquickcontrols2-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Quick Controls 2.0" url="https://www.qt.io/" @@ -10,7 +10,8 @@ arch="all" options="!check" # Impossible to test with accelerated X desktop license="LGPLv2 with exceptions OR GPLv3 with exceptions" depends="" -makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev" +depends_dev="qt5-qtdeclarative-dev" +makedepends="$depends_dev qt5-qtbase-dev" subpackages="$pkgname-dev" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" builddir="$srcdir"/$_pkgname-$pkgver @@ -26,4 +27,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="46817c31a62de3cce4179869c3080e12d2dcb3859af9020fc476baddc184ef7a7b8dfb0ccd2501c72e689c5d64c3d9135eeb1f7dfc821f06aa124addc4dc4d7d qtquickcontrols2-opensource-src-5.9.6.tar.xz" +sha512sums="591a3b5ee53f681d1c9906451db76c89c12e9ccdc0cdbbb18937550612149505ba415f85d3acf2c01ab6c6b9aab279388fb2e6b501daf9ac49095b20eaeac032 qtquickcontrols2-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtscript/APKBUILD b/user/qt5-qtscript/APKBUILD index 940d23e5a..16237b5c6 100644 --- a/user/qt5-qtscript/APKBUILD +++ b/user/qt5-qtscript/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtscript _pkgname=qtscript-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Deprecated scripting framework for Qt applications" url="https://www.qt.io/" @@ -28,4 +28,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="2ddecda376b79edc8cfe9215a531a8f0b1892f3e6b39c298a679903c2600a1df43bb59baeed3392e92fefb476ec2ebdd2ffd351d14918fea00025d2cbd48da46 qtscript-opensource-src-5.9.6.tar.xz" +sha512sums="e019d2e7aa29e1183636503822db960d97f1787fa7517f286acbe42645f2c5daa099cc251ac6640e3243dedb4ef64e509f2e22bca798a7e583063e0ac7635662 qtscript-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtsensors/APKBUILD b/user/qt5-qtsensors/APKBUILD index 152d9eabe..bc363c58b 100644 --- a/user/qt5-qtsensors/APKBUILD +++ b/user/qt5-qtsensors/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtsensors _pkgname=qtsensors-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Library for interfacing with sensors" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="1c82b0e02bc45c914fbc620049b2f4e33bdd0ff858c2f3946d134e4e5dc5927358ff53db0b6d9fcbb6811e36d2a816aacf7f852f377ecff47280ca592eaa92c3 qtsensors-opensource-src-5.9.6.tar.xz" +sha512sums="b07c5a79e9f1db5d64bef6fb92954c7467858d5f00f9bc96f8f7c8651121c1c57de7d21b273827830814919b5fa19720515d3a2dab77bf87876e60fdaedae788 qtsensors-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtserialport/APKBUILD b/user/qt5-qtserialport/APKBUILD index 78ce5b969..afbf09362 100644 --- a/user/qt5-qtserialport/APKBUILD +++ b/user/qt5-qtserialport/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtserialport _pkgname=qtserialport-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Connect Qt applications to serial ports" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="a4f5230c78772aa8899471dea90bab38a1cc021c22737f959e1a6852d18e7faeaadba4d329e49b3c9a3b7ef5fea69febb550e7fb4a9d99902d0e80a144822847 qtserialport-opensource-src-5.9.6.tar.xz" +sha512sums="a90cfec383f2c1e8240bbcb0fe18c99773833d0749499e3b379d669b6053eaceea7813665068b2512cdc5c57cef5dafbdd9928e8f3d133405fb02c4c0c44e80b qtserialport-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtsvg/APKBUILD b/user/qt5-qtsvg/APKBUILD index f3d5b3b94..d0c96bdc6 100644 --- a/user/qt5-qtsvg/APKBUILD +++ b/user/qt5-qtsvg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtsvg _pkgname=qtsvg-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - SVG rendering library" url="https://www.qt.io/" @@ -28,4 +28,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="6e86f050c07621d628f6e9440541be1fd80b3e05b034ba17bb5068afd4775d9ee08d7bf11d2ffdf03da2cb8ca66bfaf2f59b7e5e76acdb1a1e2ec25af25c65b4 qtsvg-opensource-src-5.9.6.tar.xz" +sha512sums="d2e58ff0321fd40031dbbc0d0b0a8bb321cae2dc64bb4afec3c72ed9b5a25d67b156971d7a5ea4f74d966a3e8cda779474ee932ab129fa0b26f12978feebcd84 qtsvg-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qttools/APKBUILD b/user/qt5-qttools/APKBUILD index 05a6b8652..da0fd89c1 100644 --- a/user/qt5-qttools/APKBUILD +++ b/user/qt5-qttools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qttools _pkgname=qttools-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Tools for Qt development" url="https://www.qt.io/" @@ -119,7 +119,7 @@ _dbusviewer() { usr/share/icons/hicolor/*/apps/qdbusviewer* } -sha512sums="2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8 qttools-opensource-src-5.9.6.tar.xz +sha512sums="0240881adf23d3b5841882e107969ed298ee05b82c125a7577b568b29d4402259d459e534408f8768ce419c61a8c974c35454cb94c9387e160fd308209188b8a qttools-opensource-src-5.9.7.tar.xz d566c5284854855541df7177b23f491d96f5064b571e899a44f1d4fcf8bbf1223590b05b1954278dc6f3f56341c917f5b846594c5bd2215b6a859224038d8ad2 assistant-qt5.desktop 72d9a2235a60c4ae05ba8395d473fe0b42c12e584da619dadb112eb67ba33a85fe0dab6c185d98112d7b25d3eeacaf02f7ef4731742e50c17eacc54c383661b3 designer-qt5.desktop b6d8a672d19eed39ab868ff6fc880f255da94acb9e1e84f5905c0f3b9b6055547e8a706492973692c06dc23d35ce77622fc13efc11adf21b62c3baf4ef5ab2ad linguist-qt5.desktop diff --git a/user/qt5-qtwebchannel/APKBUILD b/user/qt5-qtwebchannel/APKBUILD index 2306ceeaf..95a4371fd 100644 --- a/user/qt5-qtwebchannel/APKBUILD +++ b/user/qt5-qtwebchannel/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwebchannel _pkgname=qtwebchannel-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Connect Qt applications to WebSockets" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="f2c4ceb7efba18ffbb2b3bf11b04c158c601ce82eadfcadeccbb81405db0ff2275fe4a5706872adaa6faa6ab2c1f1f6b6fdeeeb09e127e3b9dbfeac5a4eb7ab5 qtwebchannel-opensource-src-5.9.6.tar.xz" +sha512sums="0109f11dd9c83e8dbf50921abb642a5e185fda98ead87973bd1b24c1f490268f2a9c7d264da659f7eac1f98942aecc839d7418abce0e7d2a66093b9b89eb4bca qtwebchannel-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtwebsockets/APKBUILD b/user/qt5-qtwebsockets/APKBUILD index 2d7914eb3..70f2ce8f0 100644 --- a/user/qt5-qtwebsockets/APKBUILD +++ b/user/qt5-qtwebsockets/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwebsockets _pkgname=qtwebsockets-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Pure Qt implementation of WebSockets" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="3ecb44b6046d1a57ee85d261107b332f219aaed312712f817127cf0715f22ef3688192bccd86bc2057f79b9b1d69bfbceb3b8cac97ddaa33afc4bb3284b857dd qtwebsockets-opensource-src-5.9.6.tar.xz" +sha512sums="ee5d1eab254a55791ca7414066c1661614605d6a193305d687aa3321bb69fb59fe6c877153cee1ea4321a91721e42b8fafcaa4cda418c6edc057dc3683c73756 qtwebsockets-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtx11extras/APKBUILD b/user/qt5-qtx11extras/APKBUILD index d3d895012..ed049fe33 100644 --- a/user/qt5-qtx11extras/APKBUILD +++ b/user/qt5-qtx11extras/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtx11extras _pkgname=qtx11extras-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Extra libraries for X11 support" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="22bb33a40e242f54caca075ef53e1401ed82f094f87526bb24e8c85227ef56364c78b0c8287a173c38aabc7ca3be833d13d5156f3b3553a57bf74ceab1831be1 qtx11extras-opensource-src-5.9.6.tar.xz" +sha512sums="04803755cabc449dd35c20a5ec7f4836fec5e9f4e28daf8a577e66385e9698139a1ae23a29ade8f0c5a766665a137497eaff3c55746879b9c2fe85c38710d37f qtx11extras-opensource-src-5.9.7.tar.xz" diff --git a/user/qt5-qtxmlpatterns/APKBUILD b/user/qt5-qtxmlpatterns/APKBUILD index 3ec06d9db..7885359f2 100644 --- a/user/qt5-qtxmlpatterns/APKBUILD +++ b/user/qt5-qtxmlpatterns/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtxmlpatterns _pkgname=qtxmlpatterns-opensource-src -pkgver=5.9.6 +pkgver=5.9.7 pkgrel=0 pkgdesc="Qt 5 - Support for XPath, XQuery, XSLT, and XML schema validation" url="https://www.qt.io/" @@ -28,4 +28,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="c1b7983725cd208b207e366f3fcaedf073768cbe11d6c54c4569b8155e2c97e4af889792600d86769b7e6828409e0333ad7c66b8459d07c5c1a06268d28d6788 qtxmlpatterns-opensource-src-5.9.6.tar.xz" +sha512sums="d24f983eaf0414b5b5dbbd8e60cfc87d4d742aae82b457e5d77c01a0534620f30f4507e1c71ce4bbe2a16eeafd6dde566c8d11bccea04c5668189936cc44aca3 qtxmlpatterns-opensource-src-5.9.7.tar.xz" diff --git a/user/rendercheck/APKBUILD b/user/rendercheck/APKBUILD new file mode 100644 index 000000000..30a821e2c --- /dev/null +++ b/user/rendercheck/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=rendercheck +pkgver=1.5 +pkgrel=0 +pkgdesc="X11 Render extension testing and debugging utility" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libx11-dev libxrender-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/rendercheck-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="ffa1abf317f85a8bcef3544e3f810b34567553524ac0a784d2a67470e0811854d7983af8600a04aadecf42871ccb83ad5c0e9e25179142fda2a8f5853a07f616 rendercheck-1.5.tar.bz2" diff --git a/user/rgb/APKBUILD b/user/rgb/APKBUILD new file mode 100644 index 000000000..42be8cbe4 --- /dev/null +++ b/user/rgb/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=rgb +pkgver=1.0.6 +pkgrel=0 +pkgdesc="X11 colour name database" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/rgb-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e rgb-1.0.6.tar.bz2" diff --git a/user/sddm-kcm/APKBUILD b/user/sddm-kcm/APKBUILD index fec6e443e..19d4af447 100644 --- a/user/sddm-kcm/APKBUILD +++ b/user/sddm-kcm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sddm-kcm -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE configuration applet for SDDM" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f9b43d4dba83c80b6cac1a55f8a7e99c500a01578a67354d8c54d049ff42ffb1a7b0ba2912e089a382b960397b4031b46e49882ba272d9ebd5c60dde843077fd sddm-kcm-5.12.6.tar.xz" +sha512sums="29d7b03378a6d5a3d58a0c2b85f6dbe4d0114785456072f16872cd09e7ce355f4e59149e31cb69fe7fbb35678c6fc075c788a091c3b638661a64a856aa4a145b sddm-kcm-5.12.7.tar.xz" diff --git a/user/sdl2/APKBUILD b/user/sdl2/APKBUILD index 45927c139..910eb1763 100644 --- a/user/sdl2/APKBUILD +++ b/user/sdl2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: August Klein <amatcoder@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sdl2 -pkgver=2.0.8 -pkgrel=1 +pkgver=2.0.9 +pkgrel=0 pkgdesc="Low level audio, keyboard, mouse, joystick and graphics library" url="https://www.libsdl.org/" arch="all" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869 SDL2-2.0.8.tar.gz +sha512sums="a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10 SDL2-2.0.9.tar.gz f64402503f4cf7e7d65efc1b397c9d632b0f592ee04893884155d0e88bc88e0ae096778cbd30a2caf61246430b43bd17a1f78dda8a8abcbc8ebd60ef107386ac ensure-c++-on-ppc.patch" diff --git a/user/showfont/APKBUILD b/user/showfont/APKBUILD new file mode 100644 index 000000000..63af1593b --- /dev/null +++ b/user/showfont/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=showfont +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Utility to display font information from an X11 Font Server" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libfs-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/showfont-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d90d6d99ca573f2632435ccfd46de606994e3792deb58bab6261ff950481ec71eef032b828da0ee5333d6946c5f54594dfb2dadf930825971d3f4baa5c0ff6fd showfont-1.0.5.tar.bz2" diff --git a/user/smproxy/APKBUILD b/user/smproxy/APKBUILD new file mode 100644 index 000000000..03e3eda4e --- /dev/null +++ b/user/smproxy/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=smproxy +pkgver=1.0.6 +pkgrel=0 +pkgdesc="X11R6 Session Manager proxy" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libice-dev libsm-dev libxmu-dev libxt-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/smproxy-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="4945c92c0f07c5dba5698889f415e78ce406939f4a36eb977309488c27385ce4ce04235c4e850a90a451fea8d7885ded7c6b18db71335c7731b38aaeefa9fcb7 smproxy-1.0.6.tar.bz2" diff --git a/user/spectrwm/APKBUILD b/user/spectrwm/APKBUILD new file mode 100644 index 000000000..4c3de19db --- /dev/null +++ b/user/spectrwm/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=spectrwm +pkgver=3.2.0 +_pkgver=${pkgver/./_} +_pkgver=${_pkgver/./_} +pkgrel=0 +pkgdesc="Small dynamic tiling window manager" +url="https://github.com/conformal/spectrwm" +arch="all" +options="!check" # no tests +license="ISC AND MIT" +depends="" +makedepends="libx11-dev libxcursor-dev libxcb-dev xcb-util-keysyms-dev + xcb-util-wm-dev libxft-dev libxt-dev libxrandr-dev bsd-compat-headers" +subpackages="$pkgname-doc" +source="spectrwm-$pkgver.tar.gz::https://github.com/conformal/spectrwm/archive/SPECTRWM_$_pkgver.tar.gz" +builddir="$srcdir/spectrwm-SPECTRWM_$_pkgver" + +build() { + cd "$builddir"/linux + CFLAGS="-DSWM_LIB=libswmhack.so" make PREFIX=/usr +} + +package() { + cd "$builddir"/linux + make PREFIX=/usr DESTDIR="$pkgdir" install + cd .. + for i in screenshot.sh baraction.sh; do + install -Dm755 $i "$pkgdir"/usr/share/spectrwm/$i + done + install -Dm644 spectrwm.conf "$pkgdir"/usr/share/spectrwm/spectrwm.conf + mkdir -p "$pkgdir"/etc/spectrwm + for i in spectrwm_*.conf; do + install -Dm644 $i "$pkgdir"/etc/spectrwm/$i + done +} + +sha512sums="038d7fc5716fbca324a078a311939ec23db6ff53e9ef33b2804c687838e729f0e7bb7f724c539e8ac8efed9607358962d4dd742db7f1a30bf3c6ab72eade1039 spectrwm-3.2.0.tar.gz" diff --git a/user/systemsettings/APKBUILD b/user/systemsettings/APKBUILD index 03ac76c89..58d109aed 100644 --- a/user/systemsettings/APKBUILD +++ b/user/systemsettings/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=systemsettings -pkgver=5.12.6 +pkgver=5.12.7 pkgrel=0 pkgdesc="KDE system settings configuration utility" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a34cf8277751f956d9d7369c99d9999d8315f34b1d0975dbed375a12b35727dcaefd78582ba627f2c649fdf3371fa99acddcfe7fe262545795b4a7f10c4f53b3 systemsettings-5.12.6.tar.xz" +sha512sums="cc8f5cdd2275816f1e7c6af2b5d06a018a35646460a71ce6ec7ab7dda7d286139836b3625239cb45316f2f7dd1f12d260ffdb44064b349948d93929654363735 systemsettings-5.12.7.tar.xz" diff --git a/user/tcpdump/APKBUILD b/user/tcpdump/APKBUILD index c5f4203e7..7adeefa35 100644 --- a/user/tcpdump/APKBUILD +++ b/user/tcpdump/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=tcpdump pkgver=4.9.2 -pkgrel=0 +pkgrel=1 pkgdesc="A tool for network monitoring and data acquisition" url="http://www.tcpdump.org" arch="all" @@ -10,7 +10,13 @@ license="BSD-3-Clause" depends="" makedepends="libpcap-dev openssl-dev perl" subpackages="$pkgname-doc" -source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz" +source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz + CVE-2018-19519.patch + " + +# secfixes: +# 4.9.2-r1: +# - CVE-2018-19519 build () { cd "$builddir" @@ -35,4 +41,5 @@ package() { rm -f "$pkgdir"/usr/sbin/tcpdump.4* } -sha512sums="e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b tcpdump-4.9.2.tar.gz" +sha512sums="e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b tcpdump-4.9.2.tar.gz +eb4232e434064ec59b07840aa394cfcc05c89e817f2d4ebeb4da1dbb1c910fe1805857356d6304ebdb16e32aa6476ce90f164aabc60501b493fd5601b380af7e CVE-2018-19519.patch" diff --git a/user/tcpdump/CVE-2018-19519.patch b/user/tcpdump/CVE-2018-19519.patch new file mode 100644 index 000000000..ac3293927 --- /dev/null +++ b/user/tcpdump/CVE-2018-19519.patch @@ -0,0 +1,10 @@ +--- tcpdump-4.9.2/print-hncp.c.old 2017-09-03 23:17:14.000000000 +0000 ++++ tcpdump-4.9.2/print-hncp.c 2018-12-07 19:31:24.360000000 +0000 +@@ -228,6 +228,7 @@ + snprintf(buf, sizeof(buf), "%s/%d", ipaddr_string(ndo, &addr), plen); + plenbytes += 1 + IPV4_MAPPED_HEADING_LEN; + } else { ++ buf[0] = '\0'; + plenbytes = decode_prefix6(ndo, prefix, max_length, buf, sizeof(buf)); + } + diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD new file mode 100644 index 000000000..9d69ce148 --- /dev/null +++ b/user/tellico/APKBUILD @@ -0,0 +1,55 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=tellico +pkgver=3.1.3 +pkgrel=0 +pkgdesc="Collection manager" +url="http://tellico-project.org/" +arch="all" +license="GPL-2.0-only OR GPL-3.0-only" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxml2-dev libxslt-dev + karchive-dev kcodecs-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev + kcrash-dev kdoctools-dev kguiaddons-dev khtml-dev ki18n-dev + kiconthemes-dev kio-dev kitemmodels-dev kjobwidgets-dev kwallet-dev + kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev solid-dev + + kfilemetadata-dev knewstuff-dev libcdio-dev libksane-dev ncurses-dev + poppler-dev poppler-qt5-dev taglib-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="http://tellico-project.org/files/tellico-$pkgver.tar.xz + btparse-strcasecmp.patch + " + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS -std=gnu99" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + # imagejob: needs running X11 + # htmlexporter: needs plasma desktop + # filelisting: needs dbus + # tellicoread: needs network + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(filelisting|imagejob|htmlexporter|tellicoread)test' +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="9024f423f0685e834ed46e7038c5b95fab5b684aaac00d6298e23493fb4290daeda994faf36a0f04973093a477be5506591e6b0e7f57ef5591fb10953ad8ec5e tellico-3.1.3.tar.xz +4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch" diff --git a/user/tellico/btparse-strcasecmp.patch b/user/tellico/btparse-strcasecmp.patch new file mode 100644 index 000000000..2afd4dec3 --- /dev/null +++ b/user/tellico/btparse-strcasecmp.patch @@ -0,0 +1,20 @@ +--- tellico-3.1.3/src/3rdparty/btparse/lex_auxiliary.c.old 2018-09-03 00:35:39.883417043 +0000 ++++ tellico-3.1.3/src/3rdparty/btparse/lex_auxiliary.c 2018-11-25 06:07:20.260000000 +0000 +@@ -32,6 +32,7 @@ + #include "bt_debug.h" + #include <stdlib.h> + #include <string.h> ++#include <strings.h> + #include <ctype.h> + #include <stdarg.h> + #include <assert.h> +--- tellico-3.1.3/src/3rdparty/btparse/sym.c.old 2018-09-03 00:35:39.887417131 +0000 ++++ tellico-3.1.3/src/3rdparty/btparse/sym.c 2018-11-25 06:07:11.570000000 +0000 +@@ -110,6 +110,7 @@ + /*#include "bt_config.h"*/ + #include <stdio.h> + #include <string.h> ++#include <strings.h> + #include <stdlib.h> + #ifdef MEMCHK + #include "trax.h" diff --git a/user/terminus-font/APKBUILD b/user/terminus-font/APKBUILD index 0020705e8..10ebdd481 100644 --- a/user/terminus-font/APKBUILD +++ b/user/terminus-font/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=terminus-font pkgver=4.46 -pkgrel=0 +pkgrel=1 pkgdesc="Monospace bitmap font (for X11 and console)" url="http://terminus-font.sourceforge.net/" # No HTTPS arch="noarch" @@ -17,7 +17,7 @@ build() { ./configure \ --prefix=/usr \ --psfdir=/usr/share/consolefonts \ - --x11dir=/usr/share/fonts/misc + --x11dir=/usr/share/fonts/X11/misc make } diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD index 7475e17a0..38c088160 100644 --- a/user/thunar-volman/APKBUILD +++ b/user/thunar-volman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=thunar-volman -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=0 pkgdesc="Volume manager for Thunar" url="https://xfce.org" @@ -11,7 +11,6 @@ makedepends="intltool libxfce4ui-dev thunar-dev exo-dev libgudev-dev libnotify-d subpackages="$pkgname-lang" langdir="/usr/lib/locale" source="http://archive.xfce.org/src/xfce/thunar-volman/0.9/thunar-volman-$pkgver.tar.bz2" -sha512sums="d753e2aeded921e5652e6ace164845997dc3cdfbfd92561e2af822bffdf910a06850658a9f662198e4f7c485a3dc1226f97b573d28fb66e5ba490aa08f56a8f5 thunar-volman-0.9.0.tar.bz2" build() { cd "$builddir" @@ -35,3 +34,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="73d9884dc667e4f8554d2b06f7116bbe25fa4e113300f0cd32bc2229c22001cc709333d5ac5618f7d5c8a35e58fb7a61e48ecafa634c7e239e9af329dc4149bc thunar-volman-0.9.1.tar.bz2" diff --git a/user/tiff/APKBUILD b/user/tiff/APKBUILD index f05bcbc2f..7bb89ee3e 100644 --- a/user/tiff/APKBUILD +++ b/user/tiff/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tiff -pkgver=4.0.9 -pkgrel=2 +pkgver=4.0.10 +pkgrel=0 pkgdesc="Library to read, create, and manipulate TIFF image files" url="http://www.libtiff.org/" arch="all" @@ -13,7 +13,6 @@ depends_dev="zlib-dev libjpeg-turbo-dev" makedepends="libtool autoconf automake $depends_dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-tools" source="http://download.osgeo.org/libtiff/$pkgname-$pkgver.tar.gz - CVE-2017-18013.patch " # secfixes: # 4.0.9-r1: @@ -36,12 +35,6 @@ source="http://download.osgeo.org/libtiff/$pkgname-$pkgver.tar.gz # 4.0.7-r1: # - CVE-2017-5225 -prepare() { - cd "$builddir" - update_config_sub - default_prepare -} - build() { cd "$builddir" ./configure \ @@ -71,5 +64,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd tiff-4.0.9.tar.gz -2baa66963302ff51e34774d6e0703f769ba1ca7f527456ae13ea230af69280e024440390df9b5a51776fc29cb6d2d40713431a2c2d98f29e50e3f8f5a7f4d73b CVE-2017-18013.patch" +sha512sums="d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8 tiff-4.0.10.tar.gz" diff --git a/user/tiff/CVE-2017-18013.patch b/user/tiff/CVE-2017-18013.patch deleted file mode 100644 index 5a1d90082..000000000 --- a/user/tiff/CVE-2017-18013.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c6f41df7b581402dfba3c19a1e3df4454c551a01 Mon Sep 17 00:00:00 2001 -From: Even Rouault <even.rouault@spatialys.com> -Date: Sun, 31 Dec 2017 15:09:41 +0100 -Subject: [PATCH] libtiff/tif_print.c: TIFFPrintDirectory(): fix null pointer dereference on corrupted file. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2770 - ---- - libtiff/tif_print.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c -index 9959d35..8deceb2 100644 ---- a/libtiff/tif_print.c -+++ b/libtiff/tif_print.c -@@ -665,13 +665,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) - #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) - fprintf(fd, " %3lu: [%8I64u, %8I64u]\n", - (unsigned long) s, -- (unsigned __int64) td->td_stripoffset[s], -- (unsigned __int64) td->td_stripbytecount[s]); -+ td->td_stripoffset ? (unsigned __int64) td->td_stripoffset[s] : 0, -+ td->td_stripbytecount ? (unsigned __int64) td->td_stripbytecount[s] : 0); - #else - fprintf(fd, " %3lu: [%8llu, %8llu]\n", - (unsigned long) s, -- (unsigned long long) td->td_stripoffset[s], -- (unsigned long long) td->td_stripbytecount[s]); -+ td->td_stripoffset ? (unsigned long long) td->td_stripoffset[s] : 0, -+ td->td_stripbytecount ? (unsigned long long) td->td_stripbytecount[s] : 0); - #endif - } - } --- -libgit2 0.26.0 - diff --git a/user/tk/APKBUILD b/user/tk/APKBUILD index 3b92a3dda..8295ec4fc 100644 --- a/user/tk/APKBUILD +++ b/user/tk/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=tk -pkgver=8.6.8 +pkgver=8.6.9.1 pkgrel=0 pkgdesc="GUI toolkit for the Tcl scripting language" url="http://tcl.sourceforge.net/" @@ -11,11 +11,10 @@ depends= depends_dev="tcl-dev libx11-dev libxft-dev fontconfig-dev" makedepends="$depends_dev libpng-dev" subpackages="$pkgname-doc $pkgname-dev" -source="http://downloads.sourceforge.net/sourceforge/tcl/$pkgname$pkgver-src.tar.gz +source="https://downloads.sourceforge.net/sourceforge/tcl/$pkgname$pkgver-src.tar.gz " - -_major=${pkgver%.*} -builddir="$srcdir"/tk${pkgver}/unix +_major=8.6 +builddir="$srcdir"/tk8.6.9/unix build() { cd "$builddir" @@ -54,4 +53,4 @@ dev() { done } -sha512sums="d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9 tk8.6.8-src.tar.gz" +sha512sums="b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92 tk8.6.9.1-src.tar.gz" diff --git a/user/tmux-bash-completion/APKBUILD b/user/tmux-bash-completion/APKBUILD new file mode 100644 index 000000000..e34f15ea5 --- /dev/null +++ b/user/tmux-bash-completion/APKBUILD @@ -0,0 +1,23 @@ +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: zlg <zlg+adelie@zlg.space> +pkgname=tmux-bash-completion +pkgver=1.0.0_git20170805 +_commit=847eda60c4664bfca833a086a3e2167957c26be0 +pkgrel=0 +pkgdesc="bash-completion files for tmux" +url="https://github.com/imomaliev/tmux-bash-completion" +arch="noarch" +options="!check" # no tests +license="GPL-2.0-only" +depends="bash-completion tmux" +makedepends="" +subpackages="" +source="$pkgname-$pkgver.tar.gz::https://github.com/imomaliev/tmux-bash-completion/archive/$_commit.tar.gz" +builddir="$srcdir/$pkgname-$_commit" + +package() { + cd "$builddir" + install -Dm644 ./completions/tmux "$pkgdir"/usr/share/bash-completion/completions/tmux +} + +sha512sums="6c4c761aa152d1352a575c91e2c375d3f19ad01263b603b9e0cde4bdd95ce478c93bb55bfcd9fa5332cde12399e1e1e1c062e6be2ed7403b96e808275401effa tmux-bash-completion-1.0.0_git20170805.tar.gz" diff --git a/user/transset/APKBUILD b/user/transset/APKBUILD new file mode 100644 index 000000000..8b063867c --- /dev/null +++ b/user/transset/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=transset +pkgver=1.0.2 +pkgrel=0 +pkgdesc="Transparency / opacity manipulation for X11 windows" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/transset-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f7a658cae70e211a0455420efbfacee0f3032821d94e7a80ec6db32ced716c1ce013f38713915505998071c312cedd1bad08575dbadfbbeb94361b048623f874 transset-1.0.2.tar.bz2" diff --git a/user/tree/APKBUILD b/user/tree/APKBUILD index 643b2d1e7..84c872d47 100644 --- a/user/tree/APKBUILD +++ b/user/tree/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: pkgname=tree -pkgver=1.7.0 -pkgrel=2 +pkgver=1.8.0 +pkgrel=0 pkgdesc="A recursive directory indented listing of files" url="http://mama.indstate.edu/users/ice/tree/" arch="all" @@ -23,4 +23,4 @@ package() { make prefix="$pkgdir/usr" MANDIR="${pkgdir}/usr/share/man/man1" install } -sha512sums="b234fb1428ba75da72d7e4aeb24bf961e123332342593e441b29a0baa2270d12bb187d889c179d6463c940c8dce9fe9dffeb4ad3f06cf11f057b83234d7b4b4a tree-1.7.0.tgz" +sha512sums="3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695 tree-1.8.0.tgz" diff --git a/user/ttf-freefont/APKBUILD b/user/ttf-freefont/APKBUILD index 532f064a7..d4a67e4a0 100644 --- a/user/ttf-freefont/APKBUILD +++ b/user/ttf-freefont/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=ttf-freefont pkgver=20120503 -pkgrel=0 +pkgrel=1 pkgdesc="High-quality TrueType fonts covering the UCS character set" url="http://www.nongnu.org/freefont/" arch="noarch" @@ -14,8 +14,8 @@ builddir="$srcdir/freefont-$pkgver" package() { cd "$builddir" - install -d "$pkgdir/usr/share/fonts/TTF" - install -m644 *.ttf "$pkgdir/usr/share/fonts/TTF/" + install -d "$pkgdir/usr/share/fonts/$pkgname/" + install -m644 *.ttf "$pkgdir/usr/share/fonts/$pkgname/" # Licensing exception is discussed in README in pkgver==20120503 install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README" } diff --git a/user/ttf-liberation/APKBUILD b/user/ttf-liberation/APKBUILD index 7f0029af5..eb25558c8 100644 --- a/user/ttf-liberation/APKBUILD +++ b/user/ttf-liberation/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ttf-liberation -pkgver=2.00.3 +pkgver=2.00.4 # Note: 2.00.0 onward releases does not includes Liberation Sans Narrow font due to licensing problems. # we use narrowver to grab older release which does include narrow fonts _narrowver=1.07.4 -pkgrel=2 +pkgrel=0 pkgdesc="Red Hat's Liberation fonts" url="https://pagure.io/liberation-fonts/" arch="noarch" @@ -29,7 +29,7 @@ package() { "$pkgdir"/etc/fonts/conf.d install -m644 "$srcdir"/liberation-fonts-ttf-$_narrowver/*.ttf \ "$pkgdir"/usr/share/fonts/$pkgname - install -m644 "$srcdir"/liberation-fonts-ttf-$pkgver/*.ttf \ + install -m644 "$srcdir"/liberation-fonts-ttf-2.00.3/*.ttf \ "$pkgdir"/usr/share/fonts/$pkgname for j in "$srcdir"/*.conf; do @@ -40,7 +40,7 @@ package() { done } -sha512sums="a83ab0c05bfa97ec30a946ff4b2d23dd1e29974999241b2a058f3c052879eb48e818e09a42a7fe27f04728fea56ddbbf67c60820b10e93e3b99f50892372565d liberation-fonts-ttf-2.00.3.tar.gz +sha512sums="a83ab0c05bfa97ec30a946ff4b2d23dd1e29974999241b2a058f3c052879eb48e818e09a42a7fe27f04728fea56ddbbf67c60820b10e93e3b99f50892372565d liberation-fonts-ttf-2.00.4.tar.gz 0906151d111fd660c8cb90dfcb39e0a38805aa53cac162def5240ff3a75c40f6195e6876d09a2f7081913bfe732550b670d197f0e10598c463186fe3bc229b9f liberation-fonts-ttf-1.07.4.tar.gz 585b74555132098d1d89b118b92fb843471ae2882622dec16178f8e7690fe6b5d8bf46e27e59fc3324aebfbd52a4b511d2ad77a8ddf8ef319cbe89b1a2dac91a 30-liberation-mono.conf cf017383d4390d52bef7c79abb2f48fc4440880ca03ee4dc11647ced524e45a944c4c3e3b318837bef9632b5aa1445e8f29e87f2ea195a8a47899cdeef67aae7 30-liberation-sans-narrow.conf diff --git a/user/ttf-noto-cjk/APKBUILD b/user/ttf-noto-cjk/APKBUILD index cf8b77938..a5d7c3034 100644 --- a/user/ttf-noto-cjk/APKBUILD +++ b/user/ttf-noto-cjk/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=ttf-noto-cjk pkgver=20170601 -pkgrel=0 +pkgrel=1 pkgdesc="Noto fonts for Chinese, Japanese, and Korean" url="https://www.google.com/get/noto/help/cjk/" arch="noarch" @@ -25,11 +25,11 @@ source="https://dev.sick.bike/$pkgname-$pkgver.tar.xz " package() { - mkdir -p "$pkgdir"/usr/share/fonts/truetype/"$pkgname" \ + mkdir -p "$pkgdir"/usr/share/fonts/"$pkgname" \ "$pkgdir"/etc/fonts/conf.d \ "$pkgdir"/etc/fonts/conf.avail - cp "$builddir"/*.ttc "$pkgdir"/usr/share/fonts/truetype/"$pkgname" + cp "$builddir"/*.ttc "$pkgdir"/usr/share/fonts/"$pkgname" cp "$srcdir"/90-ttf-noto-cjk.conf "$pkgdir"/etc/fonts/conf.avail cd "$pkgdir"/etc/fonts/conf.d diff --git a/user/ttf-noto/APKBUILD b/user/ttf-noto/APKBUILD index 3551fe7fe..21c83d972 100644 --- a/user/ttf-noto/APKBUILD +++ b/user/ttf-noto/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ttf-noto pkgver=20170403 -pkgrel=1 +pkgrel=2 pkgdesc="Noto font family" url="https://www.google.com/get/noto/" arch="noarch" @@ -21,9 +21,9 @@ source="https://dev.gentoo.org/~floppym/dist/noto-$pkgver.tar.xz builddir="$srcdir"/noto-$pkgver package() { - mkdir -p "$pkgdir"/usr/share/fonts/truetype/ + mkdir -p "$pkgdir"/usr/share/fonts/$pkgname/ mkdir -p "$pkgdir"/etc/fonts/conf.d/ - cp "$builddir"/*.ttf "$pkgdir"/usr/share/fonts/truetype/ + cp "$builddir"/*.ttf "$pkgdir"/usr/share/fonts/$pkgname/ cp "$srcdir"/*.conf "$pkgdir"/etc/fonts/conf.d/ } diff --git a/user/unifont/APKBUILD b/user/unifont/APKBUILD index b4d8ff484..fc71d4326 100644 --- a/user/unifont/APKBUILD +++ b/user/unifont/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Breno Leitao <breno.leitao@gmail.com> # Maintainer: pkgname=unifont -pkgver=11.0.02 +pkgver=11.0.03 pkgrel=0 pkgdesc="GNU font package with all Unicode 11 characters" url="http://unifoundry.com/unifont.html" @@ -24,4 +24,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d0dc8ce079feb282f53c444df5819751a7c97788feed480dc5c5b8a239c8cc13ef258876ffe2830994e404c0a6f524481a405b273c7341703ceef5854c12a68d unifont-11.0.02.tar.gz" +sha512sums="fd24e48630acb4bac5e3a05aa541c5c93cbdda95ce162f62e05bc860a686f025e67af3c2e577bf96991119b70b2e3a0d1ef170466af3b8037df5a7014d009982 unifont-11.0.03.tar.gz" diff --git a/user/v4l-utils/APKBUILD b/user/v4l-utils/APKBUILD index ae7151438..389c4f9ad 100644 --- a/user/v4l-utils/APKBUILD +++ b/user/v4l-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: pkgname=v4l-utils -pkgver=1.16.1 +pkgver=1.16.3 pkgrel=0 pkgdesc="Userspace tools and conversion library for Video 4 Linux" url="https://www.linuxtv.org/wiki/index.php/V4l-utils" @@ -76,7 +76,7 @@ ir_keytable() { "$subpkgdir"/etc } -sha512sums="5092e592e963ce7f174faedd03f5f2b4e262c648fea4f868ae9a8b40029a87412ca16566ce5f687e96588904cdb72b25349d9b26b81ce1285283195208f671b7 v4l-utils-1.16.1.tar.bz2 +sha512sums="404672d18d94861c6957ea3a15a6a48f238d3859940810952a5a8cc33b57f1a360d1a19af28405c01b073c0ece90c5995a71dbe6544b30bdb8eace7daeb4bc0b v4l-utils-1.16.3.tar.bz2 bc18280046c15b19984103f7c2bb44a0aea79715803c64f0c64bc932499c09022c956914c3b15ae59499adc09f6fbff5378be45707fe851250f495a26b63d682 qv4l2.svg 6f74aa524b3de420eeb8de788ff3f717020732a3f1f6530caee50e63aae7eddbe5f551ffc50065c9f5d6078c13bace089948ecdcacf01f8b82c1a44960e06315 qv4l2.desktop 9a4f6d0a44d30bb7afe4db8b40074d362f240cae1f1b13feb0eb2b1b666479fc6f73ef27542f6f80fb1b922c9540feadc9ff8563890ff3041d3f7fc62e504e29 getsubopt.patch" diff --git a/user/viewres/APKBUILD b/user/viewres/APKBUILD new file mode 100644 index 000000000..0185ca839 --- /dev/null +++ b/user/viewres/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=viewres +pkgver=1.0.5 +pkgrel=0 +pkgdesc="View widget class trees in software using Athena widgets (Xaw)" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libxaw-dev libxmu-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/viewres-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="fe573e9b5ae679b65eee95733cbea20c86c92089c3a2dadfe977bc9c54d1f58c5e5f4663e51a1cf206543a43592b3a3c266da1769279f08be85c66b0aa5b0f7f viewres-1.0.5.tar.bz2" diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index 7db6632a1..1d8f2de92 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=vlc pkgver=3.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" pkgusers="vlc" @@ -61,6 +61,7 @@ makedepends="autoconf automake bison eudev-dev flex libarchive-dev " source="https://get.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz check-headless.patch + CVE-2018-19857.patch disable-sub-autodetect-fuzzy-1-test.patch endian-fix.patch fix-testing.patch @@ -71,6 +72,10 @@ source="https://get.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz vlc-libs.trigger " +# secfixes: +# 3.0.4-r2: +# - CVE-2018-19857 + prepare() { default_prepare NOCONFIGURE=1 ./bootstrap @@ -295,6 +300,7 @@ plugins_visualization() { _mv_plugins visualization; } sha512sums="55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271 vlc-3.0.4.tar.xz 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch +57a2b843b4b80d3887ca0141b9ea1a00752473861846a6c988553faa58650eb42cc2cd011503dce075c8a5dcabf834e449397c3cdbfdcb291ae7a41d218512da CVE-2018-19857.patch e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd4630948e30c4329d27bd928f95de20fe1050d5e839778a4d012 endian-fix.patch 63adb16b3a1927ee3de27ac339cbfbbaa346a69928c527f883259d1e03b5cb59f26a55feeda767837b448c455de584abcb53dc733b2845c0cc13621d72e7f6fd fix-testing.patch diff --git a/user/vlc/CVE-2018-19857.patch b/user/vlc/CVE-2018-19857.patch new file mode 100644 index 000000000..a65dcef20 --- /dev/null +++ b/user/vlc/CVE-2018-19857.patch @@ -0,0 +1,34 @@ +From 0cc5ea748ee5ff7705dde61ab15dff8f58be39d0 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Sat, 1 Dec 2018 23:32:18 +0200 +Subject: [PATCH] caf: fix integer underflow + +Pointed-out-by: Hans Jerry Illikainen <hji@dyntopia.com> +--- + modules/demux/caf.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/modules/demux/caf.c b/modules/demux/caf.c +index cc312a5a30..39b381f963 100644 +--- a/modules/demux/caf.c ++++ b/modules/demux/caf.c +@@ -691,14 +691,13 @@ static int ReadKukiChunk( demux_t *p_demux, uint64_t i_size ) + demux_sys_t *p_sys = p_demux->p_sys; + const uint8_t *p_peek; + +- /* vlc_stream_Peek can't handle sizes bigger than INT32_MAX, and also p_sys->fmt.i_extra is of type 'int'*/ +- if( i_size > INT32_MAX ) ++ if( i_size > SSIZE_MAX ) + { + msg_Err( p_demux, "Magic Cookie chunk too big" ); + return VLC_EGENERIC; + } + +- if( (unsigned int)vlc_stream_Peek( p_demux->s, &p_peek, (int)i_size ) < i_size ) ++ if( vlc_stream_Peek( p_demux->s, &p_peek, i_size ) < (ssize_t)i_size ) + { + msg_Err( p_demux, "Couldn't peek extra data" ); + return VLC_EGENERIC; +-- +2.11.0 + diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index 8aae39a17..73af32453 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vte -pkgver=0.54.2 +pkgver=0.54.3 pkgrel=0 pkgdesc="Virtual terminal emulator library for Gnome" url="https://www.gnome.org" @@ -35,5 +35,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="214ec69110d6ad6caa9bc41fb741874bfcf27f20f34d3ae745b13903c574f9c854f7e0dadbae3dbc8ce04c5a6eb818a433c50569c1ef802501a9a078385f23fc vte-0.54.2.tar.xz +sha512sums="dd7d2ac361ed9ac0550599bb3164a3bd6ba95535275c9b559c81ce0af1bbf4b3d150a7489f987b2e626b32d4a8adc82d1ff78e8c8640e5b1c036fe4076c5d8ce vte-0.54.3.tar.xz 4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch" diff --git a/user/wavpack/APKBUILD b/user/wavpack/APKBUILD index a98666d6e..e59ef255e 100644 --- a/user/wavpack/APKBUILD +++ b/user/wavpack/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: pkgname=wavpack pkgver=5.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes" url="http://www.wavpack.com/" arch="all" @@ -12,9 +12,15 @@ license="BSD-3-Clause" depends="" makedepends="" subpackages="$pkgname-dev $pkgname-doc" -source="http://www.wavpack.com/$pkgname-$pkgver.tar.bz2" +source="http://www.wavpack.com/$pkgname-$pkgver.tar.bz2 + cve2018-19840.patch + cve2018-19841.patch + " # secfixes: +# 5.1.0-r4: +# - CVE-2018-19840 +# - CVE-2018-19840 # 5.1.0-r0: # - CVE-2016-10169 # - CVE-2016-10170 @@ -46,4 +52,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54 wavpack-5.1.0.tar.bz2" +sha512sums="4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54 wavpack-5.1.0.tar.bz2 +67d02dd744c638d126cf5a894d1ff2c39726bd4d3771ef7410ea782e5c9a0f9341909432bd4bea9b8959891c38699601c1aac2da6e0eaddaa5a4d679e7f58dd2 cve2018-19840.patch +dba007fa8cb2537b6f6c8ee559a98e501e948260ce7e7af7d3fdc8c9145bbbbf85c8fed8030de354459c4b08d3015a0ea769a948636bdfd66e567c0a2d2493c6 cve2018-19841.patch" diff --git a/user/wavpack/cve2018-19840.patch b/user/wavpack/cve2018-19840.patch new file mode 100644 index 000000000..2da022025 --- /dev/null +++ b/user/wavpack/cve2018-19840.patch @@ -0,0 +1,25 @@ +From 070ef6f138956d9ea9612e69586152339dbefe51 Mon Sep 17 00:00:00 2001 +From: David Bryant <david@wavpack.com> +Date: Thu, 29 Nov 2018 21:00:42 -0800 +Subject: [PATCH] issue #53: error out on zero sample rate + +--- + src/pack_utils.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/pack_utils.c b/src/pack_utils.c +index 2253f0d..2a83497 100644 +--- a/src/pack_utils.c ++++ b/src/pack_utils.c +@@ -195,6 +195,11 @@ int WavpackSetConfiguration64 (WavpackContext *wpc, WavpackConfig *config, int64 + int num_chans = config->num_channels; + int i; + ++ if (!config->sample_rate) { ++ strcpy (wpc->error_message, "sample rate cannot be zero!"); ++ return FALSE; ++ } ++ + wpc->stream_version = (config->flags & CONFIG_COMPATIBLE_WRITE) ? CUR_STREAM_VERS : MAX_STREAM_VERS; + + if ((config->qmode & QMODE_DSD_AUDIO) && config->bytes_per_sample == 1 && config->bits_per_sample == 8) { diff --git a/user/wavpack/cve2018-19841.patch b/user/wavpack/cve2018-19841.patch new file mode 100644 index 000000000..6872ed91e --- /dev/null +++ b/user/wavpack/cve2018-19841.patch @@ -0,0 +1,29 @@ +From bba5389dc598a92bdf2b297c3ea34620b6679b5b Mon Sep 17 00:00:00 2001 +From: David Bryant <david@wavpack.com> +Date: Thu, 29 Nov 2018 21:53:51 -0800 +Subject: [PATCH] issue #54: fix potential out-of-bounds heap read + +--- + src/open_utils.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/open_utils.c b/src/open_utils.c +index 80051fc..4fe0d67 100644 +--- a/src/open_utils.c ++++ b/src/open_utils.c +@@ -1258,13 +1258,13 @@ int WavpackVerifySingleBlock (unsigned char *buffer, int verify_checksum) + #endif + + if (meta_bc == 4) { +- if (*dp++ != (csum & 0xff) || *dp++ != ((csum >> 8) & 0xff) || *dp++ != ((csum >> 16) & 0xff) || *dp++ != ((csum >> 24) & 0xff)) ++ if (*dp != (csum & 0xff) || dp[1] != ((csum >> 8) & 0xff) || dp[2] != ((csum >> 16) & 0xff) || dp[3] != ((csum >> 24) & 0xff)) + return FALSE; + } + else { + csum ^= csum >> 16; + +- if (*dp++ != (csum & 0xff) || *dp++ != ((csum >> 8) & 0xff)) ++ if (*dp != (csum & 0xff) || dp[1] != ((csum >> 8) & 0xff)) + return FALSE; + } + diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index 3cca9f41a..6f8bb3701 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -1,8 +1,9 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> +# Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=weechat pkgver=2.3 -pkgrel=0 +pkgrel=1 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://www.weechat.org" arch="all" @@ -16,6 +17,7 @@ subpackages="$pkgname-dev $pkgname-aspell:_plugin $pkgname-lua:_plugin $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-lang" source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz fix-python-linking.patch + fix-unsigned-char.patch libintl-fix.patch " @@ -63,4 +65,5 @@ check() { sha512sums="3315eb672d099dec041a6ece268e3efac9f766fe8273b13810c9ed6bc9129ed0db9730a027db6cdf157338472caf99d60aaf3de9b096a3c395fdf889b106aaea weechat-2.3.tar.gz 95f6d1405141421fae70288ec560a6d61f0bde1ce0bfa6e522e24a9673e699099594e83511b39e413aff28010ea1f7f1672af051ac370b152c732d6ca36a9056 fix-python-linking.patch +e9dddc914f08660c49fd3331ebdca73a3df7e165b284d8b19e0487974ec2d8d75d03cd6d07da6ba9783015ddb19d6c118b697a830dcbea13f078ca7826223370 fix-unsigned-char.patch 59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch" diff --git a/user/weechat/fix-unsigned-char.patch b/user/weechat/fix-unsigned-char.patch new file mode 100644 index 000000000..d4acd1986 --- /dev/null +++ b/user/weechat/fix-unsigned-char.patch @@ -0,0 +1,37 @@ +This patch is backported from the upcoming 2.4 release. It corrects +highlighting behavior for plugins such as urlserver.py. + +See-Also: https://github.com/weechat/weechat/issues/1277 +Patch-Author: Sébastien Helleu <flashcode@flashtux.org> + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ae69ea0f..1d7738af5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,8 +27,8 @@ project(weechat C) + set(CMAKE_VERBOSE_MAKEFILE OFF) + set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) + set(CMAKE_SKIP_RPATH ON) +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration") +-set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char -Wall -Wextra -Werror-implicit-function-declaration") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -Wall -Wextra -Werror-implicit-function-declaration") + + # version + execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-major OUTPUT_VARIABLE VERSION_MAJOR) +diff --git a/configure.ac b/configure.ac +index d267ca10f..a0bf00078 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1330,7 +1330,7 @@ AC_DEFINE_UNQUOTED(WEECHAT_SHAREDIR, "$WEECHAT_SHAREDIR") + weechat_libdir=${libdir}/weechat + AC_SUBST(weechat_libdir) + +-COMMON_CFLAGS="-Wall -Wextra -Werror-implicit-function-declaration" ++COMMON_CFLAGS="-fsigned-char -Wall -Wextra -Werror-implicit-function-declaration" + AC_MSG_CHECKING([whether we have GNU assembler]) + GAS=`as --version < /dev/null 2>/dev/null | grep GNU` + if test "$GAS"; then +-- +2.19.1 + diff --git a/user/wpa_supplicant/APKBUILD b/user/wpa_supplicant/APKBUILD index 0b070dee7..0208adaee 100644 --- a/user/wpa_supplicant/APKBUILD +++ b/user/wpa_supplicant/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=wpa_supplicant pkgver=2.6 -pkgrel=9 +pkgrel=10 pkgdesc="Utility providing key negotiation for WPA wireless networks" url="https://w1.fi/wpa_supplicant/" arch="all" @@ -90,6 +90,10 @@ package() { "$pkgdir"/etc/init.d/wpa_supplicant install -Dm644 "$srcdir"/wpa_supplicant.confd \ "$pkgdir"/etc/conf.d/wpa_supplicant + + # work around netifrc braindamage + mkdir -p "$pkgdir"/bin + ln -s ../sbin/wpa_cli "$pkgdir"/bin/wpa_cli } wpa_gui() { @@ -113,4 +117,4 @@ fc84edd8b30305cc42053c872554098f3f077292ec980ed6a442f37884087ff2f055738fd55977ed 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 wpa_supplicant.confd 2be055dd1f7da5a3d8e79c2f2c0220ddd31df309452da18f290144d2112d6dbde0fc633bb2ad02c386a39d7785323acaf5f70e5969995a1e8303a094eb5fe232 eloop.patch 6707991f9a071f2fcb09d164d31d12b1f52b91fbb5574b70b8d6f9727f72bbe42b03dd66d10fcc2126f5b7e49ac785657dec90e88b4bf54a9aa5638582f6e505 config -44d33cfe419cdb65cc14f2ac05aa9f8a1b9f2f432181e498071e41ef835662db1e4c5142adf4cfab2475e7b606696169936bd159d1d711f803322db93f242361 wpa_cli.sh" +45d3e70c47d0f7d6dc6730853af8cbcb40ed0713ee7b1069698f5a635939f273f66e72d4221e064c3c71a92154cf07841c8c0d4fc14d796dbb6fe0d92776ee2b wpa_cli.sh" diff --git a/user/wpa_supplicant/wpa_cli.sh b/user/wpa_supplicant/wpa_cli.sh index 0a5a6cc03..ee80e76e9 100644 --- a/user/wpa_supplicant/wpa_cli.sh +++ b/user/wpa_supplicant/wpa_cli.sh @@ -1,33 +1,37 @@ #!/bin/sh # Distributed under the terms of the BSD License. -# Copyright (c) 2015 Sören Tempel <soeren+alpine@soeren-tempel.net> +# Copyright 1999-2011 Gentoo Foundation +# Written by Roy Marples <uberlord@gentoo.org> +# Copyright 2018 Adélie Linux. -IFUP="/sbin/ifup" -IFDOWN="/sbin/ifdown" - -if [ -z "${1}" -o -z "${2}" ]; then - logger -t wpa_cli "this script should be called from wpa_cli(8)" - exit 1 -elif ! [ -x "${IFUP}" -a -x "${IFDOWN}" ]; then - logger -t wpa_cli "${IFUP} or ${IFDOWN} doesn't exist" +if [ -z "$1" -o -z "$2" ]; then + logger -t wpa_cli "Insufficient parameters" exit 1 fi -IFNAME="${1}" -ACTION="${2}" +INTERFACE="$1" +ACTION="$2" + +EXEC="/etc/init.d/net.${INTERFACE} --quiet" -EXEC="" case "${ACTION}" in CONNECTED) - EXEC="${IFUP}" + EXEC="${EXEC} start" ;; DISCONNECTED) - EXEC="${IFDOWN}" + # Deactivated, since stopping /etc/init.d/net.wlanX + # stops the network completly. + EXEC="false ${EXEC} stop" ;; *) - logger -t wpa_cli "unknown action '${ACTION}'" + logger -t wpa_cli "Unknown action '${ACTION}'" exit 1 + ;; esac +# netifrc can use ${IN_BACKGROUND} so that it knows that the user isn't +# stopping the interface and a background process - like wpa_cli - is. +export IN_BACKGROUND=true + logger -t wpa_cli "interface ${IFNAME} ${ACTION}" -${EXEC} "${IFNAME}" || logger -t wpa_cli "executing '${EXEC}' failed" +${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed" diff --git a/user/x11/APKBUILD b/user/x11/APKBUILD new file mode 100644 index 000000000..9ed101368 --- /dev/null +++ b/user/x11/APKBUILD @@ -0,0 +1,16 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=x11 +pkgver=7.7 +pkgrel=0 +pkgdesc="The X Window System" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +options="!check" # Metapacakge +subpackages="" +depends="xorg-apps xorg-drivers xorg-fonts xorg-server xbitmaps xcursor-themes" +source="" + +package() { + mkdir -p $pkgdir +} diff --git a/user/x11perf/APKBUILD b/user/x11perf/APKBUILD new file mode 100644 index 000000000..2c3d265bb --- /dev/null +++ b/user/x11perf/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=x11perf +pkgver=1.6.0 +pkgrel=0 +pkgdesc="X11 server benchmarking utility" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libx11-dev libxft-dev libxmu-dev libxrender-dev util-macros + xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/x11perf-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="a9508c9dd6db2663b5bd30f5e1f5f80b1d22ce5221ae3dc292e746f8e554fda2d3130f7311f2545e20244dceb51e867fe80fec82c9ac5911dcdc90a73b231623 x11perf-1.6.0.tar.bz2" diff --git a/user/xbiff/APKBUILD b/user/xbiff/APKBUILD new file mode 100644 index 000000000..bef041c3c --- /dev/null +++ b/user/xbiff/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xbiff +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Local email notification applet for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="xbitmaps" +makedepends="libx11-dev libxaw-dev libxext-dev libxmu-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xbiff-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e9fa72817cae5fd6c052a4a59fcd6c696ae9d3f5fd8eecb0e9b0d8994258201cf5f4ae99845dd03e3da56e378eb214658e4450c9291a29399d9ece8af3b9f9e9 xbiff-1.0.3.tar.bz2" diff --git a/user/xcalc/APKBUILD b/user/xcalc/APKBUILD new file mode 100644 index 000000000..d15d905fc --- /dev/null +++ b/user/xcalc/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xcalc +pkgver=1.0.6 +pkgrel=0 +pkgdesc="Graphical scientific calculator for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxaw-dev libxt-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xcalc-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="61b921b6a3fefea20bd9e7ad0b308f589f2aeaafe9316df94cc739a005be6c180bdafc981b8957230f46c9fc1c0e266829a55b473ae26b1377c705796175c908 xcalc-1.0.6.tar.bz2" diff --git a/user/xclipboard/APKBUILD b/user/xclipboard/APKBUILD new file mode 100644 index 000000000..b0219ea81 --- /dev/null +++ b/user/xclipboard/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xclipboard +pkgver=1.1.3 +pkgrel=0 +pkgdesc="Clipboard viewer for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros + xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xclipboard-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="84a51d11851756422eb23e67b2721d2bcb2ac248fa32c0837423b6169144dff76717c22611ad3c93633e09a44dc70c847a2470d3988eff0b24d77e252a4e147e xclipboard-1.1.3.tar.bz2" diff --git a/user/xclock/APKBUILD b/user/xclock/APKBUILD new file mode 100644 index 000000000..f8b9e4a22 --- /dev/null +++ b/user/xclock/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xclock +pkgver=1.0.7 +pkgrel=0 +pkgdesc="Clock applet for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxaw-dev libxkbfile-dev libxft-dev libxmu-dev + libxrender-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xclock-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="56689bdae6c83e9e1da5c4c48cf1136ca8b4f45b177f27bc1deeb24758e2c180035b639e8df72e3ebf32dc301bceb59118309fcce2ffab54e5abe9bfa645e607 xclock-1.0.7.tar.bz2" diff --git a/user/xcmsdb/APKBUILD b/user/xcmsdb/APKBUILD new file mode 100644 index 000000000..973f006f0 --- /dev/null +++ b/user/xcmsdb/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xcmsdb +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Device colour management for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xcmsdb-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e47bfce87d7531e7809c300e01120c3e8d6001130d9a6c9f6de5bc19651d8712d273a6f54452223bd8c4bff4612b5ecae8db45eddb022da945ed6e14c9c84ae4 xcmsdb-1.0.5.tar.bz2" diff --git a/user/xcompmgr/APKBUILD b/user/xcompmgr/APKBUILD new file mode 100644 index 000000000..27c149441 --- /dev/null +++ b/user/xcompmgr/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xcompmgr +pkgver=1.1.7 +pkgrel=0 +pkgdesc="Small compositing manager for X11" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libxcomposite-dev libxdamage-dev libxext-dev libxfixes-dev + libxrender-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xcompmgr-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f93a6be78169dd41ff08d71409e28746fd62902810a2f6930c0ac44f1415bc7391a8fb885b074fd40afedd7f1c1590aa7c67fc101c3b6488ddaa74495b42149c xcompmgr-1.1.7.tar.bz2" diff --git a/user/xconsole/APKBUILD b/user/xconsole/APKBUILD new file mode 100644 index 000000000..4bbac0359 --- /dev/null +++ b/user/xconsole/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xconsole +pkgver=1.0.7 +pkgrel=0 +pkgdesc="Console monitor for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros + xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xconsole-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="89f391058ea99904587bd1dac9e31fa3ff06cf63b899abe6c06e4897bbc9919500dd4773873b1a452de4f54cc6999bd496022b6d8df9d4147804448abbdca2f9 xconsole-1.0.7.tar.bz2" diff --git a/user/xcursor-themes/APKBUILD b/user/xcursor-themes/APKBUILD new file mode 100644 index 000000000..e61f4a537 --- /dev/null +++ b/user/xcursor-themes/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xcursor-themes +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Built-in cursor themes for X11" +url="https://www.X.Org/" +arch="noarch" +license="X11" +depends="" +makedepends="libxcursor-dev util-macros xcursorgen" +subpackages="" +source="https://www.x.org/releases/individual/data/xcursor-themes-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f41e1de0d5deafba33106dcad81576d1888fca052a962c202f2221104aa2d8236b066d8d8fc3dcfbdc166db63f84e60980dfc54059b20a26c7415de71ed07a5b xcursor-themes-1.0.5.tar.bz2" diff --git a/user/xcursorgen/APKBUILD b/user/xcursorgen/APKBUILD new file mode 100644 index 000000000..395dfb95b --- /dev/null +++ b/user/xcursorgen/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xcursorgen +pkgver=1.0.6 +pkgrel=0 +pkgdesc="Cursor generator for X11" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libpng-dev libx11-dev libxcursor-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xcursorgen-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3b464b7be3cec8c6d2bf4538266108bdc09e1dae4053d573f7f38e004929b41be0d996aa54918490fa040655644e2b0d4fab1ec24cca014d77bdb91c41ab1db4 xcursorgen-1.0.6.tar.bz2" diff --git a/user/xdbedizzy/APKBUILD b/user/xdbedizzy/APKBUILD new file mode 100644 index 000000000..5d190e7c5 --- /dev/null +++ b/user/xdbedizzy/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xdbedizzy +pkgver=1.1.0 +pkgrel=0 +pkgdesc="X11 demo showcasing the Double Buffering extension" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libx11-dev libxext-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xdbedizzy-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="58b9c88b09772008fe18921c0b63972a65ee5833f96edbbd2e1dc335e5f20ca9a241728b9a225e3b0f3eb392a7941cc1ab6e3c871b9463ff21bb23e38557e9fa xdbedizzy-1.1.0.tar.bz2" diff --git a/user/xditview/APKBUILD b/user/xditview/APKBUILD new file mode 100644 index 000000000..6902402e2 --- /dev/null +++ b/user/xditview/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xditview +pkgver=1.0.4 +pkgrel=0 +pkgdesc="X11 ditroff viewer" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xditview-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7a0d023cd28ffc63c771814e028e79d20f8b56671a7a558c41ef062ef2d40079b5d37a5cf026b7ad3670da6866a087ae4888cea96d6d9e8a137e115174d637d2 xditview-1.0.4.tar.bz2" diff --git a/user/xdpyinfo/APKBUILD b/user/xdpyinfo/APKBUILD index d6d4a0f89..903b9a11d 100644 --- a/user/xdpyinfo/APKBUILD +++ b/user/xdpyinfo/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xdpyinfo pkgver=1.3.2 -pkgrel=1 -pkgdesc="X11 utility to show display information" +pkgrel=2 +pkgdesc="X11 display information viewer" url="https://www.X.Org/" arch="all" license="X11" depends="" -makedepends="libxtst-dev" +makedepends="libx11-dev libxcomposite-dev libxext-dev libxinerama-dev libxrender-dev libxtst-dev libxxf86dga-dev libxxf86misc-dev libxxf86vm-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" diff --git a/user/xdriinfo/APKBUILD b/user/xdriinfo/APKBUILD new file mode 100644 index 000000000..ae39b7f97 --- /dev/null +++ b/user/xdriinfo/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xdriinfo +pkgver=1.0.6 +pkgrel=0 +pkgdesc="X11 DRI information viewer" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev mesa-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xdriinfo-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f xdriinfo-1.0.6.tar.bz2" diff --git a/user/xedit/APKBUILD b/user/xedit/APKBUILD new file mode 100644 index 000000000..3ad25658c --- /dev/null +++ b/user/xedit/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xedit +pkgver=1.2.2 +pkgrel=0 +pkgdesc="Simple text editor for X11" +url="https://www.X.Org/" +arch="all" +license="BSD-3-Clause AND X11" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xedit-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="24d8e23a2ad1a2e81f6606928bb032f25b70b76da83b65341367bc4111d011abe89f9e30402d057854f2ccdaa9c1ef0d7c55bf29b81ab2d050a8f448cf3eeb5d xedit-1.2.2.tar.bz2" diff --git a/user/xev/APKBUILD b/user/xev/APKBUILD new file mode 100644 index 000000000..951fb10c4 --- /dev/null +++ b/user/xev/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xev +pkgver=1.2.2 +pkgrel=0 +pkgdesc="X11 input event monitor" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxrandr-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xev-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="453fc18072e4d4fd088a1b2e918f3772aaa2c56b36c082deb41ec4d434d1579de75f447fc4e0507086c170152e02d6db8b60dc7fd87ae18a2e817448bd628fca xev-1.2.2.tar.bz2" diff --git a/user/xeyes/APKBUILD b/user/xeyes/APKBUILD new file mode 100644 index 000000000..76edc0272 --- /dev/null +++ b/user/xeyes/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xeyes +pkgver=1.1.2 +pkgrel=0 +pkgdesc="Feel like somebody's watching you" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxext-dev libxmu-dev libxrender-dev libxt-dev + util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xeyes-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0 xeyes-1.1.2.tar.bz2" diff --git a/user/xf86-input-evdev/APKBUILD b/user/xf86-input-evdev/APKBUILD index 014f8911f..3339d8caf 100644 --- a/user/xf86-input-evdev/APKBUILD +++ b/user/xf86-input-evdev/APKBUILD @@ -2,7 +2,7 @@ pkgname=xf86-input-evdev pkgver=2.10.6 pkgrel=0 -pkgdesc="X.Org input driver - Evdev" +pkgdesc="X.Org generic input driver" url="https://www.X.Org/" arch="all" license="MIT" diff --git a/user/xf86-input-joystick/APKBUILD b/user/xf86-input-joystick/APKBUILD new file mode 100644 index 000000000..c71441234 --- /dev/null +++ b/user/xf86-input-joystick/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-input-joystick +pkgver=1.6.3 +pkgrel=0 +pkgdesc="X.Org joystick driver" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-input-joystick-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="541c993bd37dd74d96d90060407d9fb9ebd3fbca352189a08c6b0c899c84609a1b5a3c1ea3febb4ceb5e2b881b54e45c75b8f9b2e475e16d7cffbbe42a3221e5 xf86-input-joystick-1.6.3.tar.bz2" diff --git a/user/xf86-input-keyboard/APKBUILD b/user/xf86-input-keyboard/APKBUILD new file mode 100644 index 000000000..600a12ec6 --- /dev/null +++ b/user/xf86-input-keyboard/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-input-keyboard +pkgver=1.9.0 +pkgrel=0 +pkgdesc="X.Org keyboard driver" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT AND GPL-2.0-only" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-input-keyboard-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d1a52d10039096d0d5e09750b6a8c2388345748331615af93e5be499646c3bc5fbbfc897fcebdeada5efaafff94f26a2ab84d6e35f01a875b8b9956a42015df9 xf86-input-keyboard-1.9.0.tar.bz2" diff --git a/user/xf86-input-libinput/APKBUILD b/user/xf86-input-libinput/APKBUILD index ad5c691bc..655c9319f 100644 --- a/user/xf86-input-libinput/APKBUILD +++ b/user/xf86-input-libinput/APKBUILD @@ -3,7 +3,7 @@ pkgname=xf86-input-libinput pkgver=0.28.1 pkgrel=0 -pkgdesc="X.Org input driver - libinput universal driver" +pkgdesc="X.Org generic input driver using libinput" url="https://www.X.Org/" arch="all" license="MIT" diff --git a/user/xf86-input-mouse/APKBUILD b/user/xf86-input-mouse/APKBUILD new file mode 100644 index 000000000..eaefa3bb0 --- /dev/null +++ b/user/xf86-input-mouse/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-input-mouse +pkgver=1.9.3 +pkgrel=0 +pkgdesc="X.Org mouse driver" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-input-mouse-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d99f5b4b1ef1aa4cbf1a92549e412f54f121bc804e4d6643248ad7ea18081b38b958bd289dc8476ebc0f6ef5f7424c2f2a8abcfaa30cae5378829549af6b148f xf86-input-mouse-1.9.3.tar.bz2" diff --git a/user/xf86-input-synaptics/APKBUILD b/user/xf86-input-synaptics/APKBUILD index 45de5e926..5d45c4602 100644 --- a/user/xf86-input-synaptics/APKBUILD +++ b/user/xf86-input-synaptics/APKBUILD @@ -2,14 +2,14 @@ pkgname=xf86-input-synaptics pkgver=1.9.1 pkgrel=0 -pkgdesc="X.Org input driver - Synaptics trackpads" +pkgdesc="X.Org input driver for Synaptics laptop trackpads" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-doc $pkgname-dev" depends="" makedepends="libevdev-dev libxi-dev libxkbfile-dev libxrandr-dev libxtst-dev mtdev-dev xorg-server-dev" +subpackages="$pkgname-doc $pkgname-dev" source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" build() { diff --git a/user/xf86-input-void/APKBUILD b/user/xf86-input-void/APKBUILD new file mode 100644 index 000000000..9ce25b0f7 --- /dev/null +++ b/user/xf86-input-void/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-input-void +pkgver=1.4.1 +pkgrel=0 +pkgdesc="X.Org null input driver" +url="https://www.X.Org/" +arch="all" +license="MIT AND X11" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-input-void-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3cbcba9510635fc4a3b610fb940584417d4b3fcace88670b1289906a7da15614e9a286590cecd1840af4bb3bd0c62f246522b1203700067ec384c3cc11b7e94a xf86-input-void-1.4.1.tar.bz2" diff --git a/user/xf86-input-wacom/APKBUILD b/user/xf86-input-wacom/APKBUILD new file mode 100644 index 000000000..da4162103 --- /dev/null +++ b/user/xf86-input-wacom/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-input-wacom +pkgver=0.36.1 +pkgrel=0 +pkgdesc="X.Org driver for Wacom tablets" +url="https://linuxwacom.github.io/" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="eudev-dev libx11-dev libxext-dev libxi-dev libxinerama-dev + libxrandr-dev util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-$pkgver/xf86-input-wacom-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="2618bb53f4d6ed4166cd738022efcd3f35b31e27b04b8293834a1650131f2cbe9e1f11594bbcfb309861360311ae68dfb179d86d27fcb57033847a7b26d6e832 xf86-input-wacom-0.36.1.tar.bz2" diff --git a/user/xf86-video-ast/APKBUILD b/user/xf86-video-ast/APKBUILD new file mode 100644 index 000000000..0d90f631b --- /dev/null +++ b/user/xf86-video-ast/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-ast +pkgver=1.1.5 +pkgrel=0 +pkgdesc="ASPEED video driver for X11" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="" +source="https://www.x.org/releases/individual/driver/xf86-video-ast-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="067c2ce3e74c83fe1531213308753cb80482d177c93009c99dc49e95bfa6ff058d81cc716d6c343b9ca1e0eb7aedf3b84beb12ad08b8cd4d9f43e11f9e192e8e xf86-video-ast-1.1.5.tar.bz2" diff --git a/user/xf86-video-cirrus/APKBUILD b/user/xf86-video-cirrus/APKBUILD new file mode 100644 index 000000000..1c26532ea --- /dev/null +++ b/user/xf86-video-cirrus/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-cirrus +pkgver=1.5.3 +pkgrel=0 +pkgdesc="Cirrus Logic video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-video-cirrus-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="6aec70f943d9bf7455782d300bd5e1caab5c90408cdca25b9a3ef314e565082f3249a179fb508be36a61c8a34006c0ace14b9aa41f724f479511a906fa8f4798 xf86-video-cirrus-1.5.3.tar.bz2" diff --git a/user/xf86-video-dummy/APKBUILD b/user/xf86-video-dummy/APKBUILD new file mode 100644 index 000000000..453dda88c --- /dev/null +++ b/user/xf86-video-dummy/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-dummy +pkgver=0.3.8 +pkgrel=0 +pkgdesc="Null video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="" +source="https://www.x.org/releases/individual/driver/xf86-video-dummy-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f534113fd9987e44d2e0d0c53bd1b71be4ba69ec239ecec4aba8fcdcc10597722c54cbc01da38e0975ac7660e4e4028330e4cdd369e755c25ec059d2dfabad80 xf86-video-dummy-0.3.8.tar.bz2" diff --git a/user/xf86-video-fbdev/APKBUILD b/user/xf86-video-fbdev/APKBUILD new file mode 100644 index 000000000..d514f987d --- /dev/null +++ b/user/xf86-video-fbdev/APKBUILD @@ -0,0 +1,34 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-fbdev +pkgver=0.5.0 +pkgrel=0 +pkgdesc="Framebuffer video driver for X11" +url="https://www.X.Org/" +arch="all" +license="MIT" +subpackages="$pkgname-doc" +depends="" +makedepends="libxi-dev util-macros xorgproto-dev xorg-server-dev" +source="https://www.X.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" + +build() { + cd "$builddir" + export LDFLAGS="$LDFLAGS -Wl,-z,lazy" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} +sha512sums="c1217b943bbe3301b3c2a8649ed1004c3c67b02607bd56bbc14f6dfa05e7f0184332c81a6a19595514745501ed88526aee932e555779b7c3a8233646b0979448 xf86-video-fbdev-0.5.0.tar.bz2" diff --git a/user/xf86-video-freedreno/APKBUILD b/user/xf86-video-freedreno/APKBUILD new file mode 100644 index 000000000..d46d2b23a --- /dev/null +++ b/user/xf86-video-freedreno/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-freedreno +pkgver=1.4.0 +pkgrel=0 +pkgdesc="Libre Adreno video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11 AND BSD-3-Clause" +depends="" +makedepends="eudev-dev libdrm-dev util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-video-freedreno-$pkgver.tar.bz2 + api-23.patch + secure-atom.patch + " + +build() { + cd "$builddir" + CFLAGS="$CFLAGS -Wno-error=deprecated-declarations" ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="5bc7c35bd79e8ff90d8da5360413b03c497ba3dec9399c78fc85e8f1d2bf8955c27c6b225dfbbcdb73a16a4b539cfa131e309866e42289cb577d0e9bfc15b6ca xf86-video-freedreno-1.4.0.tar.bz2 +6e940ecb5b784b8e8854af47c0f01becf2a3453cc0d81b905612920d78ce8a89f99eac7b5e0c8d4755ec64755b482a6d4c1f369c96ee0c26e2402bd0b5c1f4d5 api-23.patch +5cac3b356339652d5447505ddb5851bdf492341d6f4e04cdda5372f1a74e47fcecfffc18af50bdf6ccaef9a894c6e5a208552add5f9dbe0bbb09805b7794448c secure-atom.patch" diff --git a/user/xf86-video-freedreno/api-23.patch b/user/xf86-video-freedreno/api-23.patch new file mode 100644 index 000000000..fbe8c48a7 --- /dev/null +++ b/user/xf86-video-freedreno/api-23.patch @@ -0,0 +1,256 @@ +From 5c82dc7874b6eaff39dc8c8575e72e5a40f13ea6 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + src/compat-api.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/compat-api.h b/src/compat-api.h +index 4f7b9ea..15b92fe 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -76,8 +76,13 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout ++#define BLOCKHANDLER_ARGS arg, pTimeout ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v1.1 + +From 5f60ca4fe99199183dced955de0206acb5a5ebe9 Mon Sep 17 00:00:00 2001 +From: Keith Packard <keithp@keithp.com> +Date: Tue, 19 Jul 2016 08:33:51 -0700 +Subject: Use NotifyFd for drm and udev fds + +NotifyFd is available after API 22, and must be used after API 23. + +Signed-off-by: Keith Packard <keithp@keithp.com> +--- + src/compat-api.h | 4 ++++ + src/drmmode_display.c | 21 +++++++++++++++++++++ + 2 files changed, 25 insertions(+) + +diff --git a/src/compat-api.h b/src/compat-api.h +index 15b92fe..80dabc1 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -76,6 +76,10 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(22,0) ++#define HAVE_NOTIFY_FD 1 ++#endif ++ + #if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout + #define BLOCKHANDLER_ARGS arg, pTimeout +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index 0d94bb5..53ae677 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -1462,6 +1462,18 @@ drmmode_flip_handler(int fd, unsigned int frame, unsigned int tv_sec, + free(flipdata); + } + ++#if HAVE_NOTIFY_FD ++ ++static void ++drmmode_notify_fd(int fd, int notify, void *data) ++{ ++ ScrnInfoPtr scrn = data; ++ drmmode_ptr drmmode = drmmode_from_scrn(scrn); ++ drmHandleEvent(drmmode->fd, &drmmode->event_context); ++} ++ ++#else ++ + static void + drmmode_wakeup_handler(pointer data, int err, pointer p) + { +@@ -1480,6 +1492,7 @@ drmmode_wakeup_handler(pointer data, int err, pointer p) + drmmode_handle_uevents(scrn); + #endif + } ++#endif /* HAVE_NOTIFY_FD */ + + void + drmmode_wait_for_event(ScrnInfoPtr pScrn) +@@ -1517,11 +1530,15 @@ drmmode_screen_init(ScreenPtr pScreen) + drmmode->event_context.version = DRM_EVENT_CONTEXT_VERSION; + drmmode->event_context.page_flip_handler = drmmode_flip_handler; + ++#if HAVE_NOTIFY_FD ++ SetNotifyFd(drmmode->fd, drmmode_notify_fd, X_NOTIFY_READ, pScrn); ++#else + AddGeneralSocket(drmmode->fd); + + /* Register a wakeup handler to get informed on DRM events */ + RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, + drmmode_wakeup_handler, pScrn); ++#endif + + return TRUE; + } +@@ -1535,10 +1552,14 @@ drmmode_screen_fini(ScreenPtr pScreen) + + drmmode_uevent_fini(pScrn); + ++#if HAVE_NOTIFY_FD ++ RemoveNotifyFd(drmmode->fd); ++#else + /* Register a wakeup handler to get informed on DRM events */ + RemoveBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, + drmmode_wakeup_handler, pScrn); + RemoveGeneralSocket(drmmode->fd); ++#endif + + drmmode_remove_fb(pScrn); + fd_bo_del(pMsm->scanout); +-- +cgit v1.1 + +From 6c8e21c686578f22d973a243a09c838943ddbadd Mon Sep 17 00:00:00 2001 +From: Rob Clark <robdclark@gmail.com> +Date: Wed, 7 Dec 2016 17:59:09 -0500 +Subject: Use NotifyFd more completely + +previous commit missed some. + +Signed-off-by: Rob Clark <robdclark@gmail.com> +--- + src/Makefile.am | 1 - + src/compat-api.h | 19 +++++++++++++++++++ + src/drmmode_display.c | 18 ++++++++++++++++++ + 3 files changed, 37 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index d4c1289..f7d5dd1 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2,7 +2,6 @@ AM_CFLAGS = \ + @XORG_CFLAGS@ \ + @XATRACKER_CFLAGS@ \ + -Wall \ +- -Werror \ + -I$(top_srcdir)/system-includes/ \ + -I$(top_builddir)/ + +diff --git a/src/compat-api.h b/src/compat-api.h +index 80dabc1..af1b922 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -28,6 +28,11 @@ + #ifndef COMPAT_API_H + #define COMPAT_API_H + ++#include <xorg-server.h> ++#include <xorgVersion.h> ++#include <xf86Module.h> ++ ++#include <picturestr.h> + #ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR + #define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] + #define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p +@@ -35,7 +40,13 @@ + + #ifndef XF86_HAS_SCRN_CONV + #define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,1,0,0,0) + #define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] ++#else ++#define xf86ScrnToScreen(s) ((s)->pScreen) ++#endif ++#else ++#define xf86ScrnToScreen(s) ((s)->pScreen) + #endif + + #ifndef XF86_SCRN_INTERFACE +@@ -51,12 +62,17 @@ + #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask + ++#define WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result, pointer read_mask ++#define WAKEUPHANDLER_ARGS arg, wakeupData, result, read_mask ++ + #define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS scrnIndex, pScreen + + #define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags ++#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 + + #define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags ++#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 + + #define FREE_SCREEN_ARGS_DECL int arg, int flags + #define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0 +@@ -88,6 +104,9 @@ + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + #endif + ++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask ++#define WAKEUPHANDLER_ARGS arg, result, read_mask ++ + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen + +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index 53ae677..c3a55e6 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -1381,6 +1381,15 @@ drmmode_handle_uevents(ScrnInfoPtr scrn) + } + #endif + ++#if HAVE_NOTIFY_FD ++static void ++drmmode_udev_notify(int fd, int notify, void *data) ++{ ++ ScrnInfoPtr scrn = data; ++ drmmode_handle_uevents(scrn); ++} ++#endif ++ + static void + drmmode_uevent_init(ScrnInfoPtr scrn) + { +@@ -1407,7 +1416,12 @@ drmmode_uevent_init(ScrnInfoPtr scrn) + return; + } + ++#if HAVE_NOTIFY_FD ++ SetNotifyFd(udev_monitor_get_fd(mon), drmmode_udev_notify, X_NOTIFY_READ, scrn); ++#else + AddGeneralSocket(udev_monitor_get_fd(mon)); ++#endif ++ + drmmode->uevent_monitor = mon; + #endif + } +@@ -1421,7 +1435,11 @@ drmmode_uevent_fini(ScrnInfoPtr scrn) + if (drmmode->uevent_monitor) { + struct udev *u = udev_monitor_get_udev(drmmode->uevent_monitor); + ++#if HAVE_NOTIFY_FD ++ RemoveNotifyFd(udev_monitor_get_fd(drmmode->uevent_monitor)); ++#else + RemoveGeneralSocket(udev_monitor_get_fd(drmmode->uevent_monitor)); ++#endif + udev_monitor_unref(drmmode->uevent_monitor); + udev_unref(u); + } +-- +cgit v1.1 + diff --git a/user/xf86-video-freedreno/secure-atom.patch b/user/xf86-video-freedreno/secure-atom.patch new file mode 100644 index 000000000..17101fb57 --- /dev/null +++ b/user/xf86-video-freedreno/secure-atom.patch @@ -0,0 +1,33 @@ +From ccba8f89995de7d5e1b216e580b789c4cda05035 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 13 Jun 2017 09:26:28 -0400 +Subject: modesetting: Validate the atom for enum properties + +The client could have said anything here, and if what they said doesn't +actually name an atom NameForAtom() will return NULL, and strcmp() will +be unhappy about that. + +[copied from xserver d4995a3936ae283b9080fdaa0905daa669ebacfc] + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + src/drmmode_display.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index c3a55e6..83f323d 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -898,7 +898,8 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property, + if (value->type != XA_ATOM || value->format != 32 || value->size != 1) + return FALSE; + memcpy(&atom, value->data, 4); +- name = NameForAtom(atom); ++ if (!(name = NameForAtom(atom))) ++ return FALSE; + + /* search for matching name string, then set its value down */ + for (j = 0; j < p->mode_prop->count_enums; j++) { +-- +cgit v1.1 + diff --git a/user/xf86-video-geode/APKBUILD b/user/xf86-video-geode/APKBUILD new file mode 100644 index 000000000..d8dccbb1e --- /dev/null +++ b/user/xf86-video-geode/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-geode +pkgver=2.11.19 +pkgrel=0 +pkgdesc="AMD Geode video driver for X11" +url="https://www.X.Org/" +arch="pmmx x86_64" +license="X11" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-video-geode-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f0b1c5edf1c226a4379aa9a4983e69cbaced0618868a7902de41a7754c148324c2a4ea73704aefd96f48d36f035fb2c8063604c26e21e986e4f90c3716578d41 xf86-video-geode-2.11.19.tar.bz2" diff --git a/user/xf86-video-mach64/APKBUILD b/user/xf86-video-mach64/APKBUILD new file mode 100644 index 000000000..2fdbb93c7 --- /dev/null +++ b/user/xf86-video-mach64/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-mach64 +pkgver=6.9.6 +pkgrel=0 +pkgdesc="ATi mach64 video driver for X11" +url="https://www.X.Org/" +arch="all" +license="MIT AND X11" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="" +source="https://www.x.org/releases/individual/driver/xf86-video-mach64-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="687f6ac60491b704d5c4788463763d2f4bf725611e10bd2163156963fe0a8fdbffe0a1b7c737eff131f01759e43b5ec3544a7dabe66a67e85b286dcb969da2f1 xf86-video-mach64-6.9.6.tar.bz2" diff --git a/user/xf86-video-mga/APKBUILD b/user/xf86-video-mga/APKBUILD new file mode 100644 index 000000000..adfbc5b31 --- /dev/null +++ b/user/xf86-video-mga/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-mga +pkgver=2.0.0 +pkgrel=0 +pkgdesc="Matrox video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-video-mga-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="b92006486aef815ff4399f291d610c65d88c0b32a9dae97658c644715ff62b221b01495b5c7a2311745e26f699c1c1f753b81c7bf54cf75567af9f78ac015540 xf86-video-mga-2.0.0.tar.bz2" diff --git a/user/xf86-video-nouveau/APKBUILD b/user/xf86-video-nouveau/APKBUILD index 700e82d37..dd6bd27cd 100644 --- a/user/xf86-video-nouveau/APKBUILD +++ b/user/xf86-video-nouveau/APKBUILD @@ -3,7 +3,7 @@ pkgname=xf86-video-nouveau pkgver=1.0.15 pkgrel=2 -pkgdesc="Open-source X.org drivers for nVidia video cards" +pkgdesc="Libre Nvidia video driver for X11" url="https://nouveau.freedesktop.org/" arch="all" license="MIT" diff --git a/user/xf86-video-openchrome/APKBUILD b/user/xf86-video-openchrome/APKBUILD new file mode 100644 index 000000000..a73468bca --- /dev/null +++ b/user/xf86-video-openchrome/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-openchrome +pkgver=0.6.0 +pkgrel=0 +pkgdesc="S3/VIA Chrome video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-video-openchrome-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f074e70d54c87a9d6e1b52c2c2d72d7c551dcb59a5f34c0a5f9495db1a6e45db4300d51fabf7eedfbe91f964f9422931c752a49b322715c6aa9ddb0db9dd6004 xf86-video-openchrome-0.6.0.tar.bz2" diff --git a/user/xf86-video-qxl/APKBUILD b/user/xf86-video-qxl/APKBUILD new file mode 100644 index 000000000..3106debc5 --- /dev/null +++ b/user/xf86-video-qxl/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-qxl +pkgver=0.1.5 +pkgrel=0 +pkgdesc="QXL video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="eudev-dev libxfont2-dev spice-protocol util-macros xorgproto-dev + xorg-server-dev" +subpackages="" +source="https://www.x.org/releases/individual/driver/xf86-video-qxl-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7510b2d037b3e978df6063b29e2406f3d1270695a239f29fdaec9b1dc65a30ab10cb959f15eb336f78e93aa708d41c64c5ea43803958feffc64542229605b782 xf86-video-qxl-0.1.5.tar.bz2" diff --git a/user/xf86-video-r128/APKBUILD b/user/xf86-video-r128/APKBUILD new file mode 100644 index 000000000..0dd94af4e --- /dev/null +++ b/user/xf86-video-r128/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-r128 +pkgver=6.12.0 +pkgrel=0 +pkgdesc="ATi Rage 128 video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-video-r128-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38 xf86-video-r128-6.12.0.tar.bz2" diff --git a/user/xf86-video-tdfx/APKBUILD b/user/xf86-video-tdfx/APKBUILD new file mode 100644 index 000000000..62b9217cc --- /dev/null +++ b/user/xf86-video-tdfx/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-tdfx +pkgver=1.4.7 +pkgrel=0 +pkgdesc="3Dfx video driver for X11" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-video-tdfx-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="573eea7a6b05ed33a963f8e2f80ac1cb14632b7fd10d8d90da16c07db432e73641ced885ee979f68e4ead8429b39506b2f231ca4ac296a0780c9f6d223c3b405 xf86-video-tdfx-1.4.7.tar.bz2" diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD index 7edd9dcfa..575436450 100644 --- a/user/xfce4-appfinder/APKBUILD +++ b/user/xfce4-appfinder/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-appfinder -pkgver=4.13.1 +pkgver=4.13.2 pkgrel=0 pkgdesc="An application finder for the XFCE desktop environment" url="https://xfce.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1be1508bea87e9ff7763dc6a8dd0a45b3e1ef39400486b9926de190e146c4c3fd96d08508d32c53a99ff92e98c4cc504e074f651273aac917a79e5df71022116 xfce4-appfinder-4.13.1.tar.bz2" +sha512sums="96ac782c785649ddf75f8659f9cf10f42c37bab647824f0c76714baca0b61904fa8ba6d23dc1574aae5fdf2538201936d26b42ea6c0f5d5f0f9d71c8ba0a51b8 xfce4-appfinder-4.13.2.tar.bz2" diff --git a/user/xfce4-dict/APKBUILD b/user/xfce4-dict/APKBUILD index cee0a0c01..c85e672d3 100644 --- a/user/xfce4-dict/APKBUILD +++ b/user/xfce4-dict/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-dict -pkgver=0.8.1 +pkgver=0.8.2 pkgrel=0 pkgdesc="Dictionary application for the XFCE desktop environment" url="https://xfce.org" @@ -10,7 +10,6 @@ license="GPL-2.0+" makedepends="intltool glib-dev gtk+3.0-dev libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-doc" source="http://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-$pkgver.tar.bz2" -sha512sums="6cadc479afe5bede536915f8094f4c3ae80139cd11f4b594ee17d28373e5ee3f60a918193b0eefb2e247dfd8780d632e8b508538fd101b4064e36260fc30c67e xfce4-dict-0.8.1.tar.bz2" build() { cd "$builddir" @@ -34,3 +33,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="b22edae6adc9e965d8d59156d7b241e6454be9af1c7cd2b6264987dfe9411293987065b179a362651ccfc1f0423a41672803467e6df5307b998c5c359e487b5b xfce4-dict-0.8.2.tar.bz2" diff --git a/user/xfce4-systemload-plugin/APKBUILD b/user/xfce4-systemload-plugin/APKBUILD index 7cfcf6656..7545e3a0a 100644 --- a/user/xfce4-systemload-plugin/APKBUILD +++ b/user/xfce4-systemload-plugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-systemload-plugin -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=0 pkgdesc="System load monitor plugin for the XFCE panel" url="https://xfce.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="01e57d799731a5860f043339ff0e90e0967ac1bda91d9f500d657ea14f3a52f31d9dd68ef5293f7941ef93e26e48af72de22aef976d0ccd497c62096e1aaf0b9 xfce4-systemload-plugin-1.2.1.tar.bz2" +sha512sums="92930431383c128e449545b15a6d50aa6e236685619cc1abf0b60979f8a25010eb82ac4428f3e0e7eaac1468c3b101d6a0ef5d39e556346e74f4dddfffaa446b xfce4-systemload-plugin-1.2.2.tar.bz2" diff --git a/user/xfd/APKBUILD b/user/xfd/APKBUILD new file mode 100644 index 000000000..5011b28d4 --- /dev/null +++ b/user/xfd/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xfd +pkgver=1.1.2 +pkgrel=0 +pkgdesc="Display all characters in X11 fonts" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="fontconfig-dev libxaw-dev libxft-dev libxmu-dev libxrender-dev + util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xfd-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3a158f697dd40c5b650b3d80ad1692d668d9d9bcf586a437fd3dcebf9e8fffb773855df290260995464d5f36cb22e768d1d71de8e61d7cca80eaa4d25c029745 xfd-1.1.2.tar.bz2" diff --git a/user/xfindproxy/APKBUILD b/user/xfindproxy/APKBUILD new file mode 100644 index 000000000..430427fb2 --- /dev/null +++ b/user/xfindproxy/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xfindproxy +pkgver=1.0.4 +pkgrel=0 +pkgdesc="X11 proxy locator service" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libice-dev libxt-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xfindproxy-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e99fdec21070d0052e21340bc2d471eed5c6b423ccfb063f3225d2bb63a264d5efa7e4d5d76543554e02f898d209338b178ba18f866593d946bc6fa117a630e2 xfindproxy-1.0.4.tar.bz2" diff --git a/user/xfontsel/APKBUILD b/user/xfontsel/APKBUILD new file mode 100644 index 000000000..e34c9d2ac --- /dev/null +++ b/user/xfontsel/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xfontsel +pkgver=1.0.6 +pkgrel=0 +pkgdesc="X11 font chooser and exploration tool" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xfontsel-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099 xfontsel-1.0.6.tar.bz2" diff --git a/user/xfs/APKBUILD b/user/xfs/APKBUILD new file mode 100644 index 000000000..d7e0fdeb6 --- /dev/null +++ b/user/xfs/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xfs +pkgver=1.2.0 +pkgrel=0 +pkgdesc="The X11 Font Server" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="xtrans" +makedepends="libxfont2-dev util-macros xmlto xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xfs-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="557b08aa07919239ce345d60b288b886640200bb1a59649fc890c3ccaa8559cc6745189614e696ab1b390ec024b393be5493787b7b0d2b3545b342d743c2e0ef xfs-1.2.0.tar.bz2" diff --git a/user/xfsinfo/APKBUILD b/user/xfsinfo/APKBUILD new file mode 100644 index 000000000..932c744c8 --- /dev/null +++ b/user/xfsinfo/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xfsinfo +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Display information about X11 font servers" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libfs-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xfsinfo-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="49fcbe91ac121022ccecd4a2f0e55a9a5cce7ba12b713be78b3b7f2847e622631bca6f6647256a956910fda591a87b524b966d5c849b8b2526d6f1a1960fe57f xfsinfo-1.0.5.tar.bz2" diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index 14451017a..d560fff66 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfwm4 pkgver=4.13.1 -pkgrel=0 +pkgrel=1 pkgdesc="Window manager for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -11,8 +11,8 @@ makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev gobject-introspection-dev vala-dev" subpackages="$pkgname-lang" langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-$pkgver.tar.bz2" -sha512sums="2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320 xfwm4-4.13.1.tar.bz2" +source="http://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-$pkgver.tar.bz2 + fix-mask-length.patch" build() { cd "$builddir" @@ -36,3 +36,5 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320 xfwm4-4.13.1.tar.bz2 +88733a4d69b58b0c98f2f46694ccc8bda4e5bc1b565d952123cee466b3f89f95d72fc28c8e9c173dcc0aee606c9f4b085d891004d769b74ad0c7084d8dec00a9 fix-mask-length.patch" diff --git a/user/xfwm4/fix-mask-length.patch b/user/xfwm4/fix-mask-length.patch new file mode 100644 index 000000000..dd050c8dc --- /dev/null +++ b/user/xfwm4/fix-mask-length.patch @@ -0,0 +1,12 @@ +diff -ru xfwm4-4.13.1.orig/src/device.c xfwm4-4.13.1/src/device.c +--- xfwm4-4.13.1.orig/src/device.c 2018-07-29 16:08:54.000000000 +0300 ++++ xfwm4-4.13.1/src/device.c 2018-09-12 08:49:18.130254993 +0300 +@@ -301,7 +301,7 @@ + guint i; + + xievent_mask->deviceid = XIAllMasterDevices; +- xievent_mask->mask_len = sizeof (mask); ++ xievent_mask->mask_len = len; + xievent_mask->mask = mask; + + for (i = 0; i < G_N_ELEMENTS (core_to_xi2); i++) diff --git a/user/xfwp/APKBUILD b/user/xfwp/APKBUILD new file mode 100644 index 000000000..46540f2ce --- /dev/null +++ b/user/xfwp/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xfwp +pkgver=1.0.3 +pkgrel=0 +pkgdesc="X11 firewall proxy" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libice-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xfwp-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="493cfff0c90ada372c76f3fc49278bc4b1bf30c013f325d0358d0bd7004144bd540e86dee0fadd0bfbe1c47b91437a61dd7e9ff21d747d75ce9f42750fb17609 xfwp-1.0.3.tar.bz2" diff --git a/user/xgamma/APKBUILD b/user/xgamma/APKBUILD new file mode 100644 index 000000000..d93f3853b --- /dev/null +++ b/user/xgamma/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xgamma +pkgver=1.0.6 +pkgrel=0 +pkgdesc="Tools for manipulating gamma on X11 displays" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxxf86vm-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xgamma-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a xgamma-1.0.6.tar.bz2" diff --git a/user/xgc/APKBUILD b/user/xgc/APKBUILD new file mode 100644 index 000000000..8e55f8a4f --- /dev/null +++ b/user/xgc/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xgc +pkgver=1.0.5 +pkgrel=0 +pkgdesc="X11 graphics core demonstration" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="cmd:lex cmd:yacc libxaw-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xgc-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="5943d13b9e0ed5e1b66d26eaa4b39d16d71f0df23e3ea93bfc397b6303516b161c2b60b24679ed75b640bf2493e66682d35efc7cedd41c5b57caa65f309a8314 xgc-1.0.5.tar.bz2" diff --git a/user/xkbevd/APKBUILD b/user/xkbevd/APKBUILD new file mode 100644 index 000000000..2402772b7 --- /dev/null +++ b/user/xkbevd/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xkbevd +pkgver=1.1.4 +pkgrel=0 +pkgdesc="Event daemon for XKB" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="cmd:yacc libx11-dev libxkbfile-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xkbevd-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7628eddd0e1dc0c4df8e61eb3f6a6bf0e9d92a87e96bb2f5248ba5bd3d99d868885c36860b78e8ea2eaba3bb9a420067ef95c4d58c1254fa3d12fb25dd4e60e7 xkbevd-1.1.4.tar.bz2" diff --git a/user/xkbprint/APKBUILD b/user/xkbprint/APKBUILD new file mode 100644 index 000000000..3661c7da9 --- /dev/null +++ b/user/xkbprint/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xkbprint +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Tool to generate PostScript descriptions of XKB keyboard layouts" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxkbfile-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xkbprint-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="bb65a93ae737cd4b78787fef51972f4d0072a272166f82103bfaa92cf275db6363fae3530539b7c9a4139f6b87512019ac15ab3478d4ad05967ad18a8e80033a xkbprint-1.0.4.tar.bz2" diff --git a/user/xkbutils/APKBUILD b/user/xkbutils/APKBUILD new file mode 100644 index 000000000..d627a69a8 --- /dev/null +++ b/user/xkbutils/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xkbutils +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Utilities for managing keyboards using XKB" +url="https://www.X.Org/" +arch="all" +license="MIT AND X11" +depends="" +makedepends="libx11-dev libxaw-dev libxt-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xkbutils-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + chmod a+w config.sub + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d xkbutils-1.0.4.tar.bz2" diff --git a/user/xkill/APKBUILD b/user/xkill/APKBUILD new file mode 100644 index 000000000..bc4d3cceb --- /dev/null +++ b/user/xkill/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xkill +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Kill X11 clients using the mouse cursor" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxmu-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xkill-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249 xkill-1.0.5.tar.bz2" diff --git a/user/xload/APKBUILD b/user/xload/APKBUILD new file mode 100644 index 000000000..71414484b --- /dev/null +++ b/user/xload/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xload +pkgver=1.1.3 +pkgrel=0 +pkgdesc="Load average monitor for X11" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros + xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xload-$pkgver.tar.bz2" + +build() { + cd "$builddir" + CFLAGS="$CFLAGS -DRLOADSTUB" ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5 xload-1.1.3.tar.bz2" diff --git a/user/xlogo/APKBUILD b/user/xlogo/APKBUILD new file mode 100644 index 000000000..6ed763de5 --- /dev/null +++ b/user/xlogo/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xlogo +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Display the X11 logo" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libsm-dev libx11-dev libxaw-dev libxext-dev libxmu-dev libxt-dev + util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xlogo-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="cbfcd48425e697950907ddeaec2f06e0607ebf2e93e6799bd263230f036b3021279c2f379de55fae15b403af5f18292caa79159ed544a4a3314b90c85ac9804d xlogo-1.0.4.tar.bz2" diff --git a/user/xlsatoms/APKBUILD b/user/xlsatoms/APKBUILD new file mode 100644 index 000000000..bc05dceb0 --- /dev/null +++ b/user/xlsatoms/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xlsatoms +pkgver=1.1.2 +pkgrel=0 +pkgdesc="List interned atoms in an X11 server" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libxcb-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xlsatoms-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f29001de22818792212312f1b9daee1bf7afa2ef2ae945cd8c14bdc1a7bb40064d3878c5efea60458ac0bf515ab1ece16fa90cbd2b0a879a5f07f3aa3e6a0baa xlsatoms-1.1.2.tar.bz2" diff --git a/user/xlsclients/APKBUILD b/user/xlsclients/APKBUILD new file mode 100644 index 000000000..81b470a1d --- /dev/null +++ b/user/xlsclients/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xlsclients +pkgver=1.1.4 +pkgrel=0 +pkgdesc="List running clients on an X11 server" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libxcb-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xlsclients-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4 xlsclients-1.1.4.tar.bz2" diff --git a/user/xlsfonts/APKBUILD b/user/xlsfonts/APKBUILD new file mode 100644 index 000000000..054386397 --- /dev/null +++ b/user/xlsfonts/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xlsfonts +pkgver=1.0.6 +pkgrel=0 +pkgdesc="List available fonts on an X11 server" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xlsfonts-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="052a3b1dec23cb20fdfacd4500cb836feb3b888bf568a548ea71deb58a4ba10a1ad5392d658e95272c6d4a1832edf1f19c3de2498b78dca82c43ee52800a30c0 xlsfonts-1.0.6.tar.bz2" diff --git a/user/xmag/APKBUILD b/user/xmag/APKBUILD new file mode 100644 index 000000000..85191ca8d --- /dev/null +++ b/user/xmag/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xmag +pkgver=1.0.6 +pkgrel=0 +pkgdesc="Tool to magnify part of an X11 screen" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xmag-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="98f3c8e0c58f31cd4f1736ba9c5cd68dba3b2e2de6191988de8ae3e91b1d310803461840189ad56be45ee57c9ca05a2c63544a49b02ce6f79f2ebc14c59613de xmag-1.0.6.tar.bz2" diff --git a/user/xman/APKBUILD b/user/xman/APKBUILD new file mode 100644 index 000000000..8bc1b8a44 --- /dev/null +++ b/user/xman/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xman +pkgver=1.1.4 +pkgrel=0 +pkgdesc="Read manual pages from the comfort of X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="groff" +makedepends="libxaw-dev libxt-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xman-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="785e973eb15b0300de08aace24f3604dfee61421c7f64ea4cde2e280480bf5d3ad797ab8208668dc023a375494f8db7534fbcaa1c1ef16e79464fdd017b5da68 xman-1.1.4.tar.bz2" diff --git a/user/xmh/APKBUILD b/user/xmh/APKBUILD new file mode 100644 index 000000000..d7594e546 --- /dev/null +++ b/user/xmh/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xmh +pkgver=1.0.3 +pkgrel=0 +pkgdesc="X11 integration for MH message handling system" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="xbitmaps" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xmh-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="acc1fb65fe69891272a25f3f45e7e1e7c57ad075bbaac7b3b53577853fbb07598d3ad3ea01130db6b10e3c347550ce23d709363440cbd73897bc39411640c251 xmh-1.0.3.tar.bz2" diff --git a/user/xmore/APKBUILD b/user/xmore/APKBUILD new file mode 100644 index 000000000..bf2d861bd --- /dev/null +++ b/user/xmore/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xmore +pkgver=1.0.2 +pkgrel=0 +pkgdesc="Display text files using X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libxaw-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xmore-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="718ad254beaae57475cead3815fc7625692699c76749c64e3aeb722daf5e1cecbea9d1207e3427d6a5d0aa240a6aaf678ea1656d6731b9f47e1a8045d62c3efb xmore-1.0.2.tar.bz2" diff --git a/user/xorg-apps/APKBUILD b/user/xorg-apps/APKBUILD new file mode 100644 index 000000000..be8cce184 --- /dev/null +++ b/user/xorg-apps/APKBUILD @@ -0,0 +1,26 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xorg-apps +pkgver=1.0 +pkgrel=0 +pkgdesc="X.Org applications (all)" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +options="!check" # Metapacakge +subpackages="" +depends="appres bdftopcf beforelight bitmap editres fonttosfnt fslsfonts + fstobdf iceauth ico lbxproxy listres luit mkcomposecache mkfontdir + mkfontscale oclock proxymngr rendercheck rgb setxkbmap showfont smproxy + transset twm viewres x11perf xauth acpilight xbiff xbitmaps xcalc + xclipboard xclock xcmsdb xcompmgr xconsole xcursorgen xdbedizzy + xditview xdpyinfo xdriinfo xedit xev xeyes xfd xfindproxy xfontsel xfs + xfsinfo xfwp xgamma xgc xhost xinit xinput xkbcomp xkbevd xkbprint + xkbutils xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman + xmessage xmh xmodmap xmore xpr xprop xrandr xrdb xrefresh xrx xscope + xset xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo xwd + xwininfo xwud" +source="" + +package() { + mkdir -p $pkgdir +} diff --git a/user/xorg-drivers/APKBUILD b/user/xorg-drivers/APKBUILD new file mode 100644 index 000000000..f50653136 --- /dev/null +++ b/user/xorg-drivers/APKBUILD @@ -0,0 +1,27 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xorg-drivers +pkgver=1.0 +pkgrel=0 +pkgdesc="Drivers for X.Org systems" +url="https://www.X.Org/" +arch="all" +license="MIT" +options="!check !dbg" # Metapacakge +subpackages="" +depends="xf86-input-evdev xf86-input-joystick xf86-input-keyboard + xf86-input-libinput xf86-input-mouse xf86-input-synaptics + xf86-input-void xf86-input-wacom + + xf86-video-ast xf86-video-ati xf86-video-cirrus xf86-video-dummy + xf86-video-fbdev xf86-video-freedreno xf86-video-mach64 xf86-video-mga + xf86-video-nouveau xf86-video-openchrome xf86-video-qxl xf86-video-r128 + xf86-video-tdfx" +case $CTARGET_ARCH in + x86_64 | pmmx) + depends="$depends xf86-video-geode xf86-video-intel" ;; +esac +source="" + +package() { + mkdir -p $pkgdir +} diff --git a/user/xorg-fonts/APKBUILD b/user/xorg-fonts/APKBUILD new file mode 100644 index 000000000..6de6a89cc --- /dev/null +++ b/user/xorg-fonts/APKBUILD @@ -0,0 +1,29 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xorg-fonts +pkgver=1.0 +pkgrel=0 +pkgdesc="Fonts from X.Org (all)" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +options="!check" # Metapacakge +subpackages="" +depends="font-adobe-75dpi font-adobe-100dpi font-adobe-utopia-75dpi + font-adobe-utopia-100dpi font-adobe-utopia-type1 font-arabic-misc + font-bh-75dpi font-bh-100dpi font-bh-lucidatypewriter-75dpi + font-bh-lucidatypewriter-100dpi font-bitstream-75dpi + font-bitstream-100dpi font-bitstream-speedo font-bitstream-type1 + font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc + font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic + font-misc-ethiopic font-misc-misc font-mutt-misc font-schumacher-misc + font-screen-cyrillic font-sony-misc font-sun-misc + font-winitzki-cyrillic font-xfree86-type1" +# font-bh-ttf: non-free license +# font-bh-type1: non-free license +# font-ibm-type1: non-free license +# font-misc-meltho: non-free license +source="" + +package() { + mkdir -p $pkgdir +} diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index 928b86a42..181bbde15 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-server pkgver=1.20.3 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org X11 server" url="https://www.X.Org/" arch="all" @@ -59,13 +59,9 @@ prepare() { build() { cd "$builddir" - # xorg modules does not work with the -z now and it seems like we - # cannot pass over the linker flag to .so files. so we tweak the - # gcc specs. export CFLAGS="$CFLAGS -D_GNU_SOURCE" [ "$CLIBC" == musl ] && export CFLAGS="$CFLAGS -D__gid_t=gid_t -D__uid_t=uid_t" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" - _fontroot="/usr/share/fonts" ./configure \ --build=$CBUILD \ @@ -73,8 +69,6 @@ build() { --prefix=/usr \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ - --with-fontrootdir=$_fontroot \ - --with-default-font-path=${_fontroot}/misc,${_fontroot}/100dpi:unscaled,${_fontroot}/75dpi:unscaled,${_fontroot}/TTF,${_fontroot}/Type1,${_fontroot}/truetype \ --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ --without-systemd-daemon \ diff --git a/user/xpr/APKBUILD b/user/xpr/APKBUILD new file mode 100644 index 000000000..a8980c5c4 --- /dev/null +++ b/user/xpr/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xpr +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Format an X11 window dump from xwd(1) for printing" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libx11-dev libxmu-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xpr-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967 xpr-1.0.5.tar.bz2" diff --git a/user/xrefresh/APKBUILD b/user/xrefresh/APKBUILD new file mode 100644 index 000000000..e942b954b --- /dev/null +++ b/user/xrefresh/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xrefresh +pkgver=1.0.6 +pkgrel=0 +pkgdesc="Refresh an X11 screen" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libx11-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xrefresh-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674 xrefresh-1.0.6.tar.bz2" diff --git a/user/xrx/APKBUILD b/user/xrx/APKBUILD new file mode 100644 index 000000000..97e71a06d --- /dev/null +++ b/user/xrx/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xrx +pkgver=1.0.4 +pkgrel=0 +pkgdesc="X11 Remote eXecution system" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="xtrans" +makedepends="libice-dev libx11-dev libxau-dev libxaw-dev libxext-dev libxt-dev + xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xrx-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="beb505555604a18651f77dee7579d928fa0f529c45ccf77e870fc066f5d0a181e265b96b6a4a4423bd3f76b46c9eed70d513919fe1c936e0671e89ffbfa2a81e xrx-1.0.4.tar.bz2" diff --git a/user/xscope/APKBUILD b/user/xscope/APKBUILD new file mode 100644 index 000000000..9b4ce4205 --- /dev/null +++ b/user/xscope/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xscope +pkgver=1.4.1 +pkgrel=0 +pkgdesc="Monitor communication between an X11 client and server" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xscope-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="0b35bd51ed3118bde72359280a610f6f3f7d5e62f1673e493f13d2118ce07bfe4ae7ccc4231556d1c24f4bd7add88c46a4ea478d825fc9cf3fd723dc662d2874 xscope-1.4.1.tar.bz2" diff --git a/user/xsetmode/APKBUILD b/user/xsetmode/APKBUILD new file mode 100644 index 000000000..37615c3f3 --- /dev/null +++ b/user/xsetmode/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xsetmode +pkgver=1.0.0 +pkgrel=0 +pkgdesc="Set the mode on an XInput device" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libx11-dev libxi-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xsetmode-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="a3c1c5e85a0cec35a7db10a57eece07691c0bec79b93987ec4417ebf71544ddffbb4832f78ef524bfcd149beb9852295a2de6a2ccec481cd6eea5633e090abfb xsetmode-1.0.0.tar.bz2" diff --git a/user/xsetpointer/APKBUILD b/user/xsetpointer/APKBUILD new file mode 100644 index 000000000..0e0d5f697 --- /dev/null +++ b/user/xsetpointer/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xsetpointer +pkgver=1.0.1 +pkgrel=0 +pkgdesc="Set the active pointer device on an X11 display" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxi-dev xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xsetpointer-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="1a462f70dde10c6ce92432440a9e718ba231c49ecbf68f0c2fd2276862edc4e9cd0dd5b6d71ad169b30e4cac7110278e4c8ed48eedd1d6cc0d1bd5e322bbcf58 xsetpointer-1.0.1.tar.bz2" diff --git a/user/xsm/APKBUILD b/user/xsm/APKBUILD new file mode 100644 index 000000000..f3e42cd18 --- /dev/null +++ b/user/xsm/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xsm +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Session manager for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="iceauth smproxy twm" +makedepends="libice-dev libsm-dev libxaw-dev libxt-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xsm-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176 xsm-1.0.4.tar.bz2" diff --git a/user/xstdcmap/APKBUILD b/user/xstdcmap/APKBUILD new file mode 100644 index 000000000..5c2622cf3 --- /dev/null +++ b/user/xstdcmap/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xstdcmap +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Define standard X11 colour map properties" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxmu-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xstdcmap-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + chmod a+w config.sub + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="8037ddb9c6b8f3a65d35637a1fca2b1b6c7e76afce5c13b1947cf72c3ca87679aa2ed05caf308d90549432b7fe029a522a99f32701bd0087c140bf4fafdb4d49 xstdcmap-1.0.3.tar.bz2" diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 7e35c3d49..edec39639 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xterm -pkgver=337 +pkgver=340 pkgrel=0 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609 xterm-337.tgz" +sha512sums="9a150741868fb681e71f4e3644748ea62fd73f9babbbe0baaca24f8c65d96c2ca434abcca713c2d337ec83e2264903b0f98fa6c9dbc3e3ac19c69a98d4c0a033 xterm-340.tgz" diff --git a/user/xvidtune/APKBUILD b/user/xvidtune/APKBUILD new file mode 100644 index 000000000..4c4e9d8b7 --- /dev/null +++ b/user/xvidtune/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xvidtune +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Tune video modes on an X11 display" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libxaw-dev libxmu-dev libxxf86vm-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xvidtune-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + chmod a+w config.sub + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352 xvidtune-1.0.3.tar.bz2" diff --git a/user/xvinfo/APKBUILD b/user/xvinfo/APKBUILD new file mode 100644 index 000000000..82d0e29ad --- /dev/null +++ b/user/xvinfo/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xvinfo +pkgver=1.1.3 +pkgrel=0 +pkgdesc="View information about video adaptors attached to X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libxv-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xvinfo-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="df8356898390d2aec4fbd15cee1627bb86b57ff8af41a527d4f6f6703a81f399a3098da342b94af6d4cf4a817d9fda1946a206bfbe3995e87ceb9910bb8b51bc xvinfo-1.1.3.tar.bz2" diff --git a/user/xwd/APKBUILD b/user/xwd/APKBUILD new file mode 100644 index 000000000..c7bd606be --- /dev/null +++ b/user/xwd/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xwd +pkgver=1.0.7 +pkgrel=0 +pkgdesc="Dump the contents of an X11 window to a file" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libx11-dev libxkbfile-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xwd-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e xwd-1.0.7.tar.bz2" diff --git a/user/xwud/APKBUILD b/user/xwud/APKBUILD new file mode 100644 index 000000000..72f7e9e50 --- /dev/null +++ b/user/xwud/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xwud +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Display the contents of an X11 window dumped by xwd(1)" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xwud-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184 xwud-1.0.5.tar.bz2" diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD new file mode 100644 index 000000000..af5d02712 --- /dev/null +++ b/user/youtube-dl/APKBUILD @@ -0,0 +1,68 @@ +# Contributor: Peter Bui <pnutzh4x0r@gmail.com> +# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> +# Contributor: Timo Teräs <timo.teras@iki.fi> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=youtube-dl +pkgver=2018.11.23 +pkgrel=0 +pkgdesc="Command-line program to download videos from YouTube and many other sites" +url="https://youtube-dl.org" +arch="noarch" +options="!check" # Takes way too long, and uses network +license="Unlicense AND Public-Domain" +depends="ffmpeg python3" +subpackages="$pkgname-doc + $pkgname-zsh-completion:zshcomp + $pkgname-bash-completion:bashcomp + $pkgname-fish-completion:fishcomp" +source="https://github.com/rg3/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" +builddir="$srcdir/$pkgname" + +prepare() { + default_prepare + sed -i \ + -e 's|etc/bash_completion.d|share/bash-completion/completions|' \ + -e 's|etc/fish/completions|share/fish/completions|' \ + "$builddir/setup.py" +} + +check() { + cd "$builddir" + python3 -m unittest discover +} + +package() { + cd "$builddir" + python3 setup.py install --root="$pkgdir/" --optimize=1 +} + +zshcomp() { + pkgdesc="Zsh completions for $pkgname" + depends="" + install_if="$pkgname=$pkgver-r$pkgrel zsh" + + install -Dm644 "$builddir/$pkgname.zsh" \ + "$subpkgdir/usr/share/zsh/site-functions/_$pkgname" +} + +bashcomp() { + pkgdesc="Bash completions for $pkgname" + depends="" + install_if="$pkgname=$pkgver-r$pkgrel bash-completion" + + mkdir -p "$subpkgdir/usr/share/bash-completion/completions/" + mv "$pkgdir/usr/share/bash-completion/completions/$pkgname.bash-completion" \ + "$subpkgdir/usr/share/bash-completion/completions/$pkgname" +} + +fishcomp() { + pkgdesc="Fish completions for $pkgname" + depends="" + install_if="$pkgname=$pkgver-r$pkgrel fish" + + mkdir -p "$subpkgdir/usr/share/fish/completions/" + mv "$pkgdir/usr/share/fish/completions/$pkgname.fish" \ + "$subpkgdir/usr/share/fish/completions/" +} + +sha512sums="d4d2813657972c37d3493743a44055d7a776aeb5c5a97902e07caa317a3b2db30332507c37b56b3d8554e0bdc2a0ec6a9862977b449b363343a4de2df12bf059 youtube-dl-2018.11.23.tar.gz" |