[gentoo-commits] repo/gentoo:master commit in: net-dialup/mgetty/files/, net-dialup/mgetty/

[gentoo-commits] repo/gentoo:master commit in: net-dialup/mgetty/files/, net-dialup/mgetty/

[Pacho Ramos]

commit:     a76610815a98fae3d6311884b1e3de6f409a93b2
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 28 19:38:19 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Nov 28 19:46:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7661081

net-dialup/mgetty: Fix building with gcc7 (#639076 by Toralf Förster)

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 net-dialup/mgetty/Manifest                       |   2 +-
 net-dialup/mgetty/files/mgetty-1.1.37-gcc7.patch | 102 +++++++++++++++++++++++
 net-dialup/mgetty/mgetty-1.1.37-r1.ebuild        |  33 ++++----
 3 files changed, 121 insertions(+), 16 deletions(-)

diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index 6140bbf22a7..2f1f5770f19 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -1 +1 @@
-DIST mgetty1.1.37-Jun05.tar.gz 1057939 SHA256 6ff8cbc4f8aacd3dd7f247ff96715141bc6173745ea916dd98b8381a85ecdf0e SHA512 577d740c7d209b830bf8e783bf71edb666cb8bbfe8e7dceaa51dda6095d88724715394bcbd24eacfb1c377999f5779b547a7ec79cd9cdc13de6de18c4d857188 WHIRLPOOL f00d22ab213cd00f392ead46804ad1c3b192ae816b7518f1a73b4d65c180ba78fb2f193ceacf1f5aa88aeca4431eecb87e0960f0b6196a7e00247690083e937e
+DIST mgetty1.1.37-Jun05.tar.gz 1057939 BLAKE2B de22751e72d72d19293794739c29ed115a6810cd7d57c07228526817120898ca597ba35afad36c324562c220ab67dd44655247ac46a2d6612c704557f3ec149d SHA512 577d740c7d209b830bf8e783bf71edb666cb8bbfe8e7dceaa51dda6095d88724715394bcbd24eacfb1c377999f5779b547a7ec79cd9cdc13de6de18c4d857188

diff --git a/net-dialup/mgetty/files/mgetty-1.1.37-gcc7.patch b/net-dialup/mgetty/files/mgetty-1.1.37-gcc7.patch
new file mode 100644
index 00000000000..6a4fa87a90a
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty-1.1.37-gcc7.patch
@@ -0,0 +1,102 @@
+From 09227cacda77d7785e864c0fec3854c22b3273f7 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Thu, 2 Mar 2017 09:25:45 +0100
+Subject: [PATCH] Fix build failure with gcc-7
+
+When function is declared inline but it is not static then compiler
+assumes it could be potentially called from other translation
+units. Hence it will inline the function within the translation unit and
+at the same time it will generate object code for function with external
+linkage. However both extern and inline variant *must* be the same and
+therefore such function can not use any variables with static storage
+duration. In our case functions in g3cat.c and pbm2g3.c are not called
+from other translation units hence it is fine to mark then explicitly as
+static and compiler won't generate other (problematic) extern variant.
+---
+ g3/g3cat.c  | 8 ++++----
+ g3/pbm2g3.c | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/g3/g3cat.c b/g3/g3cat.c
+index 8a4b708..1951210 100644
+--- a/g3/g3cat.c
++++ b/g3/g3cat.c
+@@ -44,7 +44,7 @@ static int b_written = 0;		/* bytes of a line already */
+ 					/* written */
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putcode _P2( (code, len), int code, int len )
+ {
+@@ -67,7 +67,7 @@ void putcode _P2( (code, len), int code, int len )
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putwhitespan _P1( (l), int l )
+ {
+@@ -98,7 +98,7 @@ void putwhitespan _P1( (l), int l )
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putblackspan _P1( (l), int l )
+ {
+@@ -129,7 +129,7 @@ void putblackspan _P1( (l), int l )
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void puteol _P0( void )			/* write byte-aligned EOL */
+ {
+diff --git a/g3/pbm2g3.c b/g3/pbm2g3.c
+index 283a728..57cb69a 100644
+--- a/g3/pbm2g3.c
++++ b/g3/pbm2g3.c
+@@ -40,7 +40,7 @@ static unsigned int out_hibit = 0;
+ static int out_byte_tab[ 256 ];			/* for g3 byte reversal */
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putcode _P2( (code, len), int code, int len )
+ {
+@@ -60,7 +60,7 @@ void putcode _P2( (code, len), int code, int len )
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void puteol _P0( void )			/* write byte-aligned EOL */
+ {
+@@ -69,7 +69,7 @@ void puteol _P0( void )			/* write byte-aligned EOL */
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putwhitespan _P1( (l), int l )
+ {
+@@ -100,7 +100,7 @@ void putwhitespan _P1( (l), int l )
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putblackspan _P1( (l), int l )
+ {
+-- 
+2.9.3
+

diff --git a/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild b/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild
index f071ac4d388..a6305c0271c 100644
--- a/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs user
+EAPI=6
+inherit flag-o-matic toolchain-funcs user
 
 DESCRIPTION="fax and voice modem programs"
 SRC_URI="ftp://mgetty.greenie.net/pub/mgetty/source/1.1/${PN}${PV}-Jun05.tar.gz"
 HOMEPAGE="http://mgetty.greenie.net/"
 
-DEPEND="doc? ( virtual/latex-base virtual/texi2dvi )
+DEPEND="
+	doc? ( virtual/latex-base virtual/texi2dvi )
 	>=sys-apps/sed-4
 	sys-apps/groff
 	dev-lang/perl
@@ -17,9 +18,11 @@ DEPEND="doc? ( virtual/latex-base virtual/texi2dvi )
 	fax? (
 		!net-misc/efax
 		!net-misc/hylafax
-	)"
+	)
+"
 RDEPEND="${DEPEND}
-	fax? ( media-libs/netpbm app-text/ghostscript-gpl )"
+	fax? ( media-libs/netpbm app-text/ghostscript-gpl )
+"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -32,12 +35,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-qa-fixes.patch"
-	epatch "${FILESDIR}/${PN}-1.1.36-callback.patch" # add callback install to Makefile
-	epatch "${FILESDIR}/Lucent.c.patch" # Lucent modem CallerID patch - bug #80366
-	use fax || epatch "${FILESDIR}/${P}-nofax.patch" # don't install fax related files - bug #195467
-	epatch "${FILESDIR}/${PN}-1.1.36-tmpfile.patch" # fix security bug 235806
+	eapply "${FILESDIR}/${P}-gentoo.patch"
+	eapply "${FILESDIR}/${P}-qa-fixes.patch"
+	eapply "${FILESDIR}/${PN}-1.1.36-callback.patch" # add callback install to Makefile
+	eapply "${FILESDIR}/Lucent.c.patch" # Lucent modem CallerID patch - bug #80366
+	use fax || eapply "${FILESDIR}/${P}-nofax.patch" # don't install fax related files - bug #195467
+	eapply "${FILESDIR}/${PN}-1.1.36-tmpfile.patch" # fix security bug 235806
+	eapply "${FILESDIR}/${P}-gcc7.patch"
 
 	sed -e 's:var/log/mgetty:var/log/mgetty/mgetty:' \
 		-e 's:var/log/sendfax:var/log/mgetty/sendfax:' \
@@ -60,6 +64,8 @@ src_prepare() {
 	# Support user's CFLAGS and LDFLAGS.
 	sed -e "s/\$(CFLAGS) -o newslock/${CFLAGS} ${LDFLAGS} -Wall -o newslock/" \
 		-e "s/\$(LDLAGS)/${LDFLAGS}/" -i {,fax/}Makefile || die
+
+	default
 }
 
 src_compile() {
@@ -157,7 +163,4 @@ pkg_postinst() {
 	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"
-	echo
-	ewarn "/var/spool/voice/.code and /var/spool/voice/messages/Index"
-	ewarn "are not longer created by this automatically!"
 }

[gentoo-commits] repo/gentoo:master commit in: net-dialup/mgetty/files/, net-dialup/mgetty/

[Conrad Kostecki]

commit:     eb8a4f413735a6fa810fd89793a45ad387aac1c0
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 20:51:43 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 20:51:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8a4f41

net-dialup/mgetty: add systemd unit

Also added missing patch for arm64.

Closes: https://bugs.gentoo.org/546610
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-dialup/mgetty/files/mgetty-1.2.1-aarch64.patch |  11 ++
 net-dialup/mgetty/mgetty-1.2.1-r3.ebuild           | 181 +++++++++++++++++++++
 2 files changed, 192 insertions(+)

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 00000000000..9d3b9cbc963
--- /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/mgetty-1.2.1-r3.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
new file mode 100644
index 00000000000..4f812a8d398
--- /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"
+}