version bump; remove creation of unused "modem" group; use fax:fax by default

(Portage version: 2.0.51.19)

7 files changed, 269 insertions, 12 deletions

diff --git a/net-dialup/mgetty/ChangeLog b/net-dialup/mgetty/ChangeLog
index 80328007078f..a199141afbf1 100644
--- a/net-dialup/mgetty/ChangeLog
+++ b/net-dialup/mgetty/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/mgetty
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.45 2005/04/07 16:02:20 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.46 2005/04/19 20:43:50 mrness Exp $
+
+*mgetty-1.1.33 (19 Apr 2005)
+
+  19 Apr 2005; Alin Nastac <mrness@gentoo.org>
+  +files/mgetty-1.1.33-callback.diff, +files/mgetty-1.1.33-gentoo.diff,
+  +files/mgetty-1.1.33-strerror.diff, +mgetty-1.1.33.ebuild:
+  Version bump
 
   07 Apr 2005; Simon Stelling <blubb@gentoo.org> mgetty-1.1.30-r2.ebuild:
   stable on amd64
diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index fba0c4b1f32a..d96fe978cbfa 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -1,18 +1,23 @@
-MD5 354b88436d463219800d062347fdd1f6 ChangeLog 6823
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 8c8c27d4f69b98bada61c29cc2018ba0 mgetty-1.1.30-r2.ebuild 3549
-MD5 257d235065484c5dd1a0f3c700cc06c1 mgetty-1.1.30-r3.ebuild 3814
 MD5 bc75a4320bc728bf322a4c13852b24ed mgetty-1.1.30.ebuild 3348
-MD5 6b58e8fabf4fd11e7e7da859094f6f7e mgetty-1.1.31-r1.ebuild 3850
+MD5 257d235065484c5dd1a0f3c700cc06c1 mgetty-1.1.30-r3.ebuild 3814
+MD5 8c8c27d4f69b98bada61c29cc2018ba0 mgetty-1.1.30-r2.ebuild 3549
 MD5 d38aaeecbf142081ba96f86e29d25a33 mgetty-1.1.31.ebuild 3776
-MD5 503ed4bbf18bb0b46850cb173873e16a files/Lucent.c.patch 814
-MD5 c9b070dfabf7bd139d53d263f869b4f0 files/digest-mgetty-1.1.30 70
+MD5 6b58e8fabf4fd11e7e7da859094f6f7e mgetty-1.1.31-r1.ebuild 3850
+MD5 354b88436d463219800d062347fdd1f6 ChangeLog 6823
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 2fc90e5d7f51832bf7efc0f4188c6f1f mgetty-1.1.33.ebuild 4000
+MD5 bc47f96a12b21b779d57c0c2ad4b6837 files/mgetty-1.1.30-gentoo.diff 2771
+MD5 98aeee2f59082edadd2c9f85e0fe4fde files/mgetty-1.1.31-logfile.c.diff 1581
+MD5 3d8cb487c2713420c85ac4af2fe324ab files/mgetty-1.1.33-strerror.diff 1573
 MD5 c9b070dfabf7bd139d53d263f869b4f0 files/digest-mgetty-1.1.30-r2 70
 MD5 c9b070dfabf7bd139d53d263f869b4f0 files/digest-mgetty-1.1.30-r3 70
-MD5 892ea03975cbf5145ed6ab5f42424461 files/digest-mgetty-1.1.31 70
 MD5 892ea03975cbf5145ed6ab5f42424461 files/digest-mgetty-1.1.31-r1 70
-MD5 bc47f96a12b21b779d57c0c2ad4b6837 files/mgetty-1.1.30-gentoo.diff 2771
-MD5 4e57a595747a3348f58b9e0acb19b5b7 files/mgetty-1.1.31-callback.diff 989
 MD5 9b39643283b470533c7e4832364aa168 files/mgetty-1.1.31-gentoo.diff 2782
-MD5 98aeee2f59082edadd2c9f85e0fe4fde files/mgetty-1.1.31-logfile.c.diff 1581
 MD5 90e6cd2de64fc408ab4103ce1800133f files/mgetty-1.1.31-r1-gentoo.diff 931
+MD5 4e57a595747a3348f58b9e0acb19b5b7 files/mgetty-1.1.31-callback.diff 989
+MD5 c9b070dfabf7bd139d53d263f869b4f0 files/digest-mgetty-1.1.30 70
+MD5 892ea03975cbf5145ed6ab5f42424461 files/digest-mgetty-1.1.31 70
+MD5 192de0178f8a1dc659e1a81c7ff002c2 files/digest-mgetty-1.1.33 71
+MD5 d9069c6812a2e93b2c51d0f59a5bf3f3 files/mgetty-1.1.33-gentoo.diff 933
+MD5 503ed4bbf18bb0b46850cb173873e16a files/Lucent.c.patch 814
+MD5 c1e91ed1386ed8e49d88ffca11b2c194 files/mgetty-1.1.33-callback.diff 991
diff --git a/net-dialup/mgetty/files/digest-mgetty-1.1.33 b/net-dialup/mgetty/files/digest-mgetty-1.1.33
new file mode 100644
index 000000000000..f2eaee0a2ed7
--- /dev/null
+++ b/net-dialup/mgetty/files/digest-mgetty-1.1.33
@@ -0,0 +1 @@
+MD5 d61a2bd343111be35250496710393bd5 mgetty1.1.33-Apr10.tar.gz 1024596
diff --git a/net-dialup/mgetty/files/mgetty-1.1.33-callback.diff b/net-dialup/mgetty/files/mgetty-1.1.33-callback.diff
new file mode 100644
index 000000000000..2feb1520f7c6
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty-1.1.33-callback.diff
@@ -0,0 +1,26 @@
+diff -Nru mgetty-1.1.33.orig/Makefile mgetty-1.1.33/Makefile
+--- mgetty-1.1.33.orig/Makefile	2005-03-13 19:59:34.000000000 +0200
++++ mgetty-1.1.33/Makefile	2005-04-19 22:49:15.355162336 +0300
+@@ -164,7 +164,7 @@
+ #
+ # if your systems doesn't have one, use the shell script that I provide
+ # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
+-INSTALL=install -c -o bin -g bin
++INSTALL=install -c
+ #INSTALL=install -c -o root -g wheel		# NeXT/BSD
+ #INSTALL=/usr/ucb/install -c -o bin -g bin	# AIX, Solaris 2.x
+ #INSTALL=installbsd -c -o bin -g bin		# OSF/1, AIX 4.1, 4.2
+@@ -703,6 +703,13 @@
+ 
+ install-vgetty: vgetty-install
+ 
++install-callback:
++	cd callback; $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" LDFLAGS="$(LDFLAGS)" \
++	BINDIR="$(BINDIR)" SBINDIR="$(SBINDIR)" LIBDIR="$(LIBDIR)" \
++	CONFDIR="$(CONFDIR)" MAN1DIR="$(MAN1DIR)" MAN8DIR="$(MAN8DIR)" INSTALL="$(INSTALL)" \
++	LN="$(LN)" MV="$(MV)" RM="$(RM)" \
++	LIBS="$(LIBS)" install
++	
+ ## test suite
+ test: bin-all
+ 	for D in g3 t ; do \
diff --git a/net-dialup/mgetty/files/mgetty-1.1.33-gentoo.diff b/net-dialup/mgetty/files/mgetty-1.1.33-gentoo.diff
new file mode 100644
index 000000000000..0e4480ff0831
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty-1.1.33-gentoo.diff
@@ -0,0 +1,26 @@
+diff -Nru mgetty-1.1.33.orig/doc/mgetty.texi-in mgetty-1.1.33/doc/mgetty.texi-in
+--- mgetty-1.1.33.orig/doc/mgetty.texi-in	2005-02-15 12:28:37.000000000 +0200
++++ mgetty-1.1.33/doc/mgetty.texi-in	2005-04-19 22:37:05.394133280 +0300
+@@ -19,6 +19,11 @@
+ Copyright @copyright{} 1993-2005 Gert Doering
+ @end ifinfo
+ 
++@dircategory User
++@direntry
++* MGETTY: (mgetty).    Modem+Voice+Fax utilities
++@end direntry
++
+ @titlepage
+ @sp 6
+ @center @titlefont{mgetty+sendfax}
+diff -Nru mgetty-1.1.33.orig/voice/Makefile mgetty-1.1.33/voice/Makefile
+--- mgetty-1.1.33.orig/voice/Makefile	2001-12-23 17:08:13.000000000 +0200
++++ mgetty-1.1.33/voice/Makefile	2005-04-19 22:37:05.395133128 +0300
+@@ -85,6 +85,7 @@
+ 	@echo ""
+ 	$(INSTALL) -m 700 vgetty/vgetty $(SBINDIR)
+ 	$(INSTALL) -m 755 vm/vm $(BINDIR)
++	$(INSTALL) -m 644 voice.conf-dist $(CONFDIR)/voice.conf
+ 	for i in $(PVFTOOLS); \
+ 	do \
+ 	     $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \
diff --git a/net-dialup/mgetty/files/mgetty-1.1.33-strerror.diff b/net-dialup/mgetty/files/mgetty-1.1.33-strerror.diff
new file mode 100644
index 000000000000..029400628496
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty-1.1.33-strerror.diff
@@ -0,0 +1,47 @@
+diff -Nru mgetty-1.1.33.orig/logfile.c mgetty-1.1.33/logfile.c
+--- mgetty-1.1.33.orig/logfile.c	2004-11-08 22:07:29.000000000 +0200
++++ mgetty-1.1.33/logfile.c	2005-04-19 22:44:43.362511504 +0300
+@@ -58,10 +58,10 @@
+ /* Most systems have these variables but do not declare them. On many
+    of those systems that _do_ declare them, it won't hurt */
+ 
+-#if !defined(__NetBSD__) && !defined( __FreeBSD__ ) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__MACH__)
++/*#if !defined(__NetBSD__) && !defined( __FreeBSD__ ) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__MACH__)
+ extern int sys_nerr;
+ extern char *sys_errlist[];
+-#endif
++#endif*/
+ 
+ /* Interactive Unix is a little bit braindead - does not have atexit(),
+  */
+@@ -211,6 +211,7 @@
+ va_list pvar;
+ int     errnr;
+ char * p;
++char *error_string;
+ static int first_open = TRUE;
+ 
+     if ( level > log_level )	/* log level high enough? */
+@@ -327,12 +328,20 @@
+     }
+     else		/* ERROR or FATAL */
+     {
++	error_string = strerror (errnr);
++	if ( error_string == NULL )
++	{
++		if ( errno == EINVAL )
++			error_string = "<error not in list>";
++		else
++			error_string = "<error calling strerror()>";
++	}
++	
+ 	fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: %s",
+ 		             tm->tm_mon+1,  tm->tm_mday,
+ 			     tm->tm_hour, tm->tm_min, tm->tm_sec,
+ 		             log_infix, ws,
+-			     ( errnr <= sys_nerr ) ? sys_errlist[errnr]:
+-			     "<error not in list>" );
++			     strerror (errnr));
+ #ifdef SYSLOG
+ 	syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws );
+ #endif
diff --git a/net-dialup/mgetty/mgetty-1.1.33.ebuild b/net-dialup/mgetty/mgetty-1.1.33.ebuild
new file mode 100644
index 000000000000..d39792339865
--- /dev/null
+++ b/net-dialup/mgetty/mgetty-1.1.33.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.33.ebuild,v 1.1 2005/04/19 20:43:50 mrness Exp $
+
+inherit toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="Fax and Voice modem programs."
+SRC_URI="ftp://alpha.greenie.net/pub/mgetty/source/1.1/${PN}${PV}-Apr10.tar.gz"
+HOMEPAGE="http://alpha.greenie.net/mgetty/"
+
+RDEPEND="virtual/libc"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4*
+	doc? ( virtual/tetex )
+	sys-apps/gawk
+	sys-apps/groff
+	dev-lang/perl
+	sys-apps/texinfo"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~alpha ~ia64 ~hppa ~ppc ~amd64 ~mips"
+IUSE="doc"
+
+pkg_setup() {
+	enewgroup fax
+	enewuser fax -1 /bin/false /dev/null fax
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	# fix deprecate warnings
+	epatch ${FILESDIR}/${P}-strerror.diff
+	# add callback install to Makefile
+	epatch ${FILESDIR}/${P}-callback.diff
+	# Lucent modem CallerID patch - bug #80366
+	epatch ${FILESDIR}/Lucent.c.patch
+
+	#Avoid "is setXid, dynamically linked and using lazy bindings" QA notices 
+	append-ldflags "-Wl,-z,now"
+
+	sed -i 's: \$(CFLAGS) -o faxq-helper faxq-helper.o: $(LDLAGS) -Wl,-z,now -o faxq-helper faxq-helper.o:' ${S}/fax/Makefile
+
+	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":' \
+		${S}/policy.h-dist > ${S}/policy.h
+
+	#Set proper owner:group
+	sed -i -e "s:uucp:fax:g" ${S}/mgetty.cfg.in
+	sed -i -e "s:phone_group phone:phone_group fax:g" \
+		-e "s:phone_owner root:phone_owner fax:g" \
+		-e "s/root.phone/fax:fax/g" ${S}/voice/voice.conf-dist
+
+	# bug 44231 and remove move warning
+	sed -e 's:ECHO="echo":ECHO="echo -e":' \
+		-e "/mv -f \$(SBINDIR)/d" \
+		-i ${S}/Makefile
+
+	sed -e "/^doc-all:/s/mgetty.asc mgetty.info mgetty.dvi mgetty.ps/mgetty.info/" \
+		-i ${S}/doc/Makefile
+	if use doc; then
+		sed -e "s:dvips -o mgetty.ps:dvips -M -o mgetty.ps:" \
+			-e "s/^doc-all:/doc-all: mgetty.ps/" \
+			-i ${S}/doc/Makefile
+	fi
+}
+
+src_compile() {
+	append-flags "-DAUTO_PPP"
+
+	# parallel make fix later - 'sedscript' issue
+	make prefix=/usr \
+		CC="$(tc-getCC)" \
+		CONFDIR=/etc/mgetty+sendfax \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		all vgetty || die "make failed."
+}
+
+src_install () {
+	dodir /var/spool
+	dodir /var/log/mgetty
+	dodir /usr/share/info
+
+	make 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 \
+		install vgetty-install install-callback || die "make install failed."
+
+	cd ${S}
+	dodoc BUGS ChangeLog README.1st Recommend THANKS TODO \
+		doc/*.txt doc/modems.db || die "dodoc failed."
+	doinfo doc/mgetty.info || die "doinfo failed."
+
+	docinto vgetty
+	dodoc voice/{Readme,Announce,ChangeLog,Credits} || die "vgetty voice failed."
+
+	if use doc; then
+		dodoc doc/mgetty.ps || die "mgetty.ps failed"
+	fi
+
+	docinto vgetty/doc
+	dodoc voice/doc/*
+
+	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/*
+
+	insinto /usr/share/"${PN}"
+	doins -r patches frontends
+	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
+	dodir /var/spool/fax
+	dodir /var/spool/fax/outgoing
+	keepdir /var/spool/fax/outgoing/locks
+	keepdir /var/spool/fax/incoming
+}
+
+pkg_postinst() {
+	einfo "${ROOT}/var/spool/voice/.code and ${ROOT}/var/spool/voice/messages/Index"
+	einfo "are not longer created by this automatically!"
+}