summaryrefslogtreecommitdiff
path: root/extra/source/wicd
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2012-09-26 01:10:42 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 22:51:55 +0200
commit9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
treeb428a16618e36ed864a8d76ea3435e19a452bf90 /extra/source/wicd
parent75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
downloadcurrent-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
Diffstat (limited to 'extra/source/wicd')
-rw-r--r--extra/source/wicd/README.SLACKWARE8
-rw-r--r--extra/source/wicd/doinst.sh1
-rw-r--r--extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff23
-rw-r--r--extra/source/wicd/wicd-1.7.0-fix_script_bug.diff30
-rw-r--r--extra/source/wicd/wicd-1.7.2.4.sanitize.string.bugfix.diff11
-rwxr-xr-xextra/source/wicd/wicd.SlackBuild28
6 files changed, 34 insertions, 67 deletions
diff --git a/extra/source/wicd/README.SLACKWARE b/extra/source/wicd/README.SLACKWARE
index 47a9cba9..e7a374dc 100644
--- a/extra/source/wicd/README.SLACKWARE
+++ b/extra/source/wicd/README.SLACKWARE
@@ -13,9 +13,5 @@ Your user account will need to be a member of the 'netdev' group
in order to use wicd.
Note that urwid will need to be installed if you want to use the
-curses client.
-
-Also, if you don't have kde installed, you won't have a graphical
-sudo client available; you might wish to consider ktsuss from
-SlackBuilds.org.
-
+curses client. Also, if you don't have kde installed, you won't
+have a graphical sudo client available.
diff --git a/extra/source/wicd/doinst.sh b/extra/source/wicd/doinst.sh
index 2c0f7d98..78732c5b 100644
--- a/extra/source/wicd/doinst.sh
+++ b/extra/source/wicd/doinst.sh
@@ -33,4 +33,5 @@ fi
config etc/dbus-1/system.d/wicd.conf.new
config etc/rc.d/rc.wicd.new
config etc/wicd/manager-settings.conf.new
+config etc/logrotate.d/wicd.logrotate.new
diff --git a/extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff b/extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff
deleted file mode 100644
index d479b29c..00000000
--- a/extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-revno: 554
-committer: Andrew Psaltis <ampsaltis@gmail.com>
-branch nick: 1.6
-timestamp: Mon 2010-03-29 13:19:08 -0400
-message:
- Fixed typo in EAP-fast template, re-resolving bug 261804.
-
-=== modified file 'encryption/templates/eap'
---- encryption/templates/eap 2009-03-01 02:52:27 +0000
-+++ encryption/templates/eap 2010-03-29 17:19:08 +0000
-@@ -11,10 +11,10 @@
- proto=RSN WPA
- pairwise=CCMP TKIP
- group=CCMP TKIP
-- key-mgmt=WPA-EAP
-+ key_mgmt=WPA-EAP
- eap=FAST
- identity="$_USERNAME"
- password="$_PASSWORD"
- phase1="fast_provisioning=1"
-- pac-file="$_PAC_FILE"
-+ pac_file="$_PAC_FILE"
- }
diff --git a/extra/source/wicd/wicd-1.7.0-fix_script_bug.diff b/extra/source/wicd/wicd-1.7.0-fix_script_bug.diff
deleted file mode 100644
index dc3ace60..00000000
--- a/extra/source/wicd/wicd-1.7.0-fix_script_bug.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-revno: 553
-committer: Andrew Psaltis <ampsaltis@gmail.com>
-branch nick: 1.6
-timestamp: Wed 2010-01-27 14:06:21 -0500
-message:
- Fixed bug in script macro expansion.
-
-=== modified file 'wicd/networking.py'
---- wicd/networking.py 2010-01-15 04:02:10 +0000
-+++ wicd/networking.py 2010-01-27 19:06:21 +0000
-@@ -215,8 +215,8 @@
- if self.pre_disconnect_script:
- print 'Running pre-disconnect script'
- misc.ExecuteScript(expand_script_macros(self.pre_disconnect_script,
-- 'pre-disconnection', (mac,
-- name)),
-+ 'pre-disconnection',
-+ mac, name),
- self.debug)
- iface.ReleaseDHCP()
- iface.SetAddress('0.0.0.0')
-@@ -229,7 +229,7 @@
- print 'Running post-disconnect script'
- misc.ExecuteScript(expand_script_macros(self.post_disconnect_script,
- 'post-disconnection',
-- (mac, name)),
-+ mac, name),
- self.debug)
-
- def ReleaseDHCP(self):
diff --git a/extra/source/wicd/wicd-1.7.2.4.sanitize.string.bugfix.diff b/extra/source/wicd/wicd-1.7.2.4.sanitize.string.bugfix.diff
new file mode 100644
index 00000000..4be44631
--- /dev/null
+++ b/extra/source/wicd/wicd-1.7.2.4.sanitize.string.bugfix.diff
@@ -0,0 +1,11 @@
+--- ./wicd/misc.py.orig 2012-04-30 14:20:09.000000000 -0500
++++ ./wicd/misc.py 2012-05-09 14:08:24.611298308 -0500
+@@ -430,7 +430,7 @@
+ """ 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)
++ return s.encode('ascii', 'replace').translate(None, table)
+
+ def sanitize_escaped(s):
+ """ Sanitize double-escaped unicode strings. """
diff --git a/extra/source/wicd/wicd.SlackBuild b/extra/source/wicd/wicd.SlackBuild
index 20dcd393..77c00f46 100755
--- a/extra/source/wicd/wicd.SlackBuild
+++ b/extra/source/wicd/wicd.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008-2010 Robby Workman Northport, AL, USA
+# Copyright 2008,2009,2010,2011,2012 Robby Workman Northport, AL, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=wicd
-VERSION=${VERSION:-1.7.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.7.2.4}
+BUILD=${BUILD:-4}
# Automatically determine architecture for build & packaging:
if [ -z "$ARCH" ]; then
@@ -51,19 +51,30 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz || exit 1
cd $PRGNAM-$VERSION || exit 1
+
chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
-# Fix a couple of bugs that are addressed in the upstream bzr repo
-zcat $CWD/wicd-1.7.0-fix_EAP_fast_typo.diff.gz | patch -p0 --verbose || exit 1
-zcat $CWD/wicd-1.7.0-fix_script_bug.diff.gz | patch -p0 --verbose || exit 1
+zcat $CWD/wicd-1.7.2.4.sanitize.string.bugfix.diff.gz | patch -p1 --verbose || exit 1
python setup.py configure \
--lib=/usr/lib${LIBDIRSUFFIX}/wicd \
--kdedir=/usr/share/autostart \
--backends=/usr/lib${LIBDIRSUFFIX}/wicd/backends \
|| exit 1
+
+# Bypass the need for pybabel (thanks, dapal!)
+for pofile in $(find po/ -type f -name "*.po") ; do
+ mkdir -p translations/$(basename ${pofile} .po)/LC_MESSAGES
+ msgfmt -o translations/$(basename ${pofile} .po)/LC_MESSAGES/wicd.mo ${pofile}
+done
+
python setup.py install --root=$PKG || exit 1
# Handle some Slackware defaults
@@ -75,8 +86,9 @@ dhcp_client = 2
sudo_app = 2
EOF
-# Don't clobber dbus config on upgrade
+# Don't clobber configs on upgrade
mv $PKG/etc/dbus-1/system.d/wicd.conf $PKG/etc/dbus-1/system.d/wicd.conf.new
+mv $PKG/etc/logrotate.d/wicd.logrotate $PKG/etc/logrotate.d/wicd.logrotate.new
mv $PKG/etc/rc.d/rc.wicd $PKG/etc/rc.d/rc.wicd.new
# Compress the man pages and add a bit to the package docs