gentoo resync : 28.04.2021

3 files changed, 75 insertions, 42 deletions

diff --git a/net-dns/ez-ipupdate/Manifest b/net-dns/ez-ipupdate/Manifest
index 081f3ef1e412..441f41c947c4 100644
--- a/net-dns/ez-ipupdate/Manifest
+++ b/net-dns/ez-ipupdate/Manifest
@@ -1,10 +1,11 @@
 AUX ez-ipupdate-3.0.11.13.3_beta8-3322.diff 1934 BLAKE2B 4492e08e46f33693ea1f8c330fe8ac8f3d912c266ae584791c1b0a88568365b3598be279f0a865ebb7297c071d925ac787af8587ddb3f371be80994f7ae0c2fa SHA512 b6a5bf2d7bc46d192d20a25cf9a220703553f3143f6db681366b90815a28be7fb716618b8a13302d0e892924b4803c8ceb535df6026e4f3154118812f1f87647
 AUX ez-ipupdate-3.0.11.13.3_beta8-dnsexit.diff 6770 BLAKE2B fa5dfa7063ebc3cdbe6d4824a56c28c49a58b0c2d875ff97162c117df8cf1536b59a5aaf4c06f716dc74140c3982f9cb74a50004d0e5a03b4478f1c2389fab43 SHA512 e3f14a06383c3a49453b5b4b37e2030d17289ed4d43f15e7a48739e40adced66857820328a2635b814c1003541b3f0ea9bf46d3343c2ffe5fea27b2872a20670
+AUX ez-ipupdate-3.0.11.13.3_beta8-fix-format-mask.patch 1162 BLAKE2B eba6d6b58910e22c4451e132dfbd8bb996f91c333e828b0e3964c31c9c743bc5aa58c08d17fa96c00af5f776d4b378f67e351288ec215592c85d9e18986a8256 SHA512 091da8edb430f699a4b4c93ac20e307a47c8f5845cd510640203f5c7ce965b70b2da5d274def3b28b36eb66fdac88bd40315a6dd367141eb0744d62c1e0b807a
 AUX ez-ipupdate-3.0.11.13.3_beta8-ipv6.diff 767 BLAKE2B c07ed8e9a72de144d2aff588334259881c323213f08c363bc0b2a22a54f2c338878d26357ce6f99148310494675506de78a22d7ba6b25afe4d522d6214d4ae7d SHA512 7b62ce5ad610963beac5138ecb797fd2a36643720c25cae4efe94621c92e9b57dd2c73b2320735c56b477f06894e35e9eeb085b8c365729728c05eb6d0d78ae4
 AUX ez-ipupdate-3.0.11.13.3_beta8-linux.diff 5841 BLAKE2B e2a9caf7d86381092dfca2ae475698ebe33a07eecaea2dddf521b7357c317ba3fad142a82657d61bf7cea7c6e7e23ad2142bc7f7829374e80b8338095c1bf125 SHA512 3cee4b7c0b145344bba892e3a6fbdd07b4e21020005a9094bd96950304fea89d8e16439de9133eebfe581764b0abf240c27f59188762ee209b96159e6d0af168
 AUX ez-ipupdate.initd 2555 BLAKE2B ecec692326933d924687cf6a33a5a3b2973e5272e0f5a9fc474bac0a11b6fcb29a68d0aab5459816f650b6020fb2e2a95c8cb3aea5b87f831a27a7e29edb5a0a SHA512 31729abd0aae2d225838dcbbbd724ea2402536eced290c71dfcd201fe48dbb1cf176da519d239b380089aee1afbeb66fc488d42bfb1432e14dfe36a484d8f841
 AUX ez-ipupdate.service 363 BLAKE2B 9ec7a686fe9b4cf2cebd4c858b3b7c83c7e1913d356e01d83b7f680f98df99b0edff179efc2d4015b98a3b95ef00fcbea46077bf514a92a6bfcc388e0148b6ce SHA512 d8822278f9c32419fd95a37ee7523ce83bbbd5d0e43dd9869b076ffd837121ca2f5ee07ebd66bb6942ac9a2bf1c07025877781b2ed049945bcaee4e04a039022
 DIST ez-ipupdate_3.0.11b8-13.3.diff.gz 154094 BLAKE2B ae82ca990937c60d7f572c132883099dc3c25e3c1ce905e880b921bc48230c64bb1cf01f877cd8948704dfbf7f89312abb5f0be9fea1be13a3ee1262aad337f8 SHA512 bef3c344a3c16f224cc3c6e662213713bb1123b4e47347d83d01d632c5ca0b09e7f0e5a989b3987655759ac901307c8dd6768fab3056c8878c0adcf78b0d5fb9
 DIST ez-ipupdate_3.0.11b8.orig.tar.gz 81975 BLAKE2B a5f6e0f301f3eb2e26b4af2f0ec4839efbb254514a08315a66bf3f5ed07b045178dab0e5a3814fb06ff9d1733dceb23168d90ca50905f2e3896f90581cdfff7d SHA512 85de91cde25d176374ade7128e8932a4e015cd04beb8d5b71bf540e2f59b6c409d1c8bd0ff7c50734b87ecc19a74a7b1da3e646a8c8787badcae4feb9dba7864
-EBUILD ez-ipupdate-3.0.11.13.3_beta8-r3.ebuild 3435 BLAKE2B 111c723d9c5de72ada65eca8abb646d042035c81b75a447513116401609ea1e999368872962b954640d05ec30b4e20e54ed3dd652bffa2a75970b5602510f770 SHA512 ef9c3d1440158ef922ed29f14679874cda2bacfcc03e2bbe67568c077d51a9a60b29838e11131a348f9a7554d53d32c7d6116b6587183f3addcf4a7e16885407
+EBUILD ez-ipupdate-3.0.11.13.3_beta8-r4.ebuild 3210 BLAKE2B 0f86cb659a94e3a54229716c57e412d48f0727730919a6502d89fff859f723cb9cf9314129ca088b0fb2131aa1ba3a2c95871fba4029b145d6e3881a6f0a0018 SHA512 a0b28fd7e124ec14e124f05469390eaf4c935555f8c5dbbdf839098d6a55c7660cab11ff08e3e610b1ec1a9582f4dc341af6bbd1c4b27f59bcc861904825883a
 MISC metadata.xml 404 BLAKE2B ff62fad677b4b7a447e051805b3d76843acd9031289eac9939999e729ae59165489500b42009e112037e0a63f53662591ecfcf87fbc7f7ea8842f4f25a9851e7 SHA512 07417b283cb97be8e2d9ff84dc6fd42d89cb1fc48bd356efa7c29498137fbec47fd408960915805d18d9aa7b49a530ec55271a8eb97287b15586678c4fdf5b20
diff --git a/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r3.ebuild b/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r4.ebuild
index c264e1c1aba0..4a1e50900053 100644
--- a/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r3.ebuild
+++ b/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r4.ebuild
@@ -1,27 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit eutils readme.gentoo systemd user versionator
+EAPI=7
 
-MY_BETA="$(get_version_component_range 6)"
-MY_PATCH="$(get_version_component_range 4-5)"
-MY_PV="$(get_version_component_range 1-3)${MY_BETA/beta/b}"
+MY_BETA="$(ver_cut 6-)"
+MY_PATCH="$(ver_cut 4-5)"
+MY_PV="$(ver_cut 1-3)${MY_BETA/beta/b}"
+
+inherit readme.gentoo-r1 systemd
 
 DESCRIPTION="Dynamic DNS client for lots of dynamic dns services"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://debian/pool/main/e/ez-ipupdate/${PN}_${MY_PV}.orig.tar.gz
-	mirror://debian/pool/main/e/ez-ipupdate/${PN}_${MY_PV}-${MY_PATCH}.diff.gz"
+SRC_URI="
+	mirror://debian/pool/main/e/ez-ipupdate/${PN}_${MY_PV}.orig.tar.gz
+	mirror://debian/pool/main/e/ez-ipupdate/${PN}_${MY_PV}-${MY_PATCH}.diff.gz
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
+RDEPEND="
+	acct-group/ez-ipupd
+	acct-user/ez-ipupd
+"
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
@@ -44,35 +47,34 @@ init-script with the 'update' parameter inside
 your PPP ip-up script.
 "
 
-src_prepare() {
-	# apply debian patches
-	epatch "${WORKDIR}/${PN}_${MY_PV}-${MY_PATCH}.diff"
-
-	# repair/apply additional debian patches
-	sed -i -e "s|^\(---\s*\)\.\./|\1|g" debian/patches/*.diff
-	EPATCH_SOURCE="${S}/debian/patches" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
-
+PATCHES=(
 	# adding members.3322.org support
-	epatch "${FILESDIR}/${P}-3322.diff"
-
+	"${FILESDIR}/${P}-3322.diff"
 	# adding www.dnsexit.com support
-	epatch "${FILESDIR}/${P}-dnsexit.diff"
-
+	"${FILESDIR}/${P}-dnsexit.diff"
 	# make ez-ipupdate work with iproute2/dhcpcd under linux (bug #318905)
-	epatch "${FILESDIR}/${P}-linux.diff"
-
+	"${FILESDIR}/${P}-linux.diff"
 	# allows to set IPv6 via -a option, (bug #432764)
-	epatch "${FILESDIR}/${P}-ipv6.diff"
-
+	"${FILESDIR}/${P}-ipv6.diff"
 	# repair format mask issues
-	sed -i -e "s|\(\s*\)\(strlen(putbuf)\)|\1(int)\2|g" ez-ipupdate.c || die
+	"${FILESDIR}/${P}-fix-format-mask.patch"
+)
+
+src_prepare() {
+	# Debian patches
+	eapply "${WORKDIR}/${PN}_${MY_PV}-${MY_PATCH}.diff"
+	# repair/apply additional Debian patches
+	sed -i -e "s|^\(---\s*\)\.\./|\1|g" debian/patches/*.diff || die
+	eapply debian/patches
+
+	default
 
 	# comment out obsolete options
 	sed -i -e "s:^\(run-as-user.*\):#\1:g" \
 		-e "s:^\(cache-file.*\):#\1:g" ex*conf || die
 
 	# make 'missing' executable (bug #103480)
-	chmod +x missing
+	chmod +x missing || die
 }
 
 src_configure() {
@@ -99,23 +101,18 @@ src_install() {
 	readme.gentoo_create_doc
 }
 
-pkg_preinst() {
-	enewgroup ez-ipupd
-	enewuser ez-ipupd -1 -1 /var/cache/ez-ipupdate ez-ipupd
-}
-
 pkg_postinst() {
-	chmod 750 /etc/ez-ipupdate /var/cache/ez-ipupdate
-	chown ez-ipupd:ez-ipupd /etc/ez-ipupdate /var/cache/ez-ipupdate
+	chmod 750 /etc/ez-ipupdate /var/cache/ez-ipupdate || die
+	chown ez-ipupd:ez-ipupd /etc/ez-ipupdate /var/cache/ez-ipupdate || die
 
 	readme.gentoo_print_elog
 
-	if [ -f /etc/ez-ipupdate.conf ]; then
+	if [[ -f /etc/ez-ipupdate.conf ]]; then
 		elog "The ez-ipupdate init-script can now handle more"
 		elog "than one config file. New config file location is"
 		elog "/etc/ez-ipupdate/*.conf"
-		if [ ! -f /etc/ez-ipupdate/default.conf ]; then
-			mv -f /etc/ez-ipupdate.conf /etc/ez-ipupdate/default.conf
+		if [[ ! -f /etc/ez-ipupdate/default.conf ]]; then
+			mv -f /etc/ez-ipupdate.conf /etc/ez-ipupdate/default.conf || die
 			elog "Your old configuration has been moved to"
 			elog "/etc/ez-ipupdate/default.conf"
 		fi
diff --git a/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-fix-format-mask.patch b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-fix-format-mask.patch
new file mode 100644
index 000000000000..51663504e2c9
--- /dev/null
+++ b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-fix-format-mask.patch
@@ -0,0 +1,35 @@
+From fe3aa40dfc94640e4faedad68ac3e5fd57353111 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Mar 2021 13:07:11 +0100
+Subject: [PATCH] Fix format mask issues
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ ez-ipupdate.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ez-ipupdate.c b/ez-ipupdate.c
+index ff093a9..8d206da 100644
+--- a/ez-ipupdate.c
++++ b/ez-ipupdate.c
+@@ -2483,7 +2483,7 @@ int DHS_update_entry(void)
+   p += strlen(p);
+   limit = BUFFER_SIZE - 1 - strlen(buf);
+ 
+-  snprintf(buf, BUFFER_SIZE, "Content-length: %d\015\012", strlen(putbuf));
++  snprintf(buf, BUFFER_SIZE, "Content-length: %d\015\012", (int)strlen(putbuf));
+   output(buf);
+   snprintf(buf, BUFFER_SIZE, "\015\012");
+   output(buf);
+@@ -2620,7 +2620,7 @@ int DHS_update_entry(void)
+     p += strlen(p);
+     limit = BUFFER_SIZE - 1 - strlen(buf);
+ 
+-    snprintf(buf, BUFFER_SIZE, "Content-length: %d\015\012", strlen(putbuf));
++    snprintf(buf, BUFFER_SIZE, "Content-length: %d\015\012", (int)strlen(putbuf));
+     output(buf);
+     snprintf(buf, BUFFER_SIZE, "\015\012");
+     output(buf);
+-- 
+2.31.0
+