diff options
author | Sergey Popov <pinkbyte@gentoo.org> | 2013-02-24 22:14:10 +0000 |
---|---|---|
committer | Sergey Popov <pinkbyte@gentoo.org> | 2013-02-24 22:14:10 +0000 |
commit | f44fd823af4ab59d26e3d3d49202724f856177d7 (patch) | |
tree | 1b5a76cf6fe165cefc70e68dca3e52f2457fbc60 /net-dialup/mgetty | |
parent | we need to depend on dev-ml/core too, should fix bug #459076 (diff) | |
download | gentoo-2-f44fd823af4ab59d26e3d3d49202724f856177d7.tar.gz gentoo-2-f44fd823af4ab59d26e3d3d49202724f856177d7.tar.bz2 gentoo-2-f44fd823af4ab59d26e3d3d49202724f856177d7.zip |
Version bump
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'net-dialup/mgetty')
-rw-r--r-- | net-dialup/mgetty/ChangeLog | 10 | ||||
-rw-r--r-- | net-dialup/mgetty/files/mgetty-1.1.37-gentoo.patch | 172 | ||||
-rw-r--r-- | net-dialup/mgetty/files/mgetty-1.1.37-nofax.patch | 110 | ||||
-rw-r--r-- | net-dialup/mgetty/files/mgetty-1.1.37-qa-fixes.patch | 175 | ||||
-rw-r--r-- | net-dialup/mgetty/mgetty-1.1.37.ebuild | 158 |
5 files changed, 624 insertions, 1 deletions
diff --git a/net-dialup/mgetty/ChangeLog b/net-dialup/mgetty/ChangeLog index 9c32897bf903..07e7158e5492 100644 --- a/net-dialup/mgetty/ChangeLog +++ b/net-dialup/mgetty/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-dialup/mgetty # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.102 2013/02/24 20:55:57 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.103 2013/02/24 22:14:10 pinkbyte Exp $ + +*mgetty-1.1.37 (24 Feb 2013) + + 24 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> +mgetty-1.1.37.ebuild, + +files/mgetty-1.1.37-gentoo.patch, +files/mgetty-1.1.37-nofax.patch, + +files/mgetty-1.1.37-qa-fixes.patch: + Version bump: EAPI 5, QA fixes, add blocker to net-misc/efax due to manpage + file collision 24 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> mgetty-1.1.36-r3.ebuild: Change awk dependency to virtual/awk, wrt bug #455666 diff --git a/net-dialup/mgetty/files/mgetty-1.1.37-gentoo.patch b/net-dialup/mgetty/files/mgetty-1.1.37-gentoo.patch new file mode 100644 index 000000000000..8f0c004d6011 --- /dev/null +++ b/net-dialup/mgetty/files/mgetty-1.1.37-gentoo.patch @@ -0,0 +1,172 @@ +diff -Nru mgetty-1.1.37.orig/callback/Makefile mgetty-1.1.37/callback/Makefile +--- mgetty-1.1.37.orig/callback/Makefile 2007-09-14 23:03:32.000000000 +0300 ++++ mgetty-1.1.37/callback/Makefile 2007-09-14 23:02:58.000000000 +0300 +@@ -37,7 +37,7 @@ + # install programs + # + install: all +- $(INSTALL) -s -m 700 -o root callback $(SBINDIR) +- $(INSTALL) -s -m 4711 -o root ct $(BINDIR) ++ $(INSTALL) -m 700 -o root callback $(SBINDIR) ++ $(INSTALL) -m 4711 -o root ct $(BINDIR) + + # source modules +diff -Nru mgetty-1.1.37.orig/doc/mgetty.texi-in mgetty-1.1.37/doc/mgetty.texi-in +--- mgetty-1.1.37.orig/doc/mgetty.texi-in 2007-09-14 23:03:32.000000000 +0300 ++++ mgetty-1.1.37/doc/mgetty.texi-in 2007-09-14 23:02:58.000000000 +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.37.orig/fax/faxspool.in mgetty-1.1.37/fax/faxspool.in +--- mgetty-1.1.37.orig/fax/faxspool.in 2007-09-14 23:03:32.000000000 +0300 ++++ mgetty-1.1.37/fax/faxspool.in 2007-09-14 23:02:58.000000000 +0300 +@@ -390,7 +390,7 @@ + + # + # convert pdf data +-# needs GNU GhostScript and Adobe acroread installed. ++# needs GNU GhostScript installed. + # For driver selection, see definition of GS_DRIVER_{HI,LO} above. + # + # contributed by mfvm@gmx.de (Michael Fischer v. Mollard) +@@ -401,7 +401,7 @@ + test X$3 = X-n && driver="$GS_DRIVER_LO" + + cat $1 | +- acroread -toPostScript | ++ pdf2ps -sOutputFile=- - | + gs $driver -sOutputFile=$2%03d -dNOPAUSE -q -dSAFER - + } + +diff -Nru mgetty-1.1.37.orig/frontends/X11/viewfax/Makefile mgetty-1.1.37/frontends/X11/viewfax/Makefile +--- mgetty-1.1.37.orig/frontends/X11/viewfax/Makefile 2007-09-14 23:03:32.000000000 +0300 ++++ mgetty-1.1.37/frontends/X11/viewfax/Makefile 2007-09-14 23:02:58.000000000 +0300 +@@ -61,7 +61,7 @@ + g3hack: g3hack.c + + install: viewfax +- $(INSTALL) -s -m 755 viewfax $(BINDIR) ++ $(INSTALL) -m 755 viewfax $(BINDIR) + $(INSTALL) -m 644 viewfax.man $(MANDIR)/viewfax.1 + $(INSTALL) -m 644 viewfax.tif $(LIBDIR) + +diff -Nru mgetty-1.1.37.orig/g3/Makefile mgetty-1.1.37/g3/Makefile +--- mgetty-1.1.37.orig/g3/Makefile 2007-09-14 23:03:32.000000000 +0300 ++++ mgetty-1.1.37/g3/Makefile 2007-09-14 23:02:58.000000000 +0300 +@@ -37,13 +37,13 @@ + # install programs + # + for f in $(G3_PROGRAMS) ; do \ +- $(INSTALL) -s -m 755 $$f $(BINDIR) ; \ ++ $(INSTALL) -m 755 $$f $(BINDIR) ; \ + done + # + # make symlink for "g3topbm" (so third-party fax viewers won't fail) +-# +- -cd $(BINDIR) ; \ +- test -x g3topbm || ln -s g32pbm g3topbm ++# Note for Gentoo: following lines will create collision with netpbm if netpbm is installed after ++# -cd $(BINDIR) ; \ ++# test -x g3topbm || ln -s g32pbm g3topbm + + + # test suite +diff -Nru mgetty-1.1.37.orig/Makefile mgetty-1.1.37/Makefile +--- mgetty-1.1.37.orig/Makefile 2007-09-14 23:03:32.000000000 +0300 ++++ mgetty-1.1.37/Makefile 2007-09-14 23:02:58.000000000 +0300 +@@ -282,7 +282,7 @@ + # please use the "mg.echo" program provided in the compat/ subdirectory. + # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo + # +-ECHO="echo" ++ECHO="echo -e" + # + # INSTALL_MECHO=mg.echo + +@@ -596,12 +596,8 @@ + $(INSTALL) -m 755 newslock $(BINDIR) + + -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) +- if [ -f $(SBINDIR)/mgetty ] ; then \ +- mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old ; fi +- if [ -f $(SBINDIR)/sendfax ] ; then \ +- mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old ; fi +- $(INSTALL) -s -m 700 mgetty $(SBINDIR) +- $(INSTALL) -s -m 755 sendfax $(SBINDIR) ++ $(INSTALL) -m 700 mgetty $(SBINDIR) ++ $(INSTALL) -m 755 sendfax $(SBINDIR) + # + # data files + directories + # +@@ -663,7 +661,7 @@ + if [ ! -z "$(INSTALL_MECHO)" ] ; then \ + cd compat ; \ + $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \ +- $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \ ++ $(INSTALL) -m 755 mg.echo $(BINDIR) ; \ + fi + + # +diff -Nru mgetty-1.1.37.orig/mgetty.cfg.in mgetty-1.1.37/mgetty.cfg.in +--- mgetty-1.1.37.orig/mgetty.cfg.in 2003-11-17 21:09:41.000000000 +0200 ++++ mgetty-1.1.37/mgetty.cfg.in 2007-09-14 23:02:58.000000000 +0300 +@@ -20,16 +20,16 @@ + # access the modem(s) with @SPEED@ bps + speed @SPEED@ + +-# use these options to make the /dev/tty-device owned by "uucp.uucp" ++# use these options to make the /dev/tty-device owned by "fax.fax" + # and mode "rw-rw-r--" (0664). *LEADING ZERO NEEDED!* +-#port-owner uucp +-#port-group uucp ++#port-owner fax ++#port-group fax + #port-mode 0664 + +-# use these options to make incoming faxes owned by "root.uucp" ++# use these options to make incoming faxes owned by "root.fax" + # and mode "rw-r-----" (0640). *LEADING ZERO NEEDED!* + #fax-owner root +-#fax-group uucp ++#fax-group fax + #fax-mode 0640 + + +diff -Nru mgetty-1.1.37.orig/voice/Makefile mgetty-1.1.37/voice/Makefile +--- mgetty-1.1.37.orig/voice/Makefile 2007-09-14 23:03:32.000000000 +0300 ++++ mgetty-1.1.37/voice/Makefile 2007-09-14 23:02:58.000000000 +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 -Nru mgetty-1.1.37.orig/voice/voice.conf-dist mgetty-1.1.37/voice/voice.conf-dist +--- mgetty-1.1.37.orig/voice/voice.conf-dist 2005-03-19 18:10:20.000000000 +0200 ++++ mgetty-1.1.37/voice/voice.conf-dist 2007-09-14 23:02:58.000000000 +0300 +@@ -47,11 +47,11 @@ + voice_dir /var/spool/voice + + # +-# incoming messages are owned by "root.phone" and mode "rw-rw----" (0660) ++# incoming messages are owned by "fax:fax" and mode "rw-rw----" (0660) + # + +-phone_owner root +-phone_group phone ++phone_owner fax ++phone_group fax + phone_mode 0660 + + # diff --git a/net-dialup/mgetty/files/mgetty-1.1.37-nofax.patch b/net-dialup/mgetty/files/mgetty-1.1.37-nofax.patch new file mode 100644 index 000000000000..6636526b691e --- /dev/null +++ b/net-dialup/mgetty/files/mgetty-1.1.37-nofax.patch @@ -0,0 +1,110 @@ +diff -Nru mgetty-1.1.37.orig/doc/Makefile mgetty-1.1.37/doc/Makefile +--- mgetty-1.1.37.orig/doc/Makefile 2007-11-25 09:31:56.000000000 +0200 ++++ mgetty-1.1.37/doc/Makefile 2007-11-25 09:28:02.000000000 +0200 +@@ -6,11 +6,10 @@ + NROFF=nroff + # + # +-MAN1PAGES=g32pbm.1 g3cat.1 pbm2g3.1 sff2g3.1 fax.1 \ +- faxspool.1 faxrunq.1 faxq.1 faxrm.1 coverpg.1 ++MAN1PAGES= + MAN4PAGES=mgettydefs.4 +-MAN5PAGES=faxqueue.5 +-MAN8PAGES=sendfax.8 mgetty.8 callback.8 faxrunqd.8 faxq-helper.8 ++MAN5PAGES= ++MAN8PAGES=mgetty.8 callback.8 + MANSRC=$(MAN1PAGES) $(MAN4PAGES) $(MAN5PAGES) $(MAN8PAGES) + MAN1DIR=/usr/local/man/man1 + MAN4DIR=/usr/local/man/man4 +diff -Nru mgetty-1.1.37.orig/Makefile mgetty-1.1.37/Makefile +--- mgetty-1.1.37.orig/Makefile 2007-11-25 09:31:58.000000000 +0200 ++++ mgetty-1.1.37/Makefile 2007-11-25 09:34:45.000000000 +0200 +@@ -324,7 +324,7 @@ + + all: bin-all doc-man-only + +-bin-all: mgetty sendfax newslock sedscript subdirs call-back ++bin-all: mgetty newslock sedscript subdirs call-back + + # a few C files need extra compiler arguments + +@@ -369,9 +369,7 @@ + # subdirectories... + + subdirs: sedscript +- cd g3 && $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all + cd tools && $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all +- cd fax && $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" "FAX_SPOOL_OUT=$(FAX_SPOOL_OUT)" "FAX_OUT_USER=$(FAX_OUT_USER)" "CONFDIR=$(CONFDIR)" all + + call-back: + @$(MAKE) mgetty +@@ -597,7 +595,6 @@ + + -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) + $(INSTALL) -m 700 mgetty $(SBINDIR) +- $(INSTALL) -m 755 sendfax $(SBINDIR) + # + # data files + directories + # +@@ -609,12 +606,8 @@ + $(INSTALL) -o root -m 600 login.config $(CONFDIR)/ + test -f $(CONFDIR)/mgetty.config || \ + $(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/ +- test -f $(CONFDIR)/sendfax.config || \ +- $(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/ + test -f $(CONFDIR)/dialin.config || \ + $(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/ +- test -f $(CONFDIR)/faxrunq.config || \ +- $(INSTALL) -o root -m 644 faxrunq.config $(CONFDIR)/ + # + # test for outdated stuff + # +@@ -626,34 +626,6 @@ + echo "" ;\ + fi + # +-# fax spool directories +-# +- test -d $(spool) || \ +- ( ./mkidirs $(spool) && chmod 755 $(spool) ) +- test -d $(FAX_SPOOL) || \ +- ( ./mkidirs $(FAX_SPOOL) && \ +- chown $(FAX_OUT_USER) $(FAX_SPOOL) && \ +- chmod 755 $(FAX_SPOOL) ) +- test -d $(FAX_SPOOL_IN) || \ +- ( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) ) +- test -d $(FAX_SPOOL_OUT) || \ +- ./mkidirs $(FAX_SPOOL_OUT) +- chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT) +- chmod 755 $(FAX_SPOOL_OUT) +-# +-# g3 tool programs +-# +- cd g3 && $(MAKE) install INSTALL="$(INSTALL)" \ +- BINDIR=$(BINDIR) \ +- LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) +-# +-# fax programs / scripts / font file +-# +- cd fax && $(MAKE) install INSTALL="$(INSTALL)" \ +- FAX_OUT_USER=$(FAX_OUT_USER) \ +- BINDIR=$(BINDIR) SBINDIR=$(SBINDIR) \ +- LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) +-# + # compatibility + # + if [ ! -z "$(INSTALL_MECHO)" ] ; then \ +diff -Nru mgetty-1.1.37.orig/t/Makefile mgetty-1.1.37/t/Makefile +--- mgetty-1.1.37.orig/t/Makefile 2006-09-26 01:32:10.000000000 +0300 ++++ mgetty-1.1.37/t/Makefile 2007-11-25 09:32:28.000000000 +0200 +@@ -8,8 +8,8 @@ + CFLAGS=-O2 -I.. -g #-DT_LOG_VERBOSE + + TEST_PROGRAMS=t_config t_ring +-TEST_HELP_PGM=t_g3f_c +-TEST_SCRIPTS=t_echo t_trap t_g3file ++TEST_HELP_PGM= ++TEST_SCRIPTS=t_echo t_trap + + test: $(TEST_PROGRAMS) $(TEST_HELP_PGM) + @for f in $(TEST_PROGRAMS) ; \ diff --git a/net-dialup/mgetty/files/mgetty-1.1.37-qa-fixes.patch b/net-dialup/mgetty/files/mgetty-1.1.37-qa-fixes.patch new file mode 100644 index 000000000000..e803b4243155 --- /dev/null +++ b/net-dialup/mgetty/files/mgetty-1.1.37-qa-fixes.patch @@ -0,0 +1,175 @@ +diff -Nru mgetty-1.1.37.orig/doc/Makefile mgetty-1.1.37/doc/Makefile +--- mgetty-1.1.37.orig/doc/Makefile 2006-02-22 18:35:02.000000000 +0100 ++++ mgetty-1.1.37/doc/Makefile 2009-08-31 20:31:01.000000000 +0200 +@@ -64,7 +64,7 @@ + + install: $(MANSRC) mgetty.info + for D in `dirname $(MAN1DIR)` $(MAN1DIR) $(MAN4DIR) $(MAN5DIR) $(MAN8DIR) ; do \ +- if [ ! -d $$D ] ; then mkdir $$D || exit 1 ; fi ; \ ++ if [ ! -d $$D ] ; then mkdir -p $$D || exit 1 ; fi ; \ + done + for i in $(MAN1PAGES) ; do \ + $(INSTALL) -m 644 $$i $(MAN1DIR) ; \ +@@ -122,16 +122,16 @@ + # + .SUFFIXES: .1in .4in .5in .8in .1 .4 .5 .8 + +-.1in.1: ++.1in.1: ../sedscript + ../sedscript <$< >$*.1 + +-.4in.4: ++.4in.4: ../sedscript + ../sedscript <$< >$*.4 + +-.5in.5: ++.5in.5: ../sedscript + ../sedscript <$< >$*.5 + +-.8in.8: ++.8in.8: ../sedscript + ../sedscript <$< >$*.8 + + # +diff -Nru mgetty-1.1.37.orig/fax/Makefile mgetty-1.1.37/fax/Makefile +--- mgetty-1.1.37.orig/fax/Makefile 2006-02-22 18:25:30.000000000 +0100 ++++ mgetty-1.1.37/fax/Makefile 2009-08-31 20:31:01.000000000 +0200 +@@ -36,7 +36,7 @@ + @cd .. ; $(MAKE) sedscript + + faxq-helper: faxq-helper.o +- $(CC) $(CFLAGS) -o faxq-helper faxq-helper.o ++ $(CC) $(LDLAGS) -o faxq-helper faxq-helper.o + + faxq-helper.o: faxq-helper.c ../sedscript + $(CC) $(CFLAGS) -DFAX_SPOOL_OUT=\"$(FAX_SPOOL_OUT)\" \ +diff -Nru mgetty-1.1.37.orig/fax_lib.h mgetty-1.1.37/fax_lib.h +--- mgetty-1.1.37.orig/fax_lib.h 2007-06-15 08:44:36.000000000 +0200 ++++ mgetty-1.1.37/fax_lib.h 2009-08-31 20:31:01.000000000 +0200 +@@ -41,6 +41,7 @@ + int fax_set_fdcc _PROTO(( int fd, int fine, int maxsp, int minsp )); + int fax_set_bor _PROTO(( int fd, int bit_order )); + int fax_set_flowcontrol _PROTO(( int fd, int hw_flow )); ++void fax_init_swaptable _PROTO(( int direct, unsigned char byte_tab[] )); + int mdm_identify _PROTO(( int fd )); + void fax2_incoming_nsf _PROTO(( char * nsf_hex )); + void fax1_incoming_nsf _PROTO(( uch * nsf_bin, int len )); +diff -Nru mgetty-1.1.37.orig/frontends/www/Makefile mgetty-1.1.37/frontends/www/Makefile +--- mgetty-1.1.37.orig/frontends/www/Makefile 2006-02-22 18:25:32.000000000 +0100 ++++ mgetty-1.1.37/frontends/www/Makefile 2009-08-31 20:31:01.000000000 +0200 +@@ -125,12 +125,12 @@ + # + .SUFFIXES: .in .cgi .html + +-.in.cgi: ++.in.cgi: ../../sedscript + rm -f $*.cgi + ../../sedscript <$< >$*.cgi + chmod +x $*.cgi + +-.in.html: ++.in.html: ../../sedscript + rm -f $*.html + ../../sedscript <$< | \ + sed -e "s!@CGI_HREF@!$(CGI_HREF)!" >$*.html +diff -Nru mgetty-1.1.37.orig/logfile.c mgetty-1.1.37/logfile.c +--- mgetty-1.1.37.orig/logfile.c 2005-11-26 14:48:16.000000000 +0100 ++++ mgetty-1.1.37/logfile.c 2009-08-31 20:31:01.000000000 +0200 +@@ -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 -Nru mgetty-1.1.37.orig/Makefile mgetty-1.1.37/Makefile +--- mgetty-1.1.37.orig/Makefile 2009-08-31 20:30:33.000000000 +0200 ++++ mgetty-1.1.37/Makefile 2009-08-31 20:32:08.000000000 +0200 +@@ -368,7 +368,7 @@ + + # subdirectories... + +-subdirs: ++subdirs: sedscript + cd g3 && $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all + cd tools && $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all + cd fax && $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" "FAX_SPOOL_OUT=$(FAX_SPOOL_OUT)" "FAX_OUT_USER=$(FAX_OUT_USER)" "CONFDIR=$(CONFDIR)" all +@@ -633,15 +633,15 @@ + # fax spool directories + # + test -d $(spool) || \ +- ( mkdir $(spool) && chmod 755 $(spool) ) ++ ( ./mkidirs $(spool) && chmod 755 $(spool) ) + test -d $(FAX_SPOOL) || \ +- ( mkdir $(FAX_SPOOL) && \ ++ ( ./mkidirs $(FAX_SPOOL) && \ + chown $(FAX_OUT_USER) $(FAX_SPOOL) && \ + chmod 755 $(FAX_SPOOL) ) + test -d $(FAX_SPOOL_IN) || \ +- ( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) ) ++ ( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) ) + test -d $(FAX_SPOOL_OUT) || \ +- mkdir $(FAX_SPOOL_OUT) ++ ./mkidirs $(FAX_SPOOL_OUT) + chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT) + chmod 755 $(FAX_SPOOL_OUT) + # +diff -Nru mgetty-1.1.37.orig/t/t_g3f_c.c mgetty-1.1.37/t/t_g3f_c.c +--- mgetty-1.1.37.orig/t/t_g3f_c.c 2007-05-05 14:03:03.000000000 +0200 ++++ mgetty-1.1.37/t/t_g3f_c.c 2009-08-31 20:31:01.000000000 +0200 +@@ -19,6 +19,7 @@ + #include "fax_lib.h" + + #include <stdio.h> ++#include <unistd.h> + #include <signal.h> + #include <errno.h> + #include <stdlib.h> +diff -Nru mgetty-1.1.37.orig/t/t_ring.c mgetty-1.1.37/t/t_ring.c +--- mgetty-1.1.37.orig/t/t_ring.c 2005-03-23 10:56:21.000000000 +0100 ++++ mgetty-1.1.37/t/t_ring.c 2009-08-31 20:31:01.000000000 +0200 +@@ -24,6 +24,7 @@ + + #include "mgetty.h" + #include <stdio.h> ++#include <string.h> + #include <signal.h> + #include <errno.h> + #ifdef T_LOG_VERBOSE diff --git a/net-dialup/mgetty/mgetty-1.1.37.ebuild b/net-dialup/mgetty/mgetty-1.1.37.ebuild new file mode 100644 index 000000000000..e018d2bf5e62 --- /dev/null +++ b/net-dialup/mgetty/mgetty-1.1.37.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.37.ebuild,v 1.1 2013/02/24 22:14:10 pinkbyte Exp $ + +EAPI=5 +inherit eutils 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 ) + >=sys-apps/sed-4 + sys-apps/groff + dev-lang/perl + 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc +fax fidonet" + +pkg_setup() { + enewgroup fax + enewuser fax -1 -1 /dev/null fax +} + +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 + + 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" || die 'creating policy.h failed' + + 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 "${S}/doc/Makefile" || die 'first sed on doc/Makefile failed' + if use doc; then + sed -e "s/^doc-all:/doc-all: mgetty.ps/" \ + -i "${S}/doc/Makefile" || die 'second sed on doc/Makefile failed' + fi +} + +src_compile() { + use fidonet && append-cppflags "-DFIDO" + append-cppflags "-DAUTO_PPP" + # bug #299421 + VARTEXFONTS="${T}"/fonts emake -j1 prefix=/usr \ + CC="$(tc-getCC)" \ + CONFDIR=/etc/mgetty+sendfax \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + all vgetty +} + +src_install () { + # parallelization issue: vgetty-install target fails if install target + # isn't finished + local targets + for targets 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" \ + ${targets} + done + + keepdir /var/log/mgetty + + #Install mgetty into /sbin (#119078) + dodir /sbin && \ + mv "${D}"/usr/sbin/mgetty "${D}"/sbin && \ + dosym /sbin/mgetty /usr/sbin/mgetty || die "failed to install /sbin/mgetty" + #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} + + if use doc; then + dodoc doc/mgetty.ps + fi + + 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" + echo + ewarn "/var/spool/voice/.code and /var/spool/voice/messages/Index" + ewarn "are not longer created by this automatically!" +} |