summaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
Diffstat (limited to 'network')
-rw-r--r--network/2ping/2ping.SlackBuild4
-rw-r--r--network/2ping/2ping.info6
-rw-r--r--network/3proxy/3proxy.SlackBuild4
-rw-r--r--network/3proxy/3proxy.info6
-rw-r--r--network/AdGuardHome/AdGuardHome.SlackBuild86
-rw-r--r--network/AdGuardHome/AdGuardHome.info10
-rw-r--r--network/AdGuardHome/README17
-rw-r--r--network/AdGuardHome/README.SBo19
-rw-r--r--network/AdGuardHome/doinst.sh25
-rw-r--r--network/AdGuardHome/rc.AdGuardHome54
-rw-r--r--network/AdGuardHome/slack-desc19
-rw-r--r--network/Electrum/Electrum.info2
-rw-r--r--network/NetworkManager-l2tp/slack-desc24
-rw-r--r--network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild10
-rw-r--r--network/NetworkManager-pptp/NetworkManager-pptp.info6
-rw-r--r--network/NetworkManager-ssh/README3
-rw-r--r--network/Pafy/Pafy.SlackBuild10
-rw-r--r--network/Pafy/Pafy.info8
-rw-r--r--network/Pafy/README2
-rw-r--r--network/Quaternion/Quaternion.SlackBuild108
-rw-r--r--network/Quaternion/Quaternion.info10
-rw-r--r--network/Quaternion/README12
-rw-r--r--network/Quaternion/doinst.sh7
-rw-r--r--network/Quaternion/slack-desc12
-rw-r--r--network/RSSOwl/README5
-rw-r--r--network/RSSOwl/RSSOwl.SlackBuild93
-rw-r--r--network/RSSOwl/RSSOwl.desktop10
-rw-r--r--network/RSSOwl/RSSOwl.info10
-rw-r--r--network/RSSOwl/doinst.sh4
-rw-r--r--network/RSSOwl/slack-desc19
-rw-r--r--network/SoulseekQt/SoulseekQt.SlackBuild11
-rw-r--r--network/SoulseekQt/SoulseekQt.info4
-rw-r--r--network/SpiderOakONE/SpiderOakONE.SlackBuild3
-rw-r--r--network/TeamSpeak3/TeamSpeak3.info6
-rw-r--r--network/WhatWeb/slack-desc10
-rw-r--r--network/WireGuard/README12
-rw-r--r--network/WireGuard/WireGuard.info10
-rw-r--r--network/WireGuard/slack-desc19
-rw-r--r--network/acme.sh/README4
-rw-r--r--network/acme.sh/acme.sh.SlackBuild19
-rw-r--r--network/acme.sh/acme.sh.info6
-rw-r--r--network/aircrack-ng/aircrack-ng.SlackBuild12
-rw-r--r--network/aircrack-ng/aircrack-ng.info6
-rw-r--r--network/anydesk/anydesk.SlackBuild2
-rw-r--r--network/anydesk/anydesk.info8
-rw-r--r--network/aria2/aria2.SlackBuild2
-rw-r--r--network/arno-iptables-firewall/README33
-rw-r--r--network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild48
-rw-r--r--network/arno-iptables-firewall/arno-iptables-firewall.info8
-rw-r--r--network/arno-iptables-firewall/files/patch-configuration-file.diff12
-rw-r--r--network/arno-iptables-firewall/files/patch-configuration-script.diff161
-rw-r--r--network/arno-iptables-firewall/files/patch-startup-script.diff17
-rw-r--r--network/arno-iptables-firewall/slack-desc2
-rw-r--r--network/arping/arping.SlackBuild11
-rw-r--r--network/arping/arping.info10
-rw-r--r--network/asterisk/README.SBo4
-rw-r--r--network/asterisk/asterisk.SlackBuild5
-rw-r--r--network/asterisk/asterisk.info74
-rw-r--r--network/atftp/atftp.SlackBuild11
-rw-r--r--network/atftp/atftp.info6
-rw-r--r--network/atheme/atheme.SlackBuild2
-rw-r--r--network/atheme/atheme.info2
-rw-r--r--network/awscli/awscli.SlackBuild4
-rw-r--r--network/awscli/awscli.info6
-rw-r--r--network/axel/axel.SlackBuild4
-rw-r--r--network/axel/axel.info6
-rw-r--r--network/barrier/barrier.info2
-rw-r--r--network/basilisk-bin/basilisk-bin.SlackBuild2
-rw-r--r--network/basilisk-bin/basilisk-bin.info4
-rw-r--r--network/basilisk/README5
-rw-r--r--network/basilisk/basilisk.SlackBuild7
-rw-r--r--network/basilisk/basilisk.info6
-rw-r--r--network/basilisk/glibc-2.30+.patch43
-rw-r--r--network/bitcoin/README6
-rw-r--r--network/bitcoin/bitcoin.SlackBuild2
-rw-r--r--network/bitcoin/bitcoin.info6
-rw-r--r--network/bluejeans/bluejeans.SlackBuild30
-rw-r--r--network/bluejeans/bluejeans.info10
-rw-r--r--network/bottle/bottle.SlackBuild8
-rw-r--r--network/bottle/bottle.info8
-rw-r--r--network/bozohttpd/bozohttpd.SlackBuild4
-rw-r--r--network/bozohttpd/bozohttpd.info6
-rw-r--r--network/brave-browser/README16
-rw-r--r--network/brave-browser/brave-browser.SlackBuild7
-rw-r--r--network/brave-browser/brave-browser.info10
-rw-r--r--network/brave-browser/doinst.sh2
-rw-r--r--network/brave-browser/slack-desc16
-rw-r--r--network/cherokee/cherokee.info4
-rw-r--r--network/chrony/chrony.SlackBuild4
-rw-r--r--network/chrony/chrony.info6
-rw-r--r--network/chrony/rc.chrony9
-rw-r--r--network/clipgrab/clipgrab.SlackBuild4
-rw-r--r--network/clipgrab/clipgrab.info8
-rw-r--r--network/cni-plugins/README47
-rw-r--r--network/cni-plugins/cni-plugins.SlackBuild108
-rw-r--r--network/cni-plugins/cni-plugins.info10
-rw-r--r--network/cni-plugins/slack-desc19
-rw-r--r--network/createrepo_c/README9
-rw-r--r--network/createrepo_c/createrepo_c.info10
-rw-r--r--network/ctorrent/ctorrent.SlackBuild8
-rw-r--r--network/ctorrent/ctorrent.info2
-rw-r--r--network/deluge/deluge.SlackBuild16
-rw-r--r--network/deluge/deluge.info12
-rw-r--r--network/discord/discord.SlackBuild6
-rw-r--r--network/discord/discord.info6
-rw-r--r--network/dissenter-browser/dissenter-browser.SlackBuild4
-rw-r--r--network/dissenter-browser/dissenter-browser.info6
-rw-r--r--network/dmitry/dmitry.SlackBuild38
-rw-r--r--network/dmitry/dmitry.info6
-rw-r--r--network/dmitry/slack-desc10
-rw-r--r--network/dokuwiki/dokuwiki.SlackBuild2
-rw-r--r--network/dothost/README20
-rw-r--r--network/dothost/dothost.SlackBuild19
-rw-r--r--network/dothost/dothost.info8
-rw-r--r--network/dothost/slack-desc2
-rw-r--r--network/dropbox/dropbox.SlackBuild18
-rw-r--r--network/dropbox/dropbox.info14
-rw-r--r--network/ekiga/ekiga.SlackBuild2
-rw-r--r--network/ekiga/ekiga.info2
-rw-r--r--network/elemental-ircd/elemental-ircd.SlackBuild1
-rw-r--r--network/elinks/elinks.SlackBuild4
-rw-r--r--network/elinks/elinks.info2
-rw-r--r--network/elinks/patches/0001-gopher_html_links.patch21
-rw-r--r--network/elinks/patches/0002-gopher_index_queries.patch161
-rw-r--r--network/elinks/patches/0003-gopher_directory_links.patch59
-rw-r--r--network/elinks/patches/0004-ssl_cert_verify.patch10
-rw-r--r--network/elinks/patches/0005-gopher_newlines_tabs_entity.patch89
-rw-r--r--network/elinks/patches/0006-gopher-indexes_nocr.patch19
-rw-r--r--network/elinks/patches/0006-indexes_nocr.patch62
-rw-r--r--network/elinks/patches/0007-gopher-move_null.patch16
-rw-r--r--network/elinks/patches/0007-move_null.patch16
-rw-r--r--network/elinks/patches/0008-gopher-html-entities.patch47
-rw-r--r--network/emailrelay/emailrelay.info2
-rw-r--r--network/exim/README.SBo6
-rw-r--r--network/exim/exim.Makefile219
-rw-r--r--network/exim/exim.SlackBuild5
-rw-r--r--network/exim/exim.info6
-rw-r--r--network/firewalld/README4
-rw-r--r--network/firewalld/README.SLACKWARE20
-rw-r--r--network/firewalld/doinst.sh3
-rw-r--r--network/firewalld/firewalld.SlackBuild20
-rw-r--r--network/firewalld/init.patch11
-rw-r--r--network/firewalld/rc.firewalld56
-rw-r--r--network/flexget/flexget.SlackBuild5
-rw-r--r--network/fping/README4
-rw-r--r--network/fping/fping.SlackBuild101
-rw-r--r--network/fping/fping.info10
-rw-r--r--network/fping6/README4
-rw-r--r--network/fping6/README.SLACKWARE6
-rw-r--r--network/fping6/fping.8.diff66
-rw-r--r--network/fping6/fping.c.diff421
-rw-r--r--network/fping6/fping6.SlackBuild114
-rw-r--r--network/fping6/fping6.info10
-rw-r--r--network/fping6/slack-desc19
-rw-r--r--network/geomyidae/geomyidae.SlackBuild2
-rw-r--r--network/geomyidae/geomyidae.info4
-rw-r--r--network/glewlwyd/README7
-rw-r--r--network/glewlwyd/glewlwyd.SlackBuild20
-rw-r--r--network/glewlwyd/glewlwyd.info6
-rw-r--r--network/glewlwyd/slack-desc2
-rw-r--r--network/gnome-bluetooth/slack-desc2
-rw-r--r--network/go-ipfs/go-ipfs.SlackBuild4
-rw-r--r--network/go-ipfs/go-ipfs.info12
-rw-r--r--network/gofiche/gofiche.SlackBuild2
-rw-r--r--network/gofiche/gofiche.info2
-rw-r--r--network/googler/googler.SlackBuild2
-rw-r--r--network/googler/googler.info6
-rw-r--r--network/guacamole-client/guacamole-client.SlackBuild4
-rw-r--r--network/guacamole-client/guacamole-client.info6
-rw-r--r--network/guacamole-client/slack-desc2
-rw-r--r--network/guacamole-server/guacamole-server.SlackBuild4
-rw-r--r--network/guacamole-server/guacamole-server.info6
-rw-r--r--network/guacamole-server/slack-desc2
-rw-r--r--network/haskell-network-multicast/README5
-rw-r--r--network/haskell-network-multicast/doinst.sh1
-rw-r--r--network/haskell-network-multicast/haskell-network-multicast.SlackBuild (renamed from network/tramp/tramp.SlackBuild)62
-rw-r--r--network/haskell-network-multicast/haskell-network-multicast.info10
-rw-r--r--network/haskell-network-multicast/slack-desc19
-rw-r--r--network/hiawatha/README18
-rw-r--r--network/hiawatha/hiawatha.SlackBuild22
-rw-r--r--network/hiawatha/hiawatha.info6
-rw-r--r--network/hiawatha/slack-desc14
-rw-r--r--network/hipchat/README7
-rw-r--r--network/hipchat/hipchat.SlackBuild80
-rw-r--r--network/hipchat/hipchat.info10
-rw-r--r--network/hipchat2/README4
-rw-r--r--network/hipchat2/hipchat2.SlackBuild79
-rw-r--r--network/hipchat2/hipchat2.info10
-rw-r--r--network/hipchat2/slack-desc19
-rw-r--r--network/hostapd/hostapd.SlackBuild6
-rw-r--r--network/hostapd/hostapd.defconfig119
-rw-r--r--network/hostapd/hostapd.info6
-rw-r--r--network/hostapd/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch73
-rw-r--r--network/hostapd/patches/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch44
-rw-r--r--network/hostapd/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch174
-rw-r--r--network/hostapd/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch250
-rw-r--r--network/hostapd/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch184
-rw-r--r--network/hostapd/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch79
-rw-r--r--network/hostapd/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch64
-rw-r--r--network/hostapd/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch132
-rw-r--r--network/hostapd/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch82
-rw-r--r--network/httpie/httpie.SlackBuild7
-rw-r--r--network/hylafax+/README2
-rw-r--r--network/hylafax+/hylafax+.SlackBuild4
-rw-r--r--network/hylafax+/hylafax+.info6
-rw-r--r--network/igmpproxy/slack-desc2
-rw-r--r--network/imapfilter/imapfilter.SlackBuild4
-rw-r--r--network/imapfilter/imapfilter.info6
-rw-r--r--network/inadyn/doinst.sh3
-rw-r--r--network/inadyn/inadyn.SlackBuild17
-rw-r--r--network/inadyn/inadyn.info10
-rw-r--r--network/inadyn/rc.inadyn9
-rw-r--r--network/inadyn/slack-desc10
-rw-r--r--network/insync/README3
-rw-r--r--network/insync/insync.SlackBuild7
-rw-r--r--network/insync/insync.info14
-rw-r--r--network/insync/slack-desc4
-rw-r--r--network/ip2location-c/README16
-rw-r--r--network/ip2location-c/ip2location-c.SlackBuild5
-rw-r--r--network/ip2location-c/ip2location-c.info8
-rw-r--r--network/ip2location-c/slack-desc14
-rw-r--r--network/ipscan/ipscan.SlackBuild4
-rw-r--r--network/ipscan/ipscan.info14
-rw-r--r--network/iptv-analyzer/iptv-analyzer.SlackBuild1
-rw-r--r--network/ipv6calc/README1
-rw-r--r--network/ipv6calc/ipv6calc.SlackBuild28
-rw-r--r--network/ipv6calc/ipv6calc.info8
-rw-r--r--network/ipvsadm/ipvsadm-1.25-popt.patch19
-rw-r--r--network/ipvsadm/ipvsadm.SlackBuild21
-rw-r--r--network/ipvsadm/ipvsadm.info10
-rw-r--r--network/ircd-hybrid/ircd-hybrid.SlackBuild6
-rw-r--r--network/ircd-hybrid/ircd-hybrid.info6
-rw-r--r--network/isync/README.SLACKWARE32
-rw-r--r--network/isync/isync.SlackBuild6
-rw-r--r--network/isync/isync.info6
-rw-r--r--network/keepalived/keepalived.info4
-rw-r--r--network/konversation/konversation.SlackBuild7
-rw-r--r--network/konversation/konversation.info10
-rw-r--r--network/krb5/krb5.SlackBuild9
-rw-r--r--network/krb5/krb5.info6
-rw-r--r--network/kubectl/README2
-rw-r--r--network/kubectl/kubectl.SlackBuild (renamed from network/createrepo_c/createrepo_c.SlackBuild)39
-rw-r--r--network/kubectl/kubectl.info10
-rw-r--r--network/kubectl/slack-desc (renamed from network/hipchat/slack-desc)22
-rw-r--r--network/libcapi20/libcapi20.info2
-rw-r--r--network/libmaxminddb/libmaxminddb.SlackBuild2
-rw-r--r--network/libmaxminddb/libmaxminddb.info6
-rw-r--r--network/limnoria/limnoria.SlackBuild2
-rw-r--r--network/limnoria/limnoria.info2
-rw-r--r--network/linksys-tftp/README19
-rw-r--r--network/linksys-tftp/linksys-tftp-1.2.1-r1-Makefile.patch28
-rw-r--r--network/linksys-tftp/linksys-tftp-1.2.1-r1-header.patch52
-rw-r--r--network/linksys-tftp/linksys-tftp.SlackBuild78
-rw-r--r--network/linksys-tftp/linksys-tftp.info10
-rw-r--r--network/linksys-tftp/slack-desc (renamed from network/createrepo_c/slack-desc)22
-rw-r--r--network/lxi-tools/lxi-gui.desktop2
-rw-r--r--network/macchanger/README16
-rw-r--r--network/macchanger/macchanger.SlackBuild59
-rw-r--r--network/macchanger/macchanger.info10
-rw-r--r--network/macchanger/slack-desc6
-rw-r--r--network/mailspring/README9
-rw-r--r--network/mailspring/doinst.sh6
-rw-r--r--network/mailspring/mailspring.SlackBuild83
-rw-r--r--network/mailspring/mailspring.info10
-rw-r--r--network/mailspring/slack-desc19
-rw-r--r--network/mattermost-desktop/doinst.sh6
-rw-r--r--network/mattermost-desktop/mattermost-desktop.SlackBuild13
-rw-r--r--network/mattermost-desktop/mattermost-desktop.info10
-rw-r--r--network/metasploit/metasploit.info4
-rw-r--r--network/milter-greylist/milter-greylist.SlackBuild2
-rw-r--r--network/milter-greylist/milter-greylist.info2
-rw-r--r--network/milter-greylist/rc.milter-greylist.new2
-rw-r--r--network/mkvserver_mk2/slack-desc2
-rw-r--r--network/mosh/mosh.info4
-rw-r--r--network/mumble/README5
-rw-r--r--network/mumble/libspeechd_header.patch12
-rw-r--r--network/mumble/mumble.SlackBuild34
-rw-r--r--network/mumble/mumble.info8
-rw-r--r--network/murmur/README3
-rw-r--r--network/murmur/murmur.SlackBuild6
-rw-r--r--network/murmur/murmur.info8
-rw-r--r--network/mysecureshell/mysecureshell.info4
-rw-r--r--network/nbtscan/nbtscan.info4
-rw-r--r--network/neomutt/doinst.sh6
-rw-r--r--network/neomutt/neomutt.SlackBuild31
-rw-r--r--network/neomutt/neomutt.info6
-rw-r--r--network/netcat-openbsd/README20
-rw-r--r--network/netcat-openbsd/netcat-openbsd.SlackBuild11
-rw-r--r--network/netcat-openbsd/netcat-openbsd.info12
-rw-r--r--network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch350
-rw-r--r--network/netcat-openbsd/patches/0002-build-without-TLS-support.patch872
-rw-r--r--network/netcat-openbsd/patches/0003-connect-timeout.patch (renamed from network/netcat-openbsd/patches/0002-connect-timeout.patch)47
-rw-r--r--network/netcat-openbsd/patches/0003-get-sev-by-name.patch34
-rw-r--r--network/netcat-openbsd/patches/0004-get-sev-by-name.patch28
-rw-r--r--network/netcat-openbsd/patches/0004-poll-hup.patch59
-rw-r--r--network/netcat-openbsd/patches/0005-send-crlf.patch222
-rw-r--r--network/netcat-openbsd/patches/0006-quit-timer.patch156
-rw-r--r--network/netcat-openbsd/patches/0007-udp-scan-timeout.patch22
-rw-r--r--network/netcat-openbsd/patches/0008-dccp-support.patch235
-rw-r--r--network/netcat-openbsd/patches/0008-verbose-numeric-port.patch106
-rw-r--r--network/netcat-openbsd/patches/0009-broadcast-support.patch89
-rw-r--r--network/netcat-openbsd/patches/0009-dccp-support.patch304
-rw-r--r--network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch72
-rw-r--r--network/netcat-openbsd/patches/0011-misc-failures-and-features.patch457
-rw-r--r--network/netcat-openbsd/patches/0011-set-TCP-MD5SIG-correctly-for-client-connections.patch101
-rw-r--r--network/netcat-openbsd/patches/0012-destination-port-list.patch191
-rw-r--r--network/netcat-openbsd/patches/0013-use-flags-to-specify-listen-address.patch108
-rw-r--r--network/netcat-openbsd/patches/0014-misc-failures-and-features.patch145
-rw-r--r--network/netdiscover/netdiscover.SlackBuild4
-rw-r--r--network/netdiscover/netdiscover.info6
-rw-r--r--network/newsboat/newsboat.SlackBuild4
-rw-r--r--network/newsboat/newsboat.info26
-rw-r--r--network/nordvpn/README16
-rw-r--r--network/nordvpn/nordvpn.SlackBuild4
-rw-r--r--network/nordvpn/nordvpn.info6
-rw-r--r--network/nsd/nsd.SlackBuild79
-rw-r--r--network/nsd/nsd.info8
-rw-r--r--network/nsd/slack-desc2
-rw-r--r--network/oinkmaster/oinkmaster.SlackBuild2
-rw-r--r--network/oinkmaster/oinkmaster.info2
-rw-r--r--network/onedrive/README16
-rw-r--r--network/onedrive/doinst.sh15
-rw-r--r--network/onedrive/onedrive.SlackBuild8
-rw-r--r--network/onedrive/onedrive.info6
-rw-r--r--network/onedrive/slack-desc4
-rw-r--r--network/onioncat/onioncat.SlackBuild4
-rw-r--r--network/onioncat/onioncat.info6
-rw-r--r--network/openresolv/openresolv.SlackBuild8
-rw-r--r--network/openresolv/openresolv.info6
-rw-r--r--network/openresolv/update-resolv-conf2
-rw-r--r--network/opensmtpd-extras/README14
-rw-r--r--network/opensmtpd/openbsd64-020-smtpd.patch4
-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.SlackBuild13
-rw-r--r--network/opera-developer/README2
-rw-r--r--network/opera-developer/opera-developer.SlackBuild6
-rw-r--r--network/opera-developer/opera-developer.info6
-rw-r--r--network/opera-developer/slack-desc2
-rw-r--r--network/opera/README2
-rw-r--r--network/opera/opera.SlackBuild4
-rw-r--r--network/opera/opera.info6
-rw-r--r--network/otter/otter.SlackBuild5
-rw-r--r--network/pCloudDrive/README42
-rw-r--r--network/pCloudDrive/doinst.sh (renamed from network/hipchat2/doinst.sh)1
-rw-r--r--network/pCloudDrive/pCloudDrive.SlackBuild82
-rw-r--r--network/pCloudDrive/pCloudDrive.info10
-rw-r--r--network/pCloudDrive/pclouddrive.desktop9
-rw-r--r--network/pCloudDrive/slack-desc19
-rw-r--r--network/packETH/packETH.SlackBuild4
-rw-r--r--network/palemoon-bin/palemoon-bin.SlackBuild4
-rw-r--r--network/palemoon-bin/palemoon-bin.info10
-rw-r--r--network/palemoon/glibc-2.30+.patch43
-rw-r--r--network/palemoon/palemoon.SlackBuild25
-rw-r--r--network/palemoon/palemoon.info8
-rw-r--r--network/persepolis/persepolis.SlackBuild2
-rw-r--r--network/persepolis/persepolis.info2
-rw-r--r--network/pexip-infinity-connect/README5
-rw-r--r--network/pexip-infinity-connect/doinst.sh3
-rw-r--r--network/pexip-infinity-connect/pexip-infinity-connect.SlackBuild76
-rw-r--r--network/pexip-infinity-connect/pexip-infinity-connect.desktop11
-rw-r--r--network/pexip-infinity-connect/pexip-infinity-connect.info10
-rw-r--r--network/pexip-infinity-connect/slack-desc19
-rw-r--r--network/pirate-get/pirate-get.SlackBuild6
-rw-r--r--network/pirate-get/pirate-get.info8
-rw-r--r--network/pmacct/slack-desc1
-rw-r--r--network/pptp/pptp.info4
-rw-r--r--network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.SlackBuild4
-rw-r--r--network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.info6
-rw-r--r--network/prosody-mod-http-upload/prosody-mod-http-upload.SlackBuild4
-rw-r--r--network/prosody-mod-http-upload/prosody-mod-http-upload.info6
-rw-r--r--network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.SlackBuild4
-rw-r--r--network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.info6
-rw-r--r--network/prosody-mod-smacks-offline/slack-desc2
-rw-r--r--network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild4
-rw-r--r--network/prosody-mod-smacks/prosody-mod-smacks.info6
-rw-r--r--network/prosody-mod-smacks/slack-desc2
-rw-r--r--network/prosody-mod-vcard-muc/slack-desc2
-rw-r--r--network/proxychains/proxychains.info2
-rw-r--r--network/psi-plus/psi-plus.SlackBuild2
-rw-r--r--network/psi-plus/psi-plus.info2
-rw-r--r--network/pure-ftpd/pure-ftpd.SlackBuild4
-rw-r--r--network/pure-ftpd/pure-ftpd.info6
-rw-r--r--network/purple-facebook/purple-facebook.SlackBuild2
-rw-r--r--network/purple-facebook/purple-facebook.info2
-rw-r--r--network/purple-hangouts/purple-hangouts.info2
-rw-r--r--network/purple-plugin-pack/purple-plugin-pack.SlackBuild2
-rw-r--r--network/purple-plugin-pack/purple-plugin-pack.info2
-rw-r--r--network/pyNeighborhood/pyNeighborhood.SlackBuild2
-rw-r--r--network/pyNeighborhood/pyNeighborhood.info2
-rw-r--r--network/pyzor/pyzor.SlackBuild2
-rw-r--r--network/pyzor/pyzor.info4
-rw-r--r--network/qbittorrent-qt5/README12
-rw-r--r--network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild7
-rw-r--r--network/qbittorrent-qt5/qbittorrent-qt5.info10
-rw-r--r--network/qbittorrent-qt5/slack-desc16
-rw-r--r--network/qbittorrent/qbittorrent.SlackBuild2
-rw-r--r--network/qbittorrent/qbittorrent.info4
-rw-r--r--network/qtmib/README16
-rw-r--r--network/qtmib/qtmib.SlackBuild18
-rw-r--r--network/qtmib/qtmib.info4
-rw-r--r--network/qtmib/slack-desc8
-rw-r--r--network/qutebrowser-tox/README15
-rw-r--r--network/qutebrowser-tox/README.SBo34
-rw-r--r--network/qutebrowser-tox/README.SBo.Widevine20
-rw-r--r--network/qutebrowser-tox/doinst.sh (renamed from network/hipchat/doinst.sh)0
-rw-r--r--network/qutebrowser-tox/qutebrowser-tox.SlackBuild153
-rw-r--r--network/qutebrowser-tox/qutebrowser-tox.info42
-rw-r--r--network/qutebrowser-tox/slack-desc19
-rw-r--r--network/qutebrowser-tox/wrapper.qutebrowser3
-rw-r--r--network/qutebrowser/qutebrowser.SlackBuild4
-rw-r--r--network/qutebrowser/qutebrowser.info8
-rw-r--r--network/r8168/r8168.SlackBuild4
-rw-r--r--network/r8168/r8168.info6
-rw-r--r--network/radicale/radicale.SlackBuild2
-rw-r--r--network/radicale/radicale.info2
-rw-r--r--network/remmina/remmina.SlackBuild1
-rw-r--r--network/remmina/remmina.desktop2
-rw-r--r--network/republicanywhere/republicanywhere.info2
-rw-r--r--network/resilio-sync/README17
-rw-r--r--network/resilio-sync/resilio-sync.SlackBuild85
-rw-r--r--network/resilio-sync/resilio-sync.info10
-rw-r--r--network/resilio-sync/rslsync-usermode7
-rw-r--r--network/resilio-sync/slack-desc19
-rw-r--r--network/riot-web/README10
-rw-r--r--network/riot-web/doinst.sh3
-rw-r--r--network/riot-web/riot-web.SlackBuild8
-rw-r--r--network/riot-web/riot-web.info6
-rw-r--r--network/rspamd/slack-desc7
-rw-r--r--network/s-nail/s-nail.SlackBuild4
-rw-r--r--network/s-nail/s-nail.info6
-rw-r--r--network/sabnzbd/sabnzbd.SlackBuild2
-rw-r--r--network/sabnzbd/sabnzbd.info6
-rw-r--r--network/sfeed/README2
-rw-r--r--network/sfeed/README.SLACKWARE8
-rw-r--r--network/sfeed/sfeed.SlackBuild4
-rw-r--r--network/sfeed/sfeed.info6
-rw-r--r--network/shadowsocks-libev/shadowsocks-libev.SlackBuild4
-rw-r--r--network/shadowsocks-libev/shadowsocks-libev.info6
-rw-r--r--network/shorewall-core/shorewall-core.SlackBuild2
-rw-r--r--network/shorewall-core/shorewall-core.info8
-rw-r--r--network/shorewall/shorewall.SlackBuild2
-rw-r--r--network/shorewall/shorewall.info8
-rw-r--r--network/shorewall6/shorewall6.SlackBuild2
-rw-r--r--network/shorewall6/shorewall6.info8
-rw-r--r--network/sic/sic.SlackBuild6
-rw-r--r--network/sic/sic.info6
-rw-r--r--network/signal-desktop/signal-desktop.SlackBuild2
-rw-r--r--network/signal-desktop/signal-desktop.info6
-rw-r--r--network/skypeforlinux/skypeforlinux.SlackBuild2
-rw-r--r--network/skypeforlinux/skypeforlinux.info6
-rw-r--r--network/slack/slack.SlackBuild2
-rw-r--r--network/slack/slack.info6
-rw-r--r--network/slimjet/files/slimjet.desktop224
-rw-r--r--network/slimjet/slimjet.SlackBuild9
-rw-r--r--network/slimjet/slimjet.info6
-rw-r--r--network/slirp4netns/slirp4netns.SlackBuild2
-rw-r--r--network/slirp4netns/slirp4netns.info6
-rw-r--r--network/slurm/slurm.SlackBuild2
-rw-r--r--network/slurm/slurm.info6
-rw-r--r--network/smstools3/smstools3.SlackBuild2
-rw-r--r--network/smstools3/smstools3.info2
-rw-r--r--network/snmpsim/snmpsim.info4
-rw-r--r--network/spamassassin/spamassassin.SlackBuild4
-rw-r--r--network/spamassassin/spamassassin.info10
-rw-r--r--network/speedtest-cli/README2
-rw-r--r--network/speedtest-cli/speedtest-cli.SlackBuild9
-rw-r--r--network/squirrelmail/README8
-rw-r--r--network/squirrelmail/config.php177
-rw-r--r--network/squirrelmail/config_local.php18
-rw-r--r--network/squirrelmail/doinst.sh2
-rw-r--r--network/squirrelmail/slack-desc18
-rw-r--r--network/squirrelmail/squirrelmail.SlackBuild173
-rw-r--r--network/squirrelmail/squirrelmail.conf36
-rw-r--r--network/squirrelmail/squirrelmail.cron5
-rw-r--r--network/squirrelmail/squirrelmail.info12
-rw-r--r--network/sshfs-fuse/README2
-rw-r--r--network/sshfs-fuse/fixrst.diff22
-rw-r--r--network/sshfs-fuse/sshfs-fuse.SlackBuild76
-rw-r--r--network/sshfs-fuse/sshfs-fuse.info12
-rw-r--r--network/sshfs-fuse/sshfs.1.gzbin0 -> 4809 bytes
-rw-r--r--network/sshpass/sshpass.SlackBuild7
-rw-r--r--network/sshpass/sshpass.info10
-rw-r--r--network/sshuttle/sshuttle.SlackBuild3
-rw-r--r--network/sshuttle/sshuttle.info12
-rw-r--r--network/ssmtp/ssmtp.SlackBuild3
-rw-r--r--network/ssmtp/ssmtp.info4
-rw-r--r--network/surfraw/surfraw.SlackBuild10
-rw-r--r--network/swaks/slack-desc2
-rw-r--r--network/syncthing/syncthing.SlackBuild2
-rw-r--r--network/syncthing/syncthing.info10
-rw-r--r--network/synergy/020_toolchain_commands.diff41
-rw-r--r--network/synergy/synergy.SlackBuild27
-rw-r--r--network/synergy/synergy.info10
-rw-r--r--network/t38modem/README19
-rw-r--r--network/t38modem/doinst.sh26
-rw-r--r--network/t38modem/rc.t38modem152
-rw-r--r--network/t38modem/rc.t38modem.conf40
-rw-r--r--network/t38modem/resetmodem28
-rw-r--r--network/t38modem/slack-desc2
-rw-r--r--network/t38modem/t38modem.SlackBuild35
-rw-r--r--network/t38modem/t38modem.info14
-rw-r--r--network/teams/README7
-rw-r--r--network/teams/slack-desc (renamed from network/fping/slack-desc)22
-rw-r--r--network/teams/teams.SlackBuild65
-rw-r--r--network/teams/teams.info10
-rw-r--r--network/teamviewer/teamviewer.SlackBuild2
-rw-r--r--network/teamviewer/teamviewer.info10
-rw-r--r--network/telegram/telegram.SlackBuild2
-rw-r--r--network/telegram/telegram.info10
-rw-r--r--network/tinyproxy/tinyproxy.SlackBuild26
-rw-r--r--network/tinyproxy/tinyproxy.info10
-rw-r--r--network/tor-browser/README2
-rw-r--r--network/tor-browser/tor-browser.SlackBuild4
-rw-r--r--network/tor-browser/tor-browser.info10
-rw-r--r--network/tor/README.SLACKWARE10
-rw-r--r--network/tor/tor.SlackBuild8
-rw-r--r--network/tor/tor.info10
-rw-r--r--network/torsocks/torsocks.SlackBuild2
-rw-r--r--network/torsocks/torsocks.info6
-rw-r--r--network/tramp/README8
-rw-r--r--network/tramp/slack-desc19
-rw-r--r--network/tramp/tramp.info10
-rw-r--r--network/transgui/transgui.SlackBuild4
-rw-r--r--network/transgui/transgui.info6
-rw-r--r--network/twine/README6
-rw-r--r--network/twine/slack-desc6
-rw-r--r--network/twine/twine.SlackBuild6
-rw-r--r--network/twine/twine.info8
-rw-r--r--network/ucarp/getopt.patch12
-rw-r--r--network/ucarp/ucarp.SlackBuild14
-rw-r--r--network/uget-chrome-wrapper/uget-chrome-wrapper.SlackBuild2
-rw-r--r--network/uget-integrator/README13
-rw-r--r--network/uget-integrator/slack-desc19
-rw-r--r--network/uget-integrator/uget-integrator.SlackBuild (renamed from network/qbittorrent-qt5/])98
-rw-r--r--network/uget-integrator/uget-integrator.info10
-rw-r--r--network/uget/uget.SlackBuild30
-rw-r--r--network/uget/uget.info6
-rw-r--r--network/unbound/unbound.SlackBuild2
-rw-r--r--network/unbound/unbound.info6
-rw-r--r--network/varnish/varnish.SlackBuild13
-rw-r--r--network/varnish/varnish.info12
-rw-r--r--network/vivaldi/README5
-rw-r--r--network/vivaldi/vivaldi.SlackBuild28
-rw-r--r--network/vivaldi/vivaldi.info26
-rw-r--r--network/vnstat/vnstat.SlackBuild4
-rw-r--r--network/vnstat/vnstat.info6
-rw-r--r--network/vpnc/vpnc.info4
-rw-r--r--network/w3m/w3m.SlackBuild2
-rw-r--r--network/w3m/w3m.info2
-rw-r--r--network/waterfox/slack-desc2
-rw-r--r--network/waterfox/waterfox.SlackBuild11
-rw-r--r--network/waterfox/waterfox.info6
-rw-r--r--network/wavemon/wavemon.info2
-rw-r--r--network/webhook/README24
-rw-r--r--network/webhook/doinst.sh25
-rw-r--r--network/webhook/slack-desc19
-rw-r--r--network/webhook/webhook-wrapper.sh36
-rw-r--r--network/webhook/webhook.SlackBuild85
-rw-r--r--network/webhook/webhook.info10
-rw-r--r--network/webhook/webhook.init69
-rw-r--r--network/webhook/webhook.logrotate6
-rw-r--r--network/webhook/webhook.sysconfig23
-rw-r--r--network/weechat/README11
-rw-r--r--network/weechat/weechat.SlackBuild16
-rw-r--r--network/weechat/weechat.info6
-rw-r--r--network/wifi-radar/wifi-radar.SlackBuild2
-rw-r--r--network/wifi-radar/wifi-radar.info2
-rw-r--r--network/wildfly/wildfly.SlackBuild2
-rw-r--r--network/wildfly/wildfly.info8
-rw-r--r--network/windscribe/README18
-rw-r--r--network/windscribe/doinst.sh13
-rw-r--r--network/windscribe/rc.windscribe79
-rw-r--r--network/windscribe/slack-desc19
-rw-r--r--network/windscribe/windscribe.SlackBuild74
-rw-r--r--network/windscribe/windscribe.info10
-rw-r--r--network/wireguard-linux-compat/README7
-rw-r--r--network/wireguard-linux-compat/doinst.sh (renamed from network/WireGuard/doinst.sh)0
-rw-r--r--network/wireguard-linux-compat/slack-desc19
-rw-r--r--network/wireguard-linux-compat/wireguard-linux-compat.SlackBuild98
-rw-r--r--network/wireguard-linux-compat/wireguard-linux-compat.info10
-rw-r--r--network/wireguard-tools/README20
-rw-r--r--network/wireguard-tools/slack-desc19
-rw-r--r--network/wireguard-tools/wireguard-tools.SlackBuild (renamed from network/WireGuard/WireGuard.SlackBuild)22
-rw-r--r--network/wireguard-tools/wireguard-tools.info10
-rw-r--r--network/wireshark/README18
-rw-r--r--network/wireshark/wireshark.SlackBuild6
-rw-r--r--network/wireshark/wireshark.info6
-rw-r--r--network/wireshark/wireshark.patch10
-rw-r--r--network/xdman/xdman.SlackBuild2
-rw-r--r--network/xdman/xdman.info4
-rw-r--r--network/xl2tpd/xl2tpd.info4
-rw-r--r--network/yadifa/slack-desc2
-rw-r--r--network/yadifa/yadifa.SlackBuild21
-rw-r--r--network/yadifa/yadifa.info6
-rw-r--r--network/yandex-browser-beta/yandex-browser-beta.SlackBuild4
-rw-r--r--network/yandex-browser-beta/yandex-browser-beta.info10
-rw-r--r--network/yle-dl/yle-dl.SlackBuild2
-rw-r--r--network/yle-dl/yle-dl.info8
-rw-r--r--network/youtube-dl/youtube-dl.SlackBuild4
-rw-r--r--network/youtube-dl/youtube-dl.info6
-rw-r--r--network/zabbix_agentd/zabbix_agentd.SlackBuild2
-rw-r--r--network/zabbix_agentd/zabbix_agentd.info8
-rw-r--r--network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild2
-rw-r--r--network/zabbix_java_gateway/zabbix_java_gateway.info8
-rw-r--r--network/zabbix_proxy/zabbix_proxy.SlackBuild3
-rw-r--r--network/zabbix_proxy/zabbix_proxy.info6
-rw-r--r--network/zabbix_server/zabbix_server.SlackBuild3
-rw-r--r--network/zabbix_server/zabbix_server.info6
-rw-r--r--network/zeek/zeek.SlackBuild4
-rw-r--r--network/zeek/zeek.info8
-rw-r--r--network/znc/znc.SlackBuild6
-rw-r--r--network/znc/znc.info6
-rw-r--r--network/zoom-linux/slack-desc4
-rw-r--r--network/zoom-linux/zoom-linux.SlackBuild4
-rw-r--r--network/zoom-linux/zoom-linux.desktop2
-rw-r--r--network/zoom-linux/zoom-linux.info10
618 files changed, 8743 insertions, 5700 deletions
diff --git a/network/2ping/2ping.SlackBuild b/network/2ping/2ping.SlackBuild
index 263ffa123b..d81a2c738c 100644
--- a/network/2ping/2ping.SlackBuild
+++ b/network/2ping/2ping.SlackBuild
@@ -6,13 +6,15 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20191130 bkw: update for v4.3.
+
# 20180821 bkw:
# - update for v4.2.
# - document optional deps in README.
# - include wireshark stuff in package.
PRGNAM=2ping
-VERSION=${VERSION:-4.2}
+VERSION=${VERSION:-4.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/2ping/2ping.info b/network/2ping/2ping.info
index 2cc7f5188f..e1197b74ab 100644
--- a/network/2ping/2ping.info
+++ b/network/2ping/2ping.info
@@ -1,8 +1,8 @@
PRGNAM="2ping"
-VERSION="4.2"
+VERSION="4.3"
HOMEPAGE="https://www.finnie.org/software/2ping/"
-DOWNLOAD="https://github.com/rfinnie/2ping/archive/v4.2/2ping-4.2.tar.gz"
-MD5SUM="5be6bdc3a35c1592133642ea80c0e63e"
+DOWNLOAD="https://github.com/rfinnie/2ping/archive/v4.3/2ping-4.3.tar.gz"
+MD5SUM="50c476b63cd3aa13a2ed2c5def018e8b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="python3"
diff --git a/network/3proxy/3proxy.SlackBuild b/network/3proxy/3proxy.SlackBuild
index a0bd0b6089..2ec93c7a56 100644
--- a/network/3proxy/3proxy.SlackBuild
+++ b/network/3proxy/3proxy.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for 3proxy
# Copyright 2008, 2009 Ilya INSTE Ponetayev, <inste@mail.ru>
-# Copyright 2018 wigums pioneer22675@gmail.com
+# Copyright 2018-2019 wigums pioneer22675@gmail.com
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=3proxy
-VERSION=${VERSION:-0.8.12}
+VERSION=${VERSION:-0.8.13}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/3proxy/3proxy.info b/network/3proxy/3proxy.info
index 9bbd9a0768..2de1849234 100644
--- a/network/3proxy/3proxy.info
+++ b/network/3proxy/3proxy.info
@@ -1,8 +1,8 @@
PRGNAM="3proxy"
-VERSION="0.8.12"
+VERSION="0.8.13"
HOMEPAGE="https://3proxy.ru/"
-DOWNLOAD="https://github.com/z3APA3A/3proxy/archive/0.8.12/3proxy-0.8.12.tar.gz"
-MD5SUM="f8ccbe689ff8da8ff67942fc440187ae"
+DOWNLOAD="https://github.com/z3APA3A/3proxy/archive/0.8.13/3proxy-0.8.13.tar.gz"
+MD5SUM="d9420c56f05fb78bf9043dd8a30c6a1c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/AdGuardHome/AdGuardHome.SlackBuild b/network/AdGuardHome/AdGuardHome.SlackBuild
new file mode 100644
index 0000000000..377d99df4e
--- /dev/null
+++ b/network/AdGuardHome/AdGuardHome.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Slackware build script for AdGuardHome
+
+# Copyright 2019-2020, Alexander Verbovetsky, Moscow, Russia
+# 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=AdGuardHome
+VERSION=${VERSION:-0.101.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SUFFIX="linux_386"
+elif [ "$ARCH" = "x86_64" ]; then
+ SUFFIX="linux_amd64"
+elif [ "$ARCH" = "arm" ]; then
+ SUFFIX="linux_arm"
+else
+ echo "$ARCH is not supported." >&2
+ exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/${PRGNAM}_$SUFFIX.tar.gz
+cd $PRGNAM
+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 $PKG/usr/sbin $PKG/etc/rc.d
+install -m 0755 -o root -g root AdGuardHome $PKG/usr/sbin
+install -m 0644 -o root -g root $CWD/rc.AdGuardHome \
+ $PKG/etc/rc.d/rc.AdGuardHome.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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a 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/AdGuardHome/AdGuardHome.info b/network/AdGuardHome/AdGuardHome.info
new file mode 100644
index 0000000000..1c143f2edd
--- /dev/null
+++ b/network/AdGuardHome/AdGuardHome.info
@@ -0,0 +1,10 @@
+PRGNAM="AdGuardHome"
+VERSION="0.101.0"
+HOMEPAGE="https://adguard.com/adguard-home.html"
+DOWNLOAD="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.101.0/AdGuardHome_linux_386.tar.gz"
+MD5SUM="7323bf988724522f34fac11b642463e7"
+DOWNLOAD_x86_64="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.101.0/AdGuardHome_linux_amd64.tar.gz"
+MD5SUM_x86_64="0f1cb08a299953d40d971368f005599b"
+REQUIRES=""
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/network/AdGuardHome/README b/network/AdGuardHome/README
new file mode 100644
index 0000000000..6903da6680
--- /dev/null
+++ b/network/AdGuardHome/README
@@ -0,0 +1,17 @@
+AdGuard Home is a network-wide software for blocking ads and tracking.
+It operates as a DNS server that re-routes tracking domains to a "black
+hole", thus preventing your devices from connecting to those servers.
+
+Key features of AdGuard Home:
+
+* Blocking ads and trackers
+* Customizing blocklists
+* Built-in DHCP server
+* HTTPS for the Admin interface
+* Encrypted DNS upstream servers: DNS-over-HTTPS, DNS-over-TLS, DNSCrypt
+* Running as a DNS-over-HTTPS or DNS-over-TLS server
+* Blocking phishing and malware domains
+* Parental control (blocking adult domains)
+* Force Safe search on search engines
+* Per-client (device) configuration
+* Access settings
diff --git a/network/AdGuardHome/README.SBo b/network/AdGuardHome/README.SBo
new file mode 100644
index 0000000000..98ba0c50a9
--- /dev/null
+++ b/network/AdGuardHome/README.SBo
@@ -0,0 +1,19 @@
+A simple init script /etc/rc.d/rc.AdGuardHome has been provided to run
+AdGuard Home as a daemon.
+
+To start AdGuard Home automatically at system start, add the following
+to /etc/rc.d/rc.local:
+
+# Start AdGuard Home
+if [ -x /etc/rc.d/rc.AdGuardHome ]; then
+ rm -f /var/run/AdGuardHome.pid
+ /etc/rc.d/rc.AdGuardHome start
+fi
+
+To properly stop AdGuard Home on system shutdown, add the following to
+/etc/rc.d/rc.local_shutdown:
+
+# Stop AdGuard Home
+if [ -x /etc/rc.d/rc.AdGuardHome ]; then
+ /etc/rc.d/rc.AdGuardHome stop
+fi
diff --git a/network/AdGuardHome/doinst.sh b/network/AdGuardHome/doinst.sh
new file mode 100644
index 0000000000..b842b7ff58
--- /dev/null
+++ b/network/AdGuardHome/doinst.sh
@@ -0,0 +1,25 @@
+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.AdGuardHome.new
diff --git a/network/AdGuardHome/rc.AdGuardHome b/network/AdGuardHome/rc.AdGuardHome
new file mode 100644
index 0000000000..23832689d1
--- /dev/null
+++ b/network/AdGuardHome/rc.AdGuardHome
@@ -0,0 +1,54 @@
+#!/bin/sh
+# Start/stop/restart the AdGuard Home
+
+bin=/usr/sbin/AdGuardHome
+config=/etc/AdGuardHome.yaml
+workdir=/var/lib/AdGuardHome
+pidfile=/var/run/AdGuardHome.pid
+
+start_AdGuardHome() {
+ echo "Starting AdGuard Home... "
+ if [ -f $pidfile ]; then
+ echo "AdGuard Home is already running with PID $(cat ${pidfile})."
+ exit 0
+ fi
+ nohup $bin --config $config --work-dir $workdir --no-check-update \
+ --pidfile $pidfile 0<&- &>/dev/null &
+}
+
+stop_AdGuardHome() {
+ echo "Stoppping AdGuard Home... "
+ [ -f $pidfile ] && kill $(cat ${pidfile})
+}
+
+restart_AdGuardHome() {
+ stop_AdGuardHome
+ sleep 1
+ start_AdGuardHome
+}
+
+status_AdGuardHome() {
+ if [ -f $pidfile ]; then
+ echo "AdGuard Home is running with PID $(cat ${pidfile})."
+ else
+ echo "AdGuard Home is stopped."
+ exit 1
+ fi
+}
+
+case "$1" in
+'start')
+ start_AdGuardHome
+ ;;
+'stop')
+ stop_AdGuardHome
+ ;;
+'restart')
+ restart_AdGuardHome
+ ;;
+'status')
+ status_AdGuardHome
+ ;;
+*)
+ echo "usage $0 start|stop|restart|status"
+esac
diff --git a/network/AdGuardHome/slack-desc b/network/AdGuardHome/slack-desc
new file mode 100644
index 0000000000..e6984b7aed
--- /dev/null
+++ b/network/AdGuardHome/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+AdGuardHome: AdGuardHome (Ad blocking DNS server)
+AdGuardHome:
+AdGuardHome: AdGuard Home is a network-wide software for blocking ads and tracking.
+AdGuardHome: It operates as a DNS server that re-routes tracking domains to a
+AdGuardHome: "black hole", thus preventing your devices from connecting to those
+AdGuardHome: servers.
+AdGuardHome:
+AdGuardHome: Homepage: https://adguard.com/adguard-home.html
+AdGuardHome:
+AdGuardHome:
+AdGuardHome:
diff --git a/network/Electrum/Electrum.info b/network/Electrum/Electrum.info
index 1ebeeb30c9..08ac9c3e5e 100644
--- a/network/Electrum/Electrum.info
+++ b/network/Electrum/Electrum.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://download.electrum.org/3.3.8/Electrum-3.3.8.tar.gz"
MD5SUM="66a1d04927f7cf7bb44a254d8791de96"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="python3-PyQt5 ecdsa python-qrcode protobuf3 python-jsonrpclib dnspython pyaes secp256k1 python3-certifi python3-six python3-aiohttp python3-aiohttp-socks python3-aiorpcX python-chardet"
+REQUIRES="python3-PyQt5 ecdsa python-qrcode protobuf3 python-jsonrpclib dnspython pyaes secp256k1 python3-certifi python3-six python3-aiohttp python3-aiohttp-socks python3-aiorpcX python-chardet QDarkStyle"
MAINTAINER="nomnombtc"
EMAIL="nomnombtc@arcor.de"
diff --git a/network/NetworkManager-l2tp/slack-desc b/network/NetworkManager-l2tp/slack-desc
index 2c2faf1cf1..2911978127 100644
--- a/network/NetworkManager-l2tp/slack-desc
+++ b/network/NetworkManager-l2tp/slack-desc
@@ -5,15 +5,15 @@
# 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------------------------------------------------------|
-network-manager-l2tp: network-manager-l2tp (VPN Plugin for NM)
-network-manager-l2tp:
-network-manager-l2tp: NetworkManager-l2tp is a VPN plugin for NetworkManager 1.2 and later
-network-manager-l2tp: which provides support for L2TP and L2TP/IPsec (i.e. L2TP over IPsec)
-network-manager-l2tp: connections. For L2TP support, it uses xl2tpd
-network-manager-l2tp: ( https://www.xelerance.com/software/xl2tpd/ )
-network-manager-l2tp:
-network-manager-l2tp: https://github.com/nm-l2tp/network-manager-l2tp
-network-manager-l2tp:
-network-manager-l2tp:
-network-manager-l2tp:
+ |-----handy-ruler------------------------------------------------------|
+NetworkManager-l2tp: NetworkManager-l2tp (VPN Plugin for NM)
+NetworkManager-l2tp:
+NetworkManager-l2tp: NetworkManager-l2tp is a VPN plugin for NetworkManager 1.2 and later
+NetworkManager-l2tp: which provides support for L2TP and L2TP/IPsec (i.e. L2TP over IPsec)
+NetworkManager-l2tp: connections. For L2TP support, it uses xl2tpd
+NetworkManager-l2tp: ( https://www.xelerance.com/software/xl2tpd/ )
+NetworkManager-l2tp:
+NetworkManager-l2tp: https://github.com/nm-l2tp/network-manager-l2tp
+NetworkManager-l2tp:
+NetworkManager-l2tp:
+NetworkManager-l2tp:
diff --git a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild
index 1f169d2a0d..325758ed3b 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.4}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.2.8}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Find the version number for pppd, used to specify the plugin directory:
+PPPD=$(echo /usr/lib${LIBDIRSUFFIX}/pppd/?.?.? | rev | cut -f 1 -d / | rev)
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -78,7 +81,8 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
- --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/2.4.5 \
+ --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 0efbfaf33d..a02a65fe28 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.4"
+VERSION="1.2.8"
HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.4.tar.xz"
-MD5SUM="a05b36c92870e2e248c0c75b2c7ef577"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.8.tar.xz"
+MD5SUM="305e31d6aac41813d735f27891fce6d8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="pptp"
diff --git a/network/NetworkManager-ssh/README b/network/NetworkManager-ssh/README
index 732f2f49fb..abf83415e2 100644
--- a/network/NetworkManager-ssh/README
+++ b/network/NetworkManager-ssh/README
@@ -1,5 +1,6 @@
NetworkManager-ssh (SSH VPN support for NetworkManager)
-You will need to add the following line to /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf:
+You will need to add the following line to
+/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf:
<allow send_destination="org.freedesktop.NetworkManager.ssh"/>
diff --git a/network/Pafy/Pafy.SlackBuild b/network/Pafy/Pafy.SlackBuild
index 29539c73ba..7ae6997bc0 100644
--- a/network/Pafy/Pafy.SlackBuild
+++ b/network/Pafy/Pafy.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for Pafy
-# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,15 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20200119 bkw:
+# Dimitris: this is B. Watson (yalhcru@gmail.com). I can't reach you
+# by email and you don't use IRC, so I'm "texting" you via this
+# comment. Pafy fails to build unless youtube-dl is installed, so
+# I added it to REQUIRES as a hard dep.
+
PRGNAM=Pafy
SRCNAM=${PRGNAM,}
-VERSION=${VERSION:-0.5.4}
+VERSION=${VERSION:-0.5.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/Pafy/Pafy.info b/network/Pafy/Pafy.info
index 406ab35285..774982c1fc 100644
--- a/network/Pafy/Pafy.info
+++ b/network/Pafy/Pafy.info
@@ -1,10 +1,10 @@
PRGNAM="Pafy"
-VERSION="0.5.4"
+VERSION="0.5.5"
HOMEPAGE="https://github.com/mps-youtube/pafy"
-DOWNLOAD="https://pypi.python.org/packages/41/cb/ec840c79942fb0788982963b61a361ecd10e4e58ad3dcaef4f0e809ce2fe/pafy-0.5.4.tar.gz"
-MD5SUM="092930504c7e4fcea30b7446fa1878c7"
+DOWNLOAD="https://files.pythonhosted.org/packages/7e/02/b70f4d2ad64bbc7d2a00018c6545d9b9039208553358534e73e6dd5bbaf6/pafy-0.5.5.tar.gz"
+MD5SUM="01430bb4876aec3b648b2f52c5ee7bd6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="youtube-dl"
MAINTAINER="Dimitris Zlatanidis"
EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/Pafy/README b/network/Pafy/README
index e583af6bff..a9b7098d28 100644
--- a/network/Pafy/README
+++ b/network/Pafy/README
@@ -15,5 +15,3 @@ Python API for YouTube - Download videos and retrieve metadata from YouTube.
- Download video only (no audio) in m4v format.
- Retreive playlists and playlist metadata.
- Works with Python 2.6+ and 3.3+.
-
-Optional dependency: youtube-dl
diff --git a/network/Quaternion/Quaternion.SlackBuild b/network/Quaternion/Quaternion.SlackBuild
new file mode 100644
index 0000000000..dc72254b20
--- /dev/null
+++ b/network/Quaternion/Quaternion.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Slackware build script for Quaternion
+
+# Copyright 2020 Charles Daniels, United States
+# 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=Quaternion
+VERSION=${VERSION:-0.0.9.4c}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# -DUSE_INTREE_LIBQMC=0 to use the installed version of libQuotient, rather
+# than building in a submodule. This is preferred both because the relase
+# tarball will not include libQuotient, and to avoid multiple installations.
+
+# -DUSE_KEYCHAIN=0 to disable support for qt5keychain. I could not get this to
+# work even with the qtkeychain package from slackbuilds.org. YMMV.
+
+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 .. \
+ -DUSE_INTREE_LIBQMC=0 \
+ -DUSE_KEYCHAIN=0
+ 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 \
+ BUILDING.md 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/Quaternion/Quaternion.info b/network/Quaternion/Quaternion.info
new file mode 100644
index 0000000000..292f287e2f
--- /dev/null
+++ b/network/Quaternion/Quaternion.info
@@ -0,0 +1,10 @@
+PRGNAM="Quaternion"
+VERSION="0.0.9.4c"
+HOMEPAGE="https://github.com/quotient-im/Quaternion"
+DOWNLOAD="https://github.com/quotient-im/Quaternion/archive/0.0.9.4c/Quaternion-0.0.9.4c.tar.gz"
+MD5SUM="6786fbdeec6edc5432694216aebe2ebf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libQuotient"
+MAINTAINER="Charles Daniels"
+EMAIL="charles@cdaniels.net"
diff --git a/network/Quaternion/README b/network/Quaternion/README
new file mode 100644
index 0000000000..49c048fa48
--- /dev/null
+++ b/network/Quaternion/README
@@ -0,0 +1,12 @@
+Quaternion is a cross-platform desktop IM client for the Matrix
+protocol.
+
+SlackBuild notes:
+
+* -DUSE_KEYCHAIN=0 is set - I was not able to get Quaternion to use the
+ version of qtkeychain from slackbuilds.org. YMMV.
+
+* -DUSE_INTREE_LIBQMC=0 is set to use the system copy of libQuotient.
+ Using the in-tree version requires the sources to be fetched
+ recursively via git, since it's a submodule. You probably don't want
+ to change this.
diff --git a/network/Quaternion/doinst.sh b/network/Quaternion/doinst.sh
new file mode 100644
index 0000000000..9a8ded3c60
--- /dev/null
+++ b/network/Quaternion/doinst.sh
@@ -0,0 +1,7 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+ /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
diff --git a/network/Quaternion/slack-desc b/network/Quaternion/slack-desc
new file mode 100644
index 0000000000..62a58bcee7
--- /dev/null
+++ b/network/Quaternion/slack-desc
@@ -0,0 +1,12 @@
+ |-----handy-ruler------------------------------------------------------|
+Quaternion: Quaternion (A Qt5-based IM client for Matrix)
+Quaternion:
+Quaternion: Quaternion is a cross-platform desktop IM client for the Matrix
+Quaternion: protocol.
+Quaternion:
+Quaternion: Homepage: https://github.com/quotient-im/Quaternion
+Quaternion:
+Quaternion:
+Quaternion:
+Quaternion:
+Quaternion:
diff --git a/network/RSSOwl/README b/network/RSSOwl/README
deleted file mode 100644
index d203b265b5..0000000000
--- a/network/RSSOwl/README
+++ /dev/null
@@ -1,5 +0,0 @@
-RSSOwl (eclipse based RSS reader) A News Reader for Everyone. RSSOwl lets
-you gather, organize, update, and store information from any compliant
-source in a convenient, easy to use interface, save selected information in
-various formats for offline viewing and sharing, and much more. RSSOwl is
-open source, licensed under the terms of the Eclipse Public License.
diff --git a/network/RSSOwl/RSSOwl.SlackBuild b/network/RSSOwl/RSSOwl.SlackBuild
deleted file mode 100644
index e74ccf654a..0000000000
--- a/network/RSSOwl/RSSOwl.SlackBuild
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for RSSOwl
-#
-# Written by Vincent Batts, vbatts@hashbangbash.com -2009
-# Maintained by Erik Hanson, erik@slackbuilds.org 2010-2014
-# 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=RSSOwl
-VERSION=${VERSION:-2.2.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-if [ "$ARCH" = "x86_64" ]; then
- LIBDIRSUFFIX="64"
- SRC_ARCH="x86_64.zip"
-elif [ "$ARCH" = "i486" ]; then
- LIBDIRSUFFIX=""
- SRC_ARCH="x86.zip"
-else
- printf "$ARCH is not supported...\n"
- exit 1
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf rssowl
-unzip $CWD/rssowl-$VERSION.linux.${SRC_ARCH}
-cd rssowl
-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 $PKG/usr/bin
-ln -s /usr/lib${LIBDIRSUFFIX}/RSSOwl/RSSOwl $PKG/usr/bin/RSSOwl
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
-cp -av * $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
-
-sed -i 's,libhunspell-1.2.so.0,libhunspell-1.3.so.0,g' $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/xulrunner/libxul.so
-
-mkdir -p $PKG/usr/share/pixmaps
-cp -av icon.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm
-
-mkdir -p $PKG/usr/share/applications
-cp -v $CWD/$PRGNAM.desktop $PKG/usr/share/applications/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a about* $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/RSSOwl/RSSOwl.desktop b/network/RSSOwl/RSSOwl.desktop
deleted file mode 100644
index 6de5a6267e..0000000000
--- a/network/RSSOwl/RSSOwl.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Exec=RSSOwl
-Icon=RSSOwl
-Type=Application
-Categories=Network;
-Name=RSSOwl
-GenericName=RSS News Reader
-MimeType=application/rss+xml;
-X-KDE-StartupNotify=true
-
diff --git a/network/RSSOwl/RSSOwl.info b/network/RSSOwl/RSSOwl.info
deleted file mode 100644
index a34f2b4f5d..0000000000
--- a/network/RSSOwl/RSSOwl.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="RSSOwl"
-VERSION="2.2.1"
-HOMEPAGE="http://www.rssowl.org/"
-DOWNLOAD="http://downloads.sourceforge.net/rssowl/rssowl-2.2.1.linux.x86.zip"
-MD5SUM="7295bbce792dc921ac89781ac717e6f6"
-DOWNLOAD_x86_64="http://downloads.sourceforge.net/rssowl/rssowl-2.2.1.linux.x86_64.zip"
-MD5SUM_x86_64="7751803db518b267b0dca121c1532747"
-REQUIRES="jdk"
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
diff --git a/network/RSSOwl/doinst.sh b/network/RSSOwl/doinst.sh
deleted file mode 100644
index 24e4bc11e0..0000000000
--- a/network/RSSOwl/doinst.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications &> /dev/null
-fi
-
diff --git a/network/RSSOwl/slack-desc b/network/RSSOwl/slack-desc
deleted file mode 100644
index ce1ed4d3db..0000000000
--- a/network/RSSOwl/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------------------------------------------------------|
-RSSOwl: RSSOwl (eclipse based RSS, Atom, and News reader)
-RSSOwl:
-RSSOwl: RSSOwl lets you gather, organize, update, and store information
-RSSOwl: from any compliant source in a convenient, easy to use interface,
-RSSOwl: save selected information in various formats for offline viewing
-RSSOwl: and sharing, and much more. RSSOwl is open source,
-RSSOwl: licensed under the terms of the Eclipse Public License.
-RSSOwl:
-RSSOwl: Homepage: http://www.rssowl.org/
-RSSOwl:
-RSSOwl:
diff --git a/network/SoulseekQt/SoulseekQt.SlackBuild b/network/SoulseekQt/SoulseekQt.SlackBuild
index 39cfe7fd17..98fbdad991 100644
--- a/network/SoulseekQt/SoulseekQt.SlackBuild
+++ b/network/SoulseekQt/SoulseekQt.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for SoulseekQt
-# Copyright 2016-2018 Dominik Drobek <dominik.drobek (at) o2.pl>
+# Copyright 2016-2018, 2020 Dominik Drobek <dominik.drobek (at) o2.pl>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -62,11 +62,10 @@ tar xvf $CWD/$PRGNAM-$FVER-$TGZARCH.tgz -C $TMP/$PRGNAM-$VERSION
cd $PRGNAM-$VERSION
chown -R root:root .
-mkdir -p $PKG/opt/$PRGNAM
-mkdir -p $PKG/usr/{bin,share/{applications,pixmaps}}
-install -m 755 $PRGNAM-$FVER-$TGZARCH $PKG/opt/$PRGNAM/$PRGNAM
-install -m 644 $CWD/SoulseekQt.png $PKG/usr/share/pixmaps
-install -m 644 $CWD/SoulseekQt.desktop $PKG/usr/share/applications
+install -D -m 755 $PRGNAM-$FVER-$TGZARCH $PKG/opt/$PRGNAM/$PRGNAM
+install -D -m 644 $CWD/$PRGNAM.png -t $PKG/usr/share/pixmaps/
+install -D -m 644 $CWD/$PRGNAM.desktop -t $PKG/usr/share/applications/
+mkdir -p $PKG/usr/bin
ln -sf ../../opt/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/network/SoulseekQt/SoulseekQt.info b/network/SoulseekQt/SoulseekQt.info
index 09de463657..2e54873c6c 100644
--- a/network/SoulseekQt/SoulseekQt.info
+++ b/network/SoulseekQt/SoulseekQt.info
@@ -1,9 +1,9 @@
PRGNAM="SoulseekQt"
VERSION="20160117"
HOMEPAGE="https://www.slsknet.org/"
-DOWNLOAD="https://www.dropbox.com/s/kebk1b5ib1m3xxw/SoulseekQt-2016-1-17-32bit.tgz"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/SoulseekQt-2016-1-17-32bit.tgz"
MD5SUM="906d99b15ed02d0d66981fffeeea1218"
-DOWNLOAD_x86_64="https://www.dropbox.com/s/7qh902qv2sxyp6p/SoulseekQt-2016-1-17-64bit.tgz"
+DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/SoulseekQt-2016-1-17-64bit.tgz"
MD5SUM_x86_64="c843e748a129e4ad9461280aeb2b957a"
REQUIRES=""
MAINTAINER="Dominik Drobek"
diff --git a/network/SpiderOakONE/SpiderOakONE.SlackBuild b/network/SpiderOakONE/SpiderOakONE.SlackBuild
index d26c38d6a0..01fe307a85 100644
--- a/network/SpiderOakONE/SpiderOakONE.SlackBuild
+++ b/network/SpiderOakONE/SpiderOakONE.SlackBuild
@@ -54,5 +54,8 @@ mv $PKG/usr/share/doc/SpiderOakONE/* $PKG/usr/doc/$PRGNAM-$VERSION
rm -rf $PKG/usr/share/doc/
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/TeamSpeak3/TeamSpeak3.info b/network/TeamSpeak3/TeamSpeak3.info
index e9d10a15bc..3d9721f2d5 100644
--- a/network/TeamSpeak3/TeamSpeak3.info
+++ b/network/TeamSpeak3/TeamSpeak3.info
@@ -2,9 +2,9 @@ PRGNAM="TeamSpeak3"
VERSION="3.3.2"
HOMEPAGE="https://www.teamspeak.com/en/"
DOWNLOAD="https://files.teamspeak-services.com/releases/client/3.3.2/TeamSpeak3-Client-linux_x86-3.3.2.run"
-MD5SUM="b26c2c9db335c7c15e45a162766312c2"
+MD5SUM="0ef269a11d72edeef110b5196c8e0d01"
DOWNLOAD_x86_64="https://files.teamspeak-services.com/releases/client/3.3.2/TeamSpeak3-Client-linux_amd64-3.3.2.run"
-MD5SUM_x86_64="0ef269a11d72edeef110b5196c8e0d01"
-REQUIRES=""
+MD5SUM_x86_64="b26c2c9db335c7c15e45a162766312c2"
+REQUIRES="libxkbcommon"
MAINTAINER="Edward W. Koenig"
EMAIL="kingbeowulf@gmail.com"
diff --git a/network/WhatWeb/slack-desc b/network/WhatWeb/slack-desc
index c36fad238d..9bb9eb5a5a 100644
--- a/network/WhatWeb/slack-desc
+++ b/network/WhatWeb/slack-desc
@@ -8,12 +8,12 @@
|-----handy-ruler------------------------------------------------------|
WhatWeb: WhatWeb (Next generation web scanner)
WhatWeb:
-WhatWeb: WhatWeb recognises web technologies including content management
+WhatWeb: WhatWeb recognises web technologies including content management
WhatWeb: systems (CMS), blogging platforms, statistic/analytics packages,
WhatWeb: javascript ibraries, web servers, and embedded devices.
-WhatWeb:
-WhatWeb:
WhatWeb:
-WhatWeb:
-WhatWeb:
+WhatWeb:
+WhatWeb:
+WhatWeb:
+WhatWeb:
WhatWeb:
diff --git a/network/WireGuard/README b/network/WireGuard/README
deleted file mode 100644
index 9f532f1d7e..0000000000
--- a/network/WireGuard/README
+++ /dev/null
@@ -1,12 +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 is not yet complete. You should not rely on this code. It has
-not undergone proper degrees of security auditing and the protocol is
-still subject to change.
-
-Optional Dependency
-
-openresolv is an optional runtime dependency -- you need it if you want
-to use to use wg-quick's DNS option.
diff --git a/network/WireGuard/WireGuard.info b/network/WireGuard/WireGuard.info
deleted file mode 100644
index bc89830609..0000000000
--- a/network/WireGuard/WireGuard.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="WireGuard"
-VERSION="0.0.20181119"
-HOMEPAGE="https://www.wireguard.com/"
-DOWNLOAD="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20181119.tar.xz"
-MD5SUM="d1bafdc59a2bed867879b737c17b66b3"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="David Spencer"
-EMAIL="baildon.research@googlemail.com"
diff --git a/network/WireGuard/slack-desc b/network/WireGuard/slack-desc
deleted file mode 100644
index 1605ab22e1..0000000000
--- a/network/WireGuard/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: WireGuard (fast, modern, secure VPN)
-WireGuard:
-WireGuard: WireGuard is a VPN that uses state-of-the-art cryptography. It is
-WireGuard: designed as a general purpose VPN for running on embedded interfaces
-WireGuard: and super computers alike, fit for many different circumstances.
-WireGuard:
-WireGuard: https://www.wireguard.com/
-WireGuard:
-WireGuard:
-WireGuard:
-WireGuard:
diff --git a/network/acme.sh/README b/network/acme.sh/README
index 374de32be7..2becfe5aca 100644
--- a/network/acme.sh/README
+++ b/network/acme.sh/README
@@ -13,3 +13,7 @@ An ACME Shell script
- Docker friendly
- IPv6 support
- Cron job notifications for renewal or error etc.
+
+ Optional dependencies:
+
+* socat - to standalone mode
diff --git a/network/acme.sh/acme.sh.SlackBuild b/network/acme.sh/acme.sh.SlackBuild
index 6665144a48..f1741842e7 100644
--- a/network/acme.sh/acme.sh.SlackBuild
+++ b/network/acme.sh/acme.sh.SlackBuild
@@ -2,7 +2,7 @@
#
# Slackware build script for acme.sh
#
-# Copyright 2019 Corrado Franco (https://conraid.net)
+# Copyright 2019-2020 Corrado Franco (https://corradofranco.it)
# All rights reserved.
#
# This program is free software: you can redistribute it and/or modify
@@ -26,12 +26,10 @@
# Latest version of this SlackBuild at https://github.com/conraid/SlackBuilds
PRGNAM=acme.sh
-VERSION=${VERSION:-2.8.3}
+VERSION=${VERSION:-2.8.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-DOCFILES="*.md"
-
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -39,14 +37,6 @@ OUTPUT=${OUTPUT:-/tmp}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME:-""}" ]; then
- echo "$PRGNAM-$VERSION-$ARCH-$BUILD.txz "
- exit 0
-fi
-
set -eu
rm -rf $PKG
@@ -64,8 +54,9 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
install -Dm755 acme.sh $PKG/usr/bin/acme.sh
-mkdir -p $PKG/usr/share/$PRGNAM
-cp -r deploy dnsapi notify $PKG/usr/share/$PRGNAM
+install -Dm755 deploy/*.sh -t $PKG/usr/share/$PRGNAM/deploy
+install -Dm755 dnsapi/*.sh -t $PKG/usr/share/$PRGNAM/dnsapi
+install -Dm755 notify/*.sh -t $PKG/usr/share/$PRGNAM/notify
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION || true
diff --git a/network/acme.sh/acme.sh.info b/network/acme.sh/acme.sh.info
index 287255ce35..05eb09d638 100644
--- a/network/acme.sh/acme.sh.info
+++ b/network/acme.sh/acme.sh.info
@@ -1,8 +1,8 @@
PRGNAM="acme.sh"
-VERSION="2.8.3"
+VERSION="2.8.5"
HOMEPAGE="https://acme.sh/"
-DOWNLOAD="https://github.com/Neilpang/acme.sh/archive/2.8.3/acme.sh-2.8.3.tar.gz"
-MD5SUM="f1faea62db62cf36040926be6b169c2f"
+DOWNLOAD="https://github.com/Neilpang/acme.sh/archive/2.8.5/acme.sh-2.8.5.tar.gz"
+MD5SUM="226b7155fe85316a7fbd1b54f9639fd2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/aircrack-ng/aircrack-ng.SlackBuild b/network/aircrack-ng/aircrack-ng.SlackBuild
index 375650b2d9..6ab6259982 100644
--- a/network/aircrack-ng/aircrack-ng.SlackBuild
+++ b/network/aircrack-ng/aircrack-ng.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for aircrack-ng
# Originally written by Yalla-One <yallaone@gmail.com>
-# Copyright 2018, 2019 Dominik Drobek <dominik.drobek (at) o2.pl>
+# Copyright 2018-2020 Dominik Drobek <dominik.drobek (at) o2.pl>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=aircrack-ng
-VERSION=${VERSION:-1.5.2}
+VERSION=${VERSION:-1.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -102,16 +102,10 @@ 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 \
- AUTHORS ChangeLog INSTALLING LICENSE* README VERSION \
+ AUTHORS ChangeLog INSTALLING LICENSE* README* SECURITY.md \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-# experimental tools seem to ignore docdir option
-if [ "$AIRCRACK_EXPERIMENTAL" != "no" ]; then
- mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
- rm -r $PKG/usr/share
-fi
-
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/aircrack-ng/aircrack-ng.info b/network/aircrack-ng/aircrack-ng.info
index 49a1280369..25e6a6adbc 100644
--- a/network/aircrack-ng/aircrack-ng.info
+++ b/network/aircrack-ng/aircrack-ng.info
@@ -1,8 +1,8 @@
PRGNAM="aircrack-ng"
-VERSION="1.5.2"
+VERSION="1.6"
HOMEPAGE="https://www.aircrack-ng.org"
-DOWNLOAD="https://download.aircrack-ng.org/aircrack-ng-1.5.2.tar.gz"
-MD5SUM="2648c192d206e953c67dca64967d2982"
+DOWNLOAD="https://download.aircrack-ng.org/aircrack-ng-1.6.tar.gz"
+MD5SUM="22ddc85549b51ed0da0931d01ef215e5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/anydesk/anydesk.SlackBuild b/network/anydesk/anydesk.SlackBuild
index 0f7dab2dd5..dcf8ff0d56 100644
--- a/network/anydesk/anydesk.SlackBuild
+++ b/network/anydesk/anydesk.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=anydesk
-VERSION=${VERSION:-5.1.2}
+VERSION=${VERSION:-5.5.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/anydesk/anydesk.info b/network/anydesk/anydesk.info
index 7c57e72d77..4bd5968ddd 100644
--- a/network/anydesk/anydesk.info
+++ b/network/anydesk/anydesk.info
@@ -1,10 +1,10 @@
PRGNAM="anydesk"
-VERSION="5.1.2"
+VERSION="5.5.4"
HOMEPAGE="https://anydesk.com/"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://download.anydesk.com/linux/anydesk_5.1.2-1_x86_64.rpm"
-MD5SUM_x86_64="68b97af169b1278cc037391d44ce4638"
+DOWNLOAD_x86_64="https://download.anydesk.com/linux/anydesk_5.5.4-1_x86_64.rpm"
+MD5SUM_x86_64="4abd972632848fb8bb2d15faed84f3e8"
REQUIRES="gtkglext lsb-release"
MAINTAINER="Reza Talebi"
-EMAIL="clonerreza47@gmail.com"
+EMAIL="reza.talebi.73@outlook.com"
diff --git a/network/aria2/aria2.SlackBuild b/network/aria2/aria2.SlackBuild
index 7d39fc3466..0afb3a951e 100644
--- a/network/aria2/aria2.SlackBuild
+++ b/network/aria2/aria2.SlackBuild
@@ -20,7 +20,7 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=${PRGNAM:-aria2}
+PRGNAM=aria2
VERSION=${VERSION:-1.35.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/arno-iptables-firewall/README b/network/arno-iptables-firewall/README
index 57dc9d2018..23ad6f4255 100644
--- a/network/arno-iptables-firewall/README
+++ b/network/arno-iptables-firewall/README
@@ -1,32 +1,41 @@
arno-iptables-firewall is a front-end for iptables. Its configuration script
will set up a secure and restrictive firewall by just asking a few questions.
-This includes configuring internal networks for Internet access via NAT and
+This includes configuring internal networks for Internet access via NAT, and
potential network services like http or ssh. Moreover, it provides advanced
additional features that can be enabled in the well documented configuration
file.
-NOTE - The setup script will *not* run automatically after your package was
-installed. In order to run the script you have to issue the following command:
+NOTE - The setup script will NOT run automatically after the package has been
+installed. In order to run the script, the following command has to be issued:
# arno-iptables-firewall-configure
-To enable the startup of the firewall at boot-time you need to create a symlink
-as follows (in order to disable it, either remove the symlink or "chmod -x" the
-startup script):
+In order to start the firewall automatically at boot-time, an "rc.firewall"
+symlink to the startup script has to be created in /etc/rc.d/ and of course
+the startup script itself should be executable:
-# ln -sv /etc/rc.d/rc.arno-iptables-firewall /etc/rc.d/rc.firewall
-# chmod +x /etc/rc.d/rc.arno-iptables-firewall
+# cd /etc/rc.d/
+# ln -sv rc.arno-iptables-firewall rc.firewall
+# chmod +x rc.arno-iptables-firewall
-You can also start the firewall manually with one of the following commands:
+In order to disable startup of the firewall at boot time, remove the symlink or
+the executable bit from the startup script:
-# /etc/rc.d/rc.arno-iptables-firewall start
+# rm /etc/rc.d/rc.firewall
+# chmod -x /etc/rc.d/rc.arno-iptables-firewall
+
+The firewall can also be started manually with one of the following commands:
# arno-iptables-firewall start
+# /etc/rc.d/rc.arno-iptables-firewall start
+
+Please refer to the man page for more details.
+
IMPORTANT - A few security notes from the upstream author:
1) If possible make sure that the firewall is started before the (ADSL) Internet
-connection is enabled. For a ppp-interface that doesn't exist yet you can use
+connection is enabled. For a ppp-interface that doesn't exist yet, you can use
the wildcard device called "ppp+" (but you can only use ppp+ if there aren't any
other ppp interfaces).
@@ -35,5 +44,5 @@ understand what they mean. Changing them anyway could have a big impact on the
security of your machine.
3) A lot of people complain that their server stopped working after installing
-the firewall. This is the *correct* behaviour for a firewall: blocking *all*
+the firewall. This is the correct behaviour for a firewall: blocking all
incoming traffic by default. Configure your OPEN_TCP (e.g.) accordingly.
diff --git a/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild b/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
index 3a93a44d14..07401eb02e 100644
--- a/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
+++ b/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for arno-iptables-firewall
-# Copyright 2013-2015 Philip Lacroix <slackph at posteo dot de>
+# Copyright 2013-2020 Philip Lacroix <slackph at posteo dot de>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,8 +27,8 @@
PRGNAM=arno-iptables-firewall
SRCNAM=aif
-VERSION=${VERSION:-2.0.1e}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.1.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -56,8 +56,8 @@ 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 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
PRGBIN=$PKG/usr/sbin
PRGETC=$PKG/etc/$PRGNAM
@@ -71,23 +71,25 @@ install -m 0755 -D ./configure.sh $PRGBIN/$PRGNAM-configure
install -m 0755 ./bin/arno-fwfilter $PRGBIN/
install -m 0755 ./bin/$PRGNAM $PRGBIN/
-# Patch the configuration script. We need this in order to be able to
-# run the script from outside the source directory as well. We're going
-# to (1) change from relative to absolute the paths to the environment
-# file and firewall executable; (2) rename and change the path to the
-# startup script (this is for better consistency with Slackware's init
-# system); (3) change the path to the unmodified copy of the config
-# file, needed to check for existing custom setups. We will NOT create
-# a Slackware-compliant /etc/rc.d/rc.firewall symlink to the startup
-# script, as this should be done manually by the sysadmin. We won't
-# create any SystemV-style symlinks either. (4) We will allow the script
-# to be run correctly more than once, by removing previously set values
-# if no value is entered: this is to prevent e.g. ports from remaining
-# open, or internal interfaces from remaining enabled with NAT. Finally
-# (5) we append the note, picked from the original installation script
-# and slightly enhanced, that the user will see when configuration is
-# done: this is to inform that an rc.firewall symlink has to be created
-# in order to start up the firewall at boot-time in a proper way.
+# Patch the configuration script. We need this to be able to run the
+# script from outside the source directory as well. We're going to:
+#
+# 1) Change from relative to absolute the paths to the environment file
+# and the firewall executable.
+# 2) Rename and change the path to the startup script, for consistency with
+# Slackware's init system.
+# 3) Change the path to the unmodified copy of the config file, needed to
+# check for already existing setups.
+# 4) Allow the script to be run correctly more than once, by removing
+# previously set values if no values are entered: this is to prevent,
+# for example, ports from remaining open, or NAT from remaining enabled.
+# 5) Append the note, copied from the original install script and adapted
+# to the Slackware system, that users read when configuration is done:
+# this is mainly to inform that the "rc.firewall" symlink has to be
+# manually created in order to start up the firewall at boot-time. We
+# will NOT create the symlink automatically, as this should be done by
+# the system administrator.
+
patch $PRGBIN/$PRGNAM-configure < $CWD/files/patch-configuration-script.diff
# Copy and compress man pages.
@@ -110,7 +112,7 @@ done
# expected by the configuration script for comparison purposes; create
# link to plugin as in the original script.
mkdir -p $PRGSHR
-cp -a ./share/$PRGNAM/* $PRGSHR/
+cp -a ./share/$PRGNAM/{environment,plugins} $PRGSHR/
cp -a $PRGETC/firewall.conf.new $PRGSHR/firewall.conf.orig
ln -sv /usr/share/$PRGNAM/plugins/traffic-accounting-show $PRGBIN/
diff --git a/network/arno-iptables-firewall/arno-iptables-firewall.info b/network/arno-iptables-firewall/arno-iptables-firewall.info
index 1bd234e44e..1bc541c2c6 100644
--- a/network/arno-iptables-firewall/arno-iptables-firewall.info
+++ b/network/arno-iptables-firewall/arno-iptables-firewall.info
@@ -1,10 +1,10 @@
PRGNAM="arno-iptables-firewall"
-VERSION="2.0.1e"
+VERSION="2.1.0"
HOMEPAGE="https://github.com/arno-iptables-firewall/aif"
-DOWNLOAD="https://github.com/arno-iptables-firewall/aif/archive/2.0.1e.tar.gz"
-MD5SUM="4981a336f55e2db90f594beedcaef47d"
+DOWNLOAD="https://github.com/arno-iptables-firewall/aif/archive/2.1.0.tar.gz"
+MD5SUM="8f890a80bb6e8d2d0681c9a822ae39de"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="Philip Lacroix"
-EMAIL="slackph at bluebottle dot com"
+EMAIL="slackph at posteo dot de"
diff --git a/network/arno-iptables-firewall/files/patch-configuration-file.diff b/network/arno-iptables-firewall/files/patch-configuration-file.diff
index c530647a22..4be4f835ab 100644
--- a/network/arno-iptables-firewall/files/patch-configuration-file.diff
+++ b/network/arno-iptables-firewall/files/patch-configuration-file.diff
@@ -1,16 +1,8 @@
-233c233
-< IP4TABLES="/sbin/iptables"
----
-> IP4TABLES="/usr/sbin/iptables"
-238c238
-< IP6TABLES="/sbin/ip6tables"
----
-> IP6TABLES="/usr/sbin/ip6tables"
-242c242
+256c256
< ENV_FILE="/usr/local/share/arno-iptables-firewall/environment"
---
> ENV_FILE="/usr/share/arno-iptables-firewall/environment"
-246c246
+260c260
< PLUGIN_BIN_PATH="/usr/local/share/arno-iptables-firewall/plugins"
---
> PLUGIN_BIN_PATH="/usr/share/arno-iptables-firewall/plugins"
diff --git a/network/arno-iptables-firewall/files/patch-configuration-script.diff b/network/arno-iptables-firewall/files/patch-configuration-script.diff
index dacac17330..800fb9157c 100644
--- a/network/arno-iptables-firewall/files/patch-configuration-script.diff
+++ b/network/arno-iptables-firewall/files/patch-configuration-script.diff
@@ -5,96 +5,145 @@
> if [ -f /usr/share/arno-iptables-firewall/environment ]; then
> . /usr/share/arno-iptables-firewall/environment
36c36
-< printf "\033[40m\033[1;31mERROR: Could not read environment file ./share/arno-iptables-firewall/environment!\033[0m\n" >&2
+< printf "\033[40m\033[1;31mERROR: Could not read environment file ./share/arno-iptables-firewall/environment!\033[0m\n\n" >&2
---
-> printf "\033[40m\033[1;31mERROR: Could not read environment file /usr/share/arno-iptables-firewall/environment!\033[0m\n" >&2
-70a71,75
+> printf "\033[40m\033[1;31mERROR: Could not read environment file /usr/share/arno-iptables-firewall/environment!\033[0m\n\n" >&2
+76a77,81
> else
> # If no value is entered, remove (unless commented) previously set
-> # values: this is to prevent e.g. ports from remaining open, or
-> # internal interfaces from remaining enabled with NAT.
+> # values: this is to prevent, for example, ports from remaining open,
+> # or internal interfaces from remaining enabled with NAT.
> sed -i -e "s~^$2=.*$~$2=\"\"~" "$1"
-85c90
+91c96
< # else
---
> else
-86a92,94
-> # This is needed in order to allow the function change_conf_var()
+92a98,100
+> # This is needed to allow the function change_conf_var()
> # to remove values for previously set open ports.
> change_conf_var "$2" "$3" ""
-216a225,231
+183,186c191,194
+< echo "Listing available interfaces:"
+< echo "-----------------------------"
+< list_interfaces;
+< echo "-----------------------------"
+---
+> # echo "Listing available interfaces:"
+> # echo "-----------------------------"
+> # list_interfaces;
+> # echo "-----------------------------"
+255a264,270
> else
-> # Remove previously set values related to the internal interface, if
-> # no internal interface is entered with this script.
+> # Remove previously set values related to the internal interface,
+> # if no internal interface is entered with this script.
> change_conf_var "$FIREWALL_CONF" "INT_IF" ""
> change_conf_var "$FIREWALL_CONF" "INTERNAL_NET" ""
> change_conf_var "$FIREWALL_CONF" "INT_NET_BCAST_ADDRESS" ""
> change_conf_var "$FIREWALL_CONF" "NAT" "0"
-218c233
-<
----
->
-220,222c235,237
-< chmod 755 /etc/init.d/arno-iptables-firewall
-< chown 0:0 "$FIREWALL_CONF" /etc/init.d/arno-iptables-firewall
-< chmod 600 "$FIREWALL_CONF"
+259,261c274,276
+< if [ -e /etc/init.d/arno-iptables-firewall ]; then
+< chown 0:0 /etc/init.d/arno-iptables-firewall
+< chmod 755 /etc/init.d/arno-iptables-firewall
---
-> chmod 755 /etc/rc.d/rc.arno-iptables-firewall
-> chown 0:0 "$FIREWALL_CONF" /etc/rc.d/rc.arno-iptables-firewall
-> chmod 600 "$FIREWALL_CONF"
-227c242
+> if [ -e /etc/rc.d/rc.arno-iptables-firewall ]; then
+> chown 0:0 /etc/rc.d/rc.arno-iptables-firewall
+> chmod 755 /etc/rc.d/rc.arno-iptables-firewall
+271c286
< AIF_VERSION="$(grep "MY_VERSION=" ./bin/arno-iptables-firewall |sed -e "s/^MY_VERSION=\"//" -e "s/\"$//")"
---
> AIF_VERSION="$(grep "MY_VERSION=" /usr/sbin/arno-iptables-firewall |sed -e "s/^MY_VERSION=\"//" -e "s/\"$//")"
-235,251d249
+279,339c294
+< RC_PATH="/etc"
+< # Check for Redhat/SUSE rc.d
+< if [ -d "/etc/rc.d" ]; then
+< RC_PATH="/etc/rc.d"
+< fi
+<
< # Remove any symlinks in rc*.d out of the way
-< rm -f /etc/rc*.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc0.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc1.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc2.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc3.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc4.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc5.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rc6.d/*arno-iptables-firewall
+< rm -f $RC_PATH/rcS.d/*arno-iptables-firewall
<
-< if get_user_yn "Do you want to start the firewall at boot (via /etc/init.d/) (Y/N)?" "y"; then
-< if [ -d /etc/rcS.d ]; then
-< ln -sv /etc/init.d/arno-iptables-firewall /etc/rcS.d/S41arno-iptables-firewall
+< if get_user_yn "Do you want to start the firewall at boot" "y"; then
+< DONE=0
+<
+< if check_command systemctl; then
+< if systemctl enable arno-iptables-firewall; then
+< echo "* Successfully enabled service with systemctl"
+< DONE=1
+< fi
+< elif check_command update-rc.d; then
+< # Note: Currently update-rc.d doesn't seem to properly use the init script's LSB header, so specify explicitly
+< if update-rc.d -f arno-iptables-firewall start 11 S . stop 10 0 6 .; then
+< echo "* Successfully enabled service with update-rc.d"
+< DONE=1
+< fi
+< elif check_command chkconfig; then
+< if chkconfig --add arno-iptables-firewall && chkconfig arno-iptables-firewall on; then
+< echo "* Successfully enabled service with chkconfig"
+< DONE=1
+< fi
< else
-< ln -sv /etc/init.d/arno-iptables-firewall /etc/rc2.d/S11arno-iptables-firewall
+< if [ -d "$RC_PATH/rcS.d" ]; then
+< if ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rcS.d/S11arno-iptables-firewall" &&
+< ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc0.d/K10arno-iptables-firewall" &&
+< ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc6.d/K10arno-iptables-firewall"; then
+< echo "* Successfully enabled service through $RC_PATH/rcS.d/ symlink"
+< DONE=1
+< fi
+< elif [ -d "$RC_PATH/rc2.d" ]; then
+< if ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc2.d/S09arno-iptables-firewall" &&
+< ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc0.d/K91arno-iptables-firewall" &&
+< ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc6.d/K91arno-iptables-firewall"; then
+< echo "* Successfully enabled service through $RC_PATH/rc2.d/ symlink"
+< DONE=1
+< fi
+< else
+< echo "WARNING: Unable to detect /rc2.d or /rcS.d directories. Skipping runlevel symlinks" >&2
+< fi
< fi
<
-< # Check for insserv. Used for dependency based booting on eg. Debian
-< INSSERV="$(find_command /sbin/insserv)"
-< if [ -n "$INSSERV" ]; then
-< "$INSSERV" arno-iptables-firewall
+< if [ $DONE -eq 0 ]; then
+< echo "ERROR: Unable to setup automatic start at boot. Please investigate" >&2
< fi
< fi
<
-253c251
-< change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "1"
+< if [ -e /etc/init.d/arno-iptables-firewall ]; then
+---
+> if [ -e /etc/rc.d/rc.arno-iptables-firewall ]; then
+341c296
+< change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "1"
---
-> change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "1"
-255c253
-< change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "0"
+> change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "1"
+343c298
+< change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "0"
---
-> change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "0"
-258c256
+> change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "0"
+347c302
< if diff ./etc/arno-iptables-firewall/firewall.conf "$FIREWALL_CONF" >/dev/null; then
---
> if diff /usr/share/arno-iptables-firewall/firewall.conf.orig "$FIREWALL_CONF" >/dev/null; then
-274a273,291
+362a318,335
> echo ""
> echo "-------------------------------------------------------------------------------"
-> echo "** NOTE: 1) You can now (manually) (re)start the firewall by executing **"
-> echo "** \"/etc/rc.d/rc.arno-iptables-firewall start\" or **"
-> echo "** \"/etc/rc.d/rc.arno-iptables-firewall restart\" **"
-> echo "** It is recommended however to first review the settings in **"
-> echo "** /etc/arno-iptables-firewall/firewall.conf! **"
+> echo "** NOTE: 1) After configuration, it is recommended to review the firewall **"
+> echo "** settings in /etc/arno-iptables-firewall/firewall.conf **"
> echo "** **"
-> echo "** 2) In order to start the firewall automatically at boot-time, **"
-> echo "** you will need to manually create in /etc/rc.d/ an appropriate **"
-> echo "** symlink, named \"rc.firewall\", pointing to the startup script. **"
-> echo "** To do that, issue the following command: **"
+> echo "** 2) To manually start or restart the firewall, run: **"
+> echo "** /etc/rc.d/rc.arno-iptables-firewall start **"
+> echo "** or /etc/rc.d/rc.arno-iptables-firewall restart **"
> echo "** **"
-> echo "** ln -sv /etc/rc.d/rc.arno-iptables-firewall /etc/rc.d/rc.firewall **"
+> echo "** 3) To start the firewall automatically at boot-time, you need an **"
+> echo "** appropriate symlink, \"rc.firewall\", pointing to the startup **"
+> echo "** script. Issue the following commands to create the symlink: **"
+> echo "** cd /etc/rc.d/ **"
+> echo "** ln -sv rc.arno-iptables-firewall rc.firewall **"
> echo "** **"
-> echo "** Delete the link if you wish to disable firewall startup at boot- **"
-> echo "** time, or \"chmod -x\" the startup script for the same result. **"
+> echo "** 4) To disable startup at boot-time, simply delete the symlink, **"
+> echo "** or remove the executable bit from the startup script. **"
> echo "-------------------------------------------------------------------------------"
-> echo ""
-277d293
-<
diff --git a/network/arno-iptables-firewall/files/patch-startup-script.diff b/network/arno-iptables-firewall/files/patch-startup-script.diff
index c31514e260..5a005f25ec 100644
--- a/network/arno-iptables-firewall/files/patch-startup-script.diff
+++ b/network/arno-iptables-firewall/files/patch-startup-script.diff
@@ -1,12 +1,12 @@
4c4
-< # description: init.d script for Arno's iptables firewall
+< # description: init.d script for Arno's Iptables Firewall(AIF)
---
-> # description: rc.d script for Arno's iptables firewall
+> # description: rc.d script for Arno's Iptables Firewall(AIF)
7c7
< # Provides: arno-iptables-firewall
---
> # Provides: rc.arno-iptables-firewall
-15,21c15,23
+15,21c15,22
< ############################################################################################
< # You should put this script in eg. "/etc/init.d/" . #
< # Furthermore make sure it's executable! -> "chmod 700" or "chmod +x" it #
@@ -18,13 +18,12 @@
> ################################################################################
> # You should put this script in "/etc/rc.d/". #
> # Furthermore make sure it's executable! -> "chmod 755" or "chmod +x" it. #
-> # If you want to run it upon boot, either create an "rc.firewall" link to this #
-> # script ("ln -sv /etc/rc.d/rc.arno-iptables-firewall /etc/rc.d/rc.firewall") #
-> # or edit the network system startup script "/etc/rc.d/rc.inet2", by renaming #
-> # both occurrences of "rc.firewall" to match the name ot this script, that is, #
-> # "rc.arno-iptables-firewall". #
+> # If you want to run it upon boot, create an "rc.firewall" symlink to the #
+> # rc.arno-iptables-firewall script: #
+> # #
+> # ln -sv /etc/rc.d/rc.arno-iptables-firewall /etc/rc.d/rc.firewall #
> ################################################################################
-24c25
+24c26
< PROGRAM="/usr/local/sbin/arno-iptables-firewall"
---
> PROGRAM="/usr/sbin/arno-iptables-firewall"
diff --git a/network/arno-iptables-firewall/slack-desc b/network/arno-iptables-firewall/slack-desc
index 6bf5e1aefe..f9350be435 100644
--- a/network/arno-iptables-firewall/slack-desc
+++ b/network/arno-iptables-firewall/slack-desc
@@ -11,7 +11,7 @@ arno-iptables-firewall:
arno-iptables-firewall: arno-iptables-firewall is a front-end for iptables. Its configuration
arno-iptables-firewall: script will set up a secure and restrictive firewall by just asking a
arno-iptables-firewall: few questions. This includes the configuration of internal networks
-arno-iptables-firewall: for Internet access via NAT and potential network services like http
+arno-iptables-firewall: for Internet access via NAT, and potential network services like http
arno-iptables-firewall: or ssh. Moreover, it provides advanced additional features that can be
arno-iptables-firewall: enabled in the well documented configuration file.
arno-iptables-firewall:
diff --git a/network/arping/arping.SlackBuild b/network/arping/arping.SlackBuild
index 2f212d53a0..245a3b2cbc 100644
--- a/network/arping/arping.SlackBuild
+++ b/network/arping/arping.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for arping
# Copyright 2010 Nilton Moura, Rio de Janeiro, RJ, Brasil
+# Copyright 2020 Michael Edie, Tampa, FL, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=arping
-VERSION=${VERSION:-2.13}
+VERSION=${VERSION:-2.20}
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 +41,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,7 +70,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 {} \;
-# We are renameing the installed files arping2 to aviod conflicts with
+# We are renaming the installed files arping2 to aviod conflicts with
# Slackware's iputils arping so lets fix the manpages and scan script.
sed \
-e "s|\(arping\)|\12|g" \
diff --git a/network/arping/arping.info b/network/arping/arping.info
index 3456f9af31..b2c4f1e781 100644
--- a/network/arping/arping.info
+++ b/network/arping/arping.info
@@ -1,10 +1,10 @@
PRGNAM="arping"
-VERSION="2.13"
+VERSION="2.20"
HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
-DOWNLOAD="http://www.habets.pp.se/synscan/files/arping-2.13.tar.gz"
-MD5SUM="698e4a87d4ea6c8535b07b06d9ed503e"
+DOWNLOAD="http://www.habets.pp.se/synscan/files/arping-2.20.tar.gz"
+MD5SUM="132d2113e35f84dd85ed604074bc075a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libnet"
-MAINTAINER="Nilton Moura"
-EMAIL="nmoura@nmoura.eti.br"
+MAINTAINER="Michael Edie"
+EMAIL="michael@edie.io"
diff --git a/network/asterisk/README.SBo b/network/asterisk/README.SBo
index f9720e27d8..3e35584dd6 100644
--- a/network/asterisk/README.SBo
+++ b/network/asterisk/README.SBo
@@ -17,7 +17,7 @@ need to install libpri, again before compiling Asterisk.
Examples
========
-Be sure to see /usr/doc/asterisk-16.5.0/sample_confs/ after
+Be sure to see /usr/doc/asterisk-16.8.0/sample_confs/ after
installation for any additional configuration files you may need.
Database Support
@@ -27,7 +27,7 @@ want to install the alembic package. Since version 12.0 the database
schemas that Asterisk uses are being captured in the form of python
script files that use alembic to create/update database schemas. The
asterisk package places these database scripts in the
-/usr/doc/asterisk-16.5.0/ast-db-manage directory.
+/usr/doc/asterisk-16.8.0/ast-db-manage directory.
Build Flags
===========
diff --git a/network/asterisk/asterisk.SlackBuild b/network/asterisk/asterisk.SlackBuild
index 61fae6f741..7e9c513e0f 100644
--- a/network/asterisk/asterisk.SlackBuild
+++ b/network/asterisk/asterisk.SlackBuild
@@ -2,7 +2,7 @@
# Copyright 2006, Alan Hicks, Lizella, GA
# Copyright 2010, 2013, 2015 Mario Preksavec, Zagreb, Croatia
-# Copyright 2018-2019 Chris Walker, Kempner, TX
+# Copyright 2018-2020 Chris Walker, Kempner, TX
# 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=asterisk
-VERSION=${VERSION:-16.6.0}
+VERSION=${VERSION:-16.9.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -139,6 +139,7 @@ CXXFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
+ --with-cap \
--with-download-cache=$CACHEDIR \
$CONFIGURE_OPTS \
--build=$ARCH-slackware-linux
diff --git a/network/asterisk/asterisk.info b/network/asterisk/asterisk.info
index db782fde72..ca65bf26e0 100644
--- a/network/asterisk/asterisk.info
+++ b/network/asterisk/asterisk.info
@@ -1,43 +1,43 @@
PRGNAM="asterisk"
-VERSION="16.6.0"
+VERSION="16.9.0"
HOMEPAGE="https://www.asterisk.org"
-DOWNLOAD="http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-16.6.0.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz.sha1 \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz \
- http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz.sha1 \
+DOWNLOAD="https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.9.0.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz.sha1 \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz \
+ https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz.sha1 \
https://raw.githubusercontent.com/asterisk/third-party/master/jansson/2.12/jansson-2.12.tar.bz2 \
- https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.8/pjproject-2.8.tar.bz2 \
+ https://www.pjsip.org/release/2.9/pjproject-2.9.tar.bz2 \
http://ponce.cc/slackware/sources/repo/imap.tar.Z"
-MD5SUM="248e7aded51e2c73e921be7d330dec80 \
+MD5SUM="f50a3073061c5b72cd06cc0059e15804 \
d90e24e30d707e2932cf419cfccff25a \
3c071029c1ab648367666d1e384394bb \
e4a9ee348028fc0e47148f783e7f945b \
@@ -71,7 +71,7 @@ MD5SUM="248e7aded51e2c73e921be7d330dec80 \
8277e2c693fd056773b1c15e4d52077d \
011fa4dc9fe35dc3d34ed557bb04263f \
317dbaf90a9f85ea0ec7b12d080d173d \
- 6487d54213f270d307eaa60efc9f56f3 \
+ 66757078e7bd7cf316acb0425c2fdd6f \
d9f7fd4e1d93ad9fca1df8717a79d1c5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/network/atftp/atftp.SlackBuild b/network/atftp/atftp.SlackBuild
index 404ec9ba26..c5f7d225e9 100644
--- a/network/atftp/atftp.SlackBuild
+++ b/network/atftp/atftp.SlackBuild
@@ -23,6 +23,8 @@
# Now maintained by B. Watson <yalhcru@gmail.com>.
+# 20191129 bkw: update for v0.7.2.
+
# 20180629 bkw:
# - Take over maintenance.
# - Simplify script slightly.
@@ -31,7 +33,7 @@
# the package since it overrides some of the info from upstream's docs.
PRGNAM=atftp
-VERSION=${VERSION:-0.7.1}
+VERSION=${VERSION:-0.7.2}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
@@ -71,11 +73,8 @@ 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 {} \+
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
CC="gcc -fgnu89-inline $SLKCFLAGS" \
./configure \
diff --git a/network/atftp/atftp.info b/network/atftp/atftp.info
index 07b1601db7..58e6c6f694 100644
--- a/network/atftp/atftp.info
+++ b/network/atftp/atftp.info
@@ -1,8 +1,8 @@
PRGNAM="atftp"
-VERSION="0.7.1"
+VERSION="0.7.2"
HOMEPAGE="https://sourceforge.net/projects/atftp"
-DOWNLOAD="https://downloads.sourceforge.net/project/atftp/atftp-0.7.1.tar.gz"
-MD5SUM="367bf401965fbed04585b1229c2191a8"
+DOWNLOAD="https://downloads.sourceforge.net/project/atftp/atftp-0.7.2.tar.gz"
+MD5SUM="eb358eb1af10ae5dc51095cd10b6738b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/atheme/atheme.SlackBuild b/network/atheme/atheme.SlackBuild
index e7fc813f59..b55ec0a29e 100644
--- a/network/atheme/atheme.SlackBuild
+++ b/network/atheme/atheme.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Slackware build script for atheme
-# Copyright 2017 David Woodfall <dave@dawoodfall.net>
+# Copyright 2017 David Woodfall <dave@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
diff --git a/network/atheme/atheme.info b/network/atheme/atheme.info
index 17611c035d..977bc5630c 100644
--- a/network/atheme/atheme.info
+++ b/network/atheme/atheme.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/awscli/awscli.SlackBuild b/network/awscli/awscli.SlackBuild
index c4320b7d7d..aa5392d994 100644
--- a/network/awscli/awscli.SlackBuild
+++ b/network/awscli/awscli.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for awscli
-# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece
+# Copyright 2014-2020 Dimitris Zlatanidis Orestiada, Greece
# 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=awscli
-VERSION=${VERSION:-1.16.238}
+VERSION=${VERSION:-1.17.15}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/awscli/awscli.info b/network/awscli/awscli.info
index 69b50ae275..94faf14c36 100644
--- a/network/awscli/awscli.info
+++ b/network/awscli/awscli.info
@@ -1,8 +1,8 @@
PRGNAM="awscli"
-VERSION="1.16.238"
+VERSION="1.17.15"
HOMEPAGE="https://aws.amazon.com/cli/"
-DOWNLOAD="https://files.pythonhosted.org/packages/3e/f0/718b0e13a04148b47f984c1fa99cb43f69df6f8e561b80ba287411636296/awscli-1.16.238.tar.gz"
-MD5SUM="3f37dad2ab5cd4456cff6a7d54f52eb2"
+DOWNLOAD="https://files.pythonhosted.org/packages/2e/e5/b80329cb29004fd073a61fead50755898d25e2127d12c27ad9ef70c55741/awscli-1.17.15.tar.gz"
+MD5SUM="350b7270208a2119890e5c36e1f7ddef"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="s3transfer colorama rsa PyYAML"
diff --git a/network/axel/axel.SlackBuild b/network/axel/axel.SlackBuild
index d5f9413709..0a02564bd5 100644
--- a/network/axel/axel.SlackBuild
+++ b/network/axel/axel.SlackBuild
@@ -4,7 +4,7 @@
# Copyright 2008 Antonio HernΓ‘ndez Blas <hba.nihilismus@gmail.com>
# Copyright 2011 Matthew "mfillpot" Fillpot
-# Copyright 2018-2019 Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2018-2020 Jostein Berntsen <jbernts@broadpark.no>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=axel
-VERSION=${VERSION:-2.17.6}
+VERSION=${VERSION:-2.17.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/axel/axel.info b/network/axel/axel.info
index 0623c95408..31158b1fd4 100644
--- a/network/axel/axel.info
+++ b/network/axel/axel.info
@@ -1,8 +1,8 @@
PRGNAM="axel"
-VERSION="2.17.6"
+VERSION="2.17.7"
HOMEPAGE="https://github.com/axel-download-accelerator/axel"
-DOWNLOAD="https://github.com/axel-download-accelerator/axel/releases/download/v2.17.6/axel-2.17.6.tar.gz"
-MD5SUM="9813dc599a1154275886c95ccd107b43"
+DOWNLOAD="https://github.com/axel-download-accelerator/axel/releases/download/v2.17.7/axel-2.17.7.tar.gz"
+MD5SUM="7ae8b2cee4dd75caf4c6a810470940ba"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/barrier/barrier.info b/network/barrier/barrier.info
index 1382632fdb..554b4888c7 100644
--- a/network/barrier/barrier.info
+++ b/network/barrier/barrier.info
@@ -6,5 +6,5 @@ MD5SUM="8cc0d40bc7da7f7e33c8c063157084b5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="avahi qt5"
-MAINTAINER="Mαrio Antunes"
+MAINTAINER="MΓ‘rio Antunes"
EMAIL="mariolpantunes@gmail.com"
diff --git a/network/basilisk-bin/basilisk-bin.SlackBuild b/network/basilisk-bin/basilisk-bin.SlackBuild
index 28a8b50471..a30c712c8c 100644
--- a/network/basilisk-bin/basilisk-bin.SlackBuild
+++ b/network/basilisk-bin/basilisk-bin.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=basilisk-bin
SRCNAM=basilisk
-VERSION=${VERSION:-2018.12.18}
+VERSION=${VERSION:-2019.09.03}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/basilisk-bin/basilisk-bin.info b/network/basilisk-bin/basilisk-bin.info
index 5a6b4c9c94..ead5cf5a63 100644
--- a/network/basilisk-bin/basilisk-bin.info
+++ b/network/basilisk-bin/basilisk-bin.info
@@ -1,10 +1,10 @@
PRGNAM="basilisk-bin"
-VERSION="2018.12.18"
+VERSION="2019.09.03"
HOMEPAGE="https://www.basilisk-browser.org"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
DOWNLOAD_x86_64="http://us.basilisk-browser.org/release/basilisk-latest.linux64.tar.bz2"
-MD5SUM_x86_64="e0d89d7b48349d7622947291fbe3b1ca"
+MD5SUM_x86_64="c7106e3201d419da95f4508d80a5c3b0"
REQUIRES=""
MAINTAINER="khronosschoty"
EMAIL="khronosschoty@posteo.org"
diff --git a/network/basilisk/README b/network/basilisk/README
index 608efa0cc3..6093a0b8ef 100644
--- a/network/basilisk/README
+++ b/network/basilisk/README
@@ -13,8 +13,7 @@ Some build time options:
will override the default and build with gtk2 instead of gtk3.
-jack-audio-connection-kit is an optional dependency and, if detected,
-automatically built. If this is undesirable you can blacklist jack, by
-passing the variable:
+jack is an optional dependency and, if detected, automatically built. If
+this is undesirable you can blacklist jack, by passing the variable:
BLACKLIST_JACK=yes ./basilisk.SlackBuild
diff --git a/network/basilisk/basilisk.SlackBuild b/network/basilisk/basilisk.SlackBuild
index 8d0dc79ace..a3419c2151 100644
--- a/network/basilisk/basilisk.SlackBuild
+++ b/network/basilisk/basilisk.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=basilisk
SRCNAM=${SRCNAM:-UXP}
-VERSION=${VERSION:-2018.12.18}
+VERSION=${VERSION:-2019.09.03}
RELEASEVER=${RELEASEVER:-52.9.$VERSION}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -142,6 +142,11 @@ cd $SRCNAM-$VERSION
echo "$RELEASEVER" > application/basilisk/config/version.txt
echo "$VERSION" > application/basilisk/config/version_display.txt
+# Selectively APPLY patch for glibc 2.30+
+if [ "${PATCH_GLIBC:-no}" = "yes" ]; then
+ patch -p0 < $CWD/glibc-2.30+.patch
+fi
+
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/network/basilisk/basilisk.info b/network/basilisk/basilisk.info
index 4a97b3db63..85057decb3 100644
--- a/network/basilisk/basilisk.info
+++ b/network/basilisk/basilisk.info
@@ -1,9 +1,9 @@
PRGNAM="basilisk"
-VERSION="2018.12.18"
+VERSION="2019.09.03"
HOMEPAGE="https://github.com/MoonchildProductions/UXP"
-DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/v2018.12.18/UXP-2018.12.18.tar.gz \
+DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/v2019.09.03/UXP-2019.09.03.tar.gz \
http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz"
-MD5SUM="2aa9f8fa041686da08ea76b8188caa3e \
+MD5SUM="afa2ceea4761d3d8d0df88ffe5e42894 \
f2994d302cf736e7e71974edfa51da3c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/network/basilisk/glibc-2.30+.patch b/network/basilisk/glibc-2.30+.patch
new file mode 100644
index 0000000000..b67945d12a
--- /dev/null
+++ b/network/basilisk/glibc-2.30+.patch
@@ -0,0 +1,43 @@
+--- tools/profiler/tasktracer/GeckoTaskTracer.cpp 2019-08-23 01:47:27.000000000 +0200
++++ tools/profiler/tasktracer/GeckoTaskTracer.cpp 2019-08-29 18:02:44.541959971 +0200
+@@ -25,20 +25,14 @@
+ #if defined(__GLIBC__)
+ #include <unistd.h>
+ #include <sys/syscall.h>
+-static inline pid_t gettid()
+-{
+- return (pid_t) syscall(SYS_gettid);
+-}
++#define gettid() static_cast<pid_t>(syscall(SYS_gettid))
+ #elif defined(XP_MACOSX)
+ #include <unistd.h>
+ #include <sys/syscall.h>
+-static inline pid_t gettid()
+-{
+- return (pid_t) syscall(SYS_thread_selfid);
+-}
++#define gettid() static_cast<pid_t>(syscall(SYS_thread_selfid))
+ #elif defined(LINUX)
+ #include <sys/types.h>
+-pid_t gettid();
++#pid_t gettid();
+ #endif
+
+ // NS_ENSURE_TRUE_VOID() without the warning on the debug build.
+
+
+--- js/src/jsnativestack.cpp 2019-08-29 17:45:10.000000000 +0200
++++ js/src/jsnativestack.cpp 2019-08-29 17:53:58.382003265 +0200
+@@ -26,11 +26,7 @@
+ # include <sys/syscall.h>
+ # include <sys/types.h>
+ # include <unistd.h>
+-static pid_t
+-gettid()
+-{
+- return syscall(__NR_gettid);
+-}
++# define gettid() static_cast<pid_t>(syscall(__NR_gettid))
+ # endif
+
+ #else
diff --git a/network/bitcoin/README b/network/bitcoin/README
index 7075d3ee89..bf26b9db6c 100644
--- a/network/bitcoin/README
+++ b/network/bitcoin/README
@@ -9,10 +9,10 @@ of a P2P network to check for double-spending.
This Bitcoin client builds the backbone of the bitcoin network.
It downloads, verifies and distributes the blockchain to other
peers in the network. It uses lots of diskspace and bandwidth.
-If you just want to send and receive Bitcoins you should look at
-a light client like Electrum.
+If you just want to send and receive Bitcoins you can also look
+at a light client like Electrum.
Please make sure to read the release notes first before upgrading:
-https://bitcoincore.org/en/releases/0.18.1/
+https://bitcoincore.org/en/releases/0.19.1/
qrencode is an optional but strongly recommended dependency.
diff --git a/network/bitcoin/bitcoin.SlackBuild b/network/bitcoin/bitcoin.SlackBuild
index 9f9353e4b4..37ddf51ef1 100644
--- a/network/bitcoin/bitcoin.SlackBuild
+++ b/network/bitcoin/bitcoin.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=bitcoin
-VERSION=${VERSION:-0.18.1}
+VERSION=${VERSION:-0.19.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/bitcoin/bitcoin.info b/network/bitcoin/bitcoin.info
index c06c153c13..e05fbb739c 100644
--- a/network/bitcoin/bitcoin.info
+++ b/network/bitcoin/bitcoin.info
@@ -1,8 +1,8 @@
PRGNAM="bitcoin"
-VERSION="0.18.1"
+VERSION="0.19.1"
HOMEPAGE="https://bitcoincore.org"
-DOWNLOAD="https://bitcoincore.org/bin/bitcoin-core-0.18.1/bitcoin-0.18.1.tar.gz"
-MD5SUM="be159bfefb78018e331d0dd7c01ef415"
+DOWNLOAD="https://bitcoincore.org/bin/bitcoin-core-0.19.1/bitcoin-0.19.1.tar.gz"
+MD5SUM="6066d7247a5a8c61392fb79ae882bd30"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="protobuf qt5"
diff --git a/network/bluejeans/bluejeans.SlackBuild b/network/bluejeans/bluejeans.SlackBuild
index 5544a07e03..4627a26c0a 100644
--- a/network/bluejeans/bluejeans.SlackBuild
+++ b/network/bluejeans/bluejeans.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for bluejeans
-# Copyright 2019 Igor Alexandrov <igor.s.alexandrov@gmail.com>
+# Copyright 2019 Igor Alexandrov <igora.vault@gmail.com>
# 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=bluejeans
-VERSION=${VERSION:-1.37.22}
+VERSION=${VERSION:-2.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -40,9 +40,12 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+SRCNAM=BlueJeans
+EXECNAM=bluejeans-v2
+
if [ "$ARCH" != "x86_64" ]; then
echo "$ARCH is not supported for $PRGNAM-$VERSION"
- exit -1
+ exit 1
fi
set -e
@@ -50,10 +53,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $PKG
-rpm2cpio $CWD/$PRGNAM-$VERSION.$ARCH.rpm | cpio -idmv
+rpm2cpio $CWD/$SRCNAM.rpm | cpio -idmv
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 \
@@ -63,21 +65,11 @@ find -L . \
find . -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-chmod 755 opt/bluejeans/bluejeans
-patchelf --replace-needed libudev.so.0 libudev.so opt/bluejeans/bluejeans-bin
-
-mkdir -p usr/{bin,doc/$PRGNAM-$VERSION,share/{applications,icons}}
-
-ln -s ../../opt/$PRGNAM/$PRGNAM usr/bin
-ln -s ../../../opt/$PRGNAM/$PRGNAM.desktop usr/share/applications
-ln -s ../../../opt/$PRGNAM/credits.html usr/doc/$PRGNAM-$VERSION
-cat $CWD/slack-desc > $PKG/usr/doc/$PRGNAM-$VERSION/slack-desc
+mkdir -p usr/{bin,doc/$PRGNAM-$VERSION}
+ln -s ../../opt/$SRCNAM/$EXECNAM usr/bin/$PRGNAM
+ln -s ../../../opt/$SRCNAM/LICENSE.electron.txt usr/doc/$PRGNAM-$VERSION
+ln -s ../../../opt/$SRCNAM/LICENSES.chromium.html usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-(cd opt/$PRGNAM/icons; find . -type d -exec mkdir -p ../../../usr/share/icons/{} \;)
-for i in $(find opt/$PRGNAM/icons -type f); do
- sd=$(echo $i | cut -d/ -f4-)
- ln -s ../../$(echo $sd | sed 's:[^/][^/]*:..:g')/$i usr/share/icons/$sd
-done
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/bluejeans/bluejeans.info b/network/bluejeans/bluejeans.info
index ca91f442e1..a13d97eaf7 100644
--- a/network/bluejeans/bluejeans.info
+++ b/network/bluejeans/bluejeans.info
@@ -1,10 +1,10 @@
PRGNAM="bluejeans"
-VERSION="1.37.22"
+VERSION="2.1.0"
HOMEPAGE="https://www.bluejeans.com"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://swdl.bluejeans.com/desktop/linux/1.37/1.37.22/bluejeans-1.37.22.x86_64.rpm"
-MD5SUM_x86_64="fa34e81272a0fc37ef03daa3ff881f15"
-REQUIRES="patchelf"
+DOWNLOAD_x86_64="https://swdl.bluejeans.com/desktop-app/linux/2.1.0/BlueJeans.rpm"
+MD5SUM_x86_64="05a514e65d7d14e3d51c43363000eee0"
+REQUIRES=""
MAINTAINER="Igor Alexandrov"
-EMAIL="igor.s.alexandrov@gmail.com"
+EMAIL="igora.vault@gmail.com"
diff --git a/network/bottle/bottle.SlackBuild b/network/bottle/bottle.SlackBuild
index ac59df529a..aa31d08f9c 100644
--- a/network/bottle/bottle.SlackBuild
+++ b/network/bottle/bottle.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for bottle
-# Copyright 2015-2017 Philip Lacroix <slackph at posteo dot de>
+# Copyright 2015-2020 Philip Lacroix <slackph at posteo dot de>
# 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=bottle
-VERSION=${VERSION:-0.12.13}
+VERSION=${VERSION:-0.12.18}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -53,8 +53,8 @@ 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 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
python setup.py install --root=$PKG
diff --git a/network/bottle/bottle.info b/network/bottle/bottle.info
index 49e70de934..a79ce8245d 100644
--- a/network/bottle/bottle.info
+++ b/network/bottle/bottle.info
@@ -1,8 +1,8 @@
PRGNAM="bottle"
-VERSION="0.12.13"
-HOMEPAGE="http://bottlepy.org/docs/dev/"
-DOWNLOAD="https://pypi.python.org/packages/bd/99/04dc59ced52a8261ee0f965a8968717a255ea84a36013e527944dbf3468c/bottle-0.12.13.tar.gz"
-MD5SUM="d2fe1b48c1d49217e78bf326b1cad437"
+VERSION="0.12.18"
+HOMEPAGE="https://bottlepy.org/docs/dev/"
+DOWNLOAD="https://files.pythonhosted.org/packages/d9/4f/57887a07944140dae0d039d8bc270c249fc7fc4a00744effd73ae2cde0a9/bottle-0.12.18.tar.gz"
+MD5SUM="a00b7e9a1ab3be7c19c1235fea2ccb40"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/bozohttpd/bozohttpd.SlackBuild b/network/bozohttpd/bozohttpd.SlackBuild
index efe8bdbadf..1fba0eea92 100644
--- a/network/bozohttpd/bozohttpd.SlackBuild
+++ b/network/bozohttpd/bozohttpd.SlackBuild
@@ -24,6 +24,8 @@
# Now maintained by B. Watson <yalhcru@gmail.com>.
+# 20191201 bkw: Update for v20190228.
+
# 20181203 bkw:
# - Update for v20181125.
# - Lua-5.1 (plain lua build) is no longer supported. Add a mess o' logic
@@ -44,7 +46,7 @@
# - Simplify script a bit.
PRGNAM=bozohttpd
-VERSION=${VERSION:-20181125}
+VERSION=${VERSION:-20190228}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/bozohttpd/bozohttpd.info b/network/bozohttpd/bozohttpd.info
index 2d275dca86..7897ab0ce5 100644
--- a/network/bozohttpd/bozohttpd.info
+++ b/network/bozohttpd/bozohttpd.info
@@ -1,8 +1,8 @@
PRGNAM="bozohttpd"
-VERSION="20181125"
+VERSION="20190228"
HOMEPAGE="http://www.eterna.com.au/bozohttpd/"
-DOWNLOAD="http://www.eterna.com.au/bozohttpd/bozohttpd-20181125.tar.bz2"
-MD5SUM="e9ee8f82ebcf9ef9b293c6af32672082"
+DOWNLOAD="http://www.eterna.com.au/bozohttpd/bozohttpd-20190228.tar.bz2"
+MD5SUM="2a6bc4bf44cfc8e31559c29ce993e0b3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/brave-browser/README b/network/brave-browser/README
index 45d71fb02a..206ae972ea 100644
--- a/network/brave-browser/README
+++ b/network/brave-browser/README
@@ -1,15 +1,11 @@
-Brave is on a mission to fix the Web by giving users a safer, faster,
-and better browsing experience – while growing support for content
-creators through a new attention-based ecosystem of rewards.
+Brave is a free and open-source web browser developed by Brave
+Software, Inc. based on the Chromium web browser.
-Much more than a browser, Brave is a new way of thinking about how the
-Web works.
-
-Brave is open source, and built by a team of privacy focused,
-performance oriented pioneers of the Web, founded by the inventor
-of Javascript and co-founder of Mozilla.
+The browser blocks ads and website trackers, and provides a
+way for users to send cryptocurrency contributions in the
+form of Basic Attention Tokens to websites and content creators.
Brave is 64-bit software.
-This SlackBuild does not build Brave from source, it simply repackages
+This SlackBuild does not build Brave from source, it repackages
the binary.
diff --git a/network/brave-browser/brave-browser.SlackBuild b/network/brave-browser/brave-browser.SlackBuild
index ae3dbcfff2..0286720ba4 100644
--- a/network/brave-browser/brave-browser.SlackBuild
+++ b/network/brave-browser/brave-browser.SlackBuild
@@ -2,6 +2,7 @@
# Slackware build script for brave-browser
+# Copyright 2019-2020 Andrew Payne, Boston MA <phalange@komputermatrix.com>
# Copyright 2018-2019 Donald Cooley South Haven, Indiana USA
# All rights reserved.
#
@@ -23,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=brave-browser
-VERSION=${VERSION:-0.68.142}
+VERSION=${VERSION:-1.5.115}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -77,8 +78,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
# Place man page(s) where The Man likes 'em
mv $PKG/usr/share/man $PKG/usr/man
-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
+#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
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/brave-browser/brave-browser.info b/network/brave-browser/brave-browser.info
index 4622018f10..70fd8b4704 100644
--- a/network/brave-browser/brave-browser.info
+++ b/network/brave-browser/brave-browser.info
@@ -1,10 +1,10 @@
PRGNAM="brave-browser"
-VERSION="0.68.142"
+VERSION="1.5.115"
HOMEPAGE="https://brave.com"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/brave/brave-browser/releases/download/v0.68.142/brave-browser-0.68.142-1.x86_64.rpm"
-MD5SUM_x86_64="ea8e9c61a3ccdf218ceb1a54e8a63426"
+DOWNLOAD_x86_64="https://github.com/brave/brave-browser/releases/download/v1.5.115/brave-browser-1.5.115-1.x86_64.rpm"
+MD5SUM_x86_64="82d39a4a0b246b8429308de8599e974e"
REQUIRES=""
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+MAINTAINER="Andrew Payne"
+EMAIL="phalange@komputermatrix.com"
diff --git a/network/brave-browser/doinst.sh b/network/brave-browser/doinst.sh
index 2675e13764..57c1cdfc42 100644
--- a/network/brave-browser/doinst.sh
+++ b/network/brave-browser/doinst.sh
@@ -1,5 +1,5 @@
if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
if [ -x /usr/bin/update-mime-database ]; then
diff --git a/network/brave-browser/slack-desc b/network/brave-browser/slack-desc
index fb3dc60d85..b95e1599f6 100644
--- a/network/brave-browser/slack-desc
+++ b/network/brave-browser/slack-desc
@@ -8,12 +8,12 @@
|-----handy-ruler------------------------------------------------------|
brave-browser: brave-browser (a safer, faster, and better Web browsing experience)
brave-browser:
-brave-browser: Brave is on a mission to fix the Web by giving users a safer, faster,
-brave-browser: and better browsing experience - while growing support for content
-brave-browser: creators through a new attention-based ecosystem of rewards.
-brave-browser: Much more than a browser, Brave is a new way of thinking about how
-brave-browser: the Web works.
-brave-browser: Brave is open source, and built by a team of privacy focused,
-brave-browser: performance oriented pioneers of the Web, founded by the inventor of
-brave-browser: Javascript and co-founder of Mozilla.
+brave-browser: Brave is a free and open-source web browser developed by Brave
+brave-browser: Software, Inc. based on the Chromium web browser.
+brave-browser:
+brave-browser:
+brave-browser:
+brave-browser:
+brave-browser:
+brave-browser:
brave-browser: https://brave-browser.com
diff --git a/network/cherokee/cherokee.info b/network/cherokee/cherokee.info
index ea23a977c6..a3526ecc64 100644
--- a/network/cherokee/cherokee.info
+++ b/network/cherokee/cherokee.info
@@ -6,5 +6,5 @@ MD5SUM="845ed7bdb3b038d277607a47288aaec1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Pablo Hernan Saro"
-EMAIL="pablosaro@gmail.com"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/network/chrony/chrony.SlackBuild b/network/chrony/chrony.SlackBuild
index 92e3c05de3..9c31e913e2 100644
--- a/network/chrony/chrony.SlackBuild
+++ b/network/chrony/chrony.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=chrony
-VERSION=${VERSION:-3.4}
+VERSION=${VERSION:-3.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -96,7 +96,7 @@ make install DESTDIR=$PKG
chown ${NTP_USER}:${NTP_GROUP} $PKG/var/lib/chrony
install -D -m 0644 $CWD/chrony.conf $PKG/etc/chrony.conf.new
install -D -m 0644 $CWD/rc.chrony $PKG/etc/rc.d/rc.chrony.new
-sed -i "s%@NTP_USER@%${NTP_USER}%g" $PKG/etc/rc.d/rc.chrony.new
+sed -i "s%^NTP_USER=@NTP_USER@%NTP_USER=${NTP_USER}%g" $PKG/etc/rc.d/rc.chrony.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
diff --git a/network/chrony/chrony.info b/network/chrony/chrony.info
index 19b3264d15..fe031f7529 100644
--- a/network/chrony/chrony.info
+++ b/network/chrony/chrony.info
@@ -1,8 +1,8 @@
PRGNAM="chrony"
-VERSION="3.4"
+VERSION="3.5"
HOMEPAGE="https://chrony.tuxfamily.org/"
-DOWNLOAD="https://download.tuxfamily.org/chrony/chrony-3.4.tar.gz"
-MD5SUM="7170e750469c198fc6784047d6f71144"
+DOWNLOAD="https://download.tuxfamily.org/chrony/chrony-3.5.tar.gz"
+MD5SUM="5f66338bc940a9b51eede8f391e7bed3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/chrony/rc.chrony b/network/chrony/rc.chrony
index fc74d34ae2..fdff2facbd 100644
--- a/network/chrony/rc.chrony
+++ b/network/chrony/rc.chrony
@@ -1,13 +1,18 @@
#!/bin/sh
+NTP_USER=@NTP_USER@
+
+# place local customizations in /etc/default/chrony
+[ -r /etc/default/chrony ] && . /etc/default/chrony
+
################################################################################
chronyd_start() {
################################################################################
if [ -n "$(pidof chronyd)" ]; then
echo "chronyd seems to be already running."
else
- echo "Starting chronyd: /usr/sbin/chronyd -u @NTP_USER@"
- /usr/sbin/chronyd -u @NTP_USER@
+ echo "Starting chronyd: /usr/sbin/chronyd -u $NTP_USER $CHRONYD_ARGS"
+ /usr/sbin/chronyd -u $NTP_USER $CHRONYD_ARGS
fi
}
diff --git a/network/clipgrab/clipgrab.SlackBuild b/network/clipgrab/clipgrab.SlackBuild
index cb1fe284eb..3d54fe488f 100644
--- a/network/clipgrab/clipgrab.SlackBuild
+++ b/network/clipgrab/clipgrab.SlackBuild
@@ -2,7 +2,7 @@
#
# Slackware build script for clipgrab.
#
-# Copyright 2015-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil.
# 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=clipgrab
-VERSION=${VERSION:-3.8.5}
+VERSION=${VERSION:-3.8.10}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/clipgrab/clipgrab.info b/network/clipgrab/clipgrab.info
index 52659f49c5..072bf52c8a 100644
--- a/network/clipgrab/clipgrab.info
+++ b/network/clipgrab/clipgrab.info
@@ -1,10 +1,10 @@
PRGNAM="clipgrab"
-VERSION="3.8.5"
+VERSION="3.8.10"
HOMEPAGE="http://clipgrab.org/"
-DOWNLOAD="https://download.clipgrab.org/clipgrab-3.8.5.tar.gz"
-MD5SUM="ec17f4041965cf5cab5d3f226e4df7a1"
+DOWNLOAD="https://download.clipgrab.org/clipgrab-3.8.10.tar.gz"
+MD5SUM="9b992e77d14fa22b079d3f64f4cf3451"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="qt5 ffmpeg opus"
+REQUIRES="pcre2 opus qt5 ffmpeg"
MAINTAINER="Edinaldo P. Silva"
EMAIL="edps.mundognu@gmail.com"
diff --git a/network/cni-plugins/README b/network/cni-plugins/README
new file mode 100644
index 0000000000..6d58b57dc6
--- /dev/null
+++ b/network/cni-plugins/README
@@ -0,0 +1,47 @@
+CNI plugins
+
+Some CNI network plugins, maintained by the containernetworking team. For
+more information, see the individual READMEs.
+
+Read CONTRIBUTING for build and test instructions.
+Plugins supplied:
+Main: interface-creating
+
+ bridge: Creates a bridge, adds the host and the container to it.
+ ipvlan: Adds an ipvlan interface in the container.
+ loopback: Set the state of loopback interface to up.
+ macvlan: Creates a new MAC address, forwards all traffic to that to
+ the container.
+ ptp: Creates a veth pair.
+ vlan: Allocates a vlan device.
+ host-device: Move an already-existing device into a container.
+
+Windows: windows specific
+
+ win-bridge: Creates a bridge, adds the host and the container to it.
+ win-overlay: Creates an overlay interface to the container.
+
+IPAM: IP address allocation
+
+ dhcp: Runs a daemon on the host to make DHCP requests on behalf of
+ the container
+ host-local: Maintains a local database of allocated IPs
+ static: Allocate a static IPv4/IPv6 addresses to container and it's
+ useful in debugging purpose.
+
+Meta: other plugins
+
+ flannel: Generates an interface corresponding to a flannel config file
+ tuning: Tweaks sysctl parameters of an existing interface
+ portmap: An iptables-based portmapping plugin. Maps ports from the
+ host's address space to the container.
+ bandwidth: Allows bandwidth-limiting through use of traffic control
+ tbf (ingress/egress).
+ sbr: A plugin that configures source based routing for an interface
+ (from which it is chained).
+ firewall: A firewall plugin which uses iptables or firewalld to add
+ rules to allow traffic to/from the container.
+
+Sample
+
+The sample plugin provides an example for building your own plugin.
diff --git a/network/cni-plugins/cni-plugins.SlackBuild b/network/cni-plugins/cni-plugins.SlackBuild
new file mode 100644
index 0000000000..4231a5d46c
--- /dev/null
+++ b/network/cni-plugins/cni-plugins.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Slackware build script for cni-plugins
+
+# Copyright 2019 Gabriel Diaz, Madrid, Spain
+# Copyright 2019 Vincent Batts, Raleigh, NC, 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=cni-plugins
+REPONAME=plugins
+VERSION=${VERSION:-0.8.2}
+GIT_COMMIT="485be65581341430f9106a194a98f0f2412245fb"
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+# The domain part of the go package name, usually the hosting platform
+DOMAIN=github.com
+# The name of the organization/owner of the package
+ORG=containernetworking
+
+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
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ LIBDIRSUFFIX="64"
+else
+ LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $REPONAME-$VERSION
+mkdir -p $REPONAME-$VERSION/src/$DOMAIN/$ORG
+cd $REPONAME-$VERSION/src/$DOMAIN/$ORG
+tar xvf $CWD/$REPONAME-$VERSION.tar.gz
+mv $REPONAME-$VERSION $REPONAME
+cd $REPONAME
+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 {} \;
+
+# Point go to the location of the source tree
+export GOPATH="$TMP/$REPONAME-$VERSION"
+REPO_PATH=$TMP/$REPONAME-$VERSION/src/$DOMAIN/$ORG/$REPONAME
+sudo mkdir -p $PKG/usr/libexec/cni
+
+PLUGINS="plugins/meta/* plugins/main/* plugins/ipam/*"
+for d in $PLUGINS; do
+ if [ -d "$d" ]; then
+ plugin="$(basename "$d")"
+ if [ $plugin != "windows" ]; then
+ echo " $plugin"
+ go build -o "$PKG/usr/libexec/cni/$plugin" "$@" "$REPO_PATH"/$d
+ fi
+ fi
+done
+
+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 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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/cni-plugins/cni-plugins.info b/network/cni-plugins/cni-plugins.info
new file mode 100644
index 0000000000..19b1651015
--- /dev/null
+++ b/network/cni-plugins/cni-plugins.info
@@ -0,0 +1,10 @@
+PRGNAM="cni-plugins"
+VERSION="0.8.2"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+DOWNLOAD="https://github.com/containernetworking/plugins/archive/v0.8.2/plugins-0.8.2.tar.gz"
+MD5SUM="21c39de98441e7874bb9cfd4921801af"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Vincent Batts"
+EMAIL="vbatts@hashbangbash.com"
diff --git a/network/cni-plugins/slack-desc b/network/cni-plugins/slack-desc
new file mode 100644
index 0000000000..ead6b93729
--- /dev/null
+++ b/network/cni-plugins/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+cni-plugins: cni-plugins (plugins for Container Networking Interface)
+cni-plugins:
+cni-plugins: Container networking plugins for baseline functionality.
+cni-plugins:
+cni-plugins: Site: https://github.com/containernetworking/plugins
+cni-plugins:
+cni-plugins:
+cni-plugins:
+cni-plugins:
+cni-plugins:
+cni-plugins:
diff --git a/network/createrepo_c/README b/network/createrepo_c/README
deleted file mode 100644
index b344f6e8f7..0000000000
--- a/network/createrepo_c/README
+++ /dev/null
@@ -1,9 +0,0 @@
-RPM metadata generator.
-
-Since we have very basic support of rpm in Slackware
-base, why not ship this utilities too?
-
-This is C implementation of createrepo.
-
-With this utility you can run repository of your own RPM
-package set.
diff --git a/network/createrepo_c/createrepo_c.info b/network/createrepo_c/createrepo_c.info
deleted file mode 100644
index 1b2b95bbbd..0000000000
--- a/network/createrepo_c/createrepo_c.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="createrepo_c"
-VERSION="0.14.2"
-HOMEPAGE="https://github.com/rpm-software-management/createrepo_c"
-DOWNLOAD="https://github.com/rpm-software-management/createrepo_c/archive/0.14.2/createrepo_c-0.14.2.tar.gz"
-MD5SUM="395d685e079cc2c52b19f6a2d461204a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Sergei Fedosoff"
-EMAIL="eleksir@gmail.com"
diff --git a/network/ctorrent/ctorrent.SlackBuild b/network/ctorrent/ctorrent.SlackBuild
index 42ef7c1fac..9b1ece677d 100644
--- a/network/ctorrent/ctorrent.SlackBuild
+++ b/network/ctorrent/ctorrent.SlackBuild
@@ -86,9 +86,9 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$PKGVERSION || true
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+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
@@ -97,4 +97,4 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/ctorrent/ctorrent.info b/network/ctorrent/ctorrent.info
index 473491d78e..e5ad101607 100644
--- a/network/ctorrent/ctorrent.info
+++ b/network/ctorrent/ctorrent.info
@@ -1,5 +1,5 @@
PRGNAM="ctorrent"
-VERSION="dnh3.3.2"
+VERSION="3.3.2"
HOMEPAGE="http://www.rahul.net/dholmes/ctorrent/"
DOWNLOAD="http://downloads.sourceforge.net/dtorrent/3.3.2/ctorrent-dnh3.3.2.tar.gz"
MD5SUM="59b23dd05ff70791cd6449effa7fc3b6"
diff --git a/network/deluge/deluge.SlackBuild b/network/deluge/deluge.SlackBuild
index 6417289318..fbac53a519 100644
--- a/network/deluge/deluge.SlackBuild
+++ b/network/deluge/deluge.SlackBuild
@@ -3,6 +3,8 @@
# Slackware build script for deluge.
# Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
+# Copyright 2019 Logan Rathbone <poprocks@gmail.com>
+#
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,9 +23,17 @@
# 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.
+#
+# CHANGELOG
+#
+# 20191118 Logan Rathbone <poprocks@gmail.com> 2.0.3-1
+# - Update for 2.0.3
+# - Additional dependencies: MarkupSafe, setproctitle, rencode,
+# service_identity
+#
PRGNAM=deluge
-VERSION=${VERSION:-1.3.15}
+VERSION=${VERSION:-2.0.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -40,7 +50,7 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-DOCS="LICENSE ChangeLog* README"
+DOCS="AUTHORS LICENSE CHANGELOG.md README.md"
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -58,7 +68,7 @@ rm -rf $PKG
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 .
diff --git a/network/deluge/deluge.info b/network/deluge/deluge.info
index 05c7ae9933..eaa430858e 100644
--- a/network/deluge/deluge.info
+++ b/network/deluge/deluge.info
@@ -1,10 +1,10 @@
PRGNAM="deluge"
-VERSION="1.3.15"
+VERSION="2.0.3"
HOMEPAGE="https://www.deluge-torrent.org/"
-DOWNLOAD="http://download.deluge-torrent.org/source/deluge-1.3.15.tar.bz2"
-MD5SUM="96cdc53cd184df0052e8394d087e2723"
+DOWNLOAD="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-2.0.3.tar.xz"
+MD5SUM="fbe784ebed006cd93c9a50f7c0530051"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="Mako libtorrent-rasterbar pyOpenSSL python-chardet python-twisted pyxdg"
-MAINTAINER="Gerardo Zamduio"
-EMAIL="gerardo.zamudio@linux.com"
+REQUIRES="Mako MarkupSafe libtorrent-rasterbar pyOpenSSL python-chardet python-twisted pyxdg rencode service_identity setproctitle"
+MAINTAINER="Logan Rathbone"
+EMAIL="poprocks@gmail.com"
diff --git a/network/discord/discord.SlackBuild b/network/discord/discord.SlackBuild
index 4ee91e3373..66e5c0f750 100644
--- a/network/discord/discord.SlackBuild
+++ b/network/discord/discord.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for discord
#
-# Copyright 2016-2019 Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2016-2020 Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
# 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=discord
-VERSION=${VERSION:-0.0.9}
+VERSION=${VERSION:-0.0.10}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -58,7 +58,7 @@ set -eu
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $PKG
-ar p $CWD/${PRGNAM}-${VERSION}.deb data.tar.xz | unxz | tar xv
+ar p $CWD/${PRGNAM}-${VERSION}.deb data.tar.gz | tar zxv
chown -R root:root .
find -L . \
diff --git a/network/discord/discord.info b/network/discord/discord.info
index fa3d37ad50..5caa0c836c 100644
--- a/network/discord/discord.info
+++ b/network/discord/discord.info
@@ -1,10 +1,10 @@
PRGNAM="discord"
-VERSION="0.0.9"
+VERSION="0.0.10"
HOMEPAGE="https://discordapp.com"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://dl.discordapp.net/apps/linux/0.0.9/discord-0.0.9.deb"
-MD5SUM_x86_64="2f6f5eb899f2815fbd26dddea0d2d316"
+DOWNLOAD_x86_64="https://dl.discordapp.net/apps/linux/0.0.10/discord-0.0.10.deb"
+MD5SUM_x86_64="0a8568752ce607187c86b640c23ae27b"
REQUIRES="libc++"
MAINTAINER="Jeremy Hansen"
EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/network/dissenter-browser/dissenter-browser.SlackBuild b/network/dissenter-browser/dissenter-browser.SlackBuild
index ed07f8557d..7eaedda22e 100644
--- a/network/dissenter-browser/dissenter-browser.SlackBuild
+++ b/network/dissenter-browser/dissenter-browser.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=dissenter-browser
-VERSION=${VERSION:-0.66.99}
+VERSION=${VERSION:-1.5.114}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,7 +69,7 @@ rm -rf $PKG/usr/share/gnome-control-center
# Move icon into place
mkdir -p $PKG/usr/share/pixmaps
-cp opt/gab/dissenter/*.xpm $PKG/usr/share/pixmaps/dissenter-browser.xpm
+cp opt/dissenter.com/dissenter/*.xpm $PKG/usr/share/pixmaps/dissenter-browser.xpm
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/dissenter-browser/dissenter-browser.info b/network/dissenter-browser/dissenter-browser.info
index d56384b6fe..d5ed39bc37 100644
--- a/network/dissenter-browser/dissenter-browser.info
+++ b/network/dissenter-browser/dissenter-browser.info
@@ -1,10 +1,10 @@
PRGNAM="dissenter-browser"
-VERSION="0.66.99"
+VERSION="1.5.114"
HOMEPAGE="https://dissenter.com"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://dissenter.com/dist/browser/0.66.99/dissenter-browser-0.66.99-1.x86_64.rpm"
-MD5SUM_x86_64="e283dadf430ed9d3da90ac8a82822f64"
+DOWNLOAD_x86_64="https://github.com/gab-ai-inc/defiant-browser/releases/download/v1.5.114/dissenter-browser-1.5.114-1.x86_64.rpm"
+MD5SUM_x86_64="1e79f69736bc849a08d3f4399c49aca1"
REQUIRES=""
MAINTAINER="Donald Cooley"
EMAIL="chytraeu@sdf.org"
diff --git a/network/dmitry/dmitry.SlackBuild b/network/dmitry/dmitry.SlackBuild
index 36b383e22f..bca6380c53 100644
--- a/network/dmitry/dmitry.SlackBuild
+++ b/network/dmitry/dmitry.SlackBuild
@@ -3,30 +3,28 @@
# Slackware build script for dmitry
# Copyright Wigums
-# 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.
+
+# DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+# Version 2, December 2004
+
+# Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+# Everyone is permitted to copy and distribute verbatim or modified
+# copies of this license document, and changing it is allowed as long
+# as the name is changed.
+
+# DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+# TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+# 0. You just DO WHAT THE FUCK YOU WANT TO.
+
+
PRGNAM=dmitry
SRCNAM=DMitry
-VERSION=${VERSION:-1.2a}
+VERSION=${VERSION:-1.3a}
BUILD=${BUILD:-1}
-TAG=${TAG:-_Sbo}
+TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/network/dmitry/dmitry.info b/network/dmitry/dmitry.info
index 7978b58988..36caccd326 100644
--- a/network/dmitry/dmitry.info
+++ b/network/dmitry/dmitry.info
@@ -1,8 +1,8 @@
PRGNAM="dmitry"
-VERSION="1.2a"
+VERSION="1.3a"
HOMEPAGE="http://mor-pah.net/software/dmitry-deepmagic-information-gathering-tool/"
-DOWNLOAD="https://dl.packetstormsecurity.net/UNIX/misc/DMitry-1.2a.tar.gz"
-MD5SUM="5917242266383be3aa7e0e618ae0c015"
+DOWNLOAD="https://dl.packetstormsecurity.net/UNIX/misc/DMitry-1.3a.tar.gz"
+MD5SUM="8d578ba16de34b5cbebf6b767181b00d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/dmitry/slack-desc b/network/dmitry/slack-desc
index 39f5f3b3ac..e714c85e53 100644
--- a/network/dmitry/slack-desc
+++ b/network/dmitry/slack-desc
@@ -8,12 +8,12 @@
|-----handy-ruler------------------------------------------------------|
dmitry: dmitry (Deepmagic Information Gathering Tool)
dmitry:
-dmitry: DMitry (Deepmagic Information Gathering Tool) is a UNIX/(GNU)Linux
-dmitry: Command Line Application coded in C. DMitry has the ability to gather
-dmitry: as much information as possible about a host. Base functionality is
-dmitry: able to gather possible subdomains, email addresses, uptime
+dmitry: DMitry (Deepmagic Information Gathering Tool) is a UNIX/(GNU)Linux
+dmitry: Command Line Application coded in C. DMitry has the ability to gather
+dmitry: as much information as possible about a host. Base functionality is
+dmitry: able to gather possible subdomains, email addresses, uptime
dmitry: information, tcp port scan, whois lookups, and more.
dmitry:
dmitry:
-dmitry:
+dmitry:
dmitry:
diff --git a/network/dokuwiki/dokuwiki.SlackBuild b/network/dokuwiki/dokuwiki.SlackBuild
index be04cf0dd2..2e10b130e4 100644
--- a/network/dokuwiki/dokuwiki.SlackBuild
+++ b/network/dokuwiki/dokuwiki.SlackBuild
@@ -21,7 +21,7 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=${PRGNAM:-dokuwiki}
+PRGNAM=dokuwiki
VERSION=${VERSION:-20180422b}
UNPACK=${UNPACK:-stable}
SRCVERSION=${SRCVERSION:-2018-04-22b}
diff --git a/network/dothost/README b/network/dothost/README
index dfce38298e..92be91a80f 100644
--- a/network/dothost/README
+++ b/network/dothost/README
@@ -4,12 +4,16 @@ Perl module also available at slackbuilds.org
Example:
-dothost www.iana.org | graph-easy --as boxart
+dothost www.iana.org | graph-easy --as ascii
- β”Œβ”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”
- ∨ β”‚
-β”Œβ”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β” ┏━━━━━━━━━━━━━━┓ β”Œβ”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”
-β”‚ 192.0.32.8 β”‚ ──> ┃ www.iana.org ┃ ──> β”‚ 2620:0:2d0:200::8 β”‚
-β””β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”˜ ┗━━━━━━━━━━━━━━┛ β””β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”˜
- ∧ β”‚
- β””β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”€β”˜
+ +-------------------------+
+ v |
+ ##################### +------------+
+ +> # www.iana.org # --> | 192.0.32.8 |
+ | ##################### +------------+
+ | |
+ | |
+ | v
+ | +-------------------+
+ +- | 2620:0:2d0:200::8 |
+ +-------------------+
diff --git a/network/dothost/dothost.SlackBuild b/network/dothost/dothost.SlackBuild
index 7f5fc755a4..fdd763df5e 100644
--- a/network/dothost/dothost.SlackBuild
+++ b/network/dothost/dothost.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for dothost
-# Copyright 2018 Donald Cooley South Haven, Indiana USA
+# Copyright 2018-2020 Donald Cooley South Haven, Indiana USA
# 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=dothost
-VERSION=${VERSION:-0.1}
+VERSION=${VERSION:-0.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -55,17 +55,20 @@ 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 {} \;
-# Install dothost binary in /opt
-mkdir -p $PKG/opt/dothost
-cp dothost $PKG/opt/dothost/dothost
+# Install to /usr instead of /usr/local
+sed -i 's_/usr/local_/usr_' Makefile
-# Link dothost binary to /usr/bin
-mkdir -p $PKG/usr/bin
-ln -s /opt/dothost/dothost $PKG/usr/bin/dothost
+# Install man pages into /usr/man instead of /usr/share/man
+sed -i 's_/share/man_/man_' Makefile
+
+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
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/dothost/dothost.info b/network/dothost/dothost.info
index 52d08d53cb..d4cfa2b9b9 100644
--- a/network/dothost/dothost.info
+++ b/network/dothost/dothost.info
@@ -1,8 +1,8 @@
PRGNAM="dothost"
-VERSION="0.1"
-HOMEPAGE="http://jwilk.net/software/dothost"
-DOWNLOAD="https://github.com/jwilk/dothost/releases/download/0.1/dothost-0.1.tar.gz"
-MD5SUM="4c1aa7632ede8a65d6037a5b3b922179"
+VERSION="0.2"
+HOMEPAGE="https://jwilk.net/software/dothost"
+DOWNLOAD="https://github.com/jwilk/dothost/releases/download/0.2/dothost-0.2.tar.gz"
+MD5SUM="2f95fb6cd01458b9e848b4fdbe9aba79"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="graph-easy"
diff --git a/network/dothost/slack-desc b/network/dothost/slack-desc
index 9793dfb5b0..69fa54c838 100644
--- a/network/dothost/slack-desc
+++ b/network/dothost/slack-desc
@@ -14,6 +14,6 @@ dothost: graph-easy Perl module also available at slackbuilds.org
dothost:
dothost:
dothost:
-dothost: http://jwilk.net/software/dothost
+dothost: https://jwilk.net/software/dothost
dothost:
dothost:
diff --git a/network/dropbox/dropbox.SlackBuild b/network/dropbox/dropbox.SlackBuild
index de881b8178..df2ec49a88 100644
--- a/network/dropbox/dropbox.SlackBuild
+++ b/network/dropbox/dropbox.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for dropbox
# Copyright 2017 cmyster amit.ugol@gmail.com
+# Copyright 2019-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,22 +25,11 @@
# Public changelog can be found in: https://www.dropboxforum.com
-# SlackBuild changelog:
-# 25/Jul/2019 * Updated to latest version 77.4.131
-# * Support for FS other than EXT4 is re-introduced.
-# 07/Jul/2019 * Updated to latest version 75.4.142
-# 26/May/2019 * Updated to latest version 73.4.118
-# 14/Apr/2019 * Updated to latest version 70.4.93
-# 10/Feb/2019 * Updated to latest version 66.4.84
-# 30/Dec/2018 * Updated to latest version 63.4.107
-# 02/Dec/2018 * Updated to latest version 62.4.103
-# 28/Oct/2018 * Updated to latest version 60.4.107
-# 24/Oct/2018 * Updated to latest version 59.4.93
-# 05/Sep/2018 * Updated to latest version 56.4.94
-###
+# Source for x86: https://www.dropbox.com/download?plat=lnx.x86
+# Source for x86_64: https://www.dropbox.com/download?plat=lnx.x86_64
PRGNAM=dropbox
-VERSION=${VERSION:-77.4.131}
+VERSION=${VERSION:-93.4.273}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/dropbox/dropbox.info b/network/dropbox/dropbox.info
index 14a2ae291b..014f68f393 100644
--- a/network/dropbox/dropbox.info
+++ b/network/dropbox/dropbox.info
@@ -1,10 +1,10 @@
PRGNAM="dropbox"
-VERSION="77.4.131"
+VERSION="93.4.273"
HOMEPAGE="https://www.dropbox.com"
-DOWNLOAD="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-77.4.131.tar.gz"
-MD5SUM="70da9a7b78580447262a892aa63bd19e"
-DOWNLOAD_x86_64="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-77.4.131.tar.gz"
-MD5SUM_x86_64="6176fa7600569e1a8d0ef6d16acc8a5a"
+DOWNLOAD="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-93.4.273.tar.gz"
+MD5SUM="8bf2d71a58b9d4f332482e2050d5e38b"
+DOWNLOAD_x86_64="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-93.4.273.tar.gz"
+MD5SUM_x86_64="d32364c241585ceab80410fd77a53ad0"
REQUIRES=""
-MAINTAINER="Amit Ugol"
-EMAIL="amit.ugol@gmail.com"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/network/ekiga/ekiga.SlackBuild b/network/ekiga/ekiga.SlackBuild
index c56634c92e..d22a4ee14d 100644
--- a/network/ekiga/ekiga.SlackBuild
+++ b/network/ekiga/ekiga.SlackBuild
@@ -4,7 +4,7 @@
# Copyright 2008-2009 Mauro Giachero
# All rights reserved.
-# Copyright 2011 Davd Woodfall <dave@dawoodfall.net>
+# Copyright 2011 Davd Woodfall <dave@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
diff --git a/network/ekiga/ekiga.info b/network/ekiga/ekiga.info
index 793e412d5e..fee0dc4a63 100644
--- a/network/ekiga/ekiga.info
+++ b/network/ekiga/ekiga.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="opal ptlib"
MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/elemental-ircd/elemental-ircd.SlackBuild b/network/elemental-ircd/elemental-ircd.SlackBuild
index 5e6346f61c..e7c57c198f 100644
--- a/network/elemental-ircd/elemental-ircd.SlackBuild
+++ b/network/elemental-ircd/elemental-ircd.SlackBuild
@@ -132,7 +132,6 @@ mkdir -p $PKG/etc/$PRGNAM
sed -e "s/@LIBDIRSUFFIX@/$LIBDIRSUFFIX/" \
$CWD/slackware.conf > $PKG/etc/$PRGNAM/slackware.conf
-# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
sed -e "s/@UNAME@/$IRCD_UNAME/" \
diff --git a/network/elinks/elinks.SlackBuild b/network/elinks/elinks.SlackBuild
index 48769d4771..e14f23f274 100644
--- a/network/elinks/elinks.SlackBuild
+++ b/network/elinks/elinks.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Slackware build script for elinks
-# Copyright 2014 David Woodfall <dave@dawoodfall.net>
+# Copyright 2014 David Woodfall <dave@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
PRGNAM=elinks
VERSION=${VERSION:-git20131231}
-BUILD=${BUILD:-10}
+BUILD=${BUILD:-12}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
diff --git a/network/elinks/elinks.info b/network/elinks/elinks.info
index d6e1a90a23..17553cf0cf 100644
--- a/network/elinks/elinks.info
+++ b/network/elinks/elinks.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/elinks/patches/0001-gopher_html_links.patch b/network/elinks/patches/0001-gopher_html_links.patch
index c9ab73856d..38a2dd0b10 100644
--- a/network/elinks/patches/0001-gopher_html_links.patch
+++ b/network/elinks/patches/0001-gopher_html_links.patch
@@ -1,21 +1,18 @@
################################################################
-# There is a problem that html links that contain URL:htpp://...
-# aren't being followed. This fixes that issue and also chtml.
-# Normally those kind of links go to a redirect page that the
-# server generates, which then sends you on your way.
-# dave@dawoodfall.net
+# Fix for HTML links that contain URL:http://
+# dave@slackbuilds.org
###############################################################
diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
--- a/src/protocol/gopher/gopher.c 2013-12-18 15:38:57.000000000 +0000
-+++ b/src/protocol/gopher/gopher.c 2017-11-15 23:10:19.758394411 +0000
++++ b/src/protocol/gopher/gopher.c 2020-01-08 05:34:02.300498220 +0000
@@ -277,6 +277,10 @@
struct string command;
enum gopher_entity entity = DEFAULT_GOPHER_ENTITY;
unsigned char *selector = conn->uri->data;
-+ unsigned char *URI = "hURI%3";
-+ unsigned char *URL = "hURL%3";
-+ unsigned char *CURI = "HURI%3";
-+ unsigned char *CURL = "HURL%3";
++ unsigned char const* URI = "hURI%3";
++ unsigned char const* URL = "hURL%3";
++ unsigned char const* CURI = "HURI%3";
++ unsigned char const* CURL = "HURL%3";
int selectorlen = conn->uri->datalen;
struct gopher_entity_info *entity_info;
size_t size;
@@ -25,13 +22,13 @@ diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
+ if(strstr(selector, URL) != NULL || strstr(selector, URI) != NULL) {
+ entity = GOPHER_HTML;
-+ *selector++;
++ selector++;
+ selectorlen--;
+ }
+
+ if(strstr(selector, CURL) != NULL || strstr(selector, CURI) != NULL) {
+ entity = GOPHER_CHTML;
-+ *selector++;
++ selector++;
+ selectorlen--;
+ }
+
diff --git a/network/elinks/patches/0002-gopher_index_queries.patch b/network/elinks/patches/0002-gopher_index_queries.patch
index ab970f60f7..662fd13a7f 100644
--- a/network/elinks/patches/0002-gopher_index_queries.patch
+++ b/network/elinks/patches/0002-gopher_index_queries.patch
@@ -1,77 +1,53 @@
#######################################################################
-# elinks by default generates its own search query form when it sees
-# a type 7 index entity. The problem is that it didn't read the
-# served results page and instead generated another search page after
-# you had entered the first. This patch fixes that and in my tests it
-# seems to work so far.
-# dave@dawoodfall.net
+# Fix for type 7 entities.
+# dave@slackbuilds.org
#######################################################################
-diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
---- a/src/protocol/gopher/gopher.c 2017-11-24 19:12:52.495714437 +0000
-+++ b/src/protocol/gopher/gopher.c 2017-11-30 12:56:38.872336516 +0000
-@@ -43,6 +43,34 @@
- #include "util/memory.h"
- #include "util/string.h"
+diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c 2020-01-13 22:35:13.663935305 +0000
++++ cc/src/protocol/gopher/gopher.c 2020-01-13 23:16:00.053003768 +0000
+@@ -197,7 +197,7 @@
+ command->length = strlen(command->source);
+ }
-+#ifdef HAVE_FCNTL_H
-+#include <fcntl.h> /* OS/2 needs this after sys/types.h */
-+#endif
-+
-+/* To enable logging for debugging purposes. */
-+#if 0
-+
-+#define LOGFILE "/tmp/log"
-+
-+static void
-+debug_log(unsigned char *data, int NL)
-+{
-+ int fd = open(LOGFILE, O_WRONLY | O_APPEND | O_CREAT, 0622);
-+
-+ if (fd == -1) return;
-+
-+ set_bin(fd);
-+ write(fd, data, strlen(data));
-+ if (NL)
-+ write(fd, "\n", 1);
-+ close(fd);
-+}
-+#undef LOGFILE
-+
-+#else
-+#define debug_log(data, len)
-+#endif
-+
- struct module gopher_protocol_module = struct_module(
- /* name: */ N_("Gopher"),
- /* options: */ NULL,
-@@ -219,23 +247,31 @@
+-static struct connection_state init_gopher_index_cache_entry(struct connection *conn);
++/* static struct connection_state init_gopher_index_cache_entry(struct connection *conn); */
+
+ static struct connection_state
+ add_gopher_command(struct connection *conn, struct string *command,
+@@ -205,7 +205,7 @@
+ unsigned char *selector, int selectorlen)
+ {
+ unsigned char *query;
+- int querylen;
++ int querylen = 0;
+
+ if (!init_string(command))
+ return connection_state(S_OUT_OF_MEM);
+@@ -218,13 +218,14 @@
+ /* Exclude '?' */
if (query) selectorlen -= 1;
query = NULL;
- querylen = 0;
+- querylen = 0;
- } else {
- query += 1;
+ } else if (entity == GOPHER_INDEX) {
-+ /* fix query size to not include the seach= part */
++ /* fix query size to not include the search= part */
+ query += 8;
querylen = selector + selectorlen - query;
/* Exclude '?' */
- selectorlen -= querylen + 1;
-+ /* fix selector length to fit with query */
+- if (querylen >= 7 && !c_strncasecmp(query, "search=", 7)) {
++ /* fix selector length to fit with query */
+ selectorlen -= querylen + 8;
- if (querylen >= 7 && !c_strncasecmp(query, "search=", 7)) {
++ if (querylen >= 7 && !c_strncasecmp(query, "submit=", 7)) {
query += 7;
querylen -= 7;
}
-+ debug_log("selector:", 1);
-+ debug_log(selector, 1);
-+ debug_log("query:", 1);
-+ debug_log(query, 1);
- }
-
+@@ -233,9 +234,11 @@
switch (entity) {
case GOPHER_INDEX:
/* No search required? */
-+ /* Don't display the form page */
++ /* Don't display the form page */
if (!query) {
done_string(command);
- return init_gopher_index_cache_entry(conn);
@@ -80,41 +56,58 @@ diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
}
add_uri_decoded(command, selector, selectorlen, 0);
-@@ -343,6 +379,10 @@
- gopher->entity = entity_info;
- gopher->commandlen = command.length;
-
-+debug_log("439 gopher->entity:", 1);
-+debug_log(gopher->entity, 1);
-+debug_log("437 command.source:", 1);
-+debug_log(command.source, 1);
- memcpy(gopher->command, command.source, command.length);
- done_string(&command);
-
-@@ -377,7 +417,7 @@
+@@ -371,13 +374,14 @@
+ add_gopher_search_field(struct string *buffer, const unsigned char *text,
+ const unsigned char *addr)
+ {
++ /* Not *every* query is a search! */
+ add_format_to_string(buffer,
+ "<form action=\"%s\">"
+ "<table>"
"<td> </td>"
"<td>%s:</td>"
- "<td><input maxlength=\"256\" name=\"search\" value=\"\"></td>"
+- "<td><input maxlength=\"256\" name=\"search\" value=\"\"></td>"
- "<td><input type=submit value=\"Search\"></td>"
++ "<td><input maxlength=\"256\" name=\"submit\" value=\"\"></td>"
+ "<td><input type=submit value=\"Submit\"></td>"
"</table>"
"</form>",
addr, text);
-@@ -726,7 +766,8 @@
- /* Now read the data from the socket */
- switch (gopher->entity->type) {
- case GOPHER_DIRECTORY:
-- case GOPHER_INDEX:
-+/* Don't do directory list for cgi output (7)
-+ case GOPHER_INDEX: */
- state = read_gopher_directory_data(conn, rb);
- break;
+@@ -662,6 +666,7 @@
+ }
+
+ /* Display a Gopher Index document. */
++/* Use the page that the gopher site sends us
+ static struct connection_state
+ init_gopher_index_cache_entry(struct connection *conn)
+ {
+@@ -674,9 +679,9 @@
+
+ where = get_uri_string(conn->uri, URI_PUBLIC);
+
+- /* TODO: Use different function when using UTF-8
++ TODO: Use different function when using UTF-8
+ * in terminal (decode_uri_for_display replaces
+- * bytes of UTF-8 characters width '*'). */
++ * bytes of UTF-8 characters width '*'). *
+ if (where) decode_uri_for_display(where);
+
+ add_format_to_string(&buffer,
+@@ -695,7 +700,7 @@
+
+ mem_free_if(where);
+
+- /* FIXME: I think this needs a form or something */
++ * FIXME: I think this needs a form or something *
-@@ -738,6 +779,7 @@
- state = connection_state(S_GOPHER_CSO_ERROR);
- break;
+ add_fragment(conn->cached, conn->from, buffer.source, buffer.length);
+ conn->from += buffer.length;
+@@ -707,7 +712,7 @@
+ ? connection_state(S_OK)
+ : connection_state(S_OUT_OF_MEM);
+ }
+-
++*/
-+ case GOPHER_INDEX:
- case GOPHER_SOUND:
- case GOPHER_PLUS_SOUND:
- case GOPHER_PLUS_MOVIE:
+ static void
+ read_gopher_response_data(struct socket *socket, struct read_buffer *rb)
diff --git a/network/elinks/patches/0003-gopher_directory_links.patch b/network/elinks/patches/0003-gopher_directory_links.patch
index dc80ef3728..15a89fac2f 100644
--- a/network/elinks/patches/0003-gopher_directory_links.patch
+++ b/network/elinks/patches/0003-gopher_directory_links.patch
@@ -1,42 +1,22 @@
#######################################################################
-# elinks does not follow links to directories on other servers
-# properly. This adds a '/' before the '1' at the start of a link and
-# removes any trailing 1.
-# dave@dawoodfall.net
+# Fix remote directory links.
+# dave@slackbuilds.org
#######################################################################
-diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
---- a/src/protocol/gopher/gopher.c 2017-12-17 01:54:27.941645180 +0000
-+++ b/src/protocol/gopher/gopher.c 2017-12-17 21:52:05.072454433 +0000
-@@ -317,6 +317,9 @@
- unsigned char *URL = "hURL%3";
- unsigned char *CURI = "HURI%3";
- unsigned char *CURL = "HURL%3";
-+ unsigned char *DIR = "1";
-+ unsigned char *SLASHDIR = "/1";
-+ unsigned char *SLASHPOS;
- int selectorlen = conn->uri->datalen;
- struct gopher_entity_info *entity_info;
- size_t size;
-@@ -354,6 +357,26 @@
+diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c 2020-01-13 23:22:18.918292198 +0000
++++ cc/src/protocol/gopher/gopher.c 2020-01-13 23:21:00.631960039 +0000
+@@ -321,6 +321,18 @@
selectorlen++;
}
-+ if (entity_info->type == '1')
-+ {
-+ if (strstr(selector, DIR) == selector)
-+ {
-+ *selector++;
++ if (entity_info->type == '1') {
++ if (strchr(selector, '1') == (char *) selector) {
++ selector++;
+ selectorlen--;
+ }
-+ else
-+ {
-+ SLASHPOS = strstr(selector, SLASHDIR);
-+ if (SLASHPOS != NULL)
-+ {
-+ if (strlen(SLASHPOS) == 2)
-+ {
-+ selectorlen--;
-+ }
++ else {
++ if ((char *) selector == "/1") {
++ selectorlen--;
+ }
+ }
+ }
@@ -44,18 +24,3 @@ diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
state = add_gopher_command(conn, &command, entity, selector, selectorlen);
if (!is_in_state(state, S_CONN))
return state;
-@@ -379,10 +402,10 @@
- gopher->entity = entity_info;
- gopher->commandlen = command.length;
-
--debug_log("439 gopher->entity:", 1);
--debug_log(gopher->entity, 1);
--debug_log("437 command.source:", 1);
--debug_log(command.source, 1);
-+ debug_log("439 gopher->entity: ", 0);
-+ debug_log(gopher->entity, 1);
-+ debug_log("437 command.source: ", 0);
-+ debug_log(command.source, 1);
- memcpy(gopher->command, command.source, command.length);
- done_string(&command);
-
diff --git a/network/elinks/patches/0004-ssl_cert_verify.patch b/network/elinks/patches/0004-ssl_cert_verify.patch
index 4629da564a..3b56e1ae40 100644
--- a/network/elinks/patches/0004-ssl_cert_verify.patch
+++ b/network/elinks/patches/0004-ssl_cert_verify.patch
@@ -1,10 +1,8 @@
##############################################################################
-# elinks does not verify ssl host names with openssl
-# This is a modifed version of the patch here that fixes that issue:
+# Verify SSL host names with OpenSSL.
+# Turn on verification by default.
# http://lists.linuxfromscratch.org/pipermail/elinks-dev/2015-June/002099.html
-# This patch turns on verification by default, and differentiates
-# between host verification fail and normal SSL errors.
-# dave@dawoodfall.net
+# dave@slackbuilds.org
##############################################################################
--- a/configure.in 2017-12-21 15:58:12.470247050 +0000
+++ b/configure.in 2017-12-21 16:10:27.406938487 +0000
@@ -75,7 +73,7 @@ diff -Naur a/src/network/ssl/socket.c b/src/network/ssl/socket.c
default:
socket->no_tls = !socket->no_tls;
- socket->ops->retry(socket, connection_state(S_SSL_ERROR));
-+ if (SSL_VERIFY_FAIL_IF_NO_PEER_CERT != NULL)
++ if (SSL_VERIFY_FAIL_IF_NO_PEER_CERT)
+ socket->ops->retry(socket, connection_state(S_SSL_CERTFAIL));
+ else
+ socket->ops->retry(socket, connection_state(S_SSL_ERROR));
diff --git a/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch b/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch
index f93b0d5431..b255fb4f98 100644
--- a/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch
+++ b/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch
@@ -1,12 +1,13 @@
#####################################################################
-# Some fixes for having line feeds in text without a carriage return.
+# Fix line feeds without carriage returns.
# Make sure that only lines with tabs are treated as links.
# Support links that don't begin with a '/'.
+# dave@slackbuilds.org
#####################################################################
-diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
---- a/src/protocol/gopher/gopher.c 2017-12-28 15:08:54.310546900 +0000
-+++ b/src/protocol/gopher/gopher.c 2017-12-28 20:26:00.635193897 +0000
-@@ -326,7 +326,7 @@
+diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c 2020-01-14 03:19:39.956296190 +0000
++++ cc/src/protocol/gopher/gopher.c 2020-01-14 03:20:05.295045232 +0000
+@@ -290,7 +290,7 @@
/* Get entity type, and selector string. */
/* Pick up gopher_entity */
@@ -15,73 +16,41 @@ diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
entity = *selector++;
selectorlen--;
}
-@@ -357,8 +357,7 @@
- selectorlen++;
+@@ -333,6 +333,18 @@
+ }
}
-- if (entity_info->type == '1')
-- {
+ if (entity_info->type == '1') {
- if (strstr(selector, DIR) == selector)
- {
- *selector++;
-@@ -402,9 +401,9 @@
- gopher->entity = entity_info;
- gopher->commandlen = command.length;
-
-- debug_log("439 gopher->entity: ", 0);
-+ debug_log("404 gopher->entity: ", 0);
- debug_log(gopher->entity, 1);
-- debug_log("437 command.source: ", 0);
-+ debug_log("406 command.source: ", 0);
- debug_log(command.source, 1);
- memcpy(gopher->command, command.source, command.length);
- done_string(&command);
-@@ -486,6 +485,7 @@
- unsigned char *host = NULL;
- unsigned char *port = NULL;
- enum gopher_entity entity = *name++;
-+ int link = 0;
-
- if (!entity) {
- add_char_to_string(buffer, '\n');
-@@ -495,6 +495,7 @@
- if (*name) {
- selector = strchr(name, ASCII_TAB);
- if (selector) {
-+ link = 1;
- /* Terminate name */
- *selector++ = '\0';
-
-@@ -565,7 +566,7 @@
- switch (entity) {
- case GOPHER_WWW:
- /* Gopher pointer to W3 */
-- if (selector) {
-+ if (selector && link == 1) {
- add_gopher_link(buffer, name, selector);
- break;
- }
-@@ -617,7 +618,8 @@
++ if (strchr(selector, '1') == (char *) selector) {
++ selector++;
++ selectorlen--;
++ }
++ else {
++ if ((char *) selector == "/1") {
++ selectorlen--;
++ }
++ }
++ }
++
+ state = add_gopher_command(conn, &command, entity, selector, selectorlen);
+ if (!is_in_state(state, S_CONN))
+ return state;
+@@ -570,7 +582,8 @@
} else if (address.length > 0
&& strlcmp(address.source, address.length - 1,
- "gopher://error.host:1/", -1)) {
+ "gopher://error.host:1/", -1)
-+ && link == 1) {
++ && selector) {
add_gopher_link(buffer, name, address.source);
} else {
-@@ -639,6 +641,12 @@
+@@ -590,7 +603,7 @@
+ get_gopher_line_end(unsigned char *data, int datalen)
+ {
for (; datalen > 1; data++, datalen--)
- if (data[0] == ASCII_CR && data[1] == ASCII_LF)
+- if (data[0] == ASCII_CR && data[1] == ASCII_LF)
++ if (data[0] == ASCII_CR || data[0] == ASCII_LF)
return data + 2;
-+ else
-+ if(data[0] == ASCII_CR)
-+ return data + 2;
-+ else
-+ if(data[0] == ASCII_LF)
-+ return data + 2;
return NULL;
- }
diff --git a/network/elinks/patches/0006-gopher-indexes_nocr.patch b/network/elinks/patches/0006-gopher-indexes_nocr.patch
new file mode 100644
index 0000000000..9e4a441db6
--- /dev/null
+++ b/network/elinks/patches/0006-gopher-indexes_nocr.patch
@@ -0,0 +1,19 @@
+#######################################################################
+# Fix index listings with only LF and no CRs.
+# dave@slackbuilds.org
+#######################################################################
+diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c 2020-01-14 06:42:11.030536586 +0000
++++ cc/src/protocol/gopher/gopher.c 2020-01-14 06:42:26.710000886 +0000
+@@ -757,6 +757,11 @@
+ switch (gopher->entity->type) {
+ case GOPHER_DIRECTORY:
+ case GOPHER_INDEX:
++ /* Lines with no carriage returns */
++ if (strchr(rb->data, ASCII_CR) == NULL) {
++ strncat(rb->data, "\r\n", 2);
++ rb->length += 3;
++ }
+ state = read_gopher_directory_data(conn, rb);
+ break;
+
diff --git a/network/elinks/patches/0006-indexes_nocr.patch b/network/elinks/patches/0006-indexes_nocr.patch
deleted file mode 100644
index 5c68cee8ca..0000000000
--- a/network/elinks/patches/0006-indexes_nocr.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-#######################################################################
-# Fixes index listings with only LF and no CRs.
-# dave@dawoodfall.net
-#######################################################################
-diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
---- a/src/protocol/gopher/gopher.c 2017-12-29 17:14:24.247093626 +0000
-+++ b/src/protocol/gopher/gopher.c 2017-12-29 17:12:08.496272595 +0000
-@@ -638,15 +638,16 @@
- static unsigned char *
- get_gopher_line_end(unsigned char *data, int datalen)
- {
-- for (; datalen > 1; data++, datalen--)
-- if (data[0] == ASCII_CR && data[1] == ASCII_LF)
-+ for (; datalen > 1; data++, datalen--) {
-+ if (data[0] == ASCII_CR && data[1] == ASCII_LF)
- return data + 2;
- else
- if(data[0] == ASCII_CR)
-- return data + 2;
-- else
-- if(data[0] == ASCII_LF)
-- return data + 2;
-+ return data + 1;
-+ else
-+ if(data[0] == ASCII_LF)
-+ return data + 1;
-+ }
-
- return NULL;
- }
-@@ -796,9 +797,21 @@
-
- /* Now read the data from the socket */
- switch (gopher->entity->type) {
-+ case GOPHER_INDEX:
-+ /* Lines with no carriage returns */
-+ if (strchr(rb->data, ASCII_CR) == NULL) {
-+ unsigned char *tmp;
-+ tmp = malloc(rb->length + 3);
-+ memcpy(tmp, "i", 1);
-+ memcpy(tmp+1, rb->data, rb->length);
-+ tmp[rb->length]= '\r';
-+ tmp[rb->length+1]= '\n';
-+ rb->length+=3;
-+ memcpy(rb->data, tmp, rb->length);
-+ free(tmp);
-+ }
-+
- case GOPHER_DIRECTORY:
--/* Don't do directory list for cgi output (7)
-- case GOPHER_INDEX: */
- state = read_gopher_directory_data(conn, rb);
- break;
-
-@@ -810,7 +823,6 @@
- state = connection_state(S_GOPHER_CSO_ERROR);
- break;
-
-- case GOPHER_INDEX:
- case GOPHER_SOUND:
- case GOPHER_PLUS_SOUND:
- case GOPHER_PLUS_MOVIE:
diff --git a/network/elinks/patches/0007-gopher-move_null.patch b/network/elinks/patches/0007-gopher-move_null.patch
new file mode 100644
index 0000000000..8f259e55cf
--- /dev/null
+++ b/network/elinks/patches/0007-gopher-move_null.patch
@@ -0,0 +1,16 @@
+###################################################################
+# Move the null terminator one char forwards.
+# dave@slackbuilds.org
+###################################################################
+diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c 2020-01-14 03:24:11.259323801 +0000
++++ cc/src/protocol/gopher/gopher.c 2020-01-14 03:24:49.452454019 +0000
+@@ -615,7 +615,7 @@
+ assert(line < end);
+
+ /* Just to be safe NUL terminate the line */
+- end[-2] = 0;
++ end[-1] = 0;
+
+ return line[0] == '.' && !line[1] ? NULL : line;
+ }
diff --git a/network/elinks/patches/0007-move_null.patch b/network/elinks/patches/0007-move_null.patch
deleted file mode 100644
index 9d8037cc37..0000000000
--- a/network/elinks/patches/0007-move_null.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-###################################################################
-# Move the added null terminator one char forwards
-# dave@dawoodfall.net
-###################################################################
-diff --exclude .git -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c
---- a/src/protocol/gopher/gopher.c 2017-12-29 17:15:39.521209968 +0000
-+++ b/src/protocol/gopher/gopher.c 2018-01-17 05:46:45.660258482 +0000
-@@ -658,7 +658,7 @@
- assert(line < end);
-
- /* Just to be safe NUL terminate the line */
-- end[-2] = 0;
-+ end[-1] = 0;
-
- return line[0] == '.' && !line[1] ? NULL : line;
- }
diff --git a/network/elinks/patches/0008-gopher-html-entities.patch b/network/elinks/patches/0008-gopher-html-entities.patch
new file mode 100644
index 0000000000..750d1a49de
--- /dev/null
+++ b/network/elinks/patches/0008-gopher-html-entities.patch
@@ -0,0 +1,47 @@
+###################################################################
+# Encode < > to HTML.
+###################################################################
+diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c
+--- bb/src/protocol/gopher/gopher.c 2020-01-14 03:26:41.791778387 +0000
++++ cc/src/protocol/gopher/gopher.c 2020-01-14 06:19:56.964025440 +0000
+@@ -620,6 +620,25 @@
+ return line[0] == '.' && !line[1] ? NULL : line;
+ }
+
++/* substring replacement */
++static void
++str_replace(char * in_string, char * s_string, char * r_string)
++{
++ /* max == replace all characters */
++ char temp[strlen(in_string) * (strlen(r_string) - strlen(s_string)) + 1];
++ char * pos;
++
++ if (!(pos = strstr(in_string, s_string)))
++ return;
++
++ strncpy(temp, in_string, pos - in_string);
++ temp[pos - in_string] = 0;
++ sprintf(temp + (pos - in_string), "%s%s", r_string, pos + 1);
++ in_string[0] = 0;
++ strcpy(in_string, temp);
++ return str_replace(in_string, s_string, r_string);
++}
++
+ /* Parse a Gopher Menu document */
+ static struct connection_state
+ read_gopher_directory_data(struct connection *conn, struct read_buffer *rb)
+@@ -639,6 +658,14 @@
+ return connection_state(S_OUT_OF_MEM);
+ }
+
++ /* Lines with characters that need to be converted to html */
++ if (strstr(rb->data, "<")) {
++ str_replace(rb->data, "<", "&lt;");
++ }
++ if (strstr(rb->data, ">")) {
++ str_replace(rb->data, ">", "&gt;");
++ }
++
+ while ((end = get_gopher_line_end(rb->data, rb->length))) {
+ unsigned char *line = check_gopher_last_line(rb->data, end);
+
diff --git a/network/emailrelay/emailrelay.info b/network/emailrelay/emailrelay.info
index 2a4e5a7a24..5a65182816 100644
--- a/network/emailrelay/emailrelay.info
+++ b/network/emailrelay/emailrelay.info
@@ -1,6 +1,6 @@
PRGNAM="emailrelay"
VERSION="2.0.1"
-HOMEPAGE="https://emailrelay.sourceforge.net/"
+HOMEPAGE="http://emailrelay.sourceforge.net/"
DOWNLOAD="https://sourceforge.net/projects/emailrelay/files/emailrelay/2.0.1/emailrelay-2.0.1-src.tar.gz"
MD5SUM="eb9d59ad77f3b98184fa4efd76e37c47"
DOWNLOAD_x86_64=""
diff --git a/network/exim/README.SBo b/network/exim/README.SBo
index d2da77c32b..b72f41afb4 100644
--- a/network/exim/README.SBo
+++ b/network/exim/README.SBo
@@ -15,6 +15,7 @@ The database lookups will not be built by default, but you can enable
them easily by passing the directives on the command line when calling
this script, e.g.
+ LOOKUP_JSON=yes \
LOOKUP_LDAP=yes \
LOOKUP_MYSQL=yes \
LOOKUP_PGSQL=yes \
@@ -22,8 +23,9 @@ this script, e.g.
LOOKUP_SQLITE=yes \
sh exim.SlackBuild
-For including the Redis and PostgreSQL lookups you'll need the "hiredis"
-resp. "postgresql" packages, both available from SlackBuilds.org.
+For including the JSON, PostgreSQL and Redis lookups you'll need the
+"jansson", "hiredis" and "postgresql" packages respectively, all available
+from SlackBuilds.org.
WARNING: this package is intended as a drop-in replacement for Sendmail.
As a result, there are some inevitable filename conflicts between
diff --git a/network/exim/exim.Makefile b/network/exim/exim.Makefile
index db91d5526e..3479dc2b45 100644
--- a/network/exim/exim.Makefile
+++ b/network/exim/exim.Makefile
@@ -12,11 +12,13 @@
# Exim distribution directory before running the "make" command.
# Things that depend on the operating system have default settings in
-# OS/Makefile-Default, but these are overridden for some OS by files called
-# called OS/Makefile-<osname>. You can further override these by creating files
-# called Local/Makefile-<osname>, where "<osname>" stands for the name of your
-# operating system - look at the names in the OS directory to see which names
-# are recognized.
+# OS/Makefile-Default, but these are overridden for some OS by files
+# called called OS/Makefile-<osname>. You can further override these by
+# creating files called Local/Makefile-<osname>, and
+# Local/Makefile-<buildname> (where "<osname>" stands for the name of
+# your operating system - look at the names in the OS directory to see
+# which names are recognized, and "<buildname>" is derived from the
+# environment variable "build")
# However, if you are building Exim for a single OS only, you don't need to
# worry about setting up Local/Makefile-<osname>. Any build-time configuration
@@ -178,6 +180,105 @@ SPOOL_DIRECTORY=/var/spool/exim
###############################################################################
+# TLS #
+###############################################################################
+# Exim is built by default to support the SMTP STARTTLS command, which implements
+# Transport Layer Security using SSL (Secure Sockets Layer). This requires you
+# must install the OpenSSL library package or the GnuTLS library. Exim contains
+# no cryptographic code of its own.
+
+# If you are running Exim as a (TLS) server, just building it with TLS support
+# is all you need to do, as tls_advertise_hosts is set to '*' by
+# default. But you are advised to create a suiteable certificate, and tell
+# Exim about it by means of the tls_certificate and tls_privatekey run
+# time options, otherwise Exim will create a self signed certificate on
+# the fly. If you are running Exim only as a (TLS) client, building it with
+# TLS support is all you need to do.
+#
+# If you are using pkg-config then you should not need to worry where
+# the libraries and headers are installed, as the pkg-config .pc
+# specification should include all -L/-I information necessary.
+# Enabling the USE_*_PC options should be sufficient. If not using
+# pkg-config, then you have to specify the libraries, and you mmight
+# need to specify the locations too.
+
+# Uncomment the following lines if you want
+# to build Exim without any TLS support (either OpenSSL or GnuTLS):
+# DISABLE_TLS=yes
+# Unless you do this, you must define one of USE_OPENSSL or USE_GNUTLS
+# below.
+
+# If you are buliding with TLS, the library configuration must be done:
+
+# Uncomment this if you are using OpenSSL
+USE_OPENSSL=yes
+# Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
+# and an optional location.
+USE_OPENSSL_PC=openssl
+# TLS_LIBS=-lssl -lcrypto
+# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
+
+# Uncomment this if you are using GnuTLS
+# USE_GNUTLS=yes
+# Uncomment one of these settings if you are using GnuTLS; pkg-config vs not
+# and an optional location. If you disable SUPPORT_DANE below, you
+# can remove the gnutls-dane references here. Earlier versions of GnuTLS
+# required libtasn1 and libgrypt also; add if needed.
+# USE_GNUTLS_PC=gnutls gnutls-dane
+# TLS_LIBS=-lgnutls -lgnutls-dane
+# TLS_LIBS=-L/usr/local/gnu/lib -lgnutls -ltasn1 -lgcrypt -lgnutls-dane
+
+# If using GnuTLS older than 2.10 and using pkg-config then note that Exim's
+# build process will require libgcrypt-config to exist in your $PATH. A
+# version that old is likely to become unsupported by Exim in 2017.
+
+# The security fix we provide with the gnutls_allow_auto_pkcs11 option
+# (4.82 PP/09) introduces a compatibility regression. The symbol is
+# not available if GnuTLS is build without p11-kit (--without-p11-kit
+# configure option). In this case use AVOID_GNUTLS_PKCS11=yes when
+# building Exim.
+# AVOID_GNUTLS_PKCS11=yes
+
+# If you are running Exim as a server, note that just building it with TLS
+# support is not all you need to do. You also need to set up a suitable
+# certificate, and tell Exim about it by means of the tls_certificate
+# and tls_privatekey run time options. You also need to set tls_advertise_hosts
+# to specify the hosts to which Exim advertises TLS support. On the other hand,
+# if you are running Exim only as a client, building it with TLS support
+# is all you need to do.
+
+# If you are using pkg-config then you should not need to worry where the
+# libraries and headers are installed, as the pkg-config .pc specification
+# should include all -L/-I information necessary. If not using pkg-config
+# then you might need to specify the locations too.
+
+# Additional libraries and include files are required for both OpenSSL and
+# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed
+# with all your other libraries. If they are in a special directory, you may
+# need something like
+
+# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
+
+# or
+
+# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt -lgnutls-dane
+# If not using DANE under GnuTLS we can lose one library
+# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt
+
+# TLS_LIBS is included only on the command for linking Exim itself, not on any
+# auxiliary programs. If the include files are not in a standard place, you can
+# set TLS_INCLUDE to specify where they are, for example:
+
+# TLS_INCLUDE=-I/usr/local/openssl/include/
+# or
+# TLS_INCLUDE=-I/opt/gnu/include
+
+# You don't need to set TLS_INCLUDE if the relevant directories are already
+# specified in INCLUDE.
+
+
+
+###############################################################################
# THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY #
###############################################################################
@@ -309,6 +410,8 @@ LOOKUP_DNSDB=yes
LOOKUP_CDB=yes
LOOKUP_DSEARCH=yes
# LOOKUP_IBASE=yes
+# LOOKUP_JSON=yes
+LOOKUP_JSON_PC=jansson
# LOOKUP_LDAP=yes
# LOOKUP_MYSQL=yes
# LOOKUP_MYSQL_PC=mariadb
@@ -332,6 +435,9 @@ LOOKUP_SQLITE_PC=sqlite3
# LOOKUP_NWILDLSEARCH=yes
+# Some platforms may need this for LOOKUP_NIS:
+# LIBS += -lnsl
+
#------------------------------------------------------------------------------
# If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate
# which LDAP library you have. Unfortunately, though most of their functions
@@ -366,9 +472,11 @@ PCRE_CONFIG=yes
#------------------------------------------------------------------------------
-# Uncomment the following line to add DANE support
+# Comment out the following line to remove DANE support
# Note: Enabling this unconditionally overrides DISABLE_DNSSEC
-# For DANE under GnuTLS we need an additional library. See TLS_LIBS below.
+# forces you to have SUPPORT_TLS enabled (the default). For DANE under
+# GnuTLS we need an additional library. See TLS_LIBS or USE_GNUTLS_PC
+# below.
SUPPORT_DANE=yes
#------------------------------------------------------------------------------
@@ -378,7 +486,7 @@ SUPPORT_DANE=yes
# don't need to set LOOKUP_INCLUDE if the relevant directories are already
# specified in INCLUDE. The settings below are just examples; -lpq is for
# PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite, -lhiredis
-# is for Redis.
+# is for Redis, -ljansson for JSON.
#
# You do not need to use this for any lookup information added via pkg-config.
@@ -396,10 +504,11 @@ LOOKUP_INCLUDE+=-I/usr/include/mysql
LOOKUP_LIBS+=-L/usr/lib$(LIBDIRSUFFIX)/mysql -lmysqlclient
endif
+
#------------------------------------------------------------------------------
# Compiling the Exim monitor: If you want to compile the Exim monitor, a
# program that requires an X11 display, then EXIM_MONITOR should be set to the
-# value "eximon.bin". Comment out this setting to disable compilation of the
+# value "eximon.bin". De-comment this setting to enable compilation of the
# monitor. The locations of various X11 directories for libraries and include
# files are defaulted in the OS/Makefile-Default file, but can be overridden in
# local OS-specific make files.
@@ -470,6 +579,11 @@ DISABLE_MAL_MKS=yes
# DISABLE_EVENT=yes
+# Uncomment this line to include support for early pipelining, per
+# https://datatracker.ietf.org/doc/draft-harris-early-pipe/
+# SUPPORT_PIPE_CONNECT=yes
+
+
#------------------------------------------------------------------------------
# Compiling Exim with experimental features. These are documented in
# experimental-spec.txt. "Experimental" means that the way these features are
@@ -492,10 +606,12 @@ DISABLE_MAL_MKS=yes
# Uncomment the following line to add DMARC checking capability, implemented
# using libopendmarc libraries. You must have SPF and DKIM support enabled also.
-# EXPERIMENTAL_DMARC=yes
-# DMARC_TLD_FILE= /etc/exim/opendmarc.tlds
+# SUPPORT_DMARC=yes
# CFLAGS += -I/usr/local/include
# LDFLAGS += -lopendmarc
+# Uncomment the following if you need to change the default. You can
+# override it at runtime (main config option dmarc_tld_file)
+# DMARC_TLD_FILE=/etc/exim/opendmarc.tlds
# Uncomment the following line to add ARC (Authenticated Received Chain)
# support. You must have SPF and DKIM support enabled also.
@@ -523,10 +639,8 @@ DISABLE_MAL_MKS=yes
# Uncomment the following line to add queuefile transport support
# EXPERIMENTAL_QUEUEFILE=yes
-# Uncomment the following to add REQUIRETLS support.
-# You must also have SUPPORT_TLS enabled.
-# Ref: https://datatracker.ietf.org/doc/draft-fenton-smtp-require-tls
-# EXPERIMENTAL_REQUIRETLS=yes
+# Uncomment the following line to include support for TLS Resumption
+# EXPERIMENTAL_TLS_RESUME=yes
###############################################################################
# THESE ARE THINGS YOU MIGHT WANT TO SPECIFY #
@@ -655,6 +769,7 @@ FIXED_NEVER_USERS=root
AUTH_CRAM_MD5=yes
AUTH_CYRUS_SASL=yes
AUTH_DOVECOT=yes
+AUTH_EXTERNAL=yes
# AUTH_GSASL=yes
# AUTH_GSASL_PC=libgsasl
# AUTH_HEIMDAL_GSSAPI=yes
@@ -668,7 +783,6 @@ AUTH_TLS=yes
# requires multiple pkg-config files to work with Exim, so the second example
# above is needed.
-
#------------------------------------------------------------------------------
# If you specified AUTH_CYRUS_SASL above, you should ensure that you have the
# Cyrus SASL library installed before trying to build Exim, and you probably
@@ -768,75 +882,6 @@ HEADERS_CHARSET="ISO-8859-1"
#------------------------------------------------------------------------------
-# Exim can be built to support the SMTP STARTTLS command, which implements
-# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you
-# must install the OpenSSL library package or the GnuTLS library. Exim contains
-# no cryptographic code of its own. Uncomment the following lines if you want
-# to build Exim with TLS support. If you don't know what this is all about,
-# leave these settings commented out.
-
-# This setting is required for any TLS support (either OpenSSL or GnuTLS)
-SUPPORT_TLS=yes
-
-# Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
-USE_OPENSSL_PC=openssl
-# TLS_LIBS=-lssl -lcrypto
-
-# Uncomment the first and either the second or the third of these if you
-# are using GnuTLS. If you have pkg-config, then the second, else the third.
-# USE_GNUTLS=yes
-# USE_GNUTLS_PC=gnutls
-# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
-
-# If using GnuTLS older than 2.10 and using pkg-config then note that Exim's
-# build process will require libgcrypt-config to exist in your $PATH. A
-# version that old is likely to become unsupported by Exim in 2017.
-
-# The security fix we provide with the gnutls_allow_auto_pkcs11 option
-# (4.82 PP/09) introduces a compatibility regression. The symbol is
-# not available if GnuTLS is build without p11-kit (--without-p11-kit
-# configure option). In this case use AVOID_GNUTLS_PKCS11=yes when
-# building Exim.
-# AVOID_GNUTLS_PKCS11=yes
-
-# If you are running Exim as a server, note that just building it with TLS
-# support is not all you need to do. You also need to set up a suitable
-# certificate, and tell Exim about it by means of the tls_certificate
-# and tls_privatekey run time options. You also need to set tls_advertise_hosts
-# to specify the hosts to which Exim advertises TLS support. On the other hand,
-# if you are running Exim only as a client, building it with TLS support
-# is all you need to do.
-
-# If you are using pkg-config then you should not need to worry where the
-# libraries and headers are installed, as the pkg-config .pc specification
-# should include all -L/-I information necessary. If not using pkg-config
-# then you might need to specify the locations too.
-
-# Additional libraries and include files are required for both OpenSSL and
-# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed
-# with all your other libraries. If they are in a special directory, you may
-# need something like
-
-# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
-# or
-# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt
-
-# For DANE under GnuTLS we need an additional library.
-# TLS_LIBS += -lgnutls-dane
-
-# TLS_LIBS is included only on the command for linking Exim itself, not on any
-# auxiliary programs. If the include files are not in a standard place, you can
-# set TLS_INCLUDE to specify where they are, for example:
-
-# TLS_INCLUDE=-I/usr/local/openssl/include/
-# or
-# TLS_INCLUDE=-I/opt/gnu/include
-
-# You don't need to set TLS_INCLUDE if the relevant directories are already
-# specified in INCLUDE.
-
-
-#------------------------------------------------------------------------------
# The default distribution of Exim contains only the plain text form of the
# documentation. Other forms are available separately. If you want to install
# the documentation in "info" format, first fetch the Texinfo documentation
@@ -1450,4 +1495,8 @@ PID_FILE_PATH=/var/run/exim.pid
# ENABLE_DISABLE_FSYNC=yes
+#------------------------------------------------------------------------------
+# For development, add this to include code to time various stages and report.
+# CFLAGS += -DMEASURE_TIMING
+
# End of EDITME for Exim 4.
diff --git a/network/exim/exim.SlackBuild b/network/exim/exim.SlackBuild
index 9e5204563f..889c6d34e0 100644
--- a/network/exim/exim.SlackBuild
+++ b/network/exim/exim.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=exim
-VERSION=${VERSION:-4.92.3}
+VERSION=${VERSION:-4.93}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -128,5 +128,8 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
+# Adjust version info for release candidates.
+VERSION=${VERSION/-/_}
+
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/exim/exim.info b/network/exim/exim.info
index 1d6c1be9cd..a20827bb05 100644
--- a/network/exim/exim.info
+++ b/network/exim/exim.info
@@ -1,8 +1,8 @@
PRGNAM="exim"
-VERSION="4.92.3"
+VERSION="4.93"
HOMEPAGE="https://www.exim.org/"
-DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.92.3.tar.xz"
-MD5SUM="9be05c609af824ce19666e31d910cefd"
+DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.93.tar.xz"
+MD5SUM="60aa3b38844a8ccece06670e8ff7d657"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="%README%"
diff --git a/network/firewalld/README b/network/firewalld/README
index 75d957740a..1821f7afae 100644
--- a/network/firewalld/README
+++ b/network/firewalld/README
@@ -1,6 +1,8 @@
-firewalld provides a dynamically managed firewall with support for
+Firewalld provides a dynamically managed firewall with support for
network or firewall zones to define the trust level of network
connections or interfaces. It has support for IPv4, IPv6 firewall
settings and for ethernet bridges and a separation of runtime and
permanent configuration options. It also provides an interface for
services or applications to add ip*tables and ebtables rules directly.
+
+Please read the README.SLACKWARE file for additional information.
diff --git a/network/firewalld/README.SLACKWARE b/network/firewalld/README.SLACKWARE
new file mode 100644
index 0000000000..a5a7404a61
--- /dev/null
+++ b/network/firewalld/README.SLACKWARE
@@ -0,0 +1,20 @@
+The package provided by the upstream project already includes
+/etc/init.d/firewalld which will get executed on boot by
+/etc/rc.d/rc.sysvinit. So technically, you don't have to
+use the custom rc.firewalld. I have provided a patch that
+changes /etc/sysconfig/ to /etc/default in order to source
+any custom arguments.
+
+Otherwise, feel free to chmod -x /etc/init.d/firewalld
+and chmod +x /etc/rc.d/rc.firewalld then add it to your
+/etc/rc.d/rc.local like so:
+
+if [ -x /etc/rc.d/rc.firewalld ]; then
+ /etc/rc.d/rc.firewalld start
+fi
+
+and the following to /etc/rc.d/rc.local_shutdown:
+
+if [ -x /etc/rc.d/rc.firewalld ]; then
+ /etc/rc.d/rc.firewalld stop
+fi
diff --git a/network/firewalld/doinst.sh b/network/firewalld/doinst.sh
index 9f4fb5fbe4..592ffcdaef 100644
--- a/network/firewalld/doinst.sh
+++ b/network/firewalld/doinst.sh
@@ -26,7 +26,8 @@ config etc/dbus-1/system.d/FirewallD.conf.new
config etc/firewall/applet.conf.new
config etc/firewalld/firewalld.conf.new
config etc/default/firewalld.new
-preserve_perms etc/rc.d/rc.FireWallD.new
+preserve_perms etc/rc.d/rc.firewalld.new
+preserve_perms etc/rc.d/init.d/firewalld.new
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/network/firewalld/firewalld.SlackBuild b/network/firewalld/firewalld.SlackBuild
index ad54c23725..b244425797 100644
--- a/network/firewalld/firewalld.SlackBuild
+++ b/network/firewalld/firewalld.SlackBuild
@@ -21,10 +21,18 @@
# 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.
+#
+# ChangeLog
+#
+# Thu Mar 19 12:19:48 UTC 2020
+#
+# * Added patch to change the source file from /etc/sysconfig to /etc/default
+# in the provided /etc/init.d/firewalld file.
+#
PRGNAM=firewalld
VERSION=${VERSION:-0.5.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -69,6 +77,10 @@ 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 {} \;
+# Let's patch the init.d script to use /etc/default instead of
+# /etc/sysconfig to source arguments.
+patch -p1 < $CWD/init.patch
+
./autogen.sh
CFLAGS="$SLKCFLAGS" \
@@ -95,8 +107,9 @@ mv $PKG/etc/sysconfig/firewalld $PKG/etc/sysconfig/firewalld.new
mv $PKG/etc/sysconfig $PKG/etc/default
mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.FireWallD > $PKG/etc/rc.d/rc.FireWallD.new
+cat $CWD/rc.firewalld > $PKG/etc/rc.d/rc.firewalld.new
+# We don't need systemd here.
rm -rf $PKG/usr/lib/systemd
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -115,5 +128,8 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/firewalld/init.patch b/network/firewalld/init.patch
new file mode 100644
index 0000000000..675dee356f
--- /dev/null
+++ b/network/firewalld/init.patch
@@ -0,0 +1,11 @@
+--- firewalld-0.5.1/config/firewalld.init 2020-03-19 08:05:08.660103937 -0400
++++ firewalld-0.5.1-new/config/firewalld.init 2020-03-19 08:10:25.695336773 -0400
+@@ -29,7 +29,7 @@
+ prog="firewalld"
+ #config="/etc/firewalld/firewalld.conf"
+
+-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
++[ -e /etc/default/$prog ] && . /etc/default/$prog
+
+ lockfile=/var/lock/subsys/$prog
+
diff --git a/network/firewalld/rc.firewalld b/network/firewalld/rc.firewalld
new file mode 100644
index 0000000000..aa0d91b3dc
--- /dev/null
+++ b/network/firewalld/rc.firewalld
@@ -0,0 +1,56 @@
+#!/bin/sh
+# Start/stop/restart firewalld.
+
+# Start firewalld:
+firewalld_start() {
+ [ -r /etc/default/firewalld ] && source /etc/default/firewalld
+ echo -n "Starting FireWallD daemon: /usr/sbin/firewalld "
+ /usr/sbin/firewalld $FIREWALLD_ARGS
+ echo
+}
+
+# Stop firewalld:
+firewalld_stop() {
+ echo -n "Stopping FireWallD daemon..."
+ if [ -r /var/run/firewalld.pid ]; then
+ kill -HUP $(cat /var/run/firewalld.pid)
+ rm -f /var/run/firewalld.pid
+ else
+ killall -HUP -q firewalld
+ fi
+ echo
+}
+
+# Restart firewalld:
+firewalld_restart() {
+ firewalld_stop
+ sleep 1
+ firewalld_start
+}
+
+# Check if firewalld is running
+firewalld_status() {
+ if [ -e /var/run/firewalld.pid ]; then
+ echo "firewalld is running as pid $(cat /var/run/firewalld.pid)."
+ else
+ echo "firewalld is stopped."
+ exit 1
+ fi
+}
+
+case "$1" in
+'start')
+ firewalld_start
+ ;;
+'stop')
+ firewalld_stop
+ ;;
+'restart')
+ firewalld_restart
+ ;;
+'status')
+ firewalld_status
+ ;;
+*)
+ echo "usage $0 start|stop|restart|status"
+esac
diff --git a/network/flexget/flexget.SlackBuild b/network/flexget/flexget.SlackBuild
index 631bff5375..59f3ccabad 100644
--- a/network/flexget/flexget.SlackBuild
+++ b/network/flexget/flexget.SlackBuild
@@ -26,12 +26,13 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-SRCNAM=FlexGet
-PRGNAM=${SRCNAM,,}
+PRGNAM=flexget
VERSION=${VERSION:-2.11.9}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+SRCNAM=FlexGet
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
diff --git a/network/fping/README b/network/fping/README
deleted file mode 100644
index f989e116d1..0000000000
--- a/network/fping/README
+++ /dev/null
@@ -1,4 +0,0 @@
-fping is a ping(1) like program which uses the Internet Control Message
-Protocol (ICMP) echo request to determine if a host is up. fping is
-different from ping in that you can specify any number of hosts on the
-command line, or specify a file containing the lists of hosts to ping.
diff --git a/network/fping/fping.SlackBuild b/network/fping/fping.SlackBuild
deleted file mode 100644
index e3d137350e..0000000000
--- a/network/fping/fping.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for fping
-# Copyright (c) 2008, Written by Mark Walling <mark@markwalling.org>
-
-# 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=fping
-VERSION=${VERSION:-2.4b2_to}
-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 -xzvf $CWD/$PRGNAM.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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man
-make
-make install 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 ChangeLog README INSTALL $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/fping/fping.info b/network/fping/fping.info
deleted file mode 100644
index 9807786c93..0000000000
--- a/network/fping/fping.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fping"
-VERSION="2.4b2_to"
-HOMEPAGE="http://fping.sourceforge.net/"
-DOWNLOAD="http://fping.sourceforge.net/download/fping.tar.gz"
-MD5SUM="d5e8be59e307cef76bc479e1684df705"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mark Walling"
-EMAIL="mark@markwalling.org"
diff --git a/network/fping6/README b/network/fping6/README
deleted file mode 100644
index f989e116d1..0000000000
--- a/network/fping6/README
+++ /dev/null
@@ -1,4 +0,0 @@
-fping is a ping(1) like program which uses the Internet Control Message
-Protocol (ICMP) echo request to determine if a host is up. fping is
-different from ping in that you can specify any number of hosts on the
-command line, or specify a file containing the lists of hosts to ping.
diff --git a/network/fping6/README.SLACKWARE b/network/fping6/README.SLACKWARE
deleted file mode 100644
index b6e36445f0..0000000000
--- a/network/fping6/README.SLACKWARE
+++ /dev/null
@@ -1,6 +0,0 @@
-The download link points to Debian server, as the package on the original site
-actually is missing IPv6 support - while it claims to be version 2.4b2_to-ipv6,
-it's actually 2.4b2_to.
-Additionally, patches from Debian are applied to make IPv6 compile time flag,
-introduce source IP support, improve manpage and other things.
-To avoid conflicts with standard fping, this version is installed as fping6.
diff --git a/network/fping6/fping.8.diff b/network/fping6/fping.8.diff
deleted file mode 100644
index 87b479152b..0000000000
--- a/network/fping6/fping.8.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- fping-2.4b2-to-ipv6.orig/fping.8
-+++ fping-2.4b2-to-ipv6/fping.8
-@@ -1,4 +1,4 @@
--.TH fping l
-+.TH fping 8
- .SH NAME
- fping \- send ICMP ECHO_REQUEST packets to network hosts
- .SH SYNOPSIS
-@@ -12,9 +12,9 @@
-
-
- .B fping
--is a
--.MS ping 8
--like program which uses the Internet Control
-+is a program like
-+.B ping(8)
-+which uses the Internet Control
- Message Protocol (ICMP) echo request to determine if a target host is
- responding.
- .B fping
-@@ -37,8 +37,7 @@
- ).
- .PP
- Unlike
--.B ping
--,
-+.B ping,
- .B fping
- is meant to be used in scripts, so its output is designed to be
- easy to parse.
-@@ -130,12 +129,16 @@
- a target will be made, not including the first try.
- .IP \fB-s\fR 5
- Print cumulative statistics upon exit.
-+.IP \fB-S\fIaddr\fR 5
-+Set source address.
- .IP \fB-t\fIn\fR 5
- Initial target timeout in milliseconds (default 500). In the default
- mode, this is the amount of time that
- .B fping
- waits for a response to its first request. Successive timeouts are
- multiplied by the backoff factor.
-+.IP \fB-T\fIn\fR 5
-+Select timeout in seconds (default 10).
- .IP \fB-u\fR 5
- Show targets that are unreachable.
- .IP \fB-v\fR 5
-@@ -152,7 +155,7 @@
- example none the less.
- .nf
-
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- require 'open2.pl';
-
- $MAILTO = "root";
-@@ -178,7 +181,7 @@
- that are currently reachable.
- .nf
-
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- $hosts_to_backup = `cat /etc/hosts.backup | fping -a`;
-
diff --git a/network/fping6/fping.c.diff b/network/fping6/fping.c.diff
deleted file mode 100644
index ae51175477..0000000000
--- a/network/fping6/fping.c.diff
+++ /dev/null
@@ -1,421 +0,0 @@
---- fping-2.4b2-to-ipv6.orig/fping.c
-+++ fping-2.4b2-to-ipv6/fping.c
-@@ -24,7 +24,7 @@
- *
- * Original author: Roland Schemers <schemers@stanford.edu>
- * IPv6 Support: Jeroen Massar <jeroen@unfix.org / jeroen@ipng.nl>
-- *
-+ * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de)
- *
- *
- * RCS header information no longer used. It has been moved to the
-@@ -42,7 +42,6 @@
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
--#define IPV6 1 /* This should be a compiler option, or even better be done from the Makefile... ;) */
-
- #ifndef _NO_PROTO
- #if !__STDC__ && !defined( __cplusplus ) && !defined( FUNCPROTO ) \
-@@ -101,13 +100,8 @@
- #endif
- #include <netinet/in_systm.h>
-
--/* Linux has bizarre ip.h and ip_icmp.h */
--#if defined( __linux__ )
--#include "linux.h"
--#else
- #include <netinet/ip.h>
- #include <netinet/ip_icmp.h>
--#endif /* defined(__linux__) */
-
- #include <arpa/inet.h>
- #include <netdb.h>
-@@ -150,7 +144,11 @@
- #define MIN_PING_DATA sizeof( PING_DATA )
- #define MAX_IP_PACKET 65536 /* (theoretical) max IP packet size */
- #define SIZE_IP_HDR 20
-+#ifndef IPV6
- #define SIZE_ICMP_HDR ICMP_MINLEN /* from ip_icmp.h */
-+#else
-+#define SIZE_ICMP_HDR sizeof(FPING_ICMPHDR)
-+#endif
- #define MAX_PING_DATA ( MAX_IP_PACKET - SIZE_IP_HDR - SIZE_ICMP_HDR )
-
- /* sized so as to be like traditional ping */
-@@ -283,6 +281,12 @@
- u_int count = 1;
- u_int trials;
- u_int report_interval = 0;
-+int src_addr_present = 0;
-+#ifndef IPV6
-+struct in_addr src_addr;
-+#else
-+struct in6_addr src_addr;
-+#endif
-
- /* global stats */
- long max_reply = 0;
-@@ -292,6 +296,7 @@
- int max_hostname_len = 0;
- int num_jobs = 0; /* number of hosts still to do */
- int num_hosts; /* total number of hosts */
-+int max_seq_sent = 0; /* maximum sequence number sent so far */
- int num_alive = 0, /* total number alive */
- num_unreachable = 0, /* total number unreachable */
- num_noaddress = 0; /* total number of addresses not found */
-@@ -408,6 +413,11 @@
- struct protoent *proto;
- char *buf;
- uid_t uid;
-+#ifndef IPV6
-+ struct sockaddr_in sa;
-+#else
-+ struct sockaddr_in6 sa;
-+#endif
- /* check if we are root */
-
- if( geteuid() )
-@@ -439,7 +449,7 @@
-
- #ifdef IPV6
- /*
-- * let the kerel pass extension headers of incoming packets,
-+ * let the kernel pass extension headers of incoming packets,
- * for privileged socket options
- */
- #ifdef IPV6_RECVHOPOPTS
-@@ -474,6 +484,35 @@
- sizeof(opton)))
- err(1, "setsockopt(IPV6_RTHDR)");
- #endif
-+#ifndef USE_SIN6_SCOPE_ID
-+#ifdef IPV6_RECVPKTINFO
-+ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVPKTINFO, &opton,
-+ sizeof(opton)))
-+ err(1, "setsockopt(IPV6_RECVPKTINFO)");
-+#else /* old adv. API */
-+ if (setsockopt(s, IPPROTO_IPV6, IPV6_PKTINFO, &opton,
-+ sizeof(opton)))
-+ err(1, "setsockopt(IPV6_PKTINFO)");
-+#endif
-+#endif /* USE_SIN6_SCOPE_ID */
-+#ifdef IPV6_RECVHOPLIMIT
-+ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &opton,
-+ sizeof(opton)))
-+ err(1, "setsockopt(IPV6_RECVHOPLIMIT)");
-+#else /* old adv. API */
-+ if (setsockopt(s, IPPROTO_IPV6, IPV6_HOPLIMIT, &opton,
-+ sizeof(opton)))
-+ err(1, "setsockopt(IPV6_HOPLIMIT)");
-+#endif
-+#ifdef IPV6_CHECKSUM
-+#ifndef SOL_RAW
-+#define SOL_RAW IPPROTO_IPV6
-+#endif
-+ opton = 2;
-+ if (setsockopt(s, SOL_RAW, IPV6_CHECKSUM, &opton,
-+ sizeof(opton)))
-+ err(1, "setsockopt(SOL_RAW,IPV6_CHECKSUM)");
-+#endif
- #endif
-
- if( ( uid = getuid() ) )
-@@ -491,7 +530,7 @@
-
- /* get command line options */
-
-- while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:" ) ) != EOF )
-+ while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:S:I:T:" ) ) != EOF )
- {
- switch( c )
- {
-@@ -502,7 +541,7 @@
- break;
-
- case 'r':
-- if( !( retry = ( u_int )atoi( optarg ) ) )
-+ if( ( retry = ( u_int )atoi( optarg ) ) < 0 )
- usage();
-
- break;
-@@ -639,6 +678,27 @@
- generate_flag = 1;
- break;
-
-+ case 'S':
-+#ifndef IPV6
-+ if( ! inet_pton( AF_INET, optarg, &src_addr ) )
-+#else
-+ if( ! inet_pton( AF_INET6, optarg, &src_addr ) )
-+#endif
-+ usage();
-+ src_addr_present = 1;
-+ break;
-+
-+ case 'I':
-+ if (setsockopt(s, SOL_SOCKET, SO_BINDTODEVICE, optarg,
-+ strlen(optarg)))
-+ err(1, "setsockopt(AF_INET, SO_BINDTODEVICE)");
-+ break;
-+
-+ case 'T':
-+ if ( ! ( select_time = ( u_int )atoi( optarg ) * 100 ) )
-+ usage();
-+ break;
-+
- default:
- usage();
- break;
-@@ -821,7 +881,7 @@
- errno_crash_and_burn( "fopen" );
-
-
-- while( fgets( line, 132, ping_file ) )
-+ while( fgets( line, sizeof(line), ping_file ) )
- {
- if( sscanf( line, "%s", host ) != 1 )
- continue;
-@@ -962,6 +1022,22 @@
- if( !num_hosts )
- exit( 2 );
-
-+ /* set the source address */
-+
-+ if( src_addr_present )
-+ {
-+ memset( &sa, 0, sizeof( sa ) );
-+#ifndef IPV6
-+ sa.sin_family = AF_INET;
-+ sa.sin_addr = src_addr;
-+#else
-+ sa.sin6_family = AF_INET6;
-+ sa.sin6_addr = src_addr;
-+#endif
-+ if ( bind( s, (struct sockaddr *)&sa, sizeof( sa ) ) < 0 )
-+ errno_crash_and_burn( "cannot bind source address" );
-+ }
-+
- /* allocate array to hold outstanding ping requests */
-
- table = ( HOST_ENTRY** )malloc( sizeof( HOST_ENTRY* ) * num_hosts );
-@@ -1112,7 +1188,7 @@
- /* but allow time for the last one to come in */
- if( count_flag )
- {
-- if( ( cursor->num_sent >= count ) && ( ht > cursor->timeout ) )
-+ if( ( cursor->num_sent >= count ) && ( cursor->num_recv >= count || ht > cursor->timeout ) )
- {
- remove_job( cursor );
- continue;
-@@ -1153,6 +1229,7 @@
-
- finish();
-
-+ return 0;
- } /* main() */
-
-
-@@ -1382,15 +1459,15 @@
- if( h->num_recv_i <= h->num_sent_i )
- {
- fprintf( stderr, " xmt/rcv/%%loss = %d/%d/%d%%",
-- h->num_sent_i, h->num_recv_i,
-- ( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i );
-+ h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ?
-+ ( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i : 0 );
-
- }/* IF */
- else
- {
- fprintf( stderr, " xmt/rcv/%%return = %d/%d/%d%%",
-- h->num_sent_i, h->num_recv_i,
-- ( ( h->num_recv_i * 100 ) / h->num_sent_i ) );
-+ h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ?
-+ ( ( h->num_recv_i * 100 ) / h->num_sent_i ) : 0 );
-
- }/* ELSE */
-
-@@ -1504,12 +1581,15 @@
- icp = ( FPING_ICMPHDR* )buffer;
-
- gettimeofday( &h->last_send_time, &tz );
-+ int myseq = h->num_sent * num_hosts + h->i;
-+ max_seq_sent = myseq > max_seq_sent ? myseq : max_seq_sent;
-+
- #ifndef IPV6
- icp->icmp_type = ICMP_ECHO;
- icp->icmp_code = 0;
- icp->icmp_cksum = 0;
-- icp->icmp_seq = h->i;
-- icp->icmp_id = ident;
-+ icp->icmp_seq = htons(myseq);
-+ icp->icmp_id = htons(ident);
-
- pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR );
- pdp->ping_ts = h->last_send_time;
-@@ -1519,8 +1599,8 @@
- #else
- icp->icmp6_type = ICMP6_ECHO_REQUEST;
- icp->icmp6_code = 0;
-- icp->icmp6_seq = h->i;
-- icp->icmp6_id = ident;
-+ icp->icmp6_seq = htons(myseq);
-+ icp->icmp6_id = htons(ident);
-
- pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR );
- pdp->ping_ts = h->last_send_time;
-@@ -1667,25 +1747,25 @@
- }/* IF */
-
- #ifndef IPV6
-- if( icp->icmp_id != ident )
-+ if( ntohs(icp->icmp_id) != ident )
- #else
-- if( icp->icmp6_id != ident )
-+ if( ntohs(icp->icmp6_id) != ident )
- #endif
- return 1; /* packet received, but not the one we are looking for! */
-
- num_pingreceived++;
-
- #ifndef IPV6
-- if( icp->icmp_seq >= ( n_short )num_hosts )
-+ if( ntohs(icp->icmp_seq) > max_seq_sent )
- #else
-- if( icp->icmp6_seq >= ( n_short )num_hosts )
-+ if( ntohs(icp->icmp6_seq) > max_seq_sent )
- #endif
- return( 1 ); /* packet received, don't worry about it anymore */
-
- #ifndef IPV6
-- n = icp->icmp_seq;
-+ n = ntohs(icp->icmp_seq) % num_hosts;
- #else
-- n = icp->icmp6_seq;
-+ n = ntohs(icp->icmp6_seq) % num_hosts;
- #endif
- h = table[n];
-
-@@ -1824,6 +1904,7 @@
-
- }/* IF */
-
-+ fflush( stdout );
- return num_jobs;
-
- } /* wait_for_reply() */
-@@ -1875,11 +1956,11 @@
- sent_icmp = ( struct icmp* )( c + 28 );
-
- if( ( sent_icmp->icmp_type == ICMP_ECHO ) &&
-- ( sent_icmp->icmp_id == ident ) &&
-- ( sent_icmp->icmp_seq < ( n_short )num_hosts ) )
-+ ( ntohs(sent_icmp->icmp_id) == ident ) &&
-+ ( ntohs(sent_icmp->icmp_seq) <= ( n_short )max_seq_sent ) )
- {
- /* this is a response to a ping we sent */
-- h = table[sent_icmp->icmp_seq];
-+ h = table[ntohs(sent_icmp->icmp_seq) % num_hosts];
-
- if( p->icmp_code > ICMP_UNREACH_MAXTYPE )
- {
-@@ -1888,11 +1969,11 @@
-
- #else
- if( ( sent_icmp->icmp6_type == ICMP_ECHO ) &&
-- ( sent_icmp->icmp6_id == ident ) &&
-- ( sent_icmp->icmp6_seq < ( n_short )num_hosts ) )
-+ ( ntohs(sent_icmp->icmp6_id) == ident ) &&
-+ ( ntohs(sent_icmp->icmp6_seq) <= ( n_short )max_seq_sent ) )
- {
- /* this is a response to a ping we sent */
-- h = table[sent_icmp->icmp6_seq];
-+ h = table[ntohs(sent_icmp->icmp6_seq) % num_hosts];
-
- if( p->icmp6_code > ICMP_UNREACH_MAXTYPE )
- {
-@@ -1930,24 +2011,24 @@
- case ICMP_PARAMPROB:
- sent_icmp = ( FPING_ICMPHDR* )( c + 28 );
- #ifndef IPV6
-- if( ( sent_icmp->icmp_type = ICMP_ECHO ) &&
-- ( sent_icmp->icmp_id = ident ) &&
-- ( sent_icmp->icmp_seq < ( n_short )num_hosts ) )
-+ if( ( sent_icmp->icmp_type == ICMP_ECHO ) &&
-+ ( ntohs(sent_icmp->icmp_id) == ident ) &&
-+ ( ntohs(sent_icmp->icmp_seq) <= ( n_short )max_seq_sent ) )
- {
- /* this is a response to a ping we sent */
-- h = table[sent_icmp->icmp_seq];
-+ h = table[ntohs(sent_icmp->icmp_seq) % num_hosts];
- fprintf( stderr, "%s from %s for ICMP Echo sent to %s",
- icmp_type_str[p->icmp_type], inet_ntoa( addr->sin_addr ), h->host );
-
- if( inet_addr( h->host ) == -1 )
- fprintf( stderr, " (%s)", inet_ntoa( h->saddr.sin_addr ) );
- #else
-- if( ( sent_icmp->icmp6_type = ICMP_ECHO ) &&
-- ( sent_icmp->icmp6_id = ident ) &&
-- ( sent_icmp->icmp6_seq < ( n_short )num_hosts ) )
-+ if( ( sent_icmp->icmp6_type == ICMP_ECHO ) &&
-+ ( ntohs(sent_icmp->icmp6_id) == ident ) &&
-+ ( ntohs(sent_icmp->icmp6_seq) <= ( n_short )max_seq_sent ) )
- {
- /* this is a response to a ping we sent */
-- h = table[sent_icmp->icmp6_seq];
-+ h = table[ntohs(sent_icmp->icmp6_seq) % num_hosts];
- fprintf( stderr, "%s from %s for ICMP Echo sent to %s",
- icmp_type_str[p->icmp6_type], addr_ascii, h->host );
-
-@@ -2165,20 +2246,33 @@
- struct addrinfo *res, hints;
- int ret_ga;
- char *hostname;
-+ size_t len;
-
- /* getaddrinfo */
- bzero(&hints, sizeof(struct addrinfo));
-- hints.ai_flags = AI_CANONNAME;
-+ hints.ai_flags = name_flag ? AI_CANONNAME : 0;
- hints.ai_family = AF_INET6;
- hints.ai_socktype = SOCK_RAW;
- hints.ai_protocol = IPPROTO_ICMPV6;
-
- ret_ga = getaddrinfo(name, NULL, &hints, &res);
-- if (ret_ga) errx(1, "%s", gai_strerror(ret_ga));
-+ if (ret_ga) {
-+ if(!quiet_flag)
-+ warnx("%s", gai_strerror(ret_ga));
-+ num_noaddress++;
-+ return;
-+ }
- if (res->ai_canonname) hostname = res->ai_canonname;
- else hostname = name;
-- if (!res->ai_addr) errx(1, "getaddrinfo failed");
-- (void)memcpy(&dst, res->ai_addr, sizeof(FPING_SOCKADDR)); /*res->ai_addrlen);*/
-+ if (!res->ai_addr) {
-+ if(!quiet_flag)
-+ warnx("getaddrinfo failed");
-+ num_noaddress++;
-+ return;
-+ }
-+ len = res->ai_addrlen;
-+ if (len > sizeof(FPING_SOCKADDR)) len = sizeof(FPING_SOCKADDR);
-+ (void)memcpy(&dst, res->ai_addr, len);
- add_addr(name, name, &dst);
- #endif
- } /* add_name() */
-@@ -2730,9 +2824,11 @@
- fprintf( stderr, " (in looping and counting modes, default %d)\n", perhost_interval / 100 );
- fprintf( stderr, " -q quiet (don't show per-target/per-ping results)\n" );
- fprintf( stderr, " -Q n same as -q, but show summary every n seconds\n" );
-- fprintf( stderr, " -r n number of retries (default %d)\n", retry );
-+ fprintf( stderr, " -r n number of retries (default %d)\n", DEFAULT_RETRY );
- fprintf( stderr, " -s print final stats\n" );
-+ fprintf( stderr, " -S addr set source address\n" );
- fprintf( stderr, " -t n individual target initial timeout (in millisec) (default %d)\n", timeout / 100 );
-+ fprintf( stderr, " -T n set select timeout (default %d)\n", select_time / 100 );
- fprintf( stderr, " -u show targets that are unreachable\n" );
- fprintf( stderr, " -v show version\n" );
- fprintf( stderr, " targets list of targets to check (if no -f specified)\n" );
diff --git a/network/fping6/fping6.SlackBuild b/network/fping6/fping6.SlackBuild
deleted file mode 100644
index f2e9061579..0000000000
--- a/network/fping6/fping6.SlackBuild
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for fping with IPv6 and source IP setting
-# support
-# Copyright (c) 2008, Written by Mark Walling <mark@markwalling.org>
-# IPv6 modifications by Richlv
-
-# 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=fping6
-VERSION=${VERSION:-2.4b2_to_ipv6}
-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}
-
-PRGNAM_ARCHIVE=fping
-VERSION_ARCHIVE=2.4b2-to-ipv6
-VERSION_SOURCE=2.4b2_to-ipv6
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686 -DIPV6=1"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686 -DIPV6=1"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC -DIPV6=1"
- 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_ARCHIVE}_$VERSION_ARCHIVE.orig.tar.gz
-cd ${PRGNAM_ARCHIVE}-$VERSION_SOURCE
-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 {} \;
-
-patch < $CWD/fping.c.diff
-patch < $CWD/fping.8.diff
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man
-
-make
-make install 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
-
-mv $PKG/usr/man/man8/$PRGNAM_ARCHIVE.8 $PKG/usr/man/man8/$PRGNAM.8
-mv $PKG/usr/sbin/$PRGNAM_ARCHIVE $PKG/usr/sbin/$PRGNAM
-
-( 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 ChangeLog README INSTALL $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/fping6/fping6.info b/network/fping6/fping6.info
deleted file mode 100644
index d517d71fd5..0000000000
--- a/network/fping6/fping6.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fping6"
-VERSION="2.4b2_to_ipv6"
-HOMEPAGE="http://fping.sourceforge.net/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/fping_2.4b2-to-ipv6.orig.tar.gz"
-MD5SUM="3ad516765514249a40d3c5b6caab812a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Richlv"
-EMAIL="richlv@nakts.net"
diff --git a/network/fping6/slack-desc b/network/fping6/slack-desc
deleted file mode 100644
index 16acb60ac1..0000000000
--- a/network/fping6/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------------------------------------------------------|
-fping6: fping6 (a ping like program to send ICMP echo requests to IPv6 hosts)
-fping6:
-fping6: fping6 is a ping(1) like program which uses the Internet Control
-fping6: Message Protocol (ICMP) echo request to determine if a host is up.
-fping6: fping6 is different from ping in that you can specify any number of
-fping6: hosts on the command line, or specify a file containing the lists of
-fping6: hosts to ping.
-fping6: This version of fping is compiled with IPv6 support, and additional
-fping6: changes from Debian patch (including source address support).
-fping6: http://fping.sourceforge.net/
-fping6: http://packages.debian.org/sid/fping
diff --git a/network/geomyidae/geomyidae.SlackBuild b/network/geomyidae/geomyidae.SlackBuild
index 2db6aaeebc..9e933c58f8 100644
--- a/network/geomyidae/geomyidae.SlackBuild
+++ b/network/geomyidae/geomyidae.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Slackware build script for geomyidae
-# Copyright 2017 David Woodfall <dave@dawoodfall.net>
+# Copyright 2017 David Woodfall <dave@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
diff --git a/network/geomyidae/geomyidae.info b/network/geomyidae/geomyidae.info
index 68dc8ffdc6..ae69121696 100644
--- a/network/geomyidae/geomyidae.info
+++ b/network/geomyidae/geomyidae.info
@@ -1,10 +1,10 @@
PRGNAM="geomyidae"
VERSION="v0.34"
-HOMEPAGE="gopher://bitreich.org/1/scm/geomyidae/log.gph"
+HOMEPAGE="http://r-36.net/scm/geomyidae/log.html"
DOWNLOAD="ftp://bitreich.org/releases/geomyidae/geomyidae-v0.34.tgz"
MD5SUM="75c4e5864afc184514372b0a5922242d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="Dave Woodfall"
-EMAIL="dave@tty1.uk"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/glewlwyd/README b/network/glewlwyd/README
index 87abbc3f2e..9d6776a0e4 100644
--- a/network/glewlwyd/README
+++ b/network/glewlwyd/README
@@ -3,9 +3,14 @@ Glewlwyd Oauth 2 authentication server
Oauth 2 Server providing JSON Web Tokens for identification.
Lightweight, fast and easy to install on small systems.
-Requires a MySql or SQLite3 database.
+Requires a MySql, PostgreSQL or SQLite3 database.
Handles LDAP or database for users backend.
The API backend is fully written in language C, it's based on Ulfius
HTTP framework, Hoel database framework and Libjwt JSON Web Tokens
library.
+
+Set GLEWLWYD_SQLITE_INIT=1 to initialize, if it doesn't exists already, a
+proper SQLite /var/cache/glewlwyd/glewlwyd.db when installing the package.
+The sample configuration file in /etc/glewlwyd/glewlwyd.conf.sample is
+then directly usable with the pretty insecure admin/password credentials.
diff --git a/network/glewlwyd/glewlwyd.SlackBuild b/network/glewlwyd/glewlwyd.SlackBuild
index b264620754..92f4e2a073 100644
--- a/network/glewlwyd/glewlwyd.SlackBuild
+++ b/network/glewlwyd/glewlwyd.SlackBuild
@@ -21,7 +21,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=glewlwyd
-VERSION=${VERSION:-2.0.0_rc2}
+VERSION=${VERSION:-2.1.1}
SRCVER=$(tr _ - <<< ${VERSION})
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -40,16 +40,16 @@ PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686 -Wno-error=maybe-uninitialized"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686 -Wno-error=maybe-uninitialized"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC -Wno-error=maybe-uninitialized"
LIBDIRSUFFIX="64"
else
- SLKCFLAGS="-O2 -Wno-error=stringop-truncation"
+ SLKCFLAGS="-O2 -Wno-error=maybe-uninitialized"
LIBDIRSUFFIX=""
fi
@@ -83,7 +83,12 @@ 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
+# Default directory for SQLite3 database
+mkdir -p $PKG/var/cache/glewlwyd/
mv $PKG/etc/glewlwyd/glewlwyd.conf $PKG/etc/glewlwyd/glewlwyd.conf.sample
+if [ ! -z "$LIBDIRSUFFIX" ]; then
+ sed -i 's#/usr/lib/glewlwyd/#/usr/lib${LIBDIRSUFFIX}/glewlwyd/#g' $PKG/etc/glewlwyd/glewlwyd.conf.sample
+fi
mkdir -p $PKG/etc/rc.d/
install -m 755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
@@ -97,6 +102,13 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
echo "preserve_perms etc/rc.d/rc.$PRGNAM.new" >> $PKG/install/doinst.sh
+if [ ! -z $GLEWLWYD_SQLITE_INIT ]; then
+ cat >> $PKG/install/doinst.sh <<EOF
+if [ ! -f /var/cache/glewlwyd/glewlwyd.db ];then
+ sqlite3 /var/cache/glewlwyd/glewlwyd.db < /usr/share/glewlwyd/docs/database/init.sqlite3.sql
+fi
+EOF
+fi
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/glewlwyd/glewlwyd.info b/network/glewlwyd/glewlwyd.info
index c8df81c90c..d6b6a192c2 100644
--- a/network/glewlwyd/glewlwyd.info
+++ b/network/glewlwyd/glewlwyd.info
@@ -1,8 +1,8 @@
PRGNAM="glewlwyd"
-VERSION="2.0.0_rc2"
+VERSION="2.1.1"
HOMEPAGE="https://github.com/babelouest/glewlwyd"
-DOWNLOAD="https://github.com/babelouest/glewlwyd/archive/v2.0.0-rc2/glewlwyd-2.0.0-rc2.tar.gz"
-MD5SUM="dd3ccb87b9d54e13f7aa0ba302ba1619"
+DOWNLOAD="https://github.com/babelouest/glewlwyd/archive/v2.1.1/glewlwyd-2.1.1.tar.gz"
+MD5SUM="f33ec6cef5a2452b6a84e1cf8e322bfb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libconfig libjwt oath-toolkit libcbor hoel"
diff --git a/network/glewlwyd/slack-desc b/network/glewlwyd/slack-desc
index 9b13c25bf0..2b2ecd83af 100644
--- a/network/glewlwyd/slack-desc
+++ b/network/glewlwyd/slack-desc
@@ -10,7 +10,7 @@ glewlwyd: glewlwyd (Oauth 2 authentication server)
glewlwyd:
glewlwyd: Oauth 2 Server providing JSON Web Tokens for identification.
glewlwyd: Lightweight, fast and easy to install on small systems.
-glewlwyd: Requires a MySql or SQLite3 database.
+glewlwyd: Requires a MySql, PostgreSQL or SQLite3 database.
glewlwyd: Handles LDAP or database for users backend.
glewlwyd:
glewlwyd: The API backend is fully written in language C.
diff --git a/network/gnome-bluetooth/slack-desc b/network/gnome-bluetooth/slack-desc
index 23df9481b3..0d53772262 100644
--- a/network/gnome-bluetooth/slack-desc
+++ b/network/gnome-bluetooth/slack-desc
@@ -5,7 +5,7 @@
# 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----------------------------------------------------|
+ |-----handy-ruler------------------------------------------------------|
gnome-bluetooth: gnome-bluetooth (GNOME Bluetooth support)
gnome-bluetooth:
gnome-bluetooth: Gnome-Bluetooth provides desktop level support for Bluetooth
diff --git a/network/go-ipfs/go-ipfs.SlackBuild b/network/go-ipfs/go-ipfs.SlackBuild
index 101c6a0286..a6cb5b60b0 100644
--- a/network/go-ipfs/go-ipfs.SlackBuild
+++ b/network/go-ipfs/go-ipfs.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=go-ipfs
-VERSION=${VERSION:-0.4.20}
+VERSION=${VERSION:-0.4.23}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,7 +69,7 @@ cp -a * \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
cp -a $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
-rm $PKG/usr/doc/$PRGNAM-$VERSION/build-log
+#rm $PKG/usr/doc/$PRGNAM-$VERSION/build-log || echo -ne '' # let's ignore minor error
mv $PKG/usr/doc/$PRGNAM-$VERSION/ipfs $PKG/usr/bin/
diff --git a/network/go-ipfs/go-ipfs.info b/network/go-ipfs/go-ipfs.info
index 43b1c3dc78..59e8cf71f6 100644
--- a/network/go-ipfs/go-ipfs.info
+++ b/network/go-ipfs/go-ipfs.info
@@ -1,10 +1,10 @@
PRGNAM="go-ipfs"
-VERSION="0.4.20"
-HOMEPAGE="https://ipfs.io/"
-DOWNLOAD="https://dist.ipfs.io/go-ipfs/v0.4.20/go-ipfs_v0.4.20_linux-386.tar.gz"
-MD5SUM="f2fe783324642d196ada103c0e7231cc"
-DOWNLOAD_x86_64="https://dist.ipfs.io/go-ipfs/v0.4.20/go-ipfs_v0.4.20_linux-amd64.tar.gz"
-MD5SUM_x86_64="ad860f09a92c69adee0b9691aea06749"
+VERSION="0.4.23"
+HOMEPAGE="https://dist.ipfs.io/#go-ipfs"
+DOWNLOAD="https://dist.ipfs.io/go-ipfs/v0.4.23/go-ipfs_v0.4.23_linux-386.tar.gz"
+MD5SUM="dd09c03a2254b8a5682efa02b4c38124"
+DOWNLOAD_x86_64="https://dist.ipfs.io/go-ipfs/v0.4.23/go-ipfs_v0.4.23_linux-amd64.tar.gz"
+MD5SUM_x86_64="357270a1a368a095e69728b2dcf7952c"
REQUIRES=""
MAINTAINER="Marcin Szychowski"
EMAIL="szycha@gmail.com"
diff --git a/network/gofiche/gofiche.SlackBuild b/network/gofiche/gofiche.SlackBuild
index ea08181341..19e6c39080 100644
--- a/network/gofiche/gofiche.SlackBuild
+++ b/network/gofiche/gofiche.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Slackware build script for gofiche
-# Copyright 2017 Dave <dave@dawoodfall.net>
+# Copyright 2017 Dave <dave@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
diff --git a/network/gofiche/gofiche.info b/network/gofiche/gofiche.info
index 1063c9262e..be0e5683f2 100644
--- a/network/gofiche/gofiche.info
+++ b/network/gofiche/gofiche.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/googler/googler.SlackBuild b/network/googler/googler.SlackBuild
index 1d6b6f05e7..cf64d6520a 100644
--- a/network/googler/googler.SlackBuild
+++ b/network/googler/googler.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=googler
-VERSION=${VERSION:-3.9}
+VERSION=${VERSION:-4.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/googler/googler.info b/network/googler/googler.info
index 38316366d4..9ac4f9d2b9 100644
--- a/network/googler/googler.info
+++ b/network/googler/googler.info
@@ -1,8 +1,8 @@
PRGNAM="googler"
-VERSION="3.9"
+VERSION="4.0"
HOMEPAGE="https://github.com/jarun/googler"
-DOWNLOAD="https://github.com/jarun/googler/archive/v3.9/googler-3.9.tar.gz"
-MD5SUM="cf9a8f3f141568bd9bde49e0412e8059"
+DOWNLOAD="https://github.com/jarun/googler/archive/v4.0/googler-4.0.tar.gz"
+MD5SUM="b12b11a70cde5bd8483114a96d99dbc5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="python3"
diff --git a/network/guacamole-client/guacamole-client.SlackBuild b/network/guacamole-client/guacamole-client.SlackBuild
index 395599d0c1..204239c179 100644
--- a/network/guacamole-client/guacamole-client.SlackBuild
+++ b/network/guacamole-client/guacamole-client.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for guacamole-client
-# Copyright 2015-2017 Zhu Qun-Ying
+# Copyright 2015-2020 Zhu Qun-Ying
# 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=guacamole-client
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/guacamole-client/guacamole-client.info b/network/guacamole-client/guacamole-client.info
index 80a5842106..225c2d5f65 100644
--- a/network/guacamole-client/guacamole-client.info
+++ b/network/guacamole-client/guacamole-client.info
@@ -1,8 +1,8 @@
PRGNAM="guacamole-client"
-VERSION="1.0.0"
+VERSION="1.1.0"
HOMEPAGE="https://guacamole.apache.org"
-DOWNLOAD="http://archive.apache.org/dist/guacamole/1.0.0/binary/guacamole-1.0.0.war"
-MD5SUM="b190718b63e80442b0c3642e5bd4bca8"
+DOWNLOAD="http://archive.apache.org/dist/guacamole/1.1.0/binary/guacamole-1.1.0.war"
+MD5SUM="b41ad2663c424516241346863662fa4b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="apache-tomcat"
diff --git a/network/guacamole-client/slack-desc b/network/guacamole-client/slack-desc
index 64c6538b27..9185d176c7 100644
--- a/network/guacamole-client/slack-desc
+++ b/network/guacamole-client/slack-desc
@@ -5,7 +5,7 @@
# 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----------------------------------------------|
+ |-----handy-ruler------------------------------------------------------|
guacamole-client: guacamole-client (Guacamole client)
guacamole-client:
guacamole-client: guacamole-client contains all Java and JavaScript components
diff --git a/network/guacamole-server/guacamole-server.SlackBuild b/network/guacamole-server/guacamole-server.SlackBuild
index 4faaafa5c8..a2ce108c24 100644
--- a/network/guacamole-server/guacamole-server.SlackBuild
+++ b/network/guacamole-server/guacamole-server.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for guacamole-server
-# Copyright 2015-2019 Zhu Qun-Ying
+# Copyright 2015-2020 Zhu Qun-Ying
# 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=guacamole-server
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/guacamole-server/guacamole-server.info b/network/guacamole-server/guacamole-server.info
index 09d9d5d678..e5fdc232a3 100644
--- a/network/guacamole-server/guacamole-server.info
+++ b/network/guacamole-server/guacamole-server.info
@@ -1,8 +1,8 @@
PRGNAM="guacamole-server"
-VERSION="1.0.0"
+VERSION="1.1.0"
HOMEPAGE="http://guacamole.apache.org/"
-DOWNLOAD="https://github.com/apache/guacamole-server/archive/1.0.0/guacamole-server-1.0.0.tar.gz"
-MD5SUM="5081a0670bcd693dd4d5fea60ab5ca5d"
+DOWNLOAD="https://github.com/apache/guacamole-server/archive/1.1.0/guacamole-server-1.1.0.tar.gz"
+MD5SUM="089cdb864d5d0d196312eaee889a02cf"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libtelnet freerdp"
diff --git a/network/guacamole-server/slack-desc b/network/guacamole-server/slack-desc
index 3d4e42ab20..40515ece9c 100644
--- a/network/guacamole-server/slack-desc
+++ b/network/guacamole-server/slack-desc
@@ -5,7 +5,7 @@
# 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------------------------------------------------------|
+ |-----handy-ruler------------------------------------------------------|
guacamole-server: guacamole-server (Guacamole server)
guacamole-server:
guacamole-server: guacamole-server contains all the native, server-side
diff --git a/network/haskell-network-multicast/README b/network/haskell-network-multicast/README
new file mode 100644
index 0000000000..084ebb30da
--- /dev/null
+++ b/network/haskell-network-multicast/README
@@ -0,0 +1,5 @@
+The Network.Multicast module is for sending UDP datagrams over multicast
+(class D) addresses.
+
+Network.Multicast 0.2.0 is the last version compatible with Network < 2.7 that
+doesn't require an explicit install of Network.BSD.
diff --git a/network/haskell-network-multicast/doinst.sh b/network/haskell-network-multicast/doinst.sh
new file mode 100644
index 0000000000..3268c238bf
--- /dev/null
+++ b/network/haskell-network-multicast/doinst.sh
@@ -0,0 +1 @@
+chroot . /usr/bin/ghc-pkg recache
diff --git a/network/tramp/tramp.SlackBuild b/network/haskell-network-multicast/haskell-network-multicast.SlackBuild
index d5801b0d1d..b392a0bf8c 100644
--- a/network/tramp/tramp.SlackBuild
+++ b/network/haskell-network-multicast/haskell-network-multicast.SlackBuild
@@ -1,8 +1,8 @@
#!/bin/sh
-# Slackware build script for tramp v.2.2.7 for Emacs
+# Slackware build script for haskell-network-multicast
-# Copyright 2013 Renato MARTINI - renato.martini AT gmail.com
+# Copyright 2020 Jan-willem De Bleser, Pasadena, CA, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,18 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=tramp
-VERSION=${VERSION:-2.2.7}
+PRGNAM=haskell-network-multicast
+VERSION=${VERSION:-0.2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+SRCNAM="$( echo $PRGNAM | cut -d- -f2- )"
+
+GHC_VERSION=$(ghc --numeric-version)
+
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 +44,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"
@@ -54,49 +58,53 @@ else
LIBDIRSUFFIX=""
fi
-set -e
+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
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 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" \
-./configure \
+runghc Setup configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --infodir=/usr/info \
- --build=$ARCH-slackware-linux \
- --with-contrib
+ --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
+ --enable-shared \
+ --enable-library-profiling \
+ --docdir=/usr/doc/$PRGNAM-$VERSION
-make
-make install DESTDIR=$PKG
+runghc Setup build
+runghc Setup haddock
+runghc Setup copy --destdir=$PKG
+runghc Setup register --gen-pkg-config
+
+PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d
+PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | cut -d" " -f2 )
+mkdir -p $PKG/$PKGCONFD
+mv $SRCNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf
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
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/tramp
-
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- ChangeLog README CONTRIBUTORS INSTALL \
+ LICENSE \
$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/haskell-network-multicast/haskell-network-multicast.info b/network/haskell-network-multicast/haskell-network-multicast.info
new file mode 100644
index 0000000000..fb31fcfc10
--- /dev/null
+++ b/network/haskell-network-multicast/haskell-network-multicast.info
@@ -0,0 +1,10 @@
+PRGNAM="haskell-network-multicast"
+VERSION="0.2.0"
+HOMEPAGE="https://hackage.haskell.org/package/network-multicast"
+DOWNLOAD="https://hackage.haskell.org/package/network-multicast-0.2.0/network-multicast-0.2.0.tar.gz"
+MD5SUM="3d24c965c74baec05c3599489b1e4356"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="haskell-network"
+MAINTAINER="Jan-willem De Bleser"
+EMAIL="jw@thescrapyard.org"
diff --git a/network/haskell-network-multicast/slack-desc b/network/haskell-network-multicast/slack-desc
new file mode 100644
index 0000000000..62385865f5
--- /dev/null
+++ b/network/haskell-network-multicast/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+haskell-network-multicast: haskell-network-multicast (multicast module)
+haskell-network-multicast:
+haskell-network-multicast: The Network.Multicast module is for sending UDP datagrams over
+haskell-network-multicast: multicast (class D) addresses.
+haskell-network-multicast:
+haskell-network-multicast:
+haskell-network-multicast:
+haskell-network-multicast:
+haskell-network-multicast:
+haskell-network-multicast: https://hackage.haskell.org/package/network-multicast
+haskell-network-multicast:
diff --git a/network/hiawatha/README b/network/hiawatha/README
index 6f6e655e59..094e670fb1 100644
--- a/network/hiawatha/README
+++ b/network/hiawatha/README
@@ -1,12 +1,12 @@
-Hiawatha (A secure and advanced Web server)
+Hiawatha (A secure and advanced webserver)
-Hiawatha is a Web server for Unix and has been built with security
-in mind. This resulted in a highly secure Web server, in both code
-and features.
+Hiawatha is a web server for Unix and has been built with security in
+mind. This resulted in a highly secure web server, in both code and
+features.
-Hiawatha supports many Web and HTTP features such as
-CGI/FASTCGI, HTTP authentication, virtual host support, request
-pipelining, keep alive connections, URL rewriting and many more.
+Hiawatha supports many web and HTTP features such as CGI/FASTCGI, HTTP
+authentication, virtual host support, request pipelining, keep alive
+connections, URL rewriting and many more.
Notes:
@@ -21,9 +21,9 @@ Notes:
* Hiawatha's daemon will listen on the network interface
127.0.0.1:80, and it can write temporary files inside
- /var/db/hiawatha
+ /var/db/hiawatha
- * The Web root directory is /var/hiawatha with index.html being
+ * The web root directory is /var/hiawatha with index.html being
the default start file.
Hiawatha's documentation can be found at the following URL:
diff --git a/network/hiawatha/hiawatha.SlackBuild b/network/hiawatha/hiawatha.SlackBuild
index b4315d65df..6e1e46a6b3 100644
--- a/network/hiawatha/hiawatha.SlackBuild
+++ b/network/hiawatha/hiawatha.SlackBuild
@@ -2,9 +2,8 @@
# Slackware build script for hiawatha
-# Copyright 2018-2019 Donald Cooley South Haven, Indiana USA
-# Copyright (c) 2009-2012, Antonio HernΓ‘ndez Blas <hba.nihilismus@gmail.com>
-# Copyright (c) 2014, Antonio HernΓ‘ndez Blas <hba.nihilismus@gmail.com>
+# Copyright 2018-2020 Donald Cooley South Haven, Indiana, USA
+# Copyright (c) 2009-2012, 2014 Antonio HernΓ‘ndez Bls
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -24,7 +23,7 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=hiawatha
-VERSION=${VERSION:-10.9}
+VERSION=${VERSION:-10.10}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -87,11 +86,10 @@ cd build
-DWORK_DIR=/var/db/$PRGNAM \
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_CACHE=on \
- -DENABLE_IPV6=on \
-DENABLE_MONITOR=on \
-DENABLE_RPROXY=on \
- -DENABLE_TOMAHAWK=on \
-DENABLE_TLS=on \
+ -DENABLE_TOMAHAWK=on \
-DENABLE_TOOLKIT=on \
-DENABLE_XSLT=on \
..
@@ -116,14 +114,16 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
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/extra
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a ChangeLog LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat extra/newroot > $PKG/usr/doc/$PRGNAM-$VERSION/extra/newroot
-
-mkdir -p $PKG/usr/share/$PRGNAM
-tar -caf $PKG/usr/share/$PRGNAM/letsencrypt.tar.gz extra/letsencrypt/*
+mkdir -p $PKG/usr/share/$PRGNAM/extra
+cat extra/newroot > $PKG/usr/share/$PRGNAM/extra/newroot
+tar -caf $PKG/usr/share/$PRGNAM/extra/letsencrypt.tar.gz extra/letsencrypt/*
+cp -a extra/{*.xml,index.html,*.in,tls*} \
+ $PKG/usr/share/$PRGNAM/extra/
+cp -a extra/nghttp2.tgz $PKG/usr/share/$PRGNAM/extra/
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/hiawatha/hiawatha.info b/network/hiawatha/hiawatha.info
index a88fc79c20..8016841a33 100644
--- a/network/hiawatha/hiawatha.info
+++ b/network/hiawatha/hiawatha.info
@@ -1,8 +1,8 @@
PRGNAM="hiawatha"
-VERSION="10.9"
+VERSION="10.10"
HOMEPAGE="https://www.hiawatha-webserver.org"
-DOWNLOAD="https://www.hiawatha-webserver.org/files/hiawatha-10.9.tar.gz"
-MD5SUM="83aa447f187c33968bee9dfac3011718"
+DOWNLOAD="https://www.hiawatha-webserver.org/files/hiawatha-10.10.tar.gz"
+MD5SUM="3bf2c12c7037ecc3dfdbec72e7a2f04f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/hiawatha/slack-desc b/network/hiawatha/slack-desc
index 5a44668542..05db98aa46 100644
--- a/network/hiawatha/slack-desc
+++ b/network/hiawatha/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-hiawatha: hiawatha (A secure and advanced Web server)
+hiawatha: hiawatha (A secure and advanced web server)
hiawatha:
-hiawatha: Hiawatha is a Web server for Unix and has been built with security
-hiawatha: in mind. This resulted in a highly secure Web server, in both code
-hiawatha: and features.
+hiawatha: Hiawatha is a web server for Unix and has been built with security in
+hiawatha: mind. This resulted in a highly secure web server, in both code and
+hiawatha: features.
hiawatha:
-hiawatha: Hiawatha supports many web and HTTP features such as
-hiawatha: CGI/FastCGI, HTTP authentication, virtual host support, request
-hiawatha: pipelining, keep alive connections, URL rewriting and many more.
+hiawatha: Hiawatha supports many web and HTTP features such as CGI/FastCGI,
+hiawatha: HTTP authentication, virtual host support, request pipelining, keep
+hiawatha: alive connections, URL rewriting and many more.
hiawatha:
hiawatha: Homepage: https://www.hiawatha-webserver.org
diff --git a/network/hipchat/README b/network/hipchat/README
deleted file mode 100644
index 9c62cb30be..0000000000
--- a/network/hipchat/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Hipchat is a private group messaging service with support for video
-chat, group screen sharing, and file sharing.
-
-This script repackages the Debian package provided by Atlassian.
-
-Note that only a 64 bit version is available. For an old 32 bit version
-of HipChat, see the hipchat2 SlackBuild.
diff --git a/network/hipchat/hipchat.SlackBuild b/network/hipchat/hipchat.SlackBuild
deleted file mode 100644
index bb7aa5056e..0000000000
--- a/network/hipchat/hipchat.SlackBuild
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
-# Copyright 2009, 2010, 2011, 2012, 2013 Eric Hameleers, Eindhoven, Netherlands
-# Slackware build script for hipchat
-# Written by Lionel Young <lionelyoung@gmail.com>
-# Based on http://slackbuilds.org/template.SlackBuild
-# Maintained by Ryan P.C. McQuen <ryanpcmcquen@member.fsf.org> 2014-2017
-
-# Alan Dingeldein | Canyon Lake, TX | kd5zex@gmail.com
-
-# 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) any later version, with the following exception:
-# the text of the GPL license may be omitted.
-
-# 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. Compiling,
-# interpreting, executing or merely reading the text of the program
-# may result in lapses of consciousness and/or very being, up to and
-# including the end of all existence and the Universe as we know it.
-# See the GNU General Public License for more details.
-
-# You may have received a copy of the GNU General Public License along
-# with this program (most likely, a file named COPYING). If not, see
-# <http://www.gnu.org/licenses/>.
-
-PRGNAM=hipchat
-VERSION=${VERSION:-4.29.4.1662}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=HipChat4
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) export ARCH=i686 ;;
- arm*) export ARCH=arm ;;
- *) export ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" != "x86_64" ]; then
- echo "$ARCH is not supported!"
- exit 1
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $PKG
-ar p $CWD/$SRCNAM-${VERSION}-Linux.deb data.tar.gz | tar xvz
-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 {} \;
-
-# Create symlinks in /usr/bin
-mkdir -p $PKG/usr/bin
-ln -s /opt/hipchat/bin/hipchat $PKG/usr/bin/hipchat
-
-mkdir -p $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/hipchat/hipchat.info b/network/hipchat/hipchat.info
deleted file mode 100644
index 180571f5bf..0000000000
--- a/network/hipchat/hipchat.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="hipchat"
-VERSION="4.29.4.1662"
-HOMEPAGE="http://www.hipchat.com/#linux"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-4.29.4.1662-Linux.deb"
-MD5SUM_x86_64="5e6731ba4a47f5c7281c18d9baf09eaa"
-REQUIRES=""
-MAINTAINER="Alan Dingeldein"
-EMAIL="kd5zex@gmail.com"
diff --git a/network/hipchat2/README b/network/hipchat2/README
deleted file mode 100644
index 7fbf0e8b62..0000000000
--- a/network/hipchat2/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Hipchat is a private group messaging service.
-
-This SlackBuild packages an old version of HipChat for 32-bit users.
-64-bit users should use the 'hipchat' SlackBuild instead.
diff --git a/network/hipchat2/hipchat2.SlackBuild b/network/hipchat2/hipchat2.SlackBuild
deleted file mode 100644
index b218763b71..0000000000
--- a/network/hipchat2/hipchat2.SlackBuild
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
-# Copyright 2009, 2010, 2011, 2012, 2013 Eric Hameleers, Eindhoven, Netherlands
-# Slackware build script for hipchat2
-# Written by Lionel Young <lionelyoung@gmail.com>
-# Based on http://slackbuilds.org/template.SlackBuild
-# Maintained by Ryan P.C. McQuen <ryanpcmcquen@member.fsf.org> 2014-2017
-
-# Alan Dingeldein | Canyon Lake, TX | kd5zex@gmail.com
-
-# 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) any later version, with the following exception:
-# the text of the GPL license may be omitted.
-
-# 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. Compiling,
-# interpreting, executing or merely reading the text of the program
-# may result in lapses of consciousness and/or very being, up to and
-# including the end of all existence and the Universe as we know it.
-# See the GNU General Public License for more details.
-
-# You may have received a copy of the GNU General Public License along
-# with this program (most likely, a file named COPYING). If not, see
-# <http://www.gnu.org/licenses/>.
-
-PRGNAM=hipchat2
-VERSION=${VERSION:-2.2.1388}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=hipchat
-
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) export ARCH=i686 ;;
- arm*) export ARCH=arm ;;
- *) export ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-
-tar xvf $CWD/$SRCNAM-$VERSION-$ARCH.pkg.tar.xz -C $PKG
-chown -R root:root $PKG
-
-# Create missing symlink for cert
-mkdir -p $PKG/etc/ssl/certs
-ln -s DigiCert_High_Assurance_EV_Root_CA.pem $PKG/etc/ssl/certs/81b9768f.0
-
-# Fix permissions on libraries
-find $PKG -name "*\.so*" -type f -exec chmod 0755 {} \;
-
-# Remove some cruft
-rm -f $PKG/.PKGINFO
-
-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
-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/hipchat2/hipchat2.info b/network/hipchat2/hipchat2.info
deleted file mode 100644
index 212d709fef..0000000000
--- a/network/hipchat2/hipchat2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="hipchat2"
-VERSION="2.2.1388"
-HOMEPAGE="http://www.hipchat.com/linux"
-DOWNLOAD="http://downloads.hipchat.com/linux/arch/i686/hipchat-2.2.1388-i686.pkg.tar.xz"
-MD5SUM="f7fdc4df78071ecc8900a6f7109facd8"
-DOWNLOAD_x86_64="http://downloads.hipchat.com/linux/arch/x86_64/hipchat-2.2.1388-x86_64.pkg.tar.xz"
-MD5SUM_x86_64="b3c605ed18425ea680903d33a00ed0da"
-REQUIRES=""
-MAINTAINER="Alan Dingeldein"
-EMAIL="kd5zex@gmail.com"
diff --git a/network/hipchat2/slack-desc b/network/hipchat2/slack-desc
deleted file mode 100644
index 7bb368c576..0000000000
--- a/network/hipchat2/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------------------------------------------------------|
-hipchat2: hipchat2 (old version of HipChat for 32 bit users)
-hipchat2:
-hipchat2: HipChat is a private group messaging service.
-hipchat2:
-hipchat2: This SlackBuild packages an old version of HipChat for 32-bit users.
-hipchat2: 64-bit users should use the 'hipchat' SlackBuild instead.
-hipchat2:
-hipchat2: Home: http://www.hipchat.com/linux
-hipchat2:
-hipchat2:
-hipchat2:
diff --git a/network/hostapd/hostapd.SlackBuild b/network/hostapd/hostapd.SlackBuild
index 6a519a3787..8dd14ed682 100644
--- a/network/hostapd/hostapd.SlackBuild
+++ b/network/hostapd/hostapd.SlackBuild
@@ -4,7 +4,7 @@
# Copyright 2008-2013 Murat D. Kadirov <banderols@gmail.com>
# Copyright 2014-2016 LukenShiro, Italy
-# Copyright 2018 Brenton Earl <brent@exitstatusone.com>
+# Copyright 2018, 2019 Brenton Earl <brent@exitstatusone.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,8 +27,8 @@
# Fixed doinst.sh by Mario Preksavec <mario@slackware.hr>
PRGNAM=hostapd
-VERSION=${VERSION:-2.6}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.7}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
diff --git a/network/hostapd/hostapd.defconfig b/network/hostapd/hostapd.defconfig
index 2faf7eff4b..08005f26b4 100644
--- a/network/hostapd/hostapd.defconfig
+++ b/network/hostapd/hostapd.defconfig
@@ -13,15 +13,14 @@
CONFIG_DRIVER_HOSTAP=y
# Driver interface for wired authenticator
-#CONFIG_DRIVER_WIRED=y
-
-# Driver interface for madwifi driver
-#CONFIG_DRIVER_MADWIFI=y
-#CFLAGS += -I../../madwifi # change to the madwifi source directory
+CONFIG_DRIVER_WIRED=y
# Driver interface for drivers using the nl80211 kernel interface
CONFIG_DRIVER_NL80211=y
+# QCA vendor extensions to nl80211
+#CONFIG_DRIVER_NL80211_QCA=y
+
# driver_nl80211.c requires libnl. If you are compiling it yourself
# you may need to point hostapd to your version of libnl.
#
@@ -32,7 +31,7 @@ CONFIG_DRIVER_NL80211=y
#CONFIG_LIBNL20=y
# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
-#CONFIG_LIBNL32=y
+CONFIG_LIBNL32=y
# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
@@ -43,7 +42,7 @@ CONFIG_DRIVER_NL80211=y
#LIBS_c += -L/usr/local/lib
# Driver interface for no driver (e.g., RADIUS server only)
-CONFIG_DRIVER_NONE=y
+#CONFIG_DRIVER_NONE=y
# IEEE 802.11F/IAPP
CONFIG_IAPP=y
@@ -51,15 +50,18 @@ CONFIG_IAPP=y
# WPA2/IEEE 802.11i RSN pre-authentication
CONFIG_RSN_PREAUTH=y
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
# IEEE 802.11w (management frame protection)
CONFIG_IEEE80211W=y
+# Support Operating Channel Validation
+#CONFIG_OCV=y
+
# Integrated EAP server
CONFIG_EAP=y
+# EAP Re-authentication Protocol (ERP) in integrated EAP server
+CONFIG_ERP=y
+
# EAP-MD5 for the integrated EAP server
CONFIG_EAP_MD5=y
@@ -98,25 +100,32 @@ CONFIG_EAP_PSK=y
#CONFIG_EAP_PWD=y
# EAP-SAKE for the integrated EAP server
-#CONFIG_EAP_SAKE=y
+CONFIG_EAP_SAKE=y
# EAP-GPSK for the integrated EAP server
-#CONFIG_EAP_GPSK=y
+CONFIG_EAP_GPSK=y
# Include support for optional SHA256 cipher suite in EAP-GPSK
-#CONFIG_EAP_GPSK_SHA256=y
+CONFIG_EAP_GPSK_SHA256=y
# EAP-FAST for the integrated EAP server
-# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed
-# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g.,
-# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions.
#CONFIG_EAP_FAST=y
+# EAP-TEAP for the integrated EAP server
+# Note: The current EAP-TEAP implementation is experimental and should not be
+# enabled for production use. The IETF RFC 7170 that defines EAP-TEAP has number
+# of conflicting statements and missing details and the implementation has
+# vendor specific workarounds for those and as such, may not interoperate with
+# any other implementation. This should not be used for anything else than
+# experimentation and interoperability testing until those issues has been
+# resolved.
+#CONFIG_EAP_TEAP=y
+
# Wi-Fi Protected Setup (WPS)
CONFIG_WPS=y
# Enable UPnP support for external WPS Registrars
CONFIG_WPS_UPNP=y
# Enable WPS support with NFC config method
-#CONFIG_WPS_NFC=y
+CONFIG_WPS_NFC=y
# EAP-IKEv2
#CONFIG_EAP_IKEV2=y
@@ -142,7 +151,7 @@ CONFIG_IPV6=y
CONFIG_IEEE80211R=y
# Use the hostapd's IEEE 802.11 authentication (ACL), but without
-# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211)
+# the IEEE 802.11 Management capability (e.g., FreeBSD/net80211)
#CONFIG_DRIVER_RADIUS_ACL=y
# IEEE 802.11n (High Throughput) support
@@ -155,6 +164,12 @@ CONFIG_IEEE80211N=y
# IEEE 802.11ac (Very High Throughput) support
CONFIG_IEEE80211AC=y
+# IEEE 802.11ax HE support
+# Note: This is experimental and work in progress. The definitions are still
+# subject to change and this should not be expected to interoperate with the
+# final IEEE 802.11ax version.
+#CONFIG_IEEE80211AX=y
+
# Remove debugging code that is printing out debug messages to stdout.
# This can be used to reduce the size of the hostapd considerably if debugging
# code is not needed.
@@ -164,6 +179,9 @@ CONFIG_IEEE80211AC=y
# Disabled by default.
#CONFIG_DEBUG_FILE=y
+# Send debug messages to syslog instead of stdout
+#CONFIG_DEBUG_SYSLOG=y
+
# Add support for sending all debug messages (regardless of debug verbosity)
# to the Linux kernel tracing facility. This helps debug the entire stack by
# making it easy to record everything happening from the driver up into the
@@ -241,10 +259,25 @@ CONFIG_IEEE80211AC=y
# requirements described above.
#CONFIG_NO_RANDOM_POOL=y
+# Should we attempt to use the getrandom(2) call that provides more reliable
+# yet secure randomness source than /dev/random on Linux 3.17 and newer.
+# Requires glibc 2.25 to build, falls back to /dev/random if unavailable.
+#CONFIG_GETRANDOM=y
+
+# Should we use poll instead of select? Select is used by default.
+#CONFIG_ELOOP_POLL=y
+
+# Should we use epoll instead of select? Select is used by default.
+#CONFIG_ELOOP_EPOLL=y
+
+# Should we use kqueue instead of select? Select is used by default.
+#CONFIG_ELOOP_KQUEUE=y
+
# Select TLS implementation
# openssl = OpenSSL (default)
# gnutls = GnuTLS
# internal = Internal TLSv1 implementation (experimental)
+# linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental)
# none = Empty template
#CONFIG_TLS=openssl
@@ -257,6 +290,10 @@ CONFIG_IEEE80211AC=y
# can be enabled to enable use of stronger crypto algorithms.
#CONFIG_TLSV12=y
+# Select which ciphers to use by default with OpenSSL if the user does not
+# specify them.
+#CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT:!EXP:!LOW"
+
# If CONFIG_TLS=internal is used, additional library and include paths are
# needed for LibTomMath. Alternatively, an integrated, minimal version of
# LibTomMath can be used. See beginning of libtommath.c for details on benefits
@@ -282,7 +319,13 @@ CONFIG_IEEE80211AC=y
#CONFIG_HS20=y
# Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file
-#CONFIG_SQLITE=y
+CONFIG_SQLITE=y
+
+# Enable Fast Session Transfer (FST)
+#CONFIG_FST=y
+
+# Enable CLI commands for FST testing
+#CONFIG_FST_TEST=y
# Testing options
# This can be used to enable some testing options (see also the example
@@ -314,4 +357,40 @@ CONFIG_IEEE80211AC=y
# For more details refer to:
# http://wireless.kernel.org/en/users/Documentation/acs
#
-#CONFIG_ACS=y
+CONFIG_ACS=y
+
+# Multiband Operation support
+# These extentions facilitate efficient use of multiple frequency bands
+# available to the AP and the devices that may associate with it.
+#CONFIG_MBO=y
+
+# Client Taxonomy
+# Has the AP retain the Probe Request and (Re)Association Request frames from
+# a client, from which a signature can be produced which can identify the model
+# of client device like "Nexus 6P" or "iPhone 5s".
+#CONFIG_TAXONOMY=y
+
+# Fast Initial Link Setup (FILS) (IEEE 802.11ai)
+#CONFIG_FILS=y
+# FILS shared key authentication with PFS
+#CONFIG_FILS_SK_PFS=y
+
+# Include internal line edit mode in hostapd_cli. This can be used to provide
+# limited command line editing and history support.
+#CONFIG_WPA_CLI_EDIT=y
+
+# Opportunistic Wireless Encryption (OWE)
+# Experimental implementation of draft-harkins-owe-07.txt
+#CONFIG_OWE=y
+
+# Airtime policy support
+#CONFIG_AIRTIME_POLICY=y
+
+# Override default value for the wpa_disable_eapol_key_retries configuration
+# parameter. See that parameter in hostapd.conf for more details.
+#CFLAGS += -DDEFAULT_WPA_DISABLE_EAPOL_KEY_RETRIES=1
+
+# custom configuration options
+CONFIG_MESH=y
+CONFIG_SAE=y
+CONFIG_WPS2=y
diff --git a/network/hostapd/hostapd.info b/network/hostapd/hostapd.info
index c7cf70d848..c4e87e1a2d 100644
--- a/network/hostapd/hostapd.info
+++ b/network/hostapd/hostapd.info
@@ -1,8 +1,8 @@
PRGNAM="hostapd"
-VERSION="2.6"
+VERSION="2.7"
HOMEPAGE="https://w1.fi/hostapd/"
-DOWNLOAD="https://w1.fi/releases/hostapd-2.6.tar.gz"
-MD5SUM="eaa56dce9bd8f1d195eb62596eab34c7"
+DOWNLOAD="https://w1.fi/releases/hostapd-2.7.tar.gz"
+MD5SUM="8d3799f3a3c247cff47d41503698721b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/hostapd/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/network/hostapd/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
new file mode 100644
index 0000000000..d764a9db01
--- /dev/null
+++ b/network/hostapd/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch
@@ -0,0 +1,73 @@
+From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j@w1.fi>
+Date: Thu, 29 Aug 2019 11:52:04 +0300
+Subject: [PATCH] AP: Silently ignore management frame from unexpected source
+ address
+
+Do not process any received Management frames with unexpected/invalid SA
+so that we do not add any state for unexpected STA addresses or end up
+sending out frames to unexpected destination. This prevents unexpected
+sequences where an unprotected frame might end up causing the AP to send
+out a response to another device and that other device processing the
+unexpected response.
+
+In particular, this prevents some potential denial of service cases
+where the unexpected response frame from the AP might result in a
+connected station dropping its association.
+
+Signed-off-by: Jouni Malinen <j@w1.fi>
+---
+ src/ap/drv_callbacks.c | 13 +++++++++++++
+ src/ap/ieee802_11.c | 12 ++++++++++++
+ 2 files changed, 25 insertions(+)
+
+diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
+index 31587685fe3b..34ca379edc3d 100644
+--- a/src/ap/drv_callbacks.c
++++ b/src/ap/drv_callbacks.c
+@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
+ "hostapd_notif_assoc: Skip event with no address");
+ return -1;
+ }
++
++ if (is_multicast_ether_addr(addr) ||
++ is_zero_ether_addr(addr) ||
++ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) {
++ /* Do not process any frames with unexpected/invalid SA so that
++ * we do not add any state for unexpected STA addresses or end
++ * up sending out frames to unexpected destination. */
++ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR
++ " in received indication - ignore this indication silently",
++ __func__, MAC2STR(addr));
++ return 0;
++ }
++
+ random_add_randomness(addr, ETH_ALEN);
+
+ hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index c85a28db44b7..e7065372e158 100644
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
+ fc = le_to_host16(mgmt->frame_control);
+ stype = WLAN_FC_GET_STYPE(fc);
+
++ if (is_multicast_ether_addr(mgmt->sa) ||
++ is_zero_ether_addr(mgmt->sa) ||
++ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) {
++ /* Do not process any frames with unexpected/invalid SA so that
++ * we do not add any state for unexpected STA addresses or end
++ * up sending out frames to unexpected destination. */
++ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR
++ " in received frame - ignore this frame silently",
++ MAC2STR(mgmt->sa));
++ return 0;
++ }
++
+ if (stype == WLAN_FC_STYPE_BEACON) {
+ handle_beacon(hapd, mgmt, len, fi);
+ return 1;
+--
+2.20.1
+
diff --git a/network/hostapd/patches/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch b/network/hostapd/patches/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
deleted file mode 100644
index a62b52c6b9..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3e34cfdff6b192fe337c6fb3f487f73e96582961 Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Sun, 15 Jul 2018 01:25:53 +0200
-Subject: [PATCH] WPA: Ignore unauthenticated encrypted EAPOL-Key data
-
-Ignore unauthenticated encrypted EAPOL-Key data in supplicant
-processing. When using WPA2, these are frames that have the Encrypted
-flag set, but not the MIC flag.
-
-When using WPA2, EAPOL-Key frames that had the Encrypted flag set but
-not the MIC flag, had their data field decrypted without first verifying
-the MIC. In case the data field was encrypted using RC4 (i.e., when
-negotiating TKIP as the pairwise cipher), this meant that
-unauthenticated but decrypted data would then be processed. An adversary
-could abuse this as a decryption oracle to recover sensitive information
-in the data field of EAPOL-Key messages (e.g., the group key).
-(CVE-2018-14526)
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/rsn_supp/wpa.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff -upr wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c wpa_supplicant-2.6/src/rsn_supp/wpa.c
---- wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c 2016-10-02 21:51:11.000000000 +0300
-+++ wpa_supplicant-2.6/src/rsn_supp/wpa.c 2018-08-08 16:55:11.506831029 +0300
-@@ -2016,6 +2016,17 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, c
-
- if ((sm->proto == WPA_PROTO_RSN || sm->proto == WPA_PROTO_OSEN) &&
- (key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) {
-+ /*
-+ * Only decrypt the Key Data field if the frame's authenticity
-+ * was verified. When using AES-SIV (FILS), the MIC flag is not
-+ * set, so this check should only be performed if mic_len != 0
-+ * which is the case in this code branch.
-+ */
-+ if (!(key_info & WPA_KEY_INFO_MIC)) {
-+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-+ "WPA: Ignore EAPOL-Key with encrypted but unauthenticated data");
-+ goto out;
-+ }
- if (wpa_supplicant_decrypt_key_data(sm, key, ver, key_data,
- &key_data_len))
- goto out;
diff --git a/network/hostapd/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/network/hostapd/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
deleted file mode 100644
index 727684865d..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From cf4cab804c7afd5c45505528a8d16e46163243a2 Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Fri, 14 Jul 2017 15:15:35 +0200
-Subject: [PATCH 1/8] hostapd: Avoid key reinstallation in FT handshake
-
-Do not reinstall TK to the driver during Reassociation Response frame
-processing if the first attempt of setting the TK succeeded. This avoids
-issues related to clearing the TX/RX PN that could result in reusing
-same PN values for transmitted frames (e.g., due to CCM nonce reuse and
-also hitting replay protection on the receiver) and accepting replayed
-frames on RX side.
-
-This issue was introduced by the commit
-0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in
-authenticator') which allowed wpa_ft_install_ptk() to be called multiple
-times with the same PTK. While the second configuration attempt is
-needed with some drivers, it must be done only if the first attempt
-failed.
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/ap/ieee802_11.c | 16 +++++++++++++---
- src/ap/wpa_auth.c | 11 +++++++++++
- src/ap/wpa_auth.h | 3 ++-
- src/ap/wpa_auth_ft.c | 10 ++++++++++
- src/ap/wpa_auth_i.h | 1 +
- 5 files changed, 37 insertions(+), 4 deletions(-)
-
-diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
-index 4e04169..333035f 100644
---- a/src/ap/ieee802_11.c
-+++ b/src/ap/ieee802_11.c
-@@ -1841,6 +1841,7 @@ static int add_associated_sta(struct hostapd_data *hapd,
- {
- struct ieee80211_ht_capabilities ht_cap;
- struct ieee80211_vht_capabilities vht_cap;
-+ int set = 1;
-
- /*
- * Remove the STA entry to ensure the STA PS state gets cleared and
-@@ -1848,9 +1849,18 @@ static int add_associated_sta(struct hostapd_data *hapd,
- * FT-over-the-DS, where a station re-associates back to the same AP but
- * skips the authentication flow, or if working with a driver that
- * does not support full AP client state.
-+ *
-+ * Skip this if the STA has already completed FT reassociation and the
-+ * TK has been configured since the TX/RX PN must not be reset to 0 for
-+ * the same key.
- */
-- if (!sta->added_unassoc)
-+ if (!sta->added_unassoc &&
-+ (!(sta->flags & WLAN_STA_AUTHORIZED) ||
-+ !wpa_auth_sta_ft_tk_already_set(sta->wpa_sm))) {
- hostapd_drv_sta_remove(hapd, sta->addr);
-+ wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED);
-+ set = 0;
-+ }
-
- #ifdef CONFIG_IEEE80211N
- if (sta->flags & WLAN_STA_HT)
-@@ -1873,11 +1883,11 @@ static int add_associated_sta(struct hostapd_data *hapd,
- sta->flags & WLAN_STA_VHT ? &vht_cap : NULL,
- sta->flags | WLAN_STA_ASSOC, sta->qosinfo,
- sta->vht_opmode, sta->p2p_ie ? 1 : 0,
-- sta->added_unassoc)) {
-+ set)) {
- hostapd_logger(hapd, sta->addr,
- HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_NOTICE,
- "Could not %s STA to kernel driver",
-- sta->added_unassoc ? "set" : "add");
-+ set ? "set" : "add");
-
- if (sta->added_unassoc) {
- hostapd_drv_sta_remove(hapd, sta->addr);
-diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
-index 3587086..707971d 100644
---- a/src/ap/wpa_auth.c
-+++ b/src/ap/wpa_auth.c
-@@ -1745,6 +1745,9 @@ int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event)
- #else /* CONFIG_IEEE80211R */
- break;
- #endif /* CONFIG_IEEE80211R */
-+ case WPA_DRV_STA_REMOVED:
-+ sm->tk_already_set = FALSE;
-+ return 0;
- }
-
- #ifdef CONFIG_IEEE80211R
-@@ -3250,6 +3253,14 @@ int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm)
- }
-
-
-+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm)
-+{
-+ if (!sm || !wpa_key_mgmt_ft(sm->wpa_key_mgmt))
-+ return 0;
-+ return sm->tk_already_set;
-+}
-+
-+
- int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm,
- struct rsn_pmksa_cache_entry *entry)
- {
-diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h
-index 0de8d97..97461b0 100644
---- a/src/ap/wpa_auth.h
-+++ b/src/ap/wpa_auth.h
-@@ -267,7 +267,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth,
- u8 *data, size_t data_len);
- enum wpa_event {
- WPA_AUTH, WPA_ASSOC, WPA_DISASSOC, WPA_DEAUTH, WPA_REAUTH,
-- WPA_REAUTH_EAPOL, WPA_ASSOC_FT
-+ WPA_REAUTH_EAPOL, WPA_ASSOC_FT, WPA_DRV_STA_REMOVED
- };
- void wpa_remove_ptk(struct wpa_state_machine *sm);
- int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event);
-@@ -280,6 +280,7 @@ int wpa_auth_pairwise_set(struct wpa_state_machine *sm);
- int wpa_auth_get_pairwise(struct wpa_state_machine *sm);
- int wpa_auth_sta_key_mgmt(struct wpa_state_machine *sm);
- int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm);
-+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm);
- int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm,
- struct rsn_pmksa_cache_entry *entry);
- struct rsn_pmksa_cache_entry *
-diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c
-index 42242a5..e63b99a 100644
---- a/src/ap/wpa_auth_ft.c
-+++ b/src/ap/wpa_auth_ft.c
-@@ -780,6 +780,14 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm)
- return;
- }
-
-+ if (sm->tk_already_set) {
-+ /* Must avoid TK reconfiguration to prevent clearing of TX/RX
-+ * PN in the driver */
-+ wpa_printf(MSG_DEBUG,
-+ "FT: Do not re-install same PTK to the driver");
-+ return;
-+ }
-+
- /* FIX: add STA entry to kernel/driver here? The set_key will fail
- * most likely without this.. At the moment, STA entry is added only
- * after association has been completed. This function will be called
-@@ -792,6 +800,7 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm)
-
- /* FIX: MLME-SetProtection.Request(TA, Tx_Rx) */
- sm->pairwise_set = TRUE;
-+ sm->tk_already_set = TRUE;
- }
-
-
-@@ -898,6 +907,7 @@ static int wpa_ft_process_auth_req(struct wpa_state_machine *sm,
-
- sm->pairwise = pairwise;
- sm->PTK_valid = TRUE;
-+ sm->tk_already_set = FALSE;
- wpa_ft_install_ptk(sm);
-
- buflen = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) +
-diff --git a/src/ap/wpa_auth_i.h b/src/ap/wpa_auth_i.h
-index 72b7eb3..7fd8f05 100644
---- a/src/ap/wpa_auth_i.h
-+++ b/src/ap/wpa_auth_i.h
-@@ -65,6 +65,7 @@ struct wpa_state_machine {
- struct wpa_ptk PTK;
- Boolean PTK_valid;
- Boolean pairwise_set;
-+ Boolean tk_already_set;
- int keycount;
- Boolean Pair;
- struct wpa_key_replay_counter {
---
-2.7.4
-
diff --git a/network/hostapd/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/network/hostapd/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
deleted file mode 100644
index 1802d664ad..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-From 927f891007c402fefd1ff384645b3f07597c3ede Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Wed, 12 Jul 2017 16:03:24 +0200
-Subject: [PATCH 2/8] Prevent reinstallation of an already in-use group key
-
-Track the current GTK and IGTK that is in use and when receiving a
-(possibly retransmitted) Group Message 1 or WNM-Sleep Mode Response, do
-not install the given key if it is already in use. This prevents an
-attacker from trying to trick the client into resetting or lowering the
-sequence counter associated to the group key.
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/common/wpa_common.h | 11 +++++
- src/rsn_supp/wpa.c | 116 ++++++++++++++++++++++++++++++------------------
- src/rsn_supp/wpa_i.h | 4 ++
- 3 files changed, 87 insertions(+), 44 deletions(-)
-
-diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
-index af1d0f0..d200285 100644
---- a/src/common/wpa_common.h
-+++ b/src/common/wpa_common.h
-@@ -217,6 +217,17 @@ struct wpa_ptk {
- size_t tk_len;
- };
-
-+struct wpa_gtk {
-+ u8 gtk[WPA_GTK_MAX_LEN];
-+ size_t gtk_len;
-+};
-+
-+#ifdef CONFIG_IEEE80211W
-+struct wpa_igtk {
-+ u8 igtk[WPA_IGTK_MAX_LEN];
-+ size_t igtk_len;
-+};
-+#endif /* CONFIG_IEEE80211W */
-
- /* WPA IE version 1
- * 00-50-f2:1 (OUI:OUI type)
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 3c47879..95bd7be 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -714,6 +714,15 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- const u8 *_gtk = gd->gtk;
- u8 gtk_buf[32];
-
-+ /* Detect possible key reinstallation */
-+ if (sm->gtk.gtk_len == (size_t) gd->gtk_len &&
-+ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) {
-+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-+ "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)",
-+ gd->keyidx, gd->tx, gd->gtk_len);
-+ return 0;
-+ }
-+
- wpa_hexdump_key(MSG_DEBUG, "WPA: Group Key", gd->gtk, gd->gtk_len);
- wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- "WPA: Installing GTK to the driver (keyidx=%d tx=%d len=%d)",
-@@ -748,6 +757,9 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- }
- os_memset(gtk_buf, 0, sizeof(gtk_buf));
-
-+ sm->gtk.gtk_len = gd->gtk_len;
-+ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len);
-+
- return 0;
- }
-
-@@ -854,6 +866,48 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm,
- }
-
-
-+#ifdef CONFIG_IEEE80211W
-+static int wpa_supplicant_install_igtk(struct wpa_sm *sm,
-+ const struct wpa_igtk_kde *igtk)
-+{
-+ size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher);
-+ u16 keyidx = WPA_GET_LE16(igtk->keyid);
-+
-+ /* Detect possible key reinstallation */
-+ if (sm->igtk.igtk_len == len &&
-+ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) {
-+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-+ "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)",
-+ keyidx);
-+ return 0;
-+ }
-+
-+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-+ "WPA: IGTK keyid %d pn %02x%02x%02x%02x%02x%02x",
-+ keyidx, MAC2STR(igtk->pn));
-+ wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", igtk->igtk, len);
-+ if (keyidx > 4095) {
-+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-+ "WPA: Invalid IGTK KeyID %d", keyidx);
-+ return -1;
-+ }
-+ if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
-+ broadcast_ether_addr,
-+ keyidx, 0, igtk->pn, sizeof(igtk->pn),
-+ igtk->igtk, len) < 0) {
-+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-+ "WPA: Failed to configure IGTK to the driver");
-+ return -1;
-+ }
-+
-+ sm->igtk.igtk_len = len;
-+ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len);
-+
-+ return 0;
-+}
-+#endif /* CONFIG_IEEE80211W */
-+
-+
- static int ieee80211w_set_keys(struct wpa_sm *sm,
- struct wpa_eapol_ie_parse *ie)
- {
-@@ -864,30 +918,14 @@ static int ieee80211w_set_keys(struct wpa_sm *sm,
- if (ie->igtk) {
- size_t len;
- const struct wpa_igtk_kde *igtk;
-- u16 keyidx;
-+
- len = wpa_cipher_key_len(sm->mgmt_group_cipher);
- if (ie->igtk_len != WPA_IGTK_KDE_PREFIX_LEN + len)
- return -1;
-+
- igtk = (const struct wpa_igtk_kde *) ie->igtk;
-- keyidx = WPA_GET_LE16(igtk->keyid);
-- wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: IGTK keyid %d "
-- "pn %02x%02x%02x%02x%02x%02x",
-- keyidx, MAC2STR(igtk->pn));
-- wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK",
-- igtk->igtk, len);
-- if (keyidx > 4095) {
-- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-- "WPA: Invalid IGTK KeyID %d", keyidx);
-- return -1;
-- }
-- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
-- broadcast_ether_addr,
-- keyidx, 0, igtk->pn, sizeof(igtk->pn),
-- igtk->igtk, len) < 0) {
-- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-- "WPA: Failed to configure IGTK to the driver");
-+ if (wpa_supplicant_install_igtk(sm, igtk) < 0)
- return -1;
-- }
- }
-
- return 0;
-@@ -2307,7 +2345,7 @@ void wpa_sm_deinit(struct wpa_sm *sm)
- */
- void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- {
-- int clear_ptk = 1;
-+ int clear_keys = 1;
-
- if (sm == NULL)
- return;
-@@ -2333,11 +2371,11 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- /* Prepare for the next transition */
- wpa_ft_prepare_auth_request(sm, NULL);
-
-- clear_ptk = 0;
-+ clear_keys = 0;
- }
- #endif /* CONFIG_IEEE80211R */
-
-- if (clear_ptk) {
-+ if (clear_keys) {
- /*
- * IEEE 802.11, 8.4.10: Delete PTK SA on (re)association if
- * this is not part of a Fast BSS Transition.
-@@ -2347,6 +2385,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- os_memset(&sm->ptk, 0, sizeof(sm->ptk));
- sm->tptk_set = 0;
- os_memset(&sm->tptk, 0, sizeof(sm->tptk));
-+ os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+#ifdef CONFIG_IEEE80211W
-+ os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+#endif /* CONFIG_IEEE80211W */
- }
-
- #ifdef CONFIG_TDLS
-@@ -2877,6 +2919,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm)
- os_memset(sm->pmk, 0, sizeof(sm->pmk));
- os_memset(&sm->ptk, 0, sizeof(sm->ptk));
- os_memset(&sm->tptk, 0, sizeof(sm->tptk));
-+ os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+#ifdef CONFIG_IEEE80211W
-+ os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+#endif /* CONFIG_IEEE80211W */
- #ifdef CONFIG_IEEE80211R
- os_memset(sm->xxkey, 0, sizeof(sm->xxkey));
- os_memset(sm->pmk_r0, 0, sizeof(sm->pmk_r0));
-@@ -2949,29 +2995,11 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf)
- os_memset(&gd, 0, sizeof(gd));
- #ifdef CONFIG_IEEE80211W
- } else if (subelem_id == WNM_SLEEP_SUBELEM_IGTK) {
-- struct wpa_igtk_kde igd;
-- u16 keyidx;
--
-- os_memset(&igd, 0, sizeof(igd));
-- keylen = wpa_cipher_key_len(sm->mgmt_group_cipher);
-- os_memcpy(igd.keyid, buf + 2, 2);
-- os_memcpy(igd.pn, buf + 4, 6);
--
-- keyidx = WPA_GET_LE16(igd.keyid);
-- os_memcpy(igd.igtk, buf + 10, keylen);
--
-- wpa_hexdump_key(MSG_DEBUG, "Install IGTK (WNM SLEEP)",
-- igd.igtk, keylen);
-- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
-- broadcast_ether_addr,
-- keyidx, 0, igd.pn, sizeof(igd.pn),
-- igd.igtk, keylen) < 0) {
-- wpa_printf(MSG_DEBUG, "Failed to install the IGTK in "
-- "WNM mode");
-- os_memset(&igd, 0, sizeof(igd));
-+ const struct wpa_igtk_kde *igtk;
-+
-+ igtk = (const struct wpa_igtk_kde *) (buf + 2);
-+ if (wpa_supplicant_install_igtk(sm, igtk) < 0)
- return -1;
-- }
-- os_memset(&igd, 0, sizeof(igd));
- #endif /* CONFIG_IEEE80211W */
- } else {
- wpa_printf(MSG_DEBUG, "Unknown element id");
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index f653ba6..afc9e37 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -31,6 +31,10 @@ struct wpa_sm {
- u8 rx_replay_counter[WPA_REPLAY_COUNTER_LEN];
- int rx_replay_counter_set;
- u8 request_counter[WPA_REPLAY_COUNTER_LEN];
-+ struct wpa_gtk gtk;
-+#ifdef CONFIG_IEEE80211W
-+ struct wpa_igtk igtk;
-+#endif /* CONFIG_IEEE80211W */
-
- struct eapol_sm *eapol; /* EAPOL state machine from upper level code */
-
---
-2.7.4
-
diff --git a/network/hostapd/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/network/hostapd/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
deleted file mode 100644
index e2937b851a..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 8280294e74846ea342389a0cd17215050fa5afe8 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 1 Oct 2017 12:12:24 +0300
-Subject: [PATCH 3/8] Extend protection of GTK/IGTK reinstallation of WNM-Sleep
- Mode cases
-
-This extends the protection to track last configured GTK/IGTK value
-separately from EAPOL-Key frames and WNM-Sleep Mode frames to cover a
-corner case where these two different mechanisms may get used when the
-GTK/IGTK has changed and tracking a single value is not sufficient to
-detect a possible key reconfiguration.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/rsn_supp/wpa.c | 53 +++++++++++++++++++++++++++++++++++++---------------
- src/rsn_supp/wpa_i.h | 2 ++
- 2 files changed, 40 insertions(+), 15 deletions(-)
-
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 95bd7be..7a2c68d 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -709,14 +709,17 @@ struct wpa_gtk_data {
-
- static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- const struct wpa_gtk_data *gd,
-- const u8 *key_rsc)
-+ const u8 *key_rsc, int wnm_sleep)
- {
- const u8 *_gtk = gd->gtk;
- u8 gtk_buf[32];
-
- /* Detect possible key reinstallation */
-- if (sm->gtk.gtk_len == (size_t) gd->gtk_len &&
-- os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) {
-+ if ((sm->gtk.gtk_len == (size_t) gd->gtk_len &&
-+ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) ||
-+ (sm->gtk_wnm_sleep.gtk_len == (size_t) gd->gtk_len &&
-+ os_memcmp(sm->gtk_wnm_sleep.gtk, gd->gtk,
-+ sm->gtk_wnm_sleep.gtk_len) == 0)) {
- wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)",
- gd->keyidx, gd->tx, gd->gtk_len);
-@@ -757,8 +760,14 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- }
- os_memset(gtk_buf, 0, sizeof(gtk_buf));
-
-- sm->gtk.gtk_len = gd->gtk_len;
-- os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len);
-+ if (wnm_sleep) {
-+ sm->gtk_wnm_sleep.gtk_len = gd->gtk_len;
-+ os_memcpy(sm->gtk_wnm_sleep.gtk, gd->gtk,
-+ sm->gtk_wnm_sleep.gtk_len);
-+ } else {
-+ sm->gtk.gtk_len = gd->gtk_len;
-+ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len);
-+ }
-
- return 0;
- }
-@@ -852,7 +861,7 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm,
- (wpa_supplicant_check_group_cipher(sm, sm->group_cipher,
- gtk_len, gtk_len,
- &gd.key_rsc_len, &gd.alg) ||
-- wpa_supplicant_install_gtk(sm, &gd, key_rsc))) {
-+ wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0))) {
- wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- "RSN: Failed to install GTK");
- os_memset(&gd, 0, sizeof(gd));
-@@ -868,14 +877,18 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm,
-
- #ifdef CONFIG_IEEE80211W
- static int wpa_supplicant_install_igtk(struct wpa_sm *sm,
-- const struct wpa_igtk_kde *igtk)
-+ const struct wpa_igtk_kde *igtk,
-+ int wnm_sleep)
- {
- size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher);
- u16 keyidx = WPA_GET_LE16(igtk->keyid);
-
- /* Detect possible key reinstallation */
-- if (sm->igtk.igtk_len == len &&
-- os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) {
-+ if ((sm->igtk.igtk_len == len &&
-+ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) ||
-+ (sm->igtk_wnm_sleep.igtk_len == len &&
-+ os_memcmp(sm->igtk_wnm_sleep.igtk, igtk->igtk,
-+ sm->igtk_wnm_sleep.igtk_len) == 0)) {
- wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)",
- keyidx);
-@@ -900,8 +913,14 @@ static int wpa_supplicant_install_igtk(struct wpa_sm *sm,
- return -1;
- }
-
-- sm->igtk.igtk_len = len;
-- os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len);
-+ if (wnm_sleep) {
-+ sm->igtk_wnm_sleep.igtk_len = len;
-+ os_memcpy(sm->igtk_wnm_sleep.igtk, igtk->igtk,
-+ sm->igtk_wnm_sleep.igtk_len);
-+ } else {
-+ sm->igtk.igtk_len = len;
-+ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len);
-+ }
-
- return 0;
- }
-@@ -924,7 +943,7 @@ static int ieee80211w_set_keys(struct wpa_sm *sm,
- return -1;
-
- igtk = (const struct wpa_igtk_kde *) ie->igtk;
-- if (wpa_supplicant_install_igtk(sm, igtk) < 0)
-+ if (wpa_supplicant_install_igtk(sm, igtk, 0) < 0)
- return -1;
- }
-
-@@ -1574,7 +1593,7 @@ static void wpa_supplicant_process_1_of_2(struct wpa_sm *sm,
- if (wpa_supplicant_rsc_relaxation(sm, key->key_rsc))
- key_rsc = null_rsc;
-
-- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc) ||
-+ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0) ||
- wpa_supplicant_send_2_of_2(sm, key, ver, key_info) < 0)
- goto failed;
- os_memset(&gd, 0, sizeof(gd));
-@@ -2386,8 +2405,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- sm->tptk_set = 0;
- os_memset(&sm->tptk, 0, sizeof(sm->tptk));
- os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep));
- #ifdef CONFIG_IEEE80211W
- os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep));
- #endif /* CONFIG_IEEE80211W */
- }
-
-@@ -2920,8 +2941,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm)
- os_memset(&sm->ptk, 0, sizeof(sm->ptk));
- os_memset(&sm->tptk, 0, sizeof(sm->tptk));
- os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep));
- #ifdef CONFIG_IEEE80211W
- os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep));
- #endif /* CONFIG_IEEE80211W */
- #ifdef CONFIG_IEEE80211R
- os_memset(sm->xxkey, 0, sizeof(sm->xxkey));
-@@ -2986,7 +3009,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf)
-
- wpa_hexdump_key(MSG_DEBUG, "Install GTK (WNM SLEEP)",
- gd.gtk, gd.gtk_len);
-- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc)) {
-+ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 1)) {
- os_memset(&gd, 0, sizeof(gd));
- wpa_printf(MSG_DEBUG, "Failed to install the GTK in "
- "WNM mode");
-@@ -2998,7 +3021,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf)
- const struct wpa_igtk_kde *igtk;
-
- igtk = (const struct wpa_igtk_kde *) (buf + 2);
-- if (wpa_supplicant_install_igtk(sm, igtk) < 0)
-+ if (wpa_supplicant_install_igtk(sm, igtk, 1) < 0)
- return -1;
- #endif /* CONFIG_IEEE80211W */
- } else {
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index afc9e37..9a54631 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -32,8 +32,10 @@ struct wpa_sm {
- int rx_replay_counter_set;
- u8 request_counter[WPA_REPLAY_COUNTER_LEN];
- struct wpa_gtk gtk;
-+ struct wpa_gtk gtk_wnm_sleep;
- #ifdef CONFIG_IEEE80211W
- struct wpa_igtk igtk;
-+ struct wpa_igtk igtk_wnm_sleep;
- #endif /* CONFIG_IEEE80211W */
-
- struct eapol_sm *eapol; /* EAPOL state machine from upper level code */
---
-2.7.4
-
diff --git a/network/hostapd/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch b/network/hostapd/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch
deleted file mode 100644
index 22ee217947..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 8f82bc94e8697a9d47fa8774dfdaaede1084912c Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Fri, 29 Sep 2017 04:22:51 +0200
-Subject: [PATCH 4/8] Prevent installation of an all-zero TK
-
-Properly track whether a PTK has already been installed to the driver
-and the TK part cleared from memory. This prevents an attacker from
-trying to trick the client into installing an all-zero TK.
-
-This fixes the earlier fix in commit
-ad00d64e7d8827b3cebd665a0ceb08adabf15e1e ('Fix TK configuration to the
-driver in EAPOL-Key 3/4 retry case') which did not take into account
-possibility of an extra message 1/4 showing up between retries of
-message 3/4.
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/common/wpa_common.h | 1 +
- src/rsn_supp/wpa.c | 5 ++---
- src/rsn_supp/wpa_i.h | 1 -
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
-index d200285..1021ccb 100644
---- a/src/common/wpa_common.h
-+++ b/src/common/wpa_common.h
-@@ -215,6 +215,7 @@ struct wpa_ptk {
- size_t kck_len;
- size_t kek_len;
- size_t tk_len;
-+ int installed; /* 1 if key has already been installed to driver */
- };
-
- struct wpa_gtk {
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 7a2c68d..0550a41 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -510,7 +510,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_sm *sm,
- os_memset(buf, 0, sizeof(buf));
- }
- sm->tptk_set = 1;
-- sm->tk_to_set = 1;
-
- kde = sm->assoc_wpa_ie;
- kde_len = sm->assoc_wpa_ie_len;
-@@ -615,7 +614,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
- enum wpa_alg alg;
- const u8 *key_rsc;
-
-- if (!sm->tk_to_set) {
-+ if (sm->ptk.installed) {
- wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- "WPA: Do not re-install same PTK to the driver");
- return 0;
-@@ -659,7 +658,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
-
- /* TK is not needed anymore in supplicant */
- os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN);
-- sm->tk_to_set = 0;
-+ sm->ptk.installed = 1;
-
- if (sm->wpa_ptk_rekey) {
- eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL);
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index 9a54631..41f371f 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -24,7 +24,6 @@ struct wpa_sm {
- struct wpa_ptk ptk, tptk;
- int ptk_set, tptk_set;
- unsigned int msg_3_of_4_ok:1;
-- unsigned int tk_to_set:1;
- u8 snonce[WPA_NONCE_LEN];
- u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */
- int renew_snonce;
---
-2.7.4
-
diff --git a/network/hostapd/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/network/hostapd/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
deleted file mode 100644
index c19c4c7102..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 12fac09b437a1dc8a0f253e265934a8aaf4d2f8b Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 1 Oct 2017 12:32:57 +0300
-Subject: [PATCH 5/8] Fix PTK rekeying to generate a new ANonce
-
-The Authenticator state machine path for PTK rekeying ended up bypassing
-the AUTHENTICATION2 state where a new ANonce is generated when going
-directly to the PTKSTART state since there is no need to try to
-determine the PMK again in such a case. This is far from ideal since the
-new PTK would depend on a new nonce only from the supplicant.
-
-Fix this by generating a new ANonce when moving to the PTKSTART state
-for the purpose of starting new 4-way handshake to rekey PTK.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/ap/wpa_auth.c | 24 +++++++++++++++++++++---
- 1 file changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
-index 707971d..bf10cc1 100644
---- a/src/ap/wpa_auth.c
-+++ b/src/ap/wpa_auth.c
-@@ -1901,6 +1901,21 @@ SM_STATE(WPA_PTK, AUTHENTICATION2)
- }
-
-
-+static int wpa_auth_sm_ptk_update(struct wpa_state_machine *sm)
-+{
-+ if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) {
-+ wpa_printf(MSG_ERROR,
-+ "WPA: Failed to get random data for ANonce");
-+ sm->Disconnect = TRUE;
-+ return -1;
-+ }
-+ wpa_hexdump(MSG_DEBUG, "WPA: Assign new ANonce", sm->ANonce,
-+ WPA_NONCE_LEN);
-+ sm->TimeoutCtr = 0;
-+ return 0;
-+}
-+
-+
- SM_STATE(WPA_PTK, INITPMK)
- {
- u8 msk[2 * PMK_LEN];
-@@ -2458,9 +2473,12 @@ SM_STEP(WPA_PTK)
- SM_ENTER(WPA_PTK, AUTHENTICATION);
- else if (sm->ReAuthenticationRequest)
- SM_ENTER(WPA_PTK, AUTHENTICATION2);
-- else if (sm->PTKRequest)
-- SM_ENTER(WPA_PTK, PTKSTART);
-- else switch (sm->wpa_ptk_state) {
-+ else if (sm->PTKRequest) {
-+ if (wpa_auth_sm_ptk_update(sm) < 0)
-+ SM_ENTER(WPA_PTK, DISCONNECTED);
-+ else
-+ SM_ENTER(WPA_PTK, PTKSTART);
-+ } else switch (sm->wpa_ptk_state) {
- case WPA_PTK_INITIALIZE:
- break;
- case WPA_PTK_DISCONNECT:
---
-2.7.4
-
diff --git a/network/hostapd/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch b/network/hostapd/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
deleted file mode 100644
index e1bd5a5726..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 6c4bed4f47d1960ec04981a9d50e5076aea5223d Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Fri, 22 Sep 2017 11:03:15 +0300
-Subject: [PATCH 6/8] TDLS: Reject TPK-TK reconfiguration
-
-Do not try to reconfigure the same TPK-TK to the driver after it has
-been successfully configured. This is an explicit check to avoid issues
-related to resetting the TX/RX packet number. There was already a check
-for this for TPK M2 (retries of that message are ignored completely), so
-that behavior does not get modified.
-
-For TPK M3, the TPK-TK could have been reconfigured, but that was
-followed by immediate teardown of the link due to an issue in updating
-the STA entry. Furthermore, for TDLS with any real security (i.e.,
-ignoring open/WEP), the TPK message exchange is protected on the AP path
-and simple replay attacks are not feasible.
-
-As an additional corner case, make sure the local nonce gets updated if
-the peer uses a very unlikely "random nonce" of all zeros.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/rsn_supp/tdls.c | 38 ++++++++++++++++++++++++++++++++++++--
- 1 file changed, 36 insertions(+), 2 deletions(-)
-
-diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c
-index e424168..9eb9738 100644
---- a/src/rsn_supp/tdls.c
-+++ b/src/rsn_supp/tdls.c
-@@ -112,6 +112,7 @@ struct wpa_tdls_peer {
- u8 tk[16]; /* TPK-TK; assuming only CCMP will be used */
- } tpk;
- int tpk_set;
-+ int tk_set; /* TPK-TK configured to the driver */
- int tpk_success;
- int tpk_in_progress;
-
-@@ -192,6 +193,20 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
- u8 rsc[6];
- enum wpa_alg alg;
-
-+ if (peer->tk_set) {
-+ /*
-+ * This same TPK-TK has already been configured to the driver
-+ * and this new configuration attempt (likely due to an
-+ * unexpected retransmitted frame) would result in clearing
-+ * the TX/RX sequence number which can break security, so must
-+ * not allow that to happen.
-+ */
-+ wpa_printf(MSG_INFO, "TDLS: TPK-TK for the peer " MACSTR
-+ " has already been configured to the driver - do not reconfigure",
-+ MAC2STR(peer->addr));
-+ return -1;
-+ }
-+
- os_memset(rsc, 0, 6);
-
- switch (peer->cipher) {
-@@ -209,12 +224,15 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
- return -1;
- }
-
-+ wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR,
-+ MAC2STR(peer->addr));
- if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1,
- rsc, sizeof(rsc), peer->tpk.tk, key_len) < 0) {
- wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the "
- "driver");
- return -1;
- }
-+ peer->tk_set = 1;
- return 0;
- }
-
-@@ -696,7 +714,7 @@ static void wpa_tdls_peer_clear(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
- peer->cipher = 0;
- peer->qos_info = 0;
- peer->wmm_capable = 0;
-- peer->tpk_set = peer->tpk_success = 0;
-+ peer->tk_set = peer->tpk_set = peer->tpk_success = 0;
- peer->chan_switch_enabled = 0;
- os_memset(&peer->tpk, 0, sizeof(peer->tpk));
- os_memset(peer->inonce, 0, WPA_NONCE_LEN);
-@@ -1159,6 +1177,7 @@ skip_rsnie:
- wpa_tdls_peer_free(sm, peer);
- return -1;
- }
-+ peer->tk_set = 0; /* A new nonce results in a new TK */
- wpa_hexdump(MSG_DEBUG, "TDLS: Initiator Nonce for TPK handshake",
- peer->inonce, WPA_NONCE_LEN);
- os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN);
-@@ -1751,6 +1770,19 @@ static int wpa_tdls_addset_peer(struct wpa_sm *sm, struct wpa_tdls_peer *peer,
- }
-
-
-+static int tdls_nonce_set(const u8 *nonce)
-+{
-+ int i;
-+
-+ for (i = 0; i < WPA_NONCE_LEN; i++) {
-+ if (nonce[i])
-+ return 1;
-+ }
-+
-+ return 0;
-+}
-+
-+
- static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr,
- const u8 *buf, size_t len)
- {
-@@ -2004,7 +2036,8 @@ skip_rsn:
- peer->rsnie_i_len = kde.rsn_ie_len;
- peer->cipher = cipher;
-
-- if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0) {
-+ if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0 ||
-+ !tdls_nonce_set(peer->inonce)) {
- /*
- * There is no point in updating the RNonce for every obtained
- * TPK M1 frame (e.g., retransmission due to timeout) with the
-@@ -2020,6 +2053,7 @@ skip_rsn:
- "TDLS: Failed to get random data for responder nonce");
- goto error;
- }
-+ peer->tk_set = 0; /* A new nonce results in a new TK */
- }
-
- #if 0
---
-2.7.4
-
diff --git a/network/hostapd/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/network/hostapd/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
deleted file mode 100644
index b9678f6815..0000000000
--- a/network/hostapd/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From b372ab0b7daea719749194dc554b26e6367603f2 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Fri, 22 Sep 2017 12:06:37 +0300
-Subject: [PATCH 8/8] FT: Do not allow multiple Reassociation Response frames
-
-The driver is expected to not report a second association event without
-the station having explicitly request a new association. As such, this
-case should not be reachable. However, since reconfiguring the same
-pairwise or group keys to the driver could result in nonce reuse issues,
-be extra careful here and do an additional state check to avoid this
-even if the local driver ends up somehow accepting an unexpected
-Reassociation Response frame.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/rsn_supp/wpa.c | 3 +++
- src/rsn_supp/wpa_ft.c | 8 ++++++++
- src/rsn_supp/wpa_i.h | 1 +
- 3 files changed, 12 insertions(+)
-
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 0550a41..2a53c6f 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -2440,6 +2440,9 @@ void wpa_sm_notify_disassoc(struct wpa_sm *sm)
- #ifdef CONFIG_TDLS
- wpa_tdls_disassoc(sm);
- #endif /* CONFIG_TDLS */
-+#ifdef CONFIG_IEEE80211R
-+ sm->ft_reassoc_completed = 0;
-+#endif /* CONFIG_IEEE80211R */
-
- /* Keys are not needed in the WPA state machine anymore */
- wpa_sm_drop_sa(sm);
-diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c
-index 205793e..d45bb45 100644
---- a/src/rsn_supp/wpa_ft.c
-+++ b/src/rsn_supp/wpa_ft.c
-@@ -153,6 +153,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len,
- u16 capab;
-
- sm->ft_completed = 0;
-+ sm->ft_reassoc_completed = 0;
-
- buf_len = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) +
- 2 + sm->r0kh_id_len + ric_ies_len + 100;
-@@ -681,6 +682,11 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies,
- return -1;
- }
-
-+ if (sm->ft_reassoc_completed) {
-+ wpa_printf(MSG_DEBUG, "FT: Reassociation has already been completed for this FT protocol instance - ignore unexpected retransmission");
-+ return 0;
-+ }
-+
- if (wpa_ft_parse_ies(ies, ies_len, &parse) < 0) {
- wpa_printf(MSG_DEBUG, "FT: Failed to parse IEs");
- return -1;
-@@ -781,6 +787,8 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies,
- return -1;
- }
-
-+ sm->ft_reassoc_completed = 1;
-+
- if (wpa_ft_process_gtk_subelem(sm, parse.gtk, parse.gtk_len) < 0)
- return -1;
-
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index 41f371f..56f88dc 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -128,6 +128,7 @@ struct wpa_sm {
- size_t r0kh_id_len;
- u8 r1kh_id[FT_R1KH_ID_LEN];
- int ft_completed;
-+ int ft_reassoc_completed;
- int over_the_ds_in_progress;
- u8 target_ap[ETH_ALEN]; /* over-the-DS target AP */
- int set_ptk_after_assoc;
---
-2.7.4
-
diff --git a/network/httpie/httpie.SlackBuild b/network/httpie/httpie.SlackBuild
index e3c4a04e65..78e0b1011a 100644
--- a/network/httpie/httpie.SlackBuild
+++ b/network/httpie/httpie.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=httpie
VERSION=${VERSION:-1.0.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -71,6 +71,11 @@ find -L . \
python setup.py install --root=$PKG
+# Python 3 support.
+if $(python3 -c 'import sys' 2>/dev/null); then
+ python3 setup.py install --root=$PKG
+fi
+
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/hylafax+/README b/network/hylafax+/README
index 347202297b..3203b17bce 100644
--- a/network/hylafax+/README
+++ b/network/hylafax+/README
@@ -6,4 +6,4 @@ an outbound job from any other machine on the network.
HylaFAX+ is a more feature rich fork of the HylaFAX project.
-See /usr/doc/hylafax-7.0.0/README.SLACKWARE for configuration hints.
+See /usr/doc/hylafax-7.0.2/README.SLACKWARE for configuration hints.
diff --git a/network/hylafax+/hylafax+.SlackBuild b/network/hylafax+/hylafax+.SlackBuild
index e35b925fbe..20fae73e6e 100644
--- a/network/hylafax+/hylafax+.SlackBuild
+++ b/network/hylafax+/hylafax+.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for hylafax+
-# Copyright 2013-2019 Chris Walker Kempner, TX
+# Copyright 2013-2020 Chris Walker Kempner, TX
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
PRGNAM=hylafax+
SRCNAM=hylafax
-VERSION=${VERSION:-7.0.0}
+VERSION=${VERSION:-7.0.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/hylafax+/hylafax+.info b/network/hylafax+/hylafax+.info
index 5647f3f419..fc8fd06607 100644
--- a/network/hylafax+/hylafax+.info
+++ b/network/hylafax+/hylafax+.info
@@ -1,8 +1,8 @@
PRGNAM="hylafax+"
-VERSION="7.0.0"
+VERSION="7.0.2"
HOMEPAGE="http://hylafax.sourceforge.net"
-DOWNLOAD="https://iweb.dl.sourceforge.net/project/hylafax/hylafax/hylafax-7.0.0.tar.gz"
-MD5SUM="5e779c2099a80d886c38ad536d131706"
+DOWNLOAD="http://prdownloads.sourceforge.net/hylafax/hylafax-7.0.2.tar.gz"
+MD5SUM="b58793ab019aa1fe131557c14c35864e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/igmpproxy/slack-desc b/network/igmpproxy/slack-desc
index 0e588ca912..8d4e741d41 100644
--- a/network/igmpproxy/slack-desc
+++ b/network/igmpproxy/slack-desc
@@ -5,7 +5,7 @@
# 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------------------------------------------------------|
+ |-----handy-ruler------------------------------------------------------|
igmpproxy: igmpproxy (IGMP multicast routing daemon)
igmpproxy:
igmpproxy: A simple multicast router that only uses the IGMP protocol.
diff --git a/network/imapfilter/imapfilter.SlackBuild b/network/imapfilter/imapfilter.SlackBuild
index 5dc87eeafa..1355549594 100644
--- a/network/imapfilter/imapfilter.SlackBuild
+++ b/network/imapfilter/imapfilter.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for imapfilter
# Copyright 2010 Ε ime Ramov
-# Copyright 2016-2018 Andrew Clemons, Wellington, New Zealand
+# Copyright 2016-2019 Andrew Clemons, Wellington, New Zealand
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=imapfilter
-VERSION=${VERSION:-2.6.12}
+VERSION=${VERSION:-2.6.16}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/imapfilter/imapfilter.info b/network/imapfilter/imapfilter.info
index 8ebe620851..97f96523b0 100644
--- a/network/imapfilter/imapfilter.info
+++ b/network/imapfilter/imapfilter.info
@@ -1,8 +1,8 @@
PRGNAM="imapfilter"
-VERSION="2.6.12"
+VERSION="2.6.16"
HOMEPAGE="https://github.com/lefcha/imapfilter"
-DOWNLOAD="https://github.com/lefcha/imapfilter/archive/v2.6.12/imapfilter-2.6.12.tar.gz"
-MD5SUM="5a39752f0c2347415a8d5804ea3ce80e"
+DOWNLOAD="https://github.com/lefcha/imapfilter/archive/v2.6.16/imapfilter-2.6.16.tar.gz"
+MD5SUM="3cb100fd8171c893079f9a969fea6db8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lua"
diff --git a/network/inadyn/doinst.sh b/network/inadyn/doinst.sh
index 93170dac0d..9f785b0fb1 100644
--- a/network/inadyn/doinst.sh
+++ b/network/inadyn/doinst.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
config() {
NEW="$1"
OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -24,4 +22,3 @@ preserve_perms() {
}
preserve_perms etc/rc.d/rc.inadyn.new
-
diff --git a/network/inadyn/inadyn.SlackBuild b/network/inadyn/inadyn.SlackBuild
index 4f8f57afb5..e8ad58ec08 100644
--- a/network/inadyn/inadyn.SlackBuild
+++ b/network/inadyn/inadyn.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=inadyn
-VERSION=${VERSION:-2.3.1}
+VERSION=${VERSION:-2.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -54,13 +54,13 @@ else
LIBDIRSUFFIX=""
fi
-set -e # Exit on most errors
+set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvJf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -69,6 +69,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 {} \;
+./autogen.sh
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -89,9 +90,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
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/etc/rc.d
+cat $CWD/rc.inadyn > $PKG/etc/rc.d/rc.inadyn.new
+
+mkdir -p $PKG/var/cache/$PRGNAM
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS CONTRIBUTING.md \
+ AUTHORS CONTRIBUTING.md debian/ \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -99,8 +105,5 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.inadyn > $PKG/etc/rc.d/rc.inadyn.new
-
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/inadyn/inadyn.info b/network/inadyn/inadyn.info
index 91ad52fd8e..df3d372e1d 100644
--- a/network/inadyn/inadyn.info
+++ b/network/inadyn/inadyn.info
@@ -1,10 +1,10 @@
PRGNAM="inadyn"
-VERSION="2.3.1"
+VERSION="2.5"
HOMEPAGE="http://troglobit.com/projects/inadyn"
-DOWNLOAD="ftp://ftp.troglobit.com/inadyn/inadyn-2.3.1.tar.xz"
-MD5SUM="6a36f62bba5c9774bff25bf2be871bbb"
+DOWNLOAD="https://github.com/troglobit/inadyn/archive/v2.5/inadyn-2.5.tar.gz"
+MD5SUM="e06354b6a617c1eeca1e97c01f224bbb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-MAINTAINER="Kenneth Chan"
-EMAIL="kenneth.t.chan@gmail.com"
REQUIRES="confuse"
+MAINTAINER="kchan"
+EMAIL="kenneth.t.chan@gmail.com"
diff --git a/network/inadyn/rc.inadyn b/network/inadyn/rc.inadyn
index 381ac1b904..96d5768136 100644
--- a/network/inadyn/rc.inadyn
+++ b/network/inadyn/rc.inadyn
@@ -12,22 +12,23 @@ if [ ! -f /etc/inadyn.conf ]; then
fi
PIDFILE=/var/run/inadyn.pid
+SCRIPTNAME=$0
case "$1" in
start)
echo -n "Starting inadyn: /usr/sbin/inadyn"
- /usr/sbin/inadyn
+ /usr/sbin/inadyn --pidfile $PIDFILE
echo
;;
stop)
echo -n "Stopping inadyn... "
kill $( ps ax | grep inadyn | grep Ss | awk '{print $1}' )
- #kill -9 $( cat $PIDFILE 2> /dev/null )
+ rm -f $PIDFILE
echo
;;
restart)
- $0 stop
- $0 start
+ $SCRIPTNAME stop
+ $SCRIPTNAME start
;;
status)
pids=$( ps ax | grep inadyn | grep Ss | awk '{print $1}' )
diff --git a/network/inadyn/slack-desc b/network/inadyn/slack-desc
index b504c62aa2..10d8a64f3b 100644
--- a/network/inadyn/slack-desc
+++ b/network/inadyn/slack-desc
@@ -8,11 +8,11 @@
|-----handy-ruler------------------------------------------------------|
inadyn: inadyn (A Small and Simple DDNS Client)
inadyn:
-inadyn: In-a-dyn is a small and simple Dynamic DNS, DDNS, client with HTTPS
-inadyn: support. It is commonly available in many GNU/Linux distributions,
-inadyn: used in off-the-shelf routers and Internet gateways to automate the
-inadyn: task of keeping your DNS record up to date with any IP address
-inadyn: changes from your ISP. It can also be used in installations with
+inadyn: In-a-dyn is a small and simple Dynamic DNS, DDNS, client with HTTPS
+inadyn: support. It is commonly available in many GNU/Linux distributions,
+inadyn: used in off-the-shelf routers and Internet gateways to automate the
+inadyn: task of keeping your DNS record up to date with any IP address
+inadyn: changes from your ISP. It can also be used in installations with
inadyn: redundant (backup) connections to the Internet.
inadyn:
inadyn: Homepage: http://troglobit.com/projects/inadyn
diff --git a/network/insync/README b/network/insync/README
index 4a17d12478..06e57bd801 100644
--- a/network/insync/README
+++ b/network/insync/README
@@ -1,3 +1,6 @@
Insync extends (Google) Drive's web functionality to your desktop
by integrating tightly with Windows, Mac and Linux so you can get
work done.
+
+WARNING: If your are upgrading from version 1.x to this version 3.x,
+be aware of those moving steps: https://tinyurl.com/y4jqzehj
diff --git a/network/insync/insync.SlackBuild b/network/insync/insync.SlackBuild
index b54b3d3e72..2ea6bdc071 100644
--- a/network/insync/insync.SlackBuild
+++ b/network/insync/insync.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for "insync".
# Copyright 2013-2016 Marcel Saegebarth <marc@mos6581.de>
+# Copyright 2019,2020 Pedro R.M. JΓΊnior <pedrormjunior@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,8 +27,8 @@
# https://github.com/willysr/SlackHacks/tree/master/SlackBuilds/insync-kde
PRGNAM=insync
-DEBNAM=wheezy
-VERSION=${VERSION:-1.3.12.36116}
+DEBNAM=bionic
+VERSION=${VERSION:-3.1.0.40756}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -75,7 +76,7 @@ chmod 0755 $PKG
if [ "$ARCH" = "x86_64" ]; then
mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
- sed -i 's/lib/lib64/' $PKG/usr/bin/{insync,insync-headless}
+ sed -i 's/lib/lib64/' $PKG/usr/bin/insync
fi
mv $PKG/usr/share/man $PKG/usr/
diff --git a/network/insync/insync.info b/network/insync/insync.info
index ccb099cbfe..c1b4b040f8 100644
--- a/network/insync/insync.info
+++ b/network/insync/insync.info
@@ -1,10 +1,10 @@
PRGNAM="insync"
-VERSION="1.3.12.36116"
+VERSION="3.1.0.40756"
HOMEPAGE="https://www.insynchq.com/"
-DOWNLOAD="http://s.insynchq.com/builds/insync_1.3.12.36116-wheezy_i386.deb"
-MD5SUM="4001dcaaba0c798bc414a79a8cd8e1db"
-DOWNLOAD_x86_64="http://s.insynchq.com/builds/insync_1.3.12.36116-wheezy_amd64.deb"
-MD5SUM_x86_64="eda34fa865bf7ea4bc16eb83881200ad"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="http://s.insynchq.com/builds/insync_3.1.0.40756-bionic_amd64.deb"
+MD5SUM_x86_64="a20c078db09548c0b22b4f13f857a393"
REQUIRES=""
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
+MAINTAINER="Pedro R.M. JΓΊnior"
+EMAIL="pedrormjunior@gmail.com"
diff --git a/network/insync/slack-desc b/network/insync/slack-desc
index e4c1a4ca01..6fca38aaa6 100644
--- a/network/insync/slack-desc
+++ b/network/insync/slack-desc
@@ -14,6 +14,6 @@ insync: work done.
insync:
insync: Homepage: http://www.insynchq.com/
insync:
-insync:
-insync:
+insync: WARNING: If your are upgrading from version 1.x to this version 3.x,
+insync: be aware of those moving steps: https://tinyurl.com/y4jqzehj
insync:
diff --git a/network/ip2location-c/README b/network/ip2location-c/README
index 7c045d09a3..3ebc96d6e6 100644
--- a/network/ip2location-c/README
+++ b/network/ip2location-c/README
@@ -1,10 +1,12 @@
-IP2Location C library enables the user to find the country, region,
-city, coordinates, zip code, time zone, ISP, domain name, connection
-type, area code, weather, MCC, MNC, mobile brand name, elevation and
-usage type that any IP address or hostname originates from. It has
-been optimized for speed and memory utilization. Developers can use
-the API to query all IP2Location binary databases for IPv4 and
-IPv6 address.
+IP2Location C Library
+
+IP2Location is a C library that enables the user to find the country,
+region, city, latitude, longitude, zip code, time zone, ISP, domain
+name, connection type, area code, weather, mobile network, elevation,
+usage type by IP address or hostname originates from. The library
+reads the geo location information from IP2Location BIN data file.
+
+IPv4 and IPv6 addresses are supported.
It contains the IP-COUNTRY BIN databases (IPv4 and IPv6) which
consists of IP address blocks as keys and countries as
diff --git a/network/ip2location-c/ip2location-c.SlackBuild b/network/ip2location-c/ip2location-c.SlackBuild
index 18e39d9891..ee05eacda6 100644
--- a/network/ip2location-c/ip2location-c.SlackBuild
+++ b/network/ip2location-c/ip2location-c.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=ip2location-c
SRCNAM=IP2Location-C-Library
-VERSION=${VERSION:-8.0.7}
+VERSION=${VERSION:-8.0.9}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -73,7 +73,6 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# The README is missing and is needed by autoconf
-cat README.md > README
autoreconf -vif
CFLAGS="$SLKCFLAGS" \
@@ -102,7 +101,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS COPYING ChangeLog Developers_Guide.txt INSTALL LICENSE.TXT NEWS README.md \
+ COPYING Developers_Guide.txt NEWS README INSTALL ChangeLog AUTHORS LICENSE.TXT \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/ip2location-c/ip2location-c.info b/network/ip2location-c/ip2location-c.info
index 132b2d1b7f..0bcd55c047 100644
--- a/network/ip2location-c/ip2location-c.info
+++ b/network/ip2location-c/ip2location-c.info
@@ -1,10 +1,10 @@
PRGNAM="ip2location-c"
-VERSION="8.0.7"
+VERSION="8.0.9"
HOMEPAGE="http://www.ip2location.com/developers/c"
-DOWNLOAD="https://github.com/chrislim2888/IP2Location-C-Library/archive/8.0.7/IP2Location-C-Library-8.0.7.tar.gz"
-MD5SUM="8c33ffe6d66baba942dffa8bf75ea45b"
+DOWNLOAD="https://github.com/chrislim2888/IP2Location-C-Library/archive/8.0.9/IP2Location-C-Library-8.0.9.tar.gz"
+MD5SUM="a232a7ed1cdfb4d972da60261fe4f38e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+EMAIL="jgraham@compukix.net"
diff --git a/network/ip2location-c/slack-desc b/network/ip2location-c/slack-desc
index 00302d16ce..f556c49110 100644
--- a/network/ip2location-c/slack-desc
+++ b/network/ip2location-c/slack-desc
@@ -8,12 +8,12 @@
|-----handy-ruler------------------------------------------------------|
ip2location-c: ip2location-c (Geolocate IP library)
ip2location-c:
-ip2location-c: IP2Location C library enables the user to find the country, region,
-ip2location-c: city, coordinates, zip code, time zone, ISP, domain name, connection
-ip2location-c: type, area code, weather, MCC, MNC, mobile brand name, elevation and
-ip2location-c: usage type that any IP address or hostname originates from. It has
-ip2location-c: been optimized for speed and memory utilization. Developers can use
-ip2location-c: the API to query all IP2Location binary databases for IPv4 and
-ip2location-c: IPv6 address.
+ip2location-c: IP2Location is a C library that enables the user to find the country,
+ip2location-c: region, city, latitude, longitude, zip code, time zone, ISP, domain
+ip2location-c: name, connection type, area code, weather, mobile network, elevation,
+ip2location-c: usage type by IP address or hostname originates from. The library
+ip2location-c: reads the geo location information from IP2Location BIN data file.
+ip2location-c:
+ip2location-c: IPv4 and IPv6 addresses are supported.
ip2location-c:
ip2location-c: Homepage: http://www.ip2location.com/c.aspx
diff --git a/network/ipscan/ipscan.SlackBuild b/network/ipscan/ipscan.SlackBuild
index 238bebdaca..9049345fa0 100644
--- a/network/ipscan/ipscan.SlackBuild
+++ b/network/ipscan/ipscan.SlackBuild
@@ -2,7 +2,7 @@
#
# Slackware build script for ipscan.
#
-# Copyright 2015-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil.
# 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=ipscan
-VERSION=${VERSION:-3.6.1}
+VERSION=${VERSION:-3.6.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/ipscan/ipscan.info b/network/ipscan/ipscan.info
index 9f28344f8e..619544ea6e 100644
--- a/network/ipscan/ipscan.info
+++ b/network/ipscan/ipscan.info
@@ -1,10 +1,10 @@
PRGNAM="ipscan"
-VERSION="3.6.1"
+VERSION="3.6.2"
HOMEPAGE="https://github.com/angryziber/ipscan/"
-DOWNLOAD="https://github.com/angryziber/ipscan/releases/download/3.6.1/ipscan-linux-3.6.1.jar"
-MD5SUM="84c9d8d777bef2500562493b9632a272"
-DOWNLOAD_x86_64="https://github.com/angryziber/ipscan/releases/download/3.6.1/ipscan-linux64-3.6.1.jar"
-MD5SUM_x86_64="32849c0f2af5216c3fb74dabfcfd2743"
+DOWNLOAD="https://github.com/angryip/ipscan/releases/download/3.6.2/ipscan-linux-3.6.2.jar"
+MD5SUM="d2610e9d01615e1eb86cd5df8895732f"
+DOWNLOAD_x86_64="https://github.com/angryip/ipscan/releases/download/3.6.2/ipscan-linux64-3.6.2.jar"
+MD5SUM_x86_64="35259a87425d5a11bd587f799031aace"
REQUIRES="jdk"
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere"
diff --git a/network/iptv-analyzer/iptv-analyzer.SlackBuild b/network/iptv-analyzer/iptv-analyzer.SlackBuild
index faf516d683..9342b16821 100644
--- a/network/iptv-analyzer/iptv-analyzer.SlackBuild
+++ b/network/iptv-analyzer/iptv-analyzer.SlackBuild
@@ -120,7 +120,6 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
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
-# Remove perllocal.pod and other special files that don't need to be installed
find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
# Remove empty directories
diff --git a/network/ipv6calc/README b/network/ipv6calc/README
index 66599f47b4..4d2658ce8c 100644
--- a/network/ipv6calc/README
+++ b/network/ipv6calc/README
@@ -11,6 +11,7 @@ support for these:
IP2LOCATION=yes Enable IP2Location support (requires ip2location-c)
GEOIP=yes Enable GeoIP support (requires GeoIP)
+ GEOIP2=yes Enable GeoIP2 support (requires libmaxminddb)
EXTERNAL=yes Enable external db support
where each build option is passed to the slackbuild. Example of
diff --git a/network/ipv6calc/ipv6calc.SlackBuild b/network/ipv6calc/ipv6calc.SlackBuild
index a9ea0bf1d5..31fe671993 100644
--- a/network/ipv6calc/ipv6calc.SlackBuild
+++ b/network/ipv6calc/ipv6calc.SlackBuild
@@ -4,7 +4,7 @@
# Copyright 2012, 2013 Chris Abela, Malta
# Copyright 2014 Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
-# Copyright 2018 Jason Graham, MD <jgraha8@gmail.com>
+# Copyright 2018-2019 Jason Graham, MD <jgraham@compukix.net>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ipv6calc
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-2.2.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -71,10 +71,11 @@ 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 {} \;
-unset ENABLE_IP2LOCATION
-unset ENABLE_GEOIP
-unset ENABLE_EXTERNAL
-unset ENABLE_MOD_IPV6CALC
+ENABLE_IP2LOCATION="--disable-ip2location"
+ENABLE_GEOIP="--disable-geoip"
+ENABLE_GEOIP2="--disable-geoip2"
+ENABLE_EXTERNAL="--disable-external"
+ENABLE_MOD_IPV6CALC="--disable-mod_ipv6calc"
if [ "$IP2LOCATION" = "yes" ]; then
ENABLE_IP2LOCATION="--enable-ip2location --with-ip2location-db=/usr/share/IP2Loc"
@@ -84,6 +85,10 @@ if [ "$GEOIP" = "yes" ]; then
ENABLE_GEOIP="--enable-geoip --with-geoip-db=/usr/share/GeoIP"
fi
+if [ "$GEOIP2" = "yes" ]; then
+ ENABLE_GEOIP2="--enable-mmdb --with-geoip-db=/usr/share/GeoIP"
+fi
+
if [ "$EXTERNAL" = "yes" ]; then
ENABLE_EXTERNAL="--enable-external"
fi
@@ -102,7 +107,9 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux \
- $ENABLE_IP2LOCATION $ENABLE_GEOIP $ENABLE_EXTERNAL $ENABLE_MOD_IPV6CALC
+ --disable-dbip \
+ --disable-dbip2 \
+ $ENABLE_IP2LOCATION $ENABLE_GEOIP $ENABLE_GEOIP2 $ENABLE_EXTERNAL $ENABLE_MOD_IPV6CALC
make
make install DESTDIR=$PKG
@@ -115,7 +122,9 @@ 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 \
- CHANGES COPYING CREDITS ChangeLog LICENSE README TODO USAGE VERSION \
+ CHANGES COPYING CREDITS ChangeLog INSTALLING LICENSE README README.DBIP \
+ README.DBIP2 README.External README.GeoIP README.GeoIP2 README.IP2Location \
+ README.MaxMindDB TODO USAGE VERSION \
doc/ipv6calc.html \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -125,6 +134,9 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
if [ "$MOD_IPV6CALC" = "yes" ]; then
+ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/mod_ipv6calc
+ cp -a \
+ mod_ipv6calc/README.mod_ipv6calc $PKG/usr/doc/$PRGNAM-$VERSION/mod_ipv6calc
# Move the ipv6calc.conf to the proper location
mkdir -p $PKG/etc/httpd
mv $PKG/etc/{httpd.d,httpd/extra}
diff --git a/network/ipv6calc/ipv6calc.info b/network/ipv6calc/ipv6calc.info
index 576e679891..8413547d34 100644
--- a/network/ipv6calc/ipv6calc.info
+++ b/network/ipv6calc/ipv6calc.info
@@ -1,10 +1,10 @@
PRGNAM="ipv6calc"
-VERSION="1.0.0"
+VERSION="2.2.0"
HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
-DOWNLOAD="ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/ipv6calc-1.0.0.tar.gz"
-MD5SUM="6eed2e5b8ca07330e044d809ade3b565"
+DOWNLOAD="https://github.com/pbiering/ipv6calc/archive/2.2.0/ipv6calc-2.2.0.tar.gz"
+MD5SUM="828dad0901f04bbb60f70affaa857e20"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+EMAIL="jgraham@compukix.net"
diff --git a/network/ipvsadm/ipvsadm-1.25-popt.patch b/network/ipvsadm/ipvsadm-1.25-popt.patch
deleted file mode 100644
index 2826002843..0000000000
--- a/network/ipvsadm/ipvsadm-1.25-popt.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naupr ipvsadm-1.25.orig/Makefile ipvsadm-1.25/Makefile
---- ipvsadm-1.25.orig/Makefile 2008-09-23 18:14:46.000000000 +0200
-+++ ipvsadm-1.25/Makefile 2008-12-22 20:03:53.793372130 +0100
-@@ -62,14 +62,7 @@ RPMBUILD = $(shell \
- fi )
-
- ifeq (,$(FORCE_GETOPT))
--LIB_SEARCH = /lib /usr/lib /usr/local/lib
--POPT_LIB = $(shell for i in $(LIB_SEARCH); do \
-- if [ -f $$i/libpopt.a ]; then \
-- if nm $$i/libpopt.a | fgrep -q poptGetContext; then \
-- echo "-lpopt"; \
-- fi; \
-- fi; \
--done)
-+POPT_LIB = "-lpopt"
- endif
-
- ifneq (,$(POPT_LIB))
diff --git a/network/ipvsadm/ipvsadm.SlackBuild b/network/ipvsadm/ipvsadm.SlackBuild
index 6dfcb5dbd4..859dc91841 100644
--- a/network/ipvsadm/ipvsadm.SlackBuild
+++ b/network/ipvsadm/ipvsadm.SlackBuild
@@ -1,12 +1,12 @@
#!/bin/sh
-# Slackware build script for source-highlight
-# Written by luoyi (luoyi.ly@gmail.com)
-
-# Modified by the slackbuilds.org project
+# Slackware build script for ipvsadm
+# 2010 - Written by luoyi (luoyi.ly@gmail.com)
+# 2010-2016 - Modified by the slackbuilds.org project
+# 2020 - Modified by Marek Wodzinski <majek@w7i.pl>
PRGNAM=ipvsadm
-VERSION=${VERSION:-1.25}
+VERSION=${VERSION:-1.31}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -43,7 +43,7 @@ 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 . \
@@ -52,9 +52,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# fix not detecting popt by default
-patch -p1 -i $CWD/ipvsadm-1.25-popt.patch
-
# use SLKCFLAGS
sed -i "s/-Wall/-Wall $SLKCFLAGS/" Makefile
sed -i "s/-Wall/-Wall $SLKCFLAGS/" libipvs/Makefile
@@ -72,8 +69,14 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
)
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ MAINTAINERS README \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mv $PKG/etc/rc.d/init.d/ipvsadm $PKG/etc/rc.d/rc.ipvsadm
+rmdir $PKG/etc/rc.d/init.d
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/ipvsadm/ipvsadm.info b/network/ipvsadm/ipvsadm.info
index 33eb491f3d..13e862d990 100644
--- a/network/ipvsadm/ipvsadm.info
+++ b/network/ipvsadm/ipvsadm.info
@@ -1,10 +1,10 @@
PRGNAM="ipvsadm"
-VERSION="1.25"
+VERSION="1.31"
HOMEPAGE="http://www.linuxvirtualserver.org/"
-DOWNLOAD="http://www.linuxvirtualserver.org/software/kernel-2.6/ipvsadm-1.25.tar.gz"
-MD5SUM="772a053f5fe888cd25784c5f55d31fc3"
+DOWNLOAD="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.31.tar.xz"
+MD5SUM="f6d1707c5baf684b58fd33682d67871f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="luoyi"
-EMAIL="luoyi.ly@gmail.com"
+MAINTAINER="Marek Wodzinski"
+EMAIL="majek@w7i.pl"
diff --git a/network/ircd-hybrid/ircd-hybrid.SlackBuild b/network/ircd-hybrid/ircd-hybrid.SlackBuild
index cb3489ffe6..0ef5eb3aec 100644
--- a/network/ircd-hybrid/ircd-hybrid.SlackBuild
+++ b/network/ircd-hybrid/ircd-hybrid.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for ircd-hybrid
-# Copyright 2018 Ebben Aries <e@dscp.org>
+# Copyright 2018-2020 Ebben Aries <e@dscp.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
PRGNAM=ircd-hybrid
BINNAM=ircd
-VERSION=${VERSION:-8.2.26}
+VERSION=${VERSION:-8.2.28}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -90,7 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-openssl \
+ --with-tls=gnutls \
--build=$ARCH-slackware-linux
make
diff --git a/network/ircd-hybrid/ircd-hybrid.info b/network/ircd-hybrid/ircd-hybrid.info
index aa664624aa..1a641a0935 100644
--- a/network/ircd-hybrid/ircd-hybrid.info
+++ b/network/ircd-hybrid/ircd-hybrid.info
@@ -1,8 +1,8 @@
PRGNAM="ircd-hybrid"
-VERSION="8.2.26"
+VERSION="8.2.28"
HOMEPAGE="http://www.ircd-hybrid.org/"
-DOWNLOAD="https://github.com/ircd-hybrid/ircd-hybrid/archive/8.2.26/ircd-hybrid-8.2.26.tar.gz"
-MD5SUM="286ec595fa258cfd39bb95d54e98e79a"
+DOWNLOAD="https://github.com/ircd-hybrid/ircd-hybrid/archive/8.2.28/ircd-hybrid-8.2.28.tar.gz"
+MD5SUM="42e6d49af64b11b82586b3b07ef626e0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/isync/README.SLACKWARE b/network/isync/README.SLACKWARE
index 4fcc0a630e..fd78538da7 100644
--- a/network/isync/README.SLACKWARE
+++ b/network/isync/README.SLACKWARE
@@ -4,24 +4,24 @@ After installation, create $HOME/.mbsyncrc. This file contains information
about your email stores and channels. An example configuration, between
a remote IMAP server and a local Maildir:
- MaildirStore local
- Path ~/Maildir/
+ MaildirStore local
+ Path ~/Maildir/
- IMAPAccount My-IMAP-server
- Host mail.myisp.foo
- Port 143
- User myuser
- #Pass mypass -- if not supplied, mbsync will prompt at runtime
+ IMAPAccount My-IMAP-server
+ Host mail.myisp.foo
+ Port 143
+ User myuser
+ #Pass mypass -- if not supplied, mbsync will prompt at runtime
- IMAPStore My-IMAP-store
- Account My-IMAP-Server
+ IMAPStore My-IMAP-store
+ Account My-IMAP-Server
- Channel My-Channel
- Master :My-IMAP-store:
- Slave :local:
- Patterns % !Trash # Synchronize all at this level except Trash
- Sync All
- Create Both
- Expunge Both
+ Channel My-Channel
+ Master :My-IMAP-store:
+ Slave :local:
+ Patterns % !Trash # Synchronize all at this level except Trash
+ Sync All
+ Create Both
+ Expunge Both
See mbsync(1) for additional explanation and options.
diff --git a/network/isync/isync.SlackBuild b/network/isync/isync.SlackBuild
index 0ee56baa2e..e287ce9498 100644
--- a/network/isync/isync.SlackBuild
+++ b/network/isync/isync.SlackBuild
@@ -29,7 +29,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=isync
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.3.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -47,7 +47,7 @@ PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,7 +60,7 @@ else
LIBDIRSUFFIX=""
fi
-set -e
+set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
diff --git a/network/isync/isync.info b/network/isync/isync.info
index b7fbbc45ab..88343019af 100644
--- a/network/isync/isync.info
+++ b/network/isync/isync.info
@@ -1,8 +1,8 @@
PRGNAM="isync"
-VERSION="1.3.0"
+VERSION="1.3.1"
HOMEPAGE="http://isync.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/isync/isync-1.3.0.tar.gz"
-MD5SUM="f64e8723ebbb081bc15510586bfa1f8f"
+DOWNLOAD="http://downloads.sourceforge.net/isync/isync-1.3.1.tar.gz"
+MD5SUM="58bc3507ebe930f8fec5997430be85d5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/keepalived/keepalived.info b/network/keepalived/keepalived.info
index 46b10d9d4d..a52db5cee0 100644
--- a/network/keepalived/keepalived.info
+++ b/network/keepalived/keepalived.info
@@ -6,5 +6,5 @@ MD5SUM="5c98b06639dd50a6bff76901b53febb6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Nilton Moura"
-EMAIL="nmoura@nmoura.eti.br"
+MAINTAINER="Marek Wodzinski"
+EMAIL="majek@w7i.pl"
diff --git a/network/konversation/konversation.SlackBuild b/network/konversation/konversation.SlackBuild
index 3300a2b817..7a93fff79f 100644
--- a/network/konversation/konversation.SlackBuild
+++ b/network/konversation/konversation.SlackBuild
@@ -3,6 +3,7 @@
# 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
@@ -25,7 +26,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=konversation
-VERSION=${VERSION:-1.5}
+VERSION=${VERSION:-1.5.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -83,8 +84,8 @@ mkdir -p build
-DMAN_INSTALL_DIR=/usr/man \
-DCMAKE_BUILD_TYPE=Release ..
- make VERBOSE=1
- make install VERBOSE=1 DESTDIR=$PKG
+ make
+ make install DESTDIR=$PKG
) || exit 1
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/network/konversation/konversation.info b/network/konversation/konversation.info
index 7c1aba386c..5e4faf679e 100644
--- a/network/konversation/konversation.info
+++ b/network/konversation/konversation.info
@@ -1,10 +1,10 @@
PRGNAM="konversation"
-VERSION="1.5"
+VERSION="1.5.1"
HOMEPAGE="https://konversation.kde.org"
-DOWNLOAD="https://download.kde.org/stable/konversation/1.5/src/konversation-1.5.tar.xz"
-MD5SUM="c65c97012854f334d87b3a8df32b38f1"
+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="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
+MAINTAINER="ArTourter"
+EMAIL="artourter@gmail.com"
diff --git a/network/krb5/krb5.SlackBuild b/network/krb5/krb5.SlackBuild
index 2b36a56c7f..d17b209e9c 100644
--- a/network/krb5/krb5.SlackBuild
+++ b/network/krb5/krb5.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for krb5
# Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA
-# Copyright 2015-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=krb5
-VERSION=${VERSION:-1.17}
+VERSION=${VERSION:-1.18}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -79,6 +79,11 @@ CPPFLAGS+=" -I/usr/include/et" \
--enable-dns-for-realm \
--with-ldap \
--with-system-et \
+ --with-system-ss \
+ --enable-pkinit \
+ --with-tls-impl=openssl \
+ --with-system-verto=no \
+ --with-prng-alg=os \
--build=$ARCH-slackware-linux
make
diff --git a/network/krb5/krb5.info b/network/krb5/krb5.info
index d522a28c5d..61d4a0d305 100644
--- a/network/krb5/krb5.info
+++ b/network/krb5/krb5.info
@@ -1,8 +1,8 @@
PRGNAM="krb5"
-VERSION="1.17"
+VERSION="1.18"
HOMEPAGE="http://web.mit.edu/kerberos/"
-DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.17/krb5-1.17.tar.gz"
-MD5SUM="3b729d89eb441150e146780c4138481b"
+DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.18/krb5-1.18.tar.gz"
+MD5SUM="69a5b165dac5754a5094627ee6df0def"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/kubectl/README b/network/kubectl/README
new file mode 100644
index 0000000000..d5226f1078
--- /dev/null
+++ b/network/kubectl/README
@@ -0,0 +1,2 @@
+Kubectl is a command line interface for running commands against
+Kubernetes clusters.
diff --git a/network/createrepo_c/createrepo_c.SlackBuild b/network/kubectl/kubectl.SlackBuild
index b7e60f7a8e..cc2d2f67fb 100644
--- a/network/createrepo_c/createrepo_c.SlackBuild
+++ b/network/kubectl/kubectl.SlackBuild
@@ -1,8 +1,8 @@
#!/bin/sh
-# Slackware build script for createrepo_c
+# Slackware build script for kubectl
-# Copyright 2019 Sergei Fedosoff <eleksir@gmail.com>
+# Copyright 2019 Dimitris Zlatanidis Orestiada, Greece
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,17 +22,17 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=createrepo_c
-VERSION=${VERSION:-0.14.2}
+PRGNAM=kubectl
+VERSION=${VERSION:-1.17.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
+case "$( uname -m )" in
i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
+ *) ARCH=$( uname -m ) ;;
+esac
fi
CWD=$(pwd)
@@ -60,7 +60,8 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+mkdir $PRGNAM-$VERSION
+cp $CWD/$PRGNAM $PRGNAM-$VERSION
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -69,31 +70,13 @@ 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 {} \;
-mkdir build
-cd build
-cmake .. \
- -DPYTHON_DESIRED:FILEPATH=/usr/bin/python \
- -DWITH_ZCHUNK=OFF \
- -DWITH_LIBMODULEMD=OFF \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_C_FLAGS="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DENABLE_THREADED_XZ_ENCODER=on
-
-make
-make install DESTDIR=$PKG
-cd ..
+mkdir -p $PKG/usr/bin
+install -D -m755 $PRGNAM $PKG/usr/bin
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
-mv $PKG/usr/share/man/ $PKG/usr/
-
-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 README.md COPYING $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/network/kubectl/kubectl.info b/network/kubectl/kubectl.info
new file mode 100644
index 0000000000..68fbffd7e0
--- /dev/null
+++ b/network/kubectl/kubectl.info
@@ -0,0 +1,10 @@
+PRGNAM="kubectl"
+VERSION="1.17.0"
+HOMEPAGE="https://kubernetes.io/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl"
+MD5SUM_x86_64="ab919f8c715aa0954cccce0701cbcb0c"
+REQUIRES=""
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/network/hipchat/slack-desc b/network/kubectl/slack-desc
index 256dad5682..3caff3f8d2 100644
--- a/network/hipchat/slack-desc
+++ b/network/kubectl/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-hipchat: hipchat (private group messaging)
-hipchat:
-hipchat: HipChat is a private group messaging service with support for video
-hipchat: chat, group screen sharing, and file sharing.
-hipchat:
-hipchat: This script repackages the Debian package provided by Atlassian.
-hipchat:
-hipchat: Note that only a 64 bit version is available. For an old 32 bit
-hipchat: version of HipChat, see the hipchat2 SlackBuild.
-hipchat:
-hipchat:
+kubectl: kubectl (Kubectl is a command line interface)
+kubectl:
+kubectl: Kubectl is a command line interface for running commands against
+kubectl: Kubernetes clusters.
+kubectl:
+kubectl: Homepage: https://kubernetes.io/
+kubectl:
+kubectl:
+kubectl:
+kubectl:
+kubectl:
diff --git a/network/libcapi20/libcapi20.info b/network/libcapi20/libcapi20.info
index 734a181501..9a4a3e1279 100644
--- a/network/libcapi20/libcapi20.info
+++ b/network/libcapi20/libcapi20.info
@@ -6,5 +6,5 @@ MD5SUM="0074d8ecdf96b474a7dada1e8f12bb9f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="slacksam"
+MAINTAINER="Marek Srejma"
EMAIL="sam_web@yahoo.de"
diff --git a/network/libmaxminddb/libmaxminddb.SlackBuild b/network/libmaxminddb/libmaxminddb.SlackBuild
index a6dfdbedd9..31e433988b 100644
--- a/network/libmaxminddb/libmaxminddb.SlackBuild
+++ b/network/libmaxminddb/libmaxminddb.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libmaxminddb
-VERSION=${VERSION:-1.0.2}
+VERSION=${VERSION:-1.4.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/network/libmaxminddb/libmaxminddb.info b/network/libmaxminddb/libmaxminddb.info
index 86f8881111..5413d8f186 100644
--- a/network/libmaxminddb/libmaxminddb.info
+++ b/network/libmaxminddb/libmaxminddb.info
@@ -1,8 +1,8 @@
PRGNAM="libmaxminddb"
-VERSION="1.0.2"
+VERSION="1.4.2"
HOMEPAGE="https://dev.maxmind.com/geoip/geoip2/web-services/"
-DOWNLOAD="https://github.com/maxmind/libmaxminddb/releases/download/1.0.2/libmaxminddb-1.0.2.tar.gz"
-MD5SUM="2b6985305c0bbf74d08431e333c03ffb"
+DOWNLOAD="https://github.com/maxmind/libmaxminddb/releases/download/1.4.2/libmaxminddb-1.4.2.tar.gz"
+MD5SUM="ca92781b655e0cea2efbe37a07ddb2bb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/limnoria/limnoria.SlackBuild b/network/limnoria/limnoria.SlackBuild
index 68f860865f..a7ef4fa870 100644
--- a/network/limnoria/limnoria.SlackBuild
+++ b/network/limnoria/limnoria.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Slackware build script for limnoria
-# Copyright 2013 David Woodfall <dave@dawoodfall.net>
+# Copyright 2013 David Woodfall <dave@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
diff --git a/network/limnoria/limnoria.info b/network/limnoria/limnoria.info
index 0aebefca3a..a0fcfdfd26 100644
--- a/network/limnoria/limnoria.info
+++ b/network/limnoria/limnoria.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="python3"
MAINTAINER="Dave Woodfall"
-EMAIL="dave@tty1.uk"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/linksys-tftp/README b/network/linksys-tftp/README
new file mode 100644
index 0000000000..d2132b7f01
--- /dev/null
+++ b/network/linksys-tftp/README
@@ -0,0 +1,19 @@
+Linksys-tftp is a BSD tftp client for the non-standard tftp
+authentication process used by some Linksys routers.
+
+These routers include the BEFW11, WRT54G and WRT54GL
+
+They all need a password for the tftp firmware file transfer to work.
+
+For example to upgrade a Linksys WRT54G router at 192.168.1.1 with
+tomato firmware, WRT54G_WRT54GL.bin, where the password is admin
+
+$linksys-wrt 192.168.1.1
+linksys-tftp>verbose
+linksys-tftp>binary
+linksys-tftp>blocksize 512
+linksys-tftp>rexmt 1
+linksys-tftp>timeout 30
+linksys-tftp>trace
+linksys-tftp>put WRT54G_WRT54GL.bin admin
+linksys-tftp>quit
diff --git a/network/linksys-tftp/linksys-tftp-1.2.1-r1-Makefile.patch b/network/linksys-tftp/linksys-tftp-1.2.1-r1-Makefile.patch
new file mode 100644
index 0000000000..b374e808ec
--- /dev/null
+++ b/network/linksys-tftp/linksys-tftp-1.2.1-r1-Makefile.patch
@@ -0,0 +1,28 @@
+Fix LDFLAGS (bug http://bugs.gentoo.org/336956 ) and
+CFLAGS (bug http://bugs.gentoo.org/240894 ) by
+Michael Weber <xmw@gentoo.org>
+
+--- linksys-tftp-1.2.1/Makefile
++++ linksys-tftp-1.2.1/Makefile
+@@ -19,18 +19,18 @@
+ # We override /usr/include/arpa/tftp.h with our own because
+ # we want tu_block to be unsigned short, not short as on most platforms
+ #
+-CFLAGS= -I. -O2 -Dsin=sin_x
++CFLAGS += -I. -Dsin=sin_x
+ #DEBUG
+ # CFLAGS= -I. -Wall -ggdb -Dsin=sin_x
+ SRCS= main.c tftp.c tftpsubs.c
+ OBJS= main.o tftp.o tftpsubs.o
+ DOBJS= tftpsubs.o
+-CC= gcc
++CC?= gcc
+
+ all: linksys-tftp
+
+ linksys-tftp: ${OBJS}
+- ${CC} -o $@ ${CFLAGS} ${OBJS}
++ ${CC} -o $@ ${CFLAGS} ${OBJS} ${LDFLAGS}
+
+ clean:
+ rm -f ${OBJS} ${DOBJS} *core linksys-tftp
diff --git a/network/linksys-tftp/linksys-tftp-1.2.1-r1-header.patch b/network/linksys-tftp/linksys-tftp-1.2.1-r1-header.patch
new file mode 100644
index 0000000000..9944f3c059
--- /dev/null
+++ b/network/linksys-tftp/linksys-tftp-1.2.1-r1-header.patch
@@ -0,0 +1,52 @@
+--- linksys-tftp-1.2.1/main.c
++++ linksys-tftp-1.2.1/main.c
+@@ -40,6 +40,10 @@
+ #include <setjmp.h>
+ #include <ctype.h>
+ #include <netdb.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#include <sys/sendfile.h>
+
+ #define TIMEOUT 5 /* secs between rexmt's */
+
+@@ -110,7 +112,7 @@
+ char *index();
+ char *rindex();
+
+-main(argc, argv)
++int main(argc, argv)
+ char *argv[];
+ {
+ struct sockaddr_in sin;
+--- a/tftp.c
++++ b/tftp.c
+@@ -36,8 +36,8 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <setjmp.h>
+-
+-extern int errno;
++#include <string.h>
++#include <unistd.h>
+
+ extern struct sockaddr_in sin; /* filled in by main */
+ extern int f; /* the opened socket */
+@@ -69,16 +69,6 @@ void timer(int sig)
+ longjmp(timeoutbuf, 1);
+ }
+
+-strnlen(s, n)
+- char *s;
+- int n;
+-{
+- int i = 0;
+-
+- while (n-- > 0 && *s++) i++;
+- return(i);
+-}
+-
+ /*
+ * Parse an OACK package and set blocksize accordingly
+ */
diff --git a/network/linksys-tftp/linksys-tftp.SlackBuild b/network/linksys-tftp/linksys-tftp.SlackBuild
new file mode 100644
index 0000000000..2803fcdc1a
--- /dev/null
+++ b/network/linksys-tftp/linksys-tftp.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Slackware build script for linksys-tftp
+
+# Copyright 2019 Richard Narron, California
+# 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=linksys-tftp
+VERSION=${VERSION:-1.2.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}
+
+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 {} \;
+
+# patches thanks to Gentoo
+(echo " " && cat $CWD/linksys-tftp-1.2.1-r1-Makefile.patch) | patch -b -p1
+(echo " " && cat $CWD/linksys-tftp-1.2.1-r1-header.patch) | patch -b -p1
+
+make
+
+install -D -m755 -t $PKG/usr/bin/ linksys-tftp
+
+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 README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION/README.slackware
+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/linksys-tftp/linksys-tftp.info b/network/linksys-tftp/linksys-tftp.info
new file mode 100644
index 0000000000..1e2c9be8ff
--- /dev/null
+++ b/network/linksys-tftp/linksys-tftp.info
@@ -0,0 +1,10 @@
+PRGNAM="linksys-tftp"
+VERSION="1.2.1"
+HOMEPAGE="https://www.redsand.net/solutions/linksys_tftp.html"
+DOWNLOAD="https://www.redsand.net/solutions/linksys-tftp-1.2.1.tar.gz"
+MD5SUM="f536f778dcbcb4a65838042ca0a2a454"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Richard Narron"
+EMAIL="richard@aaazen.com"
diff --git a/network/createrepo_c/slack-desc b/network/linksys-tftp/slack-desc
index 7621984882..52b24ab204 100644
--- a/network/createrepo_c/slack-desc
+++ b/network/linksys-tftp/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-createrepo_c: createrepo_c (rpm repository metadata generator)
-createrepo_c:
-createrepo_c: C implementation of Createrepo.
-createrepo_c: A set of utilities (createrepo_c, mergerepo_c, modifyrepo_c)
-createrepo_c: for generating a common metadata repository from a directory of
-createrepo_c: rpm packages and maintaining it.
-createrepo_c:
-createrepo_c:
-createrepo_c: Project URL: https://github.com/rpm-software-management/createrepo_c
-createrepo_c:
-createrepo_c:
+linksys-tftp: linksys-tftp (tftp client for Linksys routers requiring a password)
+linksys-tftp:
+linksys-tftp: This is a BSD tftp client for Linksys routers that need a password
+linksys-tftp: for tftp firmware installation such as the BEFW11, WRT54G and WRT54GL
+linksys-tftp:
+linksys-tftp:
+linksys-tftp:
+linksys-tftp:
+linksys-tftp:
+linksys-tftp:
+linksys-tftp:
diff --git a/network/lxi-tools/lxi-gui.desktop b/network/lxi-tools/lxi-gui.desktop
index fb17ad31d9..c5e75f843f 100644
--- a/network/lxi-tools/lxi-gui.desktop
+++ b/network/lxi-tools/lxi-gui.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Version=1.18
+Version=1.0
Name=LXI-GUI
Comment=LAN eXtensions for Instrumentation GUI
Exec=lxi-gui
diff --git a/network/macchanger/README b/network/macchanger/README
index 404318fe12..72b3a2b9cc 100644
--- a/network/macchanger/README
+++ b/network/macchanger/README
@@ -1,10 +1,10 @@
-GNU MAC Changer is a utility for viewing and manipulating
-the MAC address of network interfaces
+GNU MAC Changer is a utility for viewing and manipulating
+MAC addresses of network interfaces.
Features:
--Set specific MAC address of a network interface
--Set the MAC randomly
--Set a MAC of another vendor
--Set another MAC of the same vendor
--Set a MAC of the same kind (eg: wireless card)
--Display a vendor MAC list (today, 6800 items) to choose from
+ - set specific MAC address of a network interface
+ - set the MAC randomly
+ - set a MAC of another vendor
+ - set another MAC of the same vendor
+ - set a MAC of the same kind (eg: wireless card)
+ - display a vendor MAC list to choose from
diff --git a/network/macchanger/macchanger.SlackBuild b/network/macchanger/macchanger.SlackBuild
index 1cb5f3bea5..9beaa20889 100644
--- a/network/macchanger/macchanger.SlackBuild
+++ b/network/macchanger/macchanger.SlackBuild
@@ -1,15 +1,30 @@
#!/bin/sh
-###################################################################
# Slackware build script for macchanger
+
+# Copyright 2007, 2010 Kevin Myers <jwblack AT cox DOT net>
+# Copyright 2020 Dominik Drobek <dominik.drobek (at) o2.pl>
+# All rights reserved.
#
-# Written by Kevin Myers jwblack AT cox DOT net 09-02-2007
+# 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=macchanger
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.7.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -26,8 +41,6 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-DOCS="AUTHORS COPYING INSTALL NEWS README ChangeLog"
-
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
@@ -42,43 +55,47 @@ else
LIBDIRSUFFIX=""
fi
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+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 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
--mandir=/usr/man \
- --build=$ARCH-slackware-linux \
- || exit 1
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --build=$ARCH-slackware-linux
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+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
rm -f $PKG/usr/info/dir
gzip -9 $PKG/usr/info/*.info*
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/network/macchanger/macchanger.info b/network/macchanger/macchanger.info
index fcc02d0362..133c385776 100644
--- a/network/macchanger/macchanger.info
+++ b/network/macchanger/macchanger.info
@@ -1,10 +1,10 @@
PRGNAM="macchanger"
-VERSION="1.5.0"
+VERSION="1.7.0"
HOMEPAGE="https://github.com/alobbs/macchanger"
-DOWNLOAD="ftp://ftp.gnu.org/gnu/macchanger/macchanger-1.5.0.tar.gz"
-MD5SUM="79b7cdaeca3d8ebafa764c4b0dd03ab7"
+DOWNLOAD="https://github.com/alobbs/macchanger/releases/download/1.7.0/macchanger-1.7.0.tar.gz"
+MD5SUM="ca56f16142914337391dac91603eb332"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Kevin Myers"
-EMAIL="jwblack@cox.net"
+MAINTAINER="Dominik Drobek"
+EMAIL="dominik.drobek (at) o2.pl"
diff --git a/network/macchanger/slack-desc b/network/macchanger/slack-desc
index 8a0a2cb30e..55a95fa54c 100644
--- a/network/macchanger/slack-desc
+++ b/network/macchanger/slack-desc
@@ -6,10 +6,10 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-macchanger: macchanger (utility for viewing/manipulating the MAC address)
+macchanger: macchanger (utility for viewing and manipulating MAC addresses)
macchanger:
-macchanger: This is a GNU/Linux Utility for viewing/manipulating the MAC
-macchanger: address of network interfaces.
+macchanger: This is a GNU/Linux utility for viewing and manipulating MAC
+macchanger: addresses of network interfaces.
macchanger:
macchanger: Homepage: https://github.com/alobbs/macchanger
macchanger:
diff --git a/network/mailspring/README b/network/mailspring/README
new file mode 100644
index 0000000000..1a4975dd51
--- /dev/null
+++ b/network/mailspring/README
@@ -0,0 +1,9 @@
+Mailspring (A beautiful, fast and maintained fork of Nylas Mail)
+
+Mailspring is a new version of Nylas Mail maintained by one of the
+original authors. It's faster, leaner, and shipping today! It replaces
+the JavaScript sync code in Nylas Mail with a new C++ sync engine based
+on Mailcore2. It uses roughly half the RAM and CPU of Nylas Mail and
+idles with almost zero "CPU Wakes", which translates to great battery
+life. It also has an entirely revamped composer and other great new
+features.
diff --git a/network/mailspring/doinst.sh b/network/mailspring/doinst.sh
new file mode 100644
index 0000000000..7b676c401a
--- /dev/null
+++ b/network/mailspring/doinst.sh
@@ -0,0 +1,6 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications
+fi
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache -q usr/share/icons/hicolor
+fi
diff --git a/network/mailspring/mailspring.SlackBuild b/network/mailspring/mailspring.SlackBuild
new file mode 100644
index 0000000000..bbaba850dd
--- /dev/null
+++ b/network/mailspring/mailspring.SlackBuild
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# Slackware build script for mailspring
+#
+# Copyright 2020 Muhammad Mahendra Subrata Depok, Indonesia
+# 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=mailspring
+VERSION=${VERSION:-1.7.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}
+
+if [ "$ARCH" = "i586" ]; then
+ echo "This package is currently only available for 64bit."
+ exit 1
+elif [ "$ARCH" = "x86_64" ]; then
+ DEBARCH="amd64"
+ LIBDIRSUFFIX="64"
+else
+ echo "Package for $(uname -m) architecture is not available."
+ exit 1
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${PRGNAM}-${VERSION}-${DEBARCH}.deb data.tar.xz | tar -Jxv
+
+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 {} \;
+
+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
+mv $PKG/usr/share/doc/${PRGNAM}/copyright $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Don't need these:
+rm -rf $PKG/usr/share/doc $PKG/usr/share/lintian
+
+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/mailspring/mailspring.info b/network/mailspring/mailspring.info
new file mode 100644
index 0000000000..2577d06b4a
--- /dev/null
+++ b/network/mailspring/mailspring.info
@@ -0,0 +1,10 @@
+PRGNAM="mailspring"
+VERSION="1.7.4"
+HOMEPAGE="https://getmailspring.com/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/Foundry376/Mailspring/releases/download/1.7.4/mailspring-1.7.4-amd64.deb"
+MD5SUM_x86_64="2660668acaa673aa08713992aa62faf4"
+REQUIRES=""
+MAINTAINER="Muhammad Mahendra Subrata"
+EMAIL="mumahendras3@gmail.com"
diff --git a/network/mailspring/slack-desc b/network/mailspring/slack-desc
new file mode 100644
index 0000000000..c5017d9e33
--- /dev/null
+++ b/network/mailspring/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+mailspring: mailspring (a beautiful, fast and maintained fork of Nylas Mail)
+mailspring:
+mailspring: Mailspring is a new version of Nylas Mail maintained by one of the
+mailspring: original authors. It's faster, leaner, and shipping today! It replaces
+mailspring: the JavaScript sync code in Nylas Mail with a new C++ sync engine
+mailspring: based on Mailcore2. It uses roughly half the RAM and CPU of Nylas Mail
+mailspring: and idles with almost zero "CPU Wakes", which translates to great
+mailspring: battery life. It also has an entirely revamped composer and other
+mailspring: great new features.
+mailspring:
+mailspring: Homepage: https://getmailspring.com/
diff --git a/network/mattermost-desktop/doinst.sh b/network/mattermost-desktop/doinst.sh
index 5fb28930db..65c7e2eeb9 100644
--- a/network/mattermost-desktop/doinst.sh
+++ b/network/mattermost-desktop/doinst.sh
@@ -1,3 +1,9 @@
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/mattermost-desktop/mattermost-desktop.SlackBuild b/network/mattermost-desktop/mattermost-desktop.SlackBuild
index e2ff2ccd79..5e9bf99959 100644
--- a/network/mattermost-desktop/mattermost-desktop.SlackBuild
+++ b/network/mattermost-desktop/mattermost-desktop.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for mattermost-desktop
-# Copyright 2018, 2019 Dominik Drobek <dominik.drobek (at) o2.pl>
+# Copyright 2018-2020 Dominik Drobek <dominik.drobek (at) o2.pl>
# 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=mattermost-desktop
-VERSION=${VERSION:-4.2.3}
+VERSION=${VERSION:-4.4.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -67,15 +67,14 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
mkdir -p $PKG/opt/$PRGNAM
-cp -a locales/ resources/ *.bin *.dat *.pak *.so $PRGNAM $PKG/opt/$PRGNAM
-
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-install -m 644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications
-install -m 644 icon.svg $PKG/usr/share/pixmaps/$PRGNAM.svg
+cp -a locales/ resources/ swiftshader/ *.bin *.dat *.pak *.so chrome-sandbox $PRGNAM $PKG/opt/$PRGNAM
mkdir -p $PKG/usr/bin
ln -sf ../../opt/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM
+install -D -m 644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+install -D -m 644 icon.svg $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
LICENSE* NOTICE.txt README.md \
diff --git a/network/mattermost-desktop/mattermost-desktop.info b/network/mattermost-desktop/mattermost-desktop.info
index 2e9a4a84ff..66aa87ee83 100644
--- a/network/mattermost-desktop/mattermost-desktop.info
+++ b/network/mattermost-desktop/mattermost-desktop.info
@@ -1,10 +1,10 @@
PRGNAM="mattermost-desktop"
-VERSION="4.2.3"
+VERSION="4.4.0"
HOMEPAGE="https://mattermost.com"
-DOWNLOAD="https://releases.mattermost.com/desktop/4.2.3/mattermost-desktop-4.2.3-linux-ia32.tar.gz"
-MD5SUM="0eb974abd7226d91fdd83ea5de6b91a5"
-DOWNLOAD_x86_64="https://releases.mattermost.com/desktop/4.2.3/mattermost-desktop-4.2.3-linux-x64.tar.gz"
-MD5SUM_x86_64="713c01b8359a4fbd7c6a98e93c73dec8"
+DOWNLOAD="https://releases.mattermost.com/desktop/4.4.0/mattermost-desktop-4.4.0-linux-ia32.tar.gz"
+MD5SUM="1a02dcaf7a8d191263c442304f57ba9a"
+DOWNLOAD_x86_64="https://releases.mattermost.com/desktop/4.4.0/mattermost-desktop-4.4.0-linux-x64.tar.gz"
+MD5SUM_x86_64="c4c1f1c3a9e2b243ce51680b1f6cf47d"
REQUIRES=""
MAINTAINER="Dominik Drobek"
EMAIL="dominik.drobek (at) o2.pl"
diff --git a/network/metasploit/metasploit.info b/network/metasploit/metasploit.info
index e7eac77a3e..ff80e873c2 100644
--- a/network/metasploit/metasploit.info
+++ b/network/metasploit/metasploit.info
@@ -6,5 +6,5 @@ MD5SUM="9d4abba0e05bb972ba805e6e0e63cea0"
DOWNLOAD_x86_64="http://downloads.metasploit.com/data/releases/archive/metasploit-4.7.0-linux-x64-installer.run"
MD5SUM_x86_64="b36d8c7282f91e8bcb0138f2feb702cf"
REQUIRES=""
-MAINTAINER="Andrea Villa"
-EMAIL="andreakarimodm@gmail.com"
+MAINTAINER="Dionysis Ntreou"
+EMAIL="yakizarns1@gmail.com"
diff --git a/network/milter-greylist/milter-greylist.SlackBuild b/network/milter-greylist/milter-greylist.SlackBuild
index a440fe5877..cbf2e45175 100644
--- a/network/milter-greylist/milter-greylist.SlackBuild
+++ b/network/milter-greylist/milter-greylist.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Slackware build script for milter-greylist
-# Copyright 2014 David Woodfall <dave@dawoodfall.net>
+# Copyright 2014 David Woodfall <dave@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
diff --git a/network/milter-greylist/milter-greylist.info b/network/milter-greylist/milter-greylist.info
index 825943d46d..60f5f88d50 100644
--- a/network/milter-greylist/milter-greylist.info
+++ b/network/milter-greylist/milter-greylist.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="Dave Woodfall"
-EMAIL="dave@tty1.uk"
+EMAIL="dave@slackbuilds.org"
diff --git a/network/milter-greylist/rc.milter-greylist.new b/network/milter-greylist/rc.milter-greylist.new
index 5f4ce88cb4..8a7c5a74dd 100644
--- a/network/milter-greylist/rc.milter-greylist.new
+++ b/network/milter-greylist/rc.milter-greylist.new
@@ -2,7 +2,7 @@
#
# Slackware init script for milter-greylist
-# Copyright 2018 Dave Woodfall <dave@tty1.uk>
+# Copyright 2018 Dave Woodfall <dave@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
diff --git a/network/mkvserver_mk2/slack-desc b/network/mkvserver_mk2/slack-desc
index 21af6d26fe..acd2597737 100644
--- a/network/mkvserver_mk2/slack-desc
+++ b/network/mkvserver_mk2/slack-desc
@@ -10,7 +10,7 @@ mkvserver_mk2: mkvserver_mk2 (Matroska Server Mk2)
mkvserver_mk2:
mkvserver_mk2: Matroska Server Mk2 project is the result of years of thinking, try-
mkvserver_mk2: ing and finally succeeding.
-mkvserver_mk2:
+mkvserver_mk2:
mkvserver_mk2: This software makes it possible to stream (almost) anything remuxed
mkvserver_mk2: as matroska live in real-time over http to multiple clients.
mkvserver_mk2:
diff --git a/network/mosh/mosh.info b/network/mosh/mosh.info
index 911318a85f..694496a6c6 100644
--- a/network/mosh/mosh.info
+++ b/network/mosh/mosh.info
@@ -6,5 +6,5 @@ MD5SUM="c2d918f4d91fdc32546e2e089f9281b2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="perl-IO-Tty protobuf"
-MAINTAINER="Ruari Oedegaard"
-EMAIL="sbo@ruari.com"
+MAINTAINER="Donald Cooley"
+EMAIL="chytraeu@sdf.org"
diff --git a/network/mumble/README b/network/mumble/README
index 7fb924cb74..c653790f03 100644
--- a/network/mumble/README
+++ b/network/mumble/README
@@ -16,6 +16,11 @@ mumble-overlay script to use for compatability. Please note, you
To build the overlay with 32-bit compatability:
OVERLAY=yes COMPAT32=yes ./mumble.SlackBuild
+Celt is no longer maintained, and dropped in is favor of opus.
+Celt-0.7.0 bundled for optional backware compatibility. SBo's celt
+is incompatible. If needed use:
+ CELT070=yes ./mumble.SlackBuild
+
Note: This does not build the mumble server (murmur).
***NOTE: text-to-speech is now an available option in mumble with
diff --git a/network/mumble/libspeechd_header.patch b/network/mumble/libspeechd_header.patch
deleted file mode 100644
index d398777a64..0000000000
--- a/network/mumble/libspeechd_header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mumble-1.2.16/src/mumble/TextToSpeech_unix.cpp mumble-1.2.16-new/src/mumble/TextToSpeech_unix.cpp
---- mumble-1.2.16/src/mumble/TextToSpeech_unix.cpp 2016-05-05 07:56:03.000000000 -0700
-+++ mumble-1.2.16-new/src/mumble/TextToSpeech_unix.cpp 2016-05-15 21:58:16.605311547 -0700
-@@ -33,7 +33,7 @@
- #include "TextToSpeech.h"
-
- #ifdef USE_SPEECHD
--#include <libspeechd.h>
-+#include </usr/include/speech-dispatcher/libspeechd.h>
- #endif
-
- #include "Global.h"
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild
index 9de8dc9468..1d6c1e1b6b 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -26,7 +26,7 @@
# New maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
PRGNAM=mumble
-VERSION=${VERSION:-1.2.19}
+VERSION=${VERSION:-1.3.0}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
@@ -34,10 +34,11 @@ G15=${G15:-no}
OVERLAY=${OVERLAY:-no}
COMPAT32=${COMPAT32:-no}
SPEECHD=${SPEECHD:-no}
+CELT070=${CELT070:-no}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -48,8 +49,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -76,6 +77,14 @@ fi
if [ "$SPEECHD" = "no" ]; then
BUILD_SPEECHD="CONFIG+=no-speechd"
fi
+# Celt is no longer maintained, and dropped in
+# favor of opus. Celt-0.7.0 is bundled for optional
+# backware compatibility. SBo's celt is incompatible.
+if [ "CELT070" = "no" ]; then
+ BUILD_CELT="CONFIG+=no-bundled-celt"
+else
+ BUILD_CELT="CONFIG+=bundled-celt"
+fi
set -e
@@ -92,14 +101,10 @@ 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 {} \;
-# Mumble won't find the speechd header without this
-patch -p1 < $CWD/libspeechd_header.patch
-
-qmake -recursive main.pro \
+qmake-qt5 -recursive main.pro \
QMAKE_CFLAGS+="$SLKCFLAGS" \
QMAKE_CXXFLAGS+="$SLKCFLAGS" \
DEFINES*="PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/mumble" \
- CONFIG+=bundled-celt \
CONFIG+=no-server \
CONFIG+=no-bundled-opus \
CONFIG+=no-bundled-speex \
@@ -107,6 +112,8 @@ qmake -recursive main.pro \
CONFIG+=no-embed-qt-translations \
CONFIG+=no-ice \
CONFIG+=no-bonjour \
+ CONFIG+=no-qt4-legacy-compat \
+ $BUILD_CELT \
$BUILD_G15 \
$BUILD_OVERLAY \
$BUILD_SPEECHD
@@ -121,10 +128,9 @@ mkdir -p \
install -m 755 release/mumble $PKG/usr/bin
-# Mumble's bundled celt is needed:
-# celt-0.7.0 is needed to keep compatibility with other clients
-# celt-0.11.0 is needed as SBo's 0.11.3 is incompatible
-cp -a release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble
+if [ "$CELT070" = "yes" ]; then
+ cp -a release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble
+fi
install -m 644 \
man/mumble-overlay.1 \
@@ -156,7 +162,7 @@ if [ "$COMPAT32" = "yes" -a "$OVERLAY" = "yes" -a "$ARCH" = "x86_64" ]; then
cd overlay_gl
make clean
- qmake \
+ qmake-qt5 \
QMAKE_CFLAGS="-m32 -O2 -march=i486 -mtune=i686" \
QMAKE_CXXFLAGS="-m32 -O2 -march=i486 -mtune=i686" \
QMAKE_LFLAGS="-m32" \
diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info
index 3842253f5d..aa0256d62b 100644
--- a/network/mumble/mumble.info
+++ b/network/mumble/mumble.info
@@ -1,10 +1,10 @@
PRGNAM="mumble"
-VERSION="1.2.19"
+VERSION="1.3.0"
HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page"
-DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.2.19/mumble-1.2.19.tar.gz"
-MD5SUM="d101068ed27ce119effdb3765a8cf8e4"
+DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.3.0/mumble-1.3.0.tar.gz"
+MD5SUM="65fd57177879f5d1830c13a63d9f50ab"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="protobuf opus speex"
+REQUIRES="protobuf opus speex qt5"
MAINTAINER="Edward W. Koenig"
EMAIL="kingbeowulf@gmail.com"
diff --git a/network/murmur/README b/network/murmur/README
index bebdb01949..07923902c8 100644
--- a/network/murmur/README
+++ b/network/murmur/README
@@ -4,9 +4,6 @@ individual users. Each murmur process supports multiple virtual
servers, each with their own user base and channel list.
Administration of murmur is done through D-Bus.
-NOTE: If you're upgrading from 1.1.4, the SlackBuild has changed:
- /var/{lib,log,run}/mumble-server moved to /var/{lib,log,run}/murmur
-
This script requires the system to have a murmur user and group:
# groupadd -g 261 murmur
diff --git a/network/murmur/murmur.SlackBuild b/network/murmur/murmur.SlackBuild
index 0ca99608da..7879d5882a 100644
--- a/network/murmur/murmur.SlackBuild
+++ b/network/murmur/murmur.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for murmur
-# Copyright 2014, 2015 Edward W. Koenig <kingbeowulf@gmail.com>
+# Copyright 2014-2019 Edward W. Koenig <kingbeowulf@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
PRGNAM=murmur
SRCNAM=mumble
-VERSION=${VERSION:-1.2.19}
+VERSION=${VERSION:-1.3.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -88,7 +88,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-qmake \
+qmake-qt5 \
-recursive \
main.pro \
QMAKE_CFLAGS+="$SLKCFLAGS" \
diff --git a/network/murmur/murmur.info b/network/murmur/murmur.info
index eeeb72dadd..e5579ce236 100644
--- a/network/murmur/murmur.info
+++ b/network/murmur/murmur.info
@@ -1,10 +1,10 @@
PRGNAM="murmur"
-VERSION="1.2.19"
+VERSION="1.3.0"
HOMEPAGE="https://github.com/mumble-voip/mumble/"
-DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.2.19/mumble-1.2.19.tar.gz"
-MD5SUM="d101068ed27ce119effdb3765a8cf8e4"
+DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.3.0/mumble-1.3.0.tar.gz"
+MD5SUM="65fd57177879f5d1830c13a63d9f50ab"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="protobuf"
+REQUIRES="protobuf qt5"
MAINTAINER="Edward W. Koenig"
EMAIL="kingbeowulf@gmail.com"
diff --git a/network/mysecureshell/mysecureshell.info b/network/mysecureshell/mysecureshell.info
index 7112264535..cef3380479 100644
--- a/network/mysecureshell/mysecureshell.info
+++ b/network/mysecureshell/mysecureshell.info
@@ -6,5 +6,5 @@ MD5SUM="f612d96c9ff3e99806c3c076acef0946"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="adaptr"
-EMAIL="jeroen@adaptr.nl"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/network/nbtscan/nbtscan.info b/network/nbtscan/nbtscan.info
index 0762abefa4..7b7f1276e8 100644
--- a/network/nbtscan/nbtscan.info
+++ b/network/nbtscan/nbtscan.info
@@ -6,5 +6,5 @@ MD5SUM="ec21e504d27acb2a0f049c7421ace462"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Fernando Giannasi"
-EMAIL="phoemur@gmail.com"
+MAINTAINER="Michael Edie"
+EMAIL="michael@sawbox.net"
diff --git a/network/neomutt/doinst.sh b/network/neomutt/doinst.sh
index 32e580cced..ab5c5595b5 100644
--- a/network/neomutt/doinst.sh
+++ b/network/neomutt/doinst.sh
@@ -14,3 +14,9 @@ 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 -t -f -q usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
+
diff --git a/network/neomutt/neomutt.SlackBuild b/network/neomutt/neomutt.SlackBuild
index 67f0738f64..cf4400db76 100644
--- a/network/neomutt/neomutt.SlackBuild
+++ b/network/neomutt/neomutt.SlackBuild
@@ -2,7 +2,7 @@
#
# Slackware build script for neomutt
#
-# Copyright 2016-2018 Corrado Franco (http://conraid.net)
+# Copyright 2016-2020 Corrado Franco (https://corradofranco.it)
# All rights reserved.
#
# This program is free software: you can redistribute it and/or modify
@@ -25,22 +25,20 @@
#
# Latest version of this SlackBuild at https://github.com/conraid/SlackBuilds
-set -eu
-
PRGNAM=neomutt
-VERSION=${VERSION:-20180716}
+VERSION=${VERSION:-20200320}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z ${ARCH:=""} ]; then
case "$( uname -m )" in
- i?86) ARCH=i686 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi
-CWD=$(pwd)
+cd $(dirname $0) ; CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -64,13 +62,14 @@ fi
[ ${USENOTMUCH:-no} == 'yes' ] && NOTMUCH="--notmuch" || NOTMUCH=""
[ ${USEIDN2:-no} == 'yes' ] && IDN2="--idn2 --disable-idn" || IDN2=""
+set -eu
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$PRGNAM-$VERSION
-
+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 \
@@ -94,6 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \
--gdbm \
--gpgme \
--locales-fix \
+ --sqlite \
--host=$ARCH-slackware-linux \
--build=$ARCH-slackware-linux \
$LUA $NOTMUCH $KYOTO $IDN2
@@ -101,15 +101,17 @@ CXXFLAGS="$SLKCFLAGS" \
make
make DESTDIR=$PKG install
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
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
+install -Dm644 $CWD/files/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+for i in 32 64 128 256; do
+ install -Dm644 contrib/logo/$PRGNAM-$i.png $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
+done
+
# Rename conf files
mv $PKG/etc/$PRGNAM/neomuttrc $PKG/etc/$PRGNAM/neomuttrc.new
@@ -120,8 +122,5 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
-install -Dm644 $CWD/files/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-install -Dm644 contrib/logo/$PRGNAM.svg $PKG/usr/share/pixmaps/$PRGNAM.svg
-
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/neomutt/neomutt.info b/network/neomutt/neomutt.info
index af4825ea8a..c50c5700e7 100644
--- a/network/neomutt/neomutt.info
+++ b/network/neomutt/neomutt.info
@@ -1,8 +1,8 @@
PRGNAM="neomutt"
-VERSION="20180716"
+VERSION="20200320"
HOMEPAGE="https://github.com/neomutt/neomutt"
-DOWNLOAD="https://github.com/neomutt/neomutt/archive/neomutt-20180716.tar.gz"
-MD5SUM="f628d1bcb31d36c926ed60f2105f742a"
+DOWNLOAD="https://github.com/neomutt/neomutt/archive/20200320/neomutt-20200320.tar.gz"
+MD5SUM="ee975317f1dfa06cd1a7e2626911697a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/netcat-openbsd/README b/network/netcat-openbsd/README
index 9431a830ae..2301321b0f 100644
--- a/network/netcat-openbsd/README
+++ b/network/netcat-openbsd/README
@@ -1,16 +1,16 @@
-Netcat is a featured networking utility which reads and writes data across
-network connections, using the TCP/IP protocol.
+Netcat is a simple Unix utility which reads and writes data across
+network connections, using the TCP or UDP protocol.
-It is designed to be a reliable "back-end" tool that can be used directly
-or easily driven by other programs and scripts. At the same time, it is a
-feature-rich network debugging and exploration tool, since it can create
-almost any kind of connection you would need and has several interesting
-built-in capabilities.
+It is designed to be a reliable "back-end" tool that can be used
+directly or easily driven by other programs and scripts. At the same
+time, it is a feature-rich network debugging and exploration tool, since
+it can create almost any kind of connection you would need and has
+several interesting built-in capabilities.
-This package contains the OpenBSD rewrite of netcat, including support
+This package contains the OpenBSD rewrite of netcat, including support
for IPv6, proxies, and Unix sockets. The installed binary is named
"nc.openbsd" and the manpage is as well.
-BTW, this package conflicts with the netcat in slackware as it creates
-a symbolic link /usr/bin/nc (to let libvirt stuff work correctly), so
+BTW, this package conflicts with the netcat in slackware as it creates a
+symbolic link /usr/bin/nc (to let libvirt stuff work correctly), so
remove netcat (nc) from your system before building/installing this.
diff --git a/network/netcat-openbsd/netcat-openbsd.SlackBuild b/network/netcat-openbsd/netcat-openbsd.SlackBuild
index c807a163db..22fa49b298 100644
--- a/network/netcat-openbsd/netcat-openbsd.SlackBuild
+++ b/network/netcat-openbsd/netcat-openbsd.SlackBuild
@@ -2,6 +2,7 @@
# Slackware build script for netcat-openbsd
#
+# Copyright 2020 Donald Cooley, South Haven, Indiana USA
# Copyright 2010, 2014 Slax-Dude <jmfl {at} sapo [dot] pt>
# All rights reserved.
#
@@ -23,15 +24,15 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=netcat-openbsd
-VERSION=${VERSION:-1.105}
+VERSION=${VERSION:-1.206}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
-DEBVER=7
+DEBVER=1
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 +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"
diff --git a/network/netcat-openbsd/netcat-openbsd.info b/network/netcat-openbsd/netcat-openbsd.info
index dc9b850460..5a4a2accd9 100644
--- a/network/netcat-openbsd/netcat-openbsd.info
+++ b/network/netcat-openbsd/netcat-openbsd.info
@@ -1,10 +1,10 @@
PRGNAM="netcat-openbsd"
-VERSION="1.105"
-HOMEPAGE="http://packages.debian.org/sid/netcat-openbsd"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/netcat-openbsd_1.105.orig.tar.gz"
-MD5SUM="7e67b22f1ad41a1b7effbb59ff28fca1"
+VERSION="1.206"
+HOMEPAGE="https://packages.debian.org/bullseye/netcat-openbsd"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.206.orig.tar.gz"
+MD5SUM="e6639c7931e057282bd1404b6f9fa063"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="%README% libbsd"
-MAINTAINER="Slax-Dude"
-EMAIL="jmfl@sapo.pt"
+MAINTAINER="Duncan Roe"
+EMAIL="duncan_roe@optusnet.com.au"
diff --git a/network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch b/network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch
index 08567c7986..3b9910f182 100644
--- a/network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch
+++ b/network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch
@@ -3,22 +3,17 @@ Date: Mon, 13 Feb 2012 15:59:31 +0800
Subject: port to linux with libsd
---
- Makefile | 17 ++++++++--
- nc.1 | 4 +--
- netcat.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------
- socks.c | 46 +++++++++++++--------------
- 4 files changed, 130 insertions(+), 42 deletions(-)
+ Makefile | 15 ++++++-
+ nc.1 | 3 -
+ netcat.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++---------------
+ socks.c | 48 +++++++++++------------
+ 4 files changed, 140 insertions(+), 57 deletions(-)
-diff --git a/Makefile b/Makefile
-index 150f829..96a6587 100644
--- a/Makefile
+++ b/Makefile
-@@ -1,6 +1,19 @@
--# $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
-+# $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
-
- PROG= nc
- SRCS= netcat.c atomicio.c socks.c
+@@ -5,4 +5,17 @@ SRCS= netcat.c atomicio.c socks.c
+ LDADD+= -ltls -lssl -lcrypto
+ DPADD+= ${LIBTLS} ${LIBSSL} ${LIBCRYPTO}
-.include <bsd.prog.mk>
+LIBS= `pkg-config --libs libbsd` -lresolv
@@ -35,36 +30,44 @@ index 150f829..96a6587 100644
+
+clean:
+ rm -f $(OBJS) nc
-diff --git a/nc.1 b/nc.1
-index 75d1437..b7014a2 100644
--- a/nc.1
+++ b/nc.1
-@@ -146,9 +146,6 @@ Proxy authentication is only supported for HTTP CONNECT proxies at present.
- Specifies the source port
+@@ -213,8 +213,6 @@ Proxy authentication is only supported f
+ Specify the source port
.Nm
should use, subject to privilege restrictions and availability.
--It is an error to use this option in conjunction with the
--.Fl l
--option.
- .It Fl r
- Specifies that source and/or destination ports should be chosen randomly
- instead of sequentially within a range or in the order that the system
-@@ -170,6 +167,7 @@ Change IPv4 TOS value.
+-Cannot be used together with
+-.Fl l .
+ .It Fl R Ar CAfile
+ Load the root CA bundle for TLS certificate verification from
+ .Ar CAfile ,
+@@ -274,6 +272,7 @@ For the IPv4 TOS/IPv6 traffic class valu
may be one of
- .Ar critical ,
- .Ar inetcontrol ,
-+.Ar lowcost ,
- .Ar lowdelay ,
- .Ar netcontrol ,
- .Ar throughput ,
-diff --git a/netcat.c b/netcat.c
-index cc4683a..9b2def2 100644
+ .Cm critical ,
+ .Cm inetcontrol ,
++.Cm lowcost ,
+ .Cm lowdelay ,
+ .Cm netcontrol ,
+ .Cm throughput ,
--- a/netcat.c
+++ b/netcat.c
-@@ -42,6 +42,46 @@
+@@ -32,6 +32,8 @@
+ * *Hobbit* <hobbit@avian.org>.
+ */
+
++#define _GNU_SOURCE
++
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/uio.h>
+@@ -41,6 +43,49 @@
+ #include <netinet/tcp.h>
#include <netinet/ip.h>
#include <arpa/telnet.h>
-
++#ifdef __linux__
++# include <linux/in6.h>
++#endif
++
+#ifndef IPTOS_LOWDELAY
+# define IPTOS_LOWDELAY 0x10
+# define IPTOS_THROUGHPUT 0x08
@@ -104,46 +107,24 @@ index cc4683a..9b2def2 100644
+# define IPTOS_DSCP_EF 0xb8
+#endif /* IPTOS_DSCP_EF */
+
-+
+
+ #include <ctype.h>
#include <err.h>
- #include <errno.h>
- #include <netdb.h>
-@@ -53,6 +93,8 @@
+@@ -56,6 +101,8 @@
+ #include <time.h>
+ #include <tls.h>
#include <unistd.h>
- #include <fcntl.h>
- #include <limits.h>
+#include <bsd/stdlib.h>
+#include <bsd/string.h>
+
#include "atomicio.h"
- #ifndef SUN_LEN
-@@ -118,7 +160,7 @@ main(int argc, char *argv[])
- struct servent *sv;
- socklen_t len;
- struct sockaddr_storage cliaddr;
-- char *proxy;
-+ char *proxy = NULL;
- const char *errstr, *proxyhost = "", *proxyport = NULL;
- struct addrinfo proxyhints;
- char unix_dg_tmp_socket_buf[UNIX_DG_TMP_SOCKET_SIZE];
-@@ -164,7 +206,11 @@ main(int argc, char *argv[])
- errx(1, "interval %s: %s", errstr, optarg);
- break;
- case 'j':
-+# if defined(SO_JUMBO)
- jflag = 1;
-+# else
-+ errx(1, "no jumbo frame support available");
-+# endif
- break;
- case 'k':
- kflag = 1;
-@@ -194,10 +240,14 @@ main(int argc, char *argv[])
+@@ -269,10 +316,14 @@ main(int argc, char *argv[])
uflag = 1;
break;
case 'V':
+# if defined(RT_TABLEID_MAX)
- rtableid = (unsigned int)strtonum(optarg, 0,
+ rtableid = (int)strtonum(optarg, 0,
RT_TABLEID_MAX, &errstr);
if (errstr)
errx(1, "rtable %s: %s", errstr, optarg);
@@ -153,8 +134,8 @@ index cc4683a..9b2def2 100644
break;
case 'v':
vflag = 1;
-@@ -232,7 +282,11 @@ main(int argc, char *argv[])
- errstr, optarg);
+@@ -321,7 +372,11 @@ main(int argc, char *argv[])
+ oflag = optarg;
break;
case 'S':
+# if defined(TCP_MD5SIG)
@@ -165,42 +146,68 @@ index cc4683a..9b2def2 100644
break;
case 'T':
errstr = NULL;
-@@ -259,6 +313,15 @@ main(int argc, char *argv[])
+@@ -346,14 +401,23 @@ main(int argc, char *argv[])
+ argc -= optind;
+ argv += optind;
+
++# if defined(RT_TABLEID_MAX)
+ if (rtableid >= 0)
+ if (setrtable(rtableid) == -1)
+ err(1, "setrtable");
++# endif
+
+ /* Cruft to make sure options are clean, and used properly. */
if (argv[0] && !argv[1] && family == AF_UNIX) {
host = argv[0];
uport = NULL;
+ } else if (!argv[0] && lflag) {
+ if (sflag)
+ errx(1, "cannot use -s and -l");
++ if (pflag)
++ errx(1, "cannot use -p and -l");
+ if (zflag)
+ errx(1, "cannot use -z and -l");
-+ if (pflag)
-+ uport=pflag;
-+ } else if (!lflag && kflag) {
-+ errx(1, "cannot use -k without -l");
} else if (argv[0] && !argv[1]) {
- if (!lflag)
+ if (!lflag)
usage(1);
-@@ -270,14 +333,7 @@ main(int argc, char *argv[])
- } else
- usage(1);
+@@ -389,33 +453,6 @@ main(int argc, char *argv[])
+ }
+ }
+- if (family == AF_UNIX) {
+- if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
+- err(1, "pledge");
+- } else if (Fflag && Pflag) {
+- if (pledge("stdio inet dns sendfd tty", NULL) == -1)
+- err(1, "pledge");
+- } else if (Fflag) {
+- if (pledge("stdio inet dns sendfd", NULL) == -1)
+- err(1, "pledge");
+- } else if (Pflag && usetls) {
+- if (pledge("stdio rpath inet dns tty", NULL) == -1)
+- err(1, "pledge");
+- } else if (Pflag) {
+- if (pledge("stdio inet dns tty", NULL) == -1)
+- err(1, "pledge");
+- } else if (usetls) {
+- if (pledge("stdio rpath inet dns", NULL) == -1)
+- err(1, "pledge");
+- } else if (pledge("stdio inet dns", NULL) == -1)
+- err(1, "pledge");
+-
- if (lflag && sflag)
- errx(1, "cannot use -s and -l");
- if (lflag && pflag)
- errx(1, "cannot use -p and -l");
- if (lflag && zflag)
- errx(1, "cannot use -z and -l");
-- if (!lflag && kflag)
-- errx(1, "must use -l with -k");
-+
-
- /* Get name of temporary socket for unix datagram client */
- if ((family == AF_UNIX) && uflag && !lflag) {
-@@ -286,8 +342,8 @@ main(int argc, char *argv[])
+ if (!lflag && kflag)
+ errx(1, "must use -l with -k");
+ if (uflag && usetls)
+@@ -450,8 +487,8 @@ main(int argc, char *argv[])
} else {
strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX",
- UNIX_DG_TMP_SOCKET_SIZE);
+ UNIX_DG_TMP_SOCKET_SIZE);
- if (mktemp(unix_dg_tmp_socket_buf) == NULL)
- err(1, "mktemp");
+ if (mkstemp(unix_dg_tmp_socket_buf) == -1)
@@ -208,19 +215,7 @@ index cc4683a..9b2def2 100644
unix_dg_tmp_socket = unix_dg_tmp_socket_buf;
}
}
-@@ -563,18 +619,22 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
- res0->ai_protocol)) < 0)
- continue;
-
-+# if defined(RT_TABLEID_MAX)
- if (rtableid) {
- if (setsockopt(s, SOL_SOCKET, SO_RTABLE, &rtableid,
- sizeof(rtableid)) == -1)
- err(1, "setsockopt SO_RTABLE");
- }
-+# endif
-
- /* Bind to a local port or source address if specified. */
+@@ -934,8 +971,10 @@ remote_connect(const char *host, const c
if (sflag || pflag) {
struct addrinfo ahints, *ares;
@@ -229,33 +224,25 @@ index cc4683a..9b2def2 100644
setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
+# endif
memset(&ahints, 0, sizeof(struct addrinfo));
- ahints.ai_family = res0->ai_family;
+ ahints.ai_family = res->ai_family;
ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
-@@ -674,15 +734,23 @@ local_listen(char *host, char *port, struct addrinfo hints)
- res0->ai_protocol)) < 0)
+@@ -1027,9 +1066,15 @@ local_listen(const char *host, const cha
+ res->ai_protocol)) == -1)
continue;
-+# if defined(RT_TABLEID_MAX)
- if (rtableid) {
- if (setsockopt(s, IPPROTO_IP, SO_RTABLE, &rtableid,
- sizeof(rtableid)) == -1)
- err(1, "setsockopt SO_RTABLE");
- }
-+# endif
-+
+ ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x));
+ if (ret == -1)
+ err(1, NULL);
-
++
+# if defined(SO_REUSEPORT)
ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
if (ret == -1)
err(1, NULL);
+# endif
- set_common_sockopts(s);
+ set_common_sockopts(s, res->ai_family);
-@@ -886,21 +954,25 @@ set_common_sockopts(int s)
+@@ -1499,11 +1544,13 @@ set_common_sockopts(int s, int af)
{
int x = 1;
@@ -269,19 +256,57 @@ index cc4683a..9b2def2 100644
if (Dflag) {
if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
&x, sizeof(x)) == -1)
- err(1, NULL);
+@@ -1514,9 +1561,14 @@ set_common_sockopts(int s, int af)
+ IP_TOS, &Tflag, sizeof(Tflag)) == -1)
+ err(1, "set IP ToS");
+
++#if defined(IPV6_TCLASS)
+ else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
+ IPV6_TCLASS, &Tflag, sizeof(Tflag)) == -1)
+ err(1, "set IPv6 traffic class");
++#else
++ else if (af == AF_INET6)
++ errx(1, "can't set IPv6 traffic class (unavailable)");
++#endif
}
-+# if defined(SO_JUMBO)
- if (jflag) {
- if (setsockopt(s, SOL_SOCKET, SO_JUMBO,
- &x, sizeof(x)) == -1)
- err(1, NULL);
+ if (Iflag) {
+ if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
+@@ -1534,19 +1586,34 @@ set_common_sockopts(int s, int af)
+ IP_TTL, &ttl, sizeof(ttl)))
+ err(1, "set IP TTL");
+
++#if defined(IPV6_UNICAST_HOPS)
+ else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
+ IPV6_UNICAST_HOPS, &ttl, sizeof(ttl)))
+ err(1, "set IPv6 unicast hops");
++#else
++ else if (af == AF_INET6)
++ errx(1, "can't set IPv6 unicast hops (unavailable)");
++#endif
}
-+# endif
- if (Tflag != -1) {
- if (setsockopt(s, IPPROTO_IP, IP_TOS,
- &Tflag, sizeof(Tflag)) == -1)
-@@ -949,6 +1021,7 @@ map_tos(char *s, int *val)
+
+ if (minttl != -1) {
++#if defined(IP_MINTTL)
+ if (af == AF_INET && setsockopt(s, IPPROTO_IP,
+ IP_MINTTL, &minttl, sizeof(minttl)))
+ err(1, "set IP min TTL");
++#else
++ if (af == AF_INET)
++ errx(1, "can't set IP min TTL (unavailable)");
++#endif
+
++#if defined(IPV6_MINHOPCOUNT)
+ else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
+ IPV6_MINHOPCOUNT, &minttl, sizeof(minttl)))
+ err(1, "set IPv6 min hop count");
++#else
++ else if (af == AF_INET6)
++ errx(1, "can't set IPv6 min hop count (unavailable)");
++#endif
+ }
+ }
+
+@@ -1581,6 +1648,7 @@ process_tos_opt(char *s, int *val)
{ "cs7", IPTOS_DSCP_CS7 },
{ "ef", IPTOS_DSCP_EF },
{ "inetcontrol", IPTOS_PREC_INTERNETCONTROL },
@@ -289,7 +314,7 @@ index cc4683a..9b2def2 100644
{ "lowdelay", IPTOS_LOWDELAY },
{ "netcontrol", IPTOS_PREC_NETCONTROL },
{ "reliability", IPTOS_RELIABILITY },
-@@ -969,6 +1042,9 @@ map_tos(char *s, int *val)
+@@ -1742,6 +1810,9 @@ report_sock(const char *msg, const struc
void
help(void)
{
@@ -299,16 +324,8 @@ index cc4683a..9b2def2 100644
usage(0);
fprintf(stderr, "\tCommand Summary:\n\
\t-4 Use IPv4\n\
-@@ -978,6 +1054,7 @@ help(void)
- \t-h This help text\n\
- \t-I length TCP receive buffer length\n\
- \t-i secs\t Delay interval for lines sent, ports scanned\n\
-+ \t-j Use jumbo frame\n\
- \t-k Keep inbound sockets open for multiple connects\n\
- \t-l Listen mode, for inbound connects\n\
- \t-n Suppress name/port resolutions\n\
-@@ -998,15 +1075,15 @@ help(void)
- \t-x addr[:port]\tSpecify proxy address and port\n\
+@@ -1784,7 +1855,7 @@ help(void)
+ \t-Z Peer certificate file\n\
\t-z Zero-I/O mode [used for scanning]\n\
Port numbers can be individual or ranges: lo-hi [inclusive]\n");
- exit(1);
@@ -316,18 +333,6 @@ index cc4683a..9b2def2 100644
}
void
- usage(int ret)
- {
- fprintf(stderr,
-- "usage: nc [-46DdhklnrStUuvz] [-I length] [-i interval] [-O length]\n"
-- "\t [-P proxy_username] [-p source_port] [-s source] [-T ToS]\n"
-+ "usage: nc [-46DdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
-+ "\t [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n"
- "\t [-V rtable] [-w timeout] [-X proxy_protocol]\n"
- "\t [-x proxy_address[:port]] [destination] [port]\n");
- if (ret)
-diff --git a/socks.c b/socks.c
-index 71108d5..befd0a9 100644
--- a/socks.c
+++ b/socks.c
@@ -38,7 +38,7 @@
@@ -339,7 +344,7 @@ index 71108d5..befd0a9 100644
#include "atomicio.h"
#define SOCKS_PORT "1080"
-@@ -167,11 +167,11 @@ socks_connect(const char *host, const char *port,
+@@ -217,11 +217,11 @@ socks_connect(const char *host, const ch
buf[2] = SOCKS_NOAUTH;
cnt = atomicio(vwrite, proxyfd, buf, 3);
if (cnt != 3)
@@ -353,7 +358,7 @@ index 71108d5..befd0a9 100644
if (buf[1] == SOCKS_NOMETHOD)
errx(1, "authentication method negotiation failed");
-@@ -220,23 +220,23 @@ socks_connect(const char *host, const char *port,
+@@ -270,11 +270,11 @@ socks_connect(const char *host, const ch
cnt = atomicio(vwrite, proxyfd, buf, wlen);
if (cnt != wlen)
@@ -364,24 +369,25 @@ index 71108d5..befd0a9 100644
if (cnt != 4)
- err(1, "read failed (%zu/4)", cnt);
+ err(1, "read failed (%zu/4)", (size_t)cnt);
- if (buf[1] != 0)
- errx(1, "connection failed, SOCKS error %d", buf[1]);
- switch (buf[3]) {
+ if (buf[1] != 0) {
+ errx(1, "connection failed, SOCKSv5 error: %s",
+ socks5_strerror(buf[1]));
+@@ -283,12 +283,12 @@ socks_connect(const char *host, const ch
case SOCKS_IPV4:
cnt = atomicio(read, proxyfd, buf + 4, 6);
if (cnt != 6)
-- err(1, "read failed (%d/6)", cnt);
-+ err(1, "read failed (%lu/6)", (unsigned long)cnt);
+- err(1, "read failed (%zu/6)", cnt);
++ err(1, "read failed (%zu/6)", (size_t)cnt);
break;
case SOCKS_IPV6:
cnt = atomicio(read, proxyfd, buf + 4, 18);
if (cnt != 18)
-- err(1, "read failed (%d/18)", cnt);
-+ err(1, "read failed (%lu/18)", (unsigned long)cnt);
+- err(1, "read failed (%zu/18)", cnt);
++ err(1, "read failed (%zu/18)", (size_t)cnt);
break;
default:
errx(1, "connection failed, unsupported address type");
-@@ -256,11 +256,11 @@ socks_connect(const char *host, const char *port,
+@@ -308,11 +308,11 @@ socks_connect(const char *host, const ch
cnt = atomicio(vwrite, proxyfd, buf, wlen);
if (cnt != wlen)
@@ -392,10 +398,10 @@ index 71108d5..befd0a9 100644
if (cnt != 8)
- err(1, "read failed (%zu/8)", cnt);
+ err(1, "read failed (%zu/8)", (size_t)cnt);
- if (buf[1] != 90)
- errx(1, "connection failed, SOCKS error %d", buf[1]);
- } else if (socksv == -1) {
-@@ -272,39 +272,39 @@ socks_connect(const char *host, const char *port,
+ if (buf[1] != 90) {
+ errx(1, "connection failed, SOCKSv4 error: %s",
+ socks4_strerror(buf[1]));
+@@ -326,21 +326,21 @@ socks_connect(const char *host, const ch
/* Try to be sane about numeric IPv6 addresses */
if (strchr(host, ':') != NULL) {
@@ -409,7 +415,7 @@ index 71108d5..befd0a9 100644
"CONNECT %s:%d HTTP/1.0\r\n",
host, ntohs(serverport));
}
- if (r == -1 || (size_t)r >= sizeof(buf))
+ if (r < 0 || (size_t)r >= sizeof(buf))
errx(1, "hostname too long");
- r = strlen(buf);
+ r = strlen((char*)buf);
@@ -420,39 +426,44 @@ index 71108d5..befd0a9 100644
+ err(1, "write failed (%zu/%d)", (size_t)cnt, (int)r);
if (authretry > 1) {
- char resp[1024];
+ char proxypass[256];
+@@ -348,20 +348,20 @@ socks_connect(const char *host, const ch
- proxypass = getproxypass(proxyuser, proxyhost);
+ getproxypass(proxyuser, proxyhost,
+ proxypass, sizeof proxypass);
- r = snprintf(buf, sizeof(buf), "%s:%s",
+ r = snprintf((char*)buf, sizeof(buf), "%s:%s",
proxyuser, proxypass);
+ explicit_bzero(proxypass, sizeof proxypass);
if (r == -1 || (size_t)r >= sizeof(buf) ||
- b64_ntop(buf, strlen(buf), resp,
+ b64_ntop(buf, strlen((char*)buf), resp,
sizeof(resp)) == -1)
errx(1, "Proxy username/password too long");
- r = snprintf(buf, sizeof(buf), "Proxy-Authorization: "
-+ r = snprintf((char*)buf, sizeof((char*)buf), "Proxy-Authorization: "
++ r = snprintf((char*)buf, sizeof(buf), "Proxy-Authorization: "
"Basic %s\r\n", resp);
- if (r == -1 || (size_t)r >= sizeof(buf))
+ if (r < 0 || (size_t)r >= sizeof(buf))
errx(1, "Proxy auth response too long");
- r = strlen(buf);
+ r = strlen((char*)buf);
if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r)
- err(1, "write failed (%zu/%d)", cnt, r);
+ err(1, "write failed (%zu/%d)", (size_t)cnt, r);
+ explicit_bzero(proxypass, sizeof proxypass);
+ explicit_bzero(buf, sizeof buf);
}
-
- /* Terminate headers */
-@@ -312,22 +312,22 @@ socks_connect(const char *host, const char *port,
- err(1, "write failed (2/%d)", r);
+@@ -371,23 +371,23 @@ socks_connect(const char *host, const ch
+ err(1, "write failed (%zu/2)", cnt);
/* Read status reply */
- proxy_read_line(proxyfd, buf, sizeof(buf));
+ proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
if (proxyuser != NULL &&
-- strncmp(buf, "HTTP/1.0 407 ", 12) == 0) {
-+ strncmp((char*)buf, "HTTP/1.0 407 ", 12) == 0) {
+- (strncmp(buf, "HTTP/1.0 407 ", 12) == 0 ||
+- strncmp(buf, "HTTP/1.1 407 ", 12) == 0)) {
++ (strncmp((char*)buf, "HTTP/1.0 407 ", 12) == 0 ||
++ strncmp((char*)buf, "HTTP/1.1 407 ", 12) == 0)) {
if (authretry > 1) {
fprintf(stderr, "Proxy authentication "
"failed\n");
@@ -472,4 +483,3 @@ index 71108d5..befd0a9 100644
if (*buf == '\0')
break;
}
---
diff --git a/network/netcat-openbsd/patches/0002-build-without-TLS-support.patch b/network/netcat-openbsd/patches/0002-build-without-TLS-support.patch
new file mode 100644
index 0000000000..c4a72c65af
--- /dev/null
+++ b/network/netcat-openbsd/patches/0002-build-without-TLS-support.patch
@@ -0,0 +1,872 @@
+From: Guilhem Moulin <guilhem@debian.org>
+Date: Fri, 09 Jun 2017 13:21:23 +0200
+Subject: build without TLS support
+
+tls.h isn't available in libsd-dev, and TLS supports adds options (-C, -Z)
+that are already used by our Debian-specific patches.
+
+---
+ Makefile | 2
+ nc.1 | 114 ++---------------------------------------
+ netcat.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
+ 3 files changed, 153 insertions(+), 135 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -2,8 +2,6 @@
+
+ PROG= nc
+ SRCS= netcat.c atomicio.c socks.c
+-LDADD+= -ltls -lssl -lcrypto
+-DPADD+= ${LIBTLS} ${LIBSSL} ${LIBCRYPTO}
+
+ LIBS= `pkg-config --libs libbsd` -lresolv
+ OBJS= $(SRCS:.c=.o)
+--- a/nc.1
++++ b/nc.1
+@@ -33,20 +33,14 @@
+ .Nd arbitrary TCP and UDP connections and listens
+ .Sh SYNOPSIS
+ .Nm nc
+-.Op Fl 46cDdFhklNnrStUuvz
+-.Op Fl C Ar certfile
+-.Op Fl e Ar name
+-.Op Fl H Ar hash
++.Op Fl 46DdFhklNnrStUuvz
+ .Op Fl I Ar length
+ .Op Fl i Ar interval
+-.Op Fl K Ar keyfile
+ .Op Fl M Ar ttl
+ .Op Fl m Ar minttl
+ .Op Fl O Ar length
+-.Op Fl o Ar staplefile
+ .Op Fl P Ar proxy_username
+ .Op Fl p Ar source_port
+-.Op Fl R Ar CAfile
+ .Op Fl s Ar source
+ .Op Fl T Ar keyword
+ .Op Fl V Ar rtable
+@@ -54,7 +48,6 @@
+ .Op Fl w Ar timeout
+ .Op Fl X Ar proxy_protocol
+ .Op Fl x Ar proxy_address Ns Op : Ns Ar port
+-.Op Fl Z Ar peercertfile
+ .Op Ar destination
+ .Op Ar port
+ .Sh DESCRIPTION
+@@ -99,28 +92,10 @@ The options are as follows:
+ Use IPv4 addresses only.
+ .It Fl 6
+ Use IPv6 addresses only.
+-.It Fl C Ar certfile
+-Load the public key part of the TLS peer certificate from
+-.Ar certfile ,
+-in PEM format.
+-Requires
+-.Fl c .
+-.It Fl c
+-Use TLS to connect or listen.
+-Cannot be used together with any of the options
+-.Fl FuU .
+ .It Fl D
+ Enable debugging on the socket.
+ .It Fl d
+ Do not attempt to read from stdin.
+-.It Fl e Ar name
+-Only accept the TLS peer certificate if it contains the
+-.Ar name .
+-Requires
+-.Fl c .
+-If not specified,
+-.Ar destination
+-is used.
+ .It Fl F
+ Pass the first connected socket using
+ .Xr sendmsg 2
+@@ -137,18 +112,7 @@ using the
+ .Cm ProxyUseFdpass
+ option).
+ Cannot be used with
+-.Fl c
+-or
+ .Fl U .
+-.It Fl H Ar hash
+-Only accept the TLS peer certificate if its hash returned from
+-.Xr tls_peer_cert_hash 3
+-matches
+-.Ar hash .
+-Requires
+-.Fl c
+-and cannot be used with
+-.Fl T Cm noverify .
+ .It Fl h
+ Print out the
+ .Nm
+@@ -160,12 +124,6 @@ Sleep for
+ .Ar interval
+ seconds between lines of text sent and received.
+ Also causes a delay time between connections to multiple ports.
+-.It Fl K Ar keyfile
+-Load the TLS private key from
+-.Ar keyfile ,
+-in PEM format.
+-Requires
+-.Fl c .
+ .It Fl k
+ When a connection is completed, listen for another one.
+ Requires
+@@ -196,15 +154,6 @@ Do not do any DNS or service lookups on
+ hostnames or ports.
+ .It Fl O Ar length
+ Specify the size of the TCP send buffer.
+-.It Fl o Ar staplefile
+-During the TLS handshake, load data to be stapled from
+-.Ar staplefile ,
+-which is expected to contain an OCSP response from an OCSP server in
+-DER format.
+-Requires
+-.Fl c
+-and
+-.Fl C .
+ .It Fl P Ar proxy_username
+ Specifies a username to present to a proxy server that requires authentication.
+ If no username is specified then authentication will not be attempted.
+@@ -213,13 +162,6 @@ Proxy authentication is only supported f
+ Specify the source port
+ .Nm
+ should use, subject to privilege restrictions and availability.
+-.It Fl R Ar CAfile
+-Load the root CA bundle for TLS certificate verification from
+-.Ar CAfile ,
+-in PEM format, instead of
+-.Pa /etc/ssl/cert.pem .
+-Requires
+-.Fl c .
+ .It Fl r
+ Choose source and/or destination ports randomly
+ instead of sequentially within a range or in the order that the system
+@@ -239,35 +181,7 @@ Cannot be used together with
+ or
+ .Fl x .
+ .It Fl T Ar keyword
+-Change the IPv4 TOS/IPv6 traffic class value or the TLS options.
+-.Pp
+-For TLS options,
+-.Ar keyword
+-may be one of:
+-.Cm noverify ,
+-which disables certificate verification;
+-.Cm noname ,
+-which disables certificate name checking;
+-.Cm clientcert ,
+-which requires a client certificate on incoming connections; or
+-.Cm muststaple ,
+-which requires the peer to provide a valid stapled OCSP response
+-with the handshake.
+-The following TLS options specify a value in the form of a
+-.Ar key Ns = Ns Ar value
+-pair:
+-.Cm ciphers ,
+-which allows the supported TLS ciphers to be specified (see
+-.Xr tls_config_set_ciphers 3
+-for further details);
+-.Cm protocols ,
+-which allows the supported TLS protocols to be specified (see
+-.Xr tls_config_parse_protocols 3
+-for further details).
+-Specifying TLS options requires
+-.Fl c .
+-.Pp
+-For the IPv4 TOS/IPv6 traffic class value,
++Change the IPv4 TOS/IPv6 traffic class value.
+ .Ar keyword
+ may be one of
+ .Cm critical ,
+@@ -291,13 +205,13 @@ to script telnet sessions.
+ Use
+ .Ux Ns -domain
+ sockets.
+-Cannot be used together with any of the options
+-.Fl cFx .
++Cannot be used together with
++.Fl F
++or
++.Fl x .
+ .It Fl u
+ Use UDP instead of TCP.
+ Cannot be used together with
+-.Fl c
+-or
+ .Fl x .
+ For
+ .Ux Ns -domain
+@@ -360,12 +274,6 @@ An IPv6 address can be specified unambig
+ in square brackets.
+ A proxy cannot be used with any of the options
+ .Fl lsuU .
+-.It Fl Z Ar peercertfile
+-Save the peer certificates to
+-.Ar peercertfile ,
+-in PEM format.
+-Requires
+-.Fl c .
+ .It Fl z
+ Only scan for listening daemons, without sending any data to them.
+ Cannot be used together with
+@@ -519,16 +427,6 @@ the source port, with a timeout of 5 sec
+ .Pp
+ .Dl $ nc -p 31337 -w 5 host.example.com 42
+ .Pp
+-Open a TCP connection to port 443 of www.example.com, and negotiate TLS with
+-any supported TLS protocol version and "compat" ciphers:
+-.Pp
+-.Dl $ nc -cv -T protocols=all -T ciphers=compat www.example.com 443
+-.Pp
+-Open a TCP connection to port 443 of www.google.ca, and negotiate TLS.
+-Check for a different name in the certificate for validation:
+-.Pp
+-.Dl $ nc -cv -e adsf.au.doubleclick.net www.google.ca 443
+-.Pp
+ Open a UDP connection to port 53 of host.example.com:
+ .Pp
+ .Dl $ nc -u host.example.com 53
+--- a/netcat.c
++++ b/netcat.c
+@@ -99,7 +99,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
+-#include <tls.h>
++#ifdef TLS
++# include <tls.h>
++#endif
+ #include <unistd.h>
+ #include <bsd/stdlib.h>
+ #include <bsd/string.h>
+@@ -115,10 +117,12 @@
+ #define POLL_STDOUT 3
+ #define BUFSIZE 16384
+
+-#define TLS_NOVERIFY (1 << 1)
+-#define TLS_NONAME (1 << 2)
+-#define TLS_CCERT (1 << 3)
+-#define TLS_MUSTSTAPLE (1 << 4)
++#ifdef TLS
++# define TLS_NOVERIFY (1 << 1)
++# define TLS_NONAME (1 << 2)
++# define TLS_CCERT (1 << 3)
++# define TLS_MUSTSTAPLE (1 << 4)
++#endif
+
+ /* Command Line Options */
+ int dflag; /* detached, no stdin */
+@@ -144,6 +148,7 @@ int Sflag; /* TCP MD5 signature opti
+ int Tflag = -1; /* IP Type of Service */
+ int rtableid = -1;
+
++# if defined(TLS)
+ int usetls; /* use TLS */
+ const char *Cflag; /* Public cert file */
+ const char *Kflag; /* Private key file */
+@@ -156,6 +161,7 @@ char *tls_expecthash; /* required hash
+ char *tls_ciphers; /* TLS ciphers */
+ char *tls_protocols; /* TLS protocols */
+ FILE *Zflag; /* file to save peer cert */
++# endif
+
+ int recvcount, recvlimit;
+ int timeout = -1;
+@@ -170,10 +176,16 @@ int strtoport(char *portstr, int udp);
+ void build_ports(char *);
+ void help(void) __attribute__((noreturn));
+ int local_listen(const char *, const char *, struct addrinfo);
++# if defined(TLS)
+ void readwrite(int, struct tls *);
++# else
++void readwrite(int);
++# endif
+ void fdpass(int nfd) __attribute__((noreturn));
+ int remote_connect(const char *, const char *, struct addrinfo);
++# if defined(TLS)
+ int timeout_tls(int, struct tls *, int (*)(struct tls *));
++# endif
+ int timeout_connect(int, const struct sockaddr *, socklen_t);
+ int socks_connect(const char *, const char *, struct addrinfo,
+ const char *, const char *, struct addrinfo, int, const char *);
+@@ -183,15 +195,24 @@ int unix_connect(char *);
+ int unix_listen(char *);
+ void set_common_sockopts(int, int);
+ int process_tos_opt(char *, int *);
++# if defined(TLS)
+ int process_tls_opt(char *, int *);
+ void save_peer_cert(struct tls *_tls_ctx, FILE *_fp);
++# endif
+ void report_sock(const char *, const struct sockaddr *, socklen_t, char *);
++# if defined(TLS)
+ void report_tls(struct tls *tls_ctx, char * host);
++# endif
+ void usage(int);
++# if defined(TLS)
+ ssize_t drainbuf(int, unsigned char *, size_t *, struct tls *);
+ ssize_t fillbuf(int, unsigned char *, size_t *, struct tls *);
+ void tls_setup_client(struct tls *, int, char *);
+ struct tls *tls_setup_server(struct tls *, int, char *);
++# else
++ssize_t drainbuf(int, unsigned char *, size_t *);
++ssize_t fillbuf(int, unsigned char *, size_t *);
++# endif
+
+ int
+ main(int argc, char *argv[])
+@@ -206,8 +227,10 @@ main(int argc, char *argv[])
+ const char *errstr;
+ struct addrinfo proxyhints;
+ char unix_dg_tmp_socket_buf[UNIX_DG_TMP_SOCKET_SIZE];
++# if defined(TLS)
+ struct tls_config *tls_cfg = NULL;
+ struct tls *tls_ctx = NULL;
++# endif
+ uint32_t protocols;
+
+ ret = 1;
+@@ -215,12 +238,18 @@ main(int argc, char *argv[])
+ host = NULL;
+ uport = NULL;
+ sv = NULL;
++# if defined(TLS)
+ Rflag = tls_default_ca_cert_file();
++# endif
+
+ signal(SIGPIPE, SIG_IGN);
+
+ while ((ch = getopt(argc, argv,
++# if defined(TLS)
+ "46C:cDde:FH:hI:i:K:klM:m:NnO:o:P:p:R:rSs:T:tUuV:vW:w:X:x:Z:z"))
++# else
++ "46DdFhI:i:klM:m:NnO:P:p:rSs:T:tUuV:vW:w:X:x:z"))
++# endif
+ != -1) {
+ switch (ch) {
+ case '4':
+@@ -242,24 +271,30 @@ main(int argc, char *argv[])
+ else
+ errx(1, "unsupported proxy protocol");
+ break;
++# if defined(TLS)
+ case 'C':
+ Cflag = optarg;
+ break;
+ case 'c':
+ usetls = 1;
+ break;
++# endif
+ case 'd':
+ dflag = 1;
+ break;
++# if defined(TLS)
+ case 'e':
+ tls_expectname = optarg;
+ break;
++# endif
+ case 'F':
+ Fflag = 1;
+ break;
++# if defined(TLS)
+ case 'H':
+ tls_expecthash = optarg;
+ break;
++# endif
+ case 'h':
+ help();
+ break;
+@@ -268,9 +303,11 @@ main(int argc, char *argv[])
+ if (errstr)
+ errx(1, "interval %s: %s", errstr, optarg);
+ break;
++# if defined(TLS)
+ case 'K':
+ Kflag = optarg;
+ break;
++# endif
+ case 'k':
+ kflag = 1;
+ break;
+@@ -299,10 +336,12 @@ main(int argc, char *argv[])
+ case 'p':
+ pflag = optarg;
+ break;
++# if defined(TLS)
+ case 'R':
+ tls_cachanged = 1;
+ Rflag = optarg;
+ break;
++# endif
+ case 'r':
+ rflag = 1;
+ break;
+@@ -344,12 +383,14 @@ main(int argc, char *argv[])
+ if ((proxy = strdup(optarg)) == NULL)
+ err(1, NULL);
+ break;
++# if defined(TLS)
+ case 'Z':
+ if (strcmp(optarg, "-") == 0)
+ Zflag = stderr;
+ else if ((Zflag = fopen(optarg, "w")) == NULL)
+ err(1, "can't open %s", optarg);
+ break;
++# endif
+ case 'z':
+ zflag = 1;
+ break;
+@@ -368,9 +409,11 @@ main(int argc, char *argv[])
+ errx(1, "TCP send window %s: %s",
+ errstr, optarg);
+ break;
++# if defined(TLS)
+ case 'o':
+ oflag = optarg;
+ break;
++# endif
+ case 'S':
+ # if defined(TCP_MD5SIG)
+ Sflag = 1;
+@@ -381,8 +424,10 @@ main(int argc, char *argv[])
+ case 'T':
+ errstr = NULL;
+ errno = 0;
++# if defined(TLS)
+ if (process_tls_opt(optarg, &TLSopt))
+ break;
++# endif
+ if (process_tos_opt(optarg, &Tflag))
+ break;
+ if (strlen(optarg) > 1 && optarg[0] == '0' &&
+@@ -392,7 +437,11 @@ main(int argc, char *argv[])
+ Tflag = (int)strtonum(optarg, 0, 255,
+ &errstr);
+ if (Tflag < 0 || Tflag > 255 || errstr || errno)
++# if defined(TLS)
+ errx(1, "illegal tos/tls value %s", optarg);
++# else
++ errx(1, "illegal tos value %s", optarg);
++# endif
+ break;
+ default:
+ usage(1);
+@@ -429,6 +478,7 @@ main(int argc, char *argv[])
+ } else
+ usage(1);
+
++# if defined(TLS)
+ if (usetls) {
+ if (Cflag && unveil(Cflag, "r") == -1)
+ err(1, "unveil");
+@@ -452,15 +502,19 @@ main(int argc, char *argv[])
+ err(1, "unveil");
+ }
+ }
++# endif
+
+ if (!lflag && kflag)
+ errx(1, "must use -l with -k");
++# if defined(TLS)
+ if (uflag && usetls)
+ errx(1, "cannot use -c and -u");
+ if ((family == AF_UNIX) && usetls)
+ errx(1, "cannot use -c and -U");
++# endif
+ if ((family == AF_UNIX) && Fflag)
+ errx(1, "cannot use -F and -U");
++# if defined(TLS)
+ if (Fflag && usetls)
+ errx(1, "cannot use -c and -F");
+ if (TLSopt && !usetls)
+@@ -479,6 +533,7 @@ main(int argc, char *argv[])
+ errx(1, "you must specify -c to use -H");
+ if (tls_expectname && !usetls)
+ errx(1, "you must specify -c to use -e");
++# endif
+
+ /* Get name of temporary socket for unix datagram client */
+ if ((family == AF_UNIX) && uflag && !lflag) {
+@@ -545,6 +600,7 @@ main(int argc, char *argv[])
+ proxyhints.ai_flags |= AI_NUMERICHOST;
+ }
+
++# if defined(TLS)
+ if (usetls) {
+ if ((tls_cfg = tls_config_new()) == NULL)
+ errx(1, "unable to allocate TLS config");
+@@ -580,7 +636,8 @@ main(int argc, char *argv[])
+ err(1, "pledge");
+ } else if (pledge("stdio inet dns", NULL) == -1)
+ err(1, "pledge");
+- }
++ }
++# endif
+ if (lflag) {
+ ret = 0;
+
+@@ -591,6 +648,7 @@ main(int argc, char *argv[])
+ s = unix_listen(host);
+ }
+
++# if defined(TLS)
+ if (usetls) {
+ tls_config_verify_client_optional(tls_cfg);
+ if ((tls_ctx = tls_server()) == NULL)
+@@ -599,6 +657,7 @@ main(int argc, char *argv[])
+ errx(1, "tls configuration failed (%s)",
+ tls_error(tls_ctx));
+ }
++# endif
+ /* Allow only one connection at a time, but stay alive. */
+ for (;;) {
+ if (family != AF_UNIX) {
+@@ -614,7 +673,11 @@ main(int argc, char *argv[])
+ * let it receive datagrams from multiple
+ * socket pairs.
+ */
++# if defined(TLS)
+ readwrite(s, NULL);
++# else
++ readwrite(s);
++# endif
+ } else if (uflag && !kflag) {
+ /*
+ * For UDP and not -k, we will use recvfrom()
+@@ -639,9 +702,14 @@ main(int argc, char *argv[])
+ report_sock("Connection received",
+ (struct sockaddr *)&z, len, NULL);
+
++# if defined(TLS)
+ readwrite(s, NULL);
+ } else {
+ struct tls *tls_cctx = NULL;
++# else
++ readwrite(s);
++ } else {
++# endif
+ int connfd;
+
+ len = sizeof(cliaddr);
+@@ -655,6 +723,7 @@ main(int argc, char *argv[])
+ report_sock("Connection received",
+ (struct sockaddr *)&cliaddr, len,
+ family == AF_UNIX ? host : NULL);
++# if defined(TLS)
+ if ((usetls) &&
+ (tls_cctx = tls_setup_server(tls_ctx, connfd, host)))
+ readwrite(connfd, tls_cctx);
+@@ -664,6 +733,10 @@ main(int argc, char *argv[])
+ timeout_tls(s, tls_cctx, tls_close);
+ close(connfd);
+ tls_free(tls_cctx);
++# else
++ readwrite(connfd);
++ close(connfd);
++# endif
+ }
+ if (family == AF_UNIX && uflag) {
+ if (connect(s, NULL, 0) == -1)
+@@ -678,7 +751,11 @@ main(int argc, char *argv[])
+
+ if ((s = unix_connect(host)) > 0) {
+ if (!zflag)
++# if defined(TLS)
+ readwrite(s, NULL);
++# else
++ readwrite(s);
++# endif
+ close(s);
+ } else {
+ warn("%s", host);
+@@ -699,6 +776,7 @@ main(int argc, char *argv[])
+ for (s = -1, i = 0; portlist[i] != NULL; i++) {
+ if (s != -1)
+ close(s);
++# if defined(TLS)
+ tls_free(tls_ctx);
+ tls_ctx = NULL;
+
+@@ -709,6 +787,7 @@ main(int argc, char *argv[])
+ errx(1, "tls configuration failed (%s)",
+ tls_error(tls_ctx));
+ }
++# endif
+ if (xflag)
+ s = socks_connect(host, portlist[i], hints,
+ proxy, proxyport, proxyhints, socksv,
+@@ -746,6 +825,7 @@ main(int argc, char *argv[])
+ }
+ if (Fflag)
+ fdpass(s);
++# if defined(TLS)
+ else {
+ if (usetls)
+ tls_setup_client(tls_ctx, s, host);
+@@ -754,13 +834,19 @@ main(int argc, char *argv[])
+ if (tls_ctx)
+ timeout_tls(s, tls_ctx, tls_close);
+ }
++# else
++ else if (!zflag)
++ readwrite(s);
++# endif
+ }
+ }
+
+ if (s != -1)
+ close(s);
++# if defined(TLS)
+ tls_free(tls_ctx);
+ tls_config_free(tls_cfg);
++# endif
+
+ return ret;
+ }
+@@ -802,6 +888,7 @@ unix_bind(char *path, int flags)
+ return s;
+ }
+
++# if defined(TLS)
+ int
+ timeout_tls(int s, struct tls *tls_ctx, int (*func)(struct tls *))
+ {
+@@ -888,6 +975,7 @@ tls_setup_server(struct tls *tls_ctx, in
+ }
+ return NULL;
+ }
++# endif
+
+ /*
+ * unix_connect()
+@@ -1113,7 +1201,11 @@ local_listen(const char *host, const cha
+ * Loop that polls on the network file descriptor and stdin.
+ */
+ void
++# if defined(TLS)
+ readwrite(int net_fd, struct tls *tls_ctx)
++# else
++readwrite(int net_fd)
++# endif
+ {
+ struct pollfd pfd[4];
+ int stdin_fd = STDIN_FILENO;
+@@ -1213,12 +1305,17 @@ readwrite(int net_fd, struct tls *tls_ct
+ /* try to read from stdin */
+ if (pfd[POLL_STDIN].revents & POLLIN && stdinbufpos < BUFSIZE) {
+ ret = fillbuf(pfd[POLL_STDIN].fd, stdinbuf,
++# if defined(TLS)
+ &stdinbufpos, NULL);
+ if (ret == TLS_WANT_POLLIN)
+ pfd[POLL_STDIN].events = POLLIN;
+ else if (ret == TLS_WANT_POLLOUT)
+ pfd[POLL_STDIN].events = POLLOUT;
+- else if (ret == 0 || ret == -1)
++ else
++# else
++ &stdinbufpos);
++# endif
++ if (ret == 0 || ret == -1)
+ pfd[POLL_STDIN].fd = -1;
+ /* read something - poll net out */
+ if (stdinbufpos > 0)
+@@ -1230,12 +1327,17 @@ readwrite(int net_fd, struct tls *tls_ct
+ /* try to write to network */
+ if (pfd[POLL_NETOUT].revents & POLLOUT && stdinbufpos > 0) {
+ ret = drainbuf(pfd[POLL_NETOUT].fd, stdinbuf,
++# if defined(TLS)
+ &stdinbufpos, tls_ctx);
+ if (ret == TLS_WANT_POLLIN)
+ pfd[POLL_NETOUT].events = POLLIN;
+ else if (ret == TLS_WANT_POLLOUT)
+ pfd[POLL_NETOUT].events = POLLOUT;
+- else if (ret == -1)
++ else
++# else
++ &stdinbufpos);
++# endif
++ if (ret == -1)
+ pfd[POLL_NETOUT].fd = -1;
+ /* buffer empty - remove self from polling */
+ if (stdinbufpos == 0)
+@@ -1247,12 +1349,17 @@ readwrite(int net_fd, struct tls *tls_ct
+ /* try to read from network */
+ if (pfd[POLL_NETIN].revents & POLLIN && netinbufpos < BUFSIZE) {
+ ret = fillbuf(pfd[POLL_NETIN].fd, netinbuf,
++# if defined(TLS)
+ &netinbufpos, tls_ctx);
+ if (ret == TLS_WANT_POLLIN)
+ pfd[POLL_NETIN].events = POLLIN;
+ else if (ret == TLS_WANT_POLLOUT)
+ pfd[POLL_NETIN].events = POLLOUT;
+- else if (ret == -1)
++ else
++# else
++ &netinbufpos);
++# endif
++ if (ret == -1)
+ pfd[POLL_NETIN].fd = -1;
+ /* eof on net in - remove from pfd */
+ if (ret == 0) {
+@@ -1279,12 +1386,17 @@ readwrite(int net_fd, struct tls *tls_ct
+ /* try to write to stdout */
+ if (pfd[POLL_STDOUT].revents & POLLOUT && netinbufpos > 0) {
+ ret = drainbuf(pfd[POLL_STDOUT].fd, netinbuf,
++# if defined(TLS)
+ &netinbufpos, NULL);
+ if (ret == TLS_WANT_POLLIN)
+ pfd[POLL_STDOUT].events = POLLIN;
+ else if (ret == TLS_WANT_POLLOUT)
+ pfd[POLL_STDOUT].events = POLLOUT;
+- else if (ret == -1)
++ else
++# else
++ &netinbufpos);
++# endif
++ if (ret == -1)
+ pfd[POLL_STDOUT].fd = -1;
+ /* buffer empty - remove self from polling */
+ if (netinbufpos == 0)
+@@ -1308,21 +1420,31 @@ readwrite(int net_fd, struct tls *tls_ct
+ }
+
+ ssize_t
++# if defined(TLS)
+ drainbuf(int fd, unsigned char *buf, size_t *bufpos, struct tls *tls)
++# else
++drainbuf(int fd, unsigned char *buf, size_t *bufpos)
++# endif
+ {
+ ssize_t n;
+ ssize_t adjust;
+
++# if defined(TLS)
+ if (tls) {
+ n = tls_write(tls, buf, *bufpos);
+ if (n == -1)
+ errx(1, "tls write failed (%s)", tls_error(tls));
+ } else {
++# endif
+ n = write(fd, buf, *bufpos);
+ /* don't treat EAGAIN, EINTR as error */
+ if (n == -1 && (errno == EAGAIN || errno == EINTR))
++# if defined(TLS)
+ n = TLS_WANT_POLLOUT;
+ }
++# else
++ n = -2;
++# endif
+ if (n <= 0)
+ return n;
+ /* adjust buffer */
+@@ -1334,21 +1456,31 @@ drainbuf(int fd, unsigned char *buf, siz
+ }
+
+ ssize_t
++# if defined(TLS)
+ fillbuf(int fd, unsigned char *buf, size_t *bufpos, struct tls *tls)
++# else
++fillbuf(int fd, unsigned char *buf, size_t *bufpos)
++# endif
+ {
+ size_t num = BUFSIZE - *bufpos;
+ ssize_t n;
+
++# if defined(TLS)
+ if (tls) {
+ n = tls_read(tls, buf + *bufpos, num);
+ if (n == -1)
+ errx(1, "tls read failed (%s)", tls_error(tls));
+ } else {
++# endif
+ n = read(fd, buf + *bufpos, num);
+ /* don't treat EAGAIN, EINTR as error */
+ if (n == -1 && (errno == EAGAIN || errno == EINTR))
++# if defined(TLS)
+ n = TLS_WANT_POLLIN;
+ }
++# else
++ n = -2;
++# endif
+ if (n <= 0)
+ return n;
+ *bufpos += n;
+@@ -1666,6 +1798,7 @@ process_tos_opt(char *s, int *val)
+ return 0;
+ }
+
++# if defined(TLS)
+ int
+ process_tls_opt(char *s, int *flags)
+ {
+@@ -1779,6 +1912,7 @@ report_tls(struct tls * tls_ctx, char *
+
+ }
+ }
++# endif
+
+ void
+ report_sock(const char *msg, const struct sockaddr *sa, socklen_t salen,
+@@ -1817,17 +1951,12 @@ help(void)
+ fprintf(stderr, "\tCommand Summary:\n\
+ \t-4 Use IPv4\n\
+ \t-6 Use IPv6\n\
+- \t-C certfile Public key file\n\
+- \t-c Use TLS\n\
+ \t-D Enable the debug socket option\n\
+ \t-d Detach from stdin\n\
+- \t-e name\t Required name in peer certificate\n\
+ \t-F Pass socket fd\n\
+- \t-H hash\t Hash string of peer certificate\n\
+ \t-h This help text\n\
+ \t-I length TCP receive buffer length\n\
+ \t-i interval Delay interval for lines sent, ports scanned\n\
+- \t-K keyfile Private key file\n\
+ \t-k Keep inbound sockets open for multiple connects\n\
+ \t-l Listen mode, for inbound connects\n\
+ \t-M ttl Outgoing TTL / Hop Limit\n\
+@@ -1835,14 +1964,12 @@ help(void)
+ \t-N Shutdown the network socket after EOF on stdin\n\
+ \t-n Suppress name/port resolutions\n\
+ \t-O length TCP send buffer length\n\
+- \t-o staplefile Staple file\n\
+ \t-P proxyuser\tUsername for proxy authentication\n\
+ \t-p port\t Specify local port for remote connects\n\
+- \t-R CAfile CA bundle\n\
+ \t-r Randomize remote ports\n\
+ \t-S Enable the TCP MD5 signature option\n\
+ \t-s source Local source address\n\
+- \t-T keyword TOS value or TLS options\n\
++ \t-T keyword TOS value\n\
+ \t-t Answer TELNET negotiation\n\
+ \t-U Use UNIX domain socket\n\
+ \t-u UDP mode\n\
+@@ -1852,7 +1979,6 @@ help(void)
+ \t-w timeout Timeout for connects and final net reads\n\
+ \t-X proto Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\
+ \t-x addr[:port]\tSpecify proxy address and port\n\
+- \t-Z Peer certificate file\n\
+ \t-z Zero-I/O mode [used for scanning]\n\
+ Port numbers can be individual or ranges: lo-hi [inclusive]\n");
+ exit(0);
+@@ -1862,15 +1988,11 @@ void
+ usage(int ret)
+ {
+ fprintf(stderr,
+- "usage: nc [-46cDdFhklNnrStUuvz] [-C certfile] [-e name] "
+- "[-H hash] [-I length]\n"
+- "\t [-i interval] [-K keyfile] [-M ttl] [-m minttl] [-O length]\n"
+- "\t [-o staplefile] [-P proxy_username] [-p source_port] "
+- "[-R CAfile]\n"
++ "usage: nc [-46DdFhklNnrStUuvz] [-I length] [-i interval] [-M ttl]\n"
++ "\t [-m minttl] [-O length] [-P proxy_username] [-p source_port]\n"
+ "\t [-s source] [-T keyword] [-V rtable] [-W recvlimit] "
+ "[-w timeout]\n"
+ "\t [-X proxy_protocol] [-x proxy_address[:port]] "
+- "[-Z peercertfile]\n"
+ "\t [destination] [port]\n");
+ if (ret)
+ exit(1);
diff --git a/network/netcat-openbsd/patches/0002-connect-timeout.patch b/network/netcat-openbsd/patches/0003-connect-timeout.patch
index 30d1d550e1..dd73c1d601 100644
--- a/network/netcat-openbsd/patches/0002-connect-timeout.patch
+++ b/network/netcat-openbsd/patches/0003-connect-timeout.patch
@@ -3,16 +3,22 @@ Date: Mon, 13 Feb 2012 14:43:56 +0800
Subject: connect timeout
---
- netcat.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 75 insertions(+), 2 deletions(-)
+ netcat.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 76 insertions(+), 2 deletions(-)
-diff --git a/netcat.c b/netcat.c
-index 9b2def2..f3cc8c1 100644
--- a/netcat.c
+++ b/netcat.c
-@@ -106,6 +106,10 @@
- #define PORT_MAX_LEN 6
- #define UNIX_DG_TMP_SOCKET_SIZE 19
+@@ -90,6 +90,7 @@
+ #include <ctype.h>
+ #include <err.h>
+ #include <errno.h>
++#include <fcntl.h>
+ #include <limits.h>
+ #include <netdb.h>
+ #include <poll.h>
+@@ -124,6 +125,10 @@
+ # define TLS_MUSTSTAPLE (1 << 4)
+ #endif
+#define CONNECTION_SUCCESS 0
+#define CONNECTION_FAILED 1
@@ -20,10 +26,10 @@ index 9b2def2..f3cc8c1 100644
+
/* Command Line Options */
int dflag; /* detached, no stdin */
- unsigned int iflag; /* Interval Flag */
-@@ -151,6 +155,9 @@ void set_common_sockopts(int);
- int map_tos(char *, int *);
- void usage(int);
+ int Fflag; /* fdpass sock to stdout */
+@@ -214,6 +219,9 @@ ssize_t drainbuf(int, unsigned char *, s
+ ssize_t fillbuf(int, unsigned char *, size_t *);
+ # endif
+static int connect_with_timeout(int fd, const struct sockaddr *sa,
+ socklen_t salen, int ctimeout);
@@ -31,25 +37,25 @@ index 9b2def2..f3cc8c1 100644
int
main(int argc, char *argv[])
{
-@@ -651,11 +658,14 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
+@@ -1079,11 +1087,14 @@ remote_connect(const char *host, const c
- set_common_sockopts(s);
+ set_common_sockopts(s, res->ai_family);
-- if (timeout_connect(s, res0->ai_addr, res0->ai_addrlen) == 0)
-+ if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS)
+- if (timeout_connect(s, res->ai_addr, res->ai_addrlen) == 0)
++ if ((error = connect_with_timeout(s, res->ai_addr, res->ai_addrlen, timeout)) == CONNECTION_SUCCESS)
break;
-- else if (vflag)
-+ else if (vflag && error == CONNECTION_FAILED)
+- if (vflag)
++ if (vflag && error == CONNECTION_FAILED)
warn("connect to %s port %s (%s) failed", host, port,
uflag ? "udp" : "tcp");
+ else if (vflag && error == CONNECTION_TIMEOUT)
+ warn("connect to %s port %s (%s) timed out", host, port,
+ uflag ? "udp" : "tcp");
+ save_errno = errno;
close(s);
- s = -1;
-@@ -703,6 +713,69 @@ timeout_connect(int s, const struct sockaddr *name, socklen_t namelen)
- return (ret);
+@@ -1124,6 +1135,69 @@ timeout_connect(int s, const struct sock
+ return ret;
}
+static int connect_with_timeout(int fd, const struct sockaddr *sa,
@@ -118,4 +124,3 @@ index 9b2def2..f3cc8c1 100644
/*
* local_listen()
* Returns a socket listening on a local port, binds to specified source
---
diff --git a/network/netcat-openbsd/patches/0003-get-sev-by-name.patch b/network/netcat-openbsd/patches/0003-get-sev-by-name.patch
deleted file mode 100644
index 1d1cca8a46..0000000000
--- a/network/netcat-openbsd/patches/0003-get-sev-by-name.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 14:45:08 +0800
-Subject: get sev by name
-
----
- netcat.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/netcat.c b/netcat.c
-index f3cc8c1..d912544 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -949,12 +949,19 @@ atelnet(int nfd, unsigned char *buf, unsigned int size)
- void
- build_ports(char *p)
- {
-+ struct servent *sv;
- const char *errstr;
- char *n;
- int hi, lo, cp;
- int x = 0;
-
-- if ((n = strchr(p, '-')) != NULL) {
-+ sv = getservbyname(p, uflag ? "udp" : "tcp");
-+ if (sv) {
-+ portlist[0] = calloc(1, PORT_MAX_LEN);
-+ if (portlist[0] == NULL)
-+ err(1, NULL);
-+ snprintf(portlist[0], PORT_MAX_LEN, "%d", ntohs(sv->s_port));
-+ } else if ((n = strchr(p, '-')) != NULL) {
- *n = '\0';
- n++;
-
---
diff --git a/network/netcat-openbsd/patches/0004-get-sev-by-name.patch b/network/netcat-openbsd/patches/0004-get-sev-by-name.patch
new file mode 100644
index 0000000000..e0734b9c03
--- /dev/null
+++ b/network/netcat-openbsd/patches/0004-get-sev-by-name.patch
@@ -0,0 +1,28 @@
+From: Aron Xu <aron@debian.org>
+Date: Mon, 13 Feb 2012 14:45:08 +0800
+Subject: get sev by name
+
+---
+ netcat.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/netcat.c
++++ b/netcat.c
+@@ -1680,11 +1680,16 @@ strtoport(char *portstr, int udp)
+ void
+ build_ports(char *p)
+ {
++ struct servent *sv;
+ char *n;
+ int hi, lo, cp;
+ int x = 0;
+
+- if (isdigit((unsigned char)*p) && (n = strchr(p, '-')) != NULL) {
++ sv = getservbyname(p, uflag ? "udp" : "tcp");
++ if (sv) {
++ if (asprintf(&portlist[0], "%d", ntohs(sv->s_port)) < 0)
++ err(1, "asprintf");
++ } else if (isdigit((unsigned char)*p) && (n = strchr(p, '-')) != NULL) {
+ *n = '\0';
+ n++;
+
diff --git a/network/netcat-openbsd/patches/0004-poll-hup.patch b/network/netcat-openbsd/patches/0004-poll-hup.patch
deleted file mode 100644
index 14923cbfa2..0000000000
--- a/network/netcat-openbsd/patches/0004-poll-hup.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:08:33 +0800
-Subject: poll hup
-
----
- netcat.c | 24 +++++++++++++++++-------
- 1 file changed, 17 insertions(+), 7 deletions(-)
-
-diff --git a/netcat.c b/netcat.c
-index d912544..fdaca44 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -884,9 +884,7 @@ readwrite(int nfd)
- if ((n = read(nfd, buf, plen)) < 0)
- return;
- else if (n == 0) {
-- shutdown(nfd, SHUT_RD);
-- pfd[0].fd = -1;
-- pfd[0].events = 0;
-+ goto shutdown_rd;
- } else {
- if (tflag)
- atelnet(nfd, buf, n);
-@@ -894,18 +892,30 @@ readwrite(int nfd)
- return;
- }
- }
-+ else if (pfd[0].revents & POLLHUP) {
-+ shutdown_rd:
-+ shutdown(nfd, SHUT_RD);
-+ pfd[0].fd = -1;
-+ pfd[0].events = 0;
-+ }
-
-- if (!dflag && pfd[1].revents & POLLIN) {
-+ if (!dflag) {
-+ if(pfd[1].revents & POLLIN) {
- if ((n = read(wfd, buf, plen)) < 0)
- return;
- else if (n == 0) {
-- shutdown(nfd, SHUT_WR);
-- pfd[1].fd = -1;
-- pfd[1].events = 0;
-+ goto shutdown_wr;
- } else {
- if (atomicio(vwrite, nfd, buf, n) != n)
- return;
- }
-+ }
-+ else if (pfd[1].revents & POLLHUP) {
-+ shutdown_wr:
-+ shutdown(nfd, SHUT_WR);
-+ pfd[1].fd = -1;
-+ pfd[1].events = 0;
-+ }
- }
- }
- }
---
diff --git a/network/netcat-openbsd/patches/0005-send-crlf.patch b/network/netcat-openbsd/patches/0005-send-crlf.patch
index 1a5fc6eeb8..ecbeb3b810 100644
--- a/network/netcat-openbsd/patches/0005-send-crlf.patch
+++ b/network/netcat-openbsd/patches/0005-send-crlf.patch
@@ -3,33 +3,34 @@ Date: Mon, 13 Feb 2012 14:57:45 +0800
Subject: send crlf
---
- nc.1 | 6 ++++--
- netcat.c | 21 +++++++++++++++++----
- 2 files changed, 21 insertions(+), 6 deletions(-)
+ nc.1 | 9 +++++--
+ netcat.c | 74 ++++++++++++++++++++++++++++++++++-----------------------------
+ 2 files changed, 48 insertions(+), 35 deletions(-)
-diff --git a/nc.1 b/nc.1
-index b7014a2..af44976 100644
--- a/nc.1
+++ b/nc.1
-@@ -34,7 +34,7 @@
+@@ -33,7 +33,7 @@
+ .Nd arbitrary TCP and UDP connections and listens
.Sh SYNOPSIS
.Nm nc
- .Bk -words
--.Op Fl 46DdhklnrStUuvz
-+.Op Fl 46CDdhklnrStUuvz
+-.Op Fl 46DdFhklNnrStUuvz
++.Op Fl 46CDdFhklNnrStUuvz
.Op Fl I Ar length
.Op Fl i Ar interval
- .Op Fl O Ar length
-@@ -98,6 +98,8 @@ to use IPv4 addresses only.
- Forces
- .Nm
- to use IPv6 addresses only.
+ .Op Fl M Ar ttl
+@@ -92,6 +92,11 @@ The options are as follows:
+ Use IPv4 addresses only.
+ .It Fl 6
+ Use IPv6 addresses only.
+.It Fl C
-+Send CRLF as line-ending.
++Send CRLF as line-ending. Each line feed (LF) character from the input
++data is translated into CR+LF before being written to the socket. Line
++feed characters that are already preceded with a carriage return (CR)
++are not translated. Received data is not affected.
.It Fl D
Enable debugging on the socket.
.It Fl d
-@@ -355,7 +357,7 @@ More complicated examples can be built up when the user knows the format
+@@ -377,7 +382,7 @@ More complicated examples can be built u
of requests required by the server.
As another example, an email may be submitted to an SMTP server using:
.Bd -literal -offset indent
@@ -38,71 +39,154 @@ index b7014a2..af44976 100644
HELO host.example.com
MAIL FROM:\*(Ltuser@host.example.com\*(Gt
RCPT TO:\*(Ltuser2@host.example.com\*(Gt
-diff --git a/netcat.c b/netcat.c
-index fdaca44..4f4d2bf 100644
--- a/netcat.c
+++ b/netcat.c
-@@ -111,6 +111,7 @@
- #define CONNECTION_TIMEOUT 2
+@@ -166,6 +166,8 @@ char *tls_expecthash; /* required hash
+ char *tls_ciphers; /* TLS ciphers */
+ char *tls_protocols; /* TLS protocols */
+ FILE *Zflag; /* file to save peer cert */
++# else
++int Cflag = 0; /* CRLF line-ending */
+ # endif
- /* Command Line Options */
-+int Cflag = 0; /* CRLF line-ending */
- int dflag; /* detached, no stdin */
- unsigned int iflag; /* Interval Flag */
- int jflag; /* use jumbo frames if we can */
-@@ -180,7 +181,7 @@ main(int argc, char *argv[])
- sv = NULL;
+ int recvcount, recvlimit;
+@@ -215,7 +217,7 @@ ssize_t fillbuf(int, unsigned char *, si
+ void tls_setup_client(struct tls *, int, char *);
+ struct tls *tls_setup_server(struct tls *, int, char *);
+ # else
+-ssize_t drainbuf(int, unsigned char *, size_t *);
++ssize_t drainbuf(int, unsigned char *, size_t *, int);
+ ssize_t fillbuf(int, unsigned char *, size_t *);
+ # endif
- while ((ch = getopt(argc, argv,
-- "46DdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
-+ "46CDdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
+@@ -256,7 +258,7 @@ main(int argc, char *argv[])
+ # if defined(TLS)
+ "46C:cDde:FH:hI:i:K:klM:m:NnO:o:P:p:R:rSs:T:tUuV:vW:w:X:x:Z:z"))
+ # else
+- "46DdFhI:i:klM:m:NnO:P:p:rSs:T:tUuV:vW:w:X:x:z"))
++ "46CDdFhI:i:klM:m:NnO:P:p:rSs:T:tUuV:vW:w:X:x:z"))
+ # endif
+ != -1) {
switch (ch) {
- case '4':
- family = AF_INET;
-@@ -309,6 +310,9 @@ main(int argc, char *argv[])
- if (Tflag < 0 || Tflag > 255 || errstr || errno)
- errx(1, "illegal tos value %s", optarg);
+@@ -286,6 +288,10 @@ main(int argc, char *argv[])
+ case 'c':
+ usetls = 1;
break;
-+ case 'C':
-+ Cflag = 1;
-+ break;
- default:
- usage(1);
- }
-@@ -906,8 +910,16 @@ readwrite(int nfd)
- else if (n == 0) {
- goto shutdown_wr;
- } else {
-- if (atomicio(vwrite, nfd, buf, n) != n)
-- return;
-+ if ((Cflag) && (buf[n-1]=='\n')) {
-+ if (atomicio(vwrite, nfd, buf, n-1) != (n-1))
-+ return;
-+ if (atomicio(vwrite, nfd, "\r\n", 2) != 2)
-+ return;
-+ }
-+ else {
-+ if (atomicio(vwrite, nfd, buf, n) != n)
-+ return;
-+ }
- }
- }
- else if (pfd[1].revents & POLLHUP) {
-@@ -1139,6 +1151,7 @@ help(void)
++# else
++ case 'C':
++ Cflag = 1;
++ break;
+ # endif
+ case 'd':
+ dflag = 1;
+@@ -1324,12 +1330,6 @@ readwrite(int net_fd)
+ stdinbufpos == 0 && netinbufpos == 0)
+ return;
+
+- /* help says -i is for "wait between lines sent". We read and
+- * write arbitrary amounts of data, and we don't want to start
+- * scanning for newlines, so this is as good as it gets */
+- if (iflag)
+- sleep(iflag);
+-
+ /* poll */
+ num_fds = poll(pfd, 4, timeout);
+
+@@ -1409,7 +1409,7 @@ readwrite(int net_fd)
+ pfd[POLL_NETOUT].events = POLLOUT;
+ else
+ # else
+- &stdinbufpos);
++ &stdinbufpos, (iflag || Cflag) ? 1 : 0);
+ # endif
+ if (ret == -1)
+ pfd[POLL_NETOUT].fd = -1;
+@@ -1468,7 +1468,7 @@ readwrite(int net_fd)
+ pfd[POLL_STDOUT].events = POLLOUT;
+ else
+ # else
+- &netinbufpos);
++ &netinbufpos, 0);
+ # endif
+ if (ret == -1)
+ pfd[POLL_STDOUT].fd = -1;
+@@ -1494,33 +1494,40 @@ readwrite(int net_fd)
+ }
+
+ ssize_t
+-# if defined(TLS)
+-drainbuf(int fd, unsigned char *buf, size_t *bufpos, struct tls *tls)
+-# else
+-drainbuf(int fd, unsigned char *buf, size_t *bufpos)
+-# endif
++drainbuf(int fd, unsigned char *buf, size_t *bufpos, int oneline)
+ {
+- ssize_t n;
++ ssize_t n, r;
+ ssize_t adjust;
++ unsigned char *lf = NULL;
+
+-# if defined(TLS)
+- if (tls) {
+- n = tls_write(tls, buf, *bufpos);
+- if (n == -1)
+- errx(1, "tls write failed (%s)", tls_error(tls));
+- } else {
+-# endif
+- n = write(fd, buf, *bufpos);
+- /* don't treat EAGAIN, EINTR as error */
+- if (n == -1 && (errno == EAGAIN || errno == EINTR))
+-# if defined(TLS)
+- n = TLS_WANT_POLLOUT;
+- }
+-# else
+- n = -2;
+-# endif
++ if (oneline)
++ lf = memchr(buf, '\n', *bufpos);
++ if (lf == NULL) {
++ n = *bufpos;
++ oneline = 0;
++ }
++ else if (Cflag && (lf == buf || buf[lf - buf - 1] != '\r')) {
++ n = lf - buf;
++ oneline = 2;
++ }
++ else
++ n = lf - buf + 1;
++ if (n > 0)
++ n = write(fd, buf, n);
++
++ /* don't treat EAGAIN, EINTR as error */
++ if (n == -1 && (errno == EAGAIN || errno == EINTR))
++ n = -2;
++ if (oneline == 2 && n >= 0)
++ n++;
+ if (n <= 0)
+ return n;
++
++ if (oneline == 2 && (r = atomicio(vwrite, fd, "\r\n", 2)) != 2)
++ err(1, "write failed (%zu/2)", r);
++ if (oneline > 0 && iflag)
++ sleep(iflag);
++
+ /* adjust buffer */
+ adjust = *bufpos - n;
+ if (adjust > 0)
+@@ -2030,6 +2037,7 @@ help(void)
fprintf(stderr, "\tCommand Summary:\n\
\t-4 Use IPv4\n\
\t-6 Use IPv6\n\
+ \t-C Send CRLF as line-ending\n\
\t-D Enable the debug socket option\n\
\t-d Detach from stdin\n\
- \t-h This help text\n\
-@@ -1172,7 +1185,7 @@ void
+ \t-F Pass socket fd\n\
+@@ -2067,7 +2075,7 @@ void
usage(int ret)
{
fprintf(stderr,
-- "usage: nc [-46DdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
-+ "usage: nc [-46CDdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
- "\t [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n"
- "\t [-V rtable] [-w timeout] [-X proxy_protocol]\n"
- "\t [-x proxy_address[:port]] [destination] [port]\n");
---
+- "usage: nc [-46DdFhklNnrStUuvz] [-I length] [-i interval] [-M ttl]\n"
++ "usage: nc [-46CDdFhklNnrStUuvz] [-I length] [-i interval] [-M ttl]\n"
+ "\t [-m minttl] [-O length] [-P proxy_username] [-p source_port]\n"
+ "\t [-s source] [-T keyword] [-V rtable] [-W recvlimit] "
+ "[-w timeout]\n"
diff --git a/network/netcat-openbsd/patches/0006-quit-timer.patch b/network/netcat-openbsd/patches/0006-quit-timer.patch
index 40d6a2a3a5..4d64cc100a 100644
--- a/network/netcat-openbsd/patches/0006-quit-timer.patch
+++ b/network/netcat-openbsd/patches/0006-quit-timer.patch
@@ -3,120 +3,132 @@ Date: Mon, 13 Feb 2012 15:16:04 +0800
Subject: quit timer
---
- nc.1 | 5 +++++
- netcat.c | 38 +++++++++++++++++++++++++++++++++-----
- 2 files changed, 38 insertions(+), 5 deletions(-)
+ nc.1 | 10 ++++++++++
+ netcat.c | 50 +++++++++++++++++++++++++++++++++++++++++---------
+ 2 files changed, 51 insertions(+), 9 deletions(-)
-diff --git a/nc.1 b/nc.1
-index af44976..0d92b74 100644
--- a/nc.1
+++ b/nc.1
-@@ -40,6 +40,7 @@
+@@ -41,6 +41,7 @@
.Op Fl O Ar length
.Op Fl P Ar proxy_username
.Op Fl p Ar source_port
+.Op Fl q Ar seconds
.Op Fl s Ar source
- .Op Fl T Ar toskeyword
+ .Op Fl T Ar keyword
.Op Fl V Ar rtable
-@@ -148,6 +149,10 @@ Proxy authentication is only supported for HTTP CONNECT proxies at present.
- Specifies the source port
+@@ -167,6 +168,15 @@ Proxy authentication is only supported f
+ Specify the source port
.Nm
should use, subject to privilege restrictions and availability.
+.It Fl q Ar seconds
-+after EOF on stdin, wait the specified number of seconds and then quit. If
++after EOF on stdin, wait the specified number of
+.Ar seconds
-+is negative, wait forever.
++and then quit. If
++.Ar seconds
++is negative, wait forever (default). Specifying a non-negative
++.Ar seconds
++implies
++.Fl N .
.It Fl r
- Specifies that source and/or destination ports should be chosen randomly
+ Choose source and/or destination ports randomly
instead of sequentially within a range or in the order that the system
-diff --git a/netcat.c b/netcat.c
-index 4f4d2bf..29ecf1a 100644
--- a/netcat.c
+++ b/netcat.c
-@@ -86,6 +86,7 @@
- #include <errno.h>
- #include <netdb.h>
- #include <poll.h>
-+#include <signal.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -120,6 +121,7 @@ int lflag; /* Bind to local port */
+@@ -139,6 +139,7 @@ int Nflag; /* shutdown() network soc
int nflag; /* Don't do name look up */
char *Pflag; /* Proxy username */
char *pflag; /* Localport flag */
-+int qflag = 0; /* Quit after some secs */
++int qflag = -1; /* Quit after some secs */
int rflag; /* Random ports flag */
char *sflag; /* Source Address */
int tflag; /* Telnet Emulation */
-@@ -158,6 +160,7 @@ void usage(int);
-
+@@ -224,6 +225,8 @@ ssize_t fillbuf(int, unsigned char *, si
static int connect_with_timeout(int fd, const struct sockaddr *sa,
socklen_t salen, int ctimeout);
-+static void quit();
++static void quit();
++
int
main(int argc, char *argv[])
-@@ -181,7 +184,7 @@ main(int argc, char *argv[])
- sv = NULL;
+ {
+@@ -256,9 +259,9 @@ main(int argc, char *argv[])
while ((ch = getopt(argc, argv,
-- "46CDdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
-+ "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:z")) != -1) {
+ # if defined(TLS)
+- "46C:cDde:FH:hI:i:K:klM:m:NnO:o:P:p:R:rSs:T:tUuV:vW:w:X:x:Z:z"))
++ "46C:cDde:FH:hI:i:K:klM:m:NnO:o:P:p:q:R:rSs:T:tUuV:vW:w:X:x:Z:z"))
+ # else
+- "46CDdFhI:i:klM:m:NnO:P:p:rSs:T:tUuV:vW:w:X:x:z"))
++ "46CDdFhI:i:klM:m:NnO:P:p:q:rSs:T:tUuV:vW:w:X:x:z"))
+ # endif
+ != -1) {
switch (ch) {
- case '4':
- family = AF_INET;
-@@ -235,6 +238,11 @@ main(int argc, char *argv[])
+@@ -350,6 +353,13 @@ main(int argc, char *argv[])
case 'p':
pflag = optarg;
break;
-+ case 'q':
++ case 'q':
+ qflag = strtonum(optarg, INT_MIN, INT_MAX, &errstr);
+ if (errstr)
+ errx(1, "quit timer %s: %s", errstr, optarg);
++ if (qflag >= 0)
++ Nflag = 1;
+ break;
- case 'r':
- rflag = 1;
- break;
-@@ -924,9 +932,18 @@ readwrite(int nfd)
- }
- else if (pfd[1].revents & POLLHUP) {
- shutdown_wr:
-+ /* if the user asked to exit on EOF, do it */
-+ if (qflag == 0) {
- shutdown(nfd, SHUT_WR);
-- pfd[1].fd = -1;
-- pfd[1].events = 0;
-+ close(wfd);
-+ }
-+ /* if user asked to die after a while, arrange for it */
-+ if (qflag > 0) {
-+ signal(SIGALRM, quit);
-+ alarm(qflag);
-+ }
-+ pfd[1].fd = -1;
-+ pfd[1].events = 0;
- }
- }
- }
-@@ -1164,6 +1181,7 @@ help(void)
+ # if defined(TLS)
+ case 'R':
+ tls_cachanged = 1;
+@@ -1320,15 +1330,27 @@ readwrite(int net_fd)
+ while (1) {
+ /* both inputs are gone, buffers are empty, we are done */
+ if (pfd[POLL_STDIN].fd == -1 && pfd[POLL_NETIN].fd == -1 &&
+- stdinbufpos == 0 && netinbufpos == 0)
+- return;
++ stdinbufpos == 0 && netinbufpos == 0) {
++ if (qflag <= 0)
++ return;
++ goto delay_exit;
++ }
+ /* both outputs are gone, we can't continue */
+- if (pfd[POLL_NETOUT].fd == -1 && pfd[POLL_STDOUT].fd == -1)
+- return;
++ if (pfd[POLL_NETOUT].fd == -1 && pfd[POLL_STDOUT].fd == -1) {
++ if (qflag <= 0)
++ return;
++ goto delay_exit;
++ }
+ /* listen and net in gone, queues empty, done */
+ if (lflag && pfd[POLL_NETIN].fd == -1 &&
+- stdinbufpos == 0 && netinbufpos == 0)
+- return;
++ stdinbufpos == 0 && netinbufpos == 0) {
++ if (qflag <= 0)
++ return;
++delay_exit:
++ close(net_fd);
++ signal(SIGALRM, quit);
++ alarm(qflag);
++ }
+
+ /* poll */
+ num_fds = poll(pfd, 4, timeout);
+@@ -2053,6 +2075,7 @@ help(void)
\t-O length TCP send buffer length\n\
\t-P proxyuser\tUsername for proxy authentication\n\
\t-p port\t Specify local port for remote connects\n\
-+ \t-q secs\t quit after EOF on stdin and delay of secs\n\
++ \t-q secs\t quit after EOF on stdin and delay of secs\n\
\t-r Randomize remote ports\n\
\t-S Enable the TCP MD5 signature option\n\
- \t-s addr\t Local source address\n\
-@@ -1186,9 +1204,19 @@ usage(int ret)
- {
+ \t-s source Local source address\n\
+@@ -2077,10 +2100,19 @@ usage(int ret)
fprintf(stderr,
- "usage: nc [-46CDdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n"
-- "\t [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n"
-- "\t [-V rtable] [-w timeout] [-X proxy_protocol]\n"
-+ "\t [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n"
-+ "\t [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n"
- "\t [-x proxy_address[:port]] [destination] [port]\n");
+ "usage: nc [-46CDdFhklNnrStUuvz] [-I length] [-i interval] [-M ttl]\n"
+ "\t [-m minttl] [-O length] [-P proxy_username] [-p source_port]\n"
+- "\t [-s source] [-T keyword] [-V rtable] [-W recvlimit] "
++ "\t [-q seconds] [-s source] [-T keyword] [-V rtable] [-W recvlimit] "
+ "[-w timeout]\n"
+ "\t [-X proxy_protocol] [-x proxy_address[:port]] "
+ "\t [destination] [port]\n");
if (ret)
exit(1);
}
@@ -127,7 +139,5 @@ index 4f4d2bf..29ecf1a 100644
+ */
+static void quit()
+{
-+ /* XXX: should explicitly close fds here */
-+ exit(0);
++ exit(0);
+}
---
diff --git a/network/netcat-openbsd/patches/0007-udp-scan-timeout.patch b/network/netcat-openbsd/patches/0007-udp-scan-timeout.patch
index c63775a495..85cd186cce 100644
--- a/network/netcat-openbsd/patches/0007-udp-scan-timeout.patch
+++ b/network/netcat-openbsd/patches/0007-udp-scan-timeout.patch
@@ -3,23 +3,21 @@ Date: Mon, 13 Feb 2012 15:29:37 +0800
Subject: udp scan timeout
---
- netcat.c | 25 ++++++++++++++++---------
- 1 file changed, 16 insertions(+), 9 deletions(-)
+ netcat.c | 23 +++++++++++++++--------
+ 1 file changed, 15 insertions(+), 8 deletions(-)
-diff --git a/netcat.c b/netcat.c
-index 29ecf1a..baab909 100644
--- a/netcat.c
+++ b/netcat.c
-@@ -111,6 +111,8 @@
+@@ -129,6 +129,8 @@
#define CONNECTION_FAILED 1
#define CONNECTION_TIMEOUT 2
+#define UDP_SCAN_TIMEOUT 3 /* Seconds */
+
/* Command Line Options */
- int Cflag = 0; /* CRLF line-ending */
int dflag; /* detached, no stdin */
-@@ -497,7 +499,7 @@ main(int argc, char *argv[])
+ int Fflag; /* fdpass sock to stdout */
+@@ -823,7 +825,7 @@ main(int argc, char *argv[])
continue;
ret = 0;
@@ -28,19 +26,18 @@ index 29ecf1a..baab909 100644
/* For UDP, make sure we are connected. */
if (uflag) {
if (udptest(s) == -1) {
-@@ -1057,15 +1059,20 @@ build_ports(char *p)
+@@ -1768,15 +1770,20 @@ build_ports(char *p)
int
udptest(int s)
{
- int i, ret;
--
++ int i, t;
+
- for (i = 0; i <= 3; i++) {
- if (write(s, "X", 1) == 1)
- ret = 1;
- else
- ret = -1;
-+ int i, t;
-+
+ if ((write(s, "X", 1) != 1) ||
+ ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED)))
+ return -1;
@@ -52,9 +49,8 @@ index 29ecf1a..baab909 100644
+ if ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED))
+ return -1;
}
-- return (ret);
+- return ret;
+ return 1;
}
void
---
diff --git a/network/netcat-openbsd/patches/0008-dccp-support.patch b/network/netcat-openbsd/patches/0008-dccp-support.patch
new file mode 100644
index 0000000000..bd37690811
--- /dev/null
+++ b/network/netcat-openbsd/patches/0008-dccp-support.patch
@@ -0,0 +1,235 @@
+From: Aron Xu <aron@debian.org>
+Date: Mon, 13 Feb 2012 15:56:51 +0800
+Subject: dccp support
+
+---
+ nc.1 | 4 ++
+ netcat.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------
+ 2 files changed, 79 insertions(+), 14 deletions(-)
+
+--- a/nc.1
++++ b/nc.1
+@@ -33,7 +33,7 @@
+ .Nd arbitrary TCP and UDP connections and listens
+ .Sh SYNOPSIS
+ .Nm nc
+-.Op Fl 46CDdFhklNnrStUuvz
++.Op Fl 46CDdFhklNnrStUuvZz
+ .Op Fl I Ar length
+ .Op Fl i Ar interval
+ .Op Fl M Ar ttl
+@@ -289,6 +289,8 @@ An IPv6 address can be specified unambig
+ in square brackets.
+ A proxy cannot be used with any of the options
+ .Fl lsuU .
++.It Fl Z
++DCCP mode.
+ .It Fl z
+ Only scan for listening daemons, without sending any data to them.
+ Cannot be used together with
+--- a/netcat.c
++++ b/netcat.c
+@@ -146,6 +146,7 @@ int rflag; /* Random ports flag */
+ char *sflag; /* Source Address */
+ int tflag; /* Telnet Emulation */
+ int uflag; /* UDP - Default to TCP */
++int dccpflag; /* DCCP - Default to TCP */
+ int vflag; /* Verbosity */
+ int xflag; /* Socks proxy */
+ int zflag; /* Port Scan Flag */
+@@ -224,6 +225,7 @@ ssize_t drainbuf(int, unsigned char *, s
+ ssize_t fillbuf(int, unsigned char *, size_t *);
+ # endif
+
++char *proto_name(int uflag, int dccpflag);
+ static int connect_with_timeout(int fd, const struct sockaddr *sa,
+ socklen_t salen, int ctimeout);
+
+@@ -263,7 +265,7 @@ main(int argc, char *argv[])
+ # if defined(TLS)
+ "46C:cDde:FH:hI:i:K:klM:m:NnO:o:P:p:q:R:rSs:T:tUuV:vW:w:X:x:Z:z"))
+ # else
+- "46CDdFhI:i:klM:m:NnO:P:p:q:rSs:T:tUuV:vW:w:X:x:z"))
++ "46CDdFhI:i:klM:m:NnO:P:p:q:rSs:T:tUuV:vW:w:X:x:Zz"))
+ # endif
+ != -1) {
+ switch (ch) {
+@@ -380,6 +382,13 @@ main(int argc, char *argv[])
+ case 'u':
+ uflag = 1;
+ break;
++ case 'Z':
++# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
++ dccpflag = 1;
++# else
++ errx(1, "no DCCP support available");
++# endif
++ break;
+ case 'V':
+ # if defined(RT_TABLEID_MAX)
+ rtableid = (int)strtonum(optarg, 0,
+@@ -484,6 +493,10 @@ main(int argc, char *argv[])
+
+ /* Cruft to make sure options are clean, and used properly. */
+ if (argv[0] && !argv[1] && family == AF_UNIX) {
++# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
++ if (dccpflag)
++ errx(1, "cannot use -Z and -U");
++# endif
+ host = argv[0];
+ uport = NULL;
+ } else if (!argv[0] && lflag) {
+@@ -578,8 +591,20 @@ main(int argc, char *argv[])
+ if (family != AF_UNIX) {
+ memset(&hints, 0, sizeof(struct addrinfo));
+ hints.ai_family = family;
+- hints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
+- hints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP;
++ if (uflag) {
++ hints.ai_socktype = SOCK_DGRAM;
++ hints.ai_protocol = IPPROTO_UDP;
++ }
++# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
++ else if (dccpflag) {
++ hints.ai_socktype = SOCK_DCCP;
++ hints.ai_protocol = IPPROTO_DCCP;
++ }
++# endif
++ else {
++ hints.ai_socktype = SOCK_STREAM;
++ hints.ai_protocol = IPPROTO_TCP;
++ }
+ if (nflag)
+ hints.ai_flags |= AI_NUMERICHOST;
+ }
+@@ -587,7 +612,10 @@ main(int argc, char *argv[])
+ if (xflag) {
+ if (uflag)
+ errx(1, "no proxy support for UDP mode");
+-
++# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
++ if (dccpflag)
++ errx(1, "no proxy support for DCCP mode");
++# endif
+ if (lflag)
+ errx(1, "no proxy support for listen");
+
+@@ -834,19 +862,20 @@ main(int argc, char *argv[])
+ }
+ }
+
++ char *proto = proto_name(uflag, dccpflag);
+ /* Don't look up port if -n. */
+ if (nflag)
+ sv = NULL;
+ else {
+ sv = getservbyport(
+ ntohs(atoi(portlist[i])),
+- uflag ? "udp" : "tcp");
++ proto);
+ }
+
+ fprintf(stderr,
+ "Connection to %s %s port [%s/%s] "
+ "succeeded!\n", host, portlist[i],
+- uflag ? "udp" : "tcp",
++ proto,
+ sv ? sv->s_name : "*");
+ }
+ if (Fflag)
+@@ -1061,6 +1090,24 @@ unix_listen(char *path)
+ return s;
+ }
+
++char *proto_name(int uflag, int dccpflag) {
++
++ char *proto = NULL;
++ if (uflag) {
++ proto = "udp";
++ }
++# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
++ else if (dccpflag) {
++ proto = "dccp";
++ }
++# endif
++ else {
++ proto = "tcp";
++ }
++
++ return proto;
++}
++
+ /*
+ * remote_connect()
+ * Returns a socket connected to a remote host. Properly binds to a local
+@@ -1091,8 +1138,21 @@ remote_connect(const char *host, const c
+ # endif
+ memset(&ahints, 0, sizeof(struct addrinfo));
+ ahints.ai_family = res->ai_family;
+- ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
+- ahints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP;
++ if (uflag) {
++ ahints.ai_socktype = SOCK_DGRAM;
++ ahints.ai_protocol = IPPROTO_UDP;
++
++ }
++# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
++ else if (dccpflag) {
++ hints.ai_socktype = SOCK_DCCP;
++ hints.ai_protocol = IPPROTO_DCCP;
++ }
++# endif
++ else {
++ ahints.ai_socktype = SOCK_STREAM;
++ ahints.ai_protocol = IPPROTO_TCP;
++ }
+ ahints.ai_flags = AI_PASSIVE;
+ if ((error = getaddrinfo(sflag, pflag, &ahints, &ares)))
+ errx(1, "getaddrinfo: %s", gai_strerror(error));
+@@ -1104,15 +1164,16 @@ remote_connect(const char *host, const c
+ }
+
+ set_common_sockopts(s, res->ai_family);
++ char *proto = proto_name(uflag, dccpflag);
+
+ if ((error = connect_with_timeout(s, res->ai_addr, res->ai_addrlen, timeout)) == CONNECTION_SUCCESS)
+ break;
+ if (vflag && error == CONNECTION_FAILED)
+ warn("connect to %s port %s (%s) failed", host, port,
+- uflag ? "udp" : "tcp");
+- else if (vflag && error == CONNECTION_TIMEOUT)
++ proto);
++ else if (vflag && error == CONNECTION_TIMEOUT)
+ warn("connect to %s port %s (%s) timed out", host, port,
+- uflag ? "udp" : "tcp");
++ proto);
+
+ save_errno = errno;
+ close(s);
+@@ -1716,7 +1777,8 @@ build_ports(char *p)
+ int hi, lo, cp;
+ int x = 0;