Package: xmlsec1
Followup-For: Bug #364382
Hi,
attached patch modifies your packaing to transition to the libraries
provided by xulrunner based on the infos provided in this bug-report.
Additionally the hardcoded dependencies of the -nss binary package have
been removed, as these are automatically picked up by debhelper.
Build tested and the resulting .so links against the new libraries, but
no functional testing has been done.
Please consider applying the patch.
Regards,
Stefan
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16-1-686
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
diff -ur xmlsec1-1.2.9/configure xmlsec1-1.2.9.mod/configure
--- xmlsec1-1.2.9/configure 2005-07-13 02:18:37.000000000 +0000
+++ xmlsec1-1.2.9.mod/configure 2006-05-02 12:41:46.000000000 +0000
@@ -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 xulrunner-nspr >=
$MOZILLA_MIN_VERSION xulrunner-nss >= $MOZILLA_MIN_VERSION" >&5
+echo $ECHO_N "checking for xulrunner-nspr >= $MOZILLA_MIN_VERSION
xulrunner-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
- if $PKG_CONFIG --exists "mozilla-nspr >= $MOZILLA_MIN_VERSION
mozilla-nss >= $MOZILLA_MIN_VERSION" ; then
+ if $PKG_CONFIG --exists "xulrunner-nspr >= $MOZILLA_MIN_VERSION
xulrunner-nss >= $MOZILLA_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 "xulrunner-nspr >=
$MOZILLA_MIN_VERSION xulrunner-nss >= $MOZILLA_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 "xulrunner-nspr >=
$MOZILLA_MIN_VERSION xulrunner-nss >= $MOZILLA_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
"xulrunner-nspr >= $MOZILLA_MIN_VERSION xulrunner-nss >= $MOZILLA_MIN_VERSION"`
fi
diff -ur xmlsec1-1.2.9/configure.in xmlsec1-1.2.9.mod/configure.in
--- xmlsec1-1.2.9/configure.in 2005-07-13 02:18:00.000000000 +0000
+++ xmlsec1-1.2.9.mod/configure.in 2006-05-02 12:37:01.000000000 +0000
@@ -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, xulrunner-nspr >= $MOZILLA_MIN_VERSION
xulrunner-nss >= $MOZILLA_MIN_VERSION,
[NSS_FOUND=yes],
[NSS_FOUND=no])
fi
diff -ur xmlsec1-1.2.9/debian/control xmlsec1-1.2.9.mod/debian/control
--- xmlsec1-1.2.9/debian/control 2006-05-02 12:46:28.000000000 +0000
+++ xmlsec1-1.2.9.mod/debian/control 2006-05-02 12:52:12.000000000 +0000
@@ -2,13 +2,13 @@
Section: text
Priority: optional
Maintainer: John V. Belmonte <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), autotools-dev, pkg-config, libxml2-dev,
libxslt1-dev, libssl-dev (>= 0.9.7), libgnutls11-dev, libnss-dev (>= 2:1.4)
+Build-Depends: debhelper (>> 4.0.0), autotools-dev, pkg-config, libxml2-dev,
libxslt1-dev, libssl-dev (>= 0.9.7), libgnutls11-dev, libnss3-dev
Standards-Version: 3.6.2
Package: libxmlsec1-dev
Section: libdevel
Architecture: any
-Depends: libxmlsec1 (= ${Source-Version}), libc6-dev, libxml2-dev,
libxslt1-dev, libssl-dev (>= 0.9.7), libgnutls11-dev, libnss-dev (>= 2:1.4)
+Depends: libxmlsec1 (= ${Source-Version}), libc6-dev, libxml2-dev,
libxslt1-dev, libssl-dev (>= 0.9.7), libgnutls11-dev, libnss3-dev
Description: Development files for the XML security library
The XML Security Library is a C library that implements these XML standards:
.
@@ -57,7 +57,7 @@
Package: libxmlsec1-nss
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libnss3 (>= 2:1.4), libnspr4 (>= 2:1.4)
+Depends: ${shlibs:Depends}
Description: Nss engine for the XML security library
The XML Security Library implements standards related to secure handling
of XML data.
diff -ur xmlsec1-1.2.9/xmlsec-nss.pc.in xmlsec1-1.2.9.mod/xmlsec-nss.pc.in
--- xmlsec1-1.2.9/xmlsec-nss.pc.in 2003-09-10 07:55:26.000000000 +0000
+++ xmlsec1-1.2.9.mod/xmlsec-nss.pc.in 2006-05-02 12:37:19.000000000 +0000
@@ -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@
xulrunner-nss >= @MOZILLA_MIN_VERSION@
Cflags: -DXMLSEC_CRYPTO=\\\"nss\\\" -DXMLSEC_CRYPTO_NSS=1 @XMLSEC_CORE_CFLAGS@
Libs: -L${libdir} -lxmlsec1-nss @XMLSEC_CORE_LIBS@
