Revision: 7731
http://sourceforge.net/p/ipcop/svn/7731
Author: owes
Date: 2014-12-03 07:48:14 +0000 (Wed, 03 Dec 2014)
Log Message:
-----------
Update procps to 3.3.10. In our use case /usr is mounted from start, no need to
move libraries.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/procps
ipcop/trunk/lfs/procps
ipcop/trunk/updates/2.1.8/ROOTFILES.i486-2.1.8
ipcop/trunk/updates/2.1.8/information.xml
ipcop/trunk/updates/2.1.8/setup
Modified: ipcop/trunk/config/rootfiles/common/procps
===================================================================
--- ipcop/trunk/config/rootfiles/common/procps 2014-12-02 19:49:09 UTC (rev
7730)
+++ ipcop/trunk/config/rootfiles/common/procps 2014-12-03 07:48:14 UTC (rev
7731)
@@ -1,6 +1,4 @@
bin/ps
-lib/libprocps.so.3
-lib/libprocps.so.3.0.0
sbin/sysctl
usr/bin/free
#usr/bin/pgrep
@@ -29,6 +27,8 @@
#usr/include/proc/wchan.h
#usr/include/proc/whattime.h
#usr/lib/libprocps.so
+usr/lib/libprocps.so.4
+usr/lib/libprocps.so.4.0.0
#usr/lib/pkgconfig/libprocps.pc
#usr/share/doc/procps-ng
#usr/share/doc/procps-ng/BUGS
@@ -47,6 +47,9 @@
#usr/share/man/man1/uptime.1
#usr/share/man/man1/w.1
#usr/share/man/man1/watch.1
+#usr/share/man/man3/openproc.3
+#usr/share/man/man3/readproc.3
+#usr/share/man/man3/readproctab.3
#usr/share/man/man5/sysctl.conf.5
#usr/share/man/man8/sysctl.8
#usr/share/man/man8/vmstat.8
Modified: ipcop/trunk/lfs/procps
===================================================================
--- ipcop/trunk/lfs/procps 2014-12-02 19:49:09 UTC (rev 7730)
+++ ipcop/trunk/lfs/procps 2014-12-03 07:48:14 UTC (rev 7731)
@@ -32,17 +32,16 @@
include Config
-# Don't forget to adjust libprocps.so.x.x.x symlink with upgrade.
-PKG_NAME := procps-ng
-VER := 3.3.9
-HOST_ARCH := all
-OTHER_SRC := yes
+PKG_NAME = procps-ng
+VER = 3.3.10
+HOST_ARCH = all
+OTHER_SRC = yes
-THISAPP := $(PKG_NAME)-$(VER)
-DL_FILE := $(THISAPP).tar.xz
-DL_FROM := $(URL_SFNET)/$(PKG_NAME)
-DIR_APP := $(DIR_SRC)/$(THISAPP)
-TARGET := $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+THISAPP = $(PKG_NAME)-$(VER)
+DL_FILE = $(THISAPP).tar.xz
+DL_FROM = $(URL_SFNET)/$(PKG_NAME)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
CFLAGS += -Wall
@@ -50,11 +49,11 @@
# Top-level Rules
###############################################################################
-objects := $(DL_FILE)
+objects = $(DL_FILE)
-$(DL_FILE) := $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 := 0980646fa25e0be58f7afb6b98f79d74
+$(DL_FILE)_MD5 = 1fb7f3f6bf92ce6c5c9ed9949ae858fe
install : $(TARGET)
@@ -96,9 +95,6 @@
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.2 /usr/lib/libprocps.so
# Reinstall our sysctl.conf
cp -f $(DIR_SRC)/config/etc/sysctl.conf /etc
Modified: ipcop/trunk/updates/2.1.8/ROOTFILES.i486-2.1.8
===================================================================
--- ipcop/trunk/updates/2.1.8/ROOTFILES.i486-2.1.8 2014-12-02 19:49:09 UTC
(rev 7730)
+++ ipcop/trunk/updates/2.1.8/ROOTFILES.i486-2.1.8 2014-12-03 07:48:14 UTC
(rev 7731)
@@ -184,6 +184,18 @@
/usr/lib/perl5/site_perl/5.14.2/URI/http.pm
/usr/lib/perl5/site_perl/5.14.2/URI/https.pm
##
+## procps-3.3.10
+/bin/ps
+/sbin/sysctl
+/usr/bin/free
+/usr/bin/pidof
+/usr/bin/top
+/usr/bin/uptime
+/usr/bin/vmstat
+/usr/bin/w
+/usr/lib/libprocps.so.4
+/usr/lib/libprocps.so.4.0.0
+##
## smartmontools-6.3
/usr/sbin/smartctl
##
Modified: ipcop/trunk/updates/2.1.8/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.8/information.xml 2014-12-02 19:49:09 UTC (rev
7730)
+++ ipcop/trunk/updates/2.1.8/information.xml 2014-12-03 07:48:14 UTC (rev
7731)
@@ -8,7 +8,7 @@
Upgrade acpid to 2.0.23, apache to 2.2.29, bind to 9.10.1, dhcpcd to
6.6.4,
ethtool to 3.16, grep to 2.21, hdparm to 9.45, iproute2 to 3.17.0, iw
to 3.17,
libpcap to 1.6.2, libpng to 1.6.15, libxml2 to 2.9.2, lsof to 4.88,
- openvpn to 2.3.6, pciutils to 3.3.0, pcre to 8.36,
+ openvpn to 2.3.6, pciutils to 3.3.0, pcre to 8.36, procps to 3.3.10,
smartmontools to 6.3, sqlite to 3.8.7.2, squid to 3.4.9, tcpdump to
4.6.2, traceroute to 2.0.21,
util-linux to 2.25.2, vnstat to 1.12, wget to 1.16.
Upgrade Perl modules DBD-SQLite to 1.44, DBI to 1.632, Net-SSLeay to
1.66, URI to 1.64.
Modified: ipcop/trunk/updates/2.1.8/setup
===================================================================
--- ipcop/trunk/updates/2.1.8/setup 2014-12-02 19:49:09 UTC (rev 7730)
+++ ipcop/trunk/updates/2.1.8/setup 2014-12-03 07:48:14 UTC (rev 7731)
@@ -96,6 +96,8 @@
/bin/rm -f /usr/lib/libpcre.so.1.2.2
/bin/rm -f /usr/lib/libpng16.so.16.10.0
/bin/rm -f /usr/lib/libxml2.so.2.9.1
+/bin/rm -f /lib/libprocps.so.3
+/bin/rm -f /lib/libprocps.so.3.0.0
# For new shared libs. May not always be required, but makes sure we do not
forget
/sbin/ldconfig
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
