Package: firestarter Severity: wishlist Tags: patch Hi Paul,
As we spoke before, here is the proposed NMU patch. Please let me know if there is anything that needs adjusting or if it is ok to upload with these changes. Thanks, Jari
>From 189a685b07a00a922625d838c92d9e24a116c45e Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Sat, 3 Mar 2012 08:59:40 -0500 Subject: [PATCH] format-3.0 Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto <[email protected]> --- debian/changelog | 8 ++++ debian/compat | 2 +- debian/control | 6 ++-- debian/patches/00list | 22 ------------ debian/patches/01_use_gksu.dpatch | 37 -------------------- debian/patches/01_use_gksu.patch | 16 ++++++++ ...atch => 02_detect_dhcp3-server_correctly.patch} | 8 +--- ...server.dpatch => 02_restart_dhcp3-server.patch} | 8 +--- ...art_dnsmasq.dpatch => 02_restart_dnsmasq.patch} | 8 +--- ...isc-dhcp4.dpatch => 02_support_isc-dhcp4.patch} | 8 +--- .../{03_xpm_icon.dpatch => 03_xpm_icon.patch} | 26 +------------- .../patches/05_remove_INSTALL_from_README.dpatch | 37 -------------------- debian/patches/05_remove_INSTALL_from_README.patch | 18 +++++++++ debian/patches/06_dot_not_hyphen.dpatch | 37 -------------------- debian/patches/06_dot_not_hyphen.patch | 18 +++++++++ .../{09_fix_ip_up.dpatch => 09_fix_ip_up.patch} | 35 ++++-------------- debian/patches/10_dhcp_hook.dpatch | 37 -------------------- debian/patches/10_dhcp_hook.patch | 18 +++++++++ ...1_desktop_file.dpatch => 11_desktop_file.patch} | 8 +--- ...patch => 12_firestarter_transparent_icon.patch} | 5 --- ...ser_nonroot.dpatch => 13_browser_nonroot.patch} | 8 +--- ...tables.dpatch => 14_update_non_routables.patch} | 10 ++---- ...5_update_sv_po.dpatch => 15_update_sv_po.patch} | 8 +--- ...te_docs_uri.dpatch => 17_update_docs_uri.patch} | 8 +--- ...{18_fix_memleak.dpatch => 18_fix_memleak.patch} | 6 +-- ...9_update_it_po.dpatch => 19_update_it_po.patch} | 6 +-- ...dpatch => 20_allow_localhost_when_locked.patch} | 19 +++++----- ...les_failing.dpatch => 21_locales_failing.patch} | 8 +--- ...op_file.dpatch => 22_update_desktop_file.patch} | 8 +--- debian/patches/23_fix_ftbfs_binutils-gold.dpatch | 31 ---------------- debian/patches/23_fix_ftbfs_binutils-gold.patch | 29 +++++++++++++++ debian/patches/series | 22 ++++++++++++ debian/rules | 5 +-- debian/source/format | 1 + 34 files changed, 182 insertions(+), 349 deletions(-) delete mode 100644 debian/patches/00list delete mode 100644 debian/patches/01_use_gksu.dpatch create mode 100644 debian/patches/01_use_gksu.patch rename debian/patches/{02_detect_dhcp3-server_correctly.dpatch => 02_detect_dhcp3-server_correctly.patch} (72%) rename debian/patches/{02_restart_dhcp3-server.dpatch => 02_restart_dhcp3-server.patch} (75%) rename debian/patches/{02_restart_dnsmasq.dpatch => 02_restart_dnsmasq.patch} (75%) rename debian/patches/{02_support_isc-dhcp4.dpatch => 02_support_isc-dhcp4.patch} (95%) rename debian/patches/{03_xpm_icon.dpatch => 03_xpm_icon.patch} (92%) delete mode 100644 debian/patches/05_remove_INSTALL_from_README.dpatch create mode 100644 debian/patches/05_remove_INSTALL_from_README.patch delete mode 100644 debian/patches/06_dot_not_hyphen.dpatch create mode 100644 debian/patches/06_dot_not_hyphen.patch rename debian/patches/{09_fix_ip_up.dpatch => 09_fix_ip_up.patch} (56%) delete mode 100644 debian/patches/10_dhcp_hook.dpatch create mode 100644 debian/patches/10_dhcp_hook.patch rename debian/patches/{11_desktop_file.dpatch => 11_desktop_file.patch} (76%) rename debian/patches/{12_firestarter_transparent_icon.dpatch => 12_firestarter_transparent_icon.patch} (95%) rename debian/patches/{13_browser_nonroot.dpatch => 13_browser_nonroot.patch} (93%) rename debian/patches/{14_update_non_routables.dpatch => 14_update_non_routables.patch} (83%) rename debian/patches/{15_update_sv_po.dpatch => 15_update_sv_po.patch} (99%) rename debian/patches/{17_update_docs_uri.dpatch => 17_update_docs_uri.patch} (67%) rename debian/patches/{18_fix_memleak.dpatch => 18_fix_memleak.patch} (91%) rename debian/patches/{19_update_it_po.dpatch => 19_update_it_po.patch} (99%) rename debian/patches/{20_allow_localhost_when_locked.dpatch => 20_allow_localhost_when_locked.patch} (50%) rename debian/patches/{21_locales_failing.dpatch => 21_locales_failing.patch} (85%) rename debian/patches/{22_update_desktop_file.dpatch => 22_update_desktop_file.patch} (72%) delete mode 100644 debian/patches/23_fix_ftbfs_binutils-gold.dpatch create mode 100644 debian/patches/23_fix_ftbfs_binutils-gold.patch create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index 635bfd0..ea8eeb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +firestarter (1.0.3-10.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt". + * Update to Standards-Version to 3.9.3 and debhelper to 9. + + -- Jari Aalto <[email protected]> Sat, 03 Mar 2012 08:04:05 -0500 + firestarter (1.0.3-10) unstable; urgency=low * Update non-routeables file to reflect allocation of the diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index 1b3bd6c..e96e67d 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: firestarter Section: admin Priority: optional Maintainer: Paul Cupis <[email protected]> -Build-Depends: debhelper (>= 5.0.51~), libgnome2-dev, libglade2-dev, libgnomeui-dev (>= 2.6.1.1-4), gettext, libpopt-dev, dpatch, autotools-dev, libxml-parser-perl, chrpath -Build-Conflicts: dpatch (= 1.21) -Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 9), libgnome2-dev, libglade2-dev, libgnomeui-dev (>= 2.6.1.1-4), gettext, libpopt-dev, autotools-dev, libxml-parser-perl, chrpath +Build-Conflicts: +Standards-Version: 3.9.3 Homepage: http://www.fs-security.com Package: firestarter diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 9f1bd2f..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,22 +0,0 @@ -01_use_gksu -02_detect_dhcp3-server_correctly -02_restart_dhcp3-server -02_restart_dnsmasq -02_support_isc-dhcp4 -03_xpm_icon -05_remove_INSTALL_from_README -06_dot_not_hyphen -09_fix_ip_up -10_dhcp_hook -11_desktop_file -12_firestarter_transparent_icon -13_browser_nonroot -14_update_non_routables -15_update_sv_po -17_update_docs_uri -18_fix_memleak -19_update_it_po -20_allow_localhost_when_locked -21_locales_failing -22_update_desktop_file -23_fix_ftbfs_binutils-gold diff --git a/debian/patches/01_use_gksu.dpatch b/debian/patches/01_use_gksu.dpatch deleted file mode 100644 index 6ae6f6a..0000000 --- a/debian/patches/01_use_gksu.dpatch +++ /dev/null @@ -1,37 +0,0 @@ -#! /bin/sh -e -## 01_use_gksu.dpatch by Rene Engelhard <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -if [ $# -lt 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch -p1 ${patch_opts} < $0;; - -unpatch) patch -R -p1 ${patch_opts} < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad firestarter-1.0.0/firestarter.desktop.in /tmp/dpep.BTyoqm/firestarter-1.0.0/firestarter.desktop.in ---- firestarter-1.0.0/firestarter.desktop.in 2004-11-25 07:56:28.000000000 +0100 -+++ /tmp/dpep.BTyoqm/firestarter-1.0.0/firestarter.desktop.in 2004-11-25 07:57:50.000000000 +0100 -@@ -2,7 +2,7 @@ - Encoding=UTF-8 - _Name=Firestarter - _Comment=Desktop Firewall Tool --Exec=firestarter -+Exec=gksu /usr/sbin/firestarter - Icon=firestarter.png - Terminal=false - Type=Application diff --git a/debian/patches/01_use_gksu.patch b/debian/patches/01_use_gksu.patch new file mode 100644 index 0000000..b566355 --- /dev/null +++ b/debian/patches/01_use_gksu.patch @@ -0,0 +1,16 @@ +From: Rene Engelhard <[email protected]> +Subject: Use gksu in .desktop and menu for starting firestarter + Thanks to Michael Vogt for the suggestion, + +diff -urNad firestarter-1.0.0/firestarter.desktop.in /tmp/dpep.BTyoqm/firestarter-1.0.0/firestarter.desktop.in +--- firestarter-1.0.0/firestarter.desktop.in 2004-11-25 07:56:28.000000000 +0100 ++++ /tmp/dpep.BTyoqm/firestarter-1.0.0/firestarter.desktop.in 2004-11-25 07:57:50.000000000 +0100 +@@ -2,7 +2,7 @@ + Encoding=UTF-8 + _Name=Firestarter + _Comment=Desktop Firewall Tool +-Exec=firestarter ++Exec=gksu /usr/sbin/firestarter + Icon=firestarter.png + Terminal=false + Type=Application diff --git a/debian/patches/02_detect_dhcp3-server_correctly.dpatch b/debian/patches/02_detect_dhcp3-server_correctly.patch similarity index 72% rename from debian/patches/02_detect_dhcp3-server_correctly.dpatch rename to debian/patches/02_detect_dhcp3-server_correctly.patch index 3694830..7df491a 100644 --- a/debian/patches/02_detect_dhcp3-server_correctly.dpatch +++ b/debian/patches/02_detect_dhcp3-server_correctly.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_detect_dhcp3-server_correctly.dpatch by Christian Bjälevik <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: Christian Bjälevik <[email protected]> +Subject: Enable using firestarter with dhcpd -@DPATCH@ diff -urNad firestarter-1.0.3~/src/dhcp-server.c firestarter-1.0.3/src/dhcp-server.c --- firestarter-1.0.3~/src/dhcp-server.c 2005-01-29 13:32:07.000000000 +0100 +++ firestarter-1.0.3/src/dhcp-server.c 2007-01-05 15:58:52.055760358 +0100 diff --git a/debian/patches/02_restart_dhcp3-server.dpatch b/debian/patches/02_restart_dhcp3-server.patch similarity index 75% rename from debian/patches/02_restart_dhcp3-server.dpatch rename to debian/patches/02_restart_dhcp3-server.patch index b945841..cfa4a23 100644 --- a/debian/patches/02_restart_dhcp3-server.dpatch +++ b/debian/patches/02_restart_dhcp3-server.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_restart_dhcp3-server.dpatch by Christian Bjälevik <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: Christian Bjälevik <[email protected]> +Subject: Use dhcp3-server daemon, not dhcpd -@DPATCH@ diff -urNad firestarter-1.0.3~/src/scriptwriter.c firestarter-1.0.3/src/scriptwriter.c --- firestarter-1.0.3~/src/scriptwriter.c 2005-01-29 13:32:08.000000000 +0100 +++ firestarter-1.0.3/src/scriptwriter.c 2007-01-05 15:53:49.042492616 +0100 diff --git a/debian/patches/02_restart_dnsmasq.dpatch b/debian/patches/02_restart_dnsmasq.patch similarity index 75% rename from debian/patches/02_restart_dnsmasq.dpatch rename to debian/patches/02_restart_dnsmasq.patch index acd3b68..752d954 100644 --- a/debian/patches/02_restart_dnsmasq.dpatch +++ b/debian/patches/02_restart_dnsmasq.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_restart_dnsmasq.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: Paul Cupis <[email protected]> +Subject: restart dnsmasq only if it exists -@DPATCH@ diff -urNad firestarter-1.0.3~/src/scriptwriter.c firestarter-1.0.3/src/scriptwriter.c --- firestarter-1.0.3~/src/scriptwriter.c 2007-08-05 10:06:35.000000000 +0100 +++ firestarter-1.0.3/src/scriptwriter.c 2007-08-05 10:07:02.000000000 +0100 diff --git a/debian/patches/02_support_isc-dhcp4.dpatch b/debian/patches/02_support_isc-dhcp4.patch similarity index 95% rename from debian/patches/02_support_isc-dhcp4.dpatch rename to debian/patches/02_support_isc-dhcp4.patch index 715577a..95cb1e8 100644 --- a/debian/patches/02_support_isc-dhcp4.dpatch +++ b/debian/patches/02_support_isc-dhcp4.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_support_isc-dhcp4.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: Paul Cupis <[email protected]> +Subject: support Debian isc-dhcp-server which is configured via /etc/dhcpd/ (Closes: #615264) -@DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' firestarter-1.0.3~/src/dhcp-server.c firestarter-1.0.3/src/dhcp-server.c --- firestarter-1.0.3~/src/dhcp-server.c 2011-02-27 20:40:37.000000000 +0000 +++ firestarter-1.0.3/src/dhcp-server.c 2011-02-27 20:40:38.000000000 +0000 diff --git a/debian/patches/03_xpm_icon.dpatch b/debian/patches/03_xpm_icon.patch similarity index 92% rename from debian/patches/03_xpm_icon.dpatch rename to debian/patches/03_xpm_icon.patch index 665b5cc..96e2545 100644 --- a/debian/patches/03_xpm_icon.dpatch +++ b/debian/patches/03_xpm_icon.patch @@ -1,28 +1,6 @@ -#!/bin/sh -e -## 03_xpm_icon.dpatch by Rene Engelhard <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: use xpm and 32x32 to conform with the menu policy +From: Rene Engelhard <[email protected]> +Subject: use xpm and 32x32 to conform with the menu policy -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ diff -urNad /home/rene/firestarter-0.9.2/pixmaps/firestarter.xpm firestarter-0.9.2/pixmaps/firestarter.xpm --- /home/rene/firestarter-0.9.2/pixmaps/firestarter.xpm 1970-01-01 01:00:00.000000000 +0100 +++ firestarter-0.9.2/pixmaps/firestarter.xpm 2003-06-12 23:53:50.000000000 +0200 diff --git a/debian/patches/05_remove_INSTALL_from_README.dpatch b/debian/patches/05_remove_INSTALL_from_README.dpatch deleted file mode 100644 index f99bada..0000000 --- a/debian/patches/05_remove_INSTALL_from_README.dpatch +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -e -## 05_remove_INSTALL_from_README.dpatch.dpatch by Rene Engelhard <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad /home/rene/Debian/Pakete/firestarter/firestarter-0.9.2/README firestarter-0.9.2/README ---- /home/rene/Debian/Pakete/firestarter/firestarter-0.9.2/README 2003-06-08 11:04:09.000000000 +0200 -+++ firestarter-0.9.2/README 2003-06-14 17:58:05.000000000 +0200 -@@ -11,8 +11,6 @@ - for open ports, in vain. Firestarter takes full advantage of GNOME but - will work in most environments. - --See the "INSTALL" file for installation instructions. -- - Major version history - ====== - 0.9.0 - GNOME 2 version diff --git a/debian/patches/05_remove_INSTALL_from_README.patch b/debian/patches/05_remove_INSTALL_from_README.patch new file mode 100644 index 0000000..69ee1ad --- /dev/null +++ b/debian/patches/05_remove_INSTALL_from_README.patch @@ -0,0 +1,18 @@ +From: Rene Engelhard <[email protected]> +Subject: In README, refer to INSTALL file + +--- + README | 2 -- + 1 file changed, 2 deletions(-) + +--- a/README ++++ b/README +@@ -11,8 +11,6 @@ + for open ports, in vain. Firestarter takes full advantage of GNOME but + will work in most environments. + +-See the "INSTALL" file for installation instructions. +- + Major version history + ====== + 1.0.0 - Redesigned interface, outbound filtering diff --git a/debian/patches/06_dot_not_hyphen.dpatch b/debian/patches/06_dot_not_hyphen.dpatch deleted file mode 100644 index f71ac10..0000000 --- a/debian/patches/06_dot_not_hyphen.dpatch +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -e -## 06_dot_not_hyphen.dpatch by Rene Engelhard <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad firestarter-1.0.0/src/scriptwriter.c /tmp/dpep.d731CV/firestarter-1.0.0/src/scriptwriter.c ---- firestarter-1.0.0/src/scriptwriter.c 2004-11-25 07:53:37.000000000 +0100 -+++ /tmp/dpep.d731CV/firestarter-1.0.0/src/scriptwriter.c 2004-11-25 08:01:07.000000000 +0100 -@@ -425,7 +425,7 @@ - - return TRUE; - -- gchar *path = g_strconcat ("/var/run/dhclient-", -+ gchar *path = g_strconcat ("/var/run/dhclient.", - preferences_get_string (PREFS_FW_EXT_IF), - ".pid", NULL); - diff --git a/debian/patches/06_dot_not_hyphen.patch b/debian/patches/06_dot_not_hyphen.patch new file mode 100644 index 0000000..7695abc --- /dev/null +++ b/debian/patches/06_dot_not_hyphen.patch @@ -0,0 +1,18 @@ +From: Rene Engelhard <[email protected]> +Subject: Correct file name prefix in /var/run/ to use dot(.) + +--- + src/scriptwriter.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/scriptwriter.c ++++ b/src/scriptwriter.c +@@ -454,7 +454,7 @@ + { + gboolean exists; + +- gchar *path = g_strconcat ("/var/run/dhclient-", ++ gchar *path = g_strconcat ("/var/run/dhclient.", + preferences_get_string (PREFS_FW_EXT_IF), + ".pid", NULL); + diff --git a/debian/patches/09_fix_ip_up.dpatch b/debian/patches/09_fix_ip_up.patch similarity index 56% rename from debian/patches/09_fix_ip_up.dpatch rename to debian/patches/09_fix_ip_up.patch index 4ad00ab..c4188ad 100644 --- a/debian/patches/09_fix_ip_up.dpatch +++ b/debian/patches/09_fix_ip_up.patch @@ -1,31 +1,12 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 09_fix_ip_up.dpatch by Yann Verley <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: Yann Verley <[email protected]> +Subject: Restart firestarter after pppd establishes the link -if [ $# -lt 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi +--- + src/scriptwriter.c | 34 ++++++++++++++++++++++++++++------ + 1 file changed, 28 insertions(+), 6 deletions(-) -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch -p1 ${patch_opts} < $0;; - -unpatch) patch -R -p1 ${patch_opts} < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad firestarter-1.0.3/src/scriptwriter.c /tmp/dpep.GdvAtF/firestarter-1.0.3/src/scriptwriter.c ---- firestarter-1.0.3/src/scriptwriter.c 2005-01-30 22:13:52.000000000 +0100 -+++ /tmp/dpep.GdvAtF/firestarter-1.0.3/src/scriptwriter.c 2005-01-30 22:19:07.000000000 +0100 +--- a/src/scriptwriter.c ++++ b/src/scriptwriter.c @@ -29,7 +29,7 @@ #include "policyview.h" @@ -35,7 +16,7 @@ diff -urNad firestarter-1.0.3/src/scriptwriter.c /tmp/dpep.GdvAtF/firestarter-1. static const gchar * test_bool (const gchar *conf_key) -@@ -588,23 +588,45 @@ +@@ -598,23 +598,45 @@ void scriptwriter_write_ppp_hook (void) { diff --git a/debian/patches/10_dhcp_hook.dpatch b/debian/patches/10_dhcp_hook.dpatch deleted file mode 100644 index 48a4475..0000000 --- a/debian/patches/10_dhcp_hook.dpatch +++ /dev/null @@ -1,37 +0,0 @@ -#! /bin/sh -e -## 01_use_gksu.dpatch by Yann Verley <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -if [ $# -lt 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch -p1 ${patch_opts} < $0;; - -unpatch) patch -R -p1 ${patch_opts} < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad firestarter-1.0.1/src/scriptwriter.c /tmp/dpep.GLxFE0/firestarter-1.0.1/src/scriptwriter.c ---- firestarter-1.0.1/src/scriptwriter.c 2004-12-17 21:33:26.000000000 +0100 -+++ /tmp/dpep.GLxFE0/firestarter-1.0.1/src/scriptwriter.c 2004-12-17 21:33:56.000000000 +0100 -@@ -473,7 +473,7 @@ - list = g_list_append (list, g_strdup (buf)); - } - -- rewind (f); -+ fprintf (f, "\n"); - fprintf (f, FIRESTARTER_HOOK); - - link = list; diff --git a/debian/patches/10_dhcp_hook.patch b/debian/patches/10_dhcp_hook.patch new file mode 100644 index 0000000..08ef169 --- /dev/null +++ b/debian/patches/10_dhcp_hook.patch @@ -0,0 +1,18 @@ +From: Yann Verley <[email protected]> +Subject: Print newline + +--- + src/scriptwriter.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/scriptwriter.c ++++ b/src/scriptwriter.c +@@ -500,7 +500,7 @@ + list = g_list_append (list, g_strdup (buf)); + } + +- rewind (f); ++ fprintf (f, "\n"); + fprintf (f, FIRESTARTER_HOOK); + + link = list; diff --git a/debian/patches/11_desktop_file.dpatch b/debian/patches/11_desktop_file.patch similarity index 76% rename from debian/patches/11_desktop_file.dpatch rename to debian/patches/11_desktop_file.patch index b440c2a..44e0219 100644 --- a/debian/patches/11_desktop_file.dpatch +++ b/debian/patches/11_desktop_file.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 11_desktop_file.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: <[email protected]> +Subject: Use su-to-root and update Categories -@DPATCH@ diff -urNad firestarter-1.0.3~/firestarter.desktop.in firestarter-1.0.3/firestarter.desktop.in --- firestarter-1.0.3~/firestarter.desktop.in 2008-09-13 21:28:20.000000000 +0100 +++ firestarter-1.0.3/firestarter.desktop.in 2008-09-13 21:28:37.000000000 +0100 diff --git a/debian/patches/12_firestarter_transparent_icon.dpatch b/debian/patches/12_firestarter_transparent_icon.patch similarity index 95% rename from debian/patches/12_firestarter_transparent_icon.dpatch rename to debian/patches/12_firestarter_transparent_icon.patch index 2447625..2b2d0c0 100644 --- a/debian/patches/12_firestarter_transparent_icon.dpatch +++ b/debian/patches/12_firestarter_transparent_icon.patch @@ -1,9 +1,4 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. -@DPATCH@ diff -Naur firestarter-1.0.3.orig/src/eggtrayicon.c firestarter-1.0.3/src/eggtrayicon.c --- firestarter-1.0.3.orig/src/eggtrayicon.c 2005-01-29 07:32:08.000000000 -0500 +++ firestarter-1.0.3/src/eggtrayicon.c 2006-05-15 19:49:09.000000000 -0400 diff --git a/debian/patches/13_browser_nonroot.dpatch b/debian/patches/13_browser_nonroot.patch similarity index 93% rename from debian/patches/13_browser_nonroot.dpatch rename to debian/patches/13_browser_nonroot.patch index 54ce4ee..4c8a596 100644 --- a/debian/patches/13_browser_nonroot.dpatch +++ b/debian/patches/13_browser_nonroot.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 13_browser_nonroot.dpatch by <pandis@pandis-laptop> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: <pandis@pandis-laptop> +Subject: Use generic open_browser(), not gnome_url_show() -@DPATCH@ diff -urNad firestarter-1.0.3~/src/menus.c firestarter-1.0.3/src/menus.c --- firestarter-1.0.3~/src/menus.c 2005-01-29 14:32:08.000000000 +0200 +++ firestarter-1.0.3/src/menus.c 2006-08-12 04:17:35.000000000 +0300 diff --git a/debian/patches/14_update_non_routables.dpatch b/debian/patches/14_update_non_routables.patch similarity index 83% rename from debian/patches/14_update_non_routables.dpatch rename to debian/patches/14_update_non_routables.patch index 7a398b7..03d3c2c 100644 --- a/debian/patches/14_update_non_routables.dpatch +++ b/debian/patches/14_update_non_routables.patch @@ -1,11 +1,7 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 11_update_non_routables.dpatch by Yann Verley <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Update of non-routables with -## DP: http://www.iana.org/assignments/ipv4-address-space (last updated 2007-01-16). +From: Yann Verley <[email protected]> +Subject: Update of non-routables with + http://www.iana.org/assignments/ipv4-address-space (last updated 2007-01-16). -@DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' firestarter-1.0.3~/scripts/non-routables firestarter-1.0.3/scripts/non-routables --- firestarter-1.0.3~/scripts/non-routables 2011-01-02 20:33:22.000000000 +0000 +++ firestarter-1.0.3/scripts/non-routables 2011-01-02 20:35:06.000000000 +0000 diff --git a/debian/patches/15_update_sv_po.dpatch b/debian/patches/15_update_sv_po.patch similarity index 99% rename from debian/patches/15_update_sv_po.dpatch rename to debian/patches/15_update_sv_po.patch index c216d44..2350b78 100644 --- a/debian/patches/15_update_sv_po.dpatch +++ b/debian/patches/15_update_sv_po.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 15_update_sv_po.dpatch by Yann Verley <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Updated translation for swedish by Daniel Nylander. +From: Yann Verley <[email protected]> +Subject: Updated translation for swedish by Daniel Nylander. -@DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' firestarter-1.0.3~/po/sv.po firestarter-1.0.3/po/sv.po --- firestarter-1.0.3~/po/sv.po 2005-01-29 12:34:10.000000000 +0000 +++ firestarter-1.0.3/po/sv.po 2011-02-03 14:28:35.000000000 +0000 diff --git a/debian/patches/17_update_docs_uri.dpatch b/debian/patches/17_update_docs_uri.patch similarity index 67% rename from debian/patches/17_update_docs_uri.dpatch rename to debian/patches/17_update_docs_uri.patch index b2253ee..c86e951 100644 --- a/debian/patches/17_update_docs_uri.dpatch +++ b/debian/patches/17_update_docs_uri.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 17_update_docs_uri.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: Paul Cupis <[email protected]> +Subject: Update URL to manual -@DPATCH@ diff -urNad firestarter-1.0.3~/src/menus.c firestarter-1.0.3/src/menus.c --- firestarter-1.0.3~/src/menus.c 2007-08-24 16:19:10.000000000 +0100 +++ firestarter-1.0.3/src/menus.c 2007-08-24 16:21:06.000000000 +0100 diff --git a/debian/patches/18_fix_memleak.dpatch b/debian/patches/18_fix_memleak.patch similarity index 91% rename from debian/patches/18_fix_memleak.dpatch rename to debian/patches/18_fix_memleak.patch index 17ea0c5..c8e3c08 100644 --- a/debian/patches/18_fix_memleak.dpatch +++ b/debian/patches/18_fix_memleak.patch @@ -1,8 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 18_fix_memleak.dpatch by RobNeild <[email protected]> -## DP: Fix memory leaks with g_slice memory allocator. +From: RobNeild <[email protected]> +Subject: Fix memory leaks with g_slice memory allocator. -@DPATCH@ diff -Naur firestarter-1.0.3.orig/src/preferences.c firestarter-1.0.3/src/preferences.c --- firestarter-1.0.3.orig/src/preferences.c 2005-01-29 12:32:08.000000000 +0000 +++ firestarter-1.0.3/src/preferences.c 2008-01-22 18:15:14.000000000 +0000 diff --git a/debian/patches/19_update_it_po.dpatch b/debian/patches/19_update_it_po.patch similarity index 99% rename from debian/patches/19_update_it_po.dpatch rename to debian/patches/19_update_it_po.patch index 7641cf1..7147b9a 100644 --- a/debian/patches/19_update_it_po.dpatch +++ b/debian/patches/19_update_it_po.patch @@ -1,8 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 19_update_it_po.dpatch by Luca Falavigna <[email protected]> -## DP: Updated italian translation by Milo Casagrande. +From: Luca Falavigna <[email protected]> +Subject: Updated italian translation by Milo Casagrande. -@DPATCH@ diff -urNad firestarter-1.0.3~/po/it.po firestarter-1.0.3/po/it.po --- firestarter-1.0.3~/po/it.po 2005-01-29 13:33:40.000000000 +0100 +++ firestarter-1.0.3/po/it.po 2008-06-04 22:26:06.000000000 +0200 diff --git a/debian/patches/20_allow_localhost_when_locked.dpatch b/debian/patches/20_allow_localhost_when_locked.patch similarity index 50% rename from debian/patches/20_allow_localhost_when_locked.dpatch rename to debian/patches/20_allow_localhost_when_locked.patch index dd0a6e6..71b498d 100644 --- a/debian/patches/20_allow_localhost_when_locked.dpatch +++ b/debian/patches/20_allow_localhost_when_locked.patch @@ -1,14 +1,13 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20_allow_localhost_when_locked.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: Paul Cupis <[email protected]> +Subject: Allow localhost traffic when firewall is locked (closes: #479224) -@DPATCH@ -diff -urNad firestarter-1.0.3~/src/scriptwriter.c firestarter-1.0.3/src/scriptwriter.c ---- firestarter-1.0.3~/src/scriptwriter.c 2008-09-13 20:50:02.000000000 +0100 -+++ firestarter-1.0.3/src/scriptwriter.c 2008-09-13 20:52:09.000000000 +0100 -@@ -233,11 +233,13 @@ +--- + src/scriptwriter.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/src/scriptwriter.c ++++ b/src/scriptwriter.c +@@ -239,11 +239,13 @@ fprintf (f, "# Lock the firewall, blocking all traffic\n" "lock_firewall () {\n" diff --git a/debian/patches/21_locales_failing.dpatch b/debian/patches/21_locales_failing.patch similarity index 85% rename from debian/patches/21_locales_failing.dpatch rename to debian/patches/21_locales_failing.patch index 8497dfb..633a64e 100644 --- a/debian/patches/21_locales_failing.dpatch +++ b/debian/patches/21_locales_failing.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 21_locales_failing.dpatch by <hobbit@gandalf> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Use LANG=C to ensure C locale when grepping ifconfig output (Fixes LP:222038). +From: <hobbit@gandalf> +Subject: Use LANG=C to ensure C locale when grepping ifconfig output (Fixes LP:222038). -@DPATCH@ diff -urNad firestarter-1.0.3~/src/scriptwriter.c firestarter-1.0.3/src/scriptwriter.c --- firestarter-1.0.3~/src/scriptwriter.c 2009-04-17 17:52:41.000000000 -0700 +++ firestarter-1.0.3/src/scriptwriter.c 2009-04-17 17:54:32.000000000 -0700 diff --git a/debian/patches/22_update_desktop_file.dpatch b/debian/patches/22_update_desktop_file.patch similarity index 72% rename from debian/patches/22_update_desktop_file.dpatch rename to debian/patches/22_update_desktop_file.patch index 6cc4f7a..8d1ec81 100644 --- a/debian/patches/22_update_desktop_file.dpatch +++ b/debian/patches/22_update_desktop_file.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 22_remove_encoding_from_desktop.patch.dpatch by Jonathan Marsden <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove deprecated Encoding= line from firestarter.desktop.in file +From: Jonathan Marsden <[email protected]> +Subject: Remove deprecated Encoding= line from firestarter.desktop.in file -@DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' firestarter-1.0.3~/firestarter.desktop.in firestarter-1.0.3/firestarter.desktop.in --- firestarter-1.0.3~/firestarter.desktop.in 2011-02-03 14:41:26.000000000 +0000 +++ firestarter-1.0.3/firestarter.desktop.in 2011-02-03 14:45:46.000000000 +0000 diff --git a/debian/patches/23_fix_ftbfs_binutils-gold.dpatch b/debian/patches/23_fix_ftbfs_binutils-gold.dpatch deleted file mode 100644 index 9a141d6..0000000 --- a/debian/patches/23_fix_ftbfs_binutils-gold.dpatch +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 23_fix_ftbfs_binutils-gold.dpatch by Mahyuddin Susanto <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix FTBFS with binutils-gold -## Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/firestarter/+bug/694413 - -@DPATCH@ -diff -Nurp firestarter-1.0.3/src//Makefile.am firestarter-1.0.3.ubuntu/src//Makefile.am ---- firestarter-1.0.3/src//Makefile.am 2005-01-29 12:32:08.000000000 +0000 -+++ firestarter-1.0.3.ubuntu/src//Makefile.am 2011-01-06 08:10:59.000000000 +0000 -@@ -53,6 +53,6 @@ firestarter_SOURCES = \ - glade_DATA = \ - preferences.glade - --firestarter_LDADD = @FIRESTARTER_LIBS@ -+firestarter_LDADD = @FIRESTARTER_LIBS@ -lX11 - - EXTRA_DIST = $(glade_DATA) -diff -Nurp firestarter-1.0.3/src//Makefile.in firestarter-1.0.3.ubuntu/src//Makefile.in ---- firestarter-1.0.3/src//Makefile.in 2005-01-29 12:35:21.000000000 +0000 -+++ firestarter-1.0.3.ubuntu/src//Makefile.in 2011-01-06 08:11:16.000000000 +0000 -@@ -183,7 +183,7 @@ glade_DATA = \ - preferences.glade - - --firestarter_LDADD = @FIRESTARTER_LIBS@ -+firestarter_LDADD = @FIRESTARTER_LIBS@ -lX11 - - EXTRA_DIST = $(glade_DATA) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/debian/patches/23_fix_ftbfs_binutils-gold.patch b/debian/patches/23_fix_ftbfs_binutils-gold.patch new file mode 100644 index 0000000..af8af05 --- /dev/null +++ b/debian/patches/23_fix_ftbfs_binutils-gold.patch @@ -0,0 +1,29 @@ +From: Mahyuddin Susanto <[email protected]> +Subject: Fix FTBFS with binutils-gold + +--- + src/Makefile.am | 2 +- + src/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -53,6 +53,6 @@ + glade_DATA = \ + preferences.glade + +-firestarter_LDADD = @FIRESTARTER_LIBS@ ++firestarter_LDADD = @FIRESTARTER_LIBS@ -lX11 + + EXTRA_DIST = $(glade_DATA) +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -183,7 +183,7 @@ + preferences.glade + + +-firestarter_LDADD = @FIRESTARTER_LIBS@ ++firestarter_LDADD = @FIRESTARTER_LIBS@ -lX11 + + EXTRA_DIST = $(glade_DATA) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..8ad2ab5 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,22 @@ +01_use_gksu.patch +02_detect_dhcp3-server_correctly.patch +02_restart_dhcp3-server.patch +02_restart_dnsmasq.patch +02_support_isc-dhcp4.patch +03_xpm_icon.patch +05_remove_INSTALL_from_README.patch +06_dot_not_hyphen.patch +09_fix_ip_up.patch +10_dhcp_hook.patch +11_desktop_file.patch +12_firestarter_transparent_icon.patch +13_browser_nonroot.patch +14_update_non_routables.patch +15_update_sv_po.patch +17_update_docs_uri.patch +18_fix_memleak.patch +19_update_it_po.patch +20_allow_localhost_when_locked.patch +21_locales_failing.patch +22_update_desktop_file.patch +23_fix_ftbfs_binutils-gold.patch diff --git a/debian/rules b/debian/rules index bbdf216..f2c4e68 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,6 @@ ## debian/rules for firestarter -include /usr/share/dpatch/dpatch.make ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS="-O0 -Wall -g" @@ -11,7 +10,7 @@ else endif configure: configure-stamp -configure-stamp: patch-stamp +configure-stamp: dh_testdir cp config.guess config.guess.orig @@ -34,7 +33,7 @@ build-stamp: touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 1.7.9
