gentoo resync : 03.03.2021

4 files changed, 182 insertions, 3 deletions

diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 0b4b77524100..e664db152e81 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -1,7 +1,10 @@
+AUX hylafaxplus-7.0.2-tiff-4.2.patch 423 BLAKE2B 73bd76ed5f9b4a80dce322e910f1656d8210fa7f07499519c71c078c64452cce8d9a2c7fc913419328a224107a7b37972d5bd6eae6c20b6026c6c3682e4b2947 SHA512 b3512870ba25a7f896003e68eb56e2288a304351e5bf32a15771c3bc3c39572bd0c833f02694470417aeed8a2938cae6864604e8e40d6303dc05e579a84d1dcd
 AUX hylafaxplus-CVE-2020-1539x.patch 3799 BLAKE2B 017793755bc17224e41541010b9bc46db72aac0c4801f94e86a5bd88ec834db4738aa22747fb3bfaa867a2967acca35ef77f9cfb88d39a0990aef93e12381010 SHA512 7f04ac1af6bb6d2440aeb0b74aab023d47357f8e27a2bffd237e6be3b66277c54947968c7dafac1dd6a6623c833970fe22f5e9ee817582279116ca88ba655e50
 AUX hylafaxplus-conf 572 BLAKE2B cd2b237704e0607565c16cf81593654d266c212810d0dcb399f35d980d04ed54a5bb961f2fd29dbc8386ef6684fe684a8bcbd21c9cd782490546554ec90e4b2e SHA512 ee97c45e49ed03bf2d393b7861fb8d0a92ce927243b7f1843c52de452540e78633e1a6d7b6892e6f5e30b5518b4b3d998354a3cfebe7adfd84da3f9586585621
 AUX hylafaxplus-init 3150 BLAKE2B 67b27c9e773d141c462b62882fa1ec592bdd30397c21c0dc0ef55384ac0d448803a8984c35eb22185c0aa315019eea1588829717b170f0b6168b549a270f2570 SHA512 6bc4db4597ef55aaf01bff66dfe7e9b3ce23d51e8d165f635ad49d9971260f8f131d386869787b2cd0de612d8ee784fb8f4e44fa8b8deb4eabf1aeab441e68f5
 AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c
 DIST hylafax-7.0.2.tar.gz 1393586 BLAKE2B cbf99f91a0aa07783dd30e76ce8416b2933240d4bf829220909000519f9c9e14a324163707c14504848ba71e7c1ee7d98455f06bb040c2c50c1493d0138122aa SHA512 ea68404ad79e798b29450683eaa927e73033e0fa8160b803a3e2c9000df487c81193cc8fc0c1187477f5e1b2e26eec1c065ebc17e0be82e9a3e3758b1b5b5e4e
-EBUILD hylafaxplus-7.0.2.ebuild 4236 BLAKE2B 1327ad118d3333313300cab3ce41d1725d4c42e89eb6a6f41e28c6dd53622d04f67c76a44b86fe7f334aade6687827a2afe590e0012ccaf756f4d28fc134c010 SHA512 44dba8d9d8c7096b379b4749f5ef3a7eeb8bb7a08b5b6d866b67388f8281b1375cd0aff73ed5474d35ceb67d1faa3a8a33c9d6f65a7727669a0f9d915596d4cf
+DIST hylafax-7.0.3.tar.gz 1405116 BLAKE2B dbf8f87380929eb79ca0f18042c3397460dd6774f16defde8e9427d1d14094e00f6be491552f3ff6cc4c3d1fad0ec67a0c1a5fa3b4cb1e07c2f0c956eaefe8ed SHA512 938a21e4573fdf12bbc03dfee85e00555e7790a83a26316ac9cd1983501860858175d599c35f3b383cb0748518644587c203fb429966b5de3b615689d856281a
+EBUILD hylafaxplus-7.0.2.ebuild 4277 BLAKE2B 15f47c1c4483d15506a90aad6911f9d49bfdc686c76069debd330e8c64fed59bddff568c5babb13ec53b92a296cd3d283f3a8240ceb89ef89bd2fd1b475ad490 SHA512 22fc577c68bba6d5bde7d4e9e1a75804fb8ad83ac34b2957947782b4557949c70c77a78fd93d2cc0c34a95a983df3ff8d11833a3de293bff7816f665f8122754
+EBUILD hylafaxplus-7.0.3.ebuild 4187 BLAKE2B 7b9632ca64f2a036b0a2af9c084ec60ae05838e5970ac8c52da528bcf9db9b54c217cfb167c5026b3f21384b30794ba23e36e89d88c6157118486c81d77ba134 SHA512 2af3df0e835067784e375e15f9b90a3e7041782c98ee3eddb84e82a1c14ed38682adb3af384c7585bdf9578b057149a1b17833501cd5c9fc1da2a0113dd378a0
 MISC metadata.xml 496 BLAKE2B 778816874c73db0b7958055c119ef88326993ba3dbac35086b6ebcc3f27c95b71abdec098989460e800c25407f0a7781869649639cddd8671f998d3cf9d0d615 SHA512 092154bcc54daa4db847fabc773d588ee09e6c65c540391d4bd78c4856662b348304a0116628b5142381fe9cf76c5caaf25984c1e7449f032f7c20b83b0a0bd5
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch b/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch
new file mode 100644
index 000000000000..97623b850805
--- /dev/null
+++ b/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/706154
+--- a/configure
++++ b/configure
+@@ -2583,7 +2583,7 @@ EOF
+ 				echo '#define TIFFSTRIPBYTECOUNTS uint32'
+ 				echo '#define TIFFVERSION TIFF_VERSION'
+ 				echo '#define TIFFHEADER TIFFHeader';;
+-		4.[01])		tiff_runlen_t="uint32"
++		4.[012])	tiff_runlen_t="uint32"
+ 				tiff_offset_t="uint64"
+ 				echo '#define TIFFSTRIPBYTECOUNTS uint64'
+ 				echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild
index 78a77fe1f505..6cbf6123a4c4 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_PN="${PN/plus/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
-HOMEPAGE="https://hylafax.sourceforge.net"
+HOMEPAGE="http://hylafax.sourceforge.net"
 SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
 
 SLOT="0"
@@ -44,6 +44,7 @@ CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
 PATCHES=(
 	"${FILESDIR}/ldconfig-patch"
 	"${FILESDIR}/${PN}-CVE-2020-1539x.patch"
+	"${FILESDIR}/${PN}-7.0.2-tiff-4.2.patch"
 )
 
 src_prepare() {
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild
new file mode 100644
index 000000000000..af9072b4758a
--- /dev/null
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam toolchain-funcs
+
+MY_PN="${PN/plus/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
+HOMEPAGE="http://hylafax.sourceforge.net"
+SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="hylafaxplus"
+KEYWORDS="~amd64 ~x86"
+IUSE="html jbig lcms ldap mgetty pam"
+
+DEPEND="
+	app-text/ghostscript-gpl
+	media-libs/tiff:0[jbig?]
+	!net-dialup/mgetty[fax]
+	>=sys-libs/zlib-1.1.4
+	virtual/awk
+	virtual/jpeg:0
+	virtual/mta
+	jbig? ( media-libs/jbigkit )
+	lcms? ( media-libs/lcms )
+	ldap? (  net-nds/openldap )
+	mgetty? ( net-dialup/mgetty[-fax] )
+	pam? ( sys-libs/pam )
+"
+RDEPEND="${DEPEND}
+	!net-dialup/sendpage
+	net-mail/metamail
+"
+
+CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
+CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
+
+PATCHES=(
+	"${FILESDIR}/ldconfig-patch"
+	"${FILESDIR}"/${PN}-7.0.2-tiff-4.2.patch
+)
+
+src_prepare() {
+	default
+
+	# force it not to strip binaries
+	for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
+		hfaxd sendfax sendpage ; do
+			sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
+				"${dir}"/Makefile.in || die "sed on ${dir}/Makefile.in failed"
+	done
+
+	sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
+
+	# Respect LDFLAGS(at least partially)
+	sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
+
+	sed -i -e "s|-fpic|-fPIC|g" \
+		configure || die
+}
+
+src_configure() {
+	do_configure() {
+		echo ./configure --nointeractive ${1}
+		# eval required for quoting in ${my_conf} to work properly, better way?
+		eval ./configure --nointeractive ${1} || die "./configure failed"
+	}
+
+	local my_conf=(
+		--with-DIR_BIN=/usr/bin
+		--with-DIR_SBIN=/usr/sbin
+		--with-DIR_LIB=/usr/$(get_libdir)
+		--with-DIR_LIBEXEC=/usr/sbin
+		--with-DIR_LIBDATA=/usr/$(get_libdir)/fax
+		--with-DIR_LOCALE=/usr/share/locale
+		--with-DIR_LOCKS=/var/lock
+		--with-DIR_MAN=/usr/share/man
+		--with-DIR_SPOOL=/var/spool/fax
+		--with-DIR_HTML=/usr/share/doc/${PF}/html
+		--with-DIR_CGI="${WORKDIR}"
+		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
+		--with-PATH_IMPRIP=""
+		--with-SYSVINIT=no
+		--with-REGEX=yes
+		--with-LIBTIFF=\"-ltiff -ljpeg -lz\"
+		--with-OPTIMIZER=\"${CFLAGS}\"
+		--with-DSO=auto
+		--with-HTML=$(usex html)
+	)
+
+	if use mgetty; then
+		my_conf+=(
+			--with-PATH_GETTY=/sbin/mgetty
+			--with-PATH_EGETTY=/sbin/mgetty
+			--with-PATH_VGETTY=/usr/sbin/vgetty
+		)
+	else
+		# GETTY defaults to /sbin/agetty
+		my_conf+=(
+			--with-PATH_EGETTY=/bin/false
+			--with-PATH_VGETTY=/bin/false
+		)
+	fi
+
+	#--enable-pam isn't valid
+	use pam || my_conf+=( $(use_enable pam) )
+	use lcms || my_conf+=( $(use_enable lcms) )
+	use ldap || my_conf+=( $(use_enable ldap) )
+	use jbig || my_conf+=( $(use_enable jbig) )
+
+	tc-export CC CXX AR RANLIB
+
+	do_configure "${my_conf[*]}"
+}
+
+src_compile() {
+	# Parallel building is borked, bug #????
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
+	dodir /var/spool /var/spool/fax
+	fowners uucp:uucp /var/spool/fax
+	fperms 0600 /var/spool/fax
+	dodir "/usr/share/doc/${P}/samples"
+
+	emake DESTDIR="${D}" \
+		BIN="${D}/usr/bin" \
+		SBIN="${D}/usr/sbin" \
+		LIBDIR="${D}/usr/$(get_libdir)" \
+		LIB="${D}/usr/$(get_libdir)" \
+		LIBEXEC="${D}/usr/sbin" \
+		LIBDATA="${D}/usr/$(get_libdir)/fax" \
+		DIR_LOCALE="${D}/usr/share/locale" \
+		MAN="${D}/usr/share/man" \
+		SPOOL="${D}/var/spool/fax" \
+		HTMLDIR="${D}/usr/share/doc/${PF}/html" \
+		install
+
+	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
+	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
+
+	einfo "Adding env.d entry for ${PN}"
+	newenvd - 99hylafaxplus <<-EOF
+		PATH="/var/spool/fax/bin"
+		CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
+		CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
+	EOF
+
+	newconfd "${FILESDIR}/${PN}-conf" ${PN}
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+
+	use pam && pamd_mimic_system ${MY_PN} auth account session
+
+	einstalldocs
+	docinto samples
+}