upstream update

* new github reference in man-pages
* unfortunatly, jsignpdf-verifier has been removed
* unfortunatly, jsignpdf-signaturecounter has been removed

5 files changed, 69 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6a491341420..e81c0476fa62 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jsignpdf
 	pkgdesc = Digitally sign PDF files with X.509 certificates in GUI and CLI.
-	pkgver = 1.6.4
-	pkgrel = 2
+	pkgver = 2.1.0
+	pkgrel = 1
 	url = http://jsignpdf.sourceforge.net/
 	changelog = changelog
 	arch = any
@@ -16,14 +16,13 @@ pkgbase = jsignpdf
 	optdepends = desktop-file-utils: MIME cache update
 	backup = usr/share/java/jsignpdf/conf/conf.properties
 	backup = usr/share/java/jsignpdf/conf/pkcs11.cfg
-	source = jsignpdf-1.6.4.zip::https://downloads.sourceforge.net/project/jsignpdf/stable/JSignPdf%201.6.4/JSignPdf-1.6.4.zip
-	source = jsignpdf_48.png::https://raw.githubusercontent.com/kwart/jsignpdf/master/doc/icon/iconverticons.com/signedpdf_48x48x32.png
-	source = jsignpdf_128.png::https://raw.githubusercontent.com/kwart/jsignpdf/master/doc/icon/iconverticons.com/signedpdf_128x128x32.png
-	source = supplementary.tar.xz
-	md5sums = a459876cba8e2d30abcf9baaf16ff986
+	source = jsignpdf-2.1.0.zip::https://downloads.sourceforge.net/project/jsignpdf/stable/JSignPdf%202.1.0/jsignpdf-2.1.0.zip
+	source = jsignpdf_48.png::https://raw.githubusercontent.com/intoolswetrust/jsignpdf/master/distribution/doc/icon/iconverticons.com/signedpdf_48x48x32.png
+	source = jsignpdf_128.png::https://raw.githubusercontent.com/intoolswetrust/jsignpdf/master/distribution/doc/icon/iconverticons.com/signedpdf_128x128x32.png
+	source = supplementary.tar.zst
+	md5sums = be5a966be3a4a303f09a42c28b9b9a22
 	md5sums = a44ef91da28d94fb949e361d19adbbd5
 	md5sums = bf2d11e38c706fe183900cce1fab0e38
-	md5sums = 0d2ebc62ed6bffa1e387fa0ba957cd2a
+	md5sums = 52a3ccd032a31311c23f7e9d2c255811
 
 pkgname = jsignpdf
-
diff --git a/PKGBUILD b/PKGBUILD
index 53a5d025e723..1f7a52661f89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,9 @@
 #
 
 pkgname=jsignpdf
-pkgver=1.6.4
-pkgrel=2
+pkgver=2.1.0
+_releasedate="2021-12-19"
+pkgrel=1
 pkgdesc="Digitally sign PDF files with X.509 certificates in GUI and CLI."
 arch=('any')
 url="http://jsignpdf.sourceforge.net/"
@@ -14,38 +15,43 @@ depends=('java-runtime>=8'
 optdepends=('hicolor-icon-theme: icon for launcher'
             'desktop-file-utils: MIME cache update')
 source=(
-  ${pkgname}-${pkgver}.zip::"https://downloads.sourceforge.net/project/jsignpdf/stable/JSignPdf%20${pkgver}/JSignPdf-${pkgver}.zip"
-  jsignpdf_48.png::"https://raw.githubusercontent.com/kwart/jsignpdf/master/doc/icon/iconverticons.com/signedpdf_48x48x32.png"
-  jsignpdf_128.png::"https://raw.githubusercontent.com/kwart/jsignpdf/master/doc/icon/iconverticons.com/signedpdf_128x128x32.png"
-  "supplementary.tar.xz")
-md5sums=('a459876cba8e2d30abcf9baaf16ff986'
+  ${pkgname}-${pkgver}.zip::"https://downloads.sourceforge.net/project/jsignpdf/stable/JSignPdf%20${pkgver}/jsignpdf-${pkgver}.zip"
+  jsignpdf_48.png::"https://raw.githubusercontent.com/intoolswetrust/jsignpdf/master/distribution/doc/icon/iconverticons.com/signedpdf_48x48x32.png"
+  jsignpdf_128.png::"https://raw.githubusercontent.com/intoolswetrust/jsignpdf/master/distribution/doc/icon/iconverticons.com/signedpdf_128x128x32.png"
+  "supplementary.tar.zst")
+md5sums=('be5a966be3a4a303f09a42c28b9b9a22'
          'a44ef91da28d94fb949e361d19adbbd5'
          'bf2d11e38c706fe183900cce1fab0e38'
-         '0d2ebc62ed6bffa1e387fa0ba957cd2a')
+         '52a3ccd032a31311c23f7e9d2c255811')
 changelog=changelog
 backup=('usr/share/java/jsignpdf/conf/conf.properties'
         'usr/share/java/jsignpdf/conf/pkcs11.cfg')
 
+build() {
+  sed -i "s/<pkgver>/$pkgver/g" ${srcdir}/manpages/de/man1/*
+  sed -i "s/<pkgver>/$pkgver/g" ${srcdir}/manpages/man1/*
+  sed -i "s/<date>/$_releasedate/g" ${srcdir}/manpages/de/man1/*
+  sed -i "s/<date>/$_releasedate/g" ${srcdir}/manpages/man1/*
+}
+
 package() {
   ## file and directory permissions for mv and cp: u=rwx,g=rx,o=rx
   umask 022
   ## licenses
   install -d "${pkgdir}"/usr/share/licenses/"${pkgname}"
-  mv "${srcdir}/${pkgname}-${pkgver}"/docs/ThirdPartyLicenses/* "${pkgdir}"/usr/share/licenses/"${pkgname}"
+  mv "${srcdir}/${pkgname}-${pkgver}"/licenses/ThirdPartyLicenses/* "${pkgdir}"/usr/share/licenses/"${pkgname}"
   ## documentation
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}"/docs/JSignPdf_signed.pdf "${pkgdir}"/usr/share/doc/"${pkgname}"/Quickstart.pdf
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}"/docs/JSignPdf.pdf "${pkgdir}"/usr/share/doc/"${pkgname}"/Quickstart.pdf
   install -Dm644 "${srcdir}/${pkgname}-${pkgver}"/docs/ReleaseNotes.txt "${pkgdir}"/usr/share/doc/"${pkgname}"/ReleaseNotes
   install -d "${pkgdir}"/usr/share/man
   mv "${srcdir}"/manpages/* "${pkgdir}"/usr/share/man
   ## programm files
-  install -Dm644 "${srcdir}"/pictures/splash.png "${pkgdir}"/usr/share/java/"${pkgname}"/splash.png
+  install -Dm644 "${srcdir}"/pictures/splash1.png "${pkgdir}"/usr/share/java/"${pkgname}"/splash.png
   rm -r "${srcdir}/${pkgname}-${pkgver}"/docs
   mv "${srcdir}/${pkgname}-${pkgver}"/* "${pkgdir}"/usr/share/java/"${pkgname}"
   ## executable scripts
   install -Dm755 "${srcdir}"/launchers/jsignpdf.sh "${pkgdir}"/usr/bin/jsignpdf
   install -Dm755 "${srcdir}"/launchers/jsignpdf-installcert.sh "${pkgdir}"/usr/bin/jsignpdf-installcert
-  install -Dm755 "${srcdir}"/launchers/jsignpdf-verifier.sh "${pkgdir}"/usr/bin/jsignpdf-verifier
-  install -Dm755 "${srcdir}"/launchers/jsignpdf-signaturecounter.sh "${pkgdir}"/usr/bin/jsignpdf-signaturecounter
   ## .icon and .desktop files
   install -Dm644 "${srcdir}"/jsignpdf_48.png "${pkgdir}"/usr/share/icons/hicolor/48x48/apps/"${pkgname}".png
   install -Dm644 "${srcdir}"/jsignpdf_128.png "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/"${pkgname}".png
diff --git a/changelog b/changelog
index 6f6cb207bba1..033868bc82d1 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,49 @@
+2021-12-19 Josef Cacek
+  * Fixed ClassCastException in OpenPDF
+  * Windows installer contains both 64-bit and 32-bit Java versions
+
+2021-12-19 Marcos Alvarado Trasmonte
+  * Spanish translation through Weblate
+
+2021-12-19 Allan Nordhøy
+  * Norwegian Bokmål translation through Weblate
+
+2021-11-21 Miloslav Raus
+  * Drag&drop and output filename suggestion
+
+2021-11-13 Josef Cacek
+  * Add x86 Java runtime to the Windows installer (so both 32b and 64b JREs are included)
+
+2021-10-15 Jesús Alonso Abad
+* Extended L2 text options with DN (${certificate}) and custom signer name (-sn, --signer-name)
+
+2021-08-08 Josef Cacek
+  * Project moved to a new Github organization: https://github.com/intoolswetrust/
+  * The log4j dependency was remove and java.util.logging is used instead
+  * dependency updates
+
+2021-07-06 Josef Cacek
+  * use jsignpdf.home system property in the launch4j template
+  * configure Dependabot (on Github)
+
+2021-06-16 Josef Cacek
+  * Preparation for JSignPdf 2.0
+  * Move the build infrastructure from Ant to Maven
+  * Remove jsign-itxt (iText 2) and replace it by OpenPDF
+  * JSignPKCS11 security provider implemented
+
+2021-04-01 Josef Cacek (1.6.5)
+  * Bash startup script
+
+2020-11-25 Josef Cacek
+  * SunPKCS11 support for Java 9 and newer
+
 2018-09-10 Josef Cacek (1.6.4)
   * Upgrade Java runtime in Windows distributions to Java 8 (u181)
 
 2018-09-09 Dan Cvrcek
   * A new interface for remote/external crypto service providers - net.sf.jsignpdf.extcsp.IExternalCryptoProvider
-  * Integration with FoxyProxy (https://gitlab.com/cloudfoxy/foxyproxy) for (eIDAS) external signatures 
+  * Integration with FoxyProxy (https://gitlab.com/cloudfoxy/foxyproxy) for (eIDAS) external signatures
 
 2018-04-19 Josef Cacek (1.6.3)
   * Allow loading truststore specified by "javax.net.ssl.trustStore" System property
@@ -22,7 +62,7 @@
   * tsa.hashAlgorithm support in conf.properties
 
 2014-06-24 Josef Cacek
-  * jsignpdf-itxt moved directly under JSignPdf project (on github) 
+  * jsignpdf-itxt moved directly under JSignPdf project (on github)
 
 2014-06-22 Josef Cacek (1.5.4)
   * Recompiled 1.5.3 - a wrong version of jsignpdf-itxt caused non-working time-stamping
diff --git a/supplementary.tar.xz b/supplementary.tar.xz
deleted file mode 100644
index b3ec604c2e4a..000000000000
--- a/supplementary.tar.xz
+++ /dev/null
diff --git a/supplementary.tar.zst b/supplementary.tar.zst
new file mode 100644
index 000000000000..e776a58f8571
--- /dev/null
+++ b/supplementary.tar.zst