[med-svn] r15363 - in trunk/packages/ugene/trunk/debian: . patches

[Olivier Sallou]

Author: osallou
Date: 2013-11-30 11:55:55 +0000 (Sat, 30 Nov 2013)
New Revision: 15363

Modified:
   trunk/packages/ugene/trunk/debian/control
   trunk/packages/ugene/trunk/debian/patches/hardening.patch
   trunk/packages/ugene/trunk/debian/patches/use_debian_sqlite.patch
   trunk/packages/ugene/trunk/debian/rules
Log:
set hardening rules to remove lintian warnings

Modified: trunk/packages/ugene/trunk/debian/control
===================================================================
--- trunk/packages/ugene/trunk/debian/control	2013-11-30 09:25:41 UTC (rev 15362)
+++ trunk/packages/ugene/trunk/debian/control	2013-11-30 11:55:55 UTC (rev 15363)
@@ -13,7 +13,8 @@
                debhelper (>= 9),
                libxtst-dev,
                libsqlite3-dev,
-               libprocps1-dev|libprocps-dev
+               libprocps1-dev|libprocps-dev,
+               hardening-includes 
 Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/ugene/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/ugene/trunk/

Modified: trunk/packages/ugene/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/ugene/trunk/debian/patches/hardening.patch	2013-11-30 09:25:41 UTC (rev 15362)
+++ trunk/packages/ugene/trunk/debian/patches/hardening.patch	2013-11-30 11:55:55 UTC (rev 15363)
@@ -1,17 +1,27 @@
+Subject: patch qmake for hardening
+Author: Olivier Sallou <osallou at debian.org>
+Description: add QMAKE flags to add hardening
+Last-Updated: 2013-11-30
+Forwarded: no
 --- a/src/ugene_globals.pri
 +++ b/src/ugene_globals.pri
-@@ -7,6 +7,10 @@ DEFINES+=UGENE_VER_MAJOR=$${UGENE_VER_MA
+@@ -7,6 +7,15 @@
  DEFINES+=UGENE_VER_MINOR=$${UGENE_VER_MINOR}
  DEFINES+=UGENE_VER_PATCH=$${UGENE_VER_PATCH}
  
 +CFLAGS += $(CFLAGS)
 +CXXFLAGS += $(CXXFLAGS)
 +LDFLAGS += $(LDFLAGS)
++CPPFLAGS:=$(CPPFLAGS)
 +
++QMAKE_CXXFLAGS += $$(CXXFLAGS)
++QMAKE_CFLAGS += $$(CFLAGS)
++QMAKE_LFLAGS += $$(LDFLAGS)
++
  #win32 : CONFIG -= flat  #group the files within the source/header group depending on the directory they reside in file system
  win32 : QMAKE_CXXFLAGS += /MP # use parallel build with nmake
  win32 : DEFINES+= _WINDOWS
-@@ -133,4 +137,4 @@ defineTest( exclude_list_enabled ) {
+@@ -133,4 +142,4 @@
  defineTest( without_non_free ) {
      contains( UGENE_WITHOUT_NON_FREE, 1 ) : return (true)
      return (false)

Modified: trunk/packages/ugene/trunk/debian/patches/use_debian_sqlite.patch
===================================================================
--- trunk/packages/ugene/trunk/debian/patches/use_debian_sqlite.patch	2013-11-30 09:25:41 UTC (rev 15362)
+++ trunk/packages/ugene/trunk/debian/patches/use_debian_sqlite.patch	2013-11-30 11:55:55 UTC (rev 15363)
@@ -1,7 +1,9 @@
 Author: Andreas Tille <tille at debian.org>
+Subject: Manage embedded sqlite3 library
 Description: Tried to use Debian packages sqlite3
  but failed because package does not build that way
-
+Forwarded: no
+Last-Updated: 2013-11-30
 --- a/ugene.pro
 +++ b/ugene.pro
 @@ -8,7 +8,6 @@ use_bundled_zlib() {

Modified: trunk/packages/ugene/trunk/debian/rules
===================================================================
--- trunk/packages/ugene/trunk/debian/rules	2013-11-30 09:25:41 UTC (rev 15362)
+++ trunk/packages/ugene/trunk/debian/rules	2013-11-30 11:55:55 UTC (rev 15363)
@@ -2,6 +2,21 @@
 
 export DH_OPTIONS
 
+export DEB_BUILD_HARDENING=1
+export DEB_BUILD_HARDENING_FORTIFY=1
+
+include /usr/share/hardening-includes/hardening.make
+
+CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+
+#CFLAGS+=$(HARDENING_CFLAGS)
+#CXXFLAGS+=$(HARDENING_CXXFLAGS)
+#LDFLAGS+=$(HARDENING_LDFLAGS)
+
+
 UPSTREAM_NAME=ugene
 pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')