The following commit has been merged in the master branch:
commit a3d3f3a79f6b9438fc130fc5461da8be83777a0a
Merge: 57b8e44ad49ce2fa02141cf402af687e859def9b
faecfefd166b85e53a4718aae7d3a0664a03630f
Author: Hideki Yamane <[email protected]>
Date: Thu Jul 19 07:12:55 2012 +0900
Imported Debian patch 0.7.1+trunk95-1
diff --combined debian/changelog
index 62f0581,447b569..3e63351
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,9 +1,22 @@@
-nailgun (0.7.1+trunk95-1) UNRELEASED; urgency=low
++nailgun (0.7.1+trunk95-1) unstable; urgency=medium
+
+ * Taken from Subversion repository
-
- -- Hideki Yamane <[email protected]> Sun, 08 Jul 2012
12:08:44 -0600
++ * debian/control
++ - update to "Standard-Version: 3.9.3"
++ - update my e-mail address
++ - set "Build-Depends: debhelper (>= 9)" to enable hardening
++ * debian/patches
++ - refresh all two patches
++ - add "name_define_as_ng-nailgun_ng.c.patch" to avoid
++ ClassNotFoundException (Closes: LP#793859)
++ - add "Makefile_enable_hardening.patch" to enable hardening
++ * debian/rules
++ - enable hardening
++ * debian/compat
++ - set 9 to enable hardening
++
++ -- Hideki Yamane <[email protected]> Thu, 19 Jul 2012 07:12:55 +0900
+
nailgun (0.7.1-3) unstable; urgency=low
* Team upload.
diff --combined debian/compat
index 7f8f011,7f8f011..ec63514
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,1 +1,1 @@@
--7
++9
diff --combined debian/control
index 0c9515f,0c9515f..c4e2b47
--- a/debian/control
+++ b/debian/control
@@@ -2,11 -2,11 +2,11 @@@ Source: nailgu
Section: java
Priority: extra
Maintainer: Debian Java Maintainers
<[email protected]>
--Uploaders: Hideki Yamane (Debian-JP) <[email protected]>,
++Uploaders: Hideki Yamane <[email protected]>,
Torsten Werner <[email protected]>
--Build-Depends: debhelper (>= 7.0.50~), ant, ant-optional, default-jdk,
++Build-Depends: debhelper (>= 9), ant, ant-optional, default-jdk,
libcobertura-java, junit
--Standards-Version: 3.8.4
++Standards-Version: 3.9.3
Homepage: http://martiansoftware.com/nailgun/
Vcs-Git: git://git.debian.org/pkg-java/nailgun.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/nailgun.git
diff --combined debian/copyright
index 8da111b,8da111b..74e7213
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,14 -1,14 +1,17 @@@
--Format-Specification: http://dep.debian.net/deps/dep5/
--Name: nailgun
--Maintainer: Martian Software, Inc
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: nailgun
++Upstream-Contact: Martian Software, Inc
Source: http://sourceforge.net/projects/nailgun/files/nailgun/
Files: *
Copyright: 2004, Martian Software, Inc
License: Apache-2
++ On Debian systems, the full text of the Apache License version 2.0
++ can be found in the file `/usr/share/common-licenses/Apache-2.0'.
++
Files: debian/*
--Copyright: 2010, Hideki Yamane (Debian-JP) <[email protected]>
++Copyright: 2010-2012, Hideki Yamane <[email protected]>
2010, Torsten Werner <[email protected]>
License: GPL-3+
On Debian systems, the full text of the GNU General Public License version 3
diff --combined debian/patches/0001-update-build.xml-for-cobertura.patch
index edb8011,edb8011..10dfb38
--- a/debian/patches/0001-update-build.xml-for-cobertura.patch
+++ b/debian/patches/0001-update-build.xml-for-cobertura.patch
@@@ -7,10 -7,10 +7,10 @@@ Subject: [PATCH] update build.xml for c
build.xml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
--diff --git a/build.xml b/build.xml
--index cfaef04..0e34455 100644
----- a/build.xml
--+++ b/build.xml
++Index: nailgun-0.7.1+trunk95/build.xml
++===================================================================
++--- nailgun-0.7.1+trunk95.orig/build.xml 2009-05-22 19:34:14.000000000
-0600
+++++ nailgun-0.7.1+trunk95/build.xml 2012-07-09 09:40:27.173082955 -0600
@@ -45,8 +45,13 @@
<!-- declare the jcoverage tasks -->
@@@ -27,7 -27,7 +27,7 @@@
</fileset>
</path>
<taskdef resource="tasks.properties">
--@@ -132,13 +137,13 @@
++@@ -134,13 +139,13 @@
<target name="instrument" depends="compile-server">
<mkdir dir="${build.instrumented}"/>
@@@ -43,7 -43,7 +43,7 @@@
<copy todir="${build.instrumented}">
<fileset dir="${src.java.prod}" excludes="**/*.class"/>
</copy>
--@@ -179,7 +184,7 @@
++@@ -181,7 +186,7 @@
<report format="frames" todir="${docs.junit}"/>
</junitreport>
@@@ -52,11 -52,11 +52,3 @@@
</target>
<target name="jar" depends="test">
--@@ -226,4 +231,4 @@
-- <zipfileset dir="dist" prefix="nailgun-${version}"
includes="${jar},${jar.examples}"/>
-- </zip>
-- </target>
---</project>
--\ No newline at end of file
--+</project>
----
diff --combined debian/patches/0002-update-build.xml-disable-junitreport.patch
index f51b51e,f51b51e..d6a446f
--- a/debian/patches/0002-update-build.xml-disable-junitreport.patch
+++ b/debian/patches/0002-update-build.xml-disable-junitreport.patch
@@@ -1,5 -1,5 +1,7 @@@
----- a/build.xml
--+++ b/build.xml
++Index: nailgun-0.7.1+trunk95/build.xml
++===================================================================
++--- nailgun-0.7.1+trunk95.orig/build.xml 2012-07-09 09:40:27.173082955
-0600
+++++ nailgun-0.7.1+trunk95/build.xml 2012-07-09 09:41:04.181082177 -0600
@@ -64,6 +64,7 @@
<delete dir="dist"/>
<delete file="ng"/>
@@@ -8,7 -8,7 +10,7 @@@
</target>
<!-- updates version numbers in client and server code
--@@ -176,13 +177,15 @@
++@@ -178,13 +179,15 @@
</fileset>
</batchtest>
</junit>
diff --combined debian/patches/Makefile_enable_hardening.patch
index 0000000,0000000..c8ff636
new file mode 100644
--- /dev/null
+++ b/debian/patches/Makefile_enable_hardening.patch
@@@ -1,0 -1,0 +1,30 @@@
++Description: hardening patch
++ Just remove some variables to enable hardening
++Author: Hideki Yamane <[email protected]>
++
++---
++Origin: vendor
++Forwarded: no
++Last-Update: 2012-07-18
++
++Index: nailgun-0.7.1+trunk95/Makefile
++===================================================================
++--- nailgun-0.7.1+trunk95.orig/Makefile 2012-07-19 07:35:11.000000000
+0900
+++++ nailgun-0.7.1+trunk95/Makefile 2012-07-19 07:47:44.933349906 +0900
++@@ -7,14 +7,11 @@
++ # Your compiler location may vary.
++ WIN32_CC=/usr/bin/i586-mingw32msvc-gcc
++
++-CC=gcc
++-CFLAGS=-Wall -pedantic -s -O3
++-
++ ng: src/c/ng.c
++ @echo "Building ng client. To build a Windows binary, type 'make
ng.exe'"
++- ${CC} ${CFLAGS} -o ng src/c/ng.c
+++ ${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ng src/c/ng.c
++
++-ng.exe: src/c/ng.c
+++ng.exe: src/c/ng.c,/usr/bin/i586-mingw32msvc-gcc
++ ${WIN32_CC} -o ng.exe src/c/ng.c -lwsock32 -O3 ${CFLAGS}
++ # any idea why the command line is so sensitive to the order of
++ # the arguments? If CFLAGS is at the beginning, it won't link.
diff --combined debian/patches/name_define_as_ng-nailgun_ng.c.patch
index 0000000,0000000..0f96af2
new file mode 100644
--- /dev/null
+++ b/debian/patches/name_define_as_ng-nailgun_ng.c.patch
@@@ -1,0 -1,0 +1,37 @@@
++Description: avoid "java.lang.ClassNotFoundException: ng-nailgun" error
++ nailgun expect to be called as ng but we install it as ng-nailgun.
++ This patch will define client name as ng-nailgun and get no error with that.
++
++Author: Hideki Yamane <[email protected]>
++
++---
++Origin: vendor
++Bug-Ubuntu: https://launchpad.net/bugs/793859
++Forwarded: no
++Last-Update: 2012-07-09
++
++Index: nailgun-0.7.1+trunk95/src/c/ng.c
++===================================================================
++--- nailgun-0.7.1+trunk95.orig/src/c/ng.c 2012-07-09 10:24:55.000000000
-0600
+++++ nailgun-0.7.1+trunk95/src/c/ng.c 2012-07-09 10:40:52.572583405 -0600
++@@ -74,7 +74,7 @@
++ #define NAILGUN_CLIENT_NAME_EXE "ng.exe"
++
++ #define NAILGUN_PORT_DEFAULT "2113"
++-#define NAILGUN_CLIENT_NAME "ng"
+++#define NAILGUN_CLIENT_NAME "ng-nailgun"
++ #define CHUNK_HEADER_LEN (5)
++
++ #define NAILGUN_SOCKET_FAILED (231)
++@@ -511,9 +511,9 @@
++ */
++ void usage(int exitcode) {
++ fprintf(stderr, "NailGun v%s\n\n", NAILGUN_VERSION);
++- fprintf(stderr, "Usage: ng class [--nailgun-options] [args]\n");
+++ fprintf(stderr, "Usage: ng-nailgun class [--nailgun-options] [args]\n");
++ fprintf(stderr, " (to execute a class)\n");
++- fprintf(stderr, " or: ng alias [--nailgun-options] [args]\n");
+++ fprintf(stderr, " or: ng-nailgun alias [--nailgun-options] [args]\n");
++ fprintf(stderr, " (to execute an aliased class)\n");
++ fprintf(stderr, " or: alias [--nailgun-options] [args]\n");
++ fprintf(stderr, " (to execute an aliased class, where
\"alias\"\n");
diff --combined debian/patches/series
index 4aea8a7,addba82..74fd773
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,2 +1,4 @@@
-#0001-update-build.xml-for-cobertura.patch
-#0002-update-build.xml-disable-junitreport.patch
+0001-update-build.xml-for-cobertura.patch
+0002-update-build.xml-disable-junitreport.patch
++name_define_as_ng-nailgun_ng.c.patch
++Makefile_enable_hardening.patch
diff --combined debian/rules
index f7b9877,f7b9877..cdad850
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,6 +1,8 @@@
#!/usr/bin/make -f
#export DH_VERBOSE=1
++export DEB_BUILD_MAINT_OPTIONS := hardening=+all
++
%:
dh $@
--
client, protocol, and server for running Java programs from CLI
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
