svn commit: r518697 - in head/net: . dhcpcd dhcpcd-devel dhcpcd-devel/files

[Ben Woods]

Author: woodsb02
Date: Sat Nov 30 02:37:58 2019
New Revision: 518697
URL: https://svnweb.freebsd.org/changeset/ports/518697

Log:
  net/dhcpcd-devel: Add new port - development verion of net/dhcpcd
  
  This is an experimental version for testing purposes.
  
  Notably this new development version includes privilege separation;
  operations which do not require root are run as the user _dhcp.

Added:
  head/net/dhcpcd-devel/
     - copied from r518657, head/net/dhcpcd/
Modified:
  head/net/Makefile
  head/net/dhcpcd-devel/Makefile
  head/net/dhcpcd-devel/distinfo
  head/net/dhcpcd-devel/files/dhcpcd.in
  head/net/dhcpcd-devel/pkg-descr
  head/net/dhcpcd-devel/pkg-plist
  head/net/dhcpcd/Makefile

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Sat Nov 30 02:22:17 2019	(r518696)
+++ head/net/Makefile	Sat Nov 30 02:37:58 2019	(r518697)
@@ -116,6 +116,7 @@
     SUBDIR += dgd-lpmud
     SUBDIR += dhcp6
     SUBDIR += dhcpcd
+    SUBDIR += dhcpcd-devel
     SUBDIR += dhcpcd-ui
     SUBDIR += dhcpd
     SUBDIR += dhcpd-pools

Modified: head/net/dhcpcd-devel/Makefile
==============================================================================
--- head/net/dhcpcd/Makefile	Fri Nov 29 14:44:18 2019	(r518657)
+++ head/net/dhcpcd-devel/Makefile	Sat Nov 30 02:37:58 2019	(r518697)
@@ -2,10 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	dhcpcd
-PORTVERSION=	8.1.2
+PORTVERSION=	8.99.0.g20191130
 CATEGORIES=	net
-MASTER_SITES=	https://roy.marples.name/downloads/dhcpcd/ \
-		https://cflags.cc/roy/dhcpcd/
+MASTER_SITES=	https://roy.marples.name/cgit/dhcpcd.git/snapshot/
+PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-${GITTAG}
+GITTAG=		273915d
 
 MAINTAINER=	woodsb02 at FreeBSD.org
 COMMENT=	DHCP/IPv4LL/IPv6RS/DHCPv6 client
@@ -13,16 +15,21 @@ COMMENT=	DHCP/IPv4LL/IPv6RS/DHCPv6 client
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+CONFLICTS_INSTALL=	dhcpcd-[0-9]*
+
 USES=		compiler:c11 cpe tar:xz
 
 CPE_VENDOR=	dhcpcd_project
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/examples
+CONFIGURE_ARGS=	--datadir=${PREFIX}/share/examples \
+		--enable-privsep
+CFLAGS+=	-DDHCPCD_USER='\"_dhcp\"'
 USE_RC_SUBR=	dhcpcd
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf \
 		${STAGEDIR}${PREFIX}/share/examples/dhcpcd
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhcpcd
+	${MKDIR} ${STAGEDIR}/var/run/dhcpcd
 
 .include <bsd.port.mk>

Modified: head/net/dhcpcd-devel/distinfo
==============================================================================
--- head/net/dhcpcd/distinfo	Fri Nov 29 14:44:18 2019	(r518657)
+++ head/net/dhcpcd-devel/distinfo	Sat Nov 30 02:37:58 2019	(r518697)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574982885
-SHA256 (dhcpcd-8.1.2.tar.xz) = cbd3e7ab1584a5a3a49d863376fa138e5fa388397a3e27d2b35bb81a2e8c35ad
-SIZE (dhcpcd-8.1.2.tar.xz) = 228736
+TIMESTAMP = 1575074999
+SHA256 (dhcpcd-273915d.tar.xz) = 7cd47b02c50f87e2d46e202f91c1e10ee5e2028f2781b64c4ada4620e0489679
+SIZE (dhcpcd-273915d.tar.xz) = 237868

Modified: head/net/dhcpcd-devel/files/dhcpcd.in
==============================================================================
--- head/net/dhcpcd/files/dhcpcd.in	Fri Nov 29 14:44:18 2019	(r518657)
+++ head/net/dhcpcd-devel/files/dhcpcd.in	Sat Nov 30 02:37:58 2019	(r518697)
@@ -16,7 +16,7 @@ if [ -n "$ifn" ]; then
 	if [ -z "$flags" -a -n "$specific" ]; then
 		rc_flags="$specific"
 	fi
-	pidfile="/var/run/dhcpcd-$ifn.pid"
+	pidfile="/var/run/dhcpcd/dhcpcd-$ifn.pid"
 else
 	pidfile="$($command -P $rc_flags)"
 	: ${dhcpcd_enable:=NO}

Modified: head/net/dhcpcd-devel/pkg-descr
==============================================================================
--- head/net/dhcpcd/pkg-descr	Fri Nov 29 14:44:18 2019	(r518657)
+++ head/net/dhcpcd-devel/pkg-descr	Sat Nov 30 02:37:58 2019	(r518697)
@@ -2,4 +2,8 @@ dhcpcd is a DHCP/IPv4LL/IPv6RS/DHCPv6 client.
 It can also act as a network manager, responding to new interfaces,
 listening for carrier up/down events and managing routes.
 
+This is an experimental version for testing purposes.
+Notably this new development version includes privilege separation;
+operations which do not require root are run as the user _dhcp.
+
 WWW: https://roy.marples.name/projects/dhcpcd

Modified: head/net/dhcpcd-devel/pkg-plist
==============================================================================
--- head/net/dhcpcd/pkg-plist	Fri Nov 29 14:44:18 2019	(r518657)
+++ head/net/dhcpcd-devel/pkg-plist	Sat Nov 30 02:37:58 2019	(r518697)
@@ -12,5 +12,6 @@ sbin/dhcpcd
 %%EXAMPLESDIR%%/hooks/15-timezone
 %%EXAMPLESDIR%%/hooks/29-lookup-hostname
 %%EXAMPLESDIR%%/hooks/50-ypbind
- at dir /var/db/dhcpcd
+ at dir(_dhcp,_dhcp,) /var/db/dhcpcd
+ at dir(_dhcp,_dhcp,) /var/run/dhcpcd
 @sample %%EXAMPLESDIR%%/dhcpcd.conf etc/dhcpcd.conf

Modified: head/net/dhcpcd/Makefile
==============================================================================
--- head/net/dhcpcd/Makefile	Sat Nov 30 02:22:17 2019	(r518696)
+++ head/net/dhcpcd/Makefile	Sat Nov 30 02:37:58 2019	(r518697)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dhcpcd
 PORTVERSION=	8.1.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://roy.marples.name/downloads/dhcpcd/ \
 		https://cflags.cc/roy/dhcpcd/
@@ -12,6 +13,8 @@ COMMENT=	DHCP/IPv4LL/IPv6RS/DHCPv6 client
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
+
+CONFLICTS_INSTALL=	dhcpcd-devel-[0-9]*
 
 USES=		compiler:c11 cpe tar:xz