From owner-svn-ports-head@freebsd.org Mon Jan 8 22:33:25 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 280CCE67759; Mon, 8 Jan 2018 22:33:25 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 02AC878AD1; Mon, 8 Jan 2018 22:33:25 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 439B2630A; Mon, 8 Jan 2018 22:33:24 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w08MXOIR031673; Mon, 8 Jan 2018 22:33:24 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w08MXOix031671; Mon, 8 Jan 2018 22:33:24 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201801082233.w08MXOix031671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Mon, 8 Jan 2018 22:33:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458489 - in head/net/isc-dhcp43-server: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zi X-SVN-Commit-Paths: in head/net/isc-dhcp43-server: . files X-SVN-Commit-Revision: 458489 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Jan 2018 22:33:25 -0000 Author: zi Date: Mon Jan 8 22:33:23 2018 New Revision: 458489 URL: https://svnweb.freebsd.org/changeset/ports/458489 Log: - Fix chroot/syslog issues - Bump PORTREVISION PR: 196547 Modified: head/net/isc-dhcp43-server/Makefile head/net/isc-dhcp43-server/files/isc-dhcpd.in Modified: head/net/isc-dhcp43-server/Makefile ============================================================================== --- head/net/isc-dhcp43-server/Makefile Mon Jan 8 22:31:50 2018 (r458488) +++ head/net/isc-dhcp43-server/Makefile Mon Jan 8 22:33:23 2018 (r458489) @@ -18,7 +18,7 @@ LICENSE= ISCL USES= gmake -PORTREVISION_SERVER= 1 +PORTREVISION_SERVER= 2 PORTREVISION_CLIENT= 0 PORTREVISION_RELAY= 0 Modified: head/net/isc-dhcp43-server/files/isc-dhcpd.in ============================================================================== --- head/net/isc-dhcp43-server/files/isc-dhcpd.in Mon Jan 8 22:31:50 2018 (r458488) +++ head/net/isc-dhcp43-server/files/isc-dhcpd.in Mon Jan 8 22:33:23 2018 (r458489) @@ -52,8 +52,7 @@ eval ": \${${name}_withgroup:=dhcpd}" # group name t eval ": \${${name}_chroot_enable:=\"NO\"}" # runs chrooted? eval ": \${${name}_devfs_enable:=\"YES\"}" # devfs if available? -eval ": \${${name}_rootdir:=/var/db/${name}}" # directory to run in -eval ": \${${name}_chrootdir:=${name}_rootdir}" # automatically set _chrootdir for syslogd compatibility +eval ": \${${name}_chrootdir:=/var/db/${name}}" # directory to run in # dhcpd_includedir="" # directory for included config files safe_run () # rc command [args...] @@ -302,8 +301,8 @@ check_chroot () { if checkyesno paranoia; then if checkyesno ${name}_chroot_enable; then - if eval "[ -z \"\${${name}_rootdir}\" ]"; then - err 1 "${name}_rootdir must be set" \ + if eval "[ -z \"\${${name}_chrootdir}\" ]"; then + err 1 "${name}_chrootdir must be set" \ "if ${name}_chroot_enable is enabled" fi else @@ -331,7 +330,7 @@ _rcvar_chuser () _rcvar_chroot () { if ! checkyesno paranoia || ! checkyesno ${name}_chroot_enable; then - eval "${name}_rootdir=" + eval "${name}_chrootdir=" elif checkyesno paranoia && checkyesno ${name}_chroot_enable; then eval "${name}_devdir=\${__dhcpd_devdir}" eval "${name}_etcdir=\${__dhcpd_etcdir}" @@ -352,16 +351,16 @@ _rcvar_pidnleases () _rcvar_rooted () { - eval "_dhcpd_rootdir=\${${name}_rootdir}" - eval "_dhcpd_devdir=\${${name}_rootdir}\${${name}_devdir}" - eval "_dhcpd_etcdir=\${${name}_rootdir}\${${name}_etcdir}" - eval "_dhcpd_confdir=\${${name}_rootdir}\${${name}_confdir}" - eval "_dhcpd_includedir=\${${name}_rootdir}\${${name}_includedir}" - eval "_dhcpd_piddir=\${${name}_rootdir}\${${name}_piddir}" - eval "_dhcpd_leasesdir=\${${name}_rootdir}\${${name}_leasesdir}" - eval "_dhcpd_conffile=\${${name}_rootdir}\${${name}_conffile}" - eval "_dhcpd_pidfile=\${${name}_rootdir}\${${name}_pidfile}" - eval "_dhcpd_leasesfile=\${${name}_rootdir}\${${name}_leasesfile}" + eval "_dhcpd_chrootdir=\${${name}_chrootdir}" + eval "_dhcpd_devdir=\${${name}_chrootdir}\${${name}_devdir}" + eval "_dhcpd_etcdir=\${${name}_chrootdir}\${${name}_etcdir}" + eval "_dhcpd_confdir=\${${name}_chrootdir}\${${name}_confdir}" + eval "_dhcpd_includedir=\${${name}_chrootdir}\${${name}_includedir}" + eval "_dhcpd_piddir=\${${name}_chrootdir}\${${name}_piddir}" + eval "_dhcpd_leasesdir=\${${name}_chrootdir}\${${name}_leasesdir}" + eval "_dhcpd_conffile=\${${name}_chrootdir}\${${name}_conffile}" + eval "_dhcpd_pidfile=\${${name}_chrootdir}\${${name}_pidfile}" + eval "_dhcpd_leasesfile=\${${name}_chrootdir}\${${name}_leasesfile}" } setup_umask () @@ -385,7 +384,7 @@ setup_chroot () safe_mkdir ${_dhcpd_devdir}/_ # XXX /_ hack! so, .../dev is root owned. fi - safe_mkdir ${_dhcpd_rootdir} ${_dhcpd_etcdir}/_ ${_dhcpd_confdir} + safe_mkdir ${_dhcpd_chrootdir} ${_dhcpd_etcdir}/_ ${_dhcpd_confdir} # XXX /_ hack! so, .../etc is root owned. if checkyesno ${name}_devfs_enable; then safe_mount ${_dhcpd_devdir} @@ -442,8 +441,8 @@ setup_flags () if eval "[ -n \"\${${name}_withgroup}\" ]"; then eval "rc_flags=\"\${rc_flags} -group \${${name}_withgroup}\"" fi - if eval "[ -n \"\${${name}_rootdir}\" ]"; then - eval "rc_flags=\"\${rc_flags} -chroot \${${name}_rootdir}\"" + if eval "[ -n \"\${${name}_chrootdir}\" ]"; then + eval "rc_flags=\"\${rc_flags} -chroot \${${name}_chrootdir}\"" fi eval "rc_flags=\"\${rc_flags} \${${name}_ifaces}\"" } @@ -519,7 +518,7 @@ __dhcpd_devdir=/dev # devices directory __dhcpd_etcdir=/etc # etc directory __dhcpd_piddir=/var/run # pid file directory __dhcpd_leasesdir=/var/db # leases file directory -#__dhcpd_rootdir=/var/db/${name} # root directory +#__dhcpd_chrootdir=/var/db/${name} # root directory dhcpd_check dhcpd_rcvar