pakfire: Add two more patches from upstream.

 * A fix the libs check which failed when there was garbage
   in some directories.
 * A check for nested buildroots. i.e. when make install DESTDIR=...
   messed up.

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index c5b65e3f57b727339cbee0c81c49677f8daddde8..5ee0bc802e1a8c664c56ea21d55dca39bc818671 100644 (file)
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -5,7 +5,7 @@
 
 name       = pakfire
 version    = 0.9.20
-release    = 3
+release    = 4
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Packaging

diff --git a/pakfire/patches/pakfire-0.9.20-check-for-nested-BUILDROOT.patch b/pakfire/patches/pakfire-0.9.20-check-for-nested-BUILDROOT.patch
new file mode 100644 (file)
index 0000000..cadeaa6
--- /dev/null
+++ b/pakfire/patches/pakfire-0.9.20-check-for-nested-BUILDROOT.patch
@@ -0,0 +1,25 @@
+From cd37f1637dc038f2ebdfc514882e4b600d85a606 Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer@ipfire.org>
+Date: Sat, 10 Mar 2012 13:25:41 +0100
+Subject: [PATCH] QA: Check for nested $BUILDROOT.
+
+---
+ tools/quality-agent.d/095-directory-layout |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tools/quality-agent.d/095-directory-layout b/tools/quality-agent.d/095-directory-layout
+index 3f946a1..d605fe9 100755
+--- a/tools/quality-agent.d/095-directory-layout
++++ b/tools/quality-agent.d/095-directory-layout
+@@ -4,7 +4,7 @@
+ 
+ DESC="The filelayout should comply to the FHS."
+ 
+-DIRS="/etc/init.d /etc/rc.d /lib/pkgconfig /usr/etc /usr/libexec /usr/local /usr/man /usr/usr /usr/var"
++DIRS="/etc/init.d /etc/rc.d /lib/pkgconfig /usr/etc /usr/libexec /usr/local /usr/man /usr/usr /usr/var ${BUILDROOT}"
+ 
+ function check() {
+       # Do nothing, if directory check was disabled.
+-- 
+1.7.3.4
+

diff --git a/pakfire/patches/pakfire-0.9.20-fix-ls-dir-listing.patch b/pakfire/patches/pakfire-0.9.20-fix-ls-dir-listing.patch
new file mode 100644 (file)
index 0000000..506778a
--- /dev/null
+++ b/pakfire/patches/pakfire-0.9.20-fix-ls-dir-listing.patch
@@ -0,0 +1,25 @@
+From 123f594fe738d6eb0a9238d094bbfbce7d4355b3 Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer@ipfire.org>
+Date: Sat, 10 Mar 2012 11:45:20 +0100
+Subject: [PATCH] QA: Don't use ls to list all directories in libs-location check.
+
+---
+ tools/quality-agent.d/003-libs-location |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tools/quality-agent.d/003-libs-location b/tools/quality-agent.d/003-libs-location
+index ce5ba72..4c2e8ba 100755
+--- a/tools/quality-agent.d/003-libs-location
++++ b/tools/quality-agent.d/003-libs-location
+@@ -19,7 +19,7 @@ gcc_libdir=$(gcc -print-libgcc-file-name)
+ for i in 1 2; do
+       gcc_libdir=$(dirname ${gcc_libdir})
+ done
+-gcc_libdir=$(ls ${BUILDROOT}${gcc_libdir}/* 2>/dev/null | tail -n1)
++gcc_libdir=$(find ${BUILDROOT}${gcc_libdir}/* -type d -maxdepth 1 2>/dev/null | sort | head -n1)
+ 
+ function check() {
+       local failed=0
+-- 
+1.7.3.4
+