Revision: 6674
http://ipcop.svn.sourceforge.net/ipcop/?rev=6674&view=rev
Author: gespinasse
Date: 2012-06-27 06:41:18 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
Fix the free -b test issue due to wraparound over 4 GB
Modified Paths:
--------------
ipcop/trunk/lfs/procps
Added Paths:
-----------
ipcop/trunk/src/patches/procps-3.3.3_free-b-4GB-swapsize.patch
Modified: ipcop/trunk/lfs/procps
===================================================================
--- ipcop/trunk/lfs/procps 2012-06-26 20:13:03 UTC (rev 6673)
+++ ipcop/trunk/lfs/procps 2012-06-27 06:41:18 UTC (rev 6674)
@@ -98,6 +98,8 @@
# Debian packaging is wrong here, don't know yet why those files are
missing on debian package
cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_missing-test-files.patch
cd $(DIR_APP) && chmod 755 testsuite/lib.test/fileutils_{badfd,full}.sh
+ # This one is upstream
+ cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_free-b-4GB-swapsize.patch
cd $(DIR_APP) && ./configure --prefix= --disable-static --disable-nls
cd $(DIR_APP) && make -j $(PARALLELISM)
Added: ipcop/trunk/src/patches/procps-3.3.3_free-b-4GB-swapsize.patch
===================================================================
--- ipcop/trunk/src/patches/procps-3.3.3_free-b-4GB-swapsize.patch
(rev 0)
+++ ipcop/trunk/src/patches/procps-3.3.3_free-b-4GB-swapsize.patch
2012-06-27 06:41:18 UTC (rev 6674)
@@ -0,0 +1,28 @@
+Remove after 3.3.3, applied upstream
+
+From 95cddd5168363662c4681d65945311cd071b95af Mon Sep 17 00:00:00 2001
+From: Adam Sampson <[email protected]>
+Date: Tue, 26 Jun 2012 14:06:45 +0100
+Subject: [PATCH] Show sizes > 4G correctly in bytes on 32-bit machines.
+
+size is a long; this needs to be a 64-bit multiplication.
+---
+ free.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/free.c b/free.c
+index 849f4e4..ecaeccd 100644
+--- a/free.c
++++ b/free.c
+@@ -121,7 +121,7 @@ static const char *scale_size(unsigned long size, int
flags, struct commandline_
+ if (!(flags & FREE_HUMANREADABLE)) {
+ if (args.exponent == 1) {
+ /* in bytes, which can not be in SI */
+- snprintf(buf, sizeof(buf), "%lld", (long long int)(size
* 1024));
++ snprintf(buf, sizeof(buf), "%lld", ((long long
int)size) * 1024);
+ return buf;
+ }
+ if (args.exponent == 2) {
+--
+1.7.9.4
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
