bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade mgetty to 1.1.36 (#3687)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@11642 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2008-07-05 12:25:00 +00:00
parent 0fd1094a79
commit e1b4c84956
2 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
utils/mgetty/Makefile
View File

@ -9,16 +9,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mgetty PKG_NAME:=mgetty
PKG_VERSION:=1.1.35 PKG_VERSION:=1.1.36
PKG_XVERSION:=Feb22 PKG_XVERSION:=Jun15
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION)-$(PKG_XVERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION)-$(PKG_XVERSION).tar.gz
PKG_SOURCE_URL:=ftp://alpha.greenie.net/pub/mgetty/source/1.1 PKG_SOURCE_URL:=ftp://alpha.greenie.net/pub/mgetty/source/1.1
PKG_MD5SUM:=6805f8e31423bb777be80e3a856001cb PKG_MD5SUM:=0320e98c6b86bcca48fc5f355b94ead4
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

34
utils/mgetty/patches/001-mgetty.patch
View File

@ -1,7 +1,5 @@
Only in mgetty-1.1.31: .prepared --- a/Makefile
diff -ur mgetty-1.1.31-old/Makefile mgetty-1.1.31/Makefile +++ b/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
@@ -164,7 +164,9 @@ @@ -164,7 +164,9 @@
# #
# if your systems doesn't have one, use the shell script that I provide # 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 # Where section 1 manual pages should be placed
@@ -416,7 +418,12 @@ @@ -421,7 +423,12 @@
./mksed >sedscript ./mksed >sedscript
chmod 700 sedscript chmod +x sedscript
-mksed: mksed.c policy.h Makefile -mksed: mksed.c policy.h Makefile
+REALGCC:=/usr/bin/gcc +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;\ + ( 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)\" \ $(CC) $(CFLAGS) -DBINDIR=\"$(BINDIR)\" -DSBINDIR=\"$(SBINDIR)\" \
-DLIBDIR=\"$(LIBDIR)\" \ -DLIBDIR=\"$(LIBDIR)\" \
-DCONFDIR=\"$(CONFDIR)\" \ -DCONFDIR=\"$(CONFDIR)\" \
@@ -590,8 +597,10 @@ @@ -586,8 +593,10 @@
-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
-mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.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 # data files + directories
# #
@@ -653,7 +662,8 @@ @@ -649,7 +658,8 @@
if [ ! -z "$(INSTALL_MECHO)" ] ; then \ if [ ! -z "$(INSTALL_MECHO)" ] ; then \
cd compat ; \ cd compat ; \
$(CC) $(CFLAGS) -o mg.echo mg.echo.c && \ $(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 fi
# #
Only in mgetty-1.1.31-old: Makefile.orig --- a/g3/Makefile
Only in mgetty-1.1.31-old: Makefile.rej +++ b/g3/Makefile
diff -ur mgetty-1.1.31-old/g3/Makefile mgetty-1.1.31/g3/Makefile @@ -37,7 +37,8 @@
--- 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 @@
# install programs # install programs
# #
for f in $(G3_PROGRAMS) ; do \ 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 done
# #
# make symlink for "g3topbm" (so third-party fax viewers won't fail) # 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 --- a/logfile.c
--- mgetty-1.1.31-old/logfile.c 2006-01-02 00:37:56.000000000 +0000 +++ b/logfile.c
+++ mgetty-1.1.31/logfile.c 2006-01-02 00:42:17.000000000 +0000
@@ -327,12 +327,11 @@ @@ -327,12 +327,11 @@
} }
else /* ERROR or FATAL */ 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 #ifdef SYSLOG
syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws ); syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws );
#endif #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