[pkg-java] r12835 - in tags/commons-daemon: . 1.0.2-2/debian 1.0.2-2/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Jul 28 13:06:45 UTC 2010
Author: drazzib
Date: 2010-07-28 13:06:44 +0000 (Wed, 28 Jul 2010)
New Revision: 12835
Added:
tags/commons-daemon/1.0.2-2/
tags/commons-daemon/1.0.2-2/debian/changelog
tags/commons-daemon/1.0.2-2/debian/patches/arm_support.diff
tags/commons-daemon/1.0.2-2/debian/patches/hppa_support.diff
tags/commons-daemon/1.0.2-2/debian/patches/kfreebsd_support.diff
tags/commons-daemon/1.0.2-2/debian/patches/libgcj_PR31700.diff
tags/commons-daemon/1.0.2-2/debian/patches/old_capabilities.diff
tags/commons-daemon/1.0.2-2/debian/patches/powerpcspe_support.diff
tags/commons-daemon/1.0.2-2/debian/patches/series
tags/commons-daemon/1.0.2-2/debian/patches/sh4_support.diff
tags/commons-daemon/1.0.2-2/debian/patches/syslog.diff
Removed:
tags/commons-daemon/1.0.2-2/debian/changelog
tags/commons-daemon/1.0.2-2/debian/patches/series
tags/commons-daemon/1.0.2-2/debian/patches/sh4-support.diff
Log:
[svn-buildpackage] Tagging commons-daemon 1.0.2-2
Deleted: tags/commons-daemon/1.0.2-2/debian/changelog
===================================================================
--- trunk/commons-daemon/debian/changelog 2010-07-27 22:14:41 UTC (rev 12828)
+++ tags/commons-daemon/1.0.2-2/debian/changelog 2010-07-28 13:06:44 UTC (rev 12835)
@@ -1,195 +0,0 @@
-commons-daemon (1.0.2-1) unstable; urgency=low
-
- [ Thierry Carrez ]
- * debian/control, debian/rules: Build with default-jdk
- * debian/rules: Depend on -headless runtimes
- * debian/rules: Set java source/target to 1.4 to match depends
-
- [ Torsten Werner ]
- * Re-add changes made by Emmanuel Bourg:
- - Update of the URLs
- - Rename Jakarta Commons to Apache Commons
-
- [ Damien Raude-Morvan ]
- * New upstream stable release (Closes: #578661).
- - d/watch: Update URL for new upstream release.
- * d/patches/sh4-support.diff: Add support for sh4 arch (Closes: #564166).
- * d/control: Remove Arnaud and add myself from Uploaders.
- * Updated to Standards-Version 3.9.1:
- - d/control: Add recommended get-orig-source target.
- * d/control: Add ${misc:Depends} to Depends.
- * Switch to 3.0 (quilt) format.
- * Use Debhelper 7:
- - d/rules: Use dh 7 and cleanup our rules file.
- - d/*.dirs: Removed not needed anymore.
- * d/libcommons-daemon-java.doc-base and d/rules: Install API Javadoc to
- /usr/share/doc/libcommons-daemon-java/api.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Tue, 27 Jul 2010 21:39:41 +0200
-
-commons-daemon (1.0.2~svn20061127-10) unstable; urgency=low
-
- * Build-Depends on libcap2-dev (Closes: #506548).
- * Added kfreebsd-* support to src/native/unix/support/apsupport.m4
- (Closes: #498376).
- * Point stdout and stderr to /dev/null for the daemon process
- (Closes: #491500, #507968).
- * Build-Depends on debhelper >= 7.
- * Replace dh_clean -k with dh_prep.
- * Moved package to section 'java'.
- * Rewrote debian/copyright to refer to
- /usr/share/common-licenses/Apache-2.0.
- * Updated to Standards-Version 3.8.3.
-
- -- Michael Koch <konqueror at gmx.de> Thu, 17 Sep 2009 22:54:55 +0200
-
-commons-daemon (1.0.2~svn20061127-9) unstable; urgency=low
-
- * Added patch to handle old capabilities version in jsvc-unix.c.
- Closes: #412690
-
- -- Michael Koch <konqueror at gmx.de> Wed, 07 May 2008 20:03:55 +0200
-
-commons-daemon (1.0.2~svn20061127-8) unstable; urgency=low
-
- * Clean src/native/unix/configure. Closes: #478503
- * Put jsvc into section utils.
-
- -- Michael Koch <konqueror at gmx.de> Wed, 30 Apr 2008 05:12:17 -0100
-
-commons-daemon (1.0.2~svn20061127-7) unstable; urgency=low
-
- * Updated watch file.
- * Updated Standards-Version to 3.7.3.
- * Remove bashism in debian/rules. (Closes: #478365).
- * Build-Depend on default-jdk-builddep. (Closes: #477853).
- * Renamed XS-Vcs-* fields to Vcs-*.
- * Added Homepage field.
-
- -- Michael Koch <konqueror at gmx.de> Tue, 29 Apr 2008 04:40:33 -0100
-
-commons-daemon (1.0.2~svn20061127-6) unstable; urgency=low
-
- * Applied a workaround for a JNI bug in libgcj (see
- http://gcc.gnu.org/PR31700).
-
- -- Marcus Better <marcus at better.se> Wed, 25 Apr 2007 15:11:01 +0200
-
-commons-daemon (1.0.2~svn20061127-5) unstable; urgency=low
-
- * jsvc can now redirect daemon output to syslog. (Closes: #402878)
- * Added support for the ppc64 architecture. Thanks to Andreas
- Jochens. (Closes: #404704)
- * Print a useful error message if the capabilities module is
- missing. Thanks to Adrian Bridgett. (Closes: #412478)
- * Don't use included config.sub and config.guess.
-
- -- Marcus Better <marcus at better.se> Wed, 13 Dec 2006 15:09:58 +0100
-
-commons-daemon (1.0.2~svn20061127-4) unstable; urgency=low
-
- * Apparently buildds don't grok Build-Depends-Indep. Moved to
- Build-Depends as a workaround.
-
- -- Marcus Better <marcus at better.se> Mon, 4 Dec 2006 14:29:08 +0100
-
-commons-daemon (1.0.2~svn20061127-3) unstable; urgency=low
-
- * Build-depend on java-gcj-compat-dev instead of Build-depend-indep.
-
- -- Marcus Better <marcus at better.se> Mon, 4 Dec 2006 12:50:35 +0100
-
-commons-daemon (1.0.2~svn20061127-2) unstable; urgency=low
-
- * Build-depend on autoconf instead of Build-depend-indep.
-
- -- Marcus Better <marcus at better.se> Thu, 30 Nov 2006 09:39:54 +0100
-
-commons-daemon (1.0.2~svn20061127-1) unstable; urgency=low
-
- * Support the arm, hppa, ia64, m68k, mipsel, and s390
- architectures. (Closes: #307853)
- * Don't include irrelevant README. (Closes: #394169)
- * The jsvc-dev package is no longer built as it's not useful.
- * debian/control:
- - Fix build deps: remove libxerces2-java and libjaxp1.2-java, add autoconf
- and docbook-to-man.
- - Clean up package descriptions.
- * debian/rules:
- - Get rid of CDBS.
- - Pass correct host options to autoconf.
-
- -- Marcus Better <marcus at better.se> Tue, 28 Nov 2006 13:49:20 +0100
-
-commons-daemon (1.0.1-3) unstable; urgency=low
-
- * Apply a patch to support ppc64 arch, thanks to Andreas Jochens
- (closes: #361831)
-
- -- Arnaud Vandyck <avdyk at debian.org> Mon, 3 Jul 2006 11:04:55 +0200
-
-commons-daemon (1.0.1-2) unstable; urgency=low
-
- * (Builds-)Depends on java-gcj-compat(-dev) instead of kaffe(-dev)
- (Closes: #358343).
- * Update Standards-Version to 3.7.2.
-
- -- Michael Koch <konqueror at gmx.de> Sat, 1 Jul 2006 15:56:17 +0000
-
-commons-daemon (1.0.1-1) unstable; urgency=low
-
- * New upstream release
- + updated manpage for new options
- + amd64 now supported
- (I will leave 307853 open until all debian platforms are supported)
- * Patch from upstream CVS to fix invalid execve() usage (closes: #314937)
- * libant1.6-java to ant transition (closes: #326436)
- * Added autotools-dev to let cdbs update the config.guess/sub
- * Standards-Version 3.6.2 (no changes)
-
- * Upload sponsored by XXX
-
- -- Wolfgang Baer <WBaer at gmx.de> Sat, 10 Sep 2005 17:45:46 +0200
-
-commons-daemon (1.0-5) unstable; urgency=low
-
- * upload with the sources.
- * Build with free tools now, therefore buildable on all
- architectures and a jsvc binary should be provided (closes: #286871)
- * Move to main as built with free tools
- * Shortened and clarified description (closes: #279752)
-
- -- Arnaud Vandyck <avdyk at debian.org> Sun, 10 Apr 2005 23:31:38 +0200
-
-commons-daemon (1.0-4) unstable; urgency=low
-
- * Build with free tools now, therefore buildable on all
- architectures and a jsvc binary should be provided (closes: #286871)
- * Moved configure/build of jsvc binary from install/jsvc target to the
- common-configure-arch and common-build-arch targets
- * Move to main as built with free tools
- * Shortened and clarified description (closes: #279752)
- * Build javadoc api and include daemons.html into documentation
- (Removed patch 01_dist_without_javadoc.patch)
- * avdyk: added Wolfgang to the uploaders
-
- -- Wolfgang Baer <WBaer at gmx.de> Fri, 12 Nov 2004 17:48:04 +0100
-
-commons-daemon (1.0-3) unstable; urgency=low
-
- * changed build-dep-indep to build-dep (closes: #280933).
-
- -- Arnaud Vandyck <avdyk at debian.org> Fri, 12 Nov 2004 17:48:04 +0100
-
-commons-daemon (1.0-2) unstable; urgency=low
-
- * improved description for jsvc-dev.
-
- -- Arnaud Vandyck <avdyk at debian.org> Fri, 29 Oct 2004 11:57:53 +0200
-
-commons-daemon (1.0-1) unstable; urgency=low
-
- * Initial Release.
-
- -- Arnaud Vandyck <avdyk at debian.org> Sat, 9 Oct 2004 17:51:44 +0200
-
Copied: tags/commons-daemon/1.0.2-2/debian/changelog (from rev 12834, trunk/commons-daemon/debian/changelog)
===================================================================
--- tags/commons-daemon/1.0.2-2/debian/changelog (rev 0)
+++ tags/commons-daemon/1.0.2-2/debian/changelog 2010-07-28 13:06:44 UTC (rev 12835)
@@ -0,0 +1,205 @@
+commons-daemon (1.0.2-2) unstable; urgency=low
+
+ * Re-add missing patches (lost during merge of new upstream release):
+ - debian/patches/syslog.diff: Support for logging to syslog.
+ - debian/patches/old_capabilities.diff: Work with older Linux capabilities.
+ - debian/patches/libgcj_PR31700.diff: Bug in GCJ handling of -X options.
+ - debian/patches/*_support.diff: Support for other Debian architectures.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 28 Jul 2010 14:59:18 +0200
+
+commons-daemon (1.0.2-1) unstable; urgency=low
+
+ [ Thierry Carrez ]
+ * debian/control, debian/rules: Build with default-jdk
+ * debian/rules: Depend on -headless runtimes
+ * debian/rules: Set java source/target to 1.4 to match depends
+
+ [ Torsten Werner ]
+ * Re-add changes made by Emmanuel Bourg:
+ - Update of the URLs
+ - Rename Jakarta Commons to Apache Commons
+
+ [ Damien Raude-Morvan ]
+ * New upstream stable release (Closes: #578661).
+ - d/watch: Update URL for new upstream release.
+ * d/patches/sh4-support.diff: Add support for sh4 arch (Closes: #564166).
+ * d/control: Remove Arnaud and add myself from Uploaders.
+ * Updated to Standards-Version 3.9.1:
+ - d/control: Add recommended get-orig-source target.
+ * d/control: Add ${misc:Depends} to Depends.
+ * Switch to 3.0 (quilt) format.
+ * Use Debhelper 7:
+ - d/rules: Use dh 7 and cleanup our rules file.
+ - d/*.dirs: Removed not needed anymore.
+ * d/libcommons-daemon-java.doc-base and d/rules: Install API Javadoc to
+ /usr/share/doc/libcommons-daemon-java/api.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 27 Jul 2010 21:39:41 +0200
+
+commons-daemon (1.0.2~svn20061127-10) unstable; urgency=low
+
+ * Build-Depends on libcap2-dev (Closes: #506548).
+ * Added kfreebsd-* support to src/native/unix/support/apsupport.m4
+ (Closes: #498376).
+ * Point stdout and stderr to /dev/null for the daemon process
+ (Closes: #491500, #507968).
+ * Build-Depends on debhelper >= 7.
+ * Replace dh_clean -k with dh_prep.
+ * Moved package to section 'java'.
+ * Rewrote debian/copyright to refer to
+ /usr/share/common-licenses/Apache-2.0.
+ * Updated to Standards-Version 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 17 Sep 2009 22:54:55 +0200
+
+commons-daemon (1.0.2~svn20061127-9) unstable; urgency=low
+
+ * Added patch to handle old capabilities version in jsvc-unix.c.
+ Closes: #412690
+
+ -- Michael Koch <konqueror at gmx.de> Wed, 07 May 2008 20:03:55 +0200
+
+commons-daemon (1.0.2~svn20061127-8) unstable; urgency=low
+
+ * Clean src/native/unix/configure. Closes: #478503
+ * Put jsvc into section utils.
+
+ -- Michael Koch <konqueror at gmx.de> Wed, 30 Apr 2008 05:12:17 -0100
+
+commons-daemon (1.0.2~svn20061127-7) unstable; urgency=low
+
+ * Updated watch file.
+ * Updated Standards-Version to 3.7.3.
+ * Remove bashism in debian/rules. (Closes: #478365).
+ * Build-Depend on default-jdk-builddep. (Closes: #477853).
+ * Renamed XS-Vcs-* fields to Vcs-*.
+ * Added Homepage field.
+
+ -- Michael Koch <konqueror at gmx.de> Tue, 29 Apr 2008 04:40:33 -0100
+
+commons-daemon (1.0.2~svn20061127-6) unstable; urgency=low
+
+ * Applied a workaround for a JNI bug in libgcj (see
+ http://gcc.gnu.org/PR31700).
+
+ -- Marcus Better <marcus at better.se> Wed, 25 Apr 2007 15:11:01 +0200
+
+commons-daemon (1.0.2~svn20061127-5) unstable; urgency=low
+
+ * jsvc can now redirect daemon output to syslog. (Closes: #402878)
+ * Added support for the ppc64 architecture. Thanks to Andreas
+ Jochens. (Closes: #404704)
+ * Print a useful error message if the capabilities module is
+ missing. Thanks to Adrian Bridgett. (Closes: #412478)
+ * Don't use included config.sub and config.guess.
+
+ -- Marcus Better <marcus at better.se> Wed, 13 Dec 2006 15:09:58 +0100
+
+commons-daemon (1.0.2~svn20061127-4) unstable; urgency=low
+
+ * Apparently buildds don't grok Build-Depends-Indep. Moved to
+ Build-Depends as a workaround.
+
+ -- Marcus Better <marcus at better.se> Mon, 4 Dec 2006 14:29:08 +0100
+
+commons-daemon (1.0.2~svn20061127-3) unstable; urgency=low
+
+ * Build-depend on java-gcj-compat-dev instead of Build-depend-indep.
+
+ -- Marcus Better <marcus at better.se> Mon, 4 Dec 2006 12:50:35 +0100
+
+commons-daemon (1.0.2~svn20061127-2) unstable; urgency=low
+
+ * Build-depend on autoconf instead of Build-depend-indep.
+
+ -- Marcus Better <marcus at better.se> Thu, 30 Nov 2006 09:39:54 +0100
+
+commons-daemon (1.0.2~svn20061127-1) unstable; urgency=low
+
+ * Support the arm, hppa, ia64, m68k, mipsel, and s390
+ architectures. (Closes: #307853)
+ * Don't include irrelevant README. (Closes: #394169)
+ * The jsvc-dev package is no longer built as it's not useful.
+ * debian/control:
+ - Fix build deps: remove libxerces2-java and libjaxp1.2-java, add autoconf
+ and docbook-to-man.
+ - Clean up package descriptions.
+ * debian/rules:
+ - Get rid of CDBS.
+ - Pass correct host options to autoconf.
+
+ -- Marcus Better <marcus at better.se> Tue, 28 Nov 2006 13:49:20 +0100
+
+commons-daemon (1.0.1-3) unstable; urgency=low
+
+ * Apply a patch to support ppc64 arch, thanks to Andreas Jochens
+ (closes: #361831)
+
+ -- Arnaud Vandyck <avdyk at debian.org> Mon, 3 Jul 2006 11:04:55 +0200
+
+commons-daemon (1.0.1-2) unstable; urgency=low
+
+ * (Builds-)Depends on java-gcj-compat(-dev) instead of kaffe(-dev)
+ (Closes: #358343).
+ * Update Standards-Version to 3.7.2.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 1 Jul 2006 15:56:17 +0000
+
+commons-daemon (1.0.1-1) unstable; urgency=low
+
+ * New upstream release
+ + updated manpage for new options
+ + amd64 now supported
+ (I will leave 307853 open until all debian platforms are supported)
+ * Patch from upstream CVS to fix invalid execve() usage (closes: #314937)
+ * libant1.6-java to ant transition (closes: #326436)
+ * Added autotools-dev to let cdbs update the config.guess/sub
+ * Standards-Version 3.6.2 (no changes)
+
+ * Upload sponsored by XXX
+
+ -- Wolfgang Baer <WBaer at gmx.de> Sat, 10 Sep 2005 17:45:46 +0200
+
+commons-daemon (1.0-5) unstable; urgency=low
+
+ * upload with the sources.
+ * Build with free tools now, therefore buildable on all
+ architectures and a jsvc binary should be provided (closes: #286871)
+ * Move to main as built with free tools
+ * Shortened and clarified description (closes: #279752)
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sun, 10 Apr 2005 23:31:38 +0200
+
+commons-daemon (1.0-4) unstable; urgency=low
+
+ * Build with free tools now, therefore buildable on all
+ architectures and a jsvc binary should be provided (closes: #286871)
+ * Moved configure/build of jsvc binary from install/jsvc target to the
+ common-configure-arch and common-build-arch targets
+ * Move to main as built with free tools
+ * Shortened and clarified description (closes: #279752)
+ * Build javadoc api and include daemons.html into documentation
+ (Removed patch 01_dist_without_javadoc.patch)
+ * avdyk: added Wolfgang to the uploaders
+
+ -- Wolfgang Baer <WBaer at gmx.de> Fri, 12 Nov 2004 17:48:04 +0100
+
+commons-daemon (1.0-3) unstable; urgency=low
+
+ * changed build-dep-indep to build-dep (closes: #280933).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Fri, 12 Nov 2004 17:48:04 +0100
+
+commons-daemon (1.0-2) unstable; urgency=low
+
+ * improved description for jsvc-dev.
+
+ -- Arnaud Vandyck <avdyk at debian.org> Fri, 29 Oct 2004 11:57:53 +0200
+
+commons-daemon (1.0-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 9 Oct 2004 17:51:44 +0200
+
Copied: tags/commons-daemon/1.0.2-2/debian/patches/arm_support.diff (from rev 12834, trunk/commons-daemon/debian/patches/arm_support.diff)
===================================================================
--- tags/commons-daemon/1.0.2-2/debian/patches/arm_support.diff (rev 0)
+++ tags/commons-daemon/1.0.2-2/debian/patches/arm_support.diff 2010-07-28 13:06:44 UTC (rev 12835)
@@ -0,0 +1,14 @@
+Description: Add support for ARM/ARMel arch
+Last-Update: 2010-07-28
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
+@@ -80,6 +80,9 @@
+ ;;
+ esac
+ case $host_cpu in
++ arm*)
++ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
++ HOST_CPU=$host_cpu;;
+ powerpc*)
+ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
+ HOST_CPU=$host_cpu;;
Copied: tags/commons-daemon/1.0.2-2/debian/patches/hppa_support.diff (from rev 12834, trunk/commons-daemon/debian/patches/hppa_support.diff)
===================================================================
--- tags/commons-daemon/1.0.2-2/debian/patches/hppa_support.diff (rev 0)
+++ tags/commons-daemon/1.0.2-2/debian/patches/hppa_support.diff 2010-07-28 13:06:44 UTC (rev 12835)
@@ -0,0 +1,22 @@
+Description: Fix support for HPPA arch
+Last-Update: 2010-07-28
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
+@@ -107,14 +107,9 @@
+ CFLAGS="$CFLAGS -DCPU=\\\"alpha\\\""
+ supported_os="alpha"
+ HOST_CPU=alpha;;
+- hppa2.0w)
+- CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0W\\\""
+- supported_os="hp-ux"
+- HOST_CPU=PA_RISC2.0W;;
+- hppa2.0)
+- CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0\\\""
+- supported_os="hp-ux"
+- HOST_CPU=PA_RISC2.0;;
++ hppa)
++ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
++ HOST_CPU=$host_cpu;;
+ mipsel)
+ CFLAGS="$CFLAGS -DCPU=\\\"mipsel\\\""
+ supported_os="mipsel"
Copied: tags/commons-daemon/1.0.2-2/debian/patches/kfreebsd_support.diff (from rev 12834, trunk/commons-daemon/debian/patches/kfreebsd_support.diff)
===================================================================
--- tags/commons-daemon/1.0.2-2/debian/patches/kfreebsd_support.diff (rev 0)
+++ tags/commons-daemon/1.0.2-2/debian/patches/kfreebsd_support.diff 2010-07-28 13:06:44 UTC (rev 12835)
@@ -0,0 +1,18 @@
+Description: Add support for kFreeBSD/GNU arch
+Bug: http://bugs.debian.org/498376
+Author: Petr Salinger <Petr.Salinger at seznam.cz>
+Last-Update: 2010-07-28
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
+@@ -69,6 +69,11 @@
+ CFLAGS="$CFLAGS -DOS_AIX -DDSO_DLFCN"
+ LDFLAGS="$LDFLAGS -ldl"
+ ;;
++ kfreebsd*-gnu)
++ CFLAGS="$CFLAGS -DOS_BSD -DDSO_DLFCN -pthread"
++ supported_os="kfreebsd-gnu"
++ LIBS="$LIBS -ldl -lpthread"
++ ;;
+ *)
+ AC_MSG_RESULT([failed])
+ AC_MSG_ERROR([Unsupported operating system "$host_os"])
Copied: tags/commons-daemon/1.0.2-2/debian/patches/libgcj_PR31700.diff (from rev 12834, trunk/commons-daemon/debian/patches/libgcj_PR31700.diff)
===================================================================
--- tags/commons-daemon/1.0.2-2/debian/patches/libgcj_PR31700.diff (rev 0)
+++ tags/commons-daemon/1.0.2-2/debian/patches/libgcj_PR31700.diff 2010-07-28 13:06:44 UTC (rev 12835)
@@ -0,0 +1,15 @@
+Description: Workaround for libgcj/PR31700 in handling -X options.
+Bug: vendor, http://gcc.gnu.org/PR31700
+Author: Marcus Better <marcus at better.se>
+Last-Update: 2010-07-28
+--- a/src/native/unix/native/java.c
++++ b/src/native/unix/native/java.c
+@@ -201,7 +201,7 @@
+ return(false);
+ }
+ #endif
+- arg.ignoreUnrecognized=FALSE;
++ arg.ignoreUnrecognized=JNI_TRUE;
+ arg.nOptions=args->onum;
+ arg.nOptions++; /* Add abort code */
+ opt=(JavaVMOption *)malloc(arg.nOptions*sizeof(JavaVMOption));
Copied: tags/commons-daemon/1.0.2-2/debian/patches/old_capabilities.diff (from rev 12834, trunk/commons-daemon/debian/patches/old_capabilities.diff)
===================================================================
--- tags/commons-daemon/1.0.2-2/debian/patches/old_capabilities.diff (rev 0)
+++ tags/commons-daemon/1.0.2-2/debian/patches/old_capabilities.diff 2010-07-28 13:06:44 UTC (rev 12835)
@@ -0,0 +1,27 @@
+Description: Patch to handle old capabilities version in jsvc-unix.c
+ Print a useful error message if capabilities module is missing.
+Bug: http://bugs.debian.org/412690
+Bug: http://bugs.debian.org/412478
+Author: Mickael Kock <konqueror at gmx.de>
+Author: Marcus Better <marcus at better.se>
+Last-Update: 2010-07-28
+--- a/src/native/unix/native/jsvc-unix.c
++++ b/src/native/unix/native/jsvc-unix.c
+@@ -171,14 +171,15 @@
+ struct __user_cap_data_struct cap;
+
+ memset(&caphead, 0, sizeof caphead);
+- caphead.version = _LINUX_CAPABILITY_VERSION;
++ caphead.version = 0x19980330;
+ caphead.pid = 0;
+ memset(&cap, 0, sizeof cap);
+ cap.effective = caps;
+ cap.permitted = caps;
+ cap.inheritable = caps;
+ if (syscall(__NR_capset, &caphead, &cap) < 0) {
+- log_error("syscall failed in set_caps");
++ log_error("set_caps: failed to set capabilities");
++ log_error("check that your kernel supports capabilities");
+ return(-1);
+ }
+ return(0);
Copied: tags/commons-daemon/1.0.2-2/debian/patches/powerpcspe_support.diff (from rev 12834, trunk/commons-daemon/debian/patches/powerpcspe_support.diff)
===================================================================
--- tags/commons-daemon/1.0.2-2/debian/patches/powerpcspe_support.diff (rev 0)
+++ tags/commons-daemon/1.0.2-2/debian/patches/powerpcspe_support.diff 2010-07-28 13:06:44 UTC (rev 12835)
@@ -0,0 +1,13 @@
+Description: Add support for powerpcspe arch
+Last-Update: 2010-07-28
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
+@@ -80,7 +80,7 @@
+ ;;
+ esac
+ case $host_cpu in
+- powerpc)
++ powerpc*)
+ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
+ HOST_CPU=$host_cpu;;
+ sparc*)
Deleted: tags/commons-daemon/1.0.2-2/debian/patches/series
===================================================================
--- trunk/commons-daemon/debian/patches/series 2010-07-27 22:14:41 UTC (rev 12828)
+++ tags/commons-daemon/1.0.2-2/debian/patches/series 2010-07-28 13:06:44 UTC (rev 12835)
@@ -1 +0,0 @@
-sh4-support.diff
Copied: tags/commons-daemon/1.0.2-2/debian/patches/series (from rev 12834, trunk/commons-daemon/debian/patches/series)
===================================================================
--- tags/commons-daemon/1.0.2-2/debian/patches/series (rev 0)
+++ tags/commons-daemon/1.0.2-2/debian/patches/series 2010-07-28 13:06:44 UTC (rev 12835)
@@ -0,0 +1,8 @@
+old_capabilities.diff
+libgcj_PR31700.diff
+sh4_support.diff
+kfreebsd_support.diff
+powerpcspe_support.diff
+hppa_support.diff
+arm_support.diff
+syslog.diff
Deleted: tags/commons-daemon/1.0.2-2/debian/patches/sh4-support.diff
===================================================================
--- trunk/commons-daemon/debian/patches/sh4-support.diff 2010-07-27 22:14:41 UTC (rev 12828)
+++ tags/commons-daemon/1.0.2-2/debian/patches/sh4-support.diff 2010-07-28 13:06:44 UTC (rev 12835)
@@ -1,18 +0,0 @@
-Description: support Renesas SH4
-Bug: http://bugs.debian.org/564166
-Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-07-27
-Forwarded: no
---- a/src/native/unix/support/apsupport.m4
-+++ b/src/native/unix/support/apsupport.m4
-@@ -122,6 +122,9 @@
- CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
- supported_os="s390"
- HOST_CPU=s390;;
-+ sh*)
-+ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
-+ HOST_CPU=$host_cpu;;
- *)
- AC_MSG_RESULT([failed])
- AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
Copied: tags/commons-daemon/1.0.2-2/debian/patches/sh4_support.diff (from rev 12834, trunk/commons-daemon/debian/patches/sh4_support.diff)
===================================================================
--- tags/commons-daemon/1.0.2-2/debian/patches/sh4_support.diff (rev 0)
+++ tags/commons-daemon/1.0.2-2/debian/patches/sh4_support.diff 2010-07-28 13:06:44 UTC (rev 12835)
@@ -0,0 +1,18 @@
+Description: support Renesas SH4
+Bug: http://bugs.debian.org/564166
+Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-07-27
+Forwarded: no
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
+@@ -122,6 +122,9 @@
+ CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
+ supported_os="s390"
+ HOST_CPU=s390;;
++ sh*)
++ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
++ HOST_CPU=$host_cpu;;
+ *)
+ AC_MSG_RESULT([failed])
+ AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
Copied: tags/commons-daemon/1.0.2-2/debian/patches/syslog.diff (from rev 12834, trunk/commons-daemon/debian/patches/syslog.diff)
===================================================================
--- tags/commons-daemon/1.0.2-2/debian/patches/syslog.diff (rev 0)
+++ tags/commons-daemon/1.0.2-2/debian/patches/syslog.diff 2010-07-28 13:06:44 UTC (rev 12835)
@@ -0,0 +1,334 @@
+Description: support for redirecting stdout to syslog
+ Unclutter debug and error output by not
+ including timestamp and PID. This is superfluous for syslog logging, and
+ can be readily added by an external filter otherwise.
+ Document SYSLOG usage
+Bug: http://bugs.debian.org/402878
+Author: Marcus Better <marcus at better.se>
+Last-Update: 2010-07-28
+Forwared: no
+--- a/src/native/unix/native/debug.c
++++ b/src/native/unix/native/debug.c
+@@ -15,10 +15,8 @@
+ limitations under the License.
+ */
+ /* @version $Id: debug.c 480469 2006-11-29 08:22:04Z bayard $ */
++#include <stdio.h>
+ #include "jsvc.h"
+-#include <sys/types.h>
+-#include <unistd.h>
+-#include <time.h>
+
+ /* Wether debug is enabled or not */
+ bool log_debug_flag = false;
+@@ -29,19 +27,9 @@
+ /* Dump a debug message to stderr */
+ void log_debug(const char *fmt, ...) {
+ va_list ap;
+- time_t now;
+- struct tm *nowtm;
+- char buff[80];
+
+ if (log_debug_flag==false) return;
+- if (fmt==NULL) return;
+-
+- now = time(NULL);
+- nowtm = localtime(&now);
+- strftime(buff, sizeof(buff), "%d/%m/%Y %T", nowtm);
+-
+ va_start(ap,fmt);
+- fprintf(stderr,"%s %d %s debug: ", buff, getpid(), log_prog);
+ vfprintf(stderr,fmt,ap);
+ fprintf(stderr,"\n");
+ fflush(stderr);
+@@ -51,21 +39,11 @@
+ /* Dump an error message to stderr */
+ void log_error(const char *fmt, ...) {
+ va_list ap;
+- time_t now;
+- struct tm *nowtm;
+- char buff[80];
+
+ if (fmt==NULL) return;
+-
+- now = time(NULL);
+- nowtm = localtime(&now);
+- strftime(buff, sizeof(buff), "%d/%m/%Y %T", nowtm);
+-
+ va_start(ap,fmt);
+- fprintf(stderr,"%s %d %s error: ", buff, getpid(), log_prog);
+ vfprintf(stderr,fmt,ap);
+ fprintf(stderr,"\n");
+ fflush(stderr);
+ va_end(ap);
+ }
+-
+--- a/src/native/unix/native/jsvc-unix.c
++++ b/src/native/unix/native/jsvc-unix.c
+@@ -24,8 +24,11 @@
+ #include <sys/wait.h>
+ #include <fcntl.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <pwd.h>
+ #include <grp.h>
++#include <syslog.h>
++#include <errno.h>
+ #ifdef OS_LINUX
+ #include <sys/prctl.h>
+ #include <sys/syscall.h>
+@@ -45,12 +48,17 @@
+ static mode_t envmask; /* mask to create the files */
+
+ pid_t controlled=0; /* the child process pid */
++pid_t logger_pid=0; /* the logger process pid */
+ static bool stopping=false;
+ static bool doreload=false;
+ static void (*handler_int)(int)=NULL;
+ static void (*handler_hup)(int)=NULL;
+ static void (*handler_trm)(int)=NULL;
+
++static int run_controller(arg_data *args, home_data *data, uid_t uid,
++ gid_t gid);
++
++
+ #ifdef OS_CYGWIN
+ /*
+ * File locking routine
+@@ -625,10 +633,62 @@
+ return(freopen(outfile,mode,stream));
+ }
+
++#define LOGBUF_SIZE 1024
++
++/* Read from file descriptors. Log to syslog. */
++static int logger_child(int out_fd, int err_fd, char *procname)
++{
++ fd_set rfds;
++ struct timeval tv;
++ int retval, n;
++ char buf[LOGBUF_SIZE];
++
++ if (out_fd > err_fd) {
++ n = out_fd + 1;
++ } else {
++ n = err_fd + 1;
++ }
++
++ openlog(procname, LOG_PID, LOG_DAEMON);
++
++ while (1) {
++ FD_ZERO(&rfds);
++ FD_SET(out_fd, &rfds);
++ FD_SET(err_fd, &rfds);
++ tv.tv_sec = 60;
++ tv.tv_usec = 0;
++ retval = select(n, &rfds, NULL, NULL, &tv);
++ if (retval == -1)
++ syslog(LOG_ERR, "select: %s", strerror(errno));
++ else if (retval) {
++ if (FD_ISSET(out_fd, &rfds)) {
++ ssize_t n = read(out_fd, buf, LOGBUF_SIZE-1);
++ if (n < 0) {
++ syslog(LOG_ERR, "read: %s", strerror(errno));
++ } else if (n > 0 && buf[0] != '\n') {
++ buf[n] = 0;
++ syslog(LOG_INFO, "%s", buf);
++ }
++ }
++ if (FD_ISSET(err_fd, &rfds)) {
++ ssize_t n = read(err_fd, buf, LOGBUF_SIZE-1);
++ if (n < 0) {
++ syslog(LOG_ERR, "read: %s", strerror(errno));
++ } else if (n > 0 && buf[0] != '\n') {
++ buf[n] = 0;
++ syslog(LOG_ERR, "%s", buf);
++ }
++ }
++ }
++ }
++}
++
+ /**
+ * Redirect stdin, stdout, stderr.
+ */
+-static void set_output(char *outfile, char *errfile, bool redirectstdin) {
++static void set_output(char *outfile, char *errfile, bool redirectstdin, char *procname) {
++ int out_pipe[2] = {0, 0}, err_pipe[2] = {0, 0}, fork_needed = 0;
++
+ if (redirectstdin==true) {
+ freopen("/dev/null", "r", stdin);
+ }
+@@ -643,12 +703,30 @@
+ if(strcmp(outfile, "&2") == 0 && strcmp(errfile,"&1") == 0) {
+ outfile="/dev/null";
+ }
+- if(strcmp(outfile, "&2") != 0) {
+- loc_freopen(outfile, "a", stdout);
++ if (strcmp(outfile, "SYSLOG") == 0) {
++ freopen("/dev/null", "a", stdout);
++ /* Send stdout to syslog through a logger process */
++ if (pipe(out_pipe) == -1) {
++ log_error("cannot create stdout pipe: %s",
++ strerror(errno));
++ } else {
++ fork_needed = 1;
++ }
++ } else if (strcmp(outfile, "&2") != 0) {
++ loc_freopen(outfile, "a", stdout);
+ }
+
+- if(strcmp(errfile,"&1") != 0) {
+- loc_freopen(errfile, "a", stderr);
++ if (strcmp(errfile, "SYSLOG") == 0) {
++ freopen("/dev/null", "a", stderr);
++ /* Send stderr to syslog through a logger process */
++ if (pipe(err_pipe) == -1) {
++ log_error("cannot create stderr pipe: %s",
++ strerror(errno));
++ } else {
++ fork_needed = 1;
++ }
++ } else if (strcmp(errfile, "&1") != 0) {
++ loc_freopen(errfile, "a", stderr);
+ } else {
+ close(2);
+ dup(1);
+@@ -657,16 +735,42 @@
+ close(1);
+ dup(2);
+ }
++
++ if (fork_needed) {
++ pid_t pid = fork();
++ if (pid == -1) {
++ log_error("cannot create logger process: %s", strerror(errno));
++ } else {
++ if (pid) {
++ logger_pid = pid;
++ if (out_pipe[0] != 0) {
++ close(out_pipe[0]);
++ if (dup2(out_pipe[1], 1) == -1) {
++ log_error("cannot redirect stdout to pipe for syslog: %s",
++ strerror(errno));
++ }
++ }
++ if (err_pipe[0] != 0) {
++ close(err_pipe[0]);
++ if (dup2(err_pipe[1], 2) == -1) {
++ log_error("cannot redirect stderr to pipe for syslog: %s",
++ strerror(errno));
++ }
++ }
++ } else {
++ exit(logger_child(out_pipe[0], err_pipe[0], procname));
++ }
++ }
++ }
+ }
+
+ int main(int argc, char *argv[]) {
+ arg_data *args=NULL;
+ home_data *data=NULL;
+- int status=0;
+ pid_t pid=0;
+ uid_t uid=0;
+ gid_t gid=0;
+- time_t laststart;
++ int res;
+
+ /* Parse command line arguments */
+ args=arguments(argc,argv);
+@@ -689,7 +793,7 @@
+ return(0);
+ }
+
+-#ifdef OS_LINUX
++#if OS_LINUX
+ /* On some UNIX operating systems, we need to REPLACE this current
+ process image with another one (thru execve) to allow the correct
+ loading of VMs (notably this is for Linux). Set, replace, and go. */
+@@ -763,24 +867,39 @@
+ }
+
+ envmask = umask(0077);
+- set_output(args->outfile, args->errfile, args->redirectstdin);
++ set_output(args->outfile, args->errfile, args->redirectstdin, args->procname);
++
++ res = run_controller(args, data, uid, gid);
++ if (logger_pid != 0) {
++ kill(logger_pid, SIGTERM);
++ }
++
++ return res;
++}
++
++static int run_controller(arg_data *args, home_data *data, uid_t uid,
++ gid_t gid)
++{
++ pid_t pid=0;
+
+ /* We have to fork: this process will become the controller and the other
+ will be the child */
+ while ((pid=fork())!=-1) {
++ time_t laststart;
++ int status=0;
+ /* We forked (again), if this is the child, we go on normally */
+ if (pid==0) exit(child(args,data,uid,gid));
+ laststart = time(NULL);
+
+ /* We are in the controller, we have to forward all interesting signals
+ to the child, and wait for it to die */
+- controlled=pid;
++ controlled = pid;
+ #ifdef OS_CYGWIN
+ SetTerm(cygwincontroller);
+ #endif
+- signal(SIGHUP,controller);
+- signal(SIGTERM,controller);
+- signal(SIGINT,controller);
++ signal(SIGHUP, controller);
++ signal(SIGTERM, controller);
++ signal(SIGINT, controller);
+
+ while (waitpid(pid,&status,0)!=pid);
+
+@@ -830,7 +949,6 @@
+ /* Got out of the loop? A fork() failed then. */
+ log_error("Cannot decouple controller/child processes");
+ return(1);
+-
+ }
+
+ void main_reload(void) {
+@@ -842,4 +960,3 @@
+ log_debug("Killing self with TERM signal");
+ kill(controlled,SIGTERM);
+ }
+-
+--- a/src/native/unix/man/jsvc.1.xml
++++ b/src/native/unix/man/jsvc.1.xml
+@@ -146,15 +146,19 @@
+ <varlistentry>
+ <term><option>-outfile</option> /full/path/to/file</term>
+ <listitem>
+- <para>Location for output from stdout (defaults to /dev/null). Use
+- the value '&2' to simulate '1>&2'</para>
++ <para>Location for output from stdout (defaults to
++ /dev/null). Use the value '&2' to simulate
++ '1>&2', or 'SYSLOG' to send output to the system
++ log.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-errfile</option> /full/path/to/file</term>
+ <listitem>
+- <para>Location for output from stderr (defaults to /dev/null). Use
+- the value '&1' to simulate '2>&1'</para>
++ <para>Location for output from stderr (defaults to
++ /dev/null). Use the value '&1' to simulate
++ '2>&1', or 'SYSLOG' to send output to the system
++ log.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
More information about the pkg-java-commits
mailing list