[Git][java-team/libitext5-java][master] 9 commits: Update debian/watch to version 5
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Wed Dec 24 14:55:18 GMT 2025
Tony Mancill pushed to branch master at Debian Java Maintainers / libitext5-java
Commits:
83aa3448 by tony mancill at 2025-12-23T20:37:07-08:00
Update debian/watch to version 5
- - - - -
062df4d2 by tony mancill at 2025-12-23T20:37:43-08:00
interim changelog entry
- - - - -
4730ff94 by tony mancill at 2025-12-23T20:38:09-08:00
New upstream version 5.5.13.4
- - - - -
289e0f84 by tony mancill at 2025-12-23T20:38:34-08:00
Update upstream source from tag 'upstream/5.5.13.4'
Update to upstream version '5.5.13.4'
with Debian dir 7725b5e53245ddacbe1ff21cd902f551f26ff9ca
- - - - -
eb228341 by tony mancill at 2025-12-23T21:32:35-08:00
Remove 0010-bouncycastle-177.patch; no longer needed
- - - - -
dcbd1ead by tony mancill at 2025-12-23T21:32:35-08:00
Remove utf8.patch; no longer needed
- - - - -
28d0a868 by tony mancill at 2025-12-23T21:32:35-08:00
Bump Standards-Version to 4.7.3
- - - - -
e3e94ed7 by tony mancill at 2025-12-24T06:48:57-08:00
Freshen years in debian/copyright
- - - - -
1bd1eb38 by tony mancill at 2025-12-24T06:48:57-08:00
Prepare for upload
- - - - -
17 changed files:
- debian/changelog
- debian/control
- debian/copyright
- − debian/patches/0010-bouncycastle-177.patch
- debian/patches/series
- − debian/patches/utf8.patch
- debian/watch
- itext/pom.xml
- itext/src/main/java/com/itextpdf/text/Version.java
- itext/src/main/java/com/itextpdf/text/pdf/DefaultSplitCharacter.java
- itext/src/main/java/com/itextpdf/text/pdf/security/CertificateUtil.java
- itext/src/main/java/com/itextpdf/text/pdf/security/PdfPKCS7.java
- itext/src/test/java/com/itextpdf/text/pdf/DefaultSplitCharacterProfilingTest.java
- pdfa/pom.xml
- pom.xml
- xmlworker/pom.xml
- xtra/pom.xml
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,20 @@
+libitext5-java (5.5.13.4-1) unstable; urgency=medium
+
+ * Team upload
+
+ [ Debian Janitor ]
+ * Apply multi-arch hints. + libitext5-java: Add Multi-Arch: foreign.
+
+ [ tony mancill ]
+ * Update debian/watch to version 5
+ * New upstream version 5.5.13.4
+ * Remove 0010-bouncycastle-177.patch; no longer needed
+ * Remove utf8.patch; no longer needed
+ * Bump Standards-Version to 4.7.3
+ * Freshen years in debian/copyright
+
+ -- tony mancill <tmancill at debian.org> Wed, 24 Dec 2025 06:48:24 -0800
+
libitext5-java (5.5.13.3-4) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -17,7 +17,7 @@ Build-Depends:
libmockito-java,
libxml-security-java,
maven-debian-helper
-Standards-Version: 4.6.2
+Standards-Version: 4.7.3
Vcs-Git: https://salsa.debian.org/java-team/libitext5-java.git
Vcs-Browser: https://salsa.debian.org/java-team/libitext5-java
Homepage: http://itextpdf.com
=====================================
debian/copyright
=====================================
@@ -4,7 +4,7 @@ Source: https://github.com/itext/itextpdf
Files-Excluded: pdfa/src/test/resources/com/itextpdf/text/pdf/*.icm
Files: *
-Copyright: 1998-2022 iText Software Corp
+Copyright: 1998-2024 iText Software Corp
License: AGPL-3.0
License: AGPL-3.0
@@ -330,7 +330,7 @@ Copyright: 2003-2005, Christian Bayle <bayle at debian.org>
2014-2018, Andreas Tille <tille at debian.org>
2015-2018, Markus Koschany <apo at debian.org>
2018, Jochen Sprickerhof <jspricke at debian.org>
- 2022, tony mancill <tmancill at debian.org>
+ 2022-2025, tony mancill <tmancill at debian.org>
License: Apache-2.0
License: Apache-2.0
=====================================
debian/patches/0010-bouncycastle-177.patch deleted
=====================================
@@ -1,61 +0,0 @@
-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
=====================================
@@ -1,9 +1,7 @@
-# utf8.patch
# remove-javadoc-page-tracking.patch
skip_test_requiring_xserver.patch
0006-Update-test-files.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
0011-CVE-2021-37819.patch
=====================================
debian/patches/utf8.patch deleted
=====================================
@@ -1,20 +0,0 @@
-Some non UTF-8 characters prevent building.
-
---- a/src/main/java/com/itextpdf/text/pdf/languages/IndicCompositeCharacterComparator.java
-+++ b/src/main/java/com/itextpdf/text/pdf/languages/IndicCompositeCharacterComparator.java
-@@ -56,15 +56,6 @@
- * of Characters before the one with lower no. This is necessay to properly display the CompositeCharacters
- * when they occur side by side.
- * </p>
--// * <p>
--// * <h3>Examples of CompositeCharactes from Bangla</h3>
--// * <ul>
--// * <li><b>�?�?�?</b></li>
--// * <li><b>�?�?</b></li>
--// * <li><b>�?�?ষ�?ম</b></li>
--// * <li><b>�?�?ষ</b></li>
--// * </ul>
--// * </p>
- *
- * @author <a href="mailto:paawak at gmail.com">Palash Ray</a>
- */
=====================================
debian/watch
=====================================
@@ -1,3 +1,7 @@
-version=4
-opts="repack,compression=xz" \
-https://github.com/itext/itextpdf/tags .*/refs/tags/@ANY_VERSION at .tar.gz
+Version: 5
+
+Template: Github
+Compression: xz
+Owner: itext
+Project: itextpdf
+Repack: yes
=====================================
itext/pom.xml
=====================================
@@ -10,7 +10,7 @@
</parent>
<artifactId>itextpdf</artifactId>
- <version>5.5.13.3</version>
+ <version>5.5.13.4</version>
<name>iText Core</name>
<description>A Free Java-PDF library</description>
@@ -75,13 +75,13 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15to18</artifactId>
- <version>1.70</version>
+ <version>1.78.1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>1.70</version>
+ <artifactId>bcpkix-jdk15to18</artifactId>
+ <version>1.78.1</version>
<optional>true</optional>
</dependency>
<dependency>
=====================================
itext/src/main/java/com/itextpdf/text/Version.java
=====================================
@@ -74,14 +74,14 @@ public final class Version {
* This String contains the version number of this iText release.
* For debugging purposes, we request you NOT to change this constant.
*/
- private final String release = "5.5.13.3";
+ private final String release = "5.5.13.4";
/**
* This String contains the iText version as shown in the producer line.
* iText is a product developed by iText Group NV.
* iText Group requests that you retain the iText producer line
* in every PDF that is created or manipulated using iText.
*/
- private String iTextVersion = iText + " " + release + " \u00a92000-2022 iText Group NV";
+ private String iTextVersion = iText + " " + release + " \u00a92000-2024 iText Group NV";
/**
* The license key.
*/
=====================================
itext/src/main/java/com/itextpdf/text/pdf/DefaultSplitCharacter.java
=====================================
@@ -116,8 +116,14 @@ public class DefaultSplitCharacter implements SplitCharacter {
* @return <CODE>true</CODE> if the character can be used to split a string, <CODE>false</CODE> otherwise
*/
public boolean isSplitCharacter(int start, int current, int end, char[] cc, PdfChunk[] ck) {
- char[] ccTmp = checkDatePattern(String.valueOf(cc));
- char c = getCurrentCharacter(current, ccTmp, ck);
+ char c = getCurrentCharacter(current, cc, ck);
+ if (c == '-') {
+ int beginDateidx = Math.max(current - 8, 0);
+ int dateLength = Math.min(16, cc.length - beginDateidx);
+ if (containsDate(String.valueOf(cc, beginDateidx, dateLength))) {
+ return false;
+ }
+ }
if (characters != null) {
for (int i = 0; i < characters.length; i++) {
@@ -155,14 +161,8 @@ public class DefaultSplitCharacter implements SplitCharacter {
return (char) ck[Math.min(current, ck.length - 1)].getUnicodeEquivalent(cc[current]);
}
- private char[] checkDatePattern(String data) {
- if (data.contains("-")) {
- Matcher m = DATE_PATTERN.matcher(data);
- if (m.find()) {
- String tmpData = m.group(1).replace('-', '\u2011');
- data = data.replaceAll(m.group(1), tmpData);
- }
- }
- return data.toCharArray();
+ private static boolean containsDate(String data) {
+ Matcher m = DATE_PATTERN.matcher(data);
+ return m.find();
}
}
=====================================
itext/src/main/java/com/itextpdf/text/pdf/security/CertificateUtil.java
=====================================
@@ -120,7 +120,7 @@ public class CertificateUtil {
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();
}
}
=====================================
itext/src/main/java/com/itextpdf/text/pdf/security/PdfPKCS7.java
=====================================
@@ -220,7 +220,7 @@ public class PdfPKCS7 {
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 @@ public class PdfPKCS7 {
// 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 @@ public class PdfPKCS7 {
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 @@ public class PdfPKCS7 {
}
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;
}
=====================================
itext/src/test/java/com/itextpdf/text/pdf/DefaultSplitCharacterProfilingTest.java
=====================================
@@ -21,7 +21,7 @@ public class DefaultSplitCharacterProfilingTest {
private static final String READ_FILE_FAIL_MESSAGE = "Failed to read test file {0}. The test could not be completed.";
- private static final int TIME_LIMIT = 20000;
+ private static final int TIME_LIMIT = 5000;
@Test(timeout = 30000)
public void checkDatePatternProfilingTest() {
=====================================
pdfa/pom.xml
=====================================
@@ -10,7 +10,7 @@
</parent>
<artifactId>itext-pdfa</artifactId>
- <version>5.5.13.3</version>
+ <version>5.5.13.4</version>
<name>iText PDF/A</name>
<description>iText ISO-19005 Module</description>
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15to18</artifactId>
- <version>1.70</version>
+ <version>1.78.1</version>
<optional>true</optional>
</dependency>
<dependency>
=====================================
pom.xml
=====================================
@@ -9,7 +9,7 @@
</parent>
<artifactId>root</artifactId>
- <version>5.5.13.3</version>
+ <version>5.5.13.4</version>
<packaging>pom</packaging>
<name>iText</name>
=====================================
xmlworker/pom.xml
=====================================
@@ -11,7 +11,7 @@
<groupId>com.itextpdf.tool</groupId>
<artifactId>xmlworker</artifactId>
- <version>5.5.13.3</version>
+ <version>5.5.13.4</version>
<name>iText XML Worker</name>
<description>Parses XML to PDF, with CSS support, using iText</description>
=====================================
xtra/pom.xml
=====================================
@@ -10,7 +10,7 @@
</parent>
<artifactId>itext-xtra</artifactId>
- <version>5.5.13.3</version>
+ <version>5.5.13.4</version>
<name>iText Xtra</name>
<description>iText Xtra, part of iText a Free Java-PDF library</description>
@@ -63,6 +63,9 @@
</ciManagement>
<properties>
+ <!-- itext-xtra depends on java 1.8 because
+ earliest published stable version of common-imaging requires java8 -->
+ <xtra.java.version>1.8</xtra.java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<argLine>-Xmx128m</argLine>
<sonar.language>java</sonar.language>
@@ -80,7 +83,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-imaging</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-alpha1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -111,6 +114,15 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.10.1</version>
+ <configuration>
+ <source>${xtra.java.version}</source>
+ <target>${xtra.java.version}</target>
+ </configuration>
+ </plugin>
<plugin>
<groupId>external.atlassian.jgitflow</groupId>
<artifactId>jgitflow-maven-plugin</artifactId>
@@ -227,41 +239,6 @@
</dependencies>
</profile>
<!-- END: Specific to mapping unit tests and covered code -->
-
- <profile>
- <id>compileWithLegacyJDK</id>
- <!--
- NOTE
- Make sure to set the environment variable JAVA7_HOME
- to your JDK 1.7 HOME when using this profile.
- -->
- <properties>
- <java.version>1.7</java.version>
- <java.home>${env.JAVA7_HOME}</java.home>
- <java.libs>${java.home}/jre/lib</java.libs>
- <java.bootclasspath>${java.libs}/rt.jar${path.separator}${java.libs}/jce.jar</java.bootclasspath>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <compilerArguments>
- <bootclasspath>${java.bootclasspath}</bootclasspath>
- </compilerArguments>
- <compilerVersion>${java.version}</compilerVersion>
- <fork>true</fork>
- <executable>${java.home}/bin/javac</executable>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
</profiles>
</project>
View it on GitLab: https://salsa.debian.org/java-team/libitext5-java/-/compare/f451cf508c5f8659b984921c6d94b80aafe5a6f0...1bd1eb3810e4a933a5edb5c40651c1fc92a14ed9
--
View it on GitLab: https://salsa.debian.org/java-team/libitext5-java/-/compare/f451cf508c5f8659b984921c6d94b80aafe5a6f0...1bd1eb3810e4a933a5edb5c40651c1fc92a14ed9
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/20251224/3875ce3a/attachment.htm>
More information about the pkg-java-commits
mailing list