[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[7035] ipcop/trunk
From:       gespinasse () users ! sourceforge ! net
Date:       2013-05-17 7:18:10
Message-ID: E1UdEva-0000Cz-9C () sfp-svn-2 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 7035
          http://ipcop.svn.sourceforge.net/ipcop/?rev=7035&view=rev
Author:   gespinasse
Date:     2013-05-17 07:18:10 +0000 (Fri, 17 May 2013)
Log Message:
-----------
Upgrade patch to 2.7.1

Modified Paths:
--------------
    ipcop/trunk/lfs/patch
    ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
    ipcop/trunk/updates/2.1.0/information.xml

Modified: ipcop/trunk/lfs/patch
===================================================================
--- ipcop/trunk/lfs/patch	2013-05-17 07:02:32 UTC (rev 7034)
+++ ipcop/trunk/lfs/patch	2013-05-17 07:18:10 UTC (rev 7035)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = patch
-VER        = 2.6.1
+VER        = 2.7.1
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -43,20 +43,15 @@
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
-PATCH1     = $(THISAPP)-test_fix-1.patch
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) \
-	$(PATCH1)
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(PATCH1)  = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
 
-$(DL_FILE)_MD5 = 057d78436e858c3ed086a544f5e1fe7e
-$(PATCH1)_MD5  = c51e1a95bfc5310635d05081472c3534
+$(DL_FILE)_MD5 = e9ae5393426d3ad783a300a338c09b72
 
 install : $(TARGET)
 
@@ -86,18 +81,16 @@
 $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(PATCH1)
 
 ifeq "$(STAGE)" "toolchain"
 	cd $(DIR_APP) && ./configure --prefix=/$(TOOLS_DIR)
-	cd $(DIR_APP) && make -j $(PARALLELISM)
+	cd $(DIR_APP) && make -j $(PARALLELISM) V=1
 	cd $(DIR_APP) && make install
 endif
 
 ifeq "$(STAGE)" "base"
-	# 2.6.1 version of patch uses tmpnam, giving a (fatal) warning. Ignore that for \
                now.
-	cd $(DIR_APP) && LDFLAGS="-no-fatal-warnings" ./configure --prefix=/usr
-	cd $(DIR_APP) && make -j $(PARALLELISM)
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make -j $(PARALLELISM) V=1
 ifeq "$(RUNNING_TEST)" "yes"
 	-cd $(DIR_APP) && make check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
 endif

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-17 07:02:32 UTC (rev 7034)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0	2013-05-17 07:18:10 UTC (rev 7035)
@@ -561,6 +561,9 @@
 /usr/sbin/parted
 /usr/sbin/partprobe
 ##
+## patch-2.7.1
+/usr/bin/patch
+##
 ## pciutils-3.1.10
 /usr/lib/libpci.so.3
 /usr/lib/libpci.so.3.1.10

Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml	2013-05-17 07:02:32 UTC (rev 7034)
+++ ipcop/trunk/updates/2.1.0/information.xml	2013-05-17 07:18:10 UTC (rev 7035)
@@ -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.15,
             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.1, openssl to 1.0.1e, openswan to 2.6.38,
-            parted to 3.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.7, \
                psmisc to 22.20,
             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,

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]