[Git][java-team/libxml-security-java][master] 3 commits: Add patch for old API used by libitext5-java

Emmanuel Bourg gitlab at salsa.debian.org
Mon Sep 24 11:15:41 BST 2018


Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libxml-security-java


Commits:
5c42ca83 by Jochen Sprickerhof at 2018-09-18T17:31:27Z
Add patch for old API used by libitext5-java

Closes: #906375

- - - - -
0f28c81e by Emmanuel Bourg at 2018-09-24T10:03:31Z
Standards-Version updated to 4.2.1

- - - - -
b644ecb1 by Emmanuel Bourg at 2018-09-24T10:12:55Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/0001-Recover-old-API-for-libitext5-java.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+libxml-security-java (2.0.10-2) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Jochen Sprickerhof ]
+  * Add patch for old API used by libitext5-java (Closes: #906375)
+
+  [ Emmanuel Bourg ]
+  * Standards-Version updated to 4.2.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 24 Sep 2018 12:06:50 +0200
+
 libxml-security-java (2.0.10-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -25,7 +25,7 @@ Build-Depends:
  libxalan2-java-doc,
  libxerces2-java,
  maven-debian-helper (>= 1.4)
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/libxml-security-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libxml-security-java
 Homepage: http://santuario.apache.org


=====================================
debian/copyright
=====================================
@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache XML Security for Java
 Upstream-Contact: Apache Santuario Team <dev at santuario.apache.org>
-Source: http://santuario.apache.org
+Source: https://santuario.apache.org
 
 Files: *
 Copyright: 1999-2015, The Apache Software Foundation.


=====================================
debian/patches/0001-Recover-old-API-for-libitext5-java.patch
=====================================
@@ -0,0 +1,38 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Thu, 30 Aug 2018 09:30:36 +0200
+Subject: Recover old API for libitext5-java
+
+---
+ .../apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java    | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
+index 2ad4c66..aa7e5af 100644
+--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
++++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
+@@ -32,6 +32,7 @@
+ package org.apache.jcp.xml.dsig.internal.dom;
+ 
+ import javax.xml.crypto.*;
++import javax.xml.crypto.dom.DOMCryptoContext;
+ import javax.xml.crypto.dsig.*;
+ import javax.xml.crypto.dsig.dom.DOMSignContext;
+ import javax.xml.crypto.dsig.dom.DOMValidateContext;
+@@ -198,6 +199,17 @@ public final class DOMXMLSignature extends DOMStructure
+         return ksr;
+     }
+ 
++    public void marshal(Node parent, Node nextSibling, String dsPrefix,
++                        DOMCryptoContext context)
++        throws MarshalException
++    {
++        XmlWriterToTree xwriter = new XmlWriterToTree(Marshaller.getMarshallers(), parent, nextSibling);
++        marshal(xwriter, dsPrefix, context);
++
++        Element sigElem = xwriter.getCreatedElement();
++        parent.insertBefore(sigElem, nextSibling);
++    }
++
+     @Override
+     public void marshal(XmlWriter xwriter, String dsPrefix, XMLCryptoContext context)
+         throws MarshalException


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-Recover-old-API-for-libitext5-java.patch



View it on GitLab: https://salsa.debian.org/java-team/libxml-security-java/compare/581645f78ddec908d2d06955b7f5f252a4be5b54...b644ecb10529d03b0063977b8e962ae5e0f359ed

-- 
View it on GitLab: https://salsa.debian.org/java-team/libxml-security-java/compare/581645f78ddec908d2d06955b7f5f252a4be5b54...b644ecb10529d03b0063977b8e962ae5e0f359ed
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180924/cf45f9e2/attachment.html>


More information about the pkg-java-commits mailing list