Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a91ef06138a09fe880c6a73a682e5cfddc49344
commit 0a91ef06138a09fe880c6a73a682e5cfddc49344 Author: DeX77 <[email protected]> Date: Sun Dec 6 20:13:40 2015 +0100 pacman-g2-3.9.0-22-x86_64 * relbump: try to fix gpg issues diff --git a/source/base/pacman-g2/0001-try-to-fix-gpg-verify-issues.patch b/source/base/pacman-g2/0001-try-to-fix-gpg-verify-issues.patch new file mode 100644 index 0000000..9e7153a --- /dev/null +++ b/source/base/pacman-g2/0001-try-to-fix-gpg-verify-issues.patch @@ -0,0 +1,42 @@ +From 68a20e4351cc76452d3e31e12fee8b4a6a0e7ee6 Mon Sep 17 00:00:00 2001 +From: DeX77 <[email protected]> +Date: Sun, 6 Dec 2015 20:01:23 +0100 +Subject: [PATCH] * try to fix gpg verify issues + +--- + scripts/makepkg | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/scripts/makepkg b/scripts/makepkg +index cb3a4de..90e797b 100755 +--- a/scripts/makepkg ++++ b/scripts/makepkg +@@ -1452,6 +1452,7 @@ if [ "$GENSHA1" = "0" ]; then + if [ ! -d ~/.gnupg ]; then + msg "Configuring gpg..." + gpg --list-keys ++ $ECHO "keyserver hkp://pool.sks-keyservers.net" >>~/.gnupg/gpg.conf + $ECHO "keyserver-options auto-key-retrieve" >>~/.gnupg/gpg.conf + fi + if [ -e $startdir/$pkgname.key ]; then +@@ -1459,7 +1460,7 @@ if [ "$GENSHA1" = "0" ]; then + gpg --import $startdir/$pkgname.key + fi + msg "Killing dirmngr" +- killall dirmngr ++ killall -u fst dirmngr + msg "Validating source files with gpg" + errors=0 + idx=0 +@@ -1491,7 +1492,7 @@ if [ "$GENSHA1" = "0" ]; then + idx=$(($idx+1)) + done + msg "Killing dirmngr" +- killall dirmngr ++ killall -u fst dirmngr + if [ $errors -gt 0 ]; then + error "One or more files did not pass the validity check!" + exit 1 +-- +2.6.3 + diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 0eafe5a..90f1d8b 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -10,7 +10,7 @@ USE_STABLE=${USE_STABLE:-"n"} pkgname=pacman-g2 pkgver=3.9.0 Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053 -pkgrel=21 +pkgrel=22 pkgdesc="A .tar.xz based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/"; backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) @@ -52,8 +52,9 @@ if ! Fuse $USE_DEVEL; then 0001-only-kill-dirmngr.patch \ 0001-makepkg-use-asneeded-by-default.patch \ 0002-makepkg-print-host-flags-in-build.patch \ - 0001-makepkg-fix-optimization-check.patch) - signatures=("$source.asc" '' '' '' '' '' '' '' '' '' '' '' '' '' '') + 0001-makepkg-fix-optimization-check.patch \ + 0001-try-to-fix-gpg-verify-issues.patch) + signatures=("$source.asc" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') if Fuse $USE_STABLE; then source=("${source[@]}" stable.patch) signatures=("${signatures[@]}" '') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
