[libtcl-perl] 01/01: Fix FTBFS

[Julián Moreno Patiño]

This is an automated email from the git hooks/post-receive script.

jump-guest pushed a commit to branch master
in repository libtcl-perl.

commit 6c2d74349ff5f5d448d631dd58b567ddbc0c6425
Author: Julián Moreno Patiño <julian at debian.org>
Date:   Tue Jun 24 23:26:57 2014 -0500

    Fix FTBFS
---
 debian/changelog                         |  8 +++++
 debian/patches/fix_hardening_FTBFS.patch | 60 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 69 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 908d145..ffd2111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libtcl-perl (1.02+ds-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add patch to pass format string as %s to allow for compiling with
+    hardnening options (Closes: #752587)
+
+ -- Julián Moreno Patiño <julian at debian.org>  Tue, 24 Jun 2014 22:36:51 -0500
+
 libtcl-perl (1.02+ds-1) unstable; urgency=low
 
   * Initial release.
diff --git a/debian/patches/fix_hardening_FTBFS.patch b/debian/patches/fix_hardening_FTBFS.patch
new file mode 100644
index 0000000..232aa01
--- /dev/null
+++ b/debian/patches/fix_hardening_FTBFS.patch
@@ -0,0 +1,60 @@
+Description: Use %s as a formatting string to
+ compile with -Werror=format-security for hardening purposes
+Bug-Debian: http://bugs.debian.org/752587
+Author: Julián Moreno Patiño <julian at debian.org>
+--- a/Tcl.xs
++++ b/Tcl.xs
+@@ -1029,7 +1029,7 @@
+ 	/* sv_mortalcopy here prevents stringifying script - necessary ?? */
+ 	cscript = SvPV(sv_mortalcopy(script), length);
+ 	if (Tcl_EvalEx(interp, cscript, length, flags) != TCL_OK) {
+-	    croak(Tcl_GetStringResult(interp));
++	    croak("%s", Tcl_GetStringResult(interp));
+ 	}
+ 	prepare_Tcl_result(aTHX_ interp, "Tcl::Eval");
+ 	SPAGAIN;
+@@ -1092,7 +1092,7 @@
+ 	PUTBACK;
+ 	Tcl_ResetResult(interp);
+ 	if (Tcl_EvalFile(interp, filename) != TCL_OK) {
+-	    croak(Tcl_GetStringResult(interp));
++	    croak("%s", Tcl_GetStringResult(interp));
+ 	}
+ 	prepare_Tcl_result(aTHX_ interp, "Tcl::EvalFile");
+ 	SPAGAIN;
+@@ -1117,7 +1117,7 @@
+ 	    {
+ 		Tcl_ResetResult(interp);
+ 		if (Tcl_Eval(interp, s) != TCL_OK)
+-		    croak(Tcl_GetStringResult(interp));
++		    croak("%s", Tcl_GetStringResult(interp));
+ 		append = 0;
+ 	    }
+ 	}
+@@ -1251,7 +1251,7 @@
+ 	    }
+ 
+ 	    if (result != TCL_OK) {
+-		croak(Tcl_GetStringResult(interp));
++		croak("%s", Tcl_GetStringResult(interp));
+ 	    }
+ 	    prepare_Tcl_result(aTHX_ interp, "Tcl::invoke");
+ 
+@@ -1318,7 +1318,7 @@
+ 	    }
+ 
+ 	    if (result != TCL_OK) {
+-		croak(Tcl_GetStringResult(interp));
++		croak("%s", Tcl_GetStringResult(interp));
+ 	    }
+ 	    prepare_Tcl_result(aTHX_ interp, "Tcl::icall");
+ 
+@@ -1393,7 +1393,7 @@
+     CODE:
+ 	if (!initialized) { return; }
+ 	if (tclKit_AppInit(interp) != TCL_OK) {
+-	    croak(Tcl_GetStringResult(interp));
++	    croak("%s", Tcl_GetStringResult(interp));
+ 	}
+ 	Tcl_CreateObjCommand(interp, "::perl::Eval", Tcl_EvalInPerl,
+ 		(ClientData) NULL, NULL);
diff --git a/debian/patches/series b/debian/patches/series
index fa8b5d6..fd0c7bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix_hardening_FTBFS.patch
 wording.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtcl-perl.git