From: ms Date: Sat, 24 Nov 2007 17:01:24 +0000 (+0000) Subject: Finished some groups of tools: X-Git-Tag: v3.0-alpha1~1156 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a97daddba1fd1da4bbb287f654d9b91eca841e48;p=ipfire-3.x.git Finished some groups of tools: * filesystem tools: added xfsprogs * networking tools: added libnetfilter_* + vlan + l7 + bridge-utils + iptstate git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1093 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/lfs/bridge-utils b/lfs/bridge-utils index a72a6a9e4..5a0f6c49e 100644 --- a/lfs/bridge-utils +++ b/lfs/bridge-utils @@ -24,13 +24,14 @@ include Config -VER = 1.1 +PKG_NAME = bridge-utils +VER = 1.2 -THISAPP = bridge-utils-$(VER) +THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### # Top-level Rules @@ -38,31 +39,13 @@ TARGET = $(DIR_INFO)/$(THISAPP) objects = $(DL_FILE) -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 43bbd2a67b59cac3e15d545f8b51df68 - 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 ############################################################################### @@ -70,8 +53,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && autoconf cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make -j $(PARALLELISM) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/iptables b/lfs/iptables index fe5b0aa1d..6c0d0a353 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -55,7 +55,7 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/iptables-$(VER).tar.bz2 + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/layer7-iptables-$(L7VER).patch #cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/iptables-1.3.0-imq1.diff @@ -77,15 +77,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -f $(DIR_SRC)/$(IPP2P)/libipt_ipp2p.so /lib/iptables rm -rf $(DIR_SRC)/$(IPP2P) - #cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.25.tar.bz2 - #cd $(DIR_SRC)/libnfnetlink-0.0.25 && ./configure --prefix=/usr - #cd $(DIR_SRC)/libnfnetlink-0.0.25 && make - #cd $(DIR_SRC)/libnfnetlink-0.0.25 && make install - - #cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.13.tar.bz2 - #cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && ./configure --prefix=/usr - #cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && make - #cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && make install - @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/iptstate b/lfs/iptstate index ee503678e..029348176 100644 --- a/lfs/iptstate +++ b/lfs/iptstate @@ -24,13 +24,14 @@ include Config -VER = 2.1 +PKG_NAME = iptstate +VER = 2.2.1 -THISAPP = iptstate-$(VER) +THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### # Top-level Rules @@ -38,31 +39,13 @@ TARGET = $(DIR_INFO)/$(THISAPP) objects = $(DL_FILE) -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = c99e19c66645689b44a871428e003ec7 - 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 ############################################################################### @@ -70,7 +53,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make -j $(PARALLELISM) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/l7-protocols b/lfs/l7-protocols index 05f130660..f2c8ec8e8 100644 --- a/lfs/l7-protocols +++ b/lfs/l7-protocols @@ -24,13 +24,14 @@ include Config -VER = 2007-10-10 +PKG_NAME = l7-protocols +VER = 2007-11-22 -THISAPP = l7-protocols-$(VER) +THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### # Top-level Rules @@ -38,31 +39,13 @@ TARGET = $(DIR_INFO)/$(THISAPP) objects = $(DL_FILE) -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 604cb6fc811c7fe80bdb2221db07bfe8 - 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 ############################################################################### @@ -70,6 +53,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - mkdir -p /etc/l7-protocols && cp -Rfv $(DIR_APP)/* /etc/l7-protocols + -mkdir -p /etc/l7-protocols + cp -Rfv $(DIR_APP)/* /etc/l7-protocols @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libnetfilter_conntrack b/lfs/libnetfilter_conntrack new file mode 100644 index 000000000..2e60d336a --- /dev/null +++ b/lfs/libnetfilter_conntrack @@ -0,0 +1,60 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program 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 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +PKG_NAME = libnetfilter_conntrack +VER = 0.0.82 + +THISAPP = $(PKG_NAME)-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DIR_APP = $(DIR_SRC)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +install: $(TARGET) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make -j $(PARALLELISM) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libnetfilter_queue b/lfs/libnetfilter_queue new file mode 100644 index 000000000..a052a04e6 --- /dev/null +++ b/lfs/libnetfilter_queue @@ -0,0 +1,60 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program 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 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +PKG_NAME = libnetfilter_queue +VER = 0.0.15 + +THISAPP = $(PKG_NAME)-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DIR_APP = $(DIR_SRC)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +install: $(TARGET) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make -j $(PARALLELISM) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libnfnetlink b/lfs/libnfnetlink new file mode 100644 index 000000000..40f268043 --- /dev/null +++ b/lfs/libnfnetlink @@ -0,0 +1,60 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program 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 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +PKG_NAME = libnfnetlink +VER = 0.0.30 + +THISAPP = $(PKG_NAME)-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DIR_APP = $(DIR_SRC)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +install: $(TARGET) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make -j $(PARALLELISM) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/pkg-config b/lfs/pkg-config index 2e9688556..4eefae971 100644 --- a/lfs/pkg-config +++ b/lfs/pkg-config @@ -24,13 +24,14 @@ include Config -VER = 0.20 +PKG_NAME = pkg-config +VER = 0.22 -THISAPP = pkg-config-$(VER) +THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### # Top-level Rules @@ -38,31 +39,13 @@ TARGET = $(DIR_INFO)/$(THISAPP) objects = $(DL_FILE) -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = fb42402593e4198bc252ab248dd4158b - 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 ############################################################################### @@ -71,7 +54,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make + cd $(DIR_APP) && make -j $(PARALLELISM) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/vlan b/lfs/vlan index 52cee41b5..2f5784a7e 100644 --- a/lfs/vlan +++ b/lfs/vlan @@ -24,13 +24,14 @@ include Config +PKG_NAME = vlan VER = 1.9 -THISAPP = vlan.$(VER) +THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/vlan -TARGET = $(DIR_INFO)/$(THISAPP) +DIR_APP = $(DIR_SRC)/$(PKG_NAME) + +TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### # Top-level Rules @@ -38,31 +39,13 @@ TARGET = $(DIR_INFO)/$(THISAPP) objects = $(DL_FILE) -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 5f0c6060b33956fb16e11a15467dd394 - 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 ############################################################################### @@ -70,7 +53,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make purge vconfig -j $(PARALLELISM) cd $(DIR_APP) && install -c -p -m 0755 vconfig /sbin @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/xfsprogs b/lfs/xfsprogs new file mode 100644 index 000000000..935184d8f --- /dev/null +++ b/lfs/xfsprogs @@ -0,0 +1,64 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program 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 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +PKG_NAME = xfsprogs +VER = 2.9.4 + +THISAPP = $(PKG_NAME)-$(VER) +DL_FILE = $(THISAPP).tar.gz +DIR_APP = $(DIR_SRC)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +install: $(TARGET) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root \ + LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes" #-j $(PARALLELISM) + cd $(DIR_APP) && make install + cd $(DIR_APP) && install -v -m755 -D libhandle/libhandle.la /usr/lib/libhandle.la + chmod -v 755 /lib/libhandle.so* + rm -f /lib/libhandle.{a,la,so} + ln -svf ../../lib/libhandle.so.1 /usr/lib/libhandle.so + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index b804e2601..7f90a8f7d 100755 --- a/make.sh +++ b/make.sh @@ -169,6 +169,10 @@ ipfire_build() { ipfire_make linux #ipfire_make zaptel + ### Building pkg-config + # + ipfire_make pkg-config + ### Building some network stuff # ipfire_make libpcap @@ -177,11 +181,14 @@ ipfire_build() { ipfire_make rp-pppoe ipfire_make dhcp ipfire_make iptables + ipfire_make libnfnetlink + ipfire_make libnetfilter_queue + ipfire_make libnetfilter_conntrack ipfire_make dnsmasq - #ipfire_make l7-protocols - #ipfire_make iptstate - #ipfire_make bridge-utils - #ipfire_make vlan + ipfire_make l7-protocols + ipfire_make iptstate + ipfire_make bridge-utils + ipfire_make vlan ### Building some general stuff # @@ -223,7 +230,7 @@ ipfire_build() { ipfire_make reiserfsprogs ipfire_make libaal ipfire_make reiser4progs - #ipfire_make xfsprogs ### This is missing. + ipfire_make xfsprogs ### Building hardware utils #