Packman Build Service PMBS

Changes of Revision 4

pdftk.changes Changed

@@ -1,195 +1,4 @@
 -------------------------------------------------------------------
-Thu Feb 29 14:47:06 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Use %autosetup macro. Allows to eliminate the usage of deprecated
-  %patchN.
-
--------------------------------------------------------------------
-Fri Oct 27 13:30:22 UTC 2023 - Fridrich Strba <fstrba@suse.com>
-
-- Use SOURCE_DATE_EPOCH for reproducible timestamps
-
--------------------------------------------------------------------
-Fri Oct 27 11:36:14 UTC 2023 - Fridrich Strba <fstrba@suse.com>
-
-- Build using maven and install as maven artifact
-- Generate the javadoc and package it in a separate sub-package
-- Craft the script using the %%jpackage_script macro
-- Added patch:
-  * pdftk-bc175.patch
-    + fix build with bouncycastle 1.75+ with some deprecated methods
-      now removed
-    + fixes build in Factory after bouncycastle upgrade
-
--------------------------------------------------------------------
-Fri Sep 23 06:23:29 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
-
-- update to version 3.3.3:
-  + Added
-    - Support UTF-8 encoded FDF files
-  + Changed
-     - Preserve external links originating from stamps
-  + Fixed
-    - Crash reading invalid bookmarks
-    - Detect invalid parent entries in root form fields
-    - Crash reading invalid XFDF forms
-    - Crashes with non-conforming inputs
-
--------------------------------------------------------------------
-Tue Dec 21 07:24:42 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
-
-- update to version 3.3.2:
- - Fixed
-  - Crash with inputs that contain null pointers
-  - Support reading xfdf forms from stdin
-  - Crash with xdf forms with no catalog
-  - Compatibility with bcprov 1.70
-  - Crash with non-conforming inputs
-
--------------------------------------------------------------------
-Mon Oct 25 18:53:13 UTC 2021 - Carsten Ziepke <kieltux@gmail.com>
-
-- Update to version 3.3.1:
-  - Fixed
-    - Crash when using OpenType fonts as replacements
-    - Detect forms that contain null pointers
-    - Regression: include fonts in native image build
-- Update to version 3.3.0:
-   - Added
-     - Support filling multi-valued list fields
-     - Support replacing fonts in form fields
-   - Changed
-     - Renamed namespace of internal iText library
-     - Partially updated internal iText library code to 4.2.0
-       NB: might introduce regressions!
-   - Fixed
-     - Crashes with non-conforming inputs
-
--------------------------------------------------------------------
-Sun Aug  1 09:41:33 UTC 2021 - Carsten Ziepke <kieltux@gmail.com>
-
-- update to version 3.2.3:
- - Added
-  - Support excluding pages from a page range with ~
-  - Support TextLeading parameter in form field appearances
- - Changed
-  - update_info adds a new Info dictionary if none is found
- - Fixed
-  - Crash with non-conforming encrypted inputs
-  - Misleading URL in producer string
-  - Better detection of xref table in non-conforming inputs
-  - Better form detection (in particular forms created by pdftk cat)
-
--------------------------------------------------------------------
-Sat Jan  9 14:46:13 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
-
-- update to version 3.2.2:
- - Fixed
-  - Build error with latest bcprov
-  - Crash when flattening forms
-  - Proper error message with missing passwords
- - Changed
-  - Better handling of long and non-ASCII form options
-  - Report more annotation types
-
--------------------------------------------------------------------
-Mon Dec 28 14:07:38 UTC 2020 - Carsten Ziepke <kieltux@gmail.com>
-
-- Pass arguments to pdftk individually quoted (replaced $* with
-  "$@")
-
--------------------------------------------------------------------
-Tue Oct 27 07:05:52 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
-
-- Update to 3.2.1:
- - Added:
-  - Allow specifying attachment metadata
-  - Support AES encryption
- - Changed:
-  - Attachments compatible with PDF/A-3u
-  - Default encryption AES-128
- - Fixed:
-  - Regression: allow reading background/stamp from stdin
-  - Crash with incomplete files
-  - Crash with invalid forms
-  - Flatten form fields in order
-
--------------------------------------------------------------------
-Mon Jul 27 19:34:47 UTC 2020 - Sebastian Wagner <sebix+novell.com@sebix.at>
-
-- update to version 3.1.3:
- - Fixed:
-  - Crash when reading FDF files
-- update to version 3.1.2:
- - Changed
-  - Add a pattern if missing from burst output
- - Fixed:
-  - Allow outputting pages read from stdin more than once
-  - Do not warn if PageMediaDimensions is given in update_info
-  - Crash when opening output files in burst fails
-- update to version 3.1.1:
- - Fixed:
-  - Do not escape form fields if UTF-8 output selected
-- update to version 3.1.0:
- - Added:
-  - update_info handles page metrics (media, rotation and labels)
- - Fixed:
-  - Report page label indices correctly
-- update to version 3.0.10:
- - Fixed:
-  - Crash in dump_data_annots
-  - Load commons-lang-3 only if needed
-  - Crash when copying malformed inputs
-
--------------------------------------------------------------------
-Mon Feb 18 09:53:00 UTC 2020 - Markus S <kamikazow@web.de>
-
-- update to version 3.0.9:
- - Added:
-  - Native image build option
- - Fixed:
-  - Print an informative error if missing dependencies
-  - Crash with newlines in arguments
-- update to version 3.0.8:
- - Changed
-  - Build for JRE version 1.7
-- update to version 3.0.7:
- - Fixed:
-  - Crash involving passwords and file handles (java.lang.NullPointerException).
-- update to version 3.0.6:
- - Fixed:
-  - Crash in burst with invalid file patterns.
-  - Do not report some spurious form fields.
-  - Escape more characters on XML-encoded reports.
-- update to version 3.0.5:
- - Fixed:
-  - Do not print error if PdfID is missing.
-  - Crash in burst with certain inputs (java.lang.NullPointerException).
-- update to version 3.0.4:
- - Fixed:
-  - Crashes with type casting (java.lang.ClassCastException)
-- update to version 3.0.3:
- - Fixed:
-  - Bug that corrupts images in PDF files with (de)compress option
-  - Crash with incomplete records
-- update to version 3.0.2:
- - Fixed:
-  - Issue with rotation not being applied.
-  - Do not require owner password when user password is given.
-
--------------------------------------------------------------------
-Mon Dec  9 10:26:36 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
-
-- Pass command-line parameters to program
-
--------------------------------------------------------------------
-Sat Oct 27 08:42:46 UTC 2018 - Luigi Baldoni <aloisio@gmx.com>
-
-- Update to version 3.0.1 (java version)
-- Dropped bug-427046_pdftk.cc.patch and Makefile.SUSE
-- Spec cleanup
-
--------------------------------------------------------------------
 Sun Sep 24 22:19:05 UTC 2017 - seife+obs@b1-systems.com
 
 - remove -fstack-clash-protection from optflags, gcc6 does choke

pdftk.spec Changed

@@ -1,8 +1,8 @@
 #
 # spec file for package pdftk
 #
-# Copyright (c) 2023 SUSE LLC
-# Copyright (c) 2020 Franz Sirl (fsirl)
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012-2013 B1 Systems GmbH, Vohburg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -13,30 +13,69 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
 Name:           pdftk
-Version:        3.3.3
+Version:        2.02
 Release:        0
 Summary:        A handy tool for manipulating PDF
-License:        GPL-2.0-or-later
+License:        GPL-2.0+
 Group:          Productivity/Publishing/PDF
-URL:            https://www.pdflabs.com/
-Source0:        https://gitlab.com/pdftk-java/pdftk/-/archive/v%{version}/pdftk-v%{version}.tar.bz2
-Patch0:         %{name}-bc175.patch
-BuildRequires:  fdupes
-BuildRequires:  java-devel >= 1.8
-BuildRequires:  maven-local
-BuildRequires:  mvn(biz.aQute.bnd:bnd-maven-plugin)
-BuildRequires:  mvn(org.apache.commons:commons-lang3)
-BuildRequires:  mvn(org.bouncycastle:bcprov-jdk18on)
-Requires:       apache-commons-lang3
-Requires:       bouncycastle
-# needed for the startscript
-Requires:       javapackages-tools
-BuildArch:      noarch
+Url:            http://www.pdflabs.com/
+Source0:        %{name}-%{version}-src.zip
+Source1:        Makefile.SUSE
+Patch0:         bug-427046_pdftk.cc.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  unzip
+
+# There is a stack of fall-through logic from here to %%description.
+# Be careful inserting stuff in here as order matters.
+
+# BuildRequires package version suffix : "41" for "gcc41-java"
+%define pkgv %nil
+# gcc/gcj binaries version suffix : "-4.1" for "gcj-4.1"
+%define gxxv %nil
+
+# openSUSE 11.0 and SLE_11 are odd cases.
+%if 0%{?suse_version} == 1100 || 0%{?sles_version} == 11
+# "Nothing provides libgcj"
+%define pkgv 43
+# "gcj command not found", "gcjh command not found"
+%define gxxv -4.3
+%endif
+
+%if 0%{?suse_version} >= 1330
+# gcc7 no longer has gcj?
+%define pkgv 6
+%define gxxv -6
+%endif
+
+BuildRequires:  gcc%{pkgv}-c++
+BuildRequires:  gcc%{pkgv}-java
+
+# Unversioned libgcj does not exist after 12.2,
+# but libgcj-devel pulls in libgcj$VERSION
+%if 0%{suse_version} < 1230
+BuildRequires:  libgcj%{pkgv}
+%endif
+
+# should only trigger on SLES11 or 11.0, combined with the pkgv=43 above
+%if 0%{?suse_version} < 1330
+BuildRequires:  libgcj%{pkgv}-devel
+%else
+BuildRequires:  libgcj-devel
+%endif
+
+# java-gcj was separated from gcj-java after 10.0
+%if 0%{suse_version} > 1000
+BuildRequires:  java-gcj
+%endif
+
+%if 0%{?suse_version} > 1010 || 0%{?sles_version} == 10
+BuildRequires:  fastjar
+%endif
 
 %description
 If PDF is electronic paper, then pdftk is an electronic staple-remover,
@@ -60,42 +99,29 @@
   * Uncompress and Re-Compress Page Streams
   * Repair Corrupted PDF (Where Possible)
 
-%package javadoc
-Summary:        API documentation for %{name}
-Group:          Documentation/HTML
-
-%description javadoc
-API documentation for %{name}.
-
 %prep
-%autosetup -p1 -n %{name}-v%{version}
-
-%pom_remove_plugin :jacoco-maven-plugin
-
-%{mvn_file} : %{name}
+%setup -q -n %{name}-%{version}-dist
+%patch0 -p0
+%__cp %{S:1} pdftk/Makefile
+%__sed -i 's/\r$//' changelog.txt license_gpl_pdftk/*.txt license_gpl_pdftk/*/*.txt
+%__chmod 644 changelog.txt license_gpl_pdftk/*.txt license_gpl_pdftk/*/*.txt
 
 %build
-%{mvn_build} -f -- \
-    -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \
-    -Dsource=8
+## gcc-6 does not know -fstack-clash-protection
+OPTFLAGS="`echo %optflags| sed 's/-fstack-clash-protection//'`"
+%__make -C pdftk CXXFLAGS="$OPTFLAGS" GCJFLAGS="$(echo " $OPTFLAGS" | sed 's/ -D/ -Wp,-D/g')" VERSUFF=%gxxv
 
 %install
-%mvn_install
-%fdupes -s %{buildroot}%{_javadocdir}/%{name}
-
-# startscript
-%jpackage_script com.gitlab.pdftk_java.pdftk "" "" %{name}:bcprov:commons-lang3 %{name} true
-# manpage
-install -dm 0755 %{buildroot}%{_mandir}/man1
-install -pm 0644 pdftk.1 -t %{buildroot}%{_mandir}/man1
-
-%files -f .mfiles
-%license LICENSE
-%doc CHANGELOG.md README.md
-%{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1%{?ext_man}
-
-%files javadoc -f .mfiles-javadoc
-%license LICENSE
+%__install -Dm 0755 pdftk/%name %{buildroot}%{_bindir}/%name
+%__install -Dpm 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
+
+%clean
+%__rm -rf %buildroot
+
+%files
+%defattr(-,root,root)
+%{_bindir}/%name
+%{_mandir}/man1/%{name}.*
+%doc changelog.txt license_gpl_pdftk/*.txt license_gpl_pdftk/*/*.txt
 
 %changelog

bug-427046_pdftk.cc.patch Added

pdftk-bc175.patch Deleted

@@ -1,29 +0,0 @@
---- pdftk-v3.3.3/java/com/gitlab/pdftk_java/com/lowagie/text/pdf/PdfPKCS7.java	2023-10-27 13:23:34.491764952 +0200
-+++ pdftk-v3.3.3/java/com/gitlab/pdftk_java/com/lowagie/text/pdf/PdfPKCS7.java	2023-10-27 13:26:30.713026680 +0200
-@@ -225,7 +225,7 @@
-         ASN1ObjectIdentifier objId = (ASN1ObjectIdentifier)signedData.getObjectAt(0);
-         if (!objId.getId().equals(ID_PKCS7_SIGNED_DATA))
-             throw new SecurityException("Not a valid PKCS#7 object - not signed data");
--        ASN1Sequence content = (ASN1Sequence)((DERTaggedObject)signedData.getObjectAt(1)).getObject();
-+        ASN1Sequence content = (ASN1Sequence)((DERTaggedObject)signedData.getObjectAt(1)).getBaseObject();
-         // the positions that we care are:
-         //     0 - version
-         //     1 - digestAlgorithms
-@@ -258,7 +258,7 @@
-         // the possible ID_PKCS7_DATA
-         ASN1Sequence rsaData = (ASN1Sequence)content.getObjectAt(2);
-         if (rsaData.size() > 1) {
--            DEROctetString rsaDataContent = (DEROctetString)((DERTaggedObject)rsaData.getObjectAt(1)).getObject();
-+            DEROctetString rsaDataContent = (DEROctetString)((DERTaggedObject)rsaData.getObjectAt(1)).getBaseObject();
-             RSAdata = rsaDataContent.getOctets();
-         }
-         
-@@ -294,7 +294,7 @@
-         next = 3;
-         if (signerInfo.getObjectAt(next) instanceof ASN1TaggedObject) {
-             ASN1TaggedObject tagsig = (ASN1TaggedObject)signerInfo.getObjectAt(next);
--            ASN1Sequence sseq = (ASN1Sequence)tagsig.getObject();
-+            ASN1Sequence sseq = (ASN1Sequence)tagsig.getBaseObject();
-             ByteArrayOutputStream bOut = new ByteArrayOutputStream();            
-             ASN1OutputStream dout = ASN1OutputStream.create(bOut);
-             try {

Makefile.SUSE Added

@@ -0,0 +1,65 @@
+# -*- Mode: Makefile -*-
+# Makefile.SUSE
+# Makefile for pdftk 1.44 on SUSE
+# brian@aljex.com
+
+# fastjar never has a suffix
+# libgcj suffix sometimes does not match g* binaries suffix
+# g* binaries sometimes must not have any suffix
+# un-hardcode /usr/share/java, see %_javadir in /usr/lib/rpm/macros
+# remove unrecognized "-Wextra" from *FLAGS
+# allow rpm to set CXXFLAGS from %optflags or %configure
+# allow GJAR to be overridden, ex: gjar-4.5 instead of fastjar etc
+
+# Backwards compatibility with generic pdftk build directions.
+# .spec file does not use VERSUFF, and it's not technically correct
+# for the older versions, although it works anyways.
+# It works on the new versions because the suffix in libgcj*.jar
+# and on g++/gcj/gcjh is the same.
+# It works on the old versions only because they happen to use gcjh 4.1
+# or lower, which does not need libgcj*.jar in --classpath, and so you
+# can just set VERSUFF to match the executables (empty in all those cases),
+# and ignore the fact that this will set LIBGCJ wrong.
+# This allows the Makefile to be included in the upstream pdftk source,
+# and the generic manual build instructions should work for most versions of openSUSE.
+# The .spec however sets GXXV, JARV, _JAVADIR, and/or LIBGCJ explicitly as needed.
+# Here are the correct values to use for several versions of openSUSE:
+# 10.0 : make -f Makefile.SUSE
+# 10.1 : make -f Makefile.SUSE
+# 10.2 : make -f Makefile.SUSE
+# 10.3 : make -f Makefile.SUSE VERSUFF=-4.3
+# 11.0 : make -f Makefile.SUSE VERSUFF=-4.3
+# 11.1 : make -f Makefile.SUSE VERSUFF=-4.3
+# 11.2 : make -f Makefile.SUSE VERSUFF=-4.4
+# 11.3 : make -f Makefile.SUSE VERSUFF=-4.5
+# 11.4 : make -f Makefile.SUSE VERSUFF=-4.5
+ifdef VERSUFF
+GXXV := $(VERSUFF)
+export JARV := $(VERSUFF)
+endif
+
+export CXX := g++$(GXXV)
+export GCJ := gcj$(GXXV)
+export GCJH := gcjh$(GXXV)
+export GJAR ?= fastjar
+export AR = ar
+export RM = rm
+export ARFLAGS = rs
+export RMFLAGS = -vf
+
+# Allow .spec to supply "/usr/share/java" from rpm macro.
+# ( %_javadir = %{_datadir}/java ;%_datadir = %{_prefix}/share ;%_prefix = /usr ) 
+export _JAVADIR ?= /usr/share/java
+
+# Allow .spec to supply entire path/filename for libgcj.jar
+export LIBGCJ ?= $(_JAVADIR)/libgcj$(JARV).jar
+
+# Allow .spec to supply CXXFLAGS from rpm macro (%optflags or %configure)
+export CXXFLAGS ?= -Wall -O2
+export GCJFLAGS ?= -Wall -O2
+
+export CPPFLAGS = -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
+export GCJHFLAGS = -force
+export LDLIBS = -lgcj
+
+include Makefile.Base

pdftk-2.02-src.zip Added

pdftk-v3.3.3.tar.bz2 Deleted