Add fixes from bug 113548 regarding nss and nspr.

(Portage version: 2.0.54)

5 files changed, 62 insertions, 117 deletions

diff --git a/dev-libs/xmlsec/files/digest-xmlsec-1.2.5 b/dev-libs/xmlsec/files/digest-xmlsec-1.2.5
deleted file mode 100644
index 6bd141dbcd96..000000000000
--- a/dev-libs/xmlsec/files/digest-xmlsec-1.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e811685d7b678ff09b901b942477f03d xmlsec1-1.2.5.tar.gz 1509199
diff --git a/dev-libs/xmlsec/files/digest-xmlsec-1.2.8 b/dev-libs/xmlsec/files/digest-xmlsec-1.2.8
deleted file mode 100644
index d68b3b24577e..000000000000
--- a/dev-libs/xmlsec/files/digest-xmlsec-1.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f86c77c2ca317d03fbd8fe2e685ea67 xmlsec1-1.2.8.tar.gz 4851546
diff --git a/dev-libs/xmlsec/files/digest-xmlsec-1.2.9-r1 b/dev-libs/xmlsec/files/digest-xmlsec-1.2.9-r1
new file mode 100644
index 000000000000..45ebab89805b
--- /dev/null
+++ b/dev-libs/xmlsec/files/digest-xmlsec-1.2.9-r1
@@ -0,0 +1 @@
+MD5 b378a076708766966724aaeba09e4607 xmlsec1-1.2.9.tar.gz 1667363
diff --git a/dev-libs/xmlsec/files/nss.patch b/dev-libs/xmlsec/files/nss.patch
new file mode 100644
index 000000000000..ec90dfc39c4d
--- /dev/null
+++ b/dev-libs/xmlsec/files/nss.patch
@@ -0,0 +1,61 @@
+--- xmlsec1-1.2.9/configure.in.orig	2005-11-25 15:22:14.000000000 +0100
++++ xmlsec1-1.2.9/configure.in	2005-11-25 15:27:25.000000000 +0100
+@@ -540,7 +540,7 @@
+     AC_MSG_RESULT(no)
+     NSS_FOUND="without"
+ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
+-    PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION,
++    PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION,
+ 	[NSS_FOUND=yes],
+ 	[NSS_FOUND=no])
+ fi
+--- xmlsec1-1.2.9/configure.orig	2006-01-23 12:23:43.000000000 +0100
++++ xmlsec1-1.2.9/configure	2006-01-23 12:24:00.000000000 +0100
+@@ -25929,23 +25929,23 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" >&5
+-echo $ECHO_N "checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
++        echo "$as_me:$LINENO: checking for nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" >&5
++echo $ECHO_N "checking for nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION... $ECHO_C" >&6
+ 
+-        if $PKG_CONFIG --exists "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" ; then
++        if $PKG_CONFIG --exists "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" ; then
+             echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+             succeeded=yes
+ 
+             echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5
+ echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6
+-            NSS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
++            NSS_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"`
+             echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5
+ echo "${ECHO_T}$NSS_CFLAGS" >&6
+ 
+             echo "$as_me:$LINENO: checking NSS_LIBS" >&5
+ echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6
+-            NSS_LIBS=`$PKG_CONFIG --libs "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
++            NSS_LIBS=`$PKG_CONFIG --libs "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"`
+             echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
+ echo "${ECHO_T}$NSS_LIBS" >&6
+         else
+@@ -25953,7 +25953,7 @@
+             NSS_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+-            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
++            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"`
+ 
+         fi
+ 
+--- xmlsec1-1.2.9/xmlsec-nss.pc.in.orig	2005-11-30 15:05:31.000000000 +0100
++++ xmlsec1-1.2.9/xmlsec-nss.pc.in	2005-11-30 15:07:00.000000000 +0100
+@@ -7,6 +7,6 @@
+ Name: xmlsec1-nss
+ Version: @VERSION@
+ Description: XML Security Library implements XML Signature and XML Encryption standards
+-Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ mozilla-nss >= @MOZILLA_MIN_VERSION@
++Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ nss >= @NSS_MIN_VERSION@
+ Cflags: -DXMLSEC_CRYPTO=\\\"nss\\\" -DXMLSEC_CRYPTO_NSS=1 @XMLSEC_CORE_CFLAGS@
+ Libs: -L${libdir} -lxmlsec1-nss @XMLSEC_CORE_LIBS@
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.2-nss-nspr-configure.in.patch b/dev-libs/xmlsec/files/xmlsec-1.2.2-nss-nspr-configure.in.patch
deleted file mode 100644
index 487643656908..000000000000
--- a/dev-libs/xmlsec/files/xmlsec-1.2.2-nss-nspr-configure.in.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- configure.in	2004-01-04 09:49:32.000000000 +0000
-+++ configure.in	2004-01-04 10:44:59.295911997 +0000
-@@ -519,34 +519,17 @@
-     NSPR_FOUND="no"
-     NSPR_PRINIT_H=""
- 
--    if test "z$with_nspr" != "z" ; then
--	NSPR_PREFIX="$with_nspr"
--	NSPR_CFLAGS="-I$with_nspr/include"
--	if test "z$with_gnu_ld" = "zyes" ; then
--	    NSPR_LIBS="-Wl,-rpath-link -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST"
--	else
--	    NSPR_LIBS="-L$with_nspr/lib $NSPR_LIBS_LIST"
--	fi
--	NSPR_INCLUDES_FOUND="yes"
--	NSPR_LIBS_FOUND="yes"
--	NSPR_PRINIT_H="$with_nspr/include/prinit.h"
--    else
--	for dir in $ac_nss_inc_dir ; do
--    	    if test -f $dir/nspr/prinit.h ; then
--    		dnl do not add -I/usr/include because compiler does it anyway
--        	if test "z$dir" = "z/usr/include" ; then
--    		    NSPR_CFLAGS=""
--    		else
--    		    NSPR_CFLAGS="-I$dir/nspr"
--    		fi
-+    for dir in $ac_nss_inc_dir ; do
-+    	if test -f $dir/nspr/prinit.h ; then
-+		NSPR_CFLAGS="-I$dir/nspr"
- 		NSPR_INCLUDES_FOUND="yes"
- 		NSPR_PRINIT_H="$dir/nspr/prinit.h"
-     		break
--    	    fi
--	done
-+	fi
-+    done
- 	
--	for dir in $ac_nss_lib_dir ; do
--    	    if test -f $dir/libnspr4.so ; then
-+    for dir in $ac_nss_lib_dir ; do
-+    	if test -f $dir/libnspr4.so ; then
- 		dnl do not add -L/usr/lib because compiler does it anyway
-         	if test "z$dir" = "z/usr/lib" ; then
-             	    NSPR_LIBS="$NSPR_LIBS_LIST"
-@@ -559,9 +542,8 @@
- 		fi
- 		NSPR_LIBS_FOUND="yes"
- 		break
--	    fi
--	done
--    fi
-+	fi
-+    done
- 
-     if test "z$NSPR_INCLUDES_FOUND" = "zyes" -a "z$NSPR_LIBS_FOUND" = "zyes" ; then
- 	OLD_CPPFLAGS=$CPPFLAGS
-@@ -591,37 +573,21 @@
-     NSS_LIBS_FOUND="no"
-     NSS_NSS_H=""
- 
--    if test "z$with_nss" != "z" ; then
--	NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include"
--	if test "z$with_gnu_ld" = "zyes" ; then
--	    NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST"
--        else
--	    NSS_LIBS="$NSS_LIBS -L$with_nss/lib $NSS_LIBS_LIST"
--        fi
--	NSS_INCLUDES_FOUND="yes"
--	NSS_LIBS_FOUND="yes"
--	NSS_NSS_H="$with_nss/include/nss.h"
--    else
--	for dir in $ac_nss_inc_dir ; do
--	    if test -f $dir/nss/nss.h ; then
--        	dnl do not add -I/usr/include because compiler does it anyway
--    		if test "z$dir" = "z/usr/include" ; then
--        	    NSS_CFLAGS="$NSS_CFLAGS"
--		else
--            	    NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss"
--		fi
-+    for dir in $ac_nss_inc_dir ; do
-+	if test -f $dir/nss/nss.h ; then
-+		NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss"
-     		NSS_INCLUDES_FOUND="yes"
-     		NSS_NSS_H="$dir/nss/nss.h"
-     		break
--    	    fi
--        done
-+	fi
-+    done
-        
--        for dir in $ac_nss_lib_dir ; do
--    	    if test -f $dir/libnss3.so ; then
--        	dnl do not add -L/usr/lib because compiler does it anyway
-+    for dir in $ac_nss_lib_dir ; do
-+        if test -f $dir/libnss3.so ; then
-+    	   	dnl do not add -L/usr/lib because compiler does it anyway
-     		if test "z$dir" = "z/usr/lib" ; then
-         	    NSS_LIBS="$NSS_LIBS_LIST"
--                else
-+		else
-             	    if test "z$with_gnu_ld" = "zyes" ; then
-     			NSS_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSS_LIBS_LIST"
-             	    else
-@@ -630,9 +596,8 @@
- 		fi
-     		NSS_LIBS_FOUND="yes"
-     		break
--	    fi
--	done
--    fi
-+	fi
-+    done
- 
-     if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
-        OLD_CPPFLAGS=$CPPFLAGS