summaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
author Matteo Bernardini2021-03-27 10:25:10 +0100
committer Matteo Bernardini2021-03-27 10:25:10 +0100
commit2fba1c878b57d3afa631b9369518be5d21221c09 (patch)
treedce412a05dfeb7fbb53d24c934a732c3b522ad0f /network
parentf4c325577c3399f98410adb164155c38bb8ed86a (diff)
downloadslackbuilds-current-20210327.1.tar.gz
20210327.1 global branch merge.current-20210327.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r--network/MEGAsync/MEGAsync.SlackBuild4
-rw-r--r--network/MEGAsync/MEGAsync.info10
-rw-r--r--network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild1
-rw-r--r--network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild117
-rw-r--r--network/NetworkManager-openvpn/NetworkManager-openvpn.info10
-rw-r--r--network/NetworkManager-openvpn/README5
-rw-r--r--network/NetworkManager-openvpn/slack-desc19
-rw-r--r--network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild8
-rw-r--r--network/NetworkManager-pptp/NetworkManager-pptp.info6
-rw-r--r--network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild3
-rw-r--r--network/NetworkManager-vpnc/NetworkManager-vpnc.info6
-rw-r--r--network/aMule/aMule.SlackBuild26
-rw-r--r--network/aMule/aMule.info6
-rw-r--r--network/aircrack-ng/aircrack-ng.SlackBuild2
-rw-r--r--network/avahi/README3
-rw-r--r--network/avahi/avahi.SlackBuild1
-rw-r--r--network/bip/bip.SlackBuild2
-rw-r--r--network/bitcoin/bitcoin.SlackBuild2
-rw-r--r--network/bwm-ng/bwm-ng.SlackBuild3
-rw-r--r--network/bwm-ng/fix_gcc7_inline.patch40
-rw-r--r--network/ccnet/ccnet.SlackBuild10
-rw-r--r--network/ccnet/ccnet.info6
-rw-r--r--network/cherokee/cherokee.SlackBuild8
-rw-r--r--network/cherokee/cherokee.info6
-rw-r--r--network/dmitry/dmitry.SlackBuild2
-rw-r--r--network/dobbscoin/dobbscoin.SlackBuild9
-rw-r--r--network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild2
-rw-r--r--network/dovecot-pigeonhole/dovecot-pigeonhole.info6
-rw-r--r--network/dovecot/README27
-rw-r--r--network/dovecot/doinst.sh26
-rw-r--r--network/dovecot/dovecot.SlackBuild133
-rw-r--r--network/dovecot/dovecot.info10
-rw-r--r--network/dovecot/rc.dovecot55
-rw-r--r--network/dovecot/slack-desc19
-rw-r--r--network/dsniff/dsniff.SlackBuild9
-rw-r--r--network/dsniff/dsniff_2.4b1+debian-18.diff.gzbin44819 -> 0 bytes
-rw-r--r--network/dsniff/patches/01_time.h.patch26
-rw-r--r--network/dsniff/patches/02_mailsnarf_corrupt.patch17
-rw-r--r--network/dsniff/patches/03_pcap_read_dump.patch534
-rw-r--r--network/dsniff/patches/04_multiple_intf.patch56
-rw-r--r--network/dsniff/patches/05_amd64_fix.patch221
-rw-r--r--network/dsniff/patches/06_urlsnarf_zeropad.patch17
-rw-r--r--network/dsniff/patches/07_libnet_1.1.patch906
-rw-r--r--network/dsniff/patches/08_openssl-0.9.8.patch15
-rw-r--r--network/dsniff/patches/09_sysconf_clocks.patch23
-rw-r--r--network/dsniff/patches/10_urlsnarf_escape.patch89
-rw-r--r--network/dsniff/patches/11_string_header.patch166
-rw-r--r--network/dsniff/patches/12_arpa_inet_header.patch65
-rw-r--r--network/dsniff/patches/13_pop_with_version.patch30
-rw-r--r--network/dsniff/patches/14_obsolete_time.patch36
-rw-r--r--network/dsniff/patches/15_checksum_libnids.patch98
-rw-r--r--network/dsniff/patches/16_TDS_decoder.patch20
-rw-r--r--network/dsniff/patches/17_checksum.patch29
-rw-r--r--network/dsniff/patches/18_sshcrypto.patch17
-rw-r--r--network/dsniff/patches/19_rewrite-and-modernize-POP-decoder.patch132
-rw-r--r--network/dsniff/patches/20_debian_dirs.patch62
-rw-r--r--network/dsniff/patches/21_msgsnarf_segfault.patch15
-rw-r--r--network/dsniff/patches/22_handlepp.patch17
-rw-r--r--network/dsniff/patches/23_urlsnarf_timestamp.patch82
-rw-r--r--network/dsniff/patches/24_Fix-OpenSSL1.1.0-Build.patch202
-rw-r--r--network/dsniff/patches/25_fix-spelling-errors.patch17
-rw-r--r--network/dsniff/patches/26_arpspoof-add-r-switch-to-poison-both-directions.patch170
-rw-r--r--network/dsniff/patches/27_arpspoof-allow-use-of-of-multiple-targets.patch194
-rw-r--r--network/dsniff/patches/28_arpspoof-allow-selection-of-source-hw-address.patch230
-rw-r--r--network/dsniff/patches/29_libnet_name2addr4.patch144
-rw-r--r--network/dsniff/patches/30_pntohl_shift.patch19
-rw-r--r--network/dsniff/patches/31_sysconf_clocks.patch31
-rw-r--r--network/dsniff/patches/32_rpc_segfault.patch19
-rw-r--r--network/dsniff/patches/33_sshcrypto_DES.patch65
-rw-r--r--network/dsniff/patches/34_fix-parallel-FTBFS.patch109
-rw-r--r--network/dsniff/patches/35_Add_CPPFLAGS.patch50
-rw-r--r--network/dsniff/patches/36_implicit_declarations.patch59
-rw-r--r--network/dsniff/patches/37_fix-lib-and-share-dirs.patch14
-rw-r--r--network/dsniff/patches/38_fix-pcap_init.patch63
-rw-r--r--network/dsniff/patches/39_libtirpc.patch51
-rw-r--r--network/ekiga/ekiga-4.0.1-boost-signals2.patch2179
-rw-r--r--network/ekiga/ekiga-4.0.1-libresolv.patch13
-rw-r--r--network/ekiga/ekiga.SlackBuild4
-rw-r--r--network/emacs-w3m/emacs-w3m.SlackBuild8
-rw-r--r--network/emacs-w3m/emacs-w3m.info6
-rw-r--r--network/falkon/README11
-rw-r--r--network/falkon/doinst.sh9
-rw-r--r--network/falkon/falkon.SlackBuild100
-rw-r--r--network/falkon/falkon.info10
-rw-r--r--network/falkon/slack-desc19
-rw-r--r--network/fcgiwrap/fcgiwrap.SlackBuild2
-rw-r--r--network/filezilla/filezilla.SlackBuild5
-rw-r--r--network/filezilla/filezilla.info6
-rw-r--r--network/filezilla/interface_Mainfrm_h_include_list.patch12
-rw-r--r--network/fqterm/fqterm.SlackBuild32
-rw-r--r--network/fqterm/fqterm.info6
-rw-r--r--network/freeradius-server/freeradius-server.SlackBuild4
-rw-r--r--network/freeradius-server/freeradius-server.info6
-rw-r--r--network/freerdp/freerdp.SlackBuild2
-rw-r--r--network/glusterfs/glusterfs.SlackBuild2
-rw-r--r--network/grsync/grsync.SlackBuild2
-rw-r--r--network/hping3/hping3.SlackBuild2
-rw-r--r--network/httrack/httrack.SlackBuild2
-rw-r--r--network/httrack/httrack.info6
-rw-r--r--network/hylafax/gcc.patch12
-rw-r--r--network/hylafax/hylafax.SlackBuild2
-rw-r--r--network/ifstatus/README10
-rw-r--r--network/ifstatus/ifstatus.SlackBuild91
-rw-r--r--network/ifstatus/ifstatus.info10
-rw-r--r--network/ifstatus/ifstatus.patch66
-rw-r--r--network/ifstatus/slack-desc19
-rw-r--r--network/iperf/iperf.SlackBuild29
-rw-r--r--network/iperf/iperf.info6
-rw-r--r--network/iperf/patches/0_iperf-2.0.8-debuginfo.patch17
-rw-r--r--network/iperf/patches/1_iperf-2.0.8-bindfail.patch42
-rw-r--r--network/iperf/patches/2_iperf-2.0.8-math.patch75
-rw-r--r--network/jigdo/jigdo-0.7.3-gcc7.patch39
-rw-r--r--network/jigdo/jigdo.SlackBuild3
-rw-r--r--network/jitsi/jitsi.SlackBuild18
-rw-r--r--network/jitsi/jitsi.info8
-rw-r--r--network/kmess/README5
-rw-r--r--network/kmess/doinst.sh10
-rw-r--r--network/kmess/giflib-5.0.patch95
-rw-r--r--network/kmess/kmess.SlackBuild100
-rw-r--r--network/kmess/kmess.info10
-rw-r--r--network/kmess/slack-desc19
-rw-r--r--network/knock/knock.SlackBuild26
-rw-r--r--network/knock/knock.info6
-rw-r--r--network/konversation/README7
-rw-r--r--network/konversation/doinst.sh10
-rw-r--r--network/konversation/konversation.SlackBuild104
-rw-r--r--network/konversation/konversation.info10
-rw-r--r--network/konversation/slack-desc19
-rw-r--r--network/krb5/EXPORT13
-rw-r--r--network/krb5/README10
-rw-r--r--network/krb5/README.krb552
-rw-r--r--network/krb5/doinst.sh26
-rw-r--r--network/krb5/krb5.info10
-rw-r--r--network/krb5/rc.kadmind54
-rw-r--r--network/krb5/rc.krb5kdc54
-rw-r--r--network/krb5/slack-desc19
-rw-r--r--network/leechcraft/README26
-rw-r--r--network/leechcraft/doinst.sh22
-rw-r--r--network/leechcraft/leechcraft.SlackBuild111
-rw-r--r--network/leechcraft/leechcraft.info10
-rw-r--r--network/leechcraft/slack-desc19
-rw-r--r--network/lighttpd/lighttpd.SlackBuild2
-rw-r--r--network/lighttpd/lighttpd.info6
-rw-r--r--network/linuxdcpp/linuxdcpp.SlackBuild2
-rw-r--r--network/memcached/memcached.SlackBuild2
-rw-r--r--network/memcached/memcached.info6
-rw-r--r--network/midori/README10
-rw-r--r--network/midori/doinst.sh16
-rw-r--r--network/midori/midori.SlackBuild47
-rw-r--r--network/midori/midori.info10
-rw-r--r--network/midori/slack-desc6
-rw-r--r--network/mldonkey/mldonkey.SlackBuild20
-rw-r--r--network/mldonkey/mldonkey.info6
-rw-r--r--network/mosh/mosh.SlackBuild2
-rw-r--r--network/museek+/README23
-rw-r--r--network/museek+/doinst.sh26
-rw-r--r--network/museek+/museek+.SlackBuild90
-rw-r--r--network/museek+/museek+.info10
-rw-r--r--network/museek+/museek-python.diff44
-rw-r--r--network/museek+/rc.museekd105
-rw-r--r--network/museek+/slack-desc19
-rw-r--r--network/nagios/nagios.SlackBuild2
-rw-r--r--network/ncrack/ncrack.SlackBuild2
-rw-r--r--network/netsurf/enable-deprecated.diff10
-rw-r--r--network/netsurf/netsurf.SlackBuild2
-rw-r--r--network/netsurf/netsurf.info6
-rw-r--r--network/nextcloud-server/nextcloud-server.SlackBuild2
-rw-r--r--network/nextcloud-server/nextcloud-server.info6
-rw-r--r--network/nghttp2/README4
-rw-r--r--network/nghttp2/nghttp2.info10
-rw-r--r--network/opendkim/opendkim.SlackBuild3
-rw-r--r--network/opendkim/openssl_1.1.0_compat.patch90
-rw-r--r--network/opensmtpd/aliases34
-rw-r--r--network/opensmtpd/fix-crash-on-authentication.patch43
-rw-r--r--network/opensmtpd/openbsd64-020-smtpd.patch31
-rw-r--r--network/opensmtpd/openbsd65-029-smptd-tls.patch52
-rw-r--r--network/opensmtpd/openbsd65-031-smtpd-envelope.patch199
-rw-r--r--network/opensmtpd/openbsd66-019-smtpd-exec.patch46
-rw-r--r--network/opensmtpd/opensmtpd.SlackBuild31
-rw-r--r--network/opensmtpd/opensmtpd.info6
-rw-r--r--network/owncloud-client/owncloud-client.SlackBuild2
-rw-r--r--network/phodav/phodav.SlackBuild18
-rw-r--r--network/phodav/phodav.info6
-rw-r--r--network/pidgin-musictracker/pidgin-musictracker.SlackBuild2
-rw-r--r--network/pidgin-sipe/pidgin-sipe.SlackBuild2
-rw-r--r--network/pidgin-sipe/pidgin-sipe.info6
-rw-r--r--network/postfix/README39
-rw-r--r--network/postfix/doinst.sh40
-rw-r--r--network/postfix/patches/postconf.diff31
-rw-r--r--network/postfix/postfix.SlackBuild199
-rw-r--r--network/postfix/postfix.info10
-rw-r--r--network/postfix/rc.postfix67
-rw-r--r--network/postfix/slack-desc19
-rw-r--r--network/pptp/pptp.SlackBuild2
-rw-r--r--network/pptp/pptp.info6
-rw-r--r--network/qTox/qTox.SlackBuild2
-rw-r--r--network/quassel-qt5/quassel-0.13.1-qt5.14.patch118
-rw-r--r--network/quassel-qt5/quassel-qt5.SlackBuild2
-rw-r--r--network/remmina/remmina.SlackBuild2
-rw-r--r--network/retroshare/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch65
-rw-r--r--network/retroshare/retroshare.SlackBuild8
-rw-r--r--network/retroshare/retroshare.info6
-rw-r--r--network/rspamd/rspamd.SlackBuild4
-rw-r--r--network/rspamd/rspamd.info6
-rw-r--r--network/rtorrent/README2
-rw-r--r--network/rtorrent/rtorrent.SlackBuild10
-rw-r--r--network/s-nail/README16
-rw-r--r--network/s-nail/doinst.sh13
-rw-r--r--network/s-nail/s-nail.SlackBuild135
-rw-r--r--network/s-nail/s-nail.info10
-rw-r--r--network/s-nail/slack-desc19
-rw-r--r--network/seafile-client/seafile-client.SlackBuild103
-rw-r--r--network/seafile-client/seafile-client.info10
-rw-r--r--network/seafile-client/slack-desc19
-rw-r--r--network/seafile/README (renamed from network/seafile-client/README)0
-rw-r--r--network/seafile/seafile.SlackBuild (renamed from network/nghttp2/nghttp2.SlackBuild)24
-rw-r--r--network/seafile/seafile.info10
-rw-r--r--network/seafile/slack-desc (renamed from network/nghttp2/slack-desc)22
-rw-r--r--network/snort/snort.SlackBuild12
-rw-r--r--network/snort/snort.info8
-rw-r--r--network/socat/README12
-rw-r--r--network/socat/slack-desc19
-rw-r--r--network/socat/socat.SlackBuild101
-rw-r--r--network/socat/socat.info10
-rw-r--r--network/spice-gtk/spice-gtk.SlackBuild59
-rw-r--r--network/spice-gtk/spice-gtk.info6
-rw-r--r--network/spice/spice.SlackBuild4
-rw-r--r--network/spice/spice.info6
-rw-r--r--network/sqlrelay/sqlrelay.SlackBuild8
-rw-r--r--network/sqlrelay/sqlrelay.info6
-rw-r--r--network/sshfs-fuse/README12
-rw-r--r--network/sshfs-fuse/slack-desc19
-rw-r--r--network/sshfs-fuse/sshfs-fuse.SlackBuild115
-rw-r--r--network/sshfs-fuse/sshfs-fuse.info10
-rw-r--r--network/sshfs-fuse/sshfs.1.gzbin5085 -> 0 bytes
-rw-r--r--network/synergy/030_openssl.diff11
-rw-r--r--network/synergy/synergy.SlackBuild1
-rw-r--r--network/tor/rc.tor2
-rw-r--r--network/transmission-remote-gtk/gcc10.patch25
-rw-r--r--network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild2
-rw-r--r--network/transmission/transmission.SlackBuild3
-rw-r--r--network/trojita/trojita.SlackBuild4
-rw-r--r--network/trojita/trojita.info6
-rw-r--r--network/vde2/vde2.SlackBuild3
-rw-r--r--network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch92
-rw-r--r--network/verlihub/verlihub-gcc7.patch18
-rw-r--r--network/verlihub/verlihub.SlackBuild3
-rw-r--r--network/webalizer/gcc10.patch19
-rw-r--r--network/webalizer/webalizer.SlackBuild2
-rw-r--r--network/wireguard-tools/README20
-rw-r--r--network/wireguard-tools/slack-desc19
-rw-r--r--network/wireguard-tools/wireguard-tools.SlackBuild105
-rw-r--r--network/wireguard-tools/wireguard-tools.info10
-rw-r--r--network/x11spice/README16
-rw-r--r--network/x11spice/slack-desc11
-rw-r--r--network/x11spice/x11spice.SlackBuild (renamed from network/krb5/krb5.SlackBuild)44
-rw-r--r--network/x11spice/x11spice.info10
-rw-r--r--network/x11vnc/gcc10.patch42
-rw-r--r--network/x11vnc/x11vnc.SlackBuild2
-rw-r--r--network/x2goclient/x2goclient.SlackBuild2
-rw-r--r--network/x2goclient/x2goclient.info6
-rw-r--r--network/x2goserver/x2goserver.SlackBuild2
-rw-r--r--network/x2goserver/x2goserver.info6
-rw-r--r--network/xaric/xaric.SlackBuild2
264 files changed, 7512 insertions, 3923 deletions
diff --git a/network/MEGAsync/MEGAsync.SlackBuild b/network/MEGAsync/MEGAsync.SlackBuild
index d15a188abf..a5659e22ea 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.3.7.0}
+SDK=${SDK:-3.7.3e}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/MEGAsync/MEGAsync.info b/network/MEGAsync/MEGAsync.info
index dca63a1e20..1944f82f57 100644
--- a/network/MEGAsync/MEGAsync.info
+++ b/network/MEGAsync/MEGAsync.info
@@ -1,10 +1,10 @@
PRGNAM="MEGAsync"
-VERSION="3.7.1.0"
+VERSION="4.3.7.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.3.7.0_Linux/MEGAsync-4.3.7.0_Linux.tar.gz \
+ https://github.com/meganz/sdk/archive/v3.7.3e/sdk-3.7.3e.tar.gz"
+MD5SUM="051cd9c42aad7ad283221e445bf838f7 \
+ 916e13eeb9e23c5542122cb1c60dc9ca"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libuv libsodium cryptopp FreeImage c-ares libmediainfo"
diff --git a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
index 4185c2c967..e1e2ea87b9 100644
--- a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
+++ b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild
@@ -87,6 +87,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.SlackBuild b/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
deleted file mode 100644
index 46b08ddac2..0000000000
--- a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for NetworkManager-openvpn
-
-# Copyright 2010-2017 Robby Workman, Tuscaloosa, Alabama, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=NetworkManager-openvpn
-VERSION=${VERSION:-1.2.10}
-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" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-# Bail out if user or group isn't valid on your system
-# For slackbuilds.org, assigned nm-openvpn uid/gid are 320/320
-# See http://slackbuilds.org/uid_gid.txt
-if ! getent group nm-openvpn 2>&1 > /dev/null; then
- echo " You must have a \"nm-openvpn\" group to run this script."
- echo " # groupadd -g 320 nm-openvpn"
- exit 1
-elif ! getent passwd nm-openvpn 2>&1 > /dev/null; then
- echo " You must have a \"nm-openvpn\" user to run this script."
- echo " # useradd -u 320 -g nm-openvpn -d /var/lib/openvpn/chroot -s /bin/false nm-openvpn"
- exit 1
-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 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
-
-# Create the chroot directory
-# From src/nm-openvpn-service-defines.h
-# /* User name and group to run nm-openvpn-service under */
-# #define NM_OPENVPN_USER "nm-openvpn"
-# #define NM_OPENVPN_GROUP "nm-openvpn"
-# #define NM_OPENVPN_CHROOT LOCALSTATEDIR "/lib/openvpn/chroot"
-mkdir -p $PKG/var/lib/openvpn/chroot
-
-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/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS COPYING ChangeLog NEWS 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/NetworkManager-openvpn/NetworkManager-openvpn.info b/network/NetworkManager-openvpn/NetworkManager-openvpn.info
deleted file mode 100644
index 85a02339c8..0000000000
--- a/network/NetworkManager-openvpn/NetworkManager-openvpn.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="NetworkManager-openvpn"
-VERSION="1.2.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_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
diff --git a/network/NetworkManager-openvpn/README b/network/NetworkManager-openvpn/README
deleted file mode 100644
index f93df9233b..0000000000
--- a/network/NetworkManager-openvpn/README
+++ /dev/null
@@ -1,5 +0,0 @@
-NetworkManager-openvpn (OpenVPN Support for NetworkManager)
-
-You will need an "nm-openvpn" user and group to use this. Suggested:
-# groupadd -g 320 nm-openvpn
-# useradd -u 320 -g nm-openvpn -d /var/lib/openvpn/chroot -s /bin/false nm-openvpn
diff --git a/network/NetworkManager-openvpn/slack-desc b/network/NetworkManager-openvpn/slack-desc
deleted file mode 100644
index 2393b7b408..0000000000
--- a/network/NetworkManager-openvpn/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------------------------------------------------------|
-NetworkManager-openvpn: NetworkManager-openvpn (OpenVPN Support for NetworkManager)
-NetworkManager-openvpn:
-NetworkManager-openvpn: OpenVPN support for NetworkManager
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
-NetworkManager-openvpn:
diff --git a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild
index 325758ed3b..5f83125cfd 100644
--- a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild
+++ b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=NetworkManager-pptp
-VERSION=${VERSION:-1.2.8}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20200716_382a8a2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -72,6 +72,9 @@ find -L . \
# Find the version number for pppd, used to specify the plugin directory:
PPPD=$(echo /usr/lib${LIBDIRSUFFIX}/pppd/?.?.? | rev | cut -f 1 -d / | rev)
+intltoolize --automake --copy
+autoreconf -vif
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -82,7 +85,6 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/$PPPD \
- --without-gnome \
--build=$ARCH-slackware-linux
make
diff --git a/network/NetworkManager-pptp/NetworkManager-pptp.info b/network/NetworkManager-pptp/NetworkManager-pptp.info
index a02a65fe28..d2a6ef0e1b 100644
--- a/network/NetworkManager-pptp/NetworkManager-pptp.info
+++ b/network/NetworkManager-pptp/NetworkManager-pptp.info
@@ -1,8 +1,8 @@
PRGNAM="NetworkManager-pptp"
-VERSION="1.2.8"
+VERSION="20200716_382a8a2"
HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.8.tar.xz"
-MD5SUM="305e31d6aac41813d735f27891fce6d8"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/NetworkManager-pptp-20200716_382a8a2.tar.xz"
+MD5SUM="2991e9bdb94255c8215a02ebe590adc9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="pptp"
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..95866506e3 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:-r11055}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -55,62 +55,62 @@ fi
if [ "$CMD" = "yes" ]; then
AMULE_CMD="enable"
- else
+else
AMULE_CMD="disable"
fi
if [ "$WEBSERVER" = "yes" ]; then
AMULE_WEBSERVER="enable"
- else
+else
AMULE_WEBSERVER="disable"
fi
if [ "$ALC" = "yes" ]; then
AMULE_ALC="enable"
- else
+else
AMULE_ALC="disable"
fi
if [ "$ALCC" = "yes" ]; then
AMULE_ALCC="enable"
- else
+else
AMULE_ALCC="disable"
fi
if [ "$XAS" = "yes" ]; then
AMULE_XAS="enable"
- else
+else
AMULE_XAS="disable"
fi
if [ "$GEOIP" = "yes" ]; then
AMULE_GEOIP="enable"
- else
+else
AMULE_GEOIP="disable"
fi
if [ "$MMAP" = "yes" ]; then
AMULE_MMAP="enable"
- else
+else
AMULE_MMAP="disable"
fi
if [ "$OPTIMIZE" = "yes" ]; then
AMULE_OPTIMIZE="enable"
- else
+else
AMULE_OPTIMIZE="disable"
fi
if [ "$PLASMAMULE" = "yes" ]; then
AMULE_PLASMAMULE="enable"
- else
+else
AMULE_PLASMAMULE="disable"
fi
if [ "$GUI" = "yes" ]; then
- AMULE_GUI="enable"
- else
- AMULE_GUI="disable"
+ AMULE_GUI="enable"
+else
+ AMULE_GUI="disable"
fi
diff --git a/network/aMule/aMule.info b/network/aMule/aMule.info
index 4bdfb50f66..aa193247bf 100644
--- a/network/aMule/aMule.info
+++ b/network/aMule/aMule.info
@@ -1,8 +1,8 @@
PRGNAM="aMule"
-VERSION="r11003"
+VERSION="r11055"
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-r11055.tar.xz"
+MD5SUM="4d4dbf14b0eb29786ad2bc17c1276aec"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="cryptopp wxPython"
diff --git a/network/aircrack-ng/aircrack-ng.SlackBuild b/network/aircrack-ng/aircrack-ng.SlackBuild
index 6ab6259982..f5f2491ce2 100644
--- a/network/aircrack-ng/aircrack-ng.SlackBuild
+++ b/network/aircrack-ng/aircrack-ng.SlackBuild
@@ -79,7 +79,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 -fcommon" \
CXXFLAGS="$SLKCFLAGS" \
./autogen.sh \
--prefix=/usr \
diff --git a/network/avahi/README b/network/avahi/README
index 8d1e64903a..8eed1b461a 100644
--- a/network/avahi/README
+++ b/network/avahi/README
@@ -11,5 +11,4 @@ prior to installing the avahi package. See README.SBo in this directory
(it is also installed to the package docmentation directory) for more
information and for setup notes.
-mono is an optional dependency that also requires gtk-sharp - enable it
-with the following: "MONO=yes ./avahi.SlackBuild"
+mono support is not working ATM so it's forcibly disabled.
diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild
index b2b984d3b3..76c94acd67 100644
--- a/network/avahi/avahi.SlackBuild
+++ b/network/avahi/avahi.SlackBuild
@@ -47,6 +47,7 @@ if [ "${MONO:-no}" = "no" ]; then
else
MONO="--enable-mono"
fi
+MONO="--disable-mono" # mono support not working ATM
warn_accounts() {
echo " You must have an avahi user and group to run this script. "
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 658fc14a62..fccc2bda6e 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 {} \;
+sed -i '/^#include <QPainter>$/a #include <QPainterPath>' src/qt/trafficgraphwidget.cpp
+
# build bitcoin-core
[ -f autogen.sh ] && sh autogen.sh
CFLAGS="$SLKCFLAGS" \
diff --git a/network/bwm-ng/bwm-ng.SlackBuild b/network/bwm-ng/bwm-ng.SlackBuild
index 15da628506..1788a593a0 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/dmitry/dmitry.SlackBuild b/network/dmitry/dmitry.SlackBuild
index bca6380c53..7906345345 100644
--- a/network/dmitry/dmitry.SlackBuild
+++ b/network/dmitry/dmitry.SlackBuild
@@ -68,7 +68,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 -fcommon" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
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-pigeonhole/dovecot-pigeonhole.SlackBuild b/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
index fb88f7ce6a..4c78eca7d2 100644
--- a/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
+++ b/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=dovecot-pigeonhole
-VERSION=${VERSION:-0.5.4}
+VERSION=${VERSION:-0.5.13}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/dovecot-pigeonhole/dovecot-pigeonhole.info b/network/dovecot-pigeonhole/dovecot-pigeonhole.info
index 83de02e3e3..7a532dc322 100644
--- a/network/dovecot-pigeonhole/dovecot-pigeonhole.info
+++ b/network/dovecot-pigeonhole/dovecot-pigeonhole.info
@@ -1,8 +1,8 @@
PRGNAM="dovecot-pigeonhole"
-VERSION="0.5.4"
+VERSION="0.5.13"
HOMEPAGE="http://pigeonhole.dovecot.org/"
-DOWNLOAD="http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.4.tar.gz"
-MD5SUM="331a7554d6b12ac2cca760146934fc5b"
+DOWNLOAD="https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz"
+MD5SUM="fc8c2845519869e15216e5c07c316a65"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="dovecot"
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/dsniff.SlackBuild b/network/dsniff/dsniff.SlackBuild
index 3fe080fd8b..1f565b0187 100644
--- a/network/dsniff/dsniff.SlackBuild
+++ b/network/dsniff/dsniff.SlackBuild
@@ -73,11 +73,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 {} \;
-zcat $CWD/dsniff_2.4b1+debian-18.diff.gz | patch -p1
-for i in debian/patches/*.dpatch; do
- patch -N < "$i"
-done
-sed -i 's|${CC-cc} -E|${CC-cc} -O2 -E|g' configure
+for i in $CWD/patches/*.patch; do patch -p1 < $i; done
+
+autoreconf -fi
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -87,6 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--sysconfdir=/etc \
--localstatedir=/var \
+ --with-libtirpc \
--build=$ARCH-slackware-linux
make
diff --git a/network/dsniff/dsniff_2.4b1+debian-18.diff.gz b/network/dsniff/dsniff_2.4b1+debian-18.diff.gz
deleted file mode 100644
index e83ac181b1..0000000000
--- a/network/dsniff/dsniff_2.4b1+debian-18.diff.gz
+++ /dev/null
Binary files differ
diff --git a/network/dsniff/patches/01_time.h.patch b/network/dsniff/patches/01_time.h.patch
new file mode 100644
index 0000000000..1867cf901e
--- /dev/null
+++ b/network/dsniff/patches/01_time.h.patch
@@ -0,0 +1,26 @@
+Author: Steve Kemp <skx@debian.org>
+Description: Include <time.h> to fix segfault on some architectures.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=315969
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/msgsnarf.c
++++ b/msgsnarf.c
+@@ -23,6 +23,7 @@
+ #include <nids.h>
+ #include <pcap.h>
+ #include <pcaputil.h>
++#include <time.h>
+
+ #include "buf.h"
+ #include "decode.h"
+--- a/sshow.c
++++ b/sshow.c
+@@ -15,6 +15,7 @@
+
+ #include <sys/types.h>
+ #include <sys/times.h>
++#include <time.h>
+
+ #include <netinet/in_systm.h>
+ #include <netinet/in.h>
diff --git a/network/dsniff/patches/02_mailsnarf_corrupt.patch b/network/dsniff/patches/02_mailsnarf_corrupt.patch
new file mode 100644
index 0000000000..18bb736c3c
--- /dev/null
+++ b/network/dsniff/patches/02_mailsnarf_corrupt.patch
@@ -0,0 +1,17 @@
+Author: Steve Kemp <skx@debian.org>
+Description: mailsnarf does not parse mail correctly.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=149330
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/mailsnarf.c
++++ b/mailsnarf.c
+@@ -178,7 +178,7 @@
+ if (smtp->state != SMTP_DATA) {
+ while ((i = buf_index(&buf, "\r\n", 2)) >= 0) {
+ line = buf_tok(&buf, NULL, i + 2);
+- line->base[line->end] = '\0';
++ line->base[line->end-1] = '\0';
+ p = buf_ptr(line);
+
+ if (strncasecmp(p, "RSET", 4) == 0) {
diff --git a/network/dsniff/patches/03_pcap_read_dump.patch b/network/dsniff/patches/03_pcap_read_dump.patch
new file mode 100644
index 0000000000..3cc0374840
--- /dev/null
+++ b/network/dsniff/patches/03_pcap_read_dump.patch
@@ -0,0 +1,534 @@
+Author: Joseph Battaglia <sephail@sephail.net> and Joshua Krage <jkrage@guisarme.us>
+Description: Allow the reading of saved PCAP capture files.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=153462
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=298604
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/dsniff.8
++++ b/dsniff.8
+@@ -10,7 +10,7 @@
+ .nf
+ .fi
+ \fBdsniff\fR [\fB-c\fR] [\fB-d\fR] [\fB-m\fR] [\fB-n\fR] [\fB-i
+-\fIinterface\fR] [\fB-s \fIsnaplen\fR] [\fB-f \fIservices\fR]
++\fIinterface\fR | \fB-p \fIpcapfile\fR] [\fB-s \fIsnaplen\fR] [\fB-f \fIservices\fR]
+ [\fB-t \fItrigger[,...]\fR]]
+ [\fB-r\fR|\fB-w\fR \fIsavefile\fR] [\fIexpression\fR]
+ .SH DESCRIPTION
+@@ -45,6 +45,9 @@
+ Do not resolve IP addresses to hostnames.
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Rather than processing the contents of packets observed upon the network
++process the given PCAP capture file.
+ .IP "\fB-s \fIsnaplen\fR"
+ Analyze at most the first \fIsnaplen\fR bytes of each TCP connection,
+ rather than the default of 1024.
+--- a/dsniff.c
++++ b/dsniff.c
+@@ -46,8 +46,9 @@
+ usage(void)
+ {
+ fprintf(stderr, "Version: " VERSION "\n"
+- "Usage: dsniff [-cdmn] [-i interface] [-s snaplen] [-f services]\n"
+- " [-t trigger[,...]] [-r|-w savefile] [expression]\n");
++ "Usage: dsniff [-cdmn] [-i interface | -p pcapfile] [-s snaplen]\n"
++ " [-f services] [-t trigger[,...]] [-r|-w savefile]\n"
++ " [expression]\n");
+ exit(1);
+ }
+
+@@ -79,7 +80,7 @@
+
+ services = savefile = triggers = NULL;
+
+- while ((c = getopt(argc, argv, "cdf:i:mnr:s:t:w:h?V")) != -1) {
++ while ((c = getopt(argc, argv, "cdf:i:mnp:r:s:t:w:h?V")) != -1) {
+ switch (c) {
+ case 'c':
+ Opt_client = 1;
+@@ -99,6 +100,9 @@
+ case 'n':
+ Opt_dns = 0;
+ break;
++ case 'p':
++ nids_params.filename = optarg;
++ break;
+ case 'r':
+ Opt_read = 1;
+ savefile = optarg;
+@@ -168,10 +172,23 @@
+ else nids_register_tcp(trigger_tcp);
+
+ if (nids_params.pcap_filter != NULL) {
+- warnx("listening on %s [%s]", nids_params.device,
+- nids_params.pcap_filter);
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s [%s]", nids_params.device,
++ nids_params.pcap_filter);
++ }
++ else {
++ warnx("using %s [%s]", nids_params.filename,
++ nids_params.pcap_filter);
++ }
++ }
++ else {
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s", nids_params.device);
++ }
++ else {
++ warnx("using %s", nids_params.filename);
++ }
+ }
+- else warnx("listening on %s", nids_params.device);
+
+ nids_run();
+
+--- a/filesnarf.8
++++ b/filesnarf.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBfilesnarf\fR [\fB-i \fIinterface\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
++\fBfilesnarf\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -18,6 +18,8 @@
+ .SH OPTIONS
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP \fB-v\fR
+ "Versus" mode. Invert the sense of matching, to select non-matching
+ files.
+--- a/filesnarf.c
++++ b/filesnarf.c
+@@ -51,7 +51,7 @@
+ usage(void)
+ {
+ fprintf(stderr, "Version: " VERSION "\n"
+- "Usage: filesnarf [-i interface] [[-v] pattern [expression]]\n");
++ "Usage: filesnarf [-i interface | -p pcapfile] [[-v] pattern [expression]]\n");
+ exit(1);
+ }
+
+@@ -464,11 +464,14 @@
+ extern int optind;
+ int c;
+
+- while ((c = getopt(argc, argv, "i:vh?V")) != -1) {
++ while ((c = getopt(argc, argv, "i:p:vh?V")) != -1) {
+ switch (c) {
+ case 'i':
+ nids_params.device = optarg;
+ break;
++ case 'p':
++ nids_params.filename = optarg;
++ break;
+ case 'v':
+ Opt_invert = 1;
+ break;
+@@ -498,11 +501,24 @@
+ nids_register_ip(decode_udp_nfs);
+ nids_register_tcp(decode_tcp_nfs);
+
+- if (nids_params.pcap_filter != NULL) {
+- warnx("listening on %s [%s]", nids_params.device,
+- nids_params.pcap_filter);
+- }
+- else warnx("listening on %s", nids_params.device);
++ if (nids_params.pcap_filter != NULL) {
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s [%s]", nids_params.device,
++ nids_params.pcap_filter);
++ }
++ else {
++ warnx("using %s [%s]", nids_params.filename,
++ nids_params.pcap_filter);
++ }
++ }
++ else {
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s", nids_params.device);
++ }
++ else {
++ warnx("using %s", nids_params.filename);
++ }
++ }
+
+ nids_run();
+
+--- a/mailsnarf.8
++++ b/mailsnarf.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBmailsnarf\fR [\fB-i \fIinterface\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
++\fBmailsnarf\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -19,6 +19,8 @@
+ .SH OPTIONS
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP \fB-v\fR
+ "Versus" mode. Invert the sense of matching, to select non-matching
+ messages.
+--- a/mailsnarf.c
++++ b/mailsnarf.c
+@@ -59,7 +59,7 @@
+ usage(void)
+ {
+ fprintf(stderr, "Version: " VERSION "\n"
+- "Usage: mailsnarf [-i interface] [[-v] pattern [expression]]\n");
++ "Usage: mailsnarf [-i interface | -p pcapfile] [[-v] pattern [expression]]\n");
+ exit(1);
+ }
+
+@@ -344,11 +344,14 @@
+ extern int optind;
+ int c;
+
+- while ((c = getopt(argc, argv, "i:vh?V")) != -1) {
++ while ((c = getopt(argc, argv, "i:p:vh?V")) != -1) {
+ switch (c) {
+ case 'i':
+ nids_params.device = optarg;
+ break;
++ case 'p':
++ nids_params.filename = optarg;
++ break;
+ case 'v':
+ Opt_invert = 1;
+ break;
+@@ -378,10 +381,23 @@
+ nids_register_tcp(sniff_pop_session);
+
+ if (nids_params.pcap_filter != NULL) {
+- warnx("listening on %s [%s]", nids_params.device,
+- nids_params.pcap_filter);
+- }
+- else warnx("listening on %s", nids_params.device);
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s [%s]", nids_params.device,
++ nids_params.pcap_filter);
++ }
++ else {
++ warnx("using %s [%s]", nids_params.filename,
++ nids_params.pcap_filter);
++ }
++ }
++ else {
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s", nids_params.device);
++ }
++ else {
++ warnx("using %s", nids_params.filename);
++ }
++ }
+
+ nids_run();
+
+--- a/msgsnarf.8
++++ b/msgsnarf.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBmsgsnarf\fR [\fB-i \fIinterface\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
++\fBmsgsnarf\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -19,6 +19,8 @@
+ .SH OPTIONS
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP \fB-v\fR
+ "Versus" mode. Invert the sense of matching, to select non-matching
+ messages.
+--- a/msgsnarf.c
++++ b/msgsnarf.c
+@@ -45,7 +45,7 @@
+ usage(void)
+ {
+ fprintf(stderr, "Version: " VERSION "\n"
+- "Usage: msgsnarf [-i interface] [[-v] pattern [expression]]\n");
++ "Usage: msgsnarf [-i interface | -p pcapfile] [[-v] pattern [expression]]\n");
+ exit(1);
+ }
+
+@@ -633,11 +633,14 @@
+ extern int optind;
+ int c;
+
+- while ((c = getopt(argc, argv, "i:hv?V")) != -1) {
++ while ((c = getopt(argc, argv, "i:p:hv?V")) != -1) {
+ switch (c) {
+ case 'i':
+ nids_params.device = optarg;
+ break;
++ case 'p':
++ nids_params.filename = optarg;
++ break;
+ case 'v':
+ Opt_invert = 1;
+ break;
+@@ -666,11 +669,24 @@
+
+ nids_register_tcp(sniff_msgs);
+
+- if (nids_params.pcap_filter != NULL) {
+- warnx("listening on %s [%s]", nids_params.device,
+- nids_params.pcap_filter);
+- }
+- else warnx("listening on %s", nids_params.device);
++ if (nids_params.pcap_filter != NULL) {
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s [%s]", nids_params.device,
++ nids_params.pcap_filter);
++ }
++ else {
++ warnx("using %s [%s]", nids_params.filename,
++ nids_params.pcap_filter);
++ }
++ }
++ else {
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s", nids_params.device);
++ }
++ else {
++ warnx("using %s", nids_params.filename);
++ }
++ }
+
+ nids_run();
+
+--- a/sshow.8
++++ b/sshow.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBsshow\fR [\fB-d\fR] [\fB-i \fIinterface\fR] [\fIexpression\fR]
++\fBsshow\fR [\fB-d\fR] [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [\fIexpression\fR]
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -28,6 +28,8 @@
+ Enable verbose debugging output.
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP "\fIexpression\fR"
+ Specify a tcpdump(8) filter expression to select traffic to sniff.
+ .SH "SEE ALSO"
+--- a/sshow.c
++++ b/sshow.c
+@@ -82,7 +82,7 @@
+ static void
+ usage(void)
+ {
+- fprintf(stderr, "Usage: sshow [-d] [-i interface]\n");
++ fprintf(stderr, "Usage: sshow [-d] [-i interface | -p pcapfile]\n");
+ exit(1);
+ }
+
+@@ -616,7 +616,7 @@
+ extern int optind;
+ int c;
+
+- while ((c = getopt(argc, argv, "di:h?")) != -1) {
++ while ((c = getopt(argc, argv, "di:p:h?")) != -1) {
+ switch (c) {
+ case 'd':
+ debug++;
+@@ -624,6 +624,9 @@
+ case 'i':
+ nids_params.device = optarg;
+ break;
++ case 'p':
++ nids_params.filename = optarg;
++ break;
+ default:
+ usage();
+ break;
+@@ -652,11 +655,24 @@
+
+ nids_register_tcp(process_event);
+
+- if (nids_params.pcap_filter != NULL) {
+- warnx("listening on %s [%s]", nids_params.device,
+- nids_params.pcap_filter);
+- }
+- else warnx("listening on %s", nids_params.device);
++ if (nids_params.pcap_filter != NULL) {
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s [%s]", nids_params.device,
++ nids_params.pcap_filter);
++ }
++ else {
++ warnx("using %s [%s]", nids_params.filename,
++ nids_params.pcap_filter);
++ }
++ }
++ else {
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s", nids_params.device);
++ }
++ else {
++ warnx("using %s", nids_params.filename);
++ }
++ }
+
+ nids_run();
+
+--- a/urlsnarf.8
++++ b/urlsnarf.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBurlsnarf\fR [\fB-n\fR] [\fB-i \fIinterface\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
++\fBurlsnarf\fR [\fB-n\fR] [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] [[\fB-v\fR] \fIpattern [\fIexpression\fR]]
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -21,6 +21,9 @@
+ .IP \fB-n\fR
+ Do not resolve IP addresses to hostnames.
+ .IP "\fB-i \fIinterface\fR"
++Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP \fB-v\fR
+ "Versus" mode. Invert the sense of matching, to select non-matching
+ URLs.
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -41,7 +41,7 @@
+ usage(void)
+ {
+ fprintf(stderr, "Version: " VERSION "\n"
+- "Usage: urlsnarf [-n] [-i interface] [[-v] pattern [expression]]\n");
++ "Usage: urlsnarf [-n] [-i interface | -p pcapfile] [[-v] pattern [expression]]\n");
+ exit(1);
+ }
+
+@@ -201,11 +201,14 @@
+ extern int optind;
+ int c;
+
+- while ((c = getopt(argc, argv, "i:nvh?V")) != -1) {
++ while ((c = getopt(argc, argv, "i:p:nvh?V")) != -1) {
+ switch (c) {
+ case 'i':
+ nids_params.device = optarg;
+ break;
++ case 'p':
++ nids_params.filename = optarg;
++ break;
+ case 'n':
+ Opt_dns = 0;
+ break;
+@@ -238,8 +241,24 @@
+
+ nids_register_tcp(sniff_http_client);
+
+- warnx("listening on %s [%s]", nids_params.device,
+- nids_params.pcap_filter);
++ if (nids_params.pcap_filter != NULL) {
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s [%s]", nids_params.device,
++ nids_params.pcap_filter);
++ }
++ else {
++ warnx("using %s [%s]", nids_params.filename,
++ nids_params.pcap_filter);
++ }
++ }
++ else {
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s", nids_params.device);
++ }
++ else {
++ warnx("using %s", nids_params.filename);
++ }
++ }
+
+ nids_run();
+
+--- a/webspy.8
++++ b/webspy.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBwebspy\fR [\fB-i \fIinterface\fR] \fIhost\fR
++\fBwebspy\fR [\fB-i \fIinterface\fR | \fB-p \fIpcapfile\fR] \fIhost\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -20,6 +20,8 @@
+ .SH OPTIONS
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to listen on.
++.IP "\fB-p \fIpcapfile\fR"
++Process packets from the specified PCAP capture file instead of the network.
+ .IP \fIhost\fR
+ Specify the web client to spy on.
+ .SH "SEE ALSO"
+--- a/webspy.c
++++ b/webspy.c
+@@ -42,7 +42,7 @@
+ usage(void)
+ {
+ fprintf(stderr, "Version: " VERSION "\n"
+- "Usage: %s [-i interface] host\n", progname);
++ "Usage: %s [-i interface | -p pcapfile] host\n", progname);
+ exit(1);
+ }
+
+@@ -184,11 +184,14 @@
+ extern int optind;
+ int c;
+
+- while ((c = getopt(argc, argv, "i:h?V")) != -1) {
++ while ((c = getopt(argc, argv, "i:p:h?V")) != -1) {
+ switch (c) {
+ case 'i':
+ nids_params.device = optarg;
+ break;
++ case 'p':
++ nids_params.filename = optarg;
++ break;
+ default:
+ usage();
+ }
+@@ -216,7 +219,13 @@
+
+ nids_register_tcp(sniff_http_client);
+
+- warnx("listening on %s", nids_params.device);
++ if (nids_params.filename == NULL) {
++ warnx("listening on %s", nids_params.device);
++ }
++ else {
++ warnx("using %s", nids_params.filename);
++ }
++
+
+ nids_run();
+
diff --git a/network/dsniff/patches/04_multiple_intf.patch b/network/dsniff/patches/04_multiple_intf.patch
new file mode 100644
index 0000000000..b624929d6c
--- /dev/null
+++ b/network/dsniff/patches/04_multiple_intf.patch
@@ -0,0 +1,56 @@
+Author: Steve Kemp <skx@debian.org>
+Description: Work with multiple interfaces.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=242369
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/arp.c
++++ b/arp.c
+@@ -39,7 +39,7 @@
+
+ #ifdef BSD
+ int
+-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether)
++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char* linf)
+ {
+ int mib[6];
+ size_t len;
+@@ -91,7 +91,7 @@
+ #endif
+
+ int
+-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether)
++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char* lif)
+ {
+ int sock;
+ struct arpreq ar;
+@@ -99,7 +99,7 @@
+
+ memset((char *)&ar, 0, sizeof(ar));
+ #ifdef __linux__
+- strncpy(ar.arp_dev, "eth0", sizeof(ar.arp_dev)); /* XXX - *sigh* */
++ strncpy(ar.arp_dev, lif, strlen(lif));
+ #endif
+ sin = (struct sockaddr_in *)&ar.arp_pa;
+ sin->sin_family = AF_INET;
+--- a/arp.h
++++ b/arp.h
+@@ -11,6 +11,6 @@
+ #ifndef _ARP_H_
+ #define _ARP_H_
+
+-int arp_cache_lookup(in_addr_t ip, struct ether_addr *ether);
++int arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char* linf);
+
+ #endif /* _ARP_H_ */
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -113,7 +113,7 @@
+ int i = 0;
+
+ do {
+- if (arp_cache_lookup(ip, mac) == 0)
++ if (arp_cache_lookup(ip, mac, intf) == 0)
+ return (1);
+ #ifdef __linux__
+ /* XXX - force the kernel to arp. feh. */
diff --git a/network/dsniff/patches/05_amd64_fix.patch b/network/dsniff/patches/05_amd64_fix.patch
new file mode 100644
index 0000000000..c5b9384fcf
--- /dev/null
+++ b/network/dsniff/patches/05_amd64_fix.patch
@@ -0,0 +1,221 @@
+Author: Steve Kemp <skx@debian.org>
+Description: Compile under AMD64.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=254002
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/configure
++++ b/configure
+@@ -2667,15 +2667,62 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
++echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6
++echo "configure:2672: checking for __dn_expand in -lresolv" >&5
++ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ ac_save_LIBS="$LIBS"
++LIBS="-lresolv $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2680 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error. */
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char __dn_expand();
++
++int main() {
++__dn_expand()
++; return 0; }
++EOF
++if { (eval echo configure:2691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++ rm -rf conftest*
++ eval "ac_cv_lib_$ac_lib_var=yes"
++else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ rm -rf conftest*
++ eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++ echo "$ac_t""yes" 1>&6
++ ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
++ cat >> confdefs.h <<EOF
++#define $ac_tr_lib 1
++EOF
++
++ LIBS="-lresolv $LIBS"
++
++else
++ echo "$ac_t""no" 1>&6
++fi
++
+ for ac_func in dirname strlcpy strlcat strsep
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2674: checking for $ac_func" >&5
++echo "configure:2721: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2679 "configure"
++#line 2726 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -2698,7 +2745,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2728,12 +2775,12 @@
+ for ac_func in MD5Update
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2732: checking for $ac_func" >&5
++echo "configure:2779: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2737 "configure"
++#line 2784 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -2756,7 +2803,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2788,12 +2835,12 @@
+ for ac_func in warnx
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2792: checking for $ac_func" >&5
++echo "configure:2839: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2797 "configure"
++#line 2844 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -2816,7 +2863,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2848,12 +2895,12 @@
+ for ac_func in ether_ntoa
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2852: checking for $ac_func" >&5
++echo "configure:2899: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2857 "configure"
++#line 2904 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -2876,7 +2923,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2912,7 +2959,7 @@
+ fi
+
+ echo $ac_n "checking for Berkeley DB with 1.85 compatibility""... $ac_c" 1>&6
+-echo "configure:2916: checking for Berkeley DB with 1.85 compatibility" >&5
++echo "configure:2963: checking for Berkeley DB with 1.85 compatibility" >&5
+ # Check whether --with-db or --without-db was given.
+ if test "${with_db+set}" = set; then
+ withval="$with_db"
+@@ -3015,7 +3062,7 @@
+
+
+ echo $ac_n "checking for libpcap""... $ac_c" 1>&6
+-echo "configure:3019: checking for libpcap" >&5
++echo "configure:3066: checking for libpcap" >&5
+ # Check whether --with-libpcap or --without-libpcap was given.
+ if test "${with_libpcap+set}" = set; then
+ withval="$with_libpcap"
+@@ -3063,7 +3110,7 @@
+
+
+ echo $ac_n "checking for libnet""... $ac_c" 1>&6
+-echo "configure:3067: checking for libnet" >&5
++echo "configure:3114: checking for libnet" >&5
+ # Check whether --with-libnet or --without-libnet was given.
+ if test "${with_libnet+set}" = set; then
+ withval="$with_libnet"
+@@ -3110,7 +3157,7 @@
+
+
+ echo $ac_n "checking for libnids""... $ac_c" 1>&6
+-echo "configure:3114: checking for libnids" >&5
++echo "configure:3161: checking for libnids" >&5
+ # Check whether --with-libnids or --without-libnids was given.
+ if test "${with_libnids+set}" = set; then
+ withval="$with_libnids"
+@@ -3152,9 +3199,9 @@
+ save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$NIDSINC"
+ echo $ac_n "checking whether libnids version is good""... $ac_c" 1>&6
+-echo "configure:3156: checking whether libnids version is good" >&5
++echo "configure:3203: checking whether libnids version is good" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3158 "configure"
++#line 3205 "configure"
+ #include "confdefs.h"
+ #include <nids.h>
+ EOF
+@@ -3173,7 +3220,7 @@
+
+
+ echo $ac_n "checking for OpenSSL""... $ac_c" 1>&6
+-echo "configure:3177: checking for OpenSSL" >&5
++echo "configure:3224: checking for OpenSSL" >&5
+ # Check whether --with-openssl or --without-openssl was given.
+ if test "${with_openssl+set}" = set; then
+ withval="$with_openssl"
+--- a/configure.in
++++ b/configure.in
+@@ -57,6 +57,7 @@
+ AC_CHECK_LIB(nsl, gethostbyname)
+ dnl XXX - feh, everything except OpenBSD sux.
+ AC_CHECK_LIB(resolv, dn_expand)
++AC_CHECK_LIB(resolv, __dn_expand)
+ AC_REPLACE_FUNCS(dirname strlcpy strlcat strsep)
+ needmd5=no
+ AC_CHECK_FUNCS(MD5Update, , [needmd5=yes])
diff --git a/network/dsniff/patches/06_urlsnarf_zeropad.patch b/network/dsniff/patches/06_urlsnarf_zeropad.patch
new file mode 100644
index 0000000000..29991708e5
--- /dev/null
+++ b/network/dsniff/patches/06_urlsnarf_zeropad.patch
@@ -0,0 +1,17 @@
+Author: Steve Kemp <skx@debian.org>
+Description: urlsnarf: zero-pad date.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=298605
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -68,7 +68,7 @@
+ t->tm_hour - gmt.tm_hour);
+ tz = hours * 60 + t->tm_min - gmt.tm_min;
+
+- len = strftime(tstr, sizeof(tstr), "%e/%b/%Y:%X", t);
++ len = strftime(tstr, sizeof(tstr), "%d/%b/%Y:%X", t);
+ if (len < 0 || len > sizeof(tstr) - 5)
+ return (NULL);
+
diff --git a/network/dsniff/patches/07_libnet_1.1.patch b/network/dsniff/patches/07_libnet_1.1.patch
new file mode 100644
index 0000000000..66d57cade4
--- /dev/null
+++ b/network/dsniff/patches/07_libnet_1.1.patch
@@ -0,0 +1,906 @@
+Author: Faidon Liambotis <paravoid@debian.org>
+Description: Use libnet v1.1 instead of v1.0
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -27,7 +27,7 @@
+
+ extern char *ether_ntoa(struct ether_addr *);
+
+-static struct libnet_link_int *llif;
++static libnet_t *l;
+ static struct ether_addr spoof_mac, target_mac;
+ static in_addr_t spoof_ip, target_ip;
+ static char *intf;
+@@ -41,47 +41,49 @@
+ }
+
+ static int
+-arp_send(struct libnet_link_int *llif, char *dev,
+- int op, u_char *sha, in_addr_t spa, u_char *tha, in_addr_t tpa)
++arp_send(libnet_t *l, int op, u_int8_t *sha,
++ in_addr_t spa, u_int8_t *tha, in_addr_t tpa)
+ {
+- char ebuf[128];
+- u_char pkt[60];
+-
++ int retval;
++
+ if (sha == NULL &&
+- (sha = (u_char *)libnet_get_hwaddr(llif, dev, ebuf)) == NULL) {
++ (sha = (u_int8_t *)libnet_get_hwaddr(l)) == NULL) {
+ return (-1);
+ }
+ if (spa == 0) {
+- if ((spa = libnet_get_ipaddr(llif, dev, ebuf)) == 0)
++ if ((spa = libnet_get_ipaddr4(l)) == -1)
+ return (-1);
+- spa = htonl(spa); /* XXX */
+ }
+ if (tha == NULL)
+ tha = "\xff\xff\xff\xff\xff\xff";
+
+- libnet_build_ethernet(tha, sha, ETHERTYPE_ARP, NULL, 0, pkt);
++ libnet_autobuild_arp(op, sha, (u_int8_t *)&spa,
++ tha, (u_int8_t *)&tpa, l);
++ libnet_build_ethernet(tha, sha, ETHERTYPE_ARP, NULL, 0, l, 0);
+
+- libnet_build_arp(ARPHRD_ETHER, ETHERTYPE_IP, ETHER_ADDR_LEN, 4,
+- op, sha, (u_char *)&spa, tha, (u_char *)&tpa,
+- NULL, 0, pkt + ETH_H);
+-
+ fprintf(stderr, "%s ",
+ ether_ntoa((struct ether_addr *)sha));
+
+ if (op == ARPOP_REQUEST) {
+ fprintf(stderr, "%s 0806 42: arp who-has %s tell %s\n",
+ ether_ntoa((struct ether_addr *)tha),
+- libnet_host_lookup(tpa, 0),
+- libnet_host_lookup(spa, 0));
++ libnet_addr2name4(tpa, LIBNET_DONT_RESOLVE),
++ libnet_addr2name4(spa, LIBNET_DONT_RESOLVE));
+ }
+ else {
+ fprintf(stderr, "%s 0806 42: arp reply %s is-at ",
+ ether_ntoa((struct ether_addr *)tha),
+- libnet_host_lookup(spa, 0));
++ libnet_addr2name4(spa, LIBNET_DONT_RESOLVE));
+ fprintf(stderr, "%s\n",
+ ether_ntoa((struct ether_addr *)sha));
+ }
+- return (libnet_write_link_layer(llif, dev, pkt, sizeof(pkt)) == sizeof(pkt));
++ retval = libnet_write(l);
++ if (retval)
++ fprintf(stderr, "%s", libnet_geterror(l));
++
++ libnet_clear_packet(l);
++
++ return retval;
+ }
+
+ #ifdef __linux__
+@@ -119,7 +121,7 @@
+ /* XXX - force the kernel to arp. feh. */
+ arp_force(ip);
+ #else
+- arp_send(llif, intf, ARPOP_REQUEST, NULL, 0, NULL, ip);
++ arp_send(l, ARPOP_REQUEST, NULL, 0, NULL, ip);
+ #endif
+ sleep(1);
+ }
+@@ -136,9 +138,9 @@
+ if (arp_find(spoof_ip, &spoof_mac)) {
+ for (i = 0; i < 3; i++) {
+ /* XXX - on BSD, requires ETHERSPOOF kernel. */
+- arp_send(llif, intf, ARPOP_REPLY,
+- (u_char *)&spoof_mac, spoof_ip,
+- (target_ip ? (u_char *)&target_mac : NULL),
++ arp_send(l, ARPOP_REPLY,
++ (u_int8_t *)&spoof_mac, spoof_ip,
++ (target_ip ? (u_int8_t *)&target_mac : NULL),
+ target_ip);
+ sleep(1);
+ }
+@@ -151,7 +153,8 @@
+ {
+ extern char *optarg;
+ extern int optind;
+- char ebuf[PCAP_ERRBUF_SIZE];
++ char pcap_ebuf[PCAP_ERRBUF_SIZE];
++ char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ int c;
+
+ intf = NULL;
+@@ -163,7 +166,7 @@
+ intf = optarg;
+ break;
+ case 't':
+- if ((target_ip = libnet_name_resolve(optarg, 1)) == -1)
++ if ((target_ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1)
+ usage();
+ break;
+ default:
+@@ -176,26 +179,26 @@
+ if (argc != 1)
+ usage();
+
+- if ((spoof_ip = libnet_name_resolve(argv[0], 1)) == -1)
++ if ((spoof_ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ usage();
+
+- if (intf == NULL && (intf = pcap_lookupdev(ebuf)) == NULL)
+- errx(1, "%s", ebuf);
++ if (intf == NULL && (intf = pcap_lookupdev(pcap_ebuf)) == NULL)
++ errx(1, "%s", pcap_ebuf);
+
+- if ((llif = libnet_open_link_interface(intf, ebuf)) == 0)
+- errx(1, "%s", ebuf);
++ if ((l = libnet_init(LIBNET_LINK, intf, libnet_ebuf)) == NULL)
++ errx(1, "%s", libnet_ebuf);
+
+ if (target_ip != 0 && !arp_find(target_ip, &target_mac))
+ errx(1, "couldn't arp for host %s",
+- libnet_host_lookup(target_ip, 0));
++ libnet_addr2name4(target_ip, LIBNET_DONT_RESOLVE));
+
+ signal(SIGHUP, cleanup);
+ signal(SIGINT, cleanup);
+ signal(SIGTERM, cleanup);
+
+ for (;;) {
+- arp_send(llif, intf, ARPOP_REPLY, NULL, spoof_ip,
+- (target_ip ? (u_char *)&target_mac : NULL),
++ arp_send(l, ARPOP_REPLY, NULL, spoof_ip,
++ (target_ip ? (u_int8_t *)&target_mac : NULL),
+ target_ip);
+ sleep(2);
+ }
+--- a/dnsspoof.c
++++ b/dnsspoof.c
+@@ -38,7 +38,7 @@
+
+ pcap_t *pcap_pd = NULL;
+ int pcap_off = -1;
+-int lnet_sock = -1;
++libnet_t *l;
+ u_long lnet_ip = -1;
+
+ static void
+@@ -90,19 +90,18 @@
+ dns_init(char *dev, char *filename)
+ {
+ FILE *f;
+- struct libnet_link_int *llif;
++ libnet_t *l;
++ char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ struct dnsent *de;
+ char *ip, *name, buf[1024];
+
+- if ((llif = libnet_open_link_interface(dev, buf)) == NULL)
+- errx(1, "%s", buf);
++ if ((l = libnet_init(LIBNET_LINK, dev, libnet_ebuf)) == NULL)
++ errx(1, "%s", libnet_ebuf);
+
+- if ((lnet_ip = libnet_get_ipaddr(llif, dev, buf)) == -1)
+- errx(1, "%s", buf);
++ if ((lnet_ip = libnet_get_ipaddr4(l)) == -1)
++ errx(1, "%s", libnet_geterror(l));
+
+- lnet_ip = htonl(lnet_ip);
+-
+- libnet_close_link_interface(llif);
++ libnet_destroy(l);
+
+ SLIST_INIT(&dns_entries);
+
+@@ -180,7 +179,7 @@
+ static void
+ dns_spoof(u_char *u, const struct pcap_pkthdr *pkthdr, const u_char *pkt)
+ {
+- struct libnet_ip_hdr *ip;
++ struct libnet_ipv4_hdr *ip;
+ struct libnet_udp_hdr *udp;
+ HEADER *dns;
+ char name[MAXHOSTNAMELEN];
+@@ -189,7 +188,7 @@
+ in_addr_t dst;
+ u_short type, class;
+
+- ip = (struct libnet_ip_hdr *)(pkt + pcap_off);
++ ip = (struct libnet_ipv4_hdr *)(pkt + pcap_off);
+ udp = (struct libnet_udp_hdr *)(pkt + pcap_off + (ip->ip_hl * 4));
+ dns = (HEADER *)(udp + 1);
+ p = (u_char *)(dns + 1);
+@@ -212,7 +211,7 @@
+ if (class != C_IN)
+ return;
+
+- p = buf + IP_H + UDP_H + dnslen;
++ p = buf + dnslen;
+
+ if (type == T_A) {
+ if ((dst = dns_lookup_a(name)) == -1)
+@@ -234,38 +233,38 @@
+ anslen += 12;
+ }
+ else return;
+-
+- libnet_build_ip(UDP_H + dnslen + anslen, 0, libnet_get_prand(PRu16),
+- 0, 64, IPPROTO_UDP, ip->ip_dst.s_addr,
+- ip->ip_src.s_addr, NULL, 0, buf);
+-
+- libnet_build_udp(ntohs(udp->uh_dport), ntohs(udp->uh_sport),
+- NULL, dnslen + anslen, buf + IP_H);
+
+- memcpy(buf + IP_H + UDP_H, (u_char *)dns, dnslen);
++ memcpy(buf, (u_char *)dns, dnslen);
+
+- dns = (HEADER *)(buf + IP_H + UDP_H);
++ dns = (HEADER *)buf;
+ dns->qr = dns->ra = 1;
+ if (type == T_PTR) dns->aa = 1;
+ dns->ancount = htons(1);
+
+ dnslen += anslen;
++
++ libnet_clear_packet(l);
++ libnet_build_udp(ntohs(udp->uh_dport), ntohs(udp->uh_sport),
++ LIBNET_UDP_H + dnslen, 0,
++ (u_int8_t *)buf, dnslen, l, 0);
++
++ libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_UDP_H + dnslen, 0,
++ libnet_get_prand(LIBNET_PRu16), 0, 64, IPPROTO_UDP, 0,
++ ip->ip_dst.s_addr, ip->ip_src.s_addr, NULL, 0, l, 0);
+
+- libnet_do_checksum(buf, IPPROTO_UDP, UDP_H + dnslen);
+-
+- if (libnet_write_ip(lnet_sock, buf, IP_H + UDP_H + dnslen) < 0)
++ if (libnet_write(l) < 0)
+ warn("write");
+
+ fprintf(stderr, "%s.%d > %s.%d: %d+ %s? %s\n",
+- libnet_host_lookup(ip->ip_src.s_addr, 0), ntohs(udp->uh_sport),
+- libnet_host_lookup(ip->ip_dst.s_addr, 0), ntohs(udp->uh_dport),
++ libnet_addr2name4(ip->ip_src.s_addr, 0), ntohs(udp->uh_sport),
++ libnet_addr2name4(ip->ip_dst.s_addr, 0), ntohs(udp->uh_dport),
+ ntohs(dns->id), type == T_A ? "A" : "PTR", name);
+ }
+
+ static void
+ cleanup(int sig)
+ {
+- libnet_close_raw_sock(lnet_sock);
++ libnet_destroy(l);
+ pcap_close(pcap_pd);
+ exit(0);
+ }
+@@ -276,6 +275,7 @@
+ extern char *optarg;
+ extern int optind;
+ char *p, *dev, *hosts, buf[1024];
++ char ebuf[LIBNET_ERRBUF_SIZE];
+ int i;
+
+ dev = hosts = NULL;
+@@ -306,7 +306,7 @@
+ strlcpy(buf, p, sizeof(buf));
+ }
+ else snprintf(buf, sizeof(buf), "udp dst port 53 and not src %s",
+- libnet_host_lookup(lnet_ip, 0));
++ libnet_addr2name4(lnet_ip, LIBNET_DONT_RESOLVE));
+
+ if ((pcap_pd = pcap_init(dev, buf, 128)) == NULL)
+ errx(1, "couldn't initialize sniffing");
+@@ -314,10 +314,10 @@
+ if ((pcap_off = pcap_dloff(pcap_pd)) < 0)
+ errx(1, "couldn't determine link layer offset");
+
+- if ((lnet_sock = libnet_open_raw_sock(IPPROTO_RAW)) == -1)
++ if ((l = libnet_init(LIBNET_RAW4, dev, ebuf)) == NULL)
+ errx(1, "couldn't initialize sending");
+
+- libnet_seed_prand();
++ libnet_seed_prand(l);
+
+ signal(SIGHUP, cleanup);
+ signal(SIGINT, cleanup);
+--- a/filesnarf.c
++++ b/filesnarf.c
+@@ -134,8 +134,8 @@
+ int fd;
+
+ warnx("%s.%d > %s.%d: %s (%d@%d)",
+- libnet_host_lookup(addr->daddr, 0), addr->dest,
+- libnet_host_lookup(addr->saddr, 0), addr->source,
++ libnet_addr2name4(addr->daddr, LIBNET_DONT_RESOLVE), addr->dest,
++ libnet_addr2name4(addr->saddr, LIBNET_DONT_RESOLVE), addr->source,
+ ma->filename, len, ma->offset);
+
+ if ((fd = open(ma->filename, O_WRONLY|O_CREAT, 0644)) >= 0) {
+@@ -353,7 +353,7 @@
+ }
+
+ static void
+-decode_udp_nfs(struct libnet_ip_hdr *ip)
++decode_udp_nfs(struct libnet_ipv4_hdr *ip)
+ {
+ static struct tuple4 addr;
+ struct libnet_udp_hdr *udp;
+--- a/macof.c
++++ b/macof.c
+@@ -48,8 +48,8 @@
+ static void
+ gen_mac(u_char *mac)
+ {
+- *((in_addr_t *)mac) = libnet_get_prand(PRu32);
+- *((u_short *)(mac + 4)) = libnet_get_prand(PRu16);
++ *((in_addr_t *)mac) = libnet_get_prand(LIBNET_PRu32);
++ *((u_short *)(mac + 4)) = libnet_get_prand(LIBNET_PRu16);
+ }
+
+ int
+@@ -59,22 +59,23 @@
+ extern int optind;
+ int c, i;
+ struct libnet_link_int *llif;
+- char ebuf[PCAP_ERRBUF_SIZE];
++ char pcap_ebuf[PCAP_ERRBUF_SIZE];
++ char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ u_char sha[ETHER_ADDR_LEN], tha[ETHER_ADDR_LEN];
+ in_addr_t src, dst;
+ u_short sport, dport;
+ u_int32_t seq;
+- u_char pkt[ETH_H + IP_H + TCP_H];
++ libnet_t *l;
+
+ while ((c = getopt(argc, argv, "vs:d:e:x:y:i:n:h?V")) != -1) {
+ switch (c) {
+ case 'v':
+ break;
+ case 's':
+- Src = libnet_name_resolve(optarg, 0);
++ Src = libnet_name2addr4(l, optarg, 0);
+ break;
+ case 'd':
+- Dst = libnet_name_resolve(optarg, 0);
++ Dst = libnet_name2addr4(l, optarg, 0);
+ break;
+ case 'e':
+ Tha = (u_char *)ether_aton(optarg);
+@@ -101,13 +102,13 @@
+ if (argc != 0)
+ usage();
+
+- if (!Intf && (Intf = pcap_lookupdev(ebuf)) == NULL)
+- errx(1, "%s", ebuf);
++ if (!Intf && (Intf = pcap_lookupdev(pcap_ebuf)) == NULL)
++ errx(1, "%s", pcap_ebuf);
+
+- if ((llif = libnet_open_link_interface(Intf, ebuf)) == 0)
+- errx(1, "%s", ebuf);
++ if ((l = libnet_init(LIBNET_LINK, Intf, libnet_ebuf)) == NULL)
++ errx(1, "%s", libnet_ebuf);
+
+- libnet_seed_prand();
++ libnet_seed_prand(l);
+
+ for (i = 0; i != Repeat; i++) {
+
+@@ -117,39 +118,39 @@
+ else memcpy(tha, Tha, sizeof(tha));
+
+ if (Src != 0) src = Src;
+- else src = libnet_get_prand(PRu32);
++ else src = libnet_get_prand(LIBNET_PRu32);
+
+ if (Dst != 0) dst = Dst;
+- else dst = libnet_get_prand(PRu32);
++ else dst = libnet_get_prand(LIBNET_PRu32);
+
+ if (Sport != 0) sport = Sport;
+- else sport = libnet_get_prand(PRu16);
++ else sport = libnet_get_prand(LIBNET_PRu16);
+
+ if (Dport != 0) dport = Dport;
+- else dport = libnet_get_prand(PRu16);
++ else dport = libnet_get_prand(LIBNET_PRu16);
+
+- seq = libnet_get_prand(PRu32);
+-
+- libnet_build_ethernet(tha, sha, ETHERTYPE_IP, NULL, 0, pkt);
+-
+- libnet_build_ip(TCP_H, 0, libnet_get_prand(PRu16), 0, 64,
+- IPPROTO_TCP, src, dst, NULL, 0, pkt + ETH_H);
++ seq = libnet_get_prand(LIBNET_PRu32);
+
+ libnet_build_tcp(sport, dport, seq, 0, TH_SYN, 512,
+- 0, NULL, 0, pkt + ETH_H + IP_H);
++ 0, 0, LIBNET_TCP_H, NULL, 0, l, 0);
+
+- libnet_do_checksum(pkt + ETH_H, IPPROTO_IP, IP_H);
+- libnet_do_checksum(pkt + ETH_H, IPPROTO_TCP, TCP_H);
++ libnet_build_ipv4(LIBNET_TCP_H, 0,
++ libnet_get_prand(LIBNET_PRu16), 0, 64,
++ IPPROTO_TCP, 0, src, dst, NULL, 0, l, 0);
+
+- if (libnet_write_link_layer(llif, Intf, pkt, sizeof(pkt)) < 0)
++ libnet_build_ethernet(tha, sha, ETHERTYPE_IP, NULL, 0, l, 0);
++
++ if (libnet_write(l) < 0)
+ errx(1, "write");
+
++ libnet_clear_packet(l);
++
+ fprintf(stderr, "%s ",
+ ether_ntoa((struct ether_addr *)sha));
+ fprintf(stderr, "%s %s.%d > %s.%d: S %u:%u(0) win 512\n",
+ ether_ntoa((struct ether_addr *)tha),
+- libnet_host_lookup(Src, 0), sport,
+- libnet_host_lookup(Dst, 0), dport, seq, seq);
++ libnet_addr2name4(Src, 0), sport,
++ libnet_addr2name4(Dst, 0), dport, seq, seq);
+ }
+ exit(0);
+ }
+--- a/record.c
++++ b/record.c
+@@ -65,8 +65,8 @@
+ tm = localtime(&rec->time);
+ strftime(tstr, sizeof(tstr), "%x %X", tm);
+
+- srcp = libnet_host_lookup(rec->src, Opt_dns);
+- dstp = libnet_host_lookup(rec->dst, Opt_dns);
++ srcp = libnet_addr2name4(rec->src, Opt_dns);
++ dstp = libnet_addr2name4(rec->dst, Opt_dns);
+
+ if ((pr = getprotobynumber(rec->proto)) == NULL)
+ protop = "unknown";
+--- a/sshmitm.c
++++ b/sshmitm.c
+@@ -389,7 +389,7 @@
+ if (argc < 1)
+ usage();
+
+- if ((ip = libnet_name_resolve(argv[0], 1)) == -1)
++ if ((ip = libnet_name2addr4(NULL, argv[0], LIBNET_RESOLVE)) == -1)
+ usage();
+
+ if (argc == 2 && (rport = atoi(argv[1])) == 0)
+--- a/tcpkill.c
++++ b/tcpkill.c
+@@ -39,17 +39,18 @@
+ static void
+ tcp_kill_cb(u_char *user, const struct pcap_pkthdr *pcap, const u_char *pkt)
+ {
+- struct libnet_ip_hdr *ip;
++ struct libnet_ipv4_hdr *ip;
+ struct libnet_tcp_hdr *tcp;
+- u_char ctext[64], buf[IP_H + TCP_H];
++ u_char ctext[64];
+ u_int32_t seq, win;
+- int i, *sock, len;
++ int i, len;
++ libnet_t *l;
+
+- sock = (int *)user;
++ l = (libnet_t *)user;
+ pkt += pcap_off;
+ len = pcap->caplen - pcap_off;
+
+- ip = (struct libnet_ip_hdr *)pkt;
++ ip = (struct libnet_ipv4_hdr *)pkt;
+ if (ip->ip_p != IPPROTO_TCP)
+ return;
+
+@@ -57,34 +58,31 @@
+ if (tcp->th_flags & (TH_SYN|TH_FIN|TH_RST))
+ return;
+
+- libnet_build_ip(TCP_H, 0, 0, 0, 64, IPPROTO_TCP,
+- ip->ip_dst.s_addr, ip->ip_src.s_addr,
+- NULL, 0, buf);
+-
+- libnet_build_tcp(ntohs(tcp->th_dport), ntohs(tcp->th_sport),
+- 0, 0, TH_RST, 0, 0, NULL, 0, buf + IP_H);
+-
+ seq = ntohl(tcp->th_ack);
+ win = ntohs(tcp->th_win);
+
+ snprintf(ctext, sizeof(ctext), "%s:%d > %s:%d:",
+- libnet_host_lookup(ip->ip_src.s_addr, 0),
++ libnet_addr2name4(ip->ip_src.s_addr, LIBNET_DONT_RESOLVE),
+ ntohs(tcp->th_sport),
+- libnet_host_lookup(ip->ip_dst.s_addr, 0),
++ libnet_addr2name4(ip->ip_dst.s_addr, LIBNET_DONT_RESOLVE),
+ ntohs(tcp->th_dport));
+
+- ip = (struct libnet_ip_hdr *)buf;
+- tcp = (struct libnet_tcp_hdr *)(ip + 1);
+-
+ for (i = 0; i < Opt_severity; i++) {
+- ip->ip_id = libnet_get_prand(PRu16);
+ seq += (i * win);
+- tcp->th_seq = htonl(seq);
+
+- libnet_do_checksum(buf, IPPROTO_TCP, TCP_H);
++ libnet_clear_packet(l);
++
++ libnet_build_tcp(ntohs(tcp->th_dport), ntohs(tcp->th_sport),
++ seq, 0, TH_RST, 0, 0, 0, LIBNET_TCP_H,
++ NULL, 0, l, 0);
++
++ libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_TCP_H, 0,
++ libnet_get_prand(LIBNET_PRu16), 0, 64,
++ IPPROTO_TCP, 0, ip->ip_dst.s_addr,
++ ip->ip_src.s_addr, NULL, 0, l, 0);
+
+- if (libnet_write_ip(*sock, buf, sizeof(buf)) < 0)
+- warn("write_ip");
++ if (libnet_write(l) < 0)
++ warn("write");
+
+ fprintf(stderr, "%s R %lu:%lu(0) win 0\n", ctext, seq, seq);
+ }
+@@ -95,8 +93,10 @@
+ {
+ extern char *optarg;
+ extern int optind;
+- int c, sock;
++ int c;
+ char *p, *intf, *filter, ebuf[PCAP_ERRBUF_SIZE];
++ char libnet_ebuf[LIBNET_ERRBUF_SIZE];
++ libnet_t *l;
+ pcap_t *pd;
+
+ intf = NULL;
+@@ -136,14 +136,14 @@
+ if ((pcap_off = pcap_dloff(pd)) < 0)
+ errx(1, "couldn't determine link layer offset");
+
+- if ((sock = libnet_open_raw_sock(IPPROTO_RAW)) == -1)
++ if ((l = libnet_init(LIBNET_RAW4, intf, libnet_ebuf)) == NULL)
+ errx(1, "couldn't initialize sending");
+
+- libnet_seed_prand();
++ libnet_seed_prand(l);
+
+ warnx("listening on %s [%s]", intf, filter);
+
+- pcap_loop(pd, -1, tcp_kill_cb, (u_char *)&sock);
++ pcap_loop(pd, -1, tcp_kill_cb, (u_char *)l);
+
+ /* NOTREACHED */
+
+--- a/tcpnice.c
++++ b/tcpnice.c
+@@ -41,107 +41,106 @@
+ }
+
+ static void
+-send_tcp_window_advertisement(int sock, struct libnet_ip_hdr *ip,
++send_tcp_window_advertisement(libnet_t *l, struct libnet_ipv4_hdr *ip,
+ struct libnet_tcp_hdr *tcp)
+ {
+ int len;
+
+ ip->ip_hl = 5;
+- ip->ip_len = htons(IP_H + TCP_H);
+- ip->ip_id = libnet_get_prand(PRu16);
+- memcpy(buf, (u_char *)ip, IP_H);
++ ip->ip_len = htons(LIBNET_IPV4_H + LIBNET_TCP_H);
++ ip->ip_id = libnet_get_prand(LIBNET_PRu16);
++ memcpy(buf, (u_char *)ip, LIBNET_IPV4_H);
+
+ tcp->th_off = 5;
+ tcp->th_win = htons(MIN_WIN);
+- memcpy(buf + IP_H, (u_char *)tcp, TCP_H);
++ memcpy(buf + LIBNET_IPV4_H, (u_char *)tcp, LIBNET_TCP_H);
+
+- libnet_do_checksum(buf, IPPROTO_TCP, TCP_H);
++ libnet_do_checksum(l, buf, IPPROTO_TCP, LIBNET_TCP_H);
+
+- len = IP_H + TCP_H;
++ len = LIBNET_IPV4_H + LIBNET_TCP_H;
+
+- if (libnet_write_ip(sock, buf, len) != len)
++ if (libnet_write_raw_ipv4(l, buf, len) != len)
+ warn("write");
+
+ fprintf(stderr, "%s:%d > %s:%d: . ack %lu win %d\n",
+- libnet_host_lookup(ip->ip_src.s_addr, 0), ntohs(tcp->th_sport),
+- libnet_host_lookup(ip->ip_dst.s_addr, 0), ntohs(tcp->th_dport),
++ libnet_addr2name4(ip->ip_src.s_addr, 0), ntohs(tcp->th_sport),
++ libnet_addr2name4(ip->ip_dst.s_addr, 0), ntohs(tcp->th_dport),
+ ntohl(tcp->th_ack), 1);
+ }
+
+ static void
+-send_icmp_source_quench(int sock, struct libnet_ip_hdr *ip)
++send_icmp_source_quench(libnet_t *l, struct libnet_ipv4_hdr *ip)
+ {
+- struct libnet_icmp_hdr *icmp;
++ struct libnet_icmpv4_hdr *icmp;
+ int len;
+
+ len = (ip->ip_hl * 4) + 8;
+
+- libnet_build_ip(ICMP_ECHO_H + len, 0, libnet_get_prand(PRu16),
+- 0, 64, IPPROTO_ICMP, ip->ip_dst.s_addr,
+- ip->ip_src.s_addr, NULL, 0, buf);
+-
+- icmp = (struct libnet_icmp_hdr *)(buf + IP_H);
++ icmp = (struct libnet_icmpv4_hdr *)(buf + LIBNET_IPV4_H);
+ icmp->icmp_type = ICMP_SOURCEQUENCH;
+ icmp->icmp_code = 0;
+- memcpy((u_char *)icmp + ICMP_ECHO_H, (u_char *)ip, len);
++ memcpy((u_char *)icmp + LIBNET_ICMPV4_ECHO_H, (u_char *)ip, len);
+
+- libnet_do_checksum(buf, IPPROTO_ICMP, ICMP_ECHO_H + len);
++ len += LIBNET_ICMPV4_ECHO_H;
+
+- len += (IP_H + ICMP_ECHO_H);
++ libnet_build_ipv4(LIBNET_IPV4_H + len, 0,
++ libnet_get_prand(LIBNET_PRu16), 0, 64, IPPROTO_ICMP,
++ 0, ip->ip_dst.s_addr, ip->ip_src.s_addr,
++ (u_int8_t *) icmp, len, l, 0);
+
+- if (libnet_write_ip(sock, buf, len) != len)
++ if (libnet_write(l) != len)
+ warn("write");
+
+ fprintf(stderr, "%s > %s: icmp: source quench\n",
+- libnet_host_lookup(ip->ip_dst.s_addr, 0),
+- libnet_host_lookup(ip->ip_src.s_addr, 0));
++ libnet_addr2name4(ip->ip_dst.s_addr, 0),
++ libnet_addr2name4(ip->ip_src.s_addr, 0));
+ }
+
+ static void
+-send_icmp_frag_needed(int sock, struct libnet_ip_hdr *ip)
++send_icmp_frag_needed(libnet_t *l, struct libnet_ipv4_hdr *ip)
+ {
+- struct libnet_icmp_hdr *icmp;
++ struct libnet_icmpv4_hdr *icmp;
+ int len;
+
+ len = (ip->ip_hl * 4) + 8;
+
+- libnet_build_ip(ICMP_MASK_H + len, 4, libnet_get_prand(PRu16),
+- 0, 64, IPPROTO_ICMP, ip->ip_dst.s_addr,
+- ip->ip_src.s_addr, NULL, 0, buf);
+-
+- icmp = (struct libnet_icmp_hdr *)(buf + IP_H);
++ icmp = (struct libnet_icmpv4_hdr *)(buf + LIBNET_IPV4_H);
+ icmp->icmp_type = ICMP_UNREACH;
+ icmp->icmp_code = ICMP_UNREACH_NEEDFRAG;
+ icmp->hun.frag.pad = 0;
+ icmp->hun.frag.mtu = htons(MIN_MTU);
+- memcpy((u_char *)icmp + ICMP_MASK_H, (u_char *)ip, len);
++ memcpy((u_char *)icmp + LIBNET_ICMPV4_MASK_H, (u_char *)ip, len);
+
+- libnet_do_checksum(buf, IPPROTO_ICMP, ICMP_MASK_H + len);
+-
+- len += (IP_H + ICMP_MASK_H);
++ len += LIBNET_ICMPV4_MASK_H;
++
++ libnet_build_ipv4(LIBNET_IPV4_H + len, 4,
++ libnet_get_prand(LIBNET_PRu16), 0, 64, IPPROTO_ICMP,
++ 0, ip->ip_dst.s_addr, ip->ip_src.s_addr,
++ (u_int8_t *) icmp, len, l, 0);
+
+- if (libnet_write_ip(sock, buf, len) != len)
++ if (libnet_write(l) != len)
+ warn("write");
+
+ fprintf(stderr, "%s > %s: icmp: ",
+- libnet_host_lookup(ip->ip_dst.s_addr, 0),
+- libnet_host_lookup(ip->ip_src.s_addr, 0));
++ libnet_addr2name4(ip->ip_dst.s_addr, 0),
++ libnet_addr2name4(ip->ip_src.s_addr, 0));
+ fprintf(stderr, "%s unreachable - need to frag (mtu %d)\n",
+- libnet_host_lookup(ip->ip_src.s_addr, 0), MIN_MTU);
++ libnet_addr2name4(ip->ip_src.s_addr, 0), MIN_MTU);
+ }
+
+ static void
+ tcp_nice_cb(u_char *user, const struct pcap_pkthdr *pcap, const u_char *pkt)
+ {
+- struct libnet_ip_hdr *ip;
++ struct libnet_ipv4_hdr *ip;
+ struct libnet_tcp_hdr *tcp;
+- int *sock, len;
++ int len;
++ libnet_t *l;
+
+- sock = (int *)user;
++ l = (libnet_t *)user;
+ pkt += pcap_off;
+ len = pcap->caplen - pcap_off;
+
+- ip = (struct libnet_ip_hdr *)pkt;
++ ip = (struct libnet_ipv4_hdr *)pkt;
+ if (ip->ip_p != IPPROTO_TCP)
+ return;
+
+@@ -151,11 +150,11 @@
+
+ if (ntohs(ip->ip_len) > (ip->ip_hl << 2) + (tcp->th_off << 2)) {
+ if (Opt_icmp)
+- send_icmp_source_quench(*sock, ip);
++ send_icmp_source_quench(l, ip);
+ if (Opt_win)
+- send_tcp_window_advertisement(*sock, ip, tcp);
++ send_tcp_window_advertisement(l, ip, tcp);
+ if (Opt_pmtu)
+- send_icmp_frag_needed(*sock, ip);
++ send_icmp_frag_needed(l, ip);
+ }
+ }
+
+@@ -164,8 +163,10 @@
+ {
+ extern char *optarg;
+ extern int optind;
+- int c, sock;
++ int c;
+ char *intf, *filter, ebuf[PCAP_ERRBUF_SIZE];
++ char libnet_ebuf[LIBNET_ERRBUF_SIZE];
++ libnet_t *l;
+ pcap_t *pd;
+
+ intf = NULL;
+@@ -209,14 +210,14 @@
+ if ((pcap_off = pcap_dloff(pd)) < 0)
+ errx(1, "couldn't determine link layer offset");
+
+- if ((sock = libnet_open_raw_sock(IPPROTO_RAW)) == -1)
++ if ((l = libnet_init(LIBNET_RAW4, intf, libnet_ebuf)) == NULL)
+ errx(1, "couldn't initialize sending");
+
+- libnet_seed_prand();
++ libnet_seed_prand(l);
+
+ warnx("listening on %s [%s]", intf, filter);
+
+- pcap_loop(pd, -1, tcp_nice_cb, (u_char *)&sock);
++ pcap_loop(pd, -1, tcp_nice_cb, (u_char *)l);
+
+ /* NOTREACHED */
+
+--- a/tcp_raw.c
++++ b/tcp_raw.c
+@@ -119,7 +119,7 @@
+ }
+
+ struct iovec *
+-tcp_raw_input(struct libnet_ip_hdr *ip, struct libnet_tcp_hdr *tcp, int len)
++tcp_raw_input(struct libnet_ipv4_hdr *ip, struct libnet_tcp_hdr *tcp, int len)
+ {
+ struct tha tha;
+ struct tcp_conn *conn;
+@@ -131,7 +131,7 @@
+
+ /* Verify TCP checksum. */
+ cksum = tcp->th_sum;
+- libnet_do_checksum((u_char *) ip, IPPROTO_TCP, len);
++ libnet_do_checksum(NULL, (u_char *) ip, IPPROTO_TCP, len);
+
+ if (cksum != tcp->th_sum)
+ return (NULL);
+--- a/tcp_raw.h
++++ b/tcp_raw.h
+@@ -15,7 +15,7 @@
+ u_short sport, u_short dport,
+ u_char *buf, int len);
+
+-struct iovec *tcp_raw_input(struct libnet_ip_hdr *ip,
++struct iovec *tcp_raw_input(struct libnet_ipv4_hdr *ip,
+ struct libnet_tcp_hdr *tcp, int len);
+
+ void tcp_raw_timeout(int timeout, tcp_raw_callback_t callback);
+--- a/trigger.c
++++ b/trigger.c
+@@ -276,7 +276,7 @@
+ }
+
+ void
+-trigger_ip(struct libnet_ip_hdr *ip)
++trigger_ip(struct libnet_ipv4_hdr *ip)
+ {
+ struct trigger *t, tr;
+ u_char *buf;
+@@ -305,7 +305,7 @@
+
+ /* libnids needs a nids_register_udp()... */
+ void
+-trigger_udp(struct libnet_ip_hdr *ip)
++trigger_udp(struct libnet_ipv4_hdr *ip)
+ {
+ struct trigger *t, tr;
+ struct libnet_udp_hdr *udp;
+@@ -437,7 +437,7 @@
+ }
+
+ void
+-trigger_tcp_raw(struct libnet_ip_hdr *ip)
++trigger_tcp_raw(struct libnet_ipv4_hdr *ip)
+ {
+ struct trigger *t, tr;
+ struct libnet_tcp_hdr *tcp;
+--- a/trigger.h
++++ b/trigger.h
+@@ -24,10 +24,10 @@
+ int trigger_set_tcp(int port, char *name);
+ int trigger_set_rpc(int program, char *name);
+
+-void trigger_ip(struct libnet_ip_hdr *ip);
+-void trigger_udp(struct libnet_ip_hdr *ip);
++void trigger_ip(struct libnet_ipv4_hdr *ip);
++void trigger_udp(struct libnet_ipv4_hdr *ip);
+ void trigger_tcp(struct tcp_stream *ts, void **conn_save);
+-void trigger_tcp_raw(struct libnet_ip_hdr *ip);
++void trigger_tcp_raw(struct libnet_ipv4_hdr *ip);
+ void trigger_tcp_raw_timeout(int signal);
+ void trigger_rpc(int program, int proto, int port);
+
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -145,14 +145,14 @@
+ if (user == NULL)
+ user = "-";
+ if (vhost == NULL)
+- vhost = libnet_host_lookup(addr->daddr, Opt_dns);
++ vhost = libnet_addr2name4(addr->daddr, Opt_dns);
+ if (referer == NULL)
+ referer = "-";
+ if (agent == NULL)
+ agent = "-";
+
+ printf("%s - %s [%s] \"%s http://%s%s\" - - \"%s\" \"%s\"\n",
+- libnet_host_lookup(addr->saddr, Opt_dns),
++ libnet_addr2name4(addr->saddr, Opt_dns),
+ user, timestamp(), req, vhost, uri, referer, agent);
+ }
+ fflush(stdout);
+--- a/webmitm.c
++++ b/webmitm.c
+@@ -242,7 +242,7 @@
+ word = buf_tok(&msg, "/", 1);
+ vhost = buf_strdup(word);
+ }
+- ssin.sin_addr.s_addr = libnet_name_resolve(vhost, 1);
++ ssin.sin_addr.s_addr = libnet_name2addr4(NULL, vhost, 1);
+ free(vhost);
+
+ if (ssin.sin_addr.s_addr == ntohl(INADDR_LOOPBACK) ||
+@@ -510,7 +510,7 @@
+ argv += optind;
+
+ if (argc == 1) {
+- if ((static_host = libnet_name_resolve(argv[0], 1)) == -1)
++ if ((static_host = libnet_name2addr4(NULL, argv[0], 1)) == -1)
+ usage();
+ }
+ else if (argc != 0) usage();
+--- a/webspy.c
++++ b/webspy.c
+@@ -126,7 +126,7 @@
+ if (auth == NULL)
+ auth = "";
+ if (vhost == NULL)
+- vhost = libnet_host_lookup(addr->daddr, 0);
++ vhost = libnet_addr2name4(addr->daddr, 0);
+
+ snprintf(cmd, sizeof(cmd), "openURL(http://%s%s%s%s)",
+ auth, *auth ? "@" : "", vhost, uri);
+@@ -205,7 +205,7 @@
+ cmdtab[0] = cmd;
+ cmdtab[1] = NULL;
+
+- if ((host = libnet_name_resolve(argv[0], 1)) == -1)
++ if ((host = libnet_name2addr4(NULL, argv[0], 1)) == -1)
+ errx(1, "unknown host");
+
+ if ((dpy = XOpenDisplay(NULL)) == NULL)
diff --git a/network/dsniff/patches/08_openssl-0.9.8.patch b/network/dsniff/patches/08_openssl-0.9.8.patch
new file mode 100644
index 0000000000..dc9b327bfe
--- /dev/null
+++ b/network/dsniff/patches/08_openssl-0.9.8.patch
@@ -0,0 +1,15 @@
+Author: <kees@ubuntu.com>
+Description: Fix FTBFS with openssl.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/ssh.c
++++ b/ssh.c
+@@ -16,6 +16,7 @@
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
+ #include <openssl/rand.h>
++#include <openssl/md5.h>
+
+ #include <err.h>
+ #include <errno.h>
diff --git a/network/dsniff/patches/09_sysconf_clocks.patch b/network/dsniff/patches/09_sysconf_clocks.patch
new file mode 100644
index 0000000000..a41fa581c5
--- /dev/null
+++ b/network/dsniff/patches/09_sysconf_clocks.patch
@@ -0,0 +1,23 @@
+Author: <kees@ubuntu.com>
+Description: Fix FTBFS: ./sshow.c:226: error: 'CLK_TCK' undeclared.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/sshow.c
++++ b/sshow.c
+@@ -217,6 +217,7 @@
+ {
+ clock_t delay;
+ int payload;
++ long CLK_TCK= sysconf(_SC_CLK_TCK);
+
+ delay = add_history(session, 0, cipher_size, plain_range);
+
+@@ -265,6 +266,7 @@
+ clock_t delay;
+ int skip;
+ range string_range;
++ long CLK_TCK= sysconf(_SC_CLK_TCK);
+
+ delay = add_history(session, 1, cipher_size, plain_range);
+
diff --git a/network/dsniff/patches/10_urlsnarf_escape.patch b/network/dsniff/patches/10_urlsnarf_escape.patch
new file mode 100644
index 0000000000..e6fab01ab3
--- /dev/null
+++ b/network/dsniff/patches/10_urlsnarf_escape.patch
@@ -0,0 +1,89 @@
+Author: Hilko Bengen <bengen@debian.org>
+Description: Escape user, vhost, uri, referer, agent strings in log.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=372536
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -84,6 +84,43 @@
+ return (tstr);
+ }
+
++static char *
++escape_log_entry(char *string)
++{
++ char *out;
++ unsigned char *c, *o;
++ size_t len;
++
++ if (!string)
++ return NULL;
++
++ /* Determine needed length */
++ for (c = string, len = 0; *c; c++) {
++ if ((*c < 32) || (*c >= 128))
++ len += 4;
++ else if ((*c == '"') || (*c =='\\'))
++ len += 2;
++ else
++ len++;
++ }
++ out = malloc(len+1);
++ if (!out)
++ return NULL;
++ for (c = string, o = out; *c; c++, o++) {
++ if ((*c < 32) || (*c >= 128)) {
++ snprintf(o, 5, "\\x%02x", *c);
++ o += 3;
++ } else if ((*c == '"') || ((*c =='\\'))) {
++ *(o++) = '\\';
++ *o = *c;
++ } else {
++ *o = *c;
++ }
++ }
++ out[len]='\0';
++ return out;
++}
++
+ static int
+ process_http_request(struct tuple4 *addr, u_char *data, int len)
+ {
+@@ -142,18 +179,26 @@
+ buf_tok(NULL, NULL, i);
+ }
+ }
+- if (user == NULL)
+- user = "-";
+- if (vhost == NULL)
+- vhost = libnet_addr2name4(addr->daddr, Opt_dns);
+- if (referer == NULL)
+- referer = "-";
+- if (agent == NULL)
+- agent = "-";
+-
++ user = escape_log_entry(user);
++ vhost = escape_log_entry(vhost);
++ uri = escape_log_entry(uri);
++ referer = escape_log_entry(referer);
++ agent = escape_log_entry(agent);
++
+ printf("%s - %s [%s] \"%s http://%s%s\" - - \"%s\" \"%s\"\n",
+ libnet_addr2name4(addr->saddr, Opt_dns),
+- user, timestamp(), req, vhost, uri, referer, agent);
++ (user?user:"-"),
++ timestamp(), req,
++ (vhost?vhost:libnet_addr2name4(addr->daddr, Opt_dns)),
++ uri,
++ (referer?referer:"-"),
++ (agent?agent:"-"));
++
++ free(user);
++ free(vhost);
++ free(uri);
++ free(referer);
++ free(agent);
+ }
+ fflush(stdout);
+
diff --git a/network/dsniff/patches/11_string_header.patch b/network/dsniff/patches/11_string_header.patch
new file mode 100644
index 0000000000..1b383f2847
--- /dev/null
+++ b/network/dsniff/patches/11_string_header.patch
@@ -0,0 +1,166 @@
+Author: Luciano Bello <luciano@linux.org.ar>
+Description: Avoid the "implicit declaration of function 'str*'" warning
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/arp.c
++++ b/arp.c
+@@ -34,6 +34,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <string.h>
+
+ #include "arp.h"
+
+--- a/buf.c
++++ b/buf.c
+@@ -17,6 +17,7 @@
+ #include <unistd.h>
+ #include <ctype.h>
+ #include <err.h>
++#include <string.h>
+
+ #include "buf.h"
+
+--- a/decode_nntp.c
++++ b/decode_nntp.c
+@@ -15,6 +15,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
+
+ #include "base64.h"
+ #include "decode.h"
+--- a/decode_pop.c
++++ b/decode_pop.c
+@@ -14,6 +14,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
+
+ #include "base64.h"
+ #include "options.h"
+--- a/decode_rlogin.c
++++ b/decode_rlogin.c
+@@ -14,6 +14,8 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcpy.h>
++#include <strlcat.h>
+
+ #include "options.h"
+ #include "decode.h"
+--- a/decode_smb.c
++++ b/decode_smb.c
+@@ -15,6 +15,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
+
+ #include "decode.h"
+
+--- a/decode_smtp.c
++++ b/decode_smtp.c
+@@ -14,6 +14,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
+
+ #include "base64.h"
+ #include "options.h"
+--- a/decode_sniffer.c
++++ b/decode_sniffer.c
+@@ -15,6 +15,8 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
++#include <strlcpy.h>
+
+ #include "base64.h"
+ #include "decode.h"
+--- a/decode_socks.c
++++ b/decode_socks.c
+@@ -14,6 +14,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
+
+ #include "decode.h"
+
+--- a/decode_tds.c
++++ b/decode_tds.c
+@@ -18,6 +18,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
+
+ #include "decode.h"
+
+--- a/decode_telnet.c
++++ b/decode_telnet.c
+@@ -14,6 +14,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcpy.h>
+
+ #include "options.h"
+ #include "decode.h"
+--- a/decode_x11.c
++++ b/decode_x11.c
+@@ -14,6 +14,8 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <strlcat.h>
++#include <strlcpy.h>
+
+ #include "decode.h"
+
+--- a/dnsspoof.c
++++ b/dnsspoof.c
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <signal.h>
+ #include <string.h>
++#include <strlcpy.h>
+ #include <resolv.h>
+ #include <err.h>
+ #include <libnet.h>
+--- a/magic.c
++++ b/magic.c
+@@ -36,6 +36,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <strlcpy.h>
+ #include <ctype.h>
+ #include <time.h>
+ #include <err.h>
+--- /dev/null
++++ b/missing/strlcat.h
+@@ -0,0 +1 @@
++size_t strlcat(char *dst, const char *src, size_t siz);
+--- /dev/null
++++ b/missing/strlcpy.h
+@@ -0,0 +1 @@
++size_t strlcpy(char *dst, const char *src, size_t siz);
+--- a/sshmitm.c
++++ b/sshmitm.c
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <strlcat.h>
+
+ #include "buf.h"
+ #include "record.h"
diff --git a/network/dsniff/patches/12_arpa_inet_header.patch b/network/dsniff/patches/12_arpa_inet_header.patch
new file mode 100644
index 0000000000..246cf27b3c
--- /dev/null
+++ b/network/dsniff/patches/12_arpa_inet_header.patch
@@ -0,0 +1,65 @@
+Author: Luciano Bello <luciano@linux.org.ar>
+Description: avoid the "implicit declaration of function 'ntohs'" warning
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/decode_aim.c
++++ b/decode_aim.c
+@@ -14,6 +14,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <arpa/inet.h>
+
+ #include "hex.h"
+ #include "buf.h"
+--- a/decode_mmxp.c
++++ b/decode_mmxp.c
+@@ -21,6 +21,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <arpa/inet.h>
+
+ #include "buf.h"
+ #include "decode.h"
+--- a/decode_pptp.c
++++ b/decode_pptp.c
+@@ -16,6 +16,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <arpa/inet.h>
+
+ #include "buf.h"
+ #include "decode.h"
+--- a/decode_tds.c
++++ b/decode_tds.c
+@@ -19,6 +19,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <strlcat.h>
++#include <arpa/inet.h>
+
+ #include "decode.h"
+
+--- a/decode_vrrp.c
++++ b/decode_vrrp.c
+@@ -15,6 +15,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <arpa/inet.h>
+
+ #include "buf.h"
+ #include "decode.h"
+--- a/ssh.c
++++ b/ssh.c
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <arpa/inet.h>
+ #include <unistd.h>
+
+ #include "hex.h"
diff --git a/network/dsniff/patches/13_pop_with_version.patch b/network/dsniff/patches/13_pop_with_version.patch
new file mode 100644
index 0000000000..80c570c41a
--- /dev/null
+++ b/network/dsniff/patches/13_pop_with_version.patch
@@ -0,0 +1,30 @@
+Author: Luciano Bello <luciano@linux.org.ar>
+Description: distinguish between pop versions
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/decode.c
++++ b/decode.c
+@@ -63,7 +63,8 @@
+ { "http", decode_http },
+ { "ospf", decode_ospf },
+ { "poppass", decode_poppass },
+- { "pop", decode_pop },
++ { "pop2", decode_pop },
++ { "pop3", decode_pop },
+ { "nntp", decode_nntp },
+ { "smb", decode_smb },
+ { "imap", decode_imap },
+--- a/dsniff.services
++++ b/dsniff.services
+@@ -10,8 +10,8 @@
+ ospf 89/ip
+ http 98/tcp
+ poppass 106/tcp
+-pop 109/tcp
+-pop 110/tcp
++pop2 109/tcp
++pop3 110/tcp
+ portmap 111/tcp
+ portmap -111/tcp
+ portmap 111/udp
diff --git a/network/dsniff/patches/14_obsolete_time.patch b/network/dsniff/patches/14_obsolete_time.patch
new file mode 100644
index 0000000000..f4ca6088c1
--- /dev/null
+++ b/network/dsniff/patches/14_obsolete_time.patch
@@ -0,0 +1,36 @@
+Author: Luciano Bello <luciano@linux.org.ar>
+Description: According to /usr/include/time.h, CLK_TCK is the
+"obsolete POSIX.1-1988 name" for CLOCKS_PER_SEC.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=420944
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/sshow.c
++++ b/sshow.c
+@@ -224,7 +224,7 @@
+ if (debug)
+ printf("- %s -> %s: DATA (%s bytes, %.2f seconds)\n",
+ s_saddr(ts), s_daddr(ts), s_range(plain_range),
+- (float)delay / CLK_TCK);
++ (float)delay / CLOCKS_PER_SEC);
+ if (debug > 1)
+ print_data(&ts->server, cipher_size);
+
+@@ -273,7 +273,7 @@
+ if (debug)
+ printf("- %s <- %s: DATA (%s bytes, %.2f seconds)\n",
+ s_saddr(ts), s_daddr(ts), s_range(plain_range),
+- (float)delay / CLK_TCK);
++ (float)delay / CLOCKS_PER_SEC);
+ if (debug > 1)
+ print_data(&ts->client, cipher_size);
+
+@@ -302,7 +302,7 @@
+
+ if (session->state == 1 &&
+ #ifdef USE_TIMING
+- now - get_history(session, 2)->timestamp >= CLK_TCK &&
++ now - get_history(session, 2)->timestamp >= CLOCKS_PER_SEC &&
+ #endif
+ session->protocol == 1 &&
+ (session->history.directions & 7) == 5 &&
diff --git a/network/dsniff/patches/15_checksum_libnids.patch b/network/dsniff/patches/15_checksum_libnids.patch
new file mode 100644
index 0000000000..47fbbe1d58
--- /dev/null
+++ b/network/dsniff/patches/15_checksum_libnids.patch
@@ -0,0 +1,98 @@
+Author: Gleb Paharenko <gpaharenko@gmail.com>
+Description: Workaround to this Debian bug
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=420129
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/dsniff.c
++++ b/dsniff.c
+@@ -70,6 +70,80 @@
+ {
+ }
+
++
++static int get_all_ifaces(struct ifreq **, int *);
++static unsigned int get_addr_from_ifreq(struct ifreq *);
++
++int all_local_ipaddrs_chksum_disable()
++{
++ struct ifreq *ifaces;
++ int ifaces_count;
++ int i, ind = 0;
++ struct nids_chksum_ctl *ctlp;
++ unsigned int tmp;
++
++ if (!get_all_ifaces(&ifaces, &ifaces_count))
++ return -1;
++ ctlp =
++ (struct nids_chksum_ctl *) malloc(ifaces_count *
++ sizeof(struct
++ nids_chksum_ctl));
++ if (!ctlp)
++ return -1;
++ for (i = 0; i < ifaces_count; i++) {
++ tmp = get_addr_from_ifreq(ifaces + i);
++ if (tmp) {
++ ctlp[ind].netaddr = tmp;
++ ctlp[ind].mask = inet_addr("255.255.255.255");
++ ctlp[ind].action = NIDS_DONT_CHKSUM;
++ ind++;
++ }
++ }
++ free(ifaces);
++ nids_register_chksum_ctl(ctlp, ind);
++}
++
++/* helper functions for Example 2 */
++unsigned int get_addr_from_ifreq(struct ifreq *iface)
++{
++ if (iface->ifr_addr.sa_family == AF_INET)
++ return ((struct sockaddr_in *) &(iface->ifr_addr))->
++ sin_addr.s_addr;
++ return 0;
++}
++
++static int get_all_ifaces(struct ifreq **ifaces, int *count)
++{
++ int ifaces_size = 8 * sizeof(struct ifreq);
++ struct ifconf param;
++ int sock;
++ unsigned int i;
++
++ *ifaces = malloc(ifaces_size);
++ sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
++ if (sock <= 0)
++ return 0;
++ for (;;) {
++ param.ifc_len = ifaces_size;
++ param.ifc_req = *ifaces;
++ if (ioctl(sock, SIOCGIFCONF, &param))
++ goto err;
++ if (param.ifc_len < ifaces_size)
++ break;
++ free(*ifaces);
++ ifaces_size *= 2;
++ ifaces = malloc(ifaces_size);
++ }
++ *count = param.ifc_len / sizeof(struct ifreq);
++ close(sock);
++ return 1;
++ err:
++ close(sock);
++ return 0;
++}
++
++
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -189,6 +263,8 @@
+ warnx("using %s", nids_params.filename);
+ }
+ }
++
++ all_local_ipaddrs_chksum_disable();
+
+ nids_run();
+
diff --git a/network/dsniff/patches/16_TDS_decoder.patch b/network/dsniff/patches/16_TDS_decoder.patch
new file mode 100644
index 0000000000..a748243f6c
--- /dev/null
+++ b/network/dsniff/patches/16_TDS_decoder.patch
@@ -0,0 +1,20 @@
+Author: Luciano Bello <luciano@debian.org>
+Description: Fix for DOS y TDS decoder. Patch provided by Hilko Bengen.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=609988
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/decode_tds.c
++++ b/decode_tds.c
+@@ -144,6 +144,11 @@
+ len > sizeof(*th) && len >= ntohs(th->size);
+ buf += ntohs(th->size), len -= ntohs(th->size)) {
+
++ if (th->size != 8) {
++ /* wrong header length */
++ break;
++ }
++
+ if (th->type == 2) {
+ /* Version 4.x, 5.0 */
+ if (len < sizeof(*th) + sizeof(*tl))
diff --git a/network/dsniff/patches/17_checksum.patch b/network/dsniff/patches/17_checksum.patch
new file mode 100644
index 0000000000..96eb3cc80f
--- /dev/null
+++ b/network/dsniff/patches/17_checksum.patch
@@ -0,0 +1,29 @@
+Author: Piotr Engelking <inkerman42@gmail.com>
+Description: Disable the filtering packets with incorrect checksum.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=372536
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -245,6 +245,7 @@
+ extern char *optarg;
+ extern int optind;
+ int c;
++ struct nids_chksum_ctl chksum_ctl;
+
+ while ((c = getopt(argc, argv, "i:p:nvh?V")) != -1) {
+ switch (c) {
+@@ -305,6 +306,12 @@
+ }
+ }
+
++ chksum_ctl.netaddr = 0;
++ chksum_ctl.mask = 0;
++ chksum_ctl.action = NIDS_DONT_CHKSUM;
++
++ nids_register_chksum_ctl(&chksum_ctl, 1);
++
+ nids_run();
+
+ /* NOTREACHED */
diff --git a/network/dsniff/patches/18_sshcrypto.patch b/network/dsniff/patches/18_sshcrypto.patch
new file mode 100644
index 0000000000..252ffa6e67
--- /dev/null
+++ b/network/dsniff/patches/18_sshcrypto.patch
@@ -0,0 +1,17 @@
+Author: Steve Kemp <skx@debian.org>
+Description: Missing openssl includes in sshcrypto.c.
+This patch was through diff.gz and now is implemented as a dpatch.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/sshcrypto.c
++++ b/sshcrypto.c
+@@ -14,6 +14,8 @@
+
+ #include <sys/types.h>
+ #include <openssl/ssl.h>
++#include <openssl/blowfish.h>
++#include <openssl/des.h>
+
+ #include <err.h>
+ #include <stdio.h>
diff --git a/network/dsniff/patches/19_rewrite-and-modernize-POP-decoder.patch b/network/dsniff/patches/19_rewrite-and-modernize-POP-decoder.patch
new file mode 100644
index 0000000000..790931521f
--- /dev/null
+++ b/network/dsniff/patches/19_rewrite-and-modernize-POP-decoder.patch
@@ -0,0 +1,132 @@
+>From b05e27ba9b0ba9ef00ad2183933652e08d8c89af Mon Sep 17 00:00:00 2001
+From: Stefan Tomanek <stefan@pico.ruhr.de>
+Date: Sat, 29 Oct 2011 20:48:55 +0200
+Subject: [PATCH] rewrite and modernize POP decoder
+
+
+Signed-off-by: Stefan Tomanek <stefan@pico.ruhr.de>
+---
+ decode_pop.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++-----------
+ 1 files changed, 77 insertions(+), 19 deletions(-)
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/decode_pop.c
++++ b/decode_pop.c
+@@ -6,6 +6,8 @@
+ * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
+ *
+ * $Id: decode_pop.c,v 1.4 2001/03/15 08:33:02 dugsong Exp $
++ *
++ * Rewritten by Stefan Tomanek 2011 <stefan@pico.ruhr.de>
+ */
+
+ #include "config.h"
+@@ -45,32 +47,88 @@
+ decode_pop(u_char *buf, int len, u_char *obuf, int olen)
+ {
+ char *p;
++ char *s;
++ int n;
+ int i, j;
++ char *user;
++ char *password;
++ enum {
++ NONE,
++ AUTHPLAIN,
++ AUTHLOGIN,
++ USERPASS
++ } mode = NONE;
++
+
+ obuf[0] = '\0';
+
+ for (p = strtok(buf, "\r\n"); p != NULL; p = strtok(NULL, "\r\n")) {
+- if (strncasecmp(p, "AUTH PLAIN", 10) == 0 ||
+- strncasecmp(p, "AUTH LOGIN", 10) == 0) {
+- strlcat(obuf, p, olen);
+- strlcat(obuf, "\n", olen);
+-
+- /* Decode SASL auth. */
+- for (i = 0; i < 2 && (p = strtok(NULL, "\r\n")); i++) {
+- strlcat(obuf, p, olen);
+- j = base64_pton(p, p, strlen(p));
+- p[j] = '\0';
+- strlcat(obuf, " [", olen);
+- strlcat(obuf, p, olen);
+- strlcat(obuf, "]\n", olen);
++ if (mode == NONE) {
++ user = NULL;
++ password = NULL;
++ if (strncasecmp(p, "AUTH PLAIN", 10) == 0) {
++ mode = AUTHPLAIN;
++ continue;
++ }
++ if (strncasecmp(p, "AUTH LOGIN", 10) == 0) {
++ mode = AUTHLOGIN;
++ continue;
++ }
++ if (strncasecmp(p, "USER ", 5) == 0) {
++ mode = USERPASS;
++ /* the traditional login cuts right to the case,
++ * so no continue here
++ */
+ }
+ }
+- /* Save regular POP2, POP3 auth info. */
+- else if (strncasecmp(p, "USER ", 5) == 0 ||
+- strncasecmp(p, "PASS ", 5) == 0 ||
+- strncasecmp(p, "HELO ", 5) == 0) {
+- strlcat(obuf, p, olen);
+- strlcat(obuf, "\n", olen);
++ printf("(%d) %s\n", mode, p);
++ if (mode == USERPASS) {
++ if (strncasecmp(p, "USER ", 5) == 0) {
++ user = &p[5];
++ } else if (strncasecmp(p, "PASS ", 5) == 0) {
++ password = &p[5];
++ }
++ }
++
++ if (mode == AUTHPLAIN) {
++ j = base64_pton(p, p, strlen(p));
++ p[j] = '\0';
++ n = 0;
++ s = p;
++ /* p consists of three parts, divided by \0 */
++ while (s <= &p[j] && n<=3) {
++ if (n == 0) {
++ /* we do not process this portion yet */
++ } else if (n == 1) {
++ user = s;
++ } else if (n == 2) {
++ password = s;
++ }
++ n++;
++ while (*s) s++;
++ s++;
++ }
++ }
++
++ if (mode == AUTHLOGIN) {
++ j = base64_pton(p, p, strlen(p));
++ p[j] = '\0';
++ if (! user) {
++ user = p;
++ } else {
++ password = p;
++ /* got everything we need :-) */
++ }
++ }
++
++ if (user && password) {
++ strlcat(obuf, "\nusername [", olen);
++ strlcat(obuf, user, olen);
++ strlcat(obuf, "] password [", olen);
++ strlcat(obuf, password, olen);
++ strlcat(obuf, "]\n", olen);
++
++ mode = NONE;
+ }
+ }
+ return (strlen(obuf));
diff --git a/network/dsniff/patches/20_debian_dirs.patch b/network/dsniff/patches/20_debian_dirs.patch
new file mode 100644
index 0000000000..a99a3ff57d
--- /dev/null
+++ b/network/dsniff/patches/20_debian_dirs.patch
@@ -0,0 +1,62 @@
+Author: Steve Kemp <skx@debian.org>
+Description: Adapt to Debian directory structure.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,7 +11,7 @@
+ install_prefix =
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-libdir = @libdir@
++libdir = $(prefix)/share/dsniff
+ sbindir = @sbindir@
+ mandir = @mandir@
+
+@@ -37,8 +37,7 @@
+ X11INC = @X_CFLAGS@
+ X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
+
+-INCS = -I. $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \
+- -I$(srcdir)/missing
++INCS = -I. $(X11INC) -I$(srcdir)/missing
+ LIBS = @LIBS@ -L$(srcdir) -lmissing
+
+ INSTALL = @INSTALL@
+--- a/dnsspoof.8
++++ b/dnsspoof.8
+@@ -31,7 +31,7 @@
+ address queries on the LAN with an answer of the local machine's IP
+ address.
+ .SH FILES
+-.IP \fI/usr/local/lib/dnsspoof.hosts\fR
++.IP \fI/usr/share/dsniff/dnsspoof.hosts\fR
+ Sample hosts file.
+ .SH "SEE ALSO"
+ dsniff(8), hosts(5)
+--- a/dsniff.8
++++ b/dsniff.8
+@@ -68,9 +68,9 @@
+ On a hangup signal \fBdsniff\fR will dump its current trigger table to
+ \fIdsniff.services\fR.
+ .SH FILES
+-.IP \fI/usr/local/lib/dsniff.services\fR
++.IP \fI/usr/share/dsniff/dsniff.services\fR
+ Default trigger table
+-.IP \fI/usr/local/lib/dsniff.magic\fR
++.IP \fI/usr/share/dsniff/dsniff.magic\fR
+ Network protocol magic
+ .SH "SEE ALSO"
+ arpspoof(8), libnids(3), services(5), magic(5)
+--- a/pathnames.h
++++ b/pathnames.h
+@@ -12,7 +12,7 @@
+ #define PATHNAMES_H
+
+ #ifndef DSNIFF_LIBDIR
+-#define DSNIFF_LIBDIR "/usr/local/lib/"
++#define DSNIFF_LIBDIR "/usr/share/dsniff/"
+ #endif
+
+ #define DSNIFF_SERVICES "dsniff.services"
diff --git a/network/dsniff/patches/21_msgsnarf_segfault.patch b/network/dsniff/patches/21_msgsnarf_segfault.patch
new file mode 100644
index 0000000000..e60fe847e4
--- /dev/null
+++ b/network/dsniff/patches/21_msgsnarf_segfault.patch
@@ -0,0 +1,15 @@
+Author: <bdefreese@debian2.bddebian.com>
+Description: Correctly 0 out the c struct.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/msgsnarf.c
++++ b/msgsnarf.c
+@@ -584,6 +584,7 @@
+ if (i == 0) {
+ if ((c = malloc(sizeof(*c))) == NULL)
+ nids_params.no_mem("sniff_msgs");
++ memset(c, 0, sizeof(*c));
+ c->ip = ts->addr.saddr;
+ c->nick = strdup("unknown");
+ SLIST_INSERT_HEAD(&client_list, c, next);
diff --git a/network/dsniff/patches/22_handlepp.patch b/network/dsniff/patches/22_handlepp.patch
new file mode 100644
index 0000000000..da0a49dbeb
--- /dev/null
+++ b/network/dsniff/patches/22_handlepp.patch
@@ -0,0 +1,17 @@
+Author: Joerg Dorchain <joerg@dorchain.net>
+Description: Add tcpkill support for handle ppp interfaces.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/pcaputil.c
++++ b/pcaputil.c
+@@ -52,6 +52,9 @@
+ case DLT_NULL:
+ offset = 4;
+ break;
++ case DLT_LINUX_SLL: /* e.g. ppp */
++ offset = 16;
++ break;
+ default:
+ warnx("unsupported datalink type");
+ break;
diff --git a/network/dsniff/patches/23_urlsnarf_timestamp.patch b/network/dsniff/patches/23_urlsnarf_timestamp.patch
new file mode 100644
index 0000000000..36a8b0f277
--- /dev/null
+++ b/network/dsniff/patches/23_urlsnarf_timestamp.patch
@@ -0,0 +1,82 @@
+Author: Hilko Bengen <bengen@debian.org>
+Description: urlsnarf: use timestamps from pcap file if available.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573365
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -36,6 +36,7 @@
+ u_short Opt_dns = 1;
+ int Opt_invert = 0;
+ regex_t *pregex = NULL;
++time_t tt = 0;
+
+ static void
+ usage(void)
+@@ -57,9 +58,12 @@
+ {
+ static char tstr[32], sign;
+ struct tm *t, gmt;
+- time_t tt = time(NULL);
+ int days, hours, tz, len;
+
++ if (!nids_params.filename) {
++ tt = time(NULL);
++ }
++
+ gmt = *gmtime(&tt);
+ t = localtime(&tt);
+
+@@ -312,9 +316,48 @@
+
+ nids_register_chksum_ctl(&chksum_ctl, 1);
+
+- nids_run();
+-
+- /* NOTREACHED */
++ pcap_t *p;
++ char pcap_errbuf[PCAP_ERRBUF_SIZE];
++ if (nids_params.filename == NULL) {
++ /* adapted from libnids.c:open_live() */
++ if (strcmp(nids_params.device, "all") == 0)
++ nids_params.device = "any";
++ p = pcap_open_live(nids_params.device, 16384,
++ (nids_params.promisc != 0),
++ 0, pcap_errbuf);
++ if (!p) {
++ fprintf(stderr, "pcap_open_live(): %s\n",
++ pcap_errbuf);
++ exit(1);
++ }
++ }
++ else {
++ p = pcap_open_offline(nids_params.filename,
++ pcap_errbuf);
++ if (!p) {
++ fprintf(stderr, "pcap_open_offline(%s): %s\n",
++ nids_params.filename, pcap_errbuf);
++ }
++ }
++
++ struct pcap_pkthdr *h;
++ u_char *d;
++ int rc;
++ while ((rc = pcap_next_ex(p, &h, &d)) == 1) {
++ tt = h->ts.tv_sec;
++ nids_pcap_handler(NULL, h, d);
++ }
++ switch (rc) {
++ case(-2): /* end of pcap file */
++ case(0): /* timeout on live capture */
++ break;
++ case(-1):
++ default:
++ fprintf(stderr, "rc = %i\n", rc);
++ pcap_perror(p, "pcap_read_ex()");
++ exit(1);
++ break;
++ }
+
+ exit(0);
+ }
diff --git a/network/dsniff/patches/24_Fix-OpenSSL1.1.0-Build.patch b/network/dsniff/patches/24_Fix-OpenSSL1.1.0-Build.patch
new file mode 100644
index 0000000000..db7739ee34
--- /dev/null
+++ b/network/dsniff/patches/24_Fix-OpenSSL1.1.0-Build.patch
@@ -0,0 +1,202 @@
+Description: Fix build with OpenSSL 1.1.0
+Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+
+--- a/ssh.c
++++ b/ssh.c
+@@ -234,7 +234,10 @@
+ u_char *p, cipher, cookie[8], msg[1024];
+ u_int32_t num;
+ int i;
+-
++
++ const BIGNUM *servkey_e, *servkey_n;
++ const BIGNUM *hostkey_e, *hostkey_n;
++
+ /* Generate anti-spoofing cookie. */
+ RAND_bytes(cookie, sizeof(cookie));
+
+@@ -243,11 +246,13 @@
+ *p++ = SSH_SMSG_PUBLIC_KEY; /* type */
+ memcpy(p, cookie, 8); p += 8; /* cookie */
+ num = 768; PUTLONG(num, p); /* servkey bits */
+- put_bn(ssh->ctx->servkey->e, &p); /* servkey exponent */
+- put_bn(ssh->ctx->servkey->n, &p); /* servkey modulus */
++ RSA_get0_key(ssh->ctx->servkey, &servkey_n, &servkey_e, NULL);
++ put_bn(servkey_e, &p); /* servkey exponent */
++ put_bn(servkey_n, &p); /* servkey modulus */
+ num = 1024; PUTLONG(num, p); /* hostkey bits */
+- put_bn(ssh->ctx->hostkey->e, &p); /* hostkey exponent */
+- put_bn(ssh->ctx->hostkey->n, &p); /* hostkey modulus */
++ RSA_get0_key(ssh->ctx->hostkey, &hostkey_n, &hostkey_e, NULL);
++ put_bn(hostkey_e, &p); /* hostkey exponent */
++ put_bn(hostkey_n, &p); /* hostkey modulus */
+ num = 0; PUTLONG(num, p); /* protocol flags */
+ num = ssh->ctx->encmask; PUTLONG(num, p); /* ciphers */
+ num = ssh->ctx->authmask; PUTLONG(num, p); /* authmask */
+@@ -298,7 +303,7 @@
+ SKIP(p, i, 4);
+
+ /* Decrypt session key. */
+- if (BN_cmp(ssh->ctx->servkey->n, ssh->ctx->hostkey->n) > 0) {
++ if (BN_cmp(servkey_n, hostkey_n) > 0) {
+ rsa_private_decrypt(enckey, enckey, ssh->ctx->servkey);
+ rsa_private_decrypt(enckey, enckey, ssh->ctx->hostkey);
+ }
+@@ -318,8 +323,8 @@
+ BN_clear_free(enckey);
+
+ /* Derive real session key using session id. */
+- if ((p = ssh_session_id(cookie, ssh->ctx->hostkey->n,
+- ssh->ctx->servkey->n)) == NULL) {
++ if ((p = ssh_session_id(cookie, hostkey_n,
++ servkey_n)) == NULL) {
+ warn("ssh_session_id");
+ return (-1);
+ }
+@@ -328,10 +333,8 @@
+ }
+ /* Set cipher. */
+ if (cipher == SSH_CIPHER_3DES) {
+- ssh->estate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+- ssh->dstate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+- ssh->encrypt = des3_encrypt;
+- ssh->decrypt = des3_decrypt;
++ warnx("cipher 3des no longer supported");
++ return (-1);
+ }
+ else if (cipher == SSH_CIPHER_BLOWFISH) {
+ ssh->estate = blowfish_init(ssh->sesskey,sizeof(ssh->sesskey));
+@@ -357,7 +360,10 @@
+ u_char *p, cipher, cookie[8], msg[1024];
+ u_int32_t num;
+ int i;
+-
++
++ BIGNUM *servkey_n, *servkey_e;
++ BIGNUM *hostkey_n, *hostkey_e;
++
+ /* Get public key. */
+ if ((i = SSH_recv(ssh, pkt, sizeof(pkt))) <= 0) {
+ warn("SSH_recv");
+@@ -379,21 +385,23 @@
+
+ /* Get servkey. */
+ ssh->ctx->servkey = RSA_new();
+- ssh->ctx->servkey->n = BN_new();
+- ssh->ctx->servkey->e = BN_new();
++ servkey_n = BN_new();
++ servkey_e = BN_new();
++ RSA_set0_key(ssh->ctx->servkey, servkey_n, servkey_e, NULL);
+
+ SKIP(p, i, 4);
+- get_bn(ssh->ctx->servkey->e, &p, &i);
+- get_bn(ssh->ctx->servkey->n, &p, &i);
++ get_bn(servkey_e, &p, &i);
++ get_bn(servkey_n, &p, &i);
+
+ /* Get hostkey. */
+ ssh->ctx->hostkey = RSA_new();
+- ssh->ctx->hostkey->n = BN_new();
+- ssh->ctx->hostkey->e = BN_new();
++ hostkey_n = BN_new();
++ hostkey_e = BN_new();
++ RSA_set0_key(ssh->ctx->hostkey, hostkey_n, hostkey_e, NULL);
+
+ SKIP(p, i, 4);
+- get_bn(ssh->ctx->hostkey->e, &p, &i);
+- get_bn(ssh->ctx->hostkey->n, &p, &i);
++ get_bn(hostkey_e, &p, &i);
++ get_bn(hostkey_n, &p, &i);
+
+ /* Get cipher, auth masks. */
+ SKIP(p, i, 4);
+@@ -405,8 +413,8 @@
+ RAND_bytes(ssh->sesskey, sizeof(ssh->sesskey));
+
+ /* Obfuscate with session id. */
+- if ((p = ssh_session_id(cookie, ssh->ctx->hostkey->n,
+- ssh->ctx->servkey->n)) == NULL) {
++ if ((p = ssh_session_id(cookie, hostkey_n,
++ servkey_n)) == NULL) {
+ warn("ssh_session_id");
+ return (-1);
+ }
+@@ -422,7 +430,7 @@
+ else BN_add_word(bn, ssh->sesskey[i]);
+ }
+ /* Encrypt session key. */
+- if (BN_cmp(ssh->ctx->servkey->n, ssh->ctx->hostkey->n) < 0) {
++ if (BN_cmp(servkey_n, hostkey_n) < 0) {
+ rsa_public_encrypt(bn, bn, ssh->ctx->servkey);
+ rsa_public_encrypt(bn, bn, ssh->ctx->hostkey);
+ }
+@@ -470,10 +478,8 @@
+ ssh->decrypt = blowfish_decrypt;
+ }
+ else if (cipher == SSH_CIPHER_3DES) {
+- ssh->estate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+- ssh->dstate = des3_init(ssh->sesskey, sizeof(ssh->sesskey));
+- ssh->encrypt = des3_encrypt;
+- ssh->decrypt = des3_decrypt;
++ warnx("cipher 3des no longer supported");
++ return (-1);
+ }
+ /* Get server response. */
+ if ((i = SSH_recv(ssh, pkt, sizeof(pkt))) <= 0) {
+--- a/sshcrypto.c
++++ b/sshcrypto.c
+@@ -28,10 +28,12 @@
+ u_char iv[8];
+ };
+
++#if 0
+ struct des3_state {
+ des_key_schedule k1, k2, k3;
+ des_cblock iv1, iv2, iv3;
+ };
++#endif
+
+ void
+ rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key)
+@@ -39,10 +41,12 @@
+ u_char *inbuf, *outbuf;
+ int len, ilen, olen;
+
+- if (BN_num_bits(key->e) < 2 || !BN_is_odd(key->e))
++ const BIGNUM *n, *e;
++ RSA_get0_key(key, &n, &e, NULL);
++ if (BN_num_bits(e) < 2 || !BN_is_odd(e))
+ errx(1, "rsa_public_encrypt() exponent too small or not odd");
+
+- olen = BN_num_bytes(key->n);
++ olen = BN_num_bytes(n);
+ outbuf = malloc(olen);
+
+ ilen = BN_num_bytes(in);
+@@ -71,7 +75,9 @@
+ u_char *inbuf, *outbuf;
+ int len, ilen, olen;
+
+- olen = BN_num_bytes(key->n);
++ const BIGNUM *n;
++ RSA_get0_key(key, &n, NULL, NULL);
++ olen = BN_num_bytes(n);
+ outbuf = malloc(olen);
+
+ ilen = BN_num_bytes(in);
+@@ -146,6 +152,7 @@
+ swap_bytes(dst, dst, len);
+ }
+
++#if 0
+ /* XXX - SSH1's weirdo 3DES... */
+ void *
+ des3_init(u_char *sesskey, int len)
+@@ -194,3 +201,4 @@
+ des_ncbc_encrypt(dst, dst, len, dstate->k2, &dstate->iv2, DES_ENCRYPT);
+ des_ncbc_encrypt(dst, dst, len, dstate->k1, &dstate->iv1, DES_DECRYPT);
+ }
++#endif
diff --git a/network/dsniff/patches/25_fix-spelling-errors.patch b/network/dsniff/patches/25_fix-spelling-errors.patch
new file mode 100644
index 0000000000..febbf914e0
--- /dev/null
+++ b/network/dsniff/patches/25_fix-spelling-errors.patch
@@ -0,0 +1,17 @@
+Description: Fix minor spelling error in source code
+Author: Marcos Fouces <marcos.fouces@gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+
+--- a/remote.c
++++ b/remote.c
+@@ -652,7 +652,7 @@
+ if (remote_command_count > 0)
+ {
+ fprintf (stderr,
+- "%s: the `-id' option must preceed all `-remote' options.\n",
++ "%s: the `-id' option must precede all `-remote' options.\n",
+ progname);
+ usage ();
+ exit (-1);
diff --git a/network/dsniff/patches/26_arpspoof-add-r-switch-to-poison-both-directions.patch b/network/dsniff/patches/26_arpspoof-add-r-switch-to-poison-both-directions.patch
new file mode 100644
index 0000000000..9a55f25051
--- /dev/null
+++ b/network/dsniff/patches/26_arpspoof-add-r-switch-to-poison-both-directions.patch
@@ -0,0 +1,170 @@
+>From 8fbf0ac15e5fe2df427e3e028f9aa8d96788986a Mon Sep 17 00:00:00 2001
+From: Stefan Tomanek <stefan@pico.ruhr.de>
+Date: Sun, 6 Nov 2011 22:44:54 +0100
+Subject: [PATCH 1/3] arpspoof: add -r switch to poison both directions
+
+
+Signed-off-by: Stefan Tomanek <stefan@pico.ruhr.de>
+---
+ arpspoof.8 | 5 ++++-
+ arpspoof.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
+ 2 files changed, 51 insertions(+), 13 deletions(-)
+
+ ---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/arpspoof.8
++++ b/arpspoof.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBarpspoof\fR [\fB-i \fIinterface\fR] [\fB-t \fItarget\fR] \fIhost\fR
++\fBarpspoof\fR [\fB\-i \fIinterface\fR] [\fB\-t \fItarget\fR] [\fB\-r\fR] \fIhost\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -26,6 +26,9 @@
+ .IP "\fB-t \fItarget\fR"
+ Specify a particular host to ARP poison (if not specified, all hosts
+ on the LAN).
++.IP "\fB\-r\fR"
++Poison both hosts (host and target) to capture traffic in both directions.
++(only valid in conjuntion with \-t)
+ .IP \fIhost\fR
+ Specify the host you wish to intercept packets for (usually the local
+ gateway).
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -7,6 +7,8 @@
+ * Copyright (c) 1999 Dug Song <dugsong@monkey.org>
+ *
+ * $Id: arpspoof.c,v 1.5 2001/03/15 08:32:58 dugsong Exp $
++ *
++ * Improved 2011 by Stefan Tomanek <stefa@pico.ruhr.de>
+ */
+
+ #include "config.h"
+@@ -31,12 +33,13 @@
+ static struct ether_addr spoof_mac, target_mac;
+ static in_addr_t spoof_ip, target_ip;
+ static char *intf;
++static int poison_reverse;
+
+ static void
+ usage(void)
+ {
+ fprintf(stderr, "Version: " VERSION "\n"
+- "Usage: arpspoof [-i interface] [-t target] host\n");
++ "Usage: arpspoof [-i interface] [-t target] [-r] host\n");
+ exit(1);
+ }
+
+@@ -133,18 +136,30 @@
+ static void
+ cleanup(int sig)
+ {
++ int fw = arp_find(spoof_ip, &spoof_mac);
++ int bw = poison_reverse && target_ip && arp_find(target_ip, &target_mac);
+ int i;
+-
+- if (arp_find(spoof_ip, &spoof_mac)) {
+- for (i = 0; i < 3; i++) {
+- /* XXX - on BSD, requires ETHERSPOOF kernel. */
++
++ fprintf(stderr, "Cleaning up and re-arping targets...\n");
++ for (i = 0; i < 5; i++) {
++ /* XXX - on BSD, requires ETHERSPOOF kernel. */
++ if (fw) {
+ arp_send(l, ARPOP_REPLY,
+ (u_int8_t *)&spoof_mac, spoof_ip,
+ (target_ip ? (u_int8_t *)&target_mac : NULL),
+ target_ip);
++ /* we have to wait a moment before sending the next packet */
++ sleep(1);
++ }
++ if (bw) {
++ arp_send(l, ARPOP_REPLY,
++ (u_int8_t *)&target_mac, target_ip,
++ (u_int8_t *)&spoof_mac,
++ spoof_ip);
+ sleep(1);
+ }
+ }
++
+ exit(0);
+ }
+
+@@ -156,11 +171,12 @@
+ char pcap_ebuf[PCAP_ERRBUF_SIZE];
+ char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ int c;
+-
++
+ intf = NULL;
+ spoof_ip = target_ip = 0;
+-
+- while ((c = getopt(argc, argv, "i:t:h?V")) != -1) {
++ poison_reverse = 0;
++
++ while ((c = getopt(argc, argv, "ri:t:h?V")) != -1) {
+ switch (c) {
+ case 'i':
+ intf = optarg;
+@@ -169,6 +185,9 @@
+ if ((target_ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1)
+ usage();
+ break;
++ case 'r':
++ poison_reverse = 1;
++ break;
+ default:
+ usage();
+ }
+@@ -178,7 +197,12 @@
+
+ if (argc != 1)
+ usage();
+-
++
++ if (poison_reverse && !target_ip) {
++ errx(1, "Spoofing the reverse path (-r) is only available when specifying a target (-t).");
++ usage();
++ }
++
+ if ((spoof_ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ usage();
+
+@@ -191,18 +215,29 @@
+ if (target_ip != 0 && !arp_find(target_ip, &target_mac))
+ errx(1, "couldn't arp for host %s",
+ libnet_addr2name4(target_ip, LIBNET_DONT_RESOLVE));
+-
++
++ if (poison_reverse) {
++ if (!arp_find(spoof_ip, &spoof_mac)) {
++ errx(1, "couldn't arp for spoof host %s",
++ libnet_addr2name4(spoof_ip, LIBNET_DONT_RESOLVE));
++ }
++ }
++
+ signal(SIGHUP, cleanup);
+ signal(SIGINT, cleanup);
+ signal(SIGTERM, cleanup);
+-
++
+ for (;;) {
+ arp_send(l, ARPOP_REPLY, NULL, spoof_ip,
+ (target_ip ? (u_int8_t *)&target_mac : NULL),
+ target_ip);
++ if (poison_reverse) {
++ arp_send(l, ARPOP_REPLY, NULL, target_ip, (uint8_t *)&spoof_mac, spoof_ip);
++ }
++
+ sleep(2);
+ }
+ /* NOTREACHED */
+-
++
+ exit(0);
+ }
diff --git a/network/dsniff/patches/27_arpspoof-allow-use-of-of-multiple-targets.patch b/network/dsniff/patches/27_arpspoof-allow-use-of-of-multiple-targets.patch
new file mode 100644
index 0000000000..120001f7b3
--- /dev/null
+++ b/network/dsniff/patches/27_arpspoof-allow-use-of-of-multiple-targets.patch
@@ -0,0 +1,194 @@
+Description: [PATCH 2/3] arpspoof: allow use of multiple targets. Last hunk modified by João Salavisa <joao.salavisa@gmail.com>
+in order to fix a bug with "-t" option of arpspoof. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=706766 fo more information.
+Author: Stefan Tomanek <stefan@pico.ruhr.de>
+ ---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+
+--- a/arpspoof.8
++++ b/arpspoof.8
+@@ -25,7 +25,7 @@
+ Specify the interface to use.
+ .IP "\fB-t \fItarget\fR"
+ Specify a particular host to ARP poison (if not specified, all hosts
+-on the LAN).
++on the LAN). Repeat to specify multiple hosts.
+ .IP "\fB\-r\fR"
+ Poison both hosts (host and target) to capture traffic in both directions.
+ (only valid in conjuntion with \-t)
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -29,9 +29,14 @@
+
+ extern char *ether_ntoa(struct ether_addr *);
+
++struct host {
++ in_addr_t ip;
++ struct ether_addr mac;
++};
++
+ static libnet_t *l;
+-static struct ether_addr spoof_mac, target_mac;
+-static in_addr_t spoof_ip, target_ip;
++static struct host spoof = {0};
++static struct host *targets;
+ static char *intf;
+ static int poison_reverse;
+
+@@ -133,30 +138,46 @@
+ return (0);
+ }
+
++static int arp_find_all() {
++ struct host *target = targets;
++ while(target->ip) {
++ if (arp_find(target->ip, &target->mac)) {
++ return 1;
++ }
++ target++;
++ }
++
++ return 0;
++}
++
+ static void
+ cleanup(int sig)
+ {
+- int fw = arp_find(spoof_ip, &spoof_mac);
+- int bw = poison_reverse && target_ip && arp_find(target_ip, &target_mac);
++ int fw = arp_find(spoof.ip, &spoof.mac);
++ int bw = poison_reverse && targets[0].ip && arp_find_all();
+ int i;
+
+ fprintf(stderr, "Cleaning up and re-arping targets...\n");
+ for (i = 0; i < 5; i++) {
+- /* XXX - on BSD, requires ETHERSPOOF kernel. */
+- if (fw) {
+- arp_send(l, ARPOP_REPLY,
+- (u_int8_t *)&spoof_mac, spoof_ip,
+- (target_ip ? (u_int8_t *)&target_mac : NULL),
+- target_ip);
+- /* we have to wait a moment before sending the next packet */
+- sleep(1);
+- }
+- if (bw) {
+- arp_send(l, ARPOP_REPLY,
+- (u_int8_t *)&target_mac, target_ip,
+- (u_int8_t *)&spoof_mac,
+- spoof_ip);
+- sleep(1);
++ struct host *target = targets;
++ while(target->ip) {
++ /* XXX - on BSD, requires ETHERSPOOF kernel. */
++ if (fw) {
++ arp_send(l, ARPOP_REPLY,
++ (u_int8_t *)&spoof.mac, spoof.ip,
++ (target->ip ? (u_int8_t *)&target->mac : NULL),
++ target->ip);
++ /* we have to wait a moment before sending the next packet */
++ sleep(1);
++ }
++ if (bw) {
++ arp_send(l, ARPOP_REPLY,
++ (u_int8_t *)&target->mac, target->ip,
++ (u_int8_t *)&spoof.mac,
++ spoof.ip);
++ sleep(1);
++ }
++ target++;
+ }
+ }
+
+@@ -171,10 +192,15 @@
+ char pcap_ebuf[PCAP_ERRBUF_SIZE];
+ char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ int c;
++ int n_targets;
+
++ spoof.ip = 0;
+ intf = NULL;
+- spoof_ip = target_ip = 0;
+ poison_reverse = 0;
++ n_targets = 0;
++
++ /* allocate enough memory for target list */
++ targets = calloc( argc+1, sizeof(struct host) );
+
+ while ((c = getopt(argc, argv, "ri:t:h?V")) != -1) {
+ switch (c) {
+@@ -182,7 +208,7 @@
+ intf = optarg;
+ break;
+ case 't':
+- if ((target_ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1)
++ if ((targets[n_targets++].ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1)
+ usage();
+ break;
+ case 'r':
+@@ -198,12 +224,12 @@
+ if (argc != 1)
+ usage();
+
+- if (poison_reverse && !target_ip) {
++ if (poison_reverse && !n_targets) {
+ errx(1, "Spoofing the reverse path (-r) is only available when specifying a target (-t).");
+ usage();
+ }
+
+- if ((spoof_ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
++ if ((spoof.ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ usage();
+
+ if (intf == NULL && (intf = pcap_lookupdev(pcap_ebuf)) == NULL)
+@@ -211,15 +237,19 @@
+
+ if ((l = libnet_init(LIBNET_LINK, intf, libnet_ebuf)) == NULL)
+ errx(1, "%s", libnet_ebuf);
+-
+- if (target_ip != 0 && !arp_find(target_ip, &target_mac))
+- errx(1, "couldn't arp for host %s",
+- libnet_addr2name4(target_ip, LIBNET_DONT_RESOLVE));
++
++ struct host *target = targets;
++ while(target->ip) {
++ if (target->ip != 0 && !arp_find(target->ip, &target->mac))
++ errx(1, "couldn't arp for host %s",
++ libnet_addr2name4(target->ip, LIBNET_DONT_RESOLVE));
++ target++;
++ }
+
+ if (poison_reverse) {
+- if (!arp_find(spoof_ip, &spoof_mac)) {
++ if (!arp_find(spoof.ip, &spoof.mac)) {
+ errx(1, "couldn't arp for spoof host %s",
+- libnet_addr2name4(spoof_ip, LIBNET_DONT_RESOLVE));
++ libnet_addr2name4(spoof.ip, LIBNET_DONT_RESOLVE));
+ }
+ }
+
+@@ -228,12 +258,20 @@
+ signal(SIGTERM, cleanup);
+
+ for (;;) {
+- arp_send(l, ARPOP_REPLY, NULL, spoof_ip,
+- (target_ip ? (u_int8_t *)&target_mac : NULL),
+- target_ip);
+- if (poison_reverse) {
+- arp_send(l, ARPOP_REPLY, NULL, target_ip, (uint8_t *)&spoof_mac, spoof_ip);
++ if (!n_targets) {
++ arp_send(l, ARPOP_REPLY, my_ha, spoof.ip, brd_ha, 0, my_ha);
++ } else {
++ struct host *target = targets;
++ while(target->ip) {
++ arp_send(l, ARPOP_REPLY, NULL, spoof.ip,
++ (target->ip ? (u_int8_t *)&target->mac : NULL),
++ target->ip);
++ if (poison_reverse) {
++ arp_send(l, ARPOP_REPLY, NULL, target->ip, (uint8_t *)&spoof.mac, spoof.ip);
++ }
++ target++;
+ }
++ }
+
+ sleep(2);
+ }
diff --git a/network/dsniff/patches/28_arpspoof-allow-selection-of-source-hw-address.patch b/network/dsniff/patches/28_arpspoof-allow-selection-of-source-hw-address.patch
new file mode 100644
index 0000000000..95da6a1651
--- /dev/null
+++ b/network/dsniff/patches/28_arpspoof-allow-selection-of-source-hw-address.patch
@@ -0,0 +1,230 @@
+>From 21773ccf18a5fc49d35e510a8797b0a1e83858c4 Mon Sep 17 00:00:00 2001
+From: Stefan Tomanek <stefan@pico.ruhr.de>
+Date: Sun, 20 Nov 2011 21:32:53 +0100
+Subject: [PATCH 3/3] arpspoof: allow selection of source hw address
+
+In certain networks, sending with the wrong hardware source address can
+jeopardize the network connection of the host running arpspoof. This
+patch makes it possible to specify whether arpspoof should use the own
+hardware address or the one of the real host when resetting the arp
+table of the target systems; it is also possible to use both.
+
+Signed-off-by: Stefan Tomanek <stefan@pico.ruhr.de>
+---
+ arpspoof.8 | 9 +++++-
+ arpspoof.c | 90 ++++++++++++++++++++++++++++++++++++++++++-----------------
+ 2 files changed, 72 insertions(+), 27 deletions(-)
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/arpspoof.8
++++ b/arpspoof.8
+@@ -9,7 +9,7 @@
+ .na
+ .nf
+ .fi
+-\fBarpspoof\fR [\fB\-i \fIinterface\fR] [\fB\-t \fItarget\fR] [\fB\-r\fR] \fIhost\fR
++\fBarpspoof\fR [\fB\-i \fIinterface\fR] [\fB\-c \fIown|host|both\fR] [\fB\-t \fItarget\fR] [\fB\-r\fR] \fIhost\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -23,6 +23,13 @@
+ .SH OPTIONS
+ .IP "\fB-i \fIinterface\fR"
+ Specify the interface to use.
++.IP "\fB-c \fIown|host|both\fR"
++Specify which hardware address t use when restoring the arp configuration;
++while cleaning up, packets can be send with the own address as well as with
++the address of the host. Sending packets with a fake hw address can disrupt
++connectivity with certain switch/ap/bridge configurations, however it works
++more reliably than using the own address, which is the default way arpspoof
++cleans up afterwards.
+ .IP "\fB-t \fItarget\fR"
+ Specify a particular host to ARP poison (if not specified, all hosts
+ on the LAN). Repeat to specify multiple hosts.
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -40,37 +40,36 @@
+ static char *intf;
+ static int poison_reverse;
+
++static uint8_t *my_ha = NULL;
++static uint8_t *brd_ha = "\xff\xff\xff\xff\xff\xff";
++
++static int cleanup_src_own = 1;
++static int cleanup_src_host = 0;
++
+ static void
+ usage(void)
+ {
+ fprintf(stderr, "Version: " VERSION "\n"
+- "Usage: arpspoof [-i interface] [-t target] [-r] host\n");
++ "Usage: arpspoof [-i interface] [-c own|host|both] [-t target] [-r] host\n");
+ exit(1);
+ }
+
+ static int
+-arp_send(libnet_t *l, int op, u_int8_t *sha,
+- in_addr_t spa, u_int8_t *tha, in_addr_t tpa)
++arp_send(libnet_t *l, int op,
++ u_int8_t *sha, in_addr_t spa,
++ u_int8_t *tha, in_addr_t tpa,
++ u_int8_t *me)
+ {
+ int retval;
+
+- if (sha == NULL &&
+- (sha = (u_int8_t *)libnet_get_hwaddr(l)) == NULL) {
+- return (-1);
+- }
+- if (spa == 0) {
+- if ((spa = libnet_get_ipaddr4(l)) == -1)
+- return (-1);
+- }
+- if (tha == NULL)
+- tha = "\xff\xff\xff\xff\xff\xff";
+-
++ if (!me) me = sha;
++
+ libnet_autobuild_arp(op, sha, (u_int8_t *)&spa,
+ tha, (u_int8_t *)&tpa, l);
+- libnet_build_ethernet(tha, sha, ETHERTYPE_ARP, NULL, 0, l, 0);
++ libnet_build_ethernet(tha, me, ETHERTYPE_ARP, NULL, 0, l, 0);
+
+ fprintf(stderr, "%s ",
+- ether_ntoa((struct ether_addr *)sha));
++ ether_ntoa((struct ether_addr *)me));
+
+ if (op == ARPOP_REQUEST) {
+ fprintf(stderr, "%s 0806 42: arp who-has %s tell %s\n",
+@@ -129,7 +128,7 @@
+ /* XXX - force the kernel to arp. feh. */
+ arp_force(ip);
+ #else
+- arp_send(l, ARPOP_REQUEST, NULL, 0, NULL, ip);
++ arp_send(l, ARPOP_REQUEST, NULL, 0, NULL, ip, NULL);
+ #endif
+ sleep(1);
+ }
+@@ -156,17 +155,23 @@
+ int fw = arp_find(spoof.ip, &spoof.mac);
+ int bw = poison_reverse && targets[0].ip && arp_find_all();
+ int i;
++ int rounds = (cleanup_src_own*5 + cleanup_src_host*5);
+
+ fprintf(stderr, "Cleaning up and re-arping targets...\n");
+- for (i = 0; i < 5; i++) {
++ for (i = 0; i < rounds; i++) {
+ struct host *target = targets;
+ while(target->ip) {
++ uint8_t *src_ha = NULL;
++ if (cleanup_src_own && (i%2 || !cleanup_src_host)) {
++ src_ha = my_ha;
++ }
+ /* XXX - on BSD, requires ETHERSPOOF kernel. */
+ if (fw) {
+ arp_send(l, ARPOP_REPLY,
+ (u_int8_t *)&spoof.mac, spoof.ip,
+- (target->ip ? (u_int8_t *)&target->mac : NULL),
+- target->ip);
++ (target->ip ? (u_int8_t *)&target->mac : brd_ha),
++ target->ip,
++ src_ha);
+ /* we have to wait a moment before sending the next packet */
+ sleep(1);
+ }
+@@ -174,7 +179,8 @@
+ arp_send(l, ARPOP_REPLY,
+ (u_int8_t *)&target->mac, target->ip,
+ (u_int8_t *)&spoof.mac,
+- spoof.ip);
++ spoof.ip,
++ src_ha);
+ sleep(1);
+ }
+ target++;
+@@ -193,6 +199,7 @@
+ char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ int c;
+ int n_targets;
++ char *cleanup_src = NULL;
+
+ spoof.ip = 0;
+ intf = NULL;
+@@ -202,7 +209,7 @@
+ /* allocate enough memory for target list */
+ targets = calloc( argc+1, sizeof(struct host) );
+
+- while ((c = getopt(argc, argv, "ri:t:h?V")) != -1) {
++ while ((c = getopt(argc, argv, "ri:t:c:h?V")) != -1) {
+ switch (c) {
+ case 'i':
+ intf = optarg;
+@@ -214,6 +221,9 @@
+ case 'r':
+ poison_reverse = 1;
+ break;
++ case 'c':
++ cleanup_src = optarg;
++ break;
+ default:
+ usage();
+ }
+@@ -229,6 +239,29 @@
+ usage();
+ }
+
++ if (!cleanup_src || strcmp(cleanup_src, "own")==0) { /* default! */
++ /* only use our own hw address when cleaning up,
++ * not jeopardizing any bridges on the way to our
++ * target
++ */
++ cleanup_src_own = 1;
++ cleanup_src_host = 0;
++ } else if (strcmp(cleanup_src, "host")==0) {
++ /* only use the target hw address when cleaning up;
++ * this can screw up some bridges and scramble access
++ * for our own host, however it resets the arp table
++ * more reliably
++ */
++ cleanup_src_own = 0;
++ cleanup_src_host = 1;
++ } else if (strcmp(cleanup_src, "both")==0) {
++ cleanup_src_own = 1;
++ cleanup_src_host = 1;
++ } else {
++ errx(1, "Invalid parameter to -c: use 'own' (default), 'host' or 'both'.");
++ usage();
++ }
++
+ if ((spoof.ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ usage();
+
+@@ -253,6 +286,10 @@
+ }
+ }
+
++ if ((my_ha = (u_int8_t *)libnet_get_hwaddr(l)) == NULL) {
++ errx(1, "Unable to determine own mac address");
++ }
++
+ signal(SIGHUP, cleanup);
+ signal(SIGINT, cleanup);
+ signal(SIGTERM, cleanup);
+@@ -263,11 +300,12 @@
+ } else {
+ struct host *target = targets;
+ while(target->ip) {
+- arp_send(l, ARPOP_REPLY, NULL, spoof.ip,
+- (target->ip ? (u_int8_t *)&target->mac : NULL),
+- target->ip);
++ arp_send(l, ARPOP_REPLY, my_ha, spoof.ip,
++ (target->ip ? (u_int8_t *)&target->mac : brd_ha),
++ target->ip,
++ my_ha);
+ if (poison_reverse) {
+- arp_send(l, ARPOP_REPLY, NULL, target->ip, (uint8_t *)&spoof.mac, spoof.ip);
++ arp_send(l, ARPOP_REPLY, my_ha, target->ip, (uint8_t *)&spoof.mac, spoof.ip, my_ha);
+ }
+ target++;
+ }
diff --git a/network/dsniff/patches/29_libnet_name2addr4.patch b/network/dsniff/patches/29_libnet_name2addr4.patch
new file mode 100644
index 0000000000..76c8c39882
--- /dev/null
+++ b/network/dsniff/patches/29_libnet_name2addr4.patch
@@ -0,0 +1,144 @@
+Description: fixes possible segmentation faults of arpspoof, sshmitm, webmitm and
+webspy if any non-resolving hostname is passed. Issue was introduced by
+dsniff-2.4-libnet_11.patch; libnet_name_resolve() was replaced by libnet_name2addr4()
+while there must be the structure libnet_t passed additionally. And if that structure is not initialized
+using libnet_init() and the passed name can't be resolved (like "192.168.2."), it
+causes a snprintf() to NULL and thus the segmentation fault. Note that macof isn't
+affected as no resolving was involved here ever.
+Author: Robert Scheck <robert@fedoraproject.org>
+Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1009879
+Origin: http://pkgs.fedoraproject.org/cgit/rpms/dsniff.git/tree/dsniff-2.4-libnet_name2addr4.patch
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/sshmitm.c
++++ b/sshmitm.c
+@@ -45,6 +45,8 @@
+ struct sockaddr_in csin, ssin;
+ int sig_pipe[2];
+
++static libnet_t *l;
++
+ static void
+ usage(void)
+ {
+@@ -364,6 +366,7 @@
+ u_long ip;
+ u_short lport, rport;
+ int c;
++ char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+
+ lport = rport = 22;
+
+@@ -390,12 +393,15 @@
+ if (argc < 1)
+ usage();
+
+- if ((ip = libnet_name2addr4(NULL, argv[0], LIBNET_RESOLVE)) == -1)
+- usage();
+-
+ if (argc == 2 && (rport = atoi(argv[1])) == 0)
+ usage();
+
++ if ((l = libnet_init(LIBNET_LINK, NULL, libnet_ebuf)) == NULL)
++ errx(1, "%s", libnet_ebuf);
++
++ if ((ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
++ usage();
++
+ record_init(NULL);
+
+ mitm_init(lport, ip, rport);
+--- a/webmitm.c
++++ b/webmitm.c
+@@ -47,6 +47,8 @@
+ int do_ssl, sig_pipe[2];
+ in_addr_t static_host = 0;
+
++static libnet_t *l;
++
+ extern int decode_http(char *, int, char *, int);
+
+ static void
+@@ -242,7 +244,7 @@
+ word = buf_tok(&msg, "/", 1);
+ vhost = buf_strdup(word);
+ }
+- ssin.sin_addr.s_addr = libnet_name2addr4(NULL, vhost, 1);
++ ssin.sin_addr.s_addr = libnet_name2addr4(l, vhost, LIBNET_RESOLVE);
+ free(vhost);
+
+ if (ssin.sin_addr.s_addr == ntohl(INADDR_LOOPBACK) ||
+@@ -496,6 +498,7 @@
+ extern char *optarg;
+ extern int optind;
+ int c;
++ char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+
+ while ((c = getopt(argc, argv, "dh?V")) != -1) {
+ switch (c) {
+@@ -509,8 +512,11 @@
+ argc -= optind;
+ argv += optind;
+
++ if ((l = libnet_init(LIBNET_LINK, NULL, libnet_ebuf)) == NULL)
++ errx(1, "%s", libnet_ebuf);
++
+ if (argc == 1) {
+- if ((static_host = libnet_name2addr4(NULL, argv[0], 1)) == -1)
++ if ((static_host = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ usage();
+ }
+ else if (argc != 0) usage();
+--- a/webspy.c
++++ b/webspy.c
+@@ -33,6 +33,7 @@
+ extern int mozilla_remote_commands (Display *, Window, char **);
+ char *expected_mozilla_version = "4.7";
+ char *progname = "webspy";
++static libnet_t *l;
+
+ Display *dpy;
+ char cmd[2048], *cmdtab[2];
+@@ -183,6 +184,7 @@
+ extern char *optarg;
+ extern int optind;
+ int c;
++ char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+
+ while ((c = getopt(argc, argv, "i:p:h?V")) != -1) {
+ switch (c) {
+@@ -205,7 +207,10 @@
+ cmdtab[0] = cmd;
+ cmdtab[1] = NULL;
+
+- if ((host = libnet_name2addr4(NULL, argv[0], 1)) == -1)
++ if ((l = libnet_init(LIBNET_LINK, NULL, libnet_ebuf)) == NULL)
++ errx(1, "%s", libnet_ebuf);
++
++ if ((host = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ errx(1, "unknown host");
+
+ if ((dpy = XOpenDisplay(NULL)) == NULL)
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -208,6 +208,10 @@
+
+ /* allocate enough memory for target list */
+ targets = calloc( argc+1, sizeof(struct host) );
++
++ if ((l = libnet_init(LIBNET_LINK, NULL, libnet_ebuf)) == NULL)
++ errx(1, "%s", libnet_ebuf);
++
+
+ while ((c = getopt(argc, argv, "ri:t:c:h?V")) != -1) {
+ switch (c) {
+@@ -265,6 +269,8 @@
+ if ((spoof.ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ usage();
+
++ libnet_destroy(l);
++
+ if (intf == NULL && (intf = pcap_lookupdev(pcap_ebuf)) == NULL)
+ errx(1, "%s", pcap_ebuf);
+
diff --git a/network/dsniff/patches/30_pntohl_shift.patch b/network/dsniff/patches/30_pntohl_shift.patch
new file mode 100644
index 0000000000..8764d69523
--- /dev/null
+++ b/network/dsniff/patches/30_pntohl_shift.patch
@@ -0,0 +1,19 @@
+Description: Corrects the incorrect bit-shift in pntohl(), the left-shift should be 8 bits, not 18.
+Author: Matthew Boyle <mlb@decisionsoft.co.uk>
+Origin: http://pkgs.fedoraproject.org/cgit/rpms/dsniff.git/tree/dsniff-2.4-pntohl_shift.patch
+Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=714958
+Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=850496
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/decode.h
++++ b/decode.h
+@@ -35,7 +35,7 @@
+ (u_short)*((u_char *)p+0)<<8))
+
+ #define pntohl(p) ((u_int32_t)*((u_char *)p+3)<<0| \
+- (u_int32_t)*((u_char *)p+2)<<18| \
++ (u_int32_t)*((u_char *)p+2)<<8| \
+ (u_int32_t)*((u_char *)p+1)<<16| \
+ (u_int32_t)*((u_char *)p+0)<<24)
+
diff --git a/network/dsniff/patches/31_sysconf_clocks.patch b/network/dsniff/patches/31_sysconf_clocks.patch
new file mode 100644
index 0000000000..4aa22086d9
--- /dev/null
+++ b/network/dsniff/patches/31_sysconf_clocks.patch
@@ -0,0 +1,31 @@
+Description: Adds a clock fix. It was improved by Robert Scheck <robert@fedoraproject.org>
+to work with older Linux kernel versions, too.
+Author: <kees@ubuntu.com>
+Origin: http://pkgs.fedoraproject.org/cgit/rpms/dsniff.git/tree/dsniff-2.4-sysconf_clocks.patch
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/sshow.c
++++ b/sshow.c
+@@ -217,7 +217,9 @@
+ {
+ clock_t delay;
+ int payload;
+- long CLK_TCK= sysconf(_SC_CLK_TCK);
++#if defined(_SC_CLK_TCK)
++ long CLK_TCK = sysconf(_SC_CLK_TCK);
++#endif
+
+ delay = add_history(session, 0, cipher_size, plain_range);
+
+@@ -266,7 +268,9 @@
+ clock_t delay;
+ int skip;
+ range string_range;
+- long CLK_TCK= sysconf(_SC_CLK_TCK);
++#if defined(_SC_CLK_TCK)
++ long CLK_TCK = sysconf(_SC_CLK_TCK);
++#endif
+
+ delay = add_history(session, 1, cipher_size, plain_range);
+
diff --git a/network/dsniff/patches/32_rpc_segfault.patch b/network/dsniff/patches/32_rpc_segfault.patch
new file mode 100644
index 0000000000..89a8d9c5af
--- /dev/null
+++ b/network/dsniff/patches/32_rpc_segfault.patch
@@ -0,0 +1,19 @@
+Description: avoids xdrs being used without being initialised first. Without this
+patch dsniff segfaults when decoding RPC packets on x86_64.
+Author: Matthew Boyle <mlb@decisionsoft.co.uk>
+Origin: http://pkgs.fedoraproject.org/cgit/rpms/dsniff.git/tree/dsniff-2.4-rpc_segfault.patch
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/rpc.c
++++ b/rpc.c
+@@ -125,6 +125,9 @@
+ return (0);
+ }
+ }
++ else
++ return (0);
++
+ stat = xdr_getpos(&xdrs);
+ xdr_destroy(&xdrs);
+
diff --git a/network/dsniff/patches/33_sshcrypto_DES.patch b/network/dsniff/patches/33_sshcrypto_DES.patch
new file mode 100644
index 0000000000..02ff90bf09
--- /dev/null
+++ b/network/dsniff/patches/33_sshcrypto_DES.patch
@@ -0,0 +1,65 @@
+Description: improves 18_sshcrypto.patch
+ - Replace all des_ methods and structs with DES_ equivalents.
+ - Remove openssl/des_old.h include.
+ - Register dependencies on OpenSSL, glib20 and gettext.
+Author: jca
+Origin: OpenBSD
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/sshcrypto.c
++++ b/sshcrypto.c
+@@ -30,8 +30,8 @@
+
+ #if 0
+ struct des3_state {
+- des_key_schedule k1, k2, k3;
+- des_cblock iv1, iv2, iv3;
++ DES_key_schedule k1, k2, k3;
++ DES_cblock iv1, iv2, iv3;
+ };
+ #endif
+
+@@ -162,13 +162,13 @@
+ if ((state = malloc(sizeof(*state))) == NULL)
+ err(1, "malloc");
+
+- des_set_key((void *)sesskey, state->k1);
+- des_set_key((void *)(sesskey + 8), state->k2);
++ DES_set_key((void *)sesskey, &state->k1);
++ DES_set_key((void *)(sesskey + 8), &state->k2);
+
+ if (len <= 16)
+- des_set_key((void *)sesskey, state->k3);
++ DES_set_key((void *)sesskey, &state->k3);
+ else
+- des_set_key((void *)(sesskey + 16), state->k3);
++ DES_set_key((void *)(sesskey + 16), &state->k3);
+
+ memset(state->iv1, 0, 8);
+ memset(state->iv2, 0, 8);
+@@ -184,9 +184,9 @@
+ estate = (struct des3_state *)state;
+ memcpy(estate->iv1, estate->iv2, 8);
+
+- des_ncbc_encrypt(src, dst, len, estate->k1, &estate->iv1, DES_ENCRYPT);
+- des_ncbc_encrypt(dst, dst, len, estate->k2, &estate->iv2, DES_DECRYPT);
+- des_ncbc_encrypt(dst, dst, len, estate->k3, &estate->iv3, DES_ENCRYPT);
++ DES_ncbc_encrypt(src, dst, len, &estate->k1, &estate->iv1, DES_ENCRYPT);
++ DES_ncbc_encrypt(dst, dst, len, &estate->k2, &estate->iv2, DES_DECRYPT);
++ DES_ncbc_encrypt(dst, dst, len, &estate->k3, &estate->iv3, DES_ENCRYPT);
+ }
+
+ void
+@@ -197,8 +197,8 @@
+ dstate = (struct des3_state *)state;
+ memcpy(dstate->iv1, dstate->iv2, 8);
+
+- des_ncbc_encrypt(src, dst, len, dstate->k3, &dstate->iv3, DES_DECRYPT);
+- des_ncbc_encrypt(dst, dst, len, dstate->k2, &dstate->iv2, DES_ENCRYPT);
+- des_ncbc_encrypt(dst, dst, len, dstate->k1, &dstate->iv1, DES_DECRYPT);
++ DES_ncbc_encrypt(src, dst, len, &dstate->k3, &dstate->iv3, DES_DECRYPT);
++ 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/patches/34_fix-parallel-FTBFS.patch b/network/dsniff/patches/34_fix-parallel-FTBFS.patch
new file mode 100644
index 0000000000..00fbb96c13
--- /dev/null
+++ b/network/dsniff/patches/34_fix-parallel-FTBFS.patch
@@ -0,0 +1,109 @@
+Description: Fix parallel FTBFS problems
+ * Add libmissing.a as a dependency to each of the PROGS to ensure it is
+ built before them.
+ * Ensure mount.h is created before decode_mountd.o gets built.
+ * Ensure nfs_prot.h is created before filesnarf.o gets built.
+Author: Lukas Schwaighofer <lukas@schwaighofer.name>
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/860611
+Bug-Debian: https://bugs.debian.org/869086
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -75,16 +75,28 @@
+ .c.o:
+ $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c
+
+-all: libmissing.a $(PROGS)
++all: $(PROGS)
+
+-mount.c: mount.x
++mount.h: mount.x
+ rpcgen -h mount.x -o mount.h
++
++mount.c: mount.x
+ rpcgen -c mount.x -o mount.c
+
+-nfs_prot.c: nfs_prot.x
++mount.o: mount.h
++
++decode_mountd.o: mount.h
++
++nfs_prot.h: nfs_prot.x
+ rpcgen -h nfs_prot.x -o nfs_prot.h
++
++nfs_prot.c: nfs_prot.x
+ rpcgen -c nfs_prot.x -o nfs_prot.c
+
++nfs_prot.o: nfs_prot.h
++
++filesnarf.o: nfs_prot.h
++
+ $(LIBOBJS):
+ $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/missing/$*.c
+
+@@ -92,49 +104,49 @@
+ ar -cr $@ $(LIBOBJS)
+ $(RANLIB) $@
+
+-dsniff: $(HDRS) $(SRCS) $(OBJS)
++dsniff: $(HDRS) $(SRCS) $(OBJS) libmissing.a
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
+
+-arpspoof: arpspoof.o arp.o
++arpspoof: arpspoof.o arp.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+
+-dnsspoof: dnsspoof.o pcaputil.o
++dnsspoof: dnsspoof.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+
+-filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o
++filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+
+-macof: macof.o
++macof: macof.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ macof.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+
+-mailsnarf: mailsnarf.o buf.o pcaputil.o
++mailsnarf: mailsnarf.o buf.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ mailsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+
+-msgsnarf: msgsnarf.o buf.o pcaputil.o
++msgsnarf: msgsnarf.o buf.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+
+-sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o
++sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
+
+-sshow: sshow.o pcaputil.o
++sshow: sshow.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ sshow.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+
+-tcpkill: tcpkill.o pcaputil.o
++tcpkill: tcpkill.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ tcpkill.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+
+-tcpnice: tcpnice.o pcaputil.o
++tcpnice: tcpnice.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ tcpnice.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+
+-tcphijack: tcphijack.o pcaputil.o
++tcphijack: tcphijack.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ tcphijack.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+
+-urlsnarf: urlsnarf.o base64.o buf.o pcaputil.o
++urlsnarf: urlsnarf.o base64.o buf.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+
+-webmitm: webmitm.o base64.o buf.o decode_http.o record.o
++webmitm: webmitm.o base64.o buf.o decode_http.o record.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
+
+-webspy: webspy.o base64.o buf.o remote.o
++webspy: webspy.o base64.o buf.o remote.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
+
+ install:
diff --git a/network/dsniff/patches/35_Add_CPPFLAGS.patch b/network/dsniff/patches/35_Add_CPPFLAGS.patch
new file mode 100644
index 0000000000..3ea8eb94d7
--- /dev/null
+++ b/network/dsniff/patches/35_Add_CPPFLAGS.patch
@@ -0,0 +1,50 @@
+Description: import CPPFLAGS in order to build an ELF binary that uses fortified libc functions. Now it is built with all default Debian compiler flags.
+Author: Marcos Fouces <marcos.fouces@gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,12 +11,13 @@
+ install_prefix =
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-libdir = $(prefix)/share/dsniff
++libdir = @libdir@
+ sbindir = @sbindir@
+ mandir = @mandir@
+
+ CC = @CC@
+ CFLAGS = @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\"
++CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+
+ PCAPINC = @PCAPINC@
+@@ -37,7 +38,8 @@
+ X11INC = @X_CFLAGS@
+ X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
+
+-INCS = -I. $(X11INC) -I$(srcdir)/missing
++INCS = -I. $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \
++ -I$(srcdir)/missing
+ LIBS = @LIBS@ -L$(srcdir) -lmissing
+
+ INSTALL = @INSTALL@
+@@ -73,7 +75,7 @@
+ CONFIGS = dsniff.magic dsniff.services dnsspoof.hosts
+
+ .c.o:
+- $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $(srcdir)/$*.c
+
+ all: $(PROGS)
+
+@@ -98,7 +100,7 @@
+ filesnarf.o: nfs_prot.h
+
+ $(LIBOBJS):
+- $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/missing/$*.c
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $(srcdir)/missing/$*.c
+
+ libmissing.a: $(LIBOBJS)
+ ar -cr $@ $(LIBOBJS)
diff --git a/network/dsniff/patches/36_implicit_declarations.patch b/network/dsniff/patches/36_implicit_declarations.patch
new file mode 100644
index 0000000000..159f7c2b32
--- /dev/null
+++ b/network/dsniff/patches/36_implicit_declarations.patch
@@ -0,0 +1,59 @@
+Description: fix implicit declarations compiler warning
+ * switch to C99 uint64_t, remove now unnecessary xdr_u_int64_t function
+ * include missing string.h for memset
+Author: Lukas Schwaighofer <lukas@schwaighofer.name>
+
+--- a/filesnarf.c
++++ b/filesnarf.c
+@@ -55,30 +55,6 @@
+ exit(1);
+ }
+
+-/* XXX - for nfs_prot_xdr.c */
+-bool_t
+-xdr_u_int64_t(XDR *xdrs, u_int64_t *nump)
+-{
+- int i = 1;
+- u_char *p = (u_char *)nump;
+-
+- if (*(char *)&i == 1) { /* endian haack. */
+- if (xdr_u_long(xdrs, (u_long *)(p + 4)))
+- return (xdr_u_long(xdrs, (u_long *)p));
+- }
+- else {
+- if (xdr_u_long(xdrs, (u_long *)p))
+- return (xdr_u_long(xdrs, (u_long *)(p + 4)));
+- }
+- return (FALSE);
+-}
+-
+-bool_t
+-xdr_int64_t(XDR *xdrs, int64_t *nump)
+-{
+- return (xdr_u_int64_t(xdrs, (u_int64_t *)nump));
+-}
+-
+ static void
+ fh_map_init(void)
+ {
+--- a/nfs_prot.x
++++ b/nfs_prot.x
+@@ -190,7 +190,7 @@
+ /*
+ * Basic data types
+ */
+-typedef u_int64_t uint64;
++typedef uint64_t uint64;
+ typedef int64_t int64;
+ typedef unsigned int uint32;
+ typedef int int32;
+--- a/sshcrypto.c
++++ b/sshcrypto.c
+@@ -20,6 +20,7 @@
+ #include <err.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ #include "sshcrypto.h"
+
diff --git a/network/dsniff/patches/37_fix-lib-and-share-dirs.patch b/network/dsniff/patches/37_fix-lib-and-share-dirs.patch
new file mode 100644
index 0000000000..f384b7ced0
--- /dev/null
+++ b/network/dsniff/patches/37_fix-lib-and-share-dirs.patch
@@ -0,0 +1,14 @@
+Description: Fix directory location for data files. They were wrongly set to lib dirs.
+Author: Hank Leininger <hlein@korelogic.com>
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,7 +11,7 @@
+ install_prefix =
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-libdir = @libdir@
++libdir = $(prefix)/share/dsniff
+ sbindir = @sbindir@
+ mandir = @mandir@
+
diff --git a/network/dsniff/patches/38_fix-pcap_init.patch b/network/dsniff/patches/38_fix-pcap_init.patch
new file mode 100644
index 0000000000..5a91c2b40a
--- /dev/null
+++ b/network/dsniff/patches/38_fix-pcap_init.patch
@@ -0,0 +1,63 @@
+Description: Resolve naming collision due to libpcap API changes
+ dsniff was written with a function named pcap_init() that predates
+ the one in libpcap and is entirely different. This patch renames it
+ out of the way.
+Author: Dennis Filder <d.filder@web.de>
+Bug-Debian: https://bugs.debian.org/980588
+Last-Update: 2021-02-10
+---
+--- a/tcpnice.c
++++ b/tcpnice.c
+@@ -204,7 +204,7 @@
+
+ filter = copy_argv(argv);
+
+- if ((pd = pcap_init(intf, filter, 128)) == NULL)
++ if ((pd = pcap_init_dsniff(intf, filter, 128)) == NULL)
+ errx(1, "couldn't initialize sniffing");
+
+ if ((pcap_off = pcap_dloff(pd)) < 0)
+--- a/dnsspoof.c
++++ b/dnsspoof.c
+@@ -309,7 +309,7 @@
+ else snprintf(buf, sizeof(buf), "udp dst port 53 and not src %s",
+ libnet_addr2name4(lnet_ip, LIBNET_DONT_RESOLVE));
+
+- if ((pcap_pd = pcap_init(dev, buf, 128)) == NULL)
++ if ((pcap_pd = pcap_init_dsniff(dev, buf, 128)) == NULL)
+ errx(1, "couldn't initialize sniffing");
+
+ if ((pcap_off = pcap_dloff(pcap_pd)) < 0)
+--- a/pcaputil.h
++++ b/pcaputil.h
+@@ -11,7 +11,7 @@
+ #ifndef PCAPUTIL_H
+ #define PCAPUTIL_H
+
+-pcap_t *pcap_init(char *intf, char *filter, int snaplen);
++pcap_t *pcap_init_dsniff(char *intf, char *filter, int snaplen);
+
+ int pcap_dloff(pcap_t *pd);
+
+--- a/tcpkill.c
++++ b/tcpkill.c
+@@ -130,7 +130,7 @@
+
+ filter = copy_argv(argv);
+
+- if ((pd = pcap_init(intf, filter, 64)) == NULL)
++ if ((pd = pcap_init_dsniff(intf, filter, 64)) == NULL)
+ errx(1, "couldn't initialize sniffing");
+
+ if ((pcap_off = pcap_dloff(pd)) < 0)
+--- a/pcaputil.c
++++ b/pcaputil.c
+@@ -63,7 +63,7 @@
+ }
+
+ pcap_t *
+-pcap_init(char *intf, char *filter, int snaplen)
++pcap_init_dsniff(char *intf, char *filter, int snaplen)
+ {
+ pcap_t *pd;
+ u_int net, mask;
diff --git a/network/dsniff/patches/39_libtirpc.patch b/network/dsniff/patches/39_libtirpc.patch
new file mode 100644
index 0000000000..9f46666826
--- /dev/null
+++ b/network/dsniff/patches/39_libtirpc.patch
@@ -0,0 +1,51 @@
+Author: Robert Scheck <robert@fedoraproject.org>
+Description: allows building against libtirpc (as a separate library) given the Sun RPC
+support in glibc has been deprecated for a long time.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -16,7 +16,7 @@
+ mandir = @mandir@
+
+ CC = @CC@
+-CFLAGS = @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\"
++CFLAGS = @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\" -I/usr/include/tirpc
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+
+@@ -107,7 +107,7 @@
+ $(RANLIB) $@
+
+ dsniff: $(HDRS) $(SRCS) $(OBJS) libmissing.a
+- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB) -ltirpc
+
+ arpspoof: arpspoof.o arp.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+@@ -116,7 +116,7 @@
+ $(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+
+ filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o libmissing.a
+- $(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
++ $(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) -ltirpc
+
+ macof: macof.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ macof.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+@@ -128,7 +128,7 @@
+ $(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+
+ sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o libmissing.a
+- $(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
++ $(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB) -ltirpc
+
+ sshow: sshow.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ sshow.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+@@ -146,7 +146,7 @@
+ $(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+
+ webmitm: webmitm.o base64.o buf.o decode_http.o record.o libmissing.a
+- $(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
++ $(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB) -ltirpc
+
+ webspy: webspy.o base64.o buf.o remote.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
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 <robert@fedoraproject.org> 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<void, BankPtr> bank_added;
++ boost::signals2::signal<void(BankPtr)> bank_added;
+
+ /** This signal is emitted when a bank has been removed from the core
+ */
+- boost::signal1<void, BankPtr> bank_removed;
++ boost::signals2::signal<void(BankPtr)> bank_removed;
+
+ /** This signal is emitted when a account has been added to one of
+ * the banks
+ */
+- boost::signal2<void, BankPtr, AccountPtr> account_added;
++ boost::signals2::signal<void(BankPtr, AccountPtr)> account_added;
+
+ /** This signal is emitted when a account has been removed from one of
+ * the banks
+ */
+- boost::signal2<void, BankPtr, AccountPtr> account_removed;
++ boost::signals2::signal<void(BankPtr, AccountPtr)> account_removed;
+
+ /** This signal is emitted when a account has been updated in one of
+ * the banks
+ */
+- boost::signal2<void, BankPtr, AccountPtr> account_updated;
++ boost::signals2::signal<void(BankPtr, AccountPtr)> account_updated;
+
+ private:
+
+@@ -147,7 +147,7 @@
+ /** This signal is emitted when the AccountCore Service has been
+ * updated.
+ */
+- boost::signal0<void> updated;
++ boost::signals2::signal<void(void)> 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<void, AccountPtr> account_added;
++ boost::signals2::signal<void(AccountPtr)> account_added;
+
+ /** This signal is emitted when a account has been removed.
+ */
+- boost::signal1<void, AccountPtr> account_removed;
++ boost::signals2::signal<void(AccountPtr)> account_removed;
+
+ /** This signal is emitted when a account has been updated.
+ */
+- boost::signal1<void, AccountPtr> account_updated;
++ boost::signals2::signal<void(AccountPtr)> 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 AccountType = Account>
+ class BankImpl:
+ public Bank,
+- public boost::signals::trackable,
++ public boost::signals2::trackable,
+ protected RefLister<AccountType>
+ {
+
+--- 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<void, ContactPtr > contact_added;
++ boost::signals2::signal<void(ContactPtr)> contact_added;
+
+
+ /** This signal is emitted when a Contact has been removed from the Book.
+ */
+- boost::signal1<void, ContactPtr > contact_removed;
++ boost::signals2::signal<void(ContactPtr)> contact_removed;
+
+
+ /** This signal is emitted when a Contact has been updated in the Book.
+ */
+- boost::signal1<void, ContactPtr > contact_updated;
++ boost::signals2::signal<void(ContactPtr)> contact_updated;
+ };
+
+ typedef boost::shared_ptr<Book> 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<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
++ for (std::list<boost::signals2::connection>::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<void, SourcePtr > source_added;
++ boost::signals2::signal<void(SourcePtr)> source_added;
+
+ /** This signal is emitted when a book has been added to one of
+ * the sources
+ */
+- boost::signal2<void, SourcePtr, BookPtr > book_added;
++ boost::signals2::signal<void(SourcePtr, BookPtr )> book_added;
+
+ /** This signal is emitted when a book has been removed from one of
+ * the sources
+ */
+- boost::signal2<void, SourcePtr, BookPtr > book_removed;
++ boost::signals2::signal<void(SourcePtr, BookPtr )> book_removed;
+
+ /** This signal is emitted when a book has been updated in one of
+ * the sources
+ */
+- boost::signal2<void, SourcePtr, BookPtr > book_updated;
++ boost::signals2::signal<void(SourcePtr, BookPtr )> book_updated;
+
+ /** This signal is emitted when a contact has been added to one of
+ * the book of one of the sources
+ */
+- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_added;
++ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_added;
+
+ /** This signal is emitted when a contact has been removed from one of
+ * the book of one of the sources
+ */
+- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_removed;
++ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_removed;
+
+ /** This signal is emitted when a contact has been updated in one of
+ * the book of one of the sources
+ */
+- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_updated;
++ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_updated;
+
+ private:
+
+@@ -174,7 +174,7 @@
+ std::list<boost::shared_ptr<ContactDecorator> > contact_decorators;
+
+ /*** Misc stuff ***/
+- std::list<boost::signals::connection> conns;
++ std::list<boost::signals2::connection> 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<void, BookPtr > book_added;
++ boost::signals2::signal<void(BookPtr)> book_added;
+
+
+ /** This signal is emitted when a Book has been updated in the Source.
+ */
+- boost::signal1<void, BookPtr > book_updated;
++ boost::signals2::signal<void(BookPtr)> book_updated;
+
+
+ /** This signal is emitted when a Book has been removed in the Source.
+ */
+- boost::signal1<void, BookPtr > book_removed;
++ boost::signals2::signal<void(BookPtr)> book_removed;
+
+ /** This signal is emitted when a Contact has been added to a book in
+ * this source.
+ */
+- boost::signal2<void, BookPtr, ContactPtr > contact_added;
++ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_added;
+
+ /** This signal is emitted when a Contact has been removed from a book in
+ * this source.
+ */
+- boost::signal2<void, BookPtr, ContactPtr > contact_removed;
++ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_removed;
+
+ /** This signal is emitted when a Contact has been updated in a book in
+ * this source
+ */
+- boost::signal2<void, BookPtr, ContactPtr > contact_updated;
++ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_updated;
+ };
+
+ typedef boost::shared_ptr<Source> 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<void, AudioInputManager &> manager_added;
++ boost::signals2::signal<void(AudioInputManager &)> manager_added;
+
+
+ /*** AudioInput Device Management ***/
+@@ -254,23 +254,23 @@
+
+ /** See audioinput-manager.h for the API
+ */
+- boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputSettings&> device_opened;
+- boost::signal2<void, AudioInputManager &, AudioInputDevice &> device_closed;
+- boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes> device_error;
++ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputSettings&)> device_opened;
++ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &)> device_closed;
++ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes)> 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<void, AudioInputDevice, bool> device_added;
++ boost::signals2::signal<void(AudioInputDevice, bool)> 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<void, AudioInputDevice, bool> device_removed;
++ boost::signals2::signal<void(AudioInputDevice, bool)> 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 <vector>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #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<void, AudioInputDevice, AudioInputSettings> device_opened;
++ boost::signals2::signal<void(AudioInputDevice, AudioInputSettings)> device_opened;
+
+ /** This signal is emitted when an audio input device is closed.
+ * @param device the audio input device that was closed.
+ */
+- boost::signal1<void, AudioInputDevice> device_closed;
++ boost::signals2::signal<void(AudioInputDevice)> 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<void, AudioInputDevice, AudioInputErrorCodes> device_error;
++ boost::signals2::signal<void(AudioInputDevice, AudioInputErrorCodes)> 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<void, AudioOutputManager &> manager_added;
++ boost::signals2::signal<void(AudioOutputManager &)> 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<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&> device_opened;
+- boost::signal3<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&> device_closed;
+- boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes> device_error;
++ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&)> device_opened;
++ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&)> device_closed;
++ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes)> 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<void, AudioOutputDevice, bool> device_added;
++ boost::signals2::signal<void(AudioOutputDevice, bool)> 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<void, AudioOutputDevice, bool> device_removed;
++ boost::signals2::signal<void(AudioOutputDevice, bool)> 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 <vector>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #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<void, AudioOutputPS, AudioOutputDevice, AudioOutputSettings> device_opened;
++ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputSettings)> 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<void, AudioOutputPS, AudioOutputDevice> device_closed;
++ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice)> 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<void, AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes> device_error;
++ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes)> 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<void, DialectPtr > dialect_added;
++ boost::signals2::signal<void(DialectPtr)> dialect_added;
+
+ private:
+
+@@ -116,7 +116,7 @@
+
+ /** This signal is emitted when the ChatCore service has been updated.
+ */
+- boost::signal0<void> updated;
++ boost::signals2::signal<void(void)> 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 <string>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include <boost/smart_ptr.hpp>
+@@ -113,15 +113,15 @@
+
+ /** This signal is emitted when the Chat has been updated.
+ */
+- boost::signal0<void> updated;
++ boost::signals2::signal<void(void)> updated;
+
+ /** This signal is emitted when the user requested to see this Chat
+ */
+- boost::signal0<void> user_requested;
++ boost::signals2::signal<void(void)> user_requested;
+
+ /** This signal is emitted when the Chat has been removed.
+ */
+- boost::signal0<void> removed;
++ boost::signals2::signal<void(void)> 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<void, SimpleChatPtr> simple_chat_added;
++ boost::signals2::signal<void(SimpleChatPtr)> simple_chat_added;
+
+ /** This signal is emitted when an Ekiga::MultipleChat has been added to
+ * the dialect.
+ */
+- boost::signal1<void, MultipleChatPtr> multiple_chat_added;
++ boost::signals2::signal<void(MultipleChatPtr)> 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::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_iterator;
+- typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_const_iterator;
+- typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_iterator;
+- typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_const_iterator;
++ typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_iterator;
++ typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_const_iterator;
++ typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_iterator;
++ typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_const_iterator;
+
+ simple_iterator simple_begin ();
+ simple_iterator simple_end ();
+@@ -116,8 +116,8 @@
+
+ private:
+
+- std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > simple_chats;
+- std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > multiple_chats;
++ std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > simple_chats;
++ std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > multiple_chats;
+
+ void on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat);
+
+@@ -133,22 +133,22 @@
+ template<typename SimpleChatType, typename MultipleChatType>
+ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::~DialectImpl ()
+ {
+- for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::iterator iter = simple_chats.begin ();
++ for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::iterator iter = simple_chats.begin ();
+ iter != simple_chats.end ();
+ iter++) {
+
+- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
++ for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
+ conn_iter != iter->second.end ();
+ ++conn_iter) {
+
+ conn_iter->disconnect ();
+ }
+ }
+- for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::iterator iter = multiple_chats.begin ();
++ for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::iterator iter = multiple_chats.begin ();
+ iter != multiple_chats.end ();
+ iter++) {
+
+- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
++ for (std::list<boost::signals2::connection>::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<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::const_iterator iter = simple_chats.begin ();
++ for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::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<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::const_iterator iter = multiple_chats.begin ();
++ for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = multiple_chats.begin ();
+ go_on && iter != multiple_chats.end ();
+ iter++) {
+
+@@ -275,7 +275,7 @@
+ void
+ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat)
+ {
+- for (typename std::list<boost::signals::connection>::iterator iter = simple_chats[chat].begin ();
++ for (typename std::list<boost::signals2::connection>::iterator iter = simple_chats[chat].begin ();
+ iter != simple_chats[chat].end ();
+ ++iter) {
+
+@@ -288,7 +288,7 @@
+ void
+ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_multiple_chat_removed (boost::shared_ptr<MultipleChatType> chat)
+ {
+- for (typename std::list<boost::signals::connection>::iterator iter = multiple_chats[chat].begin ();
++ for (typename std::list<boost::signals2::connection>::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<void> cleared;
++ boost::signals2::signal<void(void)> 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<Heap>,
+ 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<void> trigger_saving;
++ boost::signals2::signal<void(void)> 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<void> trigger_saving;
++ boost::signals2::signal<void(void)> 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 <iostream>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #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 <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ /* This code uses boost signals to implement the "chain of responsibility"
+@@ -117,9 +117,8 @@
+
+ template<typename T_request>
+ struct ChainOfResponsibility:
+- public boost::signal1<bool,
+- T_request,
+- responsibility_accumulator>
++ public boost::signals2::signal<bool(T_request),
++ responsibility_accumulator>
+ {
+ };
+ };
+--- 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 <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #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 <vector>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #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<void, std::string /*key*/, GmConfEntry * /*entry*/> property_changed;
++ boost::signals2::signal<void(std::string /*key*/, GmConfEntry * /*entry*/)> 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<void> updated;
++ boost::signals2::signal<void(void)> updated;
+
+
+ /** This signal is emitted when the object has been removed.
+ */
+- boost::signal0<void> removed;
++ boost::signals2::signal<void(void)> 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 <string>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+
+--- 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 <string>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include "services.h"
+@@ -66,7 +66,7 @@
+ virtual void set_presence_info (const std::string presence,
+ const std::string status) = 0;
+
+- boost::signal0<void> updated;
++ boost::signals2::signal<void(void)> 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 <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+ #include <list>
+
+@@ -55,7 +55,7 @@
+ {
+ protected:
+
+- typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals::connection> > container_type;
++ typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals2::connection> > container_type;
+ typedef Ekiga::map_key_iterator<container_type> iterator;
+ typedef Ekiga::map_key_const_iterator<container_type> const_iterator;
+
+@@ -66,7 +66,7 @@
+ void add_object (boost::shared_ptr<ObjectType> obj);
+
+ void add_connection (boost::shared_ptr<ObjectType> obj,
+- boost::signals::connection connection);
++ boost::signals2::connection connection);
+
+ void remove_object (boost::shared_ptr<ObjectType> obj);
+
+@@ -78,9 +78,9 @@
+ const_iterator begin () const;
+ const_iterator end () const;
+
+- boost::signal1<void, boost::shared_ptr<ObjectType> > object_added;
+- boost::signal1<void, boost::shared_ptr<ObjectType> > object_removed;
+- boost::signal1<void, boost::shared_ptr<ObjectType> > object_updated;
++ boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_added;
++ boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_removed;
++ boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_updated;
+
+ private:
+ container_type objects;
+@@ -95,7 +95,7 @@
+ iter != objects.end ();
+ ++iter) {
+
+- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
++ for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
+ conn_iter != iter->second.end ();
+ ++conn_iter) {
+
+@@ -130,7 +130,7 @@
+ template<typename ObjectType>
+ void
+ Ekiga::RefLister<ObjectType>::add_connection (boost::shared_ptr<ObjectType> obj,
+- boost::signals::connection connection)
++ boost::signals2::connection connection)
+ {
+ objects[obj].push_back (connection);
+ }
+@@ -139,8 +139,8 @@
+ void
+ Ekiga::RefLister<ObjectType>::remove_object (boost::shared_ptr<ObjectType> obj)
+ {
+- std::list<boost::signals::connection> connections = objects[obj];
+- for (std::list<boost::signals::connection>::iterator iter = connections.begin ();
++ std::list<boost::signals2::connection> connections = objects[obj];
++ for (std::list<boost::signals2::connection>::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 <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #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 <list>
+ #include <string>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ namespace Ekiga
+@@ -101,7 +101,7 @@
+
+ void dump (std::ostream &stream) const;
+
+- boost::signal1<void, ServicePtr> service_added;
++ boost::signals2::signal<void(ServicePtr)> 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 <sstream>
++
+ #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<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+
+ std::string presence;
+
+@@ -502,7 +502,7 @@
+ {
+ AccountsWindow *self = ACCOUNTS_WINDOW (obj);
+
+- for (std::vector<boost::signals::connection>::iterator iter
++ for (std::vector<boost::signals2::connection>::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<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+ GtkWidget *tree_view;
+ GtkWidget *notebook;
+ GtkTreeSelection *selection;
+@@ -579,7 +579,7 @@
+ {
+ AddressBookWindow *self = ADDRESSBOOK_WINDOW (obj);
+
+- for (std::vector<boost::signals::connection>::iterator iter
++ for (std::vector<boost::signals2::connection>::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<boost::signals::connection> connections;
++ std::list<boost::signals2::connection> connections;
+ };
+
+
+@@ -447,7 +447,7 @@
+
+ view = BOOK_VIEW_GTK (obj);
+
+- for (std::list<boost::signals::connection>::iterator iter
++ for (std::list<boost::signals2::connection>::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<History::Book> book;
+ GtkListStore* store;
+ GtkTreeView* tree;
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+ };
+
+ /* this is what we put in the view */
+@@ -229,7 +229,7 @@
+
+ view = CALL_HISTORY_VIEW_GTK (obj);
+
+- for (std::vector<boost::signals::connection>::iterator iter
++ for (std::vector<boost::signals2::connection>::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<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> 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<ChatAreaHelper> 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<boost::signals::connection> connections;
++ std::list<boost::signals2::connection> connections;
+
+ GtkWidget* notebook;
+ };
+@@ -405,7 +405,7 @@
+
+ self = CHAT_WINDOW (obj);
+
+- for (std::list<boost::signals::connection>::iterator iter
++ for (std::list<boost::signals2::connection>::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<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+
+ GtkTreeStore* store;
+ GtkTreeView* view;
+@@ -454,7 +454,7 @@
+ {
+ if (self->priv->heap) {
+
+- for (std::vector<boost::signals::connection>::iterator iter
++ for (std::vector<boost::signals2::connection>::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<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> 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<Ekiga::VideoInputCore> videoinput_core = core.get<Ekiga::VideoInputCore> ("videoinput-core");
+ boost::shared_ptr<Ekiga::AudioInputCore> audioinput_core = core.get<Ekiga::AudioInputCore> ("audioinput-core");
+ boost::shared_ptr<Ekiga::AudioOutputCore> audiooutput_core = core.get<Ekiga::AudioOutputCore> ("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<Ekiga::PresenceCore> core;
+
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> connections;
+ GtkTreeStore *store;
+ GtkTreeView *tree_view;
+ GSList *folded_groups;
+@@ -1382,7 +1382,7 @@
+ {
+ if (self->priv->core) {
+
+- for (std::vector<boost::signals::connection>::iterator iter
++ for (std::vector<boost::signals2::connection>::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<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> 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<boost::signals::connection>::iterator iter = self->priv->connections.begin () ;
++ for (std::vector<boost::signals2::connection>::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 <gtk/gtk.h>
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ 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 <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include <set>
+@@ -114,24 +114,24 @@
+ /** This signal is emitted when an Ekiga::HalManager has been
+ * added to the HalCore Service.
+ */
+- boost::signal1<void, HalManager &> manager_added;
++ boost::signals2::signal<void(HalManager &)> manager_added;
+
+
+ /*** API to act on HAL events ***/
+
+ /** See hal-manager.h for the API
+ */
+- boost::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_added;
+- boost::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_removed;
++ boost::signals2::signal<void(const std::string &, const std::string &, unsigned, HalManager*)> videoinput_device_added;
++ boost::signals2::signal<void(const std::string &, const std::string &, unsigned, HalManager*)> videoinput_device_removed;
+
+- boost::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_added;
+- boost::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_removed;
++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audioinput_device_added;
++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audioinput_device_removed;
+
+- boost::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_added;
+- boost::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_removed;
++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audiooutput_device_added;
++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audiooutput_device_removed;
+
+- boost::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_up;
+- boost::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_down;
++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> network_interface_up;
++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> 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<void, std::string, std::string, unsigned> videoinput_device_added;
++ boost::signals2::signal<void(std::string, std::string, unsigned)> 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<void, std::string, std::string, unsigned> videoinput_device_removed;
++ boost::signals2::signal<void(std::string, std::string, unsigned)> 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<void, std::string, std::string> audioinput_device_added;
++ boost::signals2::signal<void(std::string, std::string)> 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<void, std::string, std::string> audioinput_device_removed;
++ boost::signals2::signal<void(std::string, std::string)> 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<void, std::string, std::string> audiooutput_device_added;
++ boost::signals2::signal<void(std::string, std::string)> 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<void, std::string, std::string> audiooutput_device_removed;
++ boost::signals2::signal<void(std::string, std::string)> 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<void, std::string, std::string> network_interface_up;
++ boost::signals2::signal<void(std::string, std::string)> 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<void, std::string, std::string> network_interface_down;
++ boost::signals2::signal<void(std::string, std::string)> 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<void> removed;
++ boost::signals2::signal<void(void)> removed;
+
+ private:
+
+@@ -109,7 +109,7 @@
+ void push_notification (boost::shared_ptr<Notification> notification)
+ { notification_added (notification); }
+
+- boost::signal1<void, boost::shared_ptr<Notification> > notification_added;
++ boost::signals2::signal<void(boost::shared_ptr<Notification>)> 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<void, HeapPtr > heap_added;
+- boost::signal1<void, HeapPtr > heap_removed;
++ boost::signals2::signal<void(HeapPtr)> heap_added;
++ boost::signals2::signal<void(HeapPtr)> heap_removed;
+
+ /** Those signals are forwarded from the given Heap
+ * @param The Heap in question.
+ */
+- boost::signal1<void, HeapPtr > heap_updated;
+- boost::signal2<void, HeapPtr , PresentityPtr > presentity_added;
+- boost::signal2<void, HeapPtr , PresentityPtr > presentity_updated;
+- boost::signal2<void, HeapPtr , PresentityPtr > presentity_removed;
++ boost::signals2::signal<void(HeapPtr)> heap_updated;
++ boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_added;
++ boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_updated;
++ boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_removed;
+ };
+
+ typedef boost::shared_ptr<Cluster> 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<void, PresentityPtr > presentity_added;
++ boost::signals2::signal<void(PresentityPtr)> presentity_added;
+
+ /** This signal is emitted when a Presentity has been updated in the Heap.
+ */
+- boost::signal1<void, PresentityPtr > presentity_updated;
++ boost::signals2::signal<void(PresentityPtr)> presentity_updated;
+
+ /** This signal is emitted when a Presentity has been removed from the Heap.
+ */
+- boost::signal1<void, PresentityPtr > presentity_removed;
++ boost::signals2::signal<void(PresentityPtr)> presentity_removed;
+ };
+
+ typedef boost::shared_ptr<Heap> 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<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
++ for (std::list<boost::signals2::connection>::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<void, std::string, std::string> presence_received;
+- boost::signal2<void, std::string, std::string> status_received;
++ boost::signals2::signal<void(std::string, std::string)> presence_received;
++ boost::signals2::signal<void(std::string, std::string)> 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<void, ClusterPtr > cluster_added;
++ boost::signals2::signal<void(ClusterPtr)> cluster_added;
+
+ /** Those signals are forwarding the heap_added, heap_updated
+ * and heap_removed from the given Cluster.
+ *
+ */
+- boost::signal2<void, ClusterPtr , HeapPtr > heap_added;
+- boost::signal2<void, ClusterPtr , HeapPtr > heap_updated;
+- boost::signal2<void, ClusterPtr , HeapPtr > heap_removed;
++ boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_added;
++ boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_updated;
++ boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_removed;
+
+ /** Those signals are forwarding the presentity_added, presentity_updated
+ * and presentity_removed from the given Heap of the given Cluster.
+ */
+- boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_added;
+- boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_updated;
+- boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_removed;
++ boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_added;
++ boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_updated;
++ boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> 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<void, std::string, std::string> presence_received;
+- boost::signal2<void, std::string, std::string> status_received;
++ boost::signals2::signal<void(std::string, std::string)> presence_received;
++ boost::signals2::signal<void(std::string, std::string)> status_received;
+
+ private:
+
+@@ -321,7 +321,7 @@
+
+ private:
+
+- std::list<boost::signals::connection> conns;
++ std::list<boost::signals2::connection> 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<boost::signals::connection>::iterator iter = manager_connections.begin ();
++ for (std::list<boost::signals2::connection>::iterator iter = manager_connections.begin ();
+ iter != manager_connections.end ();
+ ++iter)
+ iter->disconnect ();
+@@ -103,7 +103,7 @@
+
+ void CallCore::add_call (boost::shared_ptr<Call> call, boost::shared_ptr<CallManager> manager)
+ {
+- std::list<boost::signals::connection> conns;
++ std::list<boost::signals2::connection> 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> call)
+ {
+- for (std::list<boost::signals::connection>::iterator iter2 = call_connections [call->get_id ()].begin ();
++ for (std::list<boost::signals2::connection>::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 <boost/smart_ptr.hpp>
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+ #include <set>
+ #include <map>
+@@ -126,7 +126,7 @@
+ /** This signal is emitted when a Ekiga::CallManager has been
+ * added to the CallCore Service.
+ */
+- boost::signal1<void, boost::shared_ptr<CallManager> > manager_added;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>)> manager_added;
+
+
+ /*** Call Management ***/
+@@ -141,21 +141,21 @@
+
+ /** See call.h for the API
+ */
+- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > ringing_call;
+- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > setup_call;
+- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > missed_call;
+- boost::signal3<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string> cleared_call;
+- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > established_call;
+- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > held_call;
+- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > retrieved_call;
+- boost::signal5<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType, bool> stream_opened;
+- boost::signal5<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType, bool> stream_closed;
+- boost::signal4<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType> stream_paused;
+- boost::signal4<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType> stream_resumed;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> ringing_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> setup_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> missed_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string)> cleared_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> established_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> held_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> retrieved_call;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType, bool)> stream_opened;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType, bool)> stream_closed;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType)> stream_paused;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType)> stream_resumed;
+
+ /*** Misc ***/
+- boost::signal1<void, boost::shared_ptr<CallManager> > manager_ready;
+- boost::signal0<void> ready;
++ boost::signals2::signal<void(boost::shared_ptr<CallManager>)> manager_ready;
++ boost::signals2::signal<void(void)> ready;
+
+ /** This chain allows the CallCore to report errors to the user
+ */
+@@ -186,8 +186,8 @@
+
+
+ std::set<boost::shared_ptr<CallManager> > managers;
+- std::list<boost::signals::connection> manager_connections;
+- std::map<std::string, std::list<boost::signals::connection> > call_connections;
++ std::list<boost::signals2::connection> manager_connections;
++ std::map<std::string, std::list<boost::signals2::connection> > 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 <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+ #include <string>
+
+@@ -198,69 +198,69 @@
+
+ /* Signal emitted when the call is established
+ */
+- boost::signal0<void> established;
++ boost::signals2::signal<void(void)> established;
+
+ /* Signal emitted when an established call is cleared
+ * @param: a string describing why the call was cleared
+ */
+- boost::signal1<void, std::string> cleared;
++ boost::signals2::signal<void(std::string)> cleared;
+
+ /* Signal emitted when the call is missed, ie cleared
+ * without having been established
+ */
+- boost::signal0<void> missed;
++ boost::signals2::signal<void(void)> missed;
+
+ /* Signal emitted when the call is forwarded
+ */
+- boost::signal0<void> forwarded;
++ boost::signals2::signal<void(void)> forwarded;
+
+ /* Signal emitted when the call is held
+ */
+- boost::signal0<void> held;
++ boost::signals2::signal<void(void)> held;
+
+ /* Signal emitted when the call is retrieved
+ */
+- boost::signal0<void> retrieved;
++ boost::signals2::signal<void(void)> retrieved;
+
+ /* Signal emitted when the call is being setup
+ */
+- boost::signal0<void> setup;
++ boost::signals2::signal<void(void)> setup;
+
+ /* Signal emitted when the remote party is ringing
+ */
+- boost::signal0<void> ringing;
++ boost::signals2::signal<void(void)> ringing;
+
+ /* Signal emitted when a stream is opened
+ * @param the stream name
+ * @param the stream type
+ * @param transmission or reception
+ */
+- boost::signal3<void, std::string, StreamType, bool> stream_opened;
++ boost::signals2::signal<void(std::string, StreamType, bool)> stream_opened;
+
+ /* Signal emitted when a stream is closed
+ * @param the stream name
+ * @param the stream type
+ * @param transmission or reception
+ */
+- boost::signal3<void, std::string, StreamType, bool> stream_closed;
++ boost::signals2::signal<void(std::string, StreamType, bool)> stream_closed;
+
+ /* Signal emitted when a transmitted stream is paused
+ * @param the stream name
+ * @param the stream type
+ * @param transmission or reception
+ */
+- boost::signal2<void, std::string, StreamType> stream_paused;
++ boost::signals2::signal<void(std::string, StreamType)> stream_paused;
+
+ /* Signal emitted when a transmitted stream is resumed
+ * @param the stream name
+ * @param the stream type
+ * @param transmission or reception
+ */
+- boost::signal2<void, std::string, StreamType> stream_resumed;
++ boost::signals2::signal<void(std::string, StreamType)> stream_resumed;
+
+ /** This signal is emitted when the Call is removed.
+ */
+- boost::signal0<void> removed;
++ boost::signals2::signal<void(void)> 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 <set>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #include <boost/smart_ptr.hpp>
+@@ -99,7 +99,7 @@
+ /** This signal is emitted when a Ekiga::CallProtocolManager has been
+ * added to the CallManager.
+ */
+- boost::signal1<void, boost::shared_ptr<CallProtocolManager> > manager_added;
++ boost::signals2::signal<void(boost::shared_ptr<CallProtocolManager>)> manager_added;
+
+
+ /*
+@@ -213,7 +213,7 @@
+ /*
+ * MISC
+ */
+- boost::signal0<void> ready;
++ boost::signals2::signal<void(void)> ready;
+
+ private:
+ std::set<boost::shared_ptr<CallProtocolManager> > 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 <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+ #include <glib.h>
+ #include <set>
+@@ -146,7 +146,7 @@
+ /** This signal is emitted when a Ekiga::VideoInputManager has been
+ * added to the VideoInputCore Service.
+ */
+- boost::signal1<void, VideoInputManager &> manager_added;
++ boost::signals2::signal<void(VideoInputManager &)> manager_added;
+
+
+ /*** VideoInput Device Management ***/
+@@ -277,23 +277,23 @@
+
+ /** See videoinput-manager.h for the API
+ */
+- boost::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputSettings&> device_opened;
+- boost::signal2<void, VideoInputManager &, VideoInputDevice &> device_closed;
+- boost::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes> device_error;
++ boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &, VideoInputSettings&)> device_opened;
++ boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &)> device_closed;
++ boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes)> 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<void, VideoInputDevice, bool> device_added;
++ boost::signals2::signal<void(VideoInputDevice, bool)> 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<void, VideoInputDevice, bool> device_removed;
++ boost::signals2::signal<void(VideoInputDevice, bool)> 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 <vector>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #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<void, VideoInputDevice, VideoInputSettings> device_opened;
++ boost::signals2::signal<void(VideoInputDevice, VideoInputSettings)> device_opened;
+
+ /** This signal is emitted when a video input device is closed.
+ * @param device the video input device that was closed.
+ */
+- boost::signal1<void, VideoInputDevice> device_closed;
++ boost::signals2::signal<void(VideoInputDevice)> 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<void, VideoInputDevice, VideoInputErrorCodes> device_error;
++ boost::signals2::signal<void(VideoInputDevice, VideoInputErrorCodes)> 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 <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+ #include <set>
+ #include <map>
+@@ -116,7 +116,7 @@
+ /** This signal is emitted when a Ekiga::VideoOutputManager has been
+ * added to the VideoOutputCore Service.
+ */
+- boost::signal1<void, VideoOutputManager &> manager_added;
++ boost::signals2::signal<void(VideoOutputManager &)> manager_added;
+
+
+ /*** Videooutput Management ***/
+@@ -165,11 +165,11 @@
+
+ /** See videooutput-manager.h for the API
+ */
+- boost::signal6<void, VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool> device_opened;
+- boost::signal1<void, VideoOutputManager &> device_closed;
+- boost::signal2<void, VideoOutputManager &, VideoOutputErrorCodes> device_error;
+- boost::signal2<void, VideoOutputManager &, VideoOutputFSToggle> fullscreen_mode_changed;
+- boost::signal3<void, VideoOutputManager &, unsigned, unsigned> size_changed;
++ boost::signals2::signal<void(VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool)> device_opened;
++ boost::signals2::signal<void(VideoOutputManager &)> device_closed;
++ boost::signals2::signal<void(VideoOutputManager &, VideoOutputErrorCodes)> device_error;
++ boost::signals2::signal<void(VideoOutputManager &, VideoOutputFSToggle)> fullscreen_mode_changed;
++ boost::signals2::signal<void(VideoOutputManager &, unsigned, unsigned)> 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 <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ #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<void, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool> device_opened;
++ boost::signals2::signal<void(VideoOutputAccel, VideoOutputMode, unsigned, bool, bool)> device_opened;
+
+ /** This signal is emitted when a video output device is closed.
+ */
+- boost::signal0<void> device_closed;
++ boost::signals2::signal<void(void)> 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<void, VideoOutputErrorCodes> device_error;
++ boost::signals2::signal<void(VideoOutputErrorCodes)> 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<void, VideoOutputFSToggle> fullscreen_mode_changed;
++ boost::signals2::signal<void(VideoOutputFSToggle)> 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<void, unsigned, unsigned> size_changed;
++ boost::signals2::signal<void(unsigned, unsigned)> 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<Heap>,
+- 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<Ekiga::URIPresentity>,
+- 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<void> trigger_saving;
++ boost::signals2::signal<void(void)> 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<Ekiga::Call> call);
+ void on_call_notification_closed (gpointer self);
+
+- typedef std::map<boost::shared_ptr<Ekiga::Notification>, std::pair<boost::signals::connection, boost::shared_ptr<NotifyNotification> > > container_type;
++ typedef std::map<boost::shared_ptr<Ekiga::Notification>, std::pair<boost::signals2::connection, boost::shared_ptr<NotifyNotification> > > 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<boost::signals::connection, boost::shared_ptr<NotifyNotification> > (conn, boost::shared_ptr<NotifyNotification> (notif, g_object_unref));
++ live[notification] = std::pair<boost::signals2::connection, boost::shared_ptr<NotifyNotification> > (conn, boost::shared_ptr<NotifyNotification> (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<void> trigger_saving;
++ boost::signals2::signal<void(void)> 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<Presentity>,
+ 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 <boost/smart_ptr.hpp>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+
+ #include <loudmouth/loudmouth.h>
+
+--- 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<void> chat_requested;
++ boost::signals2::signal<void(void)> 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<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
++ for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::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<boost::signals::connection>::const_iterator iter2
++ for (std::list<boost::signals2::connection>::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<boost::signals::connection> conns;
++ std::list<boost::signals2::connection> 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<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
++ for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::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<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
++ for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
+ iter = presentities.begin ();
+ iter != presentities.end ();
+ ++iter) {
+@@ -514,7 +514,7 @@
+ "contact on a remote server"));
+
+ std::set<std::string> all_groups;
+- for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
++ for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::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<void> trigger_saving;
++ boost::signals2::signal<void(void)> trigger_saving;
+
+ private:
+
+@@ -106,7 +106,7 @@
+ boost::shared_ptr<xmlDoc> doc;
+ xmlNodePtr list_node;
+
+- std::map<PresentityPtr, std::list<boost::signals::connection> > presentities;
++ std::map<PresentityPtr, std::list<boost::signals2::connection> > 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<void, boost::shared_ptr<Entry> > entry_added;
+- boost::signal1<void, boost::shared_ptr<Entry> > entry_updated;
+- boost::signal1<void, boost::shared_ptr<Entry> > entry_removed;
++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_added;
++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_updated;
++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_removed;
+
+
+ /* data for its children */
+@@ -104,7 +104,7 @@
+
+ std::list<ChildType> ordering;
+ std::list<boost::shared_ptr<List> > lists;
+- std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > > entries;
++ std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > > entries;
+ };
+
+
+@@ -235,12 +235,12 @@
+ (*iter)->flush ();
+ lists.clear ();
+
+- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::iterator iter = entries.begin ();
++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::iterator iter = entries.begin ();
+ iter != entries.end ();
+ ++iter) {
+
+ iter->first->removed ();
+- for (std::list<boost::signals::connection>::iterator conn_iter
++ for (std::list<boost::signals2::connection>::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<boost::signals::connection> conns;
++ std::list<boost::signals2::connection> 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<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > (entry, conns));
++ entries.push_back (std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > (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::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
+ iter != entries.end ();
+ ++iter) {
+
+@@ -381,7 +381,7 @@
+ ++iter)
+ (*iter)->push_status (uri_, status);
+
+- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
+ iter != entries.end ();
+ ++iter) {
+
+@@ -400,7 +400,7 @@
+ ++iter)
+ go_on = (*iter)->visit_presentities (visitor);
+
+- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
+ go_on && iter != entries.end ();
+ ++iter) {
+
+@@ -418,7 +418,7 @@
+ ++iter)
+ (*iter)->publish ();
+
+- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::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<void, boost::shared_ptr<Entry> > entry_added;
+- boost::signal1<void, boost::shared_ptr<Entry> > entry_updated;
+- boost::signal1<void, boost::shared_ptr<Entry> > entry_removed;
++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_added;
++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_updated;
++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> 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<void> trigger_reload;
++ boost::signals2::signal<void(void)> 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<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> 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<Ekiga::VideoInputCore> ("videoinput-core");
+ assistant->priv->audioinput_core = service_core.get<Ekiga::AudioInputCore> ("audioinput-core");
+ assistant->priv->audiooutput_core = service_core.get<Ekiga::AudioOutputCore> ("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<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> 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<Ekiga::PersonalDetails> personal_details;
+- std::vector<boost::signals::connection> connections;
++ std::vector<boost::signals2::connection> 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/README b/network/falkon/README
deleted file mode 100644
index 3e46f00e6c..0000000000
--- a/network/falkon/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Falkon is a KDE web browser using QtWebEngine rendering engine,
-previously known as QupZilla. It aims to be a lightweight web browser
-available through all major platforms.
-This project has been originally started only for educational
-purposes, but from its start, Falkon has grown into a feature-rich
-browser.
-
-Falkon has all standard functions you expect from a web browser.
-It includes bookmarks, history (both also in sidebar) and tabs.
-Above that, it has by default enabled blocking ads with a built-in
-AdBlock plugin.
diff --git a/network/falkon/doinst.sh b/network/falkon/doinst.sh
deleted file mode 100644
index 65c7e2eeb9..0000000000
--- a/network/falkon/doinst.sh
+++ /dev/null
@@ -1,9 +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/falkon/falkon.SlackBuild b/network/falkon/falkon.SlackBuild
deleted file mode 100644
index df6df2e5ae..0000000000
--- a/network/falkon/falkon.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for falkon
-
-# Copyright 2018 Matteo Bernardini <ponce@slackbuilds.org>, 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=falkon
-VERSION=${VERSION:-3.0.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.?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 {} \;
-
-# Handling this directory requires the KDE5 Framework
-rm -fR po
-
-mkdir -p build
-cd build
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DMAN_INSTALL_DIR=/usr/man \
- -DCMAKE_BUILD_TYPE=Release ..
- make
- make install DESTDIR=$PKG
-cd ..
-
-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 CHANGELOG COPYING README.md $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/falkon/falkon.info b/network/falkon/falkon.info
deleted file mode 100644
index 39afba46f1..0000000000
--- a/network/falkon/falkon.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="falkon"
-VERSION="3.0.1"
-HOMEPAGE="https://www.falkon.org"
-DOWNLOAD="https://download.kde.org/stable/falkon/3.0.1/falkon-3.0.1.tar.xz"
-MD5SUM="c6fb6433ac0f228667e2f763c02317c5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="extra-cmake-modules qt5"
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
diff --git a/network/falkon/slack-desc b/network/falkon/slack-desc
deleted file mode 100644
index f2d05d57bf..0000000000
--- a/network/falkon/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------------------------------------------------------|
-falkon: falkon (lightweight web browser)
-falkon:
-falkon: Falkon is a KDE web browser using QtWebEngine rendering engine,
-falkon: previously known as QupZilla. It aims to be a lightweight web browser
-falkon: available through all major platforms.
-falkon: This project has been originally started only for educational
-falkon: purposes, but from its start, Falkon has grown into a feature-rich
-falkon: browser.
-falkon:
-falkon: Homepage: https://www.falkon.org
-falkon:
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/filezilla/filezilla.SlackBuild b/network/filezilla/filezilla.SlackBuild
index 02ef99af3e..52b4b65876 100644
--- a/network/filezilla/filezilla.SlackBuild
+++ b/network/filezilla/filezilla.SlackBuild
@@ -21,7 +21,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=filezilla
-VERSION=${VERSION:-3.42.1}
+VERSION=${VERSION:-3.51.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -76,6 +76,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 {} \;
+# Needed for gcc >= 10.x
+patch -p1 < $CWD/interface_Mainfrm_h_include_list.patch
+
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/network/filezilla/filezilla.info b/network/filezilla/filezilla.info
index bcc1154e2f..c6653c5182 100644
--- a/network/filezilla/filezilla.info
+++ b/network/filezilla/filezilla.info
@@ -1,8 +1,8 @@
PRGNAM="filezilla"
-VERSION="3.42.1"
+VERSION="3.51.0"
HOMEPAGE="https://filezilla-project.org/"
-DOWNLOAD="https://download.filezilla-project.org/client/FileZilla_3.42.1_src.tar.bz2"
-MD5SUM="00e2f8ff0c1ad9802c0eed6488c3565a"
+DOWNLOAD="https://download.filezilla-project.org/client/FileZilla_3.51.0_src.tar.bz2"
+MD5SUM="d8e9abde7a0b0a64d6896b6e6732ef96"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="wxGTK3 libfilezilla"
diff --git a/network/filezilla/interface_Mainfrm_h_include_list.patch b/network/filezilla/interface_Mainfrm_h_include_list.patch
new file mode 100644
index 0000000000..3977ba657c
--- /dev/null
+++ b/network/filezilla/interface_Mainfrm_h_include_list.patch
@@ -0,0 +1,12 @@
+Index: filezilla-3.47.2.1/src/interface/Mainfrm.h
+===================================================================
+--- filezilla-3.47.2.1.orig/src/interface/Mainfrm.h
++++ filezilla-3.47.2.1/src/interface/Mainfrm.h
+@@ -6,6 +6,7 @@
+ #include "notification.h"
+ #include "serverdata.h"
+
++#include <list>
+ #include <wx/timer.h>
+
+ #ifndef __WXMAC__
diff --git a/network/fqterm/fqterm.SlackBuild b/network/fqterm/fqterm.SlackBuild
index b90004e147..1af9f50ecf 100644
--- a/network/fqterm/fqterm.SlackBuild
+++ b/network/fqterm/fqterm.SlackBuild
@@ -5,14 +5,13 @@
# Written by vvoody <vvoodywang@gmail.com>
PRGNAM=fqterm
-VERSION=${VERSION:-0.9.8.2}
-SVNVER=svn1076
+VERSION=${VERSION:-0.9.8.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -23,18 +22,14 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
fi
set -e
@@ -42,15 +37,15 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION-$SVNVER.tar.gz
-cd $PRGNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
mkdir build
cd build
@@ -58,17 +53,16 @@ cd build
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX:PATH="/usr" \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
..
make
make install DESTDIR=$PKG
cd -
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE INSTALL.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE INSTALL.txt README* $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/network/fqterm/fqterm.info b/network/fqterm/fqterm.info
index 787760d96c..c948f08484 100644
--- a/network/fqterm/fqterm.info
+++ b/network/fqterm/fqterm.info
@@ -1,8 +1,8 @@
PRGNAM="fqterm"
-VERSION="0.9.8.2"
+VERSION="0.9.8.4"
HOMEPAGE="https://github.com/mytbk/fqterm"
-DOWNLOAD="http://ftp1.fr.freebsd.org/pub/frugalware/frugalware-stable/source/xlib-extra/fqterm/fqterm-0.9.8.2-svn1076.tar.gz"
-MD5SUM="eaf7b51c1e3e0f13351f9f5678996d51"
+DOWNLOAD="https://github.com/mytbk/fqterm/archive/0.9.8.4/fqterm-0.9.8.4.tar.gz"
+MD5SUM="d7d9500806055def62456550fe33173e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/freeradius-server/freeradius-server.SlackBuild b/network/freeradius-server/freeradius-server.SlackBuild
index e72487437e..fae2fc93f4 100644
--- a/network/freeradius-server/freeradius-server.SlackBuild
+++ b/network/freeradius-server/freeradius-server.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=freeradius-server
-VERSION=${VERSION:-2.2.9}
+VERSION=${VERSION:-3.0.21}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -84,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \
--build=$ARCH-slackware-linux
make
-make install R=$PKG
+make -j1 install R=$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
diff --git a/network/freeradius-server/freeradius-server.info b/network/freeradius-server/freeradius-server.info
index 98b1a931e0..57ca94bf53 100644
--- a/network/freeradius-server/freeradius-server.info
+++ b/network/freeradius-server/freeradius-server.info
@@ -1,8 +1,8 @@
PRGNAM="freeradius-server"
-VERSION="2.2.9"
+VERSION="3.0.21"
HOMEPAGE="http://www.freeradius.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/freeradius-server-2.2.9.tar.bz2"
-MD5SUM="d1398327ba4e23c75da06d8a0e01096b"
+DOWNLOAD="ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.0.21.tar.bz2"
+MD5SUM="8b7f794f2ac0d686d9aecfa083a63614"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/freerdp/freerdp.SlackBuild b/network/freerdp/freerdp.SlackBuild
index 3b9edaa061..8b1386b761 100644
--- a/network/freerdp/freerdp.SlackBuild
+++ b/network/freerdp/freerdp.SlackBuild
@@ -85,7 +85,7 @@ find -L . \
mkdir -p build
cd build
cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $(pkg-config --cflags gstreamer-base-1.0)" \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $(pkg-config --cflags gstreamer-base-1.0) -fcommon" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_CUPS=ON \
-DWITH_FFMPEG=$WITH_FFMPEG \
diff --git a/network/glusterfs/glusterfs.SlackBuild b/network/glusterfs/glusterfs.SlackBuild
index 099eb7f2ee..ffc71919d3 100644
--- a/network/glusterfs/glusterfs.SlackBuild
+++ b/network/glusterfs/glusterfs.SlackBuild
@@ -70,7 +70,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
./autogen.sh
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/network/grsync/grsync.SlackBuild b/network/grsync/grsync.SlackBuild
index c4d09274d1..92f7490f77 100644
--- a/network/grsync/grsync.SlackBuild
+++ b/network/grsync/grsync.SlackBuild
@@ -71,7 +71,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/network/hping3/hping3.SlackBuild b/network/hping3/hping3.SlackBuild
index 10f08e77c6..d685005449 100644
--- a/network/hping3/hping3.SlackBuild
+++ b/network/hping3/hping3.SlackBuild
@@ -88,7 +88,7 @@ MANPATH=/usr/man ./configure \
# From Arch Linux - Adds DESTDIR to Makefile
patch -p1 --verbose < $CWD/patches/Makefile.patch
-make CCOPT="$SLKCFLAGS -DUSE_TCL"
+make CCOPT="$SLKCFLAGS -DUSE_TCL -fcommon"
make install DESTDIR=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
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 <cstdlib>'
-patch -p1 < $CWD/ifstatus.patch
-
-make \
- CFLAGS="$SLKCFLAGS" \
- CXXFLAGS="$SLKCFLAGS"
-
-# We can't use the 'install' target in the Makefile as it
-# hardcodes the destination directory to /usr/local/bin
-install -D -m 0755 ./ifstatus $PKG/usr/bin/ifstatus
-strip --strip-unneeded $PKG/usr/bin/ifstatus
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ifstatus/ifstatus.info b/network/ifstatus/ifstatus.info
deleted file mode 100644
index f4021d55cc..0000000000
--- a/network/ifstatus/ifstatus.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ifstatus"
-VERSION="1.1.0"
-HOMEPAGE="http://ifstatus.sourceforge.net"
-DOWNLOAD="http://ifstatus.sourceforge.net/download/ifstatus-v1.1.0.tar.gz"
-MD5SUM="f4d413f880754fd6677290160f8bc5d7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Sean Donner"
-EMAIL="sean.donner@gmail.com"
diff --git a/network/ifstatus/ifstatus.patch b/network/ifstatus/ifstatus.patch
deleted file mode 100644
index 75bc3befd5..0000000000
--- a/network/ifstatus/ifstatus.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for ifstatus >= 1.1.0,
-which adds a few missing #include lines to not violate the C++ standards
-and to build successfully with G++ version 4.3 and 4.4.
-
---- ifstatus/IFStatus.cc 2006-01-17 00:18:46.000000000 +0100
-+++ ifstatus/IFStatus.cc.gcc44 2009-04-14 00:42:04.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Main.h"
- #include "IFStatus.h"
- #include "Graph.h"
---- ifstatus/GraphDecorator.cc 2006-01-17 01:00:59.000000000 +0100
-+++ ifstatus/GraphDecorator.cc.gcc44 2009-04-14 00:41:38.000000000 +0200
-@@ -21,7 +21,8 @@
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
--
-+
-+#include <cstdlib>
- #include "GraphDecorator.h"
- #include "Config.h"
-
---- ifstatus/Interface.cc 2006-01-17 02:48:27.000000000 +0100
-+++ ifstatus/Interface.cc.gcc44 2009-04-14 00:42:23.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Interface.h"
- #include "Config.h"
-
---- ifstatus/Config.cc 2005-02-26 12:54:51.000000000 +0100
-+++ ifstatus/Config.cc.gcc44 2009-04-14 00:40:13.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Main.h"
- #include "Config.h"
- #include "Util.h"
---- ifstatus/Email.cc 2005-02-26 12:54:51.000000000 +0100
-+++ ifstatus/Email.cc.gcc44 2009-04-14 00:40:44.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Email.h"
- #include "Config.h"
-
---- ifstatus/Interfaces.cc 2006-01-16 23:45:33.000000000 +0100
-+++ ifstatus/Interfaces.cc.gcc44 2009-04-14 00:42:45.000000000 +0200
-@@ -22,6 +22,7 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <cstdlib>
- #include "Interfaces.h"
- #include "Config.h"
- #include "Util.h"
diff --git a/network/ifstatus/slack-desc b/network/ifstatus/slack-desc
deleted file mode 100644
index a0f087dfc8..0000000000
--- a/network/ifstatus/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-ifstatus: ifstatus (A curses network traffic monitor)
-ifstatus:
-ifstatus: IFStatus was developed for Linux users that are usually in console
-ifstatus: mode. It is a simple, easy to use program for displaying commonly
-ifstatus: needed / wanted statistcs in real time about ingoing and outgoing
-ifstatus: traffic of multiple network interfaces that is usually hard to find,
-ifstatus: with a simple and effecient view.
-ifstatus:
-ifstatus:
-ifstatus:
-ifstatus:
diff --git a/network/iperf/iperf.SlackBuild b/network/iperf/iperf.SlackBuild
index f8c40ab1e8..d4c970ca8b 100644
--- a/network/iperf/iperf.SlackBuild
+++ b/network/iperf/iperf.SlackBuild
@@ -8,13 +8,13 @@
# http://www.slackwiki.org/Writing_A_SlackBuild_Script
PRGNAM=iperf
-VERSION=${VERSION:-2.0.5}
+VERSION=${VERSION:-2.0.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -25,8 +25,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -49,10 +49,15 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Thanks fedora for these
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+
+autoreconf -fi
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -68,13 +73,11 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS ChangeLog COPYING INSTALL README doc/index.html $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/iperf/iperf.info b/network/iperf/iperf.info
index fbb6e24fa4..730b096a3b 100644
--- a/network/iperf/iperf.info
+++ b/network/iperf/iperf.info
@@ -1,8 +1,8 @@
PRGNAM="iperf"
-VERSION="2.0.5"
+VERSION="2.0.8"
HOMEPAGE="https://sourceforge.net/projects/iperf/"
-DOWNLOAD="https://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz"
-MD5SUM="44b5536b67719f4250faed632a3cd016"
+DOWNLOAD="https://downloads.sourceforge.net/iperf2/iperf-2.0.8.tar.gz"
+MD5SUM="e5887f799d8dc64a974c6c2f2e5cc339"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch b/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch
new file mode 100644
index 0000000000..2a3ad246ee
--- /dev/null
+++ b/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch
@@ -0,0 +1,17 @@
+diff -NarpU5 iperf-2.0.8/configure.ac iperf-2.0.8.debuginfo/configure.ac
+--- iperf-2.0.8/configure.ac 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.debuginfo/configure.ac 2015-04-10 10:11:33.287445003 -0400
+@@ -42,13 +42,11 @@ AC_ARG_ENABLE(kalman, AC_HELP_STRING([--
+ dnl ===================================================================
+ dnl Checks for programs
+ dnl ===================================================================
+
+ AC_PROG_CXX
+-CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+ AC_PROG_CC
+-CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+ AC_ISC_POSIX
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ AC_LANG(C)
diff --git a/network/iperf/patches/1_iperf-2.0.8-bindfail.patch b/network/iperf/patches/1_iperf-2.0.8-bindfail.patch
new file mode 100644
index 0000000000..b18b2cffed
--- /dev/null
+++ b/network/iperf/patches/1_iperf-2.0.8-bindfail.patch
@@ -0,0 +1,42 @@
+diff -NarpU5 iperf-2.0.8/src/Client.cpp iperf-2.0.8.bindfail/src/Client.cpp
+--- iperf-2.0.8/src/Client.cpp 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.bindfail/src/Client.cpp 2015-04-10 10:05:38.279936555 -0400
+@@ -701,20 +701,20 @@ void Client::Connect( ) {
+ AF_INET
+ #endif
+ : AF_INET);
+
+ mSettings->mSock = socket( domain, type, 0 );
+- WARN_errno( mSettings->mSock == INVALID_SOCKET, "socket" );
++ FAIL_errno( mSettings->mSock == INVALID_SOCKET, "socket", mSettings );
+
+ SetSocketOptions( mSettings );
+
+ SockAddr_localAddr( mSettings );
+ if ( mSettings->mLocalhost != NULL ) {
+ // bind socket to local address
+ rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local,
+ SockAddr_get_sizeof_sockaddr( &mSettings->local ) );
+- WARN_errno( rc == SOCKET_ERROR, "bind" );
++ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
+ }
+ // connect socket
+ rc = connect( mSettings->mSock, (sockaddr*) &mSettings->peer,
+ SockAddr_get_sizeof_sockaddr( &mSettings->peer ));
+ FAIL_errno( rc == SOCKET_ERROR, "connect", mSettings );
+diff -NarpU5 iperf-2.0.8/src/Listener.cpp iperf-2.0.8.bindfail/src/Listener.cpp
+--- iperf-2.0.8/src/Listener.cpp 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.bindfail/src/Listener.cpp 2015-04-10 10:06:23.279699885 -0400
+@@ -342,11 +342,11 @@ void Listener::Listen( ) {
+ WARN_errno( rc == SOCKET_ERROR, "WSAJoinLeaf (aka bind)" );
+ } else
+ #endif
+ {
+ rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local, mSettings->size_local );
+- WARN_errno( rc == SOCKET_ERROR, "bind" );
++ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
+ }
+ // listen for connections (TCP only).
+ // default backlog traditionally 5
+ if ( !isUDP( mSettings ) ) {
+ rc = listen( mSettings->mSock, 5 );
diff --git a/network/iperf/patches/2_iperf-2.0.8-math.patch b/network/iperf/patches/2_iperf-2.0.8-math.patch
new file mode 100644
index 0000000000..1a943f5f2c
--- /dev/null
+++ b/network/iperf/patches/2_iperf-2.0.8-math.patch
@@ -0,0 +1,75 @@
+diff -NarU5 a/include/headers.h b/include/headers.h
+--- a/include/headers.h 2015-04-02 16:51:48.000000000 -0400
++++ b/include/headers.h 2016-03-16 14:52:14.386853750 -0400
+@@ -80,11 +80,10 @@
+ #include <assert.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <time.h>
+-#include <math.h>
+ #include <float.h>
+ #include <sys/types.h>
+
+ #ifdef WIN32
+
+diff -NarU5 a/src/Client.cpp b/src/Client.cpp
+--- a/src/Client.cpp 2015-04-02 16:51:48.000000000 -0400
++++ b/src/Client.cpp 2016-03-16 14:52:14.387853701 -0400
+@@ -50,10 +50,11 @@
+ * A client thread initiates a connect to the server and handles
+ * sending and receiving data, then closes the socket.
+ * ------------------------------------------------------------------- */
+
+ #include <time.h>
++#include <cmath>
+ #include "headers.h"
+ #include "Client.hpp"
+ #include "Thread.h"
+ #include "SocketAddr.h"
+ #include "PerfSocket.hpp"
+diff -NarU5 a/src/ReportDefault.c b/src/ReportDefault.c
+--- a/src/ReportDefault.c 2015-04-02 16:51:49.000000000 -0400
++++ b/src/ReportDefault.c 2016-03-16 14:52:14.387853701 -0400
+@@ -47,10 +47,11 @@
+ * ReportDefault.c
+ * by Kevin Gibbs <kgibbs@nlanr.net>
+ *
+ * ________________________________________________________________ */
+
++#include <math.h>
+ #include "headers.h"
+ #include "Settings.hpp"
+ #include "util.h"
+ #include "Reporter.h"
+ #include "report_default.h"
+diff -NarU5 a/src/Reporter.c b/src/Reporter.c
+--- a/src/Reporter.c 2015-04-02 16:51:49.000000000 -0400
++++ b/src/Reporter.c 2016-03-16 14:52:14.388853652 -0400
+@@ -47,10 +47,11 @@
+ * Reporter.c
+ * by Kevin Gibbs <kgibbs@nlanr.net>
+ *
+ * ________________________________________________________________ */
+
++#include <math.h>
+ #include "headers.h"
+ #include "Settings.hpp"
+ #include "util.h"
+ #include "Reporter.h"
+ #include "Thread.h"
+diff -NarU5 a/src/Server.cpp b/src/Server.cpp
+--- a/src/Server.cpp 2015-04-02 16:51:49.000000000 -0400
++++ b/src/Server.cpp 2016-03-16 14:52:14.388853652 -0400
+@@ -52,10 +52,11 @@
+ * Handles sending and receiving data, and then closes socket.
+ * Changes to this version : The server can be run as a daemon
+ * ------------------------------------------------------------------- */
+
+ #define HEADERS()
++#include <cmath>
+ #include "headers.h"
+ #include "Server.hpp"
+ #include "List.h"
+ #include "Extractor.h"
+ #include "Reporter.h"
diff --git a/network/jigdo/jigdo-0.7.3-gcc7.patch b/network/jigdo/jigdo-0.7.3-gcc7.patch
new file mode 100644
index 0000000000..d5f0c8a4d0
--- /dev/null
+++ b/network/jigdo/jigdo-0.7.3-gcc7.patch
@@ -0,0 +1,39 @@
+diff -Naur jigdo-0.7.3.orig/src/mkimage.cc jigdo-0.7.3/src/mkimage.cc
+--- jigdo-0.7.3.orig/src/mkimage.cc 2005-07-09 21:14:46.000000000 +0200
++++ jigdo-0.7.3/src/mkimage.cc 2017-02-17 14:47:12.884488507 +0100
+@@ -285,27 +285,27 @@
+ //______________________________________________________________________
+
+ namespace {
+- const int SIZE_WIDTH = 12;
++ const int size_width = 12;
+ }
+
+ ostream& JigdoDesc::ImageInfo::put(ostream& s) const {
+- s << "image-info " << setw(SIZE_WIDTH) << size() << " "
++ s << "image-info " << setw(size_width) << size() << " "
+ << md5() << ' ' << blockLength() << '\n';
+ return s;
+ }
+ ostream& JigdoDesc::UnmatchedData::put(ostream& s) const {
+- s << "in-template " << setw(SIZE_WIDTH) << offset() << ' '
+- << setw(SIZE_WIDTH) << size() << '\n';
++ s << "in-template " << setw(size_width) << offset() << ' '
++ << setw(size_width) << size() << '\n';
+ return s;
+ }
+ ostream& JigdoDesc::MatchedFile::put(ostream& s) const {
+- s << "need-file " << setw(SIZE_WIDTH) << offset() << ' '
+- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
++ s << "need-file " << setw(size_width) << offset() << ' '
++ << setw(size_width) << size() << ' ' << md5() << ' ' << rsync() << '\n';
+ return s;
+ }
+ ostream& JigdoDesc::WrittenFile::put(ostream& s) const {
+- s << "have-file " << setw(SIZE_WIDTH) << offset() << ' '
+- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
++ s << "have-file " << setw(size_width) << offset() << ' '
++ << setw(size_width) << size() << ' ' << md5() << ' ' << rsync() << '\n';
+ return s;
+ }
+
diff --git a/network/jigdo/jigdo.SlackBuild b/network/jigdo/jigdo.SlackBuild
index 67e467dde2..ef17522f77 100644
--- a/network/jigdo/jigdo.SlackBuild
+++ b/network/jigdo/jigdo.SlackBuild
@@ -73,6 +73,9 @@ find -L . \
# apply some patches from debian
zcat $CWD/jigdo_0.7.3-3.diff.gz | patch -p1
+# Fic for gcc-7.x, thanks fedora!
+patch -p1 < $CWD/jigdo-0.7.3-gcc7.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/jitsi/jitsi.SlackBuild b/network/jitsi/jitsi.SlackBuild
index dea951b97a..636e19af35 100644
--- a/network/jitsi/jitsi.SlackBuild
+++ b/network/jitsi/jitsi.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=jitsi
-VERSION=${VERSION:-2.8}
+VERSION=${VERSION:-5633}
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"
@@ -60,8 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-src-$VERSION.5426.zip
-mv $PRGNAM $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -70,8 +69,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 {} \;
-sed -i "s/0.build.by.SVN/5426/g" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
-
ant rebuild
mkdir -p $PKG/usr/bin
@@ -86,9 +83,9 @@ mkdir -p $PKG/usr/share/jitsi/lib/native
cp resources/install/resources/splash.gif $PKG/usr/share/jitsi
cp lib/{felix.client.run.properties,felix.jar,jitsi-defaults.properties,logging.properties} $PKG/usr/share/jitsi/lib
if [ "$ARCH" = "x86_64" ]; then
- cp -a lib/native/linux-64/*.so $PKG/usr/share/jitsi/lib/native
+ cp -a lib/native/linux-64/*.so $PKG/usr/share/jitsi/lib/native
else
- cp -a lib/native/linux/*.so $PKG/usr/share/jitsi/lib/native
+ cp -a lib/native/linux/*.so $PKG/usr/share/jitsi/lib/native
fi
cp lib/bundle/{commons-logging.jar,log4j.jar} $PKG/usr/share/jitsi/lib/bundle
@@ -113,7 +110,6 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
-sed 's#_PACKAGE_NAME_#jitsi#' resources/install/debian/changelog.tmpl | sed 's#_VERSION_#2.8.5426-1#' | sed 's#_DATE_#Thu, 19 Mar 2015 02:20:44 -0400#' > $PKG/usr/doc/$PRGNAM-$VERSION/changelog
cp resources/install/debian/copyright $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/jitsi/jitsi.info b/network/jitsi/jitsi.info
index 8d2c254e97..bb50a7a694 100644
--- a/network/jitsi/jitsi.info
+++ b/network/jitsi/jitsi.info
@@ -1,10 +1,10 @@
PRGNAM="jitsi"
-VERSION="2.8"
+VERSION="5633"
HOMEPAGE="https://jitsi.org/"
-DOWNLOAD="https://download.jitsi.org/jitsi/src/jitsi-src-2.8.5426.zip"
-MD5SUM="db86aa3c754e54e774257c09e7c474d2"
+DOWNLOAD="https://github.com/jitsi/jitsi/archive/5633/jitsi-5633.tar.gz"
+MD5SUM="0844dc46176c7940cdeac075559d38e6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="openjdk7"
+REQUIRES="apache-ant jdk"
MAINTAINER="Furry Monster"
EMAIL="furrymonster at gmx dot com"
diff --git a/network/kmess/README b/network/kmess/README
deleted file mode 100644
index f04f2e181b..0000000000
--- a/network/kmess/README
+++ /dev/null
@@ -1,5 +0,0 @@
-KMess is an alternative Live Messenger chat client for Linux.
-It allows Linux users to chat with friends who use Live Messenger in
-Windows or Mac OS. The strength of KMess is it's integration with the
-KDE desktop environment, it focus on Messenger-specific features, and
-an easy-to-use interface.
diff --git a/network/kmess/doinst.sh b/network/kmess/doinst.sh
deleted file mode 100644
index 4a25de5e6f..0000000000
--- a/network/kmess/doinst.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
-
diff --git a/network/kmess/giflib-5.0.patch b/network/kmess/giflib-5.0.patch
deleted file mode 100644
index cc568fdf8a..0000000000
--- a/network/kmess/giflib-5.0.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- contrib/isf-qt/src/isfqt.cpp.orig 2014-06-11 13:10:43.137321400 +0000
-+++ contrib/isf-qt/src/isfqt.cpp 2014-06-11 13:12:23.123474616 +0000
-@@ -249,7 +249,7 @@
- qWarning() << "Couldn't initialize GIF library!";
- }
-
-- DGifCloseFile( gifImage );
-+ DGifCloseFile( gifImage, NULL );
- gifData.close();
- */
-
-@@ -484,12 +484,13 @@
- int width = isfImage.width();
- int numColors = 0;
- bool gifError = true;
-+ int gifErrCode;
-
- // Convert the image to GIF using libgif
-
- // Open the gif file
- gifData.open( QIODevice::WriteOnly );
-- gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray );
-+ gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray, &gifErrCode );
- if( gifImage == 0 )
- {
- qWarning() << "Couldn't initialize gif library!";
-@@ -503,7 +504,7 @@
- numColors = 256;
- }
-
-- cmap = MakeMapObject( numColors, NULL );
-+ cmap = GifMakeMapObject( numColors, NULL );
- if( cmap == 0 && isfImage.numColors() > 1 )
- {
- qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!";
-@@ -576,7 +577,7 @@
- else
- {
- // Write the extension
-- if( EGifPutExtensionFirst( gifImage, COMMENT_EXT_FUNC_CODE, MAX_GIF_BYTE, isfData.left( MAX_GIF_BYTE ).data() ) == GIF_ERROR )
-+ if( EGifPutExtensionLeader( gifImage, COMMENT_EXT_FUNC_CODE) == GIF_ERROR )
- {
- qWarning() << "EGifPutExtensionFirst failed!";
- goto writeError;
-@@ -590,9 +591,9 @@
- // Write all the full data blocks
- while( length >= MAX_GIF_BYTE )
- {
-- if( EGifPutExtensionNext( gifImage, 0, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
-+ if( EGifPutExtensionBlock( gifImage, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
- {
-- qWarning() << "EGifPutExtensionNext failed!";
-+ qWarning() << "EGifPutExtensionBlock failed!";
- goto writeError;
- }
-
-@@ -603,17 +604,17 @@
- // Write the last block
- if( length > 0 )
- {
-- if( EGifPutExtensionLast( gifImage, 0, length, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR )
-+ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR )
- {
-- qWarning() << "EGifPutExtensionLast (n) failed!";
-+ qWarning() << "EGifPutExtensionTrailer (n) failed!";
- goto writeError;
- }
- }
- else
- {
-- if( EGifPutExtensionLast( gifImage, 0, 0, 0 ) == GIF_ERROR )
-+ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR )
- {
-- qWarning() << "EGifPutExtensionLast (0) failed!";
-+ qWarning() << "EGifPutExtensionTrailer (0) failed!";
- goto writeError;
- }
- }
-@@ -623,13 +624,13 @@
-
- writeError:
- // Clean up the GIF converter etc
-- EGifCloseFile( gifImage );
-- FreeMapObject( cmap );
-+ EGifCloseFile( gifImage, NULL );
-+ GifFreeMapObject( cmap );
- gifData.close();
-
- if( gifError )
- {
-- qWarning() << "GIF error code:" << GifLastError();
-+ qWarning() << "GIF error code:" << GifErrorString(gifErrCode);
- }
- else
- {
diff --git a/network/kmess/kmess.SlackBuild b/network/kmess/kmess.SlackBuild
deleted file mode 100644
index 27c6a9e73b..0000000000
--- a/network/kmess/kmess.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for kmess
-
-# Copyright 2008-2009 Tarantino Antonino <metrofox9@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=kmess
-VERSION=${VERSION:-2.0.6.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -fr $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Fix for building with new giflib (thanks to Arch)
-patch -p1 contrib/isf-qt/src/isfqt.cpp < $CWD/giflib-5.0.patch
-
-mkdir -p build
-cd build
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DCMAKE_BUILD_TYPE=Release ..
- make
- make install DESTDIR=$PKG
-cd ..
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS COPYING ChangeLog FEATURES INSTALL NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/kmess/kmess.info b/network/kmess/kmess.info
deleted file mode 100644
index 51a7e19d01..0000000000
--- a/network/kmess/kmess.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="kmess"
-VERSION="2.0.6.2"
-HOMEPAGE="http://kmess.org/"
-DOWNLOAD="http://downloads.sourceforge.net/kmess/kmess-2.0.6.2.tar.bz2"
-MD5SUM="a2e57911713308bef81b9347135cc5dd"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Tarantino Antonino"
-EMAIL="metrofox9@gmail.com"
diff --git a/network/kmess/slack-desc b/network/kmess/slack-desc
deleted file mode 100644
index 7bced9d9c3..0000000000
--- a/network/kmess/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-kmess: kmess (MSN Messenger client)
-kmess:
-kmess: KMess is a MSN Messenger client for Linux. It enables Linux users
-kmess: to chat with friends online who are using MSN Messenger in Windows
-kmess: or Mac OS. The strength of KMess is it's integration with the KDE
-kmess: desktop environment, focus on MSN Messenger specific features and
-kmess: an easy-to-use interface.
-kmess:
-kmess:
-kmess:
-kmess:
diff --git a/network/knock/knock.SlackBuild b/network/knock/knock.SlackBuild
index eeb481a019..bc5a0d98b1 100644
--- a/network/knock/knock.SlackBuild
+++ b/network/knock/knock.SlackBuild
@@ -5,13 +5,13 @@
# Written by Joey Trungale joey@trungale.net
PRGNAM=knock
-VERSION=${VERSION:-0.5}
+VERSION=${VERSION:-0.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -46,10 +46,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -63,16 +63,14 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README ChangeLog TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md ChangeLog TODO $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
cat $PKG/etc/knockd.conf > $PKG/usr/doc/$PRGNAM-$VERSION/knockd.conf
mv $PKG/etc/knockd.conf $PKG/etc/knockd.conf.new
diff --git a/network/knock/knock.info b/network/knock/knock.info
index 8274f4fce1..6845299aa4 100644
--- a/network/knock/knock.info
+++ b/network/knock/knock.info
@@ -1,8 +1,8 @@
PRGNAM="knock"
-VERSION="0.5"
+VERSION="0.7"
HOMEPAGE="http://www.zeroflux.org"
-DOWNLOAD="http://www.zeroflux.org/proj/knock/files/knock-0.5.tar.gz"
-MD5SUM="ca09d61458974cff90a700aba6120891"
+DOWNLOAD="http://www.zeroflux.org/proj/knock/files/knock-0.7.tar.gz"
+MD5SUM="cb6373fd4ccb42eeca3ff406b7fdb8a7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/konversation/README b/network/konversation/README
deleted file mode 100644
index bdf71648f9..0000000000
--- a/network/konversation/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Konversation is an Internet Relay Chat (IRC) client for KDE.
-
-Konversation features include:
-* integration of Konsole (using the KPart technology)
-* interaction with KAddressBook * themable nicklist icons
-* OSD (On Screen Display) * IPv6 support
-* multiserver support * [Secure Sockets Layer|SSL]]
diff --git a/network/konversation/doinst.sh b/network/konversation/doinst.sh
deleted file mode 100644
index 4a25de5e6f..0000000000
--- a/network/konversation/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/konversation/konversation.SlackBuild b/network/konversation/konversation.SlackBuild
deleted file mode 100644
index 7a93fff79f..0000000000
--- a/network/konversation/konversation.SlackBuild
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-# SlackBuild script for konversation
-
-# Copyright 2007-2014 Michiel van Wessem, Leicester, United Kingdom
-# Copyright 2020 Gregory Tourte <artourter@gmail.com>
-# 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=konversation
-VERSION=${VERSION:-1.5.1}
-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}
-
-SRC_VERSION=$(echo $VERSION | tr _ -)
-
-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-$SRC_VERSION
-tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.xz
-cd $PRGNAM-$SRC_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 {} \;
-
-mkdir -p build
-( cd build
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DMAN_INSTALL_DIR=/usr/man \
- -DCMAKE_BUILD_TYPE=Release ..
-
- make
- make install DESTDIR=$PKG
-) || exit 1
-
-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/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* ChangeLog INSTALL README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir $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/konversation/konversation.info b/network/konversation/konversation.info
deleted file mode 100644
index 5e4faf679e..0000000000
--- a/network/konversation/konversation.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="konversation"
-VERSION="1.5.1"
-HOMEPAGE="https://konversation.kde.org"
-DOWNLOAD="https://download.kde.org/stable/konversation/1.5.1/src/konversation-1.5.1.tar.xz"
-MD5SUM="66731bbfa34e36bd3f7b723c63a492e7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="ArTourter"
-EMAIL="artourter@gmail.com"
diff --git a/network/konversation/slack-desc b/network/konversation/slack-desc
deleted file mode 100644
index a353822169..0000000000
--- a/network/konversation/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------------------------------------------------------|
-konversation: konversation (KDE IRC client)
-konversation:
-konversation: Konversation is a user-friendly and highly configurable
-konversation: Internet Relay Chat client for KDE.
-konversation:
-konversation: Konversation has support for standard IRC features, SSL server
-konversation: support, bookmarking support, multiple identities for different
-konversation: servers, theme support, and much more.
-konversation:
-konversation: Homepage: http://konversation.kde.org/
-konversation:
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.info b/network/krb5/krb5.info
deleted file mode 100644
index ec91e88bd1..0000000000
--- a/network/krb5/krb5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="krb5"
-VERSION="1.19.1"
-HOMEPAGE="http://web.mit.edu/kerberos/"
-DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.19/krb5-1.19.1.tar.gz"
-MD5SUM="81257292f8243f735654d4fd5d1fef6a"
-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 <jgraha8@gmail.com>
-#
-
-# 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 <jgraha8@gmail.com>
-#
-
-# 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/lighttpd/lighttpd.SlackBuild b/network/lighttpd/lighttpd.SlackBuild
index 7c48640ad5..55c9a0028c 100644
--- a/network/lighttpd/lighttpd.SlackBuild
+++ b/network/lighttpd/lighttpd.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=lighttpd
-VERSION=${VERSION:-1.4.58}
+VERSION=${VERSION:-1.4.59}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/lighttpd/lighttpd.info b/network/lighttpd/lighttpd.info
index 49924d8729..cf867fea71 100644
--- a/network/lighttpd/lighttpd.info
+++ b/network/lighttpd/lighttpd.info
@@ -1,8 +1,8 @@
PRGNAM="lighttpd"
-VERSION="1.4.58"
+VERSION="1.4.59"
HOMEPAGE="http://www.lighttpd.net/"
-DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.58.tar.xz"
-MD5SUM="8d12a31bd3fdd7eab85cf9a6d2cfa92e"
+DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.59.tar.xz"
+MD5SUM="a8838dac90fcddbcc05c0d1877bd8cdf"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
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..7124b94326 100644
--- a/network/memcached/memcached.SlackBuild
+++ b/network/memcached/memcached.SlackBuild
@@ -29,7 +29,7 @@
# Added rc startup script contributed by Miguel De Anda
PRGNAM="memcached"
-VERSION=${VERSION:-1.4.37}
+VERSION=${VERSION:-1.6.9}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/memcached/memcached.info b/network/memcached/memcached.info
index 3be16c1c65..76d908aabf 100644
--- a/network/memcached/memcached.info
+++ b/network/memcached/memcached.info
@@ -1,8 +1,8 @@
PRGNAM="memcached"
-VERSION="1.4.37"
+VERSION="1.6.9"
HOMEPAGE="http://memcached.org/"
-DOWNLOAD="http://www.memcached.org/files/memcached-1.4.37.tar.gz"
-MD5SUM="5080f9e984486380f628a743dcadf1dc"
+DOWNLOAD="http://www.memcached.org/files/memcached-1.6.9.tar.gz"
+MD5SUM="ee802a316d7d622aaaec22382ca65004"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
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 <abrouwers@gmail.com>
# Copyright 2009-2011 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
# Copyright 2012-2013 Roberto Neri, Palermo, Italy
-# Copyright 2013-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, 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 ac040947a9..40ba6d2b63 100644
--- a/network/mosh/mosh.SlackBuild
+++ b/network/mosh/mosh.SlackBuild
@@ -53,7 +53,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 <iskar.enev[@]gmail.com>
-# Currently maintained by B. Watson <yalhcru@gmail.com>
-
-PRGNAM=museek+
-VERSION=${VERSION:-0.2}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# This patch fixes the python modules install path
-# to be architecture aware
-patch -p0 < $CWD/museek-python.diff
-
-cmake -DPREFIX=/usr \
- -DMANDIR=man \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
- -DSWIG_DIR:PATH=`swig -swiglib` \
- -DEVERYTHING=1 \
- -DTRAYICON=1 \
- -DBINRELOC=0
-
-make VERBOSE=1
-make install VERBOSE=1 DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- COPYING CREDITS FILES LICENSE README TODO INSTALL \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/rc.museekd > $PKG/usr/doc/$PRGNAM-$VERSION/rc.museekd.new
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/museek+/museek+.info b/network/museek+/museek+.info
deleted file mode 100644
index 8ee1bc1126..0000000000
--- a/network/museek+/museek+.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="museek+"
-VERSION="0.2"
-HOMEPAGE="http://museek-plus.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/museek-plus/museek+-0.2.tar.bz2"
-MD5SUM="66d3eab341e1cd6642f83d329a18c3b5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libxml++"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/network/museek+/museek-python.diff b/network/museek+/museek-python.diff
deleted file mode 100644
index 844d17d624..0000000000
--- a/network/museek+/museek-python.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- murmur/CMakeLists.txt 2008-09-22 11:49:33.000000000 +0300
-+++ murmur/CMakeLists.txt.1 2009-09-01 12:04:34.000000000 +0300
-@@ -25,7 +25,7 @@
- ${PYMURMUR_FILES}
- )
-
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-
- if (NOT sitepackages OR error)
- MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
---- mucous/CMakeLists.txt 2008-09-22 11:49:33.000000000 +0300
-+++ mucous/CMakeLists.txt.1 2009-09-01 12:04:55.000000000 +0300
-@@ -28,7 +28,7 @@
- ${PYMUCOUS_FILES}
- )
-
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-
- if (NOT sitepackages OR error)
- MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
---- python-bindings/CMakeLists.txt 2008-09-22 11:49:33.000000000 +0300
-+++ python-bindings/CMakeLists.txt.1 2009-09-01 12:04:15.000000000 +0300
-@@ -18,7 +18,7 @@
- museek/driver.py
- )
-
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-
- if (NOT sitepackages OR error)
- MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
---- Mucipher/PyMucipher/CMakeLists.txt 2008-10-07 19:58:27.000000000 +0300
-+++ Mucipher/PyMucipher/CMakeLists.txt.1 2009-09-01 12:05:46.000000000 +0300
-@@ -37,7 +37,7 @@
- ${CMAKE_CURRENT_BINARY_DIR}/mucipherc.py
- ${CMAKE_CURRENT_BINARY_DIR}/_mucipherc.so
- )
--EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-
- if (NOT sitepackages OR error)
- MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
diff --git a/network/museek+/rc.museekd b/network/museek+/rc.museekd
deleted file mode 100644
index 8c74eb95ab..0000000000
--- a/network/museek+/rc.museekd
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-#
-# This shell script takes care of starting and stopping museekd.
-
-MUSEEKD=/usr/bin/museekd
-MUSETUP=/usr/bin/musetup
-MUSCAN=/usr/bin/muscan
-MUSOCKET=/tmp/museekd.root
-PIDFILE=/var/run/museekd.pid
-DBDIR=/var/museek
-CONFIG=$DBDIR/museekd.xml
-CHOWNSOCKET=YES
-
-case "$1" in
- start)
- if [ ! -d $DBDIR ]; then
- mkdir $DBDIR
- fi
- if [ ! -f $CONFIG ]; then
- echo -n "Starting Museek Setup"
- echo
- if [ ! -d $DBDIR ]; then
- mkdir $DBDIR
- fi
- $MUSETUP $CONFIG
- echo
- fi
- if [ -f $PIDFILE ]; then
- echo -n "Museek Daemon already running (or zombie pid file in /var/run/)"
- echo
- exit
- fi
- echo -n "Starting Museek Daemon"
- $MUSEEKD -c $CONFIG &>/dev/null &
- PID="$!"
- sleep 2
- if kill -0 $PID # pid check
- then
- if [ $CHOWNSOCKET = YES ];
- then
- if [ -e $MUSOCKET ]; then chmod 666 $MUSOCKET
- # access the museekd socket from other users, may be a security risk on multiuser systems
- fi
- fi
- echo $PID > $PIDFILE
- echo
- else
- echo -n "Museekd isn't starting up properly. Check your Config file, \nor run 'museekd -c /var/museek/museekd.xml' for verbose messages."
- echo
- fi
- ;;
- stop)
- echo -n "Stopping Museek Daemon"
- echo
- if [ -f $PIDFILE ]; then
- kill -15 $(cat $PIDFILE) &>/dev/null
- rm $PIDFILE
- else
- echo -n "Museek Daemon not running"
- echo
- exit
- fi
- ;;
- reconnect)
- if [ -f $PIDFILE ]; then
- echo -n "Attempting to reconnect Museekd to the Server"
- kill -ALRM $(cat $PIDFILE) &>/dev/null
- echo
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- rescan)
- echo -n "Starting Muscan, rescanning shared files"
- echo
- $MUSCAN -c $CONFIG -r -v
- echo
- $0 reload
- ;;
- setup)
- echo -n "Starting Museek Setup"
- echo
- if [ ! -d $DBDIR ]; then
- mkdir $DBDIR
- fi
- $MUSETUP $CONFIG
- echo
- ;;
- reload)
- if [ -f $PIDFILE ]; then
- echo -n "Reloading Museek Daemon to update Shares"
- kill -HUP $(cat $PIDFILE)
- echo
- else
- echo -n "Museek Daemon not running, can't reload shares"
- echo
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|rescan|reconnect|setup|reload}"
- echo -n
-esac
diff --git a/network/museek+/slack-desc b/network/museek+/slack-desc
deleted file mode 100644
index 58f0d98ace..0000000000
--- a/network/museek+/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-museek+: museek+ (file-sharing application)
-museek+:
-museek+: Museek+ is a file-sharing application for the Soulseek p2p network,
-museek+: written in C++. It's an enhanced version of Hyriand's original Museek
-museek+: (http://museek.thegraveyard.org). It supports chat, transferring
-museek+: files, searching, user-management, sharing, banlists, interests
-museek+: and more. Museek+ consists of museekd (daemon), muscan (shares
-museek+: scanning tool), muscand (automated shares scanning tool), musetup
-museek+: (command-line configuration script), musetup-gtk (PyGTK configuration
-museek+: app), museeq (QT GUI client), mucous (curses python client),
-museek+: museekcontrol (command-line python client) and murmur (PyGTK client).
diff --git a/network/nagios/nagios.SlackBuild b/network/nagios/nagios.SlackBuild
index d19ea44f60..97fa049904 100644
--- a/network/nagios/nagios.SlackBuild
+++ b/network/nagios/nagios.SlackBuild
@@ -105,7 +105,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 -w -Wl,--allow-multiple-definition" \
./configure \
--prefix=/usr \
--sbindir=/usr/sbin/$PRGNAM \
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/netsurf/enable-deprecated.diff b/network/netsurf/enable-deprecated.diff
deleted file mode 100644
index 3378406e85..0000000000
--- a/network/netsurf/enable-deprecated.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/netsurf/gtk/Makefile.target 2015-03-21 20:50:22.018730471 +0300
-+++ b/netsurf/gtk/Makefile.target 2015-03-22 11:38:07.809544850 +0300
-@@ -34,7 +34,6 @@
-
- # GTK and GLIB flags to disable depricated usage
- GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
-- -DG_DISABLE_DEPRECATED \
- -DGTK_DISABLE_SINGLE_INCLUDES \
- -DGTK_DISABLE_DEPRECATED \
- -DGTK_MULTIHEAD_SAFE \
diff --git a/network/netsurf/netsurf.SlackBuild b/network/netsurf/netsurf.SlackBuild
index 649dd16b9a..05bb96ae3f 100644
--- a/network/netsurf/netsurf.SlackBuild
+++ b/network/netsurf/netsurf.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=netsurf
-VERSION=${VERSION:-3.8}
+VERSION=${VERSION:-3.10}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/netsurf/netsurf.info b/network/netsurf/netsurf.info
index a63840e0a4..76745e7077 100644
--- a/network/netsurf/netsurf.info
+++ b/network/netsurf/netsurf.info
@@ -1,8 +1,8 @@
PRGNAM="netsurf"
-VERSION="3.8"
+VERSION="3.10"
HOMEPAGE="http://www.netsurf-browser.org"
-DOWNLOAD="https://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.8.tar.gz"
-MD5SUM="cf3e00b98b630d552ae694be52e23c8a"
+DOWNLOAD="https://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.10.tar.gz"
+MD5SUM="f5b2ea34c85775941ab3c2144783d396"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="perl-html-parser"
diff --git a/network/nextcloud-server/nextcloud-server.SlackBuild b/network/nextcloud-server/nextcloud-server.SlackBuild
index 1a139248f2..8276ac8a74 100644
--- a/network/nextcloud-server/nextcloud-server.SlackBuild
+++ b/network/nextcloud-server/nextcloud-server.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=nextcloud-server
SRCNAM=nextcloud
-VERSION=${VERSION:-13.0.7}
+VERSION=${VERSION:-18.0.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/nextcloud-server/nextcloud-server.info b/network/nextcloud-server/nextcloud-server.info
index 4087894048..42fbb27b4b 100644
--- a/network/nextcloud-server/nextcloud-server.info
+++ b/network/nextcloud-server/nextcloud-server.info
@@ -1,8 +1,8 @@
PRGNAM="nextcloud-server"
-VERSION="13.0.7"
+VERSION="18.0.4"
HOMEPAGE="https://nextcloud.com/"
-DOWNLOAD="https://download.nextcloud.com/server/releases/nextcloud-13.0.7.tar.bz2"
-MD5SUM="ee0c0e53a1ac8e2feb3ce0fdfe27f9b2"
+DOWNLOAD="https://download.nextcloud.com/server/releases/nextcloud-18.0.4.tar.bz2"
+MD5SUM="d2f3c7bd402ef61d30a576d165fe7c1d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/nghttp2/README b/network/nghttp2/README
deleted file mode 100644
index 3d05758f54..0000000000
--- a/network/nghttp2/README
+++ /dev/null
@@ -1,4 +0,0 @@
-nghttp2 is an implementation of HTTP/2 and its header compression
-algorithm HPACK in C.
-The framing layer of HTTP/2 is implemented as a form of reusable C
-library.
diff --git a/network/nghttp2/nghttp2.info b/network/nghttp2/nghttp2.info
deleted file mode 100644
index 11476aa1b8..0000000000
--- a/network/nghttp2/nghttp2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nghttp2"
-VERSION="1.16.1"
-HOMEPAGE="https://nghttp2.org/"
-DOWNLOAD="https://github.com/nghttp2/nghttp2/releases/download/v1.16.1/nghttp2-1.16.1.tar.xz"
-MD5SUM="bde0dca3fd5da7bc5c7c8470ed0674b5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jansson"
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
diff --git a/network/opendkim/opendkim.SlackBuild b/network/opendkim/opendkim.SlackBuild
index 85b2b88f4b..83b188ea96 100644
--- a/network/opendkim/opendkim.SlackBuild
+++ b/network/opendkim/opendkim.SlackBuild
@@ -104,6 +104,9 @@ else
UNBOUND=""
fi
+patch -p1 < $CWD/openssl_1.1.0_compat.patch
+autoreconf -vif
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/opendkim/openssl_1.1.0_compat.patch b/network/opendkim/openssl_1.1.0_compat.patch
new file mode 100644
index 0000000000..383990832a
--- /dev/null
+++ b/network/opendkim/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+ * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+ - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- opendkim-2.11.0~alpha.orig/configure.ac
++++ opendkim-2.11.0~alpha/configure.ac
+@@ -864,26 +864,28 @@ then
+ AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ AC_MSG_ERROR([libcrypto not found]))
+
+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+- [
+- if test x"$enable_shared" = x"yes"
+- then
+- AC_MSG_ERROR([Cannot build shared opendkim
+- against static openssl libraries.
+- Configure with --disable-shared
+- to get this working or obtain a
+- shared libssl library for
+- opendkim to use.])
+- fi
+
+- # avoid caching issue - last result of SSL_library_init
+- # shouldn't be cached for this next check
+- unset ac_cv_search_SSL_library_init
+- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+- AC_MSG_ERROR([libssl not found]), [-ldl])
+- ]
+- )
++ AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++ [[SSL_library_init();]])],
++ [od_have_ossl="yes";],
++ [od_have_ossl="no";])
++ if test x"$od_have_ossl" = x"no"
++ then
++ if test x"$enable_shared" = x"yes"
++ then
++ AC_MSG_ERROR([Cannot build shared opendkim
++ against static openssl libraries.
++ Configure with --disable-shared
++ to get this working or obtain a
++ shared libssl library for
++ opendkim to use.])
++ fi
++
++ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++ AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++ AC_MSG_ERROR([libssl not found]), [-ldl])
++ fi
+
+ AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+ AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim-2.11.0~alpha.orig/opendkim/opendkim-crypto.c
++++ opendkim-2.11.0~alpha/opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ {
+ assert(pthread_setspecific(id_key, ptr) == 0);
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++ OPENSSL_thread_stop();
++#else
+ ERR_remove_state(0);
++#endif
+
+ free(ptr);
+
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ if (crypto_init_done)
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++ OPENSSL_thread_stop();
++#else
+ CRYPTO_cleanup_all_ex_data();
+ CONF_modules_free();
+ EVP_cleanup();
+ ERR_free_strings();
+ ERR_remove_state(0);
++#endif
+
+ if (nmutexes > 0)
+ {
diff --git a/network/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 <johannes.brechtmann@gmail.com>
-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 <errno.h>
- #ifdef HAVE_CRYPT_H
- #include <crypt.h>
-@@ -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/owncloud-client/owncloud-client.SlackBuild b/network/owncloud-client/owncloud-client.SlackBuild
index b5ab05a98d..f94a92ef0e 100644
--- a/network/owncloud-client/owncloud-client.SlackBuild
+++ b/network/owncloud-client/owncloud-client.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 {} \;
+sed -i '/^#include <QPainter>$/a #include <QPainterPath>' src/libsync/networkjobs.cpp
+
mkdir -p build
cd build
cmake \
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 <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2016-2019 Matteo Bernardini <ponce@slackbuilds.org>, 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 <alan@lizella.net>
-postfix: and the SlackBuilds.org Team <http://www.slackbuilds.org>
-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 aca498cc4f..49c05827e3 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/quassel-qt5/quassel-0.13.1-qt5.14.patch b/network/quassel-qt5/quassel-0.13.1-qt5.14.patch
new file mode 100644
index 0000000000..f0305ea53c
--- /dev/null
+++ b/network/quassel-qt5/quassel-0.13.1-qt5.14.patch
@@ -0,0 +1,118 @@
+commit c90702bdbc43fc542d7df6d5ec4b321912ca0035
+Author: Manuel Nickschas <sputnick@quassel-irc.org>
+Date: Tue Jan 7 18:34:54 2020 +0100
+
+ common: Disable enum type stream operators for Qt >= 5.14
+
+ Starting from version 5.14, Qt provides stream operators for enum
+ types, which collide with the ones we ship in types.h. Disable
+ Quassel's stream operators when compiling against Qt 5.14 or later.
+
+ Add a unit test that ensures that enum serialization honors the width
+ of the underlying type.
+
+diff --git a/src/common/types.h b/src/common/types.h
+index 467d9fb2..c4b9f364 100644
+--- a/src/common/types.h
++++ b/src/common/types.h
+@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress)
+ typedef QList<MsgId> MsgIdList;
+ typedef QList<BufferId> BufferIdList;
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+ /**
+ * Catch-all stream serialization operator for enum types.
+ *
+@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) {
+ value = static_cast<T>(v);
+ return in;
+ }
++#endif
+
+ // Exceptions
+
+diff --git a/src/common/typestest.cpp b/src/common/typestest.cpp
+new file mode 100644
+index 00000000..04031c29
+--- /dev/null
++++ b/src/common/typestest.cpp
+@@ -0,0 +1,79 @@
++/***************************************************************************
++ * Copyright (C) 2005-2020 by the Quassel Project *
++ * devel@quassel-irc.org *
++ * *
++ * This program is free software; you can redistribute it and/or modify *
++ * it under the terms of the GNU General Public License as published by *
++ * the Free Software Foundation; either version 2 of the License, or *
++ * (at your option) version 3. *
++ * *
++ * This program is distributed in the hope that it will be useful, *
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
++ * GNU General Public License for more details. *
++ * *
++ * You should have received a copy of the GNU General Public License *
++ * along with this program; if not, write to the *
++ * Free Software Foundation, Inc., *
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
++ ***************************************************************************/
++
++#include <cstdint>
++
++#include <QByteArray>
++#include <QDataStream>
++#include <QObject>
++
++#include "testglobal.h"
++#include "types.h"
++
++using namespace ::testing;
++
++class EnumHolder
++{
++ Q_GADGET
++
++public:
++ enum class Enum16 : uint16_t {};
++ enum class Enum32 : uint32_t {};
++
++ enum class EnumQt16 : uint16_t {};
++ Q_ENUM(EnumQt16)
++ enum class EnumQt32 : uint32_t {};
++ Q_ENUM(EnumQt32)
++};
++
++// Verify that enums are (de)serialized as their underlying type
++TEST(TypesTest, enumSerialization)
++{
++ QByteArray data;
++ QDataStream out(&data, QIODevice::WriteOnly);
++
++ // Serialize
++ out << EnumHolder::Enum16(0xabcd);
++ ASSERT_THAT(data.size(), Eq(2));
++ out << EnumHolder::Enum32(0x123456);
++ ASSERT_THAT(data.size(), Eq(6));
++ out << EnumHolder::EnumQt16(0x4321);
++ ASSERT_THAT(data.size(), Eq(8));
++ out << EnumHolder::Enum32(0xfedcba);
++ ASSERT_THAT(data.size(), Eq(12));
++ ASSERT_THAT(out.status(), Eq(QDataStream::Status::Ok));
++
++ // Deserialize
++ QDataStream in(data);
++ EnumHolder::Enum16 enum16;
++ EnumHolder::Enum32 enum32;
++ EnumHolder::EnumQt16 enumQt16;
++ EnumHolder::EnumQt32 enumQt32;
++ in >> enum16 >> enum32 >> enumQt16 >> enumQt32;
++ ASSERT_THAT(in.status(), Eq(QDataStream::Status::Ok));
++ EXPECT_TRUE(in.atEnd());
++
++ EXPECT_THAT((int)enum16, Eq(0xabcd));
++ EXPECT_THAT((int)enum32, Eq(0x123456));
++ EXPECT_THAT((int)enumQt16, Eq(0x4321));
++ EXPECT_THAT((int)enumQt32, Eq(0xfedcba));
++}
++
++#include "typestest.moc"
diff --git a/network/quassel-qt5/quassel-qt5.SlackBuild b/network/quassel-qt5/quassel-qt5.SlackBuild
index c136a341d9..72093342f6 100644
--- a/network/quassel-qt5/quassel-qt5.SlackBuild
+++ b/network/quassel-qt5/quassel-qt5.SlackBuild
@@ -71,6 +71,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/quassel-0.13.1-qt5.14.patch
+
mkdir -p build
cd build
cmake \
diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild
index 7a89b06188..db15e08b4d 100644
--- a/network/remmina/remmina.SlackBuild
+++ b/network/remmina/remmina.SlackBuild
@@ -80,7 +80,7 @@ find -L . \
mkdir -p build
cd build
cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -lz -lssl -lcrypto" \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -lz -lssl -lcrypto -fcommon" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-DWITH_AVAHI=${AVAHI} \
diff --git a/network/retroshare/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch b/network/retroshare/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch
new file mode 100644
index 0000000000..732984645d
--- /dev/null
+++ b/network/retroshare/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch
@@ -0,0 +1,65 @@
+backport of
+
+From bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc Mon Sep 17 00:00:00 2001
+From: Phenom <retrosharephenom@gmail.com>
+Date: Mon, 1 Jun 2020 13:44:43 +0200
+Subject: [PATCH] Fix build with Qt 5.15+
+
+---
+ retroshare-gui/src/gui/elastic/elnode.h | 8 +++++---
+ .../src/gui/gxs/GxsCommentTreeWidget.cpp | 16 +++++++++-------
+ retroshare-gui/src/gui/gxs/GxsIdDetails.cpp | 18 ++++++++++--------
+ 3 files changed, 24 insertions(+), 18 deletions(-)
+
+diff --git a/retroshare-gui/src/gui/elastic/elnode.h b/retroshare-gui/src/gui/elastic/elnode.h
+index 1e0edd1a8..b881baed6 100644
+--- a/retroshare-gui/src/gui/elastic/elnode.h
++++ b/retroshare-gui/src/gui/elastic/elnode.h
+@@ -34,6 +34,8 @@
+ #include <retroshare/rstypes.h>
+ #include "graphwidget.h"
+
++#include <QPainterPath>
++
+ class Edge;
+ QT_BEGIN_NAMESPACE
+ class QGraphicsSceneMouseEvent;
+diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
+index e5d714860..a3187d4d9 100644
+--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
++++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
+@@ -18,6 +18,14 @@
+ * *
+ *******************************************************************************/
+
++#include "GxsCommentTreeWidget.h"
++
++#include "gui/common/FilesDefs.h"
++#include "gui/common/RSElidedItemDelegate.h"
++#include "gui/common/RSTreeWidgetItem.h"
++#include "gui/gxs/GxsCreateCommentDialog.h"
++#include "gui/gxs/GxsIdTreeWidgetItem.h"
++
+ #include <QAbstractTextDocumentLayout>
+ #include <QApplication>
+ #include <QClipboard>
+@@ -25,6 +33,7 @@
+ #include <QMenu>
+ #include <QMimeData>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QTextDocument>
+
+ #include "gui/common/RSElidedItemDelegate.h"
+diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
+index 6168090eb..1bbab7f82 100644
+--- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
++++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
+@@ -31,6 +31,7 @@
+
+ #include <iostream>
+ #include <QPainter>
++#include <QPainterPath>
+
+ /* Images for tag icons */
+ #define IMAGE_LOADING ":/images/folder-draft.png"
diff --git a/network/retroshare/retroshare.SlackBuild b/network/retroshare/retroshare.SlackBuild
index 1861c03e25..e333491dec 100644
--- a/network/retroshare/retroshare.SlackBuild
+++ b/network/retroshare/retroshare.SlackBuild
@@ -18,7 +18,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
PRGNAM=retroshare
-VERSION=${VERSION:-0.6.4}
+VERSION=${VERSION:-0.6.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -47,13 +47,14 @@ else
LIBDIRSUFFIX=""
fi
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $SRCNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
cd $SRCNAM-$VERSION
-
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -61,6 +62,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 for qt5 >= 5.14.x
+patch -p1 < $CWD/bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc.patch
+
RETROTOR=${RETROTOR:-no}
if [ $RETROTOR = yes ]; then
qmake-qt5 PREFIX=/usr LIB_DIR=/usr/lib${LIBDIRSUFFIX} "CONFIG-=debug" "CONFIG+=release" "CONFIG+=retrotor"
diff --git a/network/retroshare/retroshare.info b/network/retroshare/retroshare.info
index 307a748169..b11446bfec 100644
--- a/network/retroshare/retroshare.info
+++ b/network/retroshare/retroshare.info
@@ -1,8 +1,8 @@
PRGNAM="retroshare"
-VERSION="0.6.4"
+VERSION="0.6.5"
HOMEPAGE="http://retroshare.net"
-DOWNLOAD="https://github.com/RetroShare/RetroShare/archive/v0.6.4/RetroShare-0.6.4.tar.gz"
-MD5SUM="392c36bb3171fa26b8702e0a984d5bd6"
+DOWNLOAD="https://github.com/RetroShare/RetroShare/archive/v0.6.5/RetroShare-0.6.5.tar.gz"
+MD5SUM="577fa867e24fc30b4c690e7956ff43c9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="qt5 libmicrohttpd libupnp-legacy speex protobuf sqlcipher"
diff --git a/network/rspamd/rspamd.SlackBuild b/network/rspamd/rspamd.SlackBuild
index 60ff15d91d..b1e50c4053 100644
--- a/network/rspamd/rspamd.SlackBuild
+++ b/network/rspamd/rspamd.SlackBuild
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=rspamd
-VERSION=${VERSION:-2.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.6}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
diff --git a/network/rspamd/rspamd.info b/network/rspamd/rspamd.info
index 8b978a1de4..8fc4c49c3d 100644
--- a/network/rspamd/rspamd.info
+++ b/network/rspamd/rspamd.info
@@ -1,8 +1,8 @@
PRGNAM="rspamd"
-VERSION="2.5"
+VERSION="2.6"
HOMEPAGE="https://rspamd.com"
-DOWNLOAD="https://github.com/rspamd/rspamd/archive/2.5/rspamd-2.5.tar.gz"
-MD5SUM="9b70be38ca7e17ee89373b764fef1ea7"
+DOWNLOAD="https://github.com/rspamd/rspamd/archive/2.6/rspamd-2.6.tar.gz"
+MD5SUM="e3fc425af0e2e584d8b4d264564706e3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ragel luajit redis hyperscan cmake-202x libsodium"
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/seafile-client.SlackBuild b/network/seafile-client/seafile-client.SlackBuild
deleted file mode 100644
index 205c0af148..0000000000
--- a/network/seafile-client/seafile-client.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for "seafile-client".
-
-# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=seafile-client
-SRCNAM=seafile
-VERSION=${VERSION:-4.4.6}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/v$VERSION-server.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION-server.tar.gz
-cd $SRCNAM-$VERSION-server
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-sh autogen.sh
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-client \
- --enable-static=no \
- --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/seafile-client/seafile-client.info b/network/seafile-client/seafile-client.info
deleted file mode 100644
index ef875c1f8f..0000000000
--- a/network/seafile-client/seafile-client.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="seafile-client"
-VERSION="4.4.6"
-HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/seafile/archive/v4.4.6-server.tar.gz"
-MD5SUM="753db8ec00c8f4e43270afff097a23af"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="ccnet libevhtp"
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
diff --git a/network/seafile-client/slack-desc b/network/seafile-client/slack-desc
deleted file mode 100644
index e41d278faa..0000000000
--- a/network/seafile-client/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-seafile-client: seafile-client (Cloud Storage System)
-seafile-client:
-seafile-client: Seafile is a next-generation open source cloud storage system with
-seafile-client: advanced support for file syncing, privacy protection and teamwork.
-seafile-client:
-seafile-client: Homepage: http://seafile.com/
-seafile-client:
-seafile-client:
-seafile-client:
-seafile-client:
-seafile-client:
diff --git a/network/seafile-client/README b/network/seafile/README
index 937324eae1..937324eae1 100644
--- a/network/seafile-client/README
+++ b/network/seafile/README
diff --git a/network/nghttp2/nghttp2.SlackBuild b/network/seafile/seafile.SlackBuild
index 39af89748f..63f62460ce 100644
--- a/network/nghttp2/nghttp2.SlackBuild
+++ b/network/seafile/seafile.SlackBuild
@@ -1,8 +1,8 @@
#!/bin/sh
-# Slackware build script for "nghttp2".
+# Slackware build script for seafile
-# Copyright 2016 Marcel Saegebarth <marc@mos6581.de>
+# Copyright 2015 Marcel Saegebarth <marc@mos6581.de>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -24,8 +24,8 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=nghttp2
-VERSION=${VERSION:-1.16.1}
+PRGNAM=seafile
+VERSION=${VERSION:-6.2.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -62,7 +62,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -71,6 +71,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sh autogen.sh
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -80,21 +81,20 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
- --disable-python-bindings \
- --with-jemalloc \
- --disable-static \
+ --enable-client \
+ --enable-static=no \
--build=$ARCH-slackware-linux
make
make install-strip DESTDIR=$PKG
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt README.markdown $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/seafile/seafile.info b/network/seafile/seafile.info
new file mode 100644
index 0000000000..85067fd4fe
--- /dev/null
+++ b/network/seafile/seafile.info
@@ -0,0 +1,10 @@
+PRGNAM="seafile"
+VERSION="6.2.5"
+HOMEPAGE="https://seafile.com"
+DOWNLOAD="https://github.com/haiwen/seafile/archive/v6.2.5/seafile-6.2.5.tar.gz"
+MD5SUM="220790c24a8cb1ff88bacc03e4e87976"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="ccnet libevhtp"
+MAINTAINER="Marcel Saegebarth"
+EMAIL="marc@mos6581.de"
diff --git a/network/nghttp2/slack-desc b/network/seafile/slack-desc
index a1d218da43..cad22d1bb6 100644
--- a/network/nghttp2/slack-desc
+++ b/network/seafile/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-nghttp2: nghttp2 (HTTP/2 implementation)
-nghttp2:
-nghttp2: nghttp2 is an implementation of HTTP/2 and its header compression
-nghttp2: algorithm HPACK in C.
-nghttp2: The framing layer of HTTP/2 is implemented as a form of reusable C
-nghttp2: library.
-nghttp2:
-nghttp2: Homepage: https://nghttp2.org/
-nghttp2:
-nghttp2:
-nghttp2:
+seafile: seafile (Cloud Storage System)
+seafile:
+seafile: Seafile is a next-generation open source cloud storage system with
+seafile: advanced support for file syncing, privacy protection and teamwork.
+seafile:
+seafile: Homepage: http://seafile.com/
+seafile:
+seafile:
+seafile:
+seafile:
+seafile:
diff --git a/network/snort/snort.SlackBuild b/network/snort/snort.SlackBuild
index 37e1b34f99..2bc47b6a56 100644
--- a/network/snort/snort.SlackBuild
+++ b/network/snort/snort.SlackBuild
@@ -26,13 +26,13 @@
# Maintained by David Spencer <baildon.research@googlemail.com>
PRGNAM=snort
-VERSION=${VERSION:-2.9.11.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.9.17}
+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
@@ -43,8 +43,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"
@@ -87,6 +87,7 @@ if [ "${NON_ETHER:-yes}" = 'no' ]; then
NON_ETHERNET_DECODERS=''
fi
+CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc/" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -98,7 +99,6 @@ CXXFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--enable-pthread \
--enable-linux-smp-stats \
- --enable-zlib \
${NON_ETHERNET_DECODERS} \
--build=$ARCH-slackware-linux
diff --git a/network/snort/snort.info b/network/snort/snort.info
index 38c8c4110f..3bcb6aa954 100644
--- a/network/snort/snort.info
+++ b/network/snort/snort.info
@@ -1,10 +1,10 @@
PRGNAM="snort"
-VERSION="2.9.11.1"
+VERSION="2.9.17"
HOMEPAGE="https://www.snort.org/"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/snort/snort-2.9.11.1.tar.gz"
-MD5SUM="378e3938b2b5c8e358f942d0ffce18cc"
+DOWNLOAD="https://www.snort.org/downloads/snort/snort-2.9.17.tar.gz"
+MD5SUM="3fe89f22def4e9ffda01f07f816e666d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="daq"
+REQUIRES="daq luajit"
MAINTAINER="David Spencer"
EMAIL="baildon.research@googlemail.com"
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 <ampsaltis@gmail.com>
-# Copyright 2011 Grigorios Bouzakis <grbzks@imap.cc>
-# Copyright 2014-2019 Larry Hajali <larryhaja[at]gmail[dot]com>
-# 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..01e681fec7 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 <ponce@slackbuilds.org> Pisa, Italy
+
+# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org> 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.39}
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
@@ -67,7 +68,7 @@ mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -76,37 +77,29 @@ 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 {} \;
-# Disable broken tests
-sed -i 's/ tests//' Makefile.am Makefile.in
-
-export VALAC=$(which valac)
-export VAPIGEN=$(which vapigen)
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir=/usr/libexec \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
--mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --sysconfdir=/etc \
--localstatedir=/var \
- --disable-static \
- --enable-shared \
- --with-gtk=3.0 \
- --enable-gstaudio=yes \
- --enable-gstvideo=yes \
- --disable-maintainer-mode \
- --enable-vala \
- --disable-celt051 \
- --enable-dbus=yes \
- --${usbredir}able-usbredir \
- --${cacard}able-smartcard \
- --${phodav}able-webdav \
- --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+ --buildtype=release \
+ -D gtk_doc=enabled \
+ -D usb-ids-path=/usr/share/hwdata/usb.ids \
+ .. || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
+cd ..
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
@@ -120,6 +113,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+echo "/sbin/setcap CAP_FOWNER=+ep usr/libexec/spice-client-glib-usb-acl-helper" \
+ >> $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/spice-gtk/spice-gtk.info b/network/spice-gtk/spice-gtk.info
index e17de616e8..06d18c54e2 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.39"
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.39.tar.xz"
+MD5SUM="5bdc76d5105d2b4b4472063fe04ef033"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="opus spice vala"
diff --git a/network/spice/spice.SlackBuild b/network/spice/spice.SlackBuild
index e887c96ddf..1d0c0bfdcc 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.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -53,7 +53,7 @@ else
LIBDIRSUFFIX=""
fi
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS CHANGELOG.md COPYING README"
# check if libcacard is there
if pkg-config --exists libcacard ; then
diff --git a/network/spice/spice.info b/network/spice/spice.info
index 04a4e89706..83d4a77c59 100644
--- a/network/spice/spice.info
+++ b/network/spice/spice.info
@@ -1,8 +1,8 @@
PRGNAM="spice"
-VERSION="0.14.1"
+VERSION="0.14.3"
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.3.tar.bz2"
+MD5SUM="a776650f7c4dc22681d76308475a9190"
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/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 c473ebeec4..0000000000
--- a/network/sshfs-fuse/sshfs-fuse.SlackBuild
+++ /dev/null
@@ -1,115 +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 <yalhcru@gmail.com>
-
-# 20201208 bkw: update for v3.7.1.
-# 20200804 bkw: update for v3.7.0.
-# 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.7.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 $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.
-# 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 54bb56b52e..0000000000
--- a/network/sshfs-fuse/sshfs-fuse.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sshfs-fuse"
-VERSION="3.7.1"
-HOMEPAGE="https://github.com/libfuse/sshfs"
-DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs-3.7.1/sshfs-3.7.1.tar.xz"
-MD5SUM="22ac23d05ca7c56fb568627f086374d0"
-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 182444d7a1..0000000000
--- a/network/sshfs-fuse/sshfs.1.gz
+++ /dev/null
Binary files differ
diff --git a/network/synergy/030_openssl.diff b/network/synergy/030_openssl.diff
new file mode 100644
index 0000000000..9aefa07d7d
--- /dev/null
+++ b/network/synergy/030_openssl.diff
@@ -0,0 +1,11 @@
+--- src/lib/net/SecureSocket.cpp.orig 2020-05-06 17:55:18.744800427 -0500
++++ src/lib/net/SecureSocket.cpp 2020-05-06 17:55:05.529584786 -0500
+@@ -807,7 +807,7 @@
+
+ // m_ssl->m_ssl->session->ciphers is not forward compatable, In future release
+ // of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead
+- STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;
++ STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl);
+ if (cStack == NULL) {
+ LOG((CLOG_DEBUG1 "remote cipher list not available"));
+ }
diff --git a/network/synergy/synergy.SlackBuild b/network/synergy/synergy.SlackBuild
index 21d6a34f49..5dba4659ae 100644
--- a/network/synergy/synergy.SlackBuild
+++ b/network/synergy/synergy.SlackBuild
@@ -68,6 +68,7 @@ tar xvf $CWD/$SRCNAM-$VERSION-stable.tar.gz
cd $SRCNAM-$VERSION-stable
patch -p0 < $CWD/010_include_dns_sd.diff
patch -p0 < $CWD/020_toolchain_commands.diff
+patch -p0 < $CWD/030_openssl.diff
chown -R root:root .
find -L . \
diff --git a/network/tor/rc.tor b/network/tor/rc.tor
index 11daf8a95a..53ab0ed110 100644
--- a/network/tor/rc.tor
+++ b/network/tor/rc.tor
@@ -34,6 +34,8 @@ else
fi
tor_start() {
+ mkdir -p /var/run/tor
+ chown tor.tor /var/run/tor
if [ -n "$MAX_FILEDESCRIPTORS" ]; then
echo -n "Raising maximum number of filedescriptors (ulimit -n) to $MAX_FILEDESCRIPTORS"
if ulimit -n "$MAX_FILEDESCRIPTORS" ; then
diff --git a/network/transmission-remote-gtk/gcc10.patch b/network/transmission-remote-gtk/gcc10.patch
new file mode 100644
index 0000000000..1c445b5085
--- /dev/null
+++ b/network/transmission-remote-gtk/gcc10.patch
@@ -0,0 +1,25 @@
+From b20655081332847426a7d10189bb1e2369efea42 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Fri, 20 Mar 2020 20:30:24 +0100
+Subject: [PATCH] Fix building under GCC 10 / -fno-common
+
+* Add a `typedef` to avoid defining a variable.
+
+Bug: https://bugs.gentoo.org/706980
+---
+ src/trg-tree-view.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/trg-tree-view.h b/src/trg-tree-view.h
+index 435848f..78cd76e 100644
+--- a/src/trg-tree-view.h
++++ b/src/trg-tree-view.h
+@@ -51,7 +51,7 @@ GtkWidget *trg_tree_view_new(void);
+
+ G_END_DECLS GList *trg_tree_view_get_selected_refs_list(GtkTreeView * tv);
+
+-enum {
++typedef enum {
+ TRG_COLTYPE_ICONTEXT,
+ TRG_COLTYPE_FILEICONTEXT,
+ TRG_COLTYPE_WANTED,
diff --git a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild
index 4daa00e722..5cb0d45cf4 100644
--- a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild
+++ b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild
@@ -89,6 +89,8 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
[ "${NOTIFY:-yes}" = "no" ] && NOTIFYOPT="--without-libnotify"
+patch -p1 < $CWD/gcc10.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/transmission/transmission.SlackBuild b/network/transmission/transmission.SlackBuild
index e29bb915e2..73e2171088 100644
--- a/network/transmission/transmission.SlackBuild
+++ b/network/transmission/transmission.SlackBuild
@@ -129,9 +129,6 @@ sed -i -e 's%-ggdb3 %%g' configure.ac
# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13b5e88c6e9c7bd2698d844cb5ed127ed809f7e
rm -f m4/glib-gettext.m4
-# Thanks Larry Hajali
-autoreconf -ivf
-
CC=gcc CXX=g++ \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/trojita/trojita.SlackBuild b/network/trojita/trojita.SlackBuild
index 0b9f72d426..c62198bbe6 100644
--- a/network/trojita/trojita.SlackBuild
+++ b/network/trojita/trojita.SlackBuild
@@ -4,7 +4,7 @@
# Written by Chris Farrell <timcowchip@gmail.com>
PRGNAM=trojita
-VERSION=${VERSION:-0.7}
+VERSION=${VERSION:-20201106_b4f24d7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -52,6 +52,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 {} \;
+# Building with ragel 7 is broken ATM, see https://bugs.kde.org/show_bug.cgi?id=426061
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -59,6 +60,7 @@ cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DWITH_RAGEL=OFF \
.
make VERBOSE=1
make install DESTDIR=$PKG
diff --git a/network/trojita/trojita.info b/network/trojita/trojita.info
index 20fda82343..4ba0674314 100644
--- a/network/trojita/trojita.info
+++ b/network/trojita/trojita.info
@@ -1,8 +1,8 @@
PRGNAM="trojita"
-VERSION="0.7"
+VERSION="20201106_b4f24d7"
HOMEPAGE="http://trojita.flaska.net/index.html"
-DOWNLOAD="http://downloads.sourceforge.net/trojita/trojita-0.7.tar.xz"
-MD5SUM="b2b5720be888ec6298a88798b113ad5f"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/trojita-20201106_b4f24d7.tar.xz"
+MD5SUM="a1c8978a37ebd817ce0f12a92994986a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="qt5-webkit"
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/webalizer/gcc10.patch b/network/webalizer/gcc10.patch
new file mode 100644
index 0000000000..66f4363d5d
--- /dev/null
+++ b/network/webalizer/gcc10.patch
@@ -0,0 +1,19 @@
+diff -Naur webalizer-2.23-08.orig/dns_resolv.c webalizer-2.23-08/dns_resolv.c
+--- webalizer-2.23-08.orig/dns_resolv.c 2013-02-26 06:37:27.000000000 +0100
++++ webalizer-2.23-08/dns_resolv.c 2021-03-23 20:18:10.825092000 +0100
+@@ -78,11 +78,11 @@
+
+ struct dns_child child[MAXCHILD]; /* DNS child pipe data */
+
+-DNODEPTR host_table[MAXHASH]; /* hostname/ip hash table */
++extern DNODEPTR host_table[MAXHASH]; /* hostname/ip hash table */
+
+-char buffer[BUFSIZE]; /* log file record buffer */
+-char tmp_buf[BUFSIZE]; /* used to temp save above */
+-struct utsname system_info; /* system info structure */
++extern char buffer[BUFSIZE]; /* log file record buffer */
++extern char tmp_buf[BUFSIZE]; /* used to temp save above */
++extern struct utsname system_info; /* system info structure */
+
+ int raiseSigChild = 1;
+
diff --git a/network/webalizer/webalizer.SlackBuild b/network/webalizer/webalizer.SlackBuild
index a4fa981af5..f97bb97d98 100644
--- a/network/webalizer/webalizer.SlackBuild
+++ b/network/webalizer/webalizer.SlackBuild
@@ -71,6 +71,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/gcc10.patch
+
CFLAGS="$SLKCFLAGS" \
CXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/wireguard-tools/README b/network/wireguard-tools/README
deleted file mode 100644
index 4769a806fe..0000000000
--- a/network/wireguard-tools/README
+++ /dev/null
@@ -1,20 +0,0 @@
-WireGuard is a VPN that uses state-of-the-art cryptography. It is
-designed as a general purpose VPN for running on embedded interfaces
-and super computers alike, fit for many different circumstances.
-
-WireGuard userspace tools require WireGuard support in the kernel (or
-as a kernel module). Refer to the wireguard-linux-compat script on
-Slackbuilds to build the associated kernel module package.
-
-openresolv is an optional runtime dependency -- you need it if you want
-to use to use wg-quick's DNS option.
-
-The wg-quick script needs at least nft 0.7 installed, if using nft.
-Slackware 14.2 ships with nftables 0.6. As such the build script
-will patch wg-quick to always fall back to iptables.
-
-If you have nftables 0.7 or newer installed (i.e. you are running
--current or a modified 14.2 installation), you may want to leave
-wg-quick unpatched by setting NEW_NFT as follows -:
-
-NEW_NFT=yes ./wireguard-tools.SlackBuild
diff --git a/network/wireguard-tools/slack-desc b/network/wireguard-tools/slack-desc
deleted file mode 100644
index 987bf40a55..0000000000
--- a/network/wireguard-tools/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------------------------------------------------------|
-wireguard-tools: wireguard-tools (Userspace tools to configure and use WireGuard)
-wireguard-tools:
-wireguard-tools: WireGuard is a VPN that uses state-of-the-art cryptography. It is
-wireguard-tools: designed as a general purpose VPN for running on embedded interfaces
-wireguard-tools: and super computers alike, fit for many different circumstances.
-wireguard-tools:
-wireguard-tools: https://www.wireguard.com/
-wireguard-tools:
-wireguard-tools:
-wireguard-tools:
-wireguard-tools:
diff --git a/network/wireguard-tools/wireguard-tools.SlackBuild b/network/wireguard-tools/wireguard-tools.SlackBuild
deleted file mode 100644
index 14099a1bd2..0000000000
--- a/network/wireguard-tools/wireguard-tools.SlackBuild
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for WireGuard userspace tools
-
-# Copyright 2017-2019 David Spencer, Baildon, West Yorkshire, U.K.
-# Copyright 2020-2021 Anj Duvnjak
-# 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=wireguard-tools
-VERSION=${VERSION:-1.0.20210315}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-PKGVER="$(printf %s "${VERSION}" | tr - _)"
-
-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 {} \;
-
-
-NEW_NFT=${NEW_NFT:-no}
-[[ $NEW_NFT != "no" ]] || sed -i 's/type -p nft/false/g' src/wg-quick/linux.bash ;
-
-
-# If you want this, you can have it :)
-SYSTEMD="${SYSTEMD:-no}"
-
-cd src
- env -u ARCH CFLAGS="$SLKCFLAGS" make
- env -u ARCH make install \
- MANDIR=/usr/man \
- DESTDIR=$PKG \
- WITH_WGQUICK=yes \
- WITH_SYSTEMDUNITS="$SYSTEMD"
-cd ..
-
-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-$PKGVER
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/wireguard-tools/wireguard-tools.info b/network/wireguard-tools/wireguard-tools.info
deleted file mode 100644
index 3200d7dd29..0000000000
--- a/network/wireguard-tools/wireguard-tools.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="wireguard-tools"
-VERSION="1.0.20210315"
-HOMEPAGE="https://www.wireguard.com/"
-DOWNLOAD="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20210315.tar.xz"
-MD5SUM="d6663d322ee5e5c4353838c6e9f98a1a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="wireguard-linux-compat"
-MAINTAINER="Anj Duvnjak"
-EMAIL="alvind11@hotmail.com"
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/krb5/krb5.SlackBuild b/network/x11spice/x11spice.SlackBuild
index 4f1fb3c106..5e984c8a70 100644
--- a/network/krb5/krb5.SlackBuild
+++ b/network/x11spice/x11spice.SlackBuild
@@ -1,9 +1,8 @@
#!/bin/sh
-# Slackware build script for krb5
+# Slackware build script for x11spice
-# Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA
-# Copyright 2015-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2018-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +22,8 @@
# 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.19.1}
+PRGNAM=x11spice
+VERSION=${VERSION:-20190820_51d2a8b}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -55,35 +54,34 @@ else
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.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 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-sed -i "/KRB5ROOT=/s/\/local//" src/util/ac_check_krb5.m4
+autoreconf -vi
-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 \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux
make
@@ -92,25 +90,15 @@ 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}
-rm -f $PKG/usr/man/man5/.*.5
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
+cp -a $DOCS $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/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/x11vnc/gcc10.patch b/network/x11vnc/gcc10.patch
new file mode 100644
index 0000000000..4934633860
--- /dev/null
+++ b/network/x11vnc/gcc10.patch
@@ -0,0 +1,42 @@
+From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Tue, 28 Jan 2020 22:21:01 +0300
+Subject: [PATCH] Fix build with -fno-common
+
+GCC 10 defaults to -fno-common
+---
+ src/util.c | 3 +++
+ src/util.h | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/util.c b/src/util.c
+index a82a1a4..6a52ebf 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -47,6 +47,9 @@ int hxl = 0;
+ #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
+ MUTEX(x11Mutex);
+ MUTEX(scrollMutex);
++MUTEX(clientMutex);
++MUTEX(inputMutex);
++MUTEX(pointerMutex);
+ #endif
+
+ int nfix(int i, int n);
+diff --git a/src/util.h b/src/util.h
+index 35c1afd..99b5dd1 100644
+--- a/src/util.h
++++ b/src/util.h
+@@ -102,9 +102,9 @@ extern struct timeval _mysleep;
+ #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
+ extern MUTEX(x11Mutex);
+ extern MUTEX(scrollMutex);
+-MUTEX(clientMutex);
+-MUTEX(inputMutex);
+-MUTEX(pointerMutex);
++extern MUTEX(clientMutex);
++extern MUTEX(inputMutex);
++extern MUTEX(pointerMutex);
+ #endif
+
+ #define X_INIT INIT_MUTEX(x11Mutex)
diff --git a/network/x11vnc/x11vnc.SlackBuild b/network/x11vnc/x11vnc.SlackBuild
index 53048bb837..c643e01d0f 100644
--- a/network/x11vnc/x11vnc.SlackBuild
+++ b/network/x11vnc/x11vnc.SlackBuild
@@ -78,6 +78,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/gcc10.patch
+
autoreconf -i
CFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/x2goclient/x2goclient.SlackBuild b/network/x2goclient/x2goclient.SlackBuild
index 488474a305..a419b479fe 100644
--- a/network/x2goclient/x2goclient.SlackBuild
+++ b/network/x2goclient/x2goclient.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=x2goclient
-VERSION=${VERSION:-4.1.2.1}
+VERSION=${VERSION:-4.1.2.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/x2goclient/x2goclient.info b/network/x2goclient/x2goclient.info
index 699c3abc5d..c360e03d0d 100644
--- a/network/x2goclient/x2goclient.info
+++ b/network/x2goclient/x2goclient.info
@@ -1,8 +1,8 @@
PRGNAM="x2goclient"
-VERSION="4.1.2.1"
+VERSION="4.1.2.2"
HOMEPAGE="http://www.x2go.org"
-DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.1.tar.gz"
-MD5SUM="0ed3b974ffec4e3bb1db40fb0be7b6d0"
+DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.2.tar.gz"
+MD5SUM="1390b794b0a10f0a885dd7cf00f2acef"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="nx-libs"
diff --git a/network/x2goserver/x2goserver.SlackBuild b/network/x2goserver/x2goserver.SlackBuild
index ba82397547..2086829f76 100644
--- a/network/x2goserver/x2goserver.SlackBuild
+++ b/network/x2goserver/x2goserver.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=x2goserver
-VERSION=${VERSION:-20190625_b3ec119}
+VERSION=${VERSION:-20201227_08aa5e6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/x2goserver/x2goserver.info b/network/x2goserver/x2goserver.info
index 9e20cd4df2..7dfbf73d3a 100644
--- a/network/x2goserver/x2goserver.info
+++ b/network/x2goserver/x2goserver.info
@@ -1,8 +1,8 @@
PRGNAM="x2goserver"
-VERSION="20190625_b3ec119"
+VERSION="20201227_08aa5e6"
HOMEPAGE="http://www.x2go.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/x2goserver-20190625_b3ec119.tar.xz"
-MD5SUM="031e3d92dfd06f22de3052360c524367"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/x2goserver-20201227_08aa5e6.tar.xz"
+MD5SUM="46aad829313b85218841e1f818244a06"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="nx-libs perl-Config-Simple perl-File-ReadBackwards perl-DBD-SQLite perl-Capture-Tiny perl-Try-Tiny perl-Unix-Syslog perl-file-basedir perl-Switch"
diff --git a/network/xaric/xaric.SlackBuild b/network/xaric/xaric.SlackBuild
index c729e5fbd8..e80a1ad274 100644
--- a/network/xaric/xaric.SlackBuild
+++ b/network/xaric/xaric.SlackBuild
@@ -54,7 +54,7 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
sed -i 's,/usr/local,/usr,' $PRGNAM.1
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \