[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]
rpms/mgetty/FC-3 mgetty-1.1.31-sendmail_path.patch, NONE, 1.1 mgetty-1.1.31-lfs.patch, NONE, 1.1 mgetty-1.1.31-162174_tcflush.patch, NONE, 1.1 mgetty.spec, 1.22, 1.23
- From: fedora-cvs-commits redhat com
- To: fedora-cvs-commits redhat com
- Subject: rpms/mgetty/FC-3 mgetty-1.1.31-sendmail_path.patch, NONE, 1.1 mgetty-1.1.31-lfs.patch, NONE, 1.1 mgetty-1.1.31-162174_tcflush.patch, NONE, 1.1 mgetty.spec, 1.22, 1.23
- Date: Fri, 22 Jul 2005 20:14:30 -0400
Author: jvdias
Update of /cvs/dist/rpms/mgetty/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv7877
Modified Files:
mgetty.spec
Added Files:
mgetty-1.1.31-sendmail_path.patch mgetty-1.1.31-lfs.patch
mgetty-1.1.31-162174_tcflush.patch
Log Message:
fix bugs 162174, 155440, 159581
mgetty-1.1.31-sendmail_path.patch:
policy.h | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE mgetty-1.1.31-sendmail_path.patch ---
--- mgetty-1.1.31/policy.h.sendmail_path 2005-02-21 11:05:33.000000000 -0500
+++ mgetty-1.1.31/policy.h 2005-02-21 11:08:57.000000000 -0500
@@ -604,7 +604,10 @@
# define NEED_MAIL_HEADERS
# endif
#endif
-
+#ifdef linux
+# define MAILER "/usr/lib/sendmail"
+# define NEED_MAIL_HEADERS
+#endif
#ifndef MAILER
# define MAILER "/usr/lib/sendmail"
# define NEED_MAIL_HEADERS
mgetty-1.1.31-lfs.patch:
getdisk.c | 18 +++++++++---------
mgetty.h | 11 ++++++++++-
2 files changed, 19 insertions(+), 10 deletions(-)
--- NEW FILE mgetty-1.1.31-lfs.patch ---
--- 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 @@
*/
#ifndef TESTDISK
-int checkspace _P1 ((path), char *path)
+unsigned long long int checkspace _P1 ((path), char *path)
{
#ifdef HASDISKSTAT
struct mountinfo mi;
- unsigned int kbytes;
+ unsigned long long int kbytes;
if (getdiskstats(path, &mi))
return(1);
@@ -207,7 +207,7 @@
*/
kbytes = (mi.mi_bavail>>2) * (mi.mi_bsize>>8);
- lprintf( L_NOISE, "%d Mb free on %s", kbytes/1024, path );
+ lprintf( L_NOISE, "%llu Mb free on %s", kbytes/1024, path );
return( kbytes / minfreespace);
#else
return(1);
@@ -333,12 +333,12 @@
fprintf(stderr, "statfs on %s failed\n", *argv);
} else {
printf( "STATFS report on %s:\n", *argv );
- printf( "\tfundamental file system block size %ld\n", mi.mi_bsize);
- printf( "\ttotal data blocks in file system %ld\n", mi.mi_blocks);
- printf( "\tfree block in fs %ld\n", mi.mi_bfree);
- printf( "\tfree blocks avail to non-superuser %ld\n", mi.mi_bavail);
- printf( "\ttotal file nodes in file system %ld\n", mi.mi_files);
- printf( "\tfree file nodes in fs %ld\n", mi.mi_ffree);
+ printf( "\tfundamental file system block size %lu\n", (unsigned long int) mi.mi_bsize);
+ printf( "\ttotal data blocks in file system %llu\n", (unsigned long long int) mi.mi_blocks);
+ printf( "\tfree block in fs %llu\n", (unsigned long long int) mi.mi_bfree);
+ printf( "\tfree blocks avail to non-superuser %llu\n", (unsigned long long int) mi.mi_bavail);
+ printf( "\ttotal file nodes in file system %llu\n", (unsigned long long int) mi.mi_files);
+ printf( "\tfree file nodes in fs %llu\n", (unsigned long long int) mi.mi_ffree);
}
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 @@
/* disk statistics retrieval in getdisk.c */
struct mountinfo {
+#ifndef _SYS_STATVFS_H
long mi_bsize; /* fundamental block size */
long mi_blocks; /* number of blocks in file system */
long mi_bfree; /* number of free blocks in file system */
long mi_bavail; /* blocks available to non-super user */
long mi_files; /* number of file nodes in file system */
long mi_ffree; /* number of free nodes in fs */
+#else
+ unsigned long int mi_bsize;
+ fsblkcnt_t mi_blocks;
+ fsblkcnt_t mi_bfree;
+ fsblkcnt_t mi_bavail;
+ fsfilcnt_t mi_files;
+ fsfilcnt_t mi_ffree;
+#endif /* _SYS_STATVFS_H */
};
typedef struct mountinfo mntinf;
extern long minfreespace;
-int checkspace _PROTO((char *path));
+unsigned long long int checkspace _PROTO((char *path));
int getdiskstats _PROTO ((char *path, mntinf *mi));
/********* system prototypes **************/
mgetty-1.1.31-162174_tcflush.patch:
logname.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE mgetty-1.1.31-162174_tcflush.patch ---
--- mgetty-1.1.31/logname.c.162174_tcflush 2005-07-22 17:11:17.650852000 -0400
+++ mgetty-1.1.31/logname.c 2005-07-22 17:13:13.114273000 -0400
@@ -368,10 +368,11 @@
{
printf( "\r\n\07\r\nYour login time (%d minutes) ran out. Goodbye.\r\n",
(max_login_time / 60)+1 );
-
+ alarm(0); /* turn off alarm */
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 */
Index: mgetty.spec
===================================================================
RCS file: /cvs/dist/rpms/mgetty/FC-3/mgetty.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mgetty.spec 9 Sep 2004 08:34:34 -0000 1.22
+++ mgetty.spec 23 Jul 2005 00:14:27 -0000 1.23
@@ -5,7 +5,7 @@
Summary: A getty replacement for use with data and fax modems.
Name: mgetty
Version: 1.1.31
-Release: 2
+Release: 3
Source: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Jul24.tar.gz
Source1: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Jul24.tar.gz.asc
Source2: logrotate.mgetty
@@ -26,6 +26,9 @@
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
License: GPL
Group: Applications/Communications
Prereq: /sbin/install-info
@@ -109,14 +112,16 @@
%patch11 -p1 -b .helper2
%patch12 -p1 -b .no-acroread
%patch13 -p1 -b .-W-format
-
cp policy.h-dist policy.h
+%patch14 -p1 -b .sendmail_path
+%patch15 -p1 -b .lfs
+%patch16 -p1 -b .161174_tcflush
%build
PATH=$PATH:/usr/X11R6/bin
export PATH
-%define makeflags CFLAGS="$RPM_OPT_FLAGS -Wall -DAUTO_PPP" 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}
+%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}
make %{makeflags}
make -C voice %{makeflags}
make -C tools %{makeflags}
@@ -178,6 +183,9 @@
# remove file droppings from $RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_bindir}/cutbl
+# remove file conflict with netpbm:
+rm -f $RPM_BUILD_ROOT%{_bindir}/g3topbm
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -295,6 +303,8 @@
%{_mandir}/man1/pvfsine.1*
%{_mandir}/man1/pvfspeed.1*
%{_mandir}/man1/pvftormd.1*
+%{_mandir}/man1/pvffilter.1*
+%{_mandir}/man1/pvfnoise.1*
%{_mandir}/man1/rmdtopvf.1*
%{_mandir}/man1/rmdfile.1*
%{_mandir}/man1/pvftovoc.1*
@@ -322,6 +332,13 @@
%{_mandir}/man1/viewfax.1x*
%changelog
+* Fri Jul 22 2005 Jason Vas Dias <jvdias redhat com> 1.1.31-10
+- fix bug 162174: prevent uninterruptable hang on exit() when
+ direct line disconnected (kernel bug 164002)
+
+* Thu Apr 21 2005 Peter Vrabec <pvrabec redhat com> 1.1.31-6
+- support FILE_OFFSET_BITS=64 in statvfs (#155440)
+
* Fri Aug 20 2004 Jason Vas Dias <jvdias redhat com> 1.1.31-2
- Fixed bug: 115164 - remove *printf format errors
@@ -476,7 +493,7 @@
- attempt to plug some potential security problems (#11874)
* Thu Jul 12 2000 Than Ngo <than redhat de>
-- add new V250modem patch from ELSA (thanks to Jürgen Kosel)
+- add new V250modem patch from ELSA (thanks to Jürgen Kosel)
* Wed Jul 12 2000 Prospector <bugzilla redhat com>
- automatic rebuild
[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]