diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-11 09:45:06 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 15:41:30 -0500 |
commit | d4c88a78dac3584ab65d02708557048b8edad30f (patch) | |
tree | 58c29a8e4d5442b31df49788b2fdd73b38d7aadf /libre/dpkg | |
parent | 86285d128130e52a03d1edc11783e6ed82b5a35d (diff) |
fix libre/dpkg (pkgrel 1.1->1.2) to work with gpg2 as the default gpg
Diffstat (limited to 'libre/dpkg')
-rw-r--r-- | libre/dpkg/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/dpkg/dpkg-gpg2.patch | 11 |
2 files changed, 17 insertions, 4 deletions
diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD index aa82d36e6..5d7534534 100644 --- a/libre/dpkg/PKGBUILD +++ b/libre/dpkg/PKGBUILD @@ -16,14 +16,14 @@ pkgver=1.16.9 url="http://packages.debian.org/source/sid/dpkg" _debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid -pkgrel=1.1 +pkgrel=1.2 debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; } arch=('i686' 'x86_64' 'mips64el') depends=('bzip2' 'xz' 'zlib' 'ncurses') checkdepends=('perl-test-pod') makedepends=('perl-io-string' 'perl-timedate') source=("$(debfile ${pkgbase} ${pkgver}).tar.xz" - dpkg-gzip-rsyncable.patch) + dpkg-gzip-rsyncable.patch dpkg-gpg2.patch) ###################################################################### @@ -79,7 +79,8 @@ _debhelper_install() { build() { cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p0 -i "${srcdir}/dpkg-gzip-rsyncable.patch" + patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch" + patch -Np1 -i "${srcdir}/dpkg-gpg2.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma make @@ -122,4 +123,5 @@ package_perl-dpkg() { } md5sums=('4df9319b2d17e19cdb6fe94dacee44da' - '5ab63758999e9bb10f84bce79a0307b2') + '5ab63758999e9bb10f84bce79a0307b2' + '74b7ce3045690a8fc290104f10cf8d42') diff --git a/libre/dpkg/dpkg-gpg2.patch b/libre/dpkg/dpkg-gpg2.patch new file mode 100644 index 000000000..28671c484 --- /dev/null +++ b/libre/dpkg/dpkg-gpg2.patch @@ -0,0 +1,11 @@ +--- dpkg-1.16.9/scripts/Dpkg/Source/Package.pm.orig 2013-01-09 01:28:47.000000000 -0500 ++++ dpkg-1.16.9/scripts/Dpkg/Source/Package.pm 2013-01-09 01:30:51.000000000 -0500 +@@ -344,7 +344,7 @@ + my $dsc = $self->get_filename(); + my @exec; + if (find_command('gpgv')) { +- push @exec, "gpgv"; ++ push @exec, "gpgv", "--verify"; + } elsif (find_command('gpg')) { + push @exec, "gpg", "--no-default-keyring", "-q", "--verify"; + } |