gentoo resync : 25.08.2020

6 files changed, 138 insertions, 310 deletions

diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index a47c8ed307f8..0b4b77524100 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -1,9 +1,7 @@
-AUX hylafax-cryptglibc.patch 3154 BLAKE2B 242ffe9babe0e68d891e2bb9fcc261368dca67c92dfac66c234abe42da4cdc2bb84ba939fdff6073c05ed0e8d10a343b723c43cea4bb43009a17302a61778966 SHA512 04e2253cbc8b1f71e984a3d80e98d8aa5a7c7ab7ae286ecbecf8fb6c8d5528085b719a9dbc9f5dae6c788cfa83a57393d9ae0c36525eac658d244f4fc500f0cb
+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-5.5.5.tar.gz 1353495 BLAKE2B e1b41a5cf5502ad28467625495171c085f43f4352b73bfd633da851a1366502aca04a157790ad4a7f3d634a6adbb5dab4c1eeb294283352e9eedaf03c565cb42 SHA512 ee6225ae044c567093103f35c30d848db757636c1d8db78e8f7cb43eb01ea34ab229a81ca4175e2bf30d3c87b598d5b5797b7d92b0dc852bf4b69c697baca8cf
-DIST hylafax-5.6.1.tar.gz 1370677 BLAKE2B bd93d54f2c3e2c5c4c33617a0d95569c82bcbd32f669fb2ea513b86e112a5743ae6b4ddc8d43f3bd4af6006517e8787392c84bf60e715c104ddb0d819b22985a SHA512 c86c33dc9e8feec4e265156fa3bbda18cf187feeef5c812ff3d3c7857de048a688bb979fcd3494ee8fe58a004a384a2a161d05245c86d0c304311d63f62a9eb1
-EBUILD hylafaxplus-5.5.5.ebuild 4713 BLAKE2B b2411e3d73bfad32c801af743373aa1580f488df9cb1dd270d45af049814fa3a498a6e1990c9f7f816b49b750a9a6484968090a0a33e3a52e1587ad6ba700868 SHA512 eb924ce2ebd1892e7d55d735ab44ce7adfc21fd90d8a5508333a878586ed9a39a6b38eaa3696c77d7a0cbcccdf127f54bbc976d5ae2429b6f4a3c0c1307e61fe
-EBUILD hylafaxplus-5.6.1.ebuild 4291 BLAKE2B 59910c07d2b56694d7bc1b6ffdf3475ae88b0c8c8b49e575fdf6ed110939464125b4751fa72a114936f3375de233e6e3ef2d54f917162277fb074de0cdaec27e SHA512 34f741613a2b527a6e42275c503b7fe9743459160ca7a3a27f5739748f29530f30d0efc95d570865fb7bc3d8b74d0634c12c4c753018cf4e97e5c36b5cfe4cac
-MISC metadata.xml 604 BLAKE2B 012e03ab403ae6f27142ac9394736f1ad10bd049e5403e673259371d39119162ad5c61bd84248f1a1ec4f659f20c879e5682b0855d54f096b51c75688975e835 SHA512 bcaa18269a7ece318c970552134c79f89eb41c76a7e471e430d72ad9a8dc4ea10fa57d6b89434759f6cd1aa22db6ad8b5fb8933b7e65ffcdab11275cfce14593
+DIST hylafax-7.0.2.tar.gz 1393586 BLAKE2B cbf99f91a0aa07783dd30e76ce8416b2933240d4bf829220909000519f9c9e14a324163707c14504848ba71e7c1ee7d98455f06bb040c2c50c1493d0138122aa SHA512 ea68404ad79e798b29450683eaa927e73033e0fa8160b803a3e2c9000df487c81193cc8fc0c1187477f5e1b2e26eec1c065ebc17e0be82e9a3e3758b1b5b5e4e
+EBUILD hylafaxplus-7.0.2.ebuild 4236 BLAKE2B 1327ad118d3333313300cab3ce41d1725d4c42e89eb6a6f41e28c6dd53622d04f67c76a44b86fe7f334aade6687827a2afe590e0012ccaf756f4d28fc134c010 SHA512 44dba8d9d8c7096b379b4749f5ef3a7eeb8bb7a08b5b6d866b67388f8281b1375cd0aff73ed5474d35ceb67d1faa3a8a33c9d6f65a7727669a0f9d915596d4cf
+MISC metadata.xml 496 BLAKE2B 778816874c73db0b7958055c119ef88326993ba3dbac35086b6ebcc3f27c95b71abdec098989460e800c25407f0a7781869649639cddd8671f998d3cf9d0d615 SHA512 092154bcc54daa4db847fabc773d588ee09e6c65c540391d4bd78c4856662b348304a0116628b5142381fe9cf76c5caaf25984c1e7449f032f7c20b83b0a0bd5
diff --git a/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch b/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch
deleted file mode 100644
index dbfc8bac5393..000000000000
--- a/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -urN hylafax-5.5.4/hfaxd/Login.c++ hylafax-5.5.4-libc217/hfaxd/Login.c++
---- hylafax-5.5.4/hfaxd/Login.c++	2013-08-07 01:23:35.000000000 +0200
-+++ hylafax-5.5.4-libc217/hfaxd/Login.c++	2013-11-13 12:56:02.000000000 +0100
-@@ -30,9 +30,6 @@
- #include <ctype.h>
- #include <fcntl.h>
- #include <pwd.h>
--#if HAS_CRYPT_H
--#include <crypt.h>
--#endif
- 
- void
- HylaFAXServer::loginRefused(const char* why)
-@@ -434,7 +431,7 @@
-     /*
-      * Check hosts.hfaxd first, then PAM, and last, LDAP
-      */
--    if (pass[0] == '\0' || !(strcmp(crypt(pass, passWd), passWd) == 0 || 
-+    if (pass[0] == '\0' || !(strcmp(Sys::crypt(pass, passWd), passWd) == 0 || 
- 			     pamCheck(the_user, pass) || 
- 			     ldapCheck(the_user,pass)))
-     {
-@@ -513,7 +510,7 @@
- {
-     fxAssert(IS(LOGGEDIN), "ADMIN command permitted when not logged in");
-     // NB: null adminWd is permitted
--    if ((strcmp(crypt(pass, adminWd), adminWd) != 0) && !pamIsAdmin()) {
-+    if ((strcmp(Sys::crypt(pass, adminWd), adminWd) != 0) && !pamIsAdmin()) {
- 	if (++adminAttempts >= maxAdminAttempts) {
- 	    reply(530, "Password incorrect (closing connection).");
- 	    logNotice("Repeated admin failures from %s [%s]"
-diff -urN hylafax-5.5.4/hfaxd/SNPPServer.c++ hylafax-5.5.4-libc217/hfaxd/SNPPServer.c++
---- hylafax-5.5.4/hfaxd/SNPPServer.c++	2013-08-07 01:23:35.000000000 +0200
-+++ hylafax-5.5.4-libc217/hfaxd/SNPPServer.c++	2013-11-13 12:55:42.000000000 +0100
-@@ -36,9 +36,6 @@
- #include "RE.h"
- 
- #include <ctype.h>
--#if HAS_CRYPT_H
--#include <crypt.h>
--#endif
- 
- extern "C" {
- #include <netdb.h>
-@@ -1003,7 +1000,7 @@
- 
-     if (checkUser(loginID)) {
- 	if (passWd != "") {
--	    if (pass[0] == '\0' || !(streq(crypt(pass, passWd), passWd) || pamCheck(the_user, pass))) {
-+	    if (pass[0] == '\0' || !(streq(Sys::crypt(pass, passWd), passWd) || pamCheck(the_user, pass))) {
- 		if (++loginAttempts >= maxLoginAttempts) {
- 		    reply(421, "Login incorrect (closing connection).");
- 		    logNotice("Repeated SNPP login failures for user %s from %s [%s]"
-diff -urN hylafax-5.5.4/hfaxd/User.c++ hylafax-5.5.4-libc217/hfaxd/User.c++
---- hylafax-5.5.4/hfaxd/User.c++	2013-08-07 01:23:35.000000000 +0200
-+++ hylafax-5.5.4-libc217/hfaxd/User.c++	2013-11-13 12:55:19.000000000 +0100
-@@ -30,9 +30,6 @@
- 
- #include <ctype.h>
- #include <pwd.h>
--#if HAS_CRYPT_H
--#include <crypt.h>
--#endif
- #include <math.h>
- 
- #ifndef CHAR_BIT
-@@ -374,7 +371,7 @@
- #else
-     to64(&salt[0], random(), 2);
- #endif
--    result = crypt(pass, salt);
-+    result = Sys::crypt(pass, salt);
-     return (true);
- }
- 
-diff -urN hylafax-5.5.4/util/Sys.h hylafax-5.5.4-libc217/util/Sys.h
---- hylafax-5.5.4/util/Sys.h	2013-08-07 01:23:35.000000000 +0200
-+++ hylafax-5.5.4-libc217/util/Sys.h	2013-11-13 12:56:26.000000000 +0100
-@@ -44,6 +44,10 @@
- #include <osfcn.h>
- #endif
- 
-+#if HAS_CRYPT_H
-+#include <crypt.h>
-+#endif
-+
- /*
-  * Wrapper functions for C library calls.
-  *
-@@ -140,5 +144,8 @@
- 	{ return ::fopen(filename, mode); }
- 
-     static int getOpenMax();
-+
-+    static const char* crypt(const char* key, const char* salt)
-+	{ const char* enc = ::crypt(key, salt); return enc ? enc : ""; }
- };
- #endif /* _Sys_ */
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-CVE-2020-1539x.patch b/net-misc/hylafaxplus/files/hylafaxplus-CVE-2020-1539x.patch
new file mode 100644
index 000000000000..6c484590c468
--- /dev/null
+++ b/net-misc/hylafaxplus/files/hylafaxplus-CVE-2020-1539x.patch
@@ -0,0 +1,110 @@
+commit e8f8196230ae15f6f7d7104ded3e2633002506e4
+Author: faxguy <faxguy@5505949e-d877-4686-9e03-c53b7a51b376>
+Date:   Sat Jun 13 23:46:33 2020 +0000
+
+    Johannes Segitz reported two issues:
+    
+    1) faxaddmodem, faxsetup, and probemodem create temporary directories in a way that is not secure due to a race condition.
+    
+    2) The HylaFAX spool directory bin and etc subdirectories are not secure against uucp deleting and recreating scripts that root runs.
+    
+    These changes address these two issues.
+    
+    
+    
+    git-svn-id: https://svn.code.sf.net/p/hylafax/HylaFAX+@2534 5505949e-d877-4686-9e03-c53b7a51b376
+
+diff --git a/CONTRIBUTORS b/CONTRIBUTORS
+index 057739f..a9d4f21 100644
+--- a/CONTRIBUTORS
++++ b/CONTRIBUTORS
+@@ -203,6 +203,7 @@ following for their contributions:
+   Travis Schafer			LogSend and LogRecv modem config options, documentation fixes
+   Sven Schmidt
+   Steven Schoch				faxrcvd faxinfo text parsing
++  Johannes Segitz			code security audit
+   John Sellens
+   Chris Severance			documentation fixes, scripting improvements
+   Simon <iahnl@iah.nl>
+diff --git a/Makefile.in b/Makefile.in
+index 1ee4d76..ec0cda7 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -208,7 +208,10 @@ makeServerDirs::
+ 	    -idb hylafax.sw.server -root ${INSTALLROOT} -dir ${SPOOL}
+ 	-${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \
+ 	    -idb hylafax.sw.server -dir \
+-	    -root ${INSTALLROOT} -F ${SPOOL} bin client config dev etc info log recvq status
++	    -root ${INSTALLROOT} -F ${SPOOL} client config dev info log recvq status
++	-${INSTALL} -u root -g root -m ${DIRMODE} \
++	    -idb hylafax.sw.server -dir \
++	    -root ${INSTALLROOT} -F ${SPOOL} bin etc
+ 	-${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m 700 \
+ 	    -idb hylafax.sw.server -dir \
+ 	    -root ${INSTALLROOT} -F ${SPOOL} sendq doneq docq tmp pollq archive
+diff --git a/etc/faxaddmodem.sh.in b/etc/faxaddmodem.sh.in
+index dc39917..c4d3ff1 100644
+--- a/etc/faxaddmodem.sh.in
++++ b/etc/faxaddmodem.sh.in
+@@ -113,12 +113,14 @@ if [ "$euid" != "root" ]; then
+ fi
+ 
+ # security
++o="`umask`"
++umask 077
+ TMPDIR=`(mktemp -d /tmp/.faxaddmodem.XXXXXX) 2>/dev/null`
++umask "$o"
+ if test X$TMPDIR = X; then
+-    TMPDIR=/tmp/.faxaddmodem$$
++    echo "Failed to create temporary directory.  Cannot continue."
++    exit 1
+ fi
+-@RM@ -rf $TMPDIR
+-(umask 077 ; mkdir $TMPDIR) || exit 1
+ 
+ SH=$SCRIPT_SH			# shell for use below
+ CPATH=$SPOOL/etc/config		# prefix of configuration file
+diff --git a/etc/faxsetup.sh.in b/etc/faxsetup.sh.in
+index 556eef5..b4aae40 100644
+--- a/etc/faxsetup.sh.in
++++ b/etc/faxsetup.sh.in
+@@ -922,12 +922,14 @@ if onServer; then
+     #
+ 
+     # Setup TMPDIR before anything can trap and rm it
++    o="`umask`"
++    umask 077
+     TMPDIR=`(mktemp -d /tmp/.faxsetup.XXXXXX) 2>/dev/null`
++    umask "$o"
+     if test x$TMPDIR = x; then
+-	TMPDIR=/tmp/.faxsetup$$
++	echo "Failed to create temporary directory.  Cannot continue."
++	exit 1
+     fi
+-    $RM -rf $TMPDIR
+-    (umask 077 ; mkdir $TMPDIR) || exit 1
+ 
+     JUNK="etc/setup.tmp"
+     trap "$RM \$JUNK; $RM -r \$TMPDIR; exit 1" 1 2 15
+diff --git a/etc/probemodem.sh.in b/etc/probemodem.sh.in
+index 55b5d9b..c0abf15 100644
+--- a/etc/probemodem.sh.in
++++ b/etc/probemodem.sh.in
+@@ -85,12 +85,14 @@ test -f $SPOOL/etc/setup.cache || {
+ . $SPOOL/etc/setup.cache	# common configuration stuff
+ . $SPOOL/etc/setup.modem	# modem-specific stuff
+ 
++o="`umask`"
++umask 077
+ TMPDIR=`(mktemp -d /tmp/.probemodem.XXXXXX) 2>/dev/null`
++umask "$o"
+ if test X$TMPDIR = X; then
+-    TMPDIR=/tmp/.probemodem$$
++    echo "Failed to create temporary directory.  Cannot continue."
++    exit 1
+ fi
+-@RM@ -fr $TMPDIR
+-(umask 077 ; mkdir $TMPDIR) || exit 1
+ 
+ SH=$SCRIPT_SH			# shell for use below
+ OUT=$TMPDIR/probemodem$$	# temp file in which modem output is recorded
diff --git a/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild
deleted file mode 100644
index e1d8b5510a8f..000000000000
--- a/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils multilib 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"
-
-SLOT="0"
-LICENSE="hylafaxplus"
-KEYWORDS="amd64 x86"
-
-IUSE="jbig html ldap mgetty pam"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	app-text/ghostscript-gpl
-	virtual/mta
-	media-libs/tiff:0[jbig?]
-	virtual/jpeg:0
-	jbig? ( media-libs/jbigkit )
-	virtual/awk
-	ldap? (  net-nds/openldap )
-	pam? ( sys-libs/pam )
-	mgetty? ( net-dialup/mgetty[-fax] )
-	!net-dialup/mgetty[fax]
-"
-RDEPEND="${DEPEND}
-	net-mail/metamail
-	!net-dialup/sendpage
-"
-
-S="${WORKDIR}/${MY_P}"
-
-export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-
-src_prepare() {
-	epatch "${FILESDIR}/ldconfig-patch"
-	epatch "${FILESDIR}/hylafax-cryptglibc.patch"
-
-	# 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 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
-
-	epatch_user
-}
-
-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/${P}/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="${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="${my_conf} \
-			--with-PATH_EGETTY=/bin/false \
-			--with-PATH_VGETTY=/bin/false"
-	fi
-
-	#--enable-pam isn't valid
-	use pam || my_conf="${my_conf} $(use_enable pam)"
-	use ldap || my_conf="${my_conf} $(use_enable ldap)"
-	use jbig || my_conf="${my_conf} $(use_enable jbig)"
-
-	tc-export CC CXX AR RANLIB
-
-	do_configure "${my_conf}"
-}
-
-src_compile() {
-	# Parallel building is borked
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
-	dodir /var/spool /var/spool/recvq /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}
-
-	generate_files # in this case, it only generates the env.d entry
-
-	einfo "Adding env.d entry for ${PN}"
-	doenvd "${T}/99${PN}"
-
-	newconfd "${FILESDIR}/${PN}-conf" ${PN}
-	newinitd "${FILESDIR}/${PN}-init" ${PN}
-
-	use pam && pamd_mimic_system ${MY_PN} auth account session
-
-	dodoc CONTRIBUTORS README TODO
-	docinto samples
-}
-
-pkg_postinst() {
-	elog
-	elog "The faxonly USE flag has been removed; since ${PN} does not"
-	elog "require mgetty, and certain fax files conflict, you must build"
-	elog "mgetty without fax support if you wish to use them both.  You"
-	elog "may want to add both to package.use so any future updates are"
-	elog "correctly built:"
-	elog
-	elog "	net-dialup/mgetty -fax"
-	elog "	net-misc/hylafax [-mgetty|mgetty]"
-	elog
-	elog "See the docs and man pages for detailed configuration info."
-	elog
-	elog "Now run faxsetup and (if necessary) faxaddmodem."
-	elog
-}
-
-generate_files() {
-	cat <<-EOF > "${T}/99${PN}"
-	PATH="/var/spool/fax/bin"
-	CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
-	EOF
-}
diff --git a/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild
index 6a3be949d081..78a77fe1f505 100644
--- a/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild
@@ -1,46 +1,50 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+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"
+HOMEPAGE="https://hylafax.sourceforge.net"
 SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="hylafaxplus"
-KEYWORDS="~amd64 ~x86"
-IUSE="jbig html lcms ldap mgetty pam"
+KEYWORDS="amd64 x86"
+IUSE="html jbig lcms ldap mgetty pam"
 
 DEPEND="
-	>=sys-libs/zlib-1.1.4
 	app-text/ghostscript-gpl
-	virtual/mta
 	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 )
-	virtual/awk
 	lcms? ( media-libs/lcms )
 	ldap? (  net-nds/openldap )
-	pam? ( sys-libs/pam )
 	mgetty? ( net-dialup/mgetty[-fax] )
-	!net-dialup/mgetty[fax]
+	pam? ( sys-libs/pam )
 "
 RDEPEND="${DEPEND}
-	net-mail/metamail
 	!net-dialup/sendpage
+	net-mail/metamail
 "
 
 S="${WORKDIR}/${MY_P}"
 
-export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
+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" )
+PATCHES=(
+	"${FILESDIR}/ldconfig-patch"
+	"${FILESDIR}/${PN}-CVE-2020-1539x.patch"
+)
 
 src_prepare() {
 	default
@@ -49,7 +53,7 @@ src_prepare() {
 	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 failed"
+				"${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"
@@ -139,10 +143,12 @@ src_install() {
 	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
 	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
 
-	generate_files # in this case, it only generates the env.d entry
-
 	einfo "Adding env.d entry for ${PN}"
-	doenvd "${T}/99${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}
@@ -152,11 +158,3 @@ src_install() {
 	einstalldocs
 	docinto samples
 }
-
-generate_files() {
-	cat <<-EOF > "${T}/99${PN}"
-	PATH="/var/spool/fax/bin"
-	CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
-	CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
-	EOF
-}
diff --git a/net-misc/hylafaxplus/metadata.xml b/net-misc/hylafaxplus/metadata.xml
index 80224275b19e..3d61d69194dc 100644
--- a/net-misc/hylafaxplus/metadata.xml
+++ b/net-misc/hylafaxplus/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
-	<longdescription>
-		Enterprise client-server fax package for class 1 and 2 fax modems.
-	</longdescription>
 	<use>
 		<flag name="jbig">JBIG Fax Compression Support</flag>
 		<flag name="pam">hfaxd authentication via PAM</flag>