Author: nthykier
Date: 2012-04-25 09:28:41 +0000 (Wed, 25 Apr 2012)
New Revision: 15994
Modified:
trunk/jetty/debian/changelog
trunk/jetty/debian/control
trunk/jetty/debian/copyright
trunk/jetty/debian/rules
Log:
Enable hardening flags and update d/copyright
Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog 2012-04-25 09:12:11 UTC (rev 15993)
+++ trunk/jetty/debian/changelog 2012-04-25 09:28:41 UTC (rev 15994)
@@ -3,6 +3,8 @@
* New upstream release.
- Fixes issues with loading javax.activation.
(Closes: #594913)
+ * Enable hardening flags for the setuid.so file.
+ * Updated d/copyright to DEP-5 format 1.0.
-- Niels Thykier <ni...@thykier.net> Wed, 25 Apr 2012 11:06:04 +0200
Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control 2012-04-25 09:12:11 UTC (rev 15993)
+++ trunk/jetty/debian/control 2012-04-25 09:28:41 UTC (rev 15994)
@@ -8,7 +8,8 @@
Build-Depends: debhelper (>= 7), cdbs (>> 0.4.5.3), default-jdk, ant-optional,
maven-repo-helper,
libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java,
libgnujaf-java, libcommons-daemon-java, junit,
libgeronimo-jta-1.0.1b-spec-java,
- libtomcat6-java, default-jdk-doc, libgnumail-java-doc, libservlet2.5-java-doc
+ libtomcat6-java, default-jdk-doc, libgnumail-java-doc, libservlet2.5-java-doc,
+ dpkg-dev (>= 1.16.1~)
Standards-Version: 3.8.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jetty
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jetty
Modified: trunk/jetty/debian/copyright
===================================================================
--- trunk/jetty/debian/copyright 2012-04-25 09:12:11 UTC (rev 15993)
+++ trunk/jetty/debian/copyright 2012-04-25 09:28:41 UTC (rev 15994)
@@ -1,6 +1,6 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Jetty
-Maintainer: Mortbay Consulting
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Jetty
+Upstream-Contact: Mortbay Consulting
Source: http://jetty.mortbay.com/
Files: *
@@ -27,22 +27,22 @@
Copyright: 2005-2006, The Apache Software Foundation
License: Apache-2.0
-Files: extras/gwt/src/main/java/org/mortbay/gwt/AsyncRemoteServiceServlet.java,
+Files: extras/gwt/src/main/java/org/mortbay/gwt/AsyncRemoteServiceServlet.java
extras/gwt/src/main/java/com/google/gwt/user/server/rpc/OpenRemoteServiceServlet.java
Copyright: 2006, Google Inc
-Copyright: 2006, Craig Day <cr...@alderaan.com.au>
+ 2006, Craig Day <cr...@alderaan.com.au>
License: Apache-2.0
Files: modules/jetty/src/main/java/org/mortbay/jetty/security/UnixCrypt.java
Copyright: 1996, Aki Yoshida,
-Copyright: 2001, Iris Van den Broeke, Daniel Deville.
+ 2001, Iris Van den Broeke, Daniel Deville.
License: other
Permission to use, copy, modify and distribute this software
for non-commercial or commercial purposes and without fee is
hereby granted provided that this copyright notice appears in
all copies.
-Files:
modules/jetty/src/test/java/org/mortbay/jetty/servlet/SessionManagerTest.java,
+Files:
modules/jetty/src/test/java/org/mortbay/jetty/servlet/SessionManagerTest.java
modules/util/src/main/java/org/mortbay/servlet/ThrottlingFilter.java
Copyright: 2006, Tim Vernum
License: Apache-2.0
@@ -61,8 +61,8 @@
Files: debian/*
Copyright: 2003, Philipp Meier <me...@meisterbohne.de>
-Copyright: 2009, Ludovic Claude <ludovic.cla...@laposte.net>
-Copyright: 2009, David Yu <david.yu....@gmail.com>
+ 2009, Ludovic Claude <ludovic.cla...@laposte.net>
+ 2009, David Yu <david.yu....@gmail.com>
License: Apache-2.0
License: Apache-2.0
Modified: trunk/jetty/debian/rules
===================================================================
--- trunk/jetty/debian/rules 2012-04-25 09:12:11 UTC (rev 15993)
+++ trunk/jetty/debian/rules 2012-04-25 09:28:41 UTC (rev 15994)
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/buildflags.mk
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
@@ -43,7 +45,8 @@
cd extras/setuid && javah -d modules/native/target/generated -classpath
../../lib/ext/jetty-setuid-$(VERSION).jar org.mortbay.setuid.SetUID
lib/ext/libsetuid.so:
extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.h
- cd extras/setuid && gcc -I$(JAVA_HOME)/include/
-I$(JAVA_HOME)/include/linux/ \
+ cd extras/setuid && gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \
+ -I$(JAVA_HOME)/include/ -I$(JAVA_HOME)/include/linux/ \
-shared
modules/native/target/generated/org_mortbay_setuid_SetUID.c -fPIC -O \
-o ../../lib/ext/libsetuid.so
@@ -55,7 +58,7 @@
dh_link -plib$(PACKAGE)-extra /usr/lib/jetty/libsetuid.so
/usr/share/jetty/lib/ext/libsetuid.so
clean::
- $(RM) -r debian/.mh
+ mh_clean
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
