This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository wss4j.
commit eb438fa45ae22b337fcbf86b40a2fe798539bc07 Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 23 07:35:14 2013 +0000 Refreshed no-opensaml.patch --- debian/patches/no-opensaml.patch | 51 ++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/debian/patches/no-opensaml.patch b/debian/patches/no-opensaml.patch index 23be6ef..0c0d187 100644 --- a/debian/patches/no-opensaml.patch +++ b/debian/patches/no-opensaml.patch @@ -1,7 +1,6 @@ -diff -Nur -x '*.orig' -x '*~' wss4j/build.xml wss4j.new/build.xml ---- wss4j/build.xml 2009-07-20 15:19:40.000000000 +0200 -+++ wss4j.new/build.xml 2009-07-20 15:29:53.000000000 +0200 -@@ -351,6 +351,8 @@ +--- a/build.xml ++++ b/build.xml +@@ -339,6 +339,8 @@ <!-- Compile the java code from ${dir.src} into ${build.classes} --> <javac srcdir="${dir.src}" destdir="${build.classes}" debug="on" source="1.3" target="1.3"> <classpath refid="classpath.library"/> @@ -10,9 +9,8 @@ diff -Nur -x '*.orig' -x '*~' wss4j/build.xml wss4j.new/build.xml <exclude name="**/Merlin.java" unless="merlin.ok"/> <exclude name="**/sandbox/**/*.java" if="jdk13.present" /> </javac> -diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/message/WSSecDKSign.java wss4j.new/src/org/apache/ws/security/message/WSSecDKSign.java ---- wss4j/src/org/apache/ws/security/message/WSSecDKSign.java 2009-04-15 09:48:44.000000000 +0200 -+++ wss4j.new/src/org/apache/ws/security/message/WSSecDKSign.java 2009-07-20 15:30:17.000000000 +0200 +--- a/src/org/apache/ws/security/message/WSSecDKSign.java ++++ b/src/org/apache/ws/security/message/WSSecDKSign.java @@ -28,7 +28,7 @@ import org.apache.ws.security.conversation.ConversationException; import org.apache.ws.security.message.token.Reference; @@ -40,9 +38,8 @@ diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/message/WSSecDKSi Element body = (Element) WSSecurityUtil.findElement(envel, elemName, nmSpace); if (body == null) { throw new WSSecurityException( -diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/message/WSSecSignature.java wss4j.new/src/org/apache/ws/security/message/WSSecSignature.java ---- wss4j/src/org/apache/ws/security/message/WSSecSignature.java 2009-04-15 09:48:44.000000000 +0200 -+++ wss4j.new/src/org/apache/ws/security/message/WSSecSignature.java 2009-07-20 15:30:17.000000000 +0200 +--- a/src/org/apache/ws/security/message/WSSecSignature.java ++++ b/src/org/apache/ws/security/message/WSSecSignature.java @@ -1,4 +1,4 @@ -/* +/* /* @@ -56,9 +53,9 @@ diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/message/WSSecSign -import org.apache.ws.security.saml.SAMLUtil; +//import org.apache.ws.security.saml.SAMLUtil; import org.apache.ws.security.transform.STRTransform; + import org.apache.ws.security.util.Base64; import org.apache.ws.security.util.WSSecurityUtil; - import org.apache.xml.security.algorithms.SignatureAlgorithm; -@@ -551,7 +551,7 @@ +@@ -558,7 +558,7 @@ Element ctx = createSTRParameter(document); transforms.addTransform(STRTransform.implementedTransformURI, ctx); sig.addDocument("#" + strUri, transforms, digestAlgo); @@ -67,7 +64,7 @@ diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/message/WSSecSign String id = null; id = SAMLUtil.getAssertionId(envelope, elemName, nmSpace); -@@ -574,7 +574,7 @@ +@@ -581,7 +581,7 @@ WSSecurityUtil.setNamespace(body, WSConstants.WSU_NS, WSConstants.WSU_PREFIX); body.setAttributeNS(WSConstants.WSU_NS, prefix + ":Id", id); sig.addDocument("#" + id, transforms, digestAlgo); @@ -76,9 +73,8 @@ diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/message/WSSecSign Element body = (Element)WSSecurityUtil.findElement(envelope, elemName, nmSpace); if (body == null) { -diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/message/WSSignEnvelope.java wss4j.new/src/org/apache/ws/security/message/WSSignEnvelope.java ---- wss4j/src/org/apache/ws/security/message/WSSignEnvelope.java 2009-04-15 09:48:44.000000000 +0200 -+++ wss4j.new/src/org/apache/ws/security/message/WSSignEnvelope.java 2009-07-20 15:30:17.000000000 +0200 +--- a/src/org/apache/ws/security/message/WSSignEnvelope.java ++++ b/src/org/apache/ws/security/message/WSSignEnvelope.java @@ -31,7 +31,7 @@ import org.apache.ws.security.message.token.Reference; import org.apache.ws.security.message.token.SecurityTokenReference; @@ -106,9 +102,8 @@ diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/message/WSSignEnv Element body = (Element) WSSecurityUtil.findElement( envelope, elemName, nmSpace); if (body == null) { -diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java wss4j.new/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java ---- wss4j/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java 2009-04-15 09:48:44.000000000 +0200 -+++ wss4j.new/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java 2009-07-20 15:30:17.000000000 +0200 +--- a/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java ++++ b/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java @@ -30,8 +30,8 @@ import org.apache.ws.security.message.token.DerivedKeyToken; import org.apache.ws.security.message.token.Reference; @@ -136,10 +131,9 @@ diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/processor/Derived } else { throw new WSSecurityException( WSSecurityException.FAILED_CHECK, "unsupportedKeyId" -diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/processor/ReferenceListProcessor.java wss4j.new/src/org/apache/ws/security/processor/ReferenceListProcessor.java ---- wss4j/src/org/apache/ws/security/processor/ReferenceListProcessor.java 2009-04-15 09:48:44.000000000 +0200 -+++ wss4j.new/src/org/apache/ws/security/processor/ReferenceListProcessor.java 2009-07-20 15:30:17.000000000 +0200 -@@ -37,8 +37,8 @@ +--- a/src/org/apache/ws/security/processor/ReferenceListProcessor.java ++++ b/src/org/apache/ws/security/processor/ReferenceListProcessor.java +@@ -36,8 +36,8 @@ import org.apache.ws.security.components.crypto.Crypto; import org.apache.ws.security.message.token.Reference; import org.apache.ws.security.message.token.SecurityTokenReference; @@ -150,7 +144,7 @@ diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/processor/Referen import org.apache.ws.security.util.WSSecurityUtil; import org.apache.xml.security.encryption.XMLCipher; import org.apache.xml.security.encryption.XMLEncryptionException; -@@ -290,8 +290,8 @@ +@@ -310,8 +310,8 @@ } Processor p = wsDocInfo.getProcessor(id); if (!(p instanceof EncryptedKeyProcessor @@ -161,7 +155,7 @@ diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/processor/Referen ) { // Try custom token WSPasswordCallback pwcb = new WSPasswordCallback(id, WSPasswordCallback.CUSTOM_TOKEN); -@@ -320,14 +320,14 @@ +@@ -340,14 +340,14 @@ } else if (p instanceof DerivedKeyTokenProcessor) { DerivedKeyTokenProcessor dkp = (DerivedKeyTokenProcessor) p; decryptedData = dkp.getKeyBytes(WSSecurityUtil.getKeyLength(algorithm)); @@ -178,9 +172,8 @@ diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/processor/Referen } else if (secRef.containsKeyIdentifier()){ String sha = secRef.getKeyIdentifierValue(); WSPasswordCallback pwcb = -diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/processor/SignatureProcessor.java wss4j.new/src/org/apache/ws/security/processor/SignatureProcessor.java ---- wss4j/src/org/apache/ws/security/processor/SignatureProcessor.java 2009-04-15 09:48:44.000000000 +0200 -+++ wss4j.new/src/org/apache/ws/security/processor/SignatureProcessor.java 2009-07-20 15:30:17.000000000 +0200 +--- a/src/org/apache/ws/security/processor/SignatureProcessor.java ++++ b/src/org/apache/ws/security/processor/SignatureProcessor.java @@ -42,8 +42,8 @@ import org.apache.ws.security.message.token.SecurityTokenReference; import org.apache.ws.security.message.token.UsernameToken; @@ -245,7 +238,7 @@ diff -Nur -x '*.orig' -x '*~' wss4j/src/org/apache/ws/security/processor/Signatu } else { certs = secRef.getKeyIdentifier(crypto); } -@@ -512,11 +513,12 @@ +@@ -514,11 +515,12 @@ } principal.setBasetokenId(basetokenId); return principal; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wss4j.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
