Fri May 25 23:29:36 UTC 201813.1

patches/packages/glibc-zoneinfo-2018e-noarch-2_slack13.1.txz:  Rebuilt.
  Handle removal of US/Pacific-New timezone. If we see that the machine is
  using this, it will be automatically switched to US/Pacific.

6 files changed, 18 insertions, 74 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.SlackBuild b/extra/source/wicd/wicd.SlackBuild
index 20dcd393..640142af 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.1}
+BUILD=${BUILD:-1_slack13.1}
 
 # Automatically determine architecture for build & packaging:
 if [ -z "$ARCH" ]; then
@@ -51,19 +51,22 @@ 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 .
 
-# 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
-
 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 +78,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
diff --git a/extra/wicd/README.SLACKWARE b/extra/wicd/README.SLACKWARE
index 47a9cba9..e7a374dc 100644
--- a/extra/wicd/README.SLACKWARE
+++ b/extra/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.