* [gentoo-commits] repo/gentoo:master commit in: net-dialup/mgetty/files/
@ 2017-01-18 9:23 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2017-01-18 9:23 UTC (permalink / raw
To: gentoo-commits
commit: ace8fec77a5d495e58a6e4819c8fd3d9ad73bee9
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jan 17 17:33:51 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 09:19:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace8fec7
net-dialup/mgetty: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3516
net-dialup/mgetty/files/mgetty-1.1.36-gentoo.patch | 170 --------------------
net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch | 110 -------------
.../mgetty/files/mgetty-1.1.36-qa-fixes.patch | 175 ---------------------
3 files changed, 455 deletions(-)
diff --git a/net-dialup/mgetty/files/mgetty-1.1.36-gentoo.patch b/net-dialup/mgetty/files/mgetty-1.1.36-gentoo.patch
deleted file mode 100644
index 12de205..00000000
--- a/net-dialup/mgetty/files/mgetty-1.1.36-gentoo.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -Nru mgetty-1.1.36.orig/callback/Makefile mgetty-1.1.36/callback/Makefile
---- mgetty-1.1.36.orig/callback/Makefile 2007-09-14 23:03:32.000000000 +0300
-+++ mgetty-1.1.36/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.36.orig/doc/mgetty.texi-in mgetty-1.1.36/doc/mgetty.texi-in
---- mgetty-1.1.36.orig/doc/mgetty.texi-in 2007-09-14 23:03:32.000000000 +0300
-+++ mgetty-1.1.36/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.36.orig/fax/faxspool.in mgetty-1.1.36/fax/faxspool.in
---- mgetty-1.1.36.orig/fax/faxspool.in 2007-09-14 23:03:32.000000000 +0300
-+++ mgetty-1.1.36/fax/faxspool.in 2007-09-14 23:02:58.000000000 +0300
-@@ -380,7 +380,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)
-@@ -391,7 +391,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.36.orig/frontends/X11/viewfax/Makefile mgetty-1.1.36/frontends/X11/viewfax/Makefile
---- mgetty-1.1.36.orig/frontends/X11/viewfax/Makefile 2007-09-14 23:03:32.000000000 +0300
-+++ mgetty-1.1.36/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.36.orig/g3/Makefile mgetty-1.1.36/g3/Makefile
---- mgetty-1.1.36.orig/g3/Makefile 2007-09-14 23:03:32.000000000 +0300
-+++ mgetty-1.1.36/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.36.orig/Makefile mgetty-1.1.36/Makefile
---- mgetty-1.1.36.orig/Makefile 2007-09-14 23:03:32.000000000 +0300
-+++ mgetty-1.1.36/Makefile 2007-09-14 23:02:58.000000000 +0300
-@@ -275,7 +275,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
-
-@@ -584,10 +584,8 @@
- $(INSTALL) -m 755 newslock $(BINDIR)
-
- -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
-- -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
-- -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
-- $(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
- #
-@@ -649,7 +647,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.36.orig/mgetty.cfg.in mgetty-1.1.36/mgetty.cfg.in
---- mgetty-1.1.36.orig/mgetty.cfg.in 2003-11-17 21:09:41.000000000 +0200
-+++ mgetty-1.1.36/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.36.orig/voice/Makefile mgetty-1.1.36/voice/Makefile
---- mgetty-1.1.36.orig/voice/Makefile 2007-09-14 23:03:32.000000000 +0300
-+++ mgetty-1.1.36/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.36.orig/voice/voice.conf-dist mgetty-1.1.36/voice/voice.conf-dist
---- mgetty-1.1.36.orig/voice/voice.conf-dist 2005-03-19 18:10:20.000000000 +0200
-+++ mgetty-1.1.36/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.36-nofax.patch b/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch
deleted file mode 100644
index a65f867..00000000
--- a/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -Nru mgetty-1.1.36.orig/doc/Makefile mgetty-1.1.36/doc/Makefile
---- mgetty-1.1.36.orig/doc/Makefile 2007-11-25 09:31:56.000000000 +0200
-+++ mgetty-1.1.36/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.36.orig/Makefile mgetty-1.1.36/Makefile
---- mgetty-1.1.36.orig/Makefile 2007-11-25 09:31:58.000000000 +0200
-+++ mgetty-1.1.36/Makefile 2007-11-25 09:34:45.000000000 +0200
-@@ -317,7 +317,7 @@
-
- all: bin-all doc-all
-
--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
-
-@@ -362,9 +362,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
-@@ -585,7 +583,6 @@
-
- -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
- $(INSTALL) -m 700 mgetty $(SBINDIR)
-- $(INSTALL) -m 755 sendfax $(SBINDIR)
- #
- # data files + directories
- #
-@@ -597,12 +594,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
- #
-@@ -614,34 +607,6 @@
- echo "\a" ;\
- 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.36.orig/t/Makefile mgetty-1.1.36/t/Makefile
---- mgetty-1.1.36.orig/t/Makefile 2006-09-26 01:32:10.000000000 +0300
-+++ mgetty-1.1.36/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.36-qa-fixes.patch b/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch
deleted file mode 100644
index 69ae072..00000000
--- a/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -Nru mgetty-1.1.36.orig/doc/Makefile mgetty-1.1.36/doc/Makefile
---- mgetty-1.1.36.orig/doc/Makefile 2006-02-22 18:35:02.000000000 +0100
-+++ mgetty-1.1.36/doc/Makefile 2009-08-31 20:31:01.000000000 +0200
-@@ -63,7 +63,7 @@
- *.man *.[1-9] mgetty.texi
-
- install: $(MANSRC) mgetty.info
-- -mkdir `dirname $(MAN1DIR)` $(MAN1DIR) $(MAN4DIR) $(MAN5DIR) $(MAN8DIR) 2>/dev/null
-+ mkdir -p $(MAN1DIR) $(MAN4DIR) $(MAN5DIR) $(MAN8DIR)
- for i in $(MAN1PAGES) ; do \
- $(INSTALL) -m 644 $$i $(MAN1DIR) ; \
- done
-@@ -120,16 +120,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.36.orig/fax/Makefile mgetty-1.1.36/fax/Makefile
---- mgetty-1.1.36.orig/fax/Makefile 2006-02-22 18:25:30.000000000 +0100
-+++ mgetty-1.1.36/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.36.orig/fax_lib.h mgetty-1.1.36/fax_lib.h
---- mgetty-1.1.36.orig/fax_lib.h 2007-06-15 08:44:36.000000000 +0200
-+++ mgetty-1.1.36/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.36.orig/frontends/www/Makefile mgetty-1.1.36/frontends/www/Makefile
---- mgetty-1.1.36.orig/frontends/www/Makefile 2006-02-22 18:25:32.000000000 +0100
-+++ mgetty-1.1.36/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.36.orig/logfile.c mgetty-1.1.36/logfile.c
---- mgetty-1.1.36.orig/logfile.c 2005-11-26 14:48:16.000000000 +0100
-+++ mgetty-1.1.36/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.36.orig/Makefile mgetty-1.1.36/Makefile
---- mgetty-1.1.36.orig/Makefile 2009-08-31 20:30:33.000000000 +0200
-+++ mgetty-1.1.36/Makefile 2009-08-31 20:32:08.000000000 +0200
-@@ -361,7 +361,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
-@@ -617,15 +617,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.36.orig/t/t_g3f_c.c mgetty-1.1.36/t/t_g3f_c.c
---- mgetty-1.1.36.orig/t/t_g3f_c.c 2007-05-05 14:03:03.000000000 +0200
-+++ mgetty-1.1.36/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.36.orig/t/t_ring.c mgetty-1.1.36/t/t_ring.c
---- mgetty-1.1.36.orig/t/t_ring.c 2005-03-23 10:56:21.000000000 +0100
-+++ mgetty-1.1.36/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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/mgetty/files/
@ 2019-03-26 16:45 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2019-03-26 16:45 UTC (permalink / raw
To: gentoo-commits
commit: 2229875255a95198db7615f8ff8700aba6f0eace
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Mar 25 18:17:33 2019 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 16:45:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22298752
net-dialup/mgetty: remove unused patches.
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11500
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
net-dialup/mgetty/files/mgetty-1.1.37-gcc7.patch | 102 ------------
net-dialup/mgetty/files/mgetty-1.1.37-gentoo.patch | 172 ---------------------
2 files changed, 274 deletions(-)
diff --git a/net-dialup/mgetty/files/mgetty-1.1.37-gcc7.patch b/net-dialup/mgetty/files/mgetty-1.1.37-gcc7.patch
deleted file mode 100644
index 6a4fa87a90a..00000000000
--- a/net-dialup/mgetty/files/mgetty-1.1.37-gcc7.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-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/files/mgetty-1.1.37-gentoo.patch b/net-dialup/mgetty/files/mgetty-1.1.37-gentoo.patch
deleted file mode 100644
index 8f0c004d601..00000000000
--- a/net-dialup/mgetty/files/mgetty-1.1.37-gentoo.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-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
-
- #
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/mgetty/files/
@ 2021-03-01 10:53 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2021-03-01 10:53 UTC (permalink / raw
To: gentoo-commits
commit: 697a59402c1d5f411c483b5f77c38c14083e81ea
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 1 10:53:01 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Mar 1 10:53:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=697a5940
net-dialup/mgetty: add missing systemd unit
Closes: https://bugs.gentoo.org/773490
Closes: https://bugs.gentoo.org/773514
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-dialup/mgetty/files/mgetty.service | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/net-dialup/mgetty/files/mgetty.service b/net-dialup/mgetty/files/mgetty.service
new file mode 100644
index 00000000000..2ca018ed49f
--- /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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-01 10:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-18 9:23 [gentoo-commits] repo/gentoo:master commit in: net-dialup/mgetty/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2019-03-26 16:45 Patrice Clement
2021-03-01 10:53 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox