Revision: 6633
http://ipcop.svn.sourceforge.net/ipcop/?rev=6633&view=rev
Author: owes
Date: 2012-06-01 21:21:39 +0000 (Fri, 01 Jun 2012)
Log Message:
-----------
Upgrade conntrack-tools to 1.21 and add new lib deps.
Modified Paths:
--------------
ipcop/trunk/lfs/conntrack-tools
ipcop/trunk/make.sh
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Added Paths:
-----------
ipcop/trunk/config/rootfiles/common/libmnl
ipcop/trunk/config/rootfiles/common/libnetfilter_cttimeout
ipcop/trunk/lfs/libmnl
ipcop/trunk/lfs/libnetfilter_cttimeout
Added: ipcop/trunk/config/rootfiles/common/libmnl
===================================================================
--- ipcop/trunk/config/rootfiles/common/libmnl (rev 0)
+++ ipcop/trunk/config/rootfiles/common/libmnl 2012-06-01 21:21:39 UTC (rev
6633)
@@ -0,0 +1,6 @@
+#usr/include/libmnl
+#usr/include/libmnl/libmnl.h
+#usr/lib/libmnl.so
+usr/lib/libmnl.so.0
+usr/lib/libmnl.so.0.1.0
+#usr/lib/pkgconfig/libmnl.pc
Added: ipcop/trunk/config/rootfiles/common/libnetfilter_cttimeout
===================================================================
--- ipcop/trunk/config/rootfiles/common/libnetfilter_cttimeout
(rev 0)
+++ ipcop/trunk/config/rootfiles/common/libnetfilter_cttimeout 2012-06-01
21:21:39 UTC (rev 6633)
@@ -0,0 +1,7 @@
+#usr/include/libnetfilter_cttimeout
+#usr/include/libnetfilter_cttimeout/libnetfilter_cttimeout.h
+#usr/lib/libnetfilter_cttimeout.la
+#usr/lib/libnetfilter_cttimeout.so
+usr/lib/libnetfilter_cttimeout.so.1
+usr/lib/libnetfilter_cttimeout.so.1.0.0
+#usr/lib/pkgconfig/libnetfilter_cttimeout.pc
Modified: ipcop/trunk/lfs/conntrack-tools
===================================================================
--- ipcop/trunk/lfs/conntrack-tools 2012-06-01 19:30:50 UTC (rev 6632)
+++ ipcop/trunk/lfs/conntrack-tools 2012-06-01 21:21:39 UTC (rev 6633)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = conntrack-tools
-VER = 1.0.1
+VER = 1.2.1
HOST_ARCH = all
OTHER_SRC = yes
@@ -54,7 +54,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8a60f02a177fc31fe40cc992c4de90e2
+$(DL_FILE)_MD5 = 48d414cb7a354001babf184ae6c16db9
install : $(TARGET)
@@ -83,7 +83,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --program-prefix=
cd $(DIR_APP) && make # V=1
Added: ipcop/trunk/lfs/libmnl
===================================================================
--- ipcop/trunk/lfs/libmnl (rev 0)
+++ ipcop/trunk/lfs/libmnl 2012-06-01 21:21:39 UTC (rev 6633)
@@ -0,0 +1,90 @@
+###############################################################################
+# This file is part of the IPCop Firewall. #
+# #
+# IPCop is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPCop is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPCop; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Makefiles are based on LFSMake, which is #
+# Copyright (C) 2002 Rod Roard <[email protected]>
#
+# #
+# Modifications by: #
+# ??-12-2003 Mark Wormgoor < [email protected]> #
+# - Modified Makefile for IPCop build #
+# #
+# $Id$
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+PKG_NAME = libmnl
+VER = 1.0.3
+HOST_ARCH = all
+OTHER_SRC = yes
+
+THISAPP = $(PKG_NAME)-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = http://www.netfilter.org/projects/libmnl/files
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 7d95fc3bea3365bc03c48e484224f65f
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(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) && ./configure --prefix=/usr --disable-static
+ cd $(DIR_APP) && make && make install
+ rm /usr/lib/libmnl.la
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
Property changes on: ipcop/trunk/lfs/libmnl
___________________________________________________________________
Added: svn:keywords
+ id
Added: ipcop/trunk/lfs/libnetfilter_cttimeout
===================================================================
--- ipcop/trunk/lfs/libnetfilter_cttimeout (rev 0)
+++ ipcop/trunk/lfs/libnetfilter_cttimeout 2012-06-01 21:21:39 UTC (rev
6633)
@@ -0,0 +1,90 @@
+###############################################################################
+# This file is part of the IPCop Firewall. #
+# #
+# IPCop is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPCop is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPCop; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Makefiles are based on LFSMake, which is #
+# Copyright (C) 2002 Rod Roard <[email protected]>
#
+# #
+# Modifications by: #
+# ??-12-2003 Mark Wormgoor < [email protected]> #
+# - Modified Makefile for IPCop build #
+# #
+# $Id$
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+PKG_NAME = libnetfilter_cttimeout
+VER = 1.0.0
+HOST_ARCH = all
+OTHER_SRC = yes
+
+THISAPP = $(PKG_NAME)-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = http://www.netfilter.org/projects/libnetfilter_cttimeout/files
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 7697437fc9ebb6f6b83df56a633db7f9
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(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) && ./configure --prefix=/usr --disable-static
+ cd $(DIR_APP) && make && make install
+ #rm /usr/lib/libnetfilter_conntrack.la
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
Property changes on: ipcop/trunk/lfs/libnetfilter_cttimeout
___________________________________________________________________
Added: svn:keywords
+ id
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2012-06-01 19:30:50 UTC (rev 6632)
+++ ipcop/trunk/make.sh 2012-06-01 21:21:39 UTC (rev 6633)
@@ -1813,9 +1813,11 @@
chroot_make gnupg
chroot_make hdparm
chroot_make ibod
+ chroot_make libmnl # iptables/conntrack
+ chroot_make libnfnetlink # iptables/conntrack
+ chroot_make libnetfilter_conntrack # iptables/conntrack
+ chroot_make libnetfilter_cttimeout # iptables/conntrack
chroot_make iptables
- chroot_make libnfnetlink
- chroot_make libnetfilter_conntrack
chroot_make conntrack-tools
chroot_make iptstate
chroot_make iftop
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-06-01 19:30:50 UTC
(rev 6632)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-06-01 21:21:39 UTC
(rev 6633)
@@ -103,13 +103,17 @@
/usr/lib/liblwres.so.80
/usr/lib/liblwres.so.80.0.2
##
-## conntrack-tools compiled with -O3
-/usr/sbin/conntrack
-##
## cairo-1.10.2 compiled with -O3
/usr/lib/libcairo.so.2
/usr/lib/libcairo.so.2.11000.2
##
+## conntrack-tools-1.2.1
+/usr/lib/libmnl.so.0
+/usr/lib/libmnl.so.0.1.0
+/usr/lib/libnetfilter_cttimeout.so.1
+/usr/lib/libnetfilter_cttimeout.so.1.0.0
+/usr/sbin/conntrack
+##
## coreutils-8.17
/bin/cat
/bin/chgrp
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-06-01 19:30:50 UTC (rev
6632)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-06-01 21:21:39 UTC (rev
6633)
@@ -4,10 +4,10 @@
<releasedate>2012-04-dd</releasedate>
<size>0</size>
<description>httpd, libxml2, gettext, setserial, pcmciautils
patched<br />
- cairo and conntrack-tools recompiled with -O3<br />
+ cairo recompiled with -O3<br />
Add URL filter, xz-5.0.3<br />
Language updates.<br />
- Upgrade acpid to 2.0.16, arping to 2.11, bash to 4.2.29, bind to
9.8.3, coreutils to 8.17,
+ Upgrade acpid to 2.0.16, arping to 2.11, bash to 4.2.29, bind to
9.8.3, conntrack-tools to 1.2.1, coreutils to 8.17,
dhcpcd to 5.5.6, dnsmasq to 2.61,
e2fsprogs to 1.42.3, ethtool to 3.2, fontconfig to 2.9, gawk to
4.0.1, glib to 2.30.3,
gmp to 5.0.5, gnupg to 1.4.12, grep to 2.12,
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
