[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e63d3291910086dffc8e2e82cc9319d3d815c139

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e63d3291910086dffc8e2e82cc9319d3d815c139

[git]

[-- Attachment #1: Type: text/plain, Size: 4707 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  e63d3291910086dffc8e2e82cc9319d3d815c139 (commit)
       via  44fd543e3a2f1efc1784ef2c13da5bbbe10c66af (commit)
       via  f94138e7fea629e9131f1c373940f8f915e67d12 (commit)
      from  f0cf8bd3bb59ae2b44a3f049d24b7a2cd97edf6d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e63d3291910086dffc8e2e82cc9319d3d815c139
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Mar 11 15:20:05 2012 +0100

    gnupg2: Fix wrong name field.

commit 44fd543e3a2f1efc1784ef2c13da5bbbe10c66af
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Mar 11 15:19:08 2012 +0100

    pakfire: Add patch that fixes the libs-location check.
    
    Find searched too deep in the filesystem for .so files.

commit f94138e7fea629e9131f1c373940f8f915e67d12
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Mar 11 15:17:20 2012 +0100

    strongswan: Build padlock plugin only on i686.
    
    All other architectures do not support this chipset.

-----------------------------------------------------------------------

Summary of changes:
 gnupg2/gnupg2.nm                                   |    7 ++++---
 pakfire/pakfire.nm                                 |    2 +-
 .../pakfire-0.9.20-fix-searching-too-deep.patch    |   19 +++++++++++++++++++
 strongswan/strongswan.nm                           |    7 +++++--
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 pakfire/patches/pakfire-0.9.20-fix-searching-too-deep.patch

Difference in files:
diff --git a/gnupg2/gnupg2.nm b/gnupg2/gnupg2.nm
index d5b10b8..ff5a93a 100644
--- a/gnupg2/gnupg2.nm
+++ b/gnupg2/gnupg2.nm
@@ -3,9 +3,10 @@
 # Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
 ###############################################################################
 
-name       = gnupg
+name       = gnupg2
 version    = 2.0.18
-release    = 1
+release    = 2
+thisapp    = gnupg-%{version}
 
 groups     = Security/Tools
 url        = http://www.gnupg.org/
@@ -35,7 +36,7 @@ build
 	end
 
 	configure_options += \
-		--libexecdir=/usr/lib/gnupg2 \
+		--libexecdir=%{libdir}/gnupg2 \
 		--enable-standard-socket
 end
 
diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 5ee0bc8..cf891d3 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -5,7 +5,7 @@
 
 name       = pakfire
 version    = 0.9.20
-release    = 4
+release    = 5
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = System/Packaging
diff --git a/pakfire/patches/pakfire-0.9.20-fix-searching-too-deep.patch b/pakfire/patches/pakfire-0.9.20-fix-searching-too-deep.patch
new file mode 100644
index 0000000..0f6f328
--- /dev/null
+++ b/pakfire/patches/pakfire-0.9.20-fix-searching-too-deep.patch
@@ -0,0 +1,19 @@
+commit da1de278eca7d6663cce89f7c1ad2a312fda8abb
+Author: Michael Tremer <michael.tremer(a)ipfire.org>
+Date:   Sun Mar 11 15:03:21 2012 +0100
+
+    QA: libs-location: Don't search in the deep.
+
+diff --git a/tools/quality-agent.d/003-libs-location b/tools/quality-agent.d/003-libs-location
+index 4c2e8ba..479f170 100755
+--- a/tools/quality-agent.d/003-libs-location
++++ b/tools/quality-agent.d/003-libs-location
+@@ -25,7 +25,7 @@ function check() {
+ 	local failed=0
+ 	local found
+ 
+-	for lib in $(find ${BUILDROOT}/{,usr/}${libdir} -type f -name "lib*.so.*" 2>/dev/null); do
++	for lib in $(find ${BUILDROOT}/{,usr/}${libdir} -maxdepth 1 -type f -name "lib*.so.*" 2>/dev/null); do
+ 		lib=${lib##*/}
+ 		lib=${lib%%.so*}
+ 
diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm
index 08f3cc3..ef43905 100644
--- a/strongswan/strongswan.nm
+++ b/strongswan/strongswan.nm
@@ -5,7 +5,7 @@
 
 name       = strongswan
 version    = 4.6.2
-release    = 1
+release    = 2
 
 groups     = Networking/VPN
 url        = http://www.strongswan.org/
@@ -44,10 +44,13 @@ build
 		--enable-ldap \
 		--enable-sqlite \
 		--enable-gcrypt \
-		--enable-padlock \
 		--enable-cisco-quirks \
 		--with-capabilities=libcap
 
+	if "%{DISTRO_ARCH}" == "i686"
+		configure_options += --enable-padlock
+	end
+
 	test
 		make check
 	end


hooks/post-receive
--
IPFire 3.x development tree