gentoo resync : 02.08.2019

6 files changed, 223 insertions, 1 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 07fd785fafc4..7652fcb15fbd 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest
index 78dbf4dc40a4..a456e2993cf5 100644
--- a/net-dialup/linux-atm/Manifest
+++ b/net-dialup/linux-atm/Manifest
@@ -1,4 +1,5 @@
 AUX linux-atm-2.5.2-headers.patch 646 BLAKE2B 1a1280f70c9232ddc39b664e1a533258c6bf7a05017f471544d442b69a9f9b73775d914b1433359adbcc571218207ec7413e2a64e67432489a8b417251b32e3d SHA512 4248a0063de9723ca6a3abdd07c5c3f4bda5a43f21bb5d19f931e898abd3e10f52b20c9d1a21415a17bee70ac6bdba83e13704f2a7c5489fb12d6e93a5a8e113
+AUX linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch 1204 BLAKE2B 26fb42c7c49a56cdb238d22ab65096e7db684550f0f27c208262a2b2b73f790aa3bf4cea65bab176317c444deaf58a4a717e8a83cdb5d2f59474aa6cec814a23 SHA512 0ded21ca8f7f49522611c76d2c161d5f5e2dceeeccf29241d97b57154addd53e0e0101a7ecea648251e264ee88096313dff608b0bd46c53b140be02a4f2cedff
 DIST linux-atm-2.5.2.tar.gz 1082256 BLAKE2B 329aad437a1e6a17fd7d7d2b81c976a76c684aaf127006ed3af1e998a0f52df056747cc84fc13c933dc15c07246f1f00e4ff101ac98ef1dd1bea102830a83625 SHA512 0a50e91513e4e1f882dc6f4792dc032e89497ff745c0eaea0c0c848b0f84e40d19e038e4ab5aa70c1f915c28a9f845340c332ac5c3ae838b8f539466e10a0a08
-EBUILD linux-atm-2.5.2.ebuild 894 BLAKE2B b4a72b006f9e74060f9333138d17e2c478067b7a8709cd354cc117de78b8e2678003f0989c39fe32ce6ea0e03f109214ec95f616c667569455e6c97e93607d80 SHA512 e18e129a2cd74c915626fc8b40ae7daf55fc657dec80a21df2ddef94a4a375f7fa2297e8165984264eb0e65f343d7a8aeae6d41c77cbd0c9d1364b19eb3e47ab
+EBUILD linux-atm-2.5.2.ebuild 948 BLAKE2B 5a999204b62fc0bb6699d6233e7f190ca94ba16251fb9b989623b66decfe7cb5943100720e0fe91cf1e38badde5cb205d60f3569c416f261e34e46c20b4b9711 SHA512 ca32fe9dc2e1b050a1034128ac438fe6de88b4ccbd1a6ca1d02d2305c7a763b20a1c382f214d7e0c7bd03b9441d7de61155f69d9c1b81b1e7f72214fc1632800
 MISC metadata.xml 303 BLAKE2B 064756eecade63aaa1040f2712c005a677f365f7c6e6bb5743c4cf8deb59bee599f42b3b38160e5e2a04402a9b2167e618b4f891cc80a30a3e48b2f7851813ac SHA512 86ae1e28bb9f9d2db0a9607d58dd8cb48f96e76c4aaf5e7027f9ae792ef41ca6ac8da92adf13a40c4bcc1bd2cbea67cd4535232116616f687011c777789bc79b
diff --git a/net-dialup/linux-atm/files/linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch b/net-dialup/linux-atm/files/linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch
new file mode 100644
index 000000000000..ff91c7f16e06
--- /dev/null
+++ b/net-dialup/linux-atm/files/linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch
@@ -0,0 +1,41 @@
+Fix build failure against linux-5.2+:
+  https://www.spinics.net/lists/linux-sh/msg53430.html
+
+--- a/src/maint/atmdump.c
++++ b/src/maint/atmdump.c
+@@ -17,6 +17,16 @@
+ #include <netinet/in.h> /* for htonl and ntohl */
+ #include <atm.h>
+ 
++#ifndef SIOCGSTAMP
++/* linux-5.2+ added support for 64-bit time_t into ioctls
++   that support 'struct timeval' and removed 'SIOCGSTAMP'
++   define.
++
++   Include 'SIOCGSTAMP' wrapper via linux/sockios.h
++   if does not exist.
++  */
++#    include <linux/sockios.h>
++#endif
+ 
+ static const char *pti[] = { "Data SDU 0","Data SDU 1","Data SDU 0, CE",
+   "Data SDU 1, CE","Segment OAM F5","End-to-end OAM F5","Reserved (RM)",
+--- a/src/maint/saaldump.c
++++ b/src/maint/saaldump.c
+@@ -24,6 +24,16 @@
+ 
+ #define MAX_ITEM  2048 /* longest string emitted by q.dump */
+ 
++#ifndef SIOCGSTAMP
++/* linux-5.2+ added support for 64-bit time_t into ioctls
++   that support 'struct timeval' and removed 'SIOCGSTAMP'
++   define.
++
++   Include 'SIOCGSTAMP' wrapper via linux/sockios.h
++   if does not exist.
++  */
++#    include <linux/sockios.h>
++#endif
+ 
+ static int interval = 0; /* display absolute time by default */
+ static int quiet = 0; /* decode Q.2931 messages by default */
diff --git a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
index 3ea9f3d5e198..7bc4fa72eed5 100644
--- a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
@@ -25,6 +25,7 @@ CONFIG_CHECK="~ATM"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-headers.patch
+	epatch "${FILESDIR}"/${P}-linux-5.2-SIOCGSTAMP.patch
 
 	sed -i '/#define _LINUX_NETDEVICE_H/d' \
 		src/arpd/*.c || die "sed command on arpd/*.c files failed"
diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index ca089d8b7fa4..5b8635dfdc59 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -6,5 +6,6 @@ AUX mgetty-1.1.37-qa-fixes.patch 6029 BLAKE2B d8ceb364913f1d133d77b29711ff31d24c
 AUX mgetty-1.2.1-Lucent.c.patch 622 BLAKE2B 63ffcfddfb13fe07037c5d845b60ceb91710f195d9bf9c5e8480faa8e98e460dd9e61ac4facd2dda22a4b10c578ccb06fe54a6c1bd3b1a936597dae18c995b48 SHA512 0913fc876897d630949ab1175eccda42ef8504ee772a835a03b4d61f31c2b1eaaabf9976ae121bb7105805ae382f0241fa7d42710b0660b7f4d9a4e24d377296
 AUX mgetty-1.2.1-gentoo.patch 4020 BLAKE2B fa9f609cc93cbc2287e415888bfcafc3f4069ba0ed6a2be93a952010f6a91bb2383948b62a407c37aa738be70aaaaf4715e578f51a9115837f3944c65f39f9d7 SHA512 24c3d98e43d8f573e395f65a500ea6379e6b27c020db81e00f4c3ea5d203d4ad344a29b6540575fd94c9462fdf51ecadff13a703568d51de3dc4fd815e462143
 DIST mgetty-1.2.1.tar.gz 1077415 BLAKE2B 09d48c6cb7917a3dbbfc97c1d32ce43b9a3e64e8a44c8a3a7bfdd168421c287357a9d43504fb4d1b354ffb0f8e2a9c52b56ac3464f196f56064d96a7651e0d6e SHA512 2a82dfb782044d9daf8d41158fa10e991dbd7bd37ab43ea44422166554dd790e989ac49e4ff471d168d1cbb49edc5bedb8762ab61884e4653650686d1bbc2a9b
+EBUILD mgetty-1.2.1-r1.ebuild 4668 BLAKE2B b2fa76ef755ad5ba47e19dbe4d61632246a854f8aeb43f47397703bd654d15bee0fc28755e520365e25cdc43e5d41c5a2a8b61080606952bd1db8d5ebd855919 SHA512 119f44fcef46e779f7b49ebbde90e96708765b824c36a3a0c9976066e509f577f870bd4f67acce0e429dac5d6013aa837cf7c4a13045b8fa4a0b63f809a584a5
 EBUILD mgetty-1.2.1.ebuild 4666 BLAKE2B 5d0203a864722ce9ce93b5783d925a14f09912ef81ad8ecdf73599ea1fc189e10e84b8a479562342062a7c088a70ad2d6d9d1e25d598177d0eab0c26d552bd5c SHA512 ee0a113b7ca5b70bd453e138c09a97130d3e4e10dc529d2ee1ddb1767e08edfe45028d0f4456b3712c008908b2f31bc436256497fb2986660d2882a252b4203e
 MISC metadata.xml 491 BLAKE2B 41dd8488152f14cb26c4db838c6a7267d0cc8063263aa7879971b2afc24e6df481cc76452ff58d07d1c86dab5d27e6d551a1d4c9b721214a71e14af4f33020ba SHA512 e975c8e98834b587752c566c0f52fd16fbbcd1b6b930407d5bf027b5717eb898af0c7c7aff94a31a18a8033d561e934e151f17b1ebbfe406c2cff22f88adba36
diff --git a/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..a188806c1cfd
--- /dev/null
+++ b/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs user
+
+DESCRIPTION="fax and voice modem programs"
+HOMEPAGE="http://mgetty.greenie.net/"
+SRC_URI="ftp://mgetty.greenie.net/pub/mgetty/source/1.2/${P}.tar.gz"
+
+DEPEND="
+	dev-lang/perl
+	sys-apps/groff
+	sys-apps/texinfo
+	virtual/awk
+	fax? (
+		!net-misc/efax
+		!net-misc/hylafax
+	)
+"
+RDEPEND="${DEPEND}
+	fax? ( media-libs/netpbm app-text/ghostscript-gpl )
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+fax fidonet split-usr"
+
+pkg_setup() {
+	enewgroup fax
+	enewuser fax -1 -1 /dev/null fax
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.36-callback.patch
+	"${FILESDIR}"/${PN}-1.1.36-tmpfile.patch
+	"${FILESDIR}"/${PN}-1.1.37-qa-fixes.patch
+	"${FILESDIR}"/${PN}-1.2.1-Lucent.c.patch
+	"${FILESDIR}"/${PN}-1.2.1-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	chmod +x mkidirs || die
+
+	# don't install fax related files - bug #195467
+	use fax || eapply "${FILESDIR}/${PN}-1.1.37-nofax.patch"
+
+	sed -i -e 's:/usr/local/lib/mgetty+sendfax:/etc/mgetty+sendfax:' faxrunq.config || die 'changing mgetty config dir failed'
+	sed -i -e 's:/usr/local/bin/g3cat:/usr/bin/g3cat:' faxrunq.config fax/faxspool.rules || die 'changing g3cat path failed'
+
+	sed -e "/^doc-all:/s/mgetty.asc mgetty.info mgetty.dvi mgetty.ps/mgetty.info/" \
+		-i doc/Makefile || die 'first sed on doc/Makefile failed'
+
+	sed -i \
+		-e 's:^CC=:CC?=:g' \
+		-e 's:^CFLAGS=:CFLAGS?=:g' \
+		{,*/}Makefile || die
+	sed -i \
+		-e 's:^AR=:AR?=:g' \
+		-e 's:^CFLAGS=:CFLAGS+= -I..:g' \
+		-e 's:^RANLIB=:RANLIB?=:g' \
+		*/Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+	use fidonet && append-cppflags "-DFIDO"
+	append-cppflags "-DAUTO_PPP"
+
+	sed -e 's:var/log/mgetty:var/log/mgetty/mgetty:' \
+		-e 's:var/log/sendfax:var/log/mgetty/sendfax:' \
+		-e 's:\/\* \(\#define CNDFILE "dialin.config"\) \*\/:\1:' \
+		-e 's:\(\#define FAX_NOTIFY_PROGRAM\).*:\1 "/etc/mgetty+sendfax/new_fax":' \
+		policy.h-dist > policy.h || die 'creating policy.h failed'
+
+	sed -i \
+		-e "s/\$(CFLAGS) -o newslock/${CFLAGS} ${LDFLAGS} -Wall -o newslock/" \
+		-e "s/\$(LDLAGS)/${LDFLAGS}/" \
+		{,fax/}Makefile || die
+}
+
+src_compile() {
+	local target
+	for target in mgetty sedscript all vgetty;do
+		VARTEXFONTS="${T}"/fonts emake prefix=/usr \
+			CONFDIR=/etc/mgetty+sendfax \
+			CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
+			${target}
+	done
+}
+
+src_install () {
+	# parallelization issue: vgetty-install target fails if install target
+	#                        isn't finished
+	local target
+	for target in install "vgetty-install install-callback"; do
+		emake prefix="${D}/usr" \
+			INFODIR="${D}/usr/share/info" \
+			CONFDIR="${D}/etc/mgetty+sendfax" \
+			MAN1DIR="${D}/usr/share/man/man1" \
+			MAN4DIR="${D}/usr/share/man/man4" \
+			MAN5DIR="${D}/usr/share/man/man5" \
+			MAN8DIR="${D}/usr/share/man/man8" \
+			SBINDIR="${D}/usr/sbin" \
+			BINDIR="${D}/usr/bin" \
+			VOICE_DIR="${D}/var/spool/voice" \
+			PHONE_GROUP=fax \
+			PHONE_PERMS=755 \
+			spool="${D}/var/spool" \
+			${target}
+	done
+
+	keepdir /var/log/mgetty
+
+	#Install mgetty into /sbin (#119078)
+	if use split-usr; then
+		dodir /sbin
+		mv "${D}"/usr/sbin/mgetty "${D}"/sbin || die
+		dosym ../../sbin/mgetty /usr/sbin/mgetty
+	fi
+
+	#Don't install ct (#106337)
+	rm "${D}"/usr/bin/ct || die "failed to remove useless ct program"
+
+	dodoc BUGS ChangeLog README.1st Recommend THANKS TODO \
+		doc/*.txt doc/modems.db
+	doinfo doc/mgetty.info
+
+	docinto vgetty
+	dodoc voice/{Readme,Announce,ChangeLog,Credits}
+
+	docinto vgetty/doc
+	dodoc voice/doc/*
+
+	if use fax; then
+		mv samples/new_fax.all samples_new_fax.all || die "move failed."
+		docinto samples
+		dodoc samples/*
+
+		docinto samples/new_fax
+		dodoc samples_new_fax.all/*
+	fi
+
+	if ! use fax; then
+		insinto /usr/share/${PN}/frontends
+		doins -r frontends/{voice,network}
+	else
+		insinto /usr/share/${PN}
+		doins -r frontends
+	fi
+	insinto /usr/share/${PN}
+	doins -r patches
+	insinto /usr/share/${PN}/voice
+	doins -r voice/{contrib,Perl,scripts}
+
+	diropts -m 0750 -o fax -g fax
+	dodir /var/spool/voice
+	keepdir /var/spool/voice/incoming
+	keepdir /var/spool/voice/messages
+	if use fax; then
+		dodir /var/spool/fax
+		dodir /var/spool/fax/outgoing
+		keepdir /var/spool/fax/outgoing/locks
+		keepdir /var/spool/fax/incoming
+	fi
+}
+
+pkg_postinst() {
+	elog "Users who wish to use the fax or voicemail capabilities must be members"
+	elog "of the group fax in order to access files"
+	elog
+	elog "If you want to grab voice messages from a remote location, you must save"
+	elog "the password in /var/spool/voice/.code file"
+}