[xmlsec] What's version included into OOo?

[Daniel Veillard]

On Fri, Apr 21, 2006 at 07:54:27AM -0700, Aleksey Sanin wrote:
> 
> >>Is it mean that you did link to original xmlsec1.2.9 with NSS for Fedora 
> >>Core 5?
> >
> >  yes, I'm the packager of xmlsec1 on Fedora and the only patch applied
> >is about nss detection, not about any code.
> >
> 
> Where can I look at this patch? :)

in the xmlsec1-1.2.9-4.2.src.rpm package, enclosed below for your convenience.

> I would love to integrate it in
> the xmlsec package directly.

  I'm not sure it's really usable as is, basically we separated nss as a 
completely separate autonomous package, so it got renamed. You may want
to extend the logic to probe for either name, see the patch :-)

Daniel

-- 
Daniel Veillard      | Red Hat http://redhat.com/
veillard at redhat.com  | libxml GNOME XML XSLT toolkit  http://xmlsoft.org/
http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/
-------------- next part --------------
--- xmlsec1-1.2.9/xmlsec-nss.pc.in.old	2005-12-15 23:36:20.000000000 -0500
+++ xmlsec1-1.2.9/xmlsec-nss.pc.in	2005-12-15 23:37:09.000000000 -0500
@@ -6,6 +6,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@
--- xmlsec1-1.2.9/configure.old	2005-12-16 00:51:22.000000000 -0500
+++ xmlsec1-1.2.9/configure	2005-12-16 00:52:02.000000000 -0500
@@ -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/configure.in.old	2005-12-15 23:35:35.000000000 -0500
+++ xmlsec1-1.2.9/configure.in	2005-12-15 23:56:06.000000000 -0500
@@ -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