gentoo resync : 03.03.2021

6 files changed, 221 insertions, 26 deletions

diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index a5f137e2c5f6..9a4c2463e95e 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -1,10 +1,12 @@
-AUX Lucent.c.patch 814 BLAKE2B 376cc24cd214c4e7c5c0c0b3cf81c8e5c950c147489d620a3d5026ebcd1f65bfe6da3a6f99157db936273386c311adb292600d5aa071a1d2550dcc90d5bc1b0b SHA512 68f5792c2fb3b13330cd78f74f9dc03b5c66665896af01ff6f0df8aa1615985cfe64b332e945508de5cafa9287d00904d32d164ca4d0f7785e5aa8f147e7f882
 AUX mgetty-1.1.36-callback.patch 991 BLAKE2B 11991e04ed2fc49790f512e94e8a1500e9d68197cbb742bc2b62db07a6f86f6204412cade9332e81e80046dc696b91cc250d5fce755d0316835e195205759563 SHA512 8cb246feddb91683f9438af6975ff6119d8229156a54bd2fac7aed25111079730d65ae1cb94d57fa311d26d420129eb65a8f1250b53f016d5bfeab59202b244b
 AUX mgetty-1.1.36-tmpfile.patch 796 BLAKE2B 0d492c8ae68b02d78746b441e5f37dfb25c306c5423c6b35da3b6440953d5218e3f8a9d4cc6c0630ecf740e80e73361e5516d73fd434d882d2f1520bd6139a53 SHA512 be58895174a8eae047952a7fee76a7989175ec8169321d1deaa7d8719eeb71d08111cb3677e855a676e16ef58eda6901090ffcd5a5989176be1184adb7f3d2d9
 AUX mgetty-1.1.37-nofax.patch 3613 BLAKE2B 52167631f57aa773af9c17aef5857d5fc09a5b19d553917d9f3959b0170c8a75bfcddd718abe1793585ada958b1ed661b2cc125ee6823d0a8a03fde5bc20a12a SHA512 be64802b24f4fa5b21c97782b8c2f74c8311878ebb48a05d0b0101e8fb3a24f1629780452acd710dade02660b186d494b3363a90e36550dcff9bf0b257bc5c71
 AUX mgetty-1.1.37-qa-fixes.patch 6029 BLAKE2B d8ceb364913f1d133d77b29711ff31d24c40a75c67743d9adbcbbafde3696a62969783eede9362f1243e535a58b1430c2745c162c5a5671aa6bded0ba865c880 SHA512 8286d5d11dbf900a28918cc2471ef0170483afc5ae537f8f05b885213fb62b2fa5969a1448229afefe2f6b736148c7e5818ed997ef710360de6f3e2a450b8918
 AUX mgetty-1.2.1-Lucent.c.patch 622 BLAKE2B 63ffcfddfb13fe07037c5d845b60ceb91710f195d9bf9c5e8480faa8e98e460dd9e61ac4facd2dda22a4b10c578ccb06fe54a6c1bd3b1a936597dae18c995b48 SHA512 0913fc876897d630949ab1175eccda42ef8504ee772a835a03b4d61f31c2b1eaaabf9976ae121bb7105805ae382f0241fa7d42710b0660b7f4d9a4e24d377296
+AUX mgetty-1.2.1-aarch64.patch 400 BLAKE2B 07d2d0f1bbadd487fb5a8531584af45d2504754de9b608cb9a9d2f5b4ab7047cc9970d5e9a44f14ec834296e28c765fe32f841cff5c412f3a359d7daacebfd17 SHA512 41f63fb2c08b4a77a0e0ef5ac450c2c0a1450aa6d79dcf0279e95e73cabe0729fc0984f97aa947705d72460c8a7598f3b122b3769ea7836dfb6ed415c4e2a9f4
 AUX mgetty-1.2.1-gentoo.patch 4020 BLAKE2B fa9f609cc93cbc2287e415888bfcafc3f4069ba0ed6a2be93a952010f6a91bb2383948b62a407c37aa738be70aaaaf4715e578f51a9115837f3944c65f39f9d7 SHA512 24c3d98e43d8f573e395f65a500ea6379e6b27c020db81e00f4c3ea5d203d4ad344a29b6540575fd94c9462fdf51ecadff13a703568d51de3dc4fd815e462143
+AUX mgetty.service 203 BLAKE2B d7bd55ab0f1acc02541cb19ed372faeb2ba1b88dae1d1114677ef955cc91006c7ff5e78f71d8ba3da1aecde111f9bbc4ae916c5c19df20061200731eaab038ac SHA512 c766385d101005980fd992d2e721ffb90a7b756afbd4ea24a55e828f39bd6106a0722461b581736816685c6d5dc3fbc4ebe5fca3faf1c1373d7e0c6658c80a8d
 DIST mgetty-1.2.1.tar.gz 1077415 BLAKE2B 09d48c6cb7917a3dbbfc97c1d32ce43b9a3e64e8a44c8a3a7bfdd168421c287357a9d43504fb4d1b354ffb0f8e2a9c52b56ac3464f196f56064d96a7651e0d6e SHA512 2a82dfb782044d9daf8d41158fa10e991dbd7bd37ab43ea44422166554dd790e989ac49e4ff471d168d1cbb49edc5bedb8762ab61884e4653650686d1bbc2a9b
 EBUILD mgetty-1.2.1-r1.ebuild 4656 BLAKE2B e131a9d0f25e609c085ebd9bdd51350dc3fa51739f6896a9aeed7aa1da1c859dbdd6e787d2eb2a9f030c132ffd57b85c8a01825addadbe04b77b6f0f655fe90a SHA512 3bad236122066579870835c607ddeb04db6de179180c110cc8adb08e51ca6bf718a83ed314da81cca4889985b34f2e2af7239089c007143bfb08e1834d22a397
-MISC metadata.xml 491 BLAKE2B 41dd8488152f14cb26c4db838c6a7267d0cc8063263aa7879971b2afc24e6df481cc76452ff58d07d1c86dab5d27e6d551a1d4c9b721214a71e14af4f33020ba SHA512 e975c8e98834b587752c566c0f52fd16fbbcd1b6b930407d5bf027b5717eb898af0c7c7aff94a31a18a8033d561e934e151f17b1ebbfe406c2cff22f88adba36
+EBUILD mgetty-1.2.1-r3.ebuild 4763 BLAKE2B 273ce499fb0f364584e1681f37f763bc2c798f705ac558d318a9384bd5dfb2c3a0c3bb2558eaf212dab09df55d227c4b606802b63315d62b73261228da6de157 SHA512 519564b5d18a0a0bad79686e1c228c82696f91a7f3c5014c83c786226ca68cf7a11ed7da9e42f23cd74985936f7066b2789509660e32fb09305f29e4daf412f0
+MISC metadata.xml 589 BLAKE2B 0875f489eba8df017139195c3873035116e951ad018d86f00d36717f2f274d4e95d4f57fbde8640a6468fd09a819c240fab9e9656c0e931c3857fab37aad8a3b SHA512 8fec8828741b63bdf1e3364dc10ca8069846498905ef3966f8712bbe254a4197f50f73065fb4aec7b6e74e36bb53e47a03cec0dbff994f2b9f02133bfddc636e
diff --git a/net-dialup/mgetty/files/Lucent.c.patch b/net-dialup/mgetty/files/Lucent.c.patch
deleted file mode 100644
index 35b4b3e0b612..000000000000
--- a/net-dialup/mgetty/files/Lucent.c.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nru mgetty-1.1.31.orig/voice/libvoice/Lucent.c mgetty-1.1.31/voice/libvoice/Lucent.c
---- mgetty-1.1.31.orig/voice/libvoice/Lucent.c	2004-11-20 16:13:01.000000000 -0500
-+++ mgetty-1.1.31/voice/libvoice/Lucent.c	2004-11-20 16:39:11.000000000 -0500
-@@ -96,6 +96,13 @@
-      if (voice_command("AT+VLS=0", "OK") != VMA_USER_1)
-           lprintf(L_WARN, "can't deselect all input/output devices");
- 
-+     /* the Lucent chips DO support Caller ID, this command is OK */
-+     /* Just borrowed from the V253modem.c file */
-+     /* enable callerid (if supported) and setformat */
-+     if (voice_command("AT+VCID=1", "OK") != VMA_USER_1)
-+          lprintf(L_WARN, "can't set caller ID output");     
-+     /* mgetty supports formated callerid output */
-+
-      voice_modem_state = IDLE;
-      return(OK);
-      }
diff --git a/net-dialup/mgetty/files/mgetty-1.2.1-aarch64.patch b/net-dialup/mgetty/files/mgetty-1.2.1-aarch64.patch
new file mode 100644
index 000000000000..9d3b9cbc9633
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty-1.2.1-aarch64.patch
@@ -0,0 +1,11 @@
+diff -U3 -r a/mgetty.h b/mgetty.h
+--- a/mgetty.h	2006-01-01 12:13:18.000000000 -0500
++++ b/mgetty.h	2018-01-13 12:53:00.337516215 -0500
+@@ -198,7 +198,7 @@
+  */
+ #if defined(__alpha__) || defined(__sparc64__) || \
+ 	    defined(__ia64__) || defined(__s390x__) || defined(__x86_64__) || \
+-	    defined(__powerpc64__)
++	    defined(__powerpc64__) || defined(__aarch64__)
+ # define PTR_IS_LONG
+ #endif
diff --git a/net-dialup/mgetty/files/mgetty.service b/net-dialup/mgetty/files/mgetty.service
new file mode 100644
index 000000000000..2ca018ed49f4
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Smart Modem Getty
+Documentation=man:mgetty(8)
+
+[Service]
+ExecStart=/usr/sbin/mgetty /dev/%i
+Restart=always
+PIDFile=/run/mgetty.%i.pid
+Type=simple
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-dialup/mgetty/metadata.xml b/net-dialup/mgetty/metadata.xml
index d1a981dc9572..d2d4288847e6 100644
--- a/net-dialup/mgetty/metadata.xml
+++ b/net-dialup/mgetty/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>Suite of programs that allows you to take full advantage of your voice/fax modem.
-mgetty is capable of handling data, fax and voice calls without interfering with outgoing calls.</longdescription>
-<use>
-	<flag name="fax">Enables fax support</flag>
-	<flag name="fidonet">Enables FidoNet support</flag>
-</use>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		Suite of programs that allows you to take full advantage
+		of your voice/fax modem. Mgetty is capable of handling data,
+		fax and voice calls without interfering with outgoing calls.
+	</longdescription>
+	<use>
+		<flag name="fax">Enables fax support</flag>
+		<flag name="fidonet">Enables FidoNet support</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
new file mode 100644
index 000000000000..4f812a8d3984
--- /dev/null
+++ b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="A programm for sending and receiving fax and voice"
+HOMEPAGE="http://mgetty.greenie.net/"
+SRC_URI="ftp://mgetty.greenie.net/pub/mgetty/source/$(ver_cut 1-2)/${P}.tar.gz"
+
+DEPEND="
+	dev-lang/perl
+	sys-apps/groff
+	sys-apps/texinfo
+	virtual/awk
+	fax? ( !net-misc/efax )
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/fax
+	acct-user/fax
+	fax? (
+		app-text/ghostscript-gpl
+		media-libs/netpbm
+	)
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+fax fidonet split-usr"
+
+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
+	"${FILESDIR}"/${PN}-1.2.1-aarch64.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
+
+	systemd_newunit "${FILESDIR}"/mgetty.service mgetty@.service
+}
+
+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"
+}