Revision: 6837
http://ipcop.svn.sourceforge.net/ipcop/?rev=6837&view=rev
Author: gespinasse
Date: 2012-11-07 18:32:13 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
Upgrade procps to 3.3.4
Remove patches include upstream
Add () so everything during test is send to test log
Modified Paths:
--------------
ipcop/trunk/lfs/procps
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/procps-3.3.3_free-b-4GB-swapsize.patch
ipcop/trunk/src/patches/procps-3.3.3_test-without-host-ps.patch
Modified: ipcop/trunk/lfs/procps
===================================================================
--- ipcop/trunk/lfs/procps 2012-11-07 17:51:24 UTC (rev 6836)
+++ ipcop/trunk/lfs/procps 2012-11-07 18:32:13 UTC (rev 6837)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = procps
-VER = 3.3.3
+VER = 3.3.4
HOST_ARCH = all
OTHER_SRC = yes
@@ -54,7 +54,7 @@
$(DL_FILE) := $(DL_FROM)/$(DL_FILE)
$(PATCH1) := $(DL_FROM)/$(PATCH1)
-$(DL_FILE)_MD5 := a236660cc09ad36e0e8a378f448161c3
+$(DL_FILE)_MD5 := 85efd032ad6514689d8dcadfac239008
$(PATCH1)_MD5 := cedbb4bb0d3d7fae78d21cda5617af8e
install : $(TARGET)
@@ -93,20 +93,16 @@
# Fix the test suite
# This is a fast hack, unsure what should be made upstream
cd $(DIR_APP) && sed -i 's|exec which sleep|exec echo /bin/sleep|'
testsuite/config/unix.exp
- # This one will be send upstream
- cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_test-without-host-ps.patch
- # 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
+ # Remove after 3.3.4 : Files were missing in testsuite/Makefile.am, so
not packaged by debian
+ cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(PKG_NAME)-3.3.3_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)
ifeq "$(RUNNING_TEST)" "yes"
# Using directly runtest produce just a much nicer output to read than
make check
# Defining DEJAGNU silent "Couldn't find the global config file" warning
- -cd $(DIR_APP)/testsuite; make site.exp && DEJAGNU=global-conf.exp
runtest &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ -(cd $(DIR_APP)/testsuite; make site.exp && DEJAGNU=global-conf.exp
runtest) &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
cd $(DIR_APP) && make install-exec
Deleted: 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
2012-11-07 17:51:24 UTC (rev 6836)
+++ ipcop/trunk/src/patches/procps-3.3.3_free-b-4GB-swapsize.patch
2012-11-07 18:32:13 UTC (rev 6837)
@@ -1,28 +0,0 @@
-Remove after 3.3.3, applied upstream
-
-From 95cddd5168363662c4681d65945311cd071b95af Mon Sep 17 00:00:00 2001
-From: Adam Sampson <a...@offog.org>
-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
-
Deleted: ipcop/trunk/src/patches/procps-3.3.3_test-without-host-ps.patch
===================================================================
--- ipcop/trunk/src/patches/procps-3.3.3_test-without-host-ps.patch
2012-11-07 17:51:24 UTC (rev 6836)
+++ ipcop/trunk/src/patches/procps-3.3.3_test-without-host-ps.patch
2012-11-07 18:32:13 UTC (rev 6837)
@@ -1,58 +0,0 @@
-From 3ae3f4ff770ab5015f1034cd5abd678c20e73712 Mon Sep 17 00:00:00 2001
-From: Gilles Espinasse <g....@free.fr>
-Date: Sat, 16 Jun 2012 14:44:31 +0200
-Subject: [PATCH] Support running pgrep and pkill tests whithout ps installed
-
-Signed-off-by: Gilles Espinasse <g....@free.fr>
-
-When ps is not installed on the host, pgrep.exp and pkill.exp fail to run ps.
-Use just build ps instead.
----
- testsuite/pgrep.test/pgrep.exp | 3 ++-
- testsuite/pkill.test/pkill.exp | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/testsuite/pgrep.test/pgrep.exp b/testsuite/pgrep.test/pgrep.exp
-index 0234099..0ec52c3 100644
---- a/testsuite/pgrep.test/pgrep.exp
-+++ b/testsuite/pgrep.test/pgrep.exp
-@@ -8,6 +8,7 @@ set uid [ exec id -u ]
- set not_uid [ expr { $uid + 1 } ]
- set gid [ exec id -g ]
- set not_gid [ expr { $gid + 1 } ]
-+set ps "${topdir}ps/pscommand"
- set raw_tty [ exec tty ]
- regexp "/dev/(.+)" $raw_tty > tty
-
-@@ -15,7 +16,7 @@ make_testproc
-
- set testproc_len [ string length $testproc_comm ]
- set testproc_trim [ string range $testproc_comm 0 [ expr { $testproc_len - 2
} ] ]
--set testproc1_sid [ string trim [ exec ps --no-headers -o sid $testproc1_pid
] ]
-+set testproc1_sid [ string trim [ exec $ps --no-headers -o sid $testproc1_pid
] ]
-
- set test "pgprep with no arguments"
- spawn $pgrep
-diff --git a/testsuite/pkill.test/pkill.exp b/testsuite/pkill.test/pkill.exp
-index 83a6d75..be0e2d9 100644
---- a/testsuite/pkill.test/pkill.exp
-+++ b/testsuite/pkill.test/pkill.exp
-@@ -8,13 +8,14 @@ set uid [ exec id -u ]
- set not_uid [ expr { $uid + 1 } ]
- set gid [ exec id -g ]
- set not_gid [ expr { $gid + 1 } ]
-+set ps "${topdir}ps/pscommand"
- set raw_tty [ exec tty ]
- regexp "/dev/(.+)" $raw_tty > tty
-
- make_testproc
- set testproc_len [ string length $testproc_comm ]
- set testproc_trim [ string range $testproc_comm 0 [ expr { $testproc_len - 2
} ] ]
--set testproc1_sid [ exec ps --no-headers -o sid $testproc1_pid ]
-+set testproc1_sid [ exec $ps --no-headers -o sid $testproc1_pid ]
-
- set test "pkill with no arguments"
- spawn $pkill
---
-1.7.2.5
-
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-11-07 17:51:24 UTC
(rev 6836)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-11-07 18:32:13 UTC
(rev 6837)
@@ -678,7 +678,7 @@
/usr/sbin/pppd
/usr/sbin/pppstats
##
-## procps-3.3.3
+## procps-3.3.4
/bin/kill
/bin/ps
/lib/libprocps.so.0
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-11-07 17:51:24 UTC (rev
6836)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-11-07 18:32:13 UTC (rev
6837)
@@ -17,7 +17,7 @@
libnetfiltercontrack to 1.0.1, libnl to 3.2.11, libpcap to 1.3.0,
libpng to 1.5.12,
libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2
to 2.8.0, logrotate to 3.8.1, lsof to 4.86,
mdadm to 3.2.5, net-tools to 1.60-p20120127084908, openldap to
2.4.33, openssh to 6.1, openssl to 1.0.1c, openswan to 2.6.38,
- parted to 3.1, pciutils to 3.1.10, pcre to 8.30, pixman to 0.24.4,
procps to 3.3.3, psmisc to 22.20,
+ parted to 3.1, pciutils to 3.1.10, pcre to 8.30, pixman to 0.24.4,
procps to 3.3.4, psmisc to 22.20,
rsyslog to 5.8.12, shadow to 4.1.5.1, sqlite to 3.7.13,
tcpdump to 4.3.0, traceroute to 2.0.18,
usb-modeswitch to 1.2.4, usb-modeswitch-data to 20120815, usbutils
to 006, util-linux to 2.21.2,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
