diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-10 10:04:03 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-10 10:04:03 +0200 |
| commit | db5f9e94c74935ba2d3f3e5267f5184f78303e15 (patch) | |
| tree | 5ffa37eab5f2f7a1afa9f4eedc7f05636668f8de /extra/libtar | |
| parent | 7d166e43d693278dc2585521d147f2b972e8a40c (diff) | |
| parent | 223ca251f3ce07eb5484be845e631d6ca645b263 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/erlang/PKGBUILD
community/bird/PKGBUILD
community/chmsee/PKGBUILD
extra/avahi/PKGBUILD
extra/lirc/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/gcc/PKGBUILD
Diffstat (limited to 'extra/libtar')
| -rw-r--r-- | extra/libtar/PKGBUILD | 25 | ||||
| -rw-r--r-- | extra/libtar/libtar-1.2.11-tar_header.patch | 15 |
2 files changed, 31 insertions, 9 deletions
diff --git a/extra/libtar/PKGBUILD b/extra/libtar/PKGBUILD index 62bda2066..0c518d5e8 100644 --- a/extra/libtar/PKGBUILD +++ b/extra/libtar/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151100 2012-02-24 21:37:32Z giovanni $ +# $Id: PKGBUILD 155876 2012-04-08 10:03:47Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,29 +6,36 @@ pkgname=libtar pkgver=1.2.11 -pkgrel=3 +pkgrel=4 pkgdesc="C library for manipulating POSIX tar files" arch=('i686' 'x86_64' 'mips64el') url="http://www.feep.net/libtar/" license=('BSD') depends=('zlib') -source=("ftp://ftp.feep.net/pub/software/$pkgname/$pkgname-$pkgver.tar.gz" +source=("ftp://ftp.feep.net/pub/software/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'libtar-1.2.11-tar_header.patch' 'libtar-1.2.11.patch') -md5sums=('604238e8734ce6e25347a58c4f1a1d7e' +md5sums=('604238e8734ce6e25347a58c4f1a1d7e' + '94b03c0fdee20671e1f6d1ecaf187258' 'baef7da841c186e1830566296859c35b') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" export CFLAGS+=" -fPIC" + + # Fix FS#29322 + patch -Np1 -i "${srcdir}/libtar-1.2.11-tar_header.patch" + patch -Np1 -i "${srcdir}/libtar-1.2.11.patch" - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr \ + --mandir=/usr/share/man make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install - install -D -m644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libtar/libtar-1.2.11-tar_header.patch b/extra/libtar/libtar-1.2.11-tar_header.patch new file mode 100644 index 000000000..161f7da7b --- /dev/null +++ b/extra/libtar/libtar-1.2.11-tar_header.patch @@ -0,0 +1,15 @@ +diff -Naur libtar-1.2.11/lib/encode.c libtar-1.2.11.tar_header/lib/encode.c +--- libtar-1.2.11/lib/encode.c 2003-01-07 07:10:59.000000000 +0530 ++++ libtar-1.2.11.tar_header/lib/encode.c 2009-11-20 11:13:25.166756167 +0530 +@@ -30,7 +30,10 @@ + int i, sum = 0; + + if (t->options & TAR_GNU) +- strncpy(t->th_buf.magic, "ustar ", 8); ++ { ++ memcpy(t->th_buf.magic, "ustar ", 6); ++ memcpy(t->th_buf.version, " \0", 2); ++ } + else + { + strncpy(t->th_buf.version, TVERSION, TVERSLEN); |