diff options
36 files changed, 316 insertions, 290 deletions
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD index bfb81d357..30428a27c 100644 --- a/system/abuild/APKBUILD +++ b/system/abuild/APKBUILD @@ -3,7 +3,7 @@ pkgname=abuild pkgver=3.3.1 pkgrel=2 pkgdesc="Script to build APK packages" -url="https://code.foxkit.us/adelie/aports" +url="https://code.foxkit.us/adelie/abuild" arch="all" license="GPL-2.0-only" depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 libc-utils diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD index 766378d3d..d432f7138 100644 --- a/system/adelie-base/APKBUILD +++ b/system/adelie-base/APKBUILD @@ -72,7 +72,7 @@ doc() { posix() { # We pull in vim for /usr/bin/ex, until apk has an alternatives system depends="adelie-base at bc cflow cxref ed fcron heirloom-devtools - heirloom-pax mailx mawk uucp vim" + heirloom-pax mailx mawk uucp utmps vim" pkgdesc="$pkgdesc - Additional POSIX tools" mkdir -p "$subpkgdir" return 0 diff --git a/system/cryptsetup/APKBUILD b/system/cryptsetup/APKBUILD index 533f036f8..5116640ac 100644 --- a/system/cryptsetup/APKBUILD +++ b/system/cryptsetup/APKBUILD @@ -12,7 +12,7 @@ makedepends_build="" makedepends_host="lvm2-dev openssl-dev popt-dev util-linux-dev json-c-dev argon2-dev" makedepends="$makedepends_build $makedepends_host" -checkdepends="device-mapper sharutils debianutils-which bash" +checkdepends="bash debianutils-which lvm2 sharutils" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs $pkgname-openrc" source="https://www.kernel.org/pub/linux/utils/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.gz dmcrypt.confd diff --git a/system/gettys-openrc/APKBUILD b/system/gettys-openrc/APKBUILD index bacb96d11..cde63a648 100644 --- a/system/gettys-openrc/APKBUILD +++ b/system/gettys-openrc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=gettys-openrc -pkgver=0.0.2.0 +pkgver=0.0.2.1 pkgrel=0 pkgdesc="Dynamic getty services" url="https://adelielinux.org/" @@ -21,4 +21,4 @@ package() { } sha512sums="50039958291cd546c51ce5a30d319f5c5cf7d310fb3cd9f7ad1632fa4bc55775cdac740f76886ff5869a2cfa3f345e760672cebf7727c7ca2514358bcc17e531 gettys.confd -ad086549334cf2ff49bf95eb7d89aed8497a7533487aa4770d0fed884baab648c5da5f4db7ba8b7613d2dc5eea5d165a484ee7029fe660e97791f954aff171b3 gettys.initd" +4fdb5e177bc6862e8b55c1252079a2ee31d25e157cd6a36bae766e25d2a79ba4b731d35660e01b38325bf8ae8a9ea9ccfddb5ec662ba1bb76e71ce9372ab608a gettys.initd" diff --git a/system/gettys-openrc/gettys.initd b/system/gettys-openrc/gettys.initd index 5181d9af2..a1fbb2082 100644 --- a/system/gettys-openrc/gettys.initd +++ b/system/gettys-openrc/gettys.initd @@ -47,8 +47,12 @@ start() { for i in $GETTYS ; do if test -c /dev/"$i" ; then - makeservice "$i" - ln -nsf "/var/lib/s6/services/getty-$i" "/run/service/getty-$i" + if test -d "/etc/s6-linux-init/current/run-image/service/getty-$i" ; then + : + else + makeservice "$i" + ln -nsf "/var/lib/s6/services/getty-$i" "/run/service/getty-$i" + fi fi done diff --git a/system/libffi/APKBUILD b/system/libffi/APKBUILD index 1913e0dbc..07a5be5eb 100644 --- a/system/libffi/APKBUILD +++ b/system/libffi/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libffi pkgver=3.2.1 -pkgrel=5 +pkgrel=6 pkgdesc="A portable, high level programming interface to various calling conventions." url="https://sourceware.org/libffi" arch="all" @@ -13,8 +13,8 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.gz disable-ppc-ldvariant.patch fix-testsuite-longdouble.patch + fix-testsuite-opts.patch gnu-linux-define.patch - pax-dlmmap.patch powerpc-fixes.patch " @@ -22,8 +22,7 @@ build () { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - --enable-pax_emutramp + --prefix=/usr make } @@ -48,6 +47,6 @@ package() { sha512sums="980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 libffi-3.2.1.tar.gz cfd3b11a0e168fd74da0a6219c95610df3466b0769966351b2a5076c93a75996daf9aed41644bebb80e28793bbe18d62272385afd7813c472104cc6c93dcba41 disable-ppc-ldvariant.patch de92cb20ded7bfefc3e469ba2ac2d9d869d67dc172ec7e2d1222f8530944eb6d5016ae913baf01ac2e26bee1624c682ae9dd08d0e45d5532d59298dbe7e417eb fix-testsuite-longdouble.patch +9b4b1d1b54cc7c96c44ba727556d9bfd2ab261a594061223df2fbd47ae7a067a7b9a3db92dc2e1b45d8c502bf4a192f8988c7638737c7aacfeac31ed1536891a fix-testsuite-opts.patch 264af568ae5388d50f647f891a406945c73cc358692266f65ad341787c0bf5f6bf31203b86c39fa1b338101c1a6d2f4fec60f95a90d379951ff5153f8f9e178f gnu-linux-define.patch -72486b389db16055ae4d7d33ba0cb05840537e28fe7a86aa89e2cb922592125d99c18c26c5df7ffde6282742e79f2b9126353e58b58f091f0486589e14dd6474 pax-dlmmap.patch bb3eb51a196aac2849fa0d0214e46f1428d55c8ed4375e5f8cf7fc9076927db935f97ac4d6e61a101897ac6ddc137a0a61e210b8d91888e938c6af122700e935 powerpc-fixes.patch" diff --git a/system/libffi/fix-testsuite-opts.patch b/system/libffi/fix-testsuite-opts.patch new file mode 100644 index 000000000..b3d08b4af --- /dev/null +++ b/system/libffi/fix-testsuite-opts.patch @@ -0,0 +1,11 @@ +--- libffi-3.2.1/testsuite/lib/libffi.old 2014-11-08 06:47:24.000000000 -0600 ++++ libffi-3.2.1/testsuite/lib/libffi.exp 2019-07-22 13:29:32.086840387 -0500 +@@ -281,7 +281,7 @@ + global using_gcc + if { [string match $using_gcc "yes"] } { + set common "-W -Wall -Wno-psabi" +- set optimizations { "-O0" "-O2" "-O3" "-Os" "-O2 -fomit-frame-pointer" } ++ set optimizations { "-O0" "-O2 -fno-inline-small-functions" "-O3 -fno-inline-small-functions" "-Os" "-O2 -fno-inline-small-functions -fomit-frame-pointer" } + } else { + # Assume we are using the vendor compiler. + set common "" diff --git a/system/libffi/pax-dlmmap.patch b/system/libffi/pax-dlmmap.patch deleted file mode 100644 index ec4150410..000000000 --- a/system/libffi/pax-dlmmap.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 48d2e46528fb6e621d95a7fa194069fd136b712d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20B=C3=BChler?= <buehler@cert.uni-stuttgart.de> -Date: Wed, 7 Sep 2016 15:49:48 +0200 -Subject: [PATCH 1/2] dlmmap_locked always needs locking as it always modifies - execsize - ---- - src/closures.c | 13 ++++--------- - 1 file changed, 4 insertions(+), 9 deletions(-) - -diff --git a/src/closures.c b/src/closures.c -index 2e0ffb45..04d6e27f 100644 ---- a/src/closures.c -+++ b/src/closures.c -@@ -769,16 +769,11 @@ dlmmap (void *start, size_t length, int prot, - MREMAP_DUP and prot at this point. */ - } - -- if (execsize == 0 || execfd == -1) -- { -- pthread_mutex_lock (&open_temp_exec_file_mutex); -- ptr = dlmmap_locked (start, length, prot, flags, offset); -- pthread_mutex_unlock (&open_temp_exec_file_mutex); -+ pthread_mutex_lock (&open_temp_exec_file_mutex); -+ ptr = dlmmap_locked (start, length, prot, flags, offset); -+ pthread_mutex_unlock (&open_temp_exec_file_mutex); - -- return ptr; -- } -- -- return dlmmap_locked (start, length, prot, flags, offset); -+ return ptr; - } - - /* Release memory at the given address, as well as the corresponding - -From 7aad5f895e2dfdb79d2ef67e1b231d21063e6511 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20B=C3=BChler?= <buehler@cert.uni-stuttgart.de> -Date: Wed, 7 Sep 2016 15:50:54 +0200 -Subject: [PATCH 2/2] ignore PaX EMUTRAMP flag; instead check for MPROTECT - -- code using ffi_closure_alloc doesn't necessarily generate gcc compatible trampolines; only those are allowed by PaX -- if MPROTECT is enabled use the same workaround as is used for SELinux (double mmap()) ---- - src/closures.c | 29 +++++++++++++---------------- - 1 file changed, 13 insertions(+), 16 deletions(-) - -diff --git a/src/closures.c b/src/closures.c -index 04d6e27f..babecc1a 100644 ---- a/src/closures.c -+++ b/src/closures.c -@@ -401,14 +401,15 @@ selinux_enabled_check (void) - - #endif /* !FFI_MMAP_EXEC_SELINUX */ - --/* On PaX enable kernels that have MPROTECT enable we can't use PROT_EXEC. */ -+/* On PaX enable kernels that have MPROTECT enabled we can't use PROT_EXEC. */ - #ifdef FFI_MMAP_EXEC_EMUTRAMP_PAX - #include <stdlib.h> - --static int emutramp_enabled = -1; -+/* -1: not read yet; 0: no PaX or MPROTECT disabled; 1: MPROTECT enabled. */ -+static int mprotect_enabled = -1; - - static int --emutramp_enabled_check (void) -+mprotect_enabled_check (void) - { - char *buf = NULL; - size_t len = 0; -@@ -422,9 +423,7 @@ emutramp_enabled_check (void) - while (getline (&buf, &len, f) != -1) - if (!strncmp (buf, "PaX:", 4)) - { -- char emutramp; -- if (sscanf (buf, "%*s %*c%c", &emutramp) == 1) -- ret = (emutramp == 'E'); -+ ret = (NULL != strchr (buf + 4, 'M')); - break; - } - free (buf); -@@ -432,8 +431,9 @@ emutramp_enabled_check (void) - return ret; - } - --#define is_emutramp_enabled() (emutramp_enabled >= 0 ? emutramp_enabled \ -- : (emutramp_enabled = emutramp_enabled_check ())) -+#define is_mprotect_enabled() (mprotect_enabled >= 0 ? mprotect_enabled \ -+ : (mprotect_enabled = mprotect_enabled_check ())) -+ - #endif /* FFI_MMAP_EXEC_EMUTRAMP_PAX */ - - #elif defined (__CYGWIN__) || defined(__INTERIX) -@@ -446,7 +446,7 @@ emutramp_enabled_check (void) - #endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */ - - #ifndef FFI_MMAP_EXEC_EMUTRAMP_PAX --#define is_emutramp_enabled() 0 -+#define is_mprotect_enabled() 0 - #endif /* FFI_MMAP_EXEC_EMUTRAMP_PAX */ - - /* Declare all functions defined in dlmalloc.c as static. */ -@@ -750,13 +750,10 @@ dlmmap (void *start, size_t length, int prot, - && flags == (MAP_PRIVATE | MAP_ANONYMOUS) - && fd == -1 && offset == 0); - -- if (execfd == -1 && is_emutramp_enabled ()) -- { -- ptr = mmap (start, length, prot & ~PROT_EXEC, flags, fd, offset); -- return ptr; -- } -- -- if (execfd == -1 && !is_selinux_enabled ()) -+ /* -1 != execfd hints that we already decided to use dlmmap_locked -+ last time. If PaX MPROTECT or SELinux is active fallback to -+ dlmmap_locked. */ -+ if (execfd == -1 && !is_mprotect_enabled () && !is_selinux_enabled ()) - { - ptr = mmap (start, length, prot | PROT_EXEC, flags, fd, offset); - diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD index f00157787..842dee2fa 100644 --- a/system/lvm2/APKBUILD +++ b/system/lvm2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lvm2 pkgver=2.03.05 -pkgrel=1 +pkgrel=2 pkgdesc="Logical Volume Manager 2 utilities" url="https://sourceware.org/lvm2/" arch="all" @@ -14,6 +14,7 @@ depends_dev="linux-headers" makedepends_build="coreutils libaio-dev" makedepends_host="$depends_dev util-linux-dev" makedepends="$makedepends_build $makedepends_host" +replaces="device-mapper $pkgname-dmeventd" source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz fix-stdio-usage.patch mallinfo.patch @@ -25,11 +26,7 @@ source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz subpackages=" $pkgname-dev $pkgname-doc - $pkgname-dmeventd $pkgname-openrc - device-mapper:dm - device-mapper-libs:dm_libs - device-mapper-event-libs:dm_event_libs $pkgname-libs $pkgname-udev " @@ -66,43 +63,14 @@ package() { install -d "$pkgdir"/etc/lvm/archive "$pkgdir"/etc/lvm/backup install -Dm755 "$srcdir"/lvm.initd "$pkgdir"/etc/init.d/lvm install -Dm644 "$srcdir"/lvm.confd "$pkgdir"/etc/conf.d/lvm - ln -s libdevmapper.so.1.02 "$pkgdir"/lib/libdevmapper.so -} - -dmeventd() { - pkgdesc="Device-mapper event daemon" - mkdir -p "$subpkgdir"/sbin - mv "$pkgdir"/sbin/dmeventd "$subpkgdir"/sbin/ - install -Dm755 "$srcdir"/dmeventd.initd "$subpkgdir"/etc/init.d/dmeventd -} - -dm() { - pkgdesc="Device mapper userspace library and tools from LVM2" - mkdir -p "$subpkgdir"/sbin "$subpkgdir"/lib - mv "$pkgdir"/sbin/dm* "$subpkgdir"/sbin/ + install -Dm755 "$srcdir"/dmeventd.initd "$pkgdir"/etc/init.d/dmeventd } libs() { - pkgdesc="LVM2 shared libraries" - depends="" - mkdir -p "$subpkgdir"/lib - mv "$pkgdir"/lib/liblvm2*.so.* "$subpkgdir"/lib/ - mv "$pkgdir"/lib/libdevmapper-event-lvm2*.so.* "$subpkgdir"/lib/ - mv "$pkgdir"/lib/device-mapper "$subpkgdir"/lib/ -} - -dm_libs() { - pkgdesc="Device-mapper shared library" - depends="" - mkdir -p "$subpkgdir"/lib - mv "$pkgdir"/lib/libdevmapper.so.* "$subpkgdir"/lib/ -} + replaces="device-mapper-libs device-mapper-event-libs" + default_libs -dm_event_libs() { - pkgdesc="Device-mapper event daemon shared library" - depends="" - mkdir -p "$subpkgdir"/lib - mv "$pkgdir"/lib/libdevmapper-event.so.* "$subpkgdir"/lib/ + mv "$pkgdir/lib/device-mapper" "$subpkgdir/lib/" } udev() { diff --git a/system/patch/APKBUILD b/system/patch/APKBUILD index 175bb7a67..292076831 100644 --- a/system/patch/APKBUILD +++ b/system/patch/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=patch pkgver=2.7.6 -pkgrel=3 +pkgrel=4 pkgdesc="Utility to apply diffs to files" url="https://www.gnu.org/software/patch/patch.html" arch="all" @@ -12,9 +12,12 @@ checkdepends="bash ed" install="" subpackages="$pkgname-doc" source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz - CVE-2018-6951.patch allow-missing.patch CVE-2018-1000156.patch + CVE-2018-6951.patch + CVE-2018-6952.patch + CVE-2019-13636.patch + CVE-2019-13638.patch " builddir="$srcdir"/$pkgname-$pkgver @@ -23,6 +26,10 @@ builddir="$srcdir"/$pkgname-$pkgver # - CVE-2018-6951 # 2.7.6-r3: # - CVE-2018-1000156.patc +# 2.7.6-r4: +# - CVE-2018-6952 +# - CVE-2019-13636 +# - CVE-2019-13638 build() { cd "$builddir" @@ -51,6 +58,9 @@ package() { } sha512sums="fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd patch-2.7.6.tar.xz -db51d0b791d38dd4f1b373621ee18620ae339b172f58a79420fdaa4a4b1b1d9df239cf61bbddc4e6a4896b28b8cffc7c99161eb5e2facaec8df86a1bf7755bc0 CVE-2018-6951.patch 317c922c3adcf347024a9ffd2374a1827b19cc1f275a90e195e070cbcf16fb47788b14ffd18365ae5e1f867ed650e6f9aed6acf287bfc427107f3ed8bcd2b3af allow-missing.patch -93414b33413b493eaa15027dfbe39c00eb1c556acf9f30af4c0ca113303867c5e7ad441c2596a7f9d060b8b67735a2a1c8be5db3c779ea47302f616ef8530d5d CVE-2018-1000156.patch" +93414b33413b493eaa15027dfbe39c00eb1c556acf9f30af4c0ca113303867c5e7ad441c2596a7f9d060b8b67735a2a1c8be5db3c779ea47302f616ef8530d5d CVE-2018-1000156.patch +db51d0b791d38dd4f1b373621ee18620ae339b172f58a79420fdaa4a4b1b1d9df239cf61bbddc4e6a4896b28b8cffc7c99161eb5e2facaec8df86a1bf7755bc0 CVE-2018-6951.patch +99df964d826d400f87e9b82bf2600d8663c59bb8f9bf4aec082adc8cf6261744f37d416e15492d6e883202ade521d4436cb41c91f516085c3e6ce8e01a8956fb CVE-2018-6952.patch +cecb80d8d48dfe66bc13c22a5ed0eb52157cc85a1b74d03d4a8ea1ebcfe5d59bae975aec34ac685adc71129dcdb794579fee0e221144412a7c1fa71c460f63c1 CVE-2019-13636.patch +d60f8c2364fca9b73aa73b5914cfd6571d11528d13fa7703ccfa93730cbdf8a6e4c9ca04cb7d02a40d33c38075890790b490052d5217e728b0948991da937980 CVE-2019-13638.patch" diff --git a/system/patch/CVE-2018-6952.patch b/system/patch/CVE-2018-6952.patch new file mode 100644 index 000000000..d9ad374a2 --- /dev/null +++ b/system/patch/CVE-2018-6952.patch @@ -0,0 +1,30 @@ +From 9c986353e420ead6e706262bf204d6e03322c300 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agruen@gnu.org> +Date: Fri, 17 Aug 2018 13:35:40 +0200 +Subject: Fix swapping fake lines in pch_swap + +* src/pch.c (pch_swap): Fix swapping p_bfake and p_efake when there is a +blank line in the middle of a context-diff hunk: that empty line stays +in the middle of the hunk and isn't swapped. + +Fixes: https://savannah.gnu.org/bugs/index.php?53133 +--- + src/pch.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pch.c b/src/pch.c +index e92bc64..a500ad9 100644 +--- a/src/pch.c ++++ b/src/pch.c +@@ -2122,7 +2122,7 @@ pch_swap (void) + } + if (p_efake >= 0) { /* fix non-freeable ptr range */ + if (p_efake <= i) +- n = p_end - i + 1; ++ n = p_end - p_ptrn_lines; + else + n = -i; + p_efake += n; +-- +cgit v1.0-41-gc330 + diff --git a/system/patch/CVE-2019-13636.patch b/system/patch/CVE-2019-13636.patch new file mode 100644 index 000000000..e62c3d417 --- /dev/null +++ b/system/patch/CVE-2019-13636.patch @@ -0,0 +1,108 @@ +From dce4683cbbe107a95f1f0d45fabc304acfb5d71a Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agruen@gnu.org> +Date: Mon, 15 Jul 2019 16:21:48 +0200 +Subject: Don't follow symlinks unless --follow-symlinks is given + +* src/inp.c (plan_a, plan_b), src/util.c (copy_to_fd, copy_file, +append_to_file): Unless the --follow-symlinks option is given, open files with +the O_NOFOLLOW flag to avoid following symlinks. So far, we were only doing +that consistently for input files. +* src/util.c (create_backup): When creating empty backup files, (re)create them +with O_CREAT | O_EXCL to avoid following symlinks in that case as well. +--- + src/inp.c | 12 ++++++++++-- + src/util.c | 14 +++++++++++--- + 2 files changed, 21 insertions(+), 5 deletions(-) + +diff --git a/src/inp.c b/src/inp.c +index 32d0919..22d7473 100644 +--- a/src/inp.c ++++ b/src/inp.c +@@ -238,8 +238,13 @@ plan_a (char const *filename) + { + if (S_ISREG (instat.st_mode)) + { +- int ifd = safe_open (filename, O_RDONLY|binary_transput, 0); ++ int flags = O_RDONLY | binary_transput; + size_t buffered = 0, n; ++ int ifd; ++ ++ if (! follow_symlinks) ++ flags |= O_NOFOLLOW; ++ ifd = safe_open (filename, flags, 0); + if (ifd < 0) + pfatal ("can't open file %s", quotearg (filename)); + +@@ -340,6 +345,7 @@ plan_a (char const *filename) + static void + plan_b (char const *filename) + { ++ int flags = O_RDONLY | binary_transput; + int ifd; + FILE *ifp; + int c; +@@ -353,7 +359,9 @@ plan_b (char const *filename) + + if (instat.st_size == 0) + filename = NULL_DEVICE; +- if ((ifd = safe_open (filename, O_RDONLY | binary_transput, 0)) < 0 ++ if (! follow_symlinks) ++ flags |= O_NOFOLLOW; ++ if ((ifd = safe_open (filename, flags, 0)) < 0 + || ! (ifp = fdopen (ifd, binary_transput ? "rb" : "r"))) + pfatal ("Can't open file %s", quotearg (filename)); + if (TMPINNAME_needs_removal) +diff --git a/src/util.c b/src/util.c +index 1cc08ba..fb38307 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -388,7 +388,7 @@ create_backup (char const *to, const struct stat *to_st, bool leave_original) + + try_makedirs_errno = ENOENT; + safe_unlink (bakname); +- while ((fd = safe_open (bakname, O_CREAT | O_WRONLY | O_TRUNC, 0666)) < 0) ++ while ((fd = safe_open (bakname, O_CREAT | O_EXCL | O_WRONLY | O_TRUNC, 0666)) < 0) + { + if (errno != try_makedirs_errno) + pfatal ("Can't create file %s", quotearg (bakname)); +@@ -579,10 +579,13 @@ create_file (char const *file, int open_flags, mode_t mode, + static void + copy_to_fd (const char *from, int tofd) + { ++ int from_flags = O_RDONLY | O_BINARY; + int fromfd; + ssize_t i; + +- if ((fromfd = safe_open (from, O_RDONLY | O_BINARY, 0)) < 0) ++ if (! follow_symlinks) ++ from_flags |= O_NOFOLLOW; ++ if ((fromfd = safe_open (from, from_flags, 0)) < 0) + pfatal ("Can't reopen file %s", quotearg (from)); + while ((i = read (fromfd, buf, bufsize)) != 0) + { +@@ -625,6 +628,8 @@ copy_file (char const *from, char const *to, struct stat *tost, + else + { + assert (S_ISREG (mode)); ++ if (! follow_symlinks) ++ to_flags |= O_NOFOLLOW; + tofd = create_file (to, O_WRONLY | O_BINARY | to_flags, mode, + to_dir_known_to_exist); + copy_to_fd (from, tofd); +@@ -640,9 +645,12 @@ copy_file (char const *from, char const *to, struct stat *tost, + void + append_to_file (char const *from, char const *to) + { ++ int to_flags = O_WRONLY | O_APPEND | O_BINARY; + int tofd; + +- if ((tofd = safe_open (to, O_WRONLY | O_BINARY | O_APPEND, 0)) < 0) ++ if (! follow_symlinks) ++ to_flags |= O_NOFOLLOW; ++ if ((tofd = safe_open (to, to_flags, 0)) < 0) + pfatal ("Can't reopen file %s", quotearg (to)); + copy_to_fd (from, tofd); + if (close (tofd) != 0) +-- +cgit v1.0-41-gc330 + diff --git a/system/patch/CVE-2019-13638.patch b/system/patch/CVE-2019-13638.patch new file mode 100644 index 000000000..38caff628 --- /dev/null +++ b/system/patch/CVE-2019-13638.patch @@ -0,0 +1,38 @@ +From 3fcd042d26d70856e826a42b5f93dc4854d80bf0 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agruen@gnu.org> +Date: Fri, 6 Apr 2018 19:36:15 +0200 +Subject: Invoke ed directly instead of using the shell + +* src/pch.c (do_ed_script): Invoke ed directly instead of using a shell +command to avoid quoting vulnerabilities. +--- + src/pch.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/pch.c b/src/pch.c +index 4fd5a05..16e001a 100644 +--- a/src/pch.c ++++ b/src/pch.c +@@ -2459,9 +2459,6 @@ do_ed_script (char const *inname, char const *outname, + *outname_needs_removal = true; + copy_file (inname, outname, 0, exclusive, instat.st_mode, true); + } +- sprintf (buf, "%s %s%s", editor_program, +- verbosity == VERBOSE ? "" : "- ", +- outname); + fflush (stdout); + + pid = fork(); +@@ -2470,7 +2467,8 @@ do_ed_script (char const *inname, char const *outname, + else if (pid == 0) + { + dup2 (tmpfd, 0); +- execl ("/bin/sh", "sh", "-c", buf, (char *) 0); ++ assert (outname[0] != '!' && outname[0] != '-'); ++ execlp (editor_program, editor_program, "-", outname, (char *) NULL); + _exit (2); + } + else +-- +cgit v1.0-41-gc330 + diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index aed46e575..d1cead76d 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-init pkgver=1.0.2.0 -pkgrel=0 +pkgrel=1 pkgdesc="A s6-based init system" url="https://skarnet.org/software/$pkgname/" arch="all" @@ -11,11 +11,11 @@ license="ISC" _skalibs_version=2.8.1.0 depends="execline s6 s6-linux-init-common" makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev utmps-dev" -subpackages="$pkgname-common:common:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" +subpackages="$pkgname-common:common:noarch $pkgname-early-getty:earlygetty:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.init runlevel rc.shutdown reboot.sh" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" provides="/sbin/init=0" - +_earlytty=tty2 build() { cd "$builddir" @@ -46,6 +46,7 @@ package() { ./s6-linux-init-maker \ -u catchlog \ + -G "/sbin/agetty -- 38400 $_earlytty linux" \ -1 \ -L \ -p "/usr/bin:/usr/sbin:/bin:/sbin" \ @@ -77,6 +78,16 @@ common() { } +earlygetty() { + pkgdesc="Files for an early getty on $_earlytty" + depends="s6-linux-init-common" + svcimg="$pkgdir/etc/s6-linux-init/current/run-image/service" + subsvcimg="$subpkgdir/etc/s6-linux-init/current/run-image/service" + mkdir -p -m 0755 "$subsvcimg" + mv "$svcimg/s6-linux-init-early-getty" "$subsvcimg/getty-$_earlytty" +} + + libs() { pkgdesc="$pkgdesc (shared libraries)" depends="skalibs-libs>=$_skalibs_version" diff --git a/user/dracut/APKBUILD b/user/dracut/APKBUILD index 8782ed974..6be168f60 100644 --- a/user/dracut/APKBUILD +++ b/user/dracut/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dracut pkgver=048 -pkgrel=1 +pkgrel=2 pkgdesc="Event-driven initramfs infrastructure" url="https://dracut.wiki.kernel.org/" arch="all" @@ -53,13 +53,13 @@ bashcomp() { } crypt() { - depends="cryptsetup device-mapper dracut" + depends="cryptsetup dracut lvm2" pkgdesc="$pkgname - LUKS / disk encryption support (crypt) module" mkdir -p "$subpkgdir" } lvm() { - depends="device-mapper dracut lvm2" + depends="dracut lvm2" pkgdesc="$pkgname - LVM2 module" mkdir -p "$subpkgdir" } diff --git a/user/libstatgrab/APKBUILD b/user/libstatgrab/APKBUILD index a86f93f52..a1a24c35b 100644 --- a/user/libstatgrab/APKBUILD +++ b/user/libstatgrab/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libstatgrab -pkgver=0.91 +pkgver=0.92 pkgrel=0 pkgdesc="Library for cross-platform access to system statistics." url="https://www.i-scream.org/libstatgrab" @@ -12,15 +12,10 @@ depends_dev="ncurses-dev" checkdepends="perl" makedepends="autoconf automake libtool utmps-dev $depends_dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://ftp.i-scream.org/pub/i-scream/$pkgname/$pkgname-$pkgver.tar.gz - fix-configure.patch - nongnu.patch" +source="https://ftp.i-scream.org/pub/i-scream/$pkgname/$pkgname-$pkgver.tar.gz" build() { cd "$builddir" - aclocal - libtoolize -if --recursive - autoreconf -if LIBS="-lutmps -lskarnet -ltinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,9 +23,7 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --enable-maintainer-mode \ - --disable-man-build \ - ac_cv_header_sys_sysinfo_h=no + --disable-man-build make } @@ -44,6 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f360f2e1b185bf9603b1d9c50649b0050e9502128ff81a9f4de88457e2f5203deafe7fd7ac13ebc4cc56e6ecd1bdf8aacae64987bdf36af0c9929e30626915f6 libstatgrab-0.91.tar.gz -96661b2d4c4c54fde9b2cb57e3a9d84e950aae130017a7496a60b630ec7c30d8c6ee270d8f2976f8179f4926073a39d92116e4abce2f4c742d4d5e08bc031f4e fix-configure.patch -9c42c860c0939b60fcba26d86d65c8e5f1e64e5e6d0646eb7d6ab72b1926f655f0ae8212823cf6e0e1afb1b9098a4d02503847304ce5e20d0540329c10d23d7f nongnu.patch" +sha512sums="a99c6be56d930779d0d8f6f81e64e2f31e19423009c39e925b39116a42aa2c6037651992ac2168c43a5c6ecadf3e4a58486ab6148cf96118c429b04fdcf65192 libstatgrab-0.92.tar.gz" diff --git a/user/libstatgrab/fix-configure.patch b/user/libstatgrab/fix-configure.patch deleted file mode 100644 index 4ae6fdbc3..000000000 --- a/user/libstatgrab/fix-configure.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nurd libstatgrab-0.91/configure.ac libstatgrab-0.91.new/configure.ac ---- libstatgrab-0.91/configure.ac 2014-07-11 19:12:06.000000000 +0000 -+++ libstatgrab-0.91.new/configure.ac 2017-10-10 18:17:14.094496592 +0000 -@@ -609,8 +609,8 @@ - [openbsd*], [ - AC_DEFINE(OPENBSD, , [Building on OpenBSD]) - ], -- [linux-gnu*], [ -- AC_DEFINE(LINUX, , [Building on GNU/Linux]) -+ [linux*], [ -+ AC_DEFINE(LINUX, , [Building on Linux]) - AM_CONDITIONAL(SETUIDBINS, true) - BIN_OWNER="root" - BIN_PERM="4755" diff --git a/user/libstatgrab/nongnu.patch b/user/libstatgrab/nongnu.patch deleted file mode 100644 index 3e5e163f7..000000000 --- a/user/libstatgrab/nongnu.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurd libstatgrab-0.91/src/libstatgrab/os_info.c libstatgrab-0.91.new/src/libstatgrab/os_info.c ---- libstatgrab-0.91/src/libstatgrab/os_info.c 2014-06-19 11:41:10.000000000 +0000 -+++ libstatgrab-0.91.new/src/libstatgrab/os_info.c 2017-10-10 18:42:04.844471568 +0000 -@@ -472,7 +472,7 @@ - host_info_buf->bitwidth = 64; - } - else { -- host_info_buf->bitwidth = sysconf(_SC_LONG_BIT); // well, maybe 64-bit disabled 128-bit system o.O -+ host_info_buf->bitwidth = sizeof(long int) * 8; // well, maybe 64-bit disabled 128-bit system o.O - } - host_info_buf->host_state = sg_unknown_configuration; - # endif diff --git a/user/php7-apcu/APKBUILD b/user/php7-apcu/APKBUILD index 4398a424d..e9ad17ae4 100644 --- a/user/php7-apcu/APKBUILD +++ b/user/php7-apcu/APKBUILD @@ -1,21 +1,20 @@ # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: +# Maintainer: Max Rees <maxcrees@me.com> pkgname=php7-apcu _pkgname=${pkgname#php7-} -pkgver=5.1.15 +pkgver=5.1.17 pkgrel=0 pkgdesc="Userland cache for PHP" -url="https://github.com/krakjoe/apcu" +url="https://pecl.php.net/package/APCu" arch="all" license="PHP-3.01" depends="php7" makedepends="php7-dev" subpackages="" -source="$pkgname-$pkgver.tar.gz::https://github.com/krakjoe/${_pkgname}/archive/v${pkgver}.tar.gz" +source="https://pecl.php.net/get/$_pkgname-$pkgver.tgz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" phpize ./configure \ --build=$CBUILD \ @@ -28,15 +27,13 @@ build() { } check() { - cd "$builddir" # The tests have a prompt at the end for sending stats make NO_INTERACTION=1 test } package() { - cd "$builddir" # It didn't listen to DESTDIR make INSTALL_ROOT="$pkgdir" install } -sha512sums="d95ab6a8a073acfc6af2f83b038f68e4150a1eb518369c163f4d1bc0c8b006c84754759fa9b72ac6f7ca008c27802a3a2aca14ae9d7ca23c02078d720a530b1c php7-apcu-5.1.15.tar.gz" +sha512sums="7f6a6cd927ed4ff251497c2c79e8d832d1a44ddd59abdb175886d3c12ea27f26142e6b851ac5bb5acb49a0e3a998e9741ba0ff03310f51b9cd188cdf6cf12793 apcu-5.1.17.tgz" diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD index daa11c586..6c6b08849 100644 --- a/user/php7/APKBUILD +++ b/user/php7/APKBUILD @@ -41,7 +41,7 @@ pkgname=php7 _pkgname=php -pkgver=7.2.19 +pkgver=7.2.20 pkgrel=0 _apiver=20170718 pkgdesc="The PHP7 language runtime engine" @@ -531,7 +531,7 @@ _mv() { mv $@ } -sha512sums="79077e73075f4aaba86699c536d8bad4929d351ad40f89c35b6f9ff0d1237b9e3d528be2918dae16519659bdaf93c5ab16fc81653fe13f667e6251871f05d722 php-7.2.19.tar.bz2 +sha512sums="8c32cb46e34440f3af905e9fc73d327e28c62b5b1b4b7f7221b192364b409172a88ae9f35aef40b796a81fbe87b8b64dec214cbf54011f5af53d9e8eddc9b3fa php-7.2.20.tar.bz2 23df4e779c809db3e3b8e5b0353b1aafaad2f3dc56f2d1cd45f9b0e3ad71b32e40700d6ebfe914b3c87e8e0b670d0dc862ded1e5c898adf160e33dea372e044f php-fpm.initd 01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb php-fpm.logrotate a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48 php-module.conf diff --git a/user/ristretto/APKBUILD b/user/ristretto/APKBUILD index 965fde75b..91d2df7b5 100644 --- a/user/ristretto/APKBUILD +++ b/user/ristretto/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=ristretto -pkgver=0.8.4 -pkgrel=1 +pkgver=0.8.5 +pkgrel=0 pkgdesc="Image viewer for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c5479cde66e4f0903b9b8d9b1b8f4c7cde35ebfa334e414c8202e783c332bd4bfec650f85d308c7151d31fe84b27a13bb4048290b0a82ce7b8ba4baf3e4088b8 ristretto-0.8.4.tar.bz2" +sha512sums="48d2a68cd13e58c0f450fc674b031a4fc4495ece0ae00805f0564a5bd9cc2ac19c1c009726dd343bdfeffa59509f0ecc9cd069986af5a2ff2c2566c4490b5fbf ristretto-0.8.5.tar.bz2" diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD index 582a2dfd9..9cb297aa6 100644 --- a/user/subversion/APKBUILD +++ b/user/subversion/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=subversion pkgver=1.12.0 -pkgrel=0 +pkgrel=1 pkgdesc="Version control system from 2000" url="https://subversion.apache.org/" arch="all" @@ -13,9 +13,10 @@ 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 autoconf automake python3" + serf-dev sqlite-dev utf8proc-dev zlib-dev autoconf automake python3 + perl-dev swig" subpackages="$pkgname-dev $pkgname-doc $pkgname-gnome $pkgname-kwallet - $pkgname-lang" + $pkgname-pl $pkgname-lang" source="https://www-eu.apache.org/dist/subversion/subversion-$pkgver.tar.bz2 apr-1.7.0.patch python3-bang.patch @@ -39,16 +40,29 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --with-kwallet + --with-kwallet \ + --with-swig make + + make swig-pl-lib + (cd subversion/bindings/swig/perl/native; perl Makefile.PL) + # need override LD_RUN_PATH with something valid, otherwise we get + # empty rpath which is not a good idea. + make -j1 -C subversion/bindings/swig/perl/native \ + LD_RUN_PATH="/usr/lib" EXTRALIBS="-lapr-1" } check() { make check + make check-swig-pl } package() { - make DESTDIR="$pkgdir" -j1 install + make DESTDIR="$pkgdir" -j1 install install-swig-pl-lib + + make pure_vendor_install -C subversion/bindings/swig/perl/native \ + PERL_INSTALL_ROOT="$pkgdir" + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } gnome() { @@ -64,6 +78,13 @@ kwallet() { mv "$pkgdir"/usr/lib/libsvn_auth_kwallet* "$subpkgdir"/usr/lib/ } +pl() { + pkgdesc="$pkgdesc (Perl bindings)" + install_if="$pkgname=$pkgver-r$pkgrel git" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/*perl* "$subpkgdir"/usr/lib/ +} + sha512sums="87a00b23bdac63124fa00642e2ac7e6f7818b092bc6422cabdeb2ca8fbc8c481fb8c1e4fbd86aac94e8e1fc099fa163aa0609aca23265ceb96ef4ebe78a64c13 subversion-1.12.0.tar.bz2 71b22f08a972a51347af00f979c4ec540c5795b44f3ced07ab2fcf8b1294b59add945983af4a63815d9f5d3b0ba88c24320cf2ec21189bf48c0ec46c7c0b48cf apr-1.7.0.patch 1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a python3-bang.patch" diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index 4f79995f6..79fdfc81d 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=thunar -pkgver=1.8.7 +pkgver=1.8.8 pkgrel=0 pkgdesc="File manager for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d4faf28857ee7c29c799bec9c5d7c639596b213f2aeb1089125d074083a4a13e91425cf3f35c63ce313330ee9ef070653a868a1a4526dc443a5d603bd9dec588 Thunar-1.8.7.tar.bz2" +sha512sums="364ca63169e01e8d7fe26c300ec7a6b8fd6734a364c9d0dd8943caf9ba08d6721ffdcef4905f9fdabca0da74503b8cbc4995ce271b7a5f787ae4b96b87f6bf96 Thunar-1.8.8.tar.bz2" diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD index 8637da4ff..3ced69237 100644 --- a/user/vala/APKBUILD +++ b/user/vala/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vala -pkgver=0.44.5 +pkgver=0.44.6 pkgrel=0 pkgdesc="Compiler for the Vala programming language" url="https://wiki.gnome.org/Projects/Vala" arch="all" license="LGPL-2.1+" -makedepends="glib-dev flex bison graphviz-dev" +makedepends="glib-dev flex byacc graphviz-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/vala/0.44/vala-$pkgver.tar.xz" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="898ed675e0bdfac1ca2367363f6a5b930f021b3b6bc848314b8c1d43f37a312abfc54492eaa5e35f0d83b5b688fe27e5555ea46f1aba89a92cde7e6e8173d4fe vala-0.44.5.tar.xz" +sha512sums="7b0fa6da3b7ecfe5d6731e64a7803e3dde38e843c269e7bd0d9d92dbbba2823bd17689bceec3e2ee6cf8f7884a5e1e11e1699e98808a32fef2167221bdc7b8a2 vala-0.44.6.tar.xz" diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD index a38613cc7..361da7acf 100644 --- a/user/xfce4-appfinder/APKBUILD +++ b/user/xfce4-appfinder/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-appfinder -pkgver=4.13.3 -pkgrel=1 +pkgver=4.13.4 +pkgrel=0 pkgdesc="An application finder for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="47f69e8daf6f963b8130c0380f2201cdb2d02212cfb8b5c05fedbebb78222d3bd35db0fd422418cf3f9d1f2b90e66ee4d143bed57881f5673aefca8bc58e059a xfce4-appfinder-4.13.3.tar.bz2" +sha512sums="5a5610c7cadf7f084dfd1b8ea789a954e947bebb169b3e1687f45270cee1bca162dd0656ab45bf9537b4a8a5b2af7a619c7f5d02d3d28b7dd16c76f947b8c18a xfce4-appfinder-4.13.4.tar.bz2" diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD index 9c844b5ca..ffbe56ddd 100644 --- a/user/xfce4-panel/APKBUILD +++ b/user/xfce4-panel/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-panel -pkgver=4.13.5 -pkgrel=1 +pkgver=4.13.6 +pkgrel=0 pkgdesc="Panel for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3eb4034bd6eae38f8f533b8cd2cae4ec8b40cab5f0d6810639baad641b4adaf15d03254ec79cd49d04e3498d3a4752bd9e968a0383468e7337106b3665092c4e xfce4-panel-4.13.5.tar.bz2" +sha512sums="affbf3ce5ba62f5a40ce01554ad0cae34ab57beabcaa674b0d134c515ed49e98bf4269f66f16faee33d2ebeb8254ef69642786d3bd5bbb1b7c2f28e2b344ebd5 xfce4-panel-4.13.6.tar.bz2" diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD index 9fac4619b..b57425570 100644 --- a/user/xfce4-power-manager/APKBUILD +++ b/user/xfce4-power-manager/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-power-manager -pkgver=1.6.2 -pkgrel=1 +pkgver=1.6.3 +pkgrel=0 pkgdesc="Power management support for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d1c475ad3cf194c19a2ad1decc4c80a9f504d74b64dec71887c14c576cd5a2932799cd0068f6356a15590fa67c6d0434401ad36b7a2fa6a3b62d51290cd7b68c xfce4-power-manager-1.6.2.tar.bz2" +sha512sums="4a3c629bf14b3214d57df9b9a5fc77ec675e02c300c508525634bcaf38d94ab0f6e125ea5ec7bd41c1d0c3d065dfb3ab1937ee7f1006adc0093142f466950c6b xfce4-power-manager-1.6.3.tar.bz2" diff --git a/user/xfce4-session/APKBUILD b/user/xfce4-session/APKBUILD index 45984c85d..f5b766252 100644 --- a/user/xfce4-session/APKBUILD +++ b/user/xfce4-session/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-session -pkgver=4.13.2 -pkgrel=1 +pkgver=4.13.3 +pkgrel=0 pkgdesc="Session management for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cb1e63a3df9c4ac3efcb0cce20cb5528f9d1a46731ad4b32634ad5f4a53711f05b40d98464bfd562b4e3d42b2555827ece03e63c6a433e879fa0f0a4ccda6a57 xfce4-session-4.13.2.tar.bz2" +sha512sums="e6d0886ea0cd15e5cf39d0b2c54d445fd6225085f6a7a15d0690fb2ae76aae0f0348a305f3e3c9c7e1a9400307de61f48d07b7321e00e277f185cfacb2b14097 xfce4-session-4.13.3.tar.bz2" diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD index 70798f6ce..92e5eac5a 100644 --- a/user/xfce4-settings/APKBUILD +++ b/user/xfce4-settings/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-settings -pkgver=4.13.6 -pkgrel=1 +pkgver=4.13.7 +pkgrel=0 pkgdesc="GUI settings application for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7fe4655a5644dec8688eebc508e23bace7af76c6b8eeb3821fa9a4ec79862cde64cf59ee2ac70a27ff378ef887ce6d109ef1b1d9e5f7e98f96fdb43604e024b6 xfce4-settings-4.13.6.tar.bz2" +sha512sums="5fdabb05ba9a5fac7f093bee70f56d0c58f225c649d92071618bdd4c7a5443bc9ee9289878397d7223954a4b3e2533d7ff41b42bb85b5fdb7a69d7bbeb39958d xfce4-settings-4.13.7.tar.bz2" diff --git a/user/xfce4-terminal/APKBUILD b/user/xfce4-terminal/APKBUILD index 4ab646532..5e09bf24c 100644 --- a/user/xfce4-terminal/APKBUILD +++ b/user/xfce4-terminal/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-terminal -pkgver=0.8.7.4 -pkgrel=1 +pkgver=0.8.8 +pkgrel=0 pkgdesc="Terminal for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de56c08d5be47583484acf9aa5b3c0a0f14b1ac2790e0f6b59db61f80d71f871ff87e94f9353a0cc187cf1d9dff643e40ce15ed60a24d550843d898eee3d62dd xfce4-terminal-0.8.7.4.tar.bz2" +sha512sums="0ceb130f0a0ceaa0a30a808fb7ff5070f75a84ef460c99799b267e5ecb1e0c15ef29558f78949d9a8968bfc50efebabc0f32dfc426a1db7ee6d225c6fdbf7645 xfce4-terminal-0.8.8.tar.bz2" diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index 5486de7dd..662a456f0 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfconf -pkgver=4.13.7 -pkgrel=1 +pkgver=4.13.8 +pkgrel=0 pkgdesc="Configuration framework for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -39,4 +39,4 @@ perl() { mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib } -sha512sums="113fb22b449a318b0cca6521914eda6cfeb6b2056a1aad4d49a5e83c28661c843c9912bbf7eddb7d6cd1f172b532c73dd02259bf6fabe60a377024f9f8d5825d xfconf-4.13.7.tar.bz2" +sha512sums="2b6afee1c9299e56e1576f93b34410c99b16109e83b0b34c4e13d952997d4812de6a6ab69f015c8f7fb8cf01e1b00b5d953261c3cbbfeab216c878aae3618f77 xfconf-4.13.8.tar.bz2" diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD index d4e435c18..8d6640115 100644 --- a/user/xfdesktop/APKBUILD +++ b/user/xfdesktop/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfdesktop -pkgver=4.13.4 -pkgrel=1 +pkgver=4.13.5 +pkgrel=0 pkgdesc="Desktop manager for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3943fc2af3ca3996a38900fea4a03004e1d3f8728a8517c988bd59744607ed8e4ba3f135d6075833af206df3c35464633f47e374c26fcbb8a20f0f1ecfdb7da6 xfdesktop-4.13.4.tar.bz2" +sha512sums="5191a28d29f9ba7960ada37055867fabccd2c7b047671331aadbb8d7a03a73dd5b7dd5f6043dd2f0226fa734262b52d22f0c6b77d56007a973aa01da9340f448 xfdesktop-4.13.5.tar.bz2" diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index 040bf7520..d86bf36b2 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfwm4 -pkgver=4.13.2 -pkgrel=1 +pkgver=4.13.3 +pkgrel=0 pkgdesc="Window manager for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="85440a377cd7034e986b317e35c25ac6d4723bd4c1ce1e6951d8545a44f3c47340952fd0211f55cf19411539be6d86f4c34fca7b2219b0873654a6d311c95055 xfwm4-4.13.2.tar.bz2" +sha512sums="cbd410c9a5a997be6582c9bcd0af879be2c6e5b5362c0e950bb1281b4d2f4a1acbf40b3da88fb8dea3b22f491b69bc3c6df4f75c09c8c36cf9c76a02b528785a xfwm4-4.13.3.tar.bz2" diff --git a/user/xscreensaver/APKBUILD b/user/xscreensaver/APKBUILD index 06f648560..9e68c3eda 100644 --- a/user/xscreensaver/APKBUILD +++ b/user/xscreensaver/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xscreensaver -pkgver=5.42 +pkgver=5.43 pkgrel=0 pkgdesc="X Screensaver suite" url="https://www.jwz.org/xscreensaver/" @@ -13,8 +13,7 @@ makedepends="bc gtk+2.0-dev intltool libglade-dev libice-dev libjpeg-turbo-dev libx11-dev libxft-dev libxinerama-dev libxml2-dev libxml2-utils libxrandr-dev libxt-dev linux-pam-dev mesa-dev mesa-glapi" subpackages="$pkgname-doc $pkgname-lang" -source="https://www.jwz.org/xscreensaver/xscreensaver-$pkgver.tar.gz - xscreensaver-fixes.patch" +source="https://www.jwz.org/xscreensaver/xscreensaver-$pkgver.tar.gz" build() { cd "$builddir" @@ -33,5 +32,4 @@ package() { make install_prefix="$pkgdir" install } -sha512sums="84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd xscreensaver-5.42.tar.gz -1df5d3a1456990eb0b2a9efb65fcd26ce576e470a0d6ee268e84e4b399dda930f5ed0960d185e55a7fdab10e5dc42fa2c90060b16443954ec2fce306c8855b54 xscreensaver-fixes.patch" +sha512sums="7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd xscreensaver-5.43.tar.gz" diff --git a/user/xscreensaver/xscreensaver-fixes.patch b/user/xscreensaver/xscreensaver-fixes.patch deleted file mode 100644 index 0f5381902..000000000 --- a/user/xscreensaver/xscreensaver-fixes.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nurd xscreensaver-5.42/hacks/fontglide.c xscreensaver-5.42.new/hacks/fontglide.c ---- xscreensaver-5.42/hacks/fontglide.c 2018-09-02 17:56:45.000000000 -0500 -+++ xscreensaver-5.42.new/hacks/fontglide.c 2019-03-24 14:09:46.559263834 -0500 -@@ -2421,8 +2421,8 @@ - - textclient_close (s->tc); - --// if (s->b && s->b != s->window) XFreePixmap (dpy, s->b); --// if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba); -+/* if (s->b && s->b != s->window) XFreePixmap (dpy, s->b); */ -+/* if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba); */ - XFreeGC (dpy, s->bg_gc); - if (s->charset) free (s->charset); - if (s->font_override) free (s->font_override); diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 859f3ea61..e6ac8c3cd 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xterm -pkgver=346 +pkgver=347 pkgrel=0 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" @@ -45,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ef0db8132a88b8bd980343007a61ca3c4c1b7ece23ef8e72245a17fa8305fa4dfed9cdf0613d8daf60da53fb8b03d41acd22aee04f2d51aeffb4a340268f51f7 xterm-346.tgz +sha512sums="4b90094c21b7af3042591939308538dc767d42718e9a6112115e6df12a974f8e3b7fba8d791d7c9557863fd07d08f2365fa7f759f7797f859a6fe5fe0852ab4e xterm-347.tgz e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch" |