Testing user submitted patch for bug 491164

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x786037A7

4 files changed, 293 insertions, 11 deletions

diff --git a/net-misc/hylafaxplus/ChangeLog b/net-misc/hylafaxplus/ChangeLog
index eaadf2914adf..a9d5761e0f81 100644
--- a/net-misc/hylafaxplus/ChangeLog
+++ b/net-misc/hylafaxplus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/hylafaxplus
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafaxplus/ChangeLog,v 1.7 2013/09/27 12:56:58 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafaxplus/ChangeLog,v 1.8 2014/01/11 00:14:52 mattm Exp $
+
+*hylafaxplus-5.5.4-r1 (11 Jan 2014)
+
+  11 Jan 2014; Matthew Marlowe <mattm@gentoo.org>
+  +files/hylafax-cryptglibc.patch, +hylafaxplus-5.5.4-r1.ebuild:
+  Testing user submitted patch for bug 491164
 
   27 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> -hylafaxplus-5.5.1.ebuild:
   Drop old
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 71fe1c1e2ab8..fbf58ca03c42 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -1,23 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX hylafax-cryptglibc.patch 3154 SHA256 e8939efe6535aa51e9cf70e40c2951175f70412c368d5921862b64918c21c92e SHA512 04e2253cbc8b1f71e984a3d80e98d8aa5a7c7ab7ae286ecbecf8fb6c8d5528085b719a9dbc9f5dae6c788cfa83a57393d9ae0c36525eac658d244f4fc500f0cb WHIRLPOOL c01cc89a63d05b488084651b568a211ea7414f97b9d097f984918a70f7c85180b673b59bb509ede1567552c169137736d256a1b0e71a39dba15527f1a8ec0051
 AUX hylafaxplus-conf 572 SHA256 bc8851e560282ebce22073c146acaf2e848c4c1bdb49c4862b7f66c2062c2942 SHA512 ee97c45e49ed03bf2d393b7861fb8d0a92ce927243b7f1843c52de452540e78633e1a6d7b6892e6f5e30b5518b4b3d998354a3cfebe7adfd84da3f9586585621 WHIRLPOOL 136dea535ce736336d872b0e9545b745415bade140468801e14971e5035b75353f838de7e45a3f8bffc9cae671d8e337a1df804d071512ddb82e6cf8d0cf69da
 AUX hylafaxplus-init 3139 SHA256 be1280b1e28f7135f9bad491bbd068eabe8c450f43f69892676c5bea1bc7ebfd SHA512 e68aca6a3868e43589c88607a23640e4e8b656e8ef0387b91dff6ec0777c781445392b33a2d1301ed105849e761e40430d3a16d5fa1082bdf2e3091ad97a6303 WHIRLPOOL b029f6d2b253524eff9113d269dfab1b095d1c6cbaa16ffc120a67a7e16a713da82cb99b385cfc45f04719b55236dfcf18b9c9a16aad08621a0f876fafc6aee5
 AUX ldconfig-patch 463 SHA256 7f2bef0bad6aa0c6474d3bdaf486a4637b75d3312348e6633a89fab66985786b SHA512 3729b8c1a7bc9e0a7fda33a7f57ead1fcbb3f3642f8639303acf079b32dc2856659a92bc39bf36606ffc042b0ba656b3b4e962eedda2cadca5247663893c0a9a WHIRLPOOL ae60a190e869ea1bf5ecc271af87d670eb1b093dd097e01d72eda28a55b8f6416c0fc575b5a7954e81221c8e0737c14b8d037853fa1d9ff31191691d7b45f7dc
 DIST hylafax-5.5.1.tar.gz 1304020 SHA256 96ac3dd60e3740184e3a5a68f0eeeafcede9aa9d3cc38bb3e8a4c06fb45f5f11 SHA512 689a4b4e4c0caa81257e75d939580bbe3feb80b057014a3a8aff6c3d7f6439edc63d75ff74742cce6d0a9b5496dbdffa6adf7851ba92e8debf7928f5a97b66c8 WHIRLPOOL b3a7ce46841dd58d6b51ad26f9563c75f0d58a919e75153598cc9f67c6befd2e6721bf78575a7a3829deb0872ab642f2b0cc76b9e36196b279a034600dd1b751
 DIST hylafax-5.5.4.tar.gz 1347860 SHA256 699ea9e05a251c0f120d753c3dab2ef347b6bb8fe362dac8ff3e4ece0fdac3ff SHA512 c26c722bf9261ffa154979e015c2cfed982caffd8c7663f471e369d05544eb24edb0e70c7f06d02b77bf71956ae7a242a48f31a6567785acd8707be3b6946161 WHIRLPOOL 779cbc292065867317a4d4fc73725acfc1c4d39b0cab6b2339a9303e91488180430d2d87f4fb52869daa0b1343a7a4b700fbf5e711288409372b4d08fbf514ce
 EBUILD hylafaxplus-5.5.1-r1.ebuild 4863 SHA256 c13e3884fee215cb618d59885e0c69e92983d20ca18511bf73358de4f4013d8e SHA512 1c70abd5cc277afe270e4d0f566d5264491a5174987a4a8520c3bf11cdd74268befb2b8ab8bd715aedb8c99bf9d8d5fbfe9cd327a14e3fc5916691d23117816c WHIRLPOOL cd341445e88c18ee925820d6f33fc5d54158aa773c4a8644ab843d7036df27dba66e8f632ce3bcef16a7c6f103b26a4510365af0f50728fe35bbc6892a276023
+EBUILD hylafaxplus-5.5.4-r1.ebuild 4798 SHA256 bc3601f289910a3b6b684513bb659efcb24d252f2b482981ea13aca32f4008e3 SHA512 647cef80ec447a5c379bf1c1c726a55fba34c5a37f24db02930dc3dba395c636211b34bfa99f094b3ce248f16ed3a30866d556fd2155c69dfdedd3426cc657f1 WHIRLPOOL 954186bebfe37718a3f5e318a8abcc0f6d4afb1ab1d0aa9b561b25a66f333589b920282ffbb42ee60ce14e4c95e9b9bd2963a6392972fe6c5709923c9fbcd176
 EBUILD hylafaxplus-5.5.4.ebuild 4759 SHA256 53aeedad0df53ddad8bca3c99119cdf99b88198d3bce272c6c934888e6acd0ab SHA512 f1747f161477cbb077d2d08a2f87482e18640885685f2e494da48b29bc1acf2ea162a5ea4ffd9e02d19ee90ded83c23048bc3a464e63a5b03e447753ea9bbff7 WHIRLPOOL 405a7eeff28c3a362ad7e944c1b439b97e90f650551f9adab8f913463c68e6e03791379d71e9ea93db3e2483e83a8c304548d4419a252f657cbf0ff9d7481f32
-MISC ChangeLog 1852 SHA256 1b6e16eaf43fdf5eff18b615b98d335dced65c185e07b8da7c78b8934ab5843f SHA512 bcea8bdc0ce2f7cc155d0380dfbd4af74a42047e91a7ac78fa3e145144d37e761f483b2519f80667d1c4b416a9540c44a0ecea024323ea1451e3e78ec2c4556b WHIRLPOOL 2a5c6093bc18280841083e0ca3cfbb68f6d0dac6f8a2863e380c487fbff30a346d8482f4931b8bc7b42c79c169f06b4e90dcc6a80857287a1df76e1c035b2b2e
+MISC ChangeLog 2048 SHA256 f67c380ad6eed91a73fdacd015cbf02cafb3f147fe424fd2ff565c51b6b71515 SHA512 aaa2a0226d3c56e2f8cff6d3d615a0e6ffb4d37ca177307bbad09107582cc54ac656acde000e60dff364a84e8e6f2818408ce32e5285873fa092e382a5bad80b WHIRLPOOL 52fc402f387208a0da1b168eace12091a1fae5f4f401377353b1737419bd523cc8296ff81f6e4d9f112c4b2f68d7552bf605a0a5e3d916038856c8d90b7c7baa
 MISC metadata.xml 620 SHA256 d8c1ce4499b907397bcb03086195b7d17456483d8582f0d725f9bd7e7f5c995d SHA512 25ac059d696814baff43d61be28e551bae7874685461a91e523669c23c285eb56f4c4ff1017e9e5990b131ff903a3770a92c4021b89963d26f402ab3b7c16a55 WHIRLPOOL 5d5d1d9ab11cddec2b50948646da9e038db0977e0f5da77bb3335f723add63bacf2a1fc36c32e5613a0d37b4834b8d1fe7d3092411b6b76a0e9e13db88b76828
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSRYBhAAoJECo/aRed9267TnUIAJ+J7jEKg3/jsf9N3ismELfX
-9qd/xn0ri6rJW0VuSrrJOhYsnDDLKSDSstYzBNmaKfkqX/0bpob0ogYC2siz11/H
-14hp+c3is4OGIK3bs8dxPe/iYKUBxA06MBy3F/k4ae2hnWft1BhSbbIMJT22ZTKJ
-/E6KUqEgiMzeAuhXfTC/uNtXOykz6XHyEUgSzLYpCflyApukpj/+6oUEq1c8f8YP
-hOnSCZU+unuI/W5w6ZHQ4qntCG8dda+uDGrjCdBzhLPt26UYLrb75dqqvGb+dLW2
-DJB1cM6RcRQXgH9FpFGLURO+92AxU/Xwpromp/5dt6RxocKv/p+NTrFVPWVS4lc=
-=TJY+
+iQEcBAEBCAAGBQJS0I0DAAoJEC1LWXx4YDen2gEH/2H57jaRumVIrqn7NkxYx7bH
+G+Qr3IaOqmXpiF8o0LLITvGxZLs5igE0Gi+F/SZ5pFWDsixjy2eOMMg3RNhgELj4
+Lvu+fhX3y2uvSyKS4P+pJAMORQS5z9/uOJ6wLRDWGnBg0r5GCKgATb/+SoAN58Rj
+B6ReSXffZUwbS4R5UrIf+WWccxex4nIQtkbHmKapIihLXy5J+GQSkWPwsmBFlAKa
+mUrz30sbe37zbCJS93XyVf03fHMjZUFw/2+z9goFSLksJSPh2pe/f0brHG2CKCKq
+ilnBcKQNysebNv1pmRI89LZJPNENgu4QWr1pB5ncxp8dLFXyr+FIGMYvR8/drUA=
+=dVFy
 -----END PGP SIGNATURE-----
diff --git a/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch b/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch
new file mode 100644
index 000000000000..dbfc8bac5393
--- /dev/null
+++ b/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch
@@ -0,0 +1,98 @@
+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/hylafaxplus-5.5.4-r1.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.5.4-r1.ebuild
new file mode 100644
index 000000000000..b4c9324adc4e
--- /dev/null
+++ b/net-misc/hylafaxplus/hylafaxplus-5.5.4-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafaxplus/hylafaxplus-5.5.4-r1.ebuild,v 1.1 2014/01/11 00:14:52 mattm Exp $
+
+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=""
+
+IUSE="jbig html ldap mgetty pam"
+
+DEPEND=">=sys-libs/zlib-1.1.4
+	app-text/ghostscript-gpl
+	virtual/mta
+	media-libs/tiff[jbig?]
+	virtual/jpeg
+	jbig? ( media-libs/jbigkit )
+	virtual/awk
+	ldap? (  net-nds/openldap )
+	pam? ( virtual/pam )
+	mgetty? ( 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
+}