From 1e6135d19ac2731eafe92f93cd9257d71e737af0 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sat, 5 Jul 2008 12:25:00 +0000
Subject: [PATCH] Upgrade mgetty to 1.1.36 (#3687)

SVN-Revision: 11642
---
 utils/mgetty/Makefile                 |  9 +++----
 utils/mgetty/patches/001-mgetty.patch | 34 ++++++++++-----------------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/utils/mgetty/Makefile b/utils/mgetty/Makefile
index 3128053cb..118643fe7 100644
--- a/utils/mgetty/Makefile
+++ b/utils/mgetty/Makefile
@@ -9,16 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mgetty
-PKG_VERSION:=1.1.35
-PKG_XVERSION:=Feb22
+PKG_VERSION:=1.1.36
+PKG_XVERSION:=Jun15
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION)-$(PKG_XVERSION).tar.gz
 PKG_SOURCE_URL:=ftp://alpha.greenie.net/pub/mgetty/source/1.1
-PKG_MD5SUM:=6805f8e31423bb777be80e3a856001cb
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=0320e98c6b86bcca48fc5f355b94ead4
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/utils/mgetty/patches/001-mgetty.patch b/utils/mgetty/patches/001-mgetty.patch
index c5ffb6f2e..427fe9c7e 100644
--- a/utils/mgetty/patches/001-mgetty.patch
+++ b/utils/mgetty/patches/001-mgetty.patch
@@ -1,7 +1,5 @@
-Only in mgetty-1.1.31: .prepared
-diff -ur mgetty-1.1.31-old/Makefile mgetty-1.1.31/Makefile
---- mgetty-1.1.31-old/Makefile	2006-01-02 00:37:56.000000000 +0000
-+++ mgetty-1.1.31/Makefile	2006-01-02 00:43:57.000000000 +0000
+--- a/Makefile
++++ b/Makefile
 @@ -164,7 +164,9 @@
  #
  # if your systems doesn't have one, use the shell script that I provide
@@ -22,9 +20,9 @@ diff -ur mgetty-1.1.31-old/Makefile mgetty-1.1.31/Makefile
  #
  #
  # Where section 1 manual pages should be placed
-@@ -416,7 +418,12 @@
+@@ -421,7 +423,12 @@
  	./mksed >sedscript
- 	chmod 700 sedscript
+ 	chmod +x sedscript
  
 -mksed: mksed.c policy.h Makefile 
 +REALGCC:=/usr/bin/gcc
@@ -32,11 +30,11 @@ diff -ur mgetty-1.1.31-old/Makefile mgetty-1.1.31/Makefile
 +	( echo $(REALGCC); $(MAKE) "CC=$(REALGCC)" "CFLAGS=$(CFLAGS)" mksed-wrong;\
 +	);
 +
-+mksed-wrong: mksed.c policy.h Makefile 
++mksed-wrong: mksed.c policy.h Makefile
  	$(CC) $(CFLAGS) -DBINDIR=\"$(BINDIR)\" -DSBINDIR=\"$(SBINDIR)\" \
  		-DLIBDIR=\"$(LIBDIR)\" \
  		-DCONFDIR=\"$(CONFDIR)\" \
-@@ -590,8 +597,10 @@
+@@ -586,8 +593,10 @@
  	-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
  	-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
  	-mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
@@ -49,7 +47,7 @@ diff -ur mgetty-1.1.31-old/Makefile mgetty-1.1.31/Makefile
  #
  # data files + directories
  #
-@@ -653,7 +662,8 @@
+@@ -649,7 +658,8 @@
  	if [ ! -z "$(INSTALL_MECHO)" ] ; then \
  	    cd compat ; \
  	    $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
@@ -59,12 +57,9 @@ diff -ur mgetty-1.1.31-old/Makefile mgetty-1.1.31/Makefile
  	fi
  
  #
-Only in mgetty-1.1.31-old: Makefile.orig
-Only in mgetty-1.1.31-old: Makefile.rej
-diff -ur mgetty-1.1.31-old/g3/Makefile mgetty-1.1.31/g3/Makefile
---- mgetty-1.1.31-old/g3/Makefile	2006-01-02 00:37:56.000000000 +0000
-+++ mgetty-1.1.31/g3/Makefile	2006-01-02 00:42:17.000000000 +0000
-@@ -40,7 +40,8 @@
+--- a/g3/Makefile
++++ b/g3/Makefile
+@@ -37,7 +37,8 @@
  # install programs
  #
  	for f in $(G3_PROGRAMS) ; do \
@@ -74,9 +69,8 @@ diff -ur mgetty-1.1.31-old/g3/Makefile mgetty-1.1.31/g3/Makefile
  	done
  #
  # make symlink for "g3topbm" (so third-party fax viewers won't fail)
-diff -ur mgetty-1.1.31-old/logfile.c mgetty-1.1.31/logfile.c
---- mgetty-1.1.31-old/logfile.c	2006-01-02 00:37:56.000000000 +0000
-+++ mgetty-1.1.31/logfile.c	2006-01-02 00:42:17.000000000 +0000
+--- a/logfile.c
++++ b/logfile.c
 @@ -327,12 +327,11 @@
      }
      else		/* ERROR or FATAL */
@@ -92,7 +86,3 @@ diff -ur mgetty-1.1.31-old/logfile.c mgetty-1.1.31/logfile.c
  #ifdef SYSLOG
  	syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws );
  #endif
-Only in mgetty-1.1.31-old/voice/libutil: access.c.orig
-Only in mgetty-1.1.31-old/voice/libvoice: Lucent.c.orig
-Only in mgetty-1.1.31-old/voice/libvoice: V253modem.c.orig
-Only in mgetty-1.1.31-old/voice/pvftools: pvftormd.c.orig
-- 
2.30.2