This is an automated email from the git hooks/post-receive script. fsfs pushed a commit to branch master in repository libtcl-perl.
commit 6a9fd55c154074ebc6f24820df60940ac4f21de9 Author: Florian Schlichting <[email protected]> Date: Sun Apr 24 00:39:55 2016 +0200 Drop wording.patch (applied upstream) and refresh fix_hardening_FTBFS.patch --- debian/patches/fix_hardening_FTBFS.patch | 16 ++++++++-------- debian/patches/series | 1 - debian/patches/wording.patch | 18 ------------------ 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/debian/patches/fix_hardening_FTBFS.patch b/debian/patches/fix_hardening_FTBFS.patch index 19edb1c..fc0f706 100644 --- a/debian/patches/fix_hardening_FTBFS.patch +++ b/debian/patches/fix_hardening_FTBFS.patch @@ -5,7 +5,7 @@ Bug: https://rt.cpan.org/Public/Bug/Display.html?id=78308 Author: Julián Moreno Patiño <[email protected]> --- a/Tcl.xs +++ b/Tcl.xs -@@ -1029,7 +1029,7 @@ +@@ -1056,7 +1056,7 @@ /* sv_mortalcopy here prevents stringifying script - necessary ?? */ cscript = SvPV(sv_mortalcopy(script), length); if (Tcl_EvalEx(interp, cscript, length, flags) != TCL_OK) { @@ -14,7 +14,7 @@ Author: Julián Moreno Patiño <[email protected]> } prepare_Tcl_result(aTHX_ interp, "Tcl::Eval"); SPAGAIN; -@@ -1092,7 +1092,7 @@ +@@ -1119,7 +1119,7 @@ PUTBACK; Tcl_ResetResult(interp); if (Tcl_EvalFile(interp, filename) != TCL_OK) { @@ -23,7 +23,7 @@ Author: Julián Moreno Patiño <[email protected]> } prepare_Tcl_result(aTHX_ interp, "Tcl::EvalFile"); SPAGAIN; -@@ -1117,7 +1117,7 @@ +@@ -1144,7 +1144,7 @@ { Tcl_ResetResult(interp); if (Tcl_Eval(interp, s) != TCL_OK) @@ -32,7 +32,7 @@ Author: Julián Moreno Patiño <[email protected]> append = 0; } } -@@ -1251,7 +1251,7 @@ +@@ -1278,7 +1278,7 @@ } if (result != TCL_OK) { @@ -41,7 +41,7 @@ Author: Julián Moreno Patiño <[email protected]> } prepare_Tcl_result(aTHX_ interp, "Tcl::invoke"); -@@ -1318,7 +1318,7 @@ +@@ -1345,7 +1345,7 @@ } if (result != TCL_OK) { @@ -50,12 +50,12 @@ Author: Julián Moreno Patiño <[email protected]> } prepare_Tcl_result(aTHX_ interp, "Tcl::icall"); -@@ -1393,7 +1393,7 @@ +@@ -1420,7 +1420,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); + + #ifdef HAVE_DDEINIT diff --git a/debian/patches/series b/debian/patches/series index fd0c7bc..c355e0c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ fix_hardening_FTBFS.patch -wording.patch diff --git a/debian/patches/wording.patch b/debian/patches/wording.patch deleted file mode 100644 index e08de22..0000000 --- a/debian/patches/wording.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: improve wording in POD -Origin: vendor -Bug: https://rt.cpan.org/Ticket/Display.html?id=96303 -Forwarded: https://rt.cpan.org/Ticket/Display.html?id=96303 -Author: gregor herrmann <[email protected]> -Last-Update: 2014-06-07 - ---- a/Tcl.pm -+++ b/Tcl.pm -@@ -122,7 +122,7 @@ - 2. All references to scalars will be substituted with names of Tcl variables - transformed appropriately. - --These first two items allows to write and expect it to work properly such -+These first two items allows one to write and expect it to work properly such - code as: - - my $r = 'aaaa'; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtcl-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
