diff --git a/apache-commons-daemon-JAVA_OS.patch b/apache-commons-daemon-JAVA_OS.patch
index 6f306d4..bcdcdc4 100644
--- a/apache-commons-daemon-JAVA_OS.patch
+++ b/apache-commons-daemon-JAVA_OS.patch
@@ -1,17 +1,6 @@
---- commons-daemon-1.0.10-src/src/native/unix/configure.orig 2012-03-29 18:11:47.739291747 -0500
-+++ commons-daemon-1.0.10-src/src/native/unix/configure 2012-03-29 18:12:15.287452463 -0500
-@@ -2818,7 +2818,7 @@
- echo "${ECHO_T}jni_md.h found in $JAVA_HOME/$JAVA_INC" >&6
- INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC"
- else
-- INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
-+ INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$JAVA_OS"
- fi
-
- if test "$GCC" = "yes"
---- commons-daemon-1.0.10-src/src/native/unix/configure.in.orig 2012-03-29 18:11:18.244119358 -0500
-+++ commons-daemon-1.0.10-src/src/native/unix/configure.in 2012-03-29 18:11:35.745221681 -0500
-@@ -94,7 +94,7 @@
+--- commons-daemon-1.2.2-src.orig/src/native/unix/configure.in
++++ commons-daemon-1.2.2-src/src/native/unix/configure.in
+@@ -98,7 +98,7 @@ then
AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC])
INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC"
else
diff --git a/apache-commons-daemon-aarch64.patch b/apache-commons-daemon-aarch64.patch
deleted file mode 100644
index 58eaea1..0000000
--- a/apache-commons-daemon-aarch64.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: commons-daemon-1.0.15-src/src/native/unix/configure
-===================================================================
---- commons-daemon-1.0.15-src.orig/src/native/unix/configure
-+++ commons-daemon-1.0.15-src/src/native/unix/configure
-@@ -2705,6 +2705,10 @@ echo "$as_me: error: Unsupported operati
- supported_os="arm"
- HOST_CPU=arm
- ;;
-+ aarch64)
-+ CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
-+ HOST_CPU=$host_cpu
-+ ;;
- *)
- echo "$as_me:$LINENO: result: failed" >&5
- echo "${ECHO_T}failed" >&6
-Index: commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
-===================================================================
---- commons-daemon-1.0.15-src.orig/src/native/unix/support/apsupport.m4
-+++ commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
-@@ -171,6 +171,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
- supported_os="arm"
- HOST_CPU=arm
- ;;
-+ aarch64)
-+ CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
-+ HOST_CPU=$host_cpu
-+ ;;
- *)
- AC_MSG_RESULT([failed])
- AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
diff --git a/apache-commons-daemon-build.xml b/apache-commons-daemon-build.xml
new file mode 100644
index 0000000..1aaf550
--- /dev/null
+++ b/apache-commons-daemon-build.xml
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apache-commons-daemon-ppc64.patch b/apache-commons-daemon-ppc64.patch
deleted file mode 100644
index 0ca3ae1..0000000
--- a/apache-commons-daemon-ppc64.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: commons-daemon-1.0.15-src/src/native/unix/configure
-===================================================================
---- commons-daemon-1.0.15-src.orig/src/native/unix/configure
-+++ commons-daemon-1.0.15-src/src/native/unix/configure
-@@ -2610,7 +2610,10 @@ echo "$as_me: error: Unsupported operati
- ;;
- esac
- case $host_cpu in
-- powerpc)
-+ powerpc*)
-+ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
-+ HOST_CPU=$host_cpu;;
-+ ppc*)
- CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
- HOST_CPU=$host_cpu
- ;;
diff --git a/apache-commons-daemon-riscv64.patch b/apache-commons-daemon-riscv64.patch
index 17feb03..067a1e2 100644
--- a/apache-commons-daemon-riscv64.patch
+++ b/apache-commons-daemon-riscv64.patch
@@ -1,25 +1,8 @@
-Index: commons-daemon-1.0.15-src/src/native/unix/configure
-===================================================================
---- commons-daemon-1.0.15-src.orig/src/native/unix/configure
-+++ commons-daemon-1.0.15-src/src/native/unix/configure
-@@ -2709,6 +2709,10 @@ echo "$as_me: error: Unsupported operati
- CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
- HOST_CPU=$host_cpu
- ;;
-+ riscv64)
-+ CFLAGS="$CFLAGS -DCPU=\\\"riscv64\\\""
-+ HOST_CPU=$host_cpu
-+ ;;
- *)
- echo "$as_me:$LINENO: result: failed" >&5
- echo "${ECHO_T}failed" >&6
-Index: commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
-===================================================================
---- commons-daemon-1.0.15-src.orig/src/native/unix/support/apsupport.m4
-+++ commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
-@@ -175,6 +175,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
- CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
- HOST_CPU=$host_cpu
+--- commons-daemon-1.2.2-src.orig/src/native/unix/support/apsupport.m4
++++ commons-daemon-1.2.2-src/src/native/unix/support/apsupport.m4
+@@ -192,6 +192,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
+ supported_os="aarch64"
+ HOST_CPU=aarch64
;;
+ riscv64)
+ CFLAGS="$CFLAGS -DCPU=\\\"riscv64\\\""
diff --git a/apache-commons-daemon-s390x.patch b/apache-commons-daemon-s390x.patch
index 1f96ea3..d4ba4d6 100644
--- a/apache-commons-daemon-s390x.patch
+++ b/apache-commons-daemon-s390x.patch
@@ -1,21 +1,3 @@
-Index: commons-daemon-1.0.15-src/src/native/unix/configure
-===================================================================
---- commons-daemon-1.0.15-src.orig/src/native/unix/configure
-+++ commons-daemon-1.0.15-src/src/native/unix/configure
-@@ -2692,6 +2692,11 @@ echo "$as_me: error: Unsupported operati
- supported_os="s390"
- HOST_CPU=s390
- ;;
-+ s390x)
-+ CFLAGS="$CFLAGS -DCPU=\\\"s390x\\\""
-+ supported_os="s390x"
-+ HOST_CPU=s390x
-+ ;;
- arm*)
- CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
- supported_os="arm"
-Index: commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
-===================================================================
--- commons-daemon-1.0.15-src.orig/src/native/unix/support/apsupport.m4
+++ commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
@@ -161,6 +161,11 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
diff --git a/apache-commons-daemon.changes b/apache-commons-daemon.changes
index 82208fc..0c6847f 100644
--- a/apache-commons-daemon.changes
+++ b/apache-commons-daemon.changes
@@ -1,3 +1,97 @@
+-------------------------------------------------------------------
+Tue Jun 9 07:26:21 UTC 2020 - Fridrich Strba
+
+- Generate ant build file and customize it in order to be able to
+ build this ring package without cycles. Ring packages cannot be
+ built using maven.
+- Modified patches:
+ * apache-commons-daemon-JAVA_OS.patch
+ * apache-commons-daemon-riscv64.patch
+ * apache-commons-daemon-s390x.patch
+ + Do not patch configure file itself, since we generate it
+ during the build
+
+-------------------------------------------------------------------
+Fri Jun 5 10:54:00 UTC 2020 - Pedro Monreal Gonzalez
+
+- Update to 1.2.2
+ * Release 1.2.2 - 2019-10-04
+ - Fix: Procrun. Correct a regression in the fix for DAEMON-401
+ that prevented the service from starting unless support for the
+ universal C runtime had been installed.
+ - Update: Update Commons-Parent to version 49.
+ * Release 1.2.1 - 2019-09-09
+ - Fix: jsvc. Correct debug log message that reports change in umask.
+ - Fix: Procrun. Correct a regression in the previous fix for this
+ issue that caused 32-bit services to crash on start-up. Fixes DAEMON-401.
+ - Fix: Procrun. Correct a regression in the fix for DAEMON-391
+ that caused the GUI to mix-up the WARN and INFO logging levels.
+ * Release 1.2.0 - 2019-07-02
+ - Fix: Procrun. Only set the global shutdown event if the event is created.
+ - Fix: Unable to build with Java 9 using ant; dropped Ant build files.
+ - Fix: Procrun. prunsrv stopping with error due to hard-coded timeout.
+ - Fix: Update config.guess and config.sub.
+ - Fix: Jsvc. Set the sun.java.command system property when starting via jsvc
+ so that tools like jconsole show something meaningful for the process name.
+ - Fix: Procrun. Correct the level name used in the GUI for WARN so that
+ changes made via the GUI are recognised. Order the log levels in the
+ drop-down from ERROR to DEBUG.
+ - Fix: Procrun. Correct reversed code comments for JRE and JDK locations
+ in the registry.
+ - Fix: Procrun. Fix a bug that meant a value provided for LibraryPath
+ replaced the value of the PATH environment variable rather than prepended to it.
+ - Fix: Procrun. Ensure that the java.library.path environment variable is
+ correctly configured when running on a JRE that depends on the Universal CRT.
+ - Add: Procrun. Log the error code returned if JVM creation fails to aid debugging.
+ - Fix: Procrun. Ensure that environment variables set via prunsrv are visible
+ to native libraries that depend on the Universal CRT.
+ - Fix: Procrun. Remove the code that removed quotes from configured Java and
+ Java 9 Options.
+ - Add: Procrun. Add an option to configure the service to use the 'Automatic
+ (Delayed Start)' startup mode.
+ - Add: Procrun. When running in jre mode, if the standard Java registry
+ entries for JavaHome and RuntimeLib are not present, attempt to use the
+ Procrun JavaHome key to find the runtime library.
+ - Add: jsvc. Include the full path to the jsvc executable in the debug log.
+ * Release 1.1.0 - 2017-11-15
+ - Update: Update the minimum Java requirement from version 5 to 6.
+ - Update: Add AArch64 support to src/native/unix/support/apsupport.m4.
+ - Fix: Remove calls to explicit garbage collection during daemon start and stop.
+ - Fix: Update config.guess and config.sub to add support, amongst others,
+ for the 64-bit PowerPC Little-Endian architecture.
+ - Update: Update Commons-Parent to version 41.
+ - Fix: Update apsupport.m4 add support for 64-bit PowerPC architectures.
+ - Fix: Suppress spurious "The data area passed to a system call is too small"
+ error message in the log when Procrun fails to stop the service.
+ - Fix: Enable jsvc to start when running on Java 9.
+ - Fix: Fix a resource leak opening the JVM configuration file.
+ _ Fix: Improve the jsvc code that restarts the process if the JVM crashes so
+ that if the JVM crashes after a signal has been received to shut down jsvc
+ does not attempt to restart the JVM.
+ - Fix: Ensure that the child process is started with the correct umask.
+ - Fix: Correct conflicting information for the behaviour of Procrun when
+ using jvm mode.
+ - Fix: Ensure that, when using Procrun in java or exe mode, the service
+ process waits for the stop process to complete before starting clean-up
+ to avoid a crash in the stop process.
+ - Fix: Enable jsvc to find the jvm when running on AIX.
+ - Fix: Ensure that Procrun treats JVM crashes as service failures so the
+ recovery options will apply.
+ - Fix: Ensure that the //MQ command closes the prunmgr process even if
+ the configuration dialog is open when the //MQ command is used.
+ - Fix: Add support for Java 9 command line arguments to jsvc.
+ - Add: Add a restarts options to jsvc to control the number of permitted
+ restarts after a system crash.
+ - Remove: Remove support for building Procrun for the Itanium platform.
+ - Fix: Fix race conditions in PID file handling in jsvc.
+- Remove patches:
+ * apache-commons-daemon-ppc64.patch
+ * apache-commons-daemon-aarch64.patch
+- Refresh patches:
+ * apache-commons-daemon-riscv64.patch
+ * apache-commons-daemon-JAVA_OS.patch
+- Update project keyring.
+
-------------------------------------------------------------------
Mon Mar 25 17:35:22 UTC 2019 - Fridrich Strba
diff --git a/apache-commons-daemon.keyring b/apache-commons-daemon.keyring
index e134c17..c9c4ed3 100644
--- a/apache-commons-daemon.keyring
+++ b/apache-commons-daemon.keyring
@@ -1,62 +1,163 @@
-pub 3072D/0D498E23 2013-01-14
-uid Mladen Turk (Default signing key)
-sub 4096g/DC3D1B18 2013-01-14
+pub 1024D/33C60243 2004-09-12
+ Key fingerprint = DCFD 35E0 BF8C A734 4752 DE8B 6FB2 1E89 33C6 0243
+uid Mark E D Thomas
+uid Mark E D Thomas
+uid Mark E D Thomas
+sub 2048g/0BECE548 2004-09-12
+
+pub 4096R/2F6059E7 2009-09-18
+ Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7
+uid Mark E D Thomas
+sub 4096R/5E763BEC 2009-09-18
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v1.4.9 (MingW32)
-mQSuBFDzsBQRDADVTeaOjvWuZ84mWFi5Rj0TmnIOdK9evO+6Bnr6eI0MCKxLfEYu
-tpcq3hrIN/sXoVJW14Kb2Vm5Zt0PLWBmlQoi+99QwfHRvrejQnYA5VCGql61Vkbz
-NbpZ3Eq3n9d1HOLhdRnZAUGYtFYm7etkdpUZSHOErZWdiCebc8Og2NdWU4xIG6f8
-16UxuzOWv+fPCtSjciHxYWmzrVc4fYNTvJiyN5OtJ08dCaRfMeAMqec4fNMOn1uX
-KXuwlFsHk5ieK4K91RP1zSGQEe1gGaMDSQsR6wwmnnEoP7QzlvPkr5gni2+uGccl
-UCfejUUQaBsEXDX+S9CesFLv/EtWMgjpnyVCF+uSCrj/pMNHJHX1zktp79NJFCJM
-BrifvthC7cVHl5eWVTMb+xFC9leEKcUPQj8GQmUlXKd3iiUCQEhoEAk9IC0cVaMq
-2wp2lZRAK+7MSO+iLYA6GSeCBBQowCC8fvc/1ihZ+JtcmR0uqErrLRpSfBbn6Ynw
-K6cu+Dd6zRBOegcBAMIQg3biwAjnP6AhB3Ul8J/Jlk3CL/v+ChMUuwTGgDKlC/9C
-kg3KctWPhlImHATy1STBBqIoebYxe+CCxxiukt9gp2NCZOdm2ZU7weT9kS7DYQz8
-scKcAbSFBTILSeDOHehCb1Qz47H3JfyRzv23VoJ4hA/0sfm1kWeqXwQEBkAtZfrF
-/C/N0Sdnf2OUf7LsEDdkaVzkVQVJZLzZGjpNq+W8zoHhOOi1KwIzx8y1opEysmiv
-/CitQOhnLJT5odM1a+AimUjdgyQ0p+U1EkcAnLAYD3UIKMA8wnGzfJZJ4tkrYkBu
-YLW/lyS50ddhzPniz2XeCc5SG+tCi8le4B+qZb4GhC+nKXD+heuRXA+45hQXEx9M
-dGgsormYKnCTF5v3Bf8sSnId8nj0eBbKZFJhUBVgNpwNrW5QjYfJHGHTMBnWy/Jv
-SF3CnWwg/IPTNcX9ctxL4FatpPREXE/Su/4/BDjm3R14cCBfBeiVdcRZ6J1TLuLP
-K+qcT62PHqd/ibthfkLlnuehr4Qsfy75UypY8/2zrLz9QCIEo8MEFcUicfc+HB8L
-/1AYsI4c1lkgOU8aubasn1GpNrvyz5NrehIPevPEjSeBGJnOxQEtWKDrD8TMd+Or
-7r9+SLGVog1NYnkhzdEGbO1m/VXGk7JQI6UU5Rgu3PaJbfBPnON9kABfDnIQMqH1
-LeylZUqAnnv4Fa3YtiQOyro3FM8Gv+r2E40SgIbX1bLfCzgqdYpDIIK1FLfCu9oO
-NiMolC4gl+zOjCQ+ilV74J4vODBX701Zg3nM9WnQcXBBrNcuz2ofTzg9wm61zjsE
-JSRPLIaiT63cyV1kvjMN1oAkCuc3Am5albC13mOAryEF3UB2ROrc1BwdBMC+aQ/z
-BLNrxEeT7M1YiE1cFnmZZdb0X6pz2UWsiBgmproRriAOzsMW3fToJxcMykBzg/f5
-6QCgoCbJ6Fv0UC1yDulnujxFXRrBPH7PCxeRVLi3cH0sXCBZbHRMRJDhyFn137Br
-qKiP+UTPNgrj8dc3UGi13RNApHxYBcBO05JFSh0KrFlJFBd0jITLa4LGGUC08RDT
-07Q0TWxhZGVuIFR1cmsgKERlZmF1bHQgc2lnbmluZyBrZXkpIDxtdHVya0BhcGFj
-aGUub3JnPoh6BBMRCAAiBQJQ87AUAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIX
-gAAKCRA1zSPBDUmOIziZAQCZD/YvZ1vrxmwAgDeJoMajmvHpWJPECkUzF0GFLW99
-CwEAs0ZZKpwqQEEewdGocKld7hEvlbmvqllrCNJDkeDdJPa5BA0EUPOwMxAQAL6j
-2zs8UQCVhPxf/RO0PhLqTPk8/6NW/W9uN1QjxPtdFaDmIpkIdY6RI3bo9bRlKf/F
-vWWQfteUDhRiWosE/ERDrLDoFzSAKIEE3/rm1jYTVuWbfYnBA+zHbZmN0KgV8fbh
-cLxt5qX+YTIp9mg2rXawCc5j2vQvPmCce/JkaR8k4ZF9XhWIrpH/afH1LE3ExePK
-019Zo9thP9dw+IiJGWmL5v3JCiJDNmmJwqSKtBDMRX/9ygIZUWABAmvPzsr+fkee
-FyPaezwtj1Qx96U+gZJiYO+eW8f2d3PrK2hC9yc8vD+N6w/ZdD4UIMBz/sSgmcD7
-WRVs+j1KpEzIMVwxJY2V2bcuqDRKdPrhOO4zen26wutKRzZF5SRx8ruRE/Hbxmqh
-H2teUtN+3xR0ARkbVDrTJwG8rvsUex5pzQk/z4V2s1Dm8ihirEuDFYE5B7Hpht8U
-17JhVH6wIrBvwMNfd+Ac1mlfvBZ19JGOnjCwkR9o44N5lx0BSSndJVnrjitV//Zf
-irASTVc/GEw5150kkZRCkaW3Hn5KMysGNXxgFf6aBbgVBlR56mNHT+6qbZV3Owbh
-i5hSSKqxXMPsv3XEANg0isdLiv3E4/KxozChph+93EWuZwdrD0PbBccyJlUCywaj
-pMBaKXzRDsuZOImi3ujcZbqPb0bZW1eZRpQ3LePrAAMGEAC5V1gmisUffyR5I3kk
-HBcEkKW4fCQFZ/FLB6cQi4t9sunOYPT56klokhSIE0AJq/ndkOLz9eW2+D4RK3aj
-IBtFTtBnXzn6nGbg+G9cpwPCpcWyuAMsiPwcFItH7mbcD9h/TCXJE+ILyhXaocOb
-n9D9IsQ16WAIIQQsBbGYMvaemJv4xsZQrLhCHr/ofHye5huEBn/wwyBKnTCLd+P0
-AkF+whf4Vl3yF4W3vnrYRFjU0XEXnVQ/nmiQH3cM0JxkVy46H3Zoe68Sjt49ZJt9
-eEWH4M7KyJc86DWjRl/YMNdHE9SMx0ReKJTTNATfzgWIMvH+xUsD9K85Evm70jxc
-13XziHwL0BjtMQzml19f/TDCUeLE9FiO5fyDgc6ueehsCxoKCvG8acQz25rkAJBv
-i0WqdFSJG4rrJaLEwbSDkAkpY9yVk73acamwa42/E4G7v7sKuGVHzW5xBX8ac7lz
-3CqKw771vWGZPgd8v2FIkk5ShikVyKQxnVADVACy2eqL8A8fmQMRSc/FYVMHfo0O
-MD5jeWWAIPo3g8bguqwqyTC0DQo60Y38t4lyXxAvg5oWvwzKdrWKwm/WmQJaJuk6
-TufoONXlsl0cc4LLHZESIwLRSP5YfxV9chplmA92vhekV0f2IchmJky/a25KEIRH
-OdCCQTyOitoKXYy2swx9j69Q7YhhBBgRCAAJBQJQ87AzAhsMAAoJEDXNI8ENSY4j
-plIA/R4QYFbde0Jw11KjqAr1AkQHaume7p5mv7Vt6I/D2CkUAP9i2PGC8mgArtlP
-XDH35tl64G5lNKNum0D8NSGV955R2g==
-=gxY8
+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
+bqWz71CpA7oP5jvoHaPqUihfWEugzOUbQnUzSauDWWOdMqQW+UUo/iDRz6HCKdlf
+ww0288krLusAEQEAAYkCHwQYAQoACQUCSrQO6QIbDAAKCRAQwBxaL2BZ5y3tD/4t
++KCuXBNi5alBCExHEzveMdRF9FJrSqJEX0NwGFivF3hQ/HJkrcu9oTJC/tXNFf/+
+EHOd0lMiyFl5PBSlhe4XS988rgapUW+ee9tQmAt+RgP40fdKdJNb6+9NYGmrdnDU
+zlQtP+h/XBOcmF0/szK/U0oigg8DjYYUm5gCWXOl9H4LJgg+yOcVCOVa4oTf1sdA
+mQba1xlMhOIYBWmEhqbWZpGOS59XvpyNfOQXWu26S8HACBqyPZ2LVV4H+9cmxinT
+z7RX1yKD17nLZ/fTOzZ1gYTbhg5rNmFpDgu3nlgU8SpGQ1kd70ZkcudgehsUe1Ep
+Pyl7O8qhj5H0/3OAmRXzrq2VF17gtz7zpntA0JqsBMbSaK5qBuBcurLhBT634WDI
+oE8u5Em1UwjgTI0Cx/lPxRTbIb4PfjP2b2ik/tJaUbwUrhuZ4LAtGztMVrF4W+qn
+x9oed4OFXMBbwgS+SH6oAHlGwpxhhzXBlqZsHXm+w+2oazWUhxFFGEe5U245GEtN
+f0AznBMDWTqg0SCVEDjlKt+e9tVXkTpHYWZjGbRZbEHkCbFqKhq0KP5BGInFZTFT
+oI5jjszmuX0W/yKpRpQZ+GuJnt4VrYSy7TMvjjhIpuhDY57VUwUIkz/2Kq8Vg2wp
+Gg+29nvcGOTdyZUcTCEB33B2jQ9z0XUEp+6B2F5iZQ==
+=hSkx
-----END PGP PUBLIC KEY BLOCK-----
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index 25ee5f9..d668178 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -18,25 +18,27 @@
%define short_name commons-daemon
Name: apache-%{short_name}
-Version: 1.0.15
+Version: 1.2.2
Release: 0
Summary: Commons Daemon - Controlling of Java Daemons
License: Apache-2.0
Group: System/Daemons
-URL: http://commons.apache.org/daemon/
-Source0: https://archive.apache.org/dist/commons/daemon/source/commons-daemon-%{version}-src.tar.gz
-Source1: https://archive.apache.org/dist/commons/daemon/source/commons-daemon-%{version}-src.tar.gz.asc
+URL: https://commons.apache.org/daemon/
+Source0: https://archive.apache.org/dist/commons/daemon/source/%{short_name}-%{version}-src.tar.gz
+Source1: https://archive.apache.org/dist/commons/daemon/source/%{short_name}-%{version}-src.tar.gz.asc
Source2: apache-commons-daemon.keyring
+Source10: apache-commons-daemon-build.xml
Patch0: apache-commons-daemon-JAVA_OS.patch
Patch1: apache-commons-daemon-s390x.patch
-Patch2: apache-commons-daemon-ppc64.patch
-Patch3: apache-commons-daemon-aarch64.patch
-Patch4: apache-commons-daemon-riscv64.patch
+Patch2: apache-commons-daemon-riscv64.patch
BuildRequires: ant
+BuildRequires: autoconf
BuildRequires: fdupes
+BuildRequires: gcc
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: libcap-devel
+BuildRequires: make
BuildRequires: xmlto
Provides: jakarta-%{short_name} = %{version}
Obsoletes: jakarta-%{short_name} < %{version}
@@ -64,7 +66,7 @@ identity to a non-privileged user.
%package javadoc
Summary: Commons Daemon Javadoc
Group: Documentation/Other
-Provides: jakarta-%{short_name}-javadoc = %{version}-%{release}
+Provides: jakarta-%{short_name}-javadoc = %{version}
Obsoletes: jakarta-%{short_name}-javadoc < %{version}
BuildArch: noarch
@@ -73,11 +75,10 @@ The Javadoc Documentation for Commons Daemon.
%prep
%setup -q -n %{short_name}-%{version}-src
+cp %{SOURCE10} build.xml
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
# remove java binaries from sources
rm -rf src/samples/build/
@@ -85,58 +86,58 @@ rm -rf src/samples/build/
# remove files for different OS
rm -rf src/samples/*.cmd
+# mark example files as non-executable
chmod -R 0644 src/samples/*
%pom_remove_parent .
-%build
+# build manpage for jsvc
pushd src/native/unix
xmlto man man/jsvc.1.xml
+%build
# build native jsvc
-%configure --with-java=%{java_home}
-# this is here because 1.0.2 archive contains old *.o
-make %{?_smp_mflags} clean
-make %{?_smp_mflags}
+pushd src/native/unix
+sh support/buildconf.sh
+
+%configure
+%make_build
popd
-ant \
- -Dcompile.source=8 -Dcompile.target=8 \
- jar test javadoc
+
+# build jar
+%{ant}
%install
-# install native jsvc
-install -Dm 0755 src/native/unix/jsvc %{buildroot}%{_bindir}/jsvc
-install -Dpm 644 src/native/unix/jsvc.1 %{buildroot}%{_mandir}/man1/jsvc.1
+# native jsvc
+install -Dpm 0755 src/native/unix/jsvc %{buildroot}%{_bindir}/jsvc
+install -Dpm 0644 src/native/unix/jsvc.1 %{buildroot}%{_mandir}/man1/jsvc.1
-# jars
-install -Dpm 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
+# jar
+install -Dpm 0644 target/%{short_name}-%{version}.jar %{buildroot}%{_jnidir}/%{short_name}.jar
+ln -sf %{_jnidir}/%{short_name}.jar %{buildroot}%{_jnidir}/%{name}.jar
# pom
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:%{short_name}"
+install -Dpm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
+%add_maven_depmap %{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}"
# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
-%files
-%license LICENSE.txt
-%doc PROPOSAL.html NOTICE.txt RELEASE-NOTES.txt src/samples
-%{_javadir}/%{name}.jar
-%{_javadir}/%{short_name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_datadir}/maven-metadata/%{name}.xml
+%files -f .mfiles
+%license LICENSE.txt NOTICE.txt
+%doc PROPOSAL.html RELEASE-NOTES.txt src/samples
+%doc src/docs/*
+%{_jnidir}/%{name}.jar
%files jsvc
-%license LICENSE.txt
+%license LICENSE.txt NOTICE.txt
%{_bindir}/jsvc
-%{_mandir}/man1/jsvc.1*
+%{_mandir}/man1/jsvc.1%{?ext_man}
%files javadoc
-%license LICENSE.txt
-%doc src/docs/*
-%doc %{_javadocdir}/%{name}
+%license LICENSE.txt NOTICE.txt
+%{_javadocdir}/%{name}
%changelog
diff --git a/commons-daemon-1.0.15-src.tar.gz b/commons-daemon-1.0.15-src.tar.gz
deleted file mode 100644
index d4aaede..0000000
--- a/commons-daemon-1.0.15-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:11ee57d2c6b281589c1497b2f88180553f06d5ac1560ce1841e05f89f0342432
-size 291128
diff --git a/commons-daemon-1.0.15-src.tar.gz.asc b/commons-daemon-1.0.15-src.tar.gz.asc
deleted file mode 100644
index 3272db8..0000000
--- a/commons-daemon-1.0.15-src.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.13 (GNU/Linux)
-
-iF4EABEIAAYFAlFUPW4ACgkQNc0jwQ1JjiMWxAEAow4EYX7KTHNrMLtvwwshV558
-AoaD/Xc1AUq/HKwxhpUBAKO65L16uV0pxihmZuki5e004HPZEHBQsN6Mx8vw8uEA
-=Zwsx
------END PGP SIGNATURE-----
diff --git a/commons-daemon-1.2.2-src.tar.gz b/commons-daemon-1.2.2-src.tar.gz
new file mode 100644
index 0000000..e2ec323
--- /dev/null
+++ b/commons-daemon-1.2.2-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ebd9d50989ee2009cc83f501e6793ad5978672ecea97be5198135a081a8aac71
+size 301538
diff --git a/commons-daemon-1.2.2-src.tar.gz.asc b/commons-daemon-1.2.2-src.tar.gz.asc
new file mode 100644
index 0000000..98a8dbd
--- /dev/null
+++ b/commons-daemon-1.2.2-src.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl2SJasACgkQEMAcWi9g
+WefmNA/+KM0PrZ0nASaG3bHTfBq6eQX5/oYET0fKl0yEGYU0jc2alGczJC623kkA
+qg5VmiqewwZiD3qHOEqI67i+uNjaxTURzqZJv7HnmG1295tO8hDpubAxpnr3kOtt
+VvEdRgnRRxJGg7di54XIKAhWO5IPrvzTRX9fcIfPEFgvkCj6edswBa26GdqNEFHV
+7vy8os9tyS16i2LCfGEf6szwwOrzY8V/9YSdhthyh62ixNylHNMP/TePPivEob7u
+Af5MUa11qDtMqzxa5o6MhF7tl4DNAIfSIyBl/CjyhY1lNwEs/5gNfjD3tuzsgTlK
+sX7S+EEUh4J8tlEeBT0oC059dDzxHSxHjiyREdiRHsRiko4u0W84JjIKjBlBrZ83
+ZrNB2fybuwz9X+Xa39wAM7yPpHVICcmap63hmGeGPU1xbnCVIHbnqFVHVm2zojcm
+YEFwg7NBWVVpgoX9hdV5fA/icD7NOugGsMcprPxMXQ4mjJHv7AowozyTkQp3ipaL
+78oomevGsIX7P7+zwiB2g3fNiJXm7vcvtogxVf/NImrRQOenfY/3PPAO79A5V0s/
+d5Z4TsgCd7PF0Fj3njmM8/jJTHOJ8ok5QTQC8FJp4bKV/Ac/bZsh3ktOOT+sIdHf
+vZ6ASI5x1JxVXzxXNH0O94zFGzJA1Xa9iqUIwUcf9NmaIFkq4oo=
+=mdZJ
+-----END PGP SIGNATURE-----