summaryrefslogtreecommitdiff
path: root/core/gnupg/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-05-16 16:49:47 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-05-16 16:49:47 +0200
commitbc864260b40f40e8f689788c54f6138007764077 (patch)
tree9c9be0d9a53d7e3a03d76276fc4b02dd08b552bf /core/gnupg/PKGBUILD
parentb90f83b99150003a2022c3a4bbad90b12eb56b7e (diff)
parent453f3b8b2c568e9babcdc4852772278a39f130c0 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/bird/PKGBUILD community/drbd/PKGBUILD community/etherape/PKGBUILD community/ext4magic/PKGBUILD community/fcron/PKGBUILD community/fcron/systab.orig community/gnome-panel/PKGBUILD community/libident/PKGBUILD community/libtorrent/PKGBUILD community/linux-tools/PKGBUILD community/linux-tools/usbipd.service community/makedev/PKGBUILD community/minbif/PKGBUILD community/noip/PKGBUILD community/notmuch/PKGBUILD community/pam_pwcheck/PKGBUILD community/pound/PKGBUILD community/preload/PKGBUILD community/python-cchardet/PKGBUILD community/rtorrent/PKGBUILD community/tor/PKGBUILD community/ude/PKGBUILD core/openldap/PKGBUILD core/sysvinit/PKGBUILD extra/cd-discid/PKGBUILD extra/cvs/PKGBUILD extra/epiphany-extensions/PKGBUILD extra/fbset/PKGBUILD extra/fluidsynth/PKGBUILD extra/gtkmm/PKGBUILD extra/gvfs/PKGBUILD extra/kdepim/PKGBUILD extra/libical/PKGBUILD extra/mutt/PKGBUILD extra/netkit-bsd-finger/PKGBUILD extra/ossp/PKGBUILD extra/php/PKGBUILD extra/pidgin/PKGBUILD extra/rtkit/PKGBUILD extra/samba/PKGBUILD extra/totem/PKGBUILD extra/webkitgtk/PKGBUILD libre/liferea-libre/PKGBUILD libre/mplayer-vaapi-libre/PKGBUILD
Diffstat (limited to 'core/gnupg/PKGBUILD')
-rw-r--r--core/gnupg/PKGBUILD18
1 files changed, 8 insertions, 10 deletions
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD
index 63e04994f..716864960 100644
--- a/core/gnupg/PKGBUILD
+++ b/core/gnupg/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 183489 2013-04-22 09:10:16Z tpowa $
+# $Id: PKGBUILD 185550 2013-05-14 23:25:14Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=gnupg
-pkgver=2.0.19
-pkgrel=7
+pkgver=2.0.20
+pkgrel=1
pkgdesc='Complete and free implementation of the OpenPGP standard'
url='http://www.gnupg.org/'
license=('GPL')
@@ -17,11 +17,8 @@ optdepends=('curl: gpg2keys_curl'
makedepends=('curl' 'libldap' 'libusb-compat')
depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr')
source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
- 'valid-keyblock-packet.patch'
'protect-tool-env.patch')
-sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f'
- 'f6e6830610a8629b0aad69d789373bf8ca481733'
- '474d827f1c2976bb107985047f61ac9096ae0953'
+sha1sums=('7ddfefa37ee9da89a8aaa8f9059d251b4cd02562' 'SKIP'
'2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
install=install
@@ -30,12 +27,13 @@ conflicts=('gnupg2')
provides=("gnupg2=${pkgver}")
replaces=('gnupg2')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
-
patch -p1 -i ../protect-tool-env.patch # FS#31900
- patch -p1 -i ../valid-keyblock-packet.patch
+}
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure \
--prefix=/usr \
--sysconfdir=/etc \