summaryrefslogtreecommitdiff
path: root/libre/dpkg
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-01-20 17:58:33 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-01-20 17:58:33 -0500
commit3a4442cb264557db9ef544c1a1f1b38d2061827a (patch)
treecd042c017be730b59ef1941a97960747d99832f2 /libre/dpkg
parentab3686a1307a02a1a12859ac1be35b36a16bac9a (diff)
update libre/dpkg
Diffstat (limited to 'libre/dpkg')
-rw-r--r--libre/dpkg/PKGBUILD185
-rw-r--r--libre/dpkg/dpkg-gzip-rsyncable.patch19
2 files changed, 115 insertions, 89 deletions
diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index 806194577..99681df3e 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -12,20 +12,38 @@ pkgname=(dpkg-devtools perl-dpkg)
pkgdesc="Debian Package manager and utilities"
license=('GPL2')
-pkgver=1.16.10
+pkgver=1.17.6
url="http://packages.debian.org/source/sid/dpkg"
-_debrepo=http://ftp.debian.org/debian/pool/main
-
-pkgrel=1.3
-arch=('i686' 'x86_64' 'mips64el')
-depends=('bzip2' 'xz' 'zlib' 'ncurses')
-checkdepends=('perl-test-pod')
-makedepends=('perl-io-string' 'perl-timedate')
+pkgrel=1
+options=('staticlibs')
+
+if ! type in_array &>/dev/null; then
+ in_array() {
+ local i
+ for i in "${@:2}"; do [[ $i = "$1" ]] && return 0; done
+ return 1
+ }
+fi
+
+# The architecture dependent bits aren't packaged with the reduced pkgname
+arch=('any')
+for _pkg in dpkg dselect libdpkg; do
+ if in_array "$_pkg" "${pkgname[@]}"; then
+ arch=('i686' 'x86_64' 'mips64el')
+ fi
+done
+unset _pkg
+
+makedepends=('bzip2' 'xz' 'zlib' 'ncurses')
+checkdepends=('gzip' 'perl-test-pod' 'perl-io-string' 'perl-timedate')
-_debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
-source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz"
+_debrepo=http://ftp.debian.org/debian/pool/main
+_debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; }
+source=("$(_debfile ${pkgbase}_${pkgver}).tar.xz"
dpkg-gzip-rsyncable.patch)
+md5sums=('c87f2ae291d460015353e01d121bea85'
+ '9c77a553e3219dcd29b7ff44b89d718d')
######################################################################
@@ -34,97 +52,104 @@ source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz"
# Shame on the dpkg developers for not putting that logic into the build system.
_destdir="$pkgbase-$pkgver/debian/pkg-makepkg"
_debhelper_install() {
- local debname=$1
- cd "$srcdir/$_destdir"
-
- # main files
- sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \
- | while read pattern dest; do
- if [[ -z $dest ]]; then
- for file in $pattern; do
- install -d "$pkgdir/${file%/*}"
- cp -a "$file" "$pkgdir/$file" || true
- done
- else
- install -d "$pkgdir/$dest/"
- cp -a "$pattern" "$pkgdir/$dest/" || true
- fi
- done
-
- # manpages
- sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null \
- | while read pattern; do
- for file in $pattern; do
- install -d "$pkgdir/${file%/*}"
- cp -a "$file" "$pkgdir/$file" || true
- done
- done
-
- # other documentation
- install -d "$pkgdir/usr/share/doc/$pkgname/"
- sed '/^\s*$/d' ../$debname.docs 2>/dev/null \
- | while read file; do
- gzip \
- < "$srcdir/$pkgbase-$pkgver/$file" \
- > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz"
- done
-
- # symlinks
- sed '/^\s*$/d' ../$debname.links 2>/dev/null \
- | while read file link; do
- ln -s "/$file" "$pkgdir/$link"
- done
+ local debname=$1
+ cd "$srcdir/$_destdir"
+
+ # main files
+ sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install |
+ while read pattern dest; do
+ if [[ -z $dest ]]; then
+ for file in $pattern; do
+ install -d "$pkgdir/${file%/*}"
+ cp -a "$file" "$pkgdir/$file" || true
+ done
+ else
+ install -d "$pkgdir/$dest/"
+ cp -a "$pattern" "$pkgdir/$dest/" || true
+ fi
+ done
+
+ # manpages
+ sed -e 's|^debian/tmp/||' -e '/^\s*$/d' ../$debname.manpages 2>/dev/null |
+ while read pattern; do
+ for file in $pattern; do
+ install -d "$pkgdir/${file%/*}"
+ cp -a "$file" "$pkgdir/$file" || true
+ done
+ done
+
+ # other documentation
+ sed '/^\s*$/d' ../$debname.docs 2>/dev/null |
+ while read file; do
+ install -d "$pkgdir/usr/share/doc/$pkgname/"
+ gzip \
+ < "$srcdir/$pkgbase-$pkgver/$file" \
+ > "$pkgdir/usr/share/doc/$pkgname/${file##*/}.gz"
+ done
+
+ # symlinks
+ sed '/^\s*$/d' ../$debname.links 2>/dev/null |
+ while read file link; do
+ ln -s "/$file" "$pkgdir/$link"
+ done
}
######################################################################
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ # {Arch Linux,Parabola}'s gzip doesn't support --rsyncable
+ patch -Np1 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
+}
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma
- make
- make DESTDIR="$srcdir/$_destdir" install
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --sysconfdir=/etc \
+ --sbindir=/sbin \
+ --localstatedir=/var \
+ --with-zlib \
+ --with-liblzma \
+ --with-bz2
+ make
+ make DESTDIR="$srcdir/$_destdir" install
}
check() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make check
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make check
}
package_dpkg() {
- pkgdesc="Debian Package manager"
- provides+=(start-stop-daemon)
- conflicts+=(start-stop-daemon)
- _debhelper_install dpkg
+ pkgdesc="Debian Package manager"
+ depends=('zlib' 'xz' 'bzip2')
+ _debhelper_install dpkg
}
package_dpkg-devtools() {
- pkgdesc="Debian Package development tools"
- arch=(any)
- depends+=(perl-dpkg)
- _debhelper_install dpkg-dev
+ pkgdesc="Debian Package development tools"
+ arch=('any')
+ depends=('perl-dpkg')
+ _debhelper_install dpkg-dev
}
package_dselect() {
- pkgdesc="Debian Package manager high-level interface"
- _debhelper_install dselect
+ pkgdesc="Debian Package manager high-level interface"
+ depends=('dpkg' 'perl' 'ncurses')
+ _debhelper_install dselect
}
package_libdpkg() {
- pkgdesc="Debian Package manager library (static)"
- _debhelper_install libdpkg-dev
+ pkgdesc="Debian Package manager library (static)"
+ _debhelper_install libdpkg-dev
}
package_perl-dpkg() {
- pkgdesc="Debian Package perl modules"
- arch=(any)
- _debhelper_install libdpkg-perl
+ pkgdesc="Debian Package Perl modules"
+ arch=('any')
+ depends=('perl-timedate' 'gzip' 'bzip2' 'xz')
+ _debhelper_install libdpkg-perl
}
-
-md5sums=('4df9319b2d17e19cdb6fe94dacee44da'
- '5ab63758999e9bb10f84bce79a0307b2'
- '74b7ce3045690a8fc290104f10cf8d42')
-md5sums=('a20a06a5272717274a8b009368f237da'
- '5ab63758999e9bb10f84bce79a0307b2')
diff --git a/libre/dpkg/dpkg-gzip-rsyncable.patch b/libre/dpkg/dpkg-gzip-rsyncable.patch
index 3daf6d76e..187633874 100644
--- a/libre/dpkg/dpkg-gzip-rsyncable.patch
+++ b/libre/dpkg/dpkg-gzip-rsyncable.patch
@@ -1,11 +1,12 @@
---- ./scripts/Dpkg/Compression.pm.orig 2012-04-27 04:49:02.000000000 +0200
-+++ ./scripts/Dpkg/Compression.pm 2012-05-27 22:23:18.530628795 +0200
-@@ -52,7 +52,7 @@
+diff -ruN dpkg-1.17.6.orig/scripts/Dpkg/Compression.pm dpkg-1.17.6/scripts/Dpkg/Compression.pm
+--- dpkg-1.17.6.orig/scripts/Dpkg/Compression.pm 2014-01-15 09:02:16.000000000 -0500
++++ dpkg-1.17.6/scripts/Dpkg/Compression.pm 2014-01-19 23:22:39.771215424 -0500
+@@ -50,7 +50,7 @@
my $COMP = {
- "gzip" => {
- "file_ext" => "gz",
-- "comp_prog" => [ "gzip", "--no-name", "--rsyncable" ],
-+ "comp_prog" => [ "gzip", "--no-name" ],
- "decomp_prog" => [ "gunzip" ],
- "default_level" => 9,
+ gzip => {
+ file_ext => 'gz',
+- comp_prog => [ 'gzip', '--no-name', '--rsyncable' ],
++ comp_prog => [ 'gzip', '--no-name' ],
+ decomp_prog => [ 'gunzip' ],
+ default_level => 9,
},