From 7146524f273ad7add0d5b533156d35d07896ed8c Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sat, 1 Aug 2020 19:08:49 +0000 Subject: Sat Aug 1 19:08:49 UTC 2020 a/cryptsetup-2.3.3-x86_64-2.txz: Rebuilt. Recompiled against json-c-0.15_20200726. l/imagemagick-7.0.10_25-x86_64-1.txz: Upgraded. l/json-c-0.15_20200726-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/urwid-1.0.3-x86_64-5.txz: Removed. This is an ancient version that was only used by wicd. n/bind-9.16.5-x86_64-2.txz: Rebuilt. Recompiled against json-c-0.15_20200726. x/libmypaint-1.6.1-x86_64-2.txz: Rebuilt. Recompiled against json-c-0.15_20200726. xap/gimp-2.10.20-x86_64-2.txz: Rebuilt. Recompiled against json-c-0.15_20200726. extra/wicd/wicd-1.7.4-x86_64-3.txz: Removed. This is unmaintained, possibly insecure, and doesn't work with Python versions newer than 2.7.18. NetworkManager is a better choice these days. --- extra/source/wicd/README.SLACKWARE | 17 --- extra/source/wicd/curses_bitrate_fix.patch | 19 ---- extra/source/wicd/doinst.sh | 37 ------- .../source/wicd/manually-compile-translations.diff | 24 ---- extra/source/wicd/slack-desc | 19 ---- extra/source/wicd/wicd-1.7.3-urwid-1.3.0.patch | 15 --- extra/source/wicd/wicd-1421918.patch | 15 --- extra/source/wicd/wicd.SlackBuild | 121 --------------------- .../wicd.netentry_curses.py.save.settings.patch | 31 ------ extra/wicd/README.SLACKWARE | 17 --- 10 files changed, 315 deletions(-) delete mode 100644 extra/source/wicd/README.SLACKWARE delete mode 100644 extra/source/wicd/curses_bitrate_fix.patch delete mode 100644 extra/source/wicd/doinst.sh delete mode 100644 extra/source/wicd/manually-compile-translations.diff delete mode 100644 extra/source/wicd/slack-desc delete mode 100644 extra/source/wicd/wicd-1.7.3-urwid-1.3.0.patch delete mode 100644 extra/source/wicd/wicd-1421918.patch delete mode 100755 extra/source/wicd/wicd.SlackBuild delete mode 100644 extra/source/wicd/wicd.netentry_curses.py.save.settings.patch delete mode 100644 extra/wicd/README.SLACKWARE (limited to 'extra') diff --git a/extra/source/wicd/README.SLACKWARE b/extra/source/wicd/README.SLACKWARE deleted file mode 100644 index e7a374dce..000000000 --- a/extra/source/wicd/README.SLACKWARE +++ /dev/null @@ -1,17 +0,0 @@ -After installing this package, make sure the /etc/rc.d/rc.wicd -script is executable; if necessary, do: - chmod +x /etc/rc.d/rc.wicd - -Results have varied, but you will probably need/want to remove -any references to interfaces from /etc/rc.d/rc.inet1.conf - in -other words, make that file look as if netconfig has never been -run. - -When you start X, you should see a wicd icon in the system tray; -click on it to open the gui interface and configure as desired. -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. diff --git a/extra/source/wicd/curses_bitrate_fix.patch b/extra/source/wicd/curses_bitrate_fix.patch deleted file mode 100644 index 1efa0c841..000000000 --- a/extra/source/wicd/curses_bitrate_fix.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- curses/netentry_curses.py 2015-02-15 18:29:05.000000000 +0100 -+++ curses/netentry_curses.py 2015-02-15 18:31:24.000000000 +0100 -@@ -538,11 +538,12 @@ - self.bitrates = wireless.GetAvailableBitrates() - self.bitrates.append('auto') - self.bitrate_combo.set_list(self.bitrates) -- self.bitrate_combo.set_focus( -- self.bitrates.index( -- wireless.GetWirelessProperty(networkID, 'bitrate') -+ if wireless.GetWirelessProperty(networkID, 'bitrate'): -+ self.bitrate_combo.set_focus( -+ self.bitrates.index( -+ wireless.GetWirelessProperty(networkID, 'bitrate') -+ ) - ) -- ) - self.allow_lower_bitrates_chkbox.set_state( - to_bool(self.format_entry(networkID, 'allow_lower_bitrates')) - ) diff --git a/extra/source/wicd/doinst.sh b/extra/source/wicd/doinst.sh deleted file mode 100644 index 78732c5b9..000000000 --- a/extra/source/wicd/doinst.sh +++ /dev/null @@ -1,37 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -# Keep same perms on rc.wicd.new: -if [ -e etc/rc.d/rc.wicd ]; then - cp -a etc/rc.d/rc.wicd etc/rc.d/rc.wicd.new.incoming - cat etc/rc.d/rc.wicd.new > etc/rc.d/rc.wicd.new.incoming - mv etc/rc.d/rc.wicd.new.incoming etc/rc.d/rc.wicd.new -fi - -# Update desktop menu -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -# Update icon cache if one exists -if [ -r usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -t -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -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/manually-compile-translations.diff b/extra/source/wicd/manually-compile-translations.diff deleted file mode 100644 index 56e22ce90..000000000 --- a/extra/source/wicd/manually-compile-translations.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur wicd-1.7.3.orig/setup.py wicd-1.7.3/setup.py ---- wicd-1.7.3.orig/setup.py 2014-12-21 13:40:46.000000000 -0600 -+++ wicd-1.7.3/setup.py 2014-12-23 13:03:13.181102639 -0600 -@@ -617,9 +617,6 @@ - import wpath - - if not wpath.no_install_i18n: -- if os.path.exists('translations'): -- shutil.rmtree('translations/') -- os.makedirs('translations') - - oldlang = os.environ['LANG'] - os.environ['LANG'] = 'C' -@@ -652,10 +649,6 @@ - except (OSError, ValueError): - print 'ARGH' - -- if compile_po: -- os.makedirs('translations/' + lang + '/LC_MESSAGES/') -- os.system('pybabel compile -D wicd -i %s -l %s -d translations/' % (pofile, lang)) -- - os.environ['LANG'] = oldlang - - class uninstall(Command): diff --git a/extra/source/wicd/slack-desc b/extra/source/wicd/slack-desc deleted file mode 100644 index 33aed2906..000000000 --- a/extra/source/wicd/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-------------------------------------------------------| -wicd: wicd (network manager for linux) -wicd: -wicd: wicd is a wired and wireless network manager for Linux. -wicd: Some features include: -wicd: - Ability to connect to wired and wireless networks -wicd: - Profiles for each wireless network and wired network -wicd: - Many encryption schemes, some of which include WEP/WPA/WPA2 -wicd: - Compatible with wireless-tools -wicd: -wicd: Homepage: https://launchpad.net/wicd -wicd: diff --git a/extra/source/wicd/wicd-1.7.3-urwid-1.3.0.patch b/extra/source/wicd/wicd-1.7.3-urwid-1.3.0.patch deleted file mode 100644 index a028059f5..000000000 --- a/extra/source/wicd/wicd-1.7.3-urwid-1.3.0.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- curses/wicd-curses.py 2015-01-27 22:35:25.414781192 -0300 -+++ cursesb/wicd-curses.py 2015-01-28 01:13:48.078904587 -0300 -@@ -1153,9 +1153,10 @@ - if not ui._started: - return False - -- input_data = ui.get_input_nonblocking() -+ ui.set_input_timeouts(max_wait=0) -+ input_data = ui.get_input() - # Resolve any "alarms" in the waiting -- self.handle_keys(input_data[1]) -+ self.handle_keys(input_data) - - # Update the screen - canvas = self.frame.render((self.size), True) diff --git a/extra/source/wicd/wicd-1421918.patch b/extra/source/wicd/wicd-1421918.patch deleted file mode 100644 index 2428f011b..000000000 --- a/extra/source/wicd/wicd-1421918.patch +++ /dev/null @@ -1,15 +0,0 @@ -=== modified file 'curses/wicd-curses.py' ---- curses/wicd-curses.py 2014-12-21 16:57:33 +0000 -+++ curses/wicd-curses.py 2015-02-24 23:41:01 +0000 -@@ -532,7 +532,10 @@ - def get_selected_profile(self): - """Get the selected wired profile""" - loc = self.get_focus()[1] -- return self.theList[loc] -+ if len(self.theList) > loc: -+ return self.theList[loc] -+ else: -+ return self.theList[-1] - - - class AdHocDialog(Dialog2): diff --git a/extra/source/wicd/wicd.SlackBuild b/extra/source/wicd/wicd.SlackBuild deleted file mode 100755 index 97b60a2c8..000000000 --- a/extra/source/wicd/wicd.SlackBuild +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh - -# Copyright 2008-2015 Robby Workman, Tuscaloosa, AL, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PKGNAM=wicd -VERSION=${VERSION:-1.7.4} -BUILD=${BUILD:-3} - -# Automatically determine architecture for build & packaging: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i586" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 -cd $PKGNAM-$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 {} \+ - -# Bypass the need for pybabel (thanks, dapal!) -zcat $CWD/manually-compile-translations.diff.gz | patch -p1 --verbose || exit 1 -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 - -# wicd-1.7.4 is broken with urwid > 1.0.x, even with this patch. -# Might be useful someday, but for now since the only thing in Slackware that uses -# urwid is wicd, just use a 1.0.x version. -# Thanks to ArchLinux -#zcat $CWD/wicd-1.7.3-urwid-1.3.0.patch.gz | patch -p0 --verbose || exit 1 - -# Crash fix. Thanks to ArchLinux. -zcat $CWD/wicd-1421918.patch.gz | patch -p0 --verbose || exit 1 - -# Thanks to Void Linux -zcat $CWD/curses_bitrate_fix.patch.gz | patch -p0 --verbose || exit 1 - -# Fix settings save crash: -zcat $CWD/wicd.netentry_curses.py.save.settings.patch.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 \ - --no-install-gnome-shell-extensions \ - || exit 1 - -python setup.py install --root=$PKG || exit 1 - -# Handle some Slackware defaults -# Use dhcpcd as the dhcp client -# Use kdesu as the graphical sudo application -cat << EOF > $PKG/etc/wicd/manager-settings.conf.new -[Settings] -dhcp_client = 2 -sudo_app = 2 -EOF - -# 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 -( cd $PKG/usr/man || exit 1 - find . -type f -exec gzip -9 {} \+ - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) -cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PKGNAM-$VERSION/README.SLACKWARE - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -c n -l y $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/extra/source/wicd/wicd.netentry_curses.py.save.settings.patch b/extra/source/wicd/wicd.netentry_curses.py.save.settings.patch deleted file mode 100644 index 512a467a0..000000000 --- a/extra/source/wicd/wicd.netentry_curses.py.save.settings.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ./curses/netentry_curses.py.orig 2018-03-15 12:02:07.569646094 -0500 -+++ ./curses/netentry_curses.py 2018-03-15 12:03:15.711650457 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - """ - netentry_curses -- everyone's favorite networks settings dialogs... in text - form! -@@ -538,12 +538,16 @@ - self.bitrates = wireless.GetAvailableBitrates() - self.bitrates.append('auto') - self.bitrate_combo.set_list(self.bitrates) -- if wireless.GetWirelessProperty(networkID, 'bitrate'): -- self.bitrate_combo.set_focus( -- self.bitrates.index( -- wireless.GetWirelessProperty(networkID, 'bitrate') -- ) -- ) -+ -+ # bitrate property is sometimes None -+ chosen_bitrate = wireless.GetWirelessProperty(networkID, 'bitrate') -+ if chosen_bitrate not in self.bitrates: -+ chosen_bitrate = 'auto' -+ -+ self.bitrate_combo.set_focus( -+ self.bitrates.index(chosen_bitrate) -+ ) -+ - self.allow_lower_bitrates_chkbox.set_state( - to_bool(self.format_entry(networkID, 'allow_lower_bitrates')) - ) diff --git a/extra/wicd/README.SLACKWARE b/extra/wicd/README.SLACKWARE deleted file mode 100644 index e7a374dce..000000000 --- a/extra/wicd/README.SLACKWARE +++ /dev/null @@ -1,17 +0,0 @@ -After installing this package, make sure the /etc/rc.d/rc.wicd -script is executable; if necessary, do: - chmod +x /etc/rc.d/rc.wicd - -Results have varied, but you will probably need/want to remove -any references to interfaces from /etc/rc.d/rc.inet1.conf - in -other words, make that file look as if netconfig has never been -run. - -When you start X, you should see a wicd icon in the system tray; -click on it to open the gui interface and configure as desired. -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. -- cgit v1.2.3