Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=205c3fad0982ff0e8cc27af2d861add5ec03ad48
commit 205c3fad0982ff0e8cc27af2d861add5ec03ad48 Author: DeX77 <[email protected]> Date: Mon Sep 28 16:04:44 2015 +0200 pacman-g2-3.9.0-16-x86_64 * relbump + add fixes for dirmngr not quiting and preventing chroot umount + add XZ multithread and higher compression options diff --git a/source/base/pacman-g2/0001-fix-problems-with-umounting-chroots-when-dirmngr-was.patch b/source/base/pacman-g2/0001-fix-problems-with-umounting-chroots-when-dirmngr-was.patch new file mode 100644 index 0000000..927862c --- /dev/null +++ b/source/base/pacman-g2/0001-fix-problems-with-umounting-chroots-when-dirmngr-was.patch @@ -0,0 +1,26 @@ +From bbf3d7ca852a1b3685b993efc16cca236f724694 Mon Sep 17 00:00:00 2001 +From: DeX77 <[email protected]> +Date: Mon, 28 Sep 2015 12:22:44 +0200 +Subject: [PATCH] * fix problems with umounting chroots when dirmngr was + running + +--- + scripts/makepkg | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/scripts/makepkg b/scripts/makepkg +index b0591b8..011b78e 100755 +--- a/scripts/makepkg ++++ b/scripts/makepkg +@@ -832,6 +832,8 @@ makepkg_init() { + } + + chroot_umount() { ++ msg "Kill dirmngr if it is running" ++ gpgconf --kill dirmngr + msg "Attempting to umount chroot directories..." + umount $CHROOTDIR/proc >/dev/null + umount $CHROOTDIR/sys >/dev/null +-- +2.5.0 + diff --git a/source/base/pacman-g2/0001-killall-gpg-components-_in_-chroot.patch b/source/base/pacman-g2/0001-killall-gpg-components-_in_-chroot.patch new file mode 100644 index 0000000..790dfb4 --- /dev/null +++ b/source/base/pacman-g2/0001-killall-gpg-components-_in_-chroot.patch @@ -0,0 +1,53 @@ +From 9c55eba19b8722f4a10ebb7c14ba3375f1d9e44f Mon Sep 17 00:00:00 2001 +From: DeX77 <[email protected]> +Date: Mon, 28 Sep 2015 15:26:12 +0200 +Subject: [PATCH] * killall gpg components _in_ chroot + +--- + scripts/makepkg | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/scripts/makepkg b/scripts/makepkg +index 011b78e..dc4e618 100755 +--- a/scripts/makepkg ++++ b/scripts/makepkg +@@ -832,8 +832,6 @@ makepkg_init() { + } + + chroot_umount() { +- msg "Kill dirmngr if it is running" +- gpgconf --kill dirmngr + msg "Attempting to umount chroot directories..." + umount $CHROOTDIR/proc >/dev/null + umount $CHROOTDIR/sys >/dev/null +@@ -1906,6 +1904,13 @@ if [ "$GENSHA1" = "0" ]; then + msg "Importing $pkgname.key" + gpg --import $startdir/$pkgname.key + fi ++ msg "Killing all gpg components" ++ gpgconf --kill gpg ++ gpgconf --kill gpg-agent ++ gpgconf --kill scdaemon ++ gpgconf --kill gpgsm ++ gpgconf --kill dirmngr ++ gpgconf --kill pinentry + msg "Validating source files with gpg" + errors=0 + idx=0 +@@ -1936,6 +1941,13 @@ if [ "$GENSHA1" = "0" ]; then + fi + idx=$(($idx+1)) + done ++ msg "Killing all gpg components" ++ gpgconf --kill gpg ++ gpgconf --kill gpg-agent ++ gpgconf --kill scdaemon ++ gpgconf --kill gpgsm ++ gpgconf --kill dirmngr ++ gpgconf --kill pinentry + if [ $errors -gt 0 ]; then + error "One or more files did not pass the validity check!" + return 1 +-- +2.5.0 + diff --git a/source/base/pacman-g2/0001-only-kill-dirmngr.patch b/source/base/pacman-g2/0001-only-kill-dirmngr.patch new file mode 100644 index 0000000..daed336 --- /dev/null +++ b/source/base/pacman-g2/0001-only-kill-dirmngr.patch @@ -0,0 +1,48 @@ +From f4e2b76f5136fcfc7a23d5b1571a3661107e696c Mon Sep 17 00:00:00 2001 +From: DeX77 <[email protected]> +Date: Mon, 28 Sep 2015 15:47:35 +0200 +Subject: [PATCH] * only kill dirmngr + +--- + scripts/makepkg | 18 ++++-------------- + 1 file changed, 4 insertions(+), 14 deletions(-) + +diff --git a/scripts/makepkg b/scripts/makepkg +index dc4e618..fb8bb84 100755 +--- a/scripts/makepkg ++++ b/scripts/makepkg +@@ -1904,13 +1904,8 @@ if [ "$GENSHA1" = "0" ]; then + msg "Importing $pkgname.key" + gpg --import $startdir/$pkgname.key + fi +- msg "Killing all gpg components" +- gpgconf --kill gpg +- gpgconf --kill gpg-agent +- gpgconf --kill scdaemon +- gpgconf --kill gpgsm +- gpgconf --kill dirmngr +- gpgconf --kill pinentry ++ msg "Killing dirmngr" ++ killall dirmngr + msg "Validating source files with gpg" + errors=0 + idx=0 +@@ -1941,13 +1936,8 @@ if [ "$GENSHA1" = "0" ]; then + fi + idx=$(($idx+1)) + done +- msg "Killing all gpg components" +- gpgconf --kill gpg +- gpgconf --kill gpg-agent +- gpgconf --kill scdaemon +- gpgconf --kill gpgsm +- gpgconf --kill dirmngr +- gpgconf --kill pinentry ++ msg "Killing dirmngr" ++ killall dirmngr + if [ $errors -gt 0 ]; then + error "One or more files did not pass the validity check!" + return 1 +-- +2.5.0 + diff --git a/source/base/pacman-g2/0001-use-multithreaded-compression-and-higher-compression.patch b/source/base/pacman-g2/0001-use-multithreaded-compression-and-higher-compression.patch new file mode 100644 index 0000000..586e674 --- /dev/null +++ b/source/base/pacman-g2/0001-use-multithreaded-compression-and-higher-compression.patch @@ -0,0 +1,24 @@ +From 48a8aa6c57f98046d7000e6289f35735f3cbbc9f Mon Sep 17 00:00:00 2001 +From: DeX77 <[email protected]> +Date: Mon, 28 Sep 2015 12:30:53 +0200 +Subject: [PATCH] * use multithreaded compression and higher compression level + for xz + +--- + etc/makepkg.conf.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in +index 2650e4c..cbf4051 100644 +--- a/etc/makepkg.conf.in ++++ b/etc/makepkg.conf.in +@@ -96,3 +96,6 @@ SBU="1" + + # Uncomment the following line if you want build time to be more "human readable." + #HRBT="1" ++ ++# Options for xz used in compression ++export XZ_OPT="--threads=0 -9" +-- +2.5.0 + diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 41687a7..59a95d8 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=15 +pkgrel=16 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}) @@ -36,10 +36,19 @@ archs=('i686' 'x86_64' 'arm') _F_archive_nosort=y up2date="Flasttar $url/releases/" if ! Fuse $USE_DEVEL; then - source=($url/releases/$pkgname-$pkgver.tar.gz 0001-Revert-libftp-set-SO_-TIMEO-on-sockets-to-avoid-bloc.patch 0001-util-in-_pacman_runhook-close-the-directory-before-r.patch \ - 0001-server-free-the-netbuf-object-before-returning-when-.patch libftp.patch 0001-repos-comment-out-ftp5-mirror-pending-a-resolution-o.patch \ - 0001-repos-comment-out-all-mirrors-that-are-inactive.patch mount_shm.patch) - signatures=("$source.asc" '' '' '' '' '' '' '') + source=($url/releases/$pkgname-$pkgver.tar.gz \ + 0001-Revert-libftp-set-SO_-TIMEO-on-sockets-to-avoid-bloc.patch \ + 0001-util-in-_pacman_runhook-close-the-directory-before-r.patch \ + 0001-server-free-the-netbuf-object-before-returning-when-.patch \ + libftp.patch \ + 0001-repos-comment-out-ftp5-mirror-pending-a-resolution-o.patch \ + 0001-repos-comment-out-all-mirrors-that-are-inactive.patch \ + mount_shm.patch \ + 0001-fix-problems-with-umounting-chroots-when-dirmngr-was.patch \ + 0001-use-multithreaded-compression-and-higher-compression.patch \ + 0001-killall-gpg-components-_in_-chroot.patch \ + 0001-only-kill-dirmngr.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
