diff options
Diffstat (limited to 'package/mgetty')
| -rw-r--r-- | package/mgetty/Makefile | 11 | ||||
| -rw-r--r-- | package/mgetty/patches/patch-Makefile | 77 | ||||
| -rw-r--r-- | package/mgetty/patches/patch-g3_Makefile | 12 | ||||
| -rw-r--r-- | package/mgetty/patches/patch-g3_g3cat_c | 38 | ||||
| -rw-r--r-- | package/mgetty/patches/patch-g3_pbm2g3_c | 38 | ||||
| -rw-r--r-- | package/mgetty/patches/patch-logfile_c | 17 |
6 files changed, 21 insertions, 172 deletions
diff --git a/package/mgetty/Makefile b/package/mgetty/Makefile index c610f53b7..105da3001 100644 --- a/package/mgetty/Makefile +++ b/package/mgetty/Makefile @@ -4,15 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mgetty -PKG_VERSION:= 1.1.36 -PKG_EXTRAVER:= Jun15 +PKG_VERSION:= 1.2.1 PKG_RELEASE:= 1 -PKG_HASH:= 8b8642aa318604ad057ed161cacff5c600296cbfbc9b4d562134ee5c130c80ce +PKG_HASH:= c8a72f5ca4142e30627ad16725c40692fb09e6284514392b95ac02062cac9a89 PKG_DESCR:= mgetty + sendfax PKG_SECTION:= sys/misc -PKG_SITES:= ftp://alpha.greenie.net/pub/mgetty/source/1.1/ +PKG_SITES:= ftp://mgetty.greenie.net/pub/mgetty/source/1.2/ -DISTFILES:= ${PKG_NAME}${PKG_VERSION}-${PKG_EXTRAVER}.tar.gz +PKG_CFLINE_MGETTY:= depends on ADK_BROKEN + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/mgetty/patches/patch-Makefile b/package/mgetty/patches/patch-Makefile index 41f1203f0..d121e705a 100644 --- a/package/mgetty/patches/patch-Makefile +++ b/package/mgetty/patches/patch-Makefile @@ -1,86 +1,39 @@ ---- mgetty-1.1.36.orig/Makefile 2007-06-15 13:15:56.000000000 +0200 -+++ mgetty-1.1.36/Makefile 2011-02-28 21:22:07.000000000 +0100 -@@ -4,7 +4,7 @@ - # - # this is the C compiler to use (on SunOS, the standard "cc" does not +--- mgetty-1.2.1.orig/Makefile 2018-09-11 12:38:58.000000000 +0200 ++++ mgetty-1.2.1/Makefile 2024-02-13 16:33:13.023498839 +0100 +@@ -6,7 +6,7 @@ # grok my code, so please use gcc there. On ISC 4.0, use "icc".). --CC=gcc -+CC?=gcc - #CC=cc # - #### C Compiler Flags #### -@@ -102,7 +102,7 @@ CC=gcc + # if you are cross-compiling, this is the C compiler for the target platform +-CC=cc ++CC?=cc + #CC=gcc + # + # if you are cross-compiling, *this* needs to be the C compiler that +@@ -109,7 +109,7 @@ HOSTCC=$(CC) # USTAT - ustat(), no statfs etc. # #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL --CFLAGS=-O2 -Wall -pipe -+CFLAGS?=-O2 -Wall -pipe +-CFLAGS=-Wall -O2 -pipe ++CFLAGS?=-Wall -O2 -pipe #CFLAGS=-O -DSVR4 #CFLAGS=-O -DSVR4 -DSVR42 #CFLAGS=-O -DUSE_POLL -@@ -143,7 +143,7 @@ CFLAGS=-O2 -Wall -pipe +@@ -150,7 +150,7 @@ CFLAGS=-Wall -O2 -pipe # "utmp.o: unresolved symbol _login" # For Linux, add "-lutil" if the linker complains about "updwtmp". # -LDFLAGS= +LDFLAGS?= - LIBS= + #LIBS= #LIBS=-lprot -lsocket # SCO Unix #LIBS=-lsocket -@@ -164,7 +164,9 @@ LIBS= +@@ -171,7 +171,8 @@ LIBS=-lutil # FreeBSD or Linux/GNU l # # 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 +STRIP= +INSTALL=install -c -o root -g root -+#INSTALL=install -c -o bin -g bin #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 -@@ -216,7 +218,7 @@ FAX_SPOOL_OUT=$(FAX_SPOOL)/outgoing - # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER - # MUST NOT BE root or any other privileged account). - # --FAX_OUT_USER=fax -+FAX_OUT_USER=root - # - # - # Where section 1 manual pages should be placed -@@ -421,7 +423,12 @@ sedscript: mksed - ./mksed >sedscript - chmod +x sedscript - --mksed: mksed.c policy.h Makefile -+REALGCC:=/usr/bin/gcc -+mksed: mksed.c policy.h Makefile -+ ( echo $(CC_FOR_BUILD); $(MAKE) "CC=$(CC_FOR_BUILD)" "CFLAGS=$(CFLAGS_FOR_BUILD)" mksed-wrong;\ -+ ); -+ -+mksed-wrong: mksed.c policy.h Makefile - $(CC) $(CFLAGS) -DBINDIR=\"$(BINDIR)\" -DSBINDIR=\"$(SBINDIR)\" \ - -DLIBDIR=\"$(LIBDIR)\" \ - -DCONFDIR=\"$(CONFDIR)\" \ -@@ -586,8 +593,10 @@ install.bin: mgetty sendfax newslock \ - -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) -+ $(STRIP) $(SBINDIR)/mgetty -+ $(INSTALL) -m 755 sendfax $(SBINDIR) -+ $(STRIP) $(SBINDIR)/sendfax - # - # data files + directories - # -@@ -649,7 +658,8 @@ install.bin: mgetty sendfax newslock \ - 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) && \ -+ $(STRIP) $(BINDIR)/mg.echo ; \ - fi - - # diff --git a/package/mgetty/patches/patch-g3_Makefile b/package/mgetty/patches/patch-g3_Makefile deleted file mode 100644 index 3cb6cf24e..000000000 --- a/package/mgetty/patches/patch-g3_Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- mgetty-1.1.36.orig/g3/Makefile 2006-02-22 18:25:34.000000000 +0100 -+++ mgetty-1.1.36/g3/Makefile 2009-08-28 15:17:14.239450922 +0200 -@@ -37,7 +37,8 @@ install: all - # install programs - # - for f in $(G3_PROGRAMS) ; do \ -- $(INSTALL) -s -m 755 $$f $(BINDIR) ; \ -+ $(INSTALL) -m 755 $$f $(BINDIR) ; \ -+ $(STRIP) $(BINDIR)/$$f ; \ - done - # - # make symlink for "g3topbm" (so third-party fax viewers won't fail) diff --git a/package/mgetty/patches/patch-g3_g3cat_c b/package/mgetty/patches/patch-g3_g3cat_c deleted file mode 100644 index 964eea4aa..000000000 --- a/package/mgetty/patches/patch-g3_g3cat_c +++ /dev/null @@ -1,38 +0,0 @@ ---- mgetty-1.1.36.orig/g3/g3cat.c 2005-02-27 20:03:37.000000000 +0100 -+++ mgetty-1.1.36/g3/g3cat.c 2017-06-03 23:40:23.804404768 +0200 -@@ -44,7 +44,7 @@ static int b_written = 0; /* bytes of a - /* 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, - } - - #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/package/mgetty/patches/patch-g3_pbm2g3_c b/package/mgetty/patches/patch-g3_pbm2g3_c deleted file mode 100644 index f56292e84..000000000 --- a/package/mgetty/patches/patch-g3_pbm2g3_c +++ /dev/null @@ -1,38 +0,0 @@ ---- mgetty-1.1.36.orig/g3/pbm2g3.c 1998-05-07 13:32:04.000000000 +0200 -+++ mgetty-1.1.36/g3/pbm2g3.c 2017-06-03 23:32:07.020481555 +0200 -@@ -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, - } - - #ifdef __GNUC__ --inline -+static inline - #endif - void puteol _P0( void ) /* write byte-aligned EOL */ - { -@@ -69,7 +69,7 @@ void puteol _P0( void ) /* write byte- - } - - #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 ) - { diff --git a/package/mgetty/patches/patch-logfile_c b/package/mgetty/patches/patch-logfile_c deleted file mode 100644 index e2c4fdc96..000000000 --- a/package/mgetty/patches/patch-logfile_c +++ /dev/null @@ -1,17 +0,0 @@ ---- mgetty-1.1.36.orig/logfile.c 2005-11-26 14:48:16.000000000 +0100 -+++ mgetty-1.1.36/logfile.c 2009-08-28 15:17:14.239450922 +0200 -@@ -327,12 +327,11 @@ static int first_open = TRUE; - } - else /* ERROR or FATAL */ - { -- fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: %s", -+ fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: #%d", - 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>" ); -+ errnr ); - #ifdef SYSLOG - syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws ); - #endif |