From 60425f8a7c21d39d3d56b02eeeda54515c7fe362 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 1 Apr 2013 14:22:07 -0400 Subject: [PATCH 01/40] systemd_post_with_restart -> systemd_postun_with_restart (#901753) --- wicd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wicd.spec b/wicd.spec index fb332b8..f356008 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -172,7 +172,7 @@ rm -rf %{buildroot} %systemd_preun wicd.service %postun common -%systemd_post_with_restart wicd.service +%systemd_postun_with_restart wicd.service %post gtk touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -275,6 +275,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Mon Apr 01 2013 David Cantrell - 1.7.2.4-6 +- systemd_post_with_restart -> systemd_postun_with_restart (#901753) + * Fri Feb 15 2013 Fedora Release Engineering - 1.7.2.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 6105ce1a2040e10147cd2ae6cc7f2587f14b482f Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 1 Apr 2013 14:51:48 -0400 Subject: [PATCH 02/40] systemd_post_with_restart -> systemd_postun_with_restart (#901753) --- wicd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wicd.spec b/wicd.spec index fb332b8..f356008 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -172,7 +172,7 @@ rm -rf %{buildroot} %systemd_preun wicd.service %postun common -%systemd_post_with_restart wicd.service +%systemd_postun_with_restart wicd.service %post gtk touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -275,6 +275,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Mon Apr 01 2013 David Cantrell - 1.7.2.4-6 +- systemd_post_with_restart -> systemd_postun_with_restart (#901753) + * Fri Feb 15 2013 Fedora Release Engineering - 1.7.2.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 0e0fcc58673db27903c31bbe7d9db199e0b9c2f1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:54:08 -0500 Subject: [PATCH 03/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index f356008..9b84364 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -275,6 +275,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.7.2.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Mon Apr 01 2013 David Cantrell - 1.7.2.4-6 - systemd_post_with_restart -> systemd_postun_with_restart (#901753) From a45da003c00a1f5b285ec9686833f0c5cfa08343 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 9 Dec 2013 08:56:19 -0500 Subject: [PATCH 04/40] Apply upstream patch to fix exception when changing properties in wicd-gtk (#981667) --- 770_769.diff | 16 ++++++++++++++++ wicd.spec | 12 +++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 770_769.diff diff --git a/770_769.diff b/770_769.diff new file mode 100644 index 0000000..2fddc9a --- /dev/null +++ b/770_769.diff @@ -0,0 +1,16 @@ +=== modified file 'wicd/misc.py' +--- wicd/misc.py 2012-04-30 19:20:47 +0000 ++++ wicd/misc.py 2012-05-03 16:01:49 +0000 +@@ -430,7 +430,10 @@ + """ Sanitize property names to be used in config-files. """ + allowed = string.ascii_letters + '_' + string.digits + table = string.maketrans(allowed, ' ' * len(allowed)) +- return s.translate(None, table) ++ ++ # s is a dbus.String -- since we don't allow unicode property keys, ++ # make it simple. ++ return str(s).translate(None, table) + + def sanitize_escaped(s): + """ Sanitize double-escaped unicode strings. """ + diff --git a/wicd.spec b/wicd.spec index 9b84364..d79771f 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -23,6 +23,7 @@ Patch1: wicd-1.7.1-dbus-failure.patch Patch2: wicd-1.7.0-dbus-policy.patch Patch3: wicd-1.7.1-DaemonClosing.patch Patch4: wicd-1.7.2.4-unicode.patch +Patch5: 770_769.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel @@ -106,6 +107,11 @@ Client program for wicd that uses a GTK+ interface. # Unicode string handling problems %patch4 -p1 +# Upstream patch: +# http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/770 +# For https://bugzilla.redhat.com/show_bug.cgi?id=981667 +%patch5 -p0 + %build rm -f po/ast.po %{__python} setup.py configure \ @@ -275,6 +281,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Mon Dec 09 2013 David Cantrell - 1.7.2.4-8 +- Apply upstream patch to fix exception when changing properties in + wicd-gtk (#981667) + * Sun Aug 04 2013 Fedora Release Engineering - 1.7.2.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 412249b91befa4192a8031ab69de129144b39778 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 9 Dec 2013 09:30:18 -0500 Subject: [PATCH 05/40] Apply upstream patch to fix exception when changing properties in wicd-gtk (#981667) --- 770_769.diff | 16 ++++++++++++++++ wicd.spec | 12 +++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 770_769.diff diff --git a/770_769.diff b/770_769.diff new file mode 100644 index 0000000..2fddc9a --- /dev/null +++ b/770_769.diff @@ -0,0 +1,16 @@ +=== modified file 'wicd/misc.py' +--- wicd/misc.py 2012-04-30 19:20:47 +0000 ++++ wicd/misc.py 2012-05-03 16:01:49 +0000 +@@ -430,7 +430,10 @@ + """ Sanitize property names to be used in config-files. """ + allowed = string.ascii_letters + '_' + string.digits + table = string.maketrans(allowed, ' ' * len(allowed)) +- return s.translate(None, table) ++ ++ # s is a dbus.String -- since we don't allow unicode property keys, ++ # make it simple. ++ return str(s).translate(None, table) + + def sanitize_escaped(s): + """ Sanitize double-escaped unicode strings. """ + diff --git a/wicd.spec b/wicd.spec index f356008..dfbf16f 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -23,6 +23,7 @@ Patch1: wicd-1.7.1-dbus-failure.patch Patch2: wicd-1.7.0-dbus-policy.patch Patch3: wicd-1.7.1-DaemonClosing.patch Patch4: wicd-1.7.2.4-unicode.patch +Patch5: 770_769.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel @@ -106,6 +107,11 @@ Client program for wicd that uses a GTK+ interface. # Unicode string handling problems %patch4 -p1 +# Upstream patch: +# http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/770 +# For https://bugzilla.redhat.com/show_bug.cgi?id=981667 +%patch5 -p0 + %build rm -f po/ast.po %{__python} setup.py configure \ @@ -275,6 +281,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Mon Dec 09 2013 David Cantrell - 1.7.2.4-7 +- Apply upstream patch to fix exception when changing properties in + wicd-gtk (#981667) + * Mon Apr 01 2013 David Cantrell - 1.7.2.4-6 - systemd_post_with_restart -> systemd_postun_with_restart (#901753) From f2dc53aa3fe63b5e4b36712ad850a93d22514106 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 23:31:39 -0500 Subject: [PATCH 06/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index d79771f..4fbaf39 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -281,6 +281,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.7.2.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Dec 09 2013 David Cantrell - 1.7.2.4-8 - Apply upstream patch to fix exception when changing properties in wicd-gtk (#981667) From aa678f6fcee0e29a62f0cbaeab3a92e4846d15d4 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 30 Jun 2014 10:35:02 -0400 Subject: [PATCH 07/40] Do not assume wicd-daemon is running when wicd-client runs (#1074315) - Fix wicd-curses crash on startup (#894646) - Edit default D-Bus policy file to allow 'users' group members to run wicd client programs (#1074372) --- wicd-1.7.2.4-check-for-daemon.patch | 17 +++++++ wicd-1.7.2.4-curses_bz894646.patch | 46 +++++++++++++++++++ ...cy.patch => wicd-1.7.2.4-dbus-policy.patch | 35 ++++++++------ wicd.spec | 22 ++++++++- 4 files changed, 105 insertions(+), 15 deletions(-) create mode 100644 wicd-1.7.2.4-check-for-daemon.patch create mode 100644 wicd-1.7.2.4-curses_bz894646.patch rename wicd-1.7.0-dbus-policy.patch => wicd-1.7.2.4-dbus-policy.patch (72%) diff --git a/wicd-1.7.2.4-check-for-daemon.patch b/wicd-1.7.2.4-check-for-daemon.patch new file mode 100644 index 0000000..5ec4731 --- /dev/null +++ b/wicd-1.7.2.4-check-for-daemon.patch @@ -0,0 +1,17 @@ +diff -up wicd-1.7.2.4/curses/wicd-curses.py.orig wicd-1.7.2.4/curses/wicd-curses.py +diff -up wicd-1.7.2.4/gtk/wicd-client.py.orig wicd-1.7.2.4/gtk/wicd-client.py +--- wicd-1.7.2.4/gtk/wicd-client.py.orig 2012-02-12 05:11:15.000000000 -0500 ++++ wicd-1.7.2.4/gtk/wicd-client.py 2014-06-30 10:14:31.170246038 -0400 +@@ -1063,4 +1063,12 @@ def main(argv): + + + if __name__ == '__main__': ++ if wireless is None: ++ sys.stderr.write("ERROR: Unable to communicate with wicd daemon.\n\n") ++ sys.stderr.write("Be sure the wicd service is enabled and running:\n") ++ sys.stderr.write(" systemctl enable wicd.service\n") ++ sys.stderr.write(" systemctl start wicd.service\n\n") ++ sys.stderr.write("NOTE: NetworkManager and other network device daemons must be disabled.\n") ++ sys.exit(1) ++ + main(sys.argv) diff --git a/wicd-1.7.2.4-curses_bz894646.patch b/wicd-1.7.2.4-curses_bz894646.patch new file mode 100644 index 0000000..50495bd --- /dev/null +++ b/wicd-1.7.2.4-curses_bz894646.patch @@ -0,0 +1,46 @@ +diff --git a/curses/curses_misc.py b/curses/curses_misc.py +index a779fa3..99a7db9 100644 +--- a/curses/curses_misc.py ++++ b/curses/curses_misc.py +@@ -314,9 +314,9 @@ class ComboBox(urwid.WidgetWrap): + #Send key to underlying widget: + self._w.keypress(dim, k) + +- #def get_size(self): +- +- def __init__(self,label='',list=[],attrs=('body','editnfc'),focus_attr='focus',use_enter=True,focus=0,callback=None,user_args=None): ++ def __init__(self, label='', list=[], attrs=('body','editnfc'), ++ focus_attr='focus', use_enter=True, focus=0, callback=None, ++ user_args=None): + """ + label : bit of text that preceeds the combobox. If it is "", then + ignore it +@@ -349,7 +349,7 @@ class ComboBox(urwid.WidgetWrap): + # We need this to pick our keypresses + self.use_enter = use_enter + +- self.focus = focus ++ self._focus = focus + + self.callback = callback + self.user_args = user_args +@@ -358,6 +358,19 @@ class ComboBox(urwid.WidgetWrap): + self.parent = None + self.ui = None + self.row = None ++ ++ @property ++ def focus(self): ++ return self._focus ++ ++ @focus.setter ++ def focus(self, index): ++ self._focus = index ++ ++ @focus.deleter ++ def focus(self): ++ del self._focus ++ + def set_list(self,list): + self.list = list + diff --git a/wicd-1.7.0-dbus-policy.patch b/wicd-1.7.2.4-dbus-policy.patch similarity index 72% rename from wicd-1.7.0-dbus-policy.patch rename to wicd-1.7.2.4-dbus-policy.patch index 9b722ec..866f4d3 100644 --- a/wicd-1.7.0-dbus-policy.patch +++ b/wicd-1.7.2.4-dbus-policy.patch @@ -1,7 +1,7 @@ -diff -up wicd-1.7.0/in/other=wicd.conf.in.orig wicd-1.7.0/in/other=wicd.conf.in ---- wicd-1.7.0/in/other=wicd.conf.in.orig 2010-01-14 23:49:11.000000000 -0500 -+++ wicd-1.7.0/in/other=wicd.conf.in 2011-08-11 16:57:20.818332542 -0400 -@@ -7,41 +7,24 @@ +diff -up wicd-1.7.2.4/in/other=wicd.conf.in.dbus wicd-1.7.2.4/in/other=wicd.conf.in +--- wicd-1.7.2.4/in/other=wicd.conf.in.dbus 2011-09-18 04:48:13.000000000 -0400 ++++ wicd-1.7.2.4/in/other=wicd.conf.in 2014-06-30 10:29:35.968246038 -0400 +@@ -7,41 +7,34 @@ @@ -15,27 +15,36 @@ diff -up wicd-1.7.0/in/other=wicd.conf.in.orig wicd-1.7.0/in/other=wicd.conf.in + - - - - +- +- +- +- - - -- -- ++ ++ + + - - -- -- ++ ++ ++ ++ + + - -- ++ ++ ++ + diff --git a/wicd.spec b/wicd.spec index 4fbaf39..08de07d 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -20,10 +20,12 @@ Source1: org.wicd.daemon.service Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch Patch1: wicd-1.7.1-dbus-failure.patch -Patch2: wicd-1.7.0-dbus-policy.patch +Patch2: wicd-1.7.2.4-dbus-policy.patch Patch3: wicd-1.7.1-DaemonClosing.patch Patch4: wicd-1.7.2.4-unicode.patch Patch5: 770_769.diff +Patch6: wicd-1.7.2.4-check-for-daemon.patch +Patch7: wicd-1.7.2.4-curses_bz894646.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel @@ -112,6 +114,16 @@ Client program for wicd that uses a GTK+ interface. # For https://bugzilla.redhat.com/show_bug.cgi?id=981667 %patch5 -p0 +# In wicd-client.py (the GTK+ client), make sure we were able to talk to +# the daemon before running. If we could not, exit as a failure and explain +# to the user what they should try. +# https://bugzilla.redhat.com/show_bug.cgi?id=1074315 +%patch6 -p1 + +# Fix curses client crash on startup. +# https://bugzilla.redhat.com/show_bug.cgi?id=894646 +%patch7 -p1 + %build rm -f po/ast.po %{__python} setup.py configure \ @@ -281,6 +293,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Mon Jun 30 2014 David Cantrell - 1.7.2.4-10 +- Do not assume wicd-daemon is running when wicd-client runs (#1074315) +- Fix wicd-curses crash on startup (#894646) +- Edit default D-Bus policy file to allow 'users' group members to run + wicd client programs (#1074372) + * Sun Jun 08 2014 Fedora Release Engineering - 1.7.2.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From e7be2d09e5043e00edfbd8e5c68bb37cdd21ccb3 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 2 Jul 2014 11:26:06 -0400 Subject: [PATCH 08/40] Prevent crash when saving network properties (#996693) --- wicd-1.7.2.4-sanitize.patch | 30 ++++++++++++++++++++++++++++++ wicd.spec | 11 ++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 wicd-1.7.2.4-sanitize.patch diff --git a/wicd-1.7.2.4-sanitize.patch b/wicd-1.7.2.4-sanitize.patch new file mode 100644 index 0000000..9722d92 --- /dev/null +++ b/wicd-1.7.2.4-sanitize.patch @@ -0,0 +1,30 @@ +diff -up wicd-1.7.2.4/wicd/wicd-daemon.py.sanitize wicd-1.7.2.4/wicd/wicd-daemon.py +--- wicd-1.7.2.4/wicd/wicd-daemon.py.sanitize 2014-07-02 11:24:51.171030709 -0400 ++++ wicd-1.7.2.4/wicd/wicd-daemon.py 2014-07-02 11:25:09.780030709 -0400 +@@ -1064,7 +1064,7 @@ class WirelessDaemon(dbus.service.Object + def SetWirelessProperty(self, netid, prop, value): + """ Sets property to value in network specified. """ + # We don't write script settings here. +- prop = misc.sanitize_config(prop) ++ prop = misc.sanitize_config(str(prop)) + if prop.endswith('script'): + print 'Setting script properties through the daemon' \ + + ' is not permitted.' +@@ -1265,7 +1265,7 @@ class WirelessDaemon(dbus.service.Object + @dbus.service.method('org.wicd.daemon.wireless') + def SaveWirelessNetworkProperty(self, id, option): + """ Writes a particular wireless property to disk. """ +- option = misc.sanitize_config(option) ++ option = misc.sanitize_config(str(option)) + if option.endswith("script"): + print 'You cannot save script information to disk through ' + \ + 'the daemon.' +@@ -1408,7 +1408,7 @@ class WiredDaemon(dbus.service.Object): + def SetWiredProperty(self, prop, value): + """ Sets the given property to the given value. """ + if self.WiredNetwork: +- prop = misc.sanitize_config(prop) ++ prop = misc.sanitize_config(str(prop)) + if prop.endswith('script'): + print 'Setting script properties through the daemon' \ + + ' is not permitted.' diff --git a/wicd.spec b/wicd.spec index dfbf16f..107346c 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -24,6 +24,7 @@ Patch2: wicd-1.7.0-dbus-policy.patch Patch3: wicd-1.7.1-DaemonClosing.patch Patch4: wicd-1.7.2.4-unicode.patch Patch5: 770_769.diff +Patch6: wicd-1.7.2.4-sanitize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel @@ -112,6 +113,11 @@ Client program for wicd that uses a GTK+ interface. # For https://bugzilla.redhat.com/show_bug.cgi?id=981667 %patch5 -p0 +# Fix crash when trying to save network properties. +# Upstream bug report and patch: +# https://bugs.launchpad.net/wicd/+bug/993912 +%patch6 -p1 + %build rm -f po/ast.po %{__python} setup.py configure \ @@ -281,6 +287,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Wed Jul 02 2014 David Cantrell - 1.7.2.4-8 +- Prevent crash when saving network properties (#996693) + * Mon Dec 09 2013 David Cantrell - 1.7.2.4-7 - Apply upstream patch to fix exception when changing properties in wicd-gtk (#981667) From 1828b1dd1e3b2418829eb0083b2e7363508295d2 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 2 Jul 2014 11:53:27 -0400 Subject: [PATCH 09/40] Prevent crash when saving network settings (#996693) --- wicd-1.7.2.4-sanitize.patch | 30 ++++++++++++++++++++++++++++++ wicd.spec | 11 ++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 wicd-1.7.2.4-sanitize.patch diff --git a/wicd-1.7.2.4-sanitize.patch b/wicd-1.7.2.4-sanitize.patch new file mode 100644 index 0000000..9722d92 --- /dev/null +++ b/wicd-1.7.2.4-sanitize.patch @@ -0,0 +1,30 @@ +diff -up wicd-1.7.2.4/wicd/wicd-daemon.py.sanitize wicd-1.7.2.4/wicd/wicd-daemon.py +--- wicd-1.7.2.4/wicd/wicd-daemon.py.sanitize 2014-07-02 11:24:51.171030709 -0400 ++++ wicd-1.7.2.4/wicd/wicd-daemon.py 2014-07-02 11:25:09.780030709 -0400 +@@ -1064,7 +1064,7 @@ class WirelessDaemon(dbus.service.Object + def SetWirelessProperty(self, netid, prop, value): + """ Sets property to value in network specified. """ + # We don't write script settings here. +- prop = misc.sanitize_config(prop) ++ prop = misc.sanitize_config(str(prop)) + if prop.endswith('script'): + print 'Setting script properties through the daemon' \ + + ' is not permitted.' +@@ -1265,7 +1265,7 @@ class WirelessDaemon(dbus.service.Object + @dbus.service.method('org.wicd.daemon.wireless') + def SaveWirelessNetworkProperty(self, id, option): + """ Writes a particular wireless property to disk. """ +- option = misc.sanitize_config(option) ++ option = misc.sanitize_config(str(option)) + if option.endswith("script"): + print 'You cannot save script information to disk through ' + \ + 'the daemon.' +@@ -1408,7 +1408,7 @@ class WiredDaemon(dbus.service.Object): + def SetWiredProperty(self, prop, value): + """ Sets the given property to the given value. """ + if self.WiredNetwork: +- prop = misc.sanitize_config(prop) ++ prop = misc.sanitize_config(str(prop)) + if prop.endswith('script'): + print 'Setting script properties through the daemon' \ + + ' is not permitted.' diff --git a/wicd.spec b/wicd.spec index 08de07d..90e6266 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -26,6 +26,7 @@ Patch4: wicd-1.7.2.4-unicode.patch Patch5: 770_769.diff Patch6: wicd-1.7.2.4-check-for-daemon.patch Patch7: wicd-1.7.2.4-curses_bz894646.patch +Patch8: wicd-1.7.2.4-sanitize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel @@ -124,6 +125,11 @@ Client program for wicd that uses a GTK+ interface. # https://bugzilla.redhat.com/show_bug.cgi?id=894646 %patch7 -p1 +# Prevent crash when saving network settings +# Upstream bug report and patch: +# https://bugs.launchpad.net/wicd/+bug/993912 +%patch8 -p1 + %build rm -f po/ast.po %{__python} setup.py configure \ @@ -293,6 +299,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Wed Jul 02 2014 David Cantrell - 1.7.2.4-11 +- Prevent crash when saving network settings (#996693) + * Mon Jun 30 2014 David Cantrell - 1.7.2.4-10 - Do not assume wicd-daemon is running when wicd-client runs (#1074315) - Fix wicd-curses crash on startup (#894646) From a418458e3c4b7feb67bddf2fdde3a0cfe7d9c6fb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 08:36:10 +0000 Subject: [PATCH 10/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 90e6266..d38c92d 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -299,6 +299,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.7.2.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Jul 02 2014 David Cantrell - 1.7.2.4-11 - Prevent crash when saving network settings (#996693) From 85d8b6a97dedccd4deb3635b202969c365545b35 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 25 Sep 2014 16:04:13 -0400 Subject: [PATCH 11/40] Fix string.translate() usage in misc.py (#1005515) --- wicd-1.7.2.4-translate-args.patch | 12 ++++++++++++ wicd.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 wicd-1.7.2.4-translate-args.patch diff --git a/wicd-1.7.2.4-translate-args.patch b/wicd-1.7.2.4-translate-args.patch new file mode 100644 index 0000000..ec0508d --- /dev/null +++ b/wicd-1.7.2.4-translate-args.patch @@ -0,0 +1,12 @@ +diff -up wicd-1.7.2.4/wicd/misc.py.orig wicd-1.7.2.4/wicd/misc.py +--- wicd-1.7.2.4/wicd/misc.py.orig 2014-09-25 15:58:24.170052173 -0400 ++++ wicd-1.7.2.4/wicd/misc.py 2014-09-25 16:00:04.175052173 -0400 +@@ -433,7 +433,7 @@ def sanitize_config(s): + + # s is a dbus.String -- since we don't allow unicode property keys, + # make it simple. +- return str(s).translate(None, table) ++ return str(s).translate(table) + + def sanitize_escaped(s): + """ Sanitize double-escaped unicode strings. """ diff --git a/wicd.spec b/wicd.spec index 107346c..af7a171 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -25,6 +25,7 @@ Patch3: wicd-1.7.1-DaemonClosing.patch Patch4: wicd-1.7.2.4-unicode.patch Patch5: 770_769.diff Patch6: wicd-1.7.2.4-sanitize.patch +Patch7: wicd-1.7.2.4-translate-args.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel @@ -118,6 +119,10 @@ Client program for wicd that uses a GTK+ interface. # https://bugs.launchpad.net/wicd/+bug/993912 %patch6 -p1 +# translate() on a string requires the table as the first argument +# https://bugzilla.redhat.com/show_bug.cgi?id=1005515 +%patch7 -p1 + %build rm -f po/ast.po %{__python} setup.py configure \ @@ -287,6 +292,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Thu Sep 25 2014 David Cantrell - 1.7.2.4-9 +- Fix string.translate() usage in misc.py (#1005515) + * Wed Jul 02 2014 David Cantrell - 1.7.2.4-8 - Prevent crash when saving network properties (#996693) From 55b6a950f70e8a1b39aee198fee644339aeb0e10 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 25 Sep 2014 16:34:49 -0400 Subject: [PATCH 12/40] Fix string.translate() usage in misc.py (#1005515) --- wicd-1.7.2.4-translate-args.patch | 12 ++++++++++++ wicd.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 wicd-1.7.2.4-translate-args.patch diff --git a/wicd-1.7.2.4-translate-args.patch b/wicd-1.7.2.4-translate-args.patch new file mode 100644 index 0000000..ec0508d --- /dev/null +++ b/wicd-1.7.2.4-translate-args.patch @@ -0,0 +1,12 @@ +diff -up wicd-1.7.2.4/wicd/misc.py.orig wicd-1.7.2.4/wicd/misc.py +--- wicd-1.7.2.4/wicd/misc.py.orig 2014-09-25 15:58:24.170052173 -0400 ++++ wicd-1.7.2.4/wicd/misc.py 2014-09-25 16:00:04.175052173 -0400 +@@ -433,7 +433,7 @@ def sanitize_config(s): + + # s is a dbus.String -- since we don't allow unicode property keys, + # make it simple. +- return str(s).translate(None, table) ++ return str(s).translate(table) + + def sanitize_escaped(s): + """ Sanitize double-escaped unicode strings. """ diff --git a/wicd.spec b/wicd.spec index d38c92d..f0efdf1 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -27,6 +27,7 @@ Patch5: 770_769.diff Patch6: wicd-1.7.2.4-check-for-daemon.patch Patch7: wicd-1.7.2.4-curses_bz894646.patch Patch8: wicd-1.7.2.4-sanitize.patch +Patch9: wicd-1.7.2.4-translate-args.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel @@ -129,6 +130,10 @@ Client program for wicd that uses a GTK+ interface. # Upstream bug report and patch: # https://bugs.launchpad.net/wicd/+bug/993912 %patch8 -p1 + +# translate() on a string requires the table as the first argument +# https://bugzilla.redhat.com/show_bug.cgi?id=1005515 +%patch9 -p1 %build rm -f po/ast.po @@ -299,6 +304,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Thu Sep 25 2014 David Cantrell - 1.7.2.4-13 +- Fix string.translate() usage in misc.py (#1005515) + * Mon Aug 18 2014 Fedora Release Engineering - 1.7.2.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 7baa159fe9868521bfeadb1db846e304d4758f02 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 29 Sep 2014 09:47:52 -0400 Subject: [PATCH 13/40] Remove check for daemon patch (#1074315) --- wicd-1.7.2.4-check-for-daemon.patch | 17 ----------------- wicd.spec | 24 ++++++++++-------------- 2 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 wicd-1.7.2.4-check-for-daemon.patch diff --git a/wicd-1.7.2.4-check-for-daemon.patch b/wicd-1.7.2.4-check-for-daemon.patch deleted file mode 100644 index 5ec4731..0000000 --- a/wicd-1.7.2.4-check-for-daemon.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up wicd-1.7.2.4/curses/wicd-curses.py.orig wicd-1.7.2.4/curses/wicd-curses.py -diff -up wicd-1.7.2.4/gtk/wicd-client.py.orig wicd-1.7.2.4/gtk/wicd-client.py ---- wicd-1.7.2.4/gtk/wicd-client.py.orig 2012-02-12 05:11:15.000000000 -0500 -+++ wicd-1.7.2.4/gtk/wicd-client.py 2014-06-30 10:14:31.170246038 -0400 -@@ -1063,4 +1063,12 @@ def main(argv): - - - if __name__ == '__main__': -+ if wireless is None: -+ sys.stderr.write("ERROR: Unable to communicate with wicd daemon.\n\n") -+ sys.stderr.write("Be sure the wicd service is enabled and running:\n") -+ sys.stderr.write(" systemctl enable wicd.service\n") -+ sys.stderr.write(" systemctl start wicd.service\n\n") -+ sys.stderr.write("NOTE: NetworkManager and other network device daemons must be disabled.\n") -+ sys.exit(1) -+ - main(sys.argv) diff --git a/wicd.spec b/wicd.spec index f0efdf1..8346f1c 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -24,10 +24,9 @@ Patch2: wicd-1.7.2.4-dbus-policy.patch Patch3: wicd-1.7.1-DaemonClosing.patch Patch4: wicd-1.7.2.4-unicode.patch Patch5: 770_769.diff -Patch6: wicd-1.7.2.4-check-for-daemon.patch -Patch7: wicd-1.7.2.4-curses_bz894646.patch -Patch8: wicd-1.7.2.4-sanitize.patch -Patch9: wicd-1.7.2.4-translate-args.patch +Patch6: wicd-1.7.2.4-curses_bz894646.patch +Patch7: wicd-1.7.2.4-sanitize.patch +Patch8: wicd-1.7.2.4-translate-args.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel @@ -116,24 +115,18 @@ Client program for wicd that uses a GTK+ interface. # For https://bugzilla.redhat.com/show_bug.cgi?id=981667 %patch5 -p0 -# In wicd-client.py (the GTK+ client), make sure we were able to talk to -# the daemon before running. If we could not, exit as a failure and explain -# to the user what they should try. -# https://bugzilla.redhat.com/show_bug.cgi?id=1074315 -%patch6 -p1 - # Fix curses client crash on startup. # https://bugzilla.redhat.com/show_bug.cgi?id=894646 -%patch7 -p1 +%patch6 -p1 # Prevent crash when saving network settings # Upstream bug report and patch: # https://bugs.launchpad.net/wicd/+bug/993912 -%patch8 -p1 +%patch7 -p1 # translate() on a string requires the table as the first argument # https://bugzilla.redhat.com/show_bug.cgi?id=1005515 -%patch9 -p1 +%patch8 -p1 %build rm -f po/ast.po @@ -304,6 +297,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Mon Sep 29 2014 David Cantrell - 1.7.2.4-14 +- Remove check for daemon patch (#1074315) + * Thu Sep 25 2014 David Cantrell - 1.7.2.4-13 - Fix string.translate() usage in misc.py (#1005515) From 01a181a9fb1c4da9036717d27223656835d3a835 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 25 Nov 2014 11:46:12 -0500 Subject: [PATCH 14/40] self.prog_name -> self.prof_name in netentry_curses.py (#1162118) --- wicd-1.7.2.4-prof_name.patch | 12 ++++++++++++ wicd.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 wicd-1.7.2.4-prof_name.patch diff --git a/wicd-1.7.2.4-prof_name.patch b/wicd-1.7.2.4-prof_name.patch new file mode 100644 index 0000000..796647f --- /dev/null +++ b/wicd-1.7.2.4-prof_name.patch @@ -0,0 +1,12 @@ +diff -up wicd-1.7.2.4/curses/netentry_curses.py.orig wicd-1.7.2.4/curses/netentry_curses.py +--- wicd-1.7.2.4/curses/netentry_curses.py.orig 2014-11-25 11:22:47.141413897 -0500 ++++ wicd-1.7.2.4/curses/netentry_curses.py 2014-11-25 11:25:19.904413897 -0500 +@@ -264,7 +264,7 @@ class WiredSettingsDialog(AdvancedSettin + self.set_values() + + self.prof_name = name +- title = ''.join([_('Configuring preferences for wired profile'), self.prog_name]) ++ title = ''.join([_('Configuring preferences for wired profile'), self.prof_name]) + self._w.header = urwid.Text( ('header',title),align='right' ) + + self.set_values() diff --git a/wicd.spec b/wicd.spec index 8346f1c..a5dcaf0 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -27,6 +27,7 @@ Patch5: 770_769.diff Patch6: wicd-1.7.2.4-curses_bz894646.patch Patch7: wicd-1.7.2.4-sanitize.patch Patch8: wicd-1.7.2.4-translate-args.patch +Patch9: wicd-1.7.2.4-prof_name.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel @@ -127,6 +128,9 @@ Client program for wicd that uses a GTK+ interface. # translate() on a string requires the table as the first argument # https://bugzilla.redhat.com/show_bug.cgi?id=1005515 %patch8 -p1 + +# self.prog_name should be self.prof_name (#1162118) +%patch9 -p1 %build rm -f po/ast.po @@ -297,6 +301,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Tue Nov 25 2014 David Cantrell - 1.7.2.4-15 +- self.prog_name -> self.prof_name in netentry_curses.py (#1162118) + * Mon Sep 29 2014 David Cantrell - 1.7.2.4-14 - Remove check for daemon patch (#1074315) From 7523d014a30ab430a14d7c3ea917bb4864a05808 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 9 Apr 2015 09:10:48 -0400 Subject: [PATCH 15/40] Remove dependency on pm-utils (#1208313) --- wicd.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/wicd.spec b/wicd.spec index a5dcaf0..85d49a4 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -36,7 +36,6 @@ BuildRequires: desktop-file-utils BuildRequires: pkgconfig BuildRequires: systemd-units -Requires: pm-utils >= 1.2.4 Requires: %{name}-common = %{version}-%{release} %description @@ -140,10 +139,10 @@ rm -f po/ast.po --share %{_datadir}/wicd \ --etc %{_sysconfdir}/wicd \ --bin %{_bindir} \ - --pmutils %{_libdir}/pm-utils/sleep.d \ --log %{_localstatedir}/log \ --systemd %{_systemd_unitdir} \ - --no-install-init + --no-install-init \ + --no-install-pmutils %{__python} setup.py build %{__python} setup.py compile_translations @@ -215,6 +214,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files %defattr(-,root,root,-) %{_libdir}/pm-utils/sleep.d/55wicd +%{_datadir}/autostart/wicd-tray.desktop %files common -f %{name}.lang %defattr(-,root,root,-) @@ -301,6 +301,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Thu Apr 09 2015 David Cantrell - 1.7.2.4-16 +- Remove dependency on pm-utils (#1208313) + * Tue Nov 25 2014 David Cantrell - 1.7.2.4-15 - self.prog_name -> self.prof_name in netentry_curses.py (#1162118) From 4a5124dbc24797df567955b9317718cc596838f1 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 9 Apr 2015 09:16:22 -0400 Subject: [PATCH 16/40] Remove dependency on pm-utils (#1208313) --- wicd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 85d49a4..049da94 100644 --- a/wicd.spec +++ b/wicd.spec @@ -213,7 +213,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files %defattr(-,root,root,-) -%{_libdir}/pm-utils/sleep.d/55wicd %{_datadir}/autostart/wicd-tray.desktop %files common -f %{name}.lang From 97a738e359993cfb7f1f74899d03b9d96d36b6e4 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 9 Apr 2015 10:00:45 -0400 Subject: [PATCH 17/40] Remove dependency on pm-utils (#1208313) --- wicd.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wicd.spec b/wicd.spec index 049da94..edceffa 100644 --- a/wicd.spec +++ b/wicd.spec @@ -213,11 +213,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files %defattr(-,root,root,-) -%{_datadir}/autostart/wicd-tray.desktop +%doc AUTHORS CHANGES LICENSE NEWS README other/WHEREAREMYFILES %files common -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS CHANGES LICENSE NEWS README other/WHEREAREMYFILES %dir %{python_sitelib}/wicd %dir %{_sysconfdir}/wicd %dir %{_sysconfdir}/wicd/encryption From 96a18146b22e2fa0eb624ff4ef6e57a7a874bfa7 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 9 Apr 2015 13:19:41 -0400 Subject: [PATCH 18/40] Upgrade to wicd-1.7.3 (#1176990) --- .gitignore | 2 +- 770_769.diff | 16 ------- sources | 2 +- wicd-1.7.1-DaemonClosing.patch | 12 ----- wicd-1.7.2.4-curses_bz894646.patch | 46 ------------------- wicd-1.7.2.4-prof_name.patch | 12 ----- wicd-1.7.2.4-translate-args.patch | 12 ----- wicd-1.7.2.4-unicode.patch | 21 --------- wicd-1.7.3-DaemonClosing.patch | 12 +++++ ...ure.patch => wicd-1.7.3-dbus-failure.patch | 28 +++++------ ...=> wicd-1.7.3-remove-WHEREAREMYFILES.patch | 36 +++++++-------- ...anitize.patch => wicd-1.7.3-sanitize.patch | 14 +++--- wicd-1.7.3-unicode.patch | 26 +++++++++++ wicd.spec | 42 ++++++----------- 14 files changed, 92 insertions(+), 189 deletions(-) delete mode 100644 770_769.diff delete mode 100644 wicd-1.7.1-DaemonClosing.patch delete mode 100644 wicd-1.7.2.4-curses_bz894646.patch delete mode 100644 wicd-1.7.2.4-prof_name.patch delete mode 100644 wicd-1.7.2.4-translate-args.patch delete mode 100644 wicd-1.7.2.4-unicode.patch create mode 100644 wicd-1.7.3-DaemonClosing.patch rename wicd-1.7.1-dbus-failure.patch => wicd-1.7.3-dbus-failure.patch (52%) rename wicd-1.7.0-remove-WHEREAREMYFILES.patch => wicd-1.7.3-remove-WHEREAREMYFILES.patch (51%) rename wicd-1.7.2.4-sanitize.patch => wicd-1.7.3-sanitize.patch (70%) create mode 100644 wicd-1.7.3-unicode.patch diff --git a/.gitignore b/.gitignore index fe25d73..30930fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -wicd-1.7.2.4.tar.gz +wicd-1.7.3.tar.gz diff --git a/770_769.diff b/770_769.diff deleted file mode 100644 index 2fddc9a..0000000 --- a/770_769.diff +++ /dev/null @@ -1,16 +0,0 @@ -=== modified file 'wicd/misc.py' ---- wicd/misc.py 2012-04-30 19:20:47 +0000 -+++ wicd/misc.py 2012-05-03 16:01:49 +0000 -@@ -430,7 +430,10 @@ - """ Sanitize property names to be used in config-files. """ - allowed = string.ascii_letters + '_' + string.digits - table = string.maketrans(allowed, ' ' * len(allowed)) -- return s.translate(None, table) -+ -+ # s is a dbus.String -- since we don't allow unicode property keys, -+ # make it simple. -+ return str(s).translate(None, table) - - def sanitize_escaped(s): - """ Sanitize double-escaped unicode strings. """ - diff --git a/sources b/sources index 9a163ee..775e7d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c2435ddfdef0b9898852d72a85a45f0f wicd-1.7.2.4.tar.gz +162ca2e6f4ab903bb7ab2bc0adb7d1aa wicd-1.7.3.tar.gz diff --git a/wicd-1.7.1-DaemonClosing.patch b/wicd-1.7.1-DaemonClosing.patch deleted file mode 100644 index 1079523..0000000 --- a/wicd-1.7.1-DaemonClosing.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up wicd-1.7.1/wicd/wicd-daemon.py.orig wicd-1.7.1/wicd/wicd-daemon.py ---- wicd-1.7.1/wicd/wicd-daemon.py.orig 2012-02-02 11:38:26.000000000 -0500 -+++ wicd-1.7.1/wicd/wicd-daemon.py 2012-03-22 10:21:38.735140300 -0400 -@@ -812,7 +812,7 @@ class WicdDaemon(dbus.service.Object): - pass - - @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='') -- def DaemonClosing(self): -+ def DaemonClosing(self, arg1=None, arg2=None): - """ Emits a signal indicating the daemon will be closing. """ - pass - diff --git a/wicd-1.7.2.4-curses_bz894646.patch b/wicd-1.7.2.4-curses_bz894646.patch deleted file mode 100644 index 50495bd..0000000 --- a/wicd-1.7.2.4-curses_bz894646.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/curses/curses_misc.py b/curses/curses_misc.py -index a779fa3..99a7db9 100644 ---- a/curses/curses_misc.py -+++ b/curses/curses_misc.py -@@ -314,9 +314,9 @@ class ComboBox(urwid.WidgetWrap): - #Send key to underlying widget: - self._w.keypress(dim, k) - -- #def get_size(self): -- -- def __init__(self,label='',list=[],attrs=('body','editnfc'),focus_attr='focus',use_enter=True,focus=0,callback=None,user_args=None): -+ def __init__(self, label='', list=[], attrs=('body','editnfc'), -+ focus_attr='focus', use_enter=True, focus=0, callback=None, -+ user_args=None): - """ - label : bit of text that preceeds the combobox. If it is "", then - ignore it -@@ -349,7 +349,7 @@ class ComboBox(urwid.WidgetWrap): - # We need this to pick our keypresses - self.use_enter = use_enter - -- self.focus = focus -+ self._focus = focus - - self.callback = callback - self.user_args = user_args -@@ -358,6 +358,19 @@ class ComboBox(urwid.WidgetWrap): - self.parent = None - self.ui = None - self.row = None -+ -+ @property -+ def focus(self): -+ return self._focus -+ -+ @focus.setter -+ def focus(self, index): -+ self._focus = index -+ -+ @focus.deleter -+ def focus(self): -+ del self._focus -+ - def set_list(self,list): - self.list = list - diff --git a/wicd-1.7.2.4-prof_name.patch b/wicd-1.7.2.4-prof_name.patch deleted file mode 100644 index 796647f..0000000 --- a/wicd-1.7.2.4-prof_name.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up wicd-1.7.2.4/curses/netentry_curses.py.orig wicd-1.7.2.4/curses/netentry_curses.py ---- wicd-1.7.2.4/curses/netentry_curses.py.orig 2014-11-25 11:22:47.141413897 -0500 -+++ wicd-1.7.2.4/curses/netentry_curses.py 2014-11-25 11:25:19.904413897 -0500 -@@ -264,7 +264,7 @@ class WiredSettingsDialog(AdvancedSettin - self.set_values() - - self.prof_name = name -- title = ''.join([_('Configuring preferences for wired profile'), self.prog_name]) -+ title = ''.join([_('Configuring preferences for wired profile'), self.prof_name]) - self._w.header = urwid.Text( ('header',title),align='right' ) - - self.set_values() diff --git a/wicd-1.7.2.4-translate-args.patch b/wicd-1.7.2.4-translate-args.patch deleted file mode 100644 index ec0508d..0000000 --- a/wicd-1.7.2.4-translate-args.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up wicd-1.7.2.4/wicd/misc.py.orig wicd-1.7.2.4/wicd/misc.py ---- wicd-1.7.2.4/wicd/misc.py.orig 2014-09-25 15:58:24.170052173 -0400 -+++ wicd-1.7.2.4/wicd/misc.py 2014-09-25 16:00:04.175052173 -0400 -@@ -433,7 +433,7 @@ def sanitize_config(s): - - # s is a dbus.String -- since we don't allow unicode property keys, - # make it simple. -- return str(s).translate(None, table) -+ return str(s).translate(table) - - def sanitize_escaped(s): - """ Sanitize double-escaped unicode strings. """ diff --git a/wicd-1.7.2.4-unicode.patch b/wicd-1.7.2.4-unicode.patch deleted file mode 100644 index 40ab99a..0000000 --- a/wicd-1.7.2.4-unicode.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up wicd-1.7.2.4/curses/netentry_curses.py.unicode wicd-1.7.2.4/curses/netentry_curses.py ---- wicd-1.7.2.4/curses/netentry_curses.py.unicode 2012-02-11 15:35:45.000000000 -0500 -+++ wicd-1.7.2.4/curses/netentry_curses.py 2012-10-23 14:06:36.537948070 -0400 -@@ -264,7 +264,7 @@ class WiredSettingsDialog(AdvancedSettin - self.set_values() - - self.prof_name = name -- title = _('Configuring preferences for wired profile "$A"').replace('$A',self.prof_name) -+ title = ''.join([_('Configuring preferences for wired profile'), self.prog_name]) - self._w.header = urwid.Text( ('header',title),align='right' ) - - self.set_values() -@@ -386,7 +386,7 @@ class WirelessSettingsDialog(AdvancedSet - self.encrypt_types = misc.LoadEncryptionMethods() - self.set_values() - -- title = _('Configuring preferences for wireless network "$A" ($B)').replace('$A',wireless.GetWirelessProperty(networkID,'essid')).replace('$B',wireless.GetWirelessProperty(networkID,'bssid')) -+ title = ''.join([_('Configuring preferences for wireless network'), wireless.GetWirelessProperty(networkID,'essid'), "(%s)" % wireless.GetWirelessProperty(networkID,'bssid')]) - self._w.header = urwid.Text(('header',title),align='right' ) - - def set_values(self): diff --git a/wicd-1.7.3-DaemonClosing.patch b/wicd-1.7.3-DaemonClosing.patch new file mode 100644 index 0000000..782505b --- /dev/null +++ b/wicd-1.7.3-DaemonClosing.patch @@ -0,0 +1,12 @@ +diff -up wicd-1.7.3/wicd/wicd-daemon.py.orig wicd-1.7.3/wicd/wicd-daemon.py +--- wicd-1.7.3/wicd/wicd-daemon.py.orig 2014-12-21 14:40:46.000000000 -0500 ++++ wicd-1.7.3/wicd/wicd-daemon.py 2015-04-09 10:27:54.203884159 -0400 +@@ -835,7 +835,7 @@ class WicdDaemon(dbus.service.Object, ob + pass + + @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='') +- def DaemonClosing(self): ++ def DaemonClosing(self, arg1=None, arg2=None): + """ Emits a signal indicating the daemon will be closing. """ + # By default, disconnect network links on close. + if not self.keep_connection: diff --git a/wicd-1.7.1-dbus-failure.patch b/wicd-1.7.3-dbus-failure.patch similarity index 52% rename from wicd-1.7.1-dbus-failure.patch rename to wicd-1.7.3-dbus-failure.patch index a9767e7..70a786a 100644 --- a/wicd-1.7.1-dbus-failure.patch +++ b/wicd-1.7.3-dbus-failure.patch @@ -1,8 +1,8 @@ -diff -up wicd-1.7.1/cli/wicd-cli.py.dbus-failure wicd-1.7.1/cli/wicd-cli.py ---- wicd-1.7.1/cli/wicd-cli.py.dbus-failure 2012-01-15 09:19:03.000000000 -0500 -+++ wicd-1.7.1/cli/wicd-cli.py 2012-02-10 15:26:31.709169719 -0500 -@@ -47,6 +47,10 @@ if not daemon: - print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.' +diff -up wicd-1.7.3/cli/wicd-cli.py.orig wicd-1.7.3/cli/wicd-cli.py +--- wicd-1.7.3/cli/wicd-cli.py.orig 2014-12-21 14:40:46.000000000 -0500 ++++ wicd-1.7.3/cli/wicd-cli.py 2015-04-09 10:25:48.171078635 -0400 +@@ -61,6 +61,10 @@ if not daemon: + 'Please make sure the wicd service is running.' sys.exit(3) +if daemon is None: @@ -12,11 +12,11 @@ diff -up wicd-1.7.1/cli/wicd-cli.py.dbus-failure wicd-1.7.1/cli/wicd-cli.py parser = optparse.OptionParser() parser.add_option('--network', '-n', type='int', default=-1) -diff -up wicd-1.7.1/curses/wicd-curses.py.dbus-failure wicd-1.7.1/curses/wicd-curses.py ---- wicd-1.7.1/curses/wicd-curses.py.dbus-failure 2012-02-02 11:38:26.000000000 -0500 -+++ wicd-1.7.1/curses/wicd-curses.py 2012-02-10 15:26:31.709169719 -0500 -@@ -1037,6 +1037,10 @@ def setup_dbus(force=True): - print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.' +diff -up wicd-1.7.3/curses/wicd-curses.py.orig wicd-1.7.3/curses/wicd-curses.py +--- wicd-1.7.3/curses/wicd-curses.py.orig 2014-12-21 14:40:46.000000000 -0500 ++++ wicd-1.7.3/curses/wicd-curses.py 2015-04-09 10:25:48.184078719 -0400 +@@ -1277,6 +1277,10 @@ def setup_dbus(force=True): + 'Please make sure the wicd service is running.' sys.exit(3) + if daemon is None: @@ -26,10 +26,10 @@ diff -up wicd-1.7.1/curses/wicd-curses.py.dbus-failure wicd-1.7.1/curses/wicd-cu netentry_curses.dbus_init(dbus_ifaces) return True -diff -up wicd-1.7.1/gtk/gui.py.dbus-failure wicd-1.7.1/gtk/gui.py ---- wicd-1.7.1/gtk/gui.py.dbus-failure 2012-01-15 09:24:23.000000000 -0500 -+++ wicd-1.7.1/gtk/gui.py 2012-02-10 15:26:31.711170031 -0500 -@@ -158,6 +158,17 @@ class appGui(object): +diff -up wicd-1.7.3/gtk/gui.py.orig wicd-1.7.3/gtk/gui.py +--- wicd-1.7.3/gtk/gui.py.orig 2014-12-21 14:40:46.000000000 -0500 ++++ wicd-1.7.3/gtk/gui.py 2015-04-09 10:25:48.184078719 -0400 +@@ -183,6 +183,17 @@ class appGui(object): d.run() sys.exit(1) diff --git a/wicd-1.7.0-remove-WHEREAREMYFILES.patch b/wicd-1.7.3-remove-WHEREAREMYFILES.patch similarity index 51% rename from wicd-1.7.0-remove-WHEREAREMYFILES.patch rename to wicd-1.7.3-remove-WHEREAREMYFILES.patch index cf08ae5..2b86867 100644 --- a/wicd-1.7.0-remove-WHEREAREMYFILES.patch +++ b/wicd-1.7.3-remove-WHEREAREMYFILES.patch @@ -1,9 +1,9 @@ -diff -up wicd-1.7.0/in/man=wicd-curses.8.in.orig wicd-1.7.0/in/man=wicd-curses.8.in ---- wicd-1.7.0/in/man=wicd-curses.8.in.orig 2010-01-14 18:49:11.000000000 -1000 -+++ wicd-1.7.0/in/man=wicd-curses.8.in 2010-05-19 09:20:00.000000000 -1000 -@@ -57,10 +57,6 @@ Bring up instructions on how to edit the - .BR O - Raise the Ad-Hoc network creation dialog +diff -up wicd-1.7.3/in/man=wicd-curses.8.in.orig wicd-1.7.3/in/man=wicd-curses.8.in +--- wicd-1.7.3/in/man=wicd-curses.8.in.orig 2014-12-21 14:40:46.000000000 -0500 ++++ wicd-1.7.3/in/man=wicd-curses.8.in 2015-04-09 10:24:30.923580121 -0400 +@@ -60,10 +60,6 @@ Raise the Ad-Hoc network creation dialog + .BR X + Show the list of saved wireless networks, to be able to remove them -.SH "FILES" -.TP @@ -12,10 +12,10 @@ diff -up wicd-1.7.0/in/man=wicd-curses.8.in.orig wicd-1.7.0/in/man=wicd-curses.8 .PP .SH "SEE ALSO" .BR wicd-client (1), -diff -up wicd-1.7.0/in/scripts=wicd-client.in.orig wicd-1.7.0/in/scripts=wicd-client.in ---- wicd-1.7.0/in/scripts=wicd-client.in.orig 2010-01-14 18:49:11.000000000 -1000 -+++ wicd-1.7.0/in/scripts=wicd-client.in 2010-05-19 09:20:25.000000000 -1000 -@@ -6,10 +6,6 @@ NC=$(tput sgr0) +diff -up wicd-1.7.3/in/scripts=wicd-client.in.orig wicd-1.7.3/in/scripts=wicd-client.in +--- wicd-1.7.3/in/scripts=wicd-client.in.orig 2014-12-21 14:40:46.000000000 -0500 ++++ wicd-1.7.3/in/scripts=wicd-client.in 2015-04-09 10:24:30.923580121 -0400 +@@ -3,10 +3,6 @@ if [ ! -d "$HOME/.wicd" ]; then mkdir -p "$HOME/.wicd" fi @@ -24,11 +24,11 @@ diff -up wicd-1.7.0/in/scripts=wicd-client.in.orig wicd-1.7.0/in/scripts=wicd-cl - ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES" -fi if [ "$DISPLAY" = "" ]; then - if [ -x "%BIN%wicd-curses" ]; then - if [ ! -f "$HOME/.wicd/CLIENT_CURSES_WARNING" ]; then -diff -up wicd-1.7.0/in/scripts=wicd-curses.in.orig wicd-1.7.0/in/scripts=wicd-curses.in ---- wicd-1.7.0/in/scripts=wicd-curses.in.orig 2010-01-14 18:49:11.000000000 -1000 -+++ wicd-1.7.0/in/scripts=wicd-curses.in 2010-05-19 09:20:36.000000000 -1000 + BOLD=$(tput bold) + BLUE=$(tput setaf 4) +diff -up wicd-1.7.3/in/scripts=wicd-curses.in.orig wicd-1.7.3/in/scripts=wicd-curses.in +--- wicd-1.7.3/in/scripts=wicd-curses.in.orig 2014-12-21 14:40:46.000000000 -0500 ++++ wicd-1.7.3/in/scripts=wicd-curses.in 2015-04-09 10:24:30.924580127 -0400 @@ -2,8 +2,5 @@ if [ ! -d "$HOME/.wicd" ]; then mkdir -p "$HOME/.wicd" @@ -38,9 +38,9 @@ diff -up wicd-1.7.0/in/scripts=wicd-curses.in.orig wicd-1.7.0/in/scripts=wicd-cu -fi exec %PYTHON% -O %SHARE%curses/wicd-curses.py $@ -diff -up wicd-1.7.0/in/scripts=wicd-gtk.in.orig wicd-1.7.0/in/scripts=wicd-gtk.in ---- wicd-1.7.0/in/scripts=wicd-gtk.in.orig 2010-01-14 18:49:11.000000000 -1000 -+++ wicd-1.7.0/in/scripts=wicd-gtk.in 2010-05-19 09:20:44.000000000 -1000 +diff -up wicd-1.7.3/in/scripts=wicd-gtk.in.orig wicd-1.7.3/in/scripts=wicd-gtk.in +--- wicd-1.7.3/in/scripts=wicd-gtk.in.orig 2014-12-21 14:40:46.000000000 -0500 ++++ wicd-1.7.3/in/scripts=wicd-gtk.in 2015-04-09 10:24:30.924580127 -0400 @@ -4,9 +4,5 @@ if [ ! -d "$HOME/.wicd" ]; then mkdir -p "$HOME/.wicd" diff --git a/wicd-1.7.2.4-sanitize.patch b/wicd-1.7.3-sanitize.patch similarity index 70% rename from wicd-1.7.2.4-sanitize.patch rename to wicd-1.7.3-sanitize.patch index 9722d92..d44137e 100644 --- a/wicd-1.7.2.4-sanitize.patch +++ b/wicd-1.7.3-sanitize.patch @@ -1,7 +1,7 @@ -diff -up wicd-1.7.2.4/wicd/wicd-daemon.py.sanitize wicd-1.7.2.4/wicd/wicd-daemon.py ---- wicd-1.7.2.4/wicd/wicd-daemon.py.sanitize 2014-07-02 11:24:51.171030709 -0400 -+++ wicd-1.7.2.4/wicd/wicd-daemon.py 2014-07-02 11:25:09.780030709 -0400 -@@ -1064,7 +1064,7 @@ class WirelessDaemon(dbus.service.Object +diff -up wicd-1.7.3/wicd/wicd-daemon.py.orig wicd-1.7.3/wicd/wicd-daemon.py +--- wicd-1.7.3/wicd/wicd-daemon.py.orig 2015-04-09 13:13:54.419639555 -0400 ++++ wicd-1.7.3/wicd/wicd-daemon.py 2015-04-09 13:14:28.473858534 -0400 +@@ -1111,7 +1111,7 @@ class WirelessDaemon(dbus.service.Object def SetWirelessProperty(self, netid, prop, value): """ Sets property to value in network specified. """ # We don't write script settings here. @@ -10,16 +10,16 @@ diff -up wicd-1.7.2.4/wicd/wicd-daemon.py.sanitize wicd-1.7.2.4/wicd/wicd-daemon if prop.endswith('script'): print 'Setting script properties through the daemon' \ + ' is not permitted.' -@@ -1265,7 +1265,7 @@ class WirelessDaemon(dbus.service.Object +@@ -1321,7 +1321,7 @@ class WirelessDaemon(dbus.service.Object @dbus.service.method('org.wicd.daemon.wireless') - def SaveWirelessNetworkProperty(self, id, option): + def SaveWirelessNetworkProperty(self, nid, option): """ Writes a particular wireless property to disk. """ - option = misc.sanitize_config(option) + option = misc.sanitize_config(str(option)) if option.endswith("script"): print 'You cannot save script information to disk through ' + \ 'the daemon.' -@@ -1408,7 +1408,7 @@ class WiredDaemon(dbus.service.Object): +@@ -1488,7 +1488,7 @@ class WiredDaemon(dbus.service.Object, o def SetWiredProperty(self, prop, value): """ Sets the given property to the given value. """ if self.WiredNetwork: diff --git a/wicd-1.7.3-unicode.patch b/wicd-1.7.3-unicode.patch new file mode 100644 index 0000000..91763f1 --- /dev/null +++ b/wicd-1.7.3-unicode.patch @@ -0,0 +1,26 @@ +diff -up wicd-1.7.3/curses/netentry_curses.py.orig wicd-1.7.3/curses/netentry_curses.py +--- wicd-1.7.3/curses/netentry_curses.py.orig 2014-12-21 14:40:46.000000000 -0500 ++++ wicd-1.7.3/curses/netentry_curses.py 2015-04-09 13:18:04.624248481 -0400 +@@ -340,8 +340,7 @@ class WiredSettingsDialog(AdvancedSettin + self.set_values() + + self.prof_name = name +- title = _('Configuring preferences for wired profile "$A"'). \ +- replace('$A', self.prof_name) ++ title = ' '.join([_('Configuring preferences for wired profile'), self.prof_name]) + self._w.header = urwid.Text(('header', title), align='right') + + self.set_values() +@@ -502,9 +501,9 @@ class WirelessSettingsDialog(AdvancedSet + self.encrypt_types = misc.LoadEncryptionMethods() + self.set_values() + +- title = _('Configuring preferences for wireless network "$A" ($B)'). \ +- replace('$A', wireless.GetWirelessProperty(networkID, 'essid')). \ +- replace('$B', wireless.GetWirelessProperty(networkID, 'bssid')) ++ title = ' '.join([_('Configuring preferences for wireless network'), ++ wireless.GetWirelessProperty(networkID,'essid'), ++ "(%s)" % wireless.GetWirelessProperty(networkID,'bssid')]) + self._w.header = urwid.Text(('header', title), align='right') + + def set_values(self): diff --git a/wicd.spec b/wicd.spec index edceffa..a153c20 100644 --- a/wicd.spec +++ b/wicd.spec @@ -8,26 +8,23 @@ %define debug_package %{nil} Name: wicd -Version: 1.7.2.4 -Release: 16%{?dist} +Version: 1.7.3 +Release: 1%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base License: GPLv2+ -URL: http://wicd.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +URL: https://launchpad.net/wicd/ +Source0: https://launchpad.net/wicd/1.7/%{version}/+download/%{name}-%{version}.tar.gz Source1: org.wicd.daemon.service -Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch -Patch1: wicd-1.7.1-dbus-failure.patch +Patch0: wicd-1.7.3-remove-WHEREAREMYFILES.patch +Patch1: wicd-1.7.3-dbus-failure.patch Patch2: wicd-1.7.2.4-dbus-policy.patch -Patch3: wicd-1.7.1-DaemonClosing.patch -Patch4: wicd-1.7.2.4-unicode.patch -Patch5: 770_769.diff -Patch6: wicd-1.7.2.4-curses_bz894646.patch -Patch7: wicd-1.7.2.4-sanitize.patch +Patch3: wicd-1.7.3-DaemonClosing.patch +Patch4: wicd-1.7.3-unicode.patch +Patch7: wicd-1.7.3-sanitize.patch Patch8: wicd-1.7.2.4-translate-args.patch -Patch9: wicd-1.7.2.4-prof_name.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel @@ -108,29 +105,13 @@ Client program for wicd that uses a GTK+ interface. %patch3 -p1 # Unicode string handling problems -%patch4 -p1 - -# Upstream patch: -# http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/770 -# For https://bugzilla.redhat.com/show_bug.cgi?id=981667 -%patch5 -p0 - -# Fix curses client crash on startup. -# https://bugzilla.redhat.com/show_bug.cgi?id=894646 -%patch6 -p1 +%patch4 -p1 -b .orig # Prevent crash when saving network settings # Upstream bug report and patch: # https://bugs.launchpad.net/wicd/+bug/993912 %patch7 -p1 -# translate() on a string requires the table as the first argument -# https://bugzilla.redhat.com/show_bug.cgi?id=1005515 -%patch8 -p1 - -# self.prog_name should be self.prof_name (#1162118) -%patch9 -p1 - %build rm -f po/ast.po %{__python} setup.py configure \ @@ -299,6 +280,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Thu Apr 09 2015 David Cantrell - 1.7.3-1 +- Upgrade to wicd-1.7.3 (#1176990) + * Thu Apr 09 2015 David Cantrell - 1.7.2.4-16 - Remove dependency on pm-utils (#1208313) From b833dc34e06f86e6ec25e486b2b1fa4247fe66f6 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 9 Apr 2015 14:46:15 -0400 Subject: [PATCH 19/40] Upgrade to wicd-1.7.3 (#1176990) --- wicd.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wicd.spec b/wicd.spec index a153c20..6ac04b9 100644 --- a/wicd.spec +++ b/wicd.spec @@ -23,8 +23,7 @@ Patch1: wicd-1.7.3-dbus-failure.patch Patch2: wicd-1.7.2.4-dbus-policy.patch Patch3: wicd-1.7.3-DaemonClosing.patch Patch4: wicd-1.7.3-unicode.patch -Patch7: wicd-1.7.3-sanitize.patch -Patch8: wicd-1.7.2.4-translate-args.patch +Patch5: wicd-1.7.3-sanitize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel @@ -110,7 +109,7 @@ Client program for wicd that uses a GTK+ interface. # Prevent crash when saving network settings # Upstream bug report and patch: # https://bugs.launchpad.net/wicd/+bug/993912 -%patch7 -p1 +%patch5 -p1 %build rm -f po/ast.po From 59d72d40cc865bdcb7d89d849d9219f9491db1fb Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 9 Apr 2015 15:14:02 -0400 Subject: [PATCH 20/40] Upgrade to wicd-1.7.3 (#1176990) --- wicd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wicd.spec b/wicd.spec index 6ac04b9..aa533bd 100644 --- a/wicd.spec +++ b/wicd.spec @@ -31,6 +31,7 @@ BuildRequires: python2-devel BuildRequires: desktop-file-utils BuildRequires: pkgconfig BuildRequires: systemd-units +BuildRequires: gnome-shell Requires: %{name}-common = %{version}-%{release} From 65440e496611d09defdf71ddb141e21d4ed820e7 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 9 Apr 2015 15:32:06 -0400 Subject: [PATCH 21/40] Upgrade to wicd-1.7.3 (#1176990) --- wicd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wicd.spec b/wicd.spec index aa533bd..35d1c3f 100644 --- a/wicd.spec +++ b/wicd.spec @@ -31,7 +31,6 @@ BuildRequires: python2-devel BuildRequires: desktop-file-utils BuildRequires: pkgconfig BuildRequires: systemd-units -BuildRequires: gnome-shell Requires: %{name}-common = %{version}-%{release} @@ -123,7 +122,8 @@ rm -f po/ast.po --log %{_localstatedir}/log \ --systemd %{_systemd_unitdir} \ --no-install-init \ - --no-install-pmutils + --no-install-pmutils \ + --no-install-gnome-shell-extensions %{__python} setup.py build %{__python} setup.py compile_translations From 17a18bb8db946fc74fec2f3c51fdc3287af3c3ea Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 9 Apr 2015 15:38:11 -0400 Subject: [PATCH 22/40] Upgrade to wicd-1.7.3 (#1176990) --- wicd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wicd.spec b/wicd.spec index 35d1c3f..9426857 100644 --- a/wicd.spec +++ b/wicd.spec @@ -31,6 +31,7 @@ BuildRequires: python2-devel BuildRequires: desktop-file-utils BuildRequires: pkgconfig BuildRequires: systemd-units +BuildRequires: gettext Requires: %{name}-common = %{version}-%{release} From 0055b5a44810bfe2d816ee0152244fda7068fc45 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 9 Apr 2015 15:49:21 -0400 Subject: [PATCH 23/40] Upgrade to wicd-1.7.3 (#1176990) --- wicd.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/wicd.spec b/wicd.spec index 9426857..dc3aa3f 100644 --- a/wicd.spec +++ b/wicd.spec @@ -271,11 +271,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files gtk %defattr(-,root,root,-) %dir %{_datadir}/wicd/gtk -%dir %{_datadir}/pixmaps/wicd %{_sysconfdir}/xdg/autostart/wicd-tray.desktop %{_datadir}/wicd/gtk/* -%{_datadir}/pixmaps/wicd/* -%{_datadir}/pixmaps/wicd-gtk.xpm %{_bindir}/wicd-gtk %{_datadir}/icons/hicolor/*/apps/wicd-gtk.png %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg From 5474a54f730f7797883e4c51b2bc21f53d0feb54 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 5 May 2015 14:47:11 -0400 Subject: [PATCH 24/40] Upgrade to wicd-1.7.3 (#1176990) --- wicd.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wicd.spec b/wicd.spec index dc3aa3f..6af440d 100644 --- a/wicd.spec +++ b/wicd.spec @@ -228,6 +228,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wired_8021x %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-psk +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-psk-hex %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-peap %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-leap %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-peap @@ -272,10 +273,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %dir %{_datadir}/wicd/gtk %{_sysconfdir}/xdg/autostart/wicd-tray.desktop +%{_datadir}/pixmaps/wicd-gtk.xpm %{_datadir}/wicd/gtk/* %{_bindir}/wicd-gtk %{_datadir}/icons/hicolor/*/apps/wicd-gtk.png %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg +%dir %{_datadir}/wicd/icons +%{_datadir}/wicd/icons/* %changelog * Thu Apr 09 2015 David Cantrell - 1.7.3-1 From 48ba61c71ef0f9042a8a3584f63e709398a111cc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:24:43 +0000 Subject: [PATCH 25/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 6af440d..473e6f1 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -282,6 +282,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/wicd/icons/* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Apr 09 2015 David Cantrell - 1.7.3-1 - Upgrade to wicd-1.7.3 (#1176990) From 90b42cc9b43e46f5393a839cb85edaa5f18a74e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:01:37 +0000 Subject: [PATCH 26/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 473e6f1..427d785 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -282,6 +282,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/wicd/icons/* %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 1.7.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 2179b70a4ba7b178b21d7d5368a8824316a7effb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 13:09:27 +0000 Subject: [PATCH 27/40] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 427d785..2d84fa4 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -282,6 +282,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/wicd/icons/* %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 1.7.3-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Fri Feb 05 2016 Fedora Release Engineering - 1.7.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From ae7742dcd73c1b265c311ae1f8da0befd1baa9e5 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 8 Nov 2016 11:17:44 -0200 Subject: [PATCH 28/40] Spec cleanup --- wicd.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/wicd.spec b/wicd.spec index 2d84fa4..264c2da 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -25,7 +25,6 @@ Patch3: wicd-1.7.3-DaemonClosing.patch Patch4: wicd-1.7.3-unicode.patch Patch5: wicd-1.7.3-sanitize.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel BuildRequires: python2-devel BuildRequires: desktop-file-utils @@ -129,7 +128,6 @@ rm -f po/ast.po %{__python} setup.py compile_translations %install -rm -rf %{buildroot} %{__python} setup.py install --skip-build --no-compile --root %{buildroot} sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/backends/be-external.py sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/backends/be-ioctl.py @@ -169,8 +167,6 @@ desktop-file-install \ %find_lang %{name} -%clean -rm -rf %{buildroot} %post common %systemd_post wicd.service @@ -194,11 +190,9 @@ fi gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -%defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE NEWS README other/WHEREAREMYFILES %files common -f %{name}.lang -%defattr(-,root,root,-) %dir %{python_sitelib}/wicd %dir %{_sysconfdir}/wicd %dir %{_sysconfdir}/wicd/encryption @@ -262,7 +256,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{_localstatedir}/lib/wicd/configurations %files curses -%defattr(-,root,root,-) %dir %{_datadir}/wicd/curses %{_datadir}/wicd/curses/* %{_bindir}/wicd-curses @@ -270,7 +263,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %lang(nl) %{_datadir}/man/nl/man8/wicd-curses.8* %files gtk -%defattr(-,root,root,-) %dir %{_datadir}/wicd/gtk %{_sysconfdir}/xdg/autostart/wicd-tray.desktop %{_datadir}/pixmaps/wicd-gtk.xpm @@ -282,6 +274,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/wicd/icons/* %changelog +* Tue Nov 08 2016 Filipe Rosset - 1.7.3-5 +- Spec cleanup + * Tue Jul 19 2016 Fedora Release Engineering - 1.7.3-4 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From 841eee5a4f965544fbb726609d20f53a8a2636af Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 8 Nov 2016 12:13:18 -0200 Subject: [PATCH 29/40] - Rebuilt for new upstream release 1.7.4 fixes rhbz #1301799 - Fixes rhbz #1308240 --- .gitignore | 1 + sources | 2 +- wicd.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 30930fb..98b229d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wicd-1.7.3.tar.gz +/wicd-1.7.4.tar.gz diff --git a/sources b/sources index 775e7d6..5d08def 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -162ca2e6f4ab903bb7ab2bc0adb7d1aa wicd-1.7.3.tar.gz +aaa2e9f5320849e0b5d053099a6f0007 wicd-1.7.4.tar.gz diff --git a/wicd.spec b/wicd.spec index 264c2da..c951d2e 100644 --- a/wicd.spec +++ b/wicd.spec @@ -8,8 +8,8 @@ %define debug_package %{nil} Name: wicd -Version: 1.7.3 -Release: 5%{?dist} +Version: 1.7.4 +Release: 1%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -274,6 +274,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/wicd/icons/* %changelog +* Tue Nov 08 2016 Filipe Rosset - 1.7.4-1 +- Rebuilt for new upstream release 1.7.4 fixes rhbz #1301799 +- Fixes rhbz #1308240 + * Tue Nov 08 2016 Filipe Rosset - 1.7.3-5 - Spec cleanup From ce8c6c89ee76c1f422a8d426bdf831fefc44cd4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:22:33 +0000 Subject: [PATCH 30/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index c951d2e..9b5d08d 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -274,6 +274,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/wicd/icons/* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Nov 08 2016 Filipe Rosset - 1.7.4-1 - Rebuilt for new upstream release 1.7.4 fixes rhbz #1301799 - Fixes rhbz #1308240 From 25cb05879d1b46396db6578d3051cdfcbf4e6338 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:36:14 +0000 Subject: [PATCH 31/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 9b5d08d..720519d 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -274,6 +274,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/wicd/icons/* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.7.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.7.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 7eff0d6285428d2ba0abf2c15d8d4e3edf202f3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:16:24 +0000 Subject: [PATCH 32/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 720519d..73672c7 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -274,6 +274,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/wicd/icons/* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.7.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.7.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From e5ca93f251c932ede19cf4b20e4dbb5a3987c72c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 18 Jan 2018 22:49:19 +0100 Subject: [PATCH 33/40] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- wicd.spec | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/wicd.spec b/wicd.spec index 73672c7..ef329cc 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -177,18 +177,6 @@ desktop-file-install \ %postun common %systemd_postun_with_restart wicd.service -%post gtk -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun gtk -if [ $1 -eq 0 ]; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans gtk -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files %doc AUTHORS CHANGES LICENSE NEWS README other/WHEREAREMYFILES @@ -274,6 +262,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/wicd/icons/* %changelog +* Thu Jan 18 2018 Igor Gnatenko - 1.7.4-5 +- Remove obsolete scriptlets + * Thu Aug 03 2017 Fedora Release Engineering - 1.7.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 3eac356f55e30eb2cb214289f109c0eaa43626a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:55:55 +0000 Subject: [PATCH 34/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index ef329cc..63b86f5 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -262,6 +262,9 @@ desktop-file-install \ %{_datadir}/wicd/icons/* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.7.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 18 2018 Igor Gnatenko - 1.7.4-5 - Remove obsolete scriptlets From ddae43d1f798138bf4df8fe2e4bcb036e03c521d Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Fri, 9 Feb 2018 23:39:08 +0100 Subject: [PATCH 35/40] Update Python 2 dependency declarations to new packaging standards --- wicd.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/wicd.spec b/wicd.spec index 63b86f5..4bce850 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -48,7 +48,7 @@ Summary: Wicd common files Group: System Environment/Base BuildArch: noarch Requires: dbus -Requires: dbus-python +Requires: python2-dbus Requires: dhclient Requires: ethtool Requires: iproute @@ -69,7 +69,7 @@ Summary: Curses client for wicd Group: Applications/System BuildArch: noarch Requires: %{name}-common = %{version}-%{release} -Requires: python-urwid >= 0.9.8.3 +Requires: python2-urwid >= 0.9.8.3 Requires: %{name}-gtk = %{version}-%{release} %description curses @@ -80,7 +80,7 @@ Summary: GTK+ client for wicd Group: Applications/Internet BuildArch: noarch Requires: %{name}-common = %{version}-%{release} -Requires: notify-python +Requires: python2-notify Requires: pygtk2-libglade >= 2.10 %description gtk @@ -262,6 +262,10 @@ desktop-file-install \ %{_datadir}/wicd/icons/* %changelog +* Fri Feb 09 2018 Iryna Shcherbina - 1.7.4-7 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Feb 09 2018 Fedora Release Engineering - 1.7.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 5ad4e702cdf097b19f9dc9b851eda378038efdfb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:50:11 +0000 Subject: [PATCH 36/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 4bce850..74d9861 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -262,6 +262,9 @@ desktop-file-install \ %{_datadir}/wicd/icons/* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.7.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Iryna Shcherbina - 1.7.4-7 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 5e145af3d2fa3b598f3d5c45ddc47d2c5caf9978 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 24 Jul 2018 14:54:45 -0400 Subject: [PATCH 37/40] Get wicd building correctly under rawhide again (#1606676) Fix %{_unitdir} usage in the spec file --- wicd.spec | 90 ++++++++++++++++++++++++++----------------------------- 1 file changed, 42 insertions(+), 48 deletions(-) diff --git a/wicd.spec b/wicd.spec index 74d9861..2d93573 100644 --- a/wicd.spec +++ b/wicd.spec @@ -1,15 +1,8 @@ -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%endif - -%{!?_systemd_unitdir: %global _systemd_unitdir %(pkg-config systemd --variable=systemdsystemunitdir)} - %define debug_package %{nil} Name: wicd Version: 1.7.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -25,11 +18,12 @@ Patch3: wicd-1.7.3-DaemonClosing.patch Patch4: wicd-1.7.3-unicode.patch Patch5: wicd-1.7.3-sanitize.patch +%{?systemd_requires} BuildRequires: babel BuildRequires: python2-devel BuildRequires: desktop-file-utils BuildRequires: pkgconfig -BuildRequires: systemd-units +BuildRequires: systemd BuildRequires: gettext Requires: %{name}-common = %{version}-%{release} @@ -44,44 +38,41 @@ it should try, with a preference first to a wired network, then to wireless. This package provides the architecture-dependent components of wicd. %package common -Summary: Wicd common files -Group: System Environment/Base -BuildArch: noarch -Requires: dbus -Requires: python2-dbus -Requires: dhclient -Requires: ethtool -Requires: iproute -Requires: logrotate -Requires: net-tools -Requires: wireless-tools -Requires: wpa_supplicant -Requires: pygobject2 -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +Summary: Wicd common files +Group: System Environment/Base +BuildArch: noarch +Requires: dbus +Requires: python2-dbus +Requires: dhclient +Requires: ethtool +Requires: iproute +Requires: logrotate +Requires: net-tools +Requires: wireless-tools +Requires: wpa_supplicant +Requires: pygobject2 %description common This package provides the main wicd daemon and the wicd-cli front-end. %package curses -Summary: Curses client for wicd -Group: Applications/System -BuildArch: noarch -Requires: %{name}-common = %{version}-%{release} -Requires: python2-urwid >= 0.9.8.3 -Requires: %{name}-gtk = %{version}-%{release} +Summary: Curses client for wicd +Group: Applications/System +BuildArch: noarch +Requires: %{name}-common = %{version}-%{release} +Requires: python2-urwid >= 0.9.8.3 +Requires: %{name}-gtk = %{version}-%{release} %description curses Client program for wicd that uses a curses interface. %package gtk -Summary: GTK+ client for wicd -Group: Applications/Internet -BuildArch: noarch -Requires: %{name}-common = %{version}-%{release} -Requires: python2-notify -Requires: pygtk2-libglade >= 2.10 +Summary: GTK+ client for wicd +Group: Applications/Internet +BuildArch: noarch +Requires: %{name}-common = %{version}-%{release} +Requires: python2-notify +Requires: pygtk2-libglade >= 2.10 %description gtk Client program for wicd that uses a GTK+ interface. @@ -113,22 +104,22 @@ Client program for wicd that uses a GTK+ interface. %build rm -f po/ast.po -%{__python} setup.py configure \ +%{__python2} setup.py configure \ --distro redhat \ --lib %{_libdir} \ --share %{_datadir}/wicd \ --etc %{_sysconfdir}/wicd \ --bin %{_bindir} \ --log %{_localstatedir}/log \ - --systemd %{_systemd_unitdir} \ + --systemd %{_unitdir} \ --no-install-init \ --no-install-pmutils \ --no-install-gnome-shell-extensions -%{__python} setup.py build -%{__python} setup.py compile_translations +%{__python2} setup.py build +%{__python2} setup.py compile_translations %install -%{__python} setup.py install --skip-build --no-compile --root %{buildroot} +%{__python2} setup.py install --skip-build --no-compile --root %{buildroot} sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/backends/be-external.py sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/backends/be-ioctl.py sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/cli/wicd-cli.py @@ -144,7 +135,7 @@ rm -f %{buildroot}%{_localstatedir}/lib/wicd/WHEREAREMYFILES rm -rf %{buildroot}%{_datadir}/doc find %{buildroot} -type f -name ".empty_on_purpose" | xargs rm -for lib in %{buildroot}%{python_sitelib}/wicd/*.py ; do +for lib in %{buildroot}%{python2_sitelib}/wicd/*.py ; do sed '/\/usr\/bin\/env/d' $lib > $lib.new && touch -r $lib $lib.new && mv $lib.new $lib @@ -167,7 +158,6 @@ desktop-file-install \ %find_lang %{name} - %post common %systemd_post wicd.service @@ -181,7 +171,7 @@ desktop-file-install \ %doc AUTHORS CHANGES LICENSE NEWS README other/WHEREAREMYFILES %files common -f %{name}.lang -%dir %{python_sitelib}/wicd +%dir %{python2_sitelib}/wicd %dir %{_sysconfdir}/wicd %dir %{_sysconfdir}/wicd/encryption %dir %{_sysconfdir}/wicd/encryption/templates @@ -214,9 +204,9 @@ desktop-file-install \ %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-peap %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-leap %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-peap -%{_systemd_unitdir}/wicd.service -%{python_sitelib}/wicd/* -%{python_sitelib}/wicd-%{version}*.egg-info +%{_unitdir}/wicd.service +%{python2_sitelib}/wicd/* +%{python2_sitelib}/wicd-%{version}*.egg-info %{_bindir}/wicd-cli %{_bindir}/wicd-client %{_sbindir}/wicd @@ -262,6 +252,10 @@ desktop-file-install \ %{_datadir}/wicd/icons/* %changelog +* Tue Jul 24 2018 David Cantrell - 1.7.4-8 +- Get wicd building correctly under rawhide again (#1606676) +- Fix %%{_unitdir} usage in the spec file + * Sat Jul 14 2018 Fedora Release Engineering - 1.7.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 441fb36941b8be55307b122edb0c7a455a0a75eb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 38/40] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- wicd.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/wicd.spec b/wicd.spec index 2d93573..9e0db51 100644 --- a/wicd.spec +++ b/wicd.spec @@ -5,7 +5,6 @@ Version: 1.7.4 Release: 9%{?dist} Summary: Wireless and wired network connection manager -Group: System Environment/Base License: GPLv2+ URL: https://launchpad.net/wicd/ Source0: https://launchpad.net/wicd/1.7/%{version}/+download/%{name}-%{version}.tar.gz @@ -39,7 +38,6 @@ This package provides the architecture-dependent components of wicd. %package common Summary: Wicd common files -Group: System Environment/Base BuildArch: noarch Requires: dbus Requires: python2-dbus @@ -57,7 +55,6 @@ This package provides the main wicd daemon and the wicd-cli front-end. %package curses Summary: Curses client for wicd -Group: Applications/System BuildArch: noarch Requires: %{name}-common = %{version}-%{release} Requires: python2-urwid >= 0.9.8.3 @@ -68,7 +65,6 @@ Client program for wicd that uses a curses interface. %package gtk Summary: GTK+ client for wicd -Group: Applications/Internet BuildArch: noarch Requires: %{name}-common = %{version}-%{release} Requires: python2-notify From 94cd0795b64c8b350be82c82e2e931f42343e123 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:42:20 +0000 Subject: [PATCH 39/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 9e0db51..7139650 100644 --- a/wicd.spec +++ b/wicd.spec @@ -2,7 +2,7 @@ Name: wicd Version: 1.7.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Wireless and wired network connection manager License: GPLv2+ @@ -248,6 +248,9 @@ desktop-file-install \ %{_datadir}/wicd/icons/* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.7.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jul 24 2018 David Cantrell - 1.7.4-8 - Get wicd building correctly under rawhide again (#1606676) - Fix %%{_unitdir} usage in the spec file From a41ebbd2ab327d977a844accd38b09776ecfdbef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 8 Apr 2019 19:17:32 +0200 Subject: [PATCH 40/40] Orphaned for 6+ weeks --- .gitignore | 2 - dead.package | 1 + org.wicd.daemon.service | 11 - sources | 1 - wicd-1.7.2.4-dbus-policy.patch | 63 ---- wicd-1.7.3-DaemonClosing.patch | 12 - wicd-1.7.3-dbus-failure.patch | 49 --- wicd-1.7.3-remove-WHEREAREMYFILES.patch | 53 --- wicd-1.7.3-sanitize.patch | 30 -- wicd-1.7.3-unicode.patch | 26 -- wicd.spec | 425 ------------------------ 11 files changed, 1 insertion(+), 672 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 org.wicd.daemon.service delete mode 100644 sources delete mode 100644 wicd-1.7.2.4-dbus-policy.patch delete mode 100644 wicd-1.7.3-DaemonClosing.patch delete mode 100644 wicd-1.7.3-dbus-failure.patch delete mode 100644 wicd-1.7.3-remove-WHEREAREMYFILES.patch delete mode 100644 wicd-1.7.3-sanitize.patch delete mode 100644 wicd-1.7.3-unicode.patch delete mode 100644 wicd.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 98b229d..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -wicd-1.7.3.tar.gz -/wicd-1.7.4.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/org.wicd.daemon.service b/org.wicd.daemon.service deleted file mode 100644 index b0287f3..0000000 --- a/org.wicd.daemon.service +++ /dev/null @@ -1,11 +0,0 @@ -# This D-Bus service activation file is only for systemd support since -# an auto-activated wicd would be quite surprising for those people -# who have wicd installed but turned off. Thus the Exec path available to -# D-Bus is /bin/false, but systemd knows the real Exec path due to the -# wicd systemd .service file. - -[D-BUS Service] -Name=org.wicd.daemon -Exec=/bin/false -User=root -SystemdService=dbus-org.wicd.daemon.service diff --git a/sources b/sources deleted file mode 100644 index 5d08def..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -aaa2e9f5320849e0b5d053099a6f0007 wicd-1.7.4.tar.gz diff --git a/wicd-1.7.2.4-dbus-policy.patch b/wicd-1.7.2.4-dbus-policy.patch deleted file mode 100644 index 866f4d3..0000000 --- a/wicd-1.7.2.4-dbus-policy.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up wicd-1.7.2.4/in/other=wicd.conf.in.dbus wicd-1.7.2.4/in/other=wicd.conf.in ---- wicd-1.7.2.4/in/other=wicd.conf.in.dbus 2011-09-18 04:48:13.000000000 -0400 -+++ wicd-1.7.2.4/in/other=wicd.conf.in 2014-06-30 10:29:35.968246038 -0400 -@@ -7,41 +7,34 @@ - - - -- -- -- -- -+ -+ -+ -+ - - -- -- -- -- -- -- -+ -+ - - -- -- -+ -+ -+ -+ - - -- -+ -+ -+ - - - - -- -- -- -- -- -+ -+ -+ -+ -+ - - - diff --git a/wicd-1.7.3-DaemonClosing.patch b/wicd-1.7.3-DaemonClosing.patch deleted file mode 100644 index 782505b..0000000 --- a/wicd-1.7.3-DaemonClosing.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up wicd-1.7.3/wicd/wicd-daemon.py.orig wicd-1.7.3/wicd/wicd-daemon.py ---- wicd-1.7.3/wicd/wicd-daemon.py.orig 2014-12-21 14:40:46.000000000 -0500 -+++ wicd-1.7.3/wicd/wicd-daemon.py 2015-04-09 10:27:54.203884159 -0400 -@@ -835,7 +835,7 @@ class WicdDaemon(dbus.service.Object, ob - pass - - @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='') -- def DaemonClosing(self): -+ def DaemonClosing(self, arg1=None, arg2=None): - """ Emits a signal indicating the daemon will be closing. """ - # By default, disconnect network links on close. - if not self.keep_connection: diff --git a/wicd-1.7.3-dbus-failure.patch b/wicd-1.7.3-dbus-failure.patch deleted file mode 100644 index 70a786a..0000000 --- a/wicd-1.7.3-dbus-failure.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up wicd-1.7.3/cli/wicd-cli.py.orig wicd-1.7.3/cli/wicd-cli.py ---- wicd-1.7.3/cli/wicd-cli.py.orig 2014-12-21 14:40:46.000000000 -0500 -+++ wicd-1.7.3/cli/wicd-cli.py 2015-04-09 10:25:48.171078635 -0400 -@@ -61,6 +61,10 @@ if not daemon: - 'Please make sure the wicd service is running.' - sys.exit(3) - -+if daemon is None: -+ print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.' -+ sys.exit(3) -+ - parser = optparse.OptionParser() - - parser.add_option('--network', '-n', type='int', default=-1) -diff -up wicd-1.7.3/curses/wicd-curses.py.orig wicd-1.7.3/curses/wicd-curses.py ---- wicd-1.7.3/curses/wicd-curses.py.orig 2014-12-21 14:40:46.000000000 -0500 -+++ wicd-1.7.3/curses/wicd-curses.py 2015-04-09 10:25:48.184078719 -0400 -@@ -1277,6 +1277,10 @@ def setup_dbus(force=True): - 'Please make sure the wicd service is running.' - sys.exit(3) - -+ if daemon is None: -+ print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.' -+ sys.exit(3) -+ - netentry_curses.dbus_init(dbus_ifaces) - return True - -diff -up wicd-1.7.3/gtk/gui.py.orig wicd-1.7.3/gtk/gui.py ---- wicd-1.7.3/gtk/gui.py.orig 2014-12-21 14:40:46.000000000 -0500 -+++ wicd-1.7.3/gtk/gui.py 2015-04-09 10:25:48.184078719 -0400 -@@ -183,6 +183,17 @@ class appGui(object): - d.run() - sys.exit(1) - -+ if daemon is None: -+ errmsg = "Error connecting to wicd service via D-Bus." + \ -+ "Please ensure the wicd service is running." -+ d = gtk.MessageDialog(parent=None, -+ flags=gtk.DIALOG_MODAL, -+ type=gtk.MESSAGE_ERROR, -+ buttons=gtk.BUTTONS_OK, -+ message_format=errmsg) -+ d.run() -+ sys.exit(1) -+ - self.tray = tray - - gladefile = os.path.join(wpath.gtk, "wicd.ui") diff --git a/wicd-1.7.3-remove-WHEREAREMYFILES.patch b/wicd-1.7.3-remove-WHEREAREMYFILES.patch deleted file mode 100644 index 2b86867..0000000 --- a/wicd-1.7.3-remove-WHEREAREMYFILES.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -up wicd-1.7.3/in/man=wicd-curses.8.in.orig wicd-1.7.3/in/man=wicd-curses.8.in ---- wicd-1.7.3/in/man=wicd-curses.8.in.orig 2014-12-21 14:40:46.000000000 -0500 -+++ wicd-1.7.3/in/man=wicd-curses.8.in 2015-04-09 10:24:30.923580121 -0400 -@@ -60,10 +60,6 @@ Raise the Ad-Hoc network creation dialog - .BR X - Show the list of saved wireless networks, to be able to remove them - --.SH "FILES" --.TP --.I ~/.wicd/WHEREAREMYFILES --Reminder that your network configuration files are not here ;-) - .PP - .SH "SEE ALSO" - .BR wicd-client (1), -diff -up wicd-1.7.3/in/scripts=wicd-client.in.orig wicd-1.7.3/in/scripts=wicd-client.in ---- wicd-1.7.3/in/scripts=wicd-client.in.orig 2014-12-21 14:40:46.000000000 -0500 -+++ wicd-1.7.3/in/scripts=wicd-client.in 2015-04-09 10:24:30.923580121 -0400 -@@ -3,10 +3,6 @@ - if [ ! -d "$HOME/.wicd" ]; then - mkdir -p "$HOME/.wicd" - fi --# Make sure the user knows WHEREAREMYFILES ;-) --if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then -- ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES" --fi - if [ "$DISPLAY" = "" ]; then - BOLD=$(tput bold) - BLUE=$(tput setaf 4) -diff -up wicd-1.7.3/in/scripts=wicd-curses.in.orig wicd-1.7.3/in/scripts=wicd-curses.in ---- wicd-1.7.3/in/scripts=wicd-curses.in.orig 2014-12-21 14:40:46.000000000 -0500 -+++ wicd-1.7.3/in/scripts=wicd-curses.in 2015-04-09 10:24:30.924580127 -0400 -@@ -2,8 +2,5 @@ - if [ ! -d "$HOME/.wicd" ]; then - mkdir -p "$HOME/.wicd" - fi --if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then -- ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES" --fi - - exec %PYTHON% -O %SHARE%curses/wicd-curses.py $@ -diff -up wicd-1.7.3/in/scripts=wicd-gtk.in.orig wicd-1.7.3/in/scripts=wicd-gtk.in ---- wicd-1.7.3/in/scripts=wicd-gtk.in.orig 2014-12-21 14:40:46.000000000 -0500 -+++ wicd-1.7.3/in/scripts=wicd-gtk.in 2015-04-09 10:24:30.924580127 -0400 -@@ -4,9 +4,5 @@ - if [ ! -d "$HOME/.wicd" ]; then - mkdir -p "$HOME/.wicd" - fi --# Make sure the user knows WHEREAREMYFILES ;-) --if [ -e "/var/lib/wicd/WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then -- ln -s "/var/lib/wicd/WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES" --fi - - exec %PYTHON% -O %SHARE%gtk/wicd-client.py $@ diff --git a/wicd-1.7.3-sanitize.patch b/wicd-1.7.3-sanitize.patch deleted file mode 100644 index d44137e..0000000 --- a/wicd-1.7.3-sanitize.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up wicd-1.7.3/wicd/wicd-daemon.py.orig wicd-1.7.3/wicd/wicd-daemon.py ---- wicd-1.7.3/wicd/wicd-daemon.py.orig 2015-04-09 13:13:54.419639555 -0400 -+++ wicd-1.7.3/wicd/wicd-daemon.py 2015-04-09 13:14:28.473858534 -0400 -@@ -1111,7 +1111,7 @@ class WirelessDaemon(dbus.service.Object - def SetWirelessProperty(self, netid, prop, value): - """ Sets property to value in network specified. """ - # We don't write script settings here. -- prop = misc.sanitize_config(prop) -+ prop = misc.sanitize_config(str(prop)) - if prop.endswith('script'): - print 'Setting script properties through the daemon' \ - + ' is not permitted.' -@@ -1321,7 +1321,7 @@ class WirelessDaemon(dbus.service.Object - @dbus.service.method('org.wicd.daemon.wireless') - def SaveWirelessNetworkProperty(self, nid, option): - """ Writes a particular wireless property to disk. """ -- option = misc.sanitize_config(option) -+ option = misc.sanitize_config(str(option)) - if option.endswith("script"): - print 'You cannot save script information to disk through ' + \ - 'the daemon.' -@@ -1488,7 +1488,7 @@ class WiredDaemon(dbus.service.Object, o - def SetWiredProperty(self, prop, value): - """ Sets the given property to the given value. """ - if self.WiredNetwork: -- prop = misc.sanitize_config(prop) -+ prop = misc.sanitize_config(str(prop)) - if prop.endswith('script'): - print 'Setting script properties through the daemon' \ - + ' is not permitted.' diff --git a/wicd-1.7.3-unicode.patch b/wicd-1.7.3-unicode.patch deleted file mode 100644 index 91763f1..0000000 --- a/wicd-1.7.3-unicode.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up wicd-1.7.3/curses/netentry_curses.py.orig wicd-1.7.3/curses/netentry_curses.py ---- wicd-1.7.3/curses/netentry_curses.py.orig 2014-12-21 14:40:46.000000000 -0500 -+++ wicd-1.7.3/curses/netentry_curses.py 2015-04-09 13:18:04.624248481 -0400 -@@ -340,8 +340,7 @@ class WiredSettingsDialog(AdvancedSettin - self.set_values() - - self.prof_name = name -- title = _('Configuring preferences for wired profile "$A"'). \ -- replace('$A', self.prof_name) -+ title = ' '.join([_('Configuring preferences for wired profile'), self.prof_name]) - self._w.header = urwid.Text(('header', title), align='right') - - self.set_values() -@@ -502,9 +501,9 @@ class WirelessSettingsDialog(AdvancedSet - self.encrypt_types = misc.LoadEncryptionMethods() - self.set_values() - -- title = _('Configuring preferences for wireless network "$A" ($B)'). \ -- replace('$A', wireless.GetWirelessProperty(networkID, 'essid')). \ -- replace('$B', wireless.GetWirelessProperty(networkID, 'bssid')) -+ title = ' '.join([_('Configuring preferences for wireless network'), -+ wireless.GetWirelessProperty(networkID,'essid'), -+ "(%s)" % wireless.GetWirelessProperty(networkID,'bssid')]) - self._w.header = urwid.Text(('header', title), align='right') - - def set_values(self): diff --git a/wicd.spec b/wicd.spec deleted file mode 100644 index 7139650..0000000 --- a/wicd.spec +++ /dev/null @@ -1,425 +0,0 @@ -%define debug_package %{nil} - -Name: wicd -Version: 1.7.4 -Release: 10%{?dist} -Summary: Wireless and wired network connection manager - -License: GPLv2+ -URL: https://launchpad.net/wicd/ -Source0: https://launchpad.net/wicd/1.7/%{version}/+download/%{name}-%{version}.tar.gz -Source1: org.wicd.daemon.service - -Patch0: wicd-1.7.3-remove-WHEREAREMYFILES.patch -Patch1: wicd-1.7.3-dbus-failure.patch -Patch2: wicd-1.7.2.4-dbus-policy.patch -Patch3: wicd-1.7.3-DaemonClosing.patch -Patch4: wicd-1.7.3-unicode.patch -Patch5: wicd-1.7.3-sanitize.patch - -%{?systemd_requires} -BuildRequires: babel -BuildRequires: python2-devel -BuildRequires: desktop-file-utils -BuildRequires: pkgconfig -BuildRequires: systemd -BuildRequires: gettext - -Requires: %{name}-common = %{version}-%{release} - -%description -Wicd is designed to give the user as much control over behavior of network -connections as possible. Every network, both wired and wireless, has its -own profile with its own configuration options and connection behavior. -Wicd will try to automatically connect only to networks the user specifies -it should try, with a preference first to a wired network, then to wireless. - -This package provides the architecture-dependent components of wicd. - -%package common -Summary: Wicd common files -BuildArch: noarch -Requires: dbus -Requires: python2-dbus -Requires: dhclient -Requires: ethtool -Requires: iproute -Requires: logrotate -Requires: net-tools -Requires: wireless-tools -Requires: wpa_supplicant -Requires: pygobject2 - -%description common -This package provides the main wicd daemon and the wicd-cli front-end. - -%package curses -Summary: Curses client for wicd -BuildArch: noarch -Requires: %{name}-common = %{version}-%{release} -Requires: python2-urwid >= 0.9.8.3 -Requires: %{name}-gtk = %{version}-%{release} - -%description curses -Client program for wicd that uses a curses interface. - -%package gtk -Summary: GTK+ client for wicd -BuildArch: noarch -Requires: %{name}-common = %{version}-%{release} -Requires: python2-notify -Requires: pygtk2-libglade >= 2.10 - -%description gtk -Client program for wicd that uses a GTK+ interface. - -%prep -%setup -q - -# Remove the WHEREAREMYFILES and resetting of ~/.wicd/WHEREAREMYFILES -# This is pointless. The documentation can just provide WHEREAREMYFILES, -# which we do in this package. -%patch0 -p1 - -# Handle D-Bus connection failures a little better -%patch1 -p1 - -# Allow users at the console to control wicd -%patch2 -p1 - -# Work around bug in DaemonClosing() calls -%patch3 -p1 - -# Unicode string handling problems -%patch4 -p1 -b .orig - -# Prevent crash when saving network settings -# Upstream bug report and patch: -# https://bugs.launchpad.net/wicd/+bug/993912 -%patch5 -p1 - -%build -rm -f po/ast.po -%{__python2} setup.py configure \ - --distro redhat \ - --lib %{_libdir} \ - --share %{_datadir}/wicd \ - --etc %{_sysconfdir}/wicd \ - --bin %{_bindir} \ - --log %{_localstatedir}/log \ - --systemd %{_unitdir} \ - --no-install-init \ - --no-install-pmutils \ - --no-install-gnome-shell-extensions -%{__python2} setup.py build -%{__python2} setup.py compile_translations - -%install -%{__python2} setup.py install --skip-build --no-compile --root %{buildroot} -sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/backends/be-external.py -sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/backends/be-ioctl.py -sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/cli/wicd-cli.py -sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/curses/curses_misc.py -sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/curses/netentry_curses.py -sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/curses/prefs_curses.py -sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/daemon/wicd-daemon.py -sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/gtk/gui.py -sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/gtk/prefs.py -sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/gtk/wicd-client.py - -rm -f %{buildroot}%{_localstatedir}/lib/wicd/WHEREAREMYFILES -rm -rf %{buildroot}%{_datadir}/doc -find %{buildroot} -type f -name ".empty_on_purpose" | xargs rm - -for lib in %{buildroot}%{python2_sitelib}/wicd/*.py ; do - sed '/\/usr\/bin\/env/d' $lib > $lib.new && - touch -r $lib $lib.new && - mv $lib.new $lib -done - -mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services -install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/dbus-1/system-services/org.wicd.daemon.service - -mv %{buildroot}%{_sysconfdir}/logrotate.d/%{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} - -desktop-file-install \ - --remove-category="Application" \ - --delete-original \ - --dir=%{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/wicd.desktop - -desktop-file-install \ - --dir=%{buildroot}%{_sysconfdir}/xdg/autostart \ - %{buildroot}%{_sysconfdir}/xdg/autostart/wicd-tray.desktop - -%find_lang %{name} - -%post common -%systemd_post wicd.service - -%preun common -%systemd_preun wicd.service - -%postun common -%systemd_postun_with_restart wicd.service - -%files -%doc AUTHORS CHANGES LICENSE NEWS README other/WHEREAREMYFILES - -%files common -f %{name}.lang -%dir %{python2_sitelib}/wicd -%dir %{_sysconfdir}/wicd -%dir %{_sysconfdir}/wicd/encryption -%dir %{_sysconfdir}/wicd/encryption/templates -%dir %{_sysconfdir}/wicd/scripts -%dir %{_sysconfdir}/wicd/scripts/postconnect -%dir %{_sysconfdir}/wicd/scripts/postdisconnect -%dir %{_sysconfdir}/wicd/scripts/preconnect -%dir %{_sysconfdir}/wicd/scripts/predisconnect -%{_sysconfdir}/acpi/resume.d/80-wicd-connect.sh -%{_sysconfdir}/acpi/suspend.d/50-wicd-suspend.sh -%config(noreplace) %{_sysconfdir}/logrotate.d/wicd -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/wicd.conf -%config(noreplace) %{_sysconfdir}/wicd/dhclient.conf.template.default -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/active -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/active_wired -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/eap -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/eap-tls -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/leap -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/peap -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/peap-tkip -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/psu -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/ttls -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-hex -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-passphrase -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-shared -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wired_8021x -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-psk -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-psk-hex -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-peap -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-leap -%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-peap -%{_unitdir}/wicd.service -%{python2_sitelib}/wicd/* -%{python2_sitelib}/wicd-%{version}*.egg-info -%{_bindir}/wicd-cli -%{_bindir}/wicd-client -%{_sbindir}/wicd -%{_datadir}/applications/wicd.desktop -%{_datadir}/dbus-1/system-services/org.wicd.daemon.service -%{_datadir}/man/man1/wicd-client.1* -%{_datadir}/man/man5/wicd-manager-settings.conf.5* -%{_datadir}/man/man5/wicd-wired-settings.conf.5* -%{_datadir}/man/man5/wicd-wireless-settings.conf.5* -%{_datadir}/man/man8/wicd-cli.8* -%{_datadir}/man/man8/wicd.8* -%lang(nl) %{_datadir}/man/nl/man1/wicd-client.1* -%lang(nl) %{_datadir}/man/nl/man5/wicd-manager-settings.conf.5* -%lang(nl) %{_datadir}/man/nl/man5/wicd-wired-settings.conf.5* -%lang(nl) %{_datadir}/man/nl/man5/wicd-wireless-settings.conf.5* -%lang(nl) %{_datadir}/man/nl/man8/wicd.8* -%dir %{_datadir}/wicd -%dir %{_datadir}/wicd/backends -%dir %{_datadir}/wicd/cli -%dir %{_datadir}/wicd/daemon -%{_datadir}/wicd/backends/* -%{_datadir}/wicd/cli/* -%{_datadir}/wicd/daemon/* -%dir %{_localstatedir}/lib/wicd -%dir %{_localstatedir}/lib/wicd/configurations - -%files curses -%dir %{_datadir}/wicd/curses -%{_datadir}/wicd/curses/* -%{_bindir}/wicd-curses -%{_datadir}/man/man8/wicd-curses.8* -%lang(nl) %{_datadir}/man/nl/man8/wicd-curses.8* - -%files gtk -%dir %{_datadir}/wicd/gtk -%{_sysconfdir}/xdg/autostart/wicd-tray.desktop -%{_datadir}/pixmaps/wicd-gtk.xpm -%{_datadir}/wicd/gtk/* -%{_bindir}/wicd-gtk -%{_datadir}/icons/hicolor/*/apps/wicd-gtk.png -%{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg -%dir %{_datadir}/wicd/icons -%{_datadir}/wicd/icons/* - -%changelog -* Sun Feb 03 2019 Fedora Release Engineering - 1.7.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 24 2018 David Cantrell - 1.7.4-8 -- Get wicd building correctly under rawhide again (#1606676) -- Fix %%{_unitdir} usage in the spec file - -* Sat Jul 14 2018 Fedora Release Engineering - 1.7.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Iryna Shcherbina - 1.7.4-7 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Feb 09 2018 Fedora Release Engineering - 1.7.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 1.7.4-5 -- Remove obsolete scriptlets - -* Thu Aug 03 2017 Fedora Release Engineering - 1.7.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.7.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.7.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Nov 08 2016 Filipe Rosset - 1.7.4-1 -- Rebuilt for new upstream release 1.7.4 fixes rhbz #1301799 -- Fixes rhbz #1308240 - -* Tue Nov 08 2016 Filipe Rosset - 1.7.3-5 -- Spec cleanup - -* Tue Jul 19 2016 Fedora Release Engineering - 1.7.3-4 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Feb 05 2016 Fedora Release Engineering - 1.7.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Apr 09 2015 David Cantrell - 1.7.3-1 -- Upgrade to wicd-1.7.3 (#1176990) - -* Thu Apr 09 2015 David Cantrell - 1.7.2.4-16 -- Remove dependency on pm-utils (#1208313) - -* Tue Nov 25 2014 David Cantrell - 1.7.2.4-15 -- self.prog_name -> self.prof_name in netentry_curses.py (#1162118) - -* Mon Sep 29 2014 David Cantrell - 1.7.2.4-14 -- Remove check for daemon patch (#1074315) - -* Thu Sep 25 2014 David Cantrell - 1.7.2.4-13 -- Fix string.translate() usage in misc.py (#1005515) - -* Mon Aug 18 2014 Fedora Release Engineering - 1.7.2.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Jul 02 2014 David Cantrell - 1.7.2.4-11 -- Prevent crash when saving network settings (#996693) - -* Mon Jun 30 2014 David Cantrell - 1.7.2.4-10 -- Do not assume wicd-daemon is running when wicd-client runs (#1074315) -- Fix wicd-curses crash on startup (#894646) -- Edit default D-Bus policy file to allow 'users' group members to run - wicd client programs (#1074372) - -* Sun Jun 08 2014 Fedora Release Engineering - 1.7.2.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Dec 09 2013 David Cantrell - 1.7.2.4-8 -- Apply upstream patch to fix exception when changing properties in - wicd-gtk (#981667) - -* Sun Aug 04 2013 Fedora Release Engineering - 1.7.2.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Apr 01 2013 David Cantrell - 1.7.2.4-6 -- systemd_post_with_restart -> systemd_postun_with_restart (#901753) - -* Fri Feb 15 2013 Fedora Release Engineering - 1.7.2.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Oct 23 2012 David Cantrell - 1.7.2.4-4 -- Fix some Unicode string handling and display problems (#845749) - -* Tue Oct 23 2012 David Cantrell - 1.7.2.4-3 -- Use new systemd macros in trigger scripts (#850367) - -* Thu Aug 02 2012 David Cantrell - 1.7.2.4-2 -- Updated duplicate logrotate file fix (#820139) - -* Thu Aug 02 2012 David Cantrell - 1.7.2.4-1 -- Upgrade to wicd-1.7.2.4 -- Remove duplicate logrotate file (#820139) -- The curses package requires some code from the gtk module, so add explicit - dependency (#831309) - -* Sun Jul 22 2012 Fedora Release Engineering - 1.7.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Apr 13 2012 David Cantrell - 1.7.2.1-1 -- Upgrade to wicd-1.7.2.1 to fix CVE-2012-2095 (#811763) - -* Mon Mar 26 2012 David Cantrell - 1.7.1-5 -- Remove our wicd.service file, this is provided by upstream now - -* Mon Mar 26 2012 David Cantrell - 1.7.1-4 -- Make sure systemd unit files go to /usr/lib/systemd -- Stop mangling logfile.py so bytecompiling will actually work -- 91wicd -> 55wicd -- Pick up new encryption template files in the %%files list - -* Thu Mar 22 2012 David Cantrell - 1.7.1-3 -- BR babel -- Remove po/ast.po because babel doesn't understand it - -* Thu Mar 22 2012 David Cantrell - 1.7.1-2 -- Ensure wpath.etc is set to /etc/wicd, not /etc/dhcp (#754412) -- Initialize child_pid to None in wicd-daemon.py (#798692) -- Make wicd-gtk subpackage require notify-python (#748258) -- Work around no-op problem in DaemonClosing calls (#740317) - -* Fri Feb 10 2012 David Cantrell - 1.7.1-1 -- Upgrade to wicd-1.7.1 final release (#789380) -- Have wicd-common require pygobject2 (#754416) -- Remove patches that have been incorporated upstream - -* Fri Jan 27 2012 David Cantrell - 1.7.1b2-0.3 -- Fix CVE-2012-0813 (#785147) - -* Sat Jan 14 2012 Fedora Release Engineering - 1.7.1-0.2.b2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Aug 19 2011 David Cantrell - 1.7.1b2-0.1 -- Upgrade to wicd-1.7.1b2 - -* Fri Aug 19 2011 David Cantrell - 1.7.0-9 -- Initialize appGui._wired_showing in __init__ (#723553) -- Make sure check and message in wicd-cli are a lambda (#712435) -- Correct systemd unit file for wicd, add D-Bus service file (#699116) -- Move docs to the wicd-common subpackage -- Correct /etc/dbus-1/system.d/wicd.conf (#699116) - -* Mon May 09 2011 Bill Nottingham - 1.7.0-8 -- fix systemd scriptlets for upgrade - -* Mon Feb 07 2011 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jan 15 2011 David Cantrell - 1.7.0-6 -- Correct typo with _systemd_unitdir macro usage in spec file - -* Sat Jan 15 2011 David Cantrell - 1.7.0-5 -- Replace existing init script with systemd unit file (#661226) - -* Fri Oct 22 2010 David Cantrell - 1.7.0-4 -- Use cPickle instead of deepcopy in configmanager.py (#645251) - -* Wed Aug 25 2010 David Cantrell - 1.7.0-3 -- Remove hard dependency on the base package by wicd-common. The - base package is arch-specific and contains optional components - for wicd. If it is present, wicd will make use of it, but it is - not required for normal functionality. - -* Fri Jul 30 2010 Thomas Spura - 1.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Mon Jun 21 2010 David Cantrell - 1.7.0-1 -- Initial package