Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux: [1582] trunk
|
From: <dha...@us...> - 2008-02-12 13:35:52
|
Revision: 1582
http://astlinux.svn.sourceforge.net/astlinux/?rev=1582&view=rev
Author: dhartman
Date: 2008-02-12 05:35:55 -0800 (Tue, 12 Feb 2008)
Log Message:
-----------
add sip plugin to arno's fw -- thanks Philip
Modified Paths:
--------------
trunk/package/arno-fw/arnofw.mk
trunk/toolchain/file_exclude
Added Paths:
-----------
trunk/package/arno-fw/arnofw.wrapper
Removed Paths:
-------------
trunk/package/arno-fw/arno.wrapper
Deleted: trunk/package/arno-fw/arno.wrapper
===================================================================
--- trunk/package/arno-fw/arno.wrapper 2008-02-12 13:29:31 UTC (rev 1581)
+++ trunk/package/arno-fw/arno.wrapper 2008-02-12 13:35:55 UTC (rev 1582)
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-. /etc/rc.conf
-
-export INT_IF="$INTIF $INT2IF $INT3IF"
-export EXT_IF="$EXTIF $EXT2IF"
-export MODEM_IF=""
-export INTERNAL_NET="$INTIP/$INTNM"
-
-if [ -n "$INT2IP" ]; then
- INTERNAL_NET="$INTERNAL_NET $INT2IP/$INT2NM"
-fi
-
-if [ -n "$INT3IP" ]; then
- INTERNAL_NET="$INTERNAL_NET $INT3IP/$INT3NM"
-fi
-
-# ok, start script below
-
Modified: trunk/package/arno-fw/arnofw.mk
===================================================================
--- trunk/package/arno-fw/arnofw.mk 2008-02-12 13:29:31 UTC (rev 1581)
+++ trunk/package/arno-fw/arnofw.mk 2008-02-12 13:35:55 UTC (rev 1582)
@@ -10,9 +10,10 @@
ARNOFW_DIR:=$(BUILD_DIR)/$(ARNOFW_ROOT)_$(ARNOFW_VER)
ARNOFW_CAT:=zcat
ARNOFW_BINARY:=arno-iptables-firewall
-ARNOFW_TARGET_BINARY:=usr/sbin/arno-iptables-firewall
-ARNOFW_CONFIG_DIR=etc/arno-iptables-firewall
+ARNOFW_TARGET_BINARY:=/usr/sbin/arno-iptables-firewall
+ARNOFW_CONFIG_DIR:=/etc/arno-iptables-firewall
ARNOFW_CONFIG:=$(ARNOFW_CONFIG_DIR)/firewall.conf
+ARNOFW_PLUGIN_DIR:=$(ARNOFW_CONFIG_DIR)/plugins
$(DL_DIR)/$(ARNOFW_SOURCE):
$(WGET) -P $(DL_DIR) $(ARNOFW_SITE)/$(ARNOFW_SOURCE)
@@ -20,32 +21,42 @@
$(ARNOFW_DIR)/.unpacked: $(DL_DIR)/$(ARNOFW_SOURCE)
$(ARNOFW_CAT) $(DL_DIR)/$(ARNOFW_SOURCE) \
| tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ifeq ($(ARNOFW_VER),1.8.8l)
+ $(WGET) -P $(ARNOFW_DIR)/$(ARNOFW_PLUGIN_DIR) \
+ $(ARNOFW_SITE)/plugins/sip-voip/sip-voip.conf \
+ $(ARNOFW_SITE)/plugins/sip-voip/50sip-voip.plugin
+endif
touch $(ARNOFW_DIR)/.unpacked
$(ARNOFW_DIR)/.patched: $(ARNOFW_DIR)/.unpacked
toolchain/patch-kernel.sh $(ARNOFW_DIR) package/arno-fw/ arnofw-\*.patch
touch $(ARNOFW_DIR)/.patched
-$(TARGET_DIR)/$(ARNOFW_TARGET_BINARY): $(ARNOFW_DIR)/.patched
- ln -sf /tmp/$(ARNOFW_CONFIG_DIR) $(TARGET_DIR)/$(ARNOFW_CONFIG_DIR)
- -mkdir $(TARGET_DIR)/stat/$(ARNOFW_CONFIG_DIR)
- $(INSTALL) -D -m 0755 package/arno-fw/arno.wrapper \
- $(TARGET_DIR)/$(ARNOFW_TARGET_BINARY)
- cat $(ARNOFW_DIR)/$(ARNOFW_BINARY) >> $(TARGET_DIR)/$(ARNOFW_TARGET_BINARY)
- $(SED) 's:^CONFIG_FILE=.*$$:CONFIG_FILE=/$(ARNOFW_CONFIG):' \
- -e '1r package/arnofw/arno.wrapper' \
- $(TARGET_DIR)/$(ARNOFW_TARGET_BINARY)
- $(INSTALL) -D -m 0700 $(ARNOFW_DIR)/$(ARNOFW_CONFIG) \
- $(TARGET_DIR)/stat/$(ARNOFW_CONFIG)
- $(SED) 's:^IPTABLES="[^"]*":IPTABLES="/$(IPTABLES_BIN)":' \
- $(TARGET_DIR)/stat/$(ARNOFW_CONFIG)
+$(TARGET_DIR)$(ARNOFW_TARGET_BINARY): $(ARNOFW_DIR)/.patched
+ ln -sf /tmp$(ARNOFW_CONFIG_DIR) $(TARGET_DIR)$(ARNOFW_CONFIG_DIR)
+ -mkdir $(TARGET_DIR)/stat$(ARNOFW_CONFIG_DIR) \
+ $(TARGET_DIR)/stat$(ARNOFW_PLUGIN_DIR)
+ $(INSTALL) -D -m 0755 package/arno-fw/arnofw.wrapper \
+ $(TARGET_DIR)$(ARNOFW_TARGET_BINARY)
+ cat $(ARNOFW_DIR)/$(ARNOFW_BINARY) >> $(TARGET_DIR)$(ARNOFW_TARGET_BINARY)
+ $(INSTALL) -D -m 0600 $(ARNOFW_DIR)$(ARNOFW_CONFIG) \
+ $(TARGET_DIR)/stat$(ARNOFW_CONFIG)
+ $(SED) 's:^IPTABLES="[^"]*":IPTABLES="$(IPTABLES_BIN)":' \
+ -r -e 's:^(INT_IF|EXT_IF|MODEM_IF|INTERNET_NET):#&:' \
+ $(TARGET_DIR)/stat$(ARNOFW_CONFIG)
+ $(INSTALL) -D -m 0755 $(ARNOFW_DIR)$(ARNOFW_CONFIG_DIR)/custom-rules \
+ $(TARGET_DIR)/stat$(ARNOFW_CONFIG_DIR)
+ $(INSTALL) -D -m 0400 $(ARNOFW_DIR)$(ARNOFW_PLUGIN_DIR)/*.plugin \
+ $(TARGET_DIR)/stat$(ARNOFW_PLUGIN_DIR)
+ $(INSTALL) -D -m 0600 $(ARNOFW_DIR)$(ARNOFW_PLUGIN_DIR)/*.conf \
+ $(TARGET_DIR)/stat$(ARNOFW_PLUGIN_DIR)
-arnofw: linux iptables $(TARGET_DIR)/$(ARNOFW_TARGET_BINARY)
+arnofw: linux iptables $(TARGET_DIR)$(ARNOFW_TARGET_BINARY)
arnofw-clean:
- rm -f $(TARGET_DIR)/$(ARNOFW_TARGET_BINARY)
- rm -rf $(TARGET_DIR)/$(ARNOFW_CONFIG_DIR) \
- $(TARGET_DIR)/stat/$(ARNOFW_CONFIG_DIR)
+ rm -f $(TARGET_DIR)$(ARNOFW_TARGET_BINARY)
+ rm -rf $(TARGET_DIR)$(ARNOFW_CONFIG_DIR) \
+ $(TARGET_DIR)/stat$(ARNOFW_CONFIG_DIR)
arnofw-dirclean:
rm -rf $(ARNOFW_DIR)
Copied: trunk/package/arno-fw/arnofw.wrapper (from rev 1580, trunk/package/arno-fw/arno.wrapper)
===================================================================
--- trunk/package/arno-fw/arnofw.wrapper (rev 0)
+++ trunk/package/arno-fw/arnofw.wrapper 2008-02-12 13:35:55 UTC (rev 1582)
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+export INT_IF="$INTIF $INT2IF $INT3IF"
+export EXT_IF="$EXTIF $EXT2IF"
+export MODEM_IF=""
+export INTERNAL_NET="$INTIP/$INTNM"
+
+if [ -n "$INT2IP" ]; then
+ INTERNAL_NET="$INTERNAL_NET $INT2IP/$INT2NM"
+fi
+
+if [ -n "$INT3IP" ]; then
+ INTERNAL_NET="$INTERNAL_NET $INT3IP/$INT3NM"
+fi
+
+# ok, start script below
+
Modified: trunk/toolchain/file_exclude
===================================================================
--- trunk/toolchain/file_exclude 2008-02-12 13:29:31 UTC (rev 1581)
+++ trunk/toolchain/file_exclude 2008-02-12 13:35:55 UTC (rev 1582)
@@ -1 +1,3 @@
pci.ids.bz2
+50sip-voip.plugin
+sip-voip.conf
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
