r45419 - in /packages/rheolef/trunk/debian: changelog copyright rules

[saramito-guest at users.alioth.debian.org]

Author: saramito-guest
Date: Fri Oct 19 18:21:26 2012
New Revision: 45419

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45419
Log:
add security compiler flags; update package deps (close: #690766)

Modified:
    packages/rheolef/trunk/debian/changelog
    packages/rheolef/trunk/debian/copyright
    packages/rheolef/trunk/debian/rules

Modified: packages/rheolef/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/changelog?rev=45419&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/changelog (original)
+++ packages/rheolef/trunk/debian/changelog Fri Oct 19 18:21:26 2012
@@ -3,18 +3,14 @@
   * New upstream release 6.3 (minor changes):
     - configure script improved (portability increased)
     - minor bug fixes
+  * rules: add security compiler flags (hardening and -W,-l,relro)
+  * copyright: various file format fixes
 
  -- Pierre Saramito <pierre.saramito at imag.fr>  Wed, 19 Oct 2012 14:56:11 +0200
 
-rheolef (6.2-2) experimental; urgency=low
-
-  * control: update package dependencies (add g++)
-
- -- Pierre Saramito <pierre.saramito at imag.fr>  Wed, 17 Oct 2012 17:27:52 +0200
-
 rheolef (6.1-3) unstable; urgency=low
 
-  * control: control update package dependencies (backport from 6.2-1 version)
+  * control: update package dependencies (closes: #690766)
 
  -- Pierre Saramito <pierre.saramito at imag.fr>  Wed, 17 Oct 2012 12:41:17 +0200
 

Modified: packages/rheolef/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/copyright?rev=45419&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/copyright (original)
+++ packages/rheolef/trunk/debian/copyright Fri Oct 19 18:21:26 2012
@@ -1,7 +1,7 @@
-Format-Specification: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Name: Rheolef
-Maintainer: Pierre Saramito <pierre.saramito at imag.fr>
-Source: http://download.gna.org/rheolef/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Rheolef
+Upstream-Contact: Pierre Saramito <Pierre.Saramito at imag.fr>
+Source: http://www-ljk.imag.fr/membres/Pierre.Saramito/rheolef
 Copyright: 1999-2010, Pierre Saramito <Pierre.Saramito at imag.fr>
 License: GPL-2
  	On Debian systems, the complete text of the GNU General Public
@@ -46,9 +46,7 @@
        	The author may be contacted via <http://www.dmalloc.com/>.
 
 
-Files: doc/todo/a4.sty
-       doc/todo/a4wide.sty
-       doc/usrman/a4.sty
+Files: doc/usrman/a4.sty
        doc/usrman/a4wide.sty
        doc/usrman/index.sty
 	    Style option `A4' to be used with LaTeX V2.09

Modified: packages/rheolef/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/rules?rev=45419&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/rules (original)
+++ packages/rheolef/trunk/debian/rules Fri Oct 19 18:21:26 2012
@@ -22,13 +22,12 @@
 RHEOLEF_RUNTIME=rheolef
 
 TMPDIR=debian/tmp-rheolef
-CFLAGS = -Wall -g
+CXXFLAGS = -D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security
+LDFLAGS = -Wl,-z,relro
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
 	CXXFLAGS += -O0
 else
-	CFLAGS += -O3
 	CXXFLAGS += -O3
 endif
 
@@ -44,7 +43,8 @@
 	echo 'shlibs:Depends=libc6 (>= 2.7-1), libgcc1 (>= 1:4.3.1-9), libstdc++6 (>= 4.3.1-9)' >  debian/$(LIBRHEOLEF).substvars
 	dh_testdir
 	./bootstrap
-	CC=gcc CXX=g++ ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --disable-optim --enable-debian-packaging --enable-fast-install
+
+	CXX=g++ CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --disable-optim --enable-debian-packaging --enable-fast-install
 	touch configure-stamp
 
 build: build-arch build-indep