The following commit has been merged in the master branch: commit 898f9b6f8ffc0a22171fc3519229f73a4411be7b Author: Vincent Legout <vinc...@legout.info> Date: Tue Mar 27 19:51:44 2012 +0200
debhelper 9, enable hardening flags diff --git a/debian/changelog b/debian/changelog index d9538d5..f993d66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ grhino (0.16.1-2) unstable; urgency=low * Update manpages section from 1 to 6. Rename grhino.1 and gtp-rhino.1 to grhino.6 and gtp-rhino.6. * Standards-Version 3.9.3 (No changes needed) + * Use debhelper 9 + * Enable hardening flags in debian/rules + - Add 02_hardening_flags.patch: Fix build with -Werror=format-security -- Vincent Legout <vleg...@debian.org> Tue, 27 Mar 2012 19:23:07 +0200 diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 8c679b9..2bf31ab 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Uploaders: Vincent Legout <vleg...@debian.org> -Build-Depends: debhelper (>= 8), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev, imagemagick, scrollkeeper +Build-Depends: debhelper (>= 9), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev, imagemagick, scrollkeeper Standards-Version: 3.9.3 Homepage: http://rhino.sourceforge.net/ Vcs-Git: git://git.debian.org/git/pkg-games/grhino.git diff --git a/debian/patches/02_hardening_flags.patch b/debian/patches/02_hardening_flags.patch new file mode 100644 index 0000000..ed146f3 --- /dev/null +++ b/debian/patches/02_hardening_flags.patch @@ -0,0 +1,16 @@ +Description: Fix build with -Werror=format-security +Author: Vincent Legout <vleg...@debian.org> +Last-Update: 2012-03-27 + +Index: grhino/gutil.cc +=================================================================== +--- grhino.orig/gutil.cc 2012-03-27 19:14:52.759014821 +0200 ++++ grhino/gutil.cc 2012-03-27 19:45:46.490973483 +0200 +@@ -27,6 +27,7 @@ + { + GtkWidget *dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, ++ "%s", + bufstr.str().c_str()); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); diff --git a/debian/patches/series b/debian/patches/series index eec3602..b06d5c7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01_dirname_no_version.diff +02_hardening_flags.patch diff --git a/debian/rules b/debian/rules index 92fff88..879b7bd 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,6 @@ #!/usr/bin/make -f -LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) -LDFLAGS += -Wl,-z,defs -Wl,--as-needed -export LDFLAGS +export DEB_BUILD_MAINT_OPTIONS = hardening=+all TOSAVE := po/Makefile po/Makefile.in po/remove-potcdate.sed -- Packaging for grhino _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits