From b4f164a81cd8b24517e17b7c5adad38d09968638 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 11 Apr 2020 16:09:18 +0200 Subject: 20200411.1 global branch merge. Signed-off-by: Matteo Bernardini --- network/MEGAsync/MEGAsync.SlackBuild | 6 +- network/MEGAsync/MEGAsync.info | 10 +- .../fix-double-declaration-of-tgkill.patch | 26 + .../NetworkManager-openvpn.SlackBuild | 3 +- .../NetworkManager-openvpn.info | 6 +- .../NetworkManager-vpnc.SlackBuild | 3 +- .../NetworkManager-vpnc/NetworkManager-vpnc.info | 6 +- network/aMule/aMule.SlackBuild | 2 +- network/aMule/aMule.info | 6 +- network/bip/bip.SlackBuild | 2 +- network/bitcoin/bitcoin.SlackBuild | 2 + network/bitcoin/boost-1.66.0.patch | 82 + network/bwm-ng/bwm-ng.SlackBuild | 3 + network/bwm-ng/fix_gcc7_inline.patch | 40 + network/ccnet/ccnet.SlackBuild | 10 +- network/ccnet/ccnet.info | 6 +- network/cherokee/cherokee.SlackBuild | 8 +- network/cherokee/cherokee.info | 6 +- network/dobbscoin/dobbscoin.SlackBuild | 9 +- network/dovecot/README | 27 - network/dovecot/doinst.sh | 26 - network/dovecot/dovecot.SlackBuild | 133 -- network/dovecot/dovecot.info | 10 - network/dovecot/rc.dovecot | 55 - network/dovecot/slack-desc | 19 - network/dsniff/24_Fix-OpenSSL1.1.0-Build.patch | 202 ++ network/dsniff/dsniff.SlackBuild | 2 + network/ekiga/ekiga-4.0.1-boost-signals2.patch | 2179 ++++++++++++++++++++ network/ekiga/ekiga-4.0.1-libresolv.patch | 13 + network/ekiga/ekiga.SlackBuild | 4 +- network/emacs-w3m/emacs-w3m.SlackBuild | 8 +- network/emacs-w3m/emacs-w3m.info | 6 +- network/falkon/falkon.SlackBuild | 4 +- network/falkon/falkon.info | 6 +- network/fcgiwrap/fcgiwrap.SlackBuild | 2 +- network/fqterm/fqterm.SlackBuild | 32 +- network/fqterm/fqterm.info | 6 +- network/httrack/httrack.SlackBuild | 2 +- network/httrack/httrack.info | 6 +- network/hylafax/gcc.patch | 12 + network/hylafax/hylafax.SlackBuild | 2 + network/ifstatus/README | 10 - network/ifstatus/ifstatus.SlackBuild | 91 - network/ifstatus/ifstatus.info | 10 - network/ifstatus/ifstatus.patch | 66 - network/ifstatus/slack-desc | 19 - network/iperf/iperf.SlackBuild | 29 +- network/iperf/iperf.info | 6 +- .../iperf/patches/0_iperf-2.0.8-debuginfo.patch | 17 + network/iperf/patches/1_iperf-2.0.8-bindfail.patch | 42 + network/iperf/patches/2_iperf-2.0.8-math.patch | 75 + network/jigdo/jigdo-0.7.3-gcc7.patch | 39 + network/jigdo/jigdo.SlackBuild | 3 + network/kmess/README | 5 - network/kmess/doinst.sh | 10 - network/kmess/giflib-5.0.patch | 95 - network/kmess/kmess.SlackBuild | 100 - network/kmess/kmess.info | 10 - network/kmess/slack-desc | 19 - network/knock/knock.SlackBuild | 26 +- network/knock/knock.info | 6 +- network/krb5/EXPORT | 13 - network/krb5/README | 10 - network/krb5/README.krb5 | 52 - network/krb5/doinst.sh | 26 - network/krb5/krb5.SlackBuild | 115 -- network/krb5/krb5.info | 10 - network/krb5/rc.kadmind | 54 - network/krb5/rc.krb5kdc | 54 - network/krb5/slack-desc | 19 - network/leechcraft/README | 26 - network/leechcraft/doinst.sh | 22 - network/leechcraft/leechcraft.SlackBuild | 111 - network/leechcraft/leechcraft.info | 10 - network/leechcraft/slack-desc | 19 - network/linuxdcpp/linuxdcpp.SlackBuild | 2 +- network/memcached/memcached.SlackBuild | 2 +- network/midori/README | 10 +- network/midori/doinst.sh | 16 - network/midori/midori.SlackBuild | 47 +- network/midori/midori.info | 10 +- network/midori/slack-desc | 6 +- network/mldonkey/mldonkey.SlackBuild | 20 +- network/mldonkey/mldonkey.info | 6 +- network/mosh/mosh.SlackBuild | 2 +- network/museek+/README | 23 - network/museek+/doinst.sh | 26 - network/museek+/museek+.SlackBuild | 90 - network/museek+/museek+.info | 10 - network/museek+/museek-python.diff | 44 - network/museek+/rc.museekd | 105 - network/museek+/slack-desc | 19 - network/ncrack/ncrack.SlackBuild | 2 +- network/nghttp2/README | 4 - network/nghttp2/nghttp2.SlackBuild | 102 - network/nghttp2/nghttp2.info | 10 - network/nghttp2/slack-desc | 19 - network/opendkim/opendkim.SlackBuild | 3 + network/opendkim/openssl_1.1.0_compat.patch | 90 + network/openfortivpn/openfortivpn.SlackBuild | 2 +- network/openfortivpn/openfortivpn.info | 6 +- network/opensmtpd/aliases | 34 +- .../opensmtpd/fix-crash-on-authentication.patch | 43 - network/opensmtpd/openbsd64-020-smtpd.patch | 31 - network/opensmtpd/openbsd65-029-smptd-tls.patch | 52 - .../opensmtpd/openbsd65-031-smtpd-envelope.patch | 199 -- network/opensmtpd/openbsd66-019-smtpd-exec.patch | 46 - network/opensmtpd/opensmtpd.SlackBuild | 31 +- network/opensmtpd/opensmtpd.info | 6 +- network/phodav/phodav.SlackBuild | 18 +- network/phodav/phodav.info | 6 +- .../pidgin-musictracker.SlackBuild | 2 +- network/pidgin-sipe/pidgin-sipe.SlackBuild | 2 +- network/pidgin-sipe/pidgin-sipe.info | 6 +- network/postfix/README | 39 - network/postfix/doinst.sh | 40 - network/postfix/patches/postconf.diff | 31 - network/postfix/postfix.SlackBuild | 199 -- network/postfix/postfix.info | 10 - network/postfix/rc.postfix | 67 - network/postfix/slack-desc | 19 - network/pptp/pptp.SlackBuild | 2 +- network/pptp/pptp.info | 6 +- network/qTox/qTox.SlackBuild | 2 + network/rtorrent/README | 2 + network/rtorrent/rtorrent.SlackBuild | 10 +- network/s-nail/README | 16 - network/s-nail/doinst.sh | 13 - network/s-nail/s-nail.SlackBuild | 135 -- network/s-nail/s-nail.info | 10 - network/s-nail/slack-desc | 19 - network/seafile-client/README | 15 - network/seafile-client/seafile-client.SlackBuild | 103 - network/seafile-client/seafile-client.info | 10 - network/seafile-client/slack-desc | 19 - network/seafile/README | 15 + network/seafile/seafile.SlackBuild | 102 + network/seafile/seafile.info | 10 + network/seafile/slack-desc | 19 + network/socat/README | 12 - network/socat/slack-desc | 19 - network/socat/socat.SlackBuild | 101 - network/socat/socat.info | 10 - network/spice-gtk/spice-gtk.SlackBuild | 7 +- network/spice-gtk/spice-gtk.info | 6 +- network/spice/spice.SlackBuild | 2 +- network/spice/spice.info | 6 +- network/sqlrelay/sqlrelay.SlackBuild | 8 +- network/sqlrelay/sqlrelay.info | 6 +- network/sshfs-fuse/README | 12 - network/sshfs-fuse/fixrst.diff | 22 - network/sshfs-fuse/slack-desc | 19 - network/sshfs-fuse/sshfs-fuse.SlackBuild | 119 -- network/sshfs-fuse/sshfs-fuse.info | 10 - network/sshfs-fuse/sshfs.1.gz | Bin 4809 -> 0 bytes network/transmission-remote-gtk/README | 4 +- .../transmission-remote-gtk.SlackBuild | 18 +- .../transmission-remote-gtk.info | 6 +- network/vde2/vde2.SlackBuild | 3 + ...de_cryptcab-compile-against-openssl-1.1.0.patch | 92 + network/verlihub/verlihub-gcc7.patch | 18 + network/verlihub/verlihub.SlackBuild | 3 + network/x11spice/README | 16 + network/x11spice/slack-desc | 11 + network/x11spice/x11spice.SlackBuild | 104 + network/x11spice/x11spice.info | 10 + network/zeek/zeek.SlackBuild | 7 + 167 files changed, 3508 insertions(+), 3419 deletions(-) create mode 100644 network/MEGAsync/fix-double-declaration-of-tgkill.patch create mode 100644 network/bitcoin/boost-1.66.0.patch create mode 100644 network/bwm-ng/fix_gcc7_inline.patch delete mode 100644 network/dovecot/README delete mode 100644 network/dovecot/doinst.sh delete mode 100644 network/dovecot/dovecot.SlackBuild delete mode 100644 network/dovecot/dovecot.info delete mode 100644 network/dovecot/rc.dovecot delete mode 100644 network/dovecot/slack-desc create mode 100644 network/dsniff/24_Fix-OpenSSL1.1.0-Build.patch create mode 100644 network/ekiga/ekiga-4.0.1-boost-signals2.patch create mode 100644 network/ekiga/ekiga-4.0.1-libresolv.patch create mode 100644 network/hylafax/gcc.patch delete mode 100644 network/ifstatus/README delete mode 100644 network/ifstatus/ifstatus.SlackBuild delete mode 100644 network/ifstatus/ifstatus.info delete mode 100644 network/ifstatus/ifstatus.patch delete mode 100644 network/ifstatus/slack-desc create mode 100644 network/iperf/patches/0_iperf-2.0.8-debuginfo.patch create mode 100644 network/iperf/patches/1_iperf-2.0.8-bindfail.patch create mode 100644 network/iperf/patches/2_iperf-2.0.8-math.patch create mode 100644 network/jigdo/jigdo-0.7.3-gcc7.patch delete mode 100644 network/kmess/README delete mode 100644 network/kmess/doinst.sh delete mode 100644 network/kmess/giflib-5.0.patch delete mode 100644 network/kmess/kmess.SlackBuild delete mode 100644 network/kmess/kmess.info delete mode 100644 network/kmess/slack-desc delete mode 100644 network/krb5/EXPORT delete mode 100644 network/krb5/README delete mode 100644 network/krb5/README.krb5 delete mode 100644 network/krb5/doinst.sh delete mode 100644 network/krb5/krb5.SlackBuild delete mode 100644 network/krb5/krb5.info delete mode 100644 network/krb5/rc.kadmind delete mode 100644 network/krb5/rc.krb5kdc delete mode 100644 network/krb5/slack-desc delete mode 100644 network/leechcraft/README delete mode 100644 network/leechcraft/doinst.sh delete mode 100644 network/leechcraft/leechcraft.SlackBuild delete mode 100644 network/leechcraft/leechcraft.info delete mode 100644 network/leechcraft/slack-desc delete mode 100644 network/museek+/README delete mode 100644 network/museek+/doinst.sh delete mode 100644 network/museek+/museek+.SlackBuild delete mode 100644 network/museek+/museek+.info delete mode 100644 network/museek+/museek-python.diff delete mode 100644 network/museek+/rc.museekd delete mode 100644 network/museek+/slack-desc delete mode 100644 network/nghttp2/README delete mode 100644 network/nghttp2/nghttp2.SlackBuild delete mode 100644 network/nghttp2/nghttp2.info delete mode 100644 network/nghttp2/slack-desc create mode 100644 network/opendkim/openssl_1.1.0_compat.patch delete mode 100644 network/opensmtpd/fix-crash-on-authentication.patch delete mode 100644 network/opensmtpd/openbsd64-020-smtpd.patch delete mode 100644 network/opensmtpd/openbsd65-029-smptd-tls.patch delete mode 100644 network/opensmtpd/openbsd65-031-smtpd-envelope.patch delete mode 100644 network/opensmtpd/openbsd66-019-smtpd-exec.patch delete mode 100644 network/postfix/README delete mode 100644 network/postfix/doinst.sh delete mode 100644 network/postfix/patches/postconf.diff delete mode 100644 network/postfix/postfix.SlackBuild delete mode 100644 network/postfix/postfix.info delete mode 100644 network/postfix/rc.postfix delete mode 100644 network/postfix/slack-desc delete mode 100644 network/s-nail/README delete mode 100644 network/s-nail/doinst.sh delete mode 100644 network/s-nail/s-nail.SlackBuild delete mode 100644 network/s-nail/s-nail.info delete mode 100644 network/s-nail/slack-desc delete mode 100644 network/seafile-client/README delete mode 100644 network/seafile-client/seafile-client.SlackBuild delete mode 100644 network/seafile-client/seafile-client.info delete mode 100644 network/seafile-client/slack-desc create mode 100644 network/seafile/README create mode 100644 network/seafile/seafile.SlackBuild create mode 100644 network/seafile/seafile.info create mode 100644 network/seafile/slack-desc delete mode 100644 network/socat/README delete mode 100644 network/socat/slack-desc delete mode 100644 network/socat/socat.SlackBuild delete mode 100644 network/socat/socat.info delete mode 100644 network/sshfs-fuse/README delete mode 100644 network/sshfs-fuse/fixrst.diff delete mode 100644 network/sshfs-fuse/slack-desc delete mode 100644 network/sshfs-fuse/sshfs-fuse.SlackBuild delete mode 100644 network/sshfs-fuse/sshfs-fuse.info delete mode 100644 network/sshfs-fuse/sshfs.1.gz create mode 100644 network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch create mode 100644 network/verlihub/verlihub-gcc7.patch create mode 100644 network/x11spice/README create mode 100644 network/x11spice/slack-desc create mode 100644 network/x11spice/x11spice.SlackBuild create mode 100644 network/x11spice/x11spice.info (limited to 'network') diff --git a/network/MEGAsync/MEGAsync.SlackBuild b/network/MEGAsync/MEGAsync.SlackBuild index d15a188abf..abc655a6c3 100644 --- a/network/MEGAsync/MEGAsync.SlackBuild +++ b/network/MEGAsync/MEGAsync.SlackBuild @@ -24,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=MEGAsync -VERSION=${VERSION:-3.7.1.0} -SDK=${SDK:-ce7b5f0b390a02ffd1fbfbac741deb5294f7a5df} +VERSION=${VERSION:-4.2.5.0} +SDK=${SDK:-3.6.2b} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -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/fix-double-declaration-of-tgkill.patch + cd src/MEGASync/mega ./autogen.sh CFLAGS="$SLKCFLAGS" \ diff --git a/network/MEGAsync/MEGAsync.info b/network/MEGAsync/MEGAsync.info index dca63a1e20..cc4f6713ca 100644 --- a/network/MEGAsync/MEGAsync.info +++ b/network/MEGAsync/MEGAsync.info @@ -1,10 +1,10 @@ PRGNAM="MEGAsync" -VERSION="3.7.1.0" +VERSION="4.2.5.0" HOMEPAGE="https://github.com/meganz/MEGAsync/" -DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v3.7.1.0_Linux/MEGAsync-3.7.1.0_Linux.tar.gz \ - https://github.com/meganz/sdk/archive/ce7b5f0/sdk-ce7b5f0b390a02ffd1fbfbac741deb5294f7a5df.tar.gz" -MD5SUM="d44da5216693efc7f63ba85b477ea46c \ - e7716ddf00b1b3f0166cfb8f222d8550" +DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.2.5.0_Linux/MEGAsync-4.2.5.0_Linux.tar.gz \ + https://github.com/meganz/sdk/archive/v3.6.2b/sdk-3.6.2b.tar.gz" +MD5SUM="19fc192b091d94e171e130443ad3bede \ + 205a78d8e98bb67ebfc7c840388ace73" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libuv libsodium cryptopp FreeImage c-ares libmediainfo" diff --git a/network/MEGAsync/fix-double-declaration-of-tgkill.patch b/network/MEGAsync/fix-double-declaration-of-tgkill.patch new file mode 100644 index 0000000000..beeea5d1b4 --- /dev/null +++ b/network/MEGAsync/fix-double-declaration-of-tgkill.patch @@ -0,0 +1,26 @@ +diff --git a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc +index 48f91682..1b7ed059 100644 +--- a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc ++++ b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc +@@ -103,12 +103,6 @@ + #define PR_SET_PTRACER 0x59616d61 + #endif + +-// A wrapper for the tgkill syscall: send a signal to a specific thread. +-static int tgkill(pid_t tgid, pid_t tid, int sig) { +- return syscall(__NR_tgkill, tgid, tid, sig); +- return 0; +-} +- + namespace google_breakpad { + + namespace { +@@ -347,7 +341,7 @@ void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) { + // In order to retrigger it, we have to queue a new signal by calling + // kill() ourselves. The special case (si_pid == 0 && sig == SIGABRT) is + // due to the kernel sending a SIGABRT from a user request via SysRQ. +- if (tgkill(getpid(), syscall(__NR_gettid), sig) < 0) { ++ if (sys_tgkill(getpid(), syscall(__NR_gettid), sig) < 0) { + // If we failed to kill ourselves (e.g. because a sandbox disallows us + // to do so), we instead resort to terminating our process. This will + // result in an incorrect exit code. diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild b/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild index 46b08ddac2..187e9bc831 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.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -88,6 +88,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --without-libnm-glib \ --build=$ARCH-slackware-linux make diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.info b/network/NetworkManager-openvpn/NetworkManager-openvpn.info index 85a02339c8..d0ab2c6a58 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.10" 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.10.tar.xz" +MD5SUM="4dbbc103761facc7a61a1c00dfd55231" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild b/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild index 139ccd3286..7f79571594 100644 --- a/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild +++ b/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=NetworkManager-vpnc -VERSION=${VERSION:-1.2.4} +VERSION=${VERSION:-1.2.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -78,6 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --without-libnm-glib \ --build=$ARCH-slackware-linux make diff --git a/network/NetworkManager-vpnc/NetworkManager-vpnc.info b/network/NetworkManager-vpnc/NetworkManager-vpnc.info index 1aa961eebb..5f7354fdae 100644 --- a/network/NetworkManager-vpnc/NetworkManager-vpnc.info +++ b/network/NetworkManager-vpnc/NetworkManager-vpnc.info @@ -1,8 +1,8 @@ PRGNAM="NetworkManager-vpnc" -VERSION="1.2.4" +VERSION="1.2.6" HOMEPAGE="http://projects.gnome.org/NetworkManager/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.4.tar.xz" -MD5SUM="b482a231f25d3857fd320d7c0b25c785" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.6.tar.xz" +MD5SUM="4e88a3bde38e3921c2adb9983fb9d09f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="vpnc" diff --git a/network/aMule/aMule.SlackBuild b/network/aMule/aMule.SlackBuild index c9a7b6a33b..f658b46ead 100644 --- a/network/aMule/aMule.SlackBuild +++ b/network/aMule/aMule.SlackBuild @@ -5,7 +5,7 @@ # Maintained by Ozan Türkyılmaz ozan.turkyilmaz@gmial.com PRGNAM=aMule -VERSION=${VERSION:-r11003} +VERSION=${VERSION:-r11025} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/aMule/aMule.info b/network/aMule/aMule.info index 4bdfb50f66..23353ac8ab 100644 --- a/network/aMule/aMule.info +++ b/network/aMule/aMule.info @@ -1,8 +1,8 @@ PRGNAM="aMule" -VERSION="r11003" +VERSION="r11025" HOMEPAGE="http://www.amule.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/aMule-r11003.tar.xz" -MD5SUM="83e46e574fc5355da4b531c369211a0a" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/aMule-r11025.tar.xz" +MD5SUM="edb864a6858bfe8e7033fe70a67c65c7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cryptopp wxPython" 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 37ddf51ef1..6075065601 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 +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/bwm-ng/bwm-ng.SlackBuild b/network/bwm-ng/bwm-ng.SlackBuild index e9eb39918c..80297935f6 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" \ ./autogen.sh \ --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 a3526ecc64..87c519de3a 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 a69de55eb3..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, 2019 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.4} -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 eb0eb93f65..0000000000 --- a/network/dovecot/dovecot.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="dovecot" -VERSION="2.3.4" -HOMEPAGE="http://www.dovecot.org/" -DOWNLOAD="http://www.dovecot.org/releases/2.3/dovecot-2.3.4.tar.gz" -MD5SUM="00eebc835a8793e8a167a616a78f4753" -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 +--- +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/ekiga/ekiga-4.0.1-boost-signals2.patch b/network/ekiga/ekiga-4.0.1-boost-signals2.patch new file mode 100644 index 0000000000..026495cdf5 --- /dev/null +++ b/network/ekiga/ekiga-4.0.1-boost-signals2.patch @@ -0,0 +1,2179 @@ +Patch by Robert Scheck for Ekiga 4.0.1, which backports +the following upstream commits (with some minor downstream-only changes to get the +Ekiga building) for Boost.Signals2 support: + + - https://github.com/GNOME/ekiga/commit/12641b735a9886a080949465d4da6d4569822ed2 + - https://github.com/GNOME/ekiga/commit/44ef7c66d055d01bede6627a8b31e4135f54f807 + - https://github.com/GNOME/ekiga/commit/95e2daa3953355118abec5a30fb2642a105705b2 + - https://github.com/GNOME/ekiga/commit/aabf103dcf7f0e61ed1903bc4f37f1dd549fb2ef + - https://github.com/GNOME/ekiga/commit/b8ea1fe8c15a4fa6a8bfde5e8b51febc74f8e529 + +This backport makes sense, because unfortunately upstream didn't release anything +after Ekiga 4.0.1, while 8c954b8ab3a771900f125375ba652afaf1966d19 just immediately +ends with a segmentation fault (which is the latest Git commit as of writing). And +openSUSE uses 8c954b8ab3a771900f125375ba652afaf1966d19 from a few months after the +Ekiga 4.0.1 release, but with Boost.Signals2 support. While this Git commit leads +even to a starting Ekiga, a not picked up inbound ringing phone call leads sooner +or later to a segmentation fault (the caller needs to hit the correct point before +hanging up and it thus takes sometimes 2-3 tries until it crashes). Aside of that, +there are graphical glitches in the popup/dialog when actually having a call. And +finally quitting Ekiga sometimes also ends with yet another segmentation fault... + +While I fortunately didn't see any of the above mentioned issues with Ekiga 4.0.1 +and this Boost.Signals2 backport patch, any before existing old Ekiga 4.0.1 issues +will exist further on for sure... + +--- ekiga-4.0.1/configure.ac 2019-05-16 20:32:30.610373983 +0200 ++++ ekiga-4.0.1/configure.ac.boost-signals2 2019-05-16 22:11:08.958062692 +0200 +@@ -173,15 +173,16 @@ + dnl ############################### + dnl Mandatory BOOST support + dnl ############################### +-AX_BOOST_BASE([1.34]) +-AX_BOOST_SIGNALS ++AX_BOOST_BASE([1.53]) + +-if test "x${ax_cv_boost_signals}" == "xno"; then +- AC_MSG_ERROR([You need the boost signals library to compile Ekiga]) +-fi ++CPPFLAGS_save="$CPPFLAGS" ++CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" ++AC_CHECK_HEADER(boost/signals2.hpp,, found_signals2=no) ++CPPFLAGS="$CPPFLAGS_save" + +-BOOST_LIBS="${BOOST_SIGNALS_LIB}" +-AC_SUBST(BOOST_LIBS) ++if test "x$found_signals2" = "xno"; then ++ AC_MSG_ERROR([Could not find BOOST signals2 headers]) ++fi + + + dnl ############################### +@@ -722,6 +723,13 @@ + AC_MSG_ERROR([You need ptlib expat support to compile ekiga]) + fi + ++# Make sure ptlib and opal don't force no-exceptions, ++# as we need them for boost's signals2 ++PTLIB_CFLAGS="$PTLIB_CFLAGS -fexceptions" ++AC_SUBST(PTLIB_CFLAGS) ++OPAL_CFLAGS="$OPAL_CFLAGS -fexceptions" ++AC_SUBST(OPAL_CFLAGS) ++ + SUFFIX= + AC_ARG_ENABLE([opal-debug], + [AS_HELP_STRING([--enable-opal-debug],[link to debug versions of opal and ptlib (opal_d and ptlib_d) (default is disabled)])], +--- ekiga-4.0.1/lib/engine/account/account-core.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/account/account-core.h.boost-signals2 2019-05-16 20:34:25.949622624 +0200 +@@ -106,26 +106,26 @@ + + /** This signal is emitted when a bank has been added to the core + */ +- boost::signal1 bank_added; ++ boost::signals2::signal bank_added; + + /** This signal is emitted when a bank has been removed from the core + */ +- boost::signal1 bank_removed; ++ boost::signals2::signal bank_removed; + + /** This signal is emitted when a account has been added to one of + * the banks + */ +- boost::signal2 account_added; ++ boost::signals2::signal account_added; + + /** This signal is emitted when a account has been removed from one of + * the banks + */ +- boost::signal2 account_removed; ++ boost::signals2::signal account_removed; + + /** This signal is emitted when a account has been updated in one of + * the banks + */ +- boost::signal2 account_updated; ++ boost::signals2::signal account_updated; + + private: + +@@ -147,7 +147,7 @@ + /** This signal is emitted when the AccountCore Service has been + * updated. + */ +- boost::signal0 updated; ++ boost::signals2::signal updated; + + + /** This chain allows the AccountCore to present forms to the user +--- ekiga-4.0.1/lib/engine/account/bank.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/account/bank.h.boost-signals2 2019-05-16 20:35:52.157810900 +0200 +@@ -74,15 +74,15 @@ + + /** This signal is emitted when a account has been added. + */ +- boost::signal1 account_added; ++ boost::signals2::signal account_added; + + /** This signal is emitted when a account has been removed. + */ +- boost::signal1 account_removed; ++ boost::signals2::signal account_removed; + + /** This signal is emitted when a account has been updated. + */ +- boost::signal1 account_updated; ++ boost::signals2::signal account_updated; + + /** This chain allows the BankImpl to present forms to the user + */ +--- ekiga-4.0.1/lib/engine/account/bank-impl.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/account/bank-impl.h.boost-signals2 2019-05-16 20:34:41.093655548 +0200 +@@ -74,7 +74,7 @@ + template + class BankImpl: + public Bank, +- public boost::signals::trackable, ++ public boost::signals2::trackable, + protected RefLister + { + +--- ekiga-4.0.1/lib/engine/addressbook/book.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/addressbook/book.h.boost-signals2 2019-05-16 20:36:30.212894662 +0200 +@@ -92,17 +92,17 @@ + + /** This signal is emitted when a Contact has been added to the Book. + */ +- boost::signal1 contact_added; ++ boost::signals2::signal contact_added; + + + /** This signal is emitted when a Contact has been removed from the Book. + */ +- boost::signal1 contact_removed; ++ boost::signals2::signal contact_removed; + + + /** This signal is emitted when a Contact has been updated in the Book. + */ +- boost::signal1 contact_updated; ++ boost::signals2::signal contact_updated; + }; + + typedef boost::shared_ptr BookPtr; +--- ekiga-4.0.1/lib/engine/addressbook/contact-core.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/addressbook/contact-core.cpp.boost-signals2 2019-05-16 21:26:27.190245510 +0200 +@@ -50,7 +50,7 @@ + + Ekiga::ContactCore::~ContactCore () + { +- for (std::list::iterator iter = conns.begin (); iter != conns.end (); ++iter) ++ for (std::list::iterator iter = conns.begin (); iter != conns.end (); ++iter) + iter->disconnect (); + } + +--- ekiga-4.0.1/lib/engine/addressbook/contact-core.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/addressbook/contact-core.h.boost-signals2 2019-05-16 21:26:20.542228371 +0200 +@@ -118,37 +118,37 @@ + /** This signal is emitted when a Ekiga::Source has been + * added to the ContactCore Service. + */ +- boost::signal1 source_added; ++ boost::signals2::signal source_added; + + /** This signal is emitted when a book has been added to one of + * the sources + */ +- boost::signal2 book_added; ++ boost::signals2::signal book_added; + + /** This signal is emitted when a book has been removed from one of + * the sources + */ +- boost::signal2 book_removed; ++ boost::signals2::signal book_removed; + + /** This signal is emitted when a book has been updated in one of + * the sources + */ +- boost::signal2 book_updated; ++ boost::signals2::signal book_updated; + + /** This signal is emitted when a contact has been added to one of + * the book of one of the sources + */ +- boost::signal3 contact_added; ++ boost::signals2::signal contact_added; + + /** This signal is emitted when a contact has been removed from one of + * the book of one of the sources + */ +- boost::signal3 contact_removed; ++ boost::signals2::signal contact_removed; + + /** This signal is emitted when a contact has been updated in one of + * the book of one of the sources + */ +- boost::signal3 contact_updated; ++ boost::signals2::signal contact_updated; + + private: + +@@ -174,7 +174,7 @@ + std::list > contact_decorators; + + /*** Misc stuff ***/ +- std::list conns; ++ std::list conns; + }; + + /** +--- ekiga-4.0.1/lib/engine/addressbook/source.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/addressbook/source.h.boost-signals2 2019-05-16 20:38:37.038176631 +0200 +@@ -63,32 +63,32 @@ + + /** This signal is emitted when a Book has been added to the Source. + */ +- boost::signal1 book_added; ++ boost::signals2::signal book_added; + + + /** This signal is emitted when a Book has been updated in the Source. + */ +- boost::signal1 book_updated; ++ boost::signals2::signal book_updated; + + + /** This signal is emitted when a Book has been removed in the Source. + */ +- boost::signal1 book_removed; ++ boost::signals2::signal book_removed; + + /** This signal is emitted when a Contact has been added to a book in + * this source. + */ +- boost::signal2 contact_added; ++ boost::signals2::signal contact_added; + + /** This signal is emitted when a Contact has been removed from a book in + * this source. + */ +- boost::signal2 contact_removed; ++ boost::signals2::signal contact_removed; + + /** This signal is emitted when a Contact has been updated in a book in + * this source + */ +- boost::signal2 contact_updated; ++ boost::signals2::signal contact_updated; + }; + + typedef boost::shared_ptr SourcePtr; +--- ekiga-4.0.1/lib/engine/audioinput/audioinput-core.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/audioinput/audioinput-core.h.boost-signals2 2019-05-16 20:39:25.511285526 +0200 +@@ -136,7 +136,7 @@ + /** This signal is emitted when a Ekiga::AudioInputManager has been + * added to the AudioInputCore Service. + */ +- boost::signal1 manager_added; ++ boost::signals2::signal manager_added; + + + /*** AudioInput Device Management ***/ +@@ -254,23 +254,23 @@ + + /** See audioinput-manager.h for the API + */ +- boost::signal3 device_opened; +- boost::signal2 device_closed; +- boost::signal3 device_error; ++ boost::signals2::signal device_opened; ++ boost::signals2::signal device_closed; ++ boost::signals2::signal device_error; + + /** This signal is emitted when an audio device input has been added to the system. + * This signal will be emitted if add_device was called with a device name and + * a manager claimed support for this device. + * @param device the audio input device that was added. + */ +- boost::signal2 device_added; ++ boost::signals2::signal device_added; + + /** This signal is emitted when an audio input device has been removed from the system. + * This signal will be emitted if remove_device was called with a device name and + * a manager claimed support for this device. + * @param device the audio input device that was removed. + */ +- boost::signal2 device_removed; ++ boost::signals2::signal device_removed; + + private: + void on_set_device (const AudioInputDevice & device); +--- ekiga-4.0.1/lib/engine/audioinput/audioinput-manager.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/audioinput/audioinput-manager.h.boost-signals2 2019-05-16 20:40:06.093377163 +0200 +@@ -39,7 +39,7 @@ + #define __AUDIOINPUT_MANAGER_H__ + + #include +-#include ++#include + #include + + #include "audioinput-info.h" +@@ -148,18 +148,18 @@ + * @param device the audio input device that was opened. + * @param config the current audio input device configuration (current volume, etc.). + */ +- boost::signal2 device_opened; ++ boost::signals2::signal device_opened; + + /** This signal is emitted when an audio input device is closed. + * @param device the audio input device that was closed. + */ +- boost::signal1 device_closed; ++ boost::signals2::signal device_closed; + + /** This signal is emitted when an error occurs when opening a audio input device. + * @param device the audio input device that caused the error. + * @param error_code the audio input device error code. + */ +- boost::signal2 device_error; ++ boost::signals2::signal device_error; + + + protected: +--- ekiga-4.0.1/lib/engine/audiooutput/audiooutput-core.h 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/audiooutput/audiooutput-core.h.boost-signals2 2019-05-16 20:40:58.822496863 +0200 +@@ -128,7 +128,7 @@ + /** This signal is emitted when a Ekiga::AudioOutputManager has been + * added to the AudioOutputCore Service. + */ +- boost::signal1 manager_added; ++ boost::signals2::signal manager_added; + + + /** Get a list of all devices supported by all managers registered to the core. +@@ -299,23 +299,23 @@ + + /** See audiooutput-manager.h for the API + */ +- boost::signal4 device_opened; +- boost::signal3 device_closed; +- boost::signal4 device_error; ++ boost::signals2::signal device_opened; ++ boost::signals2::signal device_closed; ++ boost::signals2::signal device_error; + + /** This signal is emitted when an audio output device has been added to the system. + * This signal will be emitted if add_device was called with a device name and + * a manager claimed support for this device. + * @param device the audio output device that was added. + */ +- boost::signal2 device_added; ++ boost::signals2::signal device_added; + + /** This signal is emitted when an audio output device has been removed from the system. + * This signal will be emitted if remove_device was called with a device name and + * a manager claimed support for this device. + * @param device the audio output device that was removed. + */ +- boost::signal2 device_removed; ++ boost::signals2::signal device_removed; + + private: + void on_set_device (const AudioOutputDevice & device); +--- ekiga-4.0.1/lib/engine/audiooutput/audiooutput-manager.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/audiooutput/audiooutput-manager.h.boost-signals2 2019-05-16 20:41:41.638594580 +0200 +@@ -39,7 +39,7 @@ + #define __AUDIOOUTPUT_MANAGER_H__ + + #include +-#include ++#include + #include + + #include "audiooutput-info.h" +@@ -152,20 +152,20 @@ + * @param device the audio output device that was opened. + * @param config the current audio output device configuration (current volume, etc.). + */ +- boost::signal3 device_opened; ++ boost::signals2::signal device_opened; + + /** This signal is emitted when an audio output device is closed. + * @param prim whether the primary or secondary audio output device was closed. + * @param device the audio output device that was closed. + */ +- boost::signal2 device_closed; ++ boost::signals2::signal device_closed; + + /** This signal is emitted when an error occurs when opening an audio output device. + * @param prim whether the primary or secondary audio output device caused the error. + * @param device the audio output device that caused the error. + * @param error_code the audio output device error code. + */ +- boost::signal3 device_error; ++ boost::signals2::signal device_error; + + protected: + typedef struct ManagerState { +--- ekiga-4.0.1/lib/engine/chat/chat-core.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/chat/chat-core.h.boost-signals2 2019-05-16 20:42:03.614644914 +0200 +@@ -100,7 +100,7 @@ + /** This signal is emitted when an Ekiga::Dialect has been added to + * the ChatCore service. + */ +- boost::signal1 dialect_added; ++ boost::signals2::signal dialect_added; + + private: + +@@ -116,7 +116,7 @@ + + /** This signal is emitted when the ChatCore service has been updated. + */ +- boost::signal0 updated; ++ boost::signals2::signal updated; + + /** This chain allows the ChatCore to present forms to the user + */ +--- ekiga-4.0.1/lib/engine/chat/chat.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/chat/chat.h.boost-signals2 2019-05-16 20:42:45.038740118 +0200 +@@ -37,7 +37,7 @@ + #define __CHAT_H__ + + #include +-#include ++#include + #include + + #include +@@ -113,15 +113,15 @@ + + /** This signal is emitted when the Chat has been updated. + */ +- boost::signal0 updated; ++ boost::signals2::signal updated; + + /** This signal is emitted when the user requested to see this Chat + */ +- boost::signal0 user_requested; ++ boost::signals2::signal user_requested; + + /** This signal is emitted when the Chat has been removed. + */ +- boost::signal0 removed; ++ boost::signals2::signal removed; + + /** Feed possible actions on this Chat to the given MenuBuilder + * @param A MenuBuilder object to populate. +--- ekiga-4.0.1/lib/engine/chat/dialect.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/chat/dialect.h.boost-signals2 2019-05-16 20:43:23.359828571 +0200 +@@ -72,12 +72,12 @@ + /** This signal is emitted when an Ekiga::SimpleChat has been added to + * the dialect. + */ +- boost::signal1 simple_chat_added; ++ boost::signals2::signal simple_chat_added; + + /** This signal is emitted when an Ekiga::MultipleChat has been added to + * the dialect. + */ +- boost::signal1 multiple_chat_added; ++ boost::signals2::signal multiple_chat_added; + + /** This chain allows the Dialect to present forms to the user. + */ +--- ekiga-4.0.1/lib/engine/chat/dialect-impl.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/chat/dialect-impl.h.boost-signals2 2019-05-16 21:27:11.112358866 +0200 +@@ -47,7 +47,7 @@ + typename MultipleChatType = MultipleChat> + class DialectImpl: + public Dialect, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +@@ -75,10 +75,10 @@ + + /* More STL-like ways to access the chats within this Ekiga::DialectImpl + */ +- typedef typename Ekiga::map_key_iterator, std::list > > simple_iterator; +- typedef typename Ekiga::map_key_const_iterator, std::list > > simple_const_iterator; +- typedef typename Ekiga::map_key_iterator, std::list > > multiple_iterator; +- typedef typename Ekiga::map_key_const_iterator, std::list > > multiple_const_iterator; ++ typedef typename Ekiga::map_key_iterator, std::list > > simple_iterator; ++ typedef typename Ekiga::map_key_const_iterator, std::list > > simple_const_iterator; ++ typedef typename Ekiga::map_key_iterator, std::list > > multiple_iterator; ++ typedef typename Ekiga::map_key_const_iterator, std::list > > multiple_const_iterator; + + simple_iterator simple_begin (); + simple_iterator simple_end (); +@@ -116,8 +116,8 @@ + + private: + +- std::map, std::list > simple_chats; +- std::map, std::list > multiple_chats; ++ std::map, std::list > simple_chats; ++ std::map, std::list > multiple_chats; + + void on_simple_chat_removed (boost::shared_ptr chat); + +@@ -133,22 +133,22 @@ + template + Ekiga::DialectImpl::~DialectImpl () + { +- for (typename std::map,std::list >::iterator iter = simple_chats.begin (); ++ for (typename std::map,std::list >::iterator iter = simple_chats.begin (); + iter != simple_chats.end (); + iter++) { + +- for (std::list::iterator conn_iter = iter->second.begin (); ++ for (std::list::iterator conn_iter = iter->second.begin (); + conn_iter != iter->second.end (); + ++conn_iter) { + + conn_iter->disconnect (); + } + } +- for (typename std::map,std::list >::iterator iter = multiple_chats.begin (); ++ for (typename std::map,std::list >::iterator iter = multiple_chats.begin (); + iter != multiple_chats.end (); + iter++) { + +- for (std::list::iterator conn_iter = iter->second.begin (); ++ for (std::list::iterator conn_iter = iter->second.begin (); + conn_iter != iter->second.end (); + ++conn_iter) { + +@@ -163,7 +163,7 @@ + { + bool go_on = true; + +- for (typename std::map,std::list >::const_iterator iter = simple_chats.begin (); ++ for (typename std::map,std::list >::const_iterator iter = simple_chats.begin (); + go_on && iter != simple_chats.end (); + iter++) { + +@@ -177,7 +177,7 @@ + { + bool go_on = true; + +- for (typename std::map,std::list >::const_iterator iter = multiple_chats.begin (); ++ for (typename std::map,std::list >::const_iterator iter = multiple_chats.begin (); + go_on && iter != multiple_chats.end (); + iter++) { + +@@ -275,7 +275,7 @@ + void + Ekiga::DialectImpl::on_simple_chat_removed (boost::shared_ptr chat) + { +- for (typename std::list::iterator iter = simple_chats[chat].begin (); ++ for (typename std::list::iterator iter = simple_chats[chat].begin (); + iter != simple_chats[chat].end (); + ++iter) { + +@@ -288,7 +288,7 @@ + void + Ekiga::DialectImpl::on_multiple_chat_removed (boost::shared_ptr chat) + { +- for (typename std::list::iterator iter = multiple_chats[chat].begin (); ++ for (typename std::list::iterator iter = multiple_chats[chat].begin (); + iter != multiple_chats[chat].end (); + ++iter) { + +--- ekiga-4.0.1/lib/engine/components/call-history/history-book.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/call-history/history-book.h.boost-signals2 2019-05-16 20:43:58.286909503 +0200 +@@ -53,7 +53,7 @@ + + class Book: + public Ekiga::Book, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +@@ -86,7 +86,7 @@ + + void clear (); + +- boost::signal0 cleared; ++ boost::signals2::signal cleared; + + private: + +--- ekiga-4.0.1/lib/engine/components/call-history/history-contact.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/call-history/history-contact.h.boost-signals2 2019-05-16 20:44:24.678970855 +0200 +@@ -61,7 +61,7 @@ + + class Contact: + public Ekiga::Contact, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- ekiga-4.0.1/lib/engine/components/local-roster/local-cluster.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/local-roster/local-cluster.h.boost-signals2 2019-05-16 20:45:18.111095580 +0200 +@@ -51,7 +51,7 @@ + class Cluster : + public Ekiga::ClusterImpl, + public Ekiga::Trigger, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- ekiga-4.0.1/lib/engine/components/local-roster/local-presentity.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/local-roster/local-presentity.h.boost-signals2 2019-05-16 20:45:33.511131655 +0200 +@@ -162,7 +162,7 @@ + * This signal makes the Local::Heap know that the XML tree changed + * and hence should be saved + */ +- boost::signal0 trigger_saving; ++ boost::signals2::signal trigger_saving; + + + private: +--- ekiga-4.0.1/lib/engine/components/opal/opal-account.h 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/opal/opal-account.h.boost-signals2 2019-05-16 20:45:50.751172106 +0200 +@@ -153,7 +153,7 @@ + + const std::string as_string () const; + +- boost::signal0 trigger_saving; ++ boost::signals2::signal trigger_saving; + + /* + * This is because an opal account is an Ekiga::PresencePublisher +--- ekiga-4.0.1/lib/engine/components/opal/opal-call.h 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/opal/opal-call.h.boost-signals2 2019-05-16 20:46:08.255213249 +0200 +@@ -55,7 +55,7 @@ + class Call + : public OpalCall, + public Ekiga::Call, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + + public: +--- ekiga-4.0.1/lib/engine/components/opal/opal-gmconf-bridge.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/opal/opal-gmconf-bridge.cpp.boost-signals2 2019-05-16 20:46:26.119255313 +0200 +@@ -35,7 +35,7 @@ + */ + + #include +-#include ++#include + #include + + #include "config.h" +--- ekiga-4.0.1/lib/engine/framework/chain-of-responsibility.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/chain-of-responsibility.h.boost-signals2 2019-05-16 21:15:28.782572221 +0200 +@@ -36,7 +36,7 @@ + #ifndef __CHAIN_OF_RESPONSIBILITY_H__ + #define __CHAIN_OF_RESPONSIBILITY_H__ + +-#include ++#include + #include + + /* This code uses boost signals to implement the "chain of responsibility" +@@ -117,9 +117,8 @@ + + template + struct ChainOfResponsibility: +- public boost::signal1 ++ public boost::signals2::signal + { + }; + }; +--- ekiga-4.0.1/lib/engine/framework/form-request-simple.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/form-request-simple.h.boost-signals2 2019-05-16 20:48:12.632507659 +0200 +@@ -36,7 +36,7 @@ + #ifndef __FORM_REQUEST_SIMPLE_H__ + #define __FORM_REQUEST_SIMPLE_H__ + +-#include ++#include + #include + + #include "form-builder.h" +--- ekiga-4.0.1/lib/engine/framework/gmconf-bridge.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/gmconf-bridge.h.boost-signals2 2019-05-16 20:48:33.432557242 +0200 +@@ -38,7 +38,7 @@ + #define __GMCONF_BRIDGE_H__ + + #include +-#include ++#include + #include + + #include "gmconf.h" +@@ -94,7 +94,7 @@ + * @param key is the GmConf key whose value changed + * @param entry is the new GmConf entry + */ +- boost::signal2 property_changed; ++ boost::signals2::signal property_changed; + + protected : + Ekiga::Service & service; +--- ekiga-4.0.1/lib/engine/framework/live-object.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/live-object.h.boost-signals2 2019-05-16 20:48:53.280604647 +0200 +@@ -62,12 +62,12 @@ + + /** This signal is emitted when the object has been updated. + */ +- boost::signal0 updated; ++ boost::signals2::signal updated; + + + /** This signal is emitted when the object has been removed. + */ +- boost::signal0 removed; ++ boost::signals2::signal removed; + + /** This chain allows the object to present forms to the user + */ +--- ekiga-4.0.1/lib/engine/framework/menu-builder.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/menu-builder.h.boost-signals2 2019-05-16 20:49:09.399643212 +0200 +@@ -37,7 +37,7 @@ + #define __MENU_BUILDER_H__ + + #include +-#include ++#include + #include + + +--- ekiga-4.0.1/lib/engine/framework/personal-details.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/personal-details.h.boost-signals2 2019-05-16 20:49:31.152695349 +0200 +@@ -37,7 +37,7 @@ + #define __PERSONAL_DETAILS_H__ + + #include +-#include ++#include + #include + + #include "services.h" +@@ -66,7 +66,7 @@ + virtual void set_presence_info (const std::string presence, + const std::string status) = 0; + +- boost::signal0 updated; ++ boost::signals2::signal updated; + }; + }; + +--- ekiga-4.0.1/lib/engine/framework/reflister.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/reflister.h.boost-signals2 2019-05-16 20:50:53.592893897 +0200 +@@ -37,7 +37,7 @@ + #ifndef __REFLISTER_H__ + #define __REFLISTER_H__ + +-#include ++#include + #include + #include + +@@ -55,7 +55,7 @@ + { + protected: + +- typedef std::map,std::list > container_type; ++ typedef std::map,std::list > container_type; + typedef Ekiga::map_key_iterator iterator; + typedef Ekiga::map_key_const_iterator const_iterator; + +@@ -66,7 +66,7 @@ + void add_object (boost::shared_ptr obj); + + void add_connection (boost::shared_ptr obj, +- boost::signals::connection connection); ++ boost::signals2::connection connection); + + void remove_object (boost::shared_ptr obj); + +@@ -78,9 +78,9 @@ + const_iterator begin () const; + const_iterator end () const; + +- boost::signal1 > object_added; +- boost::signal1 > object_removed; +- boost::signal1 > object_updated; ++ boost::signals2::signal)> object_added; ++ boost::signals2::signal)> object_removed; ++ boost::signals2::signal)> object_updated; + + private: + container_type objects; +@@ -95,7 +95,7 @@ + iter != objects.end (); + ++iter) { + +- for (std::list::iterator conn_iter = iter->second.begin (); ++ for (std::list::iterator conn_iter = iter->second.begin (); + conn_iter != iter->second.end (); + ++conn_iter) { + +@@ -130,7 +130,7 @@ + template + void + Ekiga::RefLister::add_connection (boost::shared_ptr obj, +- boost::signals::connection connection) ++ boost::signals2::connection connection) + { + objects[obj].push_back (connection); + } +@@ -139,8 +139,8 @@ + void + Ekiga::RefLister::remove_object (boost::shared_ptr obj) + { +- std::list connections = objects[obj]; +- for (std::list::iterator iter = connections.begin (); ++ std::list connections = objects[obj]; ++ for (std::list::iterator iter = connections.begin (); + iter != connections.end (); + ++iter) + iter->disconnect (); +--- ekiga-4.0.1/lib/engine/framework/runtime.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/runtime.h.boost-signals2 2019-05-16 21:15:48.437621428 +0200 +@@ -34,7 +34,7 @@ + * + */ + +-#include ++#include + #include + + #ifndef __RUNTIME_H__ +--- ekiga-4.0.1/lib/engine/framework/services.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/services.h.boost-signals2 2019-05-16 20:51:40.904008518 +0200 +@@ -45,7 +45,7 @@ + + #include + #include +-#include ++#include + #include + + namespace Ekiga +@@ -101,7 +101,7 @@ + + void dump (std::ostream &stream) const; + +- boost::signal1 service_added; ++ boost::signals2::signal service_added; + + private: + +--- ekiga-4.0.1/lib/engine/gui/gtk-core/codecsbox.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-core/codecsbox.cpp.boost-signals2 2019-05-16 20:52:02.689061460 +0200 +@@ -38,6 +38,8 @@ + #include "config.h" + #include "codecsbox.h" + ++#include ++ + #include "gmconf.h" + #include "codec-description.h" + +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/accounts-window.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/accounts-window.cpp.boost-signals2 2019-05-16 20:52:22.872110600 +0200 +@@ -62,7 +62,7 @@ + GtkAccelGroup *accel; + + Ekiga::ServiceCore &core; +- std::vector connections; ++ std::vector connections; + + std::string presence; + +@@ -502,7 +502,7 @@ + { + AccountsWindow *self = ACCOUNTS_WINDOW (obj); + +- for (std::vector::iterator iter ++ for (std::vector::iterator iter + = self->priv->connections.begin (); + iter != self->priv->connections.end (); + iter++) +@@ -535,7 +535,7 @@ + { + AccountsWindow *self = NULL; + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + GtkWidget *vbox = NULL; + GtkWidget *menu_bar = NULL; +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/addressbook-window.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/addressbook-window.cpp.boost-signals2 2019-05-16 20:52:40.184152821 +0200 +@@ -52,7 +52,7 @@ + _AddressBookWindowPrivate (Ekiga::ContactCore & _core):core (_core) { } + + Ekiga::ContactCore & core; +- std::vector connections; ++ std::vector connections; + GtkWidget *tree_view; + GtkWidget *notebook; + GtkTreeSelection *selection; +@@ -579,7 +579,7 @@ + { + AddressBookWindow *self = ADDRESSBOOK_WINDOW (obj); + +- for (std::vector::iterator iter ++ for (std::vector::iterator iter + = self->priv->connections.begin (); + iter != self->priv->connections.end (); + iter++) +@@ -613,7 +613,7 @@ + { + AddressBookWindow *self = NULL; + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + GtkWidget *menu_bar = NULL; + GtkWidget *frame = NULL; +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/book-view-gtk.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/book-view-gtk.cpp.boost-signals2 2019-05-16 21:25:50.824151811 +0200 +@@ -62,7 +62,7 @@ + GtkWidget *scrolled_window; + + Ekiga::BookPtr book; +- std::list connections; ++ std::list connections; + }; + + +@@ -447,7 +447,7 @@ + + view = BOOK_VIEW_GTK (obj); + +- for (std::list::iterator iter ++ for (std::list::iterator iter + = view->priv->connections.begin (); + iter != view->priv->connections.end (); + ++iter) +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp.boost-signals2 2019-05-16 20:53:08.385221735 +0200 +@@ -56,7 +56,7 @@ + boost::shared_ptr book; + GtkListStore* store; + GtkTreeView* tree; +- std::vector connections; ++ std::vector connections; + }; + + /* this is what we put in the view */ +@@ -229,7 +229,7 @@ + + view = CALL_HISTORY_VIEW_GTK (obj); + +- for (std::vector::iterator iter ++ for (std::vector::iterator iter + = view->priv->connections.begin (); + iter != view->priv->connections.end (); + iter++) +@@ -314,7 +314,7 @@ + GtkCellRenderer *renderer = NULL; + GtkTreeSelection *selection = NULL; + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + g_return_val_if_fail (book, (GtkWidget*)NULL); + +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-window.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-window.cpp.boost-signals2 2019-05-16 20:53:23.457258635 +0200 +@@ -181,7 +181,7 @@ + + GtkWidget *transfer_call_popup; + +- std::vector connections; ++ std::vector connections; + }; + + /* properties */ +@@ -2207,7 +2207,7 @@ + static void + ekiga_call_window_connect_engine_signals (EkigaCallWindow *cw) + { +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + g_return_if_fail (EKIGA_IS_CALL_WINDOW (cw)); + +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-area.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-area.cpp.boost-signals2 2019-05-16 20:53:39.069296908 +0200 +@@ -58,7 +58,7 @@ + struct _ChatAreaPrivate + { + Ekiga::Chat* chat; +- boost::signals::connection connection; ++ boost::signals2::connection connection; + boost::shared_ptr helper; + GmTextBufferEnhancer* enhancer; + GtkWidget* smiley_menu; +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-window.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-window.cpp.boost-signals2 2019-05-16 21:25:41.264127202 +0200 +@@ -54,7 +54,7 @@ + {} + + Ekiga::ServiceCore& core; +- std::list connections; ++ std::list connections; + + GtkWidget* notebook; + }; +@@ -405,7 +405,7 @@ + + self = CHAT_WINDOW (obj); + +- for (std::list::iterator iter ++ for (std::list::iterator iter + = self->priv->connections.begin (); + iter != self->priv->connections.end (); + ++iter) +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/heap-view.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/heap-view.cpp.boost-signals2 2019-05-16 20:53:55.041336117 +0200 +@@ -47,7 +47,7 @@ + struct _HeapViewPrivate + { + Ekiga::HeapPtr heap; +- std::vector connections; ++ std::vector connections; + + GtkTreeStore* store; + GtkTreeView* view; +@@ -454,7 +454,7 @@ + { + if (self->priv->heap) { + +- for (std::vector::iterator iter ++ for (std::vector::iterator iter + = self->priv->connections.begin (); + iter != self->priv->connections.end (); + iter++) +@@ -465,7 +465,7 @@ + + if (heap) { + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + conn = heap->removed.connect (boost::bind (&on_heap_removed, self)); + self->priv->connections.push_back (conn); +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/preferences-window.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/preferences-window.cpp.boost-signals2 2019-05-16 20:54:24.433408410 +0200 +@@ -88,7 +88,7 @@ + GtkWidget *iface; + GtkWidget *fsbutton; + Ekiga::ServiceCore *core; +- std::vector connections; ++ std::vector connections; + } GmPreferencesWindow; + + #define GM_PREFERENCES_WINDOW(x) (GmPreferencesWindow *) (x) +@@ -1357,7 +1357,7 @@ + + gm_window_hide_on_delete (window); + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + boost::shared_ptr videoinput_core = core.get ("videoinput-core"); + boost::shared_ptr audioinput_core = core.get ("audioinput-core"); + boost::shared_ptr audiooutput_core = core.get ("audiooutput-core"); +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/presentity-view.cpp 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/presentity-view.cpp.boost-signals2 2019-05-16 20:54:36.777438826 +0200 +@@ -40,8 +40,8 @@ + struct _PresentityViewPrivate + { + Ekiga::Presentity* presentity; +- boost::signals::connection updated_conn; +- boost::signals::connection removed_conn; ++ boost::signals2::connection updated_conn; ++ boost::signals2::connection removed_conn; + + /* we contain those, so no need to unref them */ + GtkWidget* presence_image; +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp.boost-signals2 2019-05-16 20:54:50.449472550 +0200 +@@ -60,7 +60,7 @@ + { + boost::shared_ptr core; + +- std::vector connections; ++ std::vector connections; + GtkTreeStore *store; + GtkTreeView *tree_view; + GSList *folded_groups; +@@ -1382,7 +1382,7 @@ + { + if (self->priv->core) { + +- for (std::vector::iterator iter ++ for (std::vector::iterator iter + = self->priv->connections.begin (); + iter != self->priv->connections.end (); + iter++) +@@ -1393,7 +1393,7 @@ + + if (core) { + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + conn = core->cluster_added.connect (boost::bind (&on_cluster_added, self, _1)); + self->priv->connections.push_back (conn); +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.cpp.boost-signals2 2019-05-16 20:55:08.249516515 +0200 +@@ -68,7 +68,7 @@ + GtkWidget *popup_menu; + gboolean has_message; + +- std::vector connections; ++ std::vector connections; + + int blink_id; + std::string status; +@@ -174,7 +174,7 @@ + if (self->priv->blink_image) + g_free (self->priv->blink_image); + +- for (std::vector::iterator iter = self->priv->connections.begin () ; ++ for (std::vector::iterator iter = self->priv->connections.begin () ; + iter != self->priv->connections.end (); + iter++) + iter->disconnect (); +@@ -548,7 +548,7 @@ + if (!statusicon_should_run ()) + return self; + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + self = STATUSICON (g_object_new (STATUSICON_TYPE, NULL)); + self->priv = new StatusIconPrivate (core); +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.h.boost-signals2 2019-05-16 20:55:28.249565992 +0200 +@@ -42,7 +42,7 @@ + + #include + +-#include ++#include + #include + + G_BEGIN_DECLS +--- ekiga-4.0.1/lib/engine/hal/hal-core.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/hal/hal-core.h.boost-signals2 2019-05-16 20:56:59.929793841 +0200 +@@ -40,7 +40,7 @@ + + #include "services.h" + +-#include ++#include + #include + + #include +@@ -114,24 +114,24 @@ + /** This signal is emitted when an Ekiga::HalManager has been + * added to the HalCore Service. + */ +- boost::signal1 manager_added; ++ boost::signals2::signal manager_added; + + + /*** API to act on HAL events ***/ + + /** See hal-manager.h for the API + */ +- boost::signal4 videoinput_device_added; +- boost::signal4 videoinput_device_removed; ++ boost::signals2::signal videoinput_device_added; ++ boost::signals2::signal videoinput_device_removed; + +- boost::signal3 audioinput_device_added; +- boost::signal3 audioinput_device_removed; ++ boost::signals2::signal audioinput_device_added; ++ boost::signals2::signal audioinput_device_removed; + +- boost::signal3 audiooutput_device_added; +- boost::signal3 audiooutput_device_removed; ++ boost::signals2::signal audiooutput_device_added; ++ boost::signals2::signal audiooutput_device_removed; + +- boost::signal3 network_interface_up; +- boost::signal3 network_interface_down; ++ boost::signals2::signal network_interface_up; ++ boost::signals2::signal network_interface_down; + + private: + +--- ekiga-4.0.1/lib/engine/hal/hal-manager.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/hal/hal-manager.h.boost-signals2 2019-05-16 20:58:32.322025169 +0200 +@@ -75,50 +75,50 @@ + * @param device the device name. + * @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux). + */ +- boost::signal3 videoinput_device_added; ++ boost::signals2::signal videoinput_device_added; + + /** This signal is emitted when a video input device is removed from the system. + * @param source the video input framework (e.g. video4linux, etc.). + * @param device the device name. + * @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux). + */ +- boost::signal3 videoinput_device_removed; ++ boost::signals2::signal videoinput_device_removed; + + /** This signal is emitted when an audio input device is added to the system. + * @param source the audio input framework (e.g. alsa, oss, etc.). + * @param device the device name. + */ +- boost::signal2 audioinput_device_added; ++ boost::signals2::signal audioinput_device_added; + + /** This signal is emitted when an audio input device is removed from the system. + * @param source the audio input framework (e.g. alsa, oss, etc.). + * @param device the device name. + */ +- boost::signal2 audioinput_device_removed; ++ boost::signals2::signal audioinput_device_removed; + + /** This signal is emitted when an audio output device is added to the system. + * @param source the audio output framework (e.g. alsa, oss, etc.). + * @param device the device name. + */ +- boost::signal2 audiooutput_device_added; ++ boost::signals2::signal audiooutput_device_added; + + /** This signal is emitted when an audio output device is removed from the system. + * @param source the audio output framework (e.g. alsa, oss, etc.). + * @param device the device name. + */ +- boost::signal2 audiooutput_device_removed; ++ boost::signals2::signal audiooutput_device_removed; + + /** This signal is emitted when a network device comes up. + * @param interface_name the interface name (e.g. eth0, etc.). + * @param ip4_address the IPv4 address (e.g. "192.168.0.1"). + */ +- boost::signal2 network_interface_up; ++ boost::signals2::signal network_interface_up; + + /** This signal is emitted when a network device goes down. + * @param interface_name the interface name (e.g. eth0, etc.). + * @param ip4_address the IPv4 address (e.g. "192.168.0.1"). + */ +- boost::signal2 network_interface_down; ++ boost::signals2::signal network_interface_down; + }; + + /** +--- ekiga-4.0.1/lib/engine/notification/notification-core.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/notification/notification-core.h.boost-signals2 2019-05-16 20:58:55.762084125 +0200 +@@ -77,7 +77,7 @@ + void action_trigger () + { if (action_callback) action_callback (); } + +- boost::signal0 removed; ++ boost::signals2::signal removed; + + private: + +@@ -109,7 +109,7 @@ + void push_notification (boost::shared_ptr notification) + { notification_added (notification); } + +- boost::signal1 > notification_added; ++ boost::signals2::signal)> notification_added; + }; + }; + +--- ekiga-4.0.1/lib/engine/presence/cluster.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/presence/cluster.h.boost-signals2 2019-05-16 20:59:44.537207148 +0200 +@@ -66,16 +66,16 @@ + * from the Cluster. + * @param The Heap in question. + */ +- boost::signal1 heap_added; +- boost::signal1 heap_removed; ++ boost::signals2::signal heap_added; ++ boost::signals2::signal heap_removed; + + /** Those signals are forwarded from the given Heap + * @param The Heap in question. + */ +- boost::signal1 heap_updated; +- boost::signal2 presentity_added; +- boost::signal2 presentity_updated; +- boost::signal2 presentity_removed; ++ boost::signals2::signal heap_updated; ++ boost::signals2::signal presentity_added; ++ boost::signals2::signal presentity_updated; ++ boost::signals2::signal presentity_removed; + }; + + typedef boost::shared_ptr ClusterPtr; +--- ekiga-4.0.1/lib/engine/presence/heap.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/presence/heap.h.boost-signals2 2019-05-16 21:00:10.299272312 +0200 +@@ -83,15 +83,15 @@ + + /** This signal is emitted when a Presentity has been added to the Heap. + */ +- boost::signal1 presentity_added; ++ boost::signals2::signal presentity_added; + + /** This signal is emitted when a Presentity has been updated in the Heap. + */ +- boost::signal1 presentity_updated; ++ boost::signals2::signal presentity_updated; + + /** This signal is emitted when a Presentity has been removed from the Heap. + */ +- boost::signal1 presentity_removed; ++ boost::signals2::signal presentity_removed; + }; + + typedef boost::shared_ptr HeapPtr; +--- ekiga-4.0.1/lib/engine/presence/presence-core.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/presence/presence-core.cpp.boost-signals2 2019-05-16 21:25:58.111170575 +0200 +@@ -49,7 +49,7 @@ + + Ekiga::PresenceCore::~PresenceCore () + { +- for (std::list::iterator iter = conns.begin (); iter != conns.end (); ++iter) ++ for (std::list::iterator iter = conns.begin (); iter != conns.end (); ++iter) + iter->disconnect (); + } + +--- ekiga-4.0.1/lib/engine/presence/presence-core.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/presence/presence-core.h.boost-signals2 2019-05-16 21:26:09.582200124 +0200 +@@ -97,8 +97,8 @@ + * presence information about an uri it was required to handle. + * The information is given as a pair of strings (uri, data). + */ +- boost::signal2 presence_received; +- boost::signal2 status_received; ++ boost::signals2::signal presence_received; ++ boost::signals2::signal status_received; + }; + + class PresencePublisher +@@ -180,22 +180,22 @@ + /** This signal is emitted when an Ekiga::Cluster has been added + * to the PresenceCore Service. + */ +- boost::signal1 cluster_added; ++ boost::signals2::signal cluster_added; + + /** Those signals are forwarding the heap_added, heap_updated + * and heap_removed from the given Cluster. + * + */ +- boost::signal2 heap_added; +- boost::signal2 heap_updated; +- boost::signal2 heap_removed; ++ boost::signals2::signal heap_added; ++ boost::signals2::signal heap_updated; ++ boost::signals2::signal heap_removed; + + /** Those signals are forwarding the presentity_added, presentity_updated + * and presentity_removed from the given Heap of the given Cluster. + */ +- boost::signal3 presentity_added; +- boost::signal3 presentity_updated; +- boost::signal3 presentity_removed; ++ boost::signals2::signal presentity_added; ++ boost::signals2::signal presentity_updated; ++ boost::signals2::signal presentity_removed; + + private: + +@@ -256,8 +256,8 @@ + /** Those signals are emitted whenever information has been received + * about an uri ; the information is a pair of strings (uri, information). + */ +- boost::signal2 presence_received; +- boost::signal2 status_received; ++ boost::signals2::signal presence_received; ++ boost::signals2::signal status_received; + + private: + +@@ -321,7 +321,7 @@ + + private: + +- std::list conns; ++ std::list conns; + }; + + /** +--- ekiga-4.0.1/lib/engine/presence/uri-presentity.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/presence/uri-presentity.h.boost-signals2 2019-05-16 21:01:39.841499790 +0200 +@@ -60,7 +60,7 @@ + */ + class URIPresentity: + public Ekiga::Presentity, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- ekiga-4.0.1/lib/engine/protocol/call-core.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/protocol/call-core.cpp.boost-signals2 2019-05-16 21:27:24.447393322 +0200 +@@ -48,7 +48,7 @@ + + CallCore::~CallCore () + { +- for (std::list::iterator iter = manager_connections.begin (); ++ for (std::list::iterator iter = manager_connections.begin (); + iter != manager_connections.end (); + ++iter) + iter->disconnect (); +@@ -103,7 +103,7 @@ + + void CallCore::add_call (boost::shared_ptr call, boost::shared_ptr manager) + { +- std::list conns; ++ std::list conns; + + conns.push_back (call->ringing.connect (boost::bind (&CallCore::on_ringing_call, this, call, manager))); + conns.push_back (call->setup.connect (boost::bind (&CallCore::on_setup_call, this, call, manager))); +@@ -124,7 +124,7 @@ + + void CallCore::remove_call (boost::shared_ptr call) + { +- for (std::list::iterator iter2 = call_connections [call->get_id ()].begin (); ++ for (std::list::iterator iter2 = call_connections [call->get_id ()].begin (); + iter2 != call_connections [call->get_id ()].end (); + ++iter2) + iter2->disconnect (); +--- ekiga-4.0.1/lib/engine/protocol/call-core.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/protocol/call-core.h.boost-signals2 2019-05-16 21:04:18.066905414 +0200 +@@ -45,7 +45,7 @@ + #include "call-protocol-manager.h" + #include + +-#include ++#include + #include + #include + #include +@@ -126,7 +126,7 @@ + /** This signal is emitted when a Ekiga::CallManager has been + * added to the CallCore Service. + */ +- boost::signal1 > manager_added; ++ boost::signals2::signal)> manager_added; + + + /*** Call Management ***/ +@@ -141,21 +141,21 @@ + + /** See call.h for the API + */ +- boost::signal2 , boost::shared_ptr > ringing_call; +- boost::signal2 , boost::shared_ptr > setup_call; +- boost::signal2 , boost::shared_ptr > missed_call; +- boost::signal3 , boost::shared_ptr, std::string> cleared_call; +- boost::signal2 , boost::shared_ptr > established_call; +- boost::signal2 , boost::shared_ptr > held_call; +- boost::signal2 , boost::shared_ptr > retrieved_call; +- boost::signal5 , boost::shared_ptr, std::string, Call::StreamType, bool> stream_opened; +- boost::signal5 , boost::shared_ptr, std::string, Call::StreamType, bool> stream_closed; +- boost::signal4 , boost::shared_ptr, std::string, Call::StreamType> stream_paused; +- boost::signal4 , boost::shared_ptr, std::string, Call::StreamType> stream_resumed; ++ boost::signals2::signal, boost::shared_ptr)> ringing_call; ++ boost::signals2::signal, boost::shared_ptr)> setup_call; ++ boost::signals2::signal, boost::shared_ptr)> missed_call; ++ boost::signals2::signal, boost::shared_ptr, std::string)> cleared_call; ++ boost::signals2::signal, boost::shared_ptr)> established_call; ++ boost::signals2::signal, boost::shared_ptr)> held_call; ++ boost::signals2::signal, boost::shared_ptr)> retrieved_call; ++ boost::signals2::signal, boost::shared_ptr, std::string, Call::StreamType, bool)> stream_opened; ++ boost::signals2::signal, boost::shared_ptr, std::string, Call::StreamType, bool)> stream_closed; ++ boost::signals2::signal, boost::shared_ptr, std::string, Call::StreamType)> stream_paused; ++ boost::signals2::signal, boost::shared_ptr, std::string, Call::StreamType)> stream_resumed; + + /*** Misc ***/ +- boost::signal1 > manager_ready; +- boost::signal0 ready; ++ boost::signals2::signal)> manager_ready; ++ boost::signals2::signal ready; + + /** This chain allows the CallCore to report errors to the user + */ +@@ -186,8 +186,8 @@ + + + std::set > managers; +- std::list manager_connections; +- std::map > call_connections; ++ std::list manager_connections; ++ std::map > call_connections; + unsigned nr_ready; + }; + +--- ekiga-4.0.1/lib/engine/protocol/call.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/protocol/call.h.boost-signals2 2019-05-16 21:06:43.219275173 +0200 +@@ -38,7 +38,7 @@ + #ifndef __CALL_H__ + #define __CALL_H__ + +-#include ++#include + #include + #include + +@@ -198,69 +198,69 @@ + + /* Signal emitted when the call is established + */ +- boost::signal0 established; ++ boost::signals2::signal established; + + /* Signal emitted when an established call is cleared + * @param: a string describing why the call was cleared + */ +- boost::signal1 cleared; ++ boost::signals2::signal cleared; + + /* Signal emitted when the call is missed, ie cleared + * without having been established + */ +- boost::signal0 missed; ++ boost::signals2::signal missed; + + /* Signal emitted when the call is forwarded + */ +- boost::signal0 forwarded; ++ boost::signals2::signal forwarded; + + /* Signal emitted when the call is held + */ +- boost::signal0 held; ++ boost::signals2::signal held; + + /* Signal emitted when the call is retrieved + */ +- boost::signal0 retrieved; ++ boost::signals2::signal retrieved; + + /* Signal emitted when the call is being setup + */ +- boost::signal0 setup; ++ boost::signals2::signal setup; + + /* Signal emitted when the remote party is ringing + */ +- boost::signal0 ringing; ++ boost::signals2::signal ringing; + + /* Signal emitted when a stream is opened + * @param the stream name + * @param the stream type + * @param transmission or reception + */ +- boost::signal3 stream_opened; ++ boost::signals2::signal stream_opened; + + /* Signal emitted when a stream is closed + * @param the stream name + * @param the stream type + * @param transmission or reception + */ +- boost::signal3 stream_closed; ++ boost::signals2::signal stream_closed; + + /* Signal emitted when a transmitted stream is paused + * @param the stream name + * @param the stream type + * @param transmission or reception + */ +- boost::signal2 stream_paused; ++ boost::signals2::signal stream_paused; + + /* Signal emitted when a transmitted stream is resumed + * @param the stream name + * @param the stream type + * @param transmission or reception + */ +- boost::signal2 stream_resumed; ++ boost::signals2::signal stream_resumed; + + /** This signal is emitted when the Call is removed. + */ +- boost::signal0 removed; ++ boost::signals2::signal removed; + + }; + +--- ekiga-4.0.1/lib/engine/protocol/call-manager.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/protocol/call-manager.h.boost-signals2 2019-05-16 21:04:48.498983953 +0200 +@@ -40,7 +40,7 @@ + #define __CALL_MANAGER_H__ + + #include +-#include ++#include + #include + + #include +@@ -99,7 +99,7 @@ + /** This signal is emitted when a Ekiga::CallProtocolManager has been + * added to the CallManager. + */ +- boost::signal1 > manager_added; ++ boost::signals2::signal)> manager_added; + + + /* +@@ -213,7 +213,7 @@ + /* + * MISC + */ +- boost::signal0 ready; ++ boost::signals2::signal ready; + + private: + std::set > managers; +--- ekiga-4.0.1/lib/engine/videoinput/videoinput-core.h 2013-02-19 07:11:02.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/videoinput/videoinput-core.h.boost-signals2 2019-05-16 21:07:34.924401112 +0200 +@@ -45,7 +45,7 @@ + #include "videoinput-manager.h" + #include "videoinput-gmconf-bridge.h" + +-#include ++#include + #include + #include + #include +@@ -146,7 +146,7 @@ + /** This signal is emitted when a Ekiga::VideoInputManager has been + * added to the VideoInputCore Service. + */ +- boost::signal1 manager_added; ++ boost::signals2::signal manager_added; + + + /*** VideoInput Device Management ***/ +@@ -277,23 +277,23 @@ + + /** See videoinput-manager.h for the API + */ +- boost::signal3 device_opened; +- boost::signal2 device_closed; +- boost::signal3 device_error; ++ boost::signals2::signal device_opened; ++ boost::signals2::signal device_closed; ++ boost::signals2::signal device_error; + + /** This signal is emitted when a video input has been added to the system. + * This signal will be emitted if add_device was called with a device name and + * a manager claimed support for this device. + * @param device the video input device that was added. + */ +- boost::signal2 device_added; ++ boost::signals2::signal device_added; + + /** This signal is emitted when a video input has been removed from the system. + * This signal will be emitted if remove_device was called with a device name and + * a manager claimed support for this device. + * @param device the video input device that was removed. + */ +- boost::signal2 device_removed; ++ boost::signals2::signal device_removed; + + private: + void on_set_device (const VideoInputDevice & device); +--- ekiga-4.0.1/lib/engine/videoinput/videoinput-manager.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/videoinput/videoinput-manager.h.boost-signals2 2019-05-16 21:08:07.020479478 +0200 +@@ -39,7 +39,7 @@ + #define __VIDEOINPUT_MANAGER_H__ + + #include +-#include ++#include + #include + + #include "videoinput-info.h" +@@ -159,18 +159,18 @@ + * @param device the video input device that was opened. + * @param config the current video input device configuration (current brightness, colour, etc.). + */ +- boost::signal2 device_opened; ++ boost::signals2::signal device_opened; + + /** This signal is emitted when a video input device is closed. + * @param device the video input device that was closed. + */ +- boost::signal1 device_closed; ++ boost::signals2::signal device_closed; + + /** This signal is emitted when an error occurs when opening a video input device. + * @param device the video input device that caused the error. + * @param error_code the video input device error code. + */ +- boost::signal2 device_error; ++ boost::signals2::signal device_error; + + protected: + typedef struct ManagerState { +--- ekiga-4.0.1/lib/engine/videooutput/videooutput-core.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/videooutput/videooutput-core.h.boost-signals2 2019-05-16 22:08:08.535773653 +0200 +@@ -42,7 +42,7 @@ + #include "videooutput-gmconf-bridge.h" + #include "videooutput-manager.h" + +-#include ++#include + #include + #include + #include +@@ -116,7 +116,7 @@ + /** This signal is emitted when a Ekiga::VideoOutputManager has been + * added to the VideoOutputCore Service. + */ +- boost::signal1 manager_added; ++ boost::signals2::signal manager_added; + + + /*** Videooutput Management ***/ +@@ -165,11 +165,11 @@ + + /** See videooutput-manager.h for the API + */ +- boost::signal6 device_opened; +- boost::signal1 device_closed; +- boost::signal2 device_error; +- boost::signal2 fullscreen_mode_changed; +- boost::signal3 size_changed; ++ boost::signals2::signal device_opened; ++ boost::signals2::signal device_closed; ++ boost::signals2::signal device_error; ++ boost::signals2::signal fullscreen_mode_changed; ++ boost::signals2::signal size_changed; + + + private: +--- ekiga-4.0.1/lib/engine/videooutput/videooutput-manager.h 2013-02-19 07:11:02.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/videooutput/videooutput-manager.h.boost-signals2 2019-05-16 22:07:52.271747906 +0200 +@@ -38,7 +38,7 @@ + #ifndef __VIDEOOUTPUT_MANAGER_H__ + #define __VIDEOOUTPUT_MANAGER_H__ + +-#include ++#include + #include + + #include "videooutput-info.h" +@@ -108,16 +108,16 @@ + * @param both_streams if a frame from both local and remote stream has been received. + * @param ext_stream if a frame from an extended video stream has been received. + */ +- boost::signal5 device_opened; ++ boost::signals2::signal device_opened; + + /** This signal is emitted when a video output device is closed. + */ +- boost::signal0 device_closed; ++ boost::signals2::signal device_closed; + + /** This signal is emitted when an error occurs when opening a video output device. + * @param error_code the video output device error code. + */ +- boost::signal1 device_error; ++ boost::signals2::signal device_error; + + /** This signal is emitted when a manager switches autonomously into or out of fullscreen mode. + * Some managers like DX and XV allow the user to switch between FS +@@ -127,7 +127,7 @@ + * or when it is being zoomed in or out. + * @param toggle VO_FS_ON or VO_FS_OFF depending on whether FS was activated or deactivated. + */ +- boost::signal1 fullscreen_mode_changed; ++ boost::signals2::signal fullscreen_mode_changed; + + /** This signal is emitted the video output size has changed. + * This signal is called whenever the size of the widget carrying the video signal +@@ -136,7 +136,7 @@ + * @param width the new width of the widget. + * @param height the new height of the widget. + */ +- boost::signal2 size_changed; ++ boost::signals2::signal size_changed; + + protected: + virtual void get_display_info (DisplayInfo &) { }; +--- ekiga-4.0.1/plugins/avahi/avahi-cluster.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/avahi/avahi-cluster.h.boost-signals2 2019-05-16 21:10:04.107766569 +0200 +@@ -53,7 +53,7 @@ + class Cluster: + public Ekiga::Service, + public Ekiga::ClusterImpl, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- ekiga-4.0.1/plugins/avahi/avahi-heap.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/avahi/avahi-heap.h.boost-signals2 2019-05-16 21:10:12.088786207 +0200 +@@ -60,7 +60,7 @@ + class Heap: + public Ekiga::PresenceFetcher, + public Ekiga::HeapImpl, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- ekiga-4.0.1/plugins/ldap/ldap-book.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/ldap/ldap-book.h.boost-signals2 2019-05-16 21:10:28.275826062 +0200 +@@ -124,7 +124,7 @@ + + xmlNodePtr get_node (); + +- boost::signal0 trigger_saving; ++ boost::signals2::signal trigger_saving; + + bool is_ekiga_net_book () const; + +--- ekiga-4.0.1/plugins/libnotify/libnotify-main.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/plugins/libnotify/libnotify-main.cpp.boost-signals2 2019-05-16 21:10:54.060889621 +0200 +@@ -51,7 +51,7 @@ + + class LibNotify: + public Ekiga::Service, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +@@ -77,7 +77,7 @@ + boost::shared_ptr call); + void on_call_notification_closed (gpointer self); + +- typedef std::map, std::pair > > container_type; ++ typedef std::map, std::pair > > container_type; + container_type live; + }; + +@@ -234,10 +234,10 @@ + notify_action_cb, notification.get (), NULL); + + g_signal_connect (notif, "closed", G_CALLBACK (on_notif_closed), notification.get ()); +- boost::signals::connection conn = notification->removed.connect (boost::bind (&LibNotify::on_notification_removed, ++ boost::signals2::connection conn = notification->removed.connect (boost::bind (&LibNotify::on_notification_removed, + this, notification)); + +- live[notification] = std::pair > (conn, boost::shared_ptr (notif, g_object_unref)); ++ live[notification] = std::pair > (conn, boost::shared_ptr (notif, g_object_unref)); + + notify_notification_show (notif, NULL); + } +--- ekiga-4.0.1/plugins/loudmouth/loudmouth-account.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/loudmouth/loudmouth-account.h.boost-signals2 2019-05-16 21:11:10.299929695 +0200 +@@ -70,7 +70,7 @@ + + xmlNodePtr get_node () const; + +- boost::signal0 trigger_saving; ++ boost::signals2::signal trigger_saving; + + const std::string get_name () const; + +--- ekiga-4.0.1/plugins/loudmouth/loudmouth-heap-roster.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/loudmouth/loudmouth-heap-roster.h.boost-signals2 2019-05-16 21:11:24.771965439 +0200 +@@ -46,7 +46,7 @@ + class HeapRoster: + public Ekiga::HeapImpl, + public LM::Handler, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- ekiga-4.0.1/plugins/loudmouth/loudmouth-helpers.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/loudmouth/loudmouth-helpers.h.boost-signals2 2019-05-16 21:11:41.572006967 +0200 +@@ -37,7 +37,7 @@ + #define __LOUDMOUTH_HELPERS_H__ + + #include +-#include ++#include + + #include + +--- ekiga-4.0.1/plugins/loudmouth/loudmouth-presentity.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/loudmouth/loudmouth-presentity.h.boost-signals2 2019-05-16 21:11:53.612036752 +0200 +@@ -78,7 +78,7 @@ + + bool has_chat; + +- boost::signal0 chat_requested; ++ boost::signals2::signal chat_requested; + + private: + LmConnection* connection; +--- ekiga-4.0.1/plugins/resource-list/rl-heap.cpp 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/resource-list/rl-heap.cpp.boost-signals2 2019-05-16 21:12:26.773118885 +0200 +@@ -185,7 +185,7 @@ + { + bool go_on = true; + +- for (std::map >::const_iterator ++ for (std::map >::const_iterator + iter = presentities.begin (); + go_on && iter != presentities.end (); + ++iter) +@@ -254,7 +254,7 @@ + while ( !presentities.empty ()) { + + presentities.begin()->first->removed (); +- for (std::list::const_iterator iter2 ++ for (std::list::const_iterator iter2 + = presentities.begin()->second.begin (); + iter2 != presentities.begin()->second.end (); + ++iter2) +@@ -366,7 +366,7 @@ + && xmlStrEqual (BAD_CAST ("entry"), child->name)) { + + PresentityPtr presentity(new Presentity (services, path, doc, child, writable)); +- std::list conns; ++ std::list conns; + conns.push_back (presentity->updated.connect (boost::bind (boost::ref (presentity_updated), presentity))); + conns.push_back (presentity->removed.connect (boost::bind(boost::ref (presentity_removed),presentity))); + conns.push_back (presentity->trigger_reload.connect (boost::bind (&RL::Heap::refresh, this))); +@@ -381,7 +381,7 @@ + RL::Heap::push_presence (const std::string uri_, + const std::string presence) + { +- for (std::map >::const_iterator ++ for (std::map >::const_iterator + iter = presentities.begin (); + iter != presentities.end (); + ++iter) { +@@ -395,7 +395,7 @@ + RL::Heap::push_status (const std::string uri_, + const std::string status) + { +- for (std::map >::const_iterator ++ for (std::map >::const_iterator + iter = presentities.begin (); + iter != presentities.end (); + ++iter) { +@@ -514,7 +514,7 @@ + "contact on a remote server")); + + std::set all_groups; +- for (std::map >::const_iterator ++ for (std::map >::const_iterator + iter = presentities.begin (); + iter != presentities.end (); + ++iter) { +--- ekiga-4.0.1/plugins/resource-list/rl-heap.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/resource-list/rl-heap.h.boost-signals2 2019-05-16 21:12:47.397170040 +0200 +@@ -90,7 +90,7 @@ + void push_status (const std::string uri, + const std::string status); + +- boost::signal0 trigger_saving; ++ boost::signals2::signal trigger_saving; + + private: + +@@ -106,7 +106,7 @@ + boost::shared_ptr doc; + xmlNodePtr list_node; + +- std::map > presentities; ++ std::map > presentities; + + void refresh (); + +--- ekiga-4.0.1/plugins/resource-list/rl-list.cpp 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/resource-list/rl-list.cpp.boost-signals2 2019-05-16 21:13:38.853297909 +0200 +@@ -94,9 +94,9 @@ + + void publish () const; + +- boost::signal1 > entry_added; +- boost::signal1 > entry_updated; +- boost::signal1 > entry_removed; ++ boost::signals2::signal)> entry_added; ++ boost::signals2::signal)> entry_updated; ++ boost::signals2::signal)> entry_removed; + + + /* data for its children */ +@@ -104,7 +104,7 @@ + + std::list ordering; + std::list > lists; +- std::list, std::list > > entries; ++ std::list, std::list > > entries; + }; + + +@@ -235,12 +235,12 @@ + (*iter)->flush (); + lists.clear (); + +- for (std::list, std::list > >::iterator iter = entries.begin (); ++ for (std::list, std::list > >::iterator iter = entries.begin (); + iter != entries.end (); + ++iter) { + + iter->first->removed (); +- for (std::list::iterator conn_iter ++ for (std::list::iterator conn_iter + = iter->second.begin (); + conn_iter != iter->second.end (); + ++conn_iter) +@@ -342,10 +342,10 @@ + entry_pos, + display_name, + doc, child)); +- std::list conns; ++ std::list conns; + conns.push_back (entry->updated.connect (boost::bind (boost::ref (entry_updated), entry))); + conns.push_back (entry->removed.connect (boost::bind (boost::ref (entry_removed), entry))); +- entries.push_back (std::pair, std::list > (entry, conns)); ++ entries.push_back (std::pair, std::list > (entry, conns)); + ordering.push_back (ENTRY); + entry_pos++; + entry_added (entry); +@@ -363,7 +363,7 @@ + ++iter) + (*iter)->push_presence (uri_, presence); + +- for (std::list, std::list > >::const_iterator iter = entries.begin (); ++ for (std::list, std::list > >::const_iterator iter = entries.begin (); + iter != entries.end (); + ++iter) { + +@@ -381,7 +381,7 @@ + ++iter) + (*iter)->push_status (uri_, status); + +- for (std::list, std::list > >::const_iterator iter = entries.begin (); ++ for (std::list, std::list > >::const_iterator iter = entries.begin (); + iter != entries.end (); + ++iter) { + +@@ -400,7 +400,7 @@ + ++iter) + go_on = (*iter)->visit_presentities (visitor); + +- for (std::list, std::list > >::const_iterator iter = entries.begin (); ++ for (std::list, std::list > >::const_iterator iter = entries.begin (); + go_on && iter != entries.end (); + ++iter) { + +@@ -418,7 +418,7 @@ + ++iter) + (*iter)->publish (); + +- for (std::list, std::list > >::const_iterator iter = entries.begin (); ++ for (std::list, std::list > >::const_iterator iter = entries.begin (); + iter != entries.end (); + ++iter) { + +--- ekiga-4.0.1/plugins/resource-list/rl-list.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/resource-list/rl-list.h.boost-signals2 2019-05-16 21:14:05.516364301 +0200 +@@ -74,9 +74,9 @@ + + void publish () const; + +- boost::signal1 > entry_added; +- boost::signal1 > entry_updated; +- boost::signal1 > entry_removed; ++ boost::signals2::signal)> entry_added; ++ boost::signals2::signal)> entry_updated; ++ boost::signals2::signal)> entry_removed; + + /* this method orders the list to get rid of all its children */ + void flush (); +--- ekiga-4.0.1/plugins/resource-list/rl-presentity.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/resource-list/rl-presentity.h.boost-signals2 2019-05-16 21:14:16.140390781 +0200 +@@ -79,7 +79,7 @@ + + bool populate_menu (Ekiga::MenuBuilder &); + +- boost::signal0 trigger_reload; ++ boost::signals2::signal trigger_reload; + + private: + +--- ekiga-4.0.1/src/gui/assistant.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/src/gui/assistant.cpp.boost-signals2 2019-05-16 21:27:53.400468197 +0200 +@@ -95,7 +95,7 @@ + gint last_active_page; + + GtkListStore *summary_model; +- std::vector connections; ++ std::vector connections; + }; + + /* presenting the network connection type to the user */ +@@ -1679,7 +1679,7 @@ + g_signal_connect (assistant, "key-press-event", + G_CALLBACK (ekiga_assistant_key_press_cb), NULL); + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + assistant->priv->videoinput_core = service_core.get ("videoinput-core"); + assistant->priv->audioinput_core = service_core.get ("audioinput-core"); + assistant->priv->audiooutput_core = service_core.get ("audiooutput-core"); +--- ekiga-4.0.1/src/gui/main_window.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/src/gui/main_window.cpp.boost-signals2 2019-05-16 21:27:43.064441457 +0200 +@@ -129,7 +129,7 @@ + unsigned calling_state; + + gulong roster_selection_connection_id; +- std::vector connections; ++ std::vector connections; + }; + + /* properties */ +@@ -1706,7 +1706,7 @@ + static void + ekiga_main_window_connect_engine_signals (EkigaMainWindow *mw) + { +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + g_return_if_fail (EKIGA_IS_MAIN_WINDOW (mw)); + +--- ekiga-4.0.1/src/gui/statusmenu.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/src/gui/statusmenu.cpp.boost-signals2 2019-05-16 21:27:34.032418100 +0200 +@@ -51,7 +51,7 @@ + struct _StatusMenuPrivate + { + boost::shared_ptr personal_details; +- std::vector connections; ++ std::vector connections; + + GtkListStore *list_store; // List store storing the menu + GtkWindow *parent; // Parent window +@@ -796,7 +796,7 @@ + { + StatusMenu *self = NULL; + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + GtkCellRenderer *renderer = NULL; + GSList *custom_status_array [NUM_STATUS_TYPES]; + diff --git a/network/ekiga/ekiga-4.0.1-libresolv.patch b/network/ekiga/ekiga-4.0.1-libresolv.patch new file mode 100644 index 0000000000..7754eeb185 --- /dev/null +++ b/network/ekiga/ekiga-4.0.1-libresolv.patch @@ -0,0 +1,13 @@ +diff -up ekiga-4.0.1/configure.ac.libresolv ekiga-4.0.1/configure.ac +--- ekiga-4.0.1/configure.ac.libresolv 2017-02-23 02:30:42.051227852 -0600 ++++ ekiga-4.0.1/configure.ac 2017-02-23 02:32:04.609519837 -0600 +@@ -324,7 +324,8 @@ if test "x$enable_ldap" = "xyes"; then + + dnl Checking for libresolv + if test ${gm_platform} = "linux" ; then +- AC_CHECK_LIB(resolv, res_gethostbyaddr, [LIBS="-lresolv $LIBS"], AC_MSG_ERROR([You need the libresolv library to compile Ekiga]), -lresolv) ++ # AC_CHECK_LIB(resolv, res_gethostbyaddr, [LIBS="-lresolv $LIBS"], AC_MSG_ERROR([You need the libresolv library to compile Ekiga]), -lresolv) ++ AC_WARNING([Just adding libresolv to LDAP_LIBS, without checking anything]) + LDAP_LIBS="${LDAP_LIBS} -lresolv" + fi + found_ldap="yes" diff --git a/network/ekiga/ekiga.SlackBuild b/network/ekiga/ekiga.SlackBuild index d22a4ee14d..a4a5bd1c9a 100644 --- a/network/ekiga/ekiga.SlackBuild +++ b/network/ekiga/ekiga.SlackBuild @@ -107,10 +107,12 @@ 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/ekiga-4.0.1-libresolv.patch +patch -p1 < $CWD/ekiga-4.0.1-boost-signals2.patch # Fix for -current (20150722 dbs) sed -e 's/gnome-icon-theme/adwaita-icon-theme/g' -i configure.ac -autoconf +autoreconf -vif CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ 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/falkon/falkon.SlackBuild b/network/falkon/falkon.SlackBuild index df6df2e5ae..8d85775f74 100644 --- a/network/falkon/falkon.SlackBuild +++ b/network/falkon/falkon.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for falkon -# Copyright 2018 Matteo Bernardini , Pisa, Italy +# Copyright 2018,2019 Matteo Bernardini , Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=falkon -VERSION=${VERSION:-3.0.1} +VERSION=${VERSION:-3.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/falkon/falkon.info b/network/falkon/falkon.info index 39afba46f1..08489ab024 100644 --- a/network/falkon/falkon.info +++ b/network/falkon/falkon.info @@ -1,8 +1,8 @@ PRGNAM="falkon" -VERSION="3.0.1" +VERSION="3.1.0" HOMEPAGE="https://www.falkon.org" -DOWNLOAD="https://download.kde.org/stable/falkon/3.0.1/falkon-3.0.1.tar.xz" -MD5SUM="c6fb6433ac0f228667e2f763c02317c5" +DOWNLOAD="https://download.kde.org/stable/falkon/3.1/falkon-3.1.0.tar.xz" +MD5SUM="9255fb335d3ba361dea44b7b297ddf7d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="extra-cmake-modules qt5" 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 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/httrack/httrack.SlackBuild b/network/httrack/httrack.SlackBuild index d5976ddd12..bfdbec4b74 100644 --- a/network/httrack/httrack.SlackBuild +++ b/network/httrack/httrack.SlackBuild @@ -9,7 +9,7 @@ # without any warranty. PRGNAM=httrack -VERSION=${VERSION:-3.47.21} +VERSION=${VERSION:-3.49.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/httrack/httrack.info b/network/httrack/httrack.info index 597ebcc033..07b38b7399 100644 --- a/network/httrack/httrack.info +++ b/network/httrack/httrack.info @@ -1,8 +1,8 @@ PRGNAM="httrack" -VERSION="3.47.21" +VERSION="3.49.2" HOMEPAGE="http://www.httrack.com" -DOWNLOAD="http://mirror.httrack.com/historical/httrack-3.47.21.tar.gz" -MD5SUM="2296de7b3b0be24758d4bbea8c0ebb20" +DOWNLOAD="http://mirror.httrack.com/historical/httrack-3.49.2.tar.gz" +MD5SUM="1fd1ab9953432f0474a66b67a71d6381" 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 ' -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 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 - #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 - #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 - #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 - #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 - #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 - #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 + #include + #include + #include + #include +-#include + #include + #include + + #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 ++#include + #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 + * + * ________________________________________________________________ */ + ++#include + #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 + * + * ________________________________________________________________ */ + ++#include + #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 + #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 -# 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/krb5/EXPORT b/network/krb5/EXPORT deleted file mode 100644 index d868a9e27e..0000000000 --- a/network/krb5/EXPORT +++ /dev/null @@ -1,13 +0,0 @@ -EXPORT LAW WARNINGS: - - * Export of this software from the United States of America may be -subject to the Export Administration Regulations of the United States -Department of Commerce, currently (October 2003) codified as Title 15 -CFR Parts 730-774. - * You are responsible for complying with all applicable export -regulations, including obtaining an export license if required. - * You may not download this software if you are located in, or are -a citizen or national of, any country for which the US government -prohibits the export of encryption source code, currently (October -2003) Cuba, Iran, Iraq, Libya, North Korea, Sudan, or Syria. (15 CFR -Sections 734(b)(3), 740.13(e)(4)) diff --git a/network/krb5/README b/network/krb5/README deleted file mode 100644 index 2058088316..0000000000 --- a/network/krb5/README +++ /dev/null @@ -1,10 +0,0 @@ -Kerberos is a network authentication protocol. It is designed to -provide strong authentication for client/server applications by using -secret-key cryptography. A free implementation of this protocol is -available from the Massachusetts Institute of Technology. Kerberos is -available in many commercial products as well. - -Note: -We provide 2 RC scripts that you can use for your own usage: -- rc.kadmind: Kerberos KADM5 administration server init script -- rc.krb5kdc: Kerberos V5 KDC init script diff --git a/network/krb5/README.krb5 b/network/krb5/README.krb5 deleted file mode 100644 index 72c522b6a7..0000000000 --- a/network/krb5/README.krb5 +++ /dev/null @@ -1,52 +0,0 @@ -Kerberos is a network authentication protocol. It is designed to -provide strong authentication for client/server applications by using -secret-key cryptography. A free implementation of this protocol is -available from the Massachusetts Institute of Technology. Kerberos is -available in many commercial products as well. - -The Internet is an insecure place. Many of the protocols used in the -Internet do not provide any security. Tools to "sniff" passwords off -of the network are in common use by malicious hackers. Thus, -applications which send an unencrypted password over the network are -extremely vulnerable. Worse yet, other client/server applications rely -on the client program to be "honest" about the identity of the user -who is using it. Other applications rely on the client to restrict its -activities to those which it is allowed to do, with no other -enforcement by the server. - -Some sites attempt to use firewalls to solve their network security -problems. Unfortunately, firewalls assume that "the bad guys" are on -the outside, which is often a very bad assumption. Most of the really -damaging incidents of computer crime are carried out by insiders. -Firewalls also have a significant disadvantage in that they restrict -how your users can use the Internet. (After all, firewalls are simply -a less extreme example of the dictum that there is nothing more secure -then a computer which is not connected to the network --- and powered -off!) In many places, these restrictions are simply unrealistic and -unacceptable. - -Kerberos was created by MIT as a solution to these network security -problems. The Kerberos protocol uses strong cryptography so that a -client can prove its identity to a server (and vice versa) across an -insecure network connection. After a client and server has used -Kerberos to prove their identity, they can also encrypt all of their -communications to assure privacy and data integrity as they go about -their business. - -Kerberos is freely available from MIT, under copyright permissions -very similar those used for the BSD operating system and the X Window -System. MIT provides Kerberos in source form so that anyone who wishes -to use it may look over the code for themselves and assure themselves -that the code is trustworthy. In addition, for those who prefer to -rely on a professionally supported product, Kerberos is available as a -product from many different vendors. - -In summary, Kerberos is a solution to your network security problems. -It provides the tools of authentication and strong cryptography over -the network to help you secure your information systems across your -entire enterprise. We hope you find Kerberos as useful as it has been -to us. At MIT, Kerberos has been invaluable to our -Information/Technology architecture. - -Additional information is available from the MIT Kerberos website: -http://web.mit.edu/kerberos/ diff --git a/network/krb5/doinst.sh b/network/krb5/doinst.sh deleted file mode 100644 index db0a05b7e2..0000000000 --- a/network/krb5/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.krb5kdc.new -preserve_perms etc/rc.d/rc.kadmind.new diff --git a/network/krb5/krb5.SlackBuild b/network/krb5/krb5.SlackBuild deleted file mode 100644 index d17b209e9c..0000000000 --- a/network/krb5/krb5.SlackBuild +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/sh - -# Slackware build script for krb5 - -# Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA -# Copyright 2015-2020 Willy Sudiarto Raharjo -# 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=krb5 -VERSION=${VERSION:-1.18} -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 $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION - -sed -i "/KRB5ROOT=/s/\/local//" src/util/ac_check_krb5.m4 - -cd src -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CPPFLAGS+=" -I/usr/include/et" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --enable-dns-for-realm \ - --with-ldap \ - --with-system-et \ - --with-system-ss \ - --enable-pkinit \ - --with-tls-impl=openssl \ - --with-system-verto=no \ - --with-prng-alg=os \ - --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 - -# Add init scripts -mkdir -p $PKG/etc/rc.d -cat $CWD/rc.krb5kdc > $PKG/etc/rc.d/rc.krb5kdc.new -cat $CWD/rc.kadmind > $PKG/etc/rc.d/rc.kadmind.new - -rm -rf $PKG/usr/man/cat{1,5,8} -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 $CWD/README $CWD/README.krb5 $CWD/EXPORT $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG/usr/doc -find $PKG/usr/doc -type f -exec chmod 0644 {} \; - -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/krb5/krb5.info b/network/krb5/krb5.info deleted file mode 100644 index 61d4a0d305..0000000000 --- a/network/krb5/krb5.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="krb5" -VERSION="1.18" -HOMEPAGE="http://web.mit.edu/kerberos/" -DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.18/krb5-1.18.tar.gz" -MD5SUM="69a5b165dac5754a5094627ee6df0def" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/network/krb5/rc.kadmind b/network/krb5/rc.kadmind deleted file mode 100644 index 5a5633f1ee..0000000000 --- a/network/krb5/rc.kadmind +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# Kerberos KADM5 administration server init script -# -# Copyright (C) 2017 Jason Graham -# - -# Start kadmind: -kadmind_start() { - CMDLINE="/usr/sbin/kadmind" - echo -n "Starting kadmind: $CMDLINE" - $CMDLINE - echo -} - -# Stop kadmind: -kadmind_stop() { - echo "Stopping kadmind..." - killall -e -q kadmind -} - -# Restart kadmind: -kadmind_restart() { - kadmind_stop - sleep 1 - kadmind_start -} - -# Check if kadmind is running -kadmind_status() { - if [ ! -z "$(ps -e -o command | grep -E -w [/]usr/sbin/kadmind)" ]; then - echo "kadmind is running." - else - echo "kadmind is stopped." - exit 1 - fi -} - -case "$1" in - 'start') - kadmind_start - ;; - 'stop') - kadmind_stop - ;; - 'restart') - kadmind_restart - ;; - 'status') - kadmind_status - ;; - *) - echo "usage $0 start|stop|restart|status" -esac diff --git a/network/krb5/rc.krb5kdc b/network/krb5/rc.krb5kdc deleted file mode 100644 index 6829e12ab5..0000000000 --- a/network/krb5/rc.krb5kdc +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# Kerberos V5 KDC init script -# -# Copyright (C) 2017 Jason Graham -# - -# Start krb5kdc: -krb5kdc_start() { - CMDLINE="/usr/sbin/krb5kdc" - echo -n "Starting krb5kdc: $CMDLINE" - $CMDLINE - echo -} - -# Stop krb5kdc: -krb5kdc_stop() { - echo "Stopping krb5kdc..." - killall -e -q krb5kdc -} - -# Restart krb5kdc: -krb5kdc_restart() { - krb5kdc_stop - sleep 1 - krb5kdc_start -} - -# Check if krb5kdc is running -krb5kdc_status() { - if [ ! -z "$(ps -e -o command | grep -E -w [/]usr/sbin/krb5kdc)" ]; then - echo "krb5kdc is running." - else - echo "krb5kdc is stopped." - exit 1 - fi -} - -case "$1" in - 'start') - krb5kdc_start - ;; - 'stop') - krb5kdc_stop - ;; - 'restart') - krb5kdc_restart - ;; - 'status') - krb5kdc_status - ;; - *) - echo "usage $0 start|stop|restart|status" -esac diff --git a/network/krb5/slack-desc b/network/krb5/slack-desc deleted file mode 100644 index 6b5ce3e43e..0000000000 --- a/network/krb5/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------------------------------------------------------| -krb5: krb5 (network authentication protocol) -krb5: -krb5: Kerberos is a network authentication protocol. It is designed to -krb5: provide strong authentication for client/server applications by using -krb5: secret-key cryptography. A free implementation of this protocol is -krb5: available from the Massachusetts Institute of Technology. Kerberos is -krb5: available in many commercial products as well. -krb5: -krb5: Homepage: http://web.mit.edu/kerberos/ -krb5: -krb5: 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/midori/README b/network/midori/README index 16ec7ed18a..d8f163a4e0 100644 --- a/network/midori/README +++ b/network/midori/README @@ -1,7 +1,7 @@ Midori is a lightweight, webkit-based web browser. Features: - * Full integration with GTK+2 + * Full integration with GTK+3 * Fast rendering with WebKit * Tabs, windows and session management * Flexibly configurable Web Search. @@ -10,11 +10,3 @@ Features: * Customizable and extensible interface. * Extensions such as Adblock, form history, mouse gestures or cookie management. - -GTK3 support is disabled by default but can be enabled -by passing GTK3=yes to the script, e.g. - - GTK3=yes ./midori.SlackBuild - -If enabled then webkitgtk3 and libunique3 (instead of webkitgtk -and libunique) are required. diff --git a/network/midori/doinst.sh b/network/midori/doinst.sh index 8505e6eaff..4a25de5e6f 100644 --- a/network/midori/doinst.sh +++ b/network/midori/doinst.sh @@ -1,19 +1,3 @@ -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... -} - -config etc/xdg/midori/search.new -config etc/xdg/midori/extensions/adblock/config.new - if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi diff --git a/network/midori/midori.SlackBuild b/network/midori/midori.SlackBuild index 99efa991c7..8aeed3e3ed 100644 --- a/network/midori/midori.SlackBuild +++ b/network/midori/midori.SlackBuild @@ -5,7 +5,7 @@ # Copyright 2008 Andrew Brouwers # Copyright 2009-2011 Pierre Cazenave # Copyright 2012-2013 Roberto Neri, Palermo, Italy -# Copyright 2013-2016 Matteo Bernardini , Pisa, Italy +# Copyright 2013-2019 Matteo Bernardini , Pisa, Italy # # All rights reserved. # @@ -27,7 +27,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=midori -VERSION=${VERSION:-0.5.11} +SRCNAM=core +VERSION=${VERSION:-9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,22 +62,14 @@ else LIBDIRSUFFIX="" fi -# GTK3 support is disabled by default but can be enabled -# by passing GTK3=yes to the script -if [ "${GTK3:-no}" = "yes" ]; then - ENABLE_GTK3="ON" -else - ENABLE_GTK3="OFF" -fi - set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/${PRGNAM}_${VERSION}_all_.tar.?z* -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -87,30 +80,20 @@ find -L . \ mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc \ - -DCMAKE_INSTALL_FULL_LIBDIR=/usr/lib$LIBDIRSUFFIX \ - -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ - -DDATADIR=/usr/share/$PRGNAM \ - -DUSE_ZEITGEIST=OFF \ - -DUSE_GTK3="$ENABLE_GTK3" \ - -DHALF_BRO_INCOM_WEBKIT2=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG + -DCMAKE_INSTALL_LIBDIR=/usr/lib$LIBDIRSUFFIX \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DVALA_CFLAGS="$SLKCFLAGS" \ + -G Ninja \ + .. + ninja + DESTDIR=$PKG ninja install cd .. -# Don't clobber existing configs -mv $PKG/etc/xdg/midori/search $PKG/etc/xdg/midori/search.new -mv $PKG/etc/xdg/midori/extensions/adblock/config $PKG/etc/xdg/midori/extensions/adblock/config.new - -# The other docs have been taken care by make install +rm -fR $PKG/usr/share/doc mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a HACKING TODO TRANSLATE \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING *.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -ln -s $PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/midori/midori.info b/network/midori/midori.info index a2abab3152..516e7ec757 100644 --- a/network/midori/midori.info +++ b/network/midori/midori.info @@ -1,10 +1,10 @@ PRGNAM="midori" -VERSION="0.5.11" -HOMEPAGE="http://midori-browser.org/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/midori_0.5.11_all_.tar.bz2" -MD5SUM="fcc03ef759fce4fe9f2446d9da4a065e" +VERSION="9.0" +HOMEPAGE="https://midori-browser.org/" +DOWNLOAD="https://github.com/midori-browser/core/archive/v9.0/midori-9.0.tar.gz" +MD5SUM="b39172aeb754e666f044d69828f82bcc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="vala webkit2gtk" +REQUIRES="libpeas webkit2gtk" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/network/midori/slack-desc b/network/midori/slack-desc index bddbb483ce..15edff5601 100644 --- a/network/midori/slack-desc +++ b/network/midori/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| midori: midori (simple web-browser) midori: -midori: midori is a simple web-browser, based on the webkit framework. +midori: midori is a simple web-browser, based on the webkit framework +midori: and gtk+3. midori: +midori: Homepage: https://midori-browser.org midori: midori: -midori: Homepage: http://midori-browser.org/ -midori: midori: midori: midori: 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/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 -# Currently maintained by B. Watson - -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 e7fa0d50de..c99b3248a4 100644 --- a/network/ncrack/ncrack.SlackBuild +++ b/network/ncrack/ncrack.SlackBuild @@ -71,7 +71,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.SlackBuild b/network/nghttp2/nghttp2.SlackBuild deleted file mode 100644 index 39af89748f..0000000000 --- a/network/nghttp2/nghttp2.SlackBuild +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -# Slackware build script for "nghttp2". - -# Copyright 2016 Marcel Saegebarth -# 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=nghttp2 -VERSION=${VERSION:-1.16.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="" -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.xz -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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-python-bindings \ - --with-jemalloc \ - --disable-static \ - --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 -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/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/nghttp2/slack-desc b/network/nghttp2/slack-desc deleted file mode 100644 index a1d218da43..0000000000 --- a/network/nghttp2/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------------------------------------------------------| -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: 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 +Last-Update: + +--- 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 ]], ++ [[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/openfortivpn/openfortivpn.SlackBuild b/network/openfortivpn/openfortivpn.SlackBuild index b0dd518e5e..3d8f4786a3 100644 --- a/network/openfortivpn/openfortivpn.SlackBuild +++ b/network/openfortivpn/openfortivpn.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openfortivpn -VERSION=${VERSION:-1.1.4} +VERSION=${VERSION:-1.8.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/openfortivpn/openfortivpn.info b/network/openfortivpn/openfortivpn.info index 3bae8f084d..b75ff5bc72 100644 --- a/network/openfortivpn/openfortivpn.info +++ b/network/openfortivpn/openfortivpn.info @@ -1,8 +1,8 @@ PRGNAM="openfortivpn" -VERSION="1.1.4" +VERSION="1.8.1" HOMEPAGE="https://github.com/adrienverge/openfortivpn" -DOWNLOAD="https://github.com/adrienverge/openfortivpn/archive/v1.1.4/openfortivpn-1.1.4.zip" -MD5SUM="0c091f3306cadcd870b92925d241c011" +DOWNLOAD="https://github.com/adrienverge/openfortivpn/archive/v1.8.1/openfortivpn-1.8.1.zip" +MD5SUM="e21b24d4209fa94b6f73ba34b1166400" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/opensmtpd/aliases b/network/opensmtpd/aliases index ea54878974..85cc8e71ac 100644 --- a/network/opensmtpd/aliases +++ b/network/opensmtpd/aliases @@ -1,23 +1,49 @@ -# See aliases(5) for more information +# Sample aliases file installed in /etc/opensmtpd/aliases +# +# Aliases in this file will NOT be expanded in the header from +# Mail, but WILL be visible over networks or from /usr/libexec/mail.local. +# +# >>>>>>>>>> The program "newaliases" must be run after +# >> NOTE >> this file is updated for any changes to +# >>>>>>>>>> show through to smtpd. +# + +# Person who should get root's mail. Don't receive mail as root! +#root: you # Basic system aliases -- these MUST be present MAILER-DAEMON: postmaster postmaster: root # General redirections for pseudo accounts -bin: root daemon: root named: root -nobody: root uucp: root www: root ftp-bugs: root +# Redirections for pseudo accounts that should not receive mail +bin: /dev/null +build: /dev/null +nobody: /dev/null +sshd: /dev/null + # Well-known aliases manager: root dumper: root operator: root -abuse: postmaster + +# RFC 2142: NETWORK OPERATIONS MAILBOX NAMES +abuse: root +# noc: root +security: root + +# RFC 2142: SUPPORT MAILBOX NAMES FOR SPECIFIC INTERNET SERVICES +# hostmaster: root +# usenet: root +# news: usenet +# webmaster: root +# ftp: root # trap decode to catch security attacks decode: root diff --git a/network/opensmtpd/fix-crash-on-authentication.patch b/network/opensmtpd/fix-crash-on-authentication.patch deleted file mode 100644 index c20b5e0a0e..0000000000 --- a/network/opensmtpd/fix-crash-on-authentication.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9b5f70b93e038df5446bd37a4adac5a0380748e7 Mon Sep 17 00:00:00 2001 -From: johannes -Date: Wed, 21 Feb 2018 23:57:11 +0100 -Subject: [PATCH] crypt_checkpass: include HAVE_CRYPT_H definition, add NULL - check - ---- - openbsd-compat/crypt_checkpass.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/openbsd-compat/crypt_checkpass.c b/openbsd-compat/crypt_checkpass.c -index dafd2dae..d10b3a57 100644 ---- a/openbsd-compat/crypt_checkpass.c -+++ b/openbsd-compat/crypt_checkpass.c -@@ -1,5 +1,6 @@ - /* OPENBSD ORIGINAL: lib/libc/crypt/cryptutil.c */ - -+#include "includes.h" - #include - #ifdef HAVE_CRYPT_H - #include -@@ -10,6 +11,8 @@ - int - crypt_checkpass(const char *pass, const char *goodhash) - { -+ char *c; -+ - if (goodhash == NULL) - goto fail; - -@@ -17,7 +20,11 @@ crypt_checkpass(const char *pass, const char *goodhash) - if (strlen(goodhash) == 0 && strlen(pass) == 0) - return 0; - -- if (strcmp(crypt(pass, goodhash), goodhash) == 0) -+ c = crypt(pass, goodhash); -+ if (c == NULL) -+ goto fail; -+ -+ if (strcmp(c, goodhash) == 0) - return 0; - - fail: diff --git a/network/opensmtpd/openbsd64-020-smtpd.patch b/network/opensmtpd/openbsd64-020-smtpd.patch deleted file mode 100644 index 8ce7178da8..0000000000 --- a/network/opensmtpd/openbsd64-020-smtpd.patch +++ /dev/null @@ -1,31 +0,0 @@ -OpenBSD 6.4 errata 020, August 2, 2019 - -smtpd can crash on excessively large input, causing a denial of service. - ---- a/smtpd/smtp_session.c 3 Sep 2018 19:01:29 -0000 1.337 -+++ b/smtpd/smtp_session.c 1 Aug 2019 21:18:53 -0000 -@@ -1904,15 +1904,21 @@ smtp_reply(struct smtp_session *s, char - { - va_list ap; - int n; -- char buf[LINE_MAX], tmp[LINE_MAX]; -+ char buf[LINE_MAX*2], tmp[LINE_MAX*2]; - - va_start(ap, fmt); - n = vsnprintf(buf, sizeof buf, fmt, ap); - va_end(ap); -- if (n == -1 || n >= LINE_MAX) -- fatalx("smtp_reply: line too long"); -+ if (n < 0) -+ fatalx("smtp_reply: response format error"); - if (n < 4) - fatalx("smtp_reply: response too short"); -+ if (n >= (int)sizeof buf) { -+ /* only first three bytes are used by SMTP logic, -+ * so if _our_ reply does not fit entirely in the -+ * buffer, it's ok to truncate. -+ */ -+ } - - log_trace(TRACE_SMTP, "smtp: %p: >>> %s", s, buf); - diff --git a/network/opensmtpd/openbsd65-029-smptd-tls.patch b/network/opensmtpd/openbsd65-029-smptd-tls.patch deleted file mode 100644 index a2727decf8..0000000000 --- a/network/opensmtpd/openbsd65-029-smptd-tls.patch +++ /dev/null @@ -1,52 +0,0 @@ -OpenBSD 6.5 errata 029, January 30, 2020: - -smtpd can crash on opportunistic TLS downgrade, causing a denial of service. - ---- usr.sbin/smtpd/mta_session.c 23 Dec 2018 16:37:53 -0000 1.115 -+++ usr.sbin/smtpd/mta_session.c 20 Jan 2020 10:36:58 -0000 -@@ -1292,40 +1292,20 @@ mta_io(struct io *io, int evt, void *arg - break; - - case IO_ERROR: -+ case IO_TLSERROR: - log_debug("debug: mta: %p: IO error: %s", s, io_error(io)); -- if (!s->ready) { -- mta_error(s, "IO Error: %s", io_error(io)); -- mta_connect(s); -- break; -- } -- else if (!(s->flags & (MTA_FORCE_TLS|MTA_FORCE_SMTPS|MTA_FORCE_ANYSSL))) { -- /* error in non-strict SSL negotiation, downgrade to plain */ -- if (s->flags & MTA_TLS) { -- log_info("smtp-out: Error on session %016"PRIx64 -- ": opportunistic TLS failed, " -- "downgrading to plain", s->id); -- s->flags &= ~MTA_TLS; -- s->flags |= MTA_DOWNGRADE_PLAIN; -- mta_connect(s); -- break; -- } -- } -- mta_error(s, "IO Error: %s", io_error(io)); -- mta_free(s); -- break; - -- case IO_TLSERROR: -- log_debug("debug: mta: %p: TLS IO error: %s", s, io_error(io)); -- if (!(s->flags & (MTA_FORCE_TLS|MTA_FORCE_SMTPS|MTA_FORCE_ANYSSL))) { -+ if (s->state == MTA_STARTTLS && s->use_smtp_tls) { - /* error in non-strict SSL negotiation, downgrade to plain */ -- log_info("smtp-out: TLS Error on session %016"PRIx64 -- ": TLS failed, " -+ log_info("smtp-out: Error on session %016"PRIx64 -+ ": opportunistic TLS failed, " - "downgrading to plain", s->id); - s->flags &= ~MTA_TLS; - s->flags |= MTA_DOWNGRADE_PLAIN; - mta_connect(s); - break; - } -+ - mta_error(s, "IO Error: %s", io_error(io)); - mta_free(s); - break; diff --git a/network/opensmtpd/openbsd65-031-smtpd-envelope.patch b/network/opensmtpd/openbsd65-031-smtpd-envelope.patch deleted file mode 100644 index cd59f1d6fa..0000000000 --- a/network/opensmtpd/openbsd65-031-smtpd-envelope.patch +++ /dev/null @@ -1,199 +0,0 @@ -OpenBSD 6.5 errata 031, February 24, 2020: - -An out of bounds read in smtpd allows an attacker to inject arbitrary -commands into the envelope file which are then executed as root. -Separately, missing privilege revocation in smtpctl allows arbitrary -commands to be run with the _smtpq group. - ---- a/smtpd/makemap.c.orig 2018-01-10 05:06:40.000000000 -0800 -+++ b/smtpd/makemap.c 2020-02-24 15:41:18.278340410 -0800 -@@ -105,8 +105,13 @@ makemap(int prog_mode, int argc, char *a - int ch, dbputs = 0, Uflag = 0; - DBTYPE dbtype = DB_HASH; - char *p; -+ gid_t gid; - int fd = -1; - -+ gid = getgid(); -+ if (setresgid(gid, gid, gid) == -1) -+ err(1, "setresgid"); -+ - log_init(1, LOG_MAIL); - - mode = prog_mode; -@@ -180,9 +185,9 @@ makemap(int prog_mode, int argc, char *a - errx(1, "database name too long"); - } - -- execlp("makemap", "makemap", "-d", argv[0], "-o", dbname, "-", -- (char *)NULL); -- err(1, "execlp"); -+ execl(PATH_MAKEMAP, "makemap", "-d", argv[0], "-o", dbname, -+ "-", (char *)NULL); -+ err(1, "execl"); - } - - if (mode == P_NEWALIASES) { ---- a/smtpd/mta_session.c.orig 2020-02-08 10:24:17.692029666 -0800 -+++ b/smtpd/mta_session.c 2020-02-24 15:46:46.121342818 -0800 -@@ -1214,7 +1214,7 @@ mta_io(struct io *io, int evt, void *arg - if (cont) { - if (s->replybuf[0] == '\0') - (void)strlcat(s->replybuf, line, sizeof s->replybuf); -- else { -+ else if (len > 4) { - line = line + 4; - if (isdigit((int)*line) && *(line + 1) == '.' && - isdigit((int)*line+2) && *(line + 3) == '.' && -@@ -1229,7 +1229,9 @@ mta_io(struct io *io, int evt, void *arg - /* last line of a reply, check if we're on a continuation to parse out status and ESC. - * if we overflow reply buffer or are not on continuation, log entire last line. - */ -- if (s->replybuf[0] != '\0') { -+ if (s->replybuf[0] == '\0') -+ (void)strlcat(s->replybuf, line, sizeof s->replybuf); -+ else if (len > 4) { - p = line + 4; - if (isdigit((int)*p) && *(p + 1) == '.' && - isdigit((int)*p+2) && *(p + 3) == '.' && -@@ -1238,8 +1240,6 @@ mta_io(struct io *io, int evt, void *arg - if (strlcat(s->replybuf, p, sizeof s->replybuf) >= sizeof s->replybuf) - (void)strlcpy(s->replybuf, line, sizeof s->replybuf); - } -- else -- (void)strlcpy(s->replybuf, line, sizeof s->replybuf); - - if (s->state == MTA_QUIT) { - log_info("%016"PRIx64" mta event=closed reason=quit messages=%zu", ---- a/smtpd/smtpctl.c.orig 2018-01-10 05:06:40.000000000 -0800 -+++ b/smtpd/smtpctl.c 2020-02-24 14:57:04.687320914 -0800 -@@ -1116,7 +1116,7 @@ sendmail_compat(int argc, char **argv) - */ - for (i = 1; i < argc; i++) - if (strncmp(argv[i], "-bi", 3) == 0) -- exit(makemap(P_NEWALIASES, argc, argv)); -+ exit(makemap(P_SENDMAIL, argc, argv)); - - if (!srv_connect()) - offlinefp = offline_file(); ---- a/smtpd/smtpd-defines.h.orig 2018-01-10 05:06:40.000000000 -0800 -+++ b/smtpd/smtpd-defines.h 2020-02-24 15:00:29.616322420 -0800 -@@ -46,6 +46,9 @@ - #ifndef PATH_SPOOL - #define PATH_SPOOL "/var/spool/smtpd" - #endif -+#ifndef PATH_MAKEUP -+#define PATH_MAKEMAP "/usr/sbin/makemap" -+#endif - - #define SUBADDRESSING_DELIMITER "+" - ---- a/smtpd/smtpd.c.orig 2018-01-10 05:06:40.000000000 -0800 -+++ b/smtpd/smtpd.c 2020-02-24 15:55:55.503346854 -0800 -@@ -109,9 +109,10 @@ static struct mproc *setup_peer(enum smt - static int imsg_wait(struct imsgbuf *, struct imsg *, int); - - static void offline_scan(int, short, void *); --static int offline_add(char *); -+static int offline_add(char *, uid_t, gid_t); - static void offline_done(void); --static int offline_enqueue(char *); -+static int offline_enqueue(char *, uid_t, gid_t); -+ - - static void purge_task(void); - static int parent_auth_user(const char *, const char *); -@@ -136,6 +137,8 @@ struct child { - - struct offline { - TAILQ_ENTRY(offline) entry; -+ uid_t uid; -+ gid_t gid; - char *path; - }; - -@@ -1409,7 +1412,8 @@ offline_scan(int fd, short ev, void *arg - continue; - } - -- if (offline_add(e->fts_name)) { -+ if (offline_add(e->fts_name, e->fts_statp->st_uid, -+ e->fts_statp->st_gid)) { - log_warnx("warn: smtpd: " - "could not add offline message %s", e->fts_name); - continue; -@@ -1429,7 +1433,7 @@ offline_scan(int fd, short ev, void *arg - } - - static int --offline_enqueue(char *name) -+offline_enqueue(char *name, uid_t uid, gid_t gid) - { - char *path; - struct stat sb; -@@ -1491,6 +1495,18 @@ offline_enqueue(char *name) - _exit(1); - } - -+ if (sb.st_uid != uid) { -+ log_warnx("warn: smtpd: file %s has bad uid %d", -+ path, sb.st_uid); -+ _exit(1); -+ } -+ -+ if (sb.st_gid != gid) { -+ log_warnx("warn: smtpd: file %s has bad gid %d", -+ path, sb.st_gid); -+ _exit(1); -+ } -+ - pw = getpwuid(sb.st_uid); - if (pw == NULL) { - log_warnx("warn: smtpd: getpwuid for uid %d failed", -@@ -1547,17 +1563,19 @@ offline_enqueue(char *name) - } - - static int --offline_add(char *path) -+offline_add(char *path, uid_t uid, gid_t gid) - { - struct offline *q; - - if (offline_running < OFFLINE_QUEUEMAX) - /* skip queue */ -- return offline_enqueue(path); -+ return offline_enqueue(path, uid, gid); - - q = malloc(sizeof(*q) + strlen(path) + 1); - if (q == NULL) - return (-1); -+ q->uid = uid; -+ q->gid = gid; - q->path = (char *)q + sizeof(*q); - memmove(q->path, path, strlen(path) + 1); - TAILQ_INSERT_TAIL(&offline_q, q, entry); -@@ -1576,7 +1594,8 @@ offline_done(void) - if ((q = TAILQ_FIRST(&offline_q)) == NULL) - break; /* all done */ - TAILQ_REMOVE(&offline_q, q, entry); -- offline_enqueue(q->path); -+ offline_enqueue(q->path, q->uid, q->gid); -+ - free(q); - } - } ---- a/smtpd/smtpd.h.orig 2018-01-10 05:06:40.000000000 -0800 -+++ b/smtpd/smtpd.h 2020-02-24 15:20:09.043331085 -0800 -@@ -128,8 +128,10 @@ - #define MTA_EXT_DSN 0x400 - - --#define P_NEWALIASES 0 --#define P_MAKEMAP 1 -+#define P_SENDMAIL 0 -+#define P_NEWALIASES 1 -+#define P_MAKEMAP 2 -+ - - struct userinfo { - char username[SMTPD_VUSERNAME_SIZE]; diff --git a/network/opensmtpd/openbsd66-019-smtpd-exec.patch b/network/opensmtpd/openbsd66-019-smtpd-exec.patch deleted file mode 100644 index 93ce19dcb1..0000000000 --- a/network/opensmtpd/openbsd66-019-smtpd-exec.patch +++ /dev/null @@ -1,46 +0,0 @@ -OpenBSD 6.6 errata 019, January 30, 2020: - -An incorrect check allows an attacker to trick mbox delivery into executing -arbitrary commands as root and lmtp delivery into executing arbitrary commands -as an unprivileged user. - ---- usr.sbin/smtpd/smtp_session.c 4 Oct 2019 08:34:29 -0000 1.415 -+++ usr.sbin/smtpd/smtp_session.c 26 Jan 2020 05:56:37 -0000 -@@ -2012,24 +2012,22 @@ smtp_mailaddr(struct mailaddr *maddr, ch - memmove(maddr->user, p, strlen(p) + 1); - } - -- if (!valid_localpart(maddr->user) || -- !valid_domainpart(maddr->domain)) { -- /* accept empty return-path in MAIL FROM, required for bounces */ -- if (mailfrom && maddr->user[0] == '\0' && maddr->domain[0] == '\0') -- return (1); -+ /* accept empty return-path in MAIL FROM, required for bounces */ -+ if (mailfrom && maddr->user[0] == '\0' && maddr->domain[0] == '\0') -+ return (1); - -- /* no user-part, reject */ -- if (maddr->user[0] == '\0') -- return (0); -- -- /* no domain, local user */ -- if (maddr->domain[0] == '\0') { -- (void)strlcpy(maddr->domain, domain, -- sizeof(maddr->domain)); -- return (1); -- } -+ /* no or invalid user-part, reject */ -+ if (maddr->user[0] == '\0' || !valid_localpart(maddr->user)) - return (0); -+ -+ /* no domain part, local user */ -+ if (maddr->domain[0] == '\0') { -+ (void)strlcpy(maddr->domain, domain, -+ sizeof(maddr->domain)); - } -+ -+ if (!valid_domainpart(maddr->domain)) -+ return (0); - - return (1); - } diff --git a/network/opensmtpd/opensmtpd.SlackBuild b/network/opensmtpd/opensmtpd.SlackBuild index 54a4f8e4cf..afda7fedc1 100644 --- a/network/opensmtpd/opensmtpd.SlackBuild +++ b/network/opensmtpd/opensmtpd.SlackBuild @@ -24,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=opensmtpd -VERSION=${VERSION:-6.0.3p1} -BUILD=${BUILD:-6} +VERSION=${VERSION:-6.6.4p1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -92,21 +92,6 @@ 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 {} \; -# fix reply buffer overflow -cat $CWD/openbsd64-020-smtpd.patch | patch -p1 - -# fix tls downgrade -cat $CWD/openbsd65-029-smptd-tls.patch | patch -p1 - -# fix exec -cat $CWD/openbsd66-019-smtpd-exec.patch | patch -p1 - -# check null from crypt function -cat $CWD/fix-crash-on-authentication.patch | patch -p1 - -# fix smtpctl envelop -cat $CWD/openbsd65-031-smtpd-envelope.patch | patch -p1 - CFLAGS="$SLKCFLAGS -D_DEFAULT_SOURCE" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -150,10 +135,16 @@ ln -s smtpctl $PKG/usr/sbin/makemap mkdir -p $PKG/etc/rc.d cat $CWD/rc.opensmtpd > $PKG/etc/rc.d/rc.opensmtpd.new -# Don't clobber the config file +# copy original smtpd.conf file +cp -p $PKG/etc/opensmtpd/smtpd.conf $PKG/etc/opensmtpd/smtpd.conf.upstream.default + +# Don't clobber the existing config file mv $PKG/etc/opensmtpd/smtpd.conf $PKG/etc/opensmtpd/smtpd.conf.new # and reflect the correct path to aliases file -sed -i "s,/etc/mail/,/etc/opensmtpd/,g" $PKG/etc/opensmtpd/smtpd.conf.new +# and use mbox instead of maildir +sed -i -e "s,/etc/mail/,/etc/opensmtpd/,g" \ + -e "s,maildir alias,mbox alias,g" \ + $PKG/etc/opensmtpd/smtpd.conf.new # Create (but don't clobber) the aliases file cat $CWD/aliases > $PKG/etc/opensmtpd/aliases.new @@ -176,7 +167,7 @@ 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 INSTALL LICENSE README.md THANKS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.slackware cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/opensmtpd/opensmtpd.info b/network/opensmtpd/opensmtpd.info index 0930880299..b8753bc31d 100644 --- a/network/opensmtpd/opensmtpd.info +++ b/network/opensmtpd/opensmtpd.info @@ -1,8 +1,8 @@ PRGNAM="opensmtpd" -VERSION="6.0.3p1" +VERSION="6.6.4p1" HOMEPAGE="https://www.opensmtpd.org/" -DOWNLOAD="https://www.opensmtpd.org/archives/opensmtpd-6.0.3p1.tar.gz" -MD5SUM="66e496bb0f3303d660744f4fa2178765" +DOWNLOAD="https://www.opensmtpd.org/archives/opensmtpd-6.6.4p1.tar.gz" +MD5SUM="4744943277f9a6dc942e7560dbdb5643" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libasr" diff --git a/network/phodav/phodav.SlackBuild b/network/phodav/phodav.SlackBuild index 1b3c1bcebc..6b597d6460 100644 --- a/network/phodav/phodav.SlackBuild +++ b/network/phodav/phodav.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for phodav -# Copyright 2016-2018 Matteo Bernardini , Pisa, Italy +# Copyright 2016-2019 Matteo Bernardini , Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=phodav -VERSION=${VERSION:-2.2} +VERSION=${VERSION:-2.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,21 +73,15 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./configure \ +meson \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ - --localstatedir=/var \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-static \ - --build=$ARCH-slackware-linux + build -make -make install DESTDIR=$PKG - -mkdir $PKG/lib -mv $PKG/usr/lib/udev $PKG/lib/ +ninja -C build +DESTDIR=$PKG ninja -C build install 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 diff --git a/network/phodav/phodav.info b/network/phodav/phodav.info index 7b7b8d7050..5fc7a8b668 100644 --- a/network/phodav/phodav.info +++ b/network/phodav/phodav.info @@ -1,8 +1,8 @@ PRGNAM="phodav" -VERSION="2.2" +VERSION="2.3" HOMEPAGE="https://wiki.gnome.org/phodav" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/phodav/2.2/phodav-2.2.tar.xz" -MD5SUM="18dc8890ef3606f2a053054658dbf016" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/phodav/2.3/phodav-2.3.tar.xz" +MD5SUM="0f4bbe83181037577c808acea166b26a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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/pidgin-sipe/pidgin-sipe.SlackBuild b/network/pidgin-sipe/pidgin-sipe.SlackBuild index e59c906f6e..c041a67d75 100644 --- a/network/pidgin-sipe/pidgin-sipe.SlackBuild +++ b/network/pidgin-sipe/pidgin-sipe.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pidgin-sipe -VERSION=${VERSION:-1.23.0} +VERSION=${VERSION:-1.24.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/pidgin-sipe/pidgin-sipe.info b/network/pidgin-sipe/pidgin-sipe.info index a2cc1045d7..31c45157f6 100644 --- a/network/pidgin-sipe/pidgin-sipe.info +++ b/network/pidgin-sipe/pidgin-sipe.info @@ -1,8 +1,8 @@ PRGNAM="pidgin-sipe" -VERSION="1.23.0" +VERSION="1.24.0" HOMEPAGE="http://sipe.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/sipe/pidgin-sipe-1.23.0.tar.xz" -MD5SUM="75fb9417834bc78114786d78a41bcd37" +DOWNLOAD="http://downloads.sourceforge.net/sipe/pidgin-sipe-1.24.0.tar.xz" +MD5SUM="b91106d28c235b347a63dcb676f7b66a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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 6bf3f38e2d..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, 2019 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.2} -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 9809f40eb0..0000000000 --- a/network/postfix/postfix.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="postfix" -VERSION="3.3.2" -HOMEPAGE="http://www.postfix.org/" -DOWNLOAD="http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/postfix-3.3.2.tar.gz" -MD5SUM="4e6ed7056576e0c54cfce6040a0bb0ad" -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 -postfix: and the SlackBuilds.org Team -postfix: -postfix: diff --git a/network/pptp/pptp.SlackBuild b/network/pptp/pptp.SlackBuild index 0ea1de4b74..c6895c11e9 100644 --- a/network/pptp/pptp.SlackBuild +++ b/network/pptp/pptp.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pptp -VERSION=${VERSION:-1.8.0} +VERSION=${VERSION:-1.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/pptp/pptp.info b/network/pptp/pptp.info index 93fefabf34..c676283935 100644 --- a/network/pptp/pptp.info +++ b/network/pptp/pptp.info @@ -1,8 +1,8 @@ PRGNAM="pptp" -VERSION="1.8.0" +VERSION="1.10.0" HOMEPAGE="http://pptpclient.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/pptpclient/pptp-1.8.0.tar.gz" -MD5SUM="4efce9f263e2c3f38d79d9df222476de" +DOWNLOAD="http://downloads.sourceforge.net/pptpclient/pptp-1.10.0.tar.gz" +MD5SUM="8d25341352fdae5ad5b36b9f18254908" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/qTox/qTox.SlackBuild b/network/qTox/qTox.SlackBuild index 1fff74fa2d..c44cc94480 100644 --- a/network/qTox/qTox.SlackBuild +++ b/network/qTox/qTox.SlackBuild @@ -72,6 +72,8 @@ find -L . \ # gcc-7 fix #patch -p1 <$CWD/rawdatabase.h.diff +sed -e 's|-Werror||' -i CMakeLists.txt + mkdir -p build cd build cmake \ diff --git a/network/rtorrent/README b/network/rtorrent/README index 6c05b5620f..74e8064101 100644 --- a/network/rtorrent/README +++ b/network/rtorrent/README @@ -2,3 +2,5 @@ rtorrent is a BitTorrent client for ncurses, using the libtorrent library. The client and library is written in C++ with emphasis on speed and efficiency, while delivering equivalent features to those found in GUI based clients in an ncurses client. + +Optional dependency: xmlrpc-c diff --git a/network/rtorrent/rtorrent.SlackBuild b/network/rtorrent/rtorrent.SlackBuild index f5ee018aff..421bf99503 100644 --- a/network/rtorrent/rtorrent.SlackBuild +++ b/network/rtorrent/rtorrent.SlackBuild @@ -17,7 +17,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 @@ -28,8 +28,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -42,6 +42,8 @@ else LIBDIRSUFFIX="" fi +xmlrpcc="" ; [ -x /usr/bin/xmlrpc-c-config ] && xmlrpcc="--with-xmlrpc-c" + set -e rm -rf $PKG @@ -66,6 +68,8 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + $xmlrpcc \ + --disable-debug \ --build=$ARCH-slackware-linux make diff --git a/network/s-nail/README b/network/s-nail/README deleted file mode 100644 index c18e83c0f2..0000000000 --- a/network/s-nail/README +++ /dev/null @@ -1,16 +0,0 @@ -S-nail (mail sending and receiving utility) - -S-nail provides a simple and friendly environment for sending and -receiving mail. It is intended to provide the functionality of the -POSIX mailx command, but is MIME capable and optionally offers -extensions for line editing, S/MIME, SMTP and POP3, among others. It -divides incoming mail into its constituent messages and allows the -user to deal with them in any order. It offers many COMMANDS and -INTERNAL VARIABLES for manipulating messages and sending mail. It -offers simple editing capabilities, and increasingly powerful and -reliable non-interactive scripting capabilities. - -NOTE - -This package conflicts with Slackware's mailx package. You should -remove mailx before installing this package. diff --git a/network/s-nail/doinst.sh b/network/s-nail/doinst.sh deleted file mode 100644 index b541fb201d..0000000000 --- a/network/s-nail/doinst.sh +++ /dev/null @@ -1,13 +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... -} -config etc/nail.rc.new diff --git a/network/s-nail/s-nail.SlackBuild b/network/s-nail/s-nail.SlackBuild deleted file mode 100644 index b50c566f5a..0000000000 --- a/network/s-nail/s-nail.SlackBuild +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/sh - -# Slackware build script for S-nail - -# Copyright 2008, 2009, 2010, 2016 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2018 - 2020 Johannes Schoepfer, Germany -# 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=s-nail -VERSION=${VERSION:-14.9.17} -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 $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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -make \ - VAL_PREFIX=/usr \ - VAL_SYSCONFDIR=/etc \ - VAL_MANDIR=/usr/man \ - VAL_MAIL=/var/spool/mail \ - VAL_MTA=/usr/sbin/sendmail \ - OPT_AUTOCC=0 \ - VAL_SID= \ - VAL_MAILX=mailx \ - VAL_SYSCONFRC=nail.rc \ - VAL_RANDOM="libgetrandom,sysgetrandom,urandom" \ - config - -make build -make test -make install DESTDIR=$PKG - -# Tighten up the perms a bit: -chmod 4711 $PKG/usr/libexec/mailx-dotlock - -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 - -# We put symlinks in /bin since some things still expect '/bin/mail' or '/bin/Mail': -mkdir -p $PKG/bin -( cd $PKG/bin - ln -sf /usr/bin/mailx Mail - ln -sf /usr/bin/mailx mail - ln -sf /usr/bin/mailx nail -) - -# Likewise, we make some compat symlinks in /usr/bin: -( cd $PKG/usr/bin - ln -sf mailx Mail - ln -sf mailx mail - ln -sf mailx nail -) - -mv $PKG/etc/nail.rc $PKG/etc/nail.rc.new - -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 - -# Manpage links: -( cd $PKG/usr/man/man1 - ln -sf mailx.1.gz mail.1.gz - ln -sf mailx.1.gz nail.1.gz - ln -sf mailx.1.gz Mail.1.gz -) - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING* INSTALL* NEWS* README* THANKS* \ - $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/s-nail/s-nail.info b/network/s-nail/s-nail.info deleted file mode 100644 index 5fa74b7f7a..0000000000 --- a/network/s-nail/s-nail.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="s-nail" -VERSION="14.9.17" -HOMEPAGE="https://www.sdaoden.eu/code.html" -DOWNLOAD="https://www.sdaoden.eu/downloads/s-nail-14.9.17.tar.xz" -MD5SUM="844524dee4c7c9b5255a2b0cf7159c7a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="%README%" -MAINTAINER="Johannes Schoepfer" -EMAIL="slackbuilds@schoepfer.info" diff --git a/network/s-nail/slack-desc b/network/s-nail/slack-desc deleted file mode 100644 index ab63a8e702..0000000000 --- a/network/s-nail/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------------------------------------------------------| -s-nail: s-nail (mail sending and receiving utility) -s-nail: -s-nail: S-nail provides a simple and friendly environment for sending and -s-nail: receiving mail. It is intended to provide the functionality of the -s-nail: POSIX mailx command, but is MIME capable and optionally offers -s-nail: extensions for line editing, S/MIME, SMTP and POP3, among others. It -s-nail: divides incoming mail into its constituent messages and allows the -s-nail: user to deal with them in any order. It offers many COMMANDS and -s-nail: INTERNAL VARIABLES for manipulating messages and sending mail. It -s-nail: offers simple editing capabilities, and increasingly powerful and -s-nail: reliable non-interactive scripting capabilities. diff --git a/network/seafile-client/README b/network/seafile-client/README deleted file mode 100644 index 937324eae1..0000000000 --- a/network/seafile-client/README +++ /dev/null @@ -1,15 +0,0 @@ -Seafile is a next-generation open source cloud storage system with -advanced support for file syncing, privacy protection and teamwork. - -Collections of files are called libraries, and each library can be -synced separately. A library can be encrypted with a user chosen -password. This password is not stored on the server, so even the -server admin cannot view a file's contents. - -Seafile allows users to create groups with file syncing, wiki, and -discussion to enable easy collaboration around documents within a -team. - -Note: -This package conflicts with seafile-server. Install just one of -them at the same time. 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 -# 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/README b/network/seafile/README new file mode 100644 index 0000000000..937324eae1 --- /dev/null +++ b/network/seafile/README @@ -0,0 +1,15 @@ +Seafile is a next-generation open source cloud storage system with +advanced support for file syncing, privacy protection and teamwork. + +Collections of files are called libraries, and each library can be +synced separately. A library can be encrypted with a user chosen +password. This password is not stored on the server, so even the +server admin cannot view a file's contents. + +Seafile allows users to create groups with file syncing, wiki, and +discussion to enable easy collaboration around documents within a +team. + +Note: +This package conflicts with seafile-server. Install just one of +them at the same time. diff --git a/network/seafile/seafile.SlackBuild b/network/seafile/seafile.SlackBuild new file mode 100644 index 0000000000..63f62460ce --- /dev/null +++ b/network/seafile/seafile.SlackBuild @@ -0,0 +1,102 @@ +#!/bin/sh + +# Slackware build script for seafile + +# Copyright 2015 Marcel Saegebarth +# 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 +VERSION=${VERSION:-6.2.5} +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 $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 {} \; + +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/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/seafile/slack-desc b/network/seafile/slack-desc new file mode 100644 index 0000000000..cad22d1bb6 --- /dev/null +++ b/network/seafile/slack-desc @@ -0,0 +1,19 @@ +# 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: 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/socat/README b/network/socat/README deleted file mode 100644 index 828012f25b..0000000000 --- a/network/socat/README +++ /dev/null @@ -1,12 +0,0 @@ -socat is a relay for bidirectional data transfer between two -independent data channels. Each of these data channels may be a file, -pipe, device (serial line etc. or a pseudo terminal), a socket (UNIX, -IP4, IP6 - raw, UDP, TCP), an SSL socket, proxy CONNECT connection, -a file descriptor (stdin etc.), the GNU line editor (readline), -a program, or a combination of two of these. These modes include -generation of "listening" sockets, named pipes, and pseudo terminals. - -socat can use the OpenSSL FIPS module, if it is installed on your system. - -Upon install, you may want to read the SECURITY file in the documentation -directory. diff --git a/network/socat/slack-desc b/network/socat/slack-desc deleted file mode 100644 index b0e75054c5..0000000000 --- a/network/socat/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------------------------------------------------------| -socat: socat (multipurpose data relay) -socat: -socat: socat is a relay for bidirectional data transfer between two -socat: independent data channels. Each of these data channels may be a file, -socat: pipe, device (serial line etc. or a pseudo terminal), a socket (UNIX, -socat: IP4, IP6 - raw, UDP, TCP), an SSL socket, proxy CONNECT connection, -socat: a file descriptor (stdin etc.), the GNU line editor (readline), -socat: a program, or a combination of two of these. These modes include -socat: generation of "listening" sockets, named pipes, and pseudo terminals. -socat: -socat: Homepage: http://www.dest-unreach.org/socat diff --git a/network/socat/socat.SlackBuild b/network/socat/socat.SlackBuild deleted file mode 100644 index eddb6935dc..0000000000 --- a/network/socat/socat.SlackBuild +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -# Slackware build script for socat - -# Copyright 2009 Andrew Psaltis -# Copyright 2011 Grigorios Bouzakis -# Copyright 2014-2019 Larry Hajali -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for any purpose -# with or without fee is hereby granted, provided that the above copyright -# notice and this permission notice appear in all copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 -# AUTHORS AND COPYRIGHT HOLDERS AND THEIR 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=socat -VERSION=${VERSION:-1.7.3.3} -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 $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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --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 {} \; - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - BUGREPORTS CHANGES COPYING* DEVELOPMENT EXAMPLES FAQ PORTING \ - README* SECURITY doc/*.{css,html} \ - $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/socat/socat.info b/network/socat/socat.info deleted file mode 100644 index 08d3a5222e..0000000000 --- a/network/socat/socat.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="socat" -VERSION="1.7.3.3" -HOMEPAGE="http://www.dest-unreach.org/socat" -DOWNLOAD="http://www.dest-unreach.org/socat/download/socat-1.7.3.3.tar.bz2" -MD5SUM="b2a032a47b8b89a18485697fa975154f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Larry Hajali" -EMAIL="larryhaja[at]gmail[dot]com" diff --git a/network/spice-gtk/spice-gtk.SlackBuild b/network/spice-gtk/spice-gtk.SlackBuild index 6561b22050..a006bfc9db 100644 --- a/network/spice-gtk/spice-gtk.SlackBuild +++ b/network/spice-gtk/spice-gtk.SlackBuild @@ -1,7 +1,8 @@ #!/bin/sh # Slackware build script for spice-gtk -# Copyright 2013-2018 Matteo Bernardini Pisa, Italy + +# Copyright 2013-2019 Matteo Bernardini Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=spice-gtk -VERSION=${VERSION:-0.35} +VERSION=${VERSION:-0.37} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,7 +59,7 @@ if pkg-config --exists libusbredirhost; then usbredir="en"; else usbredir="dis"; if pkg-config --exists libcacard; then cacard="en"; else cacard="dis"; fi if pkg-config --exists libphodav-2.0; then phodav="en"; else phodav="dis"; fi -DOCS="AUTHORS COPYING NEWS README THANKS TODO" +DOCS="AUTHORS CHANGELOG.md COPYING README.md" set -e diff --git a/network/spice-gtk/spice-gtk.info b/network/spice-gtk/spice-gtk.info index e17de616e8..4bb1378921 100644 --- a/network/spice-gtk/spice-gtk.info +++ b/network/spice-gtk/spice-gtk.info @@ -1,8 +1,8 @@ PRGNAM="spice-gtk" -VERSION="0.35" +VERSION="0.37" HOMEPAGE="https://www.spice-space.org" -DOWNLOAD="https://www.spice-space.org/download/gtk/spice-gtk-0.35.tar.bz2" -MD5SUM="a8c919ee4a48dfeab619deb70900d788" +DOWNLOAD="https://www.spice-space.org/download/gtk/spice-gtk-0.37.tar.bz2" +MD5SUM="f1554a2442817109d2bdc37d30336208" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="opus spice vala" diff --git a/network/spice/spice.SlackBuild b/network/spice/spice.SlackBuild index e887c96ddf..566a495b55 100644 --- a/network/spice/spice.SlackBuild +++ b/network/spice/spice.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=spice -VERSION=${VERSION:-0.14.1} +VERSION=${VERSION:-0.14.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/spice/spice.info b/network/spice/spice.info index 04a4e89706..62370277dd 100644 --- a/network/spice/spice.info +++ b/network/spice/spice.info @@ -1,8 +1,8 @@ PRGNAM="spice" -VERSION="0.14.1" +VERSION="0.14.2" HOMEPAGE="https://www.spice-space.org" -DOWNLOAD="https://www.spice-space.org/download/releases/spice-server/spice-0.14.1.tar.bz2" -MD5SUM="1e2442b08605a5a17430d1aaa0912c24" +DOWNLOAD="https://www.spice-space.org/download/releases/spice-server/spice-0.14.2.tar.bz2" +MD5SUM="7ca431580b662e7c3cb8021983a3d387" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="opus pyparsing six spice-protocol" 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 4b484d5915..0000000000 --- a/network/sshfs-fuse/README +++ /dev/null @@ -1,12 +0,0 @@ -sshfs-fuse (ssh file system module for FUSE) - -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/fixrst.diff b/network/sshfs-fuse/fixrst.diff deleted file mode 100644 index 4bf148f5d5..0000000000 --- a/network/sshfs-fuse/fixrst.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur sshfs-3.6.0/sshfs.rst sshfs-3.6.0.patched/sshfs.rst ---- sshfs-3.6.0/sshfs.rst 2019-11-03 04:34:29.000000000 -0500 -+++ sshfs-3.6.0.patched/sshfs.rst 2020-01-01 03:49:22.746410220 -0500 -@@ -205,13 +205,11 @@ - -o direct_io - This option disables the use of page cache (file content cache) in - the kernel for this filesystem. -- This has several affects: -- 1. Each read() or write() system call will initiate one or more read or -- write operations, data will not be cached in the kernel. -- 2. The return value of the read() and write() system calls will correspond -- to the return values of the read and write operations. This is useful -- for example if the file size is not known in advance (before reading it). -- e.g. /proc filesystem -+ This has several effects: -+ -+ 1. Each read() or write() system call will initiate one or more read or write operations, data will not be cached in the kernel. -+ -+ 2. The return value of the read() and write() system calls will correspond to the return values of the read and write operations. This is useful for example if the file size is not known in advance (before reading it). e.g. /proc filesystem - - In addition, SSHFS accepts several options common to all FUSE file - systems. These are described in the `mount.fuse` manpage (look 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 1a4e9412a0..0000000000 --- a/network/sshfs-fuse/sshfs-fuse.SlackBuild +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/sh - -# Copyright 2006-2009 Alan Hicks, Lizella, GA -# Copyright 2012, Michiel van Wessem, Leicester, United Kingdom -# Copyright 2020, B. Watson -# 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. - -# Now maintained by B. Watson - -# Note: I'm aware the fixrst.diff isn't being applied. Please leave -# it in the repo, it's the source for the sshfs.1.gz, which *is* -# installed. Need the diff to comply with the GPL. - -# 20200101 bkw: -# - take over maintenance -# - update for v3.6.0. too many changes to build old versions. - -PRGNAM=sshfs-fuse -SRCNAM=sshfs -VERSION=${VERSION:-3.6.0} -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.?z* -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -mkdir build -cd build - CFLAGS="-Wl,-s $SLKCFLAGS" \ - CXXFLAGS="-Wl,-s $SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - --sysconfdir=/etc - ninja - DESTDIR=$PKG ninja install -cd .. - -# Use prebuilt man page, so this build doesn't depend on docutils. -# Also, the supplied sshfs.rst is slightly broken, this man page was -# made from a slightly fixed version (see fixrst.diff). -# Don't use the one installed by ninja, if there was one. -MANDIR=$PKG/usr/man/man1 -rm -f $MANDIR/$SRCNAM.1 -mkdir -p $MANDIR -cat $CWD/$SRCNAM.1.gz > $MANDIR/$SRCNAM.1.gz - -# We got symlinks for commands, so link the man pages too. Slightly -# wrong, as the linked commands are in /usr/sbin, but the man page -# is section 1 (not 8). I can live with it. -ln -s $SRCNAM.1.gz $MANDIR/mount.fuse.sshfs.1.gz -ln -s $SRCNAM.1.gz $MANDIR/mount.sshfs.1.gz - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog* 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/sshfs-fuse/sshfs-fuse.info b/network/sshfs-fuse/sshfs-fuse.info deleted file mode 100644 index 8503f7fa0c..0000000000 --- a/network/sshfs-fuse/sshfs-fuse.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sshfs-fuse" -VERSION="3.6.0" -HOMEPAGE="https://github.com/libfuse/sshfs" -DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs-3.6.0/sshfs-3.6.0.tar.xz" -MD5SUM="7f7685ebefdea10c5fc44a54e9500e36" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="meson fuse3" -MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" diff --git a/network/sshfs-fuse/sshfs.1.gz b/network/sshfs-fuse/sshfs.1.gz deleted file mode 100644 index fb079bef57..0000000000 Binary files a/network/sshfs-fuse/sshfs.1.gz and /dev/null differ 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..b08fabcc8a 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.4.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..1f185d0e80 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.4.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.4.1/transmission-remote-gtk-1.4.1.tar.xz" +MD5SUM="5955f2d80e51c14fa6bf137c9c2bac74" 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" \ diff --git a/network/x11spice/README b/network/x11spice/README new file mode 100644 index 0000000000..a273afe9a7 --- /dev/null +++ b/network/x11spice/README @@ -0,0 +1,16 @@ +x11spice connects a running X server as a Spice server. + +It owes a debt to the excellent x11vnc project, from the libvncserver +project. That project proved that this could be done, and done well. +Some of the logic, notably that of scan.c, was inspired by the code +in x11vnc. + +Example: launch a spice server on a remote pc (where x11spice is +installed) via ssh, redirect the output locally and connect to it with +spicy + + ssh $remote_host -L 5900:localhost:5900 "x11spice --allow-control --display :0 --password=whatever" + +and then locally + + spicy -h localhost -p 5900 diff --git a/network/x11spice/slack-desc b/network/x11spice/slack-desc new file mode 100644 index 0000000000..af47ca2f35 --- /dev/null +++ b/network/x11spice/slack-desc @@ -0,0 +1,11 @@ +x11spice: x11spice (export X via spice) +x11spice: +x11spice: x11spice connects a running X server as a Spice server. +x11spice: +x11spice: It owes a debt to the excellent x11vnc project, from the libvncserver +x11spice: project. That project proved that this could be done, and done well. +x11spice: Some of the logic, notably that of scan.c, was inspired by the code +x11spice: in x11vnc. +x11spice: +x11spice: homepage: https://gitlab.freedesktop.org/spice/x11spice +x11spice: diff --git a/network/x11spice/x11spice.SlackBuild b/network/x11spice/x11spice.SlackBuild new file mode 100644 index 0000000000..5e984c8a70 --- /dev/null +++ b/network/x11spice/x11spice.SlackBuild @@ -0,0 +1,104 @@ +#!/bin/sh + +# Slackware build script for x11spice + +# Copyright 2018-2019 Matteo Bernardini , Pisa, Italy +# 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=x11spice +VERSION=${VERSION:-20190820_51d2a8b} +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 + +DOCS="AUTHORS COPYING ChangeLog NEWS README" + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $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 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +autoreconf -vi + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --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 $DOCS $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/x11spice/x11spice.info b/network/x11spice/x11spice.info new file mode 100644 index 0000000000..9d4d29bd7d --- /dev/null +++ b/network/x11spice/x11spice.info @@ -0,0 +1,10 @@ +PRGNAM="x11spice" +VERSION="20190820_51d2a8b" +HOMEPAGE="https://gitlab.freedesktop.org/spice/x11spice" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/x11spice-20190820_51d2a8b.tar.xz" +MD5SUM="ad1d8aea83a15a1e9130f347186fd4ef" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="spice" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/network/zeek/zeek.SlackBuild b/network/zeek/zeek.SlackBuild index 95a7a0072d..a2022d1b2a 100644 --- a/network/zeek/zeek.SlackBuild +++ b/network/zeek/zeek.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 -- cgit v1.2.3