Compare commits
9 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
51f95eae66 | ||
|
|
575a2f0c00 | ||
|
|
0751300b58 | ||
|
|
df9d0adfea | ||
|
|
e0a014ce33 | ||
|
|
6f75fd9bb1 | ||
|
|
6cf752c85e | ||
|
|
92a0e3aabe | ||
| faa6fae947 |
12 changed files with 533 additions and 21 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
wicd-1.7.0.tar.bz2
|
||||
21
Makefile
21
Makefile
|
|
@ -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)
|
||||
1
sources
1
sources
|
|
@ -0,0 +1 @@
|
|||
7e5956891d6696b6185baa7f5dc70c56 wicd-1.7.0.tar.bz2
|
||||
19
wicd-1.7.0-CVE-2012-0813.patch
Normal file
19
wicd-1.7.0-CVE-2012-0813.patch
Normal file
|
|
@ -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))
|
||||
91
wicd-1.7.0-CVE-2012-2095.patch
Normal file
91
wicd-1.7.0-CVE-2012-2095.patch
Normal file
|
|
@ -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'
|
||||
12
wicd-1.7.0-dhclient-zombie.patch
Normal file
12
wicd-1.7.0-dhclient-zombie.patch
Normal file
|
|
@ -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,
|
||||
12
wicd-1.7.0-initscript.patch
Normal file
12
wicd-1.7.0-initscript.patch
Normal file
|
|
@ -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
|
||||
53
wicd-1.7.0-remove-WHEREAREMYFILES.patch
Normal file
53
wicd-1.7.0-remove-WHEREAREMYFILES.patch
Normal file
|
|
@ -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 $@
|
||||
44
wicd-1.7.0-rhbz1211811.patch
Normal file
44
wicd-1.7.0-rhbz1211811.patch
Normal file
|
|
@ -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
|
||||
6
wicd.logrotate
Normal file
6
wicd.logrotate
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
/var/log/wicd.log {
|
||||
missingok
|
||||
notifempty
|
||||
size 30k
|
||||
create 0600 root root
|
||||
}
|
||||
294
wicd.spec
Normal file
294
wicd.spec
Normal file
|
|
@ -0,0 +1,294 @@
|
|||
%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: 6%{?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-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
|
||||
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: pygobject2
|
||||
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
|
||||
|
||||
# Fix CVE-2012-0813
|
||||
# Patch based on upstream:
|
||||
# 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
|
||||
|
||||
# Make sure wicd-daemon.py waits for dhclient child
|
||||
# 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 \
|
||||
--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
|
||||
* Tue May 05 2015 David Cantrell <dcantrell@redhat.com> - 1.7.0-6
|
||||
- Prevent wicd-curses from crashing on startup (#1211811)
|
||||
|
||||
* Thu Jun 12 2014 David Cantrell <dcantrell@redhat.com> - 1.7.0-5
|
||||
- Have wicd-common require pygobject2 (#1003200)
|
||||
|
||||
* Thu Mar 14 2013 David Cantrell <dcantrell@redhat.com> - 1.7.0-4
|
||||
- Make sure wicd-daemon.py waits for dhclient child (#893807)
|
||||
|
||||
* Fri Apr 13 2012 David Cantrell <dcantrell@redhat.com> - 1.7.0-3
|
||||
- Fix CVE-2012-2095 (#811764)
|
||||
|
||||
* Fri Jan 27 2012 David Cantrell <dcantrell@redhat.com> - 1.7.0-2
|
||||
- Fix CVE-2012-0813 (#785147)
|
||||
|
||||
* Mon Jun 21 2010 David Cantrell <dcantrell@redhat.com> - 1.7.0-1
|
||||
- Initial package
|
||||
Loading…
Add table
Add a link
Reference in a new issue