[xml/sgml-commit] [xmlsec1] 11/32: Imported Debian patch 1.2.12-1

Rene Engelhard rene at moszumanska.debian.org
Sun Jun 25 17:46:23 UTC 2017


This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch experimental
in repository xmlsec1.

commit 144fd0e068925c3dc6b5ea07ce575648b042a270
Merge: db66ffe 3118210
Author: John V. Belmonte <jbelmonte at debian.org>
Date:   Sat Sep 5 18:21:58 2009 -0400

    Imported Debian patch 1.2.12-1

 AUTHORS                                            |   10 +-
 ChangeLog                                          |  161 +
 INSTALL                                            |    2 +-
 Makefile.am                                        |    9 +-
 Makefile.in                                        |   80 +-
 apps/Makefile.am                                   |    1 +
 apps/Makefile.in                                   |   16 +
 apps/cmdline.c                                     |   12 +
 apps/xmlsec.c                                      |   94 +-
 compile                                            |  140 +
 configure                                          | 8972 +++-----------------
 configure.in                                       |  440 +-
 debian/README.Debian                               |    5 -
 debian/changelog                                   |   21 +-
 debian/compat                                      |    2 +-
 debian/control                                     |    7 +-
 debian/rules                                       |   12 +-
 debian/watch                                       |    2 +-
 docs/Makefile.in                                   |   15 +
 docs/api/Makefile.in                               |   15 +
 docs/api/chapters/new-crypto.sgml                  |    2 +-
 docs/api/index.html                                |   89 +-
 docs/api/xmlsec-app.html                           |   62 +-
 docs/api/xmlsec-base64.html                        |   52 +-
 docs/api/xmlsec-bn.html                            |  112 +-
 docs/api/xmlsec-buffer.html                        |   82 +-
 docs/api/xmlsec-custom-keys-manager.html           |    9 +-
 docs/api/xmlsec-decrypt-with-keys-mngr.html        |    9 +-
 docs/api/xmlsec-decrypt-with-signle-key.html       |    9 +-
 docs/api/xmlsec-dl.html                            |   20 +-
 docs/api/xmlsec-encrypt-dynamic-template.html      |    9 +-
 docs/api/xmlsec-encrypt-template-file.html         |    9 +-
 docs/api/xmlsec-encrypt-with-session-key.html      |    9 +-
 docs/api/xmlsec-encryption-klasses.html            |    6 +-
 docs/api/xmlsec-errors.html                        |   70 +-
 .../xmlsec-examples-sign-dynamimc-template.html    |    9 +-
 docs/api/xmlsec-examples-sign-template-file.html   |   12 +-
 docs/api/xmlsec-examples-sign-x509.html            |    9 +-
 docs/api/xmlsec-examples.html                      |    6 +-
 docs/api/xmlsec-gnutls-app.html                    |   60 +-
 docs/api/xmlsec-gnutls-crypto.html                 |   34 +-
 docs/api/xmlsec-gnutls-ref.html                    |   10 +-
 docs/api/xmlsec-index.html                         |    4 +-
 docs/api/xmlsec-index.sgml                         | 1299 ---
 docs/api/xmlsec-io.html                            |   22 +-
 docs/api/xmlsec-keyinfo.html                       |   48 +-
 docs/api/xmlsec-keys.html                          |  150 +-
 docs/api/xmlsec-keysdata.html                      |  268 +-
 docs/api/xmlsec-keysmngr.html                      |   90 +-
 docs/api/xmlsec-list.html                          |   78 +-
 docs/api/xmlsec-membuf.html                        |   12 +-
 docs/api/xmlsec-mscrypto-app.html                  |  100 +-
 docs/api/xmlsec-mscrypto-certkeys.html             |   22 +-
 docs/api/xmlsec-mscrypto-crypto.html               |   44 +-
 docs/api/xmlsec-mscrypto-keysstore.html            |   26 +-
 docs/api/xmlsec-mscrypto-ref.html                  |   16 +-
 docs/api/xmlsec-mscrypto-x509.html                 |   60 +-
 docs/api/xmlsec-nodeset.html                       |   68 +-
 docs/api/xmlsec-notes-compiling-others.html        |    6 +-
 docs/api/xmlsec-notes-compiling-unix.html          |    6 +-
 docs/api/xmlsec-notes-compiling-windows.html       |    6 +-
 docs/api/xmlsec-notes-compiling.html               |    6 +-
 docs/api/xmlsec-notes-contexts.html                |    6 +-
 docs/api/xmlsec-notes-custom-keys-store.html       |    6 +-
 docs/api/xmlsec-notes-decrypt.html                 |    6 +-
 .../xmlsec-notes-dynamic-encryption-templates.html |    6 +-
 .../xmlsec-notes-dynamic-signature-templates.html  |    6 +-
 docs/api/xmlsec-notes-encrypt.html                 |    6 +-
 docs/api/xmlsec-notes-include-files.html           |    6 +-
 docs/api/xmlsec-notes-init-shutdown.html           |    6 +-
 docs/api/xmlsec-notes-keys-manager-sign-enc.html   |    6 +-
 .../api/xmlsec-notes-keys-mngr-verify-decrypt.html |    6 +-
 docs/api/xmlsec-notes-keys.html                    |    6 +-
 docs/api/xmlsec-notes-keysmngr.html                |    6 +-
 docs/api/xmlsec-notes-new-crypto-functions.html    |    6 +-
 docs/api/xmlsec-notes-new-crypto-key-stores.html   |    2 +-
 docs/api/xmlsec-notes-new-crypto-keys.html         |    6 +-
 docs/api/xmlsec-notes-new-crypto-klasses.html      |    8 +-
 .../xmlsec-notes-new-crypto-sharing-results.html   |    6 +-
 .../xmlsec-notes-new-crypto-simple-keys-mngr.html  |    6 +-
 docs/api/xmlsec-notes-new-crypto-skeleton.html     |    6 +-
 docs/api/xmlsec-notes-new-crypto-transforms.html   |    6 +-
 docs/api/xmlsec-notes-new-crypto.html              |    6 +-
 docs/api/xmlsec-notes-overview.html                |    6 +-
 docs/api/xmlsec-notes-sign-encrypt.html            |    6 +-
 docs/api/xmlsec-notes-sign-x509.html               |    6 +-
 docs/api/xmlsec-notes-sign.html                    |    6 +-
 docs/api/xmlsec-notes-simple-keys-store.html       |    6 +-
 docs/api/xmlsec-notes-structure.html               |    6 +-
 docs/api/xmlsec-notes-templates.html               |    6 +-
 docs/api/xmlsec-notes-transforms.html              |    6 +-
 docs/api/xmlsec-notes-verify-decrypt.html          |    6 +-
 docs/api/xmlsec-notes-verify-x509.html             |    6 +-
 docs/api/xmlsec-notes-verify.html                  |    6 +-
 docs/api/xmlsec-notes-x509.html                    |    6 +-
 docs/api/xmlsec-notes.html                         |    6 +-
 docs/api/xmlsec-nss-app.html                       |  136 +-
 docs/api/xmlsec-nss-bignum.html                    |   22 +-
 docs/api/xmlsec-nss-crypto.html                    |   48 +-
 docs/api/xmlsec-nss-keysstore.html                 |   26 +-
 docs/api/xmlsec-nss-pkikeys.html                   |   24 +-
 docs/api/xmlsec-nss-ref.html                       |   18 +-
 docs/api/xmlsec-nss-x509.html                      |   62 +-
 docs/api/xmlsec-openssl-app.html                   |  140 +-
 docs/api/xmlsec-openssl-bn.html                    |   20 +-
 docs/api/xmlsec-openssl-crypto.html                |   74 +-
 docs/api/xmlsec-openssl-evp.html                   |   20 +-
 docs/api/xmlsec-openssl-ref.html                   |   16 +-
 docs/api/xmlsec-openssl-x509.html                  |   68 +-
 docs/api/xmlsec-parser.html                        |   30 +-
 docs/api/xmlsec-ref.html                           |   52 +-
 docs/api/xmlsec-reference.html                     |    6 +-
 docs/api/xmlsec-signature-klasses.html             |    6 +-
 docs/api/xmlsec-templates.html                     |  180 +-
 docs/api/xmlsec-transforms.html                    |  372 +-
 docs/api/xmlsec-verify-with-key.html               |    9 +-
 docs/api/xmlsec-verify-with-keys-mngr.html         |    9 +-
 docs/api/xmlsec-verify-with-restrictions.html      |    9 +-
 docs/api/xmlsec-verify-with-x509.html              |    9 +-
 docs/api/xmlsec-version.html                       |   10 +-
 docs/api/xmlsec-x509.html                          |   16 +-
 docs/api/xmlsec-xmldsig.html                       |   74 +-
 docs/api/xmlsec-xmlenc.html                        |   62 +-
 docs/api/xmlsec-xmlsec.html                        |   18 +-
 docs/api/xmlsec-xmltree.html                       |  256 +-
 docs/authors.html                                  |    9 +-
 docs/bugs.html                                     |    2 +-
 docs/c14n.html                                     |    2 +-
 docs/documentation.html                            |   28 +-
 docs/download.html                                 |   26 +-
 docs/faq.html                                      |  556 +-
 docs/index.html                                    |   65 +-
 docs/news.html                                     |   49 +-
 docs/related.html                                  |  162 +-
 docs/xmldsig-verifier.html                         |   13 +-
 docs/xmldsig.html                                  |   47 +-
 docs/xmlenc.html                                   |    4 +-
 docs/xmlsec-man.html                               |   18 +-
 examples/Makefile.w32                              |   10 +-
 include/Makefile.in                                |   15 +
 include/xmlsec/Makefile.in                         |   15 +
 include/xmlsec/app.h                               |   22 +
 include/xmlsec/base64.h                            |    4 +
 include/xmlsec/exports.h                           |   15 +-
 include/xmlsec/gnutls/Makefile.in                  |   15 +
 include/xmlsec/gnutls/crypto.h                     |    4 +
 include/xmlsec/{gnutls => mscrypto}/.cvsignore     |    0
 include/xmlsec/mscrypto/Makefile.am                |   16 +
 include/xmlsec/{nss => mscrypto}/Makefile.in       |   68 +-
 include/xmlsec/mscrypto/certkeys.h                 |    1 +
 include/xmlsec/mscrypto/crypto.h                   |   44 +
 include/xmlsec/mscrypto/symbols.h                  |    5 +-
 include/xmlsec/mscrypto/x509.h                     |    4 +
 include/xmlsec/nss/Makefile.in                     |   15 +
 include/xmlsec/nss/crypto.h                        |    4 +
 include/xmlsec/openssl/Makefile.in                 |   15 +
 include/xmlsec/openssl/app.h                       |    3 +
 include/xmlsec/openssl/crypto.h                    |    4 +
 include/xmlsec/openssl/x509.h                      |    5 +
 include/xmlsec/private.h                           |    3 +
 include/xmlsec/private/Makefile.in                 |   15 +
 include/xmlsec/strings.h                           |   20 +
 include/xmlsec/templates.h                         |    7 +
 include/xmlsec/version.h                           |    6 +-
 include/xmlsec/xmlenc.h                            |   19 +-
 include/xmlsec/xmltree.h                           |   17 +-
 man/Makefile.in                                    |   15 +
 mkinstalldirs                                      |    2 +-
 scripts/build_release.sh                           |   18 +-
 scripts/push_release.sh                            |   39 +-
 src/Makefile.am                                    |    5 +-
 src/Makefile.in                                    |   18 +-
 src/app.c                                          |   70 +
 src/base64.c                                       |   27 +-
 src/bn.c                                           |    2 +-
 src/dl.c                                           |   26 +
 src/gnutls/Makefile.am                             |   24 +-
 src/gnutls/Makefile.in                             |  121 +-
 src/gnutls/hmac.c                                  |   45 +-
 src/keyinfo.c                                      |    5 +-
 src/{gnutls => mscrypto}/.cvsignore                |    4 +-
 src/mscrypto/Makefile.am                           |   58 +
 src/{nss => mscrypto}/Makefile.in                  |  219 +-
 src/mscrypto/app.c                                 |  248 +-
 src/mscrypto/certkeys.c                            |  234 +-
 src/mscrypto/ciphers.c                             |   43 +-
 src/mscrypto/crypto.c                              |   21 +-
 src/mscrypto/csp_calg.h                            |   92 +
 src/mscrypto/csp_oid.h                             |  114 +
 src/mscrypto/digests.c                             |   79 +-
 src/mscrypto/keysstore.c                           |   70 +-
 src/mscrypto/kt_rsa.c                              |    3 +-
 src/mscrypto/mingw-crypt32.def                     |   32 +
 src/mscrypto/signatures.c                          |   95 +-
 src/mscrypto/x509.c                                |  169 +-
 src/mscrypto/x509vfy.c                             | 1066 ++-
 src/mscrypto/xmlsec-mingw.h                        |  165 +
 src/nss/Makefile.am                                |   25 +-
 src/nss/Makefile.in                                |  221 +-
 src/nss/app.c                                      |    4 -
 src/nss/bignum.c                                   |    2 +-
 src/nss/hmac.c                                     |   45 +-
 src/nss/keysstore.c                                |   20 -
 src/nss/pkikeys.c                                  |    2 +-
 src/nss/x509.c                                     |   18 +-
 src/openssl/Makefile.am                            |   24 +-
 src/openssl/Makefile.in                            |  210 +-
 src/openssl/app.c                                  |   43 +
 src/openssl/bn.c                                   |    2 +-
 src/openssl/hmac.c                                 |   45 +-
 src/openssl/x509.c                                 |   19 +-
 src/openssl/x509vfy.c                              |  120 +-
 src/skeleton/Makefile.am                           |   24 +-
 src/skeleton/crypto.c                              |   12 +
 src/strings.c                                      |   20 +
 src/templates.c                                    |  126 +-
 src/transforms.c                                   |    3 +-
 src/xmldsig.c                                      |   21 +-
 src/xmlenc.c                                       |  208 +-
 src/xmlsec-ltdl.c                                  |    7 +-
 src/xmlsec-ltdl.patch                              |   16 +
 src/xmltree.c                                      |  142 +-
 src/xpath.c                                        |    2 +-
 tests/aleksey-xmldsig-01/enveloped-gost.tmpl       |   31 +
 tests/aleksey-xmldsig-01/enveloped-gost.xml        |   42 +
 tests/keys/gost2001ca.der                          |  Bin 0 -> 527 bytes
 tests/keys/gost2001ca.pem                          |   13 +
 tests/testDSig.sh                                  |  124 +-
 tests/testEnc.sh                                   |  100 +-
 tests/testKeys.sh                                  |   53 +-
 win32/Makefile.msvc                                |    2 +-
 win32/mycfg.bat                                    |    5 +-
 xmlsec-config.in                                   |    3 +-
 xmlsec-nss.pc.in                                   |    2 +-
 xmlsec.spec.in                                     |    4 +
 xmlsec1-config                                     |   17 +-
 xmlsec1-gnutls.pc                                  |   11 +
 xmlsec1-nss.pc                                     |    6 +-
 xmlsec1-openssl.pc                                 |    4 +-
 xmlsec1.m4                                         |  172 +
 xmlsec1.pc                                         |    4 +-
 xmlsec1.spec                                       |    6 +-
 xmlsec1Conf.sh                                     |    4 +-
 243 files changed, 8776 insertions(+), 12719 deletions(-)

diff --cc debian/README.Debian
index 8aa9323,0000000..a35c521
mode 100644,000000..100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -1,42 -1,0 +1,37 @@@
 +xmlsec and libxmlsec for Debian
 +-------------------------------
 +
 +The upstream documentation is included with the libxmlsec1-dev package and
 +located at /usr/share/doc/libxmlsec1-dev.
 +
 +When developing with the xmlsec library, you have a choice of openssl,
 +gnutls, or nss crypto engines.  By using "pkg-config xmlsec1-<engine>" or
 +"xmlsec1-config --crypto=<engine>", you can get the necessary compiler
 +command-line switches for enabling a certain engine.
 +
 +If you want to license your application that uses the xmlsec library under
 +the GNU GPL, or want your library that uses the xmlsec library to be GPL-
 +compatible, I suggest using the gnutls engine.  Use of the nss crypto engine
 +may also be compatible with the GPL, but see bugs #207024 and #207026.
 +Regarding openssl, there is a bit of controversy about whether it can be
 +considered part of the OS and therefore make use of a loophole in the GPL.
 +(See the xmlsec FAQ in the documentation.)  More specifically, debian-legal
 +takes a hard line and does not allow GPL'd packages that link to openssl to
 +exist in main.  In the future, support for PGP key types may be added, which
 +would become another reason to go with the gnutls engine.
 +
 +Note that the library has a dynamic crypto engine loading feature, but I
 +have not yet enabled it.
 +
- Regarding nss crypto engine support, beware that there are a number of
- packaging issues with depending on libnss and libnspr (part of the mozilla
- source package) which may cause trouble down the road (see bugs #200877,
- #200878, #207008, #207009, and #48208).
- 
 +Note that a number of the examples included with the -dev package will
 +not compile successfuly under the gnutls engine (due to lack of features
 +compared to openssl), and will fail under both the gnutls and nss engines
 +(due to lack of pem file support, etc.).
 +
 +Upstream has promised that they will increment the number in the library name
 +name (for example, xmlsec1 -> xmlsec2) whenever a binary incompatibility is
 +introduced, and that it will always match the soname number.  For this
 +reason I chose to omit the soname number from package names.
 +
 +
 + -- John V. Belmonte <jbelmonte at debian.org>
diff --cc debian/changelog
index 9a0cc43,0000000..111e15d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,140 -1,0 +1,149 @@@
- xmlsec1 (1.2.9-5+lenny1) oldstable-security; urgency=high
++xmlsec1 (1.2.12-1) unstable; urgency=low
 +
-   * Non-maintainer upload by the Security Team.
-   * Apply patch from upstream addressing arbitrary file overwrite
-     (CVE-2011-1425, closes: #620560).
++  * New upstream release (Closes: #532751, #529918)
++  * Update debian/watch
++  * Upgrade to latest debhelper version
++  * In debian/control:
++    * add Homepage
++    * remove use of ${Source-Version}
++  * In debian/rules:
++    * fix distclean call
++    * $(CURDIR) instead of $(PWD)
++    * remove xulrunner hack since upstream now supports it in configure
++    * strip RPATH's caused by bug in upstream's libtool version
++  * Confirm Debian standards 3.8.3
 +
-  -- Thijs Kinkhorst <thijs at debian.org>  Wed, 13 Apr 2011 11:57:24 +0200
++ -- John V. Belmonte <jbelmonte at debian.org>  Sat, 05 Sep 2009 18:21:58 -0400
 +
 +xmlsec1 (1.2.9-5) unstable; urgency=low
 +
 +  * Remove shlibs.local (Closes: #379445)
 +  * Add minimum versions to Build-Depends and -dev Depends
 +
 + -- John V. Belmonte <jbelmonte at debian.org>  Sun, 30 Jul 2006 22:27:01 -0400
 +
 +xmlsec1 (1.2.9-4) unstable; urgency=low
 +
 +  * Fix gnutls dependency in shlibs.local (Closes: #379390)
 +
 + -- John V. Belmonte <jbelmonte at debian.org>  Sun, 23 Jul 2006 10:46:53 -0400
 +
 +xmlsec1 (1.2.9-3) unstable; urgency=low
 +
 +  * Adjust gnutls dependency (Closes: #335771)
 +  * Adjust libxml2 min version
 +
 + -- John V. Belmonte <jbelmonte at debian.org>  Mon, 26 Jun 2006 20:48:41 -0400
 +
 +xmlsec1 (1.2.9-2) unstable; urgency=low
 +
 +  * Add engine libraries to depends of dev package
 +  * Switch to mozilla libs provided by xulrunner package (Closes: #364382)
 +  * Confirm Debian standards 3.7.2
 +
 + -- John V. Belmonte <jbelmonte at debian.org>  Thu, 08 Jun 2006 21:52:55 -0400
 +
 +xmlsec1 (1.2.9-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #319807)
 +  * Upgrade to Debian standards 3.6.2
 +
 + -- John V. Belmonte <jbelmonte at debian.org>  Sat, 17 Sep 2005 09:36:11 -0400
 +
 +xmlsec1 (1.2.6-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- John V. Belmonte <jbelmonte at debian.org>  Thu, 26 Aug 2004 15:07:52 -0400
 +
 +xmlsec1 (1.2.4-3) unstable; urgency=low
 +
 +  * Adjust gnutls dependency (Closes: #263626)
 +  * Add debian/watch
 +
 + -- John V. Belmonte <jbelmonte at debian.org>  Thu, 5 Aug 2004 12:09:42 -0400
 +
 +xmlsec1 (1.2.4-2) unstable; urgency=low
 +
 +  * Change maintainer address
 +  * Adjust libxslt dependency (Closes: #261831)
 +
 + -- John V. Belmonte <jbelmonte at debian.org>  Mon, 2 Aug 2004 10:05:04 -0400
 +
 +xmlsec1 (1.2.4-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #228531)
 +  * Add binary for nss crypto engine
 +  * Upgrade gnutls dependency to gnutls10
 +
 + -- John V. Belmonte <jvb at prairienet.org>  Tue, 27 Jan 2004 12:49:49 -0500
 +
 +xmlsec1 (1.1.1-2) unstable; urgency=low
 +
 +  * Upgrade to Debian standards 3.6.1
 +  * In debian/rules:
 +    * remove unused "nostrip" logic
 +    * replace use of $CURDIR with `pwd`
 +    * remove unused debhelper calls
 +    * convert from dh_movefiles to dh_install
 +    * omit makefiles and SGML files from HTML docs
 +
 + -- John V. Belmonte <jvb at prairienet.org>  Mon, 13 Oct 2003 15:43:41 -0400
 +
 +xmlsec1 (1.1.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Add soname number to build/-dev depends for libgnutls
 +  * Add version to build/-dev depends for libssl since no
 +    libssl<soname_number>-dev is available
 +  * In README.Debian, clarify restriction on use of openssl crypto engine
 +    by GPL'd official Debian packages
 +  * In README.Debian, more about the yet unpackaged nss crypto engine
 +
 + -- John V. Belmonte <jvb at prairienet.org>  Sun, 24 Aug 2003 06:39:56 -0400
 +
 +xmlsec1 (1.1.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Add pkg-config files (Closes: #203376)
 +  * Downplay xmlsec1-config in README.Debian, package descriptions
 +  * Remove some upstream workarounds from debian/rules
 +
 + -- John V. Belmonte <jvb at prairienet.org>  Mon, 11 Aug 2003 10:05:06 -0400
 +
 +xmlsec1 (1.0.4-2) unstable; urgency=low
 +
 +  * No change, except this time my sponsor won't accidentally mutilate the
 +    package before uploading :-)
 +
 + -- John V. Belmonte <jvb at prairienet.org>  Fri, 18 Jul 2003 01:11:45 -0400
 +
 +xmlsec1 (1.0.4-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Update README.Debian regarding nss engine support
 +  * Fix typo in libxmlsec1 description
 +  * Remove some upstream workarounds from debian/rules
 +
 + -- John V. Belmonte <jvb at prairienet.org>  Tue, 15 Jul 2003 21:23:11 -0400
 +
 +xmlsec1 (1.0.3-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #194270)
 +  * change source name for xmlsec1 series
 +  * change dev package section to libdevel
 +
 + -- John V. Belmonte <jvb at prairienet.org>  Tue, 17 Jun 2003 23:19:17 -0400
 +
 +xmlsec (0.0.14-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * upgrade to Debian standards 3.5.9
 +
 + -- John V. Belmonte <jvb at prairienet.org>  Fri, 28 Mar 2003 14:21:10 -0500
 +
 +xmlsec (0.0.12-1) unstable; urgency=low
 +
 +  * Initial Release (Closes: #152605)
 +
 + -- John V. Belmonte <jvb at prairienet.org>  Tue, 11 Feb 2003 14:58:00 -0500
diff --cc debian/compat
index b8626c4,0000000..7f8f011
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 4
++7
diff --cc debian/control
index ff18450,0000000..792645b
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,75 -1,0 +1,76 @@@
 +Source: xmlsec1
 +Section: text
 +Priority: optional
 +Maintainer: John V. Belmonte <jbelmonte at debian.org>
- Build-Depends: debhelper (>> 4.0.0), autotools-dev, pkg-config, libxml2-dev (>= 2.6.12), libxslt1-dev (>= 1.0.20), libssl-dev (>= 0.9.7), libgnutls-dev (>= 1.0.0), libnss3-dev
- Standards-Version: 3.7.2
++Build-Depends: debhelper (>> 7.0.0), autotools-dev, chrpath, pkg-config, libxml2-dev (>= 2.6.12), libxslt1-dev (>= 1.0.20), libssl-dev (>= 0.9.8), libgnutls-dev (>= 1.0.0), libnss3-dev
++Standards-Version: 3.8.3
++Homepage: http://www.aleksey.com/xmlsec/
 +
 +Package: libxmlsec1-dev
 +Section: libdevel
 +Architecture: any
- Depends: libxmlsec1 (= ${Source-Version}), libxmlsec1-openssl (= ${Source-Version}), libxmlsec1-gnutls (= ${Source-Version}), libxmlsec1-nss (= ${Source-Version}), libc6-dev, libxml2-dev (>= 2.6.12), libxslt1-dev (>= 1.0.20), libssl-dev (>= 0.9.7), libgnutls-dev (>= 1.0.0), libnss3-dev
++Depends: libxmlsec1 (= ${binary:Version}), libxmlsec1-openssl (= ${binary:Version}), libxmlsec1-gnutls (= ${binary:Version}), libxmlsec1-nss (= ${binary:Version}), libc6-dev, libxml2-dev (>= 2.6.12), libxslt1-dev (>= 1.0.20), libssl-dev (>= 0.9.8), libgnutls-dev (>= 1.0.0), libnss3-dev
 +Description: Development files for the XML security library
 + The XML Security Library is a C library that implements these XML standards:
 + .
 +    * XML Signature
 +    * XML Encryption
 + .
 + This package provides development files including documentation, examples,
 + headers, static libraries, and configuration support.
 +
 +Package: libxmlsec1
 +Section: libs
 +Architecture: any
 +Depends: ${shlibs:Depends}
 +Description: XML security library
 + The XML Security Library implements standards related to secure handling
 + of XML data.
 + .
 + This package provides dynamic libraries for use by applications.
 + Specifically, it provides all XML security library functionality
 + except for the cryptography engine.
 +
 +Package: libxmlsec1-openssl
 +Section: libs
 +Architecture: any
 +Depends: ${shlibs:Depends}
 +Description: Openssl engine for the XML security library
 + The XML Security Library implements standards related to secure handling
 + of XML data.
 + .
 + This package provides dynamic libraries for use by applications.
 + Specifically, it provides the openssl implementation of the XML security
 + library cryptography functions.
 +
 +Package: libxmlsec1-gnutls
 +Section: libs
 +Architecture: any
 +Depends: ${shlibs:Depends}
 +Description: Gnutls engine for the XML security library
 + The XML Security Library implements standards related to secure handling
 + of XML data.
 + .
 + This package provides dynamic libraries for use by applications.
 + Specifically, it provides the gnutls implementation of the XML security
 + library cryptography functions.
 +
 +Package: libxmlsec1-nss
 +Section: libs
 +Architecture: any
 +Depends: ${shlibs:Depends}
 +Description: Nss engine for the XML security library
 + The XML Security Library implements standards related to secure handling
 + of XML data.
 + .
 + This package provides dynamic libraries for use by applications.
 + Specifically, it provides the nss implementation of the XML security
 + library cryptography functions.
 +
 +Package: xmlsec1
 +Section: text
 +Architecture: any
 +Depends: ${shlibs:Depends}
 +Description: XML security command line processor
 + Xmlsec is a command line tool for signature and encryption transformations
 + of XML data.  It is part of the XML Security Library.
diff --cc debian/rules
index a8461f8,0000000..ebb75eb
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,103 -1,0 +1,103 @@@
 +#!/usr/bin/make -f
 +# Sample debian/rules that uses debhelper.
 +# GNU copyright 1997 to 1999 by Joey Hess.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
 +# These are used for cross-compiling and for saving the configure script
 +# from having to guess our platform (since we know it already)
 +DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 +DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 +
 +
 +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 +	CFLAGS += -g
 +endif
 +
 +# shared library versions, option 1
 +#version=2.0.5
 +#major=2
 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
 +version=`ls src/.libs/lib*.so.* | \
 +	awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
 +major=`ls src/.libs/lib*.so.* | \
 +	awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 +
 +config.status: configure
 +	dh_testdir
 +	# Add here commands to configure the package.
 +	-test -r /usr/share/misc/config.sub && \
 +		cp -f /usr/share/misc/config.sub config.sub
 +	-test -r /usr/share/misc/config.guess && \
 +		cp -f /usr/share/misc/config.guess config.guess
- 	# replace mozilla-nspr/nss package references with xulrunner
- 	sed -i -e 's/mozilla-\(nspr\|nss\)/xulrunner-\1/g' \
- 		 configure.in configure xmlsec-nss.pc.in
 +	./configure \
 +		--host=$(DEB_HOST_GNU_TYPE) \
 +		--build=$(DEB_BUILD_GNU_TYPE) \
 +		--prefix=/usr \
 +		--mandir=\$${prefix}/share/man \
 +		--infodir=\$${prefix}/share/info \
 +		--with-html-dir=\$${prefix}/share/doc/xmlsec1/html \
 +		--enable-dynamic \
 +		--disable-crypto-dl \
 +		--disable-apps-crypto-dl
 +
 +
 +build: build-stamp
 +build-stamp: config.status
 +	dh_testdir
 +
 +	# Add here commands to compile the package.
 +	$(MAKE)
 +
 +	touch build-stamp
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
 +	rm -f build-stamp
 +
 +	# Add here commands to clean up after the build process.
- 	-$(MAKE) distclean
++	[ ! -f Makefile ] || $(MAKE) distclean
 +
 +	dh_clean COPYING config.log config.cache config.status config.sub \
 +		config.guess
 +
 +install: build
 +	dh_testdir
 +	dh_testroot
 +	dh_clean -k
 +	dh_installdirs
 +
 +	# Add here commands to install the package into debian/tmp
- 	$(MAKE) install prefix=`pwd`/debian/tmp/usr
++	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
++	# strip unwanted RPATH caused by bug in old libtool
++	chrpath -d $(CURDIR)/debian/tmp/usr/lib/*.so \
++		$(CURDIR)/debian/tmp/usr/bin/xmlsec1
 +
 +# Build architecture-independent files here.
 +binary-indep: build install
 +# We have nothing to do by default.
 +
 +# Build architecture-dependent files here.
 +binary-arch: build install
 +	dh_testdir
 +	dh_testroot
 +
 +	dh_install -X.cvsignore --sourcedir=debian/tmp
 +	dh_installexamples -X.cvsignore examples/*
 +	dh_installdocs -X.sgml --all README debian/README.Debian debian/TODO.Debian
 +	dh_installman
 +	dh_installchangelogs ChangeLog
 +	dh_strip
 +	dh_compress -Xexamples/
 +	dh_fixperms
 +	dh_makeshlibs -V
 +	dh_installdeb
- 	dh_shlibdeps -l $(PWD)/debian/libxmlsec1/usr/lib
++	dh_shlibdeps -l $(CURDIR)/debian/libxmlsec1/usr/lib
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install
diff --cc debian/watch
index 49dd00f,0000000..9017ba8
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,3 @@@
 +version=2
- ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-([\d\.]+)\.tar\.gz \
++http://www.aleksey.com/xmlsec/download/xmlsec1-([\d\.]+)\.tar\.gz \
 +    debian uupdate

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-xml-sgml/xmlsec1.git



More information about the debian-xml-sgml-commit mailing list