From 0c82b124701e41bce7e0b4313503ace6f2a55934 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Apr 05 2013 03:11:26 +0000 Subject: Update to upstream version 1.0.15 --- diff --git a/.gitignore b/.gitignore index 8af977e..ee935d5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ commons-daemon-1.0.2-src.tar.gz /commons-daemon-1.0.11-src.tar.gz /commons-daemon-1.0.12-src.tar.gz /commons-daemon-1.0.13-src.tar.gz +/commons-daemon-1.0.15-src.tar.gz diff --git a/0001-execve-path-warning.patch b/0001-execve-path-warning.patch deleted file mode 100644 index 3a9c4d1..0000000 --- a/0001-execve-path-warning.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0de57c78cbe1666fdf78ff6522b3b0ce18f12716 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Tue, 18 Jan 2011 14:46:21 +0100 -Subject: [PATCH 1/3] execve path warning - ---- - src/native/unix/native/jsvc-unix.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/src/native/unix/native/jsvc-unix.c b/src/native/unix/native/jsvc-unix.c -index 1967f09..22967f1 100644 ---- a/src/native/unix/native/jsvc-unix.c -+++ b/src/native/unix/native/jsvc-unix.c -@@ -1015,6 +1015,15 @@ int main(int argc, char *argv[]) - char *tmp = NULL; - char *p1 = NULL; - char *p2 = NULL; -+ -+ /* We don't want to use a form of exec() that searches the -+ PATH, so require that argv[0] be either an absolute or -+ relative path. Error out if this isn't the case. */ -+ if (strchr(argv[0],'/') == NULL) { -+ log_error("JSVC re-exec requires execution with an absolute or relative path"); -+ return(1); -+ } -+ - - /* - * There is no need to change LD_LIBRARY_PATH --- -1.7.6 - diff --git a/apache-commons-daemon-ppc64.patch b/apache-commons-daemon-ppc64.patch deleted file mode 100644 index 6fdc19a..0000000 --- a/apache-commons-daemon-ppc64.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up commons-daemon-1.0.10-src/src/native/unix/configure.ppc64 commons-daemon-1.0.10-src/src/native/unix/configure ---- commons-daemon-1.0.10-src/src/native/unix/configure.ppc64 2012-08-17 15:50:17.060069518 +0200 -+++ commons-daemon-1.0.10-src/src/native/unix/configure 2012-08-17 15:51:23.540069517 +0200 -@@ -2607,7 +2607,7 @@ echo "$as_me: error: Unsupported operati - ;; - esac - case $host_cpu in -- powerpc) -+ powerpc*) - CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" - HOST_CPU=$host_cpu;; - sparc*) -diff -up commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4.ppc64 commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4 ---- commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4.ppc64 2012-08-17 15:50:30.330069517 +0200 -+++ commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4 2012-08-17 15:51:33.280069517 +0200 -@@ -76,7 +76,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[ - ;; - esac - case $host_cpu in -- powerpc) -+ powerpc*) - CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" - HOST_CPU=$host_cpu;; - sparc*) diff --git a/apache-commons-daemon-s390x.patch b/apache-commons-daemon-s390x.patch deleted file mode 100644 index c54c245..0000000 --- a/apache-commons-daemon-s390x.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up commons-daemon-1.0.10-src/src/native/unix/configure.s390x commons-daemon-1.0.10-src/src/native/unix/configure ---- commons-daemon-1.0.10-src/src/native/unix/configure.s390x 2012-04-23 11:55:56.000000000 +0200 -+++ commons-daemon-1.0.10-src/src/native/unix/configure 2012-04-23 11:57:18.000000000 +0200 -@@ -2671,6 +2671,10 @@ echo "$as_me: error: Unsupported operati - CFLAGS="$CFLAGS -DCPU=\\\"s390\\\"" - 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 -up commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4.s390x commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4 ---- commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4.s390x 2012-04-23 11:56:04.000000000 +0200 -+++ commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4 2012-04-23 11:56:41.000000000 +0200 -@@ -140,6 +140,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[ - CFLAGS="$CFLAGS -DCPU=\\\"s390\\\"" - 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.spec b/apache-commons-daemon.spec index 76f3f76..c94b6c0 100644 --- a/apache-commons-daemon.spec +++ b/apache-commons-daemon.spec @@ -3,17 +3,14 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.0.13 -Release: 1%{?dist} +Version: 1.0.15 +Release: 2%{?dist} Summary: Defines API to support an alternative invocation mechanism License: ASL 2.0 Group: Applications/System URL: http://commons.apache.org/%{base_name} Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz -Patch0: 0001-execve-path-warning.patch Patch1: apache-commons-daemon-JAVA_OS.patch -Patch2: apache-commons-daemon-s390x.patch -Patch3: apache-commons-daemon-ppc64.patch BuildRequires: maven-local BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils @@ -60,10 +57,7 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1:1.0.1 %prep %setup -q -n %{short_name}-%{version}-src -%patch0 -p1 -b .execve %patch1 -p1 -b .java_os -%patch2 -p1 -b .s390x -%patch3 -p1 -b .ppc64 # remove java binaries from sources rm -rf src/samples/build/ @@ -113,6 +107,11 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1 %changelog +* Fri Apr 5 2013 Mikolaj Izdebski - 1.0.15-1 +- Update to upstream version 1.0.15 +- Remove 0001-execve-path-warning.patch (fixed upstream) +- Remove patches for s390x and ppc64 (accepted upstream in DAEMON-289) + * Wed Feb 13 2013 Mikolaj Izdebski - 1.0.13-1 - Update to upstream version 1.0.13 diff --git a/sources b/sources index 51ae1b7..9277777 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -abf519e43e95e8b1f63a45e2568374d6 commons-daemon-1.0.13-src.tar.gz +e467bc1f332d47ad85d18ea8b8a897c3 commons-daemon-1.0.15-src.tar.gz