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(+) (limited to 'community') 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-70-g09d2 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(-) (limited to 'community') 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-70-g09d2 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(+) (limited to 'community') 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-70-g09d2 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 (limited to 'community') 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-70-g09d2