[arch-commits] Commit in libarchive/trunk (3 files)

[Dave Reisner]

    Date: Friday, June 17, 2016 @ 20:10:43
  Author: dreisner
Revision: 270158

upgpkg: libarchive 3.2.0-1

Modified:
  libarchive/trunk/PKGBUILD
Deleted:
  libarchive/trunk/0001-Limit-write-requests-to-at-most-INT_MAX.patch
  libarchive/trunk/0001-mtree-fix-line-filename-length-calculation.patch

-------------------------------------------------------+
 0001-Limit-write-requests-to-at-most-INT_MAX.patch    |   32 -------------
 0001-mtree-fix-line-filename-length-calculation.patch |   29 ------------
 PKGBUILD                                              |   38 +++-------------
 3 files changed, 9 insertions(+), 90 deletions(-)

Deleted: 0001-Limit-write-requests-to-at-most-INT_MAX.patch
===================================================================
--- 0001-Limit-write-requests-to-at-most-INT_MAX.patch	2016-06-17 18:42:27 UTC (rev 270157)
+++ 0001-Limit-write-requests-to-at-most-INT_MAX.patch	2016-06-17 20:10:43 UTC (rev 270158)
@@ -1,32 +0,0 @@
-From 22531545514043e04633e1c015c7540b9de9dbe4 Mon Sep 17 00:00:00 2001
-From: Tim Kientzle <kientzle at acm.org>
-Date: Fri, 22 Mar 2013 23:48:41 -0700
-Subject: [PATCH] Limit write requests to at most INT_MAX. This prevents a
- certain common programming error (passing -1 to write) from leading to other
- problems deeper in the library.
-
----
- libarchive/archive_write.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
-index eede5e0..be85621 100644
---- a/libarchive/archive_write.c
-+++ b/libarchive/archive_write.c
-@@ -673,8 +673,13 @@ static ssize_t
- _archive_write_data(struct archive *_a, const void *buff, size_t s)
- {
- 	struct archive_write *a = (struct archive_write *)_a;
-+	const size_t max_write = INT_MAX;
-+
- 	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
- 	    ARCHIVE_STATE_DATA, "archive_write_data");
-+	/* In particular, this catches attempts to pass negative values. */
-+	if (s > max_write)
-+		s = max_write;
- 	archive_clear_error(&a->archive);
- 	return ((a->format_write_data)(a, buff, s));
- }
--- 
-1.9.0
-

Deleted: 0001-mtree-fix-line-filename-length-calculation.patch
===================================================================
--- 0001-mtree-fix-line-filename-length-calculation.patch	2016-06-17 18:42:27 UTC (rev 270157)
+++ 0001-mtree-fix-line-filename-length-calculation.patch	2016-06-17 20:10:43 UTC (rev 270158)
@@ -1,29 +0,0 @@
-From e65bf287f0133426b26611fe3e80b51267987106 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner at archlinux.org>
-Date: Thu, 21 Feb 2013 19:01:06 -0500
-Subject: [PATCH] mtree: fix line filename length calculation. Fixes #301.
- Signed-off-by: Andres Mejia <amejia004 at gmail.com>
-
----
- 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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-17 18:42:27 UTC (rev 270157)
+++ PKGBUILD	2016-06-17 20:10:43 UTC (rev 270158)
@@ -2,8 +2,8 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=libarchive
-pkgver=3.1.2
-pkgrel=8
+pkgver=3.2.0
+pkgrel=1
 pkgdesc="library that can create and read several streaming archive formats"
 arch=('i686' 'x86_64')
 url="http://libarchive.org/"
@@ -11,37 +11,17 @@
 depends=('acl' 'attr' 'bzip2' 'expat' 'lzo' 'openssl' 'xz' 'zlib')
 options=('strip' 'debug' 'libtool')
 provides=('libarchive.so')
-source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz"
-        '0001-mtree-fix-line-filename-length-calculation.patch'
-        '0001-Limit-write-requests-to-at-most-INT_MAX.patch'
-        'libarchive-3.1.2-acl.patch'
-        'libarchive-3.1.2-sparce-mtree.patch')
-md5sums=('efad5a503f66329bb9d2f4308b5de98a'
-         'fda89c145bbcd793a96b06b463ef6a72'
-         '9bf80940bd3ce861137a0a8dcacf5705'
-         'a5c995661c62429ceff2c23ea322393b'
-         'cb344a879b3c4550fe3faf86c3826f23')
+source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz")
+md5sums=('596210b5a9c2ff74a0f7ca34838d655f')
 
-prepare() {
+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 \
+      --without-nettle
 
-  # https://code.google.com/p/libarchive/issues/detail?id=329
-  patch -Np1 -i "$srcdir/libarchive-3.1.2-acl.patch"
-
-  # CVE-2013-0211
-  patch -Np1 -i "$srcdir/0001-Limit-write-requests-to-at-most-INT_MAX.patch"
-
-  # upstream commit 977bf2a4 - improved mtree support
-  patch -p1 -i $srcdir/libarchive-3.1.2-sparce-mtree.patch
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --without-xml2
   make
 }