This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository commons-daemon.
commit da9685133f8d0ac7267b9dd6d7458e21f8a845d7 Merge: 3dee205 3e249c6 Author: Emmanuel Bourg <[email protected]> Date: Wed Apr 3 10:17:55 2013 +0200 Imported Debian patch 1.0.15-1 NOTICE.txt | 2 +- RELEASE-NOTES.txt | 20 +- build.xml | 6 +- debian/changelog | 9 + debian/control | 9 +- debian/copyright | 12 +- debian/patches/arm_support.diff | 16 - debian/patches/hppa_support.diff | 25 - debian/patches/hurd_support.diff | 19 - debian/patches/kfreebsd_support.diff | 6 +- debian/patches/libcap_dlopen.diff | 25 - debian/patches/powerpcspe_support.diff | 15 - debian/patches/s390x_support.diff | 13 - debian/patches/series | 7 - debian/patches/sh4_support.diff | 20 - pom.xml | 4 +- .../daemon/support/DaemonConfiguration.java | 4 +- .../commons/daemon/support/DaemonWrapper.java | 11 +- src/native/unix/configure | 130 +- src/native/unix/configure.in | 8 +- src/native/unix/native/arguments.c | 13 +- src/native/unix/native/arguments.h | 4 +- src/native/unix/native/help.c | 6 +- src/native/unix/native/home.c | 8 +- src/native/unix/native/jsvc-unix.c | 87 +- src/native/unix/native/location.c | 14 +- src/native/unix/native/version.h | 4 +- src/native/unix/support/apsupport.m4 | 126 +- src/native/unix/support/buildconf.sh | 2 +- src/native/unix/support/config.guess | 1380 +++++++++++--------- src/native/unix/support/config.sub | 143 +- src/native/windows/apps/prunmgr/prunmgr.c | 36 +- src/native/windows/apps/prunmgr/prunmgr.h | 2 +- src/native/windows/apps/prunmgr/prunmgr.manifest | 8 + src/native/windows/apps/prunmgr/prunmgr.rc | 12 +- src/native/windows/apps/prunsrv/Makefile | 7 - src/native/windows/apps/prunsrv/prunsrv.c | 155 ++- src/native/windows/apps/prunsrv/prunsrv.h | 2 +- .../prunmgr.manifest => prunsrv/prunsrv.manifest} | 12 +- src/native/windows/apps/prunsrv/prunsrv.rc | 7 +- src/native/windows/include/javajni.h | 7 +- src/native/windows/include/log.h | 10 + src/native/windows/src/javajni.c | 105 +- src/native/windows/src/log.c | 32 +- src/native/windows/src/rprocess.c | 6 + src/samples/ProcrunServiceRemove.cmd | 84 +- src/site/xdoc/binaries.xml | 25 +- src/site/xdoc/download_daemon.xml | 52 +- src/site/xdoc/jsvc.xml | 2 + 49 files changed, 1595 insertions(+), 1117 deletions(-) diff --cc debian/changelog index 47e5eed,0000000..6cd467c mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,306 -1,0 +1,315 @@@ ++commons-daemon (1.0.15-1) experimental; urgency=low ++ ++ * Team upload. ++ * New upstream release. ++ * Removed the patches merged upstream ++ * d/control: Bump Standards-Version to 3.9.4: no changes needed. ++ ++ -- Emmanuel Bourg <[email protected]> Wed, 03 Apr 2013 10:17:55 +0200 ++ +commons-daemon (1.0.10-3) unstable; urgency=low + + * Team upload. + * Add patch to allow dlopen to locate libcap. (Closes: #685025) + + -- tony mancill <[email protected]> Wed, 15 Aug 2012 22:45:51 -0700 + +commons-daemon (1.0.10-2) unstable; urgency=low + + * d/control: Really drop Michael from Uploaders list. + * d/rules: Run autoconf before configure (because patches are applied + to apsupport.m4). + * d/control: Wrap-and-sort fields. + + -- Damien Raude-Morvan <[email protected]> Fri, 02 Mar 2012 22:07:21 +0100 + +commons-daemon (1.0.10-1) unstable; urgency=low + + * New upstream release. + * d/control: Bump Standards-Version to 3.9.3: no changes needed. + * d/rules: Enable hardening build with dpkg-buildflags. + * d/rules: Remove old code to workaround bug in debhelper. + * Fix "Updating the commons-daemon Uploaders list" Remove Michael Koch + from Uploaders list (Closes: #654006). Thanks Michael! + * d/copyright: Use copyright-format 1.0. + + -- Damien Raude-Morvan <[email protected]> Fri, 02 Mar 2012 19:37:23 +0100 + +commons-daemon (1.0.8-1) unstable; urgency=low + + * New upstream release: + - Refresh all patches. + + -- Damien Raude-Morvan <[email protected]> Thu, 24 Nov 2011 19:29:26 +0100 + +commons-daemon (1.0.7-2) unstable; urgency=low + + * Add support for s390x. Closes: #638907. + + -- Damien Raude-Morvan <[email protected]> Mon, 22 Aug 2011 23:07:18 +0200 + +commons-daemon (1.0.7-1) unstable; urgency=high + + * New upstream security release. + * Fix CVE-2011-2729 (jsvc does not drop + capabilities allowing the application to access files and directories + owned by superuser). + + -- Damien Raude-Morvan <[email protected]> Fri, 12 Aug 2011 19:36:58 +0200 + +commons-daemon (1.0.6-1) unstable; urgency=low + + * New upstream release. + * Refresh patches. + * d/control: Move Depends default-jre-headless | java2-runtime-headless from + libcommons-daemon-java to jsvc package Recommends. + * d/copyright: Use DEP-5 format. + + -- Damien Raude-Morvan <[email protected]> Sun, 10 Jul 2011 22:06:40 +0200 + +commons-daemon (1.0.5-2) unstable; urgency=low + + * Publish commons daemon JAR into /usr/share/maven-repo. + * d/control: Bump Standards-Version to 3.9.2: no changes needed. + + -- Damien Raude-Morvan <[email protected]> Mon, 13 Jun 2011 19:25:17 +0200 + +commons-daemon (1.0.5-1) unstable; urgency=low + + * New upstream release. + + -- Damien Raude-Morvan <[email protected]> Wed, 05 Jan 2011 22:01:53 +0100 + +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/control index 3688f8b,0000000..6dd2f30 mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,45 -1,0 +1,46 @@@ +Source: commons-daemon +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Marcus Better <[email protected]>, - Damien Raude-Morvan <[email protected]> ++ Damien Raude-Morvan <[email protected]>, ++ Emmanuel Bourg <[email protected]> +Build-Depends: ant, + autoconf, + autotools-dev, + debhelper (>= 7.0.50~), + default-jdk, + docbook-xsl, + libcap-dev [linux-any], + maven-repo-helper, + xsltproc +Build-Conflicts: autoconf2.13 - Standards-Version: 3.9.3 ++Standards-Version: 3.9.4 +Homepage: http://commons.apache.org/daemon/ +Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/commons-daemon/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-daemon/ + +Package: libcommons-daemon-java +Architecture: all +Depends: ${misc:Depends} +Suggests: java-virtual-machine +Recommends: jsvc - Description: library to launch Java applications as daemons ++Description: Library to launch Java applications as daemons + The Daemon package from Apache Commons can be used to implement Java + applications which can be launched as daemons. For example the + program will be notified about a shutdown so that it can perform + cleanup tasks before its process of execution is destroyed by the + operation system. + . + This package contains the java library. You will also need the actual + binary for your architecture which is provided by the jsvc package. + +Package: jsvc +Section: utils +Architecture: any +Depends: libcommons-daemon-java, ${misc:Depends}, ${shlibs:Depends} +Recommends: default-jre-headless | java2-runtime-headless - Description: wrapper to launch Java applications as daemons ++Description: Wrapper to launch Java applications as daemons + This is the native application for launching Java applications + implementing certain interfaces from the libcommons-daemon-java + package as daemons. diff --cc debian/copyright index 0f328fa,0000000..86cf676 mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,21 -1,0 +1,21 @@@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ - Upstream-Name: Commons Daemon - Upstream-Contact: <http://commons.apache.org/daemon> - Source: http://www.apache.org/dist/commons/daemon/source/ ++Upstream-Name: Apache Commons Daemon ++Upstream-Contact: Apache Commons Developers <[email protected]> ++Source: http://commons.apache.org/daemon/ + +Files: * - Copyright: Copyright (C) 1999-2011 The Apache Software Foundation. ++Copyright: 1999-2011 The Apache Software Foundation. +License: Apache-2.0 +Comment: + Upstream authors: Bill Barker, Jean-Frederic Clere, Mladen Turk, + Remy Maucherat, Pier Fumagalli, Yoav Shapira. + +Files: debian/* +Copyright: 2004, Arnaud Vandyck <[email protected]> - Copyright: Copyright (C) 2006 Marcus Better - Copyright: 2010-2011, Damien Raude-Morvan ++ 2006 Marcus Better ++ 2010-2011, Damien Raude-Morvan +License: Apache-2.0 + +License: Apache-2.0 + A complete copy of the Apache License, Version 2.0, can be found in + /usr/share/common-licenses/Apache-2.0 on Debian Systems. diff --cc debian/patches/kfreebsd_support.diff index 4c4bd6b,0000000..eb1bd69 mode 100644,000000..100644 --- a/debian/patches/kfreebsd_support.diff +++ b/debian/patches/kfreebsd_support.diff @@@ -1,20 -1,0 +1,18 @@@ +Description: Add support for kFreeBSD/GNU arch +Bug: http://bugs.debian.org/498376 +Author: Petr Salinger <[email protected]> +Last-Update: 2010-07-28 - Index: b/src/native/unix/support/apsupport.m4 - =================================================================== +--- a/src/native/unix/support/apsupport.m4 ++++ b/src/native/unix/support/apsupport.m4 - @@ -70,6 +70,11 @@ - CFLAGS="$CFLAGS -DOS_AIX -DDSO_DLFCN" ++@@ -73,6 +73,11 @@ + LDFLAGS="$LDFLAGS -ldl" ++ supported_os="aix5" + ;; ++ 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"]) diff --cc debian/patches/series index 57458fd,0000000..2fe91c3 mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,9 -1,0 +1,2 @@@ +libgcj_PR31700.diff - sh4_support.diff +kfreebsd_support.diff - powerpcspe_support.diff - hppa_support.diff - arm_support.diff - hurd_support.diff - s390x_support.diff - libcap_dlopen.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
