fakeroot: update to 1.22

4 files changed, 64 insertions, 23 deletions

diff --git a/abs/core/fakeroot/PKGBUILD b/abs/core/fakeroot/PKGBUILD
index 292e30d..ed80d20 100644
--- a/abs/core/fakeroot/PKGBUILD
+++ b/abs/core/fakeroot/PKGBUILD
@@ -1,35 +1,58 @@
-# $Id: PKGBUILD 160939 2012-06-07 07:26:49Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=fakeroot
-pkgver=1.18.4
+pkgver=1.22
 pkgrel=1
-pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://packages.debian.org/fakeroot"
-groups=('base-devel')
+pkgdesc='Tool for simulating superuser privileges'
+arch=(x86_64)
+license=(GPL)
+url='http://packages.debian.org/fakeroot'
+groups=(base-devel)
 install=fakeroot.install
-depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
-options=('!libtool')
-source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2)
-md5sums=('706171d8d520b1ca1576ac73f2ceb4f3')
+depends=(glibc filesystem sed util-linux sh)
+#makedepends=(po4a)
+checkdepends=(sharutils)
+source=(http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2
+        silence-dlerror.patch)
+md5sums=('fae64c9aeb2c895ead8e1b99bf50c631'
+         '5fba0b541b5af39d804265223fda525c')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i "$srcdir"/silence-dlerror.patch
+
+  ./bootstrap
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \
-              --disable-static --with-ipc=sysv
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib/libfakeroot \
+    --disable-static \
+    --with-ipc=sysv
+
   make
+
+#  cd doc
+#  po4a -k 0 --rm-backups --variable 'srcdir=../doc/' po4a/po4a.cfg
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
 }
 
 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/abs/core/fakeroot/__changelog b/abs/core/fakeroot/__changelog
new file mode 100644
index 0000000..3df28e1
--- /dev/null
+++ b/abs/core/fakeroot/__changelog
@@ -0,0 +1 @@
+PKGBUILD: don't use po4a
diff --git a/abs/core/fakeroot/fakeroot.install b/abs/core/fakeroot/fakeroot.install
index 986c91b..caab922 100644
--- a/abs/core/fakeroot/fakeroot.install
+++ b/abs/core/fakeroot/fakeroot.install
@@ -1,14 +1,14 @@
 post_install() {
-  sbin/ldconfig -r .
+  usr/bin/ldconfig -r .
 }
 
 post_upgrade() {
   if [ "$(vercmp $2 1.14.4-2)" -lt 0 ]; then
     sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf
   fi
-  sbin/ldconfig -r .
+  usr/bin/ldconfig -r .
 }
 
 pre_remove() {
-  sbin/ldconfig -r .
+  usr/bin/ldconfig -r .
 }
diff --git a/abs/core/fakeroot/silence-dlerror.patch b/abs/core/fakeroot/silence-dlerror.patch
new file mode 100644
index 0000000..a4472d8
--- /dev/null
+++ b/abs/core/fakeroot/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 */
+   }
+ }
+