diff options
| -rw-r--r-- | libre/pacman/0001-Revert-makepkg-use-the-declare-builtin-when-backing-.patch | 66 | ||||
| -rw-r--r-- | libre/pacman/0001-Sychronize-filesystem.patch | 5 | ||||
| -rw-r--r-- | libre/pacman/0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch | 27 | ||||
| -rw-r--r-- | libre/pacman/0001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch (renamed from libre/pacman/0001-makepkg-treat-pkgrel-more-similarly-to-pkgver.patch) | 41 | ||||
| -rw-r--r-- | libre/pacman/0002-Revert-close-stdin-before-running-install-scripts.patch | 5 | ||||
| -rw-r--r-- | libre/pacman/0002-makepkg-Don-t-use-parameterless-return.patch | 93 | ||||
| -rw-r--r-- | libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch | 3 | ||||
| -rw-r--r-- | libre/pacman/PKGBUILD | 42 |
8 files changed, 44 insertions, 238 deletions
diff --git a/libre/pacman/0001-Revert-makepkg-use-the-declare-builtin-when-backing-.patch b/libre/pacman/0001-Revert-makepkg-use-the-declare-builtin-when-backing-.patch deleted file mode 100644 index d3d96b87d..000000000 --- a/libre/pacman/0001-Revert-makepkg-use-the-declare-builtin-when-backing-.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 10ca4f48311370cdd580f66096d5e94858fde467 Mon Sep 17 00:00:00 2001 -From: Allan McRae <allan@archlinux.org> -Date: Tue, 19 Jun 2018 21:08:28 +1000 -Subject: [PATCH] Revert "makepkg: use the `declare` builtin when backing up - variables to eval" - -This reverts commit 9e52a36794552b77ecf26f7f34b226d096978f1e. - -The change to use declare for the split package metadata backup/restore -resulted in variables being declared at a local scope. When these variables -were unset (mostly noticed with debug packaging) this left the variable at -global scope defined. The decided fix for this requires the use of -bash-4.2 features, which is greater than our current minimum version and so -is not suitable for a maint release. Revert the change in the meantime. - -Signed-off-by: Allan McRae <allan@archlinux.org> ---- - scripts/makepkg.sh.in | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in -index 32423262..d35dd62d 100644 ---- a/scripts/makepkg.sh.in -+++ b/scripts/makepkg.sh.in -@@ -1125,22 +1125,34 @@ check_build_status() { - backup_package_variables() { - local var - for var in ${splitpkg_overrides[@]}; do -- declare -p $var 2>/dev/null || printf '%s\n' "unset $var" -+ local indirect="${var}_backup" -+ eval "${indirect}=(\"\${$var[@]}\")" -+ done -+} -+ -+restore_package_variables() { -+ local var -+ for var in ${splitpkg_overrides[@]}; do -+ local indirect="${var}_backup" -+ if [[ -n ${!indirect} ]]; then -+ eval "${var}=(\"\${$indirect[@]}\")" -+ else -+ unset ${var} -+ fi - done - } - - run_split_packaging() { - local pkgname_backup=("${pkgname[@]}") -- local restore_package_variables - for pkgname in ${pkgname_backup[@]}; do - pkgdir="$pkgdirbase/$pkgname" - mkdir "$pkgdir" -- restore_package_variables="$(backup_package_variables)" -+ backup_package_variables - run_package $pkgname - tidy_install - lint_package || exit $E_PACKAGE_FAILED - create_package -- eval "$restore_package_variables" -+ restore_package_variables - done - pkgname=("${pkgname_backup[@]}") - create_debug_package --- -2.17.1 - diff --git a/libre/pacman/0001-Sychronize-filesystem.patch b/libre/pacman/0001-Sychronize-filesystem.patch index 159c65f32..49ca47cbe 100644 --- a/libre/pacman/0001-Sychronize-filesystem.patch +++ b/libre/pacman/0001-Sychronize-filesystem.patch @@ -1,5 +1,5 @@ From 60abb58d9db663e6050d8d61d67e0e893306dfb0 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich +From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sat, 13 Sep 2014 18:58:16 -0600 Subject: [PATCH 1/3] Sychronize filesystem @@ -8,7 +8,7 @@ particularly package installations followed by a reboot very shorly after, this will perform a sync() after installations and removals to ensure a consistent filesystem state after package operations. -Signed-off-by: Kevin Mihelich +Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> --- lib/libalpm/trans.c | 3 +++ 1 file changed, 3 insertions(+) @@ -29,3 +29,4 @@ index af964832..b3f9049e 100644 -- 2.17.0 + diff --git a/libre/pacman/0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch b/libre/pacman/0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch deleted file mode 100644 index b4a5f16ae..000000000 --- a/libre/pacman/0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 842bdfbb622db0673d4952812a490e10f61fa3bd Mon Sep 17 00:00:00 2001 -Message-Id: <842bdfbb622db0673d4952812a490e10f61fa3bd.1527784094.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Thu, 31 May 2018 17:01:16 +0200 -Subject: [PATCH 1/2] makepkg: Clear ERR trap before trying to restore it - -$restoretrap is empty if the trap was not set. This caused the trap -handler to remain and override later exit codes. ---- - scripts/makepkg.sh.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in -index e9080a70..d67fd853 100644 ---- a/scripts/makepkg.sh.in -+++ b/scripts/makepkg.sh.in -@@ -432,6 +432,7 @@ run_function_safe() { - - run_function "$1" - -+ trap - ERR - eval "$restoretrap" - eval "$restoreset" - eval "$restoreshopt" --- -2.17.0 - diff --git a/libre/pacman/0001-makepkg-treat-pkgrel-more-similarly-to-pkgver.patch b/libre/pacman/0001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch index 4f74d7ec4..e2d19122f 100644 --- a/libre/pacman/0001-makepkg-treat-pkgrel-more-similarly-to-pkgver.patch +++ b/libre/pacman/0001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch @@ -1,36 +1,39 @@ -From 0c2242fa1569a3516c59e3d84d28a2d8603aa774 Mon Sep 17 00:00:00 2001 -From: Luke Shumaker <lukeshu@sbcglobal.net> +From 612fb2a528924fef206ba0e49122167eb553e139 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> Date: Thu, 14 Apr 2016 17:06:07 -0400 -Subject: [PATCH 1/1] makepkg: treat pkgrel more similarly to pkgver +Subject: [PATCH] makepkg: Treat pkgrel more similarly to pkgver This is perfectly fine with libalpm; it was only makepkg that was more strict with pkgrel than pkgver. Further, the former error message about invalid pkgrel formats claimed that pkgrel was a "decimal", which would mean that `1.1 == 1.10`. This is not -the case; alpm parses pkgrel as a version, not a decimal. In that light, -enforcing /[0-9]+(\.([0-9]+)?/ on a version spec seems silly. +the case; alpm parses pkgrel as a version, not as a decimal. In that +light, enforcing /[0-9]+(\.([0-9]+)?/ on a version spec seems silly. --- - doc/PKGBUILD.5.txt | 4 ++-- + doc/PKGBUILD.5.asciidoc | 5 ++-- scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 4 ++-- - test/util/vercmptest.sh | 23 ++++++++++++++++++++++- - 3 files changed, 26 insertions(+), 5 deletions(-) + test/util/vercmptest.sh | 23 ++++++++++++++++++- + 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc -index e410481..86df1e8 100644 +index f12effde..1ad8de37 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc -@@ -62,7 +62,7 @@ below). +@@ -60,9 +60,8 @@ systems (see below). allows package maintainers to make updates to the package's configure flags, for example. This is typically set to '1' for each new upstream software release and incremented for intermediate PKGBUILD updates. The -- variable is not allowed to contain hyphens. -+ variable is not allowed to contain colons, hyphens or whitespace. +- variable is a postive integer, with an optional subrelease level +- specified by adding another postive integer separated by a period +- (i.e. in the form x.y). ++ variable is not allowed to contain colons, forward slashes, hyphens or ++ whitespace. *epoch*:: Used to force the package to be seen as newer than any previous versions diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in -index 95cb808..ca618f8 100644 +index f294a3bf..07292613 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in @@ -35,8 +35,8 @@ lint_pkgrel() { @@ -39,13 +42,13 @@ index 95cb808..ca618f8 100644 - if [[ $pkgrel != +([0-9])?(.+([0-9])) ]]; then - error "$(gettext "%s must be a decimal, not %s.")" "pkgrel" "$pkgrel" -+ if [[ $pkgrel = *[[:space:]:-]* ]]; then -+ error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgrel" "$pkgrel" ++ if [[ $pkgrel = *[[:space:]/:-]* ]]; then ++ error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace.")" "pkgrel" "$pkgrel" return 1 fi } diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh -index 5542f59..4f9b1f3 100755 +index 1541e7ae..f41a0d1e 100755 --- a/test/util/vercmptest.sh +++ b/test/util/vercmptest.sh @@ -39,7 +39,7 @@ tap_runtest() { @@ -57,7 +60,7 @@ index 5542f59..4f9b1f3 100755 # all similar length, no pkgrel tap_runtest 1.5.0 1.5.0 0 -@@ -113,6 +113,27 @@ tap_runtest 1:1.0 1.0 1 +@@ -113,4 +113,25 @@ tap_runtest 1:1.0 1.0 1 tap_runtest 1:1.0 1.1 1 tap_runtest 1:1.1 1.1 1 @@ -83,8 +86,6 @@ index 5542f59..4f9b1f3 100755 +tap_runtest 1-3 1-2.par1 1 + tap_finish - - # vim: set noet: -- -2.8.0 +2.18.0 diff --git a/libre/pacman/0002-Revert-close-stdin-before-running-install-scripts.patch b/libre/pacman/0002-Revert-close-stdin-before-running-install-scripts.patch index 62ec5c7f7..80d9e2c6f 100644 --- a/libre/pacman/0002-Revert-close-stdin-before-running-install-scripts.patch +++ b/libre/pacman/0002-Revert-close-stdin-before-running-install-scripts.patch @@ -1,5 +1,5 @@ From d892998ecea95c8224b128e1797a0e5a970436a8 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich +From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sat, 30 Jan 2016 17:19:03 -0700 Subject: [PATCH 2/3] Revert "close stdin before running install scripts" @@ -10,7 +10,7 @@ prompting the user to flash a new kernel to a bare partition. Removing this feature will undoubtedly cause more problems than it intends to solve. -Signed-off-by: Kevin Mihelich +Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> --- lib/libalpm/util.c | 1 - 1 file changed, 1 deletion(-) @@ -29,3 +29,4 @@ index 102a879a..c9fdd4af 100644 while(dup2(child2parent_pipefd[HEAD], 1) == -1 && errno == EINTR); -- 2.17.0 + diff --git a/libre/pacman/0002-makepkg-Don-t-use-parameterless-return.patch b/libre/pacman/0002-makepkg-Don-t-use-parameterless-return.patch deleted file mode 100644 index c919e4f09..000000000 --- a/libre/pacman/0002-makepkg-Don-t-use-parameterless-return.patch +++ /dev/null @@ -1,93 +0,0 @@ -From bd164585f1a815a9f57b0c5bd2365d251500bc9f Mon Sep 17 00:00:00 2001 -Message-Id: <bd164585f1a815a9f57b0c5bd2365d251500bc9f.1527784094.git.jan.steffens@gmail.com> -In-Reply-To: <842bdfbb622db0673d4952812a490e10f61fa3bd.1527784094.git.jan.steffens@gmail.com> -References: <842bdfbb622db0673d4952812a490e10f61fa3bd.1527784094.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Thu, 31 May 2018 17:46:51 +0200 -Subject: [PATCH 2/2] makepkg: Don't use parameterless return - -It's especially dangerous in trap handlers since the return value of the -function becomes the return value of the last command before the trap, -not the last command in the current function. This applies to any -function executed in a trap handler, nested functions included. - -In one case, install_packages failed (via return 14), which was inside a -conditional that then ran exit 14, which triggered the EXIT handler, -which called clean_up, which called remove_deps, which had !RMDEPS and -thus returned. The return value of remove_deps became the return value -of install_packages, triggering the ERR handler, which (due to another -problem) was still the user function handler, which then printed a -misleading error message and overrode the exit code with 4. ---- - scripts/makepkg.sh.in | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in -index d67fd853..15524dc0 100644 ---- a/scripts/makepkg.sh.in -+++ b/scripts/makepkg.sh.in -@@ -133,7 +133,7 @@ clean_up() { - - if (( INFAKEROOT )); then - # Don't clean up when leaving fakeroot, we're not done yet. -- return -+ return 0 - fi - - if (( (EXIT_CODE == E_OK || EXIT_CODE == E_INSTALL_FAILED) && CLEANUP )); then -@@ -313,7 +313,7 @@ resolve_deps() { - } - - remove_deps() { -- (( ! RMDEPS )) && return -+ (( ! RMDEPS )) && return 0 - - # check for packages removed during dependency install (e.g. due to conflicts) - # removing all installed packages is risky in this case -@@ -519,7 +519,7 @@ find_libdepends() { - - if (( sodepends == 0 )); then - (( ${#depends[@]} )) && printf '%s\n' "${depends[@]}" -- return; -+ return 0; - fi - - local libdeps filename soarch sofile soname soversion; -@@ -721,7 +721,7 @@ list_package_files() { - } - - create_package() { -- (( NOARCHIVE )) && return -+ (( NOARCHIVE )) && return 0 - - if [[ ! -d $pkgdir ]]; then - error "$(gettext "Missing %s directory.")" "\$pkgdir/" -@@ -784,14 +784,14 @@ create_package() { - create_debug_package() { - # check if a debug package was requested - if ! check_option "debug" "y" || ! check_option "strip" "y"; then -- return -+ return 0 - fi - - pkgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@" - - # check if we have any debug symbols to package - if dir_is_empty "$pkgdir/usr/lib/debug"; then -- return -+ return 0 - fi - - unset groups depends optdepends provides conflicts replaces backup install changelog -@@ -875,7 +875,7 @@ create_srcpackage() { - } - - install_package() { -- (( ! INSTALL )) && return -+ (( ! INSTALL )) && return 0 - - if (( ! SPLITPKG )); then - msg "$(gettext "Installing package %s with %s...")" "$pkgname" "$PACMAN -U" --- -2.17.0 - diff --git a/libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch b/libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch index c6b8b6160..302bf0ebc 100644 --- a/libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch +++ b/libre/pacman/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch @@ -1,5 +1,5 @@ From dd8d526a39c86c300f158c581e028365efe60a64 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich +From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Fri, 11 Mar 2016 20:11:24 -0700 Subject: [PATCH 3/3] Revert "alpm_run_chroot: always connect parent2child pipe" @@ -57,3 +57,4 @@ index c9fdd4af..2d57b256 100644 #define STOP_POLLING(p) do { close(p->fd); p->fd = -1; } while(0) -- 2.17.0 + diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 62ec0cc21..0d81747eb 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -4,15 +4,15 @@ # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org> # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info> # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info> -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer: Luke Shumaker <lukeshu@parabola.nu> # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe> # Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar> # Contributor: Daniel Milewski <niitotantei@riseup.net> pkgname=pacman -pkgver=5.1.0 -pkgrel=2 -pkgrel+=.parabola2 +pkgver=5.1.1 +pkgrel=1 +pkgrel+=.parabola1 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') arch+=('i686' 'armv7h') @@ -25,7 +25,7 @@ depends=('bash' 'glibc' 'libarchive' 'curl' depends+=('parabola-keyring' 'archlinuxarm-keyring' 'archlinux32-keyring') makedepends=('asciidoc') checkdepends=('python2' 'fakechroot') -optdpepends=('perl-locale-gettext: translation support in makepkg-template') +optdepends=('perl-locale-gettext: translation support in makepkg-template') provides=('pacman-parabola') conflicts=('pacman-parabola') replaces=('pacman-parabola') @@ -34,38 +34,29 @@ options=('strip' 'debug') validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@archlinux.org> 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org> source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} - 0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch - 0002-makepkg-Don-t-use-parameterless-return.patch "${arch[@]/#/pacman.conf.}" makepkg.conf.in pacman-keyring.service pacman-keyring.timer - 0001-Sychronize-filesystem.patch - 0002-Revert-close-stdin-before-running-install-scripts.patch - 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch - 0001-makepkg-treat-pkgrel-more-similarly-to-pkgver.patch - 0001-Revert-makepkg-use-the-declare-builtin-when-backing-.patch) -sha256sums=('9f5993fc8923530713742f15df284677f297b3eca15ed7a24758c98ac7399bd3' + 0001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch) +source_armv7h=(0001-Sychronize-filesystem.patch + 0002-Revert-close-stdin-before-running-install-scripts.patch + 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch) +sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d' 'SKIP' - '9b2304141582a421e812c76760a74f360a3cbd780472cbb60cf023a34d6fcb3d' - '2a31d4db5f6e19e0148d4892de14317514f2b2dfb5369c7972a641ca8be89e5a' '1b2c8f4ec84d0dc496516880a54b5e4deb78798618c9cf5e284a45303f156e58' '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad' 'b2cb3ba229edba338c0af7d7f5bb1a6ef6143bcd453c693bfee0c02fa1cfa18a' 'ecef1e98eaaf207f4f2c3d07cfe13533866e1e774240eb833e8b3bd691ada95f' '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d' '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6' - '635ef682073878b6273e3376b00a89a572c4f5f39b118f7b0b4c7497a265a16c' - 'e9e63a58ba7022869b001f4badbfcf340c47c19ab345c77bef3b2287cf9045fd' - '94e6771cc47ba0bd19f67f2c866dfd0336560e89ee72b4af373a20d3ae1abab7' - '91bdcb8b29cc75a2e9f0fe821c1599fec2736a5115308ad502d309f04f3320a2' - 'a00d733c89869afe58a6c54f22c18c2d700c57e887db5f0ca7d3ef61b7baf355') + 'a145dca282ad3a130983493f675a5439dfb88c70da8c44b4bf69a5f006dc8a01') +sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041cc9cc' + '0e771370da68c855bfb4eaad4c2ae137883a474886a049b934dac2e775574cb9' + '2f586f72c34150330389854575a21be1d3ef3637c4f94bec2e948c2717a5aecb') prepare() { cd "$pkgname-$pkgver" - # Fix install_packages failure exit code, required by makechrootpkg - patch -Np1 -i ../0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch - patch -Np1 -i ../0002-makepkg-Don-t-use-parameterless-return.patch # From Arch ARM if [ "${CARCH}" = "armv7h" ]; then @@ -75,10 +66,7 @@ prepare() { fi # From Parabola - patch -p1 -i $srcdir/0001-makepkg-treat-pkgrel-more-similarly-to-pkgver.patch - # Actually from upstream git/ML, but actually worth backporting in - # Parabola because we build debug packages by default - patch -p1 -i $srcdir/0001-Revert-makepkg-use-the-declare-builtin-when-backing-.patch + patch -p1 -i $srcdir/0001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch } build() { |