[Git][java-team/libitext5-java][master] 3 commits: Combine UNRELEASED d/changelog entries
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Mon Dec 11 05:09:29 GMT 2023
Tony Mancill pushed to branch master at Debian Java Maintainers / libitext5-java
Commits:
b9ade39f by tony mancill at 2023-12-10T10:03:26-08:00
Combine UNRELEASED d/changelog entries
- - - - -
76a0d51d by tony mancill at 2023-12-10T20:59:40-08:00
Add patch to compile against BouncyCastle 1.77 (Closes: #1057171)
- - - - -
5d55e433 by tony mancill at 2023-12-10T21:00:01-08:00
interim changelog entry
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/0010-bouncycastle-177.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,24 +1,16 @@
-libitext5-java (5.5.13.3-5) UNRELEASED; urgency=medium
+libitext5-java (5.5.13.3-3) UNRELEASED; urgency=medium
+ [ Andreas Tille ]
* Team upload.
* Standards-Version: 4.6.2 (routine-update)
* Add salsa-ci file (routine-update)
* Rules-Requires-Root: no (routine-update)
-
- -- Andreas Tille <tille at debian.org> Sat, 09 Dec 2023 12:25:21 +0100
-
-libitext5-java (5.5.13.3-4) UNRELEASED; urgency=medium
-
- * Team upload.
-
- -- Andreas Tille <tille at debian.org> Sat, 09 Dec 2023 12:25:20 +0100
-
-libitext5-java (5.5.13.3-3) UNRELEASED; urgency=medium
-
- * Team upload.
* Fix watchfile to detect new versions on github
- -- Andreas Tille <tille at debian.org> Sat, 09 Dec 2023 12:25:20 +0100
+ [ tony mancill ]
+ * Add patch to compile against BouncyCastle 1.77 (Closes: #1057171)
+
+ -- tony mancill <tmancill at debian.org> Sun, 10 Dec 2023 20:59:43 -0800
libitext5-java (5.5.13.3-2) unstable; urgency=medium
=====================================
debian/patches/0010-bouncycastle-177.patch
=====================================
@@ -0,0 +1,61 @@
+Description: update for BouncyCastle method signatures removed in BC 1.75
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057171
+Author: tony mancill <tmancill at debian.org>
+Forwarded: no
+
+--- a/itext/src/main/java/com/itextpdf/text/pdf/security/PdfPKCS7.java
++++ b/itext/src/main/java/com/itextpdf/text/pdf/security/PdfPKCS7.java
+@@ -220,7 +220,7 @@
+ ASN1ObjectIdentifier objId = (ASN1ObjectIdentifier)signedData.getObjectAt(0);
+ if (!objId.getId().equals(SecurityIDs.ID_PKCS7_SIGNED_DATA))
+ throw new IllegalArgumentException(MessageLocalization.getComposedMessage("not.a.valid.pkcs.7.object.not.signed.data"));
+- ASN1Sequence content = (ASN1Sequence)((ASN1TaggedObject)signedData.getObjectAt(1)).getObject();
++ ASN1Sequence content = (ASN1Sequence)((ASN1TaggedObject)signedData.getObjectAt(1)).getBaseObject();
+ // the positions that we care are:
+ // 0 - version
+ // 1 - digestAlgorithms
+@@ -243,7 +243,7 @@
+ // the possible ID_PKCS7_DATA
+ ASN1Sequence rsaData = (ASN1Sequence)content.getObjectAt(2);
+ if (rsaData.size() > 1) {
+- ASN1OctetString rsaDataContent = (ASN1OctetString)((ASN1TaggedObject)rsaData.getObjectAt(1)).getObject();
++ ASN1OctetString rsaDataContent = (ASN1OctetString)((ASN1TaggedObject)rsaData.getObjectAt(1)).getBaseObject();
+ RSAdata = rsaDataContent.getOctets();
+ }
+
+@@ -343,11 +343,11 @@
+ for (int j = 0; j < seqout.size(); ++j) {
+ ASN1TaggedObject tg = (ASN1TaggedObject)seqout.getObjectAt(j);
+ if (tg.getTagNo() == 0) {
+- ASN1Sequence seqin = (ASN1Sequence)tg.getObject();
++ ASN1Sequence seqin = (ASN1Sequence)tg.getBaseObject();
+ findCRL(seqin);
+ }
+ if (tg.getTagNo() == 1) {
+- ASN1Sequence seqin = (ASN1Sequence)tg.getObject();
++ ASN1Sequence seqin = (ASN1Sequence)tg.getBaseObject();
+ findOcsp(seqin);
+ }
+ }
+@@ -1283,8 +1283,8 @@
+ }
+ if (seq.getObjectAt(k) instanceof ASN1TaggedObject) {
+ ASN1TaggedObject tag = (ASN1TaggedObject)seq.getObjectAt(k);
+- if (tag.getObject() instanceof ASN1Sequence) {
+- seq = (ASN1Sequence)tag.getObject();
++ if (tag.getBaseObject() instanceof ASN1Sequence) {
++ seq = (ASN1Sequence)tag.getBaseObject();
+ ret = false;
+ break;
+ }
+--- a/itext/src/main/java/com/itextpdf/text/pdf/security/CertificateUtil.java
++++ b/itext/src/main/java/com/itextpdf/text/pdf/security/CertificateUtil.java
+@@ -120,7 +120,7 @@
+ if (name.getTagNo() != GeneralName.uniformResourceIdentifier) {
+ continue;
+ }
+- DERIA5String derStr = DERIA5String.getInstance((ASN1TaggedObject)name.toASN1Primitive(), false);
++ DERIA5String derStr = (DERIA5String)DERIA5String.getInstance((ASN1TaggedObject)name.toASN1Primitive(), false);
+ return derStr.getString();
+ }
+ }
=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ skip_test_requiring_xserver.patch
0007-Ignore-broken-XadesTests-for-now.patch
0008-Update-CompareToolTests.patch
0009-Fix-OUTFOLDER-so-it-s-separated-from-the-fileName.patch
+0010-bouncycastle-177.patch
View it on GitLab: https://salsa.debian.org/java-team/libitext5-java/-/compare/a76996f1dd013c1e25344c635a7546d9004c2ec3...5d55e43311232fbdafc61c40adeab9ad8d8d93bb
--
View it on GitLab: https://salsa.debian.org/java-team/libitext5-java/-/compare/a76996f1dd013c1e25344c635a7546d9004c2ec3...5d55e43311232fbdafc61c40adeab9ad8d8d93bb
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/20231211/f9f4c568/attachment.htm>
More information about the pkg-java-commits
mailing list