Revision: 7047
http://ipcop.svn.sourceforge.net/ipcop/?rev=7047&view=rev
Author: gespinasse
Date: 2013-05-27 06:28:33 +0000 (Mon, 27 May 2013)
Log Message:
-----------
Upgrade procps to 3.3.8
Use --disable-numa as we do not compile libnuma and that remove one linking to
libdl
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/procps
ipcop/trunk/lfs/procps
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
ipcop/trunk/updates/2.1.0/setup
Modified: ipcop/trunk/config/rootfiles/common/procps
===================================================================
--- ipcop/trunk/config/rootfiles/common/procps 2013-05-24 21:26:16 UTC (rev
7046)
+++ ipcop/trunk/config/rootfiles/common/procps 2013-05-27 06:28:33 UTC (rev
7047)
@@ -1,6 +1,6 @@
bin/ps
lib/libprocps.so.1
-lib/libprocps.so.1.1.1
+lib/libprocps.so.1.1.2
sbin/sysctl
usr/bin/free
#usr/bin/pgrep
Modified: ipcop/trunk/lfs/procps
===================================================================
--- ipcop/trunk/lfs/procps 2013-05-24 21:26:16 UTC (rev 7046)
+++ ipcop/trunk/lfs/procps 2013-05-27 06:28:33 UTC (rev 7047)
@@ -34,7 +34,7 @@
# Don't forget to adjust libprocps.so.x.x.x symlink with upgrade.
PKG_NAME := procps-ng
-VER := 3.3.7
+VER := 3.3.8
HOST_ARCH := all
OTHER_SRC := yes
@@ -54,7 +54,7 @@
$(DL_FILE) := $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 := 57d2bad8c8fac3d09ee9f5f964e3da9c
+$(DL_FILE)_MD5 := aecbeeda2ab308f8d09dddcb4cb9a572
install : $(TARGET)
@@ -85,25 +85,20 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
- # Fix the test suite
- # This is a fast hack, unsure what should be made upstream, revert
bogus last minute correction for 9999999
- cd $(DIR_APP) && sed -i -e "s|exec which sleep|exec echo
/$(TOOLS_DIR)/bin/sleep|" -e 's|&9|9999999|' testsuite/config/unix.exp
- # make check work without kill build but not runtest
- cd $(DIR_APP) && rm -rf testsuite/kill.test
-
- cd $(DIR_APP) && ./configure --prefix=/usr --exec-prefix=
--libdir=/usr/lib --disable-static --disable-nls --disable-kill --disable-skill
+ cd $(DIR_APP) && ./configure --prefix=/usr --exec-prefix=
--libdir=/usr/lib --disable-static --disable-nls \
+ --disable-kill --disable-skill --disable-numa
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=/dev/null runtest)
&> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
cd $(DIR_APP) && make install
# Move shared .so.* to lib because ps is in /bin and recreate .so
symlink
mv /usr/lib/libprocps.so.* /lib
- ln -sf ../../lib/libprocps.so.1.1.1 /usr/lib/libprocps.so
+ ln -sf ../../lib/libprocps.so.1.1.2 /usr/lib/libprocps.so
# Reinstall our sysctl.conf
cp -f $(DIR_SRC)/config/etc/sysctl.conf /etc
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-05-24 21:26:16 UTC
(rev 7046)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-05-27 06:28:33 UTC
(rev 7047)
@@ -755,10 +755,10 @@
/usr/sbin/pppd
/usr/sbin/pppstats
##
-## procps-3.3.7
+## procps-3.3.8
/bin/ps
/lib/libprocps.so.1
-/lib/libprocps.so.1.1.1
+/lib/libprocps.so.1.1.2
/sbin/sysctl
/usr/bin/free
/usr/bin/top
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2013-05-24 21:26:16 UTC (rev
7046)
+++ ipcop/trunk/updates/2.1.0/information.xml 2013-05-27 06:28:33 UTC (rev
7047)
@@ -17,7 +17,7 @@
libnfnetlink to 1.0.1, libnetfiltercontrack to 1.0.2, libnl to
3.2.16, libpcap to 1.3.0, libpng to 1.5.16,
libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2
to 2.9.1, logrotate to 3.8.1, lsof to 4.87,
mdadm to 3.2.6, net-tools to 1.60-p20120127084908, openldap to
2.4.35, openssh to 6.2p2, openssl to 1.0.1e, openswan to 2.6.38,
- parted to 3.1, patch to 2.7.1, pciutils to 3.1.10, pcre to 8.32,
pixman to 0.24.4, procps to 3.3.7, psmisc to 22.20,
+ parted to 3.1, patch to 2.7.1, pciutils to 3.1.10, pcre to 8.32,
pixman to 0.24.4, procps to 3.3.8, psmisc to 22.20,
rp-pppoe to 3.11, rsyslog to 5.8.13, sed to 4.2.2, shadow to
4.1.5.1, smartmontools to 6.0, sqlite to 3.7.13
tcpdump to 4.3.0, traceroute to 2.0.19,
usb-modeswitch to 1.2.5, usb-modeswitch-data to 20121109, usbutils
to 006, util-linux to 2.22.2,
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2013-05-24 21:26:16 UTC (rev 7046)
+++ ipcop/trunk/updates/2.1.0/setup 2013-05-27 06:28:33 UTC (rev 7047)
@@ -107,7 +107,7 @@
/bin/rm -f /lib/libip6tc.so.0.0.0
/bin/rm -f /lib/libproc-3.2.8.so
/bin/rm -f /lib/libprocps.so.0*
-/bin/rm -f /lib/libprocps.so.1.1.0
+/bin/rm -f /lib/libprocps.so.1.1.{0,1}
/bin/rm -f /lib/libsysfs.so*
/bin/rm -f /lib/libz.so.1.2.{6,7}
/bin/rm -f /lib/libxtables.so.{7,8,9}*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
