From 20a54a467b1463ac595cc5f44aa716f802e95199 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 08:28:26 +0000 Subject: auto-import changelog data from mgetty-1.1.26-5.src.rpm Tue Jul 10 2001 Bill Nottingham - make /etc/issue parsing match other gettys Tue Jun 12 2001 Florian La Roche - add 64 bit patch for s390x from --- diff --git a/.cvsignore b/.cvsignore index 351d552..5c90f33 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -mgetty-1.1.25-to-11032001.bz2 -mgetty1.1.25-Feb01.tar.gz +mgetty1.1.26-Apr16.tar.gz diff --git a/mgetty-1.1.26-issue.patch b/mgetty-1.1.26-issue.patch new file mode 100644 index 0000000..9382f75 --- /dev/null +++ b/mgetty-1.1.26-issue.patch @@ -0,0 +1,91 @@ +--- mgetty-1.1.26/doc/mgetty.8in.issue Tue Jul 10 20:06:46 2001 ++++ mgetty-1.1.26/doc/mgetty.8in Tue Jul 10 20:08:46 2001 +@@ -42,14 +42,14 @@ + .B -p + Use the given string to prompt users for their login names. Various + tokens are allowed in this string. These tokens are: @ for the system +-name, \\n, \\r, \\g, \\v, \\f, \\t for newline, carriage return, bell, +-vertical tab, form feed, and tab, respectively. \\P and \\L will expand to +-the tty name ("ttyS0"). \\I will give the "CONNECT foobar" string returned +-by the modem, and \\S will output the port speed. +-\\N and \\U give the number of users currently logged in. +-\\C will be changed into the result of ctime(), and \\D and \\T will +-output the date and time, respectively. Finally, \\ will use digit +-as octal/decimal/hexadecimal representation of the character to follow. ++name, \\n, \\g, \\v, \\f for newline, bell, vertical tab, and form feed, ++respectively. \\P, \\l and \\L will expand to the tty name ("ttyS0"). \\I ++will give the "CONNECT foobar" string returned by the modem, and \\S and ++\\b will output the port speed. \\N and \\U give the number of users ++currently logged in. \\C will be changed into the result of ctime(), and ++\\D or \\d and \\T or \\t will output the date and time, respectively. ++Finally, \\ will use digit as octal/decimal/hexadecimal representation ++of the character to follow. + + The default prompt is specified at compile time. + .TP +--- mgetty-1.1.26/logname.c.issue Tue Jul 10 19:00:00 2001 ++++ mgetty-1.1.26/logname.c Tue Jul 10 20:05:38 2001 +@@ -87,12 +87,12 @@ + switch ( *ep ) + { + case 'n': p[i++] = '\n'; break; +- case 'r': p[i++] = '\r'; break; ++ /* case 'r': p[i++] = '\r'; break; */ + case 'g': p[i++] = '\007'; break; +- case 'b': p[i++] = '\010'; break; +- case 'v': p[i++] = '\013'; break; ++ /* case 'b': p[i++] = '\010'; break; */ ++ /* case 'v': p[i++] = '\013'; break; */ + case 'f': p[i++] = '\f'; break; +- case 't': p[i++] = '\t'; break; ++ /* case 't': p[i++] = '\t'; break; */ + case 's': /* Operating System */ + if ( i + strlen(un.sysname) +1 > MAX_PROMPT_LENGTH ) break; + i += strappnd( &p[i], un.sysname ); +@@ -101,10 +101,12 @@ + if ( i + strlen(un.machine) +1 > MAX_PROMPT_LENGTH ) break; + i += strappnd( &p[i], un.machine ); + break; ++ case 'r': + case 'R': /* OS release */ + if ( i + strlen(un.release) +1 > MAX_PROMPT_LENGTH ) break; + i += strappnd( &p[i], un.release ); + break; ++ case 'v': + case 'V': /* OS version */ + if ( i + strlen(un.version) +1 > MAX_PROMPT_LENGTH ) break; + i += strappnd( &p[i], un.version ); +@@ -116,6 +118,7 @@ + i += strappnd( &p[i], CallerId ); + break; + } ++ case 'l': + case 'P': /* port name */ + case 'L': /* tty line */ + { +@@ -144,6 +147,7 @@ + i = strlen(p); + break; + } ++ case 'b': + case 'S': /* port speed */ + { /* ugly, I know. */ + TIO temp_t; +@@ -152,6 +156,8 @@ + i = strlen(p); + } + break; ++ case 'd': ++ case 't': + case 'D': /* fallthrough */ + case 'T': + if ( i + 30 > MAX_PROMPT_LENGTH ) +@@ -165,7 +171,7 @@ + + if ( tm == NULL ) break; + +- if ( *ep == 'D' ) ++ if ( *ep == 'D' || *ep == 'd' ) + sprintf( &p[i], "%d/%d/%d", tm->tm_mon+1, + tm->tm_mday, tm->tm_year + 1900 ); + else diff --git a/mgetty.spec b/mgetty.spec index 9e7b4c6..254da73 100644 --- a/mgetty.spec +++ b/mgetty.spec @@ -4,20 +4,22 @@ Summary: A getty replacement for use with data and fax modems. Name: mgetty -Version: 1.1.25 +Version: 1.1.26 Release: 5 -Source: ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/mgetty%{version}-Feb01.tar.gz +Source: ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/mgetty%{version}-Apr16.tar.gz Source1: logrotate.mgetty Source2: logrotate.sendfax Source3: logrotate.vgetty Source4: logrotate.vm -Patch0: http://www-internal.alphanet.ch/~schaefer/vgetty/global_patches/CURRENT/mgetty-1.1.25-to-11032001.bz2 -Patch1: mgetty-1.1.22-config.patch -Patch2: mgetty-1.1.26-policy.patch -Patch3: mgetty-1.1.25-faxprint.patch -Patch4: mgetty-1.1.21-giftopnm.patch -Patch5: mgetty-1.1.25-voiceconfig.patch -Patch6: mgetty-1.1.25-elsa.patch +#Patch0: http://www-internal.alphanet.ch/~schaefer/vgetty/global_patches/CURRENT/mgetty-1.1.25-to-11032001.bz2 +Patch0: mgetty-1.1.22-config.patch +Patch1: mgetty-1.1.26-policy.patch +Patch2: mgetty-1.1.25-faxprint.patch +Patch3: mgetty-1.1.21-giftopnm.patch +Patch4: mgetty-1.1.25-voiceconfig.patch +Patch5: mgetty-1.1.25-elsa.patch +Patch6: mgetty-1.1.25-s390x.patch +Patch7: mgetty-1.1.26-issue.patch License: GPL Group: Applications/Communications Prereq: /sbin/install-info @@ -85,19 +87,23 @@ install mgetty. %prep %setup -q -%patch0 -p1 -b .vgetty -%patch1 -p1 -b .config -%patch2 -p1 -b .policy -%patch3 -p1 -b .faxprint +%patch0 -p1 -b .config +%patch1 -p1 -b .policy +%patch2 -p1 -b .faxprint %if %{using_netpbm} -%patch4 -p1 -b .giftopnm +%patch3 -p1 -b .giftopnm %endif -%patch5 -p1 -b .voiceconfig -# Should be outdated by the vgetty patch. -#%patch6 -p1 -b .elsa +%patch4 -p1 -b .voiceconfig +# Should be outdated by the vgetty changes in 1.1.26. +#%patch5 -p1 -b .elsa +%patch6 -p1 +%patch7 -p1 cp policy.h-dist policy.h %build +PATH=$PATH:/usr/X11R6/bin +export PATH + %define makeflags CFLAGS="$RPM_OPT_FLAGS -Wall -DAUTO_PPP" CONFDIR=%{_sysconfdir}/mgetty+sendfax ECHO="'echo -e'" prefix=%{_prefix} make %{makeflags} @@ -293,10 +299,17 @@ fi %{_mandir}/man1/viewfax.1x* %changelog +* Tue Jul 10 2001 Bill Nottingham +- make /etc/issue parsing match other gettys + +* Tue Jun 12 2001 Florian La Roche +- add 64 bit patch for s390x from + * Wed Apr 18 2001 Nalin Dahyabhai - define _sysconfdir, not sysconfdir * Mon Apr 16 2001 Nalin Dahyabhai +- update to 1.1.26 - add logrotate.vm and logrotate.vgetty (note from Heiner Kordewiner) - add voice/{Announce,Changelog,Readme} to documentation set diff --git a/sources b/sources index 42339f9..91a3783 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -8995ba565a3f452cd95ea4b7745ffc5f mgetty-1.1.25-to-11032001.bz2 -f59183d231d34e74e4d28567c573a101 mgetty1.1.25-Feb01.tar.gz +02d60e05acdd406b1e86222e8a373a7e mgetty1.1.26-Apr16.tar.gz