From c3842bbc997b358e85d5a5cdd9f8a1f81330aa9d849f1aa5fa8454611d7dea55 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 2 Nov 2020 14:44:40 +0000 Subject: [PATCH] Accepting request 844231 from home:pmonrealgonzalez:branches:Java:packages - Update to 1.2.3 * Fix: Procrun. Correct multiple issues related to enabling a service to interact with the desktop. Provide a better error message if this option is used with an invalid user, install the service with the option enabled if requested and correctly save the setting if it is enabled in the GUI. * Fix: jsvc. Update the list of paths searched for libjvm.so to include the path used by OpenJDK 11. * Add: Procrun. Add additional debug logging for Java start mode. * Fix: jsvc. Remove incorrect definition 'supported_os' which defined in psupport.m4 file to fix jsvc build error on s390, arm, aarch64, mipsel and mips. * Add: More debug logging in prunsrv.c and javajni.c. * Add: Update arguments.c to support Java 11 --enable-preview. * Add: jsvc and Procrun. Add support for Java native memory tracking. * Add: Procrun. Add a new command, print, that outputs the command to (re-)configure the service with the current settings. This is intended to be used to save settings such as before an upgrade. - Rebase apache-commons-daemon-riscv64.patch - Remove apache-commons-daemon-s390x.patch fixed upstream OBS-URL: https://build.opensuse.org/request/show/844231 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-daemon?expand=0&rev=33 --- apache-commons-daemon-build.xml | 2 +- apache-commons-daemon-riscv64.patch | 10 ++++++---- apache-commons-daemon-s390x.patch | 14 -------------- apache-commons-daemon.changes | 24 ++++++++++++++++++++++++ apache-commons-daemon.spec | 6 ++---- commons-daemon-1.2.2-src.tar.gz | 3 --- commons-daemon-1.2.2-src.tar.gz.asc | 17 ----------------- commons-daemon-1.2.3-src.tar.gz | 3 +++ commons-daemon-1.2.3-src.tar.gz.asc | 17 +++++++++++++++++ 9 files changed, 53 insertions(+), 43 deletions(-) delete mode 100644 apache-commons-daemon-s390x.patch delete mode 100644 commons-daemon-1.2.2-src.tar.gz delete mode 100644 commons-daemon-1.2.2-src.tar.gz.asc create mode 100644 commons-daemon-1.2.3-src.tar.gz create mode 100644 commons-daemon-1.2.3-src.tar.gz.asc diff --git a/apache-commons-daemon-build.xml b/apache-commons-daemon-build.xml index 1aaf550..ce01f70 100644 --- a/apache-commons-daemon-build.xml +++ b/apache-commons-daemon-build.xml @@ -5,7 +5,7 @@ - + diff --git a/apache-commons-daemon-riscv64.patch b/apache-commons-daemon-riscv64.patch index 067a1e2..f8a8244 100644 --- a/apache-commons-daemon-riscv64.patch +++ b/apache-commons-daemon-riscv64.patch @@ -1,7 +1,9 @@ ---- 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" +Index: commons-daemon-1.2.3-src/src/native/unix/support/apsupport.m4 +=================================================================== +--- commons-daemon-1.2.3-src.orig/src/native/unix/support/apsupport.m4 ++++ commons-daemon-1.2.3-src/src/native/unix/support/apsupport.m4 +@@ -181,6 +181,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[ + CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\"" HOST_CPU=aarch64 ;; + riscv64) diff --git a/apache-commons-daemon-s390x.patch b/apache-commons-daemon-s390x.patch deleted file mode 100644 index d4ba4d6..0000000 --- a/apache-commons-daemon-s390x.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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,[ - 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" diff --git a/apache-commons-daemon.changes b/apache-commons-daemon.changes index 0c6847f..bc3d0e1 100644 --- a/apache-commons-daemon.changes +++ b/apache-commons-daemon.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Oct 27 08:26:44 UTC 2020 - Pedro Monreal + +- Update to 1.2.3 + * Fix: Procrun. Correct multiple issues related to enabling a + service to interact with the desktop. Provide a better error + message if this option is used with an invalid user, install + the service with the option enabled if requested and correctly + save the setting if it is enabled in the GUI. + * Fix: jsvc. Update the list of paths searched for libjvm.so to + include the path used by OpenJDK 11. + * Add: Procrun. Add additional debug logging for Java start mode. + * Fix: jsvc. Remove incorrect definition 'supported_os' which + defined in psupport.m4 file to fix jsvc build error on s390, + arm, aarch64, mipsel and mips. + * Add: More debug logging in prunsrv.c and javajni.c. + * Add: Update arguments.c to support Java 11 --enable-preview. + * Add: jsvc and Procrun. Add support for Java native memory tracking. + * Add: Procrun. Add a new command, print, that outputs the command to + (re-)configure the service with the current settings. This is + intended to be used to save settings such as before an upgrade. +- Rebase apache-commons-daemon-riscv64.patch +- Remove apache-commons-daemon-s390x.patch fixed upstream + ------------------------------------------------------------------- Tue Jun 9 07:26:21 UTC 2020 - Fridrich Strba diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec index d668178..d6e0d6a 100644 --- a/apache-commons-daemon.spec +++ b/apache-commons-daemon.spec @@ -18,7 +18,7 @@ %define short_name commons-daemon Name: apache-%{short_name} -Version: 1.2.2 +Version: 1.2.3 Release: 0 Summary: Commons Daemon - Controlling of Java Daemons License: Apache-2.0 @@ -29,8 +29,7 @@ Source1: https://archive.apache.org/dist/commons/daemon/source/%{short_na 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-riscv64.patch +Patch1: apache-commons-daemon-riscv64.patch BuildRequires: ant BuildRequires: autoconf BuildRequires: fdupes @@ -78,7 +77,6 @@ The Javadoc Documentation for Commons Daemon. cp %{SOURCE10} build.xml %patch0 -p1 %patch1 -p1 -%patch2 -p1 # remove java binaries from sources rm -rf src/samples/build/ diff --git a/commons-daemon-1.2.2-src.tar.gz b/commons-daemon-1.2.2-src.tar.gz deleted file mode 100644 index e2ec323..0000000 --- a/commons-daemon-1.2.2-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 98a8dbd..0000000 --- a/commons-daemon-1.2.2-src.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------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----- diff --git a/commons-daemon-1.2.3-src.tar.gz b/commons-daemon-1.2.3-src.tar.gz new file mode 100644 index 0000000..9f55462 --- /dev/null +++ b/commons-daemon-1.2.3-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37b8c461c52e76c1ed6cd290431237611dfe496df36cd70e5afa30659d9bce4c +size 282110 diff --git a/commons-daemon-1.2.3-src.tar.gz.asc b/commons-daemon-1.2.3-src.tar.gz.asc new file mode 100644 index 0000000..d75f192 --- /dev/null +++ b/commons-daemon-1.2.3-src.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl9OjJEACgkQEMAcWi9g +WecrhRAAqEZak44CZXAvcNWkXIVTgr02drwCBf5rrLnKcrcMNcST2goid5i1n7Cg +37hCaWrpUUvBqe2Blr5D9GAT68L7cQVOa2+iA3fCwYDmQRqZdOJgbe+Iq+MGRTOv +eIpHXCTDXPfwr2q/r/RZPxRxIr3AMyTs7CxkmU1YsgN7tmj8x1OaCjyelGs+EjNI +K3WWvn3ihxXxsbgmDbtCusReDrp3rmkKuKMCz7Y04mRMyvuzkgUjeUgIHkJOL0Po +wZAC2NO8FGTgpngMIPyAJjlrbC0LCfvEWl3syxuBD4oNTnRWezDJHrA2xGamXfW7 ++v85lXE5h8/STipuOfQ0+EgHsWKCuso2YVimy7wiQ0P/+4toa/XdVWoggnKxESgq +Z80IZwsOIGP0tQDRP0EDmApS298sBv96fqAxV6TxvUSiU7NFDOF+sEcXW77Fj4Ue +6NBvVm+Svgxz9skpIDHEV6hZPBcK98nTnX0XK4pSRj9wUJFU1jc2jt2rQIgJodRS +etH7Ksv0AiNc+7ZgNUVv5HJSyUf9w59OAlQn/l3G1Ovled9N3yFUOhQS0jHUNHkg +k/6BfImm9hV1v1rHLSY56wvWmOv58b9Oa51OaFxAU+UbiWV2ehZlRl6zHxZa+une +c3BRu+qqQ19lDZ9qiM4Y5Zmf6c4W7y3VQlB+tV5ns9iZ4+GGcyA= +=goCL +-----END PGP SIGNATURE-----