pool/apache-commons-daemon
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 125090 from Java:packages

Browse Source 
rename of packkage

OBS-URL: https://build.opensuse.org/request/show/125090
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-daemon?expand=0&rev=1
This commit is contained in:
Michal Vyskocil 2012-06-15 11:47:39 +00:00 committed by Git OBS Bridge
commit 0c5c39338f
8 changed files with 322 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

32
0001-execve-path-warning.patch Normal file
View File

@ -0,0 +1,32 @@
From 0de57c78cbe1666fdf78ff6522b3b0ce18f12716 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
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

22
apache-commons-daemon-JAVA_OS.patch Normal file
View File

@ -0,0 +1,22 @@
--- 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 @@
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 -------------------------------------------------------------------------

28
apache-commons-daemon-s390x.patch Normal file
View File

@ -0,0 +1,28 @@
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"

74
apache-commons-daemon.changes Normal file
View File

@ -0,0 +1,74 @@
-------------------------------------------------------------------
Fri Jun 15 11:14:54 UTC 2012 - mvyskocil@suse.cz
- Update to 1.0.10 (bugfix release)
- Rename to apache-commons-daemon
* put the binary to -jsvc package
* return jars from -java package to main one
- Obsoleted ppc patch
-------------------------------------------------------------------
Mon Apr 2 15:30:42 UTC 2012 - dvaleev@suse.com
- fix ppc64 architecture detection
-------------------------------------------------------------------
Tue Sep 6 13:56:15 UTC 2011 - mvyskocil@suse.cz
- Update to 1.0.7
* fix bnc#CVE-2011-2729/bnc#715656
* proper file closing and other minor fixes
-------------------------------------------------------------------
Wed Jan 19 18:04:43 UTC 2011 - bitshuffler@opensuse.org
- Updated to 1.0.5.
- Reworked spec.
- Removed obsolete patches.
-------------------------------------------------------------------
Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
- make patch0 usage consistent
-------------------------------------------------------------------
Mon Sep 25 11:45:32 CEST 2006 - skh@suse.de
- don't use icecream
- use source="1.4" and target="1.4" for build with java 1.5
-------------------------------------------------------------------
Wed Jan 25 21:46:36 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Mon Jan 16 17:13:42 CET 2006 - jsmeix@suse.de
- Current version 1.0.1 from JPackage.org
-------------------------------------------------------------------
Wed Jul 27 16:14:09 CEST 2005 - jsmeix@suse.de
- Adjustments in the spec file.
-------------------------------------------------------------------
Wed Jul 20 14:53:21 CEST 2005 - jsmeix@suse.de
- Current version 1.0 from JPackage.org
-------------------------------------------------------------------
Mon Jul 18 16:06:38 CEST 2005 - jsmeix@suse.de
- Current version 1.0 from JPackage.org
-------------------------------------------------------------------
Thu Sep 16 15:18:24 CEST 2004 - skh@suse.de
- Fix prerequires of javadoc subpackage
-------------------------------------------------------------------
Thu Sep 2 16:57:34 CEST 2004 - skh@suse.de
- Initial package created with version 1.0 (JPackage 1.5)

139
apache-commons-daemon.spec Normal file
View File

@ -0,0 +1,139 @@
#
# spec file for package apache-commons-daemon
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define short_name commons-daemon
Name: apache-%{short_name}
Version: 1.0.10
Release: 0
Summary: Commons Daemon - Controlling of Java Daemons
License: Apache-2.0
Group: System/Daemons
Url: http://commons.apache.org/daemon/
Source0: commons-daemon-%{version}-src.tar.gz
Patch0: 0001-execve-path-warning.patch
Patch1: apache-commons-daemon-JAVA_OS.patch
Patch2: apache-commons-daemon-s390x.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ant
BuildRequires: apache-commons-parent
BuildRequires: java-devel
BuildRequires: libcap-devel
BuildRequires: xmlto
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}
Provides: jakarta-%{short_name}-java = %{version}-%{release}
Obsoletes: jakarta-%{short_name}-java < %{version}
%description
The Daemon Component contains a set of Java and native code, including
a set of Java interfaces applications must implement and Unix native
code to control a Java daemon from a Unix operating system.
%package jsvc
Summary: Java daemon launcher
Group: System/Daemons
Provides: jsvc = %{version}-%{release}
Obsoletes: jsvc < %{version}
Provides: jakarta-%{short_name}:%{_sbindir}/jsvc
%description jsvc
Jsvc is a set of libraries and applications for making Java applications run on
UNIX more easily. It allows the application (e.g. Tomcat) to perform some
privileged operations as root (e.g. bind to a port < 1024), and then switch
identity to a non-privileged user.
%package javadoc
BuildArch: noarch
Summary: Commons Daemon Javadoc
Group: Documentation/Other
Provides: jakarta-%{short_name}-javadoc = %{version}-%{release}
Obsoletes: jakarta-%{short_name}-javadoc < %{version}
%description javadoc
The Javadoc Documentation for Commons Daemon.
%prep
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1
%patch1 -p1
%patch2 -p1
# remove java binaries from sources
rm -rf src/samples/build/
chmod 644 src/samples/*
%build
cd src/native/unix
xmlto man man/jsvc.1.xml
# build native jsvc
pushd src/native/unix
%configure --with-java=%{java_home}
# this is here because 1.0.2 archive contains old *.o
make clean
make %{?_smp_mflags}
popd
ant jar test javadoc
%install
# install native jsvc
install -Dm 0755 src/native/unix/jsvc %{buildroot}%{_bindir}/jsvc
install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
# jars
install -Dpm 644 dist/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# pom
install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:%{short_name}"
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc LICENSE.txt PROPOSAL.html NOTICE.txt RELEASE-NOTES.txt src/samples
%{_javadir}/%{name}.jar
%{_javadir}/%{short_name}.jar
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%files jsvc
%defattr(-,root,root)
%doc LICENSE.txt
%{_bindir}/jsvc
%{_mandir}/man1/jsvc.1*
%files javadoc
%defattr(-,root,root)
%doc LICENSE.txt
%doc src/docs/*
%doc %{_javadocdir}/%{name}
%changelog

3
commons-daemon-1.0.10-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b60b28523cbd28497a02a298a341c51cabbe45983ec9e93616e6c91fbb5280c
size 288950