rpms / apache-commons-daemon

Clone
Source Code
GIT

#2 update to version 1.2.0
Merged 4 years ago by decathorpe. Opened 4 years ago by decathorpe.
Unknown source master  into  master

file modified
+5 -1 
@@ -1,4 +1,7 @@
 

- commons-daemon-1.0.2-src.tar.gz
 

+ /results_*
 

+ /*.src.rpm
 

+ 

+ /commons-daemon-1.0.2-src.tar.gz
 

  /commons-daemon-1.0.3-src.tar.gz
 

  /commons-daemon-1.0.4-src.tar.gz
 

  /commons-daemon-1.0.5-src.tar.gz
 
@@ -10,3 +13,4 @@
 

  /commons-daemon-1.0.12-src.tar.gz
 

  /commons-daemon-1.0.13-src.tar.gz
 

  /commons-daemon-1.0.15-src.tar.gz
 

+ /commons-daemon-1.2.0-src.tar.gz

file added
+11 
@@ -0,0 +1,11 @@
 

+ --- commons-daemon-1.2.0-src/src/native/unix/configure.in-orig	2019-06-28 10:21:30.000000000 -0300
 

+ +++ commons-daemon-1.2.0-src/src/native/unix/configure.in	2019-07-10 03:53:58.900381022 -0300
 

+ @@ -98,7 +98,7 @@
 

+    AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC])
 

+    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
 

+  

+  dnl -------------------------------------------------------------------------

file removed
-11 
@@ -1,11 +0,0 @@
 

- --- 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"
 

- +  INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$JAVA_OS"
 

-  fi
 

-  

-  if test "$GCC" = "yes"

file removed
-43 
@@ -1,43 +0,0 @@
 

- 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
 

-      ;;
 

- +  aarch64*)
 

- +    CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
 

- +    supported_os="aarch64"
 

- +    HOST_CPU=aarch64;;
 

-    *)
 

-      AC_MSG_RESULT([failed])
 

-      AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
 

-    esac
 

-

file removed
-60 
@@ -1,60 +0,0 @@
 

- --- 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)
 

- -    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\\\""
 

- @@ -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

file modified
+34 -30 
@@ -1,29 +1,27 @@
 

- 

  %global base_name   daemon
 

  %global short_name  commons-%{base_name}
 

  

- Name:           apache-%{short_name}
 

- Version:        1.0.15
 

- Release:        19%{?dist}
 

+ Name:           apache-commons-daemon
 

  Summary:        Defines API to support an alternative invocation mechanism
 

+ Version:        1.2.0
 

+ Release:        1%{?dist}
 

  License:        ASL 2.0
 

+ 

  URL:            http://commons.apache.org/%{base_name}
 

  Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 

- Patch1:         apache-commons-daemon-JAVA_OS.patch
 

- # backport from https://fisheye6.atlassian.com/changelog/commons?cs=1458896
 

- Patch2:         apache-commons-daemon-secondary.patch
 

- # backport from http://svn.apache.org/viewvc?view=revision&revision=1533345
 

- # https://issues.apache.org/jira/browse/DAEMON-308
 

- Patch3:         apache-commons-daemon-aarch64.patch
 

- BuildRequires:  maven-local
 

- BuildRequires:  java-devel >= 1:1.6.0
 

- BuildRequires:  jpackage-utils
 

- BuildRequires:  apache-commons-parent
 

- BuildRequires:  maven-surefire-provider-junit
 

- BuildRequires:  xmlto
 

+ 

+ Patch0:         00-configure-java-os.patch
 

+ 

+ BuildRequires:  autoconf
 

+ BuildRequires:  dos2unix
 

  BuildRequires:  gcc
 

+ BuildRequires:  java-devel >= 1:1.6.0
 

  BuildRequires:  make
 

+ BuildRequires:  xmlto
 

  

+ BuildRequires:  maven-local
 

+ BuildRequires:  mvn(junit:junit)
 

+ BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 

  

  %description
 

  The scope of this package is to define an API in line with the current
 
@@ -33,12 +31,14 @@
 

  we define as Java daemons, or, in other words, non interactive
 

  Java applications.
 

  

+ 

  %package        jsvc
 

  Summary:        Java daemon launcher
 

  Provides:       jsvc = 1:%{version}-%{release}
 

  

  %description    jsvc
 

- %{summary}.
 

+ Java daemon launcher.
 

+ 

  

  %package        javadoc
 

  Summary:        API documentation for %{name}
 
@@ -46,31 +46,33 @@
 

  BuildArch:      noarch
 

  

  %description    javadoc
 

- %{summary}.
 

+ API documentation for apache-commons-daemon.
 

  

  

  %prep
 

  %setup -q -n %{short_name}-%{version}-src
 

- %patch1 -p1 -b .java_os
 

- %patch2 -p1 -b .secondary
 

- %patch3 -p1 -b .aarch64
 

- 

- # remove java binaries from sources
 

- rm -rf src/samples/build/
 

+ %patch0 -p1
 

  

+ # mark example files as non-executable
 

  chmod 644 src/samples/*
 

+ 

+ # convert to correct end-of-line format
 

+ dos2unix -k -n src/samples/ProcrunServiceInstall.cmd src/samples/ProcrunServiceInstall.cmd.new
 

+ rm src/samples/ProcrunServiceInstall.cmd
 

+ mv src/samples/ProcrunServiceInstall.cmd.new src/samples/ProcrunServiceInstall.cmd
 

+ 

+ # build manpage for jsvc
 

  cd src/native/unix
 

  xmlto man man/jsvc.1.xml
 

  

  

  %build
 

- 

  # build native jsvc
 

  pushd src/native/unix
 

+ sh support/buildconf.sh
 

+ 

  %configure --with-java=%{java_home}
 

- # this is here because 1.0.2 archive contains old *.o
 

- make clean
 

- make %{?_smp_mflags}
 

+ %make_build
 

  popd
 

  

  # build jars
 
@@ -91,18 +93,19 @@
 

  %doc LICENSE.txt PROPOSAL.html NOTICE.txt RELEASE-NOTES.txt src/samples
 

  %doc src/docs/*
 

  

- 

  %files jsvc
 

  %doc LICENSE.txt NOTICE.txt
 

  %{_bindir}/jsvc
 

  %{_mandir}/man1/jsvc.1*
 

  

- 

  %files javadoc -f .mfiles-javadoc
 

  %doc LICENSE.txt NOTICE.txt
 

  

  

  %changelog
 

+ * Wed Jul 10 2019 Filipe Rosset <rosset.filipe@gmail.com> - 1.2.0-1
 

+ - Update to 1.2.0
 

+ 

  * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.15-19
 

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

  
@@ -279,3 +282,4 @@
 

  

  * Mon Sep 24 2007 Permaine Cheung <pcheung@redhat.com> - 1:1.0.1-6jpp.4
 

  - Add execve path warning patch from James Ralston
 

+

file modified
+1 -1 
@@ -1,1 +1,1 @@
 

- e467bc1f332d47ad85d18ea8b8a897c3  commons-daemon-1.0.15-src.tar.gz
 

+ SHA512 (commons-daemon-1.2.0-src.tar.gz) = dfb4da03168cb29bcdd8fe55e2ba4ad08015ac4a4de0692fb75f06cc8dcb04de621a54fb5a210cf381c74cb89dd9344e0281603c50b6f02a29348d3f00954fbf

  • update to version 1.2.0
  • drop upstreamed patches
  • adapt JAVA_OS patch
  • regenerate BuildRequires with xmvn-builddep
  • update workarounds in %prep and %build sections

Based on https://src.fedoraproject.org/rpms/apache-commons-daemon/pull-request/1

Test rebuilds of dependent packages were done in COPR:

https://copr.fedorainfracloud.org/coprs/decathorpe/apache-commons-daemon-pr/monitor/

There were no new build failures compared to the current state of rawhide.

It would be good if @cipherboy or @dmoluguw could look at this PR as well, since it affects dogtag-pki.

LGTM. Thanks for the update @decathorpe :100:

I tested this update on a rawhide container by installing a basic PKI standalone (CA, KRA, OCSP, TKS and TPS) and IPA environment. I was able to successfully install and run a basic command.

[root@master builduser]# rpm -qa tomcat* pki-* freeipa-* nss* 389-ds* jss* apache-commons-daemon | sort
389-ds-base-1.4.1.5-1.fc31.x86_64
389-ds-base-legacy-tools-1.4.1.5-1.fc31.x86_64
389-ds-base-libs-1.4.1.5-1.fc31.x86_64
apache-commons-daemon-1.2.0-1.fc31.x86_64
freeipa-client-4.8.0-1.fc31.x86_64
freeipa-client-common-4.8.0-1.fc31.noarch
freeipa-common-4.8.0-1.fc31.noarch
freeipa-server-4.8.0-1.fc31.x86_64
freeipa-server-common-4.8.0-1.fc31.noarch
freeipa-server-dns-4.8.0-1.fc31.noarch
freeipa-server-trust-ad-4.8.0-1.fc31.x86_64
jss-4.6.0-1.20190627201246.0b6924d1.fc31.x86_64
nss-3.44.1-1.fc31.x86_64
nss-softokn-3.44.1-1.fc31.x86_64
nss-softokn-freebl-3.44.1-1.fc31.x86_64
nss-sysinit-3.44.1-1.fc31.x86_64
nss-tools-3.44.1-1.fc31.x86_64
nss-util-3.44.1-1.fc31.x86_64
pki-base-10.7.1-1.20190711012004.40bdef05.fc31.noarch
pki-base-java-10.7.1-1.20190711012004.40bdef05.fc31.noarch
pki-ca-10.7.1-1.20190711012004.40bdef05.fc31.noarch
pki-console-10.7.1-1.20190711012004.40bdef05.fc31.noarch
pki-javadoc-10.7.1-1.20190711012004.40bdef05.fc31.noarch
pki-kra-10.7.1-1.20190711012004.40bdef05.fc31.noarch
pki-ocsp-10.7.1-1.20190711012004.40bdef05.fc31.noarch
pki-server-10.7.1-1.20190711012004.40bdef05.fc31.noarch
pki-symkey-10.7.1-1.20190711012004.40bdef05.fc31.x86_64
pki-tks-10.7.1-1.20190711012004.40bdef05.fc31.noarch
pki-tools-10.7.1-1.20190711012004.40bdef05.fc31.x86_64
pki-tps-10.7.1-1.20190711012004.40bdef05.fc31.x86_64
tomcat-9.0.21-1.fc31.noarch
tomcat-el-3.0-api-9.0.21-1.fc31.noarch
tomcat-jsp-2.3-api-9.0.21-1.fc31.noarch
tomcat-lib-9.0.21-1.fc31.noarch
tomcat-servlet-4.0-api-9.0.21-1.fc31.noarch
tomcatjss-7.4.1-1.20190624153532.fb11bcd4.fc31.noarch
Edited 4 years ago by dmoluguw

Great, thanks for testing and the review!

Pull-Request has been merged by decathorpe
4 years ago
Metadata
None
No Tags
Changes Summary 7
+5 -1
file changed
.gitignore
+11
file added
00-configure-java-os.patch
-11
file removed
apache-commons-daemon-JAVA_OS.patch
-43
file removed
apache-commons-daemon-aarch64.patch
-60
file removed
apache-commons-daemon-secondary.patch
+34 -30
file changed
apache-commons-daemon.spec
+1 -1
file changed
sources
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.