Package: release.debian.org Severity: minor User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package 'tupi' This is a minor update mainly to fix Hardening in plugins: Changelog: tupi (0.1+git12-7) unstable; urgency=low * xz compression for binary packages. * pass all required build flags to fix Hardening. * lintian-overrides for Hardening false-positives. See all the changes in the attached diff. unblock tupi/0.1+git12-7 Thank you. Regards, Dmitry.
diff --git a/debian/changelog b/debian/changelog
index 351dc08..cf4c6e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
+tupi (0.1+git12-7) unstable; urgency=low
+
+ * xz compression for binary packages.
+ * pass all required build flags to fix Hardening.
+ * lintian-overrides for Hardening false-positives.
+
+ -- Dmitry Smirnov <onlyjob@member.fsf.org> Fri, 31 Aug 2012 07:23:07 +1000
+
tupi (0.1+git12-6) unstable; urgency=low
* new patch for ruby1.9 compatibility (Closes: #676121)
* removed '©' characters from debian/copyright
diff --git a/debian/copyright b/debian/copyright
index 2f2231f..83fe56d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,9 +46,9 @@ Copyright: 1998-2005 Gilles Vollant
License: GPL-3+
Files: 3rdparty/quazip/zip.* 3rdparty/quazip/unzip.* 3rdparty/quazip/crypt.h
Copyright: 1998-2005 Gilles Vollant
-Copyright: 1999-2000 Info-ZIP
+ 1999-2000 Info-ZIP
License:
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
diff --git a/debian/rules b/debian/rules
index c39a567..6cbfaf4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,8 @@
PDIR := $(CURDIR)/debian/tupi
QM_FILES := $(patsubst %.ts, %.qm, $(wildcard src/shell/data/translations/*.ts))
-export LFLAGS= -Wl,--as-needed $(LDFLAGS)
-$(info LFLAGS=$(LFLAGS))
-
%:
dh $@
$(QM_FILES):
@@ -41,9 +38,12 @@ override_dh_auto_configure: $(QM_FILES)
--libdir=$(PDIR)/usr/lib/tupi \
--sharedir=$(PDIR)-data/usr/share/tupi \
--includedir=$(PDIR)-dev/usr/include/tupi
# force qmake-generated Makefiles to respect dpkg-provided flags
- perl -pi -e 'local $$/; $$_=<>; s{((CX?X?|L)FLAGS\s*)=}{$$1+=}g;' `find . -name Makefile`
+ perl -0pi -e 's[(CXXFLAGS\s*=)][$$1 $$ENV{CFLAGS} $$ENV{CPPFLAGS}]; \
+ s[(LFLAGS\s*=)][$$1 -Wl,--as-needed $$ENV{LDFLAGS}]; \
+ s[(CFLAGS\s*=)][$$1 $$ENV{CFLAGS} $$ENV{CPPFLAGS}];' \
+ $$(find . -name Makefile)
override_dh_auto_install:
dh_auto_install
$(RM) $(PDIR)/usr/share/man/man1/tupi.1.gz
@@ -64,6 +64,9 @@ override_dh_makeshlibs:
override_dh_strip:
dh_strip -v --dbg-package=tupi-dbg
+override_dh_builddeb:
+ dh_builddeb -- -Zxz
+
get-orig-source:
uscan --noconf --verbose --force-download --rename --repack --destdir=. --download-current-version
diff --git a/debian/tupi.lintian-overrides b/debian/tupi.lintian-overrides
new file mode 100644
index 0000000..b1295fd
--- /dev/null
+++ b/debian/tupi.lintian-overrides
@@ -0,0 +1,4 @@
+## false-positives:
+hardening-no-fortify-functions usr/lib/tupi/bin/tupi.bin
+hardening-no-fortify-functions usr/lib/tupi/libtupi.so.1.0.0
+hardening-no-fortify-functions usr/lib/tupi/libtupifwgui.so.1.0.0
Attachment:
signature.asc
Description: This is a digitally signed message part.