This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository commons-daemon.
commit c18c0a258116ea58cdfb64ca234d016028ce586c Merge: 63a1854 07c125b Author: Damien Raude-Morvan <[email protected]> Date: Sun Nov 21 18:05:41 2010 +0100 Imported Debian patch 1.0.4-1 README | 18 +- RELEASE-NOTES.txt | 52 +++- build.xml | 14 +- debian/changelog | 16 ++ debian/patches/hurd_support.diff | 4 +- debian/patches/libgcj_PR31700.diff | 6 +- debian/patches/series | 1 - debian/patches/syslog.diff | 313 --------------------- pom.xml | 8 +- src/assembly/native-src.xml | 14 +- src/assembly/src.xml | 4 +- src/java/org/apache/commons/daemon/Daemon.java | 8 +- .../apache/commons/daemon/DaemonInitException.java | 45 +++ .../daemon/support/DaemonConfiguration.java | 195 +++++++++++++ .../commons/daemon/support/DaemonLoader.java | 92 +++--- .../commons/daemon/support/DaemonWrapper.java | 267 ++++++++++++++++++ .../nt/procrun/apps/prunmgr/prunmgr.manifest | 10 - src/native/unix/CHANGES.txt | 9 +- src/native/unix/INSTALL.txt | 10 + src/native/unix/Makedefs.in | 6 +- src/native/unix/Makefile.in | 4 +- src/native/unix/configure | 152 +++++++++- src/native/unix/configure.in | 21 +- src/native/unix/man/jsvc.1.xml | 28 +- src/native/unix/native/Makefile.in | 5 +- src/native/unix/native/Tomcat.sh | 78 ----- src/native/unix/native/arguments.c | 5 +- src/native/unix/native/debug.c | 30 +- src/native/unix/native/debug.h | 8 +- src/native/unix/native/help.c | 6 +- src/native/unix/native/home.c | 6 +- src/native/unix/native/java.c | 54 +++- src/native/unix/native/jsvc-unix.c | 235 +++++++++++++--- src/native/unix/native/location.c | 2 + src/native/unix/native/locks.c | 3 +- src/native/unix/native/signals.c | 4 +- src/native/unix/native/version.h | 2 +- src/native/unix/support/apfunctions.m4 | 72 ++++- src/native/unix/support/apsupport.m4 | 4 +- src/native/unix/support/mkdist.sh | 104 +++++++ src/native/windows/README | 25 ++ src/native/{nt/procrun => windows}/README.dev | 4 +- .../{nt/procrun => windows}/apps/prunmgr/Makefile | 0 .../{nt/procrun => windows}/apps/prunmgr/prunmgr.c | 0 .../{nt/procrun => windows}/apps/prunmgr/prunmgr.h | 8 +- src/native/windows/apps/prunmgr/prunmgr.manifest | 26 ++ .../procrun => windows}/apps/prunmgr/prunmgr.rc | 82 +++--- .../{nt/procrun => windows}/apps/prunsrv/Makefile | 2 +- .../{nt/procrun => windows}/apps/prunsrv/prunsrv.c | 178 +++++++++--- .../{nt/procrun => windows}/apps/prunsrv/prunsrv.h | 6 +- .../procrun => windows}/apps/prunsrv/prunsrv.rc | 10 +- .../{nt/procrun => windows}/include/Makefile.inc | 36 ++- .../{nt/procrun => windows}/include/apxwin.h | 1 + .../{nt/procrun => windows}/include/cmdline.h | 0 .../{nt/procrun => windows}/include/console.h | 0 src/native/{nt/procrun => windows}/include/gui.h | 0 .../{nt/procrun => windows}/include/handles.h | 0 .../{nt/procrun => windows}/include/javajni.h | 19 +- src/native/{nt/procrun => windows}/include/log.h | 0 .../{nt/procrun => windows}/include/registry.h | 0 .../{nt/procrun => windows}/include/rprocess.h | 0 .../{nt/procrun => windows}/include/service.h | 0 .../{nt/procrun => windows}/resources/commons.bmp | Bin .../{nt/procrun => windows}/resources/license.rtf | 0 .../{nt/procrun => windows}/resources/procrunr.ico | Bin .../{nt/procrun => windows}/resources/procruns.ico | Bin .../{nt/procrun => windows}/resources/procrunw.ico | Bin .../{nt/procrun => windows}/resources/susers.bmp | Bin src/native/{nt/procrun => windows}/src/cmdline.c | 0 src/native/{nt/procrun => windows}/src/console.c | 0 src/native/{nt/procrun => windows}/src/gui.c | 3 +- src/native/{nt/procrun => windows}/src/handles.c | 0 src/native/{nt/procrun => windows}/src/javajni.c | 203 ++++++++----- src/native/{nt/procrun => windows}/src/log.c | 88 ++++-- src/native/{nt/procrun => windows}/src/mclib.c | 15 +- src/native/{nt/procrun => windows}/src/mclib.h | 0 src/native/{nt/procrun => windows}/src/private.h | 0 src/native/{nt/procrun => windows}/src/registry.c | 8 +- src/native/{nt/procrun => windows}/src/rprocess.c | 0 src/native/{nt/procrun => windows}/src/service.c | 17 +- src/native/{nt/procrun => windows}/src/utils.c | 0 src/native/{nt/procrun => windows}/xdocs/index.xml | 0 src/samples/AloneService.java | 35 ++- src/samples/Native.c | 4 +- src/samples/ProcrunService.java | 100 ++++++- src/samples/ServiceDaemon.java | 35 ++- .../{SimpleDaemon.java => SimpleApplication.java} | 160 ++++++----- src/samples/SimpleApplication.sh | 57 ++++ src/samples/SimpleDaemon.java | 24 +- src/{native/unix/native => samples}/Tomcat5.sh | 0 src/samples/Tomcat7.sh | 203 +++++++++++++ src/samples/build.xml | 22 +- src/samples/build/classes/AloneService.class | Bin 0 -> 2809 bytes src/samples/build/classes/ProcrunService.class | Bin 0 -> 3972 bytes src/samples/build/classes/ServiceDaemon.class | Bin 0 -> 2981 bytes .../build/classes/ServiceDaemonReadThread.class | Bin 0 -> 617 bytes .../build/classes/SimpleApplication$Handler.class | Bin 0 -> 3730 bytes .../classes/SimpleApplication$ShutdownHook.class | Bin 0 -> 625 bytes src/samples/build/classes/SimpleApplication.class | Bin 0 -> 3335 bytes .../build/classes/SimpleDaemon$Handler.class | Bin 0 -> 4021 bytes src/samples/build/classes/SimpleDaemon.class | Bin 0 -> 3444 bytes 101 files changed, 2360 insertions(+), 926 deletions(-) diff --cc debian/changelog index 8572931,0000000..dab6e58 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,217 -1,0 +1,233 @@@ ++commons-daemon (1.0.4-1) unstable; urgency=low ++ ++ * New upstream release. ++ - d/patches/syslog.diff: merged upstream. ++ - d/patches/jsvc_reopen_usr1.diff: merged upstream. ++ - d/patches/hurd_support.diff: use "gnu" instead of "hurd". ++ ++ -- Damien Raude-Morvan <[email protected]> Sun, 21 Nov 2010 18:05:41 +0100 ++ ++commons-daemon (1.0.3-2) UNRELEASED; urgency=low ++ ++ * d/patches/jsvc_reopen_usr1.diff: ++ Make jsvc reopen log files on SIGUSR1 (Closes: #460183). ++ ++ -- Damien Raude-Morvan <[email protected]> Tue, 31 Aug 2010 00:26:47 +0200 ++ +commons-daemon (1.0.3-1) unstable; urgency=low + + * New upstream release. + - debian/patches/old_capabilities.diff: merged upstream. + - no more prebuilt ELF objects in source tarball. + * d/pacthes/syslog.diff: Updated to keep timestamp when SYSLOG support + is not enabled. + * d/patches/hurd_support.diff: tentative support for GNU/Hurd OS. + * d/control: B-D on libcap-dev for all Linux OS. + + -- Damien Raude-Morvan <[email protected]> Thu, 05 Aug 2010 18:00:06 +0200 + +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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Fri, 12 Nov 2004 17:48:04 +0100 + +commons-daemon (1.0-2) unstable; urgency=low + + * improved description for jsvc-dev. + + -- Arnaud Vandyck <[email protected]> Fri, 29 Oct 2004 11:57:53 +0200 + +commons-daemon (1.0-1) unstable; urgency=low + + * Initial Release. + + -- Arnaud Vandyck <[email protected]> Sat, 9 Oct 2004 17:51:44 +0200 + diff --cc debian/patches/hurd_support.diff index 6e11bcf,0000000..892faf0 mode 100644,000000..100644 --- a/debian/patches/hurd_support.diff +++ b/debian/patches/hurd_support.diff @@@ -1,17 -1,0 +1,17 @@@ +Description: Add support for Hurd OS +Last-Update: 2010-08-03 + +--- a/src/native/unix/support/apsupport.m4 ++++ b/src/native/unix/support/apsupport.m4 +@@ -74,6 +74,11 @@ + supported_os="kfreebsd-gnu" + LIBS="$LIBS -ldl -lpthread" + ;; - + hurd*) - + CFLAGS="$CFLAGS -pthread" +++ gnu*) +++ CFLAGS="$CFLAGS -DOS_HURD -DDSO_DLFCN -pthread " ++ supported_os="hurd-gnu" ++ LIBS="$LIBS -ldl -lpthread" ++ ;; + *) + AC_MSG_RESULT([failed]) + AC_MSG_ERROR([Unsupported operating system "$host_os"]) diff --cc debian/patches/libgcj_PR31700.diff index 553851b,0000000..a69bead mode 100644,000000..100644 --- a/debian/patches/libgcj_PR31700.diff +++ b/debian/patches/libgcj_PR31700.diff @@@ -1,15 -1,0 +1,15 @@@ +Description: Workaround for libgcj/PR31700 in handling -X options. +Bug: vendor, http://gcc.gnu.org/PR31700 +Author: Marcus Better <[email protected]> +Last-Update: 2010-07-28 +--- a/src/native/unix/native/java.c ++++ b/src/native/unix/native/java.c - @@ -224,7 +224,7 @@ ++@@ -227,7 +227,7 @@ + return false; + } + #endif +- arg.ignoreUnrecognized = FALSE; ++ arg.ignoreUnrecognized = JNI_TRUE; - arg.nOptions = args->onum; - arg.nOptions++; /* Add abort code */ ++ arg.nOptions = args->onum + 4; /* pid, ppid and abort */ + opt = (JavaVMOption *) malloc(arg.nOptions * sizeof(JavaVMOption)); ++ for (x = 0; x < args->onum; x++) { diff --cc debian/patches/series index 5143647,0000000..5484802 mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,8 -1,0 +1,7 @@@ +libgcj_PR31700.diff +sh4_support.diff +kfreebsd_support.diff +powerpcspe_support.diff +hppa_support.diff +arm_support.diff +hurd_support.diff - syslog.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-daemon.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
