Added patches from bug #162918. Thanks to Simone Piunno <pioppo@ferrara.linux.it>.

Package-Manager: portage-2.1.2-r9

diff --git a/dev-java/commons-daemon/ChangeLog b/dev-java/commons-daemon/ChangeLog
index 4480a24289fedba9624aa6b8828b3de93ff7113c..99eae9b28dd2ada023a66279c188c851b2828128 100644 (file)
--- a/dev-java/commons-daemon/ChangeLog
+++ b/dev-java/commons-daemon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/commons-daemon
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.28 2007/01/10 03:20:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.29 2007/02/11 17:11:15 betelgeuse Exp $
+
+*commons-daemon-1.0.1-r2 (11 Feb 2007)
+
+  11 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.0.1-capabilities-non-root.patch, +files/1.0.1-execve-self.patch,
+  +commons-daemon-1.0.1-r2.ebuild:
+  Added patches from bug #162918. Thanks to Simone Piunno
+  <pioppo@ferrara.linux.it>.
 
   10 Jan 2007; Vlastimil Babka <caster@gentoo.org>
   -commons-daemon-1.0.1.ebuild:

diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index 659f96e6e9d196f125beea70778e665ac72fb0fd..b0a39e5b96d8c79eb9249f683d49b17cd95881e8 100644 (file)
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0.1-as-needed.patch 1295 RMD160 97f3cca890f3b2be7e0aeaa2d710acb8504fb096 SHA1 deb095d7d97006e8f7fe05d1d2c42f4b63d07281 SHA256 640d2239d1679892e218c9c71053c37719894d6438b00e1ece5e0e461ed4f888
 MD5 c9be4f24c5ff845b60a4cdbe704407db files/1.0.1-as-needed.patch 1295
 RMD160 97f3cca890f3b2be7e0aeaa2d710acb8504fb096 files/1.0.1-as-needed.patch 1295
 SHA256 640d2239d1679892e218c9c71053c37719894d6438b00e1ece5e0e461ed4f888 files/1.0.1-as-needed.patch 1295
+AUX 1.0.1-capabilities-non-root.patch 487 RMD160 e8242b5090905de2ac08aad0613783c90dadd2bb SHA1 96eca88daff89e2dbd081c67cb0dc1e28c094480 SHA256 1ca521470b4fde439ee614cf9b8bfab26579ba2bf3abd3f85773fde2b0204a1c
+MD5 d159e9f415ee074b7350f514c2c1440e files/1.0.1-capabilities-non-root.patch 487
+RMD160 e8242b5090905de2ac08aad0613783c90dadd2bb files/1.0.1-capabilities-non-root.patch 487
+SHA256 1ca521470b4fde439ee614cf9b8bfab26579ba2bf3abd3f85773fde2b0204a1c files/1.0.1-capabilities-non-root.patch 487
+AUX 1.0.1-execve-self.patch 479 RMD160 958220ed8bef26541f71565e643dbbb2d13fb007 SHA1 f44ad98243b0759d3c59a7a3ed0751a9f19635fa SHA256 194becaeb8fab84c362766db82f446e0db6e5d4c125527733e3bfba9d1975e31
+MD5 cedad879a72d1a11e049c982b708138f files/1.0.1-execve-self.patch 479
+RMD160 958220ed8bef26541f71565e643dbbb2d13fb007 files/1.0.1-execve-self.patch 479
+SHA256 194becaeb8fab84c362766db82f446e0db6e5d4c125527733e3bfba9d1975e31 files/1.0.1-execve-self.patch 479
 AUX 1.0.1-fbsd.patch 544 RMD160 d539c2ba63e6c9dfe6ce6ef7bde36962b0f2cb01 SHA1 98755f64462c4a69e9a6dc77b9e45e29772a0c0d SHA256 9b9627a7c87cc80525a49b726e5d369199ca27f4028899343edf2997dc4371d5
 MD5 48f9026de2d4047372e3556152633f59 files/1.0.1-fbsd.patch 544
 RMD160 d539c2ba63e6c9dfe6ce6ef7bde36962b0f2cb01 files/1.0.1-fbsd.patch 544
@@ -11,10 +22,14 @@ EBUILD commons-daemon-1.0.1-r1.ebuild 1608 RMD160 0f3533177dd02c9693c0c3cf96831b
 MD5 262e6cdb0013fd76e1c9b7c045bd4147 commons-daemon-1.0.1-r1.ebuild 1608
 RMD160 0f3533177dd02c9693c0c3cf96831b8df6f71d67 commons-daemon-1.0.1-r1.ebuild 1608
 SHA256 ba3b1f14eb386e217b4c6b91d61fc7ae48455f19a003d89dbdc0229b3827d29c commons-daemon-1.0.1-r1.ebuild 1608
-MISC ChangeLog 3885 RMD160 ec787fdd64622d89003eb26d10b6233899013281 SHA1 293629cd0a306a9c72455e3129113b0e98113afa SHA256 179d7747a2b58d8f113c11806faffc717713ea3644a7fef2def0dd3f526912ab
-MD5 df692f5272145505195d6a79972d0c5e ChangeLog 3885
-RMD160 ec787fdd64622d89003eb26d10b6233899013281 ChangeLog 3885
-SHA256 179d7747a2b58d8f113c11806faffc717713ea3644a7fef2def0dd3f526912ab ChangeLog 3885
+EBUILD commons-daemon-1.0.1-r2.ebuild 1790 RMD160 6e33e1e518adad7bb4d6c0bcfd1de2168e9b1c74 SHA1 c820e592bb157290687697b8678454ccef760f24 SHA256 38149e5cccf8a2024b3b3111edc9da863db9c77eddbed8cc18da13299158cf28
+MD5 7a5064ca428663a4e33e32af9b858fb0 commons-daemon-1.0.1-r2.ebuild 1790
+RMD160 6e33e1e518adad7bb4d6c0bcfd1de2168e9b1c74 commons-daemon-1.0.1-r2.ebuild 1790
+SHA256 38149e5cccf8a2024b3b3111edc9da863db9c77eddbed8cc18da13299158cf28 commons-daemon-1.0.1-r2.ebuild 1790
+MISC ChangeLog 4181 RMD160 6dd68e4e9661c01da1151758cfd0103e03758cfc SHA1 4f84569d043190780d24e3252958b315002cc457 SHA256 6dd108ee5e74f51a32f26753cc9b9746a3455d0edfb282afb41ac9cfc1fb38e7
+MD5 f3f41e5c82ee557d9e34ca40b4795d31 ChangeLog 4181
+RMD160 6dd68e4e9661c01da1151758cfd0103e03758cfc ChangeLog 4181
+SHA256 6dd108ee5e74f51a32f26753cc9b9746a3455d0edfb282afb41ac9cfc1fb38e7 ChangeLog 4181
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -22,3 +37,13 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 fddd3a2c1a4c981297f9b860c934775c files/digest-commons-daemon-1.0.1-r1 238
 RMD160 a6e1fb33ccb1551a62716c164102b3d85116ae84 files/digest-commons-daemon-1.0.1-r1 238
 SHA256 48ecc6d148e38bb4563627f45eefe01663cc435820e920937d8c570b62330a09 files/digest-commons-daemon-1.0.1-r1 238
+MD5 fddd3a2c1a4c981297f9b860c934775c files/digest-commons-daemon-1.0.1-r2 238
+RMD160 a6e1fb33ccb1551a62716c164102b3d85116ae84 files/digest-commons-daemon-1.0.1-r2 238
+SHA256 48ecc6d148e38bb4563627f45eefe01663cc435820e920937d8c570b62330a09 files/digest-commons-daemon-1.0.1-r2 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFFz05GcxLzpIGCsLQRAr0HAJ4uZFj4YcpjEVwzRxR27BuXV5gD9gCeKxHa
+Crgyg9VtXacGwS3tkyR2Krc=
+=Bcfw
+-----END PGP SIGNATURE-----

diff --git a/dev-java/commons-daemon/commons-daemon-1.0.1-r2.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.1-r2.ebuild
new file mode 100644 (file)
index 0000000..15e0822
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.0.1-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.1-r2.ebuild,v 1.1 2007/02/11 17:11:15 betelgeuse Exp $
+
+WANT_AUTOCONF=2.5
+inherit java-pkg-2 java-ant-2 eutils autotools
+
+DESCRIPTION="Tools to allow java programs to run as unix daemons"
+SRC_URI="mirror://apache/jakarta/commons/daemon/source/daemon-${PV}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/commons/daemon/"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc examples source"
+
+DEPEND=">=virtual/jdk-1.4
+       dev-java/ant-core
+       source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/daemon-${PV}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # Submitted upstream to http://bugs.gentoo.org/show_bug.cgi?id=132563
+       epatch "${FILESDIR}/1.0.1-as-needed.patch"
+
+       # Fix fbsd building, from upstream svn, #157381
+       epatch "${FILESDIR}/1.0.1-fbsd.patch"
+
+       # https://issues.apache.org/jira/browse/DAEMON-93
+       epatch "${FILESDIR}/1.0.1-capabilities-non-root.patch"
+
+       # Already in trunk
+       epatch "${FILESDIR}/1.0.1-execve-self.patch"
+
+       cd "${S}/src/native/unix"
+       sed -e "s/powerpc/powerpc|powerpc64/g" -i support/apsupport.m4
+       eautoconf
+}
+
+src_compile() {
+       # compile native stuff
+       cd "${S}/src/native/unix"
+       econf || die "configure failed"
+       emake || die "make failed"
+
+       # compile java stuff
+       cd "${S}"
+       eant jar $(use_doc)
+}
+
+src_install() {
+       dobin src/native/unix/jsvc
+       java-pkg_dojar dist/${PN}.jar
+
+       dodoc README RELEASE-NOTES.txt *.html
+       use doc && java-pkg_dohtml -r dist/docs/*
+       if use examples; then
+               dodir /usr/share/doc/${PF}/examples
+               cp -R src/samples/* ${D}/usr/share/doc/${PF}/examples
+       fi
+       use source && java-pkg_dosrc src/java/* src/native/unix/native
+}

diff --git a/dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch b/dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch
new file mode 100644 (file)
index 0000000..5a9566b
--- /dev/null
+++ b/dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch
@@ -0,0 +1,11 @@
+--- daemon-1.0.1/src/native/unix/native/jsvc-unix.c.orig       2007-01-20 12:08:52.000000000 +0100
++++ daemon-1.0.1/src/native/unix/native/jsvc-unix.c    2007-01-20 12:12:35.000000000 +0100
+@@ -475,7 +475,7 @@
+ 
+ #ifdef OS_LINUX
+     /* setuid()/setgid() only apply the current thread so we must do it now */
+-    if (linuxset_user_group(args->user,uid,gid)!=0)
++    if (getuid()==0 && linuxset_user_group(args->user,uid,gid)!=0)
+             return(4);
+ #endif
+     /* Initialize the Java VM */

diff --git a/dev-java/commons-daemon/files/1.0.1-execve-self.patch b/dev-java/commons-daemon/files/1.0.1-execve-self.patch
new file mode 100644 (file)
index 0000000..578d2e0
--- /dev/null
+++ b/dev-java/commons-daemon/files/1.0.1-execve-self.patch
@@ -0,0 +1,10 @@
+--- daemon-1.0.1/src/native/unix/native/jsvc-unix.c.orig       2007-01-20 12:08:52.000000000 +0100
++++ daemon-1.0.1/src/native/unix/native/jsvc-unix.c    2007-01-20 13:15:43.000000000 +0100
+@@ -652,6 +652,7 @@
+         log_debug("Invoking w/ LD_LIBRARY_PATH=%s",getenv("LD_LIBRARY_PATH"));
+ 
+         argv[0]=args->procname;
++        execve("/proc/self/exe",argv,environ);
+         execve(old,argv,environ);
+         log_error("Cannot execute JSVC executor process");
+         return(1);

diff --git a/dev-java/commons-daemon/files/digest-commons-daemon-1.0.1-r2 b/dev-java/commons-daemon/files/digest-commons-daemon-1.0.1-r2
new file mode 100644 (file)
index 0000000..3e3fd19
--- /dev/null
+++ b/dev-java/commons-daemon/files/digest-commons-daemon-1.0.1-r2
@@ -0,0 +1,3 @@
+MD5 df3eb5aafa53ca530843a09d40b8a1c0 daemon-1.0.1.tar.gz 301023
+RMD160 b77ffd3dbc40d18d867afd62015ba1aa05bd9c65 daemon-1.0.1.tar.gz 301023
+SHA256 177107b8d99cabdbcda58cec284a2e2ccb5063113cc1fdb1b672754d4652848c daemon-1.0.1.tar.gz 301023