From e36fdd4873efa6c4afee4701c9b46c490bf82956 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sun, 30 Sep 2018 20:53:07 +0200 Subject: community/firefox-developer-edition: use our tarballer --- community/firefox-developer-edition/PKGBUILD | 59 ++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/community/firefox-developer-edition/PKGBUILD b/community/firefox-developer-edition/PKGBUILD index a0a94a98..949c4715 100644 --- a/community/firefox-developer-edition/PKGBUILD +++ b/community/firefox-developer-edition/PKGBUILD @@ -4,3 +4,62 @@ eval "$( /cd mozilla-unified/a sed -i "s/\\(cargo_rustc_flags += -C lto\\)/#\\1/" config/rules.mk ' )" + +# use our tarballer instead of hg +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 -- cgit v1.2.3-54-g00ecf From e509822c63a3053f61ac6fc634c867d3734afc27 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sun, 30 Sep 2018 21:12:47 +0200 Subject: Revert "community/firefox-developer-edition: use our tarballer" extra/firefox-developer-edition: "Exception: could not resolve changeset" This reverts commit e36fdd4873efa6c4afee4701c9b46c490bf82956. --- community/firefox-developer-edition/PKGBUILD | 59 ---------------------------- 1 file changed, 59 deletions(-) diff --git a/community/firefox-developer-edition/PKGBUILD b/community/firefox-developer-edition/PKGBUILD index 949c4715..a0a94a98 100644 --- a/community/firefox-developer-edition/PKGBUILD +++ b/community/firefox-developer-edition/PKGBUILD @@ -4,62 +4,3 @@ eval "$( /cd mozilla-unified/a sed -i "s/\\(cargo_rustc_flags += -C lto\\)/#\\1/" config/rules.mk ' )" - -# use our tarballer instead of hg -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 -- cgit v1.2.3-54-g00ecf From 69c95687b78f608830dbc10faf6832c9a907eb20 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 1 Oct 2018 09:30:00 +0200 Subject: community/firefox-developer-edition: use our tarballer and set MOZ_SOURCE_CHANGESET (but still broken) --- community/firefox-developer-edition/PKGBUILD | 61 ++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) 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 -- cgit v1.2.3-54-g00ecf From d226c91d83ec41f20afba7c13ce21d38d82acef2 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Mon, 1 Oct 2018 22:51:42 +0200 Subject: core/systemd: some temporary workaround missing systemd-jornald user --- core/systemd/PKGBUILD | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 02cee487..a7e5ae15 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -7,3 +7,14 @@ 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 + ' + )" +fi -- cgit v1.2.3-54-g00ecf From aa7e9f376c22beac1d3cc37815b534a557f94900 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 2 Oct 2018 12:06:39 +0200 Subject: extra/imagemagick6: remove obsolete patch --- extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch | Bin 576 -> 0 bytes extra/imagemagick6/PKGBUILD | 11 ----------- 2 files changed, 11 deletions(-) delete mode 100644 extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch delete mode 100644 extra/imagemagick6/PKGBUILD 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 Binary files a/extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch and /dev/null differ 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 - ' -)" -- cgit v1.2.3-54-g00ecf From 216388ecdea5755e2b0386239ce2f0987db8c107 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 2 Oct 2018 12:24:01 +0200 Subject: core/findutils: add temporary fix --- core/findutils/PKGBUILD | 12 ++++++++++++ core/findutils/findutils-4.6.0-gnulib-fflush.patch | Bin 0 -> 5695 bytes core/findutils/findutils-4.6.0-gnulib-makedev.patch | Bin 0 -> 2823 bytes 3 files changed, 12 insertions(+) create mode 100644 core/findutils/PKGBUILD create mode 100644 core/findutils/findutils-4.6.0-gnulib-fflush.patch create mode 100644 core/findutils/findutils-4.6.0-gnulib-makedev.patch 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 Binary files /dev/null and b/core/findutils/findutils-4.6.0-gnulib-fflush.patch differ 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 Binary files /dev/null and b/core/findutils/findutils-4.6.0-gnulib-makedev.patch differ -- cgit v1.2.3-54-g00ecf From dd4b7eb2c08eee37547535e11e9ca0b5dfa74f3d Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 2 Oct 2018 13:51:08 +0200 Subject: core/reiserfsprogs: add temporary fix --- core/reiserfsprogs/PKGBUILD | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 core/reiserfsprogs/PKGBUILD 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/ + ' +)" -- cgit v1.2.3-54-g00ecf From 4611158e66d41f59cacfbc9c73504935019e9385 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 2 Oct 2018 14:00:54 +0200 Subject: core/gzip: add temporary fix for gnulib --- core/gzip/PKGBUILD | 5 +++++ core/gzip/gnulib.patch | Bin 0 -> 7322 bytes 2 files changed, 5 insertions(+) create mode 100644 core/gzip/PKGBUILD create mode 100644 core/gzip/gnulib.patch 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 Binary files /dev/null and b/core/gzip/gnulib.patch differ -- cgit v1.2.3-54-g00ecf From c731e6fa53364da5c4e227ddbea08ece5f0abc55 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 2 Oct 2018 14:33:39 +0200 Subject: extra/firefox: use tarballer instead of hg --- extra/firefox/PKGBUILD | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) 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 -- cgit v1.2.3-54-g00ecf From a1972ac4017520f36c1bf9a74e89486015ead22b Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Tue, 2 Oct 2018 17:37:50 +0200 Subject: core/glibc2: i486-specific temporary patching added --- core/glib2/PKGBUILD | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 core/glib2/PKGBUILD diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD new file mode 100644 index 00000000..ae229167 --- /dev/null +++ b/core/glib2/PKGBUILD @@ -0,0 +1,25 @@ +# i486-specific +if [ "${CARCH}" = "i486" ]; then + # no documentation + makedepends=(${makedepends[@]//gtk-doc/}) + eval "$( + declare -f build | \ + sed ' + s/--enable-gtk-doc// + ' + )" + + eval "$( + declare -f package_glib2 | \ + sed ' + /mv.*gtk-doc/d + ' + )" + + pkgname=(${pkgname[@]//glib2-docs}) + + # all but one test succeed, for now disable testing + # ERROR: timer - too few tests run (expected 7, got 0) + # ERROR: timer - exited with status 134 (terminated by signal 6?) + unset check +fi -- cgit v1.2.3-54-g00ecf From 3cc2ce753625b5e53cf0c4b5221432147dfca98e Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Tue, 2 Oct 2018 17:43:44 +0200 Subject: core/libidn2: temporarily removed docu building for i486 --- core/libidn2/PKGBUILD | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/libidn2/PKGBUILD diff --git a/core/libidn2/PKGBUILD b/core/libidn2/PKGBUILD new file mode 100644 index 00000000..e608d717 --- /dev/null +++ b/core/libidn2/PKGBUILD @@ -0,0 +1,6 @@ +# i486-specific +if [ "${CARCH}" = "i486" ]; then + # remove dependency on gtk-doc and ruby-ronn + makedepends=(${makedepends[@]//gtk-doc/}) + makedepends=(${makedepends[@]//ruby-ronn/}) +fi -- cgit v1.2.3-54-g00ecf From 77de0feffdf96480cc25ec5e3b476d88594fd98a Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Tue, 2 Oct 2018 19:07:47 +0200 Subject: core/dinglibs: i486-specific patch, avoid using doxygen --- core/ding-libs/PKGBUILD | 8 ++++++++ 1 file changed, 8 insertions(+) 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 -- cgit v1.2.3-54-g00ecf From e127f49d9d3b6be778de402887671c013154157d Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Tue, 2 Oct 2018 20:25:14 +0200 Subject: core/systemd: disabled checks for now on i486 (see FS#60239) --- core/systemd/PKGBUILD | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index a7e5ae15..baf567fc 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -17,4 +17,7 @@ if [ "${CARCH}" = "i486" ]; then /install.*systemd-journal/d ' )" + + # tempoary failure, known upstream, see FS#60239 + unset check fi -- cgit v1.2.3-54-g00ecf From 61beb82f05ab32fafdfa1839d5a5e21e3189e65c Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 3 Oct 2018 20:38:11 +0200 Subject: core/pacman-mirrorlist: remove inactive mirror --- core/pacman-mirrorlist/PKGBUILD | 6 +++--- core/pacman-mirrorlist/mirrorlist | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) 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 -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 -- cgit v1.2.3-54-g00ecf From 37367580269610419dd61d35d5a40dd7763a24c2 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 4 Oct 2018 08:07:27 +0200 Subject: extra/linux-pae: 4.18.11 -> 4.18.12 --- extra/linux-pae/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 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' -- cgit v1.2.3-54-g00ecf From 6b7f1a32ea1c710dc290f38fe59906ee9e69d037 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 4 Oct 2018 09:21:52 +0200 Subject: core/openssl: adapted to upstream removal of 32-bit switch (openssltarget) --- community/httpbin/PKGBUILD | 1 - core/openssl/PKGBUILD | 12 +++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 community/httpbin/PKGBUILD 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/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 -- cgit v1.2.3-54-g00ecf From 7d1da76a8b1031b042e634df60c909c713c423d7 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 4 Oct 2018 15:32:18 +0200 Subject: core/grep: add temp. fix for check() --- core/grep/PKGBUILD | 10 ++++++++++ core/grep/c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch | Bin 0 -> 1175 bytes 2 files changed, 10 insertions(+) create mode 100644 core/grep/PKGBUILD create mode 100644 core/grep/c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch 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 Binary files /dev/null and b/core/grep/c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch differ -- cgit v1.2.3-54-g00ecf