Merge branch '3.5' into 3.6

2020-07-04 09:47:22 +00:00 · 2020-07-04 09:47:22 +00:00 · 5d57341dd3
commit 5d57341dd3
parent 0c21014445 8b2b86f703
11 changed files with 34 additions and 25 deletions
--- a/curl/.signature
+++ b/curl/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqnenjcBjhYD2S+f7SidgJ8hbKRdnqCm51tNDdxCofAgNUO4eEFd6+qtiNF0Y/T+nY8kJVzIeg2LehB9lZL3vBgE=
-SHA256 (Pkgfile) = f258ddf48c6e85c0d455bd25d93d9360b2b83bfc62b26b8831997f5a69d283fb
+RWRJc1FUaeVeqhyrIsdoCFpdTBLg2A9uYQ9C8YeBiSjrbto7Vw2WD/ln7D3PiiqSbfCHPH1Gyjzbv2GsIA9+SsWPBtwmraqbxg0=
+SHA256 (Pkgfile) = 4aeb3eb714c6a8f8602fbcd270a76f5a1f0407abb1638ef1dcf5b104029c12f5
 SHA256 (.footprint) = 2ae90b26e0d0ba6c17304ecbcc72d13dea894515074e2de1fe2d9edd8eee4060
-SHA256 (curl-7.71.0.tar.xz) = cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772
+SHA256 (curl-7.71.1.tar.xz) = 40f83eda27cdbeb25cd4da48cefb639af1b9395d6026d2da1825bf059239658c
--- a/curl/Pkgfile
+++ b/curl/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  openssl, zlib

 name=curl
-version=7.71.0
+version=7.71.1
 release=1
 source=(https://curl.haxx.se/download/$name-$version.tar.xz)

--- a/dhcpcd/.footprint
+++ b/dhcpcd/.footprint
@ -7,7 +7,6 @@ drwxr-xr-x	root/root	lib/dhcpcd/dev/
 -rwxr-xr-x	root/root	lib/dhcpcd/dev/udev.so
 drwxr-xr-x	root/root	lib/dhcpcd/dhcpcd-hooks/
 -rw-r--r--	root/root	lib/dhcpcd/dhcpcd-hooks/01-test
-rw-r--r--	root/root	lib/dhcpcd/dhcpcd-hooks/02-dump
 -rw-r--r--	root/root	lib/dhcpcd/dhcpcd-hooks/20-resolv.conf
 -rw-r--r--	root/root	lib/dhcpcd/dhcpcd-hooks/30-hostname
 -rwxr-xr-x	root/root	lib/dhcpcd/dhcpcd-run-hooks
@ -28,4 +27,4 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/dhcpcd.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
-drwxr-xr-x	root/root	var/lib/dhcpcd/
+drwxr-xr-x	dhcpcd/dhcpcd	var/lib/dhcpcd/
--- a/dhcpcd/.signature
+++ b/dhcpcd/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqvvBMzwckF/aoWM2diNiyrr9GAo6W3/HtQrvSpiZJ/vvqZz8HYKywx+c1ncunWPO2ecg0BV6Rq+apCFviq/osA8=
-SHA256 (Pkgfile) = b855f8deb92a054a581d708ab46d685417a94f9a3b9f47c5b369b12c2a66410c
-SHA256 (.footprint) = d9a7aee62c42089e2d24224ba37e4d88502f402e0f94ea92d0a19492ff7afd76
-SHA256 (dhcpcd-8.1.9.tar.xz) = 8e2a505eb2bd8007d7c6fd855fcb4dd28cced8fc28886c7ce41fb4fc5630fbcf
+RWRJc1FUaeVeqvNlpzZaMVUtKc2Vk+q5RPf9U3AkIYfWt33fhXA7FaDU1NVwgSzsok9ZIgCCLmLsVkUVUprlS6WrXIx8ydgO6ww=
+SHA256 (Pkgfile) = 5cb189485f1f02efa48aedbf7b8270d388bfedd59c37876e1af0609ca29ae53f
+SHA256 (.footprint) = 36408a5de30857e3c77ae409c68ff83d874a30ee33a8d70d75a4280de32743f9
+SHA256 (dhcpcd-9.1.4.tar.xz) = 5fe133e5497d8af6d26bd6e6b8dd48ab12d124d6cc4cefe6de6536ff97f76820
--- a/dhcpcd/Pkgfile
+++ b/dhcpcd/Pkgfile
@ -1,10 +1,10 @@
 # Description: An RFC2131-compliant DHCP client daemon
-# URL:         https://roy.marples.name/projects/dhcpcd/
+# URL:         http://roy.marples.name/projects/dhcpcd/
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 # Depends on:  eudev

 name=dhcpcd
-version=8.1.9
+version=9.1.4
 release=1
 source=(https://roy.marples.name/downloads/dhcpcd/$name-$version.tar.xz)

@ -15,9 +15,13 @@ build () {
                --libexecdir=/lib/dhcpcd \
                --dbdir=/var/lib/dhcpcd \
                --sysconfdir=/etc/dhcpcd \
-                --with-hooks=
+                --enable-privsep \
+                --privsepuser=dhcpcd

    make
    make DESTDIR=$PKG install
+
+    install -d -o dhcpcd -g dhcpcd $PKG/var/lib/dhcpcd
+
    chmod -R u+w $PKG
 }
--- a/dhcpcd/pre-install
+++ b/dhcpcd/pre-install
@ -0,0 +1,6 @@
+#!/bin/sh
+
+getent group dhcpcd || /usr/sbin/groupadd -r dhcpcd
+getent passwd dhcpcd || /usr/sbin/useradd -r -d /var/lib/dhcpcd -s /bin/false dhcpcd
+/usr/bin/passwd -l dhcpcd
+
--- a/libcap/.footprint
+++ b/libcap/.footprint
@ -1,6 +1,6 @@
 drwxr-xr-x	root/root	lib/
-lrwxrwxrwx	root/root	lib/libcap.so.2 -> libcap.so.2.36
-rw-r--r--	root/root	lib/libcap.so.2.36
+lrwxrwxrwx	root/root	lib/libcap.so.2 -> libcap.so.2.37
+-rw-r--r--	root/root	lib/libcap.so.2.37
 drwxr-xr-x	root/root	lib/security/
 -rwxr-xr-x	root/root	lib/security/pam_cap.so
 drwxr-xr-x	root/root	sbin/
@ -15,7 +15,7 @@ drwxr-xr-x	root/root	usr/include/sys/
 -rw-r--r--	root/root	usr/include/sys/psx_syscall.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libcap.a
-lrwxrwxrwx	root/root	usr/lib/libcap.so -> ../../lib/libcap.so.2.36
+lrwxrwxrwx	root/root	usr/lib/libcap.so -> ../../lib/libcap.so.2.37
 -rw-r--r--	root/root	usr/lib/libpsx.a
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libcap.pc
--- a/libcap/.signature
+++ b/libcap/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqgtoiyFck5xCb8u0AtoJk5wgwk00cYuWZPKjSLFVDOPb9BUmpXvBH0OrRVK+KoXrQofLlzgpazu/pMxRLbUdmQE=
-SHA256 (Pkgfile) = 0fcc67516132033e9fbf409dd221c4fa63846163641ac3ae386796ef09467480
-SHA256 (.footprint) = 0800232321f3fe9c421267ad23e931d658950cbb79cbd433868fd2c6a616aad5
-SHA256 (libcap-2.36.tar.xz) = 5048c849bdbbe24d2ca59463142cb279abec5edf3ab6731ab35a596bcf538a49
+RWRJc1FUaeVeqkYZNlVmRNv4EDryEH/dq3pAgazqB8Cyy3tVVjoby8zRyqCk9OuKUAvYi1MuMIem58iHcAGpT7nu1HOsaRq3rwE=
+SHA256 (Pkgfile) = de196526b87004ad842887ba87088c6a52f1f218f408a4aa1d45047039de154a
+SHA256 (.footprint) = 254b0198dc5bcd42a486d96c91011fed07b197f6dbf0e318db6be5dd5cb3fde4
+SHA256 (libcap-2.37.tar.xz) = 17ea6b808e06271886d3e2a55aa5df16f0976e36eb0391e8f630d6c735bec838
--- a/libcap/Pkgfile
+++ b/libcap/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  attr linux-pam

 name=libcap
-version=2.36
+version=2.37
 release=1
 source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$name-$version.tar.xz)

--- a/nasm/.signature
+++ b/nasm/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqgn+hF/UPTJ/WUt1su9NhAiiJVZrtm4EbNsKzlpu8XH52dw9hWXbjCstH/CQD3p+cDUVG92WfRM93U7WOyqg0AQ=
-SHA256 (Pkgfile) = 97c6fb93e2d4b8d78ffda1534a948d96fb823d62bcdf108c962d5f7d4d0c026f
+RWRJc1FUaeVeqlp9eGWudkcAy5g9vRczdXHoF9jp0dgrSLHpdlQc3EpyzexVtlaT26RJWIw04Gy5oBibHgZAVD2TZrpC5fjaBA8=
+SHA256 (Pkgfile) = c8d3fff994083f7bb769daec9af5222315bb1a58ad007417212a12ed1bd3835f
 SHA256 (.footprint) = 2f2595d48b1d9747afa0d6b676a290528c98d1151c567954c594803a07fa9255
-SHA256 (nasm-2.14.02.tar.xz) = e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5
+SHA256 (nasm-2.15.02.tar.xz) = f4fd1329b1713e1ccd34b2fc121c4bcd278c9f91cc4cb205ae8fcd2e4728dd14
--- a/nasm/Pkgfile
+++ b/nasm/Pkgfile
@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu

 name=nasm
-version=2.14.02
+version=2.15.02
 release=1
 source=(https://www.nasm.us/pub/nasm/releasebuilds/$version/$name-$version.tar.xz)