Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

2 files changed, 13 insertions, 21 deletions

diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index 5d7534534..806194577 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -12,28 +12,30 @@ pkgname=(dpkg-devtools perl-dpkg)
 pkgdesc="Debian Package manager and utilities"
 license=('GPL2')
 
-pkgver=1.16.9
+pkgver=1.16.10
 url="http://packages.debian.org/source/sid/dpkg"
-_debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid
+_debrepo=http://ftp.debian.org/debian/pool/main
+
+pkgrel=1.3
 
-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-gpg2.patch)
+
+_debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
+source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz"
+        dpkg-gzip-rsyncable.patch)
 
 ######################################################################
 
 # This is really gross.
 # It uses the debian control files to help us split the package.
 # Shame on the dpkg developers for not putting that logic into the build system.
-_destdir="$srcdir/$pkgbase-$pkgver/debian/pkg-makepkg"
+_destdir="$pkgbase-$pkgver/debian/pkg-makepkg"
 _debhelper_install() {
   local debname=$1
-  cd "$_destdir"
+  cd "$srcdir/$_destdir"
 
   # main files
   sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \
@@ -80,11 +82,10 @@ build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   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
-  make DESTDIR="$_destdir" install
+  make DESTDIR="$srcdir/$_destdir" install
 }
 
 check() {
@@ -125,3 +126,5 @@ package_perl-dpkg() {
 md5sums=('4df9319b2d17e19cdb6fe94dacee44da'
          '5ab63758999e9bb10f84bce79a0307b2'
          '74b7ce3045690a8fc290104f10cf8d42')
+md5sums=('a20a06a5272717274a8b009368f237da'
+         '5ab63758999e9bb10f84bce79a0307b2')
diff --git a/libre/dpkg/dpkg-gpg2.patch b/libre/dpkg/dpkg-gpg2.patch
deleted file mode 100644
index 28671c484..000000000
--- a/libre/dpkg/dpkg-gpg2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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";
-     }