From 265dbe5dbc14c199299496c6db8fce3f76647015 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Sep 2018 18:00:10 +0100 Subject: gentoo resync : 21.09.2018 --- .../mgetty/files/mgetty-1.2.1-Lucent.c.patch | 16 +++ net-dialup/mgetty/files/mgetty-1.2.1-gentoo.patch | 154 +++++++++++++++++++++ 2 files changed, 170 insertions(+) create mode 100644 net-dialup/mgetty/files/mgetty-1.2.1-Lucent.c.patch create mode 100644 net-dialup/mgetty/files/mgetty-1.2.1-gentoo.patch (limited to 'net-dialup/mgetty/files') diff --git a/net-dialup/mgetty/files/mgetty-1.2.1-Lucent.c.patch b/net-dialup/mgetty/files/mgetty-1.2.1-Lucent.c.patch new file mode 100644 index 000000000000..ac73bea808c0 --- /dev/null +++ b/net-dialup/mgetty/files/mgetty-1.2.1-Lucent.c.patch @@ -0,0 +1,16 @@ +--- a/voice/libvoice/Lucent.c ++++ b/voice/libvoice/Lucent.c +@@ -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-gentoo.patch b/net-dialup/mgetty/files/mgetty-1.2.1-gentoo.patch new file mode 100644 index 000000000000..fd46ff23ed46 --- /dev/null +++ b/net-dialup/mgetty/files/mgetty-1.2.1-gentoo.patch @@ -0,0 +1,154 @@ +--- a/callback/Makefile ++++ b/callback/Makefile +@@ -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 +--- a/doc/mgetty.texi-in ++++ b/doc/mgetty.texi-in +@@ -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} +--- a/fax/faxspool.in ++++ b/fax/faxspool.in +@@ -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 - + } + +--- a/frontends/X11/viewfax/Makefile ++++ b/frontends/X11/viewfax/Makefile +@@ -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) + +--- a/g3/Makefile ++++ b/g3/Makefile +@@ -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 +--- a/Makefile ++++ b/Makefile +@@ -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 + + # +--- a/mgetty.cfg.in ++++ b/mgetty.cfg.in +@@ -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 + + +--- a/voice/Makefile ++++ b/voice/Makefile +@@ -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); \ +--- a/voice/voice.conf-dist ++++ b/voice/voice.conf-dist +@@ -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 + + # -- cgit v1.2.3