rpms/isdn4k-utils/devel isdn4k-utils-statfs.patch, NONE, 1.1 isdn4k-utils.spec, 1.30, 1.31

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/isdn4k-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15179

Modified Files:
	isdn4k-utils.spec 
Added Files:
	isdn4k-utils-statfs.patch 
Log Message:
fix for large filesystems (#155441)

isdn4k-utils-statfs.patch:
 eurofile/src/wuauth/divfunc.c    |    2 +-
 eurofile/src/wuauth/extensions.c |   10 +++++-----
 eurofile/src/wuauth/extensions.h |    5 +++++
 vbox/src/vboxgetty.c             |    4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)

--- NEW FILE isdn4k-utils-statfs.patch ---
--- isdn4k-utils-CVS-2005-03-09/vbox/src/vboxgetty.c.old	2000-11-30 16:35:20.000000000 +0100
+++ isdn4k-utils-CVS-2005-03-09/vbox/src/vboxgetty.c	2005-04-20 16:30:31.000000000 +0200
@@ -434,7 +434,7 @@
 static int check_spool_space(unsigned long need)
 {
 	struct statfs stat;
-	unsigned long have;
+	unsigned long long have;
 
 	log(L_DEBUG, "Checking free space on \"%s\"...\n", setup.spool);
 
@@ -449,7 +449,7 @@
 	{
 		have = (stat.f_bfree * stat.f_bsize);
 
-		log_line(L_JUNK, "%ld bytes available; %ld bytes needed... ", have, need);
+		log_line(L_JUNK, "%lld bytes available; %ld bytes needed... ", have, need);
 
 		if (have >= need)
 		{
--- isdn4k-utils-CVS-2005-03-09/eurofile/src/wuauth/extensions.h.old	2005-04-20 16:35:37.000000000 +0200
+++ isdn4k-utils-CVS-2005-03-09/eurofile/src/wuauth/extensions.h	2005-04-20 16:37:02.000000000 +0200
@@ -42,3 +42,8 @@
 #define ARG8    entry->arg[8]
 #define ARG9    entry->arg[9]
 #define ARG     entry->arg
+
+#if defined(HAVE_STATVFS) || defined(HAVE_SYS_VFS) || defined (HAVE_SYS_MOUNT)
+unsigned long long getSize(s);
+#endif
+
--- isdn4k-utils-CVS-2005-03-09/eurofile/src/wuauth/extensions.c.old	2005-04-20 16:20:17.000000000 +0200
+++ isdn4k-utils-CVS-2005-03-09/eurofile/src/wuauth/extensions.c	2005-04-20 16:24:56.000000000 +0200
@@ -154,7 +154,7 @@
 }
 
 #if defined(HAVE_STATVFS)
-int getSize(s)
+unsigned long long getSize(s)
 char *s;
 {
     int c;
@@ -163,10 +163,10 @@
     if (( c = statvfs(s, &buf)) != 0)
         return(0);
 
-    return(buf.f_bavail * buf.f_frsize / 1024);
+    return((unsigned long long)(buf.f_bavail * buf.f_frsize / 1024));
 }
 #elif defined(HAVE_SYS_VFS) || defined (HAVE_SYS_MOUNT)
-int getSize(s)
+unsigned long long getSize(s)
 char *s;
 {
     int c;
@@ -175,7 +175,7 @@
     if (( c = statfs(s, &buf)) != 0)
         return(0);
 
-    return(buf.f_bavail * buf.f_bsize / 1024);
+    return((unsigned long long)(buf.f_bavail * buf.f_bsize / 1024));
 }
 #endif
 
@@ -236,7 +236,7 @@
 
             case 'F':
 #if defined(HAVE_STATVFS) || defined(HAVE_SYS_VFS) || defined(HAVE_SYS_MOUNT)
-                sprintf(outptr, "%lu", getSize("."));
+                sprintf(outptr, "%llu",(unsigned long long)getSize("."));
 #endif
                 break;
 
--- isdn4k-utils-CVS-2005-03-09/eurofile/src/wuauth/divfunc.c.old	2001-03-01 15:59:14.000000000 +0100
+++ isdn4k-utils-CVS-2005-03-09/eurofile/src/wuauth/divfunc.c	2005-04-20 16:34:26.000000000 +0200
@@ -121,7 +121,7 @@
 
             case 'F':
 #if defined(HAVE_STATVFS) || defined(HAVE_SYS_VFS) || defined(HAVE_SYS_MOUNT)
-                sprintf(outptr, "%lu", getSize("."));
+                sprintf(outptr, "%llu",(unsigned long long)getSize("."));
 #endif
                 break;
 


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- isdn4k-utils.spec	9 Mar 2005 21:19:13 -0000	1.30
+++ isdn4k-utils.spec	20 Apr 2005 15:31:53 -0000	1.31
@@ -13,7 +13,7 @@
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 26
+Release: 27
 License: GPL
 Group: Applications/System
 
@@ -34,6 +34,7 @@
 Patch7: isdn4k-utils-CVS-2004-11-18-cleanup.patch
 Patch9: isdn4k-utils-isdnlog.patch
 Patch10: isdn4k-utils-CVS-2004-11-18-lib64.patch
+Patch11: isdn4k-utils-statfs.patch
 
 BuildRoot: %{_tmppath}/%name-root
 
@@ -101,6 +102,7 @@
 %patch7 -p0 -b .cleanup
 %patch9 -p1 -b .typo
 %patch10 -p1 -b .lib64
+%patch11 -p1 -b .statfs
 
 for i in */configure; do
 	cd `dirname $i`
@@ -113,7 +115,7 @@
 
 %build
 export PATH=$PATH:/usr/X11R6/bin
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 
 mv .config.rpm .config
 echo CONFIG_GENMAN=y >>.config
@@ -482,6 +484,9 @@
 %doc xmonisdn/README
 
 %changelog
+* Wed Apr 20 2005 Martin Stransky <stransky at redhat.com> 3.2-27
+- fix for large filesystems (#155441)
+
 * Wed Mar 09 2005 Than Ngo <than at redhat.com> 3.2-26
 - update cvs snapshot
 - fix gcc4 build problem