summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-06-05 05:24:22 +0000
committerEric Hameleers <alien@slackware.com>2018-06-05 14:23:15 +0200
commitec4fd2d70a99a651f8498ce4c1ca8b38b9583c39 (patch)
tree4d7e472dd250677ad2bec251cb7ac5e7d8e3f6e3 /source
parentb5c37d741f799c8289c331f601c6499e8b974ec7 (diff)
downloadcurrent-ec4fd2d70a99a651f8498ce4c1ca8b38b9583c39.tar.gz
Tue Jun 5 05:24:22 UTC 201820180605052422
ap/mc-4.8.21-x86_64-1.txz: Upgraded. ap/soma-3.0.4-noarch-1.txz: Upgraded. d/perl-5.26.2-x86_64-4.txz: Rebuilt. Added IO-Socket-SSL-2.056 and Net-SSLeay-1.85. Thanks to Xsane. n/ModemManager-1.8.0-x86_64-1.txz: Upgraded. n/bluez-5.50-x86_64-1.txz: Upgraded. n/dhcpcd-7.0.5b-x86_64-1.txz: Upgraded. xap/gnuplot-5.2.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/ap/mc/mc.SlackBuild2
-rw-r--r--source/ap/mc/slack-desc2
-rw-r--r--source/ap/soma/ChangeLog.txt30
-rw-r--r--source/ap/soma/README74
-rwxr-xr-xsource/ap/soma/soma.SlackBuild29
-rw-r--r--source/ap/soma/soma.SlackBuild.slack.diff35
-rw-r--r--source/ap/soma/soma.info6
-rwxr-xr-xsource/d/perl/perl.SlackBuild45
-rwxr-xr-xsource/n/ModemManager/ModemManager.SlackBuild2
-rwxr-xr-xsource/n/bluez/bluez.SlackBuild3
-rw-r--r--source/n/bluez/gatt_fix_crash.diff43
-rw-r--r--source/n/dhcpcd/dhcpcd-7.0.4.tar.xz.distinfo1
-rw-r--r--source/n/dhcpcd/dhcpcd-7.0.5b.tar.xz.distinfo1
-rw-r--r--source/xap/gnuplot/gnuplot.url1
14 files changed, 199 insertions, 75 deletions
diff --git a/source/ap/mc/mc.SlackBuild b/source/ap/mc/mc.SlackBuild
index abab4c71..bc5a535c 100755
--- a/source/ap/mc/mc.SlackBuild
+++ b/source/ap/mc/mc.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mc
VERSION=${VERSION:-$(echo mc-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/ap/mc/slack-desc b/source/ap/mc/slack-desc
index f2e1e238..6f4b41a3 100644
--- a/source/ap/mc/slack-desc
+++ b/source/ap/mc/slack-desc
@@ -16,4 +16,4 @@ mc: mc for use on the text console or in an xterm.
mc:
mc: mc was written by Miguel de Icaza and Mauricio Plaza.
mc:
-mc:
+mc: Homepage: https://midnight-commander.org
diff --git a/source/ap/soma/ChangeLog.txt b/source/ap/soma/ChangeLog.txt
index ffc32886..53e0860e 100644
--- a/source/ap/soma/ChangeLog.txt
+++ b/source/ap/soma/ChangeLog.txt
@@ -1,4 +1,34 @@
======================================================
+Version 3.0.3
+Add check for empty input in text input box.
+======================================================
+Version 3.0.2
+Edit purge files function slightly.
+======================================================
+Version 3.0.1
+Add new theme.
+Edit purge files function slightly to make it safer.
+======================================================
+Version 3.0.0
+Fixed BBC Radio 4 and BBC Radio 4 Extra URLs.
+Add menu options for genres, bookmarks and themes.
+Add schedules and volume indicators.
+Add more options for timeformat, caret etc.
+======================================================
+Version 2.13.2
+Fixes for new dialog in -current.
+======================================================
+Version 2.13.1
+Bugfix where sometimes station list is broken.
+======================================================
+Version 2.13.0
+Fix another scheduler bug.
+Add genre support.
+Move Theme option to main menu.
+Add time format option.
+Updated all broken BBC URLs.
+Removed some broken URLs.
+======================================================
Version 2.12.3
Fix scheduler bug.
======================================================
diff --git a/source/ap/soma/README b/source/ap/soma/README
new file mode 100644
index 00000000..d63eb8d3
--- /dev/null
+++ b/source/ap/soma/README
@@ -0,0 +1,74 @@
+Soma - a dialog internet radio player
+
+For help/usage see soma -h
+
+Soma started off as a way to play .pls playlists from SomaFM but can
+also play .ram playlists too. In fact any url playable by mplayer
+using the -playlist option should work. Extra stations can be added
+in ~/.soma/stations.conf (up to 200).
+
+Soma uses mplayer to play the streams and aplay to detect cards for
+mixer so mplayer and alsa-utils need to be installed.
+
+Key commands supported in status window:
+
+( Volume -5
+) Volume +5
+1 - 0 Volume 10%, 20%, ... 100% (saved)
+Space Pause/Play
+d Disconnect/Reconnect
+a Add schedule
+b Station browser
+m Mute toggle
+s Scheduler
+q Quit
+
+There are 3 config files:
+
+~/.soma/themes/*rcrc Specify the dialog colours.
+~/.soma/options.conf A few extra options.
+~/.soma/stations.conf User station list.
+
+There are also:
+
+/etc/soma/options.conf Default options.
+/etc/soma/themes/*rc Dialog configs.
+/etc/soma/stations.conf Default station list.
+
+Stations should be added to the user list like this:
+
+Name,URL
+
+You cannot use a comma , in the name or URL
+
+I would be glad of any exra radio urls emailed to me so I can add to
+the default list.
+
+NOTES:
+
+The Jack and NAS options for output device will only work if MPlayer is
+built against them.
+
+When changing/selecting soundcard output device you must press space on
+the option. Just scrolling down and hitting Enter does nothing.
+
+BUGS:
+
+Soma may induce the side effects of general well-being and profound
+spiritual satisfaction.
+
+http://en.wikipedia.org/wiki/Soma
+http://en.wikipedia.org/wiki/Soma_(Brave_New_World)
+
+REAL BUGS:
+
+Some people might find screen messes up the dialog colours. If you
+have this line in ~/.screenrc:
+
+attrcolor b ".I"
+
+You might want to comment it out and try again as it seems to turn off
+the bold attribute.
+
+Please mail me at dave@dawoodfall.net for new radio urls or bug
+reports etc.
diff --git a/source/ap/soma/soma.SlackBuild b/source/ap/soma/soma.SlackBuild
index 09d3be2d..d8c6e961 100755
--- a/source/ap/soma/soma.SlackBuild
+++ b/source/ap/soma/soma.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Slackware build script for soma
# (C) 2010 David Woodfall <dave@dawoodfall.net>
@@ -24,22 +24,22 @@
cd $(dirname $0) ; CWD=$(pwd)
-PKGNAM=soma
-VERSION=${VERSION:-2.12.3}
+PRGNAM=soma
+VERSION=${VERSION:-3.0.4}
ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
#TAG=${TAG:-daw}
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information
# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
- echo "$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}"
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}"
exit 0
fi
TMP=${TMP:-/tmp/daw}
-PKG=$TMP/package-$PKGNAM
+PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
set -e
@@ -47,9 +47,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xfv $CWD/$PKGNAM-$VERSION.tar.gz
-cd $PKGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xfv $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -57,19 +57,22 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-mkdir -p $PKG/usr/bin $PKG/etc/soma/themes $PKG/install $PKG/usr/doc/$PKGNAM-$VERSION
+mkdir -p $PKG/usr/bin $PKG/etc/soma/themes \
+ $PKG/etc/soma/genres \
+ $PKG/install $PKG/usr/doc/$PRGNAM-$VERSION
install -m 755 soma $PKG/usr/bin/soma
install -m 644 options.conf $PKG/etc/soma/options.conf.new
install -m 644 stations.conf $PKG/etc/soma/stations.conf.new
install -m 644 themes/* $PKG/etc/soma/themes
+install -m 644 genres/* $PKG/etc/soma/genres
cp -a \
- README $CWD/ChangeLog.txt \
- $PKG/usr/doc/$PKGNAM-$VERSION
+ $CWD/README $CWD/ChangeLog.txt \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/slack-desc > $PKG/install/slack-desc
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
diff --git a/source/ap/soma/soma.SlackBuild.slack.diff b/source/ap/soma/soma.SlackBuild.slack.diff
index 6f1273d7..71dfbcd0 100644
--- a/source/ap/soma/soma.SlackBuild.slack.diff
+++ b/source/ap/soma/soma.SlackBuild.slack.diff
@@ -1,16 +1,32 @@
---- soma.SlackBuild.orig 2017-12-02 11:26:26.000000000 -0600
-+++ soma.SlackBuild 2017-12-02 11:48:00.554981067 -0600
-@@ -26,7 +26,7 @@
- VERSION=${VERSION:-2.12.3}
+--- soma.SlackBuild.orig 2018-03-05 23:58:06.000000000 -0600
++++ soma.SlackBuild 2018-06-04 23:45:17.325657453 -0500
+@@ -22,13 +22,22 @@
+ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
++cd $(dirname $0) ; CWD=$(pwd)
++
+ PRGNAM=soma
+ VERSION=${VERSION:-3.0.4}
ARCH=noarch
BUILD=${BUILD:-1}
-TAG=${TAG:-daw}
+#TAG=${TAG:-daw}
++
++# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
++# the name of the created package would be, and then exit. This information
++# could be useful to other scripts.
++if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
++ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}"
++ exit 0
++fi
- CWD=$(pwd)
+-CWD=$(pwd)
TMP=${TMP:-/tmp/daw}
-@@ -51,16 +51,16 @@
- mkdir -p $PKG/usr/bin $PKG/etc/soma/themes $PKG/install $PKG/usr/doc/$PRGNAM-$VERSION
+ PKG=$TMP/package-$PRGNAM
+ OUTPUT=${OUTPUT:-/tmp}
+@@ -53,8 +62,8 @@
+ $PKG/install $PKG/usr/doc/$PRGNAM-$VERSION
install -m 755 soma $PKG/usr/bin/soma
-install -m 644 options.conf $PKG/etc/soma
@@ -18,9 +34,10 @@
+install -m 644 options.conf $PKG/etc/soma/options.conf.new
+install -m 644 stations.conf $PKG/etc/soma/stations.conf.new
install -m 644 themes/* $PKG/etc/soma/themes
+ install -m 644 genres/* $PKG/etc/soma/genres
- cp -a \
- README $CWD/ChangeLog.txt \
+@@ -62,8 +71,8 @@
+ $CWD/README $CWD/ChangeLog.txt \
$PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/source/ap/soma/soma.info b/source/ap/soma/soma.info
index 6452f00d..82cd9782 100644
--- a/source/ap/soma/soma.info
+++ b/source/ap/soma/soma.info
@@ -1,8 +1,8 @@
PRGNAM="soma"
-VERSION="2.12.3"
+VERSION="3.0.4"
HOMEPAGE="http://www.dawoodfall.net/slackbuilds/noversion/soma/"
-DOWNLOAD="http://www.dawoodfall.net/files/slackbuilds/noversion/soma/soma-2.12.3.tar.gz"
-MD5SUM="f454d93cc8431cb9b2097eea720d8c6b"
+DOWNLOAD="http://www.dawoodfall.net/slackbuilds/noversion/soma/soma-3.0.4.tar.gz"
+MD5SUM="f99857601879ab2a651f298304069716"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/source/d/perl/perl.SlackBuild b/source/d/perl/perl.SlackBuild
index 94518bfe..bb35a6bc 100755
--- a/source/d/perl/perl.SlackBuild
+++ b/source/d/perl/perl.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=perl
VERSION=5.26.2
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -56,15 +56,30 @@ TMP=${TMP:-/tmp}
PKG=$TMP/package-perl
# Additional required modules:
+#
+# https://metacpan.org/release/DBD-mysql
DBDMYSQL=4.046
+# https://metacpan.org/release/DBI
DBI=1.641
+# https://metacpan.org/release/gettext
GETTEXT=1.07
+# https://metacpan.org/release/TermReadKey
TERMREADKEY=2.37
+# https://metacpan.org/release/URI
URI=1.74
+# https://metacpan.org/release/XML-Parser
XMLPARSER=2.44
+# https://metacpan.org/release/XML-Simple
XMLSIMPLE=2.25
+# https://metacpan.org/release/Authen-SASL
AUTHENSASL=2.16
+# https://metacpan.org/release/MIME-Base64
MIMEBASE64=3.15
+# https://metacpan.org/release/IO-Socket-SSL
+IOSOCKETSSL=2.056
+# https://metacpan.org/release/Net-SSLeay
+NETSSLEAY=1.85
+# https://metacpan.org/release/libnet
LIBNET=3.11
if [ "$ARCH" = "i486" ]; then
@@ -304,6 +319,34 @@ make install DESTDIR=$PKG || exit 1
cp -a README* $PKG/usr/doc/perl-$VERSION/MIME-Base64-${MIMEBASE64}
chmod 644 $PKG/usr/doc/perl-$VERSION/MIME-Base64-${MIMEBASE64}/*
) || exit 1
+ ( tar xzvf $CWD/IO-Socket-SSL-${IOSOCKETSSL}.tar.gz
+ cd IO-Socket-SSL-${IOSOCKETSSL}
+ chown -R root:root .
+ echo Y | perl Makefile.PL INSTALLDIRS=vendor
+ make || exit 1
+ if [ "$MAKETEST" = "yes" ]; then
+ make test || exit 1
+ fi
+ make install || exit 1
+ make install DESTDIR=$PKG || exit 1
+ mkdir -p $PKG/usr/doc/perl-$VERSION/IO-Socket-SSL-${IOSOCKETSSL}
+ cp -a README* $PKG/usr/doc/perl-$VERSION/IO-Socket-SSL-${IOSOCKETSSL}
+ chmod 644 $PKG/usr/doc/perl-$VERSION/IO-Socket-SSL-${IOSOCKETSSL}/*
+ ) || exit 1
+ ( tar xzvf $CWD/Net-SSLeay-${NETSSLEAY}.tar.gz
+ cd Net-SSLeay-${NETSSLEAY}
+ chown -R root:root .
+ echo y | perl Makefile.PL INSTALLDIRS=vendor
+ make || exit 1
+ if [ "$MAKETEST" = "yes" ]; then
+ make test || exit 1
+ fi
+ make install || exit 1
+ make install DESTDIR=$PKG || exit 1
+ mkdir -p $PKG/usr/doc/perl-$VERSION/Net-SSLeay-${NETSSLEAY}
+ cp -a README* $PKG/usr/doc/perl-$VERSION/Net-SSLeay-${NETSSLEAY}
+ chmod 644 $PKG/usr/doc/perl-$VERSION/Net-SSLeay-${NETSSLEAY}/*
+ ) || exit 1
( tar xzvf $CWD/libnet-${LIBNET}.tar.gz
cd libnet-${LIBNET}
zcat $CWD/libnet-3.08-Do-not-create-Net-libnet.cfg.patch.gz | patch -p1 --verbose || exit 1
diff --git a/source/n/ModemManager/ModemManager.SlackBuild b/source/n/ModemManager/ModemManager.SlackBuild
index 6740f03b..6b7ba2a1 100755
--- a/source/n/ModemManager/ModemManager.SlackBuild
+++ b/source/n/ModemManager/ModemManager.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=ModemManager
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild
index 8fc07365..94a407d4 100755
--- a/source/n/bluez/bluez.SlackBuild
+++ b/source/n/bluez/bluez.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=bluez
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
@@ -79,7 +79,6 @@ find . \
zcat $CWD/bluez-5.30-obexd_without_systemd-1.patch.gz | patch -p1 --verbose || exit 1
# Fix bluetoothd crashes:
-zcat $CWD/gatt_fix_crash.diff.gz | patch -p1 --verbose || exit 1
zcat $CWD/refresh_adv_manager_for_non-LE_devices.diff.gz | patch -p1 --verbose || exit 1
autoreconf -vif
diff --git a/source/n/bluez/gatt_fix_crash.diff b/source/n/bluez/gatt_fix_crash.diff
deleted file mode 100644
index d0578525..00000000
--- a/source/n/bluez/gatt_fix_crash.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-From e10c204e1226e94a1eaaeaee076e7e2e5b13c504 Mon Sep 17 00:00:00 2001
-From: Szymon Janc <szymon.janc@codecoup.pl>
-Date: Wed, 4 Apr 2018 09:28:56 +0200
-Subject: gatt: Fix crash with BR/EDR only adapter
-
-adapter->database can be NULL if controller is BR/EDR only or LE was
-disabled. Make btd_gatt_database_restore_svc_chng_ccc accept NULL
-pointer and silently ignore it similiar to rest of btd_gatt_database
-API.
-
-Invalid read of size 8
- at 0x164DCB: btd_gatt_database_restore_svc_chng_ccc (src/bluez-git/src/bluetoothd)
- by 0x17B70F: read_info_complete (src/bluez-git/src/bluetoothd)
- by 0x1A7E58: request_complete (src/bluez-git/src/bluetoothd)
- by 0x1A89AD: can_read_data (src/bluez-git/src/bluetoothd)
- by 0x1B5752: watch_callback (src/bluez-git/src/bluetoothd)
- by 0x4E852C5: g_main_context_dispatch (in /usr/lib/libglib-2.0.so.0.5600.0)
- by 0x4E856A0: ??? (in /usr/lib/libglib-2.0.so.0.5600.0)
- by 0x4E859D1: g_main_loop_run (in /usr/lib/libglib-2.0.so.0.5600.0)
- by 0x125058: main (src/bluez-git/src/bluetoothd)
- Address 0x40 is not stack'd, malloc'd or (recently) free'd
----
- src/gatt-database.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/gatt-database.c b/src/gatt-database.c
-index 1cdc72e..0ac5b75 100644
---- a/src/gatt-database.c
-+++ b/src/gatt-database.c
-@@ -3330,6 +3330,9 @@ void btd_gatt_database_restore_svc_chng_ccc(struct btd_gatt_database *database)
- uint8_t value[4];
- uint16_t handle, ccc_handle;
-
-+ if (!database)
-+ return;
-+
- handle = gatt_db_attribute_get_handle(database->svc_chngd);
- ccc_handle = gatt_db_attribute_get_handle(database->svc_chngd_ccc);
-
---
-cgit v1.1
-
-
diff --git a/source/n/dhcpcd/dhcpcd-7.0.4.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-7.0.4.tar.xz.distinfo
deleted file mode 100644
index b530ad20..00000000
--- a/source/n/dhcpcd/dhcpcd-7.0.4.tar.xz.distinfo
+++ /dev/null
@@ -1 +0,0 @@
-SHA256 (dhcpcd-7.0.4.tar.xz) = 1fa414be34383578e2c343dfc8cdcb95e2da74f62121b394c88d60698c889a78
diff --git a/source/n/dhcpcd/dhcpcd-7.0.5b.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-7.0.5b.tar.xz.distinfo
new file mode 100644
index 00000000..09d1357d
--- /dev/null
+++ b/source/n/dhcpcd/dhcpcd-7.0.5b.tar.xz.distinfo
@@ -0,0 +1 @@
+SHA256 (dhcpcd-7.0.5b.tar.xz) = 587cdaba99cc8778a6cbe3a52728e37ac0f4dfbc9d5b702d48a505be0162317d
diff --git a/source/xap/gnuplot/gnuplot.url b/source/xap/gnuplot/gnuplot.url
new file mode 100644
index 00000000..e75ec660
--- /dev/null
+++ b/source/xap/gnuplot/gnuplot.url
@@ -0,0 +1 @@
+http://www.gnuplot.info