Date: Wednesday, February 27, 2013 @ 22:51:44
Author: dreisner
Revision: 178867
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
libarchive/repos/staging-i686/
libarchive/repos/staging-i686/0001-mtree-fix-line-filename-length-calculation.patch
(from rev 178866,
libarchive/trunk/0001-mtree-fix-line-filename-length-calculation.patch)
libarchive/repos/staging-i686/PKGBUILD
(from rev 178866, libarchive/trunk/PKGBUILD)
libarchive/repos/staging-x86_64/
libarchive/repos/staging-x86_64/0001-mtree-fix-line-filename-length-calculation.patch
(from rev 178866,
libarchive/trunk/0001-mtree-fix-line-filename-length-calculation.patch)
libarchive/repos/staging-x86_64/PKGBUILD
(from rev 178866, libarchive/trunk/PKGBUILD)
----------------------------------------------------------------------+
staging-i686/0001-mtree-fix-line-filename-length-calculation.patch | 29
+++++++
staging-i686/PKGBUILD | 39
++++++++++
staging-x86_64/0001-mtree-fix-line-filename-length-calculation.patch | 29
+++++++
staging-x86_64/PKGBUILD | 39
++++++++++
4 files changed, 136 insertions(+)
Copied:
libarchive/repos/staging-i686/0001-mtree-fix-line-filename-length-calculation.patch
(from rev 178866,
libarchive/trunk/0001-mtree-fix-line-filename-length-calculation.patch)
===================================================================
--- staging-i686/0001-mtree-fix-line-filename-length-calculation.patch
(rev 0)
+++ staging-i686/0001-mtree-fix-line-filename-length-calculation.patch
2013-02-27 21:51:44 UTC (rev 178867)
@@ -0,0 +1,29 @@
+From e65bf287f0133426b26611fe3e80b51267987106 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <[email protected]>
+Date: Thu, 21 Feb 2013 19:01:06 -0500
+Subject: [PATCH] mtree: fix line filename length calculation. Fixes #301.
+ Signed-off-by: Andres Mejia <[email protected]>
+
+---
+ libarchive/archive_write_set_format_mtree.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/archive_write_set_format_mtree.c
b/libarchive/archive_write_set_format_mtree.c
+index 9c0613c..f37f723 100644
+--- a/libarchive/archive_write_set_format_mtree.c
++++ b/libarchive/archive_write_set_format_mtree.c
+@@ -1855,9 +1855,9 @@ mtree_entry_setup_filenames(struct archive_write *a,
struct mtree_entry *file,
+ return (ret);
+ }
+
+- /* Make a basename from dirname and slash */
++ /* Make a basename from file->parentdir.s and slash */
+ *slash = '\0';
+- file->parentdir.length = slash - dirname;
++ file->parentdir.length = slash - file->parentdir.s;
+ archive_strcpy(&(file->basename), slash + 1);
+ return (ret);
+ }
+--
+1.8.1.4
+
Copied: libarchive/repos/staging-i686/PKGBUILD (from rev 178866,
libarchive/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-02-27 21:51:44 UTC (rev 178867)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Dan McGee <[email protected]>
+
+pkgname=libarchive
+pkgver=3.1.2
+pkgrel=1
+pkgdesc="library that can create and read several streaming archive formats"
+arch=('i686' 'x86_64')
+url="http://libarchive.org/";
+license=('BSD')
+depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib')
+source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz";
+ '0001-mtree-fix-line-filename-length-calculation.patch')
+md5sums=('efad5a503f66329bb9d2f4308b5de98a'
+ 'fda89c145bbcd793a96b06b463ef6a72')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # https://code.google.com/p/libarchive/issues/detail?id=301
+ # upstream commit e65bf287f0133426b26611fe3e80b51267987106
+ patch -Np1 -i "$srcdir/0001-mtree-fix-line-filename-length-calculation.patch"
+
+ ./configure --prefix=/usr --without-xml2
+ make
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+
+ make check
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
+}
Copied:
libarchive/repos/staging-x86_64/0001-mtree-fix-line-filename-length-calculation.patch
(from rev 178866,
libarchive/trunk/0001-mtree-fix-line-filename-length-calculation.patch)
===================================================================
--- staging-x86_64/0001-mtree-fix-line-filename-length-calculation.patch
(rev 0)
+++ staging-x86_64/0001-mtree-fix-line-filename-length-calculation.patch
2013-02-27 21:51:44 UTC (rev 178867)
@@ -0,0 +1,29 @@
+From e65bf287f0133426b26611fe3e80b51267987106 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <[email protected]>
+Date: Thu, 21 Feb 2013 19:01:06 -0500
+Subject: [PATCH] mtree: fix line filename length calculation. Fixes #301.
+ Signed-off-by: Andres Mejia <[email protected]>
+
+---
+ libarchive/archive_write_set_format_mtree.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/archive_write_set_format_mtree.c
b/libarchive/archive_write_set_format_mtree.c
+index 9c0613c..f37f723 100644
+--- a/libarchive/archive_write_set_format_mtree.c
++++ b/libarchive/archive_write_set_format_mtree.c
+@@ -1855,9 +1855,9 @@ mtree_entry_setup_filenames(struct archive_write *a,
struct mtree_entry *file,
+ return (ret);
+ }
+
+- /* Make a basename from dirname and slash */
++ /* Make a basename from file->parentdir.s and slash */
+ *slash = '\0';
+- file->parentdir.length = slash - dirname;
++ file->parentdir.length = slash - file->parentdir.s;
+ archive_strcpy(&(file->basename), slash + 1);
+ return (ret);
+ }
+--
+1.8.1.4
+
Copied: libarchive/repos/staging-x86_64/PKGBUILD (from rev 178866,
libarchive/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-02-27 21:51:44 UTC (rev 178867)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Dan McGee <[email protected]>
+
+pkgname=libarchive
+pkgver=3.1.2
+pkgrel=1
+pkgdesc="library that can create and read several streaming archive formats"
+arch=('i686' 'x86_64')
+url="http://libarchive.org/";
+license=('BSD')
+depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib')
+source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz";
+ '0001-mtree-fix-line-filename-length-calculation.patch')
+md5sums=('efad5a503f66329bb9d2f4308b5de98a'
+ 'fda89c145bbcd793a96b06b463ef6a72')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # https://code.google.com/p/libarchive/issues/detail?id=301
+ # upstream commit e65bf287f0133426b26611fe3e80b51267987106
+ patch -Np1 -i "$srcdir/0001-mtree-fix-line-filename-length-calculation.patch"
+
+ ./configure --prefix=/usr --without-xml2
+ make
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+
+ make check
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
+}
