[arch-commits] Commit in libtar/trunk (PKGBUILD libtar-1.2.11-tar_header.patch)

[Giovanni Scafora]

    Date: Sunday, April 8, 2012 @ 06:03:19
  Author: giovanni
Revision: 155875

upgpkg: libtar 1.2.11-4

Fixed FS29322

Added:
  libtar/trunk/libtar-1.2.11-tar_header.patch
Modified:
  libtar/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   23 +++++++++++++++--------
 libtar-1.2.11-tar_header.patch |   15 +++++++++++++++
 2 files changed, 30 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-08 09:45:37 UTC (rev 155874)
+++ PKGBUILD	2012-04-08 10:03:19 UTC (rev 155875)
@@ -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')
 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"
 }

Added: libtar-1.2.11-tar_header.patch
===================================================================
--- libtar-1.2.11-tar_header.patch	                        (rev 0)
+++ libtar-1.2.11-tar_header.patch	2012-04-08 10:03:19 UTC (rev 155875)
@@ -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);