Merge branch '3.4' into 3.5

6 files changed, 7 insertions, 58 deletions

diff --git a/bison/.footprint b/bison/.footprint
index 0a55701a..948cea4c 100644
--- a/bison/.footprint
+++ b/bison/.footprint
@@ -8,6 +8,7 @@ drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/bison-i18n.m4
 drwxr-xr-x	root/root	usr/share/bison/
+-rw-r--r--	root/root	usr/share/bison/bison-default.css
 drwxr-xr-x	root/root	usr/share/bison/m4sugar/
 -rw-r--r--	root/root	usr/share/bison/m4sugar/foreach.m4
 -rw-r--r--	root/root	usr/share/bison/m4sugar/m4sugar.m4
diff --git a/bison/.signature b/bison/.signature
index 5dfbc61b..bdbd0886 100644
--- a/bison/.signature
+++ b/bison/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqlKuOI0CurVcDGz11JjyZujPAP78woF6+AN99ld3p9QPXdJUuRjM1AuoH66ewSQzp6ZcnRx2HZNX/3NbOhPzxQE=
-SHA256 (Pkgfile) = 6acc49bf4f0b79d16395b96d2bbe15b36ffec6ca3c5d7d31975b6c60ed03f195
-SHA256 (.footprint) = d5001fc72ded9b53e708dea2da9a7bf99d468b4329b9cb14e3f28c66201eb884
-SHA256 (bison-3.3.2.tar.xz) = 039ee45b61d95e5003e7e8376f9080001b4066ff357bde271b7faace53b9d804
+RWRJc1FUaeVequEgaXtC2kfwBXwWaaLLn7cbWskTEbQC2tk9deFKloEdMo2uRQvMkFwqN6Cvk38kr9EfdyHVOuEVlAh9gLFOwwE=
+SHA256 (Pkgfile) = 18df87396bd18fb7aba84e65dac0548d8836be3938bc7b87b67b98637f8ceda3
+SHA256 (.footprint) = 7ed5958b8b341d679b814b46571fa8f6bf4da2909c7e940df1687560c0ed4eaf
+SHA256 (bison-3.4.1.tar.xz) = 27159ac5ebf736dffd5636fd2cd625767c9e437de65baa63cb0de83570bd820d
diff --git a/bison/Pkgfile b/bison/Pkgfile
index fd2d1a1d..39e2f1a4 100644
--- a/bison/Pkgfile
+++ b/bison/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=bison
-version=3.3.2
+version=3.4.1
 release=1
 source=(http://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.xz)
 
@@ -13,5 +13,5 @@ build() {
     make
     make DESTDIR=$PKG install
     rm -r $PKG/usr/share/{doc,info}
-    rm $PKG/usr/share/bison/README
+    rm $PKG/usr/share/bison/README.md
 }
diff --git a/iputils/.footprint b/iputils/.footprint
deleted file mode 100644
index 2e268152..00000000
--- a/iputils/.footprint
+++ /dev/null
@@ -1,22 +0,0 @@
-drwxr-xr-x	root/root	bin/
--rwsr-xr-x	root/root	bin/ping
-drwxr-xr-x	root/root	sbin/
--rwxr-xr-x	root/root	sbin/arping
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
--rwsr-xr-x	root/root	usr/bin/traceroute6
-drwxr-xr-x	root/root	usr/sbin/
--rwxr-xr-x	root/root	usr/sbin/clockdiff
--rwxr-xr-x	root/root	usr/sbin/rarpd
--rwxr-xr-x	root/root	usr/sbin/rdisc
--rwxr-xr-x	root/root	usr/sbin/tracepath
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man8/
--rw-r--r--	root/root	usr/share/man/man8/arping.8.gz
--rw-r--r--	root/root	usr/share/man/man8/clockdiff.8.gz
--rw-r--r--	root/root	usr/share/man/man8/ping.8.gz
--rw-r--r--	root/root	usr/share/man/man8/rarpd.8.gz
--rw-r--r--	root/root	usr/share/man/man8/rdisc.8.gz
--rw-r--r--	root/root	usr/share/man/man8/tracepath.8.gz
--rw-r--r--	root/root	usr/share/man/man8/traceroute6.8.gz
diff --git a/iputils/.signature b/iputils/.signature
deleted file mode 100644
index 6ab007c9..00000000
--- a/iputils/.signature
+++ /dev/null
@@ -1,6 +0,0 @@
-untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqtd+1fvZLeNQPY6D90zDtAIJq0asn1DJPRtotE9GvvQOu3c0o8a7WELNnrXlxhhNuvdxd2X8KSFhC/OqVrDeOAg=
-SHA256 (Pkgfile) = dff3fb79dab27c51530b0629494def05e76ecf4cf5f9d5ffd69ec6ee4502d069
-SHA256 (.footprint) = 05e349336245cd86102f102ffaa59776b15406264cb25e9063bdbe5c90412507
-SHA256 (iputils-s20180629.tar.gz) = da14105291dd491f28ea91ade854ed10aee8ba019641c80eed233de3908be7c5
-SHA256 (iputils-man-s20180629-1.tar.xz) = fdbee6d088a134d6fb0612be7d8619806ef304d8d614443d5f6fef88b8fb6a85
diff --git a/iputils/Pkgfile b/iputils/Pkgfile
deleted file mode 100644
index 7f9af890..00000000
--- a/iputils/Pkgfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Description: Basic networking utilities
-# URL: https://github.com/iputils/iputils
-# Maintainer: CRUX System Team, core-ports at crux dot nu
-# Depends on: libcap openssl
-
-name=iputils
-version=s20180629
-release=2
-source=(https://github.com/iputils/iputils/archive/$version/$name-$version.tar.gz
-        http://crux.nu/files/distfiles/$name-man-$version-1.tar.xz)
-
-build() {
-    cd $name-$version
-
-    make USE_IDN=no USE_NETTLE=no USE_GCRYPT=no USE_GNUTLS=no CCOPTOPT="$CFLAGS"
-
-    install -d $PKG/{{s,}bin,usr/{bin,sbin,share/man/man8}}
-    install ping $PKG/bin/
-    install arping $PKG/sbin/
-    install tracepath clockdiff rarpd rdisc $PKG/usr/sbin/
-    install traceroute6 $PKG/usr/bin/
-    cp -d $SRC/$name-man-$version/* $PKG/usr/share/man/man8
-    chmod u+s $PKG/bin/ping $PKG/usr/bin/traceroute6
-}