[patch] ebuild.patch

file_665268.txt (text/plain), 7.59 KB, created by Pengcheng Xu on 2018-09-05 12:16:43 UTC

--- bind-9.12.2_p1.ebuild	2018-08-20 10:09:22.000000000 -0000
+++ bind-9.12.2_p1-r1.ebuild	2018-09-05 12:01:17.674916483 -0000
@@ -132,6 +132,8 @@
 	rm aclocal.m4
 	rm -rf libtool.m4/
 	eautoreconf
+
+	epatch_user
 }
 
 src_configure() {
@@ -153,8 +155,8 @@
 
 	export BUILD_CC=$(tc-getBUILD_CC)
 	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
+		--sysconfdir="${EPREFIX}"/etc/bind \
+		--localstatedir="${EPREFIX}"/var \
 		--with-libtool \
 		--enable-full-report \
 		--without-readline \
@@ -166,7 +168,7 @@
 		$(use_enable rpz rpz-nsip) \
 		$(use_enable seccomp) \
 		$(use_enable threads) \
-		$(use_with berkdb dlz-bdb) \
+		$(use_with berkdb dlz-bdb "${EPREFIX}"/usr) \
 		$(use_with dlz dlopen) \
 		$(use_with dlz dlz-filesystem) \
 		$(use_with dlz dlz-stub) \
@@ -216,7 +218,7 @@
 		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
 
 		# some handy-dandy dynamic dns examples
-		pushd "${D}"/usr/share/doc/${PF} 1>/dev/null
+		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null
 		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
 		popd 1>/dev/null
 	fi
@@ -235,31 +237,31 @@
 	newconfd "${FILESDIR}"/named.confd-r7 named
 
 	if use gost; then
-		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
+		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${ED}/etc/init.d/named" || die
 	else
-		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die
+		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${ED}/etc/init.d/named" || die
 	fi
 
 	newenvd "${FILESDIR}"/10bind.env 10bind
 
 	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
-	rm -f "${D}"/usr/share/man/man8/nsupdate.8*
-	rm -f "${D}"/usr/bin/{dig,host,nslookup,nsupdate}
-	rm -f "${D}"/usr/sbin/{dig,host,nslookup,nsupdate}
+	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1*
+	rm -f "${ED}"/usr/share/man/man8/nsupdate.8*
+	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate}
+	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate}
 	for tool in dsfromkey importkey keyfromlabel keygen \
 	  revoke settime signzone verify; do
-		rm -f "${D}"/usr/{,s}bin/dnssec-"${tool}"
-		rm -f "${D}"/usr/share/man/man8/dnssec-"${tool}".8*
+		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}"
+		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8*
 	done
 
 	# bug 405251, library archives aren't properly handled by --enable/disable-static
 	if ! use static-libs; then
-		find "${D}" -type f -name '*.a' -delete || die
+		find "${ED}" -type f -name '*.a' -delete || die
 	fi
 
 	# bug 405251
-	find "${D}" -type f -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 
 	if use python; then
 		install_python_tools() {
@@ -267,16 +269,16 @@
 		}
 		python_foreach_impl install_python_tools
 
-		python_replicate_script "${D}usr/sbin/dnssec-checkds"
-		python_replicate_script "${D}usr/sbin/dnssec-coverage"
+		python_replicate_script "${ED}usr/sbin/dnssec-checkds"
+		python_replicate_script "${ED}usr/sbin/dnssec-coverage"
 	fi
 
 	# bug 450406
 	dosym named.cache /var/bind/root.cache
 
-	dosym /var/bind/pri /etc/bind/pri
-	dosym /var/bind/sec /etc/bind/sec
-	dosym /var/bind/dyn /etc/bind/dyn
+	dosym "${EPREFIX}"/var/bind/pri /etc/bind/pri
+	dosym "${EPREFIX}"/var/bind/sec /etc/bind/sec
+	dosym "${EPREFIX}"/var/bind/dyn /etc/bind/dyn
 	keepdir /var/bind/{pri,sec,dyn}
 
 	dodir /var/log/named
@@ -294,62 +296,62 @@
 }
 
 pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
+	if [ ! -f "${EPREFIX}"'/etc/bind/rndc.key' ]; then
 		if use urandom; then
 			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
+			"${EPREFIX}"/usr/sbin/rndc-confgen -r /dev/urandom -a
 			echo
 		else
 			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
+			"${EPREFIX}"/usr/sbin/rndc-confgen -a
 			echo
 		fi
-		chown root:named /etc/bind/rndc.key
-		chmod 0640 /etc/bind/rndc.key
+		chown root:named "${EPREFIX}"/etc/bind/rndc.key
+		chmod 0640 "${EPREFIX}"/etc/bind/rndc.key
 	fi
 
 	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo "You can edit ${EPREFIX}/etc/conf.d/named to customize named settings"
 	einfo
 	use mysql || use postgres || use ldap && {
 		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
 		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		elog "${EPREFIX}/etc/conf.d/named config to ensure they'll start before bind"
 		einfo
 	}
 	einfo "If you'd like to run bind in a chroot AND this is a new"
 	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "1) Uncomment and set the CHROOT variable in ${EPREFIX}/etc/conf.d/named."
 	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
 	einfo
 
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	CHROOT=$(source "${EPREFIX}"/etc/conf.d/named 2>/dev/null; echo ${CHROOT})
 	if [[ -n ${CHROOT} ]]; then
 		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
 		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "CHROOT_NOMOUNT option in your ${EPREFIX}/etc/conf.d/named config."
 		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
+		elog "first and merge your existing configs/zones to ${EPREFIX}/etc/bind and"
+		elog "${EPREFIX}/var/bind because bind will now mount the needed directories into"
 		elog "the chroot dir."
 	fi
 }
 
 pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+	CHROOT=$(source "${EPREFIX}"/etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source "${EPREFIX}"/etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source "${EPREFIX}"/etc/conf.d/named; echo ${CHROOT_GEOIP})
 
 	if [[ -z "${CHROOT}" ]]; then
 		eerror "This config script is designed to automate setting up"
 		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		eerror "and set the CHROOT variable in '${EPREFIX}/etc/conf.d/named'."
 		die "Unset CHROOT"
 	fi
 	if [[ -d "${CHROOT}" ]]; then
 		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
 		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn "CHROOT_NOMOUNT option in your ${EPREFIX}/etc/conf.d/named config."
 		ewarn
 		ewarn "${CHROOT} already exists... some things might become overridden"
 		ewarn "press CTRL+C if you don't want to continue"
@@ -388,8 +390,8 @@
 	fi
 
 	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
-		cp -a /etc/bind ${CHROOT}/etc/
-		cp -a /var/bind ${CHROOT}/var/
+		cp -a "${EPREFIX}"/etc/bind ${CHROOT}/etc/
+		cp -a "${EPREFIX}"/var/bind ${CHROOT}/var/
 	fi
 
 	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then