diff options
66 files changed, 1178 insertions, 855 deletions
diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD index 22eeeba55..4cda8968f 100644 --- a/system/adelie-base/APKBUILD +++ b/system/adelie-base/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adelie-base pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="The Adélie Linux Base System" url="https://www.adelielinux.org/" arch="noarch" @@ -94,6 +94,7 @@ devkit() { } docs() { + depends="" pkgdesc="Metapackage that will magically install all documentation for your system" mkdir -p "$subpkgdir" return 0 diff --git a/system/bsd-compat-headers/APKBUILD b/system/bsd-compat-headers/APKBUILD new file mode 100644 index 000000000..f7f5036c0 --- /dev/null +++ b/system/bsd-compat-headers/APKBUILD @@ -0,0 +1,31 @@ +# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> +pkgname=bsd-compat-headers +pkgver=0.7.1 +pkgrel=1 +pkgdesc="Compatibility files for building BSD software" +url=" " +arch="noarch" +options="!check" # Just header files. +license="BSD-2-Clause AND BSD-3-Clause" +depends="" +makedepends="" +subpackages="" +source="sys-cdefs.h + sys-queue.h + sys-tree.h + " + +package() { + mkdir -p "$pkgdir" + case "$CLIBC" in + musl) + install -D "$srcdir"/sys-cdefs.h "$pkgdir"/usr/include/sys/cdefs.h + install -D "$srcdir"/sys-queue.h "$pkgdir"/usr/include/sys/queue.h + install -D "$srcdir"/sys-tree.h "$pkgdir"/usr/include/sys/tree.h + ;; + esac +} + +sha512sums="8c3fddd73b696a38e633953715c79c47703739be27ee085fc6c960a57b6746ca05bf6406f7e6126cc1a13204254fd5830afb566624e1f298f4d6b58216013c28 sys-cdefs.h +2f0d5e6e4dc3350285cf17009265dddcbe12431c111868eea39bc8cb038ab7c1f2acacbb21735c4e9d4a1fd106a8fc0f8611ea33987d4faba37dde5ce6da0750 sys-queue.h +07cb70f2f0ddb31e23dd913c6f561fc9885667c5803fdf3a559676c99d08834b4104589bacb5d17b4a0b379c68c81a1cf3173832b3da33a7b936fa7b93706844 sys-tree.h" diff --git a/system/libc-dev/sys-cdefs.h b/system/bsd-compat-headers/sys-cdefs.h index 209a623c0..209a623c0 100644 --- a/system/libc-dev/sys-cdefs.h +++ b/system/bsd-compat-headers/sys-cdefs.h diff --git a/system/libc-dev/sys-queue.h b/system/bsd-compat-headers/sys-queue.h index a38499a26..a38499a26 100644 --- a/system/libc-dev/sys-queue.h +++ b/system/bsd-compat-headers/sys-queue.h diff --git a/system/libc-dev/sys-tree.h b/system/bsd-compat-headers/sys-tree.h index eaea56aae..eaea56aae 100644 --- a/system/libc-dev/sys-tree.h +++ b/system/bsd-compat-headers/sys-tree.h diff --git a/system/libc-dev/APKBUILD b/system/libc-dev/APKBUILD deleted file mode 100644 index 4ead3c13b..000000000 --- a/system/libc-dev/APKBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: William Pitcock <nenolod@dereferenced.org> -pkgname=libc-dev -pkgver=0.7.1 -pkgrel=0 -pkgdesc="Meta package to pull in correct libc" -url="http://alpinelinux.org" -arch="noarch" -license="BSD-2-Clause AND BSD-3-Clause" -makedepends_build=" " -makedepends_host=" " -makedepends="$makedepends_build $makedepends_host" -depends="$CLIBC-dev" -subpackages="libc-utils:utils bsd-compat-headers:bsdcompat" -source="sys-cdefs.h - sys-queue.h - sys-tree.h - " - -prepare() { - mkdir -p "$builddir" - cd "$builddir" -} - -build() { - return 0 -} - -check() { - return 0 -} - -package() { - mkdir -p "$pkgdir" -} - -utils() { - depends="$CLIBC-utils" - - mkdir -p "$subpkgdir" -} - -bsdcompat() { - pkgdesc="BSD compatibility headers (cdefs, queue, tree)" - depends="" - - mkdir -p "$subpkgdir" - case "$CLIBC" in - musl) - install -D "$srcdir"/sys-cdefs.h "$subpkgdir"/usr/include/sys/cdefs.h - install -D "$srcdir"/sys-queue.h "$subpkgdir"/usr/include/sys/queue.h - install -D "$srcdir"/sys-tree.h "$subpkgdir"/usr/include/sys/tree.h - ;; - esac -} - -sha512sums="8c3fddd73b696a38e633953715c79c47703739be27ee085fc6c960a57b6746ca05bf6406f7e6126cc1a13204254fd5830afb566624e1f298f4d6b58216013c28 sys-cdefs.h -2f0d5e6e4dc3350285cf17009265dddcbe12431c111868eea39bc8cb038ab7c1f2acacbb21735c4e9d4a1fd106a8fc0f8611ea33987d4faba37dde5ce6da0750 sys-queue.h -07cb70f2f0ddb31e23dd913c6f561fc9885667c5803fdf3a559676c99d08834b4104589bacb5d17b4a0b379c68c81a1cf3173832b3da33a7b936fa7b93706844 sys-tree.h" diff --git a/system/man-db/APKBUILD b/system/man-db/APKBUILD index e8b60b75f..0e0aa9724 100644 --- a/system/man-db/APKBUILD +++ b/system/man-db/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=man-db pkgver=2.8.4 -pkgrel=0 +pkgrel=1 pkgdesc="The man command and related utilities for examining on-line help files" url="http://www.nongnu.org/man-db/" arch="all" diff --git a/system/man-db/man-db.trigger b/system/man-db/man-db.trigger index fb76aa38c..f9de5961c 100644 --- a/system/man-db/man-db.trigger +++ b/system/man-db/man-db.trigger @@ -1,3 +1,3 @@ #!/bin/sh -exec /usr/bin/mandb /usr/share/man +exec /usr/bin/mandb /usr/share/man >/dev/null diff --git a/system/musl/2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch b/system/musl/2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch deleted file mode 100644 index b39664dac..000000000 --- a/system/musl/2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 58dec23397e3fcc4300cc03839ce5e508389abbc Mon Sep 17 00:00:00 2001 -From: William Pitcock <nenolod@dereferenced.org> -Date: Thu, 22 Jun 2017 22:04:51 +0000 -Subject: [PATCH] pthread internals: increase DEFAULT_GUARD_SIZE to 2 pages - instead of 1 page. - -This is intended to be a proactive mitigation against any bugs similar to CVE-2017-1000366. - -Signed-off-by: William Pitcock <nenolod@dereferenced.org> ---- - src/internal/pthread_impl.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h -index ae0ab1c5..ad4ea3fa 100644 ---- a/src/internal/pthread_impl.h -+++ b/src/internal/pthread_impl.h -@@ -146,7 +146,7 @@ void __block_app_sigs(void *); - void __restore_sigs(void *); - - #define DEFAULT_STACK_SIZE 81920 --#define DEFAULT_GUARD_SIZE 4096 -+#define DEFAULT_GUARD_SIZE 8192 - - #define __ATTRP_C11_THREAD ((void*)(uintptr_t)-1) - --- -2.13.0 - diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD index df828a90e..368ba8766 100644 --- a/system/musl/APKBUILD +++ b/system/musl/APKBUILD @@ -1,16 +1,14 @@ -# Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=musl -pkgver=1.1.20 -pkgrel=6 +pkgver=1.1.21 +pkgrel=0 pkgdesc="System library (libc) implementation" url="http://www.musl-libc.org/" arch="all" options="!check" license="MIT" depends="" -depends_dev="!uclibc-dev" -makedepends="$depends_dev" +makedepends="" subpackages="$pkgname-dev" case "$BOOTSTRAP" in nocc) pkgname="musl-dev" @@ -25,14 +23,8 @@ nolibc) ;; esac source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz amalgamation.patch - 2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch 3001-make-real-lastlog-h.patch handle-aux-at_base.patch - fix-file-locking-race.patch - dcngettext-null-deref.patch - getaddrinfo-regression.patch - ppc64-atomic.patch - dynamic-binary-stack-size.patch fgetspent_r.patch ldconfig @@ -104,8 +96,14 @@ package() { rm "$pkgdir"/usr/include/utmpx.h # utmps } +dev() { + provides="libc-dev=$pkgver-r$pkgrel" + default_dev +} + utils() { depends="!uclibc-utils scanelf" + provides="libc-utils=$pkgver-r$pkgrel" replaces="libiconv uclibc-utils" license="BSD-2-Clause AND GPL-2.0+" @@ -120,16 +118,10 @@ utils() { install -D -m755 "$srcdir"/ldconfig "$subpkgdir"/sbin } -sha512sums="d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d musl-1.1.20.tar.gz +sha512sums="fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363 musl-1.1.21.tar.gz 3162b778101a46d9fb3a38927e3c4969781ccdabb9bb72de10d48ea31691215ecba605faee945ed86144a7e31fc948c31c2fee2881dc07897be3e82b6c6ff1e6 amalgamation.patch -2c8e1dde1834238097b2ee8a7bfb53471a0d9cff4a5e38b55f048b567deff1cdd47c170d0578a67b1a039f95a6c5fbb8cff369c75b6a3e4d7ed171e8e86ebb8c 2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch 88ae443dbb8e0a4368235bdc3a1c5c7b718495afa75e06deb8e01becc76cb1f0d6964589e2204fc749c9c1b3190b8b9ac1ae2c0099cab8e2ce3ec877103d4332 3001-make-real-lastlog-h.patch 6a7ff16d95b5d1be77e0a0fbb245491817db192176496a57b22ab037637d97a185ea0b0d19da687da66c2a2f5578e4343d230f399d49fe377d8f008410974238 handle-aux-at_base.patch -b967339d9048161583523e847be91779adb0e16cc225d6ff85ef51748269b2dab08a0b8e558ad01469135837a9df76a59bf9a31791dd4063d75bc5efe6e94861 fix-file-locking-race.patch -a08d1b170356beea333ace1da12f8a8399ca80c5d9c32ff2fcd8562537a670214f566e4b1219a11b32129078e22fbf7009bb277b7de8550a89352a64b3b5090d dcngettext-null-deref.patch -e3953a3a73ef11696dd3eb216e18b152ae35198d8bff686d157e27bc90fb558f9a0be518025a90534e9afd6ea1bf731ffdb6fcb202bb9368f2c8eec7ca886141 getaddrinfo-regression.patch -aae9110eccb8cd7dcd3c957fcb01ed524598f79f7fa1a16b9993af40793545d1ec211e7e6aeabe7af7715d94cc26a473ea0acf6d6e66019bf65f03d4b8e24a4b ppc64-atomic.patch -654f76c96ed0e69e19b1a20569e83751bb207a8c181b26742f505638095dde3f4dd3f785deb92c49a603bd15cd8d4932129f567de8cd2edffdd8551c4dfd6976 dynamic-binary-stack-size.patch ded41235148930f8cf781538f7d63ecb0c65ea4e8ce792565f3649ee2523592a76b2a166785f0b145fc79f5852fd1fb1729a7a09110b3b8f85cba3912e790807 fgetspent_r.patch cce2f1eeb61e55674469c26871a573cce61d739c3defe9c8f56f2b774f6ba5435849ad542a6714120efddc98c297098e9c98a1a424ac593df2243d4aa479f9a9 ldconfig 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c diff --git a/system/musl/__stack_chk_fail_local.c b/system/musl/__stack_chk_fail_local.c deleted file mode 100644 index 2b403a6e0..000000000 --- a/system/musl/__stack_chk_fail_local.c +++ /dev/null @@ -1,2 +0,0 @@ -extern void __stack_chk_fail(void); -void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); } diff --git a/system/musl/dcngettext-null-deref.patch b/system/musl/dcngettext-null-deref.patch deleted file mode 100644 index bcc385e86..000000000 --- a/system/musl/dcngettext-null-deref.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 017e67ddde79fa2b6187a5e56b1e92bafc7c4cd2 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Fri, 14 Sep 2018 13:00:41 -0400 -Subject: drop lazy plural forms init in dcngettext - -there is no good reason to wait to find and process the plural rules -for a translated message file until a gettext form requesting plural -rule processing is used. it just imposes additional synchronization, -here in the form of clunky use of atomics. - -it looks like there may also have been a race condition where nplurals -could be seen without plural_rule being seen, possibly leading to null -pointer dereference. if so, this commit fixes it. ---- - src/locale/dcngettext.c | 35 +++++++++++++++++------------------ - 1 file changed, 17 insertions(+), 18 deletions(-) - -diff --git a/src/locale/dcngettext.c b/src/locale/dcngettext.c -index 7fbe7196..8b891d00 100644 ---- a/src/locale/dcngettext.c -+++ b/src/locale/dcngettext.c -@@ -100,8 +100,8 @@ struct msgcat { - struct msgcat *next; - const void *map; - size_t map_size; -- void *volatile plural_rule; -- volatile int nplurals; -+ const char *plural_rule; -+ int nplurals; - struct binding *binding; - const struct __locale_map *lm; - int cat; -@@ -200,20 +200,7 @@ notrans: - p->lm = lm; - p->map = map; - p->map_size = map_size; -- do { -- old_cats = cats; -- p->next = old_cats; -- } while (a_cas_p(&cats, old_cats, p) != old_cats); -- } -- -- const char *trans = __mo_lookup(p->map, p->map_size, msgid1); -- if (!trans) goto notrans; -- -- /* Non-plural-processing gettext forms pass a null pointer as -- * msgid2 to request that dcngettext suppress plural processing. */ -- if (!msgid2) return (char *)trans; - -- if (!p->plural_rule) { - const char *rule = "n!=1;"; - unsigned long np = 2; - const char *r = __mo_lookup(p->map, p->map_size, ""); -@@ -237,10 +224,22 @@ notrans: - rule = r+7; - } - } -- a_store(&p->nplurals, np); -- a_cas_p(&p->plural_rule, 0, (void *)rule); -+ p->nplurals = np; -+ p->plural_rule = rule; -+ -+ do { -+ old_cats = cats; -+ p->next = old_cats; -+ } while (a_cas_p(&cats, old_cats, p) != old_cats); - } -- if (p->nplurals) { -+ -+ const char *trans = __mo_lookup(p->map, p->map_size, msgid1); -+ if (!trans) goto notrans; -+ -+ /* Non-plural-processing gettext forms pass a null pointer as -+ * msgid2 to request that dcngettext suppress plural processing. */ -+ -+ if (msgid2 && p->nplurals) { - unsigned long plural = __pleval(p->plural_rule, n); - if (plural > p->nplurals) goto notrans; - while (plural--) { --- -cgit v1.2.1 - diff --git a/system/musl/dynamic-binary-stack-size.patch b/system/musl/dynamic-binary-stack-size.patch deleted file mode 100644 index e2e3f12d3..000000000 --- a/system/musl/dynamic-binary-stack-size.patch +++ /dev/null @@ -1,97 +0,0 @@ -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/musl/fix-file-locking-race.patch b/system/musl/fix-file-locking-race.patch deleted file mode 100644 index 2ef91390a..000000000 --- a/system/musl/fix-file-locking-race.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0db393d3a77bb9f300a356c6a5484fc2dddb161d Mon Sep 17 00:00:00 2001 -From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -Date: Tue, 18 Sep 2018 10:03:27 +0300 -Subject: fix race condition in file locking - -The condition occurs when -- thread #1 is holding the lock -- thread #2 is waiting for it on __futexwait -- thread #1 is about to release the lock and performs a_swap -- thread #3 enters the __lockfile function and manages to grab the lock - before thread #1 calls __wake, resetting the MAYBE_WAITERS flag -- thread #1 calls __wake -- thread #2 wakes up but goes again to __futexwait as the lock is - held by thread #3 -- thread #3 releases the lock but does not call __wake as the - MAYBE_WAITERS flag is not set - -This condition results in thread #2 not being woken up. This patch fixes -the problem by making the woken up thread ensure that the flag is -properly set before going to sleep again. - -Mainainer's note: This fixes a regression introduced in commit -c21f750727515602a9e84f2a190ee8a0a2aeb2a1. ---- - src/stdio/__lockfile.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c -index 2ff75d8a..0dcb2a42 100644 ---- a/src/stdio/__lockfile.c -+++ b/src/stdio/__lockfile.c -@@ -8,13 +8,13 @@ int __lockfile(FILE *f) - int owner = f->lock, tid = __pthread_self()->tid; - if ((owner & ~MAYBE_WAITERS) == tid) - return 0; -- for (;;) { -- owner = a_cas(&f->lock, 0, tid); -- if (!owner) return 1; -- if (a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) break; -+ owner = a_cas(&f->lock, 0, tid); -+ if (!owner) return 1; -+ while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) { -+ if ((owner & MAYBE_WAITERS) || -+ a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) -+ __futexwait(&f->lock, owner|MAYBE_WAITERS, 1); - } -- while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) -- __futexwait(&f->lock, owner, 1); - return 1; - } - --- -cgit v1.2.1 - diff --git a/system/musl/getaddrinfo-regression.patch b/system/musl/getaddrinfo-regression.patch deleted file mode 100644 index 28d4558b8..000000000 --- a/system/musl/getaddrinfo-regression.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f381c118b2d4f7d914481d3cdc830ce41369b002 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Wed, 19 Sep 2018 18:03:22 -0400 -Subject: fix getaddrinfo regression with AI_ADDRCONFIG on some configurations - -despite not being documented to do so in the standard or Linux -documentation, attempts to udp connect to 127.0.0.1 or ::1 generate -EADDRNOTAVAIL when the loopback device is not configured and there is -no default route for IPv6. this caused getaddrinfo with AI_ADDRCONFIG -to fail with EAI_SYSTEM and EADDRNOTAVAIL on some no-IPv6 -configurations, rather than the intended behavior of detecting IPv6 as -unsuppported and producing IPv4-only results. - -previously, only EAFNOSUPPORT was treated as unavailability of the -address family being probed. instead, treat all errors related to -inability to get an address or route as conclusive that the family -being probed is unsupported, and only fail with EAI_SYSTEM on other -errors. - -further improvements may be desirable, such as reporting EAI_AGAIN -instead of EAI_SYSTEM for errors which are expected to be transient, -but this patch should suffice to fix the serious regression. ---- - src/network/getaddrinfo.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c -index ba26847a..e33bfa28 100644 ---- a/src/network/getaddrinfo.c -+++ b/src/network/getaddrinfo.c -@@ -76,7 +76,16 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru - close(s); - if (!r) continue; - } -- if (errno != EAFNOSUPPORT) return EAI_SYSTEM; -+ switch (errno) { -+ case EADDRNOTAVAIL: -+ case EAFNOSUPPORT: -+ case EHOSTUNREACH: -+ case ENETDOWN: -+ case ENETUNREACH: -+ break; -+ default: -+ return EAI_SYSTEM; -+ } - if (family == tf[i]) return EAI_NONAME; - family = tf[1-i]; - } --- -cgit v1.2.1 - diff --git a/system/musl/ppc64-atomic.patch b/system/musl/ppc64-atomic.patch deleted file mode 100644 index 6e96a9048..000000000 --- a/system/musl/ppc64-atomic.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 12817793301398241b6cb00c740f0d3ca41076e9 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Fri, 14 Sep 2018 10:47:16 -0400 -Subject: fix broken atomic store on powerpc[64] - -in our memory model, all atomics are supposed to be full barriers; -stores are not release-only. this is important because store is used -as an unlock operation in places where it needs to acquire the waiter -count to determine if a futex wake is needed. at least in the -malloc-internal locks, but possibly elsewhere, soft deadlocks from -missing futex wake (breakable by poking the threads to restart the -syscall, e.g. by attaching a tracer) were reported to occur. - -once the malloc lock is replaced with Jens Gustedt's new lock -implementation (see commit 47d0bcd4762f223364e5b58d5a381aaa0cbd7c38), -malloc will not be affected by the issue, but it's not clear that -other uses won't be. reducing the strength of the ordering properties -required from a_store would require a thorough analysis of how it's -used. - -to fix the problem, I'm removing the powerpc[64]-specific a_store -definition; now, the top-level atomic.h will implement a_store using -a_barrier on both sides of the store. - -it's not clear to me yet whether there might be issues with the other -atomics. it's possible that a_post_llsc needs to be replaced with a -full barrier to guarantee the formal semanics we want, but either way -I think the difference is unlikely to impact the way we use them. ---- - arch/powerpc/atomic_arch.h | 8 -------- - arch/powerpc64/atomic_arch.h | 8 -------- - 2 files changed, 16 deletions(-) - -diff --git a/arch/powerpc/atomic_arch.h b/arch/powerpc/atomic_arch.h -index 5b65cde7..c2673919 100644 ---- a/arch/powerpc/atomic_arch.h -+++ b/arch/powerpc/atomic_arch.h -@@ -30,14 +30,6 @@ static inline void a_post_llsc() - __asm__ __volatile__ ("isync" : : : "memory"); - } - --#define a_store a_store --static inline void a_store(volatile int *p, int v) --{ -- a_pre_llsc(); -- *p = v; -- a_post_llsc(); --} -- - #define a_clz_32 a_clz_32 - static inline int a_clz_32(uint32_t x) - { -diff --git a/arch/powerpc64/atomic_arch.h b/arch/powerpc64/atomic_arch.h -index 17cababd..2bed82be 100644 ---- a/arch/powerpc64/atomic_arch.h -+++ b/arch/powerpc64/atomic_arch.h -@@ -48,14 +48,6 @@ static inline void a_post_llsc() - __asm__ __volatile__ ("isync" : : : "memory"); - } - --#define a_store a_store --static inline void a_store(volatile int *p, int v) --{ -- a_pre_llsc(); -- *p = v; -- a_post_llsc(); --} -- - #define a_crash a_crash - static inline void a_crash() - { --- -cgit v1.2.1 - diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD index 4394eb5c2..015e59192 100644 --- a/system/openssh/APKBUILD +++ b/system/openssh/APKBUILD @@ -4,7 +4,7 @@ pkgname=openssh pkgver=7.9_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=0 +pkgrel=1 pkgdesc="Port of OpenBSD's free SSH release" url="http://www.openssh.org/portable.html" arch="all" @@ -20,8 +20,8 @@ subpackages="$pkgname-doc $pkgname-client $pkgname-keysign $pkgname-sftp-server:sftp - $pkgname-server-common:server_common:noarch $pkgname-server + $pkgname-openrc " source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz @@ -131,26 +131,21 @@ sftp() { "$subpkgdir"/usr/lib/ssh/ } -server_common() { - pkgdesc="OpenSSH server configuration files" - depends="" - for i in etc/ssh/sshd_config \ - etc/init.d/sshd \ - etc/conf.d/sshd; do - - install -d "$subpkgdir"/${i%/*} - mv "$pkgdir"/$i \ - "$subpkgdir"/${i%/*}/ - - done -} - server() { pkgdesc="OpenSSH server" - depends="openssh-keygen openssh-server-common" + depends="openssh-keygen" + replaces="openssh-server-common" cd "$builddir" install -d "$subpkgdir"/usr/sbin + install -d "$subpkgdir"/etc/ssh mv "$pkgdir"/usr/sbin/sshd "$subpkgdir"/usr/sbin/ + mv "$pkgdir"/etc/ssh/sshd_config "$subpkgdir"/etc/ssh/ +} + +openrc() { + default_openrc + depends="openssh-server" + install_if="openssh-server=$pkgver-r$pkgrel openrc" } sha512sums="0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e openssh-7.9p1.tar.gz diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD index 87ba80226..1ed293793 100644 --- a/system/ruby/APKBUILD +++ b/system/ruby/APKBUILD @@ -28,13 +28,13 @@ pkgname=ruby pkgver=2.5.3 _abiver="${pkgver%.*}.0" -pkgrel=0 +pkgrel=1 pkgdesc="An object-oriented language for quick and easy programming" url="http://www.ruby-lang.org/" arch="all" license="Ruby AND BSD-2-Clause" depends="ca-certificates" -depends_dev="gmp-dev" +depends_dev="ruby=$pkgver-r$pkgrel gmp-dev" makedepends="$depends_dev zlib-dev openssl-dev db-dev libedit-dev libffi-dev coreutils yaml-dev linux-headers autoconf" install="$pkgname.post-upgrade" diff --git a/user/audacious-plugins/APKBUILD b/user/audacious-plugins/APKBUILD index 8a4742252..61d848646 100644 --- a/user/audacious-plugins/APKBUILD +++ b/user/audacious-plugins/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=audacious-plugins pkgver=3.10 -pkgrel=0 +pkgrel=1 pkgdesc="Playlist-oriented media player (plugins)" url="https://audacious-media-player.org/" arch="all" @@ -12,13 +12,12 @@ license="ISC" depends="audacious" install_if="audacious=$pkgver" makedepends="audacious-dev>=${pkgver%.*} - dbus-glib-dev libguess-dev libmowgli-dev libxml2-dev - ffmpeg-dev libcddb-dev libcdio-dev libcdio-paranoia-dev mpg123-dev - libcue-dev libmms-dev libsamplerate-dev libsndfile-dev libxcomposite-dev - libnotify-dev libogg-dev libvorbis-dev pulseaudio-dev - alsa-lib-dev curl-dev flac-dev lame-dev neon-dev sdl-dev wavpack-dev - faad2-dev fluidsynth-dev qt5-qtmultimedia-dev - automake autoconf" + alsa-lib-dev curl-dev dbus-glib-dev faad2-dev ffmpeg-dev flac-dev + fluidsynth-dev lame-dev libcddb-dev libcdio-dev libcdio-paranoia-dev + libcue-dev libguess-dev libmodplug-dev libmms-dev libmowgli-dev + libnotify-dev libogg-dev libsamplerate-dev libsndfile-dev libvorbis-dev + libxcomposite-dev libxml2-dev mpg123-dev neon-dev pulseaudio-dev + qt5-qtmultimedia-dev sdl-dev wavpack-dev" subpackages="$pkgname-lang" source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2" diff --git a/user/cdrtools/APKBUILD b/user/cdrtools/APKBUILD index c9e6c1d70..0145aa351 100644 --- a/user/cdrtools/APKBUILD +++ b/user/cdrtools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cdrtools pkgver=3.01 -pkgrel=0 +pkgrel=1 pkgdesc="Highly portable CD/DVD/Blu-Ray command line recording software" url="http://cdrecord.sourceforge.net/private/cdrecord.html" arch="all" @@ -26,6 +26,9 @@ check() { package() { cd "$builddir" smake INS_BASE=/usr DESTDIR="$pkgdir" install + + mv "$pkgdir"/usr/share/man/man3 "$pkgdir"/usr/share/man/man3sch + rename .3 .3sch "$pkgdir"/usr/share/man/man3sch/*.3 } sha512sums="54f06496e47184e324fc9d8b1153d3c806ed43c3c57e2a8d79a79afe12aa5334e82fa500fe1b1bf49307ad7dfabe687f6e1ad914fc2f0c5c429d8e6a34c293eb cdrtools-3.01.tar.bz2" diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index 8d576a7ed..6d6c0627b 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpeg pkgver=4.1 -pkgrel=0 +pkgrel=1 pkgdesc="Record, convert, and stream audio and video" url="https://ffmpeg.org/" arch="all" @@ -12,11 +12,12 @@ license="GPL-2.0-only" options="!check textrels" # Test suite requires proper licensing headers on all files, # which upstream does not provide. subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" -makedepends="gnutls-dev lame-dev libvorbis-dev xvidcore-dev zlib-dev libvdpau-dev - imlib2-dev libtheora-dev coreutils bzip2-dev perl-dev x264-dev - pulseaudio-dev sdl2-dev libxfixes-dev libva-dev alsa-lib-dev rtmpdump-dev - v4l-utils-dev yasm opus-dev x265-dev xz-dev freetype-dev speex-dev - ladspa-dev libcdio-dev libcdio-paranoia-dev wavpack-dev libwebp-dev" +makedepends="alsa-lib-dev bzip2-dev freetype-dev gnutls-dev imlib2-dev + ladspa-dev lame-dev libcdio-dev libcdio-paranoia-dev libmodplug-dev + libtheora-dev libva-dev libvdpau-dev libvorbis-dev libwebp-dev + libxfixes-dev opus-dev perl-dev pulseaudio-dev rtmpdump-dev sdl2-dev + speex-dev v4l-utils-dev wavpack-dev x264-dev x265-dev xvidcore-dev + xz-dev yasm zlib-dev" source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch " @@ -54,6 +55,7 @@ build() { --enable-gnutls \ --enable-gpl \ --enable-libmp3lame \ + --enable-libmodplug \ --enable-librtmp \ --enable-libvorbis \ --disable-libvpx \ diff --git a/user/fontforge/APKBUILD b/user/fontforge/APKBUILD index 16a69b3b6..949fb702c 100644 --- a/user/fontforge/APKBUILD +++ b/user/fontforge/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fontforge pkgver=2.0.20170731 -pkgrel=0 +pkgrel=1 pkgdesc="Open source font editor" url="https://fontforge.github.io/en-US/" arch="all" @@ -12,7 +12,9 @@ makedepends="freetype-dev giflib-dev glib-dev libjpeg-turbo-dev libuninameslist-dev libpng-dev libx11-dev libxml2-dev pango-dev python3-dev tiff-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://github.com/fontforge/fontforge/releases/download/${pkgver/2.0./}/fontforge-dist-${pkgver/2.0./}.tar.xz" +source="https://github.com/fontforge/fontforge/releases/download/${pkgver/2.0./}/fontforge-dist-${pkgver/2.0./}.tar.xz + python3.patch + " build() { cd "$builddir" @@ -37,4 +39,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 fontforge-dist-20170731.tar.xz" +sha512sums="26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 fontforge-dist-20170731.tar.xz +0ca2f3d10a54e4ccb0737ba8e4e768a75e536f70f8892bfe8c23daa5d542d58a1dd4991a982748dcb2c24ed5ae4cb336278a1c01eb434a0463b8b36133b0bb33 python3.patch" diff --git a/user/fontforge/python3.patch b/user/fontforge/python3.patch new file mode 100644 index 000000000..25bae415e --- /dev/null +++ b/user/fontforge/python3.patch @@ -0,0 +1,197 @@ +From b6089f11bd7534c9aa38b875ef1e830fc3b898b4 Mon Sep 17 00:00:00 2001 +From: Jeremy Tan <jtanx@outlook.com> +Date: Wed, 13 Sep 2017 17:22:18 +0800 +Subject: [PATCH] python: Use PyMem_Free wherever PyArg_ParseTuple+es is used + +https://docs.python.org/2.0/ext/parseTuple.html +--- + fontforge/python.c | 62 +++++++++++++++++++++++++++------------------- + 1 file changed, 38 insertions(+), 27 deletions(-) + +diff --git a/fontforge/python.c b/fontforge/python.c +index 5d6820c40..c6d7aca2b 100644 +--- a/fontforge/python.c ++++ b/fontforge/python.c +@@ -607,7 +607,13 @@ return( NULL ); + } + } + +- if ( !SetPrefs((char *) prefname,&val,NULL)) { ++ bool succeeded = SetPrefs((char *) prefname,&val,NULL); ++ if (val.type == v_str && val.u.sval) { ++ PyMem_Free(val.u.sval); ++ val.u.sval = NULL; ++ } ++ ++ if (!succeeded) { + PyErr_Format(PyExc_NameError, "Unknown preference item in SetPrefs: %s", prefname ); + return( NULL ); + } +@@ -728,7 +734,7 @@ static PyObject *PyFF_UnicodeFromName(PyObject *UNUSED(self), PyObject *args) { + return( NULL ); + + ret = Py_BuildValue("i", UniFromName((char *) name, ui_none,&custom)); +- free(name); ++ PyMem_Free(name); + return( ret ); + } + +@@ -1361,12 +1367,14 @@ Py_RETURN_NONE; /* Well, that was pointless */ + if ( import==Py_None ) + import=NULL; + else if ( !PyCallable_Check(import) ) { ++ PyMem_Free(name); + PyErr_Format(PyExc_TypeError, "First argument is not callable" ); + return( NULL ); + } + if ( export==Py_None ) + export=NULL; + else if ( !PyCallable_Check(export) ) { ++ PyMem_Free(name); + PyErr_Format(PyExc_TypeError, "Second argument is not callable" ); + return( NULL ); + } +@@ -1472,7 +1480,7 @@ static PyObject *PyFF_logError(PyObject *UNUSED(self), PyObject *args) { + if ( !PyArg_ParseTuple(args,"es","UTF-8", &msg) ) + return( NULL ); + LogError(msg); +- free(msg); ++ PyMem_Free(msg); + Py_RETURN_NONE; + } + +@@ -1486,6 +1494,8 @@ static PyObject *PyFF_postError(PyObject *UNUSED(self), PyObject *args) { + return( NULL ); + if( showPythonErrors ) + ff_post_error(title,msg); /* Prints to stderr if no ui */ ++ PyMem_Free(title); ++ PyMem_Free(msg); + Py_RETURN_NONE; + } + +@@ -1494,6 +1504,8 @@ static PyObject *PyFF_postNotice(PyObject *UNUSED(self), PyObject *args) { + if ( !PyArg_ParseTuple(args,"eses","UTF-8", &title, "UTF-8", &msg) ) + return( NULL ); + ff_post_notice(title,msg); /* Prints to stderr if no ui */ ++ PyMem_Free(title); ++ PyMem_Free(msg); + Py_RETURN_NONE; + } + +@@ -1511,8 +1523,8 @@ return( NULL ); + return( NULL ); + + ret = ff_open_filename(title,def,filter); +- free(title); +- free(def); ++ PyMem_Free(title); ++ PyMem_Free(def); + if ( ret==NULL ) + Py_RETURN_NONE; + reto = DECODE_UTF8(ret,strlen(ret),NULL); +@@ -1534,8 +1546,8 @@ return( NULL ); + return( NULL ); + + ret = ff_save_filename(title,def,filter); +- free(title); +- free(def); ++ PyMem_Free(title); ++ PyMem_Free(def); + if ( ret==NULL ) + Py_RETURN_NONE; + reto = DECODE_UTF8(ret,strlen(ret),NULL); +@@ -1558,8 +1570,8 @@ return( NULL ); + return( NULL ); + if ( !PySequence_Check(answero) || STRING_CHECK(answero)) { + PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument"); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + return( NULL ); + } + cnt = PySequence_Size(answero); +@@ -1568,16 +1580,16 @@ return( NULL ); + cancel = cnt-1; + if ( cancel<0 || cancel>=cnt || def<0 || def>=cnt ) { + PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th or 5th argument"); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + free(answers); + return( NULL ); + } + for ( i=0; i<cnt; ++i ) { + PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i)); + if ( utf8_name==NULL ) { +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + FreeStringArray( i, answers ); + return( NULL ); + } +@@ -1587,8 +1599,8 @@ return( NULL ); + answers[cnt] = NULL; + + ret = ff_ask(title,(const char **) answers,def,cancel,quest); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + FreeStringArray( cnt, answers ); + return( Py_BuildValue("i",ret)); + } +@@ -1608,23 +1620,23 @@ return( NULL ); + return( NULL ); + if ( !PySequence_Check(answero) || STRING_CHECK(answero)) { + PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument"); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + return( NULL ); + } + cnt = PySequence_Size(answero); + answers = calloc(cnt+1, sizeof(char *)); + if ( def<0 || def>=cnt ) { + PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th argument"); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + return( NULL ); + } + for ( i=0; i<cnt; ++i ) { + PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i)); + if ( utf8_name==NULL ) { +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + FreeStringArray( i, answers ); + return( NULL ); + } +@@ -1634,8 +1646,8 @@ return( NULL ); + answers[cnt] = NULL; + + ret = ff_choose(title,(const char **) answers,cnt,def,quest); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + FreeStringArray( cnt, answers ); + return( Py_BuildValue("i",ret)); + } +@@ -1654,8 +1666,8 @@ return( NULL ); + return( NULL ); + + ret = ff_ask_string(title,def,quest); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + free(def); + if ( ret==NULL ) + Py_RETURN_NONE; diff --git a/user/free42/APKBUILD b/user/free42/APKBUILD index 126880926..ba8814388 100644 --- a/user/free42/APKBUILD +++ b/user/free42/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=free42 pkgver=2.0.22 -pkgrel=0 +pkgrel=1 pkgdesc="Scientific programmable calculator" url="http://thomasokken.com/free42/" arch="all" @@ -11,7 +11,7 @@ license="GPL-2.0-only AND Public-Domain" depends="" makedepends="alsa-lib-dev gtk+2.0-dev libx11-dev libxmu-dev" subpackages="" -source="http://thomasokken.com/free42/upstream/free42-nologo-$pkgver.tgz +source="https://distfiles.adelielinux.org/source/free42-nologo-$pkgver.tgz free42.desktop libx11.patch patch.patch @@ -23,7 +23,7 @@ build() { local SAVE_CFLAGS SAVE_CFLAGS=$CFLAGS unset CFLAGS - ./build-intel-lib.sh + CC="gcc -D_WCHAR_T" ./build-intel-lib.sh CFLAGS=$SAVE_CFLAGS make BCD_MATH=1 AUDIO_ALSA=1 } @@ -36,6 +36,6 @@ package() { } sha512sums="865e8cce86a882aba10e7e756308e195a6675f0b6db4b881e7b7df67de95f5169ca801005e25dd0e61a70a5a0cd6a374b0cf58003251cdc9dc526a2506e18e1d free42-nologo-2.0.22.tgz -3d0dee5b574e171692e341c09d2204a048888e5e34cc479ee4f23f4ac137134db7e9d94779765e0426642e3a3069f9b3d962b72ebcea495c1e0b20d32405640b free42.desktop +f52700d234719f4ee7cdd369fc5f28ade190ff77ed1a824cd2cdaeef62419700de3d85a28fd6ae378f904e018813dc4145ca4cc9f2669fdf50f3e13baa7ec634 free42.desktop f8434fd1c20f0dd40de5773615eaf798329870231f7ce66785a1bc8e208fa0a64919f48ac3eea5ab9ceb818570ae93f61b0e81baec4261bbdfbf04237108ab6a libx11.patch -b529bc68cbc84e3e698a16afe4b7a5ad52119125749d75d3392cc9281a3dfae7cba0a9637ac88fc96d6da89564225265b785a33b841708f14d6bf4b8c4be6f5d patch.patch" +7b48609bff5466d81f42ed65405cd09e98fa675c087837b22caebab2b97420a34d1156399c3b18608bcae42896c12aa63a6f87515f5677587dfff6ed135dc760 patch.patch" diff --git a/user/free42/free42.desktop b/user/free42/free42.desktop index 704fbe80c..568afc69b 100644 --- a/user/free42/free42.desktop +++ b/user/free42/free42.desktop @@ -6,4 +6,4 @@ GenericName=Scientific Calculator Comment=HP-42S Calculator Simulator Icon=accessories-calculator Exec=/usr/bin/free42dec -Category=Utility;Calculator;Science;Math; +Categories=Utility;Calculator;Science;Math; diff --git a/user/free42/patch.patch b/user/free42/patch.patch index 03e73a5f3..e84b3f7b8 100644 --- a/user/free42/patch.patch +++ b/user/free42/patch.patch @@ -63,3 +63,20 @@ + else + __TMP := $(strip $(subst /, ,$(firstword $(CC)))) + CC_NAME := $(word $(words $(__TMP)), $(__TMP)) +--- gtk/intel-lib-linux.patch.old 2019-01-23 03:43:48.830000000 +0000 ++++ gtk/intel-lib-linux.patch 2019-01-23 03:46:18.170000000 +0000 +@@ -1727,3 +1727,14 @@ + else + __TMP := $(strip $(subst /, ,$(firstword $(CC)))) + CC_NAME := $(word $(words $(__TMP)), $(__TMP)) ++--- LIBRARY/src/bid_functions.h.old 2011-07-12 05:30:53.000000000 +0000 +++++ LIBRARY/src/bid_functions.h 2019-01-23 03:45:35.660000000 +0000 ++@@ -42,7 +42,7 @@ ++ #include <ctype.h>
++
++ // Fix system header issue on Sun solaris and define required type by ourselves
++-#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__)
+++#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) && !defined(WCHAR_MAX)
++ typedef int wchar_t;
++ #endif
++
diff --git a/user/gnu-ghostscript/APKBUILD b/user/gnu-ghostscript/APKBUILD index 88a1ea38b..14ce2c5f6 100644 --- a/user/gnu-ghostscript/APKBUILD +++ b/user/gnu-ghostscript/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnu-ghostscript pkgver=9.14.1 -pkgrel=1 +pkgrel=2 pkgdesc="PostScript utilities" url="https://www.gnu.org/software/ghostscript/" arch="all" @@ -44,4 +44,4 @@ package() { } sha512sums="658f6ae14b29965c7959b9bd1463760d7fb03b35251446fc37101dbe7ee2866c74a0803e22b2f4488be3221d026578be1d6be7b562ff240036134fbf83edabf9 gnu-ghostscript-9.14.1.tar.xz -2c1d3a487ff7ee65855d3c587747bd8bf0f5a61ef30f4c84e6df237d6680a88ba72f328c7294eee0058eb69f770f3e539f29cb2ea4c55bcac98f22c5bd203020 do-not-use-sprintf.patch" +1c4d79633ecece9f4de7a672f2888939be7d1e0ba24f3a66500fdfbb37e081e0f323a5efa0d1547fed51206e5a95d3b0659c0ea845d0bc333f281dfb88fcc040 do-not-use-sprintf.patch" diff --git a/user/gnu-ghostscript/do-not-use-sprintf.patch b/user/gnu-ghostscript/do-not-use-sprintf.patch index 7bf03cd89..e0e84b4fe 100644 --- a/user/gnu-ghostscript/do-not-use-sprintf.patch +++ b/user/gnu-ghostscript/do-not-use-sprintf.patch @@ -18,3 +18,68 @@ wl(linebuf); } mergefile(os_prefix, inname, in, config, false); +--- gnu-ghostscript-9.14.1/cups/gdevcups.c.old 2014-07-02 15:13:25.000000000 +0000 ++++ gnu-ghostscript-9.14.1/cups/gdevcups.c 2019-01-23 20:56:04.082290416 +0000 +@@ -1039,7 +1039,7 @@ + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsInteger%d", i); ++ snprintf(name, sizeof(name), "cupsInteger%d", i); + if ((code = param_write_int(plist, strdup(name), + (int *)(cups->header.cupsInteger + i))) < 0) + return (code); +@@ -1047,7 +1047,7 @@ + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsReal%d", i); ++ snprintf(name, sizeof(name), "cupsReal%d", i); + if ((code = param_write_float(plist, strdup(name), + cups->header.cupsReal + i)) < 0) + return (code); +@@ -1055,7 +1055,7 @@ + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsString%d", i); ++ snprintf(name, sizeof(name), "cupsString%d", i); + param_string_from_string(s, cups->header.cupsString[i]); + if ((code = param_write_string(plist, strdup(name), &s)) < 0) + return (code); +@@ -3166,19 +3166,19 @@ + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsInteger%d", i); ++ snprintf(name, sizeof(name), "cupsInteger%d", i); + intoption(cupsInteger[i],strdup(name), unsigned) + } + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsReal%d", i); ++ snprintf(name, sizeof(name), "cupsReal%d", i); + floatoption(cupsReal[i], strdup(name)) + } + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsString%d", i); ++ snprintf(name, sizeof(name), "cupsString%d", i); + stringoption(cupsString[i], strdup(name)) + } + +@@ -4247,10 +4247,10 @@ + */ + + if (pdev->HWResolution[0] != pdev->HWResolution[1]) +- sprintf(resolution, "%.0fx%.0fdpi", pdev->HWResolution[0], ++ snprintf(resolution, sizeof(resolution), "%.0fx%.0fdpi", pdev->HWResolution[0], + pdev->HWResolution[1]); + else +- sprintf(resolution, "%.0fdpi", pdev->HWResolution[0]); ++ snprintf(resolution, sizeof(resolution), "%.0fdpi", pdev->HWResolution[0]); + + for (i = 0, profile = cups->PPD->profiles; + i < cups->PPD->num_profiles; diff --git a/user/gnumeric/APKBUILD b/user/gnumeric/APKBUILD index 815de92d2..07c02e4ef 100644 --- a/user/gnumeric/APKBUILD +++ b/user/gnumeric/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnumeric pkgver=1.12.44 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME spreadsheet software" url="http://www.gnumeric.org/" arch="all" @@ -13,7 +13,7 @@ license="GPL-2.0-only OR GPL-3.0-only" depends="" makedepends="byacc gobject-introspection-dev goffice-dev gtk+3.0-dev intltool itstool libgda-dev libxml2-utils perl-dev zlib-dev" -subpackages="$pkgname-doc $pkgname-lang" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" langdir="/usr/lib/locale" source="https://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.12/gnumeric-$pkgver.tar.xz cs.patch diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD index dd1215897..555fec878 100644 --- a/user/gst-plugins-base/APKBUILD +++ b/user/gst-plugins-base/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-base pkgver=1.14.4 -pkgrel=0 +pkgrel=1 pkgdesc="GStreamer multimedia framework - Base plugins" url="https://gstreamer.freedesktop.org/" arch="all" @@ -9,26 +9,10 @@ license="GPL LGPL" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends="" replaces="gst-plugins-base1" -makedepends=" - alsa-lib-dev - cdparanoia-dev - expat-dev - glib-dev - gobject-introspection-dev - gstreamer-dev - libice-dev - libogg-dev - libsm-dev - libtheora-dev - libvorbis-dev - libx11-dev - libxt-dev - libxv-dev - opus-dev - orc-dev - pango-dev - perl - " +makedepends="alsa-lib-dev cdparanoia-dev expat-dev glib-dev + gobject-introspection-dev gstreamer-dev libice-dev libogg-dev libsm-dev + libtheora-dev libvorbis-dev libx11-dev libxt-dev libxv-dev mesa-dev + opus-dev orc-dev pango-dev perl" checkdepends="orc-compiler" source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz" ldpath="/usr/lib/gstreamer-1.0" diff --git a/user/hermit/APKBUILD b/user/hermit/APKBUILD new file mode 100644 index 000000000..e2b1002d4 --- /dev/null +++ b/user/hermit/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Luis Ressel <aranea@aixah.de> +pkgname=hermit +pkgver=2.0 +pkgrel=0 +pkgdesc="A monospace font designed to be clear, pragmatic and very readable" +url="https://pcaro.es/p/hermit/" +arch="noarch" +options="!check" # No testing fonts +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://pcaro.es/d/otf-$pkgname-$pkgver.tar.gz" +builddir="$srcdir" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf +} + +sha512sums="ee41f8cbcdedfff568cd47ab7730c462ddd67d6170c05d35eaf64a7f954a4bb72d6ac99a383749f7032d9cf7b407b7a5ef3270b4209692c1572beb9744a21d42 otf-hermit-2.0.tar.gz" diff --git a/user/kde/APKBUILD b/user/kde/APKBUILD index 1538ef0f5..dbb054a1e 100644 --- a/user/kde/APKBUILD +++ b/user/kde/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde pkgver=5 -pkgrel=0 +pkgrel=1 pkgdesc="The K Desktop Environment" url="https://www.kde.org/" arch="noarch" @@ -9,7 +9,10 @@ license="NCSA" options="!check" # Metapacakge subpackages="" depends="adelie-kde-theme kde-education kde-games kde-graphics kde-multimedia - kde-system kde-utilities plasma-desktop" + kde-system kde-utilities plasma-desktop + + kgamma5 khotkeys kmenuedit ksshaskpass plasma-workspace-wallpapers + user-manager" source="" package() { diff --git a/user/libcanberra/APKBUILD b/user/libcanberra/APKBUILD index 9d2431be0..bd41ad019 100644 --- a/user/libcanberra/APKBUILD +++ b/user/libcanberra/APKBUILD @@ -2,16 +2,15 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=libcanberra pkgver=0.30 -pkgrel=3 +pkgrel=4 pkgdesc="Event sound library for free desktops" url="http://0pointer.de/lennart/projects/libcanberra/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" -depends="" -depends_dev="alsa-lib-dev gstreamer-dev gtk+2.0-dev gtk+3.0-dev libogg-dev - libtool libvorbis-dev pulseaudio-dev" -makedepends="$depends_dev lynx" +depends="sound-theme-freedesktop" +makedepends="alsa-lib-dev gstreamer-dev gtk+2.0-dev gtk+3.0-dev libogg-dev + libtool libvorbis-dev lynx pulseaudio-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-gtk2 $pkgname-gtk3 $pkgname-gstreamer $pkgname-pulse" source="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.xz" @@ -42,6 +41,7 @@ package() { gtk2() { pkgdesc="Gtk+ 2.x Bindings for libcanberra" + install_if="$pkgname=$pkgver-r$pkgrel gtk+2.0" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libcanberra-gtk.so.* \ "$subpkgdir"/usr/lib/ @@ -51,6 +51,7 @@ gtk2() { gtk3() { pkgdesc="Gtk+ 3.x Bindings for libcanberra" + install_if="$pkgname=$pkgver-r$pkgrel gtk+3.0" mkdir -p "$subpkgdir"/usr/lib/gnome-settings-daemon-3.0/gtk-modules \ "$subpkgdir"/usr/bin \ "$subpkgdir"/usr/share/gnome/autostart \ diff --git a/user/libcdio/APKBUILD b/user/libcdio/APKBUILD index c1e7bc351..031f11fae 100644 --- a/user/libcdio/APKBUILD +++ b/user/libcdio/APKBUILD @@ -1,14 +1,14 @@ -# Contributor: Carlo Landmeter # Maintainer: pkgname=libcdio pkgver=2.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="GNU Compact Disc Input and Control Library" url="https://www.gnu.org/software/libcdio/" arch="all" license="GPL-3.0+" depends="" -makedepends="libcddb-dev ncurses-dev linux-headers" +depends_dev="ncurses-dev" +makedepends="$depends_dev libcddb-dev linux-headers" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools ${pkgname}++:_cpp" source="https://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2 disable-broken-test.patch" diff --git a/user/libmodplug/APKBUILD b/user/libmodplug/APKBUILD new file mode 100644 index 000000000..23046bebe --- /dev/null +++ b/user/libmodplug/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libmodplug +pkgver=0.8.8.5 +pkgrel=0 +pkgdesc="Library for MOD music files" +url="http://modplug-xmms.sourceforge.net/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="" +subpackages="$pkgname-dev" +source="https://downloads.sourceforge.net/modplug-xmms/libmodplug-$pkgver.tar.gz" + +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="aa943b8df5e3fd41b497e55f5d2c493c28a4c90d444d041f74a58ab5f4702eab9bb36f337e4c795561e0006846a5fda0b42bcf96b33e1267b190f6005862b332 libmodplug-0.8.8.5.tar.gz" diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index 418e9e361..c36074f8a 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mesa -pkgver=18.1.8 +pkgver=18.3.2 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="https://www.mesa3d.org" @@ -15,26 +15,21 @@ subpackages="$pkgname-dev $pkgname-dri-virtio:_dri $pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles $pkgname-xatracker $pkgname-osmesa $pkgname-gbm - $pkgname-libwayland-egl:_wayland " _llvmver=6 -depends_dev="libdrm-dev dri2proto libxext-dev libxdamage-dev libxcb-dev glproto - dri3proto presentproto libxshmfence-dev" -makedepends="$depends_dev expat-dev xextproto libxt-dev makedepend py3-mako - flex bison llvm$_llvmver-dev eudev-dev libvdpau-dev python3 py-libxml2 - libxvmc-dev libxfixes-dev wayland-dev libelf-dev wayland-protocols - autoconf automake libtool libxxf86vm-dev libx11-dev zlib-dev" +depends_dev="libdrm-dev libxcb-dev libxdamage-dev libxext-dev libxshmfence-dev + xorgproto-dev" +makedepends="$depends_dev byacc eudev-dev expat-dev flex libelf-dev + libvdpau-dev libx11-dev libxfixes-dev libxrandr-dev libxt-dev + libxvmc-dev libxxf86vm-dev llvm$_llvmver-dev makedepend python3 + py3-libxml2 py3-mako zlib-dev" source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz - glx_ro_text_segm.patch musl-fixes.patch musl-fix-includes.patch amdgpu-pthread-header.patch disk_cache-stack-overflow.patch drmdeps.patch - python3-compat.patch - intel.patch " -replaces="mesa-dricore" _dri_driverdir=/usr/lib/xorg/modules/dri _dri_drivers="r200,radeon,nouveau,swrast" @@ -73,22 +68,20 @@ build() { cd "$builddir" export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700" - PYTHON2=python3 ./configure \ + PYTHON=python3 ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=$_dri_driverdir \ --disable-asm \ - --disable-xvmc \ - --enable-glx-rts \ --with-gallium-drivers=${_gallium_drivers} \ --with-dri-drivers=${_dri_drivers} \ --with-vulkan-drivers=${_vulkan_drivers} \ --with-llvm-prefix=/usr/lib/llvm$_llvmver \ --enable-llvm-shared-libs \ --enable-llvm \ - --with-platforms=x11,drm,wayland \ + --with-platforms=x11,drm \ --enable-shared-glapi \ --enable-gbm \ --disable-glx-tls \ @@ -100,7 +93,6 @@ build() { --enable-gles1 \ --enable-gles2 \ --enable-egl \ - --enable-texture-float \ --enable-xa \ --enable-vdpau \ $_arch_opts @@ -238,19 +230,9 @@ _dri() { esac } -_wayland() { - pkgdesc="Mesa libwayland-egl library" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libwayland-egl.so.* "$subpkgdir"/usr/lib/ \ - || return 1 -} - -sha512sums="ab89c6d27b765d3efdf61b24dc56d863ae590d83003d2eae4bfe25ecfbeda5bee0227f21d057523bb4eceeaf3d9955df48087ffb472c41b123c100e593056cb9 mesa-18.1.8.tar.xz -c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch +sha512sums="34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6db9ca8b81283866da415e34346a4c39fc37bebe2a0929be14480faf4db45 mesa-18.3.2.tar.xz 9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch 245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch f40ff04ac73c090c74d1955de6013c5aa41fb77f28b2b82d89cfc1880306a9ca1dde4581592db19f0a0ec6d85032f1ed5d953103ab0d075f9f0b7e459a028c45 disk_cache-stack-overflow.patch -6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430 drmdeps.patch -61ddf4f33f11b4fbaa334bec04d184236f01bc8cad4340cb74b66c92fc8c0c985d36507cf43b504d186dc108fc2e5ae348ed28ea8a680ba4dfdb74994fc440f7 python3-compat.patch -baa0039c65b760ac60d55a112cc3fe9c59759e6f6e31c9c0dc46cfc1dcca91726706d6fb3328e11c043ba1f84f01dd56d0208ee153b05174fde74252d3d7d95c intel.patch" +6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430 drmdeps.patch" diff --git a/user/mesa/glx_ro_text_segm.patch b/user/mesa/glx_ro_text_segm.patch deleted file mode 100644 index 8cad4876b..000000000 --- a/user/mesa/glx_ro_text_segm.patch +++ /dev/null @@ -1,28 +0,0 @@ -2011-02-09 Jeremy Huddleston <jeremyhu@freedesktop.org - - #240956 - * configure.ac add support to enable readonly test segment on x86 - ---- ./configure.ac.orig 2008-11-17 23:19:38.000000000 +0100 -+++ ./configure.ac 2008-11-17 23:20:17.000000000 +0100 -@@ -499,6 +499,20 @@ - enable_xcb=no - fi - -+ -+dnl readonly text segment on x86 hardened platforms -+AC_ARG_ENABLE([glx_rts], -+ [AS_HELP_STRING([--enable-glx-rts], -+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])], -+ [enable_glx_rts="$enableval"], -+ [enable_glx_rts=no]) -+if test "x$enable_glx_rts" = xyes; then -+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" -+else -+ enable_glx_rts=no -+fi -+ -+ - dnl - dnl libGL configuration per driver - dnl diff --git a/user/mesa/intel.patch b/user/mesa/intel.patch deleted file mode 100644 index 10871fc7c..000000000 --- a/user/mesa/intel.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- mesa-18.1.3/src/mesa/drivers/dri/i965/brw_bufmgr.h 2018-06-29 13:47:29.000000000 -0400 -+++ mesa-18.1.3/src/mesa/drivers/dri/i965/brw_bufmgr.h 2018-07-24 03:18:37.479847335 -0400 -@@ -37,6 +37,7 @@ - #include <stdbool.h> - #include <stdint.h> - #include <stdio.h> -+#include <time.h> - #include "util/u_atomic.h" - #include "util/list.h" - ---- mesa-18.1.3/src/intel/vulkan/anv_entrypoints_gen.py 2018-07-24 03:15:05.009848837 -0400 -+++ mesa-18.1.3/src/intel/vulkan/anv_entrypoints_gen.py 2018-07-24 03:12:21.739849990 -0400 -@@ -91,7 +91,7 @@ - % endfor - """, output_encoding='utf-8') - --TEMPLATE_C = Template(u"""\ -+TEMPLATE_C = Template("""\ - /* - * Copyright © 2015 Intel Corporation - * -@@ -145,7 +145,7 @@ - /* Hash table stats: - * size ${len(strmap.sorted_strings)} entries - * collisions entries: --% for i in xrange(10): -+% for i in range(10): - * ${i}${'+' if i == 9 else ' '} ${strmap.collisions[i]} - % endfor - */ -@@ -388,7 +388,7 @@ - - def bake(self): - self.sorted_strings = \ -- sorted(self.strings.values(), key=lambda x: x.string) -+ sorted(list(self.strings.values()), key=lambda x: x.string) - offset = 0 - for entry in self.sorted_strings: - entry.offset = offset -@@ -507,7 +507,7 @@ - assert e.core_version is None - e.extensions.append(ext) - -- return [e for e in entrypoints.itervalues() if e.enabled] -+ return [e for e in list(entrypoints.values()) if e.enabled] - - - def get_entrypoints_defines(doc): ---- mesa-18.1.3/src/intel/vulkan/anv_extensions.py 2018-06-29 13:47:29.000000000 -0400 -+++ mesa-18.1.3/src/intel/vulkan/anv_extensions.py 2018-07-24 03:07:13.599852168 -0400 -@@ -146,14 +146,32 @@ - patch = self.patch if self.patch is not None else 0 - return (self.major << 22) | (self.minor << 12) | patch - -- def __cmp__(self, other): -+ def __lt__(self, other): - # If only one of them has a patch version, "ignore" it by making - # other's patch version match self. - if (self.patch is None) != (other.patch is None): - other = copy.copy(other) - other.patch = self.patch - -- return self.__int_ver().__cmp__(other.__int_ver()) -+ return self.__int_ver() < other.__int_ver() -+ -+ def __gt__(self, other): -+ # If only one of them has a patch version, "ignore" it by making -+ # other's patch version match self. -+ if (self.patch is None) != (other.patch is None): -+ other = copy.copy(other) -+ other.patch = self.patch -+ -+ return self.__int_ver() > other.__int_ver() -+ -+ def __eq__(self, other): -+ # If only one of them has a patch version, "ignore" it by making -+ # other's patch version match self. -+ if (self.patch is None) != (other.patch is None): -+ other = copy.copy(other) -+ other.patch = self.patch -+ -+ return self.__int_ver() == other.__int_ver() - - - MAX_API_VERSION = VkVersion('0.0.0') diff --git a/user/mesa/python3-compat.patch b/user/mesa/python3-compat.patch deleted file mode 100644 index 9dc213e9f..000000000 --- a/user/mesa/python3-compat.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- mesa-17.3.1/src/gallium/drivers/r600/egd_tables.py (original) -+++ mesa-17.3.1/src/gallium/drivers/r600/egd_tables.py (refactored) -@@ -60,7 +60,7 @@ - """ - fragments = [ - '"%s\\0" /* %s */' % ( -- te[0].encode('string_escape'), -+ te[0].encode('unicode-escape'), - ', '.join(str(idx) for idx in te[2]) - ) - for te in self.table -@@ -217,10 +217,10 @@ - strings = StringTable() - strings_offsets = IntTable("int") - -- print '/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */' -- print -- print CopyRight.strip() -- print ''' -+ print('/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */') -+ print() -+ print(CopyRight.strip()) -+ print(''' - #ifndef EG_TABLES_H - #define EG_TABLES_H - -@@ -242,20 +242,20 @@ - unsigned name_offset; - unsigned op; - }; --''' -- -- print 'static const struct eg_packet3 packet3_table[] = {' -+''') -+ -+ print('static const struct eg_packet3 packet3_table[] = {') - for pkt in packets: -- print '\t{%s, %s},' % (strings.add(pkt[5:]), pkt) -- print '};' -- print -- -- print 'static const struct eg_field egd_fields_table[] = {' -+ print('\t{%s, %s},' % (strings.add(pkt[5:]), pkt)) -+ print('};') -+ print() -+ -+ print('static const struct eg_field egd_fields_table[] = {') - - fields_idx = 0 - for reg in regs: - if len(reg.fields) and reg.own_fields: -- print '\t/* %s */' % (fields_idx) -+ print('\t/* %s */' % (fields_idx)) - - reg.fields_idx = fields_idx - -@@ -266,34 +266,34 @@ - while value[1] >= len(values_offsets): - values_offsets.append(-1) - values_offsets[value[1]] = strings.add(strip_prefix(value[0])) -- print '\t{%s, %s(~0u), %s, %s},' % ( -+ print('\t{%s, %s(~0u), %s, %s},' % ( - strings.add(field.name), field.s_name, -- len(values_offsets), strings_offsets.add(values_offsets)) -+ len(values_offsets), strings_offsets.add(values_offsets))) - else: -- print '\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name) -+ print('\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name)) - fields_idx += 1 - -- print '};' -- print -- -- print 'static const struct eg_reg egd_reg_table[] = {' -+ print('};') -+ print() -+ -+ print('static const struct eg_reg egd_reg_table[] = {') - for reg in regs: - if len(reg.fields): -- print '\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name, -- len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx) -+ print('\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name, -+ len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx)) - else: -- print '\t{%s, %s},' % (strings.add(reg.name), reg.r_name) -- print '};' -- print -+ print('\t{%s, %s},' % (strings.add(reg.name), reg.r_name)) -+ print('};') -+ print() - - strings.emit(sys.stdout, "egd_strings") - -- print -+ print() - - strings_offsets.emit(sys.stdout, "egd_strings_offsets") - -- print -- print '#endif' -+ print() -+ print('#endif') - - - def main(): ---- mesa-18.1.3/m4/ax_check_python_mako_module.m4.old 2018-06-29 17:47:29.000000000 +0000 -+++ mesa-18.1.3/m4/ax_check_python_mako_module.m4 2018-07-09 01:55:22.740000000 +0000 -@@ -48,8 +48,8 @@ - except ImportError as err: - sys.exit(err) - else: -- ver_req = map(int, '$1'.split('.')) -- ver_act = map(int, mako.__version__.split('.')) -+ ver_req = list(map(int, '$1'.split('.'))) -+ ver_act = list(map(int, mako.__version__.split('.'))) - sys.exit(int(ver_req > ver_act)) - " | $PYTHON2 - - diff --git a/user/musl-obstack/APKBUILD b/user/musl-obstack/APKBUILD new file mode 100644 index 000000000..a7466fc96 --- /dev/null +++ b/user/musl-obstack/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=musl-obstack +pkgver=1.1 +pkgrel=0 +pkgdesc="Standalone library to implement obstack functionality" +url=" " +arch="all" +license="GPL-2.0+" +depends="" +makedepends="" +subpackages="$pkgname-dev" +source="musl-obstack-$pkgver.tar.gz::https://github.com/pullmoll/musl-obstack/archive/v$pkgver.tar.gz" + +build() { + cd "$builddir" + ./bootstrap.sh + ./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="e3a9956133d72a00663cf8d9720e62002142e113e7d67e2338a2bce1bdfac9eefd4290db8add15eabafdf01065f7fe9bb6754faa36b88df819c53d44fa140757 musl-obstack-1.1.tar.gz" diff --git a/user/pavucontrol/APKBUILD b/user/pavucontrol/APKBUILD index 15bc75054..113806f22 100644 --- a/user/pavucontrol/APKBUILD +++ b/user/pavucontrol/APKBUILD @@ -8,7 +8,7 @@ url="https://freedesktop.org/software/pulseaudio/pavucontrol/" arch="all" license="GPL-2.0+" depends="" -makedepends="gtkmm+3.0-dev libcanberra-dev intltool lynx" +makedepends="gtkmm+3.0-dev intltool libcanberra-dev lynx pulseaudio-dev" subpackages="$pkgname-doc $pkgname-lang" langdir="/usr/lib/locale" source="http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-$pkgver.tar.xz" diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD index 89ab74709..9da2b1de2 100644 --- a/user/php7/APKBUILD +++ b/user/php7/APKBUILD @@ -26,7 +26,7 @@ pkgname=php7 _pkgname=php pkgver=7.2.11 -pkgrel=2 +pkgrel=3 _apiver=20170718 pkgdesc="The PHP7 language runtime engine" url="https://php.net/" @@ -34,7 +34,8 @@ arch="all" options="!checkroot" license="PHP-3.01 AND Zend-2.0 AND Custom:TSRM AND LGPL-2.1+ AND MIT AND Beerware AND Public-Domain AND BSD-3-Clause AND Apache-1.0 AND PostgreSQL AND BSD-2-Clause AND Zlib AND BSD-4-Clause" depends="" -depends_dev="$pkgname=$pkgver-r$pkgrel autoconf pcre-dev" +depends_dev="$pkgname=$pkgver-r$pkgrel autoconf icu-dev libedit-dev libxml2-dev + pcre-dev zlib-dev" makedepends="autoconf apache-httpd-dev aspell-dev diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD new file mode 100644 index 000000000..5269c55bd --- /dev/null +++ b/user/postfix/APKBUILD @@ -0,0 +1,96 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=postfix +pkgver=3.3.2 +pkgrel=1 +pkgdesc="Mail server (MTA) that is Sendmail outside and Qmail inside" +url="http://www.postfix.org/" +arch="all" +options="!check suid" # No test suite. +license="EPL-2.0 AND IPL-1.0" +depends="" +makedepends="cyrus-sasl-dev db-dev icu-dev linux-pam-dev lmdb-dev openldap-dev + openssl-dev pcre-dev perl postgresql-dev sqlite-dev" +install="$pkgname.pre-install" +subpackages="$pkgname-doc $pkgname-ldap $pkgname-lmdb $pkgname-openrc + $pkgname-pgsql $pkgname-sqlite" +pkgusers="postfix" +pkggroups="postfix postdrop" +source="http://www.namesdir.com/mirrors/postfix-release/official/postfix-$pkgver.tar.gz + honour-config-directory.patch + postfix.initd + " + +build() { + cd "$builddir" + local CCARGS="-DHAS_LDAP -DHAS_LMDB -DHAS_PCRE -DHAS_PGSQL -I$(pg_config --includedir) -DHAS_SQLITE -DNO_NIS -DUSE_CYRUS_SASL -DUSE_SASL_AUTH -I/usr/include/sasl -DUSE_LDAP_SASL -DUSE_TLS -Wno-comment" + local AUXLIBS="-lpam $(pcre-config --libs) -lsasl2 -lssl -lcrypto" + make DEBUG="" shared=yes dynamicmaps=yes pie=yes \ + config_directory="/etc/postfix" \ + daemon_directory="/usr/libexec/postfix" \ + meta_directory="/etc/postfix" \ + shlib_directory="/usr/lib/postfix" \ + CC="gcc" OPT="$CFLAGS" CCARGS="$CCARGS" AUXLIBS="$AUXLIBS" \ + AUXLIBS_LDAP="-lldap -llber" AUXLIBS_LMDB="-llmdb" \ + AUXLIBS_PCRE="$(pcre-config --libs)" \ + AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq" \ + AUXLIBS_SQLITE="$(pkgconf --libs sqlite3)" \ + makefiles +} + +package() { + cd "$builddir" + make install_root="$pkgdir" manpage_directory="/usr/share/man" \ + command_directory="/usr/sbin" mailq_path="/usr/bin/mailq" \ + newaliases_path="/usr/bin/newaliases" \ + sendmail_path="/usr/sbin/sendmail" \ + non-interactive-package + + mkdir -p "$pkgdir"/etc/apk/protected_paths.d + cat > "$pkgdir"/etc/apk/protected_paths.d/postfix.list <<-EOF + !var/lib/postfix + !var/spool/postfix + EOF + + chown -R root:postfix \ + "$pkgdir"/var/lib/postfix + chown -R postfix:postfix \ + "$pkgdir"/var/spool/postfix + chgrp postdrop "$pkgdir"/var/spool/postfix/{public,maildrop} + chmod 0750 "$pkgdir"/var/lib/postfix + chgrp postdrop "$pkgdir"/usr/sbin/postdrop "$pkgdir"/usr/sbin/postqueue + chmod 2755 "$pkgdir"/usr/sbin/postdrop "$pkgdir"/usr/sbin/postqueue + + install -D -m755 "$srcdir"/postfix.initd "$pkgdir"/etc/init.d/postfix +} + +_database() { + pkgdesc="Postfix mapping plugin for storing users in $2" + + install -d "$subpkgdir"/etc/postfix/dynamicmaps.cf.d + grep $1 "$pkgdir"/etc/postfix/dynamicmaps.cf > \ + "$subpkgdir"/etc/postfix/dynamicmaps.cf.d/$1 + sed -i "/$1/d" "$pkgdir"/etc/postfix/dynamicmaps.cf + install -d "$subpkgdir"/usr/lib/postfix + mv "$pkgdir"/usr/lib/postfix/postfix-$1.so "$subpkgdir"/usr/lib/postfix/ +} + +ldap() { + _database "ldap" "LDAP" +} + +lmdb() { + _database "lmdb" "LMDB" +} + +pgsql() { + _database "pgsql" "PostgreSQL" +} + +sqlite() { + _database "sqlite" "SQLite 3" +} + +sha512sums="df67eb978751900d357597def16f744dae990f5cc4e48af8dca57f84b0140e05416712727c1760b8f557ed3564cd593620756561b0a6f31db4b54d928e15293f postfix-3.3.2.tar.gz +63ea7fe461fca1306088e9984acfab6ab3e919dafa2b606d43fbca472969e6ec232800071f939f5a4482c01c6d7b53a86de9e7e893ab94f4cb135d16ff5763cc honour-config-directory.patch +2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592 postfix.initd" diff --git a/user/postfix/honour-config-directory.patch b/user/postfix/honour-config-directory.patch new file mode 100644 index 000000000..a32c588ee --- /dev/null +++ b/user/postfix/honour-config-directory.patch @@ -0,0 +1,11 @@ +--- postfix-3.3.2/postfix-install ++++ postfix-3.3.2/postfix-install +@@ -832,7 +832,7 @@ + # the wrong place when Postfix is being upgraded. + + case "$mail_version" in +-"") mail_version="`bin/postconf -dhx mail_version`" || exit 1 ++"") mail_version="`bin/postconf -c $CONFIG_DIRECTORY -dhx mail_version`" || exit 1 + esac + + # Undo MAIL_VERSION expansion at the end of a parameter value. If diff --git a/user/postfix/postfix.initd b/user/postfix/postfix.initd new file mode 100644 index 000000000..9a1c1e21d --- /dev/null +++ b/user/postfix/postfix.initd @@ -0,0 +1,85 @@ +#!/sbin/openrc-run +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload abort flush" + +description_reload="Re-read configuration files. Running processes terminate at their earliest convenience." +description_abort="Stop the Postfix mail system abruptly. Running processes are signaled to stop immediately." +description_flush="Force delivery: attempt to deliver every message in the deferred mail queue." + +# Please read http://www.postfix.org/MULTI_INSTANCE_README.html for multi instance support +CONF_DIR="/etc/postfix" +CONF_OPT="${SVCNAME##*.}" +if [ -n ${CONF_OPT} -a ${SVCNAME} != "postfix" ]; then + CONF_DIR="${CONF_DIR}.${CONF_OPT}" +fi +if [ "${CONF_DIR}" = "/etc/postfix" ]; then + CONF_PARAM="" + CONF_MESSAGE="" +else + CONF_PARAM="-c ${CONF_DIR}" + CONF_MESSAGE="(${CONF_DIR})" +fi + +depend() { + use logger dns ypbind amavisd antivirus postfix_greylist net saslauthd + if [ "${SVCNAME}" = "postfix" ]; then + provide mta + fi +} + +start() { + if [ ! -z "${CONF_PARAM}" ]; then + einfo "Please consider updating your config for postmulti support." + fi + ebegin "Starting postfix ${CONF_MESSAGE}" + if [ ! -d ${CONF_DIR} ]; then + eend 1 "${CONF_DIR} does not exist" + return 1 + fi + /usr/sbin/postfix ${CONF_PARAM} start >/dev/null 2>&1 + eend $? +} + +stop() { + ebegin "Stopping postfix ${CONF_MESSAGE}" + /usr/sbin/postfix ${CONF_PARAM} stop >/dev/null 2>&1 + eend +} + +status() { + local _retval + einfon "" + /usr/sbin/postfix ${CONF_PARAM} status + _retval=$? + if [ x${_retval} = 'x0' ]; then + mark_service_started "${SVCNAME}" + eend 0 + else + mark_service_stopped "${SVCNAME}" + eend 3 + fi +} + +reload() { + ebegin "Reloading postfix ${CONF_MESSAGE}" + /usr/sbin/postfix ${CONF_PARAM} reload >/dev/null 2>&1 + eend $? +} + +abort() { + ebegin "Aborting postfix ${CONF_MESSAGE}" + + if service_started "${SVCNAME}"; then + mark_service_stopped "${SVCNAME}" + fi + /usr/sbin/postfix ${CONF_PARAM} abort >/dev/null 2>&1 + eend $? +} + +flush() { + ebegin "Flushing postfix ${CONF_MESSAGE}" + /usr/sbin/postfix ${CONF_PARAM} flush >/dev/null 2>&1 + eend $? +} diff --git a/user/postfix/postfix.pre-install b/user/postfix/postfix.pre-install new file mode 100644 index 000000000..73ebdba3f --- /dev/null +++ b/user/postfix/postfix.pre-install @@ -0,0 +1,5 @@ +#!/bin/sh + +groupadd -g 207 -r postfix +groupadd -g 208 -r postdrop +useradd -u 207 -c "Postfix Mail Server" -M -N -G postfix,mail -r -s /sbin/nologin postfix diff --git a/user/pulseaudio/APKBUILD b/user/pulseaudio/APKBUILD index 1a5bf62d3..9e3f7a565 100644 --- a/user/pulseaudio/APKBUILD +++ b/user/pulseaudio/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pulseaudio pkgver=12.2 -pkgrel=1 +pkgrel=3 pkgdesc="A featureful, general-purpose sound server" url="https://www.freedesktop.org/wiki/Software/PulseAudio" pkgusers="pulse" @@ -22,7 +22,9 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bluez $pkgname-zsh-completion:zshcomp:noarch" source="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz $pkgname.initd - $pkgname.confd" + $pkgname.confd + disable-flat-volume.patch + " build() { cd "$builddir" @@ -76,6 +78,7 @@ libs() { "$subpkgdir"/usr/lib/ mv "$pkgdir"/usr/lib/libpulse.so.0* \ "$pkgdir"/usr/lib/libpulse-simple.so.0* \ + "$pkgdir"/usr/lib/libpulse-mainloop-*.so.0* \ "$subpkgdir"/usr/lib/ mv "$pkgdir"/etc/pulse/client.conf \ "$subpkgdir"/etc/pulse/ @@ -130,4 +133,5 @@ zshcomp() { sha512sums="877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e pulseaudio-12.2.tar.xz 34fe54ece5df60ce63a7955cd828a2716670fef71f40960698ae5518fdaf9cd599f4d8f8852e2c88d715600a9ad06a38984415e5eb320071012e5eb6e5c1b8b1 pulseaudio.initd -75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd" +75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd +dcb50f7c4fd86b0311ab050f7f0340dcf54379a685903951f22e24df6aee5486ee5e02f866c9e53dd55a54ba302658ad282114ce37f169d185855dc37dae0349 disable-flat-volume.patch" diff --git a/user/pulseaudio/disable-flat-volume.patch b/user/pulseaudio/disable-flat-volume.patch new file mode 100644 index 000000000..8325c8d1f --- /dev/null +++ b/user/pulseaudio/disable-flat-volume.patch @@ -0,0 +1,11 @@ +--- pulseaudio-12.2/src/daemon/daemon.conf.in.old 2018-07-13 19:06:14.000000000 +0000 ++++ pulseaudio-12.2/src/daemon/daemon.conf.in 2019-01-22 00:30:56.700000000 +0000 +@@ -60,7 +60,7 @@ + ; enable-lfe-remixing = no + ; lfe-crossover-freq = 0 + +-; flat-volumes = yes ++flat-volumes = no + + ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl + ; rlimit-fsize = -1 diff --git a/user/scons/APKBUILD b/user/scons/APKBUILD new file mode 100644 index 000000000..c3ebf5694 --- /dev/null +++ b/user/scons/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=scons +pkgver=3.0.4 +pkgrel=0 +pkgdesc="Python-based software building system" +url="https://scons.org/" +arch="noarch" +license="MIT" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="https://prdownloads.sourceforge.net/scons/scons-$pkgver.tar.gz + python3-bang.patch + " + +build() { + cd "$builddir" + python3 setup.py build +} + +check() { + cd "$builddir" + python3 setup.py check +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="064a604939460fa85aa247776e5a2083ce98cac5f49f6035886d207f5cf167255756ee10cc00dd8228278d0d1efbed2afd8793bf3ca736a3ac970fabc3c4b627 scons-3.0.4.tar.gz +cb8be26f0d8cae7974dffcb3008c67254e8904bb8bb91f9732dd01a9942e33d57527101ec4104a866061096b991a336d00b344da48cf835489fc5d26fb1f331e python3-bang.patch" diff --git a/user/scons/python3-bang.patch b/user/scons/python3-bang.patch new file mode 100644 index 000000000..e902e7418 --- /dev/null +++ b/user/scons/python3-bang.patch @@ -0,0 +1,8 @@ +--- scons-3.0.4/script/scons.old 2019-01-23 17:30:36.000000000 +0000 ++++ scons-3.0.4/script/scons 2019-01-23 22:08:17.600000000 +0000 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # SCons - a Software Constructor + # diff --git a/user/serf/APKBUILD b/user/serf/APKBUILD new file mode 100644 index 000000000..db2ae5425 --- /dev/null +++ b/user/serf/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=serf +pkgver=1.3.9 +pkgrel=0 +pkgdesc="High-performance HTTP library from Apache" +url="https://serf.apache.org/" +arch="all" +license="Apache-2.0" +depends="" +makedepends="apr-dev apr-util-dev openssl-dev scons zlib-dev" +subpackages="$pkgname-dev" +source="https://www.apache.org/dist/serf/serf-$pkgver.tar.bz2 + py3.patch + " + +build() { + cd "$builddir" + scons PREFIX=/usr -j "$JOBS" +} + +check() { + cd "$builddir" + scons test +} + +package() { + cd "$builddir" + local _header + install -D -m644 libserf-1.a "$pkgdir"/usr/lib/libserf-1.a + install -D -m755 libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1.3.0 + ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1 + ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so + for _header in serf{_bucket_{types,util},}.h; do + install -D -m644 $_header "$pkgdir"/usr/include/serf-1/$_header + done + install -D -m644 serf-1.pc "$pkgdir"/usr/lib/pkgconfig/serf-1.pc +} + +sha512sums="9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d serf-1.3.9.tar.bz2 +4f55a30f8e505e757c36debc8e19041dbf824c5708495d9e0338e4bac736445eff72ea60aa9a9bafdcdde9b26e2ffb6c79c39b4e6f6422cffc34d3986e49d1b1 py3.patch" diff --git a/user/serf/py3.patch b/user/serf/py3.patch new file mode 100644 index 000000000..12e7be1bc --- /dev/null +++ b/user/serf/py3.patch @@ -0,0 +1,24 @@ +--- serf-1.3.9/SConstruct.old 2015-09-17 12:46:24.000000000 +0000 ++++ serf-1.3.9/SConstruct 2019-01-23 22:11:30.900000000 +0000 +@@ -163,9 +163,9 @@ + suffix='.def', src_suffix='.h') + }) + +-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' +- 'SERF_MINOR_VERSION ([0-9]+).*' +- 'SERF_PATCH_VERSION ([0-9]+)', ++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*' ++ b'SERF_MINOR_VERSION ([0-9]+).*' ++ b'SERF_PATCH_VERSION ([0-9]+)', + env.File('serf.h').get_contents(), + re.DOTALL) + MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] +@@ -183,7 +183,7 @@ + + unknown = opts.UnknownVariables() + if unknown: +- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) ++ print('Warning: Used unknown variables:', ', '.join(unknown.keys())) + + apr = str(env['APR']) + apu = str(env['APU']) diff --git a/user/socat/APKBUILD b/user/socat/APKBUILD new file mode 100644 index 000000000..93b519d45 --- /dev/null +++ b/user/socat/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=socat +pkgver=1.7.3.2 +pkgrel=0 +pkgdesc="Multipurpose network relay" +url="http://www.dest-unreach.org/socat/" +arch="all" +options="!check" # No testsuite +license="GPL-2.0-only" +depends="" +makedepends="openssl-dev" +subpackages="$pkgname-doc" +source="http://www.dest-unreach.org/socat/download/socat-$pkgver.tar.gz + netdb-internal.patch" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="540658b2a3d1b87673196282e5c62b97681bd0f1d1e4759ff9d72909d11060235ee9e9521a973603c1b00376436a9444248e5fbc0ffac65f8edb9c9bc28e7972 socat-1.7.3.2.tar.gz +22a6e0c2317a9317997c98114daac258ebbcc3d8e58e49a6ebf24781b98967afed47c63807282582fa0909076fe349281f05e4462faacb90e7aabc853903d6e6 netdb-internal.patch" diff --git a/user/socat/netdb-internal.patch b/user/socat/netdb-internal.patch new file mode 100644 index 000000000..d1ebc8e5b --- /dev/null +++ b/user/socat/netdb-internal.patch @@ -0,0 +1,13 @@ +--- socat-1.7.2.4.orig/compat.h ++++ socat-1.7.2.4/compat.h +@@ -656,6 +656,10 @@ + # define NETDB_INTERNAL h_NETDB_INTERNAL + #endif + ++#if !defined(NETDB_INTERNAL) ++# define NETDB_INTERNAL (-1) ++#endif ++ + #ifndef INET_ADDRSTRLEN + # define INET_ADDRSTRLEN sizeof(struct sockaddr_in) + #endif diff --git a/user/sound-theme-freedesktop/APKBUILD b/user/sound-theme-freedesktop/APKBUILD new file mode 100644 index 000000000..ad1f9c0e4 --- /dev/null +++ b/user/sound-theme-freedesktop/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=sound-theme-freedesktop +pkgver=0.8 +pkgrel=0 +pkgdesc="Stereo sound theme" +url="https://www.freedesktop.org/wiki/Specifications/sound-theme-spec/" +arch="noarch" +license="CC-BY-SA AND GPL-2.0+ AND CC-BY-3.0 AND GPL-2.0-only" +depends="" +makedepends="intltool" +subpackages="" +source="https://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-$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="f08e0414443f3a47bc433a69a7226d2b9383bc7c64e0711e8a605bd761ac69ea052a6db7f0037d88fbf0900efddaae6466ca96391eb71295ee1d0edbd0364621 sound-theme-freedesktop-0.8.tar.bz2" diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD new file mode 100644 index 000000000..3d9a96a68 --- /dev/null +++ b/user/subversion/APKBUILD @@ -0,0 +1,58 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=subversion +pkgver=1.10.4 +pkgrel=0 +pkgdesc="Version control system from 2000" +url="https://subversion.apache.org/" +arch="all" +license="Apache-2.0" +depends="" +depends_dev="apr-dev apr-util-dev linux-headers" +makedepends="apr-dev apr-util-dev cyrus-sasl-dev db-dev dbus-dev file-dev + kdelibs4support-dev kwallet-dev libsecret-dev lz4-dev openssl-dev + serf-dev sqlite-dev utf8proc-dev zlib-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-gnome $pkgname-kwallet + $pkgname-lang" +source="https://www-eu.apache.org/dist/subversion/subversion-$pkgver.tar.bz2 + python3-bang.patch + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --with-kwallet + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" -j1 install +} + +gnome() { + pkgdesc="$pkgdesc (GNOME Keychain integration)" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libsvn_auth_gnome* "$subpkgdir"/usr/lib/ +} + +kwallet() { + pkgdesc="$pkgdesc (KDE Wallet integration)" + install_if="$pkgname=$pkgver-r$pkgrel kwallet" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libsvn_auth_kwallet* "$subpkgdir"/usr/lib/ +} + +sha512sums="c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434 subversion-1.10.4.tar.bz2 +1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a python3-bang.patch" diff --git a/user/subversion/python3-bang.patch b/user/subversion/python3-bang.patch new file mode 100644 index 000000000..fa92ff098 --- /dev/null +++ b/user/subversion/python3-bang.patch @@ -0,0 +1,8 @@ +--- subversion-1.10.4/subversion/tests/cmdline/svneditor.py.old 2010-02-22 19:47:55.000000000 +0000 ++++ subversion-1.10.4/subversion/tests/cmdline/svneditor.py 2019-01-23 23:08:14.830000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # svneditor.py: a mock $SVN_EDITOR for the Subversion test suite + # diff --git a/user/utf8proc/APKBUILD b/user/utf8proc/APKBUILD new file mode 100644 index 000000000..8be033ef7 --- /dev/null +++ b/user/utf8proc/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=utf8proc +pkgver=2.2.0 +pkgrel=0 +pkgdesc="C library for processing UTF-8 data" +url=" " +arch="all" +license="MIT AND Unicode-DFS-2016" +depends="" +makedepends="" +subpackages="$pkgname-dev" +source="utf8proc-$pkgver.tar.gz::https://github.com/JuliaStrings/utf8proc/archive/v$pkgver.tar.gz" + +prepare() { + cd "$builddir" + default_prepare + mkdir build +} + +build() { + cd "$builddir"/build + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + .. + make +} + +check() { + cd "$builddir"/build + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir"/build + make DESTDIR="$pkgdir" install +} + +sha512sums="ae19287e33bc4807475063963557c4d1d2f7d95577d61882ba8df380883662860eeb868e7391ac1b8111614ca2c1855f631925ade6eaa827d07d28cc4cdbab9c utf8proc-2.2.0.tar.gz" diff --git a/user/uwsgi/APKBUILD b/user/uwsgi/APKBUILD new file mode 100644 index 000000000..1e10be30d --- /dev/null +++ b/user/uwsgi/APKBUILD @@ -0,0 +1,86 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=uwsgi +pkgver=2.0.17.1 +pkgrel=0 +pkgdesc="Web application server" +url="https://projects.unbit.it/uwsgi" +arch="all" +options="!check" # Requires unpackaged `cppcheck`. +license="GPL-2.0-only" +depends="" +makedepends="libxml2-dev openssl-dev zlib-dev + perl-dev php7-dev php7-embed python3-dev ruby-dev" +subpackages="" +# Keep psgi at the end for the CFLAGS hack. +_plugins="asyncio cgi corerouter http php python rack psgi" +for _plugin in $_plugins; do + subpackages="$subpackages $pkgname-$_plugin" +done +source="https://projects.unbit.it/downloads/uwsgi-$pkgver.tar.gz" + +build() { + cd "$builddir" + + echo 'plugin_dir = /usr/lib/uwsgi/plugins' >> buildconf/core.ini + echo 'plugin_build_dir = .' >> buildconf/core.ini + + python3 uwsgiconfig.py --build core + + for _plugin in $_plugins; do + [ $_plugin != "psgi" ] || export CFLAGS="-D_GNU_SOURCE -include /usr/include/setjmp.h" + python3 uwsgiconfig.py --plugin plugins/$_plugin core + done +} + +check() { + cd "$builddir" + python3 uwsgiconfig.py --check +} + +package() { + cd "$builddir" + install -D -m755 "$builddir"/uwsgi "$pkgdir"/usr/bin/uwsgi +} + +_plugpack() { + pkgdesc="$pkgdesc ($2 plugin)" + depends="" + + install -D -m755 "$builddir"/$1_plugin.so \ + "$subpkgdir"/usr/lib/uwsgi/plugins/$1_plugin.so +} + +asyncio() { + _plugpack asyncio "Python asyncio" +} + +cgi() { + _plugpack cgi "CGI" +} + +corerouter() { + _plugpack corerouter "Core router" +} + +http() { + _plugpack http "HTTP server" +} + +php() { + _plugpack php "PHP" +} + +psgi() { + _plugpack psgi "PSGI" +} + +python() { + _plugpack python "Python 3" +} + +rack() { + _plugpack rack "Ruby Rack" +} + +sha512sums="10d357961fde3a3f5f8e77986cc647313f95a33243e24c2afc482fce21df68a8ae48f90e7b5b76d7edc3cf8fd474d99823d6d60ef7477349abc65a319222f11b uwsgi-2.0.17.1.tar.gz" diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index 0d1bd0675..a06e293ed 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=vlc pkgver=3.0.6 -pkgrel=0 +pkgrel=1 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" pkgusers="vlc" @@ -51,14 +51,13 @@ makedepends="autoconf automake bison eudev-dev flex libarchive-dev xdg-utils a52dec-dev alsa-lib-dev faad2-dev ffmpeg-dev flac-dev fluidsynth-dev - libaacs-dev libavc1394-dev libbluray-dev>=0.2.1 libbluray-dev<20100000 - libcddb-dev libdc1394-dev>=2.1.0 libdca-dev libdvbpsi-dev libdvdnav-dev - libdvdread-dev libmad-dev libmatroska-dev libmpeg2-dev libmtp-dev - libogg-dev libraw1394-dev>=2.0.1 librsvg-dev libshout-dev libtheora-dev - libva-dev libvdpau-dev libvorbis-dev live-media-dev>=2012.01.26 - opus-dev pulseaudio-dev speex-dev speexdsp-dev taglib-dev v4l-utils-dev - x264-dev x265-dev gstreamer-dev gst-plugins-base-dev - " + gstreamer-dev gst-plugins-base-dev libaacs-dev libavc1394-dev + libbluray-dev>=0.2.1 libbluray-dev<20100000 libcddb-dev libdc1394-dev + libdca-dev libdvbpsi-dev libdvdnav-dev libdvdread-dev libmad-dev + libmatroska-dev libmodplug-dev libmpeg2-dev libmtp-dev libogg-dev + libraw1394-dev>=2.0.1 librsvg-dev libshout-dev libtheora-dev libva-dev + libvdpau-dev libvorbis-dev live-media-dev opus-dev pulseaudio-dev + speex-dev speexdsp-dev taglib-dev v4l-utils-dev x264-dev x265-dev" source="https://get.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz check-headless.patch disable-sub-autodetect-fuzzy-1-test.patch @@ -113,7 +112,6 @@ build() { --enable-avcodec \ --enable-avformat \ --enable-bluray \ - --enable-cdda \ --enable-dc1394 \ --enable-dca \ --enable-dvbpsi \ diff --git a/user/w3m/APKBUILD b/user/w3m/APKBUILD index 1e4ed29b2..134acd67d 100644 --- a/user/w3m/APKBUILD +++ b/user/w3m/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=w3m -pkgver=0.5.3 +pkgver=0.5.3_git20190105 pkgrel=0 pkgdesc="Text-based Web browser" url="http://w3m.sourceforge.net/" @@ -12,15 +12,8 @@ depends="compface" makedepends="compface-dev gc-dev gdk-pixbuf-dev glib-dev gtk+2.0-dev imlib2-dev libbsd-dev libx11-dev ncurses-dev openssl-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://downloads.sourceforge.net/w3m/w3m-$pkgver.tar.gz - use-modern-gc.patch - " - -prepare() { - cd "$builddir" - default_prepare - update_config_sub -} +source="w3m-$pkgver.tar.gz::https://github.com/tats/w3m/archive/v0.5.3+git20190105.tar.gz" +builddir="$srcdir"/w3m-${pkgver/_/-} build() { cd "$builddir" @@ -40,5 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="43508c76d07b4d8f19c19f975c0b870aeb94abf0744b6128ee01c759d4e409a8b57bc866baeaf990f309ff73e9a7b02ca455d272b1dd0a93fafb8c72b1fe6d14 w3m-0.5.3.tar.gz -d43f99e2277b0daabb6080b06b4e06af7a1b679da9203bad782ef57e137ca18d27b85ef7a0691aeb293bd3f6f00bd556d1fe021fed0b725b5b78b376671f1494 use-modern-gc.patch" +sha512sums="b63b15d0bea82f50bcaa9fc0826c2d3c265a3ad73069b4a020812f28b552cdf08618ab877280c9f3a43bd64f51b80b7a526098e6395ea121c0981a3fcd2562b4 w3m-0.5.3_git20190105.tar.gz" diff --git a/user/w3m/use-modern-gc.patch b/user/w3m/use-modern-gc.patch deleted file mode 100644 index a30d642bb..000000000 --- a/user/w3m/use-modern-gc.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- w3m-0.5.3/main.c.old 2011-01-04 09:42:19.000000000 +0000 -+++ w3m-0.5.3/main.c 2019-01-18 20:12:22.570000000 +0000 -@@ -833,7 +833,8 @@ - mySignal(SIGPIPE, SigPipe); - #endif - -- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); -+ orig_GC_warn_proc = GC_get_warn_proc(); -+ GC_set_warn_proc(wrap_GC_warn_proc); - err_msg = Strnew(); - if (load_argc == 0) { - /* no URL specified */ diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index 181bbde15..e5f0041eb 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=1 +pkgrel=2 pkgdesc="X.Org X11 server" url="https://www.X.Org/" arch="all" @@ -27,6 +27,7 @@ makedepends="$depends_dev autoconf automake libtool util-macros source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 autoconfig-sis.patch fix-musl-arm.patch + support-coffeelake.patch " # secfixes: @@ -141,4 +142,5 @@ xwayland() { sha512sums="ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba xorg-server-1.20.3.tar.bz2 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch -b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch" +b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch +1deae020ffd7e3ea91d8d3d8118dbb80c5d08308d9a253deaa3afc42f93ff13d1a93d3aaca7acce5d45213dee9c072a15c3ed385432bc833f403e7c8472e9fd6 support-coffeelake.patch" diff --git a/user/xorg-server/support-coffeelake.patch b/user/xorg-server/support-coffeelake.patch new file mode 100644 index 000000000..99f12aada --- /dev/null +++ b/user/xorg-server/support-coffeelake.patch @@ -0,0 +1,14 @@ +This PCI ID has been seen in the wild on the i7-9700K. + +diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h +index 82e4a549e..1ef1a0edf 100644 +--- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h ++++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h +@@ -174,6 +174,7 @@ CHIPSET(0x3EA4, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)") + CHIPSET(0x3E91, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)") + CHIPSET(0x3E92, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)") + CHIPSET(0x3E96, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") ++CHIPSET(0x3E98, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)") + CHIPSET(0x3E9A, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") + CHIPSET(0x3E9B, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)") + CHIPSET(0x3E94, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 35177bf1a..ab8a22b7a 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xterm pkgver=341 -pkgrel=0 +pkgrel=1 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" arch="all" @@ -11,11 +11,13 @@ license="X11" makedepends="libx11-dev libsm-dev libice-dev libxt-dev utmps-dev libxaw-dev libxext-dev freetype-dev ncurses-dev pcre-dev" subpackages="$pkgname-doc" -source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz" +source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz + posix-ptmx.patch + " build() { cd "$builddir" - LIBS="-lutmps -lskarnet -ltinfow" ./configure \ + LIBS="-ltinfow" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -23,7 +25,18 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --with-pcre - make + # This is NOT A TYPO! + # + # XTerm does not use ld(1) as a linker. It uses a shell script + # called 'plink.sh' which tries to Be Smart, but is actually + # Quite Dumb. + # + # It determines that the utmp symbols are in musl, and decides + # -lutmps really isn't necessary. However! There is some solace. + # + # -k is like -l, but is forced, even if it isn't "really needed". + # So we use -k for utmps. + make EXTRA_LOADFLAGS="-kutmps -lskarnet" } package() { @@ -31,4 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="336b8e8d3bfbc373ce1a0547571f705401142b54a8206050d2cdf961dfd99e01c9e78e10df443eb3278fb02116536cf55bc1501835978b9b390399614ab77494 xterm-341.tgz" +sha512sums="336b8e8d3bfbc373ce1a0547571f705401142b54a8206050d2cdf961dfd99e01c9e78e10df443eb3278fb02116536cf55bc1501835978b9b390399614ab77494 xterm-341.tgz +e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch" diff --git a/user/xterm/posix-ptmx.patch b/user/xterm/posix-ptmx.patch new file mode 100644 index 000000000..351aba9ab --- /dev/null +++ b/user/xterm/posix-ptmx.patch @@ -0,0 +1,21 @@ +--- xterm/main.c.old ++++ xterm/main.c +@@ -2654,7 +2654,7 @@ get_pty(int *pty, char *from GCC_UNUSED) + close(opened_tty); + opened_tty = -1; + } +-#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT_PTY_ISATTY) ++#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) + if ((*pty = posix_openpt(O_RDWR)) >= 0) { + char *name = ptsname(*pty); + if (name != 0) { +@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw) + /* + * now in child process + */ +-#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) ++#if defined(_POSIX_VERSION) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) + int pgrp = setsid(); /* variable may not be used... */ + #else + int pgrp = getpid(); + |