From faa6fae9474afc9ed791cf23c9d3b2e04d6cf312 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 21 Jun 2010 02:35:17 +0000 Subject: [PATCH 01/84] Initialize branch EL-6 for wicd --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From ed2d508f3f1b113d940b19c9f541637a51fcae3e Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 21 Jun 2010 17:24:18 +0000 Subject: [PATCH 02/84] - Initial package --- .cvsignore | 1 + sources | 1 + wicd-1.7.0-initscript.patch | 12 ++ wicd-1.7.0-remove-WHEREAREMYFILES.patch | 53 +++++ wicd.logrotate | 6 + wicd.spec | 257 ++++++++++++++++++++++++ 6 files changed, 330 insertions(+) create mode 100644 wicd-1.7.0-initscript.patch create mode 100644 wicd-1.7.0-remove-WHEREAREMYFILES.patch create mode 100644 wicd.logrotate create mode 100644 wicd.spec diff --git a/.cvsignore b/.cvsignore index e69de29..fa44ba2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +wicd-1.7.0.tar.bz2 diff --git a/sources b/sources index e69de29..c13af5a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +7e5956891d6696b6185baa7f5dc70c56 wicd-1.7.0.tar.bz2 diff --git a/wicd-1.7.0-initscript.patch b/wicd-1.7.0-initscript.patch new file mode 100644 index 0000000..5d85082 --- /dev/null +++ b/wicd-1.7.0-initscript.patch @@ -0,0 +1,12 @@ +diff -up wicd-1.7.0/in/init=redhat=wicd.in.orig wicd-1.7.0/in/init=redhat=wicd.in +--- wicd-1.7.0/in/init=redhat=wicd.in.orig 2010-01-14 18:49:11.000000000 -1000 ++++ wicd-1.7.0/in/init=redhat=wicd.in 2010-05-30 12:45:31.000000000 -1000 +@@ -43,7 +43,7 @@ force_stop() + killproc -p $pidfile wicd + RETVAL=$? + echo +- if [ $retval -eq 0 ]; then ++ if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$servicename + rm -f $pidfile + fi diff --git a/wicd-1.7.0-remove-WHEREAREMYFILES.patch b/wicd-1.7.0-remove-WHEREAREMYFILES.patch new file mode 100644 index 0000000..cf08ae5 --- /dev/null +++ b/wicd-1.7.0-remove-WHEREAREMYFILES.patch @@ -0,0 +1,53 @@ +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 + +-.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.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) + 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 + 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 +@@ -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.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 +@@ -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.logrotate b/wicd.logrotate new file mode 100644 index 0000000..59ca51d --- /dev/null +++ b/wicd.logrotate @@ -0,0 +1,6 @@ +/var/log/wicd.log { + missingok + notifempty + size 30k + create 0600 root root +} diff --git a/wicd.spec b/wicd.spec new file mode 100644 index 0000000..38365d7 --- /dev/null +++ b/wicd.spec @@ -0,0 +1,257 @@ +%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 + +%define debug_package %{nil} + +Name: wicd +Version: 1.7.0 +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.bz2 +Source1: wicd.logrotate +Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch +Patch1: wicd-1.7.0-initscript.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) +BuildRequires: python2-devel +BuildRequires: desktop-file-utils + +Requires: pm-utils >= 1.2.4 +Requires: wicd-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 +Group: System Environment/Base +BuildArch: noarch +Requires: dbus +Requires: dbus-python +Requires: dhclient +Requires: ethtool +Requires: iproute +Requires: logrotate +Requires: net-tools +Requires: wireless-tools +Requires: wpa_supplicant +Requires: %{name} = %{version}-%{release} +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts +Requires(postun): initscripts + +%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} = %{version}-%{release} +Requires: python-urwid >= 0.9.8.3 + +%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} = %{version}-%{release} +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 + +# Init scripts should use $RETVAL, not $retval +# Reported upstream: https://bugs.launchpad.net/wicd/+bug/587690 +%patch1 -p1 + +%build +# NOTE: --etc is where dhclient.conf.template goes +%{__python} setup.py configure \ + --distro redhat \ + --lib %{_libdir} \ + --share %{_datadir}/wicd \ + --etc %{_sysconfdir}/dhcp \ + --bin %{_bindir} \ + --pmutils %{_libdir}/pm-utils/sleep.d \ + --log %{_localstatedir}/log +%{__python} setup.py build + +%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 +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}%{python_sitelib}/wicd/*.py ; do + sed '/\/usr\/bin\/env/d' $lib > $lib.new && + touch -r $lib $lib.new && + 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 + +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} + +%clean +rm -rf %{buildroot} + +%post common +/sbin/chkconfig --add wicd + +%preun common +if [ $1 -eq 0 ]; then + /sbin/service wicd stop >/dev/null 2>&1 + /sbin/chkconfig --del wicd +fi + +%postun common +if [ $1 -ge 1 ]; then + /sbin/service wicd condrestart >/dev/null 2>&1 || : +fi + +%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 +%defattr(-,root,root,-) +%doc AUTHORS CHANGES LICENSE NEWS README other/WHEREAREMYFILES +%{_libdir}/pm-utils/sleep.d/91wicd + +%files common -f %{name}.lang +%defattr(-,root,root,-) +%dir %{python_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}/dbus-1/system.d/wicd.conf +%config(noreplace) %{_sysconfdir}/dhcp/dhclient.conf.template.default +%config(noreplace) %{_sysconfdir}/logrotate.d/wicd +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/active +%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/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/wpa +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-psk +%{_initddir}/wicd +%{python_sitelib}/wicd/* +%{python_sitelib}/Wicd-%{version}*.egg-info +%{_bindir}/wicd-cli +%{_bindir}/wicd-client +%{_sbindir}/wicd +%{_datadir}/applications/wicd.desktop +%{_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 +%defattr(-,root,root,-) +%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 +%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 + +%changelog +* Mon Jun 21 2010 David Cantrell - 1.7.0-1 +- Initial package From 92a0e3aabe3f15959f013bad10b1138b0d1aebce Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 21 Jun 2010 18:28:19 +0000 Subject: [PATCH 03/84] - Initial package --- .cvsignore | 1 + sources | 1 + wicd-1.7.0-initscript.patch | 12 ++ wicd-1.7.0-remove-WHEREAREMYFILES.patch | 53 +++++ wicd.logrotate | 6 + wicd.spec | 257 ++++++++++++++++++++++++ 6 files changed, 330 insertions(+) create mode 100644 wicd-1.7.0-initscript.patch create mode 100644 wicd-1.7.0-remove-WHEREAREMYFILES.patch create mode 100644 wicd.logrotate create mode 100644 wicd.spec diff --git a/.cvsignore b/.cvsignore index e69de29..fa44ba2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +wicd-1.7.0.tar.bz2 diff --git a/sources b/sources index e69de29..c13af5a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +7e5956891d6696b6185baa7f5dc70c56 wicd-1.7.0.tar.bz2 diff --git a/wicd-1.7.0-initscript.patch b/wicd-1.7.0-initscript.patch new file mode 100644 index 0000000..5d85082 --- /dev/null +++ b/wicd-1.7.0-initscript.patch @@ -0,0 +1,12 @@ +diff -up wicd-1.7.0/in/init=redhat=wicd.in.orig wicd-1.7.0/in/init=redhat=wicd.in +--- wicd-1.7.0/in/init=redhat=wicd.in.orig 2010-01-14 18:49:11.000000000 -1000 ++++ wicd-1.7.0/in/init=redhat=wicd.in 2010-05-30 12:45:31.000000000 -1000 +@@ -43,7 +43,7 @@ force_stop() + killproc -p $pidfile wicd + RETVAL=$? + echo +- if [ $retval -eq 0 ]; then ++ if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$servicename + rm -f $pidfile + fi diff --git a/wicd-1.7.0-remove-WHEREAREMYFILES.patch b/wicd-1.7.0-remove-WHEREAREMYFILES.patch new file mode 100644 index 0000000..cf08ae5 --- /dev/null +++ b/wicd-1.7.0-remove-WHEREAREMYFILES.patch @@ -0,0 +1,53 @@ +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 + +-.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.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) + 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 + 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 +@@ -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.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 +@@ -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.logrotate b/wicd.logrotate new file mode 100644 index 0000000..59ca51d --- /dev/null +++ b/wicd.logrotate @@ -0,0 +1,6 @@ +/var/log/wicd.log { + missingok + notifempty + size 30k + create 0600 root root +} diff --git a/wicd.spec b/wicd.spec new file mode 100644 index 0000000..38365d7 --- /dev/null +++ b/wicd.spec @@ -0,0 +1,257 @@ +%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 + +%define debug_package %{nil} + +Name: wicd +Version: 1.7.0 +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.bz2 +Source1: wicd.logrotate +Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch +Patch1: wicd-1.7.0-initscript.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) +BuildRequires: python2-devel +BuildRequires: desktop-file-utils + +Requires: pm-utils >= 1.2.4 +Requires: wicd-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 +Group: System Environment/Base +BuildArch: noarch +Requires: dbus +Requires: dbus-python +Requires: dhclient +Requires: ethtool +Requires: iproute +Requires: logrotate +Requires: net-tools +Requires: wireless-tools +Requires: wpa_supplicant +Requires: %{name} = %{version}-%{release} +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts +Requires(postun): initscripts + +%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} = %{version}-%{release} +Requires: python-urwid >= 0.9.8.3 + +%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} = %{version}-%{release} +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 + +# Init scripts should use $RETVAL, not $retval +# Reported upstream: https://bugs.launchpad.net/wicd/+bug/587690 +%patch1 -p1 + +%build +# NOTE: --etc is where dhclient.conf.template goes +%{__python} setup.py configure \ + --distro redhat \ + --lib %{_libdir} \ + --share %{_datadir}/wicd \ + --etc %{_sysconfdir}/dhcp \ + --bin %{_bindir} \ + --pmutils %{_libdir}/pm-utils/sleep.d \ + --log %{_localstatedir}/log +%{__python} setup.py build + +%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 +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}%{python_sitelib}/wicd/*.py ; do + sed '/\/usr\/bin\/env/d' $lib > $lib.new && + touch -r $lib $lib.new && + 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 + +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} + +%clean +rm -rf %{buildroot} + +%post common +/sbin/chkconfig --add wicd + +%preun common +if [ $1 -eq 0 ]; then + /sbin/service wicd stop >/dev/null 2>&1 + /sbin/chkconfig --del wicd +fi + +%postun common +if [ $1 -ge 1 ]; then + /sbin/service wicd condrestart >/dev/null 2>&1 || : +fi + +%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 +%defattr(-,root,root,-) +%doc AUTHORS CHANGES LICENSE NEWS README other/WHEREAREMYFILES +%{_libdir}/pm-utils/sleep.d/91wicd + +%files common -f %{name}.lang +%defattr(-,root,root,-) +%dir %{python_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}/dbus-1/system.d/wicd.conf +%config(noreplace) %{_sysconfdir}/dhcp/dhclient.conf.template.default +%config(noreplace) %{_sysconfdir}/logrotate.d/wicd +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/active +%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/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/wpa +%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-psk +%{_initddir}/wicd +%{python_sitelib}/wicd/* +%{python_sitelib}/Wicd-%{version}*.egg-info +%{_bindir}/wicd-cli +%{_bindir}/wicd-client +%{_sbindir}/wicd +%{_datadir}/applications/wicd.desktop +%{_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 +%defattr(-,root,root,-) +%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 +%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 + +%changelog +* Mon Jun 21 2010 David Cantrell - 1.7.0-1 +- Initial package From 76e05c93d90aecaafaa766acf764914b8a9f4e08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:18:29 +0000 Subject: [PATCH 04/84] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 2e5a18f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wicd -# $Id$ -NAME := wicd -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 6cf752c85e27b470da2261f04ea213076361b473 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:18:29 +0000 Subject: [PATCH 05/84] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 2e5a18f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wicd -# $Id$ -NAME := wicd -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 From 558886266b4e5b5d610d31e6700508b5320475e7 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Sat, 31 Jul 2010 02:36:14 +0200 Subject: [PATCH 06/84] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 38365d7..99b708e 100644 --- a/wicd.spec +++ b/wicd.spec @@ -7,7 +7,7 @@ Name: wicd Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -253,5 +253,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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 From fcb31951ebe8b6a598a02a98471524db07e21b03 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 25 Aug 2010 06:21:12 -1000 Subject: [PATCH 07/84] Remove hard dependency on the base package by wicd-common. 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. --- wicd.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wicd.spec b/wicd.spec index 99b708e..ca5de5b 100644 --- a/wicd.spec +++ b/wicd.spec @@ -7,7 +7,7 @@ Name: wicd Version: 1.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -23,7 +23,7 @@ BuildRequires: python2-devel BuildRequires: desktop-file-utils Requires: pm-utils >= 1.2.4 -Requires: wicd-common = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} %description Wicd is designed to give the user as much control over behavior of network @@ -47,7 +47,6 @@ Requires: logrotate Requires: net-tools Requires: wireless-tools Requires: wpa_supplicant -Requires: %{name} = %{version}-%{release} Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts @@ -60,7 +59,7 @@ This package provides the main wicd daemon and the wicd-cli front-end. Summary: Curses client for wicd Group: Applications/System BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} Requires: python-urwid >= 0.9.8.3 %description curses @@ -70,7 +69,7 @@ Client program for wicd that uses a curses interface. Summary: GTK+ client for wicd Group: Applications/Internet BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} Requires: pygtk2-libglade >= 2.10 %description gtk @@ -253,6 +252,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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 From 673d6d4ac2c373af41e0692456b9aaf9269faccd Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 22 Oct 2010 10:22:10 -1000 Subject: [PATCH 08/84] - Use cPickle instead of deepcopy in configmanager.py (#645251) --- wicd-1.7.0-deepcopy.patch | 50 +++++++++++++++++++++++++++++++++++++++ wicd.spec | 9 ++++++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 wicd-1.7.0-deepcopy.patch diff --git a/wicd-1.7.0-deepcopy.patch b/wicd-1.7.0-deepcopy.patch new file mode 100644 index 0000000..47989e8 --- /dev/null +++ b/wicd-1.7.0-deepcopy.patch @@ -0,0 +1,50 @@ +diff -up wicd-1.7.0/wicd/configmanager.py.deepcopy wicd-1.7.0/wicd/configmanager.py +--- wicd-1.7.0/wicd/configmanager.py.deepcopy 2010-01-14 18:49:11.000000000 -1000 ++++ wicd-1.7.0/wicd/configmanager.py 2010-10-22 10:18:14.000000000 -1000 +@@ -25,6 +25,7 @@ reusable for other purposes as well. + # + + import os, copy ++import cPickle + + from ConfigParser import RawConfigParser + +@@ -35,7 +36,7 @@ from dbus import Int32 + class ConfigManager(RawConfigParser): + """ A class that can be used to manage a given configuration file. """ + def __init__(self, path, debug=False, mark_whitespace="`'`"): +- RawConfigParser.__init__(self) ++ RawConfigParser.__init__(self, allow_no_value = True) + self.config_file = path + self.debug = debug + self.mrk_ws = mark_whitespace +@@ -67,7 +68,7 @@ class ConfigManager(RawConfigParser): + if value.startswith(' ') or value.endswith(' '): + value = "%(ws)s%(value)s%(ws)s" % {"value" : value, + "ws" : self.mrk_ws} +- RawConfigParser.set(self, section, str(option), value) ++ RawConfigParser.set(self, section, str(option), "None" if value is None else value) + if write: + self.write() + +@@ -176,9 +177,7 @@ class ConfigManager(RawConfigParser): + + + def _copy_section(self, name): +- # Yes, deepcopy sucks, but it is robust to changes in both +- # this class and RawConfigParser. +- p = copy.deepcopy(self) ++ p = cPickle.loads(cPickle.dumps(self, -1)) + for sname in p.sections(): + if sname != name: + p.remove_section(sname) +@@ -188,8 +187,7 @@ class ConfigManager(RawConfigParser): + + def write(self): + """ Writes the loaded config file to disk. """ +- # Really don't like this deepcopy. +- p = copy.deepcopy(self) ++ p = cPickle.loads(cPickle.dumps(self, -1)) + for sname in p.sections(): + fname = p.get_option(sname, '_filename_') + if fname and fname != self.config_file: diff --git a/wicd.spec b/wicd.spec index ca5de5b..fb33648 100644 --- a/wicd.spec +++ b/wicd.spec @@ -7,7 +7,7 @@ Name: wicd Version: 1.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -17,6 +17,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.ta Source1: wicd.logrotate Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch Patch1: wicd-1.7.0-initscript.patch +Patch2: wicd-1.7.0-deepcopy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: python2-devel @@ -87,6 +88,9 @@ Client program for wicd that uses a GTK+ interface. # Reported upstream: https://bugs.launchpad.net/wicd/+bug/587690 %patch1 -p1 +# Use cPickle instead of deepcopy in configmanager.py +%patch2 -p1 + %build # NOTE: --etc is where dhclient.conf.template goes %{__python} setup.py configure \ @@ -252,6 +256,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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 From f86ff3692cceaa7f188b3ac5f7c9ceceb8d389ed Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Sat, 15 Jan 2011 15:32:54 -1000 Subject: [PATCH 09/84] - Replace existing init script with systemd unit file (#661226) --- wicd-1.7.0-initscript.patch | 12 ---- wicd.service | 11 +++ wicd.spec | 131 +++++++++++++++++++++--------------- 3 files changed, 86 insertions(+), 68 deletions(-) delete mode 100644 wicd-1.7.0-initscript.patch create mode 100644 wicd.service diff --git a/wicd-1.7.0-initscript.patch b/wicd-1.7.0-initscript.patch deleted file mode 100644 index 5d85082..0000000 --- a/wicd-1.7.0-initscript.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up wicd-1.7.0/in/init=redhat=wicd.in.orig wicd-1.7.0/in/init=redhat=wicd.in ---- wicd-1.7.0/in/init=redhat=wicd.in.orig 2010-01-14 18:49:11.000000000 -1000 -+++ wicd-1.7.0/in/init=redhat=wicd.in 2010-05-30 12:45:31.000000000 -1000 -@@ -43,7 +43,7 @@ force_stop() - killproc -p $pidfile wicd - RETVAL=$? - echo -- if [ $retval -eq 0 ]; then -+ if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/$servicename - rm -f $pidfile - fi diff --git a/wicd.service b/wicd.service new file mode 100644 index 0000000..f30fc3a --- /dev/null +++ b/wicd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Wicd a wireless and wired network manager for Linux +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/sbin/wicd +ExecStop=/usr/sbin/wicd -k + +[Install] +WantedBy=multi-user.target diff --git a/wicd.spec b/wicd.spec index fb33648..82f2cd5 100644 --- a/wicd.spec +++ b/wicd.spec @@ -3,28 +3,32 @@ %{!?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.0 -Release: 4%{?dist} -Summary: Wireless and wired network connection manager +Name: wicd +Version: 1.7.0 +Release: 5%{?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.bz2 -Source1: wicd.logrotate -Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch -Patch1: wicd-1.7.0-initscript.patch -Patch2: wicd-1.7.0-deepcopy.patch +Group: System Environment/Base +License: GPLv2+ +URL: http://wicd.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Source1: wicd.logrotate +Source2: wicd.service +Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch +Patch1: wicd-1.7.0-deepcopy.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) -BuildRequires: python2-devel -BuildRequires: desktop-file-utils +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) +BuildRequires: python2-devel +BuildRequires: desktop-file-utils +BuildRequires: pkgconfig +BuildRequires: systemd-units -Requires: pm-utils >= 1.2.4 -Requires: %{name}-common = %{version}-%{release} +Requires: pm-utils >= 1.2.4 +Requires: %{name}-common = %{version}-%{release} %description Wicd is designed to give the user as much control over behavior of network @@ -36,42 +40,43 @@ 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: dbus-python -Requires: dhclient -Requires: ethtool -Requires: iproute -Requires: logrotate -Requires: net-tools -Requires: wireless-tools -Requires: wpa_supplicant -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts +Summary: Wicd common files +Group: System Environment/Base +BuildArch: noarch +Requires: dbus +Requires: dbus-python +Requires: dhclient +Requires: ethtool +Requires: iproute +Requires: logrotate +Requires: net-tools +Requires: wireless-tools +Requires: wpa_supplicant +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +Requires(triggerun): systemd-units + %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: python-urwid >= 0.9.8.3 +Summary: Curses client for wicd +Group: Applications/System +BuildArch: noarch +Requires: %{name}-common = %{version}-%{release} +Requires: python-urwid >= 0.9.8.3 %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: pygtk2-libglade >= 2.10 +Summary: GTK+ client for wicd +Group: Applications/Internet +BuildArch: noarch +Requires: %{name}-common = %{version}-%{release} +Requires: pygtk2-libglade >= 2.10 %description gtk Client program for wicd that uses a GTK+ interface. @@ -84,12 +89,8 @@ Client program for wicd that uses a GTK+ interface. # which we do in this package. %patch0 -p1 -# Init scripts should use $RETVAL, not $retval -# Reported upstream: https://bugs.launchpad.net/wicd/+bug/587690 -%patch1 -p1 - # Use cPickle instead of deepcopy in configmanager.py -%patch2 -p1 +%patch1 -p1 %build # NOTE: --etc is where dhclient.conf.template goes @@ -100,7 +101,8 @@ Client program for wicd that uses a GTK+ interface. --etc %{_sysconfdir}/dhcp \ --bin %{_bindir} \ --pmutils %{_libdir}/pm-utils/sleep.d \ - --log %{_localstatedir}/log + --log %{_localstatedir}/log \ + --no-install-init %{__python} setup.py build %install @@ -133,6 +135,9 @@ 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_unit_dir} +install -m 0644 %{SOURCE2} %{buildroot}%{_systemd_unit_dir}/wicd.service + desktop-file-install \ --remove-category="Application" \ --delete-original \ @@ -149,17 +154,28 @@ desktop-file-install \ rm -rf %{buildroot} %post common -/sbin/chkconfig --add wicd +if [ $1 -eq 1 ]; then + # Package install, not upgrade + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi %preun common -if [ $1 -eq 0 ]; then - /sbin/service wicd stop >/dev/null 2>&1 - /sbin/chkconfig --del wicd +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl disable wicd.service > /dev/null 2>&1 || : + /bin/systemctl stop wicd.service > /dev/null 2>&1 || : fi %postun common -if [ $1 -ge 1 ]; then - /sbin/service wicd condrestart >/dev/null 2>&1 || : +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart wicd.service >/dev/null 2>&1 || : +fi + +%triggerun -- wicd-common < 1.7.0-5 +if /sbin/chkconfig wicd ; then + /bin/systemctl enable wicd.service >/dev/null 2>&1 || : fi %post gtk @@ -207,7 +223,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-shared %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-psk -%{_initddir}/wicd +%{_systemd_unit_dir}/wicd.service %{python_sitelib}/wicd/* %{python_sitelib}/Wicd-%{version}*.egg-info %{_bindir}/wicd-cli @@ -256,6 +272,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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) From b67779aa2d8f5f8e8e228745899a809d22e71013 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Sat, 15 Jan 2011 16:14:53 -1000 Subject: [PATCH 10/84] - Correct typo with _systemd_unitdir macro usage in spec file --- wicd.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/wicd.spec b/wicd.spec index 82f2cd5..fae4237 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -135,8 +135,8 @@ 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_unit_dir} -install -m 0644 %{SOURCE2} %{buildroot}%{_systemd_unit_dir}/wicd.service +mkdir -p %{buildroot}%{_systemd_unitdir} +install -m 0644 %{SOURCE2} %{buildroot}%{_systemd_unitdir}/wicd.service desktop-file-install \ --remove-category="Application" \ @@ -223,7 +223,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-shared %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-psk -%{_systemd_unit_dir}/wicd.service +%{_systemd_unitdir}/wicd.service %{python_sitelib}/wicd/* %{python_sitelib}/Wicd-%{version}*.egg-info %{_bindir}/wicd-cli @@ -272,6 +272,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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) From c1a2d24a9223cd6ee027c39805ce01fa82f2a714 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 20:35:56 -0600 Subject: [PATCH 11/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index fae4237..916e067 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -272,6 +272,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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 From a50ab24889f4a212eb127efb0ecbad40d8a451d3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 5 May 2011 16:56:52 -0400 Subject: [PATCH 12/84] Fix systemd-related scriptlets. - chkconfig without a level forwards to systemctl, which is not useful for SysV migrations. Pass an explicit level. --- wicd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 916e067..64c751d 100644 --- a/wicd.spec +++ b/wicd.spec @@ -174,7 +174,7 @@ if [ $1 -ge 1 ] ; then fi %triggerun -- wicd-common < 1.7.0-5 -if /sbin/chkconfig wicd ; then +if /sbin/chkconfig --level 3 wicd ; then /bin/systemctl enable wicd.service >/dev/null 2>&1 || : fi From de423b5692c9e2a03c87952ba18a34902eb03396 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 9 May 2011 14:27:57 -0400 Subject: [PATCH 13/84] Bump release, add changelog. --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 64c751d..8fd5efe 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -272,6 +272,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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 From 58fbe946a010c47be617984d5c2865d0aa94d28e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 9 May 2011 14:28:49 -0400 Subject: [PATCH 14/84] Remove invalid Requires(triggerun); Requires(post) should handle this. --- wicd.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/wicd.spec b/wicd.spec index 8fd5efe..457462c 100644 --- a/wicd.spec +++ b/wicd.spec @@ -55,8 +55,6 @@ Requires: wpa_supplicant Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -Requires(triggerun): systemd-units - %description common This package provides the main wicd daemon and the wicd-cli front-end. From 2d89c88e0bf298ac751fa294169eedf35d08b035 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 19 Aug 2011 16:32:27 -0400 Subject: [PATCH 15/84] 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) --- org.wicd.daemon.service | 11 ++++ wicd-1.7.0-dbus-failure.patch | 50 +++++++++++++++++ wicd-1.7.0-dbus-policy.patch | 54 +++++++++++++++++++ wicd-1.7.0-error-messages.patch | 27 ++++++++++ wicd-1.7.0-initialize-check-and-message.patch | 13 +++++ wicd-1.7.0-wired_showing.patch | 11 ++++ wicd.service | 10 ++-- wicd.spec | 37 ++++++++++++- 8 files changed, 208 insertions(+), 5 deletions(-) create mode 100644 org.wicd.daemon.service create mode 100644 wicd-1.7.0-dbus-failure.patch create mode 100644 wicd-1.7.0-dbus-policy.patch create mode 100644 wicd-1.7.0-error-messages.patch create mode 100644 wicd-1.7.0-initialize-check-and-message.patch create mode 100644 wicd-1.7.0-wired_showing.patch diff --git a/org.wicd.daemon.service b/org.wicd.daemon.service new file mode 100644 index 0000000..b0287f3 --- /dev/null +++ b/org.wicd.daemon.service @@ -0,0 +1,11 @@ +# 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/wicd-1.7.0-dbus-failure.patch b/wicd-1.7.0-dbus-failure.patch new file mode 100644 index 0000000..3d2eacf --- /dev/null +++ b/wicd-1.7.0-dbus-failure.patch @@ -0,0 +1,50 @@ +diff -up wicd-1.7.0/cli/wicd-cli.py.orig wicd-1.7.0/cli/wicd-cli.py +--- wicd-1.7.0/cli/wicd-cli.py.orig 2010-01-14 23:49:11.000000000 -0500 ++++ wicd-1.7.0/cli/wicd-cli.py 2011-08-05 11:09:57.561058338 -0400 +@@ -43,6 +43,10 @@ except dbus.DBusException: + print 'Error: Could not connect to the daemon. Please make sure it 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.0/curses/wicd-curses.py.orig wicd-1.7.0/curses/wicd-curses.py +--- wicd-1.7.0/curses/wicd-curses.py.orig 2010-01-14 23:49:11.000000000 -0500 ++++ wicd-1.7.0/curses/wicd-curses.py 2011-08-05 11:09:00.248056606 -0400 +@@ -1016,6 +1016,10 @@ def setup_dbus(force=True): + wireless = dbus_ifaces['wireless'] + wired = dbus_ifaces['wired'] + ++ 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.0/gtk/gui.py.orig wicd-1.7.0/gtk/gui.py +--- wicd-1.7.0/gtk/gui.py.orig 2010-01-14 23:49:11.000000000 -0500 ++++ wicd-1.7.0/gtk/gui.py 2011-08-05 10:49:08.392177338 -0400 +@@ -146,6 +146,17 @@ class appGui(object): + """ Initializes everything needed for the GUI. """ + setup_dbus() + ++ 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.glade") +diff -up wicd-1.7.0/gtk/wicd-client.py.orig wicd-1.7.0/gtk/wicd-client.py diff --git a/wicd-1.7.0-dbus-policy.patch b/wicd-1.7.0-dbus-policy.patch new file mode 100644 index 0000000..9b722ec --- /dev/null +++ b/wicd-1.7.0-dbus-policy.patch @@ -0,0 +1,54 @@ +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 --git a/wicd-1.7.0-error-messages.patch b/wicd-1.7.0-error-messages.patch new file mode 100644 index 0000000..1de0cc8 --- /dev/null +++ b/wicd-1.7.0-error-messages.patch @@ -0,0 +1,27 @@ +diff -up wicd-1.7.0/curses/wicd-curses.py.orig wicd-1.7.0/curses/wicd-curses.py +--- wicd-1.7.0/curses/wicd-curses.py.orig 2011-08-11 17:01:29.969340068 -0400 ++++ wicd-1.7.0/curses/wicd-curses.py 2011-08-11 17:01:30.159340092 -0400 +@@ -1033,7 +1033,7 @@ if __name__ == '__main__': + parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REV,daemon.Hello())) + except Exception, e: + if "DBus.Error.AccessDenied" in e.get_dbus_name(): +- print language['access_denied_wc'].replace('$A','\033[1;34m'+wpath.wicd_group+'\033[0m') ++ print language['access_denied_wc'] + sys.exit(1) + else: + raise +diff -up wicd-1.7.0/wicd/translations.py.orig wicd-1.7.0/wicd/translations.py +--- wicd-1.7.0/wicd/translations.py.orig 2010-01-14 23:49:23.000000000 -0500 ++++ wicd-1.7.0/wicd/translations.py 2011-08-11 17:01:30.179340042 -0400 +@@ -214,9 +214,9 @@ language['connection_established'] = _(' + language['disconnected'] = _('''Disconnected''') + language['establishing_connection'] = _('''Establishing connection...''') + language['association_failed'] = _('''Connection failed: Could not contact the wireless access point.''') +-language['access_denied'] = _('''Unable to contact the Wicd daemon due to an access denied error from DBus. Please check that your user is in the $A group.''') ++language['access_denied'] = _('''Unable to contact the Wicd daemon due to an access denied error from DBus. Please check your D-Bus policy configuration.''') + language['disconnecting_active'] = _('''Disconnecting active connections...''') +-language['access_denied_wc'] = _('''ERROR: wicd-curses was denied access to the wicd daemon: please check that your user is in the "$A" group.''') ++language['access_denied_wc'] = _('''ERROR: wicd-curses was denied access to the wicd daemon: please check your D-Bus policy configuration.''') + language['post_disconnect_script'] = _('''Run post-disconnect script''') + language['resume_script'] = _('''Resume script''') + language['suspend_script'] = _('''Suspend script''') diff --git a/wicd-1.7.0-initialize-check-and-message.patch b/wicd-1.7.0-initialize-check-and-message.patch new file mode 100644 index 0000000..323e549 --- /dev/null +++ b/wicd-1.7.0-initialize-check-and-message.patch @@ -0,0 +1,13 @@ +diff -up wicd-1.7.0/cli/wicd-cli.py.orig wicd-1.7.0/cli/wicd-cli.py +--- wicd-1.7.0/cli/wicd-cli.py.orig 2011-08-19 15:24:57.413159478 -0400 ++++ wicd-1.7.0/cli/wicd-cli.py 2011-08-19 15:31:49.790055545 -0400 +@@ -195,6 +195,9 @@ if options.connect: + + check = lambda: wired.CheckIfWiredConnecting() + message = lambda: wired.CheckWiredConnectingMessage() ++ else: ++ check = lambda: False ++ message = lambda: False + + # update user on what the daemon is doing + last = None diff --git a/wicd-1.7.0-wired_showing.patch b/wicd-1.7.0-wired_showing.patch new file mode 100644 index 0000000..275e4f3 --- /dev/null +++ b/wicd-1.7.0-wired_showing.patch @@ -0,0 +1,11 @@ +diff -up wicd-1.7.0/gtk/gui.py.orig wicd-1.7.0/gtk/gui.py +--- wicd-1.7.0/gtk/gui.py.orig 2011-08-19 14:53:37.667180427 -0400 ++++ wicd-1.7.0/gtk/gui.py 2011-08-19 14:55:43.657056952 -0400 +@@ -220,6 +220,7 @@ class appGui(object): + self.refreshing = False + self.prev_state = None + self.update_cb = None ++ self._wired_showing = False + self.network_list.set_sensitive(False) + label = gtk.Label("%s..." % language['scanning']) + self.network_list.pack_start(label) diff --git a/wicd.service b/wicd.service index f30fc3a..68d2437 100644 --- a/wicd.service +++ b/wicd.service @@ -1,11 +1,15 @@ [Unit] Description=Wicd a wireless and wired network manager for Linux After=syslog.target +Wants=network.target +Before=network.target +Conflicts=NetworkManager.service [Service] -Type=forking -ExecStart=/usr/sbin/wicd -ExecStop=/usr/sbin/wicd -k +Type=dbus +BusName=org.wicd.daemon +ExecStart=/usr/sbin/wicd --no-daemon [Install] WantedBy=multi-user.target +Alias=dbus-org.wicd.daemon.service diff --git a/wicd.spec b/wicd.spec index 457462c..1b7834a 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -18,8 +18,15 @@ URL: http://wicd.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: wicd.logrotate Source2: wicd.service +Source3: org.wicd.daemon.service + Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch Patch1: wicd-1.7.0-deepcopy.patch +Patch2: wicd-1.7.0-dbus-failure.patch +Patch3: wicd-1.7.0-error-messages.patch +Patch4: wicd-1.7.0-dbus-policy.patch +Patch5: wicd-1.7.0-wired_showing.patch +Patch6: wicd-1.7.0-initialize-check-and-message.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: python2-devel @@ -90,6 +97,21 @@ Client program for wicd that uses a GTK+ interface. # Use cPickle instead of deepcopy in configmanager.py %patch1 -p1 +# Handle D-Bus connection failures a little better +%patch2 -p1 + +# Direct users to D-Bus policy configuration on connection failure +%patch3 -p1 + +# Allow users at the console to control wicd +%patch4 -p1 + +# Initialize appGui._wired_showing in __init__ +%patch5 -p1 + +# Make sure check and message are always a lambda +%patch6 -p1 + %build # NOTE: --etc is where dhclient.conf.template goes %{__python} setup.py configure \ @@ -136,6 +158,9 @@ 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 + desktop-file-install \ --remove-category="Application" \ --delete-original \ @@ -190,11 +215,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files %defattr(-,root,root,-) -%doc AUTHORS CHANGES LICENSE NEWS README other/WHEREAREMYFILES %{_libdir}/pm-utils/sleep.d/91wicd %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 @@ -228,6 +253,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_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* @@ -270,6 +296,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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 From 0c5da92eb178923165e2baa0033fb10d9bfab5a9 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 19 Aug 2011 16:56:38 -0400 Subject: [PATCH 16/84] Upgrade to wicd-1.7.1b2 --- .gitignore | 2 +- sources | 2 +- wicd.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index fa44ba2..ebd1b99 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -wicd-1.7.0.tar.bz2 +wicd-1.7.1b2.tar.bz2 diff --git a/sources b/sources index c13af5a..522be39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e5956891d6696b6185baa7f5dc70c56 wicd-1.7.0.tar.bz2 +65a6f6c9483d3fcf4ec8dfb8204fcd51 wicd-1.7.1b2.tar.bz2 diff --git a/wicd.spec b/wicd.spec index 1b7834a..805bce9 100644 --- a/wicd.spec +++ b/wicd.spec @@ -6,10 +6,11 @@ %{!?_systemd_unitdir: %global _systemd_unitdir %(pkg-config systemd --variable=systemdsystemunitdir)} %define debug_package %{nil} +%define alphatag b2 Name: wicd -Version: 1.7.0 -Release: 9%{?dist} +Version: 1.7.1 +Release: 0.1.%{alphatag}%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -296,6 +297,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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) From c4d69e580900196617da606990ae987b13839202 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 19 Aug 2011 16:57:17 -0400 Subject: [PATCH 17/84] Upgrade to wicd-1.7.1b2 --- wicd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 805bce9..78ebc02 100644 --- a/wicd.spec +++ b/wicd.spec @@ -16,7 +16,7 @@ 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.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.bz2 Source1: wicd.logrotate Source2: wicd.service Source3: org.wicd.daemon.service From 24496c4d3962db93e979dc4e9a9f63a9335db98c Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 19 Aug 2011 17:11:48 -0400 Subject: [PATCH 18/84] Upgrade to wicd-1.7.1b2 --- wicd-1.7.0-deepcopy.patch | 50 ------------------- wicd-1.7.0-initialize-check-and-message.patch | 13 ----- ...e.patch => wicd-1.7.1b2-dbus-failure.patch | 25 +++++----- ...patch => wicd-1.7.1b2-error-messages.patch | 16 +++--- ...1.7.1b2-initialize-check-and-message.patch | 13 +++++ ....patch => wicd-1.7.1b2-wired_showing.patch | 8 +-- wicd.spec | 26 ++++------ 7 files changed, 48 insertions(+), 103 deletions(-) delete mode 100644 wicd-1.7.0-deepcopy.patch delete mode 100644 wicd-1.7.0-initialize-check-and-message.patch rename wicd-1.7.0-dbus-failure.patch => wicd-1.7.1b2-dbus-failure.patch (59%) rename wicd-1.7.0-error-messages.patch => wicd-1.7.1b2-error-messages.patch (72%) create mode 100644 wicd-1.7.1b2-initialize-check-and-message.patch rename wicd-1.7.0-wired_showing.patch => wicd-1.7.1b2-wired_showing.patch (54%) diff --git a/wicd-1.7.0-deepcopy.patch b/wicd-1.7.0-deepcopy.patch deleted file mode 100644 index 47989e8..0000000 --- a/wicd-1.7.0-deepcopy.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -up wicd-1.7.0/wicd/configmanager.py.deepcopy wicd-1.7.0/wicd/configmanager.py ---- wicd-1.7.0/wicd/configmanager.py.deepcopy 2010-01-14 18:49:11.000000000 -1000 -+++ wicd-1.7.0/wicd/configmanager.py 2010-10-22 10:18:14.000000000 -1000 -@@ -25,6 +25,7 @@ reusable for other purposes as well. - # - - import os, copy -+import cPickle - - from ConfigParser import RawConfigParser - -@@ -35,7 +36,7 @@ from dbus import Int32 - class ConfigManager(RawConfigParser): - """ A class that can be used to manage a given configuration file. """ - def __init__(self, path, debug=False, mark_whitespace="`'`"): -- RawConfigParser.__init__(self) -+ RawConfigParser.__init__(self, allow_no_value = True) - self.config_file = path - self.debug = debug - self.mrk_ws = mark_whitespace -@@ -67,7 +68,7 @@ class ConfigManager(RawConfigParser): - if value.startswith(' ') or value.endswith(' '): - value = "%(ws)s%(value)s%(ws)s" % {"value" : value, - "ws" : self.mrk_ws} -- RawConfigParser.set(self, section, str(option), value) -+ RawConfigParser.set(self, section, str(option), "None" if value is None else value) - if write: - self.write() - -@@ -176,9 +177,7 @@ class ConfigManager(RawConfigParser): - - - def _copy_section(self, name): -- # Yes, deepcopy sucks, but it is robust to changes in both -- # this class and RawConfigParser. -- p = copy.deepcopy(self) -+ p = cPickle.loads(cPickle.dumps(self, -1)) - for sname in p.sections(): - if sname != name: - p.remove_section(sname) -@@ -188,8 +187,7 @@ class ConfigManager(RawConfigParser): - - def write(self): - """ Writes the loaded config file to disk. """ -- # Really don't like this deepcopy. -- p = copy.deepcopy(self) -+ p = cPickle.loads(cPickle.dumps(self, -1)) - for sname in p.sections(): - fname = p.get_option(sname, '_filename_') - if fname and fname != self.config_file: diff --git a/wicd-1.7.0-initialize-check-and-message.patch b/wicd-1.7.0-initialize-check-and-message.patch deleted file mode 100644 index 323e549..0000000 --- a/wicd-1.7.0-initialize-check-and-message.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up wicd-1.7.0/cli/wicd-cli.py.orig wicd-1.7.0/cli/wicd-cli.py ---- wicd-1.7.0/cli/wicd-cli.py.orig 2011-08-19 15:24:57.413159478 -0400 -+++ wicd-1.7.0/cli/wicd-cli.py 2011-08-19 15:31:49.790055545 -0400 -@@ -195,6 +195,9 @@ if options.connect: - - check = lambda: wired.CheckIfWiredConnecting() - message = lambda: wired.CheckWiredConnectingMessage() -+ else: -+ check = lambda: False -+ message = lambda: False - - # update user on what the daemon is doing - last = None diff --git a/wicd-1.7.0-dbus-failure.patch b/wicd-1.7.1b2-dbus-failure.patch similarity index 59% rename from wicd-1.7.0-dbus-failure.patch rename to wicd-1.7.1b2-dbus-failure.patch index 3d2eacf..5db6f62 100644 --- a/wicd-1.7.0-dbus-failure.patch +++ b/wicd-1.7.1b2-dbus-failure.patch @@ -1,6 +1,6 @@ -diff -up wicd-1.7.0/cli/wicd-cli.py.orig wicd-1.7.0/cli/wicd-cli.py ---- wicd-1.7.0/cli/wicd-cli.py.orig 2010-01-14 23:49:11.000000000 -0500 -+++ wicd-1.7.0/cli/wicd-cli.py 2011-08-05 11:09:57.561058338 -0400 +diff -up wicd-1.7.1b2/cli/wicd-cli.py.orig wicd-1.7.1b2/cli/wicd-cli.py +--- wicd-1.7.1b2/cli/wicd-cli.py.orig 2010-10-29 11:36:55.000000000 -0400 ++++ wicd-1.7.1b2/cli/wicd-cli.py 2011-08-19 17:06:57.834035455 -0400 @@ -43,6 +43,10 @@ except dbus.DBusException: print 'Error: Could not connect to the daemon. Please make sure it is running.' sys.exit(3) @@ -12,10 +12,10 @@ diff -up wicd-1.7.0/cli/wicd-cli.py.orig wicd-1.7.0/cli/wicd-cli.py parser = optparse.OptionParser() parser.add_option('--network', '-n', type='int', default=-1) -diff -up wicd-1.7.0/curses/wicd-curses.py.orig wicd-1.7.0/curses/wicd-curses.py ---- wicd-1.7.0/curses/wicd-curses.py.orig 2010-01-14 23:49:11.000000000 -0500 -+++ wicd-1.7.0/curses/wicd-curses.py 2011-08-05 11:09:00.248056606 -0400 -@@ -1016,6 +1016,10 @@ def setup_dbus(force=True): +diff -up wicd-1.7.1b2/curses/wicd-curses.py.orig wicd-1.7.1b2/curses/wicd-curses.py +--- wicd-1.7.1b2/curses/wicd-curses.py.orig 2010-10-29 11:36:55.000000000 -0400 ++++ wicd-1.7.1b2/curses/wicd-curses.py 2011-08-19 17:06:57.835034617 -0400 +@@ -1017,6 +1017,10 @@ def setup_dbus(force=True): wireless = dbus_ifaces['wireless'] wired = dbus_ifaces['wired'] @@ -26,10 +26,10 @@ diff -up wicd-1.7.0/curses/wicd-curses.py.orig wicd-1.7.0/curses/wicd-curses.py netentry_curses.dbus_init(dbus_ifaces) return True -diff -up wicd-1.7.0/gtk/gui.py.orig wicd-1.7.0/gtk/gui.py ---- wicd-1.7.0/gtk/gui.py.orig 2010-01-14 23:49:11.000000000 -0500 -+++ wicd-1.7.0/gtk/gui.py 2011-08-05 10:49:08.392177338 -0400 -@@ -146,6 +146,17 @@ class appGui(object): +diff -up wicd-1.7.1b2/gtk/gui.py.orig wicd-1.7.1b2/gtk/gui.py +--- wicd-1.7.1b2/gtk/gui.py.orig 2010-10-29 11:36:55.000000000 -0400 ++++ wicd-1.7.1b2/gtk/gui.py 2011-08-19 17:06:57.836054170 -0400 +@@ -145,6 +145,17 @@ class appGui(object): """ Initializes everything needed for the GUI. """ setup_dbus() @@ -46,5 +46,4 @@ diff -up wicd-1.7.0/gtk/gui.py.orig wicd-1.7.0/gtk/gui.py + self.tray = tray - gladefile = os.path.join(wpath.gtk, "wicd.glade") -diff -up wicd-1.7.0/gtk/wicd-client.py.orig wicd-1.7.0/gtk/wicd-client.py + gladefile = os.path.join(wpath.gtk, "wicd.ui") diff --git a/wicd-1.7.0-error-messages.patch b/wicd-1.7.1b2-error-messages.patch similarity index 72% rename from wicd-1.7.0-error-messages.patch rename to wicd-1.7.1b2-error-messages.patch index 1de0cc8..68efe8d 100644 --- a/wicd-1.7.0-error-messages.patch +++ b/wicd-1.7.1b2-error-messages.patch @@ -1,8 +1,8 @@ -diff -up wicd-1.7.0/curses/wicd-curses.py.orig wicd-1.7.0/curses/wicd-curses.py ---- wicd-1.7.0/curses/wicd-curses.py.orig 2011-08-11 17:01:29.969340068 -0400 -+++ wicd-1.7.0/curses/wicd-curses.py 2011-08-11 17:01:30.159340092 -0400 -@@ -1033,7 +1033,7 @@ if __name__ == '__main__': - parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REV,daemon.Hello())) +diff -up wicd-1.7.1b2/curses/wicd-curses.py.orig wicd-1.7.1b2/curses/wicd-curses.py +--- wicd-1.7.1b2/curses/wicd-curses.py.orig 2010-10-29 11:36:55.000000000 -0400 ++++ wicd-1.7.1b2/curses/wicd-curses.py 2011-08-19 17:07:55.523159764 -0400 +@@ -1030,7 +1030,7 @@ if __name__ == '__main__': + parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REV,daemon.Hello()), prog="wicd-curses") except Exception, e: if "DBus.Error.AccessDenied" in e.get_dbus_name(): - print language['access_denied_wc'].replace('$A','\033[1;34m'+wpath.wicd_group+'\033[0m') @@ -10,9 +10,9 @@ diff -up wicd-1.7.0/curses/wicd-curses.py.orig wicd-1.7.0/curses/wicd-curses.py sys.exit(1) else: raise -diff -up wicd-1.7.0/wicd/translations.py.orig wicd-1.7.0/wicd/translations.py ---- wicd-1.7.0/wicd/translations.py.orig 2010-01-14 23:49:23.000000000 -0500 -+++ wicd-1.7.0/wicd/translations.py 2011-08-11 17:01:30.179340042 -0400 +diff -up wicd-1.7.1b2/wicd/translations.py.orig wicd-1.7.1b2/wicd/translations.py +--- wicd-1.7.1b2/wicd/translations.py.orig 2010-10-29 11:36:55.000000000 -0400 ++++ wicd-1.7.1b2/wicd/translations.py 2011-08-19 17:07:55.524160039 -0400 @@ -214,9 +214,9 @@ language['connection_established'] = _(' language['disconnected'] = _('''Disconnected''') language['establishing_connection'] = _('''Establishing connection...''') diff --git a/wicd-1.7.1b2-initialize-check-and-message.patch b/wicd-1.7.1b2-initialize-check-and-message.patch new file mode 100644 index 0000000..cdfbd71 --- /dev/null +++ b/wicd-1.7.1b2-initialize-check-and-message.patch @@ -0,0 +1,13 @@ +diff -up wicd-1.7.1b2/cli/wicd-cli.py.orig wicd-1.7.1b2/cli/wicd-cli.py +--- wicd-1.7.1b2/cli/wicd-cli.py.orig 2010-10-29 11:36:55.000000000 -0400 ++++ wicd-1.7.1b2/cli/wicd-cli.py 2011-08-19 17:10:38.582160338 -0400 +@@ -191,6 +191,9 @@ if options.connect: + + check = lambda: wired.CheckIfWiredConnecting() + message = lambda: wired.CheckWiredConnectingMessage() ++ else: ++ check = lambda: False ++ message = lambda: False + + # update user on what the daemon is doing + last = None diff --git a/wicd-1.7.0-wired_showing.patch b/wicd-1.7.1b2-wired_showing.patch similarity index 54% rename from wicd-1.7.0-wired_showing.patch rename to wicd-1.7.1b2-wired_showing.patch index 275e4f3..eb8be29 100644 --- a/wicd-1.7.0-wired_showing.patch +++ b/wicd-1.7.1b2-wired_showing.patch @@ -1,7 +1,7 @@ -diff -up wicd-1.7.0/gtk/gui.py.orig wicd-1.7.0/gtk/gui.py ---- wicd-1.7.0/gtk/gui.py.orig 2011-08-19 14:53:37.667180427 -0400 -+++ wicd-1.7.0/gtk/gui.py 2011-08-19 14:55:43.657056952 -0400 -@@ -220,6 +220,7 @@ class appGui(object): +diff -up wicd-1.7.1b2/gtk/gui.py.orig wicd-1.7.1b2/gtk/gui.py +--- wicd-1.7.1b2/gtk/gui.py.orig 2010-10-29 11:36:55.000000000 -0400 ++++ wicd-1.7.1b2/gtk/gui.py 2011-08-19 17:09:39.142160320 -0400 +@@ -208,6 +208,7 @@ class appGui(object): self.refreshing = False self.prev_state = None self.update_cb = None diff --git a/wicd.spec b/wicd.spec index 78ebc02..601afa5 100644 --- a/wicd.spec +++ b/wicd.spec @@ -22,12 +22,11 @@ Source2: wicd.service Source3: org.wicd.daemon.service Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch -Patch1: wicd-1.7.0-deepcopy.patch -Patch2: wicd-1.7.0-dbus-failure.patch -Patch3: wicd-1.7.0-error-messages.patch -Patch4: wicd-1.7.0-dbus-policy.patch -Patch5: wicd-1.7.0-wired_showing.patch -Patch6: wicd-1.7.0-initialize-check-and-message.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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: python2-devel @@ -88,30 +87,27 @@ Requires: pygtk2-libglade >= 2.10 Client program for wicd that uses a GTK+ interface. %prep -%setup -q +%setup -q -n %{name}-%{version}%{alphatag} # 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 -# Use cPickle instead of deepcopy in configmanager.py +# Handle D-Bus connection failures a little better %patch1 -p1 -# Handle D-Bus connection failures a little better +# Direct users to D-Bus policy configuration on connection failure %patch2 -p1 -# Direct users to D-Bus policy configuration on connection failure +# Allow users at the console to control wicd %patch3 -p1 -# Allow users at the console to control wicd +# Initialize appGui._wired_showing in __init__ %patch4 -p1 -# Initialize appGui._wired_showing in __init__ -%patch5 -p1 - # Make sure check and message are always a lambda -%patch6 -p1 +%patch5 -p1 %build # NOTE: --etc is where dhclient.conf.template goes From 6f8d52157530bae2a34d4865ae835922e6e71aee Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:18:45 -0600 Subject: [PATCH 19/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 601afa5..8fd600b 100644 --- a/wicd.spec +++ b/wicd.spec @@ -10,7 +10,7 @@ Name: wicd Version: 1.7.1 -Release: 0.1.%{alphatag}%{?dist} +Release: 0.2.%{alphatag}%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -293,6 +293,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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 From 309fe7376a594ecbdaaad0a610dd5d4771f55810 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 27 Jan 2012 14:21:47 -0500 Subject: [PATCH 20/84] Fix CVS-2012-0813 (#785147) --- wicd-1.7.1b2-CVE-2012-0813.patch | 19 +++++++++++++++++++ wicd.spec | 11 ++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 wicd-1.7.1b2-CVE-2012-0813.patch diff --git a/wicd-1.7.1b2-CVE-2012-0813.patch b/wicd-1.7.1b2-CVE-2012-0813.patch new file mode 100644 index 0000000..06f0e8f --- /dev/null +++ b/wicd-1.7.1b2-CVE-2012-0813.patch @@ -0,0 +1,19 @@ +diff -up wicd-1.7.1b2/wicd/configmanager.py.CVE-2012-0813 wicd-1.7.1b2/wicd/configmanager.py +--- wicd-1.7.1b2/wicd/configmanager.py.CVE-2012-0813 2010-10-29 11:36:55.000000000 -0400 ++++ wicd-1.7.1b2/wicd/configmanager.py 2012-01-27 14:17:48.773091678 -0500 +@@ -107,8 +107,13 @@ class ConfigManager(RawConfigParser): + ret = ret[3:-3] + if default: + if self.debug: +- print ''.join(['found ', option, ' in configuration ', +- str(ret)]) ++ # mask out sensitive information ++ if option in ['apsk', 'password', 'identity', 'private_key', \ ++ 'private_key_passwd', 'key', 'passphrase']: ++ print ''.join(['found ', option, ' in configuration *****']) ++ else: ++ print ''.join(['found ', option, ' in configuration ', ++ str(ret)]) + else: + if default != "__None__": + print 'did not find %s in configuration, setting default %s' % (option, str(default)) diff --git a/wicd.spec b/wicd.spec index 8fd600b..3c94572 100644 --- a/wicd.spec +++ b/wicd.spec @@ -10,7 +10,7 @@ Name: wicd Version: 1.7.1 -Release: 0.2.%{alphatag}%{?dist} +Release: 0.3.%{alphatag}%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -27,6 +27,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: python2-devel @@ -109,6 +110,11 @@ Client program for wicd that uses a GTK+ interface. # 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 %{__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 +* Fri Jan 27 2012 David Cantrell - 1.7.1b2-0.3 +- Fix CVS-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 From 6f75fd9bb1bca244e95e1a29c1edf3e48c106d95 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 27 Jan 2012 15:14:05 -0500 Subject: [PATCH 21/84] Fix CVS-2012-0813 (#785147) --- wicd-1.7.0-CVE-2012-0813.patch | 19 +++++++++++++++++++ wicd.spec | 11 ++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 wicd-1.7.0-CVE-2012-0813.patch diff --git a/wicd-1.7.0-CVE-2012-0813.patch b/wicd-1.7.0-CVE-2012-0813.patch new file mode 100644 index 0000000..2c84e0e --- /dev/null +++ b/wicd-1.7.0-CVE-2012-0813.patch @@ -0,0 +1,19 @@ +diff -up wicd-1.7.0/wicd/configmanager.py.CVE-2012-0813 wicd-1.7.0/wicd/configmanager.py +--- wicd-1.7.0/wicd/configmanager.py.CVE-2012-0813 2012-01-27 14:34:12.779219466 -0500 ++++ wicd-1.7.0/wicd/configmanager.py 2012-01-27 14:34:33.534091679 -0500 +@@ -97,8 +97,13 @@ class ConfigManager(RawConfigParser): + ret = ret[3:-3] + if default: + if self.debug: +- print ''.join(['found ', option, ' in configuration ', +- str(ret)]) ++ # mask out sensitive information ++ if option in ['apsk', 'password', 'identity', 'private_key', \ ++ 'private_key_passwd', 'key', 'passphrase']: ++ print ''.join(['found ', option, ' in configuration *****']) ++ else: ++ print ''.join(['found ', option, ' in configuration ', ++ str(ret)]) + else: + if default != "__None__": + print 'did not find %s in configuration, setting default %s' % (option, str(default)) diff --git a/wicd.spec b/wicd.spec index 38365d7..1316c9f 100644 --- a/wicd.spec +++ b/wicd.spec @@ -7,7 +7,7 @@ Name: wicd Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -17,6 +17,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.ta Source1: wicd.logrotate Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch Patch1: wicd-1.7.0-initscript.patch +Patch2: wicd-1.7.0-CVE-2012-0813.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: python2-devel @@ -88,6 +89,11 @@ Client program for wicd that uses a GTK+ interface. # Reported upstream: https://bugs.launchpad.net/wicd/+bug/587690 %patch1 -p1 +# Fix CVE-2012-0813 +# Patch based on upstream: +# http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/682 +%patch2 -p1 + %build # NOTE: --etc is where dhclient.conf.template goes %{__python} setup.py configure \ @@ -253,5 +259,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Fri Jan 27 2012 David Cantrell - 1.7.0-2 +- Fix CVS-2012-0813 (#785147) + * Mon Jun 21 2010 David Cantrell - 1.7.0-1 - Initial package From 72dbba84849e99a2a74d3e42bb5bfe98228390ae Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 10 Feb 2012 14:33:31 -0500 Subject: [PATCH 22/84] Upgrade to wicd-1.7.1 final release --- .gitignore | 1 + sources | 2 +- wicd.spec | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ebd1b99..fcee2f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ 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.spec b/wicd.spec index 3c94572..e706163 100644 --- a/wicd.spec +++ b/wicd.spec @@ -6,17 +6,16 @@ %{!?_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.3.%{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.bz2 Source1: wicd.logrotate Source2: wicd.service Source3: org.wicd.daemon.service @@ -299,8 +298,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Fri Feb 10 2012 David Cantrell - 1.7.1-1 +- Upgrade to wicd-1.7.1 final release + * Fri Jan 27 2012 David Cantrell - 1.7.1b2-0.3 -- Fix CVS-2012-0813 (#785147) +- 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 From 95559128ead6acdb346adbec37c7bf4ad9b489a9 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 10 Feb 2012 14:57:29 -0500 Subject: [PATCH 23/84] Upgrade to wicd-1.7.1 final release (#789380) - Have wicd-common require pygobject2 (#754416) --- wicd.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index e706163..9815928 100644 --- a/wicd.spec +++ b/wicd.spec @@ -59,6 +59,7 @@ 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 @@ -299,7 +300,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Fri Feb 10 2012 David Cantrell - 1.7.1-1 -- Upgrade to wicd-1.7.1 final release +- Upgrade to wicd-1.7.1 final release (#789380) +- Have wicd-common require pygobject2 (#754416) * Fri Jan 27 2012 David Cantrell - 1.7.1b2-0.3 - Fix CVE-2012-0813 (#785147) From befbfe6e3889753ce76729523cb73b189ae9c170 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 10 Feb 2012 15:01:04 -0500 Subject: [PATCH 24/84] Upgrade to wicd-1.7.1 final release (#789380) - Have wicd-common require pygobject2 (#754416) --- .gitignore | 3 +-- wicd.spec | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fcee2f6..59cc34d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -wicd-1.7.1b2.tar.bz2 -/wicd-1.7.1.tar.gz +wicd-1.7.1.tar.gz diff --git a/wicd.spec b/wicd.spec index 9815928..e83eda5 100644 --- a/wicd.spec +++ b/wicd.spec @@ -15,7 +15,7 @@ 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.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: wicd.logrotate Source2: wicd.service Source3: org.wicd.daemon.service From c2d5eff08c5abaa2798d33e3bea1be5604f37aaf Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 10 Feb 2012 15:07:25 -0500 Subject: [PATCH 25/84] Upgrade to wicd-1.7.1 final release (#789380) - Have wicd-common require pygobject2 (#754416) --- wicd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index e83eda5..53d30d1 100644 --- a/wicd.spec +++ b/wicd.spec @@ -88,7 +88,7 @@ Requires: pygtk2-libglade >= 2.10 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, From 89370f8843cded7cd14ad995af10a456e14851cd Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 10 Feb 2012 15:34:19 -0500 Subject: [PATCH 26/84] Upgrade to wicd-1.7.1 final release (#789380) - Have wicd-common require pygobject2 (#754416) - Remove patches that have been incorporated upstream --- wicd-1.7.1b2-CVE-2012-0813.patch | 19 ------------- wicd-1.7.1b2-error-messages.patch | 27 ------------------- ...1.7.1b2-initialize-check-and-message.patch | 13 --------- wicd-1.7.1b2-wired_showing.patch | 11 -------- wicd.spec | 25 +++-------------- 5 files changed, 4 insertions(+), 91 deletions(-) delete mode 100644 wicd-1.7.1b2-CVE-2012-0813.patch delete mode 100644 wicd-1.7.1b2-error-messages.patch delete mode 100644 wicd-1.7.1b2-initialize-check-and-message.patch delete mode 100644 wicd-1.7.1b2-wired_showing.patch diff --git a/wicd-1.7.1b2-CVE-2012-0813.patch b/wicd-1.7.1b2-CVE-2012-0813.patch deleted file mode 100644 index 06f0e8f..0000000 --- a/wicd-1.7.1b2-CVE-2012-0813.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up wicd-1.7.1b2/wicd/configmanager.py.CVE-2012-0813 wicd-1.7.1b2/wicd/configmanager.py ---- wicd-1.7.1b2/wicd/configmanager.py.CVE-2012-0813 2010-10-29 11:36:55.000000000 -0400 -+++ wicd-1.7.1b2/wicd/configmanager.py 2012-01-27 14:17:48.773091678 -0500 -@@ -107,8 +107,13 @@ class ConfigManager(RawConfigParser): - ret = ret[3:-3] - if default: - if self.debug: -- print ''.join(['found ', option, ' in configuration ', -- str(ret)]) -+ # mask out sensitive information -+ if option in ['apsk', 'password', 'identity', 'private_key', \ -+ 'private_key_passwd', 'key', 'passphrase']: -+ print ''.join(['found ', option, ' in configuration *****']) -+ else: -+ print ''.join(['found ', option, ' in configuration ', -+ str(ret)]) - else: - if default != "__None__": - print 'did not find %s in configuration, setting default %s' % (option, str(default)) diff --git a/wicd-1.7.1b2-error-messages.patch b/wicd-1.7.1b2-error-messages.patch deleted file mode 100644 index 68efe8d..0000000 --- a/wicd-1.7.1b2-error-messages.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up wicd-1.7.1b2/curses/wicd-curses.py.orig wicd-1.7.1b2/curses/wicd-curses.py ---- wicd-1.7.1b2/curses/wicd-curses.py.orig 2010-10-29 11:36:55.000000000 -0400 -+++ wicd-1.7.1b2/curses/wicd-curses.py 2011-08-19 17:07:55.523159764 -0400 -@@ -1030,7 +1030,7 @@ if __name__ == '__main__': - parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REV,daemon.Hello()), prog="wicd-curses") - except Exception, e: - if "DBus.Error.AccessDenied" in e.get_dbus_name(): -- print language['access_denied_wc'].replace('$A','\033[1;34m'+wpath.wicd_group+'\033[0m') -+ print language['access_denied_wc'] - sys.exit(1) - else: - raise -diff -up wicd-1.7.1b2/wicd/translations.py.orig wicd-1.7.1b2/wicd/translations.py ---- wicd-1.7.1b2/wicd/translations.py.orig 2010-10-29 11:36:55.000000000 -0400 -+++ wicd-1.7.1b2/wicd/translations.py 2011-08-19 17:07:55.524160039 -0400 -@@ -214,9 +214,9 @@ language['connection_established'] = _(' - language['disconnected'] = _('''Disconnected''') - language['establishing_connection'] = _('''Establishing connection...''') - language['association_failed'] = _('''Connection failed: Could not contact the wireless access point.''') --language['access_denied'] = _('''Unable to contact the Wicd daemon due to an access denied error from DBus. Please check that your user is in the $A group.''') -+language['access_denied'] = _('''Unable to contact the Wicd daemon due to an access denied error from DBus. Please check your D-Bus policy configuration.''') - language['disconnecting_active'] = _('''Disconnecting active connections...''') --language['access_denied_wc'] = _('''ERROR: wicd-curses was denied access to the wicd daemon: please check that your user is in the "$A" group.''') -+language['access_denied_wc'] = _('''ERROR: wicd-curses was denied access to the wicd daemon: please check your D-Bus policy configuration.''') - language['post_disconnect_script'] = _('''Run post-disconnect script''') - language['resume_script'] = _('''Resume script''') - language['suspend_script'] = _('''Suspend script''') diff --git a/wicd-1.7.1b2-initialize-check-and-message.patch b/wicd-1.7.1b2-initialize-check-and-message.patch deleted file mode 100644 index cdfbd71..0000000 --- a/wicd-1.7.1b2-initialize-check-and-message.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up wicd-1.7.1b2/cli/wicd-cli.py.orig wicd-1.7.1b2/cli/wicd-cli.py ---- wicd-1.7.1b2/cli/wicd-cli.py.orig 2010-10-29 11:36:55.000000000 -0400 -+++ wicd-1.7.1b2/cli/wicd-cli.py 2011-08-19 17:10:38.582160338 -0400 -@@ -191,6 +191,9 @@ if options.connect: - - check = lambda: wired.CheckIfWiredConnecting() - message = lambda: wired.CheckWiredConnectingMessage() -+ else: -+ check = lambda: False -+ message = lambda: False - - # update user on what the daemon is doing - last = None diff --git a/wicd-1.7.1b2-wired_showing.patch b/wicd-1.7.1b2-wired_showing.patch deleted file mode 100644 index eb8be29..0000000 --- a/wicd-1.7.1b2-wired_showing.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up wicd-1.7.1b2/gtk/gui.py.orig wicd-1.7.1b2/gtk/gui.py ---- wicd-1.7.1b2/gtk/gui.py.orig 2010-10-29 11:36:55.000000000 -0400 -+++ wicd-1.7.1b2/gtk/gui.py 2011-08-19 17:09:39.142160320 -0400 -@@ -208,6 +208,7 @@ class appGui(object): - self.refreshing = False - self.prev_state = None - self.update_cb = None -+ self._wired_showing = False - self.network_list.set_sensitive(False) - label = gtk.Label("%s..." % language['scanning']) - self.network_list.pack_start(label) diff --git a/wicd.spec b/wicd.spec index 53d30d1..3d687fc 100644 --- a/wicd.spec +++ b/wicd.spec @@ -21,12 +21,8 @@ Source2: wicd.service Source3: 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: python2-devel @@ -98,22 +94,8 @@ 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 -%patch2 -p1 - # Allow users at the console to control wicd -%patch3 -p1 - -# Initialize appGui._wired_showing in __init__ -%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 +%patch2 -p1 %build # NOTE: --etc is where dhclient.conf.template goes @@ -302,6 +284,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * 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) From 32a2db9bf67052a5e78ff1f146335c485d6c6714 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 10 Feb 2012 15:58:36 -0500 Subject: [PATCH 27/84] Upgrade to wicd-1.7.1 final release (#789380) - Have wicd-common require pygobject2 (#754416) - Remove patches that have been incorporated upstream --- wicd-1.7.1-dbus-failure.patch | 49 +++++++++++++++++++++++++++++++++ wicd-1.7.1b2-dbus-failure.patch | 49 --------------------------------- 2 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 wicd-1.7.1-dbus-failure.patch delete mode 100644 wicd-1.7.1b2-dbus-failure.patch 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-1.7.1b2-dbus-failure.patch b/wicd-1.7.1b2-dbus-failure.patch deleted file mode 100644 index 5db6f62..0000000 --- a/wicd-1.7.1b2-dbus-failure.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up wicd-1.7.1b2/cli/wicd-cli.py.orig wicd-1.7.1b2/cli/wicd-cli.py ---- wicd-1.7.1b2/cli/wicd-cli.py.orig 2010-10-29 11:36:55.000000000 -0400 -+++ wicd-1.7.1b2/cli/wicd-cli.py 2011-08-19 17:06:57.834035455 -0400 -@@ -43,6 +43,10 @@ except dbus.DBusException: - print 'Error: Could not connect to the daemon. Please make sure it 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.1b2/curses/wicd-curses.py.orig wicd-1.7.1b2/curses/wicd-curses.py ---- wicd-1.7.1b2/curses/wicd-curses.py.orig 2010-10-29 11:36:55.000000000 -0400 -+++ wicd-1.7.1b2/curses/wicd-curses.py 2011-08-19 17:06:57.835034617 -0400 -@@ -1017,6 +1017,10 @@ def setup_dbus(force=True): - wireless = dbus_ifaces['wireless'] - wired = dbus_ifaces['wired'] - -+ 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.1b2/gtk/gui.py.orig wicd-1.7.1b2/gtk/gui.py ---- wicd-1.7.1b2/gtk/gui.py.orig 2010-10-29 11:36:55.000000000 -0400 -+++ wicd-1.7.1b2/gtk/gui.py 2011-08-19 17:06:57.836054170 -0400 -@@ -145,6 +145,17 @@ class appGui(object): - """ Initializes everything needed for the GUI. """ - setup_dbus() - -+ 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") From a5fe60f17bc46632e87863955550250cfb148c9d Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 10 Feb 2012 16:23:53 -0500 Subject: [PATCH 28/84] Upgrade to wicd-1.7.1 final release (#789380) - Have wicd-common require pygobject2 (#754416) - Remove patches that have been incorporated upstream --- wicd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wicd.spec b/wicd.spec index 3d687fc..1cf3855 100644 --- a/wicd.spec +++ b/wicd.spec @@ -109,6 +109,7 @@ Client program for wicd that uses a GTK+ interface. --log %{_localstatedir}/log \ --no-install-init %{__python} setup.py build +%{__python} setup.py compile_translations %install rm -rf %{buildroot} From eb6827b624846eee07e14a25baf1e6457ae85100 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 22 Mar 2012 10:34:15 -0400 Subject: [PATCH 29/84] 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) --- wicd-1.7.1-DaemonClosing.patch | 12 ++++++++++++ wicd-1.7.1-child_pid.patch | 11 +++++++++++ wicd.spec | 22 ++++++++++++++++++---- 3 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 wicd-1.7.1-DaemonClosing.patch create mode 100644 wicd-1.7.1-child_pid.patch 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.spec b/wicd.spec index 1cf3855..e9f6ba1 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -23,6 +23,8 @@ Source3: 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 +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: python2-devel @@ -78,6 +80,7 @@ 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 @@ -97,13 +100,18 @@ Client program for wicd that uses a GTK+ interface. # Allow users at the console to control wicd %patch2 -p1 +# Initialize child_pid to None in wicd-daemon.py +%patch3 -p1 + +# Work around bug in DaemonClosing() calls +%patch4 -p1 + %build -# NOTE: --etc is where dhclient.conf.template goes %{__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 \ @@ -218,7 +226,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_sysconfdir}/acpi/resume.d/80-wicd-connect.sh %{_sysconfdir}/acpi/suspend.d/50-wicd-suspend.sh %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/eap @@ -282,6 +290,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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) From cd9993d45e55f3338d6aae7a54790a07988af195 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 22 Mar 2012 10:42:59 -0400 Subject: [PATCH 30/84] 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) - BR babel --- wicd.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wicd.spec b/wicd.spec index e9f6ba1..911bb2d 100644 --- a/wicd.spec +++ b/wicd.spec @@ -27,6 +27,7 @@ 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 @@ -295,6 +296,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - 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) +- BR babel * Fri Feb 10 2012 David Cantrell - 1.7.1-1 - Upgrade to wicd-1.7.1 final release (#789380) From 693809f4a30dad62ba5df9042821b65e595b77d6 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 22 Mar 2012 10:55:40 -0400 Subject: [PATCH 31/84] 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) - BR babel - Remove po/ast.po because babel doesn't understand it --- wicd.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wicd.spec b/wicd.spec index 911bb2d..c866f14 100644 --- a/wicd.spec +++ b/wicd.spec @@ -90,6 +90,8 @@ Client program for wicd that uses a GTK+ interface. %prep %setup -q +rm -f po/ast.po + # Remove the WHEREAREMYFILES and resetting of ~/.wicd/WHEREAREMYFILES # This is pointless. The documentation can just provide WHEREAREMYFILES, # which we do in this package. @@ -297,6 +299,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Make wicd-gtk subpackage require notify-python (#748258) - Work around no-op problem in DaemonClosing calls (#740317) - BR babel +- Remove po/ast.po because babel doesn't understand it * Fri Feb 10 2012 David Cantrell - 1.7.1-1 - Upgrade to wicd-1.7.1 final release (#789380) From ed242365fb6f2e8550b374cb1c6d13840f47f0bd Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 22 Mar 2012 11:03:12 -0400 Subject: [PATCH 32/84] 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) - BR babel - Remove po/ast.po because babel doesn't understand it --- wicd.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wicd.spec b/wicd.spec index c866f14..cda44fa 100644 --- a/wicd.spec +++ b/wicd.spec @@ -90,8 +90,6 @@ Client program for wicd that uses a GTK+ interface. %prep %setup -q -rm -f po/ast.po - # Remove the WHEREAREMYFILES and resetting of ~/.wicd/WHEREAREMYFILES # This is pointless. The documentation can just provide WHEREAREMYFILES, # which we do in this package. @@ -110,6 +108,7 @@ rm -f po/ast.po %patch4 -p1 %build +rm -f po/ast.po %{__python} setup.py configure \ --distro redhat \ --lib %{_libdir} \ From 4dee156ed8953e07a3f29316163fc7195fb06339 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 22 Mar 2012 11:15:20 -0400 Subject: [PATCH 33/84] BR babel - Remove po/ast.po because babel doesn't understand it --- wicd.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/wicd.spec b/wicd.spec index cda44fa..be8fa22 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -292,13 +292,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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) -- BR babel -- Remove po/ast.po because babel doesn't understand it * Fri Feb 10 2012 David Cantrell - 1.7.1-1 - Upgrade to wicd-1.7.1 final release (#789380) From f0c195baf1e08011c76c616857ec2cc9a0488d7f Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 26 Mar 2012 12:59:45 -0400 Subject: [PATCH 34/84] 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 --- wicd.spec | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/wicd.spec b/wicd.spec index be8fa22..9ec680b 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -117,6 +117,7 @@ rm -f po/ast.po --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 @@ -145,9 +146,6 @@ 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 @@ -211,7 +209,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,-) @@ -227,24 +225,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}/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 @@ -292,6 +297,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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 From 29a13776ba27fb8de7efd63fc3e492056f359e0f Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 26 Mar 2012 13:52:33 -0400 Subject: [PATCH 35/84] Remove our wicd.service file, this is provided by upstream now --- wicd.service | 15 --------------- wicd.spec | 13 ++++++------- 2 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 wicd.service diff --git a/wicd.service b/wicd.service deleted file mode 100644 index 68d2437..0000000 --- a/wicd.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Wicd a wireless and wired network manager for Linux -After=syslog.target -Wants=network.target -Before=network.target -Conflicts=NetworkManager.service - -[Service] -Type=dbus -BusName=org.wicd.daemon -ExecStart=/usr/sbin/wicd --no-daemon - -[Install] -WantedBy=multi-user.target -Alias=dbus-org.wicd.daemon.service diff --git a/wicd.spec b/wicd.spec index 9ec680b..e36d92e 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -17,8 +17,7 @@ License: GPLv2+ URL: http://wicd.sourceforge.net/ 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.1-dbus-failure.patch @@ -149,11 +148,8 @@ done 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" \ @@ -297,6 +293,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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 From fa1e9f60384921b498fc9b7159b0a5713509af5e Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 13 Apr 2012 09:44:52 -0400 Subject: [PATCH 36/84] Upgrade to wicd-1.7.2.1 to fix CVE-2012-2095 (#811763) --- .gitignore | 1 + sources | 2 +- wicd-1.7.1-child_pid.patch | 11 ----------- wicd.spec | 15 +++++++-------- 4 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 wicd-1.7.1-child_pid.patch diff --git a/.gitignore b/.gitignore index 59cc34d..792dafb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wicd-1.7.1.tar.gz +/wicd-1.7.2.1.tar.gz diff --git a/sources b/sources index 16fe0a3..f505a9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c5664a0e850cddbe80942eabb10430a wicd-1.7.1.tar.gz +96c0a08b2bc0c7f1977219a58ad70cd9 wicd-1.7.2.1.tar.gz diff --git a/wicd-1.7.1-child_pid.patch b/wicd-1.7.1-child_pid.patch deleted file mode 100644 index 19efb6f..0000000 --- a/wicd-1.7.1-child_pid.patch +++ /dev/null @@ -1,11 +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: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.spec b/wicd.spec index e36d92e..277d542 100644 --- a/wicd.spec +++ b/wicd.spec @@ -8,8 +8,8 @@ %define debug_package %{nil} Name: wicd -Version: 1.7.1 -Release: 5%{?dist} +Version: 1.7.2.1 +Release: 1%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -22,8 +22,7 @@ Source2: 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 -Patch3: wicd-1.7.1-child_pid.patch -Patch4: wicd-1.7.1-DaemonClosing.patch +Patch3: wicd-1.7.1-DaemonClosing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel @@ -100,11 +99,8 @@ Client program for wicd that uses a GTK+ interface. # Allow users at the console to control wicd %patch2 -p1 -# Initialize child_pid to None in wicd-daemon.py -%patch3 -p1 - # Work around bug in DaemonClosing() calls -%patch4 -p1 +%patch3 -p1 %build rm -f po/ast.po @@ -293,6 +289,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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 From e0a014ce335bd5a72a709161148050807bc3ad40 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 13 Apr 2012 12:50:12 -0400 Subject: [PATCH 37/84] Fix CVE-2012-2095 (#811764) --- wicd-1.7.0-CVE-2012-2095.patch | 91 ++++++++++++++++++++++++++++++++++ wicd.spec | 13 ++++- 2 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 wicd-1.7.0-CVE-2012-2095.patch diff --git a/wicd-1.7.0-CVE-2012-2095.patch b/wicd-1.7.0-CVE-2012-2095.patch new file mode 100644 index 0000000..da6a4b3 --- /dev/null +++ b/wicd-1.7.0-CVE-2012-2095.patch @@ -0,0 +1,91 @@ +diff -up wicd-1.7.0/wicd/wicd-daemon.py.CVE-2012-2095 wicd-1.7.0/wicd/wicd-daemon.py +--- wicd-1.7.0/wicd/wicd-daemon.py.CVE-2012-2095 2012-04-13 10:17:46.356047035 -0400 ++++ wicd-1.7.0/wicd/wicd-daemon.py 2012-04-13 10:18:35.018046979 -0400 +@@ -978,6 +978,28 @@ class WirelessDaemon(dbus.service.Object + "wireless-settings.conf"), + debug=debug) + ++ self._validProperties = ( ++ 'bssid', ++ 'essid', ++ 'hidden', ++ 'channel', ++ 'mode', ++ 'enctype', ++ 'encryption_method', ++ 'key', ++ 'automatic', ++ 'ip', ++ 'netmask', ++ 'broadcast', ++ 'gateway', ++ 'use_static_dns', ++ 'use_global_dns', ++ 'dns1', ++ 'dns2', ++ 'dns3', ++ 'use_settings_globally', ++ ) ++ + def get_debug_mode(self): + return self._debug_mode + def set_debug_mode(self, mode): +@@ -1086,9 +1108,9 @@ 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. +- if (prop.strip()).endswith("script"): +- print "Setting script properties through the daemon is not" \ +- + " permitted." ++ if prop.strip() not in self._validProperties: ++ print "Trying to set invalid property (or property not " \ ++ "permitted): "+ prop.strip() + "." + return False + self.LastScan[netid][prop] = misc.to_unicode(misc.Noneify(value)) + +@@ -1365,6 +1387,25 @@ class WiredDaemon(dbus.service.Object): + "wired-settings.conf"), + debug=debug) + ++ self._validProperties = ( ++ 'ip', ++ 'broadcast', ++ 'netmask', ++ 'gateway', ++ 'search_domain', ++ 'dns_domain', ++ 'dns1', ++ 'dns2', ++ 'dns3', ++ 'encryption_enabled', ++ 'default', ++ 'dhcphostname', ++ 'lastused', ++ 'profilename', ++ 'use_global_dns', ++ 'use_static_dns', ++ ) ++ + def get_debug_mode(self): + return self._debug_mode + def set_debug_mode(self, mode): +@@ -1405,14 +1446,14 @@ class WiredDaemon(dbus.service.Object): + return str(iface) + + @dbus.service.method('org.wicd.daemon.wired') +- def SetWiredProperty(self, property, value): ++ def SetWiredProperty(self, prop, value): + """ Sets the given property to the given value. """ + if self.WiredNetwork: +- if (property.strip()).endswith("script"): +- print "Setting script properties through the daemon" \ +- + " is not permitted." ++ if prop.strip() not in self._validProperties: ++ print "Trying to set invalid property (or property not " \ ++ "permitted): "+ prop.strip() + "." + return False +- self.WiredNetwork[property] = misc.to_unicode(misc.Noneify(value)) ++ self.WiredNetwork[prop] = misc.to_unicode(misc.Noneify(value)) + return True + else: + print 'SetWiredProperty: WiredNetwork does not exist' diff --git a/wicd.spec b/wicd.spec index 1316c9f..f8e98f9 100644 --- a/wicd.spec +++ b/wicd.spec @@ -7,7 +7,7 @@ Name: wicd Version: 1.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -18,6 +18,7 @@ Source1: wicd.logrotate Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch Patch1: wicd-1.7.0-initscript.patch Patch2: wicd-1.7.0-CVE-2012-0813.patch +Patch3: wicd-1.7.0-CVE-2012-2095.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: python2-devel @@ -94,6 +95,11 @@ Client program for wicd that uses a GTK+ interface. # http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/682 %patch2 -p1 +# Fix CVE-2012-2095 +# Patch based on upstream: +# http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/751 +%patch3 -p1 + %build # NOTE: --etc is where dhclient.conf.template goes %{__python} setup.py configure \ @@ -259,8 +265,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Fri Apr 13 2012 David Cantrell - 1.7.0-3 +- Fix CVE-2012-2095 (#811764) + * Fri Jan 27 2012 David Cantrell - 1.7.0-2 -- Fix CVS-2012-0813 (#785147) +- Fix CVE-2012-0813 (#785147) * Mon Jun 21 2010 David Cantrell - 1.7.0-1 - Initial package From 238c8186707fd721e26e5c6ea2eca389939c1b08 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 22:35:37 -0500 Subject: [PATCH 38/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 277d542..65dba34 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -289,6 +289,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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) From 80eafe0546243697779390dc1e47830ac67a0c5d Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 2 Aug 2012 10:21:08 -0400 Subject: [PATCH 39/84] 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) --- .gitignore | 3 +-- sources | 2 +- wicd.spec | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 792dafb..fe25d73 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -wicd-1.7.1.tar.gz -/wicd-1.7.2.1.tar.gz +wicd-1.7.2.4.tar.gz diff --git a/sources b/sources index f505a9d..9a163ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96c0a08b2bc0c7f1977219a58ad70cd9 wicd-1.7.2.1.tar.gz +c2435ddfdef0b9898852d72a85a45f0f wicd-1.7.2.4.tar.gz diff --git a/wicd.spec b/wicd.spec index 65dba34..b33fe01 100644 --- a/wicd.spec +++ b/wicd.spec @@ -8,16 +8,15 @@ %define debug_package %{nil} Name: wicd -Version: 1.7.2.1 -Release: 2%{?dist} +Version: 1.7.2.4 +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 -Source1: wicd.logrotate -Source2: org.wicd.daemon.service +Source1: org.wicd.daemon.service Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch Patch1: wicd-1.7.1-dbus-failure.patch @@ -70,6 +69,7 @@ Group: Applications/System BuildArch: noarch Requires: %{name}-common = %{version}-%{release} Requires: python-urwid >= 0.9.8.3 +Requires: %{name}-gtk = %{version}-%{release} %description curses Client program for wicd that uses a curses interface. @@ -141,11 +141,8 @@ for lib in %{buildroot}%{python_sitelib}/wicd/*.py ; do mv $lib.new $lib done -mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d -install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/wicd - mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services -install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/dbus-1/system-services/org.wicd.daemon.service +install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/dbus-1/system-services/org.wicd.daemon.service desktop-file-install \ --remove-category="Application" \ @@ -289,6 +286,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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 From 35e431072506f92697010aa9475d46ba82b41188 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 2 Aug 2012 10:33:29 -0400 Subject: [PATCH 40/84] 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) --- wicd.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wicd.spec b/wicd.spec index b33fe01..80b2cf4 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -144,6 +144,8 @@ 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 \ @@ -214,10 +216,9 @@ 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}/logrotate.d/wicd %config(noreplace) %{_sysconfdir}/dbus-1/system.d/wicd.conf %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 From 299042626c22a5e38e073e2ea5f64d6f96cae396 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 2 Aug 2012 10:59:36 -0400 Subject: [PATCH 41/84] Don't need this file anymore. --- wicd.logrotate | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 wicd.logrotate diff --git a/wicd.logrotate b/wicd.logrotate deleted file mode 100644 index 59ca51d..0000000 --- a/wicd.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/wicd.log { - missingok - notifempty - size 30k - create 0600 root root -} From 8def0d7bbec9ab0c596d58ce04dd2e53a59b90f4 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 23 Oct 2012 10:20:03 -0400 Subject: [PATCH 42/84] Use new systemd macros in trigger scripts (#850367) --- wicd.spec | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/wicd.spec b/wicd.spec index 80b2cf4..b54fcca 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -162,29 +162,13 @@ desktop-file-install \ rm -rf %{buildroot} %post common -if [ $1 -eq 1 ]; then - # Package install, not upgrade - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post wicd.service %preun common -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl disable wicd.service > /dev/null 2>&1 || : - /bin/systemctl stop wicd.service > /dev/null 2>&1 || : -fi +%systemd_preun wicd.service %postun common -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart wicd.service >/dev/null 2>&1 || : -fi - -%triggerun -- wicd-common < 1.7.0-5 -if /sbin/chkconfig --level 3 wicd ; then - /bin/systemctl enable wicd.service >/dev/null 2>&1 || : -fi +%systemd_post_with_restart wicd.service %post gtk touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -287,6 +271,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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) From 9d2447bd84ba664d2c32a4278adc60aeef69acd4 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 23 Oct 2012 14:08:21 -0400 Subject: [PATCH 43/84] Fix some Unicode string handling and display problems (#845749) --- wicd-1.7.2.4-unicode.patch | 21 +++++++++++++++++++++ wicd.spec | 9 ++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 wicd-1.7.2.4-unicode.patch diff --git a/wicd-1.7.2.4-unicode.patch b/wicd-1.7.2.4-unicode.patch new file mode 100644 index 0000000..40ab99a --- /dev/null +++ b/wicd-1.7.2.4-unicode.patch @@ -0,0 +1,21 @@ +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.spec b/wicd.spec index b54fcca..1dd188f 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -22,6 +22,7 @@ Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: babel @@ -102,6 +103,9 @@ Client program for wicd that uses a GTK+ interface. # Work around bug in DaemonClosing() calls %patch3 -p1 +# Unicode string handling problems +%patch4 -p1 + %build rm -f po/ast.po %{__python} setup.py configure \ @@ -271,6 +275,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* 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) From 357efedf4710b4d669bc92f8f65bb9ffe3eb4da2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:07:12 -0600 Subject: [PATCH 44/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- wicd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 1dd188f..fb332b8 100644 --- a/wicd.spec +++ b/wicd.spec @@ -9,7 +9,7 @@ Name: wicd Version: 1.7.2.4 -Release: 4%{?dist} +Release: 5%{?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 +* 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) From df9d0adfea36ca4e23f22a93114b6691df2e355c Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 14 Mar 2013 13:47:13 -0400 Subject: [PATCH 45/84] Make sure wicd-daemon.py waits for dhclient child (#893807) --- wicd-1.7.0-dhclient-zombie.patch | 12 ++++++++++++ wicd.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 wicd-1.7.0-dhclient-zombie.patch diff --git a/wicd-1.7.0-dhclient-zombie.patch b/wicd-1.7.0-dhclient-zombie.patch new file mode 100644 index 0000000..6eb3916 --- /dev/null +++ b/wicd-1.7.0-dhclient-zombie.patch @@ -0,0 +1,12 @@ +diff -up wicd-1.7.0/wicd/wnettools.py.orig wicd-1.7.0/wicd/wnettools.py +--- wicd-1.7.0/wicd/wnettools.py.orig 2010-01-14 23:49:11.000000000 -0500 ++++ wicd-1.7.0/wicd/wnettools.py 2013-03-14 13:45:08.266245972 -0400 +@@ -606,6 +606,8 @@ class BaseInterface(object): + cmd = self._get_dhcp_command('connect', hostname) + if self.verbose: print cmd + self.dhcp_object = misc.Run(cmd, include_stderr=True, return_obj=True) ++ # fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=537195 ++ self.dhcp_object.wait() + pipe = self.dhcp_object.stdout + client_dict = { misc.DHCLIENT : self._parse_dhclient, + misc.DHCPCD : self._parse_dhcpcd, diff --git a/wicd.spec b/wicd.spec index f8e98f9..084b52a 100644 --- a/wicd.spec +++ b/wicd.spec @@ -7,7 +7,7 @@ Name: wicd Version: 1.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -19,6 +19,7 @@ Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch Patch1: wicd-1.7.0-initscript.patch Patch2: wicd-1.7.0-CVE-2012-0813.patch Patch3: wicd-1.7.0-CVE-2012-2095.patch +Patch4: wicd-1.7.0-dhclient-zombie.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: python2-devel @@ -100,6 +101,10 @@ Client program for wicd that uses a GTK+ interface. # http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/751 %patch3 -p1 +# Make sure wicd-daemon.py waits for dhclient child +# Debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=537195 +%patch4 -p1 + %build # NOTE: --etc is where dhclient.conf.template goes %{__python} setup.py configure \ @@ -265,6 +270,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Thu Mar 14 2013 David Cantrell - 1.7.0-4 +- Make sure wicd-daemon.py waits for dhclient child (#893807) + * Fri Apr 13 2012 David Cantrell - 1.7.0-3 - Fix CVE-2012-2095 (#811764) From 60425f8a7c21d39d3d56b02eeeda54515c7fe362 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 1 Apr 2013 14:22:07 -0400 Subject: [PATCH 46/84] 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 47/84] - 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 48/84] 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 f2dc53aa3fe63b5e4b36712ad850a93d22514106 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 23:31:39 -0500 Subject: [PATCH 49/84] - 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 0751300b5802bdacb81f098231d75d0437afcca3 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 12 Jun 2014 14:45:47 -0400 Subject: [PATCH 50/84] Have wicd-common require pygobject2 (#1003200) --- wicd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wicd.spec b/wicd.spec index 084b52a..007b61e 100644 --- a/wicd.spec +++ b/wicd.spec @@ -7,7 +7,7 @@ Name: wicd Version: 1.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -48,6 +48,7 @@ Requires: ethtool Requires: iproute Requires: logrotate Requires: net-tools +Requires: pygobject2 Requires: wireless-tools Requires: wpa_supplicant Requires: %{name} = %{version}-%{release} @@ -270,6 +271,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Thu Jun 12 2014 David Cantrell - 1.7.0-5 +- HAve wicd-common require pygobject2 (#1003200) + * Thu Mar 14 2013 David Cantrell - 1.7.0-4 - Make sure wicd-daemon.py waits for dhclient child (#893807) From aa678f6fcee0e29a62f0cbaeab3a92e4846d15d4 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 30 Jun 2014 10:35:02 -0400 Subject: [PATCH 51/84] 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 1828b1dd1e3b2418829eb0083b2e7363508295d2 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 2 Jul 2014 11:53:27 -0400 Subject: [PATCH 52/84] 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 53/84] - 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 55b6a950f70e8a1b39aee198fee644339aeb0e10 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 25 Sep 2014 16:34:49 -0400 Subject: [PATCH 54/84] 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 55/84] 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 56/84] 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 57/84] 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 58/84] 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 59/84] 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 60/84] 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 61/84] 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 62/84] 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 63/84] 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 64/84] 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 65/84] 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 575a2f0c0066d9e2b1e91c8bbf4b8c514dab340a Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 5 May 2015 11:06:49 -0400 Subject: [PATCH 66/84] Prevent wicd-curses from crashing on startup (#1211811) --- wicd.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/wicd.spec b/wicd.spec index 007b61e..87a3316 100644 --- a/wicd.spec +++ b/wicd.spec @@ -7,7 +7,7 @@ Name: wicd Version: 1.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Wireless and wired network connection manager Group: System Environment/Base @@ -20,6 +20,7 @@ Patch1: wicd-1.7.0-initscript.patch Patch2: wicd-1.7.0-CVE-2012-0813.patch Patch3: wicd-1.7.0-CVE-2012-2095.patch Patch4: wicd-1.7.0-dhclient-zombie.patch +Patch5: wicd-1.7.0-rhbz1211811.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: python2-devel @@ -106,6 +107,9 @@ Client program for wicd that uses a GTK+ interface. # Debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=537195 %patch4 -p1 +# Prevent wicd-curses from crashing on startup (#1211811) +%patch5 -p1 + %build # NOTE: --etc is where dhclient.conf.template goes %{__python} setup.py configure \ @@ -271,8 +275,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg %changelog +* Tue May 05 2015 David Cantrell - 1.7.0-6 +- Prevent wicd-curses from crashing on startup (#1211811) + * Thu Jun 12 2014 David Cantrell - 1.7.0-5 -- HAve wicd-common require pygobject2 (#1003200) +- Have wicd-common require pygobject2 (#1003200) * Thu Mar 14 2013 David Cantrell - 1.7.0-4 - Make sure wicd-daemon.py waits for dhclient child (#893807) From 51f95eae66cee351a6d8f7c6b6a804bec760ee93 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 5 May 2015 11:07:02 -0400 Subject: [PATCH 67/84] Prevent wicd-curses from crashing on startup (#1211811) --- wicd-1.7.0-rhbz1211811.patch | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 wicd-1.7.0-rhbz1211811.patch diff --git a/wicd-1.7.0-rhbz1211811.patch b/wicd-1.7.0-rhbz1211811.patch new file mode 100644 index 0000000..a88f195 --- /dev/null +++ b/wicd-1.7.0-rhbz1211811.patch @@ -0,0 +1,44 @@ +diff -up wicd-1.7.0/curses/curses_misc.py.orig wicd-1.7.0/curses/curses_misc.py +--- wicd-1.7.0/curses/curses_misc.py.orig 2010-01-14 23:49:11.000000000 -0500 ++++ wicd-1.7.0/curses/curses_misc.py 2015-05-05 11:04:33.981846606 -0400 +@@ -312,9 +312,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 +@@ -347,7 +347,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 +@@ -356,6 +356,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 From 5474a54f730f7797883e4c51b2bc21f53d0feb54 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 5 May 2015 14:47:11 -0400 Subject: [PATCH 68/84] 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 69/84] - 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 70/84] - 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 71/84] - 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 72/84] 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 73/84] - 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 74/84] - 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 75/84] - 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 76/84] - 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 77/84] 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 78/84] - 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 79/84] 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 80/84] - 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 81/84] 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 82/84] 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 83/84] - 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 84/84] 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