Revision: 6603
http://ipcop.svn.sourceforge.net/ipcop/?rev=6603&view=rev
Author: gespinasse
Date: 2012-05-08 08:38:11 +0000 (Tue, 08 May 2012)
Log Message:
-----------
Upgrade lsof to 4.86
Add running tests but this is not easy as author want interactive setup for no
good reason.
Fix our LSOF_VERS LSOF_VSTR settings.
This may have been right on some previous versions but actually, this is better
if doing nothing.
LSOF_VSTR is set from kernel header version and LSOF_VERS is derivated from
LSOF_VSTR (dot removed).
Pass our CFLAGS using DEBUG variable like FEDORA
I tested using CFLAGS += -Wall but that mostly only show unused variables.
Modified Paths:
--------------
ipcop/trunk/lfs/lsof
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Modified: ipcop/trunk/lfs/lsof
===================================================================
--- ipcop/trunk/lfs/lsof 2012-05-07 17:25:11 UTC (rev 6602)
+++ ipcop/trunk/lfs/lsof 2012-05-08 08:38:11 UTC (rev 6603)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = lsof
-VER = 4.85
+VER = 4.86
HOST_ARCH = all
OTHER_SRC = yes
@@ -45,8 +45,11 @@
# Used to include same timestamp for all
# This is the release date
-DATESTAMP = "2011-09-27 14:06:00"
+DATESTAMP = "2012-04-10 19:06:00"
+# A bit too noisy for now and mostly uninteresting warnings
+# CFLAGS += -Wall
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -55,7 +58,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 102ee2081172bbe76dccaa6cceda8573
+$(DL_FILE)_MD5 = 9f1cda41f35add068c7b81f873fa56b5
install : $(TARGET)
@@ -87,14 +90,26 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && tar xf $(PKG_NAME)_$(VER)_src.tar
- # Use IPCop kernel version not version from build system
- cd $(DIR_APP)/$(PKG_NAME)_$(VER)_src && LSOF_VERS=$(KVER)
LSOF_VSTR=$(KVER) ./Configure -n linux
+ # LSOF_VSTR is set by Configure from kernel headers version and
LSOF_VERS is derivated from LSOF_VSTR
+ cd $(DIR_APP)/$(PKG_NAME)_$(VER)_src && ./Configure -n linux
+
# Use release date instead of `date` so everyone that compile has same
md5
cd $(DIR_APP)/$(PKG_NAME)_$(VER)_src && sed -i -e
's|'\`date\`'|$(DATESTAMP)|' Makefile
+
# Slightly increase security
cd $(DIR_APP)/$(PKG_NAME)_$(VER)_src && sed -i -e
's|.*#define\s*HASSECURITY\s*1.*|#define HASSECURITY 1)|' \
-e 's|.*#define\s*HASNOSOCKSECURITY\s*1.*|#define
HASNOSOCKSECURITY 1)|' machine.h
+
+ # Pass our CFLAGS to DEBUG variable
cd $(DIR_APP)/$(PKG_NAME)_$(VER)_src && LSOF_HOST=IPCop
LSOF_USER=builder LSOF_SYSINFO=none make -j $(PARALLELISM)
+
+ifeq "$(RUNNING_TEST)" "yes"
+ # Want the test to run, without interactive effect, so change standard
input with yes pipe and hack tty detection to exit with success
+ cd $(DIR_APP)/$(PKG_NAME)_$(VER)_src && sed -i 's/exit 1/exit 0/'
tests/CkTestDB
+ # opt tests are not run as nfs test fail without a path to nfs
+ -cd $(DIR_APP)/$(PKG_NAME)_$(VER)_src && yes '' | make -C tests all &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+endif
+
cd $(DIR_APP)/$(PKG_NAME)_$(VER)_src && install lsof /usr/sbin
@rm -rf $(DIR_APP)
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-05-07 17:25:11 UTC
(rev 6602)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-05-08 08:38:11 UTC
(rev 6603)
@@ -353,7 +353,7 @@
## fixes needed for linux 3.0
/usr/lib/libparted.so.1.0.0
##
-## lsof-4.85
+## lsof-4.86
/usr/sbin/lsof
##
## mdadm-3.2.3
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-05-07 17:25:11 UTC (rev
6602)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-05-08 08:38:11 UTC (rev
6603)
@@ -13,7 +13,7 @@
gmp to 5.0.5, gnupg to 1.4.12, grep to 2.12,
iproute2 to 3.3.0, iptables to 1.4.13, hdparm to 9.39, kernel to
3.0.30, krb5 to 1.9.3,
libffi to 3.0.10, libgd to 2.0.36~rc1, libgcrypt to 1.5.0, libpng
to 1.5.10,
- libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, lsof to
4.85,
+ libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, lsof to
4.86,
openldap to 2.4.30, openssh to 6.0, openssl to 1.0.1b, openswan to
2.6.38,
pcre to 8.30, pixman to 0.24.4, procps to 3.3.2, psmisc to 22.16,
rsyslog to 5.8.9, shadow to 4.1.5, squid-langpack to 20120329,
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
