Fri Jan 30 12:51:08 UTC 2009

Author: jskala

Update of /cvs/extras/rpms/mgetty/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11186

Modified Files:
	.cvsignore mgetty-1.1.25-voiceconfig.patch 
	mgetty-1.1.26-issue.patch mgetty-1.1.26-policy.patch 
	mgetty-1.1.29-config.patch mgetty-1.1.29-helper.patch 
	mgetty-1.1.30-mktemp.patch mgetty-1.1.30-unioninit.patch 
	mgetty-1.1.31-162174_tcflush.patch mgetty-1.1.31-helper2.patch 
	mgetty-1.1.31-issue-doc.patch mgetty-1.1.31-lfs.patch 
	mgetty-1.1.31-no-acroread.patch 
	mgetty-1.1.31-sendmail_path.patch mgetty-1.1.33-167830.patch 
	mgetty-1.1.33-167830_tty_access.patch 
	mgetty-1.1.33-bug_63843.patch mgetty.spec sources 
Added Files:
	mgetty-1.1.36-caller_name.patch 
Removed Files:
	mgetty-1.1.21-giftopnm.patch mgetty-1.1.25-faxprint.patch 
	mgetty-1.1.30-path.patch mgetty-1.1.31-W-format.patch 
	mgetty-1.1.33-sprintf_chk.patch 
Log Message:
* Fri Jan 30 2009 Jiri Skala <jskala at redhat.com> - 1.1.36-1
- re-base to latest upstream
- Resolves: #232522 - mgetty does not collect caller name from modem properly


mgetty-1.1.36-caller_name.patch:

--- NEW FILE mgetty-1.1.36-caller_name.patch ---
diff -up mgetty-1.1.36/callback/callback.c.caller_name mgetty-1.1.36/callback/callback.c
--- mgetty-1.1.36/callback/callback.c.caller_name	2009-01-30 08:47:53.000000000 +0100
+++ mgetty-1.1.36/callback/callback.c	2009-01-30 08:49:15.000000000 +0100
@@ -396,7 +396,7 @@ char * r;
 /* provide some "dummy" things for do_chat(), otherwise callback won't link */
 /*!!! FIXME - we don't really want this */
 int virtual_ring = FALSE;
-void cndfind _P1( (p), char * p ) { /* DUMMY */ }
+int cndfind _P1( (p), char * p ) { /* DUMMY */ }
 
 int main _P2((argc, argv), int argc, char ** argv)
 {
diff -up mgetty-1.1.36/cnd.c.caller_name mgetty-1.1.36/cnd.c
--- mgetty-1.1.36/cnd.c.caller_name	2009-01-30 08:48:07.000000000 +0100
+++ mgetty-1.1.36/cnd.c	2009-01-30 09:09:36.000000000 +0100
@@ -104,7 +104,7 @@ struct cndtable cndtable[] =
 };
     
 
-void
+int
 cndfind _P1((str), char *str)
 {
     struct cndtable *cp;
@@ -124,56 +124,82 @@ cndfind _P1((str), char *str)
        asked for it with AT\O. The CID will simply get sent on a single
        line consisting only of digits. So, if we get a line starting
        with a digit, let's assume that it's the CID...
+       The USRobotics can send unformatted caller id data. Allow for that as well.
      */
     if ( isdigit(*str) )
     {
-	CallerId = p = strdup(str);
-	while( isdigit(*p) ) p++;
-	*p = 0;
-	lprintf( L_NOISE, "CND: ELink caller ID: '%s'", CallerId );
-	return;
+			int CheckSum=0; // to validate possible unformatted display
+ 			int digit;
+			CallerId = p = strdup(str);
+			while( isxdigit(*p) ) p++;
+			*p = 0;
+ 			// Check for an unformatted display of caller id. Calculate FSK checksum...
+			p = CallerId;
+	 		while (*p)
+			{
+	 			if (isdigit(*p))
+					digit = (*p - '0');
+ 				else digit = 10 + (tolower(*p) - 'a');
+ 				CheckSum += (digit << 4);
+		 		p++;
+ 				if (!*p)
+					break; // odd number of characters, not proper hex, cannot be FSK
+	 			if (isdigit(*p))
+					digit = (*p - '0');
+	 			else digit = 10 + (tolower(*p) - 'a');
+ 				CheckSum += digit;
+				CheckSum &= 255;
+ 				p++;
+		 	}
+			if (CheckSum == 0)
+			{
+				lprintf( L_NOISE, "CND: ELink caller ID: '%s'", CallerId );
+				return 4;
+			}
+			return 1;
     }
 
     for (cp = cndtable; cp->string; cp++)
     {
-	len = strlen(cp->string);
-	if (strncmp(cp->string, str, len) == 0)
-	{
-	    if (!cp->variable)
-		return;
-
-	    /* special case: Rockwell sends *two* MESG=... lines */
-	    if (cp->variable == &CallMsg1 && CallMsg1[0] != 0)
-		continue;
-
-	    /* special case for CONNECT on Rockwell-Based modems */
-	    if ( ( cnd_carrier[0] != 0 || cnd_protocol[0] != 0 ) &&
-		 strncmp( str, "CONNECT ", 8 ) == 0 )
-	    {
-		*(cp->variable) = malloc( strlen(str) - len +
-		                  strlen( cnd_carrier ) +
-				  strlen( cnd_protocol ) + 5 );
-		sprintf( *(cp->variable), "%s/%s %s",
-			 str+len, cnd_carrier, cnd_protocol );
-	    }
-	    else	/* normal case */
-	    {
-		*(cp->variable) = p = malloc(strlen(str) - len + 1);
-		(void) strcpy(*(cp->variable), str+len);
-
-		/* nuke quotes and non-printable characters (some of this 
-		 * stuff is passed to shell commands and environment vars)
-		 */
-		while( *p != '\0' )
-		{ 
-		    if ( *p == '\'' || *p == '\"' || !isprint(*p) ) *p = ' ';
-		    p++;
-		}
-	    }
-	    lprintf(L_JUNK, "CND: found: %s", *(cp->variable));
-	    return;
-	}
+			len = strlen(cp->string);
+			if (strncmp(cp->string, str, len) == 0)
+			{
+	  	  if (!cp->variable)
+					return 0;
+
+	    	/* special case: Rockwell sends *two* MESG=... lines */
+		    if (cp->variable == &CallMsg1 && CallMsg1[0] != 0)
+					continue;
+
+		    /* special case for CONNECT on Rockwell-Based modems */
+		    if ( ( cnd_carrier[0] != 0 || cnd_protocol[0] != 0 ) &&
+						 strncmp( str, "CONNECT ", 8 ) == 0 )
+		    {
+					*(cp->variable) = malloc( strlen(str) - len +
+		      	strlen( cnd_carrier ) +
+					  strlen( cnd_protocol ) + 5 );
+					sprintf( *(cp->variable), "%s/%s %s",
+						str+len, cnd_carrier, cnd_protocol );
+		    }
+		    else	/* normal case */
+	  	  {
+					*(cp->variable) = p = malloc(strlen(str) - len + 1);
+					(void) strcpy(*(cp->variable), str+len);
+
+					/* nuke quotes and non-printable characters (some of this 
+					 * stuff is passed to shell commands and environment vars)
+					 */
+					while( *p != '\0' )
+					{ 
+				    if ( *p == '\'' || *p == '\"' || !isprint(*p) ) *p = ' ';
+				    p++;
+					}
+		    }
+		    lprintf(L_JUNK, "CND: found: %s", *(cp->variable));
+	  	  return 1;
+			}
     }
+	return 0;
 }
 
 /* process Rockwell-style caller ID. Weird */
diff -up mgetty-1.1.36/mgetty.h.caller_name mgetty-1.1.36/mgetty.h
--- mgetty-1.1.36/mgetty.h.caller_name	2009-01-30 08:48:28.000000000 +0100
+++ mgetty-1.1.36/mgetty.h	2009-01-30 09:39:28.000000000 +0100
@@ -300,7 +300,7 @@ extern char *CallTime;
 extern char *CallName;
 extern char *CalledNr;
 
-void cndfind _PROTO((char *str));
+int cndfind _PROTO((char *str));
 int cndlookup _PROTO((void));
 int cnd_call _PROTO((char *name, char *tty, int dist_ring ));
 
diff -up mgetty-1.1.36/ring.c.caller_name mgetty-1.1.36/ring.c
--- mgetty-1.1.36/ring.c.caller_name	2009-01-30 08:48:17.000000000 +0100
+++ mgetty-1.1.36/ring.c	2009-01-30 09:47:03.000000000 +0100
@@ -219,6 +219,7 @@ int wait_for_ring _P6((fd, msn_list, tim
 char	buf[BUFSIZE], ch, *p;
 int	i, w, r;
 int	rc = SUCCESS;
+int need_cnd_items = 4;
 boolean	got_dle;		/* for <DLE><char> events (voice mode) */
 
     lprintf( L_MESG, "wfr: waiting for ``RING''" );
@@ -311,7 +312,7 @@ boolean	got_dle;		/* for <DLE><char> eve
 	/* got a full line */
 	if ( w == 0 ) { continue; }		/* ignore empty lines */
 	buf[w] = '\0';
-	cndfind( buf );				/* grab caller ID */
+  need_cnd_items -= cndfind( buf );	/* grab caller ID, adjust count of needed data items for cnd-program */
 
 	/* ZyXEL CallerID/MSN display? */
 	if ( strncmp( buf, "FM:", 3 ) == 0 ||
@@ -323,7 +324,8 @@ boolean	got_dle;		/* for <DLE><char> eve
 	 * instead of waiting for the next "real" RING
 	 * (but don't do this for V253 DRON/DROF modems!)
 	 */
-	if ( strncmp( buf, "NMBR", 4 ) == 0 && drox_count == 0 ) { break; }
+	//if ( strncmp( buf, "NMBR", 4 ) == 0 && drox_count == 0 ) { break; }
+  if ( (need_cnd_items <= 0) && (drox_count == 0) ) { break; }
 
 	/* V.253 ring cadences */
 	if ( strncmp( buf, "DRON", 4 ) == 0 ||


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Mar 2008 17:28:42 -0000	1.10
+++ .cvsignore	30 Jan 2009 12:50:36 -0000	1.11
@@ -1,3 +1 @@
-faxq-helper.8
-mgetty1.1.33-Apr10.tar.gz
-mgetty1.1.33-Apr10.tar.gz.asc
+mgetty1.1.36-Jun15.tar.gz

mgetty-1.1.25-voiceconfig.patch:

Index: mgetty-1.1.25-voiceconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.25-voiceconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.25-voiceconfig.patch	9 Sep 2004 08:27:55 -0000	1.1
+++ mgetty-1.1.25-voiceconfig.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,8 +1,7 @@
-Eek!  We don't create a phone group by default.  Use the uucp group, which
-owns the serial ports.
---- mgetty-1.1.25/voice/voice.conf-dist.voiceconfig	Tue Mar 20 18:24:12 2001
-+++ mgetty-1.1.25/voice/voice.conf-dist	Tue Mar 20 18:24:20 2001
-@@ -51,7 +51,7 @@
+diff -up mgetty-1.1.36/voice/voice.conf-dist.voiceconfig mgetty-1.1.36/voice/voice.conf-dist
+--- mgetty-1.1.36/voice/voice.conf-dist.voiceconfig	2008-10-09 22:56:11.000000000 +0200
++++ mgetty-1.1.36/voice/voice.conf-dist	2008-10-09 22:56:11.000000000 +0200
+@@ -51,7 +51,7 @@ voice_dir /var/spool/voice
  #
  
  phone_owner root

mgetty-1.1.26-issue.patch:

Index: mgetty-1.1.26-issue.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.26-issue.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mgetty-1.1.26-issue.patch	18 Feb 2008 15:23:21 -0000	1.3
+++ mgetty-1.1.26-issue.patch	30 Jan 2009 12:50:36 -0000	1.4
@@ -1,41 +1,7 @@
-This patch allows mgetty to interpret escape sequences in issue files
-in the same fashion as agetty, which apparently is the model that
-mingetty follows as well.  The specifics, excerpted from the agetty
-man page:
-
-ISSUE ESCAPES
-       The issue-file (/etc/issue or the file set with the -f option) may contain certain escape codes  to  display
-       the  system name, date and time etc. All escape codes consist of a backslash (\) immediately followed by one
-       of the letters explained below.
-
-       b      Insert the baudrate of the current line.	[mgetty sends a backspace]
-
-       d      Insert the current date.	[mgetty ignores this -- it expects upper case]
-
-       s      Insert the system name, the name of the operating system.
-
-       l      Insert the name of the current tty line.	[mgetty ignores this]
-
-       m      Insert the architecture identifier of the machine, eg. i486
-
-       n      Insert the nodename of the machine, also known as the hostname.
-
-       o      Insert the domainname of the machine.
-
-       r      Insert the release number of the OS, eg. 1.1.9.	[mgetty sends a carriage return]
-
-       t      Insert the current time.	[mgetty sends a horizontal tab for this]
-
-       u      Insert the number of current users logged in.
-
-       U      Insert the string "1 user" or "<n> users" where <n> is the number of current users logged in.
-
-       v      Insert the version of the OS, eg. the build-date etc.	[mgetty sends a vertical tab (?)]
-
-
---- mgetty-1.1.26/logname.c	Tue Sep  1 05:56:19 1998
-+++ mgetty-1.1.26/logname.c	Tue Jul 24 18:11:31 2001
-@@ -87,12 +87,14 @@
+diff -up mgetty-1.1.36/logname.c.issue mgetty-1.1.36/logname.c
+--- mgetty-1.1.36/logname.c.issue	2008-10-09 22:56:17.000000000 +0200
++++ mgetty-1.1.36/logname.c	2008-10-09 22:56:17.000000000 +0200
+@@ -97,12 +97,14 @@ char * ln_escape_prompt _P1( (ep), char 
  	    switch ( *ep )
  	    {
  	      case 'n': p[i++] = '\n'; break;
@@ -52,7 +18,7 @@
  	      case 's':					/* Operating System */
  		    if ( i + strlen(un.sysname) +1 > MAX_PROMPT_LENGTH ) break;
  		    i += strappnd( &p[i], un.sysname );
-@@ -101,10 +103,16 @@
+@@ -111,10 +113,16 @@ char * ln_escape_prompt _P1( (ep), char 
  		    if ( i + strlen(un.machine) +1 > MAX_PROMPT_LENGTH ) break;
  		    i += strappnd( &p[i], un.machine );
  		    break;
@@ -69,7 +35,7 @@
  	      case 'V':					/* OS version */
  		    if ( i + strlen(un.version) +1 > MAX_PROMPT_LENGTH ) break;
  		    i += strappnd( &p[i], un.version );
-@@ -116,6 +124,12 @@
+@@ -126,6 +134,12 @@ char * ln_escape_prompt _P1( (ep), char 
  		    i += strappnd( &p[i], CallerId );
  		    break;
  		}
@@ -82,7 +48,7 @@
  	      case 'P':					/* port name */
  	      case 'L':					/* tty line */
  		{
-@@ -137,13 +151,16 @@
+@@ -147,13 +161,16 @@ char * ln_escape_prompt _P1( (ep), char 
  		    i += strappnd( &p[i], Connect);
  		    break;
  		}
@@ -100,7 +66,7 @@
  	      case 'S':					/* port speed */
  		{					/* ugly, I know. */
  		    TIO temp_t;
-@@ -152,6 +169,10 @@
+@@ -162,6 +179,10 @@ char * ln_escape_prompt _P1( (ep), char 
  		    i = strlen(p);
  		}
  		break;
@@ -111,7 +77,7 @@
  	      case 'D':			/* fallthrough */
  	      case 'T':
  		if ( i + 30 > MAX_PROMPT_LENGTH )
-@@ -165,7 +186,7 @@
+@@ -175,7 +196,7 @@ char * ln_escape_prompt _P1( (ep), char 
  
  		    if ( tm == NULL ) break;
  
@@ -120,9 +86,10 @@
  		        sprintf( &p[i], "%d/%d/%d", tm->tm_mon+1,
  				 tm->tm_mday, tm->tm_year + 1900 );
  		    else
---- mgetty-1.1.26/policy.h	Tue Jul 24 18:09:27 2001
-+++ mgetty-1.1.26/policy.h	Tue Jul 24 18:09:27 2001
-@@ -221,6 +221,14 @@
+diff -up mgetty-1.1.36/policy.h.issue mgetty-1.1.36/policy.h
+--- mgetty-1.1.36/policy.h.issue	2008-10-09 22:56:17.000000000 +0200
++++ mgetty-1.1.36/policy.h	2008-10-09 22:56:17.000000000 +0200
+@@ -228,6 +228,14 @@
   */
  #define NOLOGIN_FILE "/etc/nologin.%s"
  

mgetty-1.1.26-policy.patch:

Index: mgetty-1.1.26-policy.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.26-policy.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mgetty-1.1.26-policy.patch	18 Feb 2008 15:23:21 -0000	1.2
+++ mgetty-1.1.26-policy.patch	30 Jan 2009 12:50:36 -0000	1.3
@@ -1,21 +1,7 @@
---- mgetty-1.1.26/voice/include/paths.h.policy	Mon Apr 16 10:53:07 2001
-+++ mgetty-1.1.26/voice/include/paths.h	Mon Apr 16 10:53:34 2001
-@@ -16,10 +16,10 @@
- 
- /*
-  * Filename of the logfile for vgetty. The "%s" will be replaced by
-- * the device name.
-+ * the device name.  We match the pattern used by mgetty for the name.
-  */
- 
--#define VGETTY_LOG_PATH "/var/log/vgetty.%s"
-+#define VGETTY_LOG_PATH "/var/log/vgetty.log.%s"
- 
- /*
-  * Filename of the logfile for vm.
---- mgetty-1.1.26/policy.h.policy	Thu Nov  2 15:26:59 2000
-+++ mgetty-1.1.26/policy.h	Mon Apr 16 10:50:12 2001
-@@ -67,7 +67,7 @@
+diff -up mgetty-1.1.36/policy.h.policy mgetty-1.1.36/policy.h
+--- mgetty-1.1.36/policy.h.policy	2008-10-09 22:56:03.000000000 +0200
++++ mgetty-1.1.36/policy.h	2008-10-09 22:56:02.000000000 +0200
+@@ -85,7 +85,7 @@
   * ZyXELs use S40.2=1.
   * If the path doesn't start with "/", it's relative to CONFDIR.
   */
@@ -24,7 +10,7 @@
  
  
  /* If you want to use /etc/gettydefs to set tty flags, define this
-@@ -96,7 +96,7 @@
+@@ -114,7 +114,7 @@
  /* group id that the device is chown()ed to. If not defined, the
   * primary group of "DEVICE_OWNER" is used.
   */
@@ -33,7 +19,7 @@
  
  /* access mode for the line while getty has it - it should be accessible
   * by uucp / uucp, but not by others (imagine someone dialing into your
-@@ -129,7 +129,7 @@
+@@ -147,7 +147,7 @@
   *
   * if the directory does not exist, the log file goes to CONSOLE (!)
   */
@@ -42,7 +28,7 @@
  
  /* Default log error level threshold. Possible error levels are
   * L_FATAL, L_ERROR, L_AUDIT, L_WARN, L_MESG, L_NOISE, L_JUNK (see mgetty.h)
-@@ -154,15 +154,20 @@
+@@ -172,15 +172,20 @@
   * mgetty will use the facility "LOG_AUTH", and the priorities
   * LOG_NOTICE, LOG_ERR and LOG_ALERT, respectively.
   */
@@ -64,7 +50,7 @@
  
  /* login stuff */
  
-@@ -175,8 +180,9 @@
+@@ -193,8 +198,9 @@
   * The "@", "\\D" and "\\T" escapes will be replaced by SYSTEM, the
   * current date and time, respectively.
   * override with "-p <prompt>" switch
@@ -73,9 +59,9 @@
 -#define LOGIN_PROMPT	"@!login: "
 +#define LOGIN_PROMPT	"@ login: "
  
- /* On SVR4, maybe on other systems too, you can cause the 'login' program
-  * to prompt with the same string as mgetty did, instead of the standard
-@@ -246,7 +252,7 @@
+ /* The old '#define ENV_TTYPROMPT' option has been superseded by setting 
+  * "login-env-ttyprompt-hack yes" in mgetty.config.  See mgetty.texi for
+@@ -256,7 +262,7 @@
  
  /* if your system isn't listed above, change that line here */
  #ifndef LOCK
@@ -84,7 +70,7 @@
  #endif
    
  /* Set this to "1" if your system uses binary lock files (i.e., the pid
-@@ -525,8 +531,9 @@
+@@ -527,8 +533,9 @@
   * (with or without leading /dev/)
   * If you don't adapt this for your needs, sendfax won't run (you can
   * set it from the sendfax.config file, though)!
@@ -95,7 +81,7 @@
  
  /* Xon or not?
   *
-@@ -584,7 +591,7 @@
+@@ -586,7 +593,7 @@
   * If you don't want this type of service, do not define it at all
   * Absolute path name has to be used here!
   */
@@ -104,3 +90,19 @@
  
  /* default minimum space required on spooling partition for receiving a FAX
   * (in KILObytes)
+diff -up mgetty-1.1.36/voice/include/paths.h.policy mgetty-1.1.36/voice/include/paths.h
+--- mgetty-1.1.36/voice/include/paths.h.policy	2008-10-09 22:56:03.000000000 +0200
++++ mgetty-1.1.36/voice/include/paths.h	2008-10-09 22:56:02.000000000 +0200
+@@ -16,10 +16,10 @@
+ 
+ /*
+  * Filename of the logfile for vgetty. The "%s" will be replaced by
+- * the device name.
++ * the device name.  We match the pattern used by mgetty for the name.
+  */
+ 
+-#define VGETTY_LOG_PATH "/var/log/vgetty.%s"
++#define VGETTY_LOG_PATH "/var/log/vgetty.log.%s"
+ 
+ /*
+  * Filename of the logfile for vm.

mgetty-1.1.29-config.patch:

Index: mgetty-1.1.29-config.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.29-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.29-config.patch	9 Sep 2004 08:31:02 -0000	1.1
+++ mgetty-1.1.29-config.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,8 +1,6 @@
-We install into a buildroot while unprivileged, so we can't set file ownerships.
-
---- mgetty-1.1.29/Makefile	2002-11-23 15:31:27.000000000 -0500
-+++ mgetty-1.1.29/Makefile	2002-11-25 17:26:34.000000000 -0500
-@@ -169,7 +169,8 @@
+--- mgetty-1.1.36/Makefile.config	2008-10-09 22:55:57.000000000 +0200
++++ mgetty-1.1.36/Makefile	2008-10-09 22:55:57.000000000 +0200
+@@ -164,7 +164,8 @@ LIBS=
  #
  # if your systems doesn't have one, use the shell script that I provide
  # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
@@ -12,9 +10,9 @@
  #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
-@@ -604,15 +605,15 @@
+@@ -596,15 +597,15 @@ install.bin: mgetty sendfax newslock \
  	test -d $(CONFDIR) || \
- 		( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR))
+ 		( ./mkidirs $(CONFDIR) && chmod 755 $(CONFDIR))
  	test -f $(CONFDIR)/login.config || \
 -		$(INSTALL) -o root -m 600 login.config $(CONFDIR)/
 +		$(INSTALL) -m 600 login.config $(CONFDIR)/

mgetty-1.1.29-helper.patch:

Index: mgetty-1.1.29-helper.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.29-helper.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.29-helper.patch	9 Sep 2004 08:31:02 -0000	1.1
+++ mgetty-1.1.29-helper.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,8 +1,7 @@
-We build without special privileges, so chown won't work here.
-
---- mgetty-1.1.29/fax/Makefile	2002-11-25 17:39:48.000000000 -0500
-+++ mgetty-1.1.29/fax/Makefile	2002-11-25 17:39:44.000000000 -0500
-@@ -61,7 +61,7 @@
+diff -up mgetty-1.1.36/fax/Makefile.helper mgetty-1.1.36/fax/Makefile
+--- mgetty-1.1.36/fax/Makefile.helper	2008-10-09 22:56:28.000000000 +0200
++++ mgetty-1.1.36/fax/Makefile	2008-10-09 22:56:28.000000000 +0200
+@@ -58,7 +58,7 @@ install: all
  	done
  	$(INSTALL) -m 755 faxrunqd $(SBINDIR)
  	$(INSTALL) faxq-helper $(LIBDIR)

mgetty-1.1.30-mktemp.patch:

Index: mgetty-1.1.30-mktemp.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.30-mktemp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.30-mktemp.patch	9 Sep 2004 08:31:02 -0000	1.1
+++ mgetty-1.1.30-mktemp.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,9 +1,7 @@
-Use mktemp to create the stdin temporary file.  Not portable to systems
-without mktemp, unfortunately.
-
---- mgetty-1.1.30/fax/faxspool.in	2002-12-18 16:59:16.000000000 -0500
-+++ mgetty-1.1.30/fax/faxspool.in	2002-12-18 17:06:43.000000000 -0500
-@@ -637,10 +637,14 @@
+diff -up mgetty-1.1.36/fax/faxspool.in.mktemp mgetty-1.1.36/fax/faxspool.in
+--- mgetty-1.1.36/fax/faxspool.in.mktemp	2008-10-09 22:56:34.000000000 +0200
++++ mgetty-1.1.36/fax/faxspool.in	2008-10-09 22:56:34.000000000 +0200
+@@ -674,10 +674,14 @@ do
  #
      if [ x$file = x- ]
      then

mgetty-1.1.30-unioninit.patch:

Index: mgetty-1.1.30-unioninit.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.30-unioninit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.30-unioninit.patch	9 Sep 2004 08:32:21 -0000	1.1
+++ mgetty-1.1.30-unioninit.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,7 @@
---- mgetty-1.1.30/callback/conf_cb.c.sopwith	2003-05-01 12:08:29.000000000 -0400
-+++ mgetty-1.1.30/callback/conf_cb.c	2003-05-01 12:08:51.000000000 -0400
-@@ -30,7 +30,7 @@
+diff -up mgetty-1.1.36/callback/conf_cb.c.unioninit mgetty-1.1.36/callback/conf_cb.c
+--- mgetty-1.1.36/callback/conf_cb.c.unioninit	2008-10-09 22:56:40.000000000 +0200
++++ mgetty-1.1.36/callback/conf_cb.c	2008-10-09 22:56:40.000000000 +0200
+@@ -30,7 +30,7 @@ static char * def_init_chat_seq[] = { ""
   */
  
  struct conf_data_mgetty c = {
@@ -9,7 +10,7 @@
  	{ "dialout-devices", {0}, CT_STRING, C_IGNORE },
  	{ "delay", {20}, CT_INT, C_PRESET },
  	{ "delay-randomize", {10}, CT_INT, C_PRESET },
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ struct conf_data_mgetty c = {
  
  	{ "modem-init", {0}, CT_CHAT, C_PRESET },
  	{ "speed", {DEFAULT_PORTSPEED}, CT_INT, C_PRESET },
@@ -18,29 +19,10 @@
  	{ "autobauding", {FALSE}, CT_BOOL, C_PRESET },
  	{ "prompt-waittime", {300}, CT_INT, C_PRESET },
  
---- mgetty-1.1.30/voice/include/config.h.sopwith	1998-09-09 17:06:32.000000000 -0400
-+++ mgetty-1.1.30/voice/include/config.h	2003-05-01 12:08:12.000000000 -0400
-@@ -30,7 +30,7 @@
-            
- #else
- 
--#define STRING (p_int)
-+#define STRING p:
- #define KEYWORD(name) \
-  struct conf_data name;
- #define CONF(field_name, default_value, value_type) \
-@@ -55,7 +55,7 @@
- 
- #ifdef CONFIG_C
- 
--     {NULL, {(p_int) ""}, CT_STRING, C_EMPTY}
-+     {NULL, {p: ""}, CT_STRING, C_EMPTY}
-      };
- 
- #else
---- mgetty-1.1.30/conf_mg.c.sopwith	2001-01-28 08:29:43.000000000 -0500
-+++ mgetty-1.1.30/conf_mg.c	2003-05-01 12:08:12.000000000 -0400
-@@ -62,9 +62,9 @@
+diff -up mgetty-1.1.36/conf_mg.c.unioninit mgetty-1.1.36/conf_mg.c
+--- mgetty-1.1.36/conf_mg.c.unioninit	2008-10-09 22:56:40.000000000 +0200
++++ mgetty-1.1.36/conf_mg.c	2008-10-09 22:56:40.000000000 +0200
+@@ -58,9 +58,9 @@ struct conf_data_mgetty c = {
  	{ "direct", {FALSE}, CT_BOOL, C_PRESET },
  	{ "blocking", {FALSE}, CT_BOOL, C_PRESET },
  
@@ -52,7 +34,7 @@
  #else
  	{ "port-group", {0}, CT_STRING, C_EMPTY },
  #endif
-@@ -75,7 +75,7 @@
+@@ -71,7 +71,7 @@ struct conf_data_mgetty c = {
  	{ "need-dsr", {FALSE}, CT_BOOL, C_PRESET },
  	{ "data-only", {FALSE}, CT_BOOL, C_PRESET },
  	{ "fax-only", {FALSE}, CT_BOOL, C_PRESET },
@@ -61,7 +43,7 @@
  	{ "modem-quirks", {0}, CT_INT, C_EMPTY },
  	{ "init-chat", {0}, CT_CHAT, C_EMPTY },
  	{ "force-init-chat", {0}, CT_CHAT, C_EMPTY },
-@@ -86,9 +86,9 @@
+@@ -82,9 +82,9 @@ struct conf_data_mgetty c = {
  
  	{ "modem-check-time", {MODEM_CHECK_TIME}, CT_INT, C_PRESET },
  	{ "rings", {1}, CT_INT, C_PRESET },
@@ -73,7 +55,7 @@
  	{ "answer-chat", {0}, CT_CHAT, C_EMPTY },
  	{ "answer-chat-timeout", {80}, CT_INT, C_PRESET },
  	{ "autobauding", {FALSE}, CT_BOOL, C_PRESET },
-@@ -97,9 +97,9 @@
+@@ -93,9 +93,9 @@ struct conf_data_mgetty c = {
  	{ "ringback-time", {30}, CT_INT, C_PRESET },
  
  	{ "ignore-carrier", {FALSE}, CT_BOOL, C_PRESET },
@@ -85,8 +67,8 @@
  #ifdef MAX_LOGIN_TIME
  	{ "login-time", {MAX_LOGIN_TIME}, CT_INT, C_PRESET },
  #else
-@@ -108,39 +108,39 @@
- 	{ "fido-send-emsi", {TRUE}, CT_BOOL, C_PRESET },
+@@ -105,39 +105,39 @@ struct conf_data_mgetty c = {
+ 	{ "login-env-ttyprompt-hack", {FALSE}, CT_BOOL, C_PRESET },
  
  #ifdef LOGIN_CFG_FILE
 -	{ "login-conf-file", {(p_int) LOGIN_CFG_FILE}, CT_STRING, C_PRESET },
@@ -105,7 +87,7 @@
 -	{ "notify", {(p_int)MAIL_TO}, CT_STRING, C_PRESET },
 +	{ "notify", {p:MAIL_TO}, CT_STRING, C_PRESET },
  #else
- 	{ "notify", {0, CT_STRING}, C_EMPTY },
+ 	{ "notify", {0}, CT_STRING, C_EMPTY },
  #endif
 -	{ "fax-owner", {(p_int)FAX_IN_OWNER}, CT_STRING, C_PRESET },
 +	{ "fax-owner", {p:FAX_IN_OWNER}, CT_STRING, C_PRESET },
@@ -133,9 +115,10 @@
  	{ "term", {0}, CT_STRING, C_EMPTY },
  
  	{ NULL, {0}, CT_STRING, C_EMPTY }};
---- mgetty-1.1.30/conf_sf.c.sopwith	1999-02-28 14:17:55.000000000 -0500
-+++ mgetty-1.1.30/conf_sf.c	2003-05-01 12:08:12.000000000 -0400
-@@ -31,11 +31,11 @@
+diff -up mgetty-1.1.36/conf_sf.c.unioninit mgetty-1.1.36/conf_sf.c
+--- mgetty-1.1.36/conf_sf.c.unioninit	2008-10-09 22:56:40.000000000 +0200
++++ mgetty-1.1.36/conf_sf.c	2008-10-09 22:56:40.000000000 +0200
+@@ -31,11 +31,11 @@ struct conf_data_sendfax c = {
  	{ "fax-devices", {0}, CT_STRING, C_IGNORE },
  	{ "modem-init", {0}, CT_STRING, C_EMPTY },
  #ifdef FAX_MODEM_HANDSHAKE
@@ -149,7 +132,7 @@
  	{ "modem-quirks", {0}, CT_INT, C_EMPTY },
  	{ "fax-send-flow", {FAXSEND_FLOW}, CT_FLOWL, C_PRESET },
  	{ "fax-rec-flow", {FAXREC_FLOW}, CT_FLOWL, C_PRESET },
-@@ -45,9 +45,9 @@
+@@ -45,9 +45,9 @@ struct conf_data_sendfax c = {
  	{ "switchbd", {FAX_SEND_SWITCHBD}, CT_INT, C_PRESET },
  	{ "open-delay",	{0}, CT_INT, C_EMPTY },
  	{ "ignore-carrier", {TRUE }, CT_BOOL, C_PRESET },
@@ -162,7 +145,7 @@
  	{ "normal-res", {0}, CT_BOOL, C_PRESET },
  	{ "fax-min-speed", {0}, CT_INT, C_PRESET },
  	{ "fax-max-speed", {14400}, CT_INT, C_PRESET },
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ struct conf_data_sendfax c = {
  	{ "page-header", {0}, CT_STRING, C_EMPTY },
  	{ "" /* stdin */, {FALSE}, CT_BOOL, C_PRESET },
  	{ "" /* rename */, {FALSE}, CT_BOOL, C_PRESET },
@@ -171,3 +154,24 @@
  	{ NULL, {0}, CT_STRING, C_EMPTY }};
  
  int sendfax_parse_args _P2( (argc,argv), int argc, char ** argv )
+diff -up mgetty-1.1.36/voice/include/config.h.unioninit mgetty-1.1.36/voice/include/config.h
+--- mgetty-1.1.36/voice/include/config.h.unioninit	2008-10-09 22:56:40.000000000 +0200
++++ mgetty-1.1.36/voice/include/config.h	2008-10-09 22:56:40.000000000 +0200
+@@ -30,7 +30,7 @@ struct conf_voice_data cvd =
+            
+ #else
+ 
+-#define STRING (p_int)
++#define STRING p:
+ #define KEYWORD(name) \
+  struct conf_data name;
+ #define CONF(field_name, default_value, value_type) \
+@@ -55,7 +55,7 @@ extern struct conf_voice_data
+ 
+ #ifdef CONFIG_C
+ 
+-     {NULL, {(p_int) ""}, CT_STRING, C_EMPTY}
++     {NULL, {p: ""}, CT_STRING, C_EMPTY}
+      };
+ 
+ #else

mgetty-1.1.31-162174_tcflush.patch:

Index: mgetty-1.1.31-162174_tcflush.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.31-162174_tcflush.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mgetty-1.1.31-162174_tcflush.patch	27 Jul 2005 15:43:05 -0000	1.2
+++ mgetty-1.1.31-162174_tcflush.patch	30 Jan 2009 12:50:36 -0000	1.3
@@ -1,31 +1,6 @@
---- mgetty-1.1.31/logname.c.161174_tcflush	2005-07-27 10:41:10.076619000 -0400
-+++ mgetty-1.1.31/logname.c	2005-07-27 10:44:39.675810000 -0400
-@@ -368,10 +368,12 @@
- 	    {
- 		printf( "\r\n\07\r\nYour login time (%d minutes) ran out. Goodbye.\r\n",
- 		       (max_login_time / 60)+1 );
--		
-+		signal(SIGALRM,SIG_DFL);/* turn off alarm */
-+		alarm(0);               
- 		sleep(3);		/* give message time to xmit */
- 		lprintf( L_AUDIT, "failed dev=%s, pid=%d, login time out",
- 			 Device, getpid() );
-+		tcflush(1,TCOFLUSH);    /* allow us to exit without hanging (bug 164002) */
- 		exit(0);		/* bye bye... */
- 	    }
- 	    ch = CKILL;			/* timeout #1 -> clear input */
---- mgetty-1.1.31/mgetty.c.161174_tcflush	2003-11-17 14:09:41.000000000 -0500
-+++ mgetty-1.1.31/mgetty.c	2005-07-27 10:41:43.155507000 -0400
-@@ -94,6 +94,7 @@
-     lprintf( L_AUDIT, "failed dev=%s, pid=%d, got signal %d, exiting",
- 	              Device, getpid(), signo );
-     rmlocks();
-+    tcflush(1,TCOFLUSH);
-     exit(10);
- }
- 
---- mgetty-1.1.31/logfile.c.161174_tcflush	2003-01-14 16:30:20.000000000 -0500
-+++ mgetty-1.1.31/logfile.c	2005-07-27 10:43:49.279257000 -0400
+diff -up mgetty-1.1.36/logfile.c.162174_tcflush mgetty-1.1.36/logfile.c
+--- mgetty-1.1.36/logfile.c.162174_tcflush	2008-10-09 22:57:07.000000000 +0200
++++ mgetty-1.1.36/logfile.c	2008-10-09 22:57:07.000000000 +0200
 @@ -22,6 +22,7 @@
  #endif
  
@@ -34,7 +9,7 @@
  #include <syslog.h>
  
  #if !defined(linux) && !defined(BSD) && !defined(_SCO_DS) && \
-@@ -212,6 +213,7 @@
+@@ -212,6 +213,7 @@ va_list pvar;
  int     errnr;
  char * p;
  static int first_open = TRUE;
@@ -42,7 +17,7 @@
  
      if ( level > log_level )	/* log level high enough? */
      {
-@@ -315,7 +317,24 @@
+@@ -315,7 +317,24 @@ static int first_open = TRUE;
  		             tm->tm_mon+1,  tm->tm_mday,
  			     tm->tm_hour, tm->tm_min, tm->tm_sec, ws );
  #ifdef SYSLOG
@@ -67,7 +42,7 @@
  #endif
      }
      else if ( level != L_ERROR && level != L_FATAL )
-@@ -334,7 +353,21 @@
+@@ -334,7 +353,21 @@ static int first_open = TRUE;
  			     ( errnr <= sys_nerr ) ? sys_errlist[errnr]:
  			     "<error not in list>" );
  #ifdef SYSLOG
@@ -89,3 +64,31 @@
  #endif
  
  #ifndef SYSLOG
+diff -up mgetty-1.1.36/logname.c.162174_tcflush mgetty-1.1.36/logname.c
+--- mgetty-1.1.36/logname.c.162174_tcflush	2008-10-09 22:57:07.000000000 +0200
++++ mgetty-1.1.36/logname.c	2008-10-09 22:57:07.000000000 +0200
+@@ -381,10 +381,12 @@ int getlogname _P7( (prompt, tio, buf, m
+ 	    {
+ 		printf( "\r\n\07\r\nYour login time (%d minutes) ran out. Goodbye.\r\n",
+ 		       (max_login_time / 60)+1 );
+-		
++		signal(SIGALRM,SIG_DFL);/* turn off alarm */
++		alarm(0);               
+ 		sleep(3);		/* give message time to xmit */
+ 		lprintf( L_AUDIT, "failed dev=%s, pid=%d, login time out",
+ 			 Device, getpid() );
++		tcflush(1,TCOFLUSH);    /* allow us to exit without hanging (bug 164002) */
+ 		exit(0);		/* bye bye... */
+ 	    }
+ 	    ch = CKILL;			/* timeout #1 -> clear input */
+diff -up mgetty-1.1.36/mgetty.c.162174_tcflush mgetty-1.1.36/mgetty.c
+--- mgetty-1.1.36/mgetty.c.162174_tcflush	2008-10-09 22:57:07.000000000 +0200
++++ mgetty-1.1.36/mgetty.c	2008-10-09 22:57:07.000000000 +0200
+@@ -103,6 +103,7 @@ static RETSIGTYPE sig_goodbye _P1 ( (sig
+     lprintf( L_AUDIT, "failed dev=%s, pid=%d, got signal %d, exiting",
+ 	              Device, getpid(), signo );
+     rmlocks();
++    tcflush(1,TCOFLUSH);
+     exit(10);
+ }
+ 

mgetty-1.1.31-helper2.patch:

Index: mgetty-1.1.31-helper2.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.31-helper2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.31-helper2.patch	9 Sep 2004 08:34:23 -0000	1.1
+++ mgetty-1.1.31-helper2.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,7 @@
---- mgetty-1.1.31/Makefile.helper2	2004-08-17 18:34:44.175470000 -0400
-+++ mgetty-1.1.31/Makefile	2004-08-17 18:48:06.907935000 -0400
-@@ -627,13 +627,13 @@
+diff -up mgetty-1.1.36/Makefile.helper2 mgetty-1.1.36/Makefile
+--- mgetty-1.1.36/Makefile.helper2	2008-10-09 22:56:45.000000000 +0200
++++ mgetty-1.1.36/Makefile	2008-10-09 22:56:45.000000000 +0200
+@@ -623,13 +623,13 @@ install.bin: mgetty sendfax newslock \
  		( mkdir $(spool) && chmod 755 $(spool) )
  	test -d $(FAX_SPOOL) || \
  		( mkdir $(FAX_SPOOL) && \

mgetty-1.1.31-issue-doc.patch:

Index: mgetty-1.1.31-issue-doc.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.31-issue-doc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.31-issue-doc.patch	9 Sep 2004 08:34:23 -0000	1.1
+++ mgetty-1.1.31-issue-doc.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,7 @@
---- mgetty-1.1.31/doc/mgetty.8in.issue	2003-04-06 10:08:23.000000000 -0400
-+++ mgetty-1.1.31/doc/mgetty.8in	2004-08-17 18:18:28.096524000 -0400
-@@ -42,16 +42,16 @@
+diff -up mgetty-1.1.36/doc/mgetty.8in.issue-doc mgetty-1.1.36/doc/mgetty.8in
+--- mgetty-1.1.36/doc/mgetty.8in.issue-doc	2008-10-09 22:56:23.000000000 +0200
++++ mgetty-1.1.36/doc/mgetty.8in	2008-10-09 22:56:23.000000000 +0200
+@@ -42,16 +42,16 @@ initialization whatsoever.
  .B -p <login prompt>
  Use the given string to prompt users for their login names. Various
  tokens are allowed in this string. These tokens are: @ for the system

mgetty-1.1.31-lfs.patch:

Index: mgetty-1.1.31-lfs.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.31-lfs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.31-lfs.patch	21 Apr 2005 08:43:46 -0000	1.1
+++ mgetty-1.1.31-lfs.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,7 @@
---- mgetty-1.1.31/getdisk.c.lfs	2005-04-21 10:16:18.794879186 +0200
-+++ mgetty-1.1.31/getdisk.c	2005-04-21 10:30:41.013861698 +0200
-@@ -192,11 +192,11 @@
+diff -up mgetty-1.1.36/getdisk.c.lfs mgetty-1.1.36/getdisk.c
+--- mgetty-1.1.36/getdisk.c.lfs	2008-10-09 22:57:02.000000000 +0200
++++ mgetty-1.1.36/getdisk.c	2008-10-09 22:57:02.000000000 +0200
+@@ -198,11 +198,11 @@ long minfreespace = MINFREESPACE;
   */
  
  #ifndef TESTDISK
@@ -14,7 +15,7 @@
  
      if (getdiskstats(path, &mi))
  	return(1);
-@@ -207,7 +207,7 @@
+@@ -213,7 +213,7 @@ int checkspace _P1 ((path), char *path)
       */
      kbytes = (mi.mi_bavail>>2) * (mi.mi_bsize>>8);
  
@@ -23,7 +24,7 @@
      return( kbytes / minfreespace);
  #else
      return(1);
-@@ -333,12 +333,12 @@
+@@ -339,12 +339,12 @@ int main(argc, argv) int argc; char **ar
  	    fprintf(stderr, "statfs on %s failed\n", *argv);
  	} else {
  	    printf( "STATFS report on %s:\n", *argv );
@@ -42,9 +43,10 @@
  	}
  	argv++;
      }
---- mgetty-1.1.31/mgetty.h.lfs	2005-04-21 09:59:13.861615345 +0200
-+++ mgetty-1.1.31/mgetty.h	2005-04-21 10:30:42.558639097 +0200
-@@ -293,19 +293,28 @@
+diff -up mgetty-1.1.36/mgetty.h.lfs mgetty-1.1.36/mgetty.h
+--- mgetty-1.1.36/mgetty.h.lfs	2008-10-09 22:57:02.000000000 +0200
++++ mgetty-1.1.36/mgetty.h	2008-10-09 22:57:02.000000000 +0200
+@@ -307,19 +307,28 @@ int cnd_call _PROTO((char *name, char *t
  /* disk statistics retrieval in getdisk.c */
  
  struct mountinfo {

mgetty-1.1.31-no-acroread.patch:

Index: mgetty-1.1.31-no-acroread.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.31-no-acroread.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.31-no-acroread.patch	9 Sep 2004 08:34:34 -0000	1.1
+++ mgetty-1.1.31-no-acroread.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,7 @@
---- mgetty-1.1.31/fax/faxspool.in.no-acroread	2004-08-17 19:10:45.000000000 -0400
-+++ mgetty-1.1.31/fax/faxspool.in	2004-08-20 14:20:18.703022000 -0400
-@@ -370,10 +370,23 @@
+diff -up mgetty-1.1.36/fax/faxspool.in.no-acroread mgetty-1.1.36/fax/faxspool.in
+--- mgetty-1.1.36/fax/faxspool.in.no-acroread	2008-10-09 22:56:51.000000000 +0200
++++ mgetty-1.1.36/fax/faxspool.in	2008-10-09 22:56:51.000000000 +0200
+@@ -389,10 +389,23 @@ fs_cvt_pdf()
  {
      driver="$GS_DRIVER_HI"
      test X$3 = X-n && driver="$GS_DRIVER_LO"

mgetty-1.1.31-sendmail_path.patch:

Index: mgetty-1.1.31-sendmail_path.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.31-sendmail_path.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mgetty-1.1.31-sendmail_path.patch	9 Jan 2008 15:49:05 -0000	1.2
+++ mgetty-1.1.31-sendmail_path.patch	30 Jan 2009 12:50:36 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up mgetty-1.1.33/policy.h.sendmail_patch mgetty-1.1.33/policy.h
---- mgetty-1.1.33/policy.h.sendmail_patch	2008-01-08 07:03:50.000000000 +0100
-+++ mgetty-1.1.33/policy.h	2008-01-08 07:04:33.000000000 +0100
-@@ -605,8 +605,12 @@
+diff -up mgetty-1.1.36/policy.h.sendmail_path mgetty-1.1.36/policy.h
+--- mgetty-1.1.36/policy.h.sendmail_path	2008-10-09 22:56:56.000000000 +0200
++++ mgetty-1.1.36/policy.h	2008-10-09 22:56:56.000000000 +0200
+@@ -578,8 +578,12 @@
  # endif
  #endif
  

mgetty-1.1.33-167830.patch:

Index: mgetty-1.1.33-167830.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.33-167830.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.33-167830.patch	15 Nov 2005 16:05:53 -0000	1.1
+++ mgetty-1.1.33-167830.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,28 @@
---- mgetty-1.1.33/mgetty.c.167830	2005-09-16 18:02:19.929881000 -0400
-+++ mgetty-1.1.33/mgetty.c	2005-09-16 18:02:19.988822000 -0400
-@@ -1011,7 +1011,15 @@
+diff -up mgetty-1.1.36/login.c.167830 mgetty-1.1.36/login.c
+--- mgetty-1.1.36/login.c.167830	2008-10-09 22:57:23.000000000 +0200
++++ mgetty-1.1.36/login.c	2008-10-09 22:57:23.000000000 +0200
+@@ -18,7 +18,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+-
++#include <sys/ioctl.h>
+ /* NeXTStep/86 has some byte order problems (Christian Starkjohann) */
+ #if defined(NeXT) && defined(__LITTLE_ENDIAN__) && !defined(NEXTSGTTY)
+ # define pw_uid pw_short_pad1
+@@ -372,6 +372,8 @@ fallthrough:
+     if ( fcntl(0, F_GETFD, 0 ) & 1 ) 
+ 	lprintf( L_WARN, "WARNING: close-on-exec bit set on FD 0 - OS BUG?" );
+ 
++    ioctl(0, TIOCSCTTY, (void*)1);
++
+     /* execute login */
+     execv( cmd, argv );
+ 
+diff -up mgetty-1.1.36/mgetty.c.167830 mgetty-1.1.36/mgetty.c
+--- mgetty-1.1.36/mgetty.c.167830	2008-10-09 22:57:23.000000000 +0200
++++ mgetty-1.1.36/mgetty.c	2008-10-09 22:57:23.000000000 +0200
+@@ -1034,7 +1034,15 @@ Ring_got_action:
  	}
  
  	/* set permissions to "rw-------" for login */
@@ -17,7 +39,7 @@
  
  	/* set ttystate for login ("after"),
  	 *  cr-nl mapping flags are set by getlogname()!
-@@ -1058,7 +1066,15 @@
+@@ -1079,7 +1087,15 @@ Ring_got_action:
  	{
  	    lprintf( L_WARN, "WARNING: starting login while DCD is low!" );
  	}
@@ -34,23 +56,3 @@
  	/* hand off to login dispatcher (which will call /bin/login) */
  	login_dispatch( buf, mgetty_state == St_callback_login? TRUE: FALSE,
  			c_string(login_config) );
---- mgetty-1.1.33/login.c.167830	2005-09-16 18:02:19.971839000 -0400
-+++ mgetty-1.1.33/login.c	2005-09-16 18:02:19.999811000 -0400
-@@ -18,7 +18,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--
-+#include <sys/ioctl.h>
- /* NeXTStep/86 has some byte order problems (Christian Starkjohann) */
- #if defined(NeXT) && defined(__LITTLE_ENDIAN__) && !defined(NEXTSGTTY)
- # define pw_uid pw_short_pad1
-@@ -371,6 +371,8 @@
-     if ( fcntl(0, F_GETFD, 0 ) & 1 ) 
- 	lprintf( L_WARN, "WARNING: close-on-exec bit set on FD 0 - OS BUG?" );
- 
-+    ioctl(0, TIOCSCTTY, (void*)1);
-+
-     /* execute login */
-     execv( cmd, argv );
- 

mgetty-1.1.33-167830_tty_access.patch:

Index: mgetty-1.1.33-167830_tty_access.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.33-167830_tty_access.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.33-167830_tty_access.patch	15 Nov 2005 16:05:53 -0000	1.1
+++ mgetty-1.1.33-167830_tty_access.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,7 @@
---- mgetty-1.1.33/login.c.167830_tty_access	2003-12-05 17:28:58.000000000 -0500
-+++ mgetty-1.1.33/login.c	2005-11-15 11:03:04.000000000 -0500
-@@ -256,6 +256,12 @@
+diff -up mgetty-1.1.36/login.c.167830_tty_access mgetty-1.1.36/login.c
+--- mgetty-1.1.36/login.c.167830_tty_access	2008-10-09 22:57:18.000000000 +0200
++++ mgetty-1.1.36/login.c	2008-10-09 22:57:18.000000000 +0200
+@@ -256,6 +256,12 @@ void login_dispatch _P3( (user, is_callb
  		{
  		    lprintf( L_NOISE, "login: user id: %s (uid %d, gid %d)",
  				      user_id, pw->pw_uid, pw->pw_gid );
@@ -13,7 +14,7 @@
  #if SECUREWARE
  		    if ( setluid( pw->pw_uid ) == -1 )
  		    {
-@@ -266,9 +272,15 @@
+@@ -266,9 +272,15 @@ void login_dispatch _P3( (user, is_callb
  		    {
  			lprintf( L_ERROR, "cannot set gid %d", pw->pw_gid );
  		    }

mgetty-1.1.33-bug_63843.patch:

Index: mgetty-1.1.33-bug_63843.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.33-bug_63843.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.33-bug_63843.patch	1 Aug 2005 22:32:34 -0000	1.1
+++ mgetty-1.1.33-bug_63843.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,5 +1,6 @@
---- mgetty-1.1.33/samples/new_fax.tiff.bug_63843	1998-04-05 06:03:26.000000000 -0400
-+++ mgetty-1.1.33/samples/new_fax.tiff	2005-08-01 18:26:45.286734000 -0400
+diff -up mgetty-1.1.36/samples/new_fax.tiff.bug_63843 mgetty-1.1.36/samples/new_fax.tiff
+--- mgetty-1.1.36/samples/new_fax.tiff.bug_63843	2008-10-09 22:57:12.000000000 +0200
++++ mgetty-1.1.36/samples/new_fax.tiff	2008-10-09 22:57:12.000000000 +0200
 @@ -24,7 +24,7 @@
  #
  #!/bin/sh
@@ -9,7 +10,7 @@
  SENDER="$2"
  
  case $4 in
-@@ -32,11 +32,11 @@
+@@ -32,11 +32,11 @@ case $4 in
    *) STRETCH=
  esac
  


Index: mgetty.spec
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mgetty.spec	3 Apr 2008 12:29:02 -0000	1.48
+++ mgetty.spec	30 Jan 2009 12:50:36 -0000	1.49
@@ -1,9 +1,11 @@
+%define date Jun15
+
 Summary: A getty replacement for use with data and fax modems
 Name: mgetty
-Version: 1.1.33
-Release: 17%{?dist}
-Source: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz
-Source1: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz.asc
+Version: 1.1.36
+Release: 1%{?dist}
+Source: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-%{date}.tar.gz
+Source1: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-%{date}.tar.gz.asc
 Source2: logrotate.mgetty
 Source3: logrotate.sendfax
 Source4: logrotate.vgetty
@@ -11,26 +13,22 @@
 Source6: faxq-helper.8
 Patch0: mgetty-1.1.29-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.26-issue.patch
 Patch6: mgetty-1.1.31-issue-doc.patch
 Patch7: mgetty-1.1.29-helper.patch
 Patch8: mgetty-1.1.30-mktemp.patch
 Patch9: mgetty-1.1.30-unioninit.patch
-#Patch10: mgetty-1.1.30-path.patch
 Patch11: mgetty-1.1.31-helper2.patch
 Patch12: mgetty-1.1.31-no-acroread.patch
-Patch13: mgetty-1.1.31-W-format.patch
 Patch14: mgetty-1.1.31-sendmail_path.patch
 Patch15: mgetty-1.1.31-lfs.patch
 Patch16: mgetty-1.1.31-162174_tcflush.patch
-Patch17: mgetty-1.1.33-sprintf_chk.patch
 Patch18: mgetty-1.1.33-bug_63843.patch
 Patch19: mgetty-1.1.33-167830_tty_access.patch
 Patch20: mgetty-1.1.33-167830.patch
 Patch21: mgetty-1.1.33-turn.patch
+Patch22: mgetty-1.1.36-caller_name.patch
 
 License: GPLv2+
 Group: Applications/Communications
@@ -102,8 +100,6 @@
 mv policy.h-dist policy.h
 %patch0 -p1 -b .config
 %patch1 -p1 -b .policy
-#%patch2 -p1 -b .faxprint
-%patch3 -p1 -b .giftopnm
 %patch4 -p1 -b .voiceconfig
 %patch5 -p1 -b .issue
 %patch6 -p1 -b .issue-doc
@@ -112,15 +108,14 @@
 %patch9 -p1 -b .unioninit
 %patch11 -p1 -b .helper2
 %patch12 -p1 -b .no-acroread
-%patch13 -p1 -b .-W-format
 %patch14 -p1 -b .sendmail_path
 %patch15 -p1 -b .lfs
 %patch16 -p1 -b .162174_tcflush
-%patch17 -p1 -b .sprintf_chk
 %patch18 -p1 -b .bug_63843
 %patch19 -p1 -b .167830_tty_access
 %patch20 -p1 -b .167830
 %patch21 -p1 -b .turn
+%patch22 -p1 -b .caller_name
 
 %build
 %define makeflags CFLAGS="$RPM_OPT_FLAGS -Wall -DAUTO_PPP -D_FILE_OFFSET_BITS=64" prefix=%{_prefix} spool=%{_var}/spool BINDIR=%{_bindir} SBINDIR=%{_sbindir} LIBDIR=%{_libdir}/mgetty+sendfax HELPDIR=%{_libdir}/mgetty+sendfax CONFDIR=%{_sysconfdir}/mgetty+sendfax MANDIR=%{_mandir} MAN1DIR=%{_mandir}/man1 MAN4DIR=%{_mandir}/man4 MAN5DIR=%{_mandir}/man5 MAN8DIR=%{_mandir}/man8 INFODIR=%{_infodir} ECHO='"echo -e"' INSTALL=%{__install}
@@ -326,6 +321,10 @@
 %{_mandir}/man1/viewfax.1*
 
 %changelog
+* Fri Jan 30 2009 Jiri Skala <jskala at redhat.com> - 1.1.36-1
+- re-base to latest upstream
+- Resolves: #232522 - mgetty does not collect caller name from modem properly
+
 * Thu Apr 03 2008 Martin Nagy <mnagy at redhat.com> - 1.1.33-17
 - make sure we compile everything with FORTIFY_SOURCE
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Mar 2008 17:28:42 -0000	1.9
+++ sources	30 Jan 2009 12:50:36 -0000	1.10
@@ -1,3 +1 @@
-3765cb20a2a17d388096b232c1e29046  faxq-helper.8
-d61a2bd343111be35250496710393bd5  mgetty1.1.33-Apr10.tar.gz
-06d71de7d8c95a521f8e7e5fa872998c  mgetty1.1.33-Apr10.tar.gz.asc
+0320e98c6b86bcca48fc5f355b94ead4  mgetty1.1.36-Jun15.tar.gz


--- mgetty-1.1.21-giftopnm.patch DELETED ---


--- mgetty-1.1.25-faxprint.patch DELETED ---


--- mgetty-1.1.30-path.patch DELETED ---


--- mgetty-1.1.31-W-format.patch DELETED ---


--- mgetty-1.1.33-sprintf_chk.patch DELETED ---


