diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-11-30 11:39:53 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-11-30 11:39:53 +0000 |
commit | 86d51032cced543cbecd89ac78e770ed1b152a31 (patch) | |
tree | 4e8a326c3dc95c30fd7cd1f697f77f340951c0da /pkgs/tools/networking/wicd/no-var-install.patch | |
parent | 009bfb702d1c018fc32b10bab07d82ded62a1f0b (diff) | |
parent | d71ad68d43723f88c25b13c07255d4929827faaa (diff) |
* Sync. backups/cve-2010-3856@34170
svn path=/nixpkgs/branches/cve-2010-3856/; revision=24936
Diffstat (limited to 'pkgs/tools/networking/wicd/no-var-install.patch')
-rw-r--r-- | pkgs/tools/networking/wicd/no-var-install.patch | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/pkgs/tools/networking/wicd/no-var-install.patch b/pkgs/tools/networking/wicd/no-var-install.patch index 9ab5a0520d921..9a333332fcf26 100644 --- a/pkgs/tools/networking/wicd/no-var-install.patch +++ b/pkgs/tools/networking/wicd/no-var-install.patch @@ -1,21 +1,16 @@ -The install tries to create files in /var. This patch removes those steps. - ---- wicd-1.6.2.2/setup.py 2009-09-01 11:05:31.000000000 -0400 -+++ wicd-1.6.2.2/setup.py 2009-12-27 21:27:57.000000000 -0500 -@@ -464,8 +464,6 @@ - data = [ - (wpath.dbus, ['other/wicd.conf']), - (wpath.desktop, ['other/wicd.desktop']), -- (wpath.log, []), -- (wpath.etc, []), - (wpath.icons + 'scalable/apps/', ['icons/scalable/wicd-client.svg']), - (wpath.icons + '192x192/apps/', ['icons/192px/wicd-client.png']), - (wpath.icons + '128x128/apps/', ['icons/128px/wicd-client.png']), -@@ -481,7 +479,6 @@ - (wpath.images, [('images/' + b) for b in os.listdir('images') if not b.startswith('.')]), - (wpath.encryption, [('encryption/templates/' + b) for b in - os.listdir('encryption/templates') if not b.startswith('.')]), -- (wpath.networks, []), - (wpath.bin, ['scripts/wicd-client', ]), - (wpath.sbin, ['scripts/wicd', ]), - (wpath.share, ['data/wicd.glade', ]), +The install tries to create files in /var. This patch removes those steps. + +--- wicd-1.7.0/setup.py 2010-01-14 23:49:11.000000000 -0500 ++++ wicd-1.7.0/setup.py 2010-11-16 22:15:33.855977242 -0500 +@@ -493,11 +493,8 @@ + print "Using init file",(wpath.init, wpath.initfile) + data = [ + (wpath.dbus, ['other/wicd.conf']), +- (wpath.log, [empty_file]), +- (wpath.etc, ['other/dhclient.conf.template.default']), + (wpath.encryption, [('encryption/templates/' + b) for b in + os.listdir('encryption/templates') if not b.startswith('.')]), +- (wpath.networks, [empty_file]), + (wpath.sbin, ['scripts/wicd']), + (wpath.daemon, ['wicd/monitor.py', 'wicd/wicd-daemon.py', + 'wicd/suspend.py', 'wicd/autoconnect.py']), |