summaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
Diffstat (limited to 'network')
-rw-r--r--network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild2
-rw-r--r--network/NetworkManager-openvpn/NetworkManager-openvpn.info6
-rw-r--r--network/RSSOwl/RSSOwl.SlackBuild2
-rw-r--r--network/aircrack-ng/aircrack-ng.SlackBuild4
-rw-r--r--network/aircrack-ng/aircrack-ng.info6
-rw-r--r--network/bip/bip.SlackBuild2
-rw-r--r--network/bitcoin/bitcoin.SlackBuild2
-rw-r--r--network/bitcoin/boost-1.66.0.patch82
-rw-r--r--network/bro/bro.SlackBuild7
-rw-r--r--network/bwm-ng/bwm-ng.SlackBuild3
-rw-r--r--network/bwm-ng/fix_gcc7_inline.patch40
-rw-r--r--network/ccnet/ccnet.SlackBuild10
-rw-r--r--network/ccnet/ccnet.info6
-rw-r--r--network/cherokee/cherokee.SlackBuild8
-rw-r--r--network/cherokee/cherokee.info6
-rw-r--r--network/dobbscoin/dobbscoin.SlackBuild9
-rw-r--r--network/dovecot/README27
-rw-r--r--network/dovecot/doinst.sh26
-rw-r--r--network/dovecot/dovecot.SlackBuild133
-rw-r--r--network/dovecot/dovecot.info10
-rw-r--r--network/dovecot/rc.dovecot55
-rw-r--r--network/dovecot/slack-desc19
-rw-r--r--network/dsniff/24_Fix-OpenSSL1.1.0-Build.patch202
-rw-r--r--network/dsniff/dsniff.SlackBuild2
-rw-r--r--network/emacs-w3m/emacs-w3m.SlackBuild8
-rw-r--r--network/emacs-w3m/emacs-w3m.info6
-rw-r--r--network/ettercap/ettercap.SlackBuild3
-rw-r--r--network/ettercap/patches/0001-First-draft-of-openssl-1.1-compatibility-layer-from-.patch257
-rw-r--r--network/ettercap/patches/CVE-2017-6430.patch68
-rw-r--r--network/ettercap/patches/CVE-2017-8366.patch258
-rw-r--r--network/fcgiwrap/fcgiwrap.SlackBuild2
-rw-r--r--network/fqterm/fqterm.SlackBuild32
-rw-r--r--network/fqterm/fqterm.info6
-rw-r--r--network/hylafax/gcc.patch12
-rw-r--r--network/hylafax/hylafax.SlackBuild2
-rw-r--r--network/ifstatus/README10
-rw-r--r--network/ifstatus/ifstatus.SlackBuild91
-rw-r--r--network/ifstatus/ifstatus.info10
-rw-r--r--network/ifstatus/ifstatus.patch66
-rw-r--r--network/ifstatus/slack-desc19
-rw-r--r--network/iperf/iperf.SlackBuild29
-rw-r--r--network/iperf/iperf.info6
-rw-r--r--network/iperf/patches/0_iperf-2.0.8-debuginfo.patch17
-rw-r--r--network/iperf/patches/1_iperf-2.0.8-bindfail.patch42
-rw-r--r--network/iperf/patches/2_iperf-2.0.8-math.patch75
-rw-r--r--network/jigdo/jigdo-0.7.3-gcc7.patch39
-rw-r--r--network/jigdo/jigdo.SlackBuild3
-rw-r--r--network/kmess/README5
-rw-r--r--network/kmess/doinst.sh10
-rw-r--r--network/kmess/giflib-5.0.patch95
-rw-r--r--network/kmess/kmess.SlackBuild100
-rw-r--r--network/kmess/kmess.info10
-rw-r--r--network/kmess/slack-desc19
-rw-r--r--network/knock/knock.SlackBuild26
-rw-r--r--network/knock/knock.info6
-rw-r--r--network/leechcraft/README26
-rw-r--r--network/leechcraft/doinst.sh22
-rw-r--r--network/leechcraft/leechcraft.SlackBuild111
-rw-r--r--network/leechcraft/leechcraft.info10
-rw-r--r--network/leechcraft/slack-desc19
-rw-r--r--network/linuxdcpp/linuxdcpp.SlackBuild2
-rw-r--r--network/memcached/memcached.SlackBuild2
-rw-r--r--network/mldonkey/mldonkey.SlackBuild20
-rw-r--r--network/mldonkey/mldonkey.info6
-rw-r--r--network/mosh/mosh.SlackBuild2
-rw-r--r--network/mumble/boost-1.66.patch32
-rw-r--r--network/mumble/mumble.SlackBuild3
-rw-r--r--network/museek+/README23
-rw-r--r--network/museek+/doinst.sh26
-rw-r--r--network/museek+/museek+.SlackBuild90
-rw-r--r--network/museek+/museek+.info10
-rw-r--r--network/museek+/museek-python.diff44
-rw-r--r--network/museek+/rc.museekd105
-rw-r--r--network/museek+/slack-desc19
-rw-r--r--network/ncrack/ncrack.SlackBuild2
-rw-r--r--network/nghttp2/README4
-rw-r--r--network/nghttp2/nghttp2.info10
-rw-r--r--network/opendkim/opendkim.SlackBuild3
-rw-r--r--network/opendkim/openssl_1.1.0_compat.patch90
-rw-r--r--network/pidgin-musictracker/pidgin-musictracker.SlackBuild2
-rw-r--r--network/postfix/README39
-rw-r--r--network/postfix/doinst.sh40
-rw-r--r--network/postfix/patches/postconf.diff31
-rw-r--r--network/postfix/postfix.SlackBuild199
-rw-r--r--network/postfix/postfix.info10
-rw-r--r--network/postfix/rc.postfix67
-rw-r--r--network/postfix/slack-desc19
-rw-r--r--network/razor-agents/razor-agents.SlackBuild2
-rw-r--r--network/remmina/find_libssh.patch25
-rw-r--r--network/remmina/remmina.SlackBuild2
-rw-r--r--network/seafile-client/seafile-client.SlackBuild103
-rw-r--r--network/seafile-client/seafile-client.info10
-rw-r--r--network/seafile-client/slack-desc19
-rw-r--r--network/seafile/README (renamed from network/seafile-client/README)0
-rw-r--r--network/seafile/seafile.SlackBuild (renamed from network/nghttp2/nghttp2.SlackBuild)24
-rw-r--r--network/seafile/seafile.info10
-rw-r--r--network/seafile/slack-desc (renamed from network/nghttp2/slack-desc)22
-rw-r--r--network/sqlrelay/sqlrelay.SlackBuild8
-rw-r--r--network/sqlrelay/sqlrelay.info6
-rw-r--r--network/sshfs-fuse/README10
-rw-r--r--network/sshfs-fuse/slack-desc19
-rw-r--r--network/sshfs-fuse/sshfs-fuse.SlackBuild99
-rw-r--r--network/sshfs-fuse/sshfs-fuse.info10
-rw-r--r--network/transmission-remote-gtk/README4
-rw-r--r--network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild18
-rw-r--r--network/transmission-remote-gtk/transmission-remote-gtk.info6
-rw-r--r--network/vde2/vde2.SlackBuild3
-rw-r--r--network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch92
-rw-r--r--network/verlihub/verlihub-gcc7.patch18
-rw-r--r--network/verlihub/verlihub.SlackBuild3
110 files changed, 1550 insertions, 2052 deletions
diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild b/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
index 46b08ddac2..7e0f003f8b 100644
--- a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
+++ b/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=NetworkManager-openvpn
-VERSION=${VERSION:-1.2.10}
+VERSION=${VERSION:-1.8.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.info b/network/NetworkManager-openvpn/NetworkManager-openvpn.info
index 85a02339c8..d33d6cada3 100644
--- a/network/NetworkManager-openvpn/NetworkManager-openvpn.info
+++ b/network/NetworkManager-openvpn/NetworkManager-openvpn.info
@@ -1,8 +1,8 @@
PRGNAM="NetworkManager-openvpn"
-VERSION="1.2.10"
+VERSION="1.8.6"
HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-DOWNLOAD="https://download.gnome.org/sources/NetworkManager-openvpn/1.2/NetworkManager-openvpn-1.2.10.tar.xz"
-MD5SUM="f118226ed2bfbacfd64ac4d1e0bd0383"
+DOWNLOAD="https://download.gnome.org/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.6.tar.xz"
+MD5SUM="d6eb18af45a3b2b5be5844db3bb8e97c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/RSSOwl/RSSOwl.SlackBuild b/network/RSSOwl/RSSOwl.SlackBuild
index e74ccf654a..999ebe5b99 100644
--- a/network/RSSOwl/RSSOwl.SlackBuild
+++ b/network/RSSOwl/RSSOwl.SlackBuild
@@ -73,7 +73,7 @@ ln -s /usr/lib${LIBDIRSUFFIX}/RSSOwl/RSSOwl $PKG/usr/bin/RSSOwl
mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
cp -av * $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
-sed -i 's,libhunspell-1.2.so.0,libhunspell-1.3.so.0,g' $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/xulrunner/libxul.so
+sed -i 's,libhunspell-1.2.so.0,libhunspell-1.6.so.0,g' $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/xulrunner/libxul.so
mkdir -p $PKG/usr/share/pixmaps
cp -av icon.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm
diff --git a/network/aircrack-ng/aircrack-ng.SlackBuild b/network/aircrack-ng/aircrack-ng.SlackBuild
index a86ceac867..61ddd575eb 100644
--- a/network/aircrack-ng/aircrack-ng.SlackBuild
+++ b/network/aircrack-ng/aircrack-ng.SlackBuild
@@ -3,7 +3,7 @@
# Written by Yalla-One <yallaone@gmail.com>
PRGNAM=aircrack-ng
-VERSION=${VERSION:-1.2_beta1}
+VERSION=${VERSION:-1.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -48,6 +48,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+./autogen.sh
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
make ${OPT}
diff --git a/network/aircrack-ng/aircrack-ng.info b/network/aircrack-ng/aircrack-ng.info
index a48ea60fe4..8ea30569e8 100644
--- a/network/aircrack-ng/aircrack-ng.info
+++ b/network/aircrack-ng/aircrack-ng.info
@@ -1,8 +1,8 @@
PRGNAM="aircrack-ng"
-VERSION="1.2_beta1"
+VERSION="1.2"
HOMEPAGE="http://www.aircrack-ng.org"
-DOWNLOAD="http://download.aircrack-ng.org/aircrack-ng-1.2-beta1.tar.gz"
-MD5SUM="f1cc7e19563bd64964f3584048a1031b"
+DOWNLOAD="https://download.aircrack-ng.org/aircrack-ng-1.2.tar.gz"
+MD5SUM="bb11ec14e1fe505d8d0d51cee0c54df9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/bip/bip.SlackBuild b/network/bip/bip.SlackBuild
index 93d6aac4df..e4a191a06c 100644
--- a/network/bip/bip.SlackBuild
+++ b/network/bip/bip.SlackBuild
@@ -72,7 +72,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=duplicate-decl-specifier" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/network/bitcoin/bitcoin.SlackBuild b/network/bitcoin/bitcoin.SlackBuild
index d0c947cada..d36fce104d 100644
--- a/network/bitcoin/bitcoin.SlackBuild
+++ b/network/bitcoin/bitcoin.SlackBuild
@@ -72,6 +72,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/boost-1.66.0.patch
+
# build bitcoin-core
[ -f autogen.sh ] && sh autogen.sh
CFLAGS="$SLKCFLAGS" \
diff --git a/network/bitcoin/boost-1.66.0.patch b/network/bitcoin/boost-1.66.0.patch
new file mode 100644
index 0000000000..be13d20403
--- /dev/null
+++ b/network/bitcoin/boost-1.66.0.patch
@@ -0,0 +1,82 @@
+From 1ec0c0a01c316146434642ab2f14a7367306dbec Mon Sep 17 00:00:00 2001
+From: Suhas Daftuar <sdaftuar@gmail.com>
+Date: Thu, 7 Dec 2017 09:57:53 -0500
+Subject: [PATCH] Make boost::multi_index comparators const
+
+This fixes compatibility with boost 1.66
+---
+ src/miner.h | 4 ++--
+ src/txmempool.h | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/miner.h b/src/miner.h
+index 36276dc362c5..d81ec6421cb8 100644
+--- a/src/miner.h
++++ b/src/miner.h
+@@ -71,7 +71,7 @@ struct modifiedentry_iter {
+ // except operating on CTxMemPoolModifiedEntry.
+ // TODO: refactor to avoid duplication of this logic.
+ struct CompareModifiedEntry {
+- bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b)
++ bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b) const
+ {
+ double f1 = (double)a.nModFeesWithAncestors * b.nSizeWithAncestors;
+ double f2 = (double)b.nModFeesWithAncestors * a.nSizeWithAncestors;
+@@ -86,7 +86,7 @@ struct CompareModifiedEntry {
+ // This is sufficient to sort an ancestor package in an order that is valid
+ // to appear in a block.
+ struct CompareTxIterByAncestorCount {
+- bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b)
++ bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) const
+ {
+ if (a->GetCountWithAncestors() != b->GetCountWithAncestors())
+ return a->GetCountWithAncestors() < b->GetCountWithAncestors();
+diff --git a/src/txmempool.h b/src/txmempool.h
+index 346585ab115e..86a008d7b211 100644
+--- a/src/txmempool.h
++++ b/src/txmempool.h
+@@ -204,7 +204,7 @@ struct mempoolentry_txid
+ class CompareTxMemPoolEntryByDescendantScore
+ {
+ public:
+- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
+ {
+ bool fUseADescendants = UseDescendantScore(a);
+ bool fUseBDescendants = UseDescendantScore(b);
+@@ -226,7 +226,7 @@ class CompareTxMemPoolEntryByDescendantScore
+ }
+
+ // Calculate which score to use for an entry (avoiding division).
+- bool UseDescendantScore(const CTxMemPoolEntry &a)
++ bool UseDescendantScore(const CTxMemPoolEntry &a) const
+ {
+ double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants();
+ double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize();
+@@ -241,7 +241,7 @@ class CompareTxMemPoolEntryByDescendantScore
+ class CompareTxMemPoolEntryByScore
+ {
+ public:
+- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
+ {
+ double f1 = (double)a.GetModifiedFee() * b.GetTxSize();
+ double f2 = (double)b.GetModifiedFee() * a.GetTxSize();
+@@ -255,7 +255,7 @@ class CompareTxMemPoolEntryByScore
+ class CompareTxMemPoolEntryByEntryTime
+ {
+ public:
+- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
+ {
+ return a.GetTime() < b.GetTime();
+ }
+@@ -264,7 +264,7 @@ class CompareTxMemPoolEntryByEntryTime
+ class CompareTxMemPoolEntryByAncestorFee
+ {
+ public:
+- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
+ {
+ double aFees = a.GetModFeesWithAncestors();
+ double aSize = a.GetSizeWithAncestors();
diff --git a/network/bro/bro.SlackBuild b/network/bro/bro.SlackBuild
index 1c58a15f01..32b38969d6 100644
--- a/network/bro/bro.SlackBuild
+++ b/network/bro/bro.SlackBuild
@@ -69,11 +69,18 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+LIBS="-L/usr/lib$LIBDIRSUFFIX/openssl-1.0" \
+CPPFLAGS="/usr/include/openssl-1.0" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/opt/$PRGNAM
+# Temporary fix until openssl-1.1 is supported
+sed -i "s/^OPENSSL_CRYPTO_LIBRARY.*/OPENSSL_CRYPTO_LIBRARY:FILEPATH=\/usr\/lib$LIBDIRSUFFIX\/openssl-1.0\/libcrypto.so/" build/CMakeCache.txt
+sed -i "s/^OPENSSL_INCLUDE_DIR.*/OPENSSL_INCLUDE_DIR:PATH=\/usr\/include\/openssl-1.0/" build/CMakeCache.txt
+sed -i "s/^OPENSSL_SSL_LIBRARY.*/OPENSSL_SSL_LIBRARY:FILEPATH=\/usr\/lib$LIBDIRSUFFIX\/openssl-1.0\/libssl.so/" build/CMakeCache.txt
+
make
make install DESTDIR=$PKG
diff --git a/network/bwm-ng/bwm-ng.SlackBuild b/network/bwm-ng/bwm-ng.SlackBuild
index 51a9ee8aba..69f668f7ee 100644
--- a/network/bwm-ng/bwm-ng.SlackBuild
+++ b/network/bwm-ng/bwm-ng.SlackBuild
@@ -70,6 +70,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Thanks opensuse
+patch -p0 < $CWD/fix_gcc7_inline.patch
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/network/bwm-ng/fix_gcc7_inline.patch b/network/bwm-ng/fix_gcc7_inline.patch
new file mode 100644
index 0000000000..dec44a7d66
--- /dev/null
+++ b/network/bwm-ng/fix_gcc7_inline.patch
@@ -0,0 +1,40 @@
+--- src/bwm-ng.c.orig 2017-06-12 03:15:08.731964116 +0200
++++ src/bwm-ng.c 2017-06-12 03:15:21.492001798 +0200
+@@ -26,7 +26,7 @@
+
+ /* handle interrupt signal */
+ void sigint(int sig) FUNCATTR_NORETURN;
+-inline void init(void);
++static inline void init(void);
+
+ /* clear stuff and exit */
+ #ifdef __STDC__
+@@ -98,7 +98,7 @@
+ deinit(0, NULL);
+ }
+
+-inline void init(void) {
++static inline void init(void) {
+ if_count=0;
+ delay=500;
+ #if EXTENDED_STATS
+--- src/options.c.orig 2017-06-12 03:11:33.659353656 +0200
++++ src/options.c 2017-06-12 03:14:36.535870677 +0200
+@@ -34,7 +34,7 @@
+ #if EXTENDED_STATS
+ inline int str2output_type(char *optarg);
+ #endif
+-inline int str2out_method(char *optarg);
++static inline int str2out_method(char *optarg);
+ inline int str2in_method(char *optarg);
+
+ #ifdef CONFIG_FILE
+@@ -87,7 +87,7 @@
+ }
+ #endif
+
+-inline int str2out_method(char *optarg) {
++static inline int str2out_method(char *optarg) {
+ if (optarg) {
+ if (!strcasecmp(optarg,"plain")) return PLAIN_OUT;
+ #ifdef HAVE_CURSES
diff --git a/network/ccnet/ccnet.SlackBuild b/network/ccnet/ccnet.SlackBuild
index a357b3a0f4..c42b6cd7b9 100644
--- a/network/ccnet/ccnet.SlackBuild
+++ b/network/ccnet/ccnet.SlackBuild
@@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ccnet
-VERSION=${VERSION:-4.4.6}
+VERSION=${VERSION:-6.1.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -61,9 +61,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION-server
-tar xvf $CWD/$PRGNAM-$VERSION-server.tar.gz
-cd $PRGNAM-$VERSION-server
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -93,7 +93,7 @@ make
make install-strip DESTDIR=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYRIGHT HACKING LICENCE.txt README.markdown \
+cp -a HACKING LICENSE.txt README.markdown \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/ccnet/ccnet.info b/network/ccnet/ccnet.info
index a796b40262..524485246b 100644
--- a/network/ccnet/ccnet.info
+++ b/network/ccnet/ccnet.info
@@ -1,8 +1,8 @@
PRGNAM="ccnet"
-VERSION="4.4.6"
+VERSION="6.1.8"
HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/ccnet/archive/v4.4.6-server/ccnet-4.4.6-server.tar.gz"
-MD5SUM="bff067e61d0af043b761027fdd840314"
+DOWNLOAD="https://github.com/haiwen/ccnet/archive/v6.1.8/ccnet-6.1.8.tar.gz"
+MD5SUM="4bab2537f68070d5af226fc80b79c859"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libsearpc vala libzdb"
diff --git a/network/cherokee/cherokee.SlackBuild b/network/cherokee/cherokee.SlackBuild
index ee57d2b98a..cf4dc146fb 100644
--- a/network/cherokee/cherokee.SlackBuild
+++ b/network/cherokee/cherokee.SlackBuild
@@ -5,13 +5,13 @@
# Written by Pablo Hernan Saro (pablosaro@gmail.com)
PRGNAM=cherokee
-VERSION=${VERSION:-20131105_d91c9c1}
+VERSION=${VERSION:-20180709_9a75e65}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/network/cherokee/cherokee.info b/network/cherokee/cherokee.info
index ea23a977c6..59fddb9c31 100644
--- a/network/cherokee/cherokee.info
+++ b/network/cherokee/cherokee.info
@@ -1,8 +1,8 @@
PRGNAM="cherokee"
-VERSION="20131105_d91c9c1"
+VERSION="20180709_9a75e65"
HOMEPAGE="http://www.cherokee-project.com"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/cherokee-20131105_d91c9c1.tar.xz"
-MD5SUM="845ed7bdb3b038d277607a47288aaec1"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/cherokee-20180709_9a75e65.tar.xz"
+MD5SUM="2f08188ca102fd6a7ad2ea3cc1c26f84"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/dobbscoin/dobbscoin.SlackBuild b/network/dobbscoin/dobbscoin.SlackBuild
index defc639fc5..a3d5048c13 100644
--- a/network/dobbscoin/dobbscoin.SlackBuild
+++ b/network/dobbscoin/dobbscoin.SlackBuild
@@ -31,7 +31,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -83,6 +83,9 @@ patch -p1 < $CWD/miniupnpc-1.9-api.patch
./autogen.sh
+export CC=clang
+export CXX=clang++
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/dovecot/README b/network/dovecot/README
deleted file mode 100644
index f81559ff43..0000000000
--- a/network/dovecot/README
+++ /dev/null
@@ -1,27 +0,0 @@
-dovecot (open source IMAP and POP3 server)
-
-Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like
-systems, written with security primarily in mind. Dovecot is an excellent
-choice for both small and large installations. It's fast, simple to set
-up, requires no special administration and it uses very little memory.
-
-This script builds dovecot with support for SSL. As such, you must
-have openssl installed - openssl-solibs is not enough in itself to meet
-this requirement.
-
-By default, MySQL database is selected, switch to PostgreSQL with:
-
- DATABASE=pgsql ./dovecot.SlackBuild
-
-See the documentation in /usr/doc/dovecot-*/ to get started.
-
-
-Groupnames and Usernames
-
-You must have both 'dovecot' and 'dovenull' users and groups to run this
-script, for example:
-
- groupadd -g 202 dovecot
- useradd -d /dev/null -s /bin/false -u 202 -g 202 dovecot
- groupadd -g 248 dovenull
- useradd -d /dev/null -s /bin/false -u 248 -g 248 dovenull
diff --git a/network/dovecot/doinst.sh b/network/dovecot/doinst.sh
deleted file mode 100644
index 03c21fc848..0000000000
--- a/network/dovecot/doinst.sh
+++ /dev/null
@@ -1,26 +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...
-}
-
-preserve_perms() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- if [ -e $OLD ]; then
- cp -a $OLD ${NEW}.incoming
- cat $NEW > ${NEW}.incoming
- mv ${NEW}.incoming $NEW
- fi
- config $NEW
-}
-
-preserve_perms etc/rc.d/rc.dovecot.new
-
diff --git a/network/dovecot/dovecot.SlackBuild b/network/dovecot/dovecot.SlackBuild
deleted file mode 100644
index 96bcc9de4e..0000000000
--- a/network/dovecot/dovecot.SlackBuild
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2010 Alan Hicks, Lizella, GA
-# Copyright 2013, 2014, 2015, 2016, 2017, 2018 Mario Preksavec, Zagreb, Croatia
-# 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.
-
-PRGNAM=dovecot
-VERSION=${VERSION:-2.3.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-# Build with MySQL database support by default
-case $DATABASE in
- pgsql) : ;;
- *) DATABASE=mysql ;;
-esac
-
-bailout() {
- echo " You must have both dovecot and dovenull users and groups:"
- echo " # groupadd -g 202 dovecot"
- echo " # useradd -d /dev/null -s /bin/false -u 202 -g 202 dovecot"
- echo " # groupadd -g 248 dovenull"
- echo " # useradd -d /dev/null -s /bin/false -u 248 -g 248 dovenull"
- exit 1
-}
-
-# Bail if user isn't valid on your system
-if ! getent group dovecot 1>/dev/null 2>/dev/null ; then
- bailout
-elif ! getent passwd dovecot 1>/dev/null 2>/dev/null ; then
- bailout
-fi
-
-set -e
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Add -ldl to LDFLAGS for sqlite
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="-ldl" \
-./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --localstatedir=/var \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --mandir=/usr/man \
- --with-notify=inotify \
- --without-pam \
- --with-ldap=plugin \
- --with-lucene \
- --with-$DATABASE \
- --with-sqlite \
- --with-libcap \
- --disable-static \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.dovecot > $PKG/etc/rc.d/rc.dovecot.new
-chmod 0755 $PKG/etc/rc.d/rc.dovecot.new
-
-gzip -9 $PKG/usr/man/man?/*.?
-
-cp -a \
- AUTHORS COPYING* ChangeLog NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/dovecot.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/dovecot.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/dovecot/dovecot.info b/network/dovecot/dovecot.info
deleted file mode 100644
index 7e2fe2e297..0000000000
--- a/network/dovecot/dovecot.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dovecot"
-VERSION="2.3.1"
-HOMEPAGE="http://www.dovecot.org/"
-DOWNLOAD="http://www.dovecot.org/releases/2.3/dovecot-2.3.1.tar.gz"
-MD5SUM="fc89b6130bcc09e99ae21003b474acc2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mario Preksavec"
-EMAIL="mario at slackware dot hr"
diff --git a/network/dovecot/rc.dovecot b/network/dovecot/rc.dovecot
deleted file mode 100644
index 8d68312ab7..0000000000
--- a/network/dovecot/rc.dovecot
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# Copyright 2006, Alan Hicks, Lizella, GA
-# 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.
-
-dovecot_start()
-{
- echo "Firing up dovecot."
- dovecot
-}
-
-dovecot_stop()
-{
- echo "Shutting down dovecot."
- killall dovecot
-}
-
-dovecot_restart()
-{
- dovecot_stop
- sleep 3 # Give it time to clean-up if it needs it.
- dovecot_start
-}
-
-case $1 in
-'start')
- dovecot_start
- ;;
-'stop')
- dovecot_stop
- ;;
-'restart')
- dovecot_restart
- ;;
-*)
- echo "usage $0 start|stop|restart"
-esac
-
diff --git a/network/dovecot/slack-desc b/network/dovecot/slack-desc
deleted file mode 100644
index 29a273bade..0000000000
--- a/network/dovecot/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 ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-dovecot: dovecot (open source IMAP and POP3 server)
-dovecot:
-dovecot: Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like
-dovecot: systems, written with security primarily in mind. Although it's
-dovecot: written in C, it uses several coding techniques to avoid most of the
-dovecot: common pitfalls.
-dovecot: Dovecot can work with standard mbox and Maildir formats and it's
-dovecot: fully compatible with UW-IMAP and Courier IMAP servers'
-dovecot: implementation of them, as well as mail clients accessing the
-dovecot: mailboxes directly.
-dovecot:
diff --git a/network/dsniff/24_Fix-OpenSSL1.1.0-Build.patch b/network/dsniff/24_Fix-OpenSSL1.1.0-Build.patch
new file mode 100644
index 0000000000..db7739ee34
--- /dev/null
+++ b/network/dsniff/24_Fix-OpenSSL1.1.0-Build.patch
@@ -0,0 +1,202 @@
+Description: Fix build with OpenSSL 1.1.0
+Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+
+--- a/ssh.c
++++ b/ssh.c
+@@ -234,7 +234,10 @@
+ u_char *p, cipher, cookie[8], msg[1024];
+ u_int32_t num;
+ int i;
+-
++
++ const BIGNUM *servkey_e, *servkey_n;
++ const BIGNUM *hostkey_e, *hostkey_n;
++
+ /* Generate anti-spoofing cookie. */
+ RAND_bytes(cookie, sizeof(cookie));
+
+@@ -243,11 +246,13 @@
+ *p++ = SSH_SMSG_PUBLIC_KEY; /* type */
+ memcpy(p, cookie, 8); p += 8; /* cookie */
+ num = 768; PUTLONG(num, p); /* servkey bits */
+- put_bn(ssh->ctx->servkey->e, &p); /* servkey exponent */
+- put_bn(ssh->ctx->servkey->n, &p); /* servkey modulus */
++ RSA_get0_key(ssh->ctx->servkey, &servkey_n, &servkey_e, NULL);
++ put_bn(servkey_e, &p); /* servkey exponent */
++ put_bn(servkey_n, &p); /* servkey modulus */
+ num = 1024; PUTLONG(num, p); /* hostkey bits */
+- put_bn(ssh->ctx->hostkey->e, &p); /* hostkey exponent */
+- put_bn(ssh->ctx->hostkey->n, &p); /* hostkey modulus */
++ RSA_get0_key(ssh->ctx->hostkey, &hostkey_n, &hostkey_e, NULL);
++ put_bn(hostkey_e, &p); /* hostkey exponent */
++ put_bn(hostkey_n, &p); /* hostkey modulus */
+ num = 0; PUTLONG(num, p); /* protocol flags */
+ num = ssh->ctx->encmask; PUTLONG(num, p); /* ciphers */
+ num = ssh->ctx->authmask; PUTLONG(num, p); /* authmask */
+@@ -298,7 +303,7 @@
+ SKIP(p, i, 4);
+
+ /* Decrypt session key. */
+- if (BN_cmp(ssh->ctx->servkey->n, ssh->ctx->hostkey->n) > 0) {
++ if (BN_cmp(servkey_n, hostkey_n) > 0) {
+ rsa_private_decrypt(enckey, enckey, ssh->ctx->servkey);
+ rsa_private_decrypt(enckey, enckey, ssh->ctx->hostkey);
+ }
+@@ -318,8 +323,8 @@
+ BN_clear_free(enckey);
+
+ /* Derive real session key using session id. */
+- if ((p = ssh_session_id(cookie, ssh->ctx->hostkey->n,
+- ssh->ctx->servkey->n)) == NULL) {
++ if ((p = ssh_session_id(cookie, hostkey_n,
++ servkey_n)) == NULL) {
+ warn("ssh_session_id");
+ return (-1);
+ }
+@@ -328,10 +333,8 @@
+ }
+ /* Set cipher. */
+ if (cipher == SSH_CIPHER_3DES) {
+- ssh->estate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+- ssh->dstate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+- ssh->encrypt = des3_encrypt;
+- ssh->decrypt = des3_decrypt;
++ warnx("cipher 3des no longer supported");
++ return (-1);
+ }
+ else if (cipher == SSH_CIPHER_BLOWFISH) {
+ ssh->estate = blowfish_init(ssh->sesskey,sizeof(ssh->sesskey));
+@@ -357,7 +360,10 @@
+ u_char *p, cipher, cookie[8], msg[1024];
+ u_int32_t num;
+ int i;
+-
++
++ BIGNUM *servkey_n, *servkey_e;
++ BIGNUM *hostkey_n, *hostkey_e;
++
+ /* Get public key. */
+ if ((i = SSH_recv(ssh, pkt, sizeof(pkt))) <= 0) {
+ warn("SSH_recv");
+@@ -379,21 +385,23 @@
+
+ /* Get servkey. */
+ ssh->ctx->servkey = RSA_new();
+- ssh->ctx->servkey->n = BN_new();
+- ssh->ctx->servkey->e = BN_new();
++ servkey_n = BN_new();
++ servkey_e = BN_new();
++ RSA_set0_key(ssh->ctx->servkey, servkey_n, servkey_e, NULL);
+
+ SKIP(p, i, 4);
+- get_bn(ssh->ctx->servkey->e, &p, &i);
+- get_bn(ssh->ctx->servkey->n, &p, &i);
++ get_bn(servkey_e, &p, &i);
++ get_bn(servkey_n, &p, &i);
+
+ /* Get hostkey. */
+ ssh->ctx->hostkey = RSA_new();
+- ssh->ctx->hostkey->n = BN_new();
+- ssh->ctx->hostkey->e = BN_new();
++ hostkey_n = BN_new();
++ hostkey_e = BN_new();
++ RSA_set0_key(ssh->ctx->hostkey, hostkey_n, hostkey_e, NULL);
+
+ SKIP(p, i, 4);
+- get_bn(ssh->ctx->hostkey->e, &p, &i);
+- get_bn(ssh->ctx->hostkey->n, &p, &i);
++ get_bn(hostkey_e, &p, &i);
++ get_bn(hostkey_n, &p, &i);
+
+ /* Get cipher, auth masks. */
+ SKIP(p, i, 4);
+@@ -405,8 +413,8 @@
+ RAND_bytes(ssh->sesskey, sizeof(ssh->sesskey));
+
+ /* Obfuscate with session id. */
+- if ((p = ssh_session_id(cookie, ssh->ctx->hostkey->n,
+- ssh->ctx->servkey->n)) == NULL) {
++ if ((p = ssh_session_id(cookie, hostkey_n,
++ servkey_n)) == NULL) {
+ warn("ssh_session_id");
+ return (-1);
+ }
+@@ -422,7 +430,7 @@
+ else BN_add_word(bn, ssh->sesskey[i]);
+ }
+ /* Encrypt session key. */
+- if (BN_cmp(ssh->ctx->servkey->n, ssh->ctx->hostkey->n) < 0) {
++ if (BN_cmp(servkey_n, hostkey_n) < 0) {
+ rsa_public_encrypt(bn, bn, ssh->ctx->servkey);
+ rsa_public_encrypt(bn, bn, ssh->ctx->hostkey);
+ }
+@@ -470,10 +478,8 @@
+ ssh->decrypt = blowfish_decrypt;
+ }
+ else if (cipher == SSH_CIPHER_3DES) {
+- ssh->estate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+- ssh->dstate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+- ssh->encrypt = des3_encrypt;
+- ssh->decrypt = des3_decrypt;
++ warnx("cipher 3des no longer supported");
++ return (-1);
+ }
+ /* Get server response. */
+ if ((i = SSH_recv(ssh, pkt, sizeof(pkt))) <= 0) {
+--- a/sshcrypto.c
++++ b/sshcrypto.c
+@@ -28,10 +28,12 @@
+ u_char iv[8];
+ };
+
++#if 0
+ struct des3_state {
+ des_key_schedule k1, k2, k3;
+ des_cblock iv1, iv2, iv3;
+ };
++#endif
+
+ void
+ rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key)
+@@ -39,10 +41,12 @@
+ u_char *inbuf, *outbuf;
+ int len, ilen, olen;
+
+- if (BN_num_bits(key->e) < 2 || !BN_is_odd(key->e))
++ const BIGNUM *n, *e;
++ RSA_get0_key(key, &n, &e, NULL);
++ if (BN_num_bits(e) < 2 || !BN_is_odd(e))
+ errx(1, "rsa_public_encrypt() exponent too small or not odd");
+
+- olen = BN_num_bytes(key->n);
++ olen = BN_num_bytes(n);
+ outbuf = malloc(olen);
+
+ ilen = BN_num_bytes(in);
+@@ -71,7 +75,9 @@
+ u_char *inbuf, *outbuf;
+ int len, ilen, olen;
+
+- olen = BN_num_bytes(key->n);
++ const BIGNUM *n;
++ RSA_get0_key(key, &n, NULL, NULL);
++ olen = BN_num_bytes(n);
+ outbuf = malloc(olen);
+
+ ilen = BN_num_bytes(in);
+@@ -146,6 +152,7 @@
+ swap_bytes(dst, dst, len);
+ }
+
++#if 0
+ /* XXX - SSH1's weirdo 3DES... */
+ void *
+ des3_init(u_char *sesskey, int len)
+@@ -194,3 +201,4 @@
+ des_ncbc_encrypt(dst, dst, len, dstate->k2, &dstate->iv2, DES_ENCRYPT);
+ des_ncbc_encrypt(dst, dst, len, dstate->k1, &dstate->iv1, DES_DECRYPT);
+ }
++#endif
diff --git a/network/dsniff/dsniff.SlackBuild b/network/dsniff/dsniff.SlackBuild
index 3fe080fd8b..e1d017c37b 100644
--- a/network/dsniff/dsniff.SlackBuild
+++ b/network/dsniff/dsniff.SlackBuild
@@ -73,6 +73,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/24_Fix-OpenSSL1.1.0-Build.patch
+
zcat $CWD/dsniff_2.4b1+debian-18.diff.gz | patch -p1
for i in debian/patches/*.dpatch; do
patch -N < "$i"
diff --git a/network/emacs-w3m/emacs-w3m.SlackBuild b/network/emacs-w3m/emacs-w3m.SlackBuild
index 622024e9ed..baca2f789c 100644
--- a/network/emacs-w3m/emacs-w3m.SlackBuild
+++ b/network/emacs-w3m/emacs-w3m.SlackBuild
@@ -5,7 +5,7 @@
# Written by Felix Pfeifer (pfeifer[dot]felix[at]googlemail[dot]com
PRGNAM=emacs-w3m
-VERSION=${VERSION:-cvs_1.4.400_0.20100725}
+VERSION=${VERSION:-cvs_1.4.569_0.20170110}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -41,9 +41,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/w3m-el-snapshot_1.4.400+0.20100725.orig.tar.gz
-cd $PRGNAM
+rm -rf w3m-el-snapshot-1.4.569+0.20170110.orig
+tar xvf $CWD/w3m-el-snapshot_1.4.569+0.20170110.orig.tar.gz
+cd w3m-el-snapshot-1.4.569+0.20170110.orig
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/network/emacs-w3m/emacs-w3m.info b/network/emacs-w3m/emacs-w3m.info
index 92b7823263..10349a11bc 100644
--- a/network/emacs-w3m/emacs-w3m.info
+++ b/network/emacs-w3m/emacs-w3m.info
@@ -1,8 +1,8 @@
PRGNAM="emacs-w3m"
-VERSION="cvs_1.4.400_0.20100725"
+VERSION="cvs_1.4.569_0.20170110"
HOMEPAGE="http://emacs-w3m.namazu.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/w3m-el-snapshot_1.4.400+0.20100725.orig.tar.gz"
-MD5SUM="0c5da2a83ea6502bcf7b589b8c4daed8"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/w3m-el-snapshot_1.4.569+0.20170110.orig.tar.gz"
+MD5SUM="f8bb143de0b009038d6fc73295af40c7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="w3m"
diff --git a/network/ettercap/ettercap.SlackBuild b/network/ettercap/ettercap.SlackBuild
index f841ef5396..07cb9ca2de 100644
--- a/network/ettercap/ettercap.SlackBuild
+++ b/network/ettercap/ettercap.SlackBuild
@@ -72,6 +72,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# apply some patches from archlinux
+for i in $CWD/patches/*; do patch -p1 < $i ; done
+
mkdir -p build
cd build
cmake \
diff --git a/network/ettercap/patches/0001-First-draft-of-openssl-1.1-compatibility-layer-from-.patch b/network/ettercap/patches/0001-First-draft-of-openssl-1.1-compatibility-layer-from-.patch
new file mode 100644
index 0000000000..effc04ec19
--- /dev/null
+++ b/network/ettercap/patches/0001-First-draft-of-openssl-1.1-compatibility-layer-from-.patch
@@ -0,0 +1,257 @@
+From f0d63b27c82df2ad5f7ada6310727d841b43fbcc Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Date: Mon, 27 Jun 2016 12:41:33 +0200
+Subject: [PATCH] First draft of openssl 1.1 compatibility layer (from
+ https://github.com/curl/curl/commit/cfe16c22d7891a1f65ea8cd4c5352504a2afbddc)
+ Closes: #739
+
+---
+ src/dissectors/ec_ssh.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/ec_sslwrap.c | 14 ++++++++
+ 2 files changed, 106 insertions(+), 1 deletion(-)
+
+diff --git a/src/dissectors/ec_ssh.c b/src/dissectors/ec_ssh.c
+index f89200dc..26c86491 100644
+--- a/src/dissectors/ec_ssh.c
++++ b/src/dissectors/ec_ssh.c
+@@ -36,6 +36,10 @@
+ #include <openssl/md5.h>
+ #include <zlib.h>
+
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++#define HAVE_OPAQUE_RSA_DSA_DH 1 /* since 1.1.0 -pre5 */
++#endif
++
+ #define SMSG_PUBLIC_KEY 2
+ #define CMSG_SESSION_KEY 3
+ #define CMSG_USER 4
+@@ -138,6 +142,11 @@ FUNC_DECODER(dissector_ssh)
+ char tmp[MAX_ASCII_ADDR_LEN];
+ u_int32 ssh_len, ssh_mod;
+ u_char ssh_packet_type, *ptr, *key_to_put;
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ BIGNUM *h_n, *s_n, *m_h_n, *m_s_n;
++ BIGNUM *h_e, *s_e, *m_h_e, *m_s_e;
++ BIGNUM *h_d, *s_d, *m_h_d, *m_s_d;
++#endif
+
+ /* don't complain about unused var */
+ (void) DECODE_DATA;
+@@ -383,12 +392,25 @@ FUNC_DECODER(dissector_ssh)
+ if (session_data->ptrkey == NULL) {
+ /* Initialize RSA key structures (other fileds are set to 0) */
+ session_data->serverkey = RSA_new();
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ s_n = BN_new();
++ s_e = BN_new();
++ RSA_set0_key(session_data->serverkey, s_n, s_e, s_d);
++#else
+ session_data->serverkey->n = BN_new();
+ session_data->serverkey->e = BN_new();
++#endif
+
+ session_data->hostkey = RSA_new();
++
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ h_n = BN_new();
++ h_e = BN_new();
++ RSA_set0_key(session_data->hostkey, h_n, h_e, h_d);
++#else
+ session_data->hostkey->n = BN_new();
+ session_data->hostkey->e = BN_new();
++#endif
+
+ /* Get the RSA Key from the packet */
+ NS_GET32(server_mod,ptr);
+@@ -396,19 +418,37 @@ FUNC_DECODER(dissector_ssh)
+ DEBUG_MSG("Dissector_ssh Bougs Server_Mod");
+ return NULL;
+ }
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ RSA_get0_key(session_data->serverkey, &s_n, &s_e, &s_d);
++ get_bn(s_e, &ptr);
++ get_bn(s_n, &ptr);
++#else
+ get_bn(session_data->serverkey->e, &ptr);
+ get_bn(session_data->serverkey->n, &ptr);
++#endif
+
+ NS_GET32(host_mod,ptr);
+ if (ptr + (host_mod/8) > PACKET->DATA.data + PACKET->DATA.len) {
+ DEBUG_MSG("Dissector_ssh Bougs Host_Mod");
+ return NULL;
+ }
++
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ RSA_get0_key(session_data->hostkey, &h_n, &h_e, &h_d);
++ get_bn(h_e, &ptr);
++ get_bn(h_n, &ptr);
++#else
+ get_bn(session_data->hostkey->e, &ptr);
+ get_bn(session_data->hostkey->n, &ptr);
++#endif
+
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ server_exp = BN_get_word(s_e);
++ host_exp = BN_get_word(h_e);
++#else
+ server_exp = *(session_data->serverkey->e->d);
+ host_exp = *(session_data->hostkey->e->d);
++#endif
+
+ /* Check if we already have a suitable RSA key to substitute */
+ index_ssl = &ssh_conn_key;
+@@ -424,7 +464,7 @@ FUNC_DECODER(dissector_ssh)
+ SAFE_CALLOC(*index_ssl, 1, sizeof(ssh_my_key));
+
+ /* Generate the new key */
+- (*index_ssl)->myserverkey = (RSA *)RSA_generate_key(server_mod, server_exp, NULL, NULL);
++ (*index_ssl)->myserverkey = (RSA *)RSA_generate_key_ex(server_mod, server_exp, NULL, NULL);
+ (*index_ssl)->myhostkey = (RSA *)RSA_generate_key(host_mod, host_exp, NULL, NULL);
+ (*index_ssl)->server_mod = server_mod;
+ (*index_ssl)->host_mod = host_mod;
+@@ -443,11 +483,25 @@ FUNC_DECODER(dissector_ssh)
+
+ /* Put our RSA key in the packet */
+ key_to_put+=4;
++
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ RSA_get0_key(session_data->ptrkey->myserverkey, &m_s_n, &m_s_e, &m_s_d);
++ put_bn(m_s_e, &key_to_put);
++ put_bn(m_s_n, &key_to_put);
++#else
+ put_bn(session_data->ptrkey->myserverkey->e, &key_to_put);
+ put_bn(session_data->ptrkey->myserverkey->n, &key_to_put);
++#endif
+ key_to_put+=4;
++
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ RSA_get0_key(session_data->ptrkey->myhostkey, &m_h_n, &m_h_e, &m_h_d);
++ put_bn(m_h_e, &key_to_put);
++ put_bn(m_h_n, &key_to_put);
++#else
+ put_bn(session_data->ptrkey->myhostkey->e, &key_to_put);
+ put_bn(session_data->ptrkey->myhostkey->n, &key_to_put);
++#endif
+
+ /* Recalculate SSH crc */
+ *(u_int32 *)(PACKET->DATA.data + PACKET->DATA.len - 4) = htonl(CRC_checksum(PACKET->DATA.data+4, PACKET->DATA.len-8, CRC_INIT_ZERO));
+@@ -482,19 +536,34 @@ FUNC_DECODER(dissector_ssh)
+ key_to_put = ptr;
+
+ /* Calculate real session id and our fake session id */
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ temp_session_id = ssh_session_id(cookie, h_n, s_n);
++#else
+ temp_session_id = ssh_session_id(cookie, session_data->hostkey->n, session_data->serverkey->n);
++#endif
+ if (temp_session_id)
+ memcpy(session_id1, temp_session_id, 16);
++
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ temp_session_id=ssh_session_id(cookie, m_h_n, m_s_n);
++#else
+ temp_session_id=ssh_session_id(cookie, session_data->ptrkey->myhostkey->n, session_data->ptrkey->myserverkey->n);
++#endif
++
+ if (temp_session_id)
+ memcpy(session_id2, temp_session_id, 16);
+
+ /* Get the session key */
+ enckey = BN_new();
++
+ get_bn(enckey, &ptr);
+
+ /* Decrypt session key */
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ if (BN_cmp(m_s_n, m_h_n) > 0) {
++#else
+ if (BN_cmp(session_data->ptrkey->myserverkey->n, session_data->ptrkey->myhostkey->n) > 0) {
++#endif
+ rsa_private_decrypt(enckey, enckey, session_data->ptrkey->myserverkey);
+ rsa_private_decrypt(enckey, enckey, session_data->ptrkey->myhostkey);
+ } else {
+@@ -534,7 +603,11 @@ FUNC_DECODER(dissector_ssh)
+ BN_add_word(bn, sesskey[i]);
+ }
+
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ if (BN_cmp(s_n, h_n) < 0) {
++#else
+ if (BN_cmp(session_data->serverkey->n, session_data->hostkey->n) < 0) {
++#endif
+ rsa_public_encrypt(bn, bn, session_data->serverkey);
+ rsa_public_encrypt(bn, bn, session_data->hostkey);
+ } else {
+@@ -716,7 +789,16 @@ static void rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key)
+ u_char *inbuf, *outbuf;
+ int32 len, ilen, olen;
+
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ BIGNUM *n;
++ BIGNUM *e;
++ BIGNUM *d;
++ RSA_get0_key(key, &n, &e, &d);
++ olen = BN_num_bytes(n);
++#else
+ olen = BN_num_bytes(key->n);
++#endif
++
+ outbuf = malloc(olen);
+ if (outbuf == NULL) /* oops, couldn't allocate memory */
+ return;
+@@ -744,7 +826,16 @@ static void rsa_private_decrypt(BIGNUM *out, BIGNUM *in, RSA *key)
+ u_char *inbuf, *outbuf;
+ int32 len, ilen, olen;
+
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ BIGNUM *n;
++ BIGNUM *e;
++ BIGNUM *d;
++ RSA_get0_key(key, &n, &e, &d);
++ olen = BN_num_bytes(n);
++#else
+ olen = BN_num_bytes(key->n);
++#endif
++
+ outbuf = malloc(olen);
+ if (outbuf == NULL) /* oops, couldn't allocate memory */
+ return;
+diff --git a/src/ec_sslwrap.c b/src/ec_sslwrap.c
+index c6c74421..6369d251 100644
+--- a/src/ec_sslwrap.c
++++ b/src/ec_sslwrap.c
+@@ -56,6 +56,10 @@
+ #define OPENSSL_NO_KRB5 1
+ #include <openssl/ssl.h>
+
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++#define HAVE_OPAQUE_RSA_DSA_DH 1 /* since 1.1.0 -pre5 */
++#endif
++
+ #define BREAK_ON_ERROR(x,y,z) do { \
+ if (x == -E_INVALID) { \
+ SAFE_FREE(z.DATA.disp_data); \
+@@ -1102,9 +1106,19 @@ static X509 *sslw_create_selfsigned(X509 *server_cert)
+ index = X509_get_ext_by_NID(server_cert, NID_authority_key_identifier, -1);
+ if (index >=0) {
+ ext = X509_get_ext(server_cert, index);
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ ASN1_OCTET_STRING* data;
++ data = X509_EXTENSION_get_data (ext);
++#endif
+ if (ext) {
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++ data->data[7] = 0xe7;
++ data->data[8] = 0x7e;
++ X509_EXTENSION_set_data (ext, data);
++#else
+ ext->value->data[7] = 0xe7;
+ ext->value->data[8] = 0x7e;
++#endif
+ X509_add_ext(out_cert, ext, -1);
+ }
+ }
+--
+2.11.1
+
diff --git a/network/ettercap/patches/CVE-2017-6430.patch b/network/ettercap/patches/CVE-2017-6430.patch
new file mode 100644
index 0000000000..67483dcc02
--- /dev/null
+++ b/network/ettercap/patches/CVE-2017-6430.patch
@@ -0,0 +1,68 @@
+From 4ad7f85dc01202e363659aa473c99470b3f4e1f4 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Date: Tue, 7 Mar 2017 22:05:31 +0100
+Subject: [PATCH] Fix issue #782
+
+---
+ utils/etterfilter/ef_compiler.c | 4 +++-
+ utils/etterfilter/ef_main.c | 10 +++++++---
+ utils/etterfilter/ef_output.c | 3 +++
+ 3 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/utils/etterfilter/ef_compiler.c b/utils/etterfilter/ef_compiler.c
+index db876636e..ddb73bd30 100644
+--- a/utils/etterfilter/ef_compiler.c
++++ b/utils/etterfilter/ef_compiler.c
+@@ -239,7 +239,9 @@ size_t compile_tree(struct filter_op **fop)
+ struct filter_op *array = NULL;
+ struct unfold_elm *ue;
+
+- BUG_IF(tree_root == NULL);
++ // invalid file
++ if (tree_root == NULL)
++ return 0;
+
+ fprintf(stdout, " Unfolding the meta-tree ");
+ fflush(stdout);
+diff --git a/utils/etterfilter/ef_main.c b/utils/etterfilter/ef_main.c
+index ae4591344..431084b91 100644
+--- a/utils/etterfilter/ef_main.c
++++ b/utils/etterfilter/ef_main.c
+@@ -39,7 +39,7 @@ struct globals *gbls;
+
+ int main(int argc, char *argv[])
+ {
+-
++ int ret_value = 0;
+ globals_alloc();
+ /* etterfilter copyright */
+ fprintf(stdout, "\n" EC_COLOR_BOLD "%s %s" EC_COLOR_END " copyright %s %s\n\n",
+@@ -84,8 +84,12 @@ int main(int argc, char *argv[])
+ fprintf(stdout, "\n\nThe script contains errors...\n\n");
+
+ /* write to file */
+- if (write_output() != E_SUCCESS)
+- FATAL_ERROR("Cannot write output file (%s)", GBL_OPTIONS->output_file);
++ ret_value = write_output();
++ if (ret_value == -E_NOTHANDLED)
++ FATAL_ERROR("Cannot write output file (%s): the filter is not correctly handled.", GBL_OPTIONS->output_file);
++ else if (ret_value == -E_INVALID)
++ FATAL_ERROR("Cannot write output file (%s): the filter format is not correct. ", GBL_OPTIONS->output_file);
++
+ globals_free();
+ return 0;
+ }
+diff --git a/utils/etterfilter/ef_output.c b/utils/etterfilter/ef_output.c
+index 5ae591904..fcf19f010 100644
+--- a/utils/etterfilter/ef_output.c
++++ b/utils/etterfilter/ef_output.c
+@@ -51,6 +51,9 @@ int write_output(void)
+ if (fop == NULL)
+ return -E_NOTHANDLED;
+
++ if (ninst == 0)
++ return -E_INVALID;
++
+ /* create the file */
+ fd = open(GBL_OPTIONS->output_file, O_CREAT | O_RDWR | O_TRUNC | O_BINARY, 0644);
+ ON_ERROR(fd, -1, "Can't create file %s", GBL_OPTIONS->output_file);
diff --git a/network/ettercap/patches/CVE-2017-8366.patch b/network/ettercap/patches/CVE-2017-8366.patch
new file mode 100644
index 0000000000..1897e81d79
--- /dev/null
+++ b/network/ettercap/patches/CVE-2017-8366.patch
@@ -0,0 +1,258 @@
+From d14d2558da14a33abf7baab28957488a75d16af1 Mon Sep 17 00:00:00 2001
+From: Alexander Koeppe <format_c@online.de>
+Date: Thu, 1 Jun 2017 08:56:23 +0200
+Subject: [PATCH 1/4] Add ASAN compiler flags in DEBUG build type
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90050590f..8e823669c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -126,7 +126,7 @@ if(NOT DISABLE_RPATH)
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ set(CMAKE_MACOSX_RPATH 1)
+ endif(NOT DISABLE_RPATH)
+-set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb3 -DDEBUG -Wall -Wno-pointer-sign -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Wextra -Wredundant-decls" CACHE STRING "" FORCE)
++set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb3 -DDEBUG -Wall -Wno-pointer-sign -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Wextra -Wredundant-decls -fsanitize=address -fno-omit-frame-pointer" CACHE STRING "" FORCE)
+ set(CMAKE_C_FLAGS_RELEASE "-O2 -w -D_FORTIFY_SOURCE=2" CACHE STRING "" FORCE)
+
+ if(OS_DARWIN)
+
+From 044051d302da73e16b0577eb797cd42affba27e5 Mon Sep 17 00:00:00 2001
+From: Alexander Koeppe <format_c@online.de>
+Date: Thu, 1 Jun 2017 08:56:57 +0200
+Subject: [PATCH 2/4] fix buffer over- / underflow conditions
+
+---
+ include/ec_strings.h | 2 +-
+ src/ec_strings.c | 25 +++++++++++++++----------
+ 2 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/include/ec_strings.h b/include/ec_strings.h
+index f791739da..9ad245ef3 100644
+--- a/include/ec_strings.h
++++ b/include/ec_strings.h
+@@ -43,7 +43,7 @@
+
+ EC_API_EXTERN int match_pattern(const char *s, const char *pattern);
+ EC_API_EXTERN int base64_decode(char *bufplain, const char *bufcoded);
+-EC_API_EXTERN int strescape(char *dst, char *src);
++EC_API_EXTERN int strescape(char *dst, char *src, size_t len);
+ EC_API_EXTERN int str_replace(char **text, const char *s, const char *d);
+ EC_API_EXTERN size_t strlen_utf8(const char *s);
+ EC_API_EXTERN char * ec_strtok(char *s, const char *delim, char **ptrptr);
+diff --git a/src/ec_strings.c b/src/ec_strings.c
+index 53583851a..21b71926c 100644
+--- a/src/ec_strings.c
++++ b/src/ec_strings.c
+@@ -167,13 +167,14 @@ static int hextoint(int c)
+ /*
+ * convert the escaped string into a binary one
+ */
+-int strescape(char *dst, char *src)
++int strescape(char *dst, char *src, size_t len)
+ {
+ char *olddst = dst;
++ char *oldsrc = src;
+ int c;
+ int val;
+
+- while ((c = *src++) != '\0') {
++ while ((c = *src++) != '\0' && (size_t)(src - oldsrc) <= len) {
+ if (c == '\\') {
+ switch ((c = *src++)) {
+ case '\0':
+@@ -218,9 +219,11 @@ int strescape(char *dst, char *src)
+ if (c >= '0' && c <= '7')
+ val = (val << 3) | (c - '0');
+ else
+- --src;
++ if (src > oldsrc) /* protect against buffer underflow */
++ --src;
+ } else
+- --src;
++ if (src > oldsrc) /* protect against buffer underflow */
++ --src;
+ *dst++ = (char) val;
+ break;
+
+@@ -232,15 +235,17 @@ int strescape(char *dst, char *src)
+ c = hextoint(*src++);
+ if (c >= 0)
+ val = (val << 4) + c;
+- else
+- --src;
+- } else
+- --src;
++ else if (src > oldsrc) /* protect against buffer underflow */
++ --src;
++ } else if (src > oldsrc) /* protect against buffer underflow */
++ --src;
+ *dst++ = (char) val;
+ break;
+ }
+- } else if (c == 8 || c == 263) /* the backspace */
+- dst--;
++ } else if (c == 8 || c == 263) { /* the backspace */
++ if (dst > oldsrc) /* protect against buffer underflow */
++ dst--;
++ }
+ else
+ *dst++ = (char) c;
+ }
+
+From 19706cf53b189fbc996791cdb4b0d9a1f0feae5f Mon Sep 17 00:00:00 2001
+From: Alexander Koeppe <format_c@online.de>
+Date: Thu, 1 Jun 2017 08:57:54 +0200
+Subject: [PATCH 3/4] adapt calls of strescape() adding strlen
+
+---
+ src/ec_encryption.c | 2 +-
+ src/interfaces/curses/ec_curses_view_connections.c | 2 +-
+ src/interfaces/gtk/ec_gtk_view_connections.c | 2 +-
+ utils/etterfilter/ef_encode.c | 18 ++++++++++++------
+ 4 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/src/ec_encryption.c b/src/ec_encryption.c
+index 6c02529c1..3d5056030 100644
+--- a/src/ec_encryption.c
++++ b/src/ec_encryption.c
+@@ -218,7 +218,7 @@ int set_wep_key(char *string)
+
+ if (type == 's') {
+ /* escape the string and check its length */
+- if (strescape((char *)tmp_wkey, p) != (int)tmp_wkey_len)
++ if (strescape((char *)tmp_wkey, p, strlen(tmp_wkey)+1) != (int)tmp_wkey_len)
+ SEMIFATAL_ERROR("Specified WEP key length does not match the given string");
+ } else if (type == 'p') {
+ /* create the key from the passphrase */
+diff --git a/src/interfaces/curses/ec_curses_view_connections.c b/src/interfaces/curses/ec_curses_view_connections.c
+index fb52331cf..011c0edf7 100644
+--- a/src/interfaces/curses/ec_curses_view_connections.c
++++ b/src/interfaces/curses/ec_curses_view_connections.c
+@@ -614,7 +614,7 @@ static void inject_user(void)
+ size_t len;
+
+ /* escape the sequnces in the buffer */
+- len = strescape((char*)injectbuf, (char*)injectbuf);
++ len = strescape((char*)injectbuf, (char*)injectbuf, strlen(injectbuf)+1);
+
+ /* check where to inject */
+ if (wdg_c1->flags & WDG_OBJ_FOCUSED) {
+diff --git a/src/interfaces/gtk/ec_gtk_view_connections.c b/src/interfaces/gtk/ec_gtk_view_connections.c
+index fa7dfdc58..b55e1755a 100644
+--- a/src/interfaces/gtk/ec_gtk_view_connections.c
++++ b/src/interfaces/gtk/ec_gtk_view_connections.c
+@@ -1627,7 +1627,7 @@ static void gtkui_inject_user(int side)
+ size_t len;
+
+ /* escape the sequnces in the buffer */
+- len = strescape(injectbuf, injectbuf);
++ len = strescape(injectbuf, injectbuf, strlen(injectbuf)+1);
+
+ /* check where to inject */
+ if (side == 1 || side == 2) {
+diff --git a/utils/etterfilter/ef_encode.c b/utils/etterfilter/ef_encode.c
+index d4b9110cd..7e359e062 100644
+--- a/utils/etterfilter/ef_encode.c
++++ b/utils/etterfilter/ef_encode.c
+@@ -136,7 +136,8 @@ int encode_const(char *string, struct filter_op *fop)
+ fop->op.test.string = (u_char*)strdup(string + 1);
+
+ /* escape it in the structure */
+- fop->op.test.slen = strescape((char*)fop->op.test.string, (char*)fop->op.test.string);
++ fop->op.test.slen = strescape((char*)fop->op.test.string,
++ (char*)fop->op.test.string, strlen(fop->op.test.string)+1);
+
+ return E_SUCCESS;
+
+@@ -184,7 +185,8 @@ int encode_function(char *string, struct filter_op *fop)
+ fop->opcode = FOP_FUNC;
+ fop->op.func.op = FFUNC_SEARCH;
+ fop->op.func.string = (u_char*)strdup(dec_args[1]);
+- fop->op.func.slen = strescape((char*)fop->op.func.string, (char*)fop->op.func.string);
++ fop->op.func.slen = strescape((char*)fop->op.func.string,
++ (char*)fop->op.func.string, strlen(fop->op.func.string)+1);
+ ret = E_SUCCESS;
+ } else
+ SCRIPT_ERROR("Unknown offset %s ", dec_args[0]);
+@@ -202,7 +204,8 @@ int encode_function(char *string, struct filter_op *fop)
+ fop->opcode = FOP_FUNC;
+ fop->op.func.op = FFUNC_REGEX;
+ fop->op.func.string = (u_char*)strdup(dec_args[1]);
+- fop->op.func.slen = strescape((char*)fop->op.func.string, (char*)fop->op.func.string);
++ fop->op.func.slen = strescape((char*)fop->op.func.string,
++ (char*)fop->op.func.string, strlen(fop->op.func.string)+1);
+ ret = E_SUCCESS;
+ } else
+ SCRIPT_ERROR("Unknown offset %s ", dec_args[0]);
+@@ -272,9 +275,11 @@ int encode_function(char *string, struct filter_op *fop)
+ /* replace always operate at DATA level */
+ fop->op.func.level = 5;
+ fop->op.func.string = (u_char*)strdup(dec_args[0]);
+- fop->op.func.slen = strescape((char*)fop->op.func.string, (char*)fop->op.func.string);
++ fop->op.func.slen = strescape((char*)fop->op.func.string,
++ (char*)fop->op.func.string, strlen(fop->op.func.string)+1);
+ fop->op.func.replace = (u_char*)strdup(dec_args[1]);
+- fop->op.func.rlen = strescape((char*)fop->op.func.replace, (char*)fop->op.func.replace);
++ fop->op.func.rlen = strescape((char*)fop->op.func.replace,
++ (char*)fop->op.func.replace, strlen(fop->op.func.replace)+1);
+ ret = E_SUCCESS;
+ } else
+ SCRIPT_ERROR("Wrong number of arguments for function \"%s\" ", name);
+@@ -328,7 +333,8 @@ int encode_function(char *string, struct filter_op *fop)
+ if (nargs == 1) {
+ fop->op.func.op = FFUNC_MSG;
+ fop->op.func.string = (u_char*)strdup(dec_args[0]);
+- fop->op.func.slen = strescape((char*)fop->op.func.string, (char*)fop->op.func.string);
++ fop->op.func.slen = strescape((char*)fop->op.func.string,
++ (char*)fop->op.func.string, strlen(fop->op.func.string)+1);
+ ret = E_SUCCESS;
+ } else
+ SCRIPT_ERROR("Wrong number of arguments for function \"%s\" ", name);
+
+From b005d55d4eae444c5be14eb792b50657a14c7b1d Mon Sep 17 00:00:00 2001
+From: Alexander Koeppe <format_c@online.de>
+Date: Sun, 4 Jun 2017 08:09:04 +0200
+Subject: [PATCH 4/4] Only add ASAN flags depeding on compiler version
+
+---
+ CMakeLists.txt | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8e823669c..8f7c7c368 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -126,7 +126,27 @@ if(NOT DISABLE_RPATH)
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ set(CMAKE_MACOSX_RPATH 1)
+ endif(NOT DISABLE_RPATH)
+-set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb3 -DDEBUG -Wall -Wno-pointer-sign -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Wextra -Wredundant-decls -fsanitize=address -fno-omit-frame-pointer" CACHE STRING "" FORCE)
++
++# set general build flags for debug build-type
++set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb3 -DDEBUG -Wall -Wno-pointer-sign -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Wextra -Wredundant-decls" CACHE STRING "" FORCE)
++# append ASAN build flags if compiler version has support
++if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
++ if (CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.8)
++ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fsanitize=address -fno-omit-frame-pointer" CACHE STRING "" FORCE)
++ message("Building with ASAN support (GNU compiler)")
++ else (CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.8)
++ message("Building without ASAN support (GNU compiler)")
++ endif (CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.8)
++elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
++ if (CMAKE_C_COMPILER_VERSION VERSION_GREATER 3.1)
++ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fsanitize=address -fno-omit-frame-pointer" CACHE STRING "" FORCE)
++ message("Building with ASAN support (Clang compiler)")
++ elseif (CMAKE_C_COMPILER_VERSION VERSION_GREATER 3.1)
++ message("Building without ASAN support (Clang compiler)")
++ endif (CMAKE_C_COMPILER_VERSION VERSION_GREATER 3.1)
++endif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
++
++# set build flags for release build-type
+ set(CMAKE_C_FLAGS_RELEASE "-O2 -w -D_FORTIFY_SOURCE=2" CACHE STRING "" FORCE)
+
+ if(OS_DARWIN)
diff --git a/network/fcgiwrap/fcgiwrap.SlackBuild b/network/fcgiwrap/fcgiwrap.SlackBuild
index 9d64052b68..b5e6f5b0a2 100644
--- a/network/fcgiwrap/fcgiwrap.SlackBuild
+++ b/network/fcgiwrap/fcgiwrap.SlackBuild
@@ -70,7 +70,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
autoreconf -i
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=implicit-fallthrough=" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/network/fqterm/fqterm.SlackBuild b/network/fqterm/fqterm.SlackBuild
index b90004e147..1af9f50ecf 100644
--- a/network/fqterm/fqterm.SlackBuild
+++ b/network/fqterm/fqterm.SlackBuild
@@ -5,14 +5,13 @@
# Written by vvoody <vvoodywang@gmail.com>
PRGNAM=fqterm
-VERSION=${VERSION:-0.9.8.2}
-SVNVER=svn1076
+VERSION=${VERSION:-0.9.8.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -23,18 +22,14 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
fi
set -e
@@ -42,15 +37,15 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION-$SVNVER.tar.gz
-cd $PRGNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
mkdir build
cd build
@@ -58,17 +53,16 @@ cd build
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX:PATH="/usr" \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
..
make
make install DESTDIR=$PKG
cd -
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE INSTALL.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE INSTALL.txt README* $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/network/fqterm/fqterm.info b/network/fqterm/fqterm.info
index 787760d96c..c948f08484 100644
--- a/network/fqterm/fqterm.info
+++ b/network/fqterm/fqterm.info
@@ -1,8 +1,8 @@
PRGNAM="fqterm"
-VERSION="0.9.8.2"
+VERSION="0.9.8.4"
HOMEPAGE="https://github.com/mytbk/fqterm"
-DOWNLOAD="http://ftp1.fr.freebsd.org/pub/frugalware/frugalware-stable/source/xlib-extra/fqterm/fqterm-0.9.8.2-svn1076.tar.gz"
-MD5SUM="eaf7b51c1e3e0f13351f9f5678996d51"
+DOWNLOAD="https://github.com/mytbk/fqterm/archive/0.9.8.4/fqterm-0.9.8.4.tar.gz"
+MD5SUM="d7d9500806055def62456550fe33173e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/hylafax/gcc.patch b/network/hylafax/gcc.patch
new file mode 100644
index 0000000000..ed9817abfe
--- /dev/null
+++ b/network/hylafax/gcc.patch
@@ -0,0 +1,12 @@
+diff -Naur hylafax-6.0.6.orig/libhylafax/FaxRecvInfo.c++ hylafax-6.0.6/libhylafax/FaxRecvInfo.c++
+--- hylafax-6.0.6.orig/libhylafax/FaxRecvInfo.c++ 2012-06-06 02:58:38.000000000 +0200
++++ hylafax-6.0.6/libhylafax/FaxRecvInfo.c++ 2017-06-03 19:51:39.491707130 +0200
+@@ -112,7 +112,7 @@
+ if (cp == NULL || cp[1] != ',' || cp[2] != '"')
+ return (false);
+ u_int i = 0;
+- while (cp+2 != '\0') {
++ while (*(cp+2) != '\0') {
+ callid[i] = cp+3; // +1 for "/+1 for ,/+1 for "
+ if (*cp == '\"') break;
+ callid[i].resize(callid[i].next(0,'"'));
diff --git a/network/hylafax/hylafax.SlackBuild b/network/hylafax/hylafax.SlackBuild
index f2663427e6..e4abfd8ba7 100644
--- a/network/hylafax/hylafax.SlackBuild
+++ b/network/hylafax/hylafax.SlackBuild
@@ -73,6 +73,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+patch -p1 < $CWD/gcc.patch
+
# Copy our source for the correct configuration
sed "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" \
< $CWD/config.local.in \
diff --git a/network/ifstatus/README b/network/ifstatus/README
deleted file mode 100644
index 9dead8790d..0000000000
--- a/network/ifstatus/README
+++ /dev/null
@@ -1,10 +0,0 @@
-IFStatus was developed for Linux users that are usually in console mode.
-It is a simple, easy to use program for displaying commonly needed / wanted
-statistcs in real time about ingoing and outgoing traffic of multiple network
-interfaces that is usually hard to find, with a simple and effecient view.
-
-The configuration file for IFStatus is automatically created in
-~/.ifstatus/ifstatus.cfg
-
-Please read http://ifstatus.sourceforge.net/graphic/informations.html
-for information on various configuration options.
diff --git a/network/ifstatus/ifstatus.SlackBuild b/network/ifstatus/ifstatus.SlackBuild
deleted file mode 100644
index 135ee6b9e8..0000000000
--- a/network/ifstatus/ifstatus.SlackBuild
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for cgdb
-
-# Copyright 2009-2010 Sean Donner (sean.donner@gmail.com)
-# 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.
-
-PRGNAM=ifstatus
-VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-
-# 'v' needed due to poor tarball naming
-tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
-
-cd $PRGNAM
-chown root:root . -R
-
-# This will not compile on gcc 4.3 or 4.4 without patch,
-# as all .cc files are missing '#include <cstdlib>'
-patch -p1 < $CWD/ifstatus.patch
-
-make \
- CFLAGS="$SLKCFLAGS" \
- CXXFLAGS="$SLKCFLAGS"
-
-# We can't use the 'install' target in the Makefile as it
-# hardcodes the destination directory to /usr/local/bin
-install -D -m 0755 ./ifstatus $PKG/usr/bin/ifstatus
-strip --strip-unneeded $PKG/usr/bin/ifstatus
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ifstatus/ifstatus.info b/network/ifstatus/ifstatus.info
deleted file mode 100644
index f4021d55cc..0000000000
--- a/network/ifstatus/ifstatus.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ifstatus"
-VERSION="1.1.0"
-HOMEPAGE="http://ifstatus.sourceforge.net"
-DOWNLOAD="http://ifstatus.sourceforge.net/download/ifstatus-v1.1.0.tar.gz"
-MD5SUM="f4d413f880754fd6677290160f8bc5d7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Sean Donner"
-EMAIL="sean.donner@gmail.com"
diff --git a/network/ifstatus/ifstatus.patch b/network/ifstatus/ifstatus.patch
deleted file mode 100644
index 75bc3befd5..0000000000
--- a/network/ifstatus/ifstatus.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for ifstatus >= 1.1.0,
-which adds a few missing #include lines to not violate the C++ standards
-and to build successfully with G++ version 4.3 and 4.4.
-
---- ifstatus/IFStatus.cc 2006-01-17 00:18:46.000000000 +0100
-+++ ifstatus/IFStatus.cc.gcc44 2009-04-14 00:42:04.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Main.h"
- #include "IFStatus.h"
- #include "Graph.h"
---- ifstatus/GraphDecorator.cc 2006-01-17 01:00:59.000000000 +0100
-+++ ifstatus/GraphDecorator.cc.gcc44 2009-04-14 00:41:38.000000000 +0200
-@@ -21,7 +21,8 @@
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
--
-+
-+#include <cstdlib>
- #include "GraphDecorator.h"
- #include "Config.h"
-
---- ifstatus/Interface.cc 2006-01-17 02:48:27.000000000 +0100
-+++ ifstatus/Interface.cc.gcc44 2009-04-14 00:42:23.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Interface.h"
- #include "Config.h"
-
---- ifstatus/Config.cc 2005-02-26 12:54:51.000000000 +0100
-+++ ifstatus/Config.cc.gcc44 2009-04-14 00:40:13.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Main.h"
- #include "Config.h"
- #include "Util.h"
---- ifstatus/Email.cc 2005-02-26 12:54:51.000000000 +0100
-+++ ifstatus/Email.cc.gcc44 2009-04-14 00:40:44.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Email.h"
- #include "Config.h"
-
---- ifstatus/Interfaces.cc 2006-01-16 23:45:33.000000000 +0100
-+++ ifstatus/Interfaces.cc.gcc44 2009-04-14 00:42:45.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Interfaces.h"
- #include "Config.h"
- #include "Util.h"
diff --git a/network/ifstatus/slack-desc b/network/ifstatus/slack-desc
deleted file mode 100644
index a0f087dfc8..0000000000
--- a/network/ifstatus/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 ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-ifstatus: ifstatus (A curses network traffic monitor)
-ifstatus:
-ifstatus: IFStatus was developed for Linux users that are usually in console
-ifstatus: mode. It is a simple, easy to use program for displaying commonly
-ifstatus: needed / wanted statistcs in real time about ingoing and outgoing
-ifstatus: traffic of multiple network interfaces that is usually hard to find,
-ifstatus: with a simple and effecient view.
-ifstatus:
-ifstatus:
-ifstatus:
-ifstatus:
diff --git a/network/iperf/iperf.SlackBuild b/network/iperf/iperf.SlackBuild
index f8c40ab1e8..d4c970ca8b 100644
--- a/network/iperf/iperf.SlackBuild
+++ b/network/iperf/iperf.SlackBuild
@@ -8,13 +8,13 @@
# http://www.slackwiki.org/Writing_A_SlackBuild_Script
PRGNAM=iperf
-VERSION=${VERSION:-2.0.5}
+VERSION=${VERSION:-2.0.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -25,8 +25,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -49,10 +49,15 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Thanks fedora for these
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+
+autoreconf -fi
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -68,13 +73,11 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS ChangeLog COPYING INSTALL README doc/index.html $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/iperf/iperf.info b/network/iperf/iperf.info
index fbb6e24fa4..730b096a3b 100644
--- a/network/iperf/iperf.info
+++ b/network/iperf/iperf.info
@@ -1,8 +1,8 @@
PRGNAM="iperf"
-VERSION="2.0.5"
+VERSION="2.0.8"
HOMEPAGE="https://sourceforge.net/projects/iperf/"
-DOWNLOAD="https://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz"
-MD5SUM="44b5536b67719f4250faed632a3cd016"
+DOWNLOAD="https://downloads.sourceforge.net/iperf2/iperf-2.0.8.tar.gz"
+MD5SUM="e5887f799d8dc64a974c6c2f2e5cc339"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch b/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch
new file mode 100644
index 0000000000..2a3ad246ee
--- /dev/null
+++ b/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch
@@ -0,0 +1,17 @@
+diff -NarpU5 iperf-2.0.8/configure.ac iperf-2.0.8.debuginfo/configure.ac
+--- iperf-2.0.8/configure.ac 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.debuginfo/configure.ac 2015-04-10 10:11:33.287445003 -0400
+@@ -42,13 +42,11 @@ AC_ARG_ENABLE(kalman, AC_HELP_STRING([--
+ dnl ===================================================================
+ dnl Checks for programs
+ dnl ===================================================================
+
+ AC_PROG_CXX
+-CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+ AC_PROG_CC
+-CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+ AC_ISC_POSIX
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ AC_LANG(C)
diff --git a/network/iperf/patches/1_iperf-2.0.8-bindfail.patch b/network/iperf/patches/1_iperf-2.0.8-bindfail.patch
new file mode 100644
index 0000000000..b18b2cffed
--- /dev/null
+++ b/network/iperf/patches/1_iperf-2.0.8-bindfail.patch
@@ -0,0 +1,42 @@
+diff -NarpU5 iperf-2.0.8/src/Client.cpp iperf-2.0.8.bindfail/src/Client.cpp
+--- iperf-2.0.8/src/Client.cpp 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.bindfail/src/Client.cpp 2015-04-10 10:05:38.279936555 -0400
+@@ -701,20 +701,20 @@ void Client::Connect( ) {
+ AF_INET
+ #endif
+ : AF_INET);
+
+ mSettings->mSock = socket( domain, type, 0 );
+- WARN_errno( mSettings->mSock == INVALID_SOCKET, "socket" );
++ FAIL_errno( mSettings->mSock == INVALID_SOCKET, "socket", mSettings );
+
+ SetSocketOptions( mSettings );
+
+ SockAddr_localAddr( mSettings );
+ if ( mSettings->mLocalhost != NULL ) {
+ // bind socket to local address
+ rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local,
+ SockAddr_get_sizeof_sockaddr( &mSettings->local ) );
+- WARN_errno( rc == SOCKET_ERROR, "bind" );
++ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
+ }
+ // connect socket
+ rc = connect( mSettings->mSock, (sockaddr*) &mSettings->peer,
+ SockAddr_get_sizeof_sockaddr( &mSettings->peer ));
+ FAIL_errno( rc == SOCKET_ERROR, "connect", mSettings );
+diff -NarpU5 iperf-2.0.8/src/Listener.cpp iperf-2.0.8.bindfail/src/Listener.cpp
+--- iperf-2.0.8/src/Listener.cpp 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.bindfail/src/Listener.cpp 2015-04-10 10:06:23.279699885 -0400
+@@ -342,11 +342,11 @@ void Listener::Listen( ) {
+ WARN_errno( rc == SOCKET_ERROR, "WSAJoinLeaf (aka bind)" );
+ } else
+ #endif
+ {
+ rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local, mSettings->size_local );
+- WARN_errno( rc == SOCKET_ERROR, "bind" );
++ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
+ }
+ // listen for connections (TCP only).
+ // default backlog traditionally 5
+ if ( !isUDP( mSettings ) ) {
+ rc = listen( mSettings->mSock, 5 );
diff --git a/network/iperf/patches/2_iperf-2.0.8-math.patch b/network/iperf/patches/2_iperf-2.0.8-math.patch
new file mode 100644
index 0000000000..1a943f5f2c
--- /dev/null
+++ b/network/iperf/patches/2_iperf-2.0.8-math.patch
@@ -0,0 +1,75 @@
+diff -NarU5 a/include/headers.h b/include/headers.h
+--- a/include/headers.h 2015-04-02 16:51:48.000000000 -0400
++++ b/include/headers.h 2016-03-16 14:52:14.386853750 -0400
+@@ -80,11 +80,10 @@
+ #include <assert.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <time.h>
+-#include <math.h>
+ #include <float.h>
+ #include <sys/types.h>
+
+ #ifdef WIN32
+
+diff -NarU5 a/src/Client.cpp b/src/Client.cpp
+--- a/src/Client.cpp 2015-04-02 16:51:48.000000000 -0400
++++ b/src/Client.cpp 2016-03-16 14:52:14.387853701 -0400
+@@ -50,10 +50,11 @@
+ * A client thread initiates a connect to the server and handles
+ * sending and receiving data, then closes the socket.
+ * ------------------------------------------------------------------- */
+
+ #include <time.h>
++#include <cmath>
+ #include "headers.h"
+ #include "Client.hpp"
+ #include "Thread.h"
+ #include "SocketAddr.h"
+ #include "PerfSocket.hpp"
+diff -NarU5 a/src/ReportDefault.c b/src/ReportDefault.c
+--- a/src/ReportDefault.c 2015-04-02 16:51:49.000000000 -0400
++++ b/src/ReportDefault.c 2016-03-16 14:52:14.387853701 -0400
+@@ -47,10 +47,11 @@
+ * ReportDefault.c
+ * by Kevin Gibbs <kgibbs@nlanr.net>
+ *
+ * ________________________________________________________________ */
+
++#include <math.h>
+ #include "headers.h"
+ #include "Settings.hpp"
+ #include "util.h"
+ #include "Reporter.h"
+ #include "report_default.h"
+diff -NarU5 a/src/Reporter.c b/src/Reporter.c
+--- a/src/Reporter.c 2015-04-02 16:51:49.000000000 -0400
++++ b/src/Reporter.c 2016-03-16 14:52:14.388853652 -0400
+@@ -47,10 +47,11 @@
+ * Reporter.c
+ * by Kevin Gibbs <kgibbs@nlanr.net>
+ *
+ * ________________________________________________________________ */
+
++#include <math.h>
+ #include "headers.h"
+ #include "Settings.hpp"
+ #include "util.h"
+ #include "Reporter.h"
+ #include "Thread.h"
+diff -NarU5 a/src/Server.cpp b/src/Server.cpp
+--- a/src/Server.cpp 2015-04-02 16:51:49.000000000 -0400
++++ b/src/Server.cpp 2016-03-16 14:52:14.388853652 -0400
+@@ -52,10 +52,11 @@
+ * Handles sending and receiving data, and then closes socket.
+ * Changes to this version : The server can be run as a daemon
+ * ------------------------------------------------------------------- */
+
+ #define HEADERS()
++#include <cmath>
+ #include "headers.h"
+ #include "Server.hpp"
+ #include "List.h"
+ #include "Extractor.h"
+ #include "Reporter.h"
diff --git a/network/jigdo/jigdo-0.7.3-gcc7.patch b/network/jigdo/jigdo-0.7.3-gcc7.patch
new file mode 100644
index 0000000000..d5f0c8a4d0
--- /dev/null
+++ b/network/jigdo/jigdo-0.7.3-gcc7.patch
@@ -0,0 +1,39 @@
+diff -Naur jigdo-0.7.3.orig/src/mkimage.cc jigdo-0.7.3/src/mkimage.cc
+--- jigdo-0.7.3.orig/src/mkimage.cc 2005-07-09 21:14:46.000000000 +0200
++++ jigdo-0.7.3/src/mkimage.cc 2017-02-17 14:47:12.884488507 +0100
+@@ -285,27 +285,27 @@
+ //______________________________________________________________________
+
+ namespace {
+- const int SIZE_WIDTH = 12;
++ const int size_width = 12;
+ }
+
+ ostream& JigdoDesc::ImageInfo::put(ostream& s) const {
+- s << "image-info " << setw(SIZE_WIDTH) << size() << " "
++ s << "image-info " << setw(size_width) << size() << " "
+ << md5() << ' ' << blockLength() << '\n';
+ return s;
+ }
+ ostream& JigdoDesc::UnmatchedData::put(ostream& s) const {
+- s << "in-template " << setw(SIZE_WIDTH) << offset() << ' '
+- << setw(SIZE_WIDTH) << size() << '\n';
++ s << "in-template " << setw(size_width) << offset() << ' '
++ << setw(size_width) << size() << '\n';
+ return s;
+ }
+ ostream& JigdoDesc::MatchedFile::put(ostream& s) const {
+- s << "need-file " << setw(SIZE_WIDTH) << offset() << ' '
+- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
++ s << "need-file " << setw(size_width) << offset() << ' '
++ << setw(size_width) << size() << ' ' << md5() << ' ' << rsync() << '\n';
+ return s;
+ }
+ ostream& JigdoDesc::WrittenFile::put(ostream& s) const {
+- s << "have-file " << setw(SIZE_WIDTH) << offset() << ' '
+- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
++ s << "have-file " << setw(size_width) << offset() << ' '
++ << setw(size_width) << size() << ' ' << md5() << ' ' << rsync() << '\n';
+ return s;
+ }
+
diff --git a/network/jigdo/jigdo.SlackBuild b/network/jigdo/jigdo.SlackBuild
index 67e467dde2..ef17522f77 100644
--- a/network/jigdo/jigdo.SlackBuild
+++ b/network/jigdo/jigdo.SlackBuild
@@ -73,6 +73,9 @@ find -L . \
# apply some patches from debian
zcat $CWD/jigdo_0.7.3-3.diff.gz | patch -p1
+# Fic for gcc-7.x, thanks fedora!
+patch -p1 < $CWD/jigdo-0.7.3-gcc7.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/kmess/README b/network/kmess/README
deleted file mode 100644
index f04f2e181b..0000000000
--- a/network/kmess/README
+++ /dev/null
@@ -1,5 +0,0 @@
-KMess is an alternative Live Messenger chat client for Linux.
-It allows Linux users to chat with friends who use Live Messenger in
-Windows or Mac OS. The strength of KMess is it's integration with the
-KDE desktop environment, it focus on Messenger-specific features, and
-an easy-to-use interface.
diff --git a/network/kmess/doinst.sh b/network/kmess/doinst.sh
deleted file mode 100644
index 4a25de5e6f..0000000000
--- a/network/kmess/doinst.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
-
diff --git a/network/kmess/giflib-5.0.patch b/network/kmess/giflib-5.0.patch
deleted file mode 100644
index cc568fdf8a..0000000000
--- a/network/kmess/giflib-5.0.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- contrib/isf-qt/src/isfqt.cpp.orig 2014-06-11 13:10:43.137321400 +0000
-+++ contrib/isf-qt/src/isfqt.cpp 2014-06-11 13:12:23.123474616 +0000
-@@ -249,7 +249,7 @@
- qWarning() << "Couldn't initialize GIF library!";
- }
-
-- DGifCloseFile( gifImage );
-+ DGifCloseFile( gifImage, NULL );
- gifData.close();
- */
-
-@@ -484,12 +484,13 @@
- int width = isfImage.width();
- int numColors = 0;
- bool gifError = true;
-+ int gifErrCode;
-
- // Convert the image to GIF using libgif
-
- // Open the gif file
- gifData.open( QIODevice::WriteOnly );
-- gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray );
-+ gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray, &gifErrCode );
- if( gifImage == 0 )
- {
- qWarning() << "Couldn't initialize gif library!";
-@@ -503,7 +504,7 @@
- numColors = 256;
- }
-
-- cmap = MakeMapObject( numColors, NULL );
-+ cmap = GifMakeMapObject( numColors, NULL );
- if( cmap == 0 && isfImage.numColors() > 1 )
- {
- qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!";
-@@ -576,7 +577,7 @@
- else
- {
- // Write the extension
-- if( EGifPutExtensionFirst( gifImage, COMMENT_EXT_FUNC_CODE, MAX_GIF_BYTE, isfData.left( MAX_GIF_BYTE ).data() ) == GIF_ERROR )
-+ if( EGifPutExtensionLeader( gifImage, COMMENT_EXT_FUNC_CODE) == GIF_ERROR )
- {
- qWarning() << "EGifPutExtensionFirst failed!";
- goto writeError;
-@@ -590,9 +591,9 @@
- // Write all the full data blocks
- while( length >= MAX_GIF_BYTE )
- {
-- if( EGifPutExtensionNext( gifImage, 0, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
-+ if( EGifPutExtensionBlock( gifImage, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
- {
-- qWarning() << "EGifPutExtensionNext failed!";
-+ qWarning() << "EGifPutExtensionBlock failed!";
- goto writeError;
- }
-
-@@ -603,17 +604,17 @@
- // Write the last block
- if( length > 0 )
- {
-- if( EGifPutExtensionLast( gifImage, 0, length, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
-+ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR )
- {
-- qWarning() << "EGifPutExtensionLast (n) failed!";
-+ qWarning() << "EGifPutExtensionTrailer (n) failed!";
- goto writeError;
- }
- }
- else
- {
-- if( EGifPutExtensionLast( gifImage, 0, 0, 0 ) == GIF_ERROR )
-+ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR )
- {
-- qWarning() << "EGifPutExtensionLast (0) failed!";
-+ qWarning() << "EGifPutExtensionTrailer (0) failed!";
- goto writeError;
- }
- }
-@@ -623,13 +624,13 @@
-
- writeError:
- // Clean up the GIF converter etc
-- EGifCloseFile( gifImage );
-- FreeMapObject( cmap );
-+ EGifCloseFile( gifImage, NULL );
-+ GifFreeMapObject( cmap );
- gifData.close();
-
- if( gifError )
- {
-- qWarning() << "GIF error code:" << GifLastError();
-+ qWarning() << "GIF error code:" << GifErrorString(gifErrCode);
- }
- else
- {
diff --git a/network/kmess/kmess.SlackBuild b/network/kmess/kmess.SlackBuild
deleted file mode 100644
index 27c6a9e73b..0000000000
--- a/network/kmess/kmess.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for kmess
-
-# Copyright 2008-2009 Tarantino Antonino <metrofox9@gmail.com>
-# 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.
-
-PRGNAM=kmess
-VERSION=${VERSION:-2.0.6.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -fr $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 for building with new giflib (thanks to Arch)
-patch -p1 contrib/isf-qt/src/isfqt.cpp < $CWD/giflib-5.0.patch
-
-mkdir -p build
-cd build
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DCMAKE_BUILD_TYPE=Release ..
- make
- make install DESTDIR=$PKG
-cd ..
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS COPYING ChangeLog FEATURES INSTALL NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/kmess/kmess.info b/network/kmess/kmess.info
deleted file mode 100644
index 51a7e19d01..0000000000
--- a/network/kmess/kmess.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="kmess"
-VERSION="2.0.6.2"
-HOMEPAGE="http://kmess.org/"
-DOWNLOAD="http://downloads.sourceforge.net/kmess/kmess-2.0.6.2.tar.bz2"
-MD5SUM="a2e57911713308bef81b9347135cc5dd"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Tarantino Antonino"
-EMAIL="metrofox9@gmail.com"
diff --git a/network/kmess/slack-desc b/network/kmess/slack-desc
deleted file mode 100644
index 7bced9d9c3..0000000000
--- a/network/kmess/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 ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-kmess: kmess (MSN Messenger client)
-kmess:
-kmess: KMess is a MSN Messenger client for Linux. It enables Linux users
-kmess: to chat with friends online who are using MSN Messenger in Windows
-kmess: or Mac OS. The strength of KMess is it's integration with the KDE
-kmess: desktop environment, focus on MSN Messenger specific features and
-kmess: an easy-to-use interface.
-kmess:
-kmess:
-kmess:
-kmess:
diff --git a/network/knock/knock.SlackBuild b/network/knock/knock.SlackBuild
index eeb481a019..bc5a0d98b1 100644
--- a/network/knock/knock.SlackBuild
+++ b/network/knock/knock.SlackBuild
@@ -5,13 +5,13 @@
# Written by Joey Trungale joey@trungale.net
PRGNAM=knock
-VERSION=${VERSION:-0.5}
+VERSION=${VERSION:-0.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -46,10 +46,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -63,16 +63,14 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README ChangeLog TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md ChangeLog TODO $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
cat $PKG/etc/knockd.conf > $PKG/usr/doc/$PRGNAM-$VERSION/knockd.conf
mv $PKG/etc/knockd.conf $PKG/etc/knockd.conf.new
diff --git a/network/knock/knock.info b/network/knock/knock.info
index 8274f4fce1..6845299aa4 100644
--- a/network/knock/knock.info
+++ b/network/knock/knock.info
@@ -1,8 +1,8 @@
PRGNAM="knock"
-VERSION="0.5"
+VERSION="0.7"
HOMEPAGE="http://www.zeroflux.org"
-DOWNLOAD="http://www.zeroflux.org/proj/knock/files/knock-0.5.tar.gz"
-MD5SUM="ca09d61458974cff90a700aba6120891"
+DOWNLOAD="http://www.zeroflux.org/proj/knock/files/knock-0.7.tar.gz"
+MD5SUM="cb6373fd4ccb42eeca3ff406b7fdb8a7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/leechcraft/README b/network/leechcraft/README
deleted file mode 100644
index 22782597c3..0000000000
--- a/network/leechcraft/README
+++ /dev/null
@@ -1,26 +0,0 @@
-LeechCraft is a full-featured modular "Internet client" application,
-currently including plugins for a web browser, news feed reader,
-BitTorrent client, FTP client, and many more. Plugins are easily added
-and integrated with each other with no effort.
-
-Currently it includes following plugins:
-* Aggregator, news feed reader * BitTorrent, the BitTorrent client
-* Chatter, the IRC client * CSTP, simple HTTP implementation
-* DBusManager, D-Bus for the LeechCraft * DeadLyrics, LyricWiki.org API
-* HistoryHolder, downloads history * LCFTP, FTP implementation client
-* LMP, simple media player with streaming support
-* NetworkMonitor, which monitors for HTTP requests
-* Poshuku, the web browser * Poshuku CleanWeb, AdBlock+-compatible ad blocker
-* Poshuku FileScheme, support for the file:// browsing
-* Poshuku FUA, which allows to set fake user agents per domain
-* SeekThru, client for OpenSearch-aware web sites
-
-The following variables default to ON, but you can disable building any of
-them by passing NAME_OF_VARIABLE=OFF to the build script:
- ENABLE_SUMMARY ENABLE_TORRENT ENABLE_AGGREGATOR ENABLE_POSHUKU ENABLE_HTTP
- ENABLE_FTP ENABLE_LMP ENABLE_DBUSMANAGER ENABLE_DEADLYRICS ENABLE_SEEKTHRU
- ENABLE_NETWORKMONITOR ENABLE_HISTORYHOLDER ENABLE_CHATTER ENABLE_YASD
- ENABLE_DCMINATOR ENABLE_NEWLIFE ENABLE_ANHERO ENABLE_VGRABBER
-As an example, you can do this: ENABLE_LMP=OFF ./leechcraft.SlackBuild
-
-An optional dependency is libtorrent-rasterbar.
diff --git a/network/leechcraft/doinst.sh b/network/leechcraft/doinst.sh
deleted file mode 100644
index f3f8604d5a..0000000000
--- a/network/leechcraft/doinst.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
-
-if [ -e usr/share/icons/Pevzi/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/Pevzi >/dev/null 2>&1
- fi
-fi
-
-if [ -e usr/share/icons/oxygen/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/oxygen >/dev/null 2>&1
- fi
-fi
-
diff --git a/network/leechcraft/leechcraft.SlackBuild b/network/leechcraft/leechcraft.SlackBuild
deleted file mode 100644
index 80b2acc607..0000000000
--- a/network/leechcraft/leechcraft.SlackBuild
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for LeechCraft
-
-# Copyright 2009 rexim
-# 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.
-
-PRGNAM=leechcraft
-VERSION=${VERSION:-0.3.65}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
- EXTRA_CMAKE_FLAGS=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
- EXTRA_CMAKE_FLAGS=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
- EXTRA_CMAKE_FLAGS="-DRESPECTLIB64=True"
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
-cmake \
- -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX="/usr" \
- -DLIB_SUFFIX="$LIBDIRSUFFIX" \
- -DENABLE_SUMMARY="${ENABLE_SUMMARY:-ON}" \
- -DENABLE_TORRENT="${ENABLE_TORRENT:-ON}" \
- -DENABLE_AGGREGATOR="${ENABLE_AGGREGATOR:-ON}" \
- -DENABLE_POSHUKU="${ENABLE_POSHUKU:-ON}" \
- -DENABLE_HTTP="${ENABLE_HTTP:-ON}" \
- -DENABLE_FTP="${ENABLE_FTP:-ON}" \
- -DENABLE_LMP="${ENABLE_LMP:-ON}" \
- -DENABLE_DBUSMANAGER="${ENABLE_DBUSMANAGER:-ON}" \
- -DENABLE_DEADLYRICS="${ENABLE_DEADLYRICS:-ON}" \
- -DENABLE_SEEKTHRU="${ENABLE_SEEKTHRU:-ON}" \
- -DENABLE_NETWORKMONITOR="${ENABLE_NETWORKMONITOR:-ON}" \
- -DENABLE_HISTORYHOLDER="${ENABLE_HISTORYHOLDER:-ON}" \
- -DENABLE_CHATTER="${ENABLE_CHATTER:-ON}" \
- -DENABLE_YASD="${ENABLE_YASD:-ON}" \
- -DENABLE_DCMINATOR="${ENABLE_DCMINATOR:-ON}" \
- -DENABLE_NEWLIFE="${ENABLE_NEWLIFE:-ON}" \
- -DENABLE_ANHERO="${ENABLE_ANHERO:-ON}" \
- -DENABLE_VGRABBER="${ENABLE_VGRABBER:-ON}" \
- $EXTRA_CMAKE_FLAGS \
- ../src/
-
-make
-make install DESTDIR=$PKG
-
-# Move the manual pages to the correct place
-mv $PKG/usr/share/man $PKG/usr
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/leechcraft/leechcraft.info b/network/leechcraft/leechcraft.info
deleted file mode 100644
index 946c9060bd..0000000000
--- a/network/leechcraft/leechcraft.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="leechcraft"
-VERSION="0.3.65"
-HOMEPAGE="https://leechcraft.org/"
-DOWNLOAD="https://downloads.sourceforge.net/leechcraft/leechcraft-0.3.65.tar.bz2"
-MD5SUM="f410eae27731aa80b8921701477b15e7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="rexim"
-EMAIL="reximkut@gmail.com"
diff --git a/network/leechcraft/slack-desc b/network/leechcraft/slack-desc
deleted file mode 100644
index eddd124950..0000000000
--- a/network/leechcraft/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 ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-leechcraft: leechcraft (modular internet client application)
-leechcraft:
-leechcraft: LeechCraft is a full-featured modular "Internet client" application,
-leechcraft: currently including plugins for a web browser, news feed reader,
-leechcraft: BitTorrent client, FTP client and many more. Plugins are easily added
-leechcraft: and integrated with each other with no effort.
-leechcraft:
-leechcraft: Homepage: http://leechcraft.org/
-leechcraft:
-leechcraft:
-leechcraft:
diff --git a/network/linuxdcpp/linuxdcpp.SlackBuild b/network/linuxdcpp/linuxdcpp.SlackBuild
index e83b5a345b..bf57367f58 100644
--- a/network/linuxdcpp/linuxdcpp.SlackBuild
+++ b/network/linuxdcpp/linuxdcpp.SlackBuild
@@ -65,7 +65,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -fpermissive" \
+CXXFLAGS="$SLKCFLAGS -fpermissive -std=gnu++98" \
scons \
PREFIX=/usr \
FAKE_ROOT=$PKG \
diff --git a/network/memcached/memcached.SlackBuild b/network/memcached/memcached.SlackBuild
index 404909ad39..833314e8d8 100644
--- a/network/memcached/memcached.SlackBuild
+++ b/network/memcached/memcached.SlackBuild
@@ -82,7 +82,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=format-overflow -Wno-error=format-truncation" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/network/mldonkey/mldonkey.SlackBuild b/network/mldonkey/mldonkey.SlackBuild
index 5845ea64a1..8c7adeb4bd 100644
--- a/network/mldonkey/mldonkey.SlackBuild
+++ b/network/mldonkey/mldonkey.SlackBuild
@@ -26,13 +26,13 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=mldonkey
-VERSION=${VERSION:-3.1.5}
+VERSION=${VERSION:-3.1.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -45,8 +45,8 @@ PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
GUIOPT=${GUIOPT:-no}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,10 +69,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# This avoids downloading tarballs when the SlackBuild is running
mkdir -p patches
@@ -105,7 +105,7 @@ CXXFLAGS="$SLKCFLAGS" \
make -j1
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
if [ "$GUIOPT" = 'yes' ]; then
@@ -116,7 +116,7 @@ fi
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- distrib/*.txt docs ChangeLog \
+ distrib/*.txt docs \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/mldonkey/mldonkey.info b/network/mldonkey/mldonkey.info
index f2de7a097c..8d2907a4bc 100644
--- a/network/mldonkey/mldonkey.info
+++ b/network/mldonkey/mldonkey.info
@@ -1,10 +1,10 @@
PRGNAM="mldonkey"
-VERSION="3.1.5"
+VERSION="3.1.6"
HOMEPAGE="http://mldonkey.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/mldonkey/mldonkey-3.1.5.tar.bz2 \
+DOWNLOAD="https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2 \
http://caml.inria.fr/pub/distrib/ocaml-3.12/ocaml-3.12.0.tar.gz \
http://www.math.nagoya-u.ac.jp/~garrigue/soft/olabl/dist/lablgtk-2.14.2.tar.gz"
-MD5SUM="eca07c8ce88702dd437c72db531162d9 \
+MD5SUM="d73a925fb3559eed2c1d91fdeed1153a \
3ba7cc65123c3579f14e7c726d3ee782 \
bad77680a72dab8b915cae99d1ec9b1f"
DOWNLOAD_x86_64=""
diff --git a/network/mosh/mosh.SlackBuild b/network/mosh/mosh.SlackBuild
index 4f5fe7ce09..bd912a0982 100644
--- a/network/mosh/mosh.SlackBuild
+++ b/network/mosh/mosh.SlackBuild
@@ -52,7 +52,7 @@ find -L . \
-exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/network/mumble/boost-1.66.patch b/network/mumble/boost-1.66.patch
new file mode 100644
index 0000000000..cf61106ce6
--- /dev/null
+++ b/network/mumble/boost-1.66.patch
@@ -0,0 +1,32 @@
+From ea861fe86743c8402bbad77d8d1dd9de8dce447e Mon Sep 17 00:00:00 2001
+From: Mikkel Krautz <mikkel@krautz.dk>
+Date: Fri, 29 Dec 2017 14:47:25 +0100
+Subject: [PATCH] AudioOutput: do not use non-existant template version of
+ std::abs.
+
+This change fixes AudioOutput to use the float overload of std::abs:
+
+ float std::abs(float);
+
+instead of a non-existant template version.
+
+Fixes mumble-voip/mumble#3281
+
+Needs-Backport: 1.2.x
+---
+ src/mumble/AudioOutput.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp
+index cbe0c0e2b..7a0a5e2ab 100644
+--- a/src/mumble/AudioOutput.cpp
++++ b/src/mumble/AudioOutput.cpp
+@@ -437,7 +437,7 @@ bool AudioOutput::mix(void *outbuff, unsigned int nsamp) {
+ top[2] = 0.0f;
+ }
+
+- if (std::abs<float>(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) {
++ if (std::abs(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) {
+ // Not perpendicular. Assume Y up and rotate 90 degrees.
+
+ float azimuth = 0.0f;
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild
index 9de8dc9468..08a665cc71 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -92,6 +92,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# From upstream, needed for the newer boost
+patch -p1 < $CWD/boost-1.66.patch
+
# Mumble won't find the speechd header without this
patch -p1 < $CWD/libspeechd_header.patch
diff --git a/network/museek+/README b/network/museek+/README
deleted file mode 100644
index 350f3838de..0000000000
--- a/network/museek+/README
+++ /dev/null
@@ -1,23 +0,0 @@
-Museek+ is a file-sharing application for the Soulseek peer-to-peer network,
-written in C++. It's an enhanced version of Hyriand's original Museek
-(see http://museek.thegraveyard.org). It supports chat, transferring files,
-searching, user-management, shares browsing and more. The new features are:
-room searching, interests, buddy-only shares, banlists, icon themes, and
-font/color selecting.
-
-Museek+ consists of museekd (daemon), muscan (shares scanning tool), muscand
-(automated shares scanning tool), musetup (command-line configuration script),
-musetup-gtk (PyGTK configuration app), museeq (QT GUI client), mucous (curses
-python client), murmur (PyGTK client) and museekcontrol (command-line python
-client).
-
-After installing museek+ follow these steps:
- 1) Configure your settings with musetup: server, username, password,
- interface password, download directory, shared directories.
- 2) Run museekd.
- 3) Run museeq, mucous, or museekcontrol.
- 4) Login into museekd via the interface socket or host:port and the
- interface password.
-
-An example init script (rc.museekd) for the museekd daemon is provided.
-Feel free to modify it for your needs. Use it at your own risk.
diff --git a/network/museek+/doinst.sh b/network/museek+/doinst.sh
deleted file mode 100644
index 74a3bd3a48..0000000000
--- a/network/museek+/doinst.sh
+++ /dev/null
@@ -1,26 +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.museekd.new:
-#if [ -e etc/rc.d/rc.museekd ]; then
-# cp -a etc/rc.d/rc.museekd etc/rc.d/rc.museekd.new.incoming
-# cat etc/rc.d/rc.museekd.new > etc/rc.d/rc.museekd.new.incoming
-# mv etc/rc.d/rc.museekd.new.incoming etc/rc.d/rc.museekd.new
-#fi
-#
-#config etc/rc.d/rc.museekd.new
-
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/network/museek+/museek+.SlackBuild b/network/museek+/museek+.SlackBuild
deleted file mode 100644
index 347b8903bf..0000000000
--- a/network/museek+/museek+.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for museek+
-# Written by Iskar Enev <iskar.enev[@]gmail.com>
-# Currently maintained by B. Watson <yalhcru@gmail.com>
-
-PRGNAM=museek+
-VERSION=${VERSION:-0.2}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# This patch fixes the python modules install path
-# to be architecture aware
-patch -p0 < $CWD/museek-python.diff
-
-cmake -DPREFIX=/usr \
- -DMANDIR=man \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
- -DSWIG_DIR:PATH=`swig -swiglib` \
- -DEVERYTHING=1 \
- -DTRAYICON=1 \
- -DBINRELOC=0
-
-make VERBOSE=1
-make install VERBOSE=1 DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- COPYING CREDITS FILES LICENSE README TODO INSTALL \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/rc.museekd > $PKG/usr/doc/$PRGNAM-$VERSION/rc.museekd.new
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/museek+/museek+.info b/network/museek+/museek+.info
deleted file mode 100644
index 8ee1bc1126..0000000000
--- a/network/museek+/museek+.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="museek+"
-VERSION="0.2"
-HOMEPAGE="http://museek-plus.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/museek-plus/museek+-0.2.tar.bz2"
-MD5SUM="66d3eab341e1cd6642f83d329a18c3b5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libxml++"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/network/museek+/museek-python.diff b/network/museek+/museek-python.diff
deleted file mode 100644
index 844d17d624..0000000000
--- a/network/museek+/museek-python.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- murmur/CMakeLists.txt 2008-09-22 11:49:33.000000000 +0300
-+++ murmur/CMakeLists.txt.1 2009-09-01 12:04:34.000000000 +0300
-@@ -25,7 +25,7 @@
- ${PYMURMUR_FILES}
- )
-
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-
- if (NOT sitepackages OR error)
- MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
---- mucous/CMakeLists.txt 2008-09-22 11:49:33.000000000 +0300
-+++ mucous/CMakeLists.txt.1 2009-09-01 12:04:55.000000000 +0300
-@@ -28,7 +28,7 @@
- ${PYMUCOUS_FILES}
- )
-
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-
- if (NOT sitepackages OR error)
- MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
---- python-bindings/CMakeLists.txt 2008-09-22 11:49:33.000000000 +0300
-+++ python-bindings/CMakeLists.txt.1 2009-09-01 12:04:15.000000000 +0300
-@@ -18,7 +18,7 @@
- museek/driver.py
- )
-
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-
- if (NOT sitepackages OR error)
- MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
---- Mucipher/PyMucipher/CMakeLists.txt 2008-10-07 19:58:27.000000000 +0300
-+++ Mucipher/PyMucipher/CMakeLists.txt.1 2009-09-01 12:05:46.000000000 +0300
-@@ -37,7 +37,7 @@
- ${CMAKE_CURRENT_BINARY_DIR}/mucipherc.py
- ${CMAKE_CURRENT_BINARY_DIR}/_mucipherc.so
- )
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-
- if (NOT sitepackages OR error)
- MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
diff --git a/network/museek+/rc.museekd b/network/museek+/rc.museekd
deleted file mode 100644
index 8c74eb95ab..0000000000
--- a/network/museek+/rc.museekd
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-#
-# This shell script takes care of starting and stopping museekd.
-
-MUSEEKD=/usr/bin/museekd
-MUSETUP=/usr/bin/musetup
-MUSCAN=/usr/bin/muscan
-MUSOCKET=/tmp/museekd.root
-PIDFILE=/var/run/museekd.pid
-DBDIR=/var/museek
-CONFIG=$DBDIR/museekd.xml
-CHOWNSOCKET=YES
-
-case "$1" in
- start)
- if [ ! -d $DBDIR ]; then
- mkdir $DBDIR
- fi
- if [ ! -f $CONFIG ]; then
- echo -n "Starting Museek Setup"
- echo
- if [ ! -d $DBDIR ]; then
- mkdir $DBDIR
- fi
- $MUSETUP $CONFIG
- echo
- fi
- if [ -f $PIDFILE ]; then
- echo -n "Museek Daemon already running (or zombie pid file in /var/run/)"
- echo
- exit
- fi
- echo -n "Starting Museek Daemon"
- $MUSEEKD -c $CONFIG &>/dev/null &
- PID="$!"
- sleep 2
- if kill -0 $PID # pid check
- then
- if [ $CHOWNSOCKET = YES ];
- then
- if [ -e $MUSOCKET ]; then chmod 666 $MUSOCKET
- # access the museekd socket from other users, may be a security risk on multiuser systems
- fi
- fi
- echo $PID > $PIDFILE
- echo
- else
- echo -n "Museekd isn't starting up properly. Check your Config file, \nor run 'museekd -c /var/museek/museekd.xml' for verbose messages."
- echo
- fi
- ;;
- stop)
- echo -n "Stopping Museek Daemon"
- echo
- if [ -f $PIDFILE ]; then
- kill -15 $(cat $PIDFILE) &>/dev/null
- rm $PIDFILE
- else
- echo -n "Museek Daemon not running"
- echo
- exit
- fi
- ;;
- reconnect)
- if [ -f $PIDFILE ]; then
- echo -n "Attempting to reconnect Museekd to the Server"
- kill -ALRM $(cat $PIDFILE) &>/dev/null
- echo
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- rescan)
- echo -n "Starting Muscan, rescanning shared files"
- echo
- $MUSCAN -c $CONFIG -r -v
- echo
- $0 reload
- ;;
- setup)
- echo -n "Starting Museek Setup"
- echo
- if [ ! -d $DBDIR ]; then
- mkdir $DBDIR
- fi
- $MUSETUP $CONFIG
- echo
- ;;
- reload)
- if [ -f $PIDFILE ]; then
- echo -n "Reloading Museek Daemon to update Shares"
- kill -HUP $(cat $PIDFILE)
- echo
- else
- echo -n "Museek Daemon not running, can't reload shares"
- echo
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|rescan|reconnect|setup|reload}"
- echo -n
-esac
diff --git a/network/museek+/slack-desc b/network/museek+/slack-desc
deleted file mode 100644
index 58f0d98ace..0000000000
--- a/network/museek+/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 ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-museek+: museek+ (file-sharing application)
-museek+:
-museek+: Museek+ is a file-sharing application for the Soulseek p2p network,
-museek+: written in C++. It's an enhanced version of Hyriand's original Museek
-museek+: (http://museek.thegraveyard.org). It supports chat, transferring
-museek+: files, searching, user-management, sharing, banlists, interests
-museek+: and more. Museek+ consists of museekd (daemon), muscan (shares
-museek+: scanning tool), muscand (automated shares scanning tool), musetup
-museek+: (command-line configuration script), musetup-gtk (PyGTK configuration
-museek+: app), museeq (QT GUI client), mucous (curses python client),
-museek+: museekcontrol (command-line python client) and murmur (PyGTK client).
diff --git a/network/ncrack/ncrack.SlackBuild b/network/ncrack/ncrack.SlackBuild
index 9271e21f02..825642fade 100644
--- a/network/ncrack/ncrack.SlackBuild
+++ b/network/ncrack/ncrack.SlackBuild
@@ -70,7 +70,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/network/nghttp2/README b/network/nghttp2/README
deleted file mode 100644
index 3d05758f54..0000000000
--- a/network/nghttp2/README
+++ /dev/null
@@ -1,4 +0,0 @@
-nghttp2 is an implementation of HTTP/2 and its header compression
-algorithm HPACK in C.
-The framing layer of HTTP/2 is implemented as a form of reusable C
-library.
diff --git a/network/nghttp2/nghttp2.info b/network/nghttp2/nghttp2.info
deleted file mode 100644
index 11476aa1b8..0000000000
--- a/network/nghttp2/nghttp2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nghttp2"
-VERSION="1.16.1"
-HOMEPAGE="https://nghttp2.org/"
-DOWNLOAD="https://github.com/nghttp2/nghttp2/releases/download/v1.16.1/nghttp2-1.16.1.tar.xz"
-MD5SUM="bde0dca3fd5da7bc5c7c8470ed0674b5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jansson"
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
diff --git a/network/opendkim/opendkim.SlackBuild b/network/opendkim/opendkim.SlackBuild
index 85b2b88f4b..83b188ea96 100644
--- a/network/opendkim/opendkim.SlackBuild
+++ b/network/opendkim/opendkim.SlackBuild
@@ -104,6 +104,9 @@ else
UNBOUND=""
fi
+patch -p1 < $CWD/openssl_1.1.0_compat.patch
+autoreconf -vif
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/opendkim/openssl_1.1.0_compat.patch b/network/opendkim/openssl_1.1.0_compat.patch
new file mode 100644
index 0000000000..383990832a
--- /dev/null
+++ b/network/opendkim/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+ * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+ - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- opendkim-2.11.0~alpha.orig/configure.ac
++++ opendkim-2.11.0~alpha/configure.ac
+@@ -864,26 +864,28 @@ then
+ AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ AC_MSG_ERROR([libcrypto not found]))
+
+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+- [
+- if test x"$enable_shared" = x"yes"
+- then
+- AC_MSG_ERROR([Cannot build shared opendkim
+- against static openssl libraries.
+- Configure with --disable-shared
+- to get this working or obtain a
+- shared libssl library for
+- opendkim to use.])
+- fi
+
+- # avoid caching issue - last result of SSL_library_init
+- # shouldn't be cached for this next check
+- unset ac_cv_search_SSL_library_init
+- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+- AC_MSG_ERROR([libssl not found]), [-ldl])
+- ]
+- )
++ AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++ [[SSL_library_init();]])],
++ [od_have_ossl="yes";],
++ [od_have_ossl="no";])
++ if test x"$od_have_ossl" = x"no"
++ then
++ if test x"$enable_shared" = x"yes"
++ then
++ AC_MSG_ERROR([Cannot build shared opendkim
++ against static openssl libraries.
++ Configure with --disable-shared
++ to get this working or obtain a
++ shared libssl library for
++ opendkim to use.])
++ fi
++
++ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++ AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++ AC_MSG_ERROR([libssl not found]), [-ldl])
++ fi
+
+ AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+ AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim-2.11.0~alpha.orig/opendkim/opendkim-crypto.c
++++ opendkim-2.11.0~alpha/opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ {
+ assert(pthread_setspecific(id_key, ptr) == 0);
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++ OPENSSL_thread_stop();
++#else
+ ERR_remove_state(0);
++#endif
+
+ free(ptr);
+
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ if (crypto_init_done)
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++ OPENSSL_thread_stop();
++#else
+ CRYPTO_cleanup_all_ex_data();
+ CONF_modules_free();
+ EVP_cleanup();
+ ERR_free_strings();
+ ERR_remove_state(0);
++#endif
+
+ if (nmutexes > 0)
+ {
diff --git a/network/pidgin-musictracker/pidgin-musictracker.SlackBuild b/network/pidgin-musictracker/pidgin-musictracker.SlackBuild
index 2307eb44cc..5a4ea68244 100644
--- a/network/pidgin-musictracker/pidgin-musictracker.SlackBuild
+++ b/network/pidgin-musictracker/pidgin-musictracker.SlackBuild
@@ -70,7 +70,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS -Wno-error=deprecated-declarations" \
+CFLAGS="$SLKCFLAGS -Wno-error=deprecated-declarations -Wno-error=expansion-to-defined -Wno-error=implicit-fallthrough= -Wno-error=format-truncation=" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/network/postfix/README b/network/postfix/README
deleted file mode 100644
index 80840d5668..0000000000
--- a/network/postfix/README
+++ /dev/null
@@ -1,39 +0,0 @@
-Postfix is Wietse Venema's mailer that started life as an alternative to the
-widely-used Sendmail program. It attempts to be fast, easy to administer, and
-secure, while at the same time, being sendmail compatible enough to not upset
-existing users. Thus, the outside has a sendmail-ish flavor, but the inside is
-completely different.
-
-This script builds postfix with optional support for Dovecot SASL, Cyrus SASL
-can be enabled with:
-
- SASL=cyrus ./postfix.SlackBuild
-
-You can also enable support for MySQL:
-
- DATABASE=mysql ./postfix.SlackBuild
-
-PostgreSQL support can be enabled with:
-
- DATABASE=pgsql ./postfix.SlackBuild
-
-On systems with multiple instances, add major version, eg: DATABASE=pgsql-9.5
-
-This script will find support for BerkleyDB and PCRE automagically; TLS support
-requires openssl package, openssl-solibs alone is not enough. Additionally, this
-script doesn't add postfix user and groups, instead it offers sane defaults that
-won't conflict with system users and groups, and other scripts from the SBo.
-
-Package created with this script will conflict with stock sendmail package, you
-*should* remove sendmail before installing postfix, otherwise sendmail updates
-could break your postfix instance.
-
-When upgrading from an older postfix version, make sure the variables such as
-html_directory and readme_directory in /etc/postfix/main.cf point to the new
-location. These can also be fixed later, afterwards make sure to run:
-
- postfix set-permissions
-
-Furthermore, many of the utilities in postfix have multiple manpages such as
-postconf(5) and postconf(8). Use man -k to find them, and don't forget to
-subscribe to the postfix-users mailing list!
diff --git a/network/postfix/doinst.sh b/network/postfix/doinst.sh
deleted file mode 100644
index 97e6510432..0000000000
--- a/network/postfix/doinst.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-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...
-}
-
-preserve_perms() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- if [ -e $OLD ]; then
- cp -a $OLD ${NEW}.incoming
- cat $NEW > ${NEW}.incoming
- mv ${NEW}.incoming $NEW
- fi
- config $NEW
-}
-
-find etc/postfix -type f -name '*.new' \
- | while read new ; do config $new ; done
-
-preserve_perms etc/rc.d/rc.postfix.new
-
-# This is an incompatability with the sendmail package
-( cd usr/lib; rm -f sendmail )
-( cd usr/lib; ln -s /usr/sbin/sendmail sendmail)
-
-# This will set the permissions on all postfix files correctly
-postfix set-permissions
-
-# Symlinks added by makepkg(8)
-
diff --git a/network/postfix/patches/postconf.diff b/network/postfix/patches/postconf.diff
deleted file mode 100644
index c51c1822fe..0000000000
--- a/network/postfix/patches/postconf.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- postfix-3.0.3/postfix-install.orig 2015-01-29 23:15:30.000000000 +0100
-+++ postfix-3.0.3/postfix-install 2015-10-17 03:57:42.269896095 +0200
-@@ -248,7 +248,7 @@
- case "$junk" in
- *MAIL_VERSION*)
- case "$mail_version" in
-- "") mail_version="`bin/postconf -dhx mail_version`" || exit 1
-+ "") mail_version="`bin/postconf -c conf -dhx mail_version`" || exit 1
- esac
- val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1
- case "$val" in
-@@ -810,7 +810,7 @@
- # the wrong place when Postfix is being upgraded.
-
- case "$mail_version" in
--"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
-+"") mail_version="`bin/postconf -c conf -dhx mail_version`" || exit 1
- esac
-
- # Undo MAIL_VERSION expansion at the end of a parameter value. If
---- postfix-3.0.3/Makefile.in.orig 2014-09-25 21:16:29.000000000 +0200
-+++ postfix-3.0.3/Makefile.in 2015-10-17 04:01:27.170920308 +0200
-@@ -20,7 +20,7 @@
- EXPAND = sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \
- -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);"
- SHLIB_DIR_OVERRIDE = \
-- $${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`}
-+ $${shlib_directory:-`$(SHLIB_ENV) bin/postconf -c conf -dhx shlib_directory`}
-
- default: update
-
diff --git a/network/postfix/postfix.SlackBuild b/network/postfix/postfix.SlackBuild
deleted file mode 100644
index 2c6ff2a91c..0000000000
--- a/network/postfix/postfix.SlackBuild
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2006, 2011 Alan Hicks, Lizella, GA
-# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018 Mario Preksavec, Zagreb, Croatia
-# 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.
-
-PRGNAM=postfix
-VERSION=${VERSION:-3.3.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""5
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-# Build with dovecot sasl support by default
-SASL=${SASL:-dovecot}
-case "$SASL" in
- dovecot) SASLARGS="-DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- SASLLIBS="" ;;
- cyrus) SASLARGS="-I/usr/include/sasl -DUSE_CYRUS_SASL"
- SASLLIBS="-L/usr/lib${LIBDIRSUFFIX}/sasl2 -lsasl2" ;;
- *) SASLARGS=""
- SASLLIBS="" ;;
-esac
-
-# Build without database support by default
-DATABASE=${DATABASE:-none}
-case "$DATABASE" in
- mysql) DBARGS="-I/usr/include/mysql -DHAS_MYSQL"
- DBLIBS="-L/usr/lib${LIBDIRSUFFIX}/mysql -lmysqlclient -lz -lm" ;;
- pgsql*) PGVER=${DATABASE/pgsql-}
- [ "$PGVER" = "pgsql" ] && PGVER=$(ls /usr/lib${LIBDIRSUFFIX}/postgresql/)
- [ -d "/usr/lib${LIBDIRSUFFIX}/postgresql/$PGVER/lib" ] && {
- DBARGS="-I/usr/include/postgresql -DHAS_PGSQL"
- DBLIBS="-L/usr/lib${LIBDIRSUFFIX}/postgresql/$PGVER/lib -lpq -lz -lm"
- } || echo "PostgreSQL not found" ;;
- *) DBARGS=""
- DBLIBS="" ;;
-esac
-
-# Build without ldap support by default
-LDAP=${LDAP:-no}
-case "$LDAP" in
- yes) LDAPARGS="-DUSE_LDAP_SASL -DHAS_LDAP"
- LDAPLIBS="-lldap -llber" ;;
- *) LDAPARGS=""
- LDAPLIBS="" ;;
-esac
-
-# MySQL compile hack
-if [ $DATABASE == "mysql" ] && [ -f /usr/include/mysql/events.h ]; then
-
-cat << EOF
-
- Postfix will fail to compile with mysql support if a system-wide
- events.h file is not removed (postfix has its own events.h).
- Either disable mysql support or (re)move events.h, eg:
-
- # mv /usr/include/mysql/events.h /usr/include/mysql/events.h.bak
-
-EOF
-
- exit
-fi
-
-# Bail if user or group isn't valid on your system
-if ! grep ^postfix: /etc/passwd 2>&1 > /dev/null; then
-
-cat << EOF
-
- You must have a postfix user to run this script
-
- # groupadd -g 200 postfix
- # useradd -u 200 -d /dev/null -s /bin/false -g postfix postfix
-
-EOF
-
- exit
-elif ! grep ^postdrop: /etc/group 2>&1 > /dev/null; then
-
-cat << EOF
-
- You must have a postdrop group to run this script
-
- # groupadd -g 201 postdrop
-
-EOF
-
- exit
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Use config files from build tree, not system ones
-# This should probably go to upstream...
-patch -p1 <$CWD/patches/postconf.diff
-
-# Postfix does not use a ./configure script
-
-make makefiles shared=yes \
- CCARGS="-DUSE_SASL_AUTH -DUSE_TLS $SASLARGS $DBARGS $LDAPARGS" \
- AUXLIBS="-lssl -lcrypto $SASLLIBS $DBLIBS $LDAPLIBS" \
- OPT="$SLKCFLAGS" DEBUG=""
-
-make non-interactive-package \
- install_root=$PKG \
- tempdir=$TMP/$PRGNAM-temp \
- config_directory=/etc/postfix \
- daemon_directory=/usr/libexec/postfix \
- command_directory=/usr/sbin \
- queue_directory=/var/spool/postfix \
- sendmail_path=/usr/sbin/sendmail \
- newaliases_path=/usr/bin/newaliases \
- mailq_path=/usr/bin/mailq \
- mail_owner=postfix \
- setgid_group=postdrop \
- html_directory=/usr/doc/$PRGNAM-$VERSION/html \
- manpage_directory=/usr/man \
- readme_directory=/usr/doc/$PRGNAM-$VERSION/README_FILES
-
-install -D -m 0644 -oroot -groot $CWD/rc.postfix $PKG/etc/rc.d/rc.postfix.new
-find $PKG/etc/postfix -type f ! -name "*.default" ! -name "*.proto" ! -name "*.out" \
- ! -name "postfix-files" -exec mv {} {}.new \;
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-sed -i 's#\($manpage_directory/man[158]/.\+\.[158]\)\(:.*\)#\1.gz\2#' \
- $PKG/etc/postfix/postfix-files
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AAAREADME COMPATIBILITY COPYRIGHT HISTORY IPv6-ChangeLog LICENSE PORTING \
- RELEASE_NOTES TLS_ACKNOWLEDGEMENTS TLS_CHANGES TLS_LICENSE US_PATENT_6321267 \
- examples implementation-notes $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/postfix/postfix.info b/network/postfix/postfix.info
deleted file mode 100644
index e561137f32..0000000000
--- a/network/postfix/postfix.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="postfix"
-VERSION="3.3.1"
-HOMEPAGE="http://www.postfix.org/"
-DOWNLOAD="http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/postfix-3.3.1.tar.gz"
-MD5SUM="4381c6492f415e4a69cf5099d4acea76"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mario Preksavec"
-EMAIL="mario at slackware dot hr"
diff --git a/network/postfix/rc.postfix b/network/postfix/rc.postfix
deleted file mode 100644
index 6e133ad9ec..0000000000
--- a/network/postfix/rc.postfix
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-# Copyright 2006, Alan Hicks, Lizella, GA
-# 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.
-#
-
-postfix_start()
-{
- /usr/sbin/postfix start
-}
-
-postfix_stop()
-{
- /usr/sbin/postfix stop
-}
-
-postfix_restart()
-{
- postfix_stop
- postfix_start
-}
-
-postfix_reload()
-{
- /usr/sbin/postfix reload
-}
-
-postfix_status()
-{
- /usr/sbin/postfix status
-}
-
-case $1 in
-'start')
- postfix_start
- ;;
-'stop')
- postfix_stop
- ;;
-'restart')
- postfix_restart
- ;;
-'reload')
- postfix_reload
- ;;
-'status')
- postfix_status
- ;;
-*)
- echo "usage $0 start|stop|restart|reload|status"
-esac
diff --git a/network/postfix/slack-desc b/network/postfix/slack-desc
deleted file mode 100644
index 0e8c796afc..0000000000
--- a/network/postfix/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 ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-postfix: postfix (alternative to the widely-used Sendmail program)
-postfix:
-postfix: Postfix attempts to be fast, easy to administer, and secure, while at
-postfix: the same time being sendmail compatible enough to not upset existing
-postfix: users. Thus, the outside has a sendmail-ish flavor, but the inside is
-postfix: completely different.
-postfix:
-postfix: Packaging script written by Alan Hicks <alan@lizella.net>
-postfix: and the SlackBuilds.org Team <http://www.slackbuilds.org>
-postfix:
-postfix:
diff --git a/network/razor-agents/razor-agents.SlackBuild b/network/razor-agents/razor-agents.SlackBuild
index 814bf7acf7..bc9ef7a41a 100644
--- a/network/razor-agents/razor-agents.SlackBuild
+++ b/network/razor-agents/razor-agents.SlackBuild
@@ -71,7 +71,7 @@ perl Makefile.PL \
INSTALLDIRS=vendor \
INSTALLVENDORMAN1DIR=/usr/man/man1 \
INSTALLVENDORMAN3DIR=/usr/man/man3
-make
+make -j1
make test
make install DESTDIR=$PKG INSTALLMAN5DIR=$PKG/usr/man/man5
diff --git a/network/remmina/find_libssh.patch b/network/remmina/find_libssh.patch
new file mode 100644
index 0000000000..77976db696
--- /dev/null
+++ b/network/remmina/find_libssh.patch
@@ -0,0 +1,25 @@
+From: "Matteo F. Vescovi" <mfv@debian.org>
+Date: Sun, 12 Aug 2018 14:22:40 +0200
+Subject: Fix_Cmake_rule_for_LibSSH
+
+---
+ cmake/FindLIBSSH.cmake | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/FindLIBSSH.cmake b/cmake/FindLIBSSH.cmake
+index f003e2d..d1bfe23 100644
+--- a/cmake/FindLIBSSH.cmake
++++ b/cmake/FindLIBSSH.cmake
+@@ -51,7 +51,11 @@ include(FindPackageHandleStandardArgs)
+
+ find_package_handle_standard_args(LIBSSH DEFAULT_MSG LIBSSH_LIBRARY LIBSSH_INCLUDE_DIR)
+
+-set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY} ${LIBSSH_THREADS_LIBRARY})
++if (LIBSSH_THREADS_LIBRARY)
++ set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY} ${LIBSSH_THREADS_LIBRARY})
++else()
++ set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY})
++endif()
+ set(LIBSSH_INCLUDE_DIRS ${LIBSSH_INCLUDE_DIR})
+
+ mark_as_advanced(LIBSSH_INCLUDE_DIR LIBSSH_LIBRARY)
diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild
index 94e4e67f62..2dc05dbfa1 100644
--- a/network/remmina/remmina.SlackBuild
+++ b/network/remmina/remmina.SlackBuild
@@ -77,6 +77,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/find_libssh.patch
+
mkdir -p build
cd build
cmake \
diff --git a/network/seafile-client/seafile-client.SlackBuild b/network/seafile-client/seafile-client.SlackBuild
deleted file mode 100644
index 205c0af148..0000000000
--- a/network/seafile-client/seafile-client.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for "seafile-client".
-
-# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "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 COPYRIGHT
-# OWNER OR CONTRIBUTORS 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.
-
-PRGNAM=seafile-client
-SRCNAM=seafile
-VERSION=${VERSION:-4.4.6}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/v$VERSION-server.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION-server.tar.gz
-cd $SRCNAM-$VERSION-server
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-sh autogen.sh
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-client \
- --enable-static=no \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/seafile-client/seafile-client.info b/network/seafile-client/seafile-client.info
deleted file mode 100644
index ef875c1f8f..0000000000
--- a/network/seafile-client/seafile-client.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="seafile-client"
-VERSION="4.4.6"
-HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/seafile/archive/v4.4.6-server.tar.gz"
-MD5SUM="753db8ec00c8f4e43270afff097a23af"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="ccnet libevhtp"
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
diff --git a/network/seafile-client/slack-desc b/network/seafile-client/slack-desc
deleted file mode 100644
index e41d278faa..0000000000
--- a/network/seafile-client/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 ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-seafile-client: seafile-client (Cloud Storage System)
-seafile-client:
-seafile-client: Seafile is a next-generation open source cloud storage system with
-seafile-client: advanced support for file syncing, privacy protection and teamwork.
-seafile-client:
-seafile-client: Homepage: http://seafile.com/
-seafile-client:
-seafile-client:
-seafile-client:
-seafile-client:
-seafile-client:
diff --git a/network/seafile-client/README b/network/seafile/README
index 937324eae1..937324eae1 100644
--- a/network/seafile-client/README
+++ b/network/seafile/README
diff --git a/network/nghttp2/nghttp2.SlackBuild b/network/seafile/seafile.SlackBuild
index 39af89748f..63f62460ce 100644
--- a/network/nghttp2/nghttp2.SlackBuild
+++ b/network/seafile/seafile.SlackBuild
@@ -1,8 +1,8 @@
#!/bin/sh
-# Slackware build script for "nghttp2".
+# Slackware build script for seafile
-# Copyright 2016 Marcel Saegebarth <marc@mos6581.de>
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -24,8 +24,8 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=nghttp2
-VERSION=${VERSION:-1.16.1}
+PRGNAM=seafile
+VERSION=${VERSION:-6.2.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -62,7 +62,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -71,6 +71,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sh autogen.sh
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -80,21 +81,20 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-python-bindings \
- --with-jemalloc \
- --disable-static \
+ --enable-client \
+ --enable-static=no \
--build=$ARCH-slackware-linux
make
make install-strip DESTDIR=$PKG
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/seafile/seafile.info b/network/seafile/seafile.info
new file mode 100644
index 0000000000..85067fd4fe
--- /dev/null
+++ b/network/seafile/seafile.info
@@ -0,0 +1,10 @@
+PRGNAM="seafile"
+VERSION="6.2.5"
+HOMEPAGE="https://seafile.com"
+DOWNLOAD="https://github.com/haiwen/seafile/archive/v6.2.5/seafile-6.2.5.tar.gz"
+MD5SUM="220790c24a8cb1ff88bacc03e4e87976"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="ccnet libevhtp"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/network/nghttp2/slack-desc b/network/seafile/slack-desc
index a1d218da43..cad22d1bb6 100644
--- a/network/nghttp2/slack-desc
+++ b/network/seafile/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-nghttp2: nghttp2 (HTTP/2 implementation)
-nghttp2:
-nghttp2: nghttp2 is an implementation of HTTP/2 and its header compression
-nghttp2: algorithm HPACK in C.
-nghttp2: The framing layer of HTTP/2 is implemented as a form of reusable C
-nghttp2: library.
-nghttp2:
-nghttp2: Homepage: https://nghttp2.org/
-nghttp2:
-nghttp2:
-nghttp2:
+seafile: seafile (Cloud Storage System)
+seafile:
+seafile: Seafile is a next-generation open source cloud storage system with
+seafile: advanced support for file syncing, privacy protection and teamwork.
+seafile:
+seafile: Homepage: http://seafile.com/
+seafile:
+seafile:
+seafile:
+seafile:
+seafile:
diff --git a/network/sqlrelay/sqlrelay.SlackBuild b/network/sqlrelay/sqlrelay.SlackBuild
index aa56ae3355..434b548bdb 100644
--- a/network/sqlrelay/sqlrelay.SlackBuild
+++ b/network/sqlrelay/sqlrelay.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=sqlrelay
-VERSION=${VERSION:-0.65.0}
+VERSION=${VERSION:-1.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/network/sqlrelay/sqlrelay.info b/network/sqlrelay/sqlrelay.info
index 99177781f8..260729b0fe 100644
--- a/network/sqlrelay/sqlrelay.info
+++ b/network/sqlrelay/sqlrelay.info
@@ -1,8 +1,8 @@
PRGNAM="sqlrelay"
-VERSION="0.65.0"
+VERSION="1.1.0"
HOMEPAGE="http://sqlrelay.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sqlrelay/sqlrelay-0.65.0.tar.gz"
-MD5SUM="231cc46bc32f6c05dc372c2f04cdcd02"
+DOWNLOAD="http://downloads.sourceforge.net/sqlrelay/sqlrelay-1.1.0.tar.gz"
+MD5SUM="be726dd405aef7d5530fd22c0c146f98"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="rudiments"
diff --git a/network/sshfs-fuse/README b/network/sshfs-fuse/README
deleted file mode 100644
index 300d34090d..0000000000
--- a/network/sshfs-fuse/README
+++ /dev/null
@@ -1,10 +0,0 @@
-SSHFS (Secure SHell FileSystem) is a file system for Linux capable of
-operating on files on a remote computer using just a secure shell login
-on the remote computer. On the local computer where the SSHFS is mounted,
-the implementation makes use of the FUSE (Filesystem in Userspace)
-kernel module.
-
-The practical effect of this is that the end user can seamlessly interact
-with remote files being securely served over SSH just as if they were
-local files on his/her computer. On the remote computer the SFTP subsystem
-of SSH is used.
diff --git a/network/sshfs-fuse/slack-desc b/network/sshfs-fuse/slack-desc
deleted file mode 100644
index 7e342f6fac..0000000000
--- a/network/sshfs-fuse/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 ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-sshfs-fuse: sshfs-fuse (ssh file system module for FUSE)
-sshfs-fuse:
-sshfs-fuse: This is a filesystem client based on the SSH File Transfer
-sshfs-fuse: Protocol. Since most SSH servers already support this protocol it
-sshfs-fuse: is very easy to set up: i.e. on the server side there's nothing
-sshfs-fuse: to do. On the client side mounting the filesystem is as easy as
-sshfs-fuse: logging into the server with ssh.
-sshfs-fuse:
-sshfs-fuse:
-sshfs-fuse:
-sshfs-fuse:
diff --git a/network/sshfs-fuse/sshfs-fuse.SlackBuild b/network/sshfs-fuse/sshfs-fuse.SlackBuild
deleted file mode 100644
index 1e43941878..0000000000
--- a/network/sshfs-fuse/sshfs-fuse.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Copyright 2012, Michiel van Wessem, Leicester, United Kingdom
-# Copyright 2006-2009 Alan Hicks, Lizella, GA
-# 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.
-
-PRGNAM=sshfs-fuse
-SRCNAM=sshfs
-VERSION=${VERSION:-2.8}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/sshfs-fuse/sshfs-fuse.info b/network/sshfs-fuse/sshfs-fuse.info
deleted file mode 100644
index ec97eeb668..0000000000
--- a/network/sshfs-fuse/sshfs-fuse.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sshfs-fuse"
-VERSION="2.8"
-HOMEPAGE="https://github.com/libfuse/sshfs"
-DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs_2.8/sshfs-2.8.tar.gz"
-MD5SUM="0ba25e848ee59e2595d6576c8f6284b6"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
diff --git a/network/transmission-remote-gtk/README b/network/transmission-remote-gtk/README
index 41c17ca20c..82d2a5b511 100644
--- a/network/transmission-remote-gtk/README
+++ b/network/transmission-remote-gtk/README
@@ -8,4 +8,6 @@ management of the Transmission BitTorrent client using its RPC interface.
priorities, add/edit/remove trackers.
* Change remote settings like global limits, download directory, and
connectivity preferences.
- * Russian, Polish, Korean, and German, Spanish, Ukranian translations.
+ * Russian, Polish, Korean, and German, Spanish, Ukranian translations.
+
+GeoIP is an optional dependency.
diff --git a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild
index 677e991256..74e31f7d63 100644
--- a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild
+++ b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild
@@ -32,13 +32,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=transmission-remote-gtk
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-1.3.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -49,8 +49,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,14 +69,14 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/transmission-remote-gtk/transmission-remote-gtk.info b/network/transmission-remote-gtk/transmission-remote-gtk.info
index 80f1eaffc3..a34496a278 100644
--- a/network/transmission-remote-gtk/transmission-remote-gtk.info
+++ b/network/transmission-remote-gtk/transmission-remote-gtk.info
@@ -1,8 +1,8 @@
PRGNAM="transmission-remote-gtk"
-VERSION="1.2"
+VERSION="1.3.1"
HOMEPAGE="https://github.com/transmission-remote-gtk/transmission-remote-gtk/"
-DOWNLOAD="https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.2/transmission-remote-gtk-1.2.tar.gz"
-MD5SUM="dfb485390b49c1f0af5063b44a4fef03"
+DOWNLOAD="https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.3.1/transmission-remote-gtk-1.3.1.tar.xz"
+MD5SUM="7a66a947360ed9ae0ce0b4e327dc00ed"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="transmission json-glib"
diff --git a/network/vde2/vde2.SlackBuild b/network/vde2/vde2.SlackBuild
index f0d9d64035..910dbd409f 100644
--- a/network/vde2/vde2.SlackBuild
+++ b/network/vde2/vde2.SlackBuild
@@ -71,6 +71,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Patch to build against openssl-1.1.x - thanks archlinux!
+patch -p1 < $CWD/vde_cryptcab-compile-against-openssl-1.1.0.patch
+
EXPERIMENTAL=${EXPERIMENTAL:-false}
OPTIONS=""
diff --git a/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch b/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch
new file mode 100644
index 0000000000..227312eabb
--- /dev/null
+++ b/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch
@@ -0,0 +1,92 @@
+--- a/src/vde_cryptcab/cryptcab.c 2011-11-23 16:41:17.000000000 +0000
++++ b/src/vde_cryptcab/cryptcab.c 2017-03-20 22:54:20.452975075 +0000
+@@ -22,7 +22,7 @@
+ exit(1);
+ }
+
+-static EVP_CIPHER_CTX ctx;
++static EVP_CIPHER_CTX *ctx;
+ static int ctx_initialized = 0;
+ static int encryption_disabled = 0;
+ static int nfd;
+@@ -30,6 +30,10 @@
+ static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700};
+ static int verbose = 0;
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++#define EVP_CIPHER_CTX_reset(x) EVP_CIPHER_CTX_cleanup(x)
++#endif
++
+ void vc_printlog(int priority, const char *format, ...)
+ {
+ va_list arg;
+@@ -103,19 +107,21 @@
+ }
+
+ if (!ctx_initialized) {
+- EVP_CIPHER_CTX_init (&ctx);
++ ctx = EVP_CIPHER_CTX_new ();
++ if (!ctx)
++ return -1;
+ ctx_initialized = 1;
+ }
+
+- EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+- if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1)
++ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++ if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1)
+ {
+ fprintf (stderr,"error in encrypt update\n");
+ olen = -1;
+ goto cleanup;
+ }
+
+- if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1)
++ if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1)
+ {
+ fprintf (stderr,"error in encrypt final\n");
+ olen = -1;
+@@ -124,7 +130,7 @@
+ olen += tlen;
+
+ cleanup:
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ EVP_CIPHER_CTX_reset(ctx);
+ return olen;
+ }
+
+@@ -138,19 +144,21 @@
+ }
+
+ if (!ctx_initialized) {
+- EVP_CIPHER_CTX_init (&ctx);
++ ctx = EVP_CIPHER_CTX_new ();
++ if (!ctx)
++ return -1;
+ ctx_initialized = 1;
+ }
+
+- EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+- if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1)
++ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++ if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1)
+ {
+ fprintf (stderr,"error in decrypt update\n");
+ olen = -1;
+ goto cleanup;
+ }
+
+- if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1)
++ if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1)
+ {
+ fprintf (stderr,"error in decrypt final\n");
+ olen = -1;
+@@ -159,7 +167,7 @@
+ olen += tlen;
+
+ cleanup:
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ EVP_CIPHER_CTX_reset (ctx);
+ return olen;
+ }
+
diff --git a/network/verlihub/verlihub-gcc7.patch b/network/verlihub/verlihub-gcc7.patch
new file mode 100644
index 0000000000..4b2ede4d42
--- /dev/null
+++ b/network/verlihub/verlihub-gcc7.patch
@@ -0,0 +1,18 @@
+diff -Naur verlihub-0.9.8e-r2.orig/src/script_api.cpp verlihub-0.9.8e-r2/src/script_api.cpp
+--- verlihub-0.9.8e-r2.orig/src/script_api.cpp 2009-05-16 16:42:07.000000000 +0200
++++ verlihub-0.9.8e-r2/src/script_api.cpp 2017-06-01 20:33:58.923440440 +0200
+@@ -218,12 +218,12 @@
+ cServerDC *server = GetCurrentVerlihub();
+ if(!server) {
+ cerr << "Server verlihub is unfortunately not running or not found." << endl;
+- return false;
++ return NULL;
+ }
+ cUser *usr = GetUser((char *) server->mC.hub_security.c_str());
+ printf("%p\n", usr);
+ printf("%p", usr->mxConn);
+- if ((!usr) || (usr && !usr->mxConn)) return false;
++ if ((!usr) || (usr && !usr->mxConn)) return NULL;
+ cout << "here" << endl;
+ if (!server->mP.ParseForCommands(command_line, usr->mxConn)) {
+ // unknown command
diff --git a/network/verlihub/verlihub.SlackBuild b/network/verlihub/verlihub.SlackBuild
index 25c0729a42..e9d5f550c4 100644
--- a/network/verlihub/verlihub.SlackBuild
+++ b/network/verlihub/verlihub.SlackBuild
@@ -71,6 +71,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# https://gcc.gnu.org/gcc-7/porting_to.html
+patch -p1 < $CWD/verlihub-gcc7.patch
+
patch -p1 < $CWD/verlihub-header.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \