[commons-daemon] 36/52: Imported Debian patch 1.0.8-1
Tony Mancill
tmancill at moszumanska.debian.org
Wed Nov 12 05:31:32 UTC 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository commons-daemon.
commit 9f86c7ff2ff8e818ccc340403c36d912944d6e83
Merge: 18121cd 2f8fa3f
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Thu Nov 24 19:29:26 2011 +0100
Imported Debian patch 1.0.8-1
README | 11 +
RELEASE-NOTES.txt | 11 +-
build.xml | 16 +-
debian/changelog | 7 +
debian/patches/arm_support.diff | 4 +-
debian/patches/hppa_support.diff | 17 +-
debian/patches/hurd_support.diff | 4 +-
debian/patches/kfreebsd_support.diff | 4 +-
debian/patches/libgcj_PR31700.diff | 4 +-
debian/patches/powerpcspe_support.diff | 4 +-
debian/patches/s390x_support.diff | 8 +-
debian/patches/sh4_support.diff | 4 +-
pom.xml | 12 +-
src/{ => main}/assembly/bin.xml | 0
src/{ => main}/assembly/native-src.xml | 10 -
src/{ => main}/assembly/src.xml | 0
.../java/org/apache/commons/daemon/Daemon.java | 0
.../org/apache/commons/daemon/DaemonContext.java | 0
.../apache/commons/daemon/DaemonController.java | 0
.../apache/commons/daemon/DaemonInitException.java | 0
.../org/apache/commons/daemon/DaemonListener.java | 0
.../apache/commons/daemon/DaemonPermission.java | 0
.../apache/commons/daemon/DaemonUserSignal.java | 0
.../daemon/support/DaemonConfiguration.java | 0
.../commons/daemon/support/DaemonLoader.java | 0
.../commons/daemon/support/DaemonWrapper.java | 0
src/native/unix/CHANGES.txt | 8 +-
src/native/unix/INSTALL.txt | 16 +-
src/native/unix/Makedefs.in | 8 +-
src/native/unix/configure | 510 +++-------------
src/native/unix/configure.in | 21 +-
src/native/unix/man/jsvc.1.xml | 8 +
src/native/unix/native/arguments.c | 30 +-
src/native/unix/native/arguments.h | 6 +-
src/native/unix/native/debug.c | 19 +-
src/native/unix/native/help.c | 4 +-
src/native/unix/native/java.c | 23 +-
src/native/unix/native/jsvc-unix.c | 33 +-
src/native/unix/native/location.c | 24 +-
src/native/unix/native/version.h | 2 +-
src/native/unix/support/apjava.m4 | 150 ++---
src/native/unix/support/apsupport.m4 | 40 +-
src/native/unix/support/config.sub | 678 ++++++++++++++++-----
src/native/windows/apps/prunmgr/prunmgr.c | 11 +-
src/native/windows/apps/prunmgr/prunmgr.h | 2 +-
src/native/windows/apps/prunmgr/prunmgr.rc | 6 +-
src/native/windows/apps/prunsrv/prunsrv.c | 349 +++++++----
src/native/windows/apps/prunsrv/prunsrv.h | 2 +-
src/native/windows/apps/prunsrv/prunsrv.rc | 4 +-
src/native/windows/include/apxwin.h | 6 +-
src/native/windows/include/cmdline.h | 4 +-
src/native/windows/include/log.h | 10 +-
src/native/windows/src/cmdline.c | 119 ++--
src/native/windows/src/javajni.c | 59 +-
src/native/windows/src/log.c | 117 +++-
src/native/windows/src/private.h | 2 -
src/native/windows/src/registry.c | 26 -
src/native/windows/src/service.c | 31 +-
src/native/windows/src/utils.c | 43 +-
src/samples/Tomcat5.sh | 89 ---
src/samples/Tomcat7.sh | 235 -------
.../org/apache/commons/daemon/SimpleDaemon.java | 0
62 files changed, 1383 insertions(+), 1428 deletions(-)
diff --cc debian/changelog
index d0dfd4a,0000000..28496f9
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,271 -1,0 +1,278 @@@
++commons-daemon (1.0.8-1) unstable; urgency=low
++
++ * New upstream release:
++ - Refresh all patches.
++
++ -- Damien Raude-Morvan <drazzib at debian.org> 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 <drazzib at debian.org> 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 <drazzib at debian.org> 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 <drazzib at debian.org> 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 <drazzib at debian.org> Mon, 13 Jun 2011 19:25:17 +0200
+
+commons-daemon (1.0.5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> 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 <drazzib at debian.org> 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 <drazzib at debian.org> 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 <drazzib at debian.org> 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 <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
+
diff --cc debian/patches/arm_support.diff
index 8bbe7e7,0000000..4215b86
mode 100644,000000..100644
--- a/debian/patches/arm_support.diff
+++ b/debian/patches/arm_support.diff
@@@ -1,14 -1,0 +1,16 @@@
+Description: Add support for ARM/ARMel arch
+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
- @@ -80,6 +80,9 @@
++@@ -81,6 +81,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;;
diff --cc debian/patches/hppa_support.diff
index 3818bbf,0000000..ec42f71
mode 100644,000000..100644
--- a/debian/patches/hppa_support.diff
+++ b/debian/patches/hppa_support.diff
@@@ -1,22 -1,0 +1,25 @@@
+Description: Fix support for HPPA arch
+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
- @@ -107,14 +107,9 @@
++@@ -108,15 +108,9 @@
+ CFLAGS="$CFLAGS -DCPU=\\\"alpha\\\""
+ supported_os="alpha"
+ HOST_CPU=alpha;;
- - hppa2.0w)
- - CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0W\\\""
- - supported_os="hp-ux"
++- hppa2.0w|hppa64)
++- CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0W\\\" -DSO_EXT=\\\"sl\\\""
+- HOST_CPU=PA_RISC2.0W;;
++- hppa2.0n)
++- CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0N\\\" -DSO_EXT=\\\"sl\\\""
++- HOST_CPU=PA_RISC2.0N;;
+- hppa2.0)
- - CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0\\\""
- - supported_os="hp-ux"
++- CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0\\\" -DSO_EXT=\\\"sl\\\""
+- HOST_CPU=PA_RISC2.0;;
- + hppa)
+++ hppa*)
++ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
++ HOST_CPU=$host_cpu;;
+ mipsel)
+ CFLAGS="$CFLAGS -DCPU=\\\"mipsel\\\""
+ supported_os="mipsel"
diff --cc debian/patches/hurd_support.diff
index 892faf0,0000000..cc19d6f
mode 100644,000000..100644
--- a/debian/patches/hurd_support.diff
+++ b/debian/patches/hurd_support.diff
@@@ -1,17 -1,0 +1,19 @@@
+Description: Add support for Hurd OS
+Last-Update: 2010-08-03
+
++Index: b/src/native/unix/support/apsupport.m4
++===================================================================
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
- @@ -74,6 +74,11 @@
++@@ -75,6 +75,11 @@
+ supported_os="kfreebsd-gnu"
+ LIBS="$LIBS -ldl -lpthread"
+ ;;
++ 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/kfreebsd_support.diff
index 44e3bd9,0000000..4c4bd6b
mode 100644,000000..100644
--- a/debian/patches/kfreebsd_support.diff
+++ b/debian/patches/kfreebsd_support.diff
@@@ -1,18 -1,0 +1,20 @@@
+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
++Index: b/src/native/unix/support/apsupport.m4
++===================================================================
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
- @@ -69,6 +69,11 @@
++@@ -70,6 +70,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"])
diff --cc debian/patches/libgcj_PR31700.diff
index f8c1e38,0000000..d190c83
mode 100644,000000..100644
--- a/debian/patches/libgcj_PR31700.diff
+++ b/debian/patches/libgcj_PR31700.diff
@@@ -1,15 -1,0 +1,17 @@@
+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
++Index: b/src/native/unix/native/java.c
++===================================================================
+--- a/src/native/unix/native/java.c
++++ b/src/native/unix/native/java.c
- @@ -252,7 +252,7 @@
++@@ -245,7 +245,7 @@
+ return false;
+ }
+ #endif
+- arg.ignoreUnrecognized = FALSE;
++ arg.ignoreUnrecognized = JNI_TRUE;
+ 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/powerpcspe_support.diff
index f0c9e74,0000000..229ff05
mode 100644,000000..100644
--- a/debian/patches/powerpcspe_support.diff
+++ b/debian/patches/powerpcspe_support.diff
@@@ -1,13 -1,0 +1,15 @@@
+Description: Add support for powerpcspe arch
+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
- @@ -80,7 +80,7 @@
++@@ -81,7 +81,7 @@
+ ;;
+ esac
+ case $host_cpu in
+- powerpc)
++ powerpc*)
+ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
+ HOST_CPU=$host_cpu;;
+ sparc*)
diff --cc debian/patches/s390x_support.diff
index 3038b32,0000000..21337ff
mode 100644,000000..100644
--- a/debian/patches/s390x_support.diff
+++ b/debian/patches/s390x_support.diff
@@@ -1,13 -1,0 +1,13 @@@
+Index: b/src/native/unix/support/apsupport.m4
+===================================================================
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
- @@ -126,7 +126,7 @@
- CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\""
- supported_os="ia64"
- HOST_CPU=ia64;;
++@@ -143,7 +143,7 @@
++ HOST_CPU=ia64
++ fi
++ ;;
+- s390)
++ s390 | s390x)
+ CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
+ supported_os="s390"
+ HOST_CPU=s390;;
diff --cc debian/patches/sh4_support.diff
index b8b949c,0000000..99f8772
mode 100644,000000..100644
--- a/debian/patches/sh4_support.diff
+++ b/debian/patches/sh4_support.diff
@@@ -1,18 -1,0 +1,20 @@@
+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
++Index: b/src/native/unix/support/apsupport.m4
++===================================================================
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
- @@ -122,6 +122,9 @@
++@@ -140,6 +140,9 @@
+ CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
+ supported_os="s390"
+ HOST_CPU=s390;;
++ sh*)
++ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
++ HOST_CPU=$host_cpu;;
+ arm*)
+ CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
+ supported_os="arm"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-daemon.git
More information about the pkg-java-commits
mailing list