1.21

1.21

3 files changed, 59 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab5acea3c25e..4aa8c687c055 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Apr 11 03:08:02 UTC 2016
 pkgbase = fakeroot-tcp
-	pkgdesc = Gives a fake root environment, useful for building packages as a non-privileged user,with tcp ipc
-	pkgver = 1.20.2
-	pkgrel = 1
+	pkgdesc = Tool for simulating superuser privileges,with tcp ipc
+	pkgver = 1.21
+	pkgrel = 2
 	url = http://packages.debian.org/fakeroot
 	install = fakeroot.install
 	arch = i686
@@ -11,15 +9,16 @@ pkgbase = fakeroot-tcp
 	arch = armv7h
 	groups = base-devel
 	license = GPL
+	makedepends = po4a
 	depends = glibc
 	depends = filesystem
 	depends = sed
 	depends = util-linux
 	depends = sh
-	conflicts = fakeroot
-	options = !libtool
-	source = http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.20.2.orig.tar.bz2
-	md5sums = a4b4564a75024aa96c86e4d1017ac786
+	source = http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot-tcp_1.21.orig.tar.gz
+	source = silence-dlerror.patch
+	md5sums = be5c9a0e516869fca4a6758105968e5a
+	md5sums = 5fba0b541b5af39d804265223fda525c
 
 pkgname = fakeroot-tcp
 
diff --git a/PKGBUILD b/PKGBUILD
index ef1ac02ff32e..ba0c1ba1b051 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,53 @@
-# $Id: PKGBUILD 160938 2012-06-07 07:26:48Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer:  4679 <admin@libnull.com>
+# Contributor:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
-_pkgname=fakeroot
 pkgname=fakeroot-tcp
-pkgver=1.20.2
-pkgrel=1
-pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user,with tcp ipc"
+_pkgname=fakeroot
+pkgver=1.21
+pkgrel=2
+pkgdesc='Tool for simulating superuser privileges,with tcp ipc'
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
 url="http://packages.debian.org/fakeroot"
 groups=('base-devel')
 install=fakeroot.install
 depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
-options=('!libtool')
-conflicts=('fakeroot')
-source=(http://ftp.debian.org/debian/pool/main/f/${_pkgname}/${_pkgname}_${pkgver}.orig.tar.bz2)
-md5sums=('a4b4564a75024aa96c86e4d1017ac786')
+makedepends=('po4a')
+source=(http://ftp.debian.org/debian/pool/main/f/$_pkgname/${_pkgname}_${pkgver}.orig.tar.gz
+        silence-dlerror.patch)
+md5sums=('be5c9a0e516869fca4a6758105968e5a'
+         '5fba0b541b5af39d804265223fda525c')
+
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -p1 -i "$srcdir"/silence-dlerror.patch
+}
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \
-              --disable-static --with-ipc=tcp
+  cd $_pkgname-$pkgver
+
+  ./bootstrap
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib/libfakeroot \
+    --disable-static \
+    --with-ipc=tcp
+
   make
+
+  cd doc
+  po4a -k 0 --rm-backups --variable "srcdir=../doc/" po4a/po4a.cfg
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 
-  install -dm755 ${pkgdir}/etc/ld.so.conf.d/
-  echo '/usr/lib/libfakeroot' > ${pkgdir}/etc/ld.so.conf.d/fakeroot.conf
+  install -dm755 "$pkgdir"/etc/ld.so.conf.d/
+  echo '/usr/lib/libfakeroot' > "$pkgdir"/etc/ld.so.conf.d/fakeroot.conf
 
   # install README for sysv/tcp usage
-  install -Dm644 $srcdir/$_pkgname-$pkgver/README $pkgdir/usr/share/doc/$_pkgname/README
+  install -Dm644 README "$pkgdir"/usr/share/doc/$_pkgname/README
 }
+
diff --git a/silence-dlerror.patch b/silence-dlerror.patch
new file mode 100644
index 000000000000..a4472d8f7c7b
--- /dev/null
+++ b/silence-dlerror.patch
@@ -0,0 +1,17 @@
+diff --git a/libfakeroot.c b/libfakeroot.c
+index f867758..7ef6e47 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -256,10 +256,12 @@ void load_library_symbols(void){
+  /* clear dlerror() just in case dlsym() legitimately returns NULL */
+     msg = dlerror();
+     *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name);
++#ifdef LIBFAKEROOT_DEBUGGING
+     if ( (msg = dlerror()) != NULL){
+       fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
+ /*    abort ();*/
+     }
++#endif /* LIBFAKEROOT_DEBUGGING */
+   }
+ }
+