Add batctl and libnl-3.

diff --git a/config/rootfiles/common/batctl b/config/rootfiles/common/batctl
new file mode 100644 (file)
index 0000000..a4f49c2
--- /dev/null
+++ b/config/rootfiles/common/batctl
@@ -0,0 +1,2 @@
+usr/sbin/batctl
+#usr/share/man/man8/batctl.8

diff --git a/config/rootfiles/common/libnl-3 b/config/rootfiles/common/libnl-3
new file mode 100644 (file)
index 0000000..0ad3c36
--- /dev/null
+++ b/config/rootfiles/common/libnl-3
@@ -0,0 +1,204 @@
+#etc/libnl
+etc/libnl/classid
+etc/libnl/pktloc
+#usr/include/libnl3
+#usr/include/libnl3/netlink
+#usr/include/libnl3/netlink/addr.h
+#usr/include/libnl3/netlink/attr.h
+#usr/include/libnl3/netlink/cache-api.h
+#usr/include/libnl3/netlink/cache.h
+#usr/include/libnl3/netlink/cli
+#usr/include/libnl3/netlink/cli/addr.h
+#usr/include/libnl3/netlink/cli/class.h
+#usr/include/libnl3/netlink/cli/cls.h
+#usr/include/libnl3/netlink/cli/ct.h
+#usr/include/libnl3/netlink/cli/exp.h
+#usr/include/libnl3/netlink/cli/link.h
+#usr/include/libnl3/netlink/cli/neigh.h
+#usr/include/libnl3/netlink/cli/qdisc.h
+#usr/include/libnl3/netlink/cli/route.h
+#usr/include/libnl3/netlink/cli/rule.h
+#usr/include/libnl3/netlink/cli/tc.h
+#usr/include/libnl3/netlink/cli/utils.h
+#usr/include/libnl3/netlink/data.h
+#usr/include/libnl3/netlink/errno.h
+#usr/include/libnl3/netlink/fib_lookup
+#usr/include/libnl3/netlink/fib_lookup/lookup.h
+#usr/include/libnl3/netlink/fib_lookup/request.h
+#usr/include/libnl3/netlink/genl
+#usr/include/libnl3/netlink/genl/ctrl.h
+#usr/include/libnl3/netlink/genl/family.h
+#usr/include/libnl3/netlink/genl/genl.h
+#usr/include/libnl3/netlink/genl/mngt.h
+#usr/include/libnl3/netlink/handlers.h
+#usr/include/libnl3/netlink/hash.h
+#usr/include/libnl3/netlink/hashtable.h
+#usr/include/libnl3/netlink/idiag
+#usr/include/libnl3/netlink/idiag/idiagnl.h
+#usr/include/libnl3/netlink/idiag/meminfo.h
+#usr/include/libnl3/netlink/idiag/msg.h
+#usr/include/libnl3/netlink/idiag/req.h
+#usr/include/libnl3/netlink/idiag/vegasinfo.h
+#usr/include/libnl3/netlink/list.h
+#usr/include/libnl3/netlink/msg.h
+#usr/include/libnl3/netlink/netfilter
+#usr/include/libnl3/netlink/netfilter/ct.h
+#usr/include/libnl3/netlink/netfilter/exp.h
+#usr/include/libnl3/netlink/netfilter/log.h
+#usr/include/libnl3/netlink/netfilter/log_msg.h
+#usr/include/libnl3/netlink/netfilter/netfilter.h
+#usr/include/libnl3/netlink/netfilter/nfnl.h
+#usr/include/libnl3/netlink/netfilter/queue.h
+#usr/include/libnl3/netlink/netfilter/queue_msg.h
+#usr/include/libnl3/netlink/netlink-compat.h
+#usr/include/libnl3/netlink/netlink-kernel.h
+#usr/include/libnl3/netlink/netlink.h
+#usr/include/libnl3/netlink/object-api.h
+#usr/include/libnl3/netlink/object.h
+#usr/include/libnl3/netlink/route
+#usr/include/libnl3/netlink/route/act
+#usr/include/libnl3/netlink/route/act/mirred.h
+#usr/include/libnl3/netlink/route/action.h
+#usr/include/libnl3/netlink/route/addr.h
+#usr/include/libnl3/netlink/route/class.h
+#usr/include/libnl3/netlink/route/classifier.h
+#usr/include/libnl3/netlink/route/cls
+#usr/include/libnl3/netlink/route/cls/basic.h
+#usr/include/libnl3/netlink/route/cls/cgroup.h
+#usr/include/libnl3/netlink/route/cls/ematch
+#usr/include/libnl3/netlink/route/cls/ematch.h
+#usr/include/libnl3/netlink/route/cls/ematch/cmp.h
+#usr/include/libnl3/netlink/route/cls/ematch/meta.h
+#usr/include/libnl3/netlink/route/cls/ematch/nbyte.h
+#usr/include/libnl3/netlink/route/cls/ematch/text.h
+#usr/include/libnl3/netlink/route/cls/fw.h
+#usr/include/libnl3/netlink/route/cls/police.h
+#usr/include/libnl3/netlink/route/cls/u32.h
+#usr/include/libnl3/netlink/route/link
+#usr/include/libnl3/netlink/route/link.h
+#usr/include/libnl3/netlink/route/link/api.h
+#usr/include/libnl3/netlink/route/link/bonding.h
+#usr/include/libnl3/netlink/route/link/bridge.h
+#usr/include/libnl3/netlink/route/link/can.h
+#usr/include/libnl3/netlink/route/link/inet.h
+#usr/include/libnl3/netlink/route/link/info-api.h
+#usr/include/libnl3/netlink/route/link/ip6tnl.h
+#usr/include/libnl3/netlink/route/link/ipgre.h
+#usr/include/libnl3/netlink/route/link/ipip.h
+#usr/include/libnl3/netlink/route/link/ipvti.h
+#usr/include/libnl3/netlink/route/link/macvlan.h
+#usr/include/libnl3/netlink/route/link/sit.h
+#usr/include/libnl3/netlink/route/link/veth.h
+#usr/include/libnl3/netlink/route/link/vlan.h
+#usr/include/libnl3/netlink/route/link/vxlan.h
+#usr/include/libnl3/netlink/route/neighbour.h
+#usr/include/libnl3/netlink/route/neightbl.h
+#usr/include/libnl3/netlink/route/nexthop.h
+#usr/include/libnl3/netlink/route/pktloc.h
+#usr/include/libnl3/netlink/route/qdisc
+#usr/include/libnl3/netlink/route/qdisc.h
+#usr/include/libnl3/netlink/route/qdisc/cbq.h
+#usr/include/libnl3/netlink/route/qdisc/dsmark.h
+#usr/include/libnl3/netlink/route/qdisc/fifo.h
+#usr/include/libnl3/netlink/route/qdisc/fq_codel.h
+#usr/include/libnl3/netlink/route/qdisc/htb.h
+#usr/include/libnl3/netlink/route/qdisc/netem.h
+#usr/include/libnl3/netlink/route/qdisc/plug.h
+#usr/include/libnl3/netlink/route/qdisc/prio.h
+#usr/include/libnl3/netlink/route/qdisc/red.h
+#usr/include/libnl3/netlink/route/qdisc/sfq.h
+#usr/include/libnl3/netlink/route/qdisc/tbf.h
+#usr/include/libnl3/netlink/route/route.h
+#usr/include/libnl3/netlink/route/rtnl.h
+#usr/include/libnl3/netlink/route/rule.h
+#usr/include/libnl3/netlink/route/tc-api.h
+#usr/include/libnl3/netlink/route/tc.h
+#usr/include/libnl3/netlink/socket.h
+#usr/include/libnl3/netlink/types.h
+#usr/include/libnl3/netlink/utils.h
+#usr/include/libnl3/netlink/version.h
+#usr/lib/libnl
+#usr/lib/libnl-3.a
+#usr/lib/libnl-3.la
+#usr/lib/libnl-3.so
+usr/lib/libnl-3.so.200
+usr/lib/libnl-3.so.200.20.0
+#usr/lib/libnl-cli-3.a
+#usr/lib/libnl-cli-3.la
+#usr/lib/libnl-cli-3.so
+usr/lib/libnl-cli-3.so.200
+usr/lib/libnl-cli-3.so.200.20.0
+#usr/lib/libnl-genl-3.a
+#usr/lib/libnl-genl-3.la
+#usr/lib/libnl-genl-3.so
+usr/lib/libnl-genl-3.so.200
+usr/lib/libnl-genl-3.so.200.20.0
+#usr/lib/libnl-idiag-3.a
+#usr/lib/libnl-idiag-3.la
+#usr/lib/libnl-idiag-3.so
+usr/lib/libnl-idiag-3.so.200
+usr/lib/libnl-idiag-3.so.200.20.0
+#usr/lib/libnl-nf-3.a
+#usr/lib/libnl-nf-3.la
+#usr/lib/libnl-nf-3.so
+usr/lib/libnl-nf-3.so.200
+usr/lib/libnl-nf-3.so.200.20.0
+#usr/lib/libnl-route-3.a
+#usr/lib/libnl-route-3.la
+#usr/lib/libnl-route-3.so
+usr/lib/libnl-route-3.so.200
+usr/lib/libnl-route-3.so.200.20.0
+#usr/lib/libnl/cli
+#usr/lib/libnl/cli/cls
+#usr/lib/libnl/cli/cls/basic.a
+#usr/lib/libnl/cli/cls/basic.la
+usr/lib/libnl/cli/cls/basic.so
+#usr/lib/libnl/cli/cls/cgroup.a
+#usr/lib/libnl/cli/cls/cgroup.la
+usr/lib/libnl/cli/cls/cgroup.so
+#usr/lib/libnl/cli/qdisc
+#usr/lib/libnl/cli/qdisc/bfifo.a
+#usr/lib/libnl/cli/qdisc/bfifo.la
+usr/lib/libnl/cli/qdisc/bfifo.so
+#usr/lib/libnl/cli/qdisc/blackhole.a
+#usr/lib/libnl/cli/qdisc/blackhole.la
+usr/lib/libnl/cli/qdisc/blackhole.so
+#usr/lib/libnl/cli/qdisc/fq_codel.a
+#usr/lib/libnl/cli/qdisc/fq_codel.la
+usr/lib/libnl/cli/qdisc/fq_codel.so
+#usr/lib/libnl/cli/qdisc/htb.a
+#usr/lib/libnl/cli/qdisc/htb.la
+usr/lib/libnl/cli/qdisc/htb.so
+#usr/lib/libnl/cli/qdisc/ingress.a
+#usr/lib/libnl/cli/qdisc/ingress.la
+usr/lib/libnl/cli/qdisc/ingress.so
+#usr/lib/libnl/cli/qdisc/pfifo.a
+#usr/lib/libnl/cli/qdisc/pfifo.la
+usr/lib/libnl/cli/qdisc/pfifo.so
+#usr/lib/libnl/cli/qdisc/plug.a
+#usr/lib/libnl/cli/qdisc/plug.la
+usr/lib/libnl/cli/qdisc/plug.so
+#usr/lib/pkgconfig/libnl-3.0.pc
+#usr/lib/pkgconfig/libnl-cli-3.0.pc
+#usr/lib/pkgconfig/libnl-genl-3.0.pc
+#usr/lib/pkgconfig/libnl-nf-3.0.pc
+#usr/lib/pkgconfig/libnl-route-3.0.pc
+#usr/sbin/genl-ctrl-list
+usr/sbin/nl-class-add
+usr/sbin/nl-class-delete
+usr/sbin/nl-class-list
+usr/sbin/nl-classid-lookup
+usr/sbin/nl-cls-add
+usr/sbin/nl-cls-delete
+usr/sbin/nl-cls-list
+usr/sbin/nl-link-list
+usr/sbin/nl-pktloc-lookup
+usr/sbin/nl-qdisc-add
+usr/sbin/nl-qdisc-delete
+usr/sbin/nl-qdisc-list
+#usr/share/man/man8/genl-ctrl-list.8
+#usr/share/man/man8/nl-classid-lookup.8
+#usr/share/man/man8/nl-pktloc-lookup.8
+#usr/share/man/man8/nl-qdisc-add.8
+#usr/share/man/man8/nl-qdisc-delete.8
+#usr/share/man/man8/nl-qdisc-list.8

diff --git a/lfs/batctl b/lfs/batctl
new file mode 100644 (file)
index 0000000..6a66982
--- /dev/null
+++ b/lfs/batctl
@@ -0,0 +1,79 @@
+###############################################################################
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2014.3.0
+
+THISAPP    = batctl-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 7d2b8c129424c014d020c4b1a2add31b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install PREFIX=/usr
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/libnl-3 b/lfs/libnl-3
new file mode 100644 (file)
index 0000000..3bb7f52
--- /dev/null
+++ b/lfs/libnl-3
@@ -0,0 +1,80 @@
+###############################################################################
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 3.2.25
+
+THISAPP    = libnl-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 03f74d0cd5037cadc8cdfa313bbd195c
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(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 --sysconfdir=/etc
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 65ca37d74382c3fdbd5e61d12b2c4dfd85d141a6..4b94c8fed184c499d4185e7c78c24494786dae94 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -478,6 +478,7 @@ buildipfire() {
   ipfiremake fireinfo
   ipfiremake libnet
   ipfiremake libnl
+  ipfiremake libnl-3
   ipfiremake libidn
   ipfiremake nasm
   ipfiremake libjpeg
@@ -810,6 +811,7 @@ buildipfire() {
   ipfiremake sslscan
   ipfiremake owncloud
   ipfiremake bacula
+  ipfiremake batctl
 }
 
 buildinstaller() {