Package: httrack
Version: 3.44.1-4
Severity: important
Tags: patch

Please enabled hardened build flags through dpkg-buildflags.

Patch attached. (dpkg-buildflags abides "noopt" from DEB_BUILD_OPTIONS)

Cheers,
        Moritz
diff -aur httrack-3.44.1.harden/debian/rules httrack-3.44.1/debian/rules
--- httrack-3.44.1.harden/debian/rules	2012-01-25 18:32:48.000000000 +0100
+++ httrack-3.44.1/debian/rules	2012-01-25 18:34:09.000000000 +0100
@@ -12,12 +12,13 @@
 	CFLAGS += -DNOSTRDEBUG
 endif
 
+DEB_CFLAGS_MAINT_APPEND=-O3
+
 # DEB_BUILD_OPTIONS flags
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g3 -O0
-else
-	CFLAGS += -g -O3
+	CFLAGS += -g3
 endif
+
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
@@ -32,7 +33,7 @@
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--mandir=\$${prefix}/share/man \
 		--sysconfdir=/etc \
-		CFLAGS="$(CFLAGS)"
+		$(shell dpkg-buildflags --export=configure)
 
 	touch configure-stamp
 
Nur in httrack-3.44.1/debian: rules~.
diff -aur httrack-3.44.1.harden/src/htslib.c httrack-3.44.1/src/htslib.c
--- httrack-3.44.1.harden/src/htslib.c	2011-02-28 15:48:53.000000000 +0100
+++ httrack-3.44.1/src/htslib.c	2012-01-25 18:39:12.000000000 +0100
@@ -4297,7 +4297,7 @@
     break;
     default:
       if (nl)
-        fprintf(fp,prefix);
+         fprintf(fp,"%s", prefix);
       nl=0;
       fputc(*buff,fp);
     }
Nur in httrack-3.44.1/src: htslib.c~.

Reply via email to