Bug#759565: service-wrapper: new upstream release available

[tony mancill]

On Thu, Aug 28, 2014 at 03:21:03PM +, Kill Your TV wrote:
> Package: service-wrapper
> Severity: wishlist
> Tags: patch
> 
> It would be nice to have Jessie released with a newer service-wrapper
> package. Please consider updating to the latest stable release (3.5.25).
> 
> Attached is a patch against the 3.5.22 service-wrapper packaging.
> 
> Due to hardening-wrapper's obsolescence, I have patched the Makefiles*
> to add the LDFLAGS variable so that the proper hardening build flags can
> be set. Once upstream fixes this problem this patch can be dropped.
> 
> In case it would be easier to deal with this request, I created a
> repository on github for this package. My changes can be found at
> https://github.com/kytvi2p/service-wrapper-java.git in the
> master-3.5.25 branch.

Hello,

thank you for the update!  I am uploading to unstable.

Cheers,
tony

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#759565: service-wrapper: new upstream release available

[Kill Your TV]

Package: service-wrapper
Severity: wishlist
Tags: patch

It would be nice to have Jessie released with a newer service-wrapper
package. Please consider updating to the latest stable release (3.5.25).

Attached is a patch against the 3.5.22 service-wrapper packaging.

Due to hardening-wrapper's obsolescence, I have patched the Makefiles*
to add the LDFLAGS variable so that the proper hardening build flags can
be set. Once upstream fixes this problem this patch can be dropped.

In case it would be easier to deal with this request, I created a
repository on github for this package. My changes can be found at
https://github.com/kytvi2p/service-wrapper-java.git in the
master-3.5.25 branch.


From 64c11ee6995a9e916ce47f8d40a6fd2dcf341d59 Mon Sep 17 00:00:00 2001
From: Kill Your TV 
Date: Thu, 28 Aug 2014 14:31:04 +
Subject: [PATCH] Update packaging for 3.5.25

---
 debian/changelog   |  18 
 debian/control |   5 +-
 debian/patches/0002-kfreebsd-support.patch |  39 ---
 debian/patches/0003-additional-makefiles.patch |  34 +++---
 debian/patches/0004-ldflags.patch  | 143 +
 debian/patches/bashisms_690722.patch   |   6 +-
 debian/patches/series  |   1 +
 debian/rules   |   3 +-
 8 files changed, 213 insertions(+), 36 deletions(-)
 create mode 100644 debian/patches/0004-ldflags.patch

diff --git a/debian/changelog b/debian/changelog
index 4822949..c6f649a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+service-wrapper-java (3.5.25-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * debian/control
+- add java7-runtime-headless as an alternate to satisfy the java
+  dependencies
+- drop build dependency on hardening-wrapper as this package is now
+  obsolete.
+- build depend on  libcunit1-ncurses-dev, libncurses5-dev
+  * hardening
+- Add ldflags.patch to insert a LDFLAGS variable into the upstream
+  makefiles so that hardening LDFLAGS can be used in the build. As noted
+  above, hardening-wrapper is no longer used as it's obsolete.
+- Update additional-makefiles.patch and kfreebsd-support.patch to add the
+  LDFLAGS variable
+
+ -- Kill Your TV   Thu, 28 Aug 2014 13:24:16 +
+
 service-wrapper-java (3.5.22-3) unstable; urgency=low
 
   * Correct bug number typo in previous upload.
diff --git a/debian/control b/debian/control
index 9ba5061..ad9917b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends: debhelper (>= 9),
  ant-optional,
  junit,
  junit4,
- hardening-wrapper
+ libcunit1-ncurses-dev,
+ libncurses5-dev
 Standards-Version: 3.9.5
 Vcs-Git: git://git.debian.org/git/pkg-java/service-wrapper-java.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/service-wrapper-java.git
@@ -48,7 +49,7 @@ Description:Jar daemon wrapper java libraries
 Package: libservice-wrapper-jni
 Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc mips mipsel
 Depends: ${shlibs:Depends}, ${misc:Depends},
- default-jre-headless | java5-runtime-headless | java6-runtime-headless
+ default-jre-headless | java5-runtime-headless | java6-runtime-headless | java7-runtime-headless
 Suggests: libservice-wrapper-doc
 Description:Jar daemon wrapper JNI libraries
  This Package contains the JNI libraries used by the Java Service Wrapper.
diff --git a/debian/patches/0002-kfreebsd-support.patch b/debian/patches/0002-kfreebsd-support.patch
index 45079f9..a1dc9ad 100644
--- a/debian/patches/0002-kfreebsd-support.patch
+++ b/debian/patches/0002-kfreebsd-support.patch
@@ -6,12 +6,14 @@ Subject: kfreebsd support
  build.xml   |  5 -
  src/c/Makefile-kfreebsd-x86-32.make | 42 +
  src/c/Makefile-kfreebsd-x86-64.make | 42 +
- src/c/logger.c  |  2 +-
+ src/c/logger.c  |  3 ++-
  src/c/wrapper.c |  6 --
- 5 files changed, 93 insertions(+), 4 deletions(-)
+ 5 files changed, 94 insertions(+), 4 deletions(-)
  create mode 100644 src/c/Makefile-kfreebsd-x86-32.make
  create mode 100644 src/c/Makefile-kfreebsd-x86-64.make
 
+diff --git a/build.xml b/build.xml
+index fa2c6d5..5206ccf 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -87,6 +87,9 @@
@@ -33,6 +35,9 @@ Subject: kfreebsd support
  
  
  
+diff --git a/src/c/Makefile-kfreebsd-x86-32.make b/src/c/Makefile-kfreebsd-x86-32.make
+new file mode 100644
+index 000..a70e660
 --- /dev/null
 +++ b/src/c/Makefile-kfreebsd-x86-32.make
 @@ -0,0 +1,42 @@
@@ -53,7 +58,7 @@ Subject: kfreebsd support
 +
 +wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c
 +
-+libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wr