Finish migrateing things for V6. if_feature now works again and the

silly log bug is fixed

Makefile

@@ -3,13 +3,13 @@ r = $(shell svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//')
 tmpdir := $(shell mktemp -ud)
 pwd := $(shell pwd)
 
-DESTDIR ?=
+DESTDIR ?= /usr/local
 
-BINDIR ?= /usr/local/sbin
-SHARDIR ?= /usr/local/share
-ETCDIR ?= /usr/local/etc
+BINDIR ?= $(DESTDIR)/sbin
+SHARDIR ?= $(DESTDIR)/share
+ETCDIR ?= $(DESTDIR)/etc
 
-PKGNAME=linuxserver-firewall
+PKGNAME=bearwall
 IPTABLES=iptables
 
 BASEDIR ?= $(SHARDIR)/$(PKGNAME)
@@ -25,82 +25,83 @@ SUPPORT := $(wildcard support/*)
 all: 
 	@sed -e s#@BASEDIR@#$(BASEDIR)#g -e s#@CONFDIR@#$(CONFDIR)#g \
 		src/firewall.in \
-		>src/firewall
+		>src/$(PKGNAME)
 	@sed -e s#@BASEDIR@#$(subst -,\\\\-,$(BASEDIR))#g \
 		-e s#@CONFDIR@#$(subst -,\\\\-,$(CONFDIR))#g \
-		doc/linuxserver-firewall.8.in \
-		>doc/linuxserver-firewall.8
+		-e s#@PKGNAME@#$(subst -,\\\\-,$(PKGNAME))#g \
+		doc/firewall.8.in \
+		>doc/$(PKGNAME).8
 
 clean:
-	@rm -f src/firewall doc/linuxserver-firewall.8
-	@rm -f linuxserver-firewall-*.tar.*
+	@rm -f src/$(PKGNAME) doc/$(PKGNAME).8
+	@rm -f $(PKGNAME)-*.tar.*
 
 install-bin: all
 
 	install -D --group=root --mode=755 --owner=root \
-		src/firewall $(DESTDIR)$(BINDIR)/firewall
+		src/$(PKGNAME) $(BINDIR)/$(PKGNAME)
 
 	install -d --group=root --mode=755 --owner=root \
-		$(DESTDIR)$(BASEDIR)/ruleset.d
+		$(BASEDIR)/ruleset.d
 	for i in $(RULESET); \
 		do install -D --group=root --mode=644 --owner=root \
-		$$i $(DESTDIR)$(BASEDIR)/$$i; \
+		$$i $(BASEDIR)/$$i; \
 		done
 
 	install -d --group=root --mode=755 --owner=root \
-		$(DESTDIR)$(BASEDIR)/support
+		$(BASEDIR)/support
 	for i in $(SUPPORT); \
 		do install -D --group=root --mode=644 --owner=root \
-		$$i $(DESTDIR)$(BASEDIR)/$$i; \
+		$$i $(BASEDIR)/$$i; \
 		done
 
 install-conf: all
 
 	install -d --group=root --mode=755 --owner=root \
-		$(DESTDIR)$(CONFDIR)/hosts.d
+		$(CONFDIR)/hosts.d
 	for i in $(HOSTS); \
 		do install -D --group=root --mode=744 --owner=root \
-		$$i $(DESTDIR)$(CONFDIR)/$$i; \
+		$$i $(CONFDIR)/$$i; \
 		done
 
 	install -d --group=root --mode=755 --owner=root \
-		$(DESTDIR)$(CONFDIR)/classes.d
+		$(CONFDIR)/classes.d
 	for i in $(CLASSES); \
 		do install -D --group=root --mode=644 --owner=root \
-		$$i $(DESTDIR)$(CONFDIR)/$$i; \
+		$$i $(CONFDIR)/$$i; \
 		done
 
 	install -d --group=root --mode=755 --owner=root \
-		$(DESTDIR)$(CONFDIR)/interfaces.d
+		$(CONFDIR)/interfaces.d
 	for i in $(INTERFACES); \
 		do install -D --group=root --mode=644 --owner=root \
-		$$i $(DESTDIR)$(CONFDIR)/$$i; \
+		$$i $(CONFDIR)/$$i; \
 		done
 
 install-doc: all
 
 	install -d --group=root --mode=755 --owner=root \
-		$(DESTDIR)$(MANDIR)/man8
+		$(MANDIR)/man8
 	install --group=root --mode=644 --owner=root \
-		doc/firewall.8 $(DESTDIR)$(MANDIR)/man8
+		doc/$(PKGNAME).8 $(MANDIR)/man8
 	install --group=root --mode=644 --owner=root \
-		doc/linuxserver-firewall.8 $(DESTDIR)$(MANDIR)/man8
+		doc/$(PKGNAME).8 $(MANDIR)/man8
 
 install: install-bin install-conf install-doc
 
 release:
 	@rm -f $(tmpdir)
 	@mkdir -p $(tmpdir)
-	@svn export . $(tmpdir)/linuxserver-firewall-$(VERSION)
+	@svn export . $(tmpdir)/$(PKGNAME)-$(VERSION)
 	@sed -e 's#VERSION=".*"#VERSION="$(VERSION)"#g' \
 		-e 's#REVISION=".*"#REVISION="$(r)"#g' \
-		$(tmpdir)/linuxserver-firewall-$(VERSION)/src/firewall.in \
-		> $(tmpdir)/linuxserver-firewall-$(VERSION)/src/firewall.$$
-	@mv $(tmpdir)/linuxserver-firewall-$(VERSION)/src/firewall.$$ \
-		$(tmpdir)/linuxserver-firewall-$(VERSION)/src/firewall.in
-	@cd $(tmpdir); tar cjf $(pwd)/linuxserver-firewall-$(VERSION).tar.bz2 \
-		linuxserver-firewall-$(VERSION)/
-	@cd $(tmpdir); tar czf $(pwd)/linuxserver-firewall-$(VERSION).tar.gz \
-		linuxserver-firewall-$(VERSION)/
+		$(tmpdir)/$(PKGNAME)-$(VERSION)/src/firewall.in \
+		> $(tmpdir)/$(PKGNAME)-$(VERSION)/src/$(PKGNAME).$$
+	@mv $(tmpdir)/$(PKGNAME)-$(VERSION)/src/$(PKGNAME).$$ \
+		$(tmpdir)/$(PKGNAME)-$(VERSION)/src/firewall.in
+	@cd $(tmpdir); tar cjf $(pwd)/$(PKGNAME)-$(VERSION).tar.bz2 \
+		$(PKGNAME)-$(VERSION)/
+	@cd $(tmpdir); tar czf $(pwd)/$(PKGNAME)-$(VERSION).tar.gz \
+		$(PKGNAME)-$(VERSION)/
 	@rm -rf $(tmpdir)
 

classes.d/external

@@ -41,11 +41,14 @@ policy forward-out reject-ms
 policy forward-in ACCEPT
 policy forward-out ACCEPT
 
-if_feature rp_filter 1 		 # Enable Reverse Router Filtering
+if_feature disable_ipv6 0        # Disable IPv6 completely?
+if_feature autoconf 1            # Enable IPv6 autoconf?
+if_feature rp_filter 1 		     # Enable Reverse Router Filtering
 if_feature accept_redirects 0 	 # Accept Redirects
 if_feature accept_source_route 0 # Accept Source Routes
 if_feature bootp_relay 0         # Dont forward bootp requests
+if_feature accept_ra 0           # Accept IPv6 Router Advertisments 
+                                 # (overridden if v6 forwarding is enabled)
 if_feature forwarding 1          # forward packets arriving on this interface
 if_feature log_martians 0        # log martians?
 if_feature send_redirects 1      # Send redirects?
-

classes.d/internal

@@ -12,10 +12,14 @@ policy out ACCEPT
 policy forward-in ACCEPT
 policy forward-out ACCEPT 
 
-if_feature rp_filter 1 		 # Enable Reverse Router Filtering
-if_feature accept_redirects 1 	 # Accept Redirects
+if_feature disable_ipv6 0        # Disable IPv6 completely?
+if_feature autoconf 1            # Enable IPv6 autoconf?
+if_feature rp_filter 1           # Enable Reverse Router Filtering
+if_feature accept_redirects 1    # Accept Redirects
 if_feature accept_source_route 1 # Accept Source Routes
 if_feature bootp_relay 0         # Dont forward bootp requests
+if_feature accept_ra 0           # Accept IPv6 Router Advertisments 
+                                 # (overridden if v6 forwarding is enabled)
 if_feature forwarding 1          # forward packets arriving at this interface
 if_feature log_martians 0        # log martians?
 if_feature send_redirects 1      # Send redirects?

classes.d/loopback

@@ -15,6 +15,8 @@ if_feature rp_filter 1 		 # Enable Reverse Router Filtering
 if_feature accept_redirects 0 	 # Accept Redirects
 if_feature accept_source_route 0 # Accept Source Routes
 if_feature bootp_relay 0         # Dont forward bootp requests
+if_feature accept_ra 0           # Accept IPv6 Router Advertisments 
+                                 # (overridden if v6 forwarding is enabled)
 if_feature forwarding 0          # forwarding
 if_feature log_martians 0        # log martians?
 if_feature send_redirects 0      # Send redirects?

classes.d/vpn

@@ -13,10 +13,14 @@ polite_deny forward-in
 
 policy forward-out ACCEPT
 
-if_feature rp_filter 0 		 # Disable Reverse Router Filtering
+if_feature disable_ipv6 1        # Disable IPv6 completely?
+if_feature autoconf 0            # Enable IPv6 autoconf?
+if_feature rp_filter 0 		     # Disable Reverse Router Filtering
 if_feature accept_redirects 0 	 # Accept Redirects
 if_feature accept_source_route 0 # Accept Source Routes
 if_feature bootp_relay 0         # Dont forward bootp requests
+if_feature accept_ra 0           # Accept IPv6 Router Advertisments 
+                                 # (overridden if v6 forwarding is enabled)
 if_feature forwarding 1          # forwarding
 if_feature log_martians 0        # log martians?
 if_feature send_redirects 1      # Send redirects?