[wicd/f17] Remove our wicd.service file, this is provided by upstream now
David Cantrell
dcantrel at fedoraproject.org
Mon Mar 26 18:07:24 UTC 2012
commit 10a80c7031c790c17c5491d804401a005dacc09a
Author: David Cantrell <dcantrell at redhat.com>
Date: Mon Mar 26 14:07:14 2012 -0400
Remove our wicd.service file, this is provided by upstream now
- 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
- BR babel
- Remove po/ast.po because babel doesn't understand it
- 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)
- Upgrade to wicd-1.7.1 final release (#789380)
- Have wicd-common require pygobject2 (#754416)
- Remove patches that have been incorporated upstream
.gitignore | 2 +-
sources | 2 +-
wicd-1.7.1-DaemonClosing.patch | 12 +++
wicd-1.7.1-child_pid.patch | 11 +++
wicd-1.7.1-dbus-failure.patch | 49 +++++++++++++
wicd-1.7.1b2-CVE-2012-0813.patch | 19 -----
wicd-1.7.1b2-dbus-failure.patch | 49 -------------
wicd-1.7.1b2-error-messages.patch | 27 -------
wicd-1.7.1b2-initialize-check-and-message.patch | 13 ----
wicd-1.7.1b2-wired_showing.patch | 11 ---
wicd.service | 15 ----
wicd.spec | 83 +++++++++++++----------
12 files changed, 120 insertions(+), 173 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ebd1b99..59cc34d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-wicd-1.7.1b2.tar.bz2
+wicd-1.7.1.tar.gz
diff --git a/sources b/sources
index 522be39..16fe0a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65a6f6c9483d3fcf4ec8dfb8204fcd51 wicd-1.7.1b2.tar.bz2
+9c5664a0e850cddbe80942eabb10430a wicd-1.7.1.tar.gz
diff --git a/wicd-1.7.1-DaemonClosing.patch b/wicd-1.7.1-DaemonClosing.patch
new file mode 100644
index 0000000..1079523
--- /dev/null
+++ b/wicd-1.7.1-DaemonClosing.patch
@@ -0,0 +1,12 @@
+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.1-child_pid.patch b/wicd-1.7.1-child_pid.patch
new file mode 100644
index 0000000..19efb6f
--- /dev/null
+++ b/wicd-1.7.1-child_pid.patch
@@ -0,0 +1,11 @@
+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:08:20.335062672 -0400
+@@ -1802,6 +1802,7 @@ def main(argv):
+ bus = dbus.SystemBus()
+ wicd_bus = dbus.service.BusName('org.wicd.daemon', bus=bus)
+ daemon = WicdDaemon(wicd_bus, auto_connect=auto_connect)
++ child_pid = None
+ if not no_poll:
+ child_pid = Popen([wpath.python, "-O",
+ os.path.join(wpath.daemon, "monitor.py")],
diff --git a/wicd-1.7.1-dbus-failure.patch b/wicd-1.7.1-dbus-failure.patch
new file mode 100644
index 0000000..a9767e7
--- /dev/null
+++ b/wicd-1.7.1-dbus-failure.patch
@@ -0,0 +1,49 @@
+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.'
+ 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.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.'
+ 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.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):
+ 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.spec b/wicd.spec
index 5da6ca0..9ae62f8 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -6,30 +6,27 @@
%{!?_systemd_unitdir: %global _systemd_unitdir %(pkg-config systemd --variable=systemdsystemunitdir)}
%define debug_package %{nil}
-%define alphatag b2
Name: wicd
Version: 1.7.1
-Release: 0.4.%{alphatag}%{?dist}
+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}%{alphatag}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: wicd.logrotate
-Source2: wicd.service
-Source3: org.wicd.daemon.service
+Source2: org.wicd.daemon.service
Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch
-Patch1: wicd-1.7.1b2-dbus-failure.patch
-Patch2: wicd-1.7.1b2-error-messages.patch
-Patch3: wicd-1.7.0-dbus-policy.patch
-Patch4: wicd-1.7.1b2-wired_showing.patch
-Patch5: wicd-1.7.1b2-initialize-check-and-message.patch
-Patch6: wicd-1.7.1b2-CVE-2012-0813.patch
+Patch1: wicd-1.7.1-dbus-failure.patch
+Patch2: wicd-1.7.0-dbus-policy.patch
+Patch3: wicd-1.7.1-child_pid.patch
+Patch4: wicd-1.7.1-DaemonClosing.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
+BuildRequires: babel
BuildRequires: python2-devel
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig
@@ -58,9 +55,9 @@ Requires: ethtool
Requires: iproute
Requires: logrotate
Requires: net-tools
-Requires: pygobject2
Requires: wireless-tools
Requires: wpa_supplicant
+Requires: pygobject2
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -83,13 +80,14 @@ Summary: GTK+ client for wicd
Group: Applications/Internet
BuildArch: noarch
Requires: %{name}-common = %{version}-%{release}
+Requires: notify-python
Requires: pygtk2-libglade >= 2.10
%description gtk
Client program for wicd that uses a GTK+ interface.
%prep
-%setup -q -n %{name}-%{version}%{alphatag}
+%setup -q
# Remove the WHEREAREMYFILES and resetting of ~/.wicd/WHEREAREMYFILES
# This is pointless. The documentation can just provide WHEREAREMYFILES,
@@ -99,35 +97,29 @@ Client program for wicd that uses a GTK+ interface.
# Handle D-Bus connection failures a little better
%patch1 -p1
-# Direct users to D-Bus policy configuration on connection failure
+# Allow users at the console to control wicd
%patch2 -p1
-# Allow users at the console to control wicd
+# Initialize child_pid to None in wicd-daemon.py
%patch3 -p1
-# Initialize appGui._wired_showing in __init__
+# Work around bug in DaemonClosing() calls
%patch4 -p1
-# Make sure check and message are always a lambda
-%patch5 -p1
-
-# Fix CVE-2012-0813
-# Patch based on upstream:
-# http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/682
-%patch6 -p1
-
%build
-# NOTE: --etc is where dhclient.conf.template goes
+rm -f po/ast.po
%{__python} setup.py configure \
--distro redhat \
--lib %{_libdir} \
--share %{_datadir}/wicd \
- --etc %{_sysconfdir}/dhcp \
+ --etc %{_sysconfdir}/wicd \
--bin %{_bindir} \
--pmutils %{_libdir}/pm-utils/sleep.d \
--log %{_localstatedir}/log \
+ --systemd %{_systemd_unitdir} \
--no-install-init
%{__python} setup.py build
+%{__python} setup.py compile_translations
%install
rm -rf %{buildroot}
@@ -153,17 +145,11 @@ for lib in %{buildroot}%{python_sitelib}/wicd/*.py ; do
mv $lib.new $lib
done
-sed -i -e 's/.$//' %{buildroot}%{python_sitelib}/wicd/logfile.py
-sed -i -e '/^#!\//, 1d' %{buildroot}%{python_sitelib}/wicd/logfile.py
-
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/wicd
-mkdir -p %{buildroot}%{_systemd_unitdir}
-install -m 0644 %{SOURCE2} %{buildroot}%{_systemd_unitdir}/wicd.service
-
mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services
-install -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/dbus-1/system-services/org.wicd.daemon.service
+install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/dbus-1/system-services/org.wicd.daemon.service
desktop-file-install \
--remove-category="Application" \
@@ -219,7 +205,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
-%{_libdir}/pm-utils/sleep.d/91wicd
+%{_libdir}/pm-utils/sleep.d/55wicd
%files common -f %{name}.lang
%defattr(-,root,root,-)
@@ -235,24 +221,31 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%dir %{_sysconfdir}/wicd/scripts/predisconnect
%{_sysconfdir}/acpi/resume.d/80-wicd-connect.sh
%{_sysconfdir}/acpi/suspend.d/50-wicd-suspend.sh
+%{_sysconfdir}/logrotate.d/wicd.logrotate
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/wicd.conf
-%config(noreplace) %{_sysconfdir}/dhcp/dhclient.conf.template.default
+%config(noreplace) %{_sysconfdir}/wicd/dhclient.conf.template.default
%config(noreplace) %{_sysconfdir}/logrotate.d/wicd
%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-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
+%{python_sitelib}/wicd-%{version}*.egg-info
%{_bindir}/wicd-cli
%{_bindir}/wicd-client
%{_sbindir}/wicd
@@ -300,11 +293,27 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
%changelog
+* Mon Mar 26 2012 David Cantrell <dcantrell at redhat.com> - 1.7.1-1
+- Remove our wicd.service file, this is provided by upstream now
+- 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
+- BR babel
+- Remove po/ast.po because babel doesn't understand it
+- 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)
+- Upgrade to wicd-1.7.1 final release (#789380)
+- Have wicd-common require pygobject2 (#754416)
+- Remove patches that have been incorporated upstream
+
* Wed Mar 21 2012 David Cantrell <dcantrell at redhat.com> - 1.7.1b2-0.4
- Make wicd-common require pygobject2 (#799537)
* Fri Jan 27 2012 David Cantrell <dcantrell at redhat.com> - 1.7.1b2-0.3
-- Fix CVS-2012-0813 (#785147)
+- Fix CVE-2012-0813 (#785147)
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1-0.2.b2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list