Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/happy/PKGBUILD
	community-staging/haskell-quickcheck/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	core/mlocate/PKGBUILD
	core/procps-ng/PKGBUILD
	core/sysvinit/PKGBUILD
	elementary/gtk-engine-equinox/PKGBUILD
	extra/audacious/PKGBUILD
	extra/libsigc++/PKGBUILD
	extra/postgresql-old-upgrade/PKGBUILD
	extra/qt/PKGBUILD
	extra/tftp-hpa/PKGBUILD
	extra/transmission/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/gjs/PKGBUILD
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-online-accounts/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gvfs/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/nautilus/PKGBUILD
	gnome-unstable/vala/PKGBUILD
	gnome-unstable/webkitgtk3/PKGBUILD
	libre/libretools/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	testing/mlocate/PKGBUILD
	testing/openmpi/PKGBUILD
	testing/run-parts/PKGBUILD
	testing/systemd/PKGBUILD
	testing/transmission/PKGBUILD
	testing/transmission/transmission-cli.install
	testing/transmission/transmission.systemd

2 files changed, 44 insertions, 5 deletions

diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD
index 40e2f5780..9ae02b8f6 100644
--- a/core/libarchive/PKGBUILD
+++ b/core/libarchive/PKGBUILD
@@ -1,20 +1,25 @@
-# $Id: PKGBUILD 155375 2012-04-02 16:12:53Z dan $
+# $Id: PKGBUILD 167058 2012-09-25 03:07:21Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=libarchive
 pkgver=3.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="library that can create and read several streaming archive formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libarchive.googlecode.com/"
 license=('BSD')
 depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz")
-md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16')
-sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac')
+source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz"
+        libarchive-3.0.x-fix-mtree-writer.patch)
+md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16'
+         '6d36a50a7282db6576bd1fbc23f08055')
+sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac'
+            'f0081c0d7d7875fc91c683b14fe4876d56b6585f45be9181c755eba4b522f5b9')
+
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i $srcdir/libarchive-3.0.x-fix-mtree-writer.patch
   ./configure --prefix=/usr --without-xml2
   make
 }
diff --git a/core/libarchive/libarchive-3.0.x-fix-mtree-writer.patch b/core/libarchive/libarchive-3.0.x-fix-mtree-writer.patch
new file mode 100644
index 000000000..dbc89686a
--- /dev/null
+++ b/core/libarchive/libarchive-3.0.x-fix-mtree-writer.patch
@@ -0,0 +1,34 @@
+--- a/libarchive/archive_write_set_format_mtree.c
++++ b/libarchive/archive_write_set_format_mtree.c
+@@ -887,6 +887,19 @@ write_entry(struct archive_write *a, struct mtree_entry *me)
+ 
+ 	archive_string_empty(&mtree->ebuf);
+ 	str = (mtree->indent)? &mtree->ebuf : &mtree->buf;
++
++	/* If the pathname does not have a path separator, we have to
++	 * add "./" to the head of the pathename because mtree reader
++	 * will suppose that it is v1(a.k.a classic) mtree format and
++	 * change the directory unexpectedly and so it will make a wrong
++	 * path. */
++	if (strchr(me->pathname, '/') == NULL &&
++	    strcmp(me->pathname, ".") != 0) {
++		archive_strcat(str, "./");
++	}
++	/* mtree reader does not accept an absolute path. */
++	else if (me->pathname[0] == '/')
++		archive_strappend_char(str, '.');
+ 	mtree_quote(str, me->pathname);
+ 	keys = get_keys(mtree, me);
+ 	if ((keys & F_NLINK) != 0 &&
+--- a/libarchive/test/test_read_format_mtree.c
++++ b/libarchive/test/test_read_format_mtree.c
+@@ -37,7 +37,8 @@ test_read_format_mtree1(void)
+ 	 * without relying on overflow.  This assumes that long long
+ 	 * is at least 64 bits. */
+ 	static const long long max_int64 = ((((long long)1) << 62) - 1) + (((long long)1) << 62);
+-	time_t min_time, t;
++	time_t min_time;
++	volatile time_t t;
+ 
+ 	extract_reference_file(reffile);
+ 
\ No newline at end of file