Jakub Wilk <jw...@debian.org> writes: > * Dmitrijs Ledkovs <dmitrij.led...@ubuntu.com>, 2010-12-11, 18:47: >>-Architecture: any >>+Architecture: all > > I'm not sure if the release team will be happy with the above change... > >> --- gnome-schedule-2.0.2~/Makefile.am 2007-12-21 08:30:24.000000000 >> -0500 >> +++ gnome-schedule-2.0.2/Makefile.am 2008-03-09 22:49:35.000000000 -0500 >> @@ -11,7 +11,6 @@ >> > This change is not documented in the changelog AFAICS. > > If you run the configure script from an untrusted directory, you are doomed > anyway (the script created files with predictable names). IOW, you are not > supposed to do that. While the hunk is technically correct, I'd omit it, so > that > we don't need to regenerate ./configure. > > OK. > >>--- gnome-schedule2.1.1-3/debian/rules 2009-11-09 10:01:57 +0000 >>+++ gnome-schedule2.1.1-3.1/debian/rules 2010-12-11 18:16:11 +0000 >>+ dh_autotools-dev_updateconfig >>+ dh_autotools-dev_restoreconfig >>+ dh_clean > > I think it's too late in the release process for this change (and it wouldn't > be > suitable for an NMU anyway).
Fixed above mentioned issues. Here is the updated debdiff:
pgptp4BNZlB2O.pgp
Description: PGP signature
=== modified file 'debian/changelog' --- gnome-schedule-2.1.1-3/debian/changelog 2010-01-29 11:37:55 +0000 +++ gnome-schedule-2.1.1-3.1/debian/changelog 2010-12-13 22:33:36 +0000 @@ -1,3 +1,12 @@ +gnome-schedule (2.1.1-3.1) unstable; urgency=high + + * Non-maintainer upload. + * Fix setting PYTHONPATH in an insecure way (Closes: #605167): + - Update debian/patches/03_distclean.patch to fix trailing slash error + from make. + + -- Dmitrijs Ledkovs <dmitrij.led...@ubuntu.com> Sat, 11 Dec 2010 11:12:35 +0000 + gnome-schedule (2.1.1-3) unstable; urgency=low * Added dpatch to fix exception Syntax error (Closes: #567406) === modified file 'debian/patches/00list' --- gnome-schedule-2.1.1-3/debian/patches/00list 2010-01-29 11:37:55 +0000 +++ gnome-schedule-2.1.1-3.1/debian/patches/00list 2010-12-11 10:58:07 +0000 @@ -1,2 +1,3 @@ 03_distclean xwrapper_bug567406 +bug605167-pythonpath.dpatch === modified file 'debian/patches/03_distclean.dpatch' --- gnome-schedule-2.1.1-3/debian/patches/03_distclean.dpatch 2009-11-08 17:17:39 +0000 +++ gnome-schedule-2.1.1-3.1/debian/patches/03_distclean.dpatch 2010-12-13 22:32:01 +0000 @@ -5,14 +5,14 @@ ## DP: don't remove gnome-doc-utils.make in the distclean target. @DPATCH@ -diff -urNad gnome-schedule-2.0.2~/Makefile.am gnome-schedule-2.0.2/Makefile.am --- gnome-schedule-2.0.2~/Makefile.am 2007-12-21 08:30:24.000000000 -0500 +++ gnome-schedule-2.0.2/Makefile.am 2008-03-09 22:49:35.000000000 -0500 @@ -11,7 +11,6 @@ intltool-merge \ intltool-update \ - po/.intltool-merge-cache \ +- po/.intltool-merge-cache \ - gnome-doc-utils.make ++ po/.intltool-merge-cache EXTRA_DIST = \ gnome-doc-utils.make \ @@ -22,8 +22,9 @@ @@ -239,7 +239,6 @@ intltool-merge \ intltool-update \ - po/.intltool-merge-cache \ +- po/.intltool-merge-cache \ - gnome-doc-utils.make ++ po/.intltool-merge-cache EXTRA_DIST = \ gnome-doc-utils.make \ === added file 'debian/patches/bug605167-pythonpath.dpatch' --- gnome-schedule-2.1.1-3/debian/patches/bug605167-pythonpath.dpatch 1970-01-01 00:00:00 +0000 +++ gnome-schedule-2.1.1-3.1/debian/patches/bug605167-pythonpath.dpatch 2010-12-13 22:29:52 +0000 @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## bug605167_hackish.dpatch by chrysn <chr...@fsfe.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch for debian bug #605167. + +...@dpatch@ +--- a/src/config.py.in ++++ b/src/config.py.in +@@ -21,7 +21,7 @@ version = "@VERSION@" + image_dir = "@prefix@/share/pixmaps/gnome-schedule" + gs_dir = "@prefix@/share/gnome-schedule" + glade_dir = gs_dir +-xwrapper_exec = "pythonpa...@pythonpath@/gtk-2.0/:$PYTHONPATH @PYTHON@ @prefix@/share/gnome-schedule/xwrapper.py" ++xwrapper_exec = "@PYTHON@ @prefix@/share/gnome-schedule/xwrapper.py" + locale_dir = "@prefix@/share/locale" + crontabbin = "@CRONTAB_CONFIG@" + atbin = "@AT_CONFIG@" +--- a/src/gnome-schedule.in ++++ b/src/gnome-schedule.in +@@ -1,2 +1,2 @@ + #! /bin/sh +-pythonpa...@pythonpath@/gtk-2.0/:$PYTHONPATH @PYTHON@ @prefix@/share/gnome-schedule/gnome-schedule.py $1 +...@python@ @prefix@/share/gnome-schedule/gnome-schedule.py $1 + +
