diff --git a/apache-commons-daemon-JAVA_OS.patch b/apache-commons-daemon-JAVA_OS.patch index b67b56e..ea89fc3 100644 --- a/apache-commons-daemon-JAVA_OS.patch +++ b/apache-commons-daemon-JAVA_OS.patch @@ -1,11 +1,12 @@ ---- commons-daemon-1.0.12-src/src/native/unix/configure~ 2013-01-14 07:45:15.000000000 +0100 -+++ commons-daemon-1.0.12-src/src/native/unix/configure 2013-01-24 15:55:59.757193071 +0100 -@@ -2776,7 +2776,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" +diff -ruN commons-daemon-1.3.2-src_back/src/native/unix/configure commons-daemon-1.3.2-src/src/native/unix/configure +--- commons-daemon-1.3.2-src_back/src/native/unix/configure 2022-11-13 23:55:12.532213488 +0800 ++++ commons-daemon-1.3.2-src/src/native/unix/configure 2022-11-14 00:02:12.999089851 +0800 +@@ -3990,7 +3990,7 @@ + then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: jni_md.h found in $JAVA_HOME/$JAVA_INC" >&5 + printf "%s\n" "jni_md.h found in $JAVA_HOME/$JAVA_INC" >&6; } +- INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC" + INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$JAVA_OS" + else + INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os" fi - - if test "$GCC" = "yes" diff --git a/apache-commons-daemon-aarch64.patch b/apache-commons-daemon-aarch64.patch index cf40653..e3b2286 100644 --- a/apache-commons-daemon-aarch64.patch +++ b/apache-commons-daemon-aarch64.patch @@ -1,36 +1,9 @@ -backport from http://svn.apache.org/viewvc?view=revision&revision=1533345 - -https://issues.apache.org/jira/browse/DAEMON-308 - ---- - src/native/unix/configure | 4 ++++ - src/native/unix/support/apsupport.m4 | 4 ++++ - 2 files changed, 8 insertions(+) - ---- commons-daemon-1.0.15-src.orig/src/native/unix/configure -+++ commons-daemon-1.0.15-src/src/native/unix/configure -@@ -2695,10 +2695,14 @@ echo "$as_me: error: Unsupported operati - arm*) - CFLAGS="$CFLAGS -DCPU=\\\"arm\\\"" - supported_os="arm" - HOST_CPU=arm - ;; -+ aarch64*) -+ CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\"" -+ supported_os="aarch64" -+ HOST_CPU=aarch64;; - *) - echo "$as_me:$LINENO: result: failed" >&5 - echo "${ECHO_T}failed" >&6 - { { echo "$as_me:$LINENO: error: Unsupported CPU architecture \"$host_cpu\"" >&5 - echo "$as_me: error: Unsupported CPU architecture \"$host_cpu\"" >&2;} ---- 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 -@@ -164,10 +164,14 @@ AC_DEFUN(AP_SUPPORTED_HOST,[ - arm*) - CFLAGS="$CFLAGS -DCPU=\\\"arm\\\"" - supported_os="arm" - HOST_CPU=arm +diff -ruN commons-daemon-1.3.2-src_back/src/native/unix/support/apsupport.m4 commons-daemon-1.3.2-src/src/native/unix/support/apsupport.m4 +--- commons-daemon-1.3.2-src_back/src/native/unix/support/apsupport.m4 2022-11-13 23:55:12.531213500 +0800 ++++ commons-daemon-1.3.2-src/src/native/unix/support/apsupport.m4 2022-11-14 00:02:13.032089448 +0800 +@@ -186,6 +186,10 @@ + supported_os="riscv64" + HOST_CPU=riscv64 ;; + aarch64*) + CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\"" @@ -39,5 +12,3 @@ https://issues.apache.org/jira/browse/DAEMON-308 *) AC_MSG_RESULT([failed]) AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);; - esac - diff --git a/apache-commons-daemon-secondary.patch b/apache-commons-daemon-secondary.patch index de2263b..ec32943 100644 --- a/apache-commons-daemon-secondary.patch +++ b/apache-commons-daemon-secondary.patch @@ -1,9 +1,10 @@ ---- commons-daemon-1.0.15-src/src/native/unix/configure.secondary 2017-08-23 12:52:35.697817597 +0200 -+++ commons-daemon-1.0.15-src/src/native/unix/configure 2017-08-23 12:53:15.313367933 +0200 -@@ -2611,8 +2611,16 @@ echo "$as_me: error: Unsupported operati - esac - case $host_cpu in - powerpc) +diff -ruN commons-daemon-1.3.2-src_back/src/native/unix/support/apsupport.m4 commons-daemon-1.3.2-src/src/native/unix/support/apsupport.m4 +--- commons-daemon-1.3.2-src_back/src/native/unix/support/apsupport.m4 2022-11-13 23:55:12.531213500 +0800 ++++ commons-daemon-1.3.2-src/src/native/unix/support/apsupport.m4 2022-11-14 00:02:13.016089643 +0800 +@@ -93,8 +93,16 @@ + HOST_CPU=ppc64le + ;; + powerpc*) - CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" - HOST_CPU=$host_cpu + CFLAGS="$CFLAGS -DCPU=\\\"ppc\\\"" @@ -19,42 +20,3 @@ ;; sparc*) CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" -@@ -2687,7 +2695,7 @@ echo "$as_me: error: Unsupported operati - HOST_CPU=ia64 - fi - ;; -- s390) -+ s390 | s390x) - CFLAGS="$CFLAGS -DCPU=\\\"s390\\\"" - supported_os="s390" - HOST_CPU=s390 ---- commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4.secondary 2013-03-27 09:09:02.000000000 +0100 -+++ commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4 2017-08-23 12:53:01.391525956 +0200 -@@ -80,8 +80,16 @@ AC_DEFUN(AP_SUPPORTED_HOST,[ - esac - case $host_cpu in - powerpc) -- CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" -- HOST_CPU=$host_cpu -+ CFLAGS="$CFLAGS -DCPU=\\\"ppc\\\"" -+ HOST_CPU=ppc -+ ;; -+ powerpc64) -+ CFLAGS="$CFLAGS -DCPU=\\\"ppc64\\\"" -+ HOST_CPU=ppc64 -+ ;; -+ powerpc64le) -+ CFLAGS="$CFLAGS -DCPU=\\\"ppc64le\\\"" -+ HOST_CPU=ppc64le - ;; - sparc*) - CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" -@@ -156,7 +164,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[ - HOST_CPU=ia64 - fi - ;; -- s390) -+ s390 | s390x) - CFLAGS="$CFLAGS -DCPU=\\\"s390\\\"" - supported_os="s390" - HOST_CPU=s390 diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec index 1389f8b..08ed04b 100644 --- a/apache-commons-daemon.spec +++ b/apache-commons-daemon.spec @@ -1,12 +1,12 @@ Name: apache-commons-daemon -Version: 1.0.15 -Release: 19 +Version: 1.3.2 +Release: 1 Summary: Defines API to support an alternative invocation mechanism License: ASL 2.0 URL: http://commons.apache.org/daemon Source0: http://archive.apache.org/dist/commons/daemon/source/commons-daemon-%{version}-src.tar.gz BuildRequires: maven-local java-devel >= 1:1.6.0 jpackage-utils apache-commons-parent -BuildRequires: maven-surefire-provider-junit xmlto gcc make +BuildRequires: maven-surefire-provider-junit5 xmlto gcc make Provides: apache-commons-daemon-jsvc = %{version}-%{release} jsvc = 1:%{version}-%{release} Obsoletes: apache-commons-daemon-jsvc < %{version}-%{release} @@ -62,5 +62,8 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1 %{_mandir}/man1/jsvc.1* %changelog +* Sat Nov 12 2022 hua 1.3.2-1 +- update to 1.3.2 + * Mon Dec 2 2019 liujing - 1.0.15-19 - Package init 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 e4cebfb..0000000 Binary files a/commons-daemon-1.0.15-src.tar.gz and /dev/null differ diff --git a/commons-daemon-1.3.2-src.tar.gz b/commons-daemon-1.3.2-src.tar.gz new file mode 100644 index 0000000..9c631f7 Binary files /dev/null and b/commons-daemon-1.3.2-src.tar.gz differ