Revision: 6903
http://ipcop.svn.sourceforge.net/ipcop/?rev=6903&view=rev
Author: gespinasse
Date: 2013-01-08 23:22:23 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
Upgrade procps to 3.3.6
Switch to SF to download the package as packages from now are available there.
Remove the remaining debian patching code and changes include upstream
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-01-07 21:26:26 UTC (rev
6902)
+++ ipcop/trunk/config/rootfiles/common/procps 2013-01-08 23:22:23 UTC (rev
6903)
@@ -1,8 +1,8 @@
bin/kill
bin/ps
#lib/libprocps.so
-lib/libprocps.so.0
-lib/libprocps.so.0.0.1
+lib/libprocps.so.1
+lib/libprocps.so.1.1.0
sbin/sysctl
usr/bin/free
#usr/bin/pgrep
Modified: ipcop/trunk/lfs/procps
===================================================================
--- ipcop/trunk/lfs/procps 2013-01-07 21:26:26 UTC (rev 6902)
+++ ipcop/trunk/lfs/procps 2013-01-08 23:22:23 UTC (rev 6903)
@@ -32,19 +32,17 @@
include Config
-PKG_NAME = procps
-VER = 3.3.4
-HOST_ARCH = all
-OTHER_SRC = yes
+PKG_NAME := procps-ng
+VER := 3.3.6
+HOST_ARCH := all
+OTHER_SRC := yes
-THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(PKG_NAME)_$(VER).orig.tar.xz
-DL_FROM = $(URL_DEBIAN)/p/$(PKG_NAME)
-DIR_APP = $(DIR_SRC)/$(PKG_NAME)-ng-$(VER)
-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)
-PATCH1 := $(PKG_NAME)_$(VER)-3.debian.tar.gz
-
###############################################################################
# Top-level Rules
###############################################################################
@@ -52,10 +50,8 @@
objects := $(DL_FILE)
$(DL_FILE) := $(DL_FROM)/$(DL_FILE)
-$(PATCH1) := $(DL_FROM)/$(PATCH1)
-$(DL_FILE)_MD5 := 85efd032ad6514689d8dcadfac239008
-$(PATCH1)_MD5 := cedbb4bb0d3d7fae78d21cda5617af8e
+$(DL_FILE)_MD5 := 0a050d9be531921db3cd38f1371e73e3
install : $(TARGET)
@@ -86,16 +82,9 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
- # Apply patches on debian order
- #cd $(DIR_APP) && tar zxf $(DIR_DL)/$(PATCH1)
- #cd $(DIR_APP) && for patch in `cat debian/patches/series` ; do patch
-p1 -i debian/patches/$$patch; done
-
# 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
/$(TOOLS_DIR)/bin/sleep|" testsuite/config/unix.exp
- # 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
cd $(DIR_APP) && ./configure --prefix= --disable-static --disable-nls
cd $(DIR_APP) && make -j $(PARALLELISM)
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-01-07 21:26:26 UTC
(rev 6902)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-01-08 23:22:23 UTC
(rev 6903)
@@ -721,11 +721,11 @@
/usr/sbin/pppd
/usr/sbin/pppstats
##
-## procps-3.3.4
+## procps-3.3.6
/bin/kill
/bin/ps
-/lib/libprocps.so.0
-/lib/libprocps.so.0.0.1
+/lib/libprocps.so.1
+/lib/libprocps.so.1.1.0
/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-01-07 21:26:26 UTC (rev
6902)
+++ ipcop/trunk/updates/2.1.0/information.xml 2013-01-08 23:22:23 UTC (rev
6903)
@@ -17,7 +17,7 @@
libnetfiltercontrack to 1.0.2, libnl to 3.2.16, 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.6, 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.4, 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.6, psmisc to 22.20,
rsyslog to 5.8.13, sed to 4.2.2, 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.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-01-07 21:26:26 UTC (rev 6902)
+++ ipcop/trunk/updates/2.1.0/setup 2013-01-08 23:22:23 UTC (rev 6903)
@@ -105,7 +105,7 @@
/bin/rm -f /lib/libip4tc.so.0.0.0
/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.0.0
+/bin/rm -f /lib/libprocps.so.0*
/bin/rm -f /lib/libsysfs.so*
/bin/rm -f /lib/libz.so.1.2.6
/bin/rm -f /lib/libxtables.so.7.0.0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Master SQL Server Development, Administration, T-SQL, SSAS, SSIS, SSRS
and more. Get SQL Server skills now (including 2012) with LearnDevNow -
200+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only - learn more at:
http://p.sf.net/sfu/learnmore_122512
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
