Date: Mon, 31 Aug 2015 10:06:27 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395660 - in head/dns: bind910 bind910/files bind99 bind99/files Message-ID: <201508311006.t7VA6RuX095310@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Aug 31 10:06:27 2015 New Revision: 395660 URL: https://svnweb.freebsd.org/changeset/ports/395660 Log: When not using OpenSSL from ports, do not try to unmount the chrooted engines directory. PR: 201423 (based on) Submitted by: girgen Sponsored by: Absolight Modified: head/dns/bind910/Makefile head/dns/bind910/files/named.in head/dns/bind99/Makefile head/dns/bind99/files/named.in Modified: head/dns/bind910/Makefile ============================================================================== --- head/dns/bind910/Makefile Mon Aug 31 10:06:19 2015 (r395659) +++ head/dns/bind910/Makefile Mon Aug 31 10:06:27 2015 (r395660) @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/} PORTREVISION= 0 .else # dns/bind910 here -PORTREVISION= 1 +PORTREVISION= 2 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} Modified: head/dns/bind910/files/named.in ============================================================================== --- head/dns/bind910/files/named.in Mon Aug 31 10:06:19 2015 (r395659) +++ head/dns/bind910/files/named.in Mon Aug 31 10:06:27 2015 (r395660) @@ -232,10 +232,10 @@ named_stop() named_poststop() { if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then - # unmount OpenSSL engines, if they were not mounted but only - # copied, do nothing. - if [ `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ]; then - umount ${named_chrootdir}${_openssl_engines} + # if using OpenSSL from ports, unmount OpenSSL engines, if they + # were not mounted but only copied, do nothing. + if [ -d ${_openssl_engines} -a \( `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 \) ]; then + umount ${named_chrootdir}${_openssl_engines} fi # unmount /dev if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Mon Aug 31 10:06:19 2015 (r395659) +++ head/dns/bind99/Makefile Mon Aug 31 10:06:27 2015 (r395660) @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 99 Modified: head/dns/bind99/files/named.in ============================================================================== --- head/dns/bind99/files/named.in Mon Aug 31 10:06:19 2015 (r395659) +++ head/dns/bind99/files/named.in Mon Aug 31 10:06:27 2015 (r395660) @@ -230,10 +230,10 @@ named_stop() named_poststop() { if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then - # unmount OpenSSL engines, if they were not mounted but only - # copied, do nothing. - if [ `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ]; then - umount ${named_chrootdir}${_openssl_engines} + # if using OpenSSL from ports, unmount OpenSSL engines, if they + # were not mounted but only copied, do nothing. + if [ -d ${_openssl_engines} -a \( `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 \) ]; then + umount ${named_chrootdir}${_openssl_engines} fi # unmount /dev if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508311006.t7VA6RuX095310>