index : packages | |
Archlinux32 package modifications | gitolite user |
summaryrefslogtreecommitdiff |
-rw-r--r-- | community/firefox-developer-edition/PKGBUILD | 61 | ||||
-rw-r--r-- | community/httpbin/PKGBUILD | 1 | ||||
-rw-r--r-- | core/ding-libs/PKGBUILD | 8 | ||||
-rw-r--r-- | core/findutils/PKGBUILD | 12 | ||||
-rw-r--r-- | core/findutils/findutils-4.6.0-gnulib-fflush.patch | 142 | ||||
-rw-r--r-- | core/findutils/findutils-4.6.0-gnulib-makedev.patch | 80 | ||||
-rw-r--r-- | core/grep/PKGBUILD | 10 | ||||
-rw-r--r-- | core/grep/c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch | 35 | ||||
-rw-r--r-- | core/gzip/PKGBUILD | 5 | ||||
-rw-r--r-- | core/gzip/gnulib.patch | 189 | ||||
-rw-r--r-- | core/openssl/PKGBUILD | 12 | ||||
-rw-r--r-- | core/pacman-mirrorlist/PKGBUILD | 6 | ||||
-rw-r--r-- | core/pacman-mirrorlist/mirrorlist | 3 | ||||
-rw-r--r-- | core/reiserfsprogs/PKGBUILD | 8 | ||||
-rw-r--r-- | core/systemd/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/firefox/PKGBUILD | 61 | ||||
-rw-r--r-- | extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch | 17 | ||||
-rw-r--r-- | extra/imagemagick6/PKGBUILD | 11 | ||||
-rw-r--r-- | extra/linux-pae/PKGBUILD | 4 |
diff --git a/community/firefox-developer-edition/PKGBUILD b/community/firefox-developer-edition/PKGBUILD index a0a94a98..5087c006 100644 --- a/community/firefox-developer-edition/PKGBUILD +++ b/community/firefox-developer-edition/PKGBUILD @@ -3,4 +3,65 @@ eval "$( sed ' /cd mozilla-unified/a sed -i "s/\\(cargo_rustc_flags += -C lto\\)/#\\1/" config/rules.mk ' + declare -f prepare | \ + sed ' + $ i export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE" + ' )" +for ((i=0; i<${#source[@]}; i++)); do + infos=$( + printf '%s\n' "${source[${i}]}" | \ + sed -n ' + s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^?#]\+\)\(?signed\)\?#\(\(tag\|commit\)=\S\+\)$@\3 \2 \4 \5 \6@ + T + p + ' + ) + if [ -n "${infos}" ]; then + source[${i}]=$( + type="${infos%% *}" + infos="${infos#* }" + if [ -n "${infos%% *}" ]; then + prefix="${infos%% *}" + else + prefix='' + fi + infos="${infos#* }" + repo="${infos%% *}" + repo64=$( + printf '%s' "${repo}" | \ + base64 -w0 | \ + sed 's/=/%3D/g' + ) + infos="${infos#* }" + if [ "${infos%% *}" = '?signed' ]; then + key_check=$( + printf '&valid_keys=' + printf '%s,' "${validpgpkeys[@]}" | \ + sed 's/,$//' + ) + else + key_check='' + fi + infos="${infos#* }" + if [ -z "${prefix}" ]; then + prefix="${repo%.git}" + prefix="${prefix##*/}" + fi + prefix_64=$( + printf '%s/' "${prefix}" | \ + base64 -w0 | \ + sed 's/=/%3D/g' + ) + + printf '%s-%s.tar.gz::https://archive-server.archlinux32.org/?t=%s&p=%s&r=%s%s&%s\n' \ + "${prefix}" \ + "${pkgver}" \ + "${type}" \ + "${prefix_64}" \ + "${repo64}" \ + "${key_check}" \ + "${infos}" + ) + fi +done diff --git a/community/httpbin/PKGBUILD b/community/httpbin/PKGBUILD deleted file mode 100644 index a209ef85..00000000 --- a/community/httpbin/PKGBUILD +++ /dev/null @@ -1 +0,0 @@ -makedepends+=('python2-enum34') diff --git a/core/ding-libs/PKGBUILD b/core/ding-libs/PKGBUILD index ef562218..74f9000c 100644 --- a/core/ding-libs/PKGBUILD +++ b/core/ding-libs/PKGBUILD @@ -8,3 +8,11 @@ prepare() { patch -Np1 -i ../ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch } + +# i486-specific +if [ "${CARCH}" = "i486" ]; then + # disable documentation + makedepends=(${makedepends[@]//doxygen/}) + + unset check +fi diff --git a/core/findutils/PKGBUILD b/core/findutils/PKGBUILD new file mode 100644 index 00000000..0b86e611 --- /dev/null +++ b/core/findutils/PKGBUILD @@ -0,0 +1,12 @@ +# see https://bugs.archlinux.org/task/59782 + +source+=('findutils-4.6.0-gnulib-fflush.patch' + 'findutils-4.6.0-gnulib-makedev.patch') +sha1sums+=('1bc1586f6a52083939c4cabc32f12e7aead97e61' + '051382a2b0039438c2b143f2f9e5dc4bea130a09') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../findutils-4.6.0-gnulib-fflush.patch + patch -p1 -i ../findutils-4.6.0-gnulib-makedev.patch +} diff --git a/core/findutils/findutils-4.6.0-gnulib-fflush.patch b/core/findutils/findutils-4.6.0-gnulib-fflush.patch new file mode 100644 index 00000000..47ac93bb --- /dev/null +++ b/core/findutils/findutils-4.6.0-gnulib-fflush.patch @@ -0,0 +1,142 @@ +From 80cdfba079627e15129a926a133825b961d41e36 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Mon, 5 Mar 2018 10:56:29 -0800 +Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Daniel P. Berrangé in: +https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html +* lib/fflush.c (clear_ungetc_buffer_preserving_position) +(disable_seek_optimization, rpl_fflush): +* lib/fpurge.c (fpurge): +* lib/freadahead.c (freadahead): +* lib/freading.c (freading): +* lib/fseeko.c (fseeko): +* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: +Define if not already defined. + +Upstream-commit: 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e +Signed-off-by: Kamil Dudka <kdudka@redhat.com> +--- + gl/lib/fflush.c | 6 +++--- + gl/lib/fpurge.c | 2 +- + gl/lib/freadahead.c | 2 +- + gl/lib/freading.c | 2 +- + gl/lib/fseeko.c | 4 ++-- + gl/lib/stdio-impl.h | 6 ++++++ + 6 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/gl/lib/fflush.c b/gl/lib/fflush.c +index 5ae3e41..7a82470 100644 +--- a/gl/lib/fflush.c ++++ b/gl/lib/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff --git a/gl/lib/fpurge.c b/gl/lib/fpurge.c +index f313b22..ecdf82d 100644 +--- a/gl/lib/fpurge.c ++++ b/gl/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff --git a/gl/lib/freadahead.c b/gl/lib/freadahead.c +index 094daab..3f8101e 100644 +--- a/gl/lib/freadahead.c ++++ b/gl/lib/freadahead.c +@@ -25,7 +25,7 @@ + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +diff --git a/gl/lib/freading.c b/gl/lib/freading.c +index 0512b19..8c48fe4 100644 +--- a/gl/lib/freading.c ++++ b/gl/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff --git a/gl/lib/fseeko.c b/gl/lib/fseeko.c +index 1c65d2a..9026408 100644 +--- a/gl/lib/fseeko.c ++++ b/gl/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +diff --git a/gl/lib/stdio-impl.h b/gl/lib/stdio-impl.h +index 502d891..ea38ee2 100644 +--- a/gl/lib/stdio-impl.h ++++ b/gl/lib/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + +-- +2.16.2 + diff --git a/core/findutils/findutils-4.6.0-gnulib-makedev.patch b/core/findutils/findutils-4.6.0-gnulib-makedev.patch new file mode 100644 index 00000000..5ed4b480 --- /dev/null +++ b/core/findutils/findutils-4.6.0-gnulib-makedev.patch @@ -0,0 +1,80 @@ +From 80628047a6cc83f82e0c410a82b8f7facd9d50f2 Mon Sep 17 00:00:00 2001 +From: Eric Blake <eblake@redhat.com> +Date: Wed, 14 Sep 2016 19:21:42 -0500 +Subject: [PATCH] mountlist: include sysmacros.h for glibc + +On Fedora rawhide (glibc 2.25), './gnulib-tool --test mountlist' +reports: +../../gllib/mountlist.c: In function 'read_file_system_list': +../../gllib/mountlist.c:534:13: warning: '__makedev_from_sys_types' is deprecated: + In the GNU C Library, `makedev' is defined by <sys/sysmacros.h>. + For historical compatibility, it is currently defined by + <sys/types.h> as well, but we plan to remove this soon. + To use `makedev', include <sys/sysmacros.h> directly. + If you did not intend to use a system-defined macro `makedev', + you should #undef it after including <sys/types.h>. + [-Wdeprecated-declarations] + me->me_dev = makedev (devmaj, devmin); + ^~ +In file included from /usr/include/features.h:397:0, + from /usr/include/sys/types.h:25, + from ./sys/types.h:28, + from ../../gllib/mountlist.h:23, + from ../../gllib/mountlist.c:20: +/usr/include/sys/sysmacros.h:89:1: note: declared here + __SYSMACROS_DEFINE_MAKEDEV (__SYSMACROS_FST_IMPL_TEMPL) + ^ + +Fix it by including the right headers. We also need a fix to +autoconf's AC_HEADER_MAJOR, but that's a separate patch. + +* m4/mountlist.m4 (gl_PREREQ_MOUTLIST_EXTRA): Include +AC_HEADER_MAJOR. +* lib/mountlist.c (includes): Use correct headers. + +Signed-off-by: Eric Blake <eblake@redhat.com> + +Upstream-commit: 4da63c5881f60f71999a943612da9112232b9161 +Signed-off-by: Kamil Dudka <kdudka@redhat.com> +--- + gl/lib/mountlist.c | 6 ++++++ + gl/m4/mountlist.m4 | 3 ++- + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/gl/lib/mountlist.c b/gl/lib/mountlist.c +index c3d2852..0b6f92e 100644 +--- a/gl/lib/mountlist.c ++++ b/gl/lib/mountlist.c +@@ -37,6 +37,12 @@ + # include <sys/param.h> + #endif + ++#if MAJOR_IN_MKDEV ++# include <sys/mkdev.h> ++#elif MAJOR_IN_SYSMACROS ++# include <sys/sysmacros.h> ++#endif ++ + #if defined MOUNTED_GETFSSTAT /* OSF_1 and Darwin1.3.x */ + # if HAVE_SYS_UCRED_H + # include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS, +diff --git a/gl/m4/mountlist.m4 b/gl/m4/mountlist.m4 +index ec58dc8..82b2dcb 100644 +--- a/gl/m4/mountlist.m4 ++++ b/gl/m4/mountlist.m4 +@@ -1,4 +1,4 @@ +-# serial 11 ++# serial 12 + dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -15,5 +15,6 @@ AC_DEFUN([gl_PREREQ_MOUNTLIST_EXTRA], + [ + dnl Note gl_LIST_MOUNTED_FILE_SYSTEMS checks for mntent.h, not sys/mntent.h. + AC_CHECK_HEADERS([sys/mntent.h]) ++ AC_HEADER_MAJOR()dnl for use of makedev () + gl_FSTYPENAME + ]) +-- +2.16.2 + diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD new file mode 100644 index 00000000..4b29ad28 --- /dev/null +++ b/core/grep/PKGBUILD @@ -0,0 +1,10 @@ +# see https://bugs.archlinux.org/task/60201 + +source+=('c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch') +md5sums+=('0d3082d1d1fb77e7575c106fc4df1341') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch + autoreconf -vfi +} diff --git a/core/grep/c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch b/core/grep/c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch new file mode 100644 index 00000000..75c62541 --- /dev/null +++ b/core/grep/c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch @@ -0,0 +1,35 @@ +From c505b0bce73c712f1297bc5f424e0de5e4ec3137 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Thu, 9 Aug 2018 10:52:48 -0700 +Subject: tests: backref-alt works with glibc 2.28 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Jaroslav Skarvada (Bug#32409). +* tests/Makefile.am (XFAIL_TESTS) [!USE_INCLUDED_REGEX]: +Don’t add backref-alt, since this bug is fixed in glibc 2.28. +--- + tests/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 9f52941..d9f9ee8 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -56,9 +56,9 @@ XFAIL_TESTS = triple-backref + if USE_INCLUDED_REGEX + XFAIL_TESTS += equiv-classes + else +-# The backslash-alt test fails for glibc, which needs to be fixed. +-# FIXME-2015: Remove this once the glibc bug is fixed. +-XFAIL_TESTS += backref-alt ++# The backslash-alt test fails for glibc 2.27 and earlier. ++# If you're using older glibc you can upgrade to glibc 2.28 or later, ++# configure --with-included-regex, or ignore the test failure. + endif + + TESTS = \ +-- +cgit v1.0-41-gc330 + diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD new file mode 100644 index 00000000..ef13027a --- /dev/null +++ b/core/gzip/PKGBUILD @@ -0,0 +1,5 @@ +# see: https://bugs.archlinux.org/task/60202 +# source: https://src.fedoraproject.org/rpms/gzip/raw/master/f/gnulib.patch + +source+=('gnulib.patch') +md5sums+=('SKIP') diff --git a/core/gzip/gnulib.patch b/core/gzip/gnulib.patch new file mode 100644 index 00000000..68e8d518 --- /dev/null +++ b/core/gzip/gnulib.patch @@ -0,0 +1,189 @@ +From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <address@hidden> +Date: Mon, 5 Mar 2018 10:56:29 -0800 +Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Daniel P. Berrangé in: +https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html +* lib/fbufmode.c (fbufmode): +* lib/fflush.c (clear_ungetc_buffer_preserving_position) +(disable_seek_optimization, rpl_fflush): +* lib/fpending.c (__fpending): +* lib/fpurge.c (fpurge): +* lib/freadable.c (freadable): +* lib/freadahead.c (freadahead): +* lib/freading.c (freading): +* lib/freadptr.c (freadptr): +* lib/freadseek.c (freadptrinc): +* lib/fseeko.c (fseeko): +* lib/fseterr.c (fseterr): +* lib/fwritable.c (fwritable): +* lib/fwriting.c (fwriting): +Check _IO_EOF_SEEN instead of _IO_ftrylockfile. +* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: +Define if not already defined. +--- + ChangeLog | 23 +++++++++++++++++++++++ + lib/fbufmode.c | 2 +- + lib/fflush.c | 6 +++--- + lib/fpending.c | 2 +- + lib/fpurge.c | 2 +- + lib/freadable.c | 2 +- + lib/freadahead.c | 2 +- + lib/freading.c | 2 +- + lib/freadptr.c | 2 +- + lib/freadseek.c | 2 +- + lib/fseeko.c | 4 ++-- + lib/fseterr.c | 2 +- + lib/fwritable.c | 2 +- + lib/fwriting.c | 2 +- + lib/stdio-impl.h | 6 ++++++ + 15 files changed, 45 insertions(+), 16 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 667f91663..beb835670 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,26 @@ ++2018-03-05 Paul Eggert <address@hidden> ++ ++ fflush: adjust to glibc 2.28 libio.h removal ++ Problem reported by Daniel P. Berrangé in: ++ https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html ++ * lib/fbufmode.c (fbufmode): ++ * lib/fflush.c (clear_ungetc_buffer_preserving_position) ++ (disable_seek_optimization, rpl_fflush): ++ * lib/fpending.c (__fpending): ++ * lib/fpurge.c (fpurge): ++ * lib/freadable.c (freadable): ++ * lib/freadahead.c (freadahead): ++ * lib/freading.c (freading): ++ * lib/freadptr.c (freadptr): ++ * lib/freadseek.c (freadptrinc): ++ * lib/fseeko.c (fseeko): ++ * lib/fseterr.c (fseterr): ++ * lib/fwritable.c (fwritable): ++ * lib/fwriting.c (fwriting): ++ Check _IO_EOF_SEEN instead of _IO_ftrylockfile. ++ * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: ++ Define if not already defined. ++ + 2018-01-07 Jim Meyering <meyering@fb.com> + + version 1.9 + * NEWS: Record release date. +diff --git a/lib/fflush.c b/lib/fflush.c +index 983ade0ff..a6edfa105 100644 +--- a/lib/fflush.c ++++ b/lib/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff --git a/lib/fpurge.c b/lib/fpurge.c +index b1d417c7a..3aedcc373 100644 +--- a/lib/fpurge.c ++++ b/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff --git a/lib/freading.c b/lib/freading.c +index 73c28acdd..c24d0c88a 100644 +--- a/lib/freading.c ++++ b/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff --git a/lib/fseeko.c b/lib/fseeko.c +index 0101ab55f..193f4e8ce 100644 +--- a/lib/fseeko.c ++++ b/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +diff --git a/lib/fseterr.c b/lib/fseterr.c +index 82649c3ac..adb637256 100644 +--- a/lib/fseterr.c ++++ b/lib/fseterr.c +@@ -29,7 +29,7 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h +index 78d896e9f..05c5752a2 100644 +--- a/lib/stdio-impl.h ++++ b/lib/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + +-- +2.14.3 + diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index e3e0d088..4446cbc6 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,11 +1,17 @@ -# i486-specific +# switch to 32-bit target (was linux-elf before, which I think is wrong also for i686) +eval "$( + declare -f build | \ + sed ' + s@linux-x86_64@linux-generic32@ + ' +)" + +# i486-specific, disable hand-crafted assembly code if [ "${CARCH}" = "i486" ]; then eval "$( declare -f build | \ sed ' s@no-ssl3-method@no-ssl3-method no-ssl2 no-ssl3@ - s@'i686'@'i486'@ - s@'linux-elf'@'linux-generic32'@ ' )" fi diff --git a/core/pacman-mirrorlist/PKGBUILD b/core/pacman-mirrorlist/PKGBUILD index 018c5f6d..55d92161 100644 --- a/core/pacman-mirrorlist/PKGBUILD +++ b/core/pacman-mirrorlist/PKGBUILD @@ -1,4 +1,4 @@ # Maintainer: Erich Eckner <deep42thought@archlinux32.org> -sha256sums=('330892243af0c4c88380730a66d6bc296e5130a26d70e6a423a82de3e93d21b5') -md5sums=('0bb24984943f845f8c03991b5916dbc0') -url='https://packages.archlinux32.org/mirrors/' +pkgver=20181003 +sha256sums=('de556975ca0af6b98d1014f3b9ac9c6e70f7c4d1412e22245365cca065fcc538') +md5sums=('8a9a14d27fedb1aa7fce13ac61952d8a') diff --git a/core/pacman-mirrorlist/mirrorlist b/core/pacman-mirrorlist/mirrorlist index a61e3bd6..99843b0b 100644 --- a/core/pacman-mirrorlist/mirrorlist +++ b/core/pacman-mirrorlist/mirrorlist @@ -3,9 +3,6 @@ ## Generated on 2017-11-15 ## -## Canada -#Server = http://arch32.mirrors.simplysam.us/$arch/$repo - ## Belarus #Server = http://mirror.datacenter.by/pub/archlinux32/$arch/$repo diff --git a/core/reiserfsprogs/PKGBUILD b/core/reiserfsprogs/PKGBUILD new file mode 100644 index 00000000..857dea64 --- /dev/null +++ b/core/reiserfsprogs/PKGBUILD @@ -0,0 +1,8 @@ +# see https://bugs.archlinux.org/task/60204 + +eval "$( + declare -f build | \ + sed ' + s/ -fgnu89-inline/\0 -D_GNU_SOURCE/ + ' +)" diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 02cee487..baf567fc 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -7,3 +7,17 @@ eval "$( /patch.*0001.*/a patch -Np1 -i ../meson-rename-Ddebug-to-Ddebug-extra.patch ' )" + +# i486-specific +if [ "${CARCH}" = "i486" ]; then + # temporary, as there is no systemd-journal user for some reason!? + eval "$( + declare -f package_systemd | \ + sed ' + /install.*systemd-journal/d + ' + )" + + # tempoary failure, known upstream, see FS#60239 + unset check +fi diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD index a0a94a98..5087c006 100644 --- a/extra/firefox/PKGBUILD +++ b/extra/firefox/PKGBUILD @@ -3,4 +3,65 @@ eval "$( sed ' /cd mozilla-unified/a sed -i "s/\\(cargo_rustc_flags += -C lto\\)/#\\1/" config/rules.mk ' + declare -f prepare | \ + sed ' + $ i export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE" + ' )" +for ((i=0; i<${#source[@]}; i++)); do + infos=$( + printf '%s\n' "${source[${i}]}" | \ + sed -n ' + s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^?#]\+\)\(?signed\)\?#\(\(tag\|commit\)=\S\+\)$@\3 \2 \4 \5 \6@ + T + p + ' + ) + if [ -n "${infos}" ]; then + source[${i}]=$( + type="${infos%% *}" + infos="${infos#* }" + if [ -n "${infos%% *}" ]; then + prefix="${infos%% *}" + else + prefix='' + fi + infos="${infos#* }" + repo="${infos%% *}" + repo64=$( + printf '%s' "${repo}" | \ + base64 -w0 | \ + sed 's/=/%3D/g' + ) + infos="${infos#* }" + if [ "${infos%% *}" = '?signed' ]; then + key_check=$( + printf '&valid_keys=' + printf '%s,' "${validpgpkeys[@]}" | \ + sed 's/,$//' + ) + else + key_check='' + fi + infos="${infos#* }" + if [ -z "${prefix}" ]; then + prefix="${repo%.git}" + prefix="${prefix##*/}" + fi + prefix_64=$( + printf '%s/' "${prefix}" | \ + base64 -w0 | \ + sed 's/=/%3D/g' + ) + + printf '%s-%s.tar.gz::https://archive-server.archlinux32.org/?t=%s&p=%s&r=%s%s&%s\n' \ + "${prefix}" \ + "${pkgver}" \ + "${type}" \ + "${prefix_64}" \ + "${repo64}" \ + "${key_check}" \ + "${infos}" + ) + fi +done diff --git a/extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch b/extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch deleted file mode 100644 index 57e22254..00000000 --- a/extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -rauN ImageMagick-6.9.10-11/Magick++/lib/Magick++/Color.h ImageMagick-6.9.10-11-bug17-patch/Magick++/lib/Magick++/Color.h ---- ImageMagick-6.9.10-11/Magick++/lib/Magick++/Color.h 2018-08-28 14:31:12.000000000 +0200 -+++ ImageMagick-6.9.10-11-bug17-patch/Magick++/lib/Magick++/Color.h 2018-09-01 15:14:05.133038562 +0200 -@@ -122,11 +122,12 @@ - { - return (static_cast<double>(quantum_)/QuantumRange); - } --#endif -+#else - static double scaleQuantumToDouble(const double quantum_) - { - return (quantum_/QuantumRange); - } -+#endif - - protected: - diff --git a/extra/imagemagick6/PKGBUILD b/extra/imagemagick6/PKGBUILD deleted file mode 100644 index c16dae59..00000000 --- a/extra/imagemagick6/PKGBUILD +++ /dev/null @@ -1,11 +0,0 @@ -# see https://github.com/ImageMagick/ImageMagick6/issues/17 - -source+=('ImageMagick-6.9.10-11-bug17.patch') -sha256sums+=('59592dba2feebf4457e0d79e95bd212f41a6e6bbec0ed7d3aaf43328047e9c96') - -eval "$( - declare -f prepare | \ - sed ' - /patch/ a patch -Np1 -i ../ImageMagick-6.9.10-11-bug17.patch - ' -)" diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD index 83773abd..a067b90e 100644 --- a/extra/linux-pae/PKGBUILD +++ b/extra/linux-pae/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgbase=linux-pae # Build stock -ARCH kernel -pkgver='4.18.11' +pkgver='4.18.12' _srcname=linux-${pkgver} pkgrel='1' arch=('i686') @@ -24,7 +24,7 @@ validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('36d319f5a6caf5dd6ab2a4802b800799b56ef5963d742f2d147fabadf4822c8c' +sha256sums=('846a5ad9cbe576f66aeeb188c9bd45d14eee0783aebfc4ea853dac09a7159fc5' 'SKIP' 'e8884986b8b50a560ba6b4be383955b97c98e4cb148aa2bc2387a4869e020bb3' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' |