[arch-commits] Commit in pacman/trunk (2 files)

Allan McRae allan at archlinux.org
Fri Dec 19 11:10:21 UTC 2014


    Date: Friday, December 19, 2014 @ 12:10:20
  Author: allan
Revision: 227781

upgpkg: pacman 4.2.0-1

upstream update

Modified:
  pacman/trunk/PKGBUILD
Deleted:
  pacman/trunk/0001-pacman-key-compatibility-with-gnupg-2.1.patch

----------------------------------------------------+
 0001-pacman-key-compatibility-with-gnupg-2.1.patch |   27 -------------------
 PKGBUILD                                           |   15 ++--------
 2 files changed, 4 insertions(+), 38 deletions(-)

Deleted: 0001-pacman-key-compatibility-with-gnupg-2.1.patch
===================================================================
--- 0001-pacman-key-compatibility-with-gnupg-2.1.patch	2014-12-19 10:31:10 UTC (rev 227780)
+++ 0001-pacman-key-compatibility-with-gnupg-2.1.patch	2014-12-19 11:10:20 UTC (rev 227781)
@@ -1,27 +0,0 @@
-From 41c8263ba289dac191d7f74faaa62476baf41c28 Mon Sep 17 00:00:00 2001
-From: Tobias Powalowski <tpowa at archlinux.org>
-Date: Fri, 21 Nov 2014 20:54:58 +1000
-Subject: [PATCH] pacman-key: compatibility with gnupg-2.1
-
-GnuPG 2.1 no longer allow empty passphrases by default.
-
-Signed-off-by: Allan McRae <allan at archlinux.org>
----
- scripts/pacman-key.sh.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
-index ba8d02e..5ba0ad8 100644
---- a/scripts/pacman-key.sh.in
-+++ b/scripts/pacman-key.sh.in
-@@ -151,6 +151,7 @@ Key-Usage: sign
- Name-Real: Pacman Keyring Master Key
- Name-Email: pacman at localhost
- Expire-Date: 0
-+%no-protection
- %commit
- %echo Done
- EOF
--- 
-2.1.3
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-19 10:31:10 UTC (rev 227780)
+++ PKGBUILD	2014-12-19 11:10:20 UTC (rev 227781)
@@ -4,14 +4,14 @@
 # Maintainer: Dave Reisner <dreisner at archlinux.org>
 
 pkgname=pacman
-pkgver=4.1.2
-pkgrel=7
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
 groups=('base' 'base-devel')
-depends=('bash>=4.2.042-2' 'glibc>=2.17-2' 'libarchive>=3.1.2' 'curl>=7.19.4'
+depends=('bash' 'glibc' 'libarchive>=3.1.2' 'curl>=7.39.0'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 checkdepends=('python2' 'fakechroot')
 optdepends=('fakeroot: for makepkg usage as normal user')
@@ -21,23 +21,16 @@
 backup=(etc/pacman.conf etc/makepkg.conf)
 options=('strip' 'debug')
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
-	0001-pacman-key-compatibility-with-gnupg-2.1.patch
         pacman.conf.i686
         pacman.conf.x86_64
         makepkg.conf)
-md5sums=('063c8b0ff6bdf903dc235445525627cd'
+md5sums=('184ce14f1f326fede72012cca51bba51'
          'SKIP'
-         'd0e015b1bf78cbf9762d9c44ea5f77a9'
          '2db6c94709bb30cc614a176ecf8badb1'
          'de74a13618347f08ae4a9637f74471c4'
          '2da6544e387f940588a90cb4b9b914e2')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae <allan at archlinux.org>
 
-prepare() {
-  cd "$pkgname-$pkgver"
-  patch -p1 -i $srcdir/0001-pacman-key-compatibility-with-gnupg-2.1.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"
 



More information about the arch-commits mailing list