This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository commons-daemon.
commit a77a398c2a6d82a3e8fe61ba00a546b308035b76 Merge: cdba7a4 fbfeb35 Author: Wolfgang Baer <[email protected]> Date: Sat Sep 10 17:45:46 2005 +0200 Imported Debian patch 1.0.1-1 NOTICE.txt | 2 + README | 6 +- RELEASE-NOTES.txt | 12 +- STATUS.html | 2 +- build.xml | 8 +- debian/changelog | 15 + debian/control | 7 +- debian/copyright | 26 - debian/docs | 1 - debian/jsvc.1 | 14 +- debian/libcommons-daemon-java.links | 2 +- debian/patches/01_invalid_execve_usage.patch | 34 + debian/rules | 23 +- maven.xml | 36 + project.properties | 3 + project.xml | 120 +- src/java/org/apache/commons/daemon/Daemon.java | 73 +- .../org/apache/commons/daemon/DaemonContext.java | 73 +- .../apache/commons/daemon/DaemonController.java | 73 +- .../org/apache/commons/daemon/DaemonListener.java | 71 +- .../apache/commons/daemon/DaemonPermission.java | 73 +- .../commons/daemon/support/DaemonLoader.java | 87 +- src/native/nt/executables/vdmoniadm/resource.h | 73 +- src/native/nt/executables/vdmonisvc/resource.h | 73 +- src/native/nt/lib/moni_inst.h | 16 + src/native/nt/moni/vdmoniadm.c | 75 +- src/native/nt/moni/vdmonisvc.c | 75 +- debian/copyright => src/native/nt/procrun/LICENSE | 98 +- src/native/nt/procrun/License.rtf | 30 - src/native/nt/procrun/Makefile | 20 - src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.c | 1705 ++++++++++ src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.h | 117 + .../nt/procrun/apps/apsvcmgr/apsvcmgr.manifest | 10 + src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.rc | 310 ++ .../nt/procrun/apps/apsvcmgr/apsvcmgr.vcproj | 252 ++ src/native/nt/procrun/apps/jar2exe/jar2exe.c | 542 ++++ src/native/nt/procrun/apps/jar2exe/jar2exe.h | 86 + src/native/nt/procrun/apps/jar2exe/jar2exe.rc | 55 + .../jar2exe/jar2exe.vcproj} | 75 +- src/native/nt/procrun/apps/prunmgr/prunmgr.c | 1698 ++++++++++ src/native/nt/procrun/apps/prunmgr/prunmgr.h | 138 + .../nt/procrun/apps/prunmgr/prunmgr.manifest | 10 + src/native/nt/procrun/apps/prunmgr/prunmgr.rc | 288 ++ src/native/nt/procrun/apps/prunmgr/prunmgr.vcproj | 244 ++ src/native/nt/procrun/apps/prunsrv/prunsrv.c | 1260 ++++++++ src/native/nt/procrun/apps/prunsrv/prunsrv.h | 31 + src/native/nt/procrun/apps/prunsrv/prunsrv.rc | 55 + .../prunsrv/prunsrv.vcproj} | 76 +- src/native/nt/procrun/apps/srvbatch/MSG00001.bin | Bin 0 -> 84 bytes .../nt/procrun/apps/srvbatch/example/example.c | 59 + .../srvbatch/example/example.vcproj} | 252 +- .../nt/procrun/apps/srvbatch/example/exservice.bat | 53 + src/native/nt/procrun/apps/srvbatch/srvbatch.c | 827 +++++ src/native/nt/procrun/apps/srvbatch/srvbatch.rc | 58 + src/native/nt/procrun/apps/srvbatch/srvbatch.sln | 30 + .../srvbatch/srvbatch.vcproj} | 255 +- src/native/nt/procrun/extend.h | 3 - src/native/nt/procrun/icoi.ico | Bin 318 -> 0 bytes src/native/nt/procrun/icos.ico | Bin 318 -> 0 bytes src/native/nt/procrun/icow.ico | Bin 318 -> 0 bytes src/native/nt/procrun/include/apxwin.h | 196 ++ src/native/nt/procrun/include/cmdline.h | 76 + src/native/nt/procrun/include/console.h | 25 + src/native/nt/procrun/include/gui.h | 185 ++ src/native/nt/procrun/include/handles.h | 191 ++ src/native/nt/procrun/include/javajni.h | 41 + src/native/nt/procrun/include/log.h | 101 + src/native/nt/procrun/include/registry.h | 145 + src/native/nt/procrun/include/rprocess.h | 75 + src/native/nt/procrun/include/service.h | 72 + src/native/nt/procrun/java/Test.java | 18 +- src/native/nt/procrun/libprocrun.vcproj | 270 ++ src/native/nt/procrun/procgui.c | 1300 -------- src/native/nt/procrun/procrun.c | 3306 -------------------- src/native/nt/procrun/procrun.dev | 62 - src/native/nt/procrun/procrun.dsp | 293 -- src/native/nt/procrun/procrun.dsw | 41 - src/native/nt/procrun/procrun.h | 359 --- src/native/nt/procrun/procrun.rc | 232 -- src/native/nt/procrun/procrun.sln | 92 +- src/native/nt/procrun/procrun.vcproj | 374 --- src/native/nt/procrun/procrund.dev | 62 - src/native/nt/procrun/procrunw.dev | 70 - src/native/nt/procrun/proctry.ico | Bin 1078 -> 0 bytes src/native/nt/procrun/readme.txt | 149 - src/native/nt/procrun/resources/apsvcmgr.ico | Bin 0 -> 7406 bytes .../{jakarta-banner.bmp => resources/jakarta.bmp} | Bin src/native/nt/procrun/resources/license.rtf | 33 + src/native/nt/procrun/resources/procrunr.ico | Bin 0 -> 318 bytes src/native/nt/procrun/resources/procruns.ico | Bin 0 -> 318 bytes src/native/nt/procrun/resources/procrunw.ico | Bin 0 -> 1078 bytes src/native/nt/procrun/resources/sorterd.bmp | Bin 0 -> 190 bytes src/native/nt/procrun/resources/sorteru.bmp | Bin 0 -> 190 bytes src/native/nt/procrun/resources/sstatus.bmp | Bin 0 -> 630 bytes src/native/nt/procrun/resources/susers.bmp | Bin 0 -> 886 bytes src/native/nt/procrun/resources/toolbar.bmp | Bin 0 -> 2294 bytes src/native/nt/procrun/samples/cchild.c | 133 + src/native/nt/procrun/samples/cchild.vcproj | 227 ++ src/native/nt/procrun/splash.bmp | Bin 116718 -> 0 bytes src/native/nt/procrun/src/cmdline.c | 276 ++ src/native/nt/procrun/src/console.c | 149 + src/native/nt/procrun/src/gui.c | 1024 ++++++ src/native/nt/procrun/src/handles.c | 685 ++++ src/native/nt/procrun/src/javajni.c | 807 +++++ src/native/nt/procrun/src/log.c | 409 +++ src/native/nt/procrun/src/mclib.c | 285 ++ src/native/nt/procrun/src/mclib.h | 26 + src/native/nt/procrun/src/private.h | 273 ++ src/native/nt/procrun/src/registry.c | 1084 +++++++ src/native/nt/procrun/src/rprocess.c | 938 ++++++ src/native/nt/procrun/src/service.c | 562 ++++ src/native/nt/procrun/src/utils.c | 946 ++++++ src/native/nt/procrun/testchild/testchild.c | 66 +- src/native/nt/procrun/testchild/testchild.vcproj | 240 +- src/native/nt/procrun/xdocs/index.xml | 18 + src/native/nt/service/instmain.c | 75 +- src/native/nt/signals/kills.c | 73 +- src/native/nt/supcalls_nt/vdenv.c | 75 +- src/native/unix/CHANGES.txt | 15 + src/native/unix/INSTALL.txt | 9 +- src/native/unix/Makedefs | 71 - src/native/unix/Makedefs.in | 73 +- src/native/unix/Makefile | 80 - src/native/unix/Makefile.in | 73 +- src/native/unix/configure | 611 ++-- src/native/unix/configure.in | 100 +- src/native/unix/man/README | 20 + src/native/unix/man/fetch.sh | 21 + {debian => src/native/unix/man}/jsvc.1.xml | 24 +- src/native/unix/native/Makefile | 43 - src/native/unix/native/Makefile.in | 2 +- src/native/unix/native/Tomcat5.sh | 24 +- src/native/unix/native/arguments.c | 31 +- src/native/unix/native/arguments.h | 8 +- src/native/unix/native/debug.c | 23 +- src/native/unix/native/debug.h | 2 +- src/native/unix/native/dso-dlfcn.c | 2 +- src/native/unix/native/dso-dyld.c | 2 +- src/native/unix/native/dso.h | 2 +- src/native/unix/native/help.c | 11 +- src/native/unix/native/help.h | 2 +- src/native/unix/native/home.c | 2 +- src/native/unix/native/home.h | 2 +- src/native/unix/native/java.c | 106 +- src/native/unix/native/java.h | 2 +- src/native/unix/native/jsvc-unix.c | 275 +- src/native/unix/native/jsvc.h | 2 +- src/native/unix/native/location.c | 19 +- src/native/unix/native/location.h | 2 +- src/native/unix/native/replace.c | 2 +- src/native/unix/native/replace.h | 2 +- src/native/unix/native/signals.c | 2 +- src/native/unix/support/apfunctions.m4 | 63 +- src/native/unix/support/apjava.m4 | 63 +- src/native/unix/support/apsupport.m4 | 119 +- src/native/unix/support/buildconf.sh | 73 +- src/native/unix/support/install.sh | 302 +- src/samples/AloneDaemon.sh | 15 + src/samples/AloneService.java | 75 +- src/samples/Native.c | 42 + src/samples/Native.sh | 18 + src/samples/README.txt | 6 +- src/samples/ServiceDaemon.java | 75 +- src/samples/ServiceDaemon.sh | 15 + src/samples/ServiceDaemonReadThread.java | 74 +- src/samples/SimpleDaemon.java | 123 +- src/samples/SimpleDaemon.sh | 22 + src/samples/build.xml | 8 +- .../org/apache/commons/daemon/SimpleDaemon.java | 75 +- xdocs/faq.xml | 22 + xdocs/jsvc.xml | 13 +- xdocs/navigation.xml | 8 +- xdocs/procrun.xml | 462 ++- 173 files changed, 19981 insertions(+), 9206 deletions(-) diff --cc debian/changelog index b7de74f,0000000..7e9b5bb mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,42 -1,0 +1,57 @@@ ++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 722f860,0000000..0fc1b6c mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,47 -1,0 +1,48 @@@ +Source: commons-daemon +Section: libs +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Arnaud Vandyck <[email protected]>, Wolfgang Baer <[email protected]> - Build-Depends: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.4.PRECVS12-1), kaffe-dev (>= 2:1.1.4.PRECVS12-1), junit, libant1.6-java, libxerces2-java, libjaxp1.2-java - Standards-Version: 3.6.1 ++Build-Depends: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-3), kaffe-dev (>= 2:1.1.5-3), junit, ant, libxerces2-java, libjaxp1.2-java, autotools-dev ++Standards-Version: 3.6.2 + +Package: libcommons-daemon-java +Architecture: all - Depends: kaffe (>= 2:1.1.4.PRECVS12-1) | java1-runtime | java2-runtime ++Depends: kaffe (>= 2:1.1.5-3) | java1-runtime | java2-runtime ++Suggests: java-virtual-machine +Recommends: jsvc +Description: Java API to launch java applications as daemons + The libcommons-daemon-java package can be used to implement java applications + which can be launched as daemons of the operating system. The application + has to implement the provided interfaces by this package in order to + be launched/stopped and restarted in the same fashion a normal unix + daemons. + . + For example the java program will be notified about a shutdown and + therefore be able to perform 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. + . + This is a part of the Apache Jakarta Project. + Home: <http://jakarta.apache.org/commons/daemon/> + +Package: jsvc +Section: net +Architecture: any +Depends: ${shlibs:Depends}, libcommons-daemon-java +Description: native application 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. + . + This is a part of the Apache Jakarta Project. + Home: <http://jakarta.apache.org/commons/daemon/> + +Package: jsvc-dev +Architecture: all +Depends: jsvc +Description: development files for jsvc + This package provides the development files of the jsvc application. + For a description please have a look at the packages jsvc and + libcommons-daemon-java. diff --cc debian/copyright index 70ecf8d,0000000..eb3a2f6 mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,213 -1,0 +1,187 @@@ +This package was debianized by Arnaud Vandyck <[email protected]> on +Sam, 09 Oct 2004 17:46:48 +0200 + +It was downloaded from http://jakarta.apache.org/commons/daemon + +Upstream Authors: Jean-Frederic Clere, Remy Maucherat, Yoav Shapira, + Bill Barker + + http://jakarta.apache.org/commons/daemon/team-list.html + +Copyright: + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --cc debian/docs index 7a13d00,0000000..9f3ad33 mode 100644,000000..100644 --- a/debian/docs +++ b/debian/docs @@@ -1,7 -1,0 +1,6 @@@ - KEYS +PROPOSAL.html +README +RELEASE-NOTES.txt +STATUS.html +src/docs/daemon.html +dist/docs/api diff --cc debian/jsvc.1 index fb096fc,0000000..f48922e mode 100644,000000..100644 --- a/debian/jsvc.1 +++ b/debian/jsvc.1 @@@ -1,102 -1,0 +1,110 @@@ +.\"Generated by db2man.xsl. Don't modify this, modify the source. +.de Sh \" Subsection +.br +.if t .Sp +.ne 5 +.PP +\fB\\$1\fR +.PP +.. +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Ip \" List item +.br +.ie \\n(.$>=3 .ne \\$3 +.el .ne 3 +.IP "\\$1" \\$2 +.. +.TH "JSVC" 1 "" "" "" +.SH NAME +jsvc \- application to launch java daemon +.SH "SYNOPSIS" +.ad l +.hy 0 +.HP 5 - \fBjsvc\fR [\-jvm\ \fIJVM\ name\fR] [\-classpath\ \fIpath\fR] [\-cp\ \fIpath\fR] [\-home\ \fIdirectory\fR] [\-version] [\-help] [\-?] [\-nodetach] [\-debug] [\-check] [\-user] [\-verbose\fI:class|gc|jni\fR] [\-outfile\ \fI/full/path/to/file\fR] [\-errfile\ \fI/full/path/to/file\fR] [\-pidfile\ \fI/full/path/to/file\fR] [\-Dproperty=\fIvalue\fR] [\-X\fIoption\fR] ++\fBjsvc\fR [\-jvm\ \fIJVM\ name\fR] [\-classpath\ \fIpath\fR] [\-cp\ \fIpath\fR] [\-home\ \fIdirectory\fR] [\-version] [\-help] [\-?] [\-nodetach] [\-debug] [\-check] [\-user\ \fIuser\fR] [\-wait\ \fIwaittime\fR] [\-stop] [\-verbose\fI:class|gc|jni\fR] [\-outfile\ \fI/full/path/to/file\fR] [\-errfile\ \fI/full/path/to/file\fR] [\-pidfile\ \fI/full/path/to/file\fR] [\-Dproperty=\fIvalue\fR] [\-X\fIoption\fR] +.ad +.hy + +.SH "DESCRIPTION" + +.PP - \fBjsvc\fR executes classfile that implements a Daemon interface\&. ++\fBjsvc\fR executes \fIclassfile\fR that implements a Daemon interface\&. + +.SH "OPTIONS" + +.TP +\fB\-jvm\fR JVM name +use a specific Java Virtual Machine\&. + +.TP +\fB\-cp/ \-classpath\fR directory and zip/jar files +set search path for service classes and resouces + +.TP +\fB\-home\fR directory +set the path of your JDK or JRE installation (or set the JAVA_HOME environment variable) + +.TP +\fB\-version\fR +show the current Java environment version (to check correctness of \-home and \-jvm\&. Implies \-nodetach) + +.TP +\fB\-help\fR +show this help page (implies \-nodetach) + +.TP +\fB\-nodetach\fR +don't detach from parent process and become a daemon + +.TP +\fB\-debug\fR +verbosely print debugging information + +.TP +\fB\-check\fR +only check service (implies \-nodetach) + +.TP - \fB\-user\fR ++\fB\-stop\fR ++stop the service using the file given in the \-pidfile option ++ ++.TP ++\fB\-wait\fR waittime ++wait up to waittime seconds for the service to start waittime should multiple of 10 (min=10) ++ ++.TP ++\fB\-user\fR user +user used to run the daemon (defaults to current user) + +.TP +\fB\-verbose[:class|gc|jni]\fR +enable verbose output + +.TP +\fB\-outfile\fR /full/path/to/file +Location for output from stdout (defaults to /dev/null)\&. Use the value '&2' to simulate '1>&2' + +.TP +\fB\-errfile\fR /full/path/to/file +Location for output from stderr (defaults to /dev/null)\&. Use the value '&1' to simulate '2>&1' + +.TP +\fB\-pidfile\fR /full/path/to/file +Location for output from the file containing the pid of jsvc (defaults to /var/run/jsvc\&.pid) + +.TP +\fB\-D\fR<name>=<value> +set a Java system property + +.TP +\fB\-X\fR<option> +set Virtual Machine specific option + +.SH "AUTHOR" + +.PP +JSVC is part of the Jakarta Commons Daemon project\&. Authors are Jean\-Frederic Clere, Remy Maucherat, Yoav Shapira, Bill Barker\&. JSVC is under the Apache License Version 2\&.0\&. + diff --cc debian/libcommons-daemon-java.links index 49bf518,0000000..8becb9e mode 100644,000000..100644 --- a/debian/libcommons-daemon-java.links +++ b/debian/libcommons-daemon-java.links @@@ -1,1 -1,0 +1,1 @@@ - usr/share/java/commons-daemon-1.0.jar usr/share/java/commons-daemon.jar ++usr/share/java/commons-daemon-1.0.1.jar usr/share/java/commons-daemon.jar diff --cc debian/patches/01_invalid_execve_usage.patch index 0000000,0000000..9f93d73 new file mode 100644 --- /dev/null +++ b/debian/patches/01_invalid_execve_usage.patch @@@ -1,0 -1,0 +1,34 @@@ ++--- src/native/unix/native/jsvc-unix.c 2005/08/15 11:19:48 232794 +++++ src/native/unix/native/jsvc-unix.c 2005/08/15 17:44:02 232839 ++@@ -631,8 +631,9 @@ ++ if (strcmp(argv[0],args->procname)!=0) { ++ char *oldpath=getenv("LD_LIBRARY_PATH"); ++ char *libf=java_library(args,data); ++- char *old=argv[0]; +++ char *filename; ++ char buf[2048]; +++ int ret; ++ char *tmp=NULL; ++ char *p1=NULL; ++ char *p2=NULL; ++@@ -653,9 +654,18 @@ ++ ++ log_debug("Invoking w/ LD_LIBRARY_PATH=%s",getenv("LD_LIBRARY_PATH")); ++ +++ /* execve needs a full path */ +++ ret = readlink("/proc/self/exe",buf,sizeof(buf)-1); +++ if (ret<=0) +++ strcpy(buf,argv[0]); +++ else +++ buf[ret]='\0'; +++ +++ filename=buf; +++ ++ argv[0]=args->procname; ++- execve(old,argv,environ); ++- log_error("Cannot execute JSVC executor process"); +++ execve(filename,argv,environ); +++ log_error("Cannot execute JSVC executor process (%s)",filename); ++ return(1); ++ } ++ log_debug("Running w/ LD_LIBRARY_PATH=%s",getenv("LD_LIBRARY_PATH")); diff --cc debian/rules index 8f72eb6,0000000..01aed0f mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,35 -1,0 +1,42 @@@ +#!/usr/bin/make -f +# debian/rules for commons-daemon + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + - # This is the debhelper compatibility version to use. - #export DH_COMPAT=4 ++DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) ++DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +include /usr/share/cdbs/1/rules/debhelper.mk ++include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/ant.mk + +JAVA_HOME := /usr/lib/kaffe - ANT_HOME := /usr/share/ant1.6 ++ANT_HOME := /usr/share/ant +DEB_JARS := ${ANT_HOME}/lib/ant-launcher.jar jaxp-1.2 xercesImpl +DEB_ANT_COMPILER := jikes +DEB_ANT_BUILD_TARGET := dist + +LIBRARY=commons-daemon - VERSION=1.0 ++VERSION=1.0.1 + +clean:: + -(cd src/native/unix ; make clean) - -rm src/native/unix/config.log src/native/unix/config.status ++ -rm src/native/unix/config.log src/native/unix/config.status ++ -rm src/native/unix/native/Makefile ++ -rm src/native/unix/Makefile ++ -rm src/native/unix/Makedefs + +common-configure-arch:: - cd src/native/unix ; ./configure --with-java=$(JAVA_HOME) ++ cd src/native/unix ; ./configure --with-java=$(JAVA_HOME) --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + +common-build-arch:: + cd src/native/unix ; make + +install/lib${LIBRARY}-java:: + install -m 644 dist/${LIBRARY}.jar debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${VERSION}.jar - # NO DOCUMENTATION AT THE MOMENT - # -cp -a dist/docs/ debian/lib${LIBRARY}-java/usr/share/doc/lib${LIBRARY}-java/ ++ # install lintian overrides ++ #install -d $(CURDIR)/debian/kaffe-pthreads-profile/usr/share/lintian/overrides/ ++ #install -m 644 $(CURDIR)/debian/kaffe-pthreads-profile.lintian $(CURDIR)/debian/kaffe-pthreads-profile/usr/share/lintian/overrides/kaffe-pthreads-profile ++ ++ -- 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
