Menu
▾
▴
astlinux-commits
|
From: <kr...@us...> - 2006-06-27 04:11:00
|
Revision: 176 Author: krisk84 Date: 2006-06-26 21:10:48 -0700 (Mon, 26 Jun 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=176&view=rev Log Message: ----------- sangoma improvements and bet g729 support Modified Paths: -------------- trunk/package/Config.in trunk/package/wanpipe/wanpipe.mk Added Paths: ----------- trunk/package/digiumg729/ trunk/package/digiumg729/Config.in trunk/package/digiumg729/codec_g729a.so trunk/package/digiumg729/digiumg729.mk trunk/package/digiumg729/register Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2006-06-22 14:49:12 UTC (rev 175) +++ trunk/package/Config.in 2006-06-27 04:10:48 UTC (rev 176) @@ -30,6 +30,7 @@ source "package/app_bundle/Config.in" source "package/mqueue-isdn/Config.in" source "package/appconference/Config.in" +source "package/digiumg729/Config.in" source "package/chan_misdn/Config.in" source "package/astmanproxy/Config.in" source "package/at/Config.in" Added: trunk/package/digiumg729/Config.in =================================================================== --- trunk/package/digiumg729/Config.in (rev 0) +++ trunk/package/digiumg729/Config.in 2006-06-27 04:10:48 UTC (rev 176) @@ -0,0 +1,11 @@ +config BR2_PACKAGE_DIGIUMG729 + bool "Asterisk G.729 Support" + default n + depends BR2_PACKAGE_ASTERISK + help + G.729a is a highly compressed codec for use with Asterisk. + Use of G.729 requires purchasing a license from Digium. + This will install the codec and the register utility, but + you will still have to buy as many licenses as you need. + + http://www.digium.com Added: trunk/package/digiumg729/codec_g729a.so =================================================================== (Binary files differ) Property changes on: trunk/package/digiumg729/codec_g729a.so ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/package/digiumg729/digiumg729.mk =================================================================== --- trunk/package/digiumg729/digiumg729.mk (rev 0) +++ trunk/package/digiumg729/digiumg729.mk 2006-06-27 04:10:48 UTC (rev 176) @@ -0,0 +1,29 @@ +############################################################# +# +# digiumg729 +# +############################################################# +DIGIUMG729_DIR:=$(BUILD_DIR)/digiumg729 +DIGIUMG729_TARGET_BINARY=$(TARGET_DIR)/usr/lib/asterisk/modules/codec_g729.so + +$(DIGIUMG729_TARGET_BINARY): + $(INSTALL) -D -m 0755 $(DIGIUMG729_DIR)/register $(TARGET_DIR)/usr/sbin/g729register + $(INSTALL) -D -m 0755 $(DIGIUMG729_DIR)/codec_g729.so $(DIGIUMG729_TARGET_BINARY) + +digiumg729: uclibc linux asterisk $(DIGIUMG729_TARGET_BINARY) + +digiumg729-clean: + rm $(DIGIUMG729_TARGET_BINARY) + rm $(TARGET_DIR)/usr/sbin/g729register + +digiumg729-dirclean: + echo "Nothing to do" + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_DIGIUMG729)),y) +TARGETS+=digiumg729 +endif Added: trunk/package/digiumg729/register =================================================================== (Binary files differ) Property changes on: trunk/package/digiumg729/register ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/package/wanpipe/wanpipe.mk =================================================================== --- trunk/package/wanpipe/wanpipe.mk 2006-06-22 14:49:12 UTC (rev 175) +++ trunk/package/wanpipe/wanpipe.mk 2006-06-27 04:10:48 UTC (rev 176) @@ -12,6 +12,8 @@ WANPIPE_TARGET_DIR:=usr/sbin WANPIPE_TARGET_BINARY:=$(WANPIPE_TARGET_DIR)/wancfg +LINUX_VER=2.6.16.12 + $(DL_DIR)/$(WANPIPE_SOURCE): $(WGET) -P $(DL_DIR) $(WANPIPE_SITE)/$(WANPIPE_SOURCE) @@ -25,14 +27,19 @@ $(WANPIPE_DIR)/.built: $(WANPIPE_DIR)/.configured CWD=$(shell pwd) - (cd $(WANPIPE_DIR) && CC=$(TARGET_CC) ./Setup install --arch=$(ARCH) --protocol=TDM --with-linux=$(BUILD_DIR)/linux \ - --zaptel-path=$(BUILD_DIR)/zaptel --builddir=$(STAGING_DIR) --usr-cc=$(TARGET_CC) --linux-vanilla --edac --silent --no-gcc-debug ; cd $(CWD)) + (cd $(WANPIPE_DIR) && CC=$(TARGET_CC) ./Setup drivers --arch=$(ARCH) --protocol=TDM --with-linux=$(BUILD_DIR)/linux \ + --zaptel-path=$(BUILD_DIR)/zaptel --builddir=$(TARGET_DIR) --usr-cc=$(TARGET_CC) --linux-vanilla --edac --silent --no-gcc-debug ; cd $(CWD)) touch $(WANPIPE_DIR)/.built $(WANPIPE_DIR)/$(WANPIPE_BINARY): $(WANPIPE_DIR)/.built - CWD=$(shell pwd) - (cd $(WANPIPE_DIR)&& CC=$(TARGET_CC) ./Setup install --arch=$(ARCH) --protocol=TDM --with-linux=$(BUILD_DIR)/linux \ - --zaptel-path=$(BUILD_DIR)/zaptel --builddir=$(STAGING_DIR) --usr-cc=$(TARGET_CC) --linux-vanilla --edac --silent --no-gcc-debug ; cd $(CWD)) + $(MAKE) -C $(WANPIPE_DIR)/util/wan_aftup CC=$(TARGET_CC) SYSINC=$(BUILD_DIR)/linux/include + $(MAKE) -C $(WANPIPE_DIR)/util/wancfg CC=$(TARGET_CC) SYSINC=$(BUILD_DIR)/linux/include ZAPINC=$(BUILD_DIR)/zaptel + $(MAKE) -C $(WANPIPE_DIR)/util/wancfg SYSINC=$(BUILD_DIR)/linux/include ZAPINC=$(BUILD_DIR)/zaptel WAN_VIRTUAL=$(TARGET_DIR) install + install -D -m 0755 $(WANPIPE_DIR)/util/wan_aftup/wan_aftup $(TARGET_DIR)/usr/sbin/wan_aftup + # rm -rf $(TARGET_DIR) + $(STRIP) $(TARGET_DIR)/$(WANPIPE_TARGET_BINARY) + $(STRIP) $(TARGET_DIR)/usr/sbin/wan_aftup + /sbin/depmod -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER) wanpipe: uclibc linux zaptel-unpack $(WANPIPE_DIR)/$(WANPIPE_BINARY) #zaptel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-07-12 18:28:38
|
Revision: 181 Author: krisk84 Date: 2006-07-12 11:28:30 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=181&view=rev Log Message: ----------- Asterisk postgres support Modified Paths: -------------- trunk/package/Config.in trunk/package/asterisk/Config.in trunk/package/asterisk/asterisk.mk Added Paths: ----------- trunk/package/asterisk/custom/ trunk/package/asterisk/custom/Makefile.patch trunk/package/libpq/ trunk/package/libpq/Config.in trunk/package/libpq/libpq.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2006-07-11 12:34:38 UTC (rev 180) +++ trunk/package/Config.in 2006-07-12 18:28:30 UTC (rev 181) @@ -78,6 +78,7 @@ source "package/libmad/Config.in" source "package/libpcap/Config.in" source "package/libpng/Config.in" +source "package/libpq/Config.in" source "package/libpri/Config.in" source "package/libsysfs/Config.in" source "package/libtool/Config.in" Modified: trunk/package/asterisk/Config.in =================================================================== --- trunk/package/asterisk/Config.in 2006-07-11 12:34:38 UTC (rev 180) +++ trunk/package/asterisk/Config.in 2006-07-12 18:28:30 UTC (rev 181) @@ -24,6 +24,14 @@ help Compile Asterisk with zaptel support +config BR2_PACKAGE_ASTERISK_LIBPQ_CUSTOM + bool "Asterisk Custom PostgreSQL Support" + default n + depends BR2_PACKAGE_ASTERISK + select BR2_PACKAGE_LIBPQ + help + Compile Asterisk with custom PostgreSQL support + config BR2_PACKAGE_ASTERISK_CHANSCCP bool "Asterisk chan_sccp Support" default n Modified: trunk/package/asterisk/asterisk.mk =================================================================== --- trunk/package/asterisk/asterisk.mk 2006-07-11 12:34:38 UTC (rev 180) +++ trunk/package/asterisk/asterisk.mk 2006-07-12 18:28:30 UTC (rev 181) @@ -20,6 +20,11 @@ ASTERISK_EXTRAS+=zaptel endif +ifeq ($(strip $(BR2_PACKAGE_ASTERISK_LIBPQ_CUSTOM)),y) +ASTERISK_EXTRAS :=$(ASTERISK_EXTRAS) +ASTERISK_EXTRAS+=libpq +endif + ifeq ($(strip $(BR2_PACKAGE_ASTERISK_LOWMEMORY)),y) ASTERISK_OPTIONS :=$(ASTERISK_OPTIONS) ASTERISK_OPTIONS+="-DLOW_MEMORY" @@ -34,6 +39,8 @@ touch $(ASTERISK_DIR)/.source $(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.source + cp package/asterisk/custom/*.c $(ASTERISK_DIR)/apps/ + patch $(ASTERISK_DIR)/apps/Makefile package/asterisk/custom/Makefile.patch touch $(ASTERISK_DIR)/.configured $(ASTERISK_DIR)/$(ASTERISK_BINARY): $(ASTERISK_DIR)/.configured @@ -66,7 +73,8 @@ chmod 640 $(TARGET_DIR)/stat/etc/asterisk/* ln -sf /tmp/etc/asterisk $(TARGET_DIR)/etc/asterisk ln -sf $(ASTERISK_DIR) $(BUILD_DIR)/asterisk - + cp -f package/asterisk/custom/*.conf $(TARGET_DIR)/stat/etc/asterisk/ + asterisk: uclibc libelf ncurses zlib openssl $(ASTERISK_EXTRAS) $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY) asterisk-source: $(DL_DIR)/$(ASTERISK_SOURCE) Added: trunk/package/asterisk/custom/Makefile.patch =================================================================== --- trunk/package/asterisk/custom/Makefile.patch (rev 0) +++ trunk/package/asterisk/custom/Makefile.patch 2006-07-12 18:28:30 UTC (rev 181) @@ -0,0 +1,11 @@ +13a14,15 +> ASTPWD:=$(shell pwd) +> +37c39 +< #APPS+=app_sql_postgres.so +--- +> APPS+=app_sql_postgres.so +109c111 +< $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq +--- +> $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L$(ASTPWD)/../../root/lib -lpq Added: trunk/package/libpq/Config.in =================================================================== --- trunk/package/libpq/Config.in (rev 0) +++ trunk/package/libpq/Config.in 2006-07-12 18:28:30 UTC (rev 181) @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LIBPQ + bool "libpq" + default n + help + PostgreSQL Interface + Added: trunk/package/libpq/libpq.mk =================================================================== --- trunk/package/libpq/libpq.mk (rev 0) +++ trunk/package/libpq/libpq.mk 2006-07-12 18:28:30 UTC (rev 181) @@ -0,0 +1,77 @@ +############################################################# +# +# postgresql library +# +############################################################# +LIBPQ_VERSION := 8.1.4 +LIBPQ_SOURCE := postgresql-$(LIBPQ_VERSION).tar.gz +LIBPQ_SITE := ftp://ftp2.nl.postgresql.org/mirror/postgresql/source/v$(LIBPQ_VERSION) +LIBPQ_DIR := $(BUILD_DIR)/postgresql-$(LIBPQ_VERSION) + +$(DL_DIR)/$(LIBPQ_SOURCE): + $(WGET) -P $(DL_DIR) $(LIBPQ_SITE)/$(LIBPQ_SOURCE) + +$(LIBPQ_DIR)/.source: $(DL_DIR)/$(LIBPQ_SOURCE) + zcat $(DL_DIR)/$(LIBPQ_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + # toolchain/patch-kernel.sh $(LIBPQ_DIR) package/postgresql/ postgresql\*.patch + touch $(LIBPQ_DIR)/.source + +$(LIBPQ_DIR)/.configured: $(LIBPQ_DIR)/.source + @mkdir -p $(STAGING_DIR)/usr/local/pgsql + (cd $(LIBPQ_DIR); \ + ./configure \ + --prefix=$(STAGING_DIR)/usr/local/pgsql \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --disable-rpath \ + --disable-largefile \ + --enable-static \ + --without-docdir \ + --without-java \ + --without-krb4 \ + --without-krb5 \ + --without-openssl \ + --without-pam \ + --without-perl \ + --without-python \ + --without-readline \ + --without-rendezvous \ + --without-tcl \ + --without-tk \ + --without-zlib \ + ); + touch $(LIBPQ_DIR)/.configured + +$(LIBPQ_DIR)/.build: $(LIBPQ_DIR)/.configured + $(MAKE1) -C $(LIBPQ_DIR)/src/include OSARCH=Linux CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) INSTALL_BASE=/ $(TARGET_CONFIGURE_OPTS) + $(MAKE1) -C $(LIBPQ_DIR)/src/interfaces/libpq OSARCH=Linux CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) INSTALL_BASE=/ $(TARGET_CONFIGURE_OPTS) + touch $(LIBPQ_DIR)/.build + +$(LIBPQ_DIR)/.installed: $(LIBPQ_DIR)/.build + $(MAKE1) -C $(LIBPQ_DIR)/src/include OSARCH=Linux CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) $(TARGET_CONFIGURE_OPTS) \ + INSTALL_BASE=/ INSTALL_PREFIX=$(STAGING_DIR) install + $(MAKE1) -C $(LIBPQ_DIR)/src/interfaces/libpq OSARCH=Linux CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) $(TARGET_CONFIGURE_OPTS) \ + INSTALL_BASE=/ INSTALL_PREFIX=$(STAGING_DIR) install + cp -a $(STAGING_DIR)/usr/local/pgsql/lib/libpq* $(TARGET_DIR)/lib + touch -c $(LIBPQ_DIR)/.installed + +libpq: uclibc $(LIBPQ_DIR)/.installed + +libpq-source: $(DL_DIR)/$(LIBPQ_SOURCE) + +libpq-clean: + rm -Rf $(STAGING_DIR)/lib/libpq* + -$(MAKE) -C $(LIBPQ_DIR) clean + +libpq-dirclean: + rm -rf $(LIBPQ_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_LIBPQ)),y) +TARGETS+=libpq +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-07-19 18:45:26
|
Revision: 182 Author: krisk84 Date: 2006-07-19 11:45:13 -0700 (Wed, 19 Jul 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=182&view=rev Log Message: ----------- new asterisk, zaptel, pptpd support Modified Paths: -------------- trunk/package/Config.in trunk/package/asterisk/asterisk.mk trunk/package/ipsec-tools/ipsec-tools.mk trunk/package/zaptel/zaptel-makefile0.patch trunk/package/zaptel/zaptel.mk Added Paths: ----------- trunk/package/pptpd/ trunk/package/pptpd/Config.in trunk/package/pptpd/pptpd.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2006-07-12 18:28:30 UTC (rev 181) +++ trunk/package/Config.in 2006-07-19 18:45:13 UTC (rev 182) @@ -124,6 +124,7 @@ source "package/portage/Config.in" source "package/portmap/Config.in" source "package/pppd/Config.in" +source "package/pptpd/Config.in" source "package/procps/Config.in" source "package/psmisc/Config.in" source "package/python/Config.in" Modified: trunk/package/asterisk/asterisk.mk =================================================================== --- trunk/package/asterisk/asterisk.mk 2006-07-12 18:28:30 UTC (rev 181) +++ trunk/package/asterisk/asterisk.mk 2006-07-19 18:45:13 UTC (rev 182) @@ -3,7 +3,7 @@ # asterisk # ############################################################## -ASTERISK_VERSION := 1.2.9.1 +ASTERISK_VERSION := 1.2.10 ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz ASTERISK_SITE := ftp://ftp.digium.com/pub/asterisk ASTERISK_DIR := $(BUILD_DIR)/asterisk-$(ASTERISK_VERSION) @@ -39,8 +39,10 @@ touch $(ASTERISK_DIR)/.source $(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.source +ifeq ($(strip $(BR2_PACKAGE_ASTERISK_LIBPQ_CUSTOM)),y) cp package/asterisk/custom/*.c $(ASTERISK_DIR)/apps/ - patch $(ASTERISK_DIR)/apps/Makefile package/asterisk/custom/Makefile.patch + toolchain/patch-kernel.sh package/asterisk/custom/\*.patch +endif touch $(ASTERISK_DIR)/.configured $(ASTERISK_DIR)/$(ASTERISK_BINARY): $(ASTERISK_DIR)/.configured @@ -73,7 +75,9 @@ chmod 640 $(TARGET_DIR)/stat/etc/asterisk/* ln -sf /tmp/etc/asterisk $(TARGET_DIR)/etc/asterisk ln -sf $(ASTERISK_DIR) $(BUILD_DIR)/asterisk +ifeq ($(strip $(BR2_PACKAGE_ASTERISK_LIBPQ_CUSTOM)),y) cp -f package/asterisk/custom/*.conf $(TARGET_DIR)/stat/etc/asterisk/ +endif asterisk: uclibc libelf ncurses zlib openssl $(ASTERISK_EXTRAS) $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY) Modified: trunk/package/ipsec-tools/ipsec-tools.mk =================================================================== --- trunk/package/ipsec-tools/ipsec-tools.mk 2006-07-12 18:28:30 UTC (rev 181) +++ trunk/package/ipsec-tools/ipsec-tools.mk 2006-07-19 18:45:13 UTC (rev 182) @@ -4,7 +4,7 @@ # ############################################################# -IPSEC_TOOLS_VER:=0.6.1 +IPSEC_TOOLS_VER:=0.6.6 IPSEC_TOOLS_SOURCE:=ipsec-tools-$(IPSEC_TOOLS_VER).tar.bz2 IPSEC_TOOLS_DIR:=$(BUILD_DIR)/ipsec-tools-$(IPSEC_TOOLS_VER) @@ -79,6 +79,7 @@ --sysconfdir=/etc \ --disable-hybrid \ --without-libpam \ + --enable-dpd \ --disable-gssapi \ --with-kernel-headers=$(STAGING_DIR)/include \ $(IPSEC_TOOLS_CONFIG_FLAGS) \ Added: trunk/package/pptpd/Config.in =================================================================== --- trunk/package/pptpd/Config.in (rev 0) +++ trunk/package/pptpd/Config.in 2006-07-19 18:45:13 UTC (rev 182) @@ -0,0 +1,5 @@ +config BR2_PACKAGE_PPTPD + bool "pptpd" + default y + help + poptop PPTP daemon Added: trunk/package/pptpd/pptpd.mk =================================================================== --- trunk/package/pptpd/pptpd.mk (rev 0) +++ trunk/package/pptpd/pptpd.mk 2006-07-19 18:45:13 UTC (rev 182) @@ -0,0 +1,63 @@ +############################################################# +# +# pptpd +# +############################################################# +PPTPD_SOURCE:=pptpd-1.3.2.tar.gz +PPTPD_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/poptop/ +PPTPD_DIR:=$(BUILD_DIR)/pptpd-1.3.2 +PPTPD_CAT:=zcat +PPTPD_BINARY:=pptpd +PPTPD_TARGET_BINARY:=usr/sbin/pptpd + + +$(DL_DIR)/$(PPTPD_SOURCE): + $(WGET) -P $(DL_DIR) $(PPTPD_SITE)/$(PPTPD_SOURCE) + + +pptpd-source: $(DL_DIR)/$(PPTPD_SOURCE) + +$(PPTPD_DIR)/.source: $(DL_DIR)/$(PPTPD_SOURCE) $(DL_DIR)/$(PPTPD_PATCH) + zcat $(DL_DIR)/$(PPTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(PPTPD_DIR)/.source + + +$(PPTPD_DIR)/.configured: $(PPTPD_DIR)/.source + (cd $(PPTPD_DIR); \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --sysconfdir=/etc \ + ); + touch $(PPTPD_DIR)/.configured; + +$(PPTPD_DIR)/$(PPTPD_BINARY): $(PPTPD_DIR)/.configured + $(MAKE) CC=$(TARGET_CC) -C $(PPTPD_DIR) + +$(TARGET_DIR)/$(PPTPD_TARGET_BINARY): $(PPTPD_DIR)/$(PPTPD_BINARY) + $(MAKE) prefix=$(TARGET_DIR)/usr -C $(PPTPD_DIR) install + cp $(PPTPD_DIR)/samples/pptpd.conf $(TARGET_DIR)/etc/pptpd.conf + rm -Rf $(TARGET_DIR)/usr/man + +pptpd: uclibc $(TARGET_DIR)/$(PPTPD_TARGET_BINARY) + +pptpd-clean: + $(MAKE) DESTDIR=$(TARGET_DIR) -C $(PPTPD_DIR) uninstall + -$(MAKE) -C $(PPTPD_DIR) clean + +pptpd-dirclean: + rm -rf $(PPTPD_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_PPTPD)),y) +TARGETS+=pptpd +endif + Modified: trunk/package/zaptel/zaptel-makefile0.patch =================================================================== --- trunk/package/zaptel/zaptel-makefile0.patch 2006-07-12 18:28:30 UTC (rev 181) +++ trunk/package/zaptel/zaptel-makefile0.patch 2006-07-19 18:45:13 UTC (rev 182) @@ -1,15 +1,14 @@ -diff -ur zaptel-1.2.6.orig/Makefile zaptel-1.2.6/Makefile ---- zaptel-1.2.6.orig/Makefile 2006-05-22 19:11:36.000000000 -0400 -+++ zaptel-1.2.6/Makefile 2006-06-01 11:36:09.000000000 -0400 +--- zaptel-1.2.7.orig/Makefile 2006-07-07 14:03:59.000000000 -0400 ++++ zaptel-1.2.7/Makefile 2006-07-18 09:57:52.000000000 -0400 @@ -45,6 +45,7 @@ + + KFLAGS+=-DSTANDALONE_ZAPATA CFLAGS+=-DSTANDALONE_ZAPATA ++INSTALL_BASE=/usr KMAKE:= $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) KMAKE_INST:= $(KMAKE) INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install -+INSTALL_BASE=/usr - EXTRA_CFLAGS:=-I$(src) - ROOT_PREFIX= -@@ -121,7 +122,7 @@ +@@ -124,7 +125,7 @@ obj-m+=xpp/ endif @@ -18,7 +17,7 @@ ZTTOOL:=zttool endif BINS=ztcfg torisatool makefw ztmonitor ztspeed $(ZTTOOL) zttest fxotune -@@ -188,13 +189,13 @@ +@@ -197,13 +198,13 @@ $(CC) -o $@ $^ tones.h: gendigits @@ -35,7 +34,7 @@ gendigits: gendigits.o $(CC) -o $@ $^ -lm -@@ -322,25 +323,25 @@ +@@ -336,25 +337,25 @@ rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxsusb.o; \ fi; \ rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o Modified: trunk/package/zaptel/zaptel.mk =================================================================== --- trunk/package/zaptel/zaptel.mk 2006-07-12 18:28:30 UTC (rev 181) +++ trunk/package/zaptel/zaptel.mk 2006-07-19 18:45:13 UTC (rev 182) @@ -3,7 +3,7 @@ # zaptel # ############################################################## -ZAPTEL_VERSION := 1.2.6 +ZAPTEL_VERSION := 1.2.7 ZAPTEL_SOURCE := zaptel-$(ZAPTEL_VERSION).tar.gz ZAPTEL_SITE := ftp://ftp.digium.com/pub/zaptel ZAPTEL_DIR := $(BUILD_DIR)/zaptel-$(ZAPTEL_VERSION) @@ -44,12 +44,12 @@ touch $(ZAPTEL_DIR)/.configured $(ZAPTEL_DIR)/$(ZAPTEL_BINARY): $(ZAPTEL_DIR)/.configured - # CWD=$(shell pwd) - # cd $(ZAPTEL_DIR) - $(MAKE1) -C $(ZAPTEL_DIR) CC=gcc makefw gendigits #hack + #CWD=$(shell pwd) + #cd $(ZAPTEL_DIR) + $(MAKE1) -C $(ZAPTEL_DIR) CC=gcc makefw gendigits fw2h #hack $(MAKE1) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) \ $(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" ZTTOOL=zttool INSTALL_BASE=/ - # cd $(CWD) + #cd $(CWD) $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY): $(ZAPTEL_DIR)/$(ZAPTEL_BINARY) mkdir -p $(STAGING_DIR)/etc/udev/rules.d #hack to get install to work... @@ -62,7 +62,7 @@ cp -a $(STAGING_DIR)/lib/libtone*so* $(TARGET_DIR)/lib/ cp -a $(STAGING_DIR)/$(ZAPTEL_TARGET_BINARY) $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY) cp -a $(STAGING_DIR)/sbin/zttool $(TARGET_DIR)/sbin/zttool - install -D -m 0755 $(ZAPTEL_DIR)/ztmonitor $(TARGET_DIR)/sbin/ztmonito + install -D -m 0755 $(ZAPTEL_DIR)/ztmonitor $(TARGET_DIR)/sbin/ztmonitor -$(STRIP) -g $(TARGET_DIR)/lib/modules/$(LINUX_VER)/misc/*.ko -$(STRIP) -g $(TARGET_DIR)/lib/libtone* -$(STRIP) -g $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dha...@us...> - 2006-08-11 15:31:50
|
Revision: 229 Author: dhartman Date: 2006-08-11 08:31:17 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=229&view=rev Log Message: ----------- merge changes from trunk Modified Paths: -------------- trunk/package/Config.in trunk/package/acpid/acpid.mk trunk/package/file/file.mk trunk/package/iptables/iptables.init trunk/package/iptables/iptables.mk trunk/target/generic/target_skeleton/etc/init.d/misc Added Paths: ----------- trunk/package/acpid/acpid.init trunk/package/iaxmodem/ trunk/package/iaxmodem/Config.in trunk/package/iaxmodem/iaxmodem.mk trunk/package/iptables/arno-iptables-firewall.conf trunk/package/libtiff/ trunk/package/libtiff/Config.in trunk/package/libtiff/libtiff.mk trunk/package/openvpn/openvpn.init trunk/target/generic/target_skeleton/etc/openvpn.conf trunk/target/generic/target_skeleton/etc/runlevels/default/K26openvpn trunk/target/generic/target_skeleton/etc/runlevels/default/S02iptables trunk/target/generic/target_skeleton/etc/runlevels/default/S03network trunk/target/generic/target_skeleton/etc/runlevels/default/S04ntpclient trunk/target/generic/target_skeleton/etc/runlevels/default/S14openvpn trunk/target/generic/target_skeleton/etc/runlevels/default/S24acpid Removed Paths: ------------- trunk/package/iaxmodem/Config.in trunk/package/iaxmodem/iaxmodem.mk trunk/package/libtiff/Config.in trunk/package/libtiff/libtiff.mk trunk/target/generic/target_skeleton/etc/runlevels/default/S02network trunk/target/generic/target_skeleton/etc/runlevels/default/S03ntpclient Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2006-08-11 07:04:51 UTC (rev 228) +++ trunk/package/Config.in 2006-08-11 15:31:17 UTC (rev 229) @@ -61,6 +61,7 @@ source "package/gzip/Config.in" source "package/hostap/Config.in" source "package/hotplug/Config.in" +source "package/iaxmodem/Config.in" source "package/inadyn/Config.in" source "package/iostat/Config.in" source "package/iproute2/Config.in" @@ -81,6 +82,7 @@ source "package/libpq/Config.in" source "package/libpri/Config.in" source "package/libsysfs/Config.in" +source "package/libtiff/Config.in" source "package/libtool/Config.in" source "package/libusb/Config.in" source "package/lighttpd/Config.in" Copied: trunk/package/acpid/acpid.init (from rev 228, branches/dhartman/package/acpid/acpid.init) =================================================================== --- trunk/package/acpid/acpid.init (rev 0) +++ trunk/package/acpid/acpid.init 2006-08-11 15:31:17 UTC (rev 229) @@ -0,0 +1,45 @@ +#!/bin/sh + +. /etc/rc.conf + +start () { +if [ -x /usr/sbin/acpid ] +then +echo "Starting acpid..." +/usr/sbin/acpid +fi +} + +stop () { +if `ps | grep -q acpid` +then +echo "Stopping acpid..." +killall acpid 2> /dev/null +fi +} + +case $1 in + +start) +start +;; + +stop) +stop +;; + +init) +start +;; + +restart) +stop +sleep 2 +start +;; + +*) +echo "Usage: start|stop|restart" +;; + +esac Property changes on: trunk/package/acpid/acpid.init ___________________________________________________________________ Name: svn:executable + * Modified: trunk/package/acpid/acpid.mk =================================================================== --- trunk/package/acpid/acpid.mk 2006-08-11 07:04:51 UTC (rev 228) +++ trunk/package/acpid/acpid.mk 2006-08-11 15:31:17 UTC (rev 229) @@ -26,6 +26,7 @@ mkdir -p $(TARGET_DIR)/etc/acpi/events echo -e "event=button[ /]power\naction=/sbin/poweroff" > $(TARGET_DIR)/etc/acpi/events/powerbtn touch -c $(TARGET_DIR)/usr/sbin/acpid + $(INSTALL) -D -m 0755 package/acpid/acpid.init $(TARGET_DIR)/etc/init.d/acpid acpid: $(TARGET_DIR)/usr/sbin/acpid @@ -33,6 +34,9 @@ acpid-clean: -make -C $(ACPID_DIR) clean + rm -f $(TARGET_DIR)/usr/sbin/acpid + rm -f $(TARGET_DIR)/etc/init.d/acpid + rm -rf $(TARGET_DIR)/etc/acpi acpid-dirclean: rm -rf $(ACPID_DIR) Modified: trunk/package/file/file.mk =================================================================== --- trunk/package/file/file.mk 2006-08-11 07:04:51 UTC (rev 228) +++ trunk/package/file/file.mk 2006-08-11 15:31:17 UTC (rev 229) @@ -3,7 +3,7 @@ # file # ############################################################# -FILE_VER:=4.15 +FILE_VER:=4.17 FILE_SOURCE:=file-$(FILE_VER).tar.gz FILE_SITE:=ftp://ftp.astron.com/pub/file FILE_DIR1:=$(TOOL_BUILD_DIR)/file-$(FILE_VER) Copied: trunk/package/iaxmodem (from rev 228, branches/dhartman/package/iaxmodem) Deleted: trunk/package/iaxmodem/Config.in =================================================================== --- branches/dhartman/package/iaxmodem/Config.in 2006-08-11 07:04:51 UTC (rev 228) +++ trunk/package/iaxmodem/Config.in 2006-08-11 15:31:17 UTC (rev 229) @@ -1,9 +0,0 @@ -config BR2_PACKAGE_IAXMODEM - bool "iaxmodem" - default n - select BR2_PACKAGE_LIBTIFF - help - iaxmodem simulator for use with Asterisk - WARNING: currently does not compile - - http://iaxmodem.sf.net Copied: trunk/package/iaxmodem/Config.in (from rev 228, branches/dhartman/package/iaxmodem/Config.in) =================================================================== --- trunk/package/iaxmodem/Config.in (rev 0) +++ trunk/package/iaxmodem/Config.in 2006-08-11 15:31:17 UTC (rev 229) @@ -0,0 +1,9 @@ +config BR2_PACKAGE_IAXMODEM + bool "iaxmodem" + default n + select BR2_PACKAGE_LIBTIFF + help + iaxmodem simulator for use with Asterisk + WARNING: currently does not compile + + http://iaxmodem.sf.net Deleted: trunk/package/iaxmodem/iaxmodem.mk =================================================================== --- branches/dhartman/package/iaxmodem/iaxmodem.mk 2006-08-11 07:04:51 UTC (rev 228) +++ trunk/package/iaxmodem/iaxmodem.mk 2006-08-11 15:31:17 UTC (rev 229) @@ -1,91 +0,0 @@ -############################################################# -# -# iaxmodem (text based web browser) -# -############################################################# -IAXMODEM_VER:=0.1.14 -IAXMODEM_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/iaxmodem/ -IAXMODEM_SOURCE:=iaxmodem-$(IAXMODEM_VER).tar.gz -IAXMODEM_DIR:=$(BUILD_DIR)/iaxmodem-$(IAXMODEM_VER) -IAXMODEM_BINARY:=iaxmodem -IAXMODEM_TARGET_BINARY:=usr/sbin/iaxmodem - -$(DL_DIR)/$(IAXMODEM_SOURCE): - $(WGET) -P $(DL_DIR) $(IAXMODEM_SITE)/$(IAXMODEM_SOURCE) - -iaxmodem-source: $(DL_DIR)/$(IAXMODEM_SOURCE) - -$(IAXMODEM_DIR)/.unpacked: $(DL_DIR)/$(IAXMODEM_SOURCE) - zcat $(DL_DIR)/$(IAXMODEM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(IAXMODEM_DIR)/.unpacked - -# must compile spandsp first -$(IAXMODEM_DIR)/lib/spandsp/.configured: $(IAXMODEM_DIR)/.unpacked - (cd $(IAXMODEM_DIR)/lib/spandsp; rm -rf config.cache; \ - $(TARGET_CONFIG_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - ); - touch $(IAXMODEM_DIR)/lib/spandsp/.configured - -$(IAXMODEM_DIR)/lib/spandsp/.compiled: $(IAXMODEM_DIR)/lib/spandsp/.configured - $(MAKE) CC=$(TARGET_CC) -C $(IAXMODEM_DIR)/lib/spandsp - $(STRIP) $(IAXMODEM_DIR)/lib/spandsp/src/.lib/libspandsp.a - touch $(IAXMODEM_DIR)/lib/spandsp/.compiled - -# then must compile libiax - - -$(IAXMODEM_DIR)/lib/libiax2/.configured: $(IAXMODEM_DIR)/lib/spandsp/.compiled -#$(IAXMODEM_DIR)/lib/libiax2/.configured: $(IAXMODEM_DIR)/.unpacked - (cd $(IAXMODEM_DIR)/lib/libiax2; rm -rf config.cache; \ - $(TARGET_CONFIG_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - ); - touch $(IAXMODEM_DIR)/lib/libiax2/.configured - -$(IAXMODEM_DIR)/lib/libiax2/.compiled: $(IAXMODEM_DIR)/lib/libiax2/.configured - $(MAKE) CC=$(TARGET_CC) -C $(IAXMODEM_DIR)/lib/libiax2 - $(STRIP) $(IAXMODEM_DIR)/lib/libiax2/src/.lib/libiax.a - touch $(IAXMODEM_DIR)/lib/libiax2/.compiled - -# then compile iaxmodem - -#$(IAXMODEM_DIR)/$(IAXMODEM_BINARY): $(IAXMODEM_DIR)/lib/libiax2/.compiled $(IAXMODEM_DIR)/lib/spandsp/.compiled -$(IAXMODEM_DIR)/$(IAXMODEM_BINARY): $(IAXMODEM_DIR)/lib/libiax2/.compiled - (cd $(IAXMODEM_DIR); \ - $(TARGET_CC) -Wall -O2 -g -DSTATICLIBS -D_GNU_SOURCE -std=c99 \ - -Ilib/libiax2/src -Ilib/spandsp/src -c -o iaxmodem.o iaxmodem.c; \ - $(TARGET_CC) -lm -lutil -o iaxmodem iaxmodem.o \ - lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a \ - $(TARGET_DIR)/usr/lib/libtiff.so \ - ); - $(STRIP) $(IAXMODEM_DIR)/$(IAXMODEM_BINARY) - -$(TARGET_DIR)/$(IAXMODEM_TARGET_BINARY): $(IAXMODEM_DIR)/$(IAXMODEM_BINARY) - install -c $(IAXMODEM_DIR)/$(IAXMODEM_BINARY) $(TARGET_DIR)/$(IAXMODEM_TARGET_BINARY) - -iaxmodem-clean: - $(MAKE) -C $(IAXMODEM_DIR)/lib/spandsp clean - $(MAKE) -C $(IAXMODEM_DIR)/lib/libiax2 clean - -iaxmodem-dirclean: - rm -rf $(IAXMODEM_DIR) - -iaxmodem: uclibc $(TARGET_DIR)/$(IAXMODEM_TARGET_BINARY) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(strip $(BR2_PACKAGE_IAXMODEM)),y) -TARGETS+=iaxmodem -endif Copied: trunk/package/iaxmodem/iaxmodem.mk (from rev 228, branches/dhartman/package/iaxmodem/iaxmodem.mk) =================================================================== --- trunk/package/iaxmodem/iaxmodem.mk (rev 0) +++ trunk/package/iaxmodem/iaxmodem.mk 2006-08-11 15:31:17 UTC (rev 229) @@ -0,0 +1,91 @@ +############################################################# +# +# iaxmodem (text based web browser) +# +############################################################# +IAXMODEM_VER:=0.1.14 +IAXMODEM_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/iaxmodem/ +IAXMODEM_SOURCE:=iaxmodem-$(IAXMODEM_VER).tar.gz +IAXMODEM_DIR:=$(BUILD_DIR)/iaxmodem-$(IAXMODEM_VER) +IAXMODEM_BINARY:=iaxmodem +IAXMODEM_TARGET_BINARY:=usr/sbin/iaxmodem + +$(DL_DIR)/$(IAXMODEM_SOURCE): + $(WGET) -P $(DL_DIR) $(IAXMODEM_SITE)/$(IAXMODEM_SOURCE) + +iaxmodem-source: $(DL_DIR)/$(IAXMODEM_SOURCE) + +$(IAXMODEM_DIR)/.unpacked: $(DL_DIR)/$(IAXMODEM_SOURCE) + zcat $(DL_DIR)/$(IAXMODEM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(IAXMODEM_DIR)/.unpacked + +# must compile spandsp first +$(IAXMODEM_DIR)/lib/spandsp/.configured: $(IAXMODEM_DIR)/.unpacked + (cd $(IAXMODEM_DIR)/lib/spandsp; rm -rf config.cache; \ + $(TARGET_CONFIG_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + ); + touch $(IAXMODEM_DIR)/lib/spandsp/.configured + +$(IAXMODEM_DIR)/lib/spandsp/.compiled: $(IAXMODEM_DIR)/lib/spandsp/.configured + $(MAKE) CC=$(TARGET_CC) -C $(IAXMODEM_DIR)/lib/spandsp + $(STRIP) $(IAXMODEM_DIR)/lib/spandsp/src/.lib/libspandsp.a + touch $(IAXMODEM_DIR)/lib/spandsp/.compiled + +# then must compile libiax + + +$(IAXMODEM_DIR)/lib/libiax2/.configured: $(IAXMODEM_DIR)/lib/spandsp/.compiled +#$(IAXMODEM_DIR)/lib/libiax2/.configured: $(IAXMODEM_DIR)/.unpacked + (cd $(IAXMODEM_DIR)/lib/libiax2; rm -rf config.cache; \ + $(TARGET_CONFIG_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + ); + touch $(IAXMODEM_DIR)/lib/libiax2/.configured + +$(IAXMODEM_DIR)/lib/libiax2/.compiled: $(IAXMODEM_DIR)/lib/libiax2/.configured + $(MAKE) CC=$(TARGET_CC) -C $(IAXMODEM_DIR)/lib/libiax2 + $(STRIP) $(IAXMODEM_DIR)/lib/libiax2/src/.lib/libiax.a + touch $(IAXMODEM_DIR)/lib/libiax2/.compiled + +# then compile iaxmodem + +#$(IAXMODEM_DIR)/$(IAXMODEM_BINARY): $(IAXMODEM_DIR)/lib/libiax2/.compiled $(IAXMODEM_DIR)/lib/spandsp/.compiled +$(IAXMODEM_DIR)/$(IAXMODEM_BINARY): $(IAXMODEM_DIR)/lib/libiax2/.compiled + (cd $(IAXMODEM_DIR); \ + $(TARGET_CC) -Wall -O2 -g -DSTATICLIBS -D_GNU_SOURCE -std=c99 \ + -Ilib/libiax2/src -Ilib/spandsp/src -c -o iaxmodem.o iaxmodem.c; \ + $(TARGET_CC) -lm -lutil -o iaxmodem iaxmodem.o \ + lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a \ + $(TARGET_DIR)/usr/lib/libtiff.so \ + ); + $(STRIP) $(IAXMODEM_DIR)/$(IAXMODEM_BINARY) + +$(TARGET_DIR)/$(IAXMODEM_TARGET_BINARY): $(IAXMODEM_DIR)/$(IAXMODEM_BINARY) + install -c $(IAXMODEM_DIR)/$(IAXMODEM_BINARY) $(TARGET_DIR)/$(IAXMODEM_TARGET_BINARY) + +iaxmodem-clean: + $(MAKE) -C $(IAXMODEM_DIR)/lib/spandsp clean + $(MAKE) -C $(IAXMODEM_DIR)/lib/libiax2 clean + +iaxmodem-dirclean: + rm -rf $(IAXMODEM_DIR) + +iaxmodem: uclibc $(TARGET_DIR)/$(IAXMODEM_TARGET_BINARY) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_IAXMODEM)),y) +TARGETS+=iaxmodem +endif Copied: trunk/package/iptables/arno-iptables-firewall.conf (from rev 228, branches/dhartman/package/iptables/arno-iptables-firewall.conf) =================================================================== --- trunk/package/iptables/arno-iptables-firewall.conf (rev 0) +++ trunk/package/iptables/arno-iptables-firewall.conf 2006-08-11 15:31:17 UTC (rev 229) @@ -0,0 +1,961 @@ +############################################################################### +# Modified by Darrick Hartman for use with Astlinux # +# basic settings in rc.conf. # +# These settings are commented out with two ## example ## EXT_IF="ppp+" # +# Make advanced setting in /mnt/kd/firewall.conf # +############################################################################### + +# --------------------------- Configuration file ------------------------------ +# -= Arno's iptables firewall =- +# Single- & multi-homed firewall script with DSL/ADSL support +# +# (C) Copyright 2001-2006 by Arno van Amersfoort +# Homepage : http://rocky.eld.leidenuniv.nl/ +# Freshmeat : http://freshmeat.net/projects/iptables-firewall/?topic_id=151 +# Email : arnova AT rocky DOT eld DOT leidenuniv DOT nl +# (note: you must remove all spaces and substitute the @ and the . +# at the proper locations!) +# ----------------------------------------------------------------------------- +# 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 2 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, write to the Free Software Foundation Inc., 59 Temple +# Place - Suite 330, Boston, MA 02111-1307, USA. +# ----------------------------------------------------------------------------- + +## Astlinux mod ## +# source rc.conf for basic settings + +. /etc/rc.conf + +# Location of the iptables-binary (use 'locate iptables' or 'whereis iptables' +# to manually locate it). +# ----------------------------------------------------------------------------- +IPTABLES="/usr/sbin/iptables" + +############################################################################### +# External (internet) interface settings # +############################################################################### + +# The external interface(s) that will be protected (and used as internet +# connection). This is probably ppp+ for non-transparent(!) (A)DSL modems +# otherwise it should be "ethX" (eg. eth0). Multiple interfaces should be space +# separated. +# ----------------------------------------------------------------------------- +##EXT_IF="ppp+" + +# Enable if THIS machines (dynamically) obtains its IP through DHCP (from your +# ISP). +# ----------------------------------------------------------------------------- +##EXT_IF_DHCP_IP=0 + +# (EXPERT SETTING!) Here you can specify your external(!) subnet(s). You should +# only use this if you for example have a corporate network and/or running a +# DHCP server on your external(!) interface. Home users should normally NOT +# touch this setting. Multiple subnets should be space separated. +# Don't forget to specify a proper subnet masker (eg. /24, /16 or /8)! +# ----------------------------------------------------------------------------- +EXTERNAL_NET="" + +# (EXPERT SETTING!) Here you can specify the IP address used for broadcasts +# on your external subnet. You only need to set this option if you want to use +# the BROADCAST_XXX_NOLOG variables AND you use a non-standard broadcast +# address (not *.255.255.255, *.*.255.255 or *.*.*.255)! So normally leaving +# this empty should work fine. Multiple addresses (if you have more than one +# external interface) should be space separated. +# ----------------------------------------------------------------------------- +EXT_NET_BCAST_ADDRESS="" + +# Enable this if THIS MACHINE is running a DHCP(BOOTP) server for a subnet on +# the external(!) interface. Note that you don't need this for internal +# subnets, as for these nets everything is accepted by default. Don't forget to +# configure the EXTERNAL_NET variable, to make this work. +# ----------------------------------------------------------------------------- +EXTERNAL_DHCP_SERVER=0 + + +############################################################################### +# Internal (LAN) interface settings # +############################################################################### + +# Internal network interface or interfaces (multiple(!) interfaces should be +# space separated). Remark this if you don't have any internal network +# interfaces. Note that ALL traffic is accepted from these interfaces. +# ----------------------------------------------------------------------------- +##INT_IF="" + +# Specify here the internal subnet which is connected to the internal interface +# (INT_IF). For multiple interfaces(!) you can either specify multiple subnets +# here or specify one big subnet for all internal interfaces. +# ----------------------------------------------------------------------------- +##INTERNAL_NET="192.168.0.0/24" + +# (EXPERT SETTING!) Here you can specify the IP address used for broadcasts +# on your internal subnet. You only need to set this option if you want to use +# the MAC filter AND you use a non-standard broadcast address +# (not *.255.255.255, *.*.255.255 or *.*.*.255)! So normally leaving +# this empty should work fine. Multiple addresses (if you have more than one +# external interface) should be space separated. +# ----------------------------------------------------------------------------- +INT_NET_BCAST_ADDRESS="" + +# Uncomment & specify here the location of the file that contains the MAC +# addresses of INTERNAL hosts that are allowed. The MAC addresses should be +# written like 00:11:22:33:44:55 +# Note that the last line of this +# file should always contain a carriage-return (enter)! +# ----------------------------------------------------------------------------- +#MAC_ADDRESS_FILE=/etc/arno-firewall-mac-addresses + + +############################################################################### +# DMZ (aka DeMilitarized Zone) settings # +############################################################################### + +# Put in the following variable the network interfaces that are DMZ-classified. +# You can also use this interface if you want to shield your Wireless network +# from your LAN. +# ----------------------------------------------------------------------------- +##DMZ_IF="" + +# Specify here the subnet which is connected to the DMZ interface (DMZ_IF). +# For multiple interfaces(!) you can either specify multiple subnets here or +# specify one big subnet for all DMZ interfaces. +# ----------------------------------------------------------------------------- +##DMZ_NET="" + + +############################################################################### +# NAT (Masquerade, SNAT, DNAT) settings # +############################################################################### + +# Enable this if you want to perform NAT (masquerading) for your internal +# network (LAN) (eg. share your internet connection with your internal +# net(s) connected to eg. INT_IF). +# ----------------------------------------------------------------------------- +##NAT=0 + +# (EXPERT SETTING!). By default only the first external interface (EXT_IF) +# is used for masquerading (NAT). By enabling this option ALL external +# interfaces *can* be used (load balancing / multi-route). Note that you should +# properly configure your route-table to make this work. Check the INSTALL file +# for more info. +# ----------------------------------------------------------------------------- +MASQ_MULTI_ROUTE=0 + +# (EXPERT SETTING!). In case you would like to use SNAT instead of +# MASQUERADING then uncomment and set the IP or IP's here of your static +# external address(es). Note that when multiple IP's are specified, SNAT +# multiroute is enabled (load balancing over multiple external (internet) +# interfaces, check the README file for more info). Note that the order of IP's +# should match the order of interfaces (they belond to) in $EXT_IF! +# ----------------------------------------------------------------------------- +#NAT_STATIC_IP="193.2.1.1" + +# (EXPERT SETTING!). Use this variable only if you want specific subnets or +# hosts to be able to access the internet. When no value is specified, your +# whole internal net will have access. In both cases it's obviously only +# meaningful when NAT is enabled. Note that you can also use this variable if +# you want to use NAT for your DMZ. +# ----------------------------------------------------------------------------- +NAT_INTERNAL_NET="$INTERNAL_NET" + +# NAT TCP/UDP/IP forwards. Forward ports or protocols from the gateway to +# an internal client through (D)NAT. Note that you can also use these +# variables to forward ports to DMZ hosts +# +# TCP/UDP form: +# "{SRCIP1,SRCIP2,...:}PORT1,PORT2-PORT3,...>DESTIP1{:port} \ +# {SRCIP3,...:}PORT3,...>DESTIP2:port}" +# +# IP form: +# "{SRCIP1,SRCIP2,...:}PROTO1,PROTO2,...>DESTIP1 \ +# {SRCIP3:}PROTO3,PROTO4,...>DESTIP2" +# +# TCP/UDP port forward examples: +# Simple (forward port 80 to internal host 192.168.0.10): +# NAT_xxx_FORWARD="80>192.168.0.10" +# Advanced (forward port 20 & 21 to 192.168.0.10 and +# forward from 1.2.3.4 port 81 to 192.168.0.11 port 80: +# NAT_xxx_FORWARD="20,21>192.168.0.10 1.2.3.4:81>192.168.0.11:80" +# +# IP protocol forward example: +# "47,48>192.168.0.10" (forward protocols 47 & 48 to 192.168.0.10 +# +# NOTE 1: {:port} is optional. Use it to redirect a specific port to a +# different port on the internal client. +# NOTE 2: {SRCIPx} is optional. Use it to restrict access to specific source +# IP addresses. +# NOTE 3: Port ranges can be written as "PORT1:PORT3" (ie. "1024:1030" would +# include ports 1024 until 1030). +# ----------------------------------------------------------------------------- +##NAT_TCP_FORWARD="" +##NAT_UDP_FORWARD="" +##NAT_IP_FORWARD="" + + +############################################################################### +# (ADSL) Modem settings # +# # +# The MODEM_xxx options should (only) be used when you have an ((A)DSL) # +# modem which works with a ppp-connection between the modem and the # +# host the modem is connected to. # +# # +# You can check whether this applies for your (hardware) setup with # +# 'ifconfig' (a 'ppp' device is shown). # +# This means that if your modem is bridging or an NAT router) or the # +# network interface the modem is connected to doesn't have an IP, you # +# should leave the MODEM_xxx options disabled (=default)! # +############################################################################### + +# The physical(!) network interface your ADSL modem is connected to (this is +# not ppp0!). +# ----------------------------------------------------------------------------- +##MODEM_IF="eth1" + +# (optional) The IP of the network interface (MODEM_IF) your ADSL modem is +# connected to (IP shown for the modem interface (MODEM_IF) in 'ifconfig'). +# ----------------------------------------------------------------------------- +##MODEM_IF_IP="10.0.0.150" + +# (optional) The IP of your (A)DSL modem itself. +# ----------------------------------------------------------------------------- +##MODEM_IP="10.0.0.138" + +# (EXPERT SETTING!). Here you can specify the hosts/local net(s) that should +# have access to the (A)DSL modem itself (manage modem settings). The default +# setting ($INTERNAL_NET) allows access from everybody on your LAN. +# ----------------------------------------------------------------------------- +MODEM_INTERNAL_NET=$INTERNAL_NET + + +############################################################################### +# General settings # +############################################################################### + +# Most people don't want to get any firewall logs being spit to the console. +# This option makes the kernel ring buffer only log messages with level +# "panic". +# ----------------------------------------------------------------------------- +##DMESG_PANIC_ONLY=1 + +# Enable this if you want TOS mangling (RFC) (recommended). +# ----------------------------------------------------------------------------- +##MANGLE_TOS=1 + +# Enable this if you want to set the maximum packet size via the +# Maximum Segment Size(through MSS field) (recommended). +# ----------------------------------------------------------------------------- +##SET_MSS=1 + +# Enable this if you want to increase the TTL value by one in the prerouting +# chain. This hides the firewall when performing eg. traceroutes to internal +# hosts. +# ----------------------------------------------------------------------------- +##TTL_INC=0 + +# (EXPERT SETTING!) Enable this if you want to set the TTL value for packets in +# the OUTPUT & FORWARD chain. Note that this only works with newer 2.6 kernels +# (2.6.14 or better) or patched 2.4 kernels, which have netfilter TTL target +# support. Don't mess with this unless you really know what you are doing! +# ----------------------------------------------------------------------------- +#PACKET_TTL="64" + +# Enable this to resolve names of DNS IP's etc. +# ----------------------------------------------------------------------------- +##RESOLV_IPS=0 + +# Enable this to support the IRC-protocol. +# ----------------------------------------------------------------------------- +##USE_IRC=0 + +# (EXPERT SETTING!). Loosen the forward chain for the external interface(s). +# Enable it to allow the use of protocols like UPnP. Note that it *could* be +# less secure. +# ----------------------------------------------------------------------------- +LOOSE_FORWARD=0 + +# (EXPERT SETTING!). Enable this if you want to drop packets originating from a +# private address. +# ----------------------------------------------------------------------------- +DROP_PRIVATE_ADDRESSES=0 + +# (EXPERT SETTING!). Protect this machine from being abused for a DRDOS-attack +# ("Distributed Reflection Denial Of Service"-attack). (STILL EXPERIMENTAL!) +# ----------------------------------------------------------------------------- +DRDOS_PROTECT=0 + +# Enable this if you want to allow/enable IPv6 traffic. Note that my firewall +# does NOT filter IPv6 traffic (yet), and thus NO checking is performed on it! +# ----------------------------------------------------------------------------- +IPV6_SUPPORT=0 + +# This option fixes problems with SMB broadcasts when using nmblookup +# ----------------------------------------------------------------------------- +NMB_BROADCAST_FIX=0 + +# (EXPERT SETTING!). Enter your remote Freeswan subnet(s) here to enable +# "Virtual IP" support for Freeswan. This allows you to have remote +# "Virtual IP's" which are in the same subnet as yourself, to be routed into +# your network (via NAT). Make sure you understand what this is and that you +# really want this (else leave it empty)! +# ----------------------------------------------------------------------------- +FREESWAN_NET="" + +# (EXPERT SETTING!). (Other) trusted network interfaces for which ALL IP +# traffic should be ACCEPTED. (multiple(!) interfaces should be space +# separated). Be warned that anything TO and FROM these interfaces is allowed +# (ACCEPTED) so make sure it's NOT routable(accessible) from the outside world +# (internet)! +# ----------------------------------------------------------------------------- +TRUSTED_IF="" + +# (EXPERT SETTING!). Put here the (internal) interfaces that should trust +# (accept forward traffic) each other. +# ----------------------------------------------------------------------------- +INT_IF_TRUST="" + +# Location of the custom iptables rules file (if any). +# ----------------------------------------------------------------------------- +##CUSTOM_RULES=/etc/arno-firewall-custom-rules + + +############################################################################### +# Logging options - All logging is rate limited to prevent log flooding # +############################################################################### + +# Enable logging for explicitly blocked hosts. +# ----------------------------------------------------------------------------- +BLOCKED_HOST_LOG=1 + +# Enable logging for various stealth scans (reliable). +# ----------------------------------------------------------------------------- +SCAN_LOG=1 + +# Enable logging for possible stealth scans (less reliable). +# ----------------------------------------------------------------------------- +POSSIBLE_SCAN_LOG=1 + +# Enable logging for TCP-packets with bad flags. +# ----------------------------------------------------------------------------- +BAD_FLAGS_LOG=1 + +# Enable logging of invalid packets. +# ----------------------------------------------------------------------------- +INVALID_PACKET_LOG=1 + +# Enable logging of source IP's with reserved addresses. +# ----------------------------------------------------------------------------- +RESERVED_NET_LOG=1 + +# Enable logging of fragmented packets. +# ----------------------------------------------------------------------------- +FRAG_LOG=1 + +# Enable logging of (probable) "lost TCP connections". Keep disabled to +# reduce false alarms. +# ----------------------------------------------------------------------------- +LOST_CONNECTION_LOG=0 + +# Enable logging of denied local (OUTPUT) connections. +# ----------------------------------------------------------------------------- +OUTPUT_DENY_LOG=1 + +# Enable logging of denied LAN output (FORWARD) connections. +# ----------------------------------------------------------------------------- +LAN_OUTPUT_DENY_LOG=1 + +# Enable logging of denied DMZ output (FORWARD) connections. +# ----------------------------------------------------------------------------- +DMZ_OUTPUT_DENY_LOG=1 + +# Enable logging of denied DMZ input (FORWARD) connections. +# ----------------------------------------------------------------------------- +DMZ_INPUT_DENY_LOG=1 + +# Enable logging of dropped ICMP-request packets (ping). +# ----------------------------------------------------------------------------- +ICMP_REQUEST_LOG=1 + +# Enable logging of dropped "other" ICMP packets. +# ----------------------------------------------------------------------------- +ICMP_OTHER_LOG=1 + +# Enable logging of normal connection attempts to privileged TCP ports. +# ----------------------------------------------------------------------------- +PRIV_TCP_LOG=1 + +# Enable logging of normal connection attempts to privileged UDP ports. +# ----------------------------------------------------------------------------- +PRIV_UDP_LOG=1 + +# Enable logging of normal connection attempts to unprivileged TCP ports. +# ----------------------------------------------------------------------------- +UNPRIV_TCP_LOG=1 + +# Enable logging of normal connection attempts to unprivileged UDP ports. +# ----------------------------------------------------------------------------- +UNPRIV_UDP_LOG=1 + +# Enable logging of normal connection attempts to "other-IP"-protocols (non +# TCP/UDP/ICMP). +# ----------------------------------------------------------------------------- +OTHER_IP_LOG=1 + +# Enable logging for ICMP flooding. +# ----------------------------------------------------------------------------- +ICMP_FLOOD_LOG=1 + +# Enable logging for not-allowed MAC addresses (if used). +# ----------------------------------------------------------------------------- +MAC_ADDRESS_LOG=1 + +# (EXPERT SETTING!). The location of the dedicated firewall log file. When +# enabled the firewall script will also log start/stop etc. info to this file +# as well. Note that in order to make this work, you should also configure +# syslogd to log firewall messages to this file (see LOGLEVEL below for further +# info). +# ----------------------------------------------------------------------------- +#FIREWALL_LOG=/var/log/firewall + +# (EXPERT SETTING!). Current log-level ("info": default kernel syslog level) +# "debug": can be used to log to /var/log/firewall.log, but you have to configure +# syslogd accordingly (see included syslogd.conf examples). +# ----------------------------------------------------------------------------- +LOGLEVEL=info + +# Put in the following variables which hosts you want to log certain incoming +# connection attempts for. +# TCP/UDP port format (LOG_HOST_xxx_INPUT): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# +# IP protocol format (LOG_HOST_IP_INPUT): +# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." +# ----------------------------------------------------------------------------- +LOG_HOST_TCP_INPUT="" +LOG_HOST_UDP_INPUT="" +LOG_HOST_IP_INPUT="" + +# Put in the following variables which hosts you want to log certain outgoing +# connection attempts for. +# TCP/UDP port format (LOG_HOST_xxx_OUTPUT): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# +# IP protocol format (LOG_HOST_IP_OUTPUT): +# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." +# ----------------------------------------------------------------------------- +LOG_HOST_TCP_OUTPUT="" +LOG_HOST_UDP_OUTPUT="" +LOG_HOST_IP_OUTPUT="" + +# Put in the following variables which services you want to log incoming +# connection attempts for. +# ----------------------------------------------------------------------------- +LOG_TCP_INPUT="" +LOG_UDP_INPUT="" +LOG_IP_INPUT="" + +# Put in the following variables which services you want to log outgoing +# connection attempts for. +# ----------------------------------------------------------------------------- +LOG_TCP_OUTPUT="" +LOG_UDP_OUTPUT="" +LOG_IP_OUTPUT="" + +# Put in the following variable which hosts you want to log incoming connection +# (attempts) for. +# ----------------------------------------------------------------------------- +LOG_HOST_INPUT="" + +# Put in the following variable which hosts you want to log outgoing connection +# (attempts) to. +# ----------------------------------------------------------------------------- +LOG_HOST_OUTPUT="" + + +############################################################################### +# /proc based settings (EXPERT SETTINGS!) # +############################################################################### + +# Enable for synflood protection (through /proc/.../tcp_syncookies). +# ----------------------------------------------------------------------------- +SYN_PROT=1 + +# Enable this to reduce the ability of others DOS'ing your machine. +# ----------------------------------------------------------------------------- +REDUCE_DOS_ABILITY=1 + +# Enable to ignore all ICMP echo-requests (IPv4) on ALL interfaces. +# ----------------------------------------------------------------------------- +ECHO_IGNORE=0 + +# Enable to log packets with impossible addresses to the kernel log. +# ----------------------------------------------------------------------------- +LOG_MARTIANS=0 + +# Only disable this if you're NOT using forwarding (required for NAT etc.) for +# increased security. +# ----------------------------------------------------------------------------- +IP_FORWARDING=1 + +# Enable if you want to accept ICMP redirect messages. Should be set to "0" in +# case of a router. +# ----------------------------------------------------------------------------- +ICMP_REDIRECT=0 + +# Enable/modify this if you want to be a able to handle a larger (or smaller) +# number of simultaneous connections. For high traffic machines I recommend to +# use a value of at least 16384 (note that a higher value (obviously) also uses +# more memory). +# ----------------------------------------------------------------------------- +CONNTRACK=16384 + +# You may need to enable this to get some internet games to work, but note that +# it's *less* secure. +# ----------------------------------------------------------------------------- +LOOSE_UDP_PATCH=0 + +# Enable ECN (Explicit Congestion Notification) TCP flag. Disabled by default, +# as some routers are still not compatible with this. +# ----------------------------------------------------------------------------- +ECN=0 + +# Enable to drop connections from non-routable IP's, eg. prevent source +# routing. By default the firewall itself also provides rules against source +# routing. Note than when you use eg. VPN (Freeswan), you should probably +# disable this setting. +# ----------------------------------------------------------------------------- +RP_FILTER=1 + +# Protect against source routed packets. Attackers can use source routing to +# generate traffic pretending to be from inside your network, but which is +# routed back along the path from which it came, namely outside, so attackers +# can compromise your network. Source routing is rarely used for legitimate +# purposes, so normally you should always leave this enabled(1)! +# ----------------------------------------------------------------------------- +SOURCE_ROUTE_PROTECTION=1 + +# Here we set the local port range (ports from which connections are +# initiated from our site). Don't mess with this unless you really know what +# you are doing! +# ----------------------------------------------------------------------------- +LOCAL_PORT_RANGE="32768 61000" + +# Here you can change the default TTL used for sending packets. The value +# should be between 10 and 255. Don't mess with this unless you really know +# what you are doing! +# ----------------------------------------------------------------------------- +DEFAULT_TTL=64 + +# In most cases pmtu discovery is ok, but in some rare cases (when having +# problems) you might want to disable it. +# ----------------------------------------------------------------------------- +NO_PMTU_DISCOVERY=0 + + +############################################################################### +# (Transparent) proxy settings (EXPERT SETTINGS!) # +############################################################################### +#HTTP_PROXY_PORT="3128" +HTTPS_PROXY_PORT="" +FTP_PROXY_PORT="" +SMTP_PROXY_PORT="" +POP3_PROXY_PORT="" + + +############################################################################### +# Firewall policies for the LAN (EXPERT SETTINGS!) # +############################################################################### + +############################################################################### +# LAN_INET_xxx = LAN->internet access rules (forward) # +# # +# Note that when both LAN_INET_OPEN_xxx & LAN_INET_HOST_OPEN_xxx are NOT # +# used, the default policy for that protocol/port is accept (unless denied # +# through LAN_INET_DENY_xxx and/or LAN_INET_HOST_DENY_xxx)! # +############################################################################### + +# Put in the following variables the TCP/UDP ports or IP +# protocols TO (remote end-point) which the LAN hosts are +# permitted to connect to via the external (internet) interface. +# ----------------------------------------------------------------------------- +LAN_INET_OPEN_TCP="" +LAN_INET_OPEN_UDP="" +LAN_INET_OPEN_IP="" + +# Put in the following variables the TCP/UDP ports or IP protocols TO (remote +# end-point) which the LAN hosts are NOT permitted to connect to +# via the external (internet) interface. Examples of usage are for blocking +# IRC (TCP 6666:6669) for the internal network. +# ----------------------------------------------------------------------------- +LAN_INET_DENY_TCP="" +LAN_INET_DENY_UDP="" +LAN_INET_DENY_IP="" + +# Put in the following variables the TCP/UDP ports or IP +# protocols TO (remote end-point) which certain LAN hosts are +# permitted to connect to via the external (internet) interface. Note that +# any ports/protocols specified here are made "exclusively" for the accompaning +# host(s), meaning that nobody else can use them! +# +# TCP/UDP port format (LAN_INET_HOST_OPEN_xxx): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# +# IP protocol format (LAN_INET_HOST_OPEN_xxx): +# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." +# ----------------------------------------------------------------------------- +LAN_INET_HOST_OPEN_TCP="" +LAN_INET_HOST_OPEN_UDP="" +LAN_INET_HOST_OPEN_IP="" + +# Put in the following variables the TCP/UDP ports or IP protocols TO (remote +# end-point) which certain LAN hosts are NOT permitted to connect to +# via the external (internet) interface. +# +# TCP/UDP port format (LAN_INET_HOST_DENY_xxx): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# +# IP protocol format (LAN_INET_HOST_DENY_xxx): +# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." +# ----------------------------------------------------------------------------- +LAN_INET_HOST_DENY_TCP="" +LAN_INET_HOST_DENY_UDP="" +LAN_INET_HOST_DENY_IP="" + + +############################################################################### +# Firewall policies for the DMZ (EXPERT SETTINGS!) # +############################################################################### + +############################################################################### +# INET_DMZ_xxx = Internet->DMZ access rules (forward) # +# DMZ_INET_xxx = DMZ->internet access rules (forward) # +# DMZ_LAN_xxx = DNZ->LAN access rules (forward) # +# DMZ_xxx = DMZ->local(this machine) access rules (input) # +# # +# Note that when both INET_DMZ_OPEN_xxx & INET_DMZ_HOST_OPEN_xxx are NOT # +# used, the default policy for that protocol/port is accept (unless denied # +# through INET_DMZ_DENY_xxx and/or INET_DMZ_HOST_DENY_xxx)! # +############################################################################### + +# Put in the following variables which INET hosts are permitted to connect to +# certain the TCP/UDP ports or IP protocols in the DMZ. +# ----------------------------------------------------------------------------- +INET_DMZ_OPEN_TCP="" +INET_DMZ_OPEN_UDP="" +INET_DMZ_OPEN_IP="" + +# Put in the following variables which INET hosts are NOT permitted to connect +# to certain the TCP/UDP ports or IP protocols in the DMZ. +# ----------------------------------------------------------------------------- +INET_DMZ_DENY_TCP="" +INET_DMZ_DENY_UDP="" +INET_DMZ_DENY_IP="" + +# Put in the following variables which INET hosts you want to allow for certain +# services. By default all services are allowed for DMZ hosts. +# TCP/UDP port format (INET_DMZ_HOST_OPEN_TCP & INET_DMZ_HOST_OPEN_UDP): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# +# IP protocol format (INET_DMZ_HOST_OPEN_IP): +# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." +# +# ICMP protocol format (INET_DMZ_HOST_OPEN_ICMP): +# "host1 host2 ...." +# ----------------------------------------------------------------------------- +INET_DMZ_HOST_OPEN_TCP="" +INET_DMZ_HOST_OPEN_UDP="" +INET_DMZ_HOST_OPEN_IP="" + +# Put in the following variables which INET hosts you want to deny for certain +# services (and logged). By default all services are allowed for DMZ +# hosts. +# TCP/UDP port format (INET_DMZ_HOST_OPEN_TCP & INET_DMZ_HOST_OPEN_UDP): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# +# IP protocol format (INET_DMZ_HOST_OPEN_IP): +# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." +# +# ICMP protocol format (INET_DMZ_HOST_OPEN_ICMP): +# "host1 host2 ...." +# ----------------------------------------------------------------------------- +INET_DMZ_HOST_DENY_TCP="" +INET_DMZ_HOST_DENY_UDP="" +INET_DMZ_HOST_DENY_IP="" + +############################################################################### +# Note that when both DMZ_INET_OPEN_xxx & DMZ_INET_HOST_OPEN_xxx are NOT # +# used, the default policy for that protocol/port is accept (unless denied # +# through DMZ_INET_DENY_xxx and/or DMZ_INET_HOST_DENY_xxx)! # +############################################################################### + +# Put in the following variables the TCP/UDP ports or IP +# protocols TO (remote end-point) which the DMZ hosts are +# permitted to connect to via the external (internet) interface. +# ----------------------------------------------------------------------------- +DMZ_INET_OPEN_TCP="" +DMZ_INET_OPEN_UDP="" +DMZ_INET_OPEN_IP="" + +# Put in the following variables the TCP/UDP ports or IP protocols TO (remote +# end-point) which the DMZ hosts are NOT permitted to connect to +# via the external (internet) interface. Examples of usage are for blocking +# IRC (TCP 6666:6669) for the internal network. +# ----------------------------------------------------------------------------- +DMZ_INET_DENY_TCP="" +DMZ_INET_DENY_UDP="" +DMZ_INET_DENY_IP="" + +# Put in the following variables which DMZ hosts you want to allow to connect +# to certain internet hosts for services. By default all inet services are +# allowed for DMZ hosts. +# +# TCP/UDP port format (DMZ_INET_HOST_OPEN_TCP & DMZ_INET_HOST_OPEN_UDP): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# +# IP protocol format (DMZ_INET_HOST_OPEN_IP): +# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." +# +# ICMP protocol format (DMZ_INET_HOST_OPEN_ICMP): +# "host1 host2 ...." +# ----------------------------------------------------------------------------- +DMZ_INET_HOST_OPEN_TCP="" +DMZ_INET_HOST_OPEN_UDP="" +DMZ_INET_HOST_OPEN_IP="" + +# Put in the following variables which DMZ hosts you want to deny to connect +# to certain internet hosts for services. +# +# TCP/UDP port format (DMZ_INET_HOST_OPEN_TCP & DMZ_INET_HOST_OPEN_UDP): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# +# IP protocol format (DMZ_INET_HOST_OPEN_IP): +# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." +# +# ICMP protocol format (DMZ_INET_HOST_OPEN_ICMP): +# "host1 host2 ...." +# ----------------------------------------------------------------------------- +DMZ_INET_HOST_DENY_TCP="" +DMZ_INET_HOST_DENY_UDP="" +DMZ_INET_HOST_DENY_IP="" + +# (EXPERT SETTING!) DMZ-to-LAN TCP/UDP/IP open ports/protocols. Open particular +# ports / protocols on LAN hosts(on INT_IF) for certain DMZ hosts.: +# TCP/UDP form: +# "SRCIP1,SRCIP2,...>DESTIP1:port \ +# SRCIP3,...>DESTIP2:port" +# +# IP form: +# "SRCIP1,SRCIP2,...>DESTIP1:protocol \ +# SRCIP3,...>DESTIP2:protocol" +# +# TCP/UDP examples: +# Simple (open port 80 on host 192.168.0.10 for all DMZ hosts): +# DMZ_LAN_HOST_OPEN_xxx="192.168.0.10:80" +# Advanced (open port 20 & 21 on 192.168.0.10 for all DMZ hosts and +# open port 80 on 192.168.0.11 for host 1.2.3.4 only: +# DMZ_LAN_HOST_OPEN_xxx="192.168.0.10:20,21 1.2.3.4>192.168.0.11:80" +# +# IP protocol forward example: +# "192.168.0.10:47,48" (open protocols 47 & 48 on 192.168.0.10 +# for all DMZ hosts) +# +# NOTE 1: {SRCIPx} is optional. Use it to restrict access to specific +# source IP addresses. +# NOTE 2: Port ranges can be written as "PORT1:PORT3" (ie. "1024:1030" would +# include ports 1024 until 1030). +# ----------------------------------------------------------------------------- +DMZ_LAN_HOST_OPEN_TCP="" +DMZ_LAN_HOST_OPEN_UDP="" +DMZ_LAN_HOST_OPEN_IP="" + +# Put in the following variables which DMZ hosts are permitted to connect to +# certain the TCP/UDP ports, IP protocols or ICMP. By default all (local) +# services are blocked for DMZ hosts. +# ----------------------------------------------------------------------------- +DMZ_OPEN_TCP="" +DMZ_OPEN_UDP="" +DMZ_OPEN_IP="" +DMZ_OPEN_ICMP=0 + +# Put in the following variables which DMZ hosts you want to allow for certain +# services. By default all (local) services are blocked for DMZ hosts. +# TCP/UDP port format (DMZ_HOST_OPEN_TCP & DMZ_HOST_OPEN_UDP): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# +# IP protocol format (DMZ_HOST_OPEN_IP): +# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." +# +# ICMP protocol format (DMZ_HOST_OPEN_ICMP): +# "host1 host2 ...." +# ----------------------------------------------------------------------------- +DMZ_HOST_OPEN_TCP="" +DMZ_HOST_OPEN_UDP="" +DMZ_HOST_OPEN_IP="" +DMZ_HOST_OPEN_ICMP="" + + +############################################################################### +# Firewall policies for the external (inet) interface (default policy = drop) # +############################################################################### + +# Put in the following variable which hosts (subnets) you want have full access +# via your internet (EXT_IF) connection(!). This is especially meant for +# networks/servers which use NIS/NFS, as these protocols require all ports +# to be open. +# NOTE: Don't mistake this variable with the one used for internal nets. +# ----------------------------------------------------------------------------- +##FULL_ACCESS_HOSTS="" + +# Put in the following variables which ports or IP protocols you want to leave +# open to the whole world. +# ----------------------------------------------------------------------------- +##OPEN_TCP="" +##OPEN_UDP="" +##OPEN_IP="" +##OPEN_ICMP=0 + +# Put in the following variables the TCP/UDP ports you want to DENY(DROP) for +# everyone (and logged). Also use these variables if you want to log connection +# attempts to these ports from everyone (also trusted/full access hosts). +# In principle you don't need these variables, as everything is already blocked +# (denied) by default, but just exists for consistency. +# ----------------------------------------------------------------------------- +##DENY_TCP="" +##DENY_UDP="" + +# Put in the following variables which ports you want to DENY(DROP) for +# everyone but NOT logged. This is very useful if you have constant probes on +# the same port(s) over and over again (code red worm) and don't want your logs +# flooded with it. +# ----------------------------------------------------------------------------- +##DENY_TCP_NOLOG="" +##DENY_UDP_NOLOG="" + +# Put in the following variables the TCP/UDP ports you want to REJECT (instead +# of DROP) for everyone (and logged). +# ----------------------------------------------------------------------------- +##REJECT_TCP="" +##REJECT_UDP="" + +# Put in the following variables the TCP/UDP ports you want to REJECT (instead +# of DROP) for everyone but NOT logged. +# ----------------------------------------------------------------------------- +##REJECT_TCP_NOLOG="" +##REJECT_UDP_NOLOG="" + +# Put in the following variables which hosts you want to allow for certain +# services. +# TCP/UDP port format (HOST_OPEN_TCP & HOST_OPEN_UDP): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# +# IP protocol format (HOST_OPEN_IP): +# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." +# +# ICMP protocol format (HOST_OPEN_ICMP): +# "host1 host2 ...." +# ----------------------------------------------------------------------------- +##HOST_OPEN_TCP="" +##HOST_OPEN_UDP="" +##HOST_OPEN_IP="" +##HOST_OPEN_ICMP="" + +# Put in the following variables which hosts you want to DENY(DROP) for certain +# services (and logged). +# to DENY(DROP) for certain hosts. +# TCP/UDP port format (HOST_DENY_TCP & HOST_DENY_UDP): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# +# IP protocol format (HOST_DENY_IP): +# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." +# +# ICMP protocol format (HOST_DENY_ICMP): +# "host1 host2 ...." +# ----------------------------------------------------------------------------- +##HOST_DENY_TCP="" +##HOST_DENY_UDP="" +##HOST_DENY_IP="" +##HOST_DENY_ICMP="" + +# Put in the following variables which hosts you want to DENY(DROP) for certain +# services but NOT logged. +# TCP/UDP port format (HOST_DENY_xxx_NOLOG): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# +# IP protocol format (HOST_DENY_IP_NOLOG): +# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." +# +# ICMP protocol format (HOST_DENY_ICMP_NOLOG): +# "host1 host2 ...." +# ----------------------------------------------------------------------------- +##HOST_DENY_TCP_NOLOG="" +##HOST_DENY_UDP_NOLOG="" +##HOST_DENY_IP_NOLOG="" +##HOST_DENY_ICMP_NOLOG="" + +# Put in the following variables which hosts you want to REJECT (instead of +# DROP) for certain TCP/UDP ports. +# TCP/UDP port format (HOST_REJECT_xxx): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# ----------------------------------------------------------------------------- +##HOST_REJECT_TCP="" +##HOST_REJECT_UDP="" + +# Put in the following variables which hosts you want to REJECT (instead of +# DROP) for certain services but NOT logged. +# TCP/UDP port format (HOST_REJECT_xxx_NOLOG): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# ----------------------------------------------------------------------------- +##HOST_REJECT_TCP_NOLOG="" +##HOST_REJECT_UDP_NOLOG="" + +# Put in the following variables which services THIS machine is NOT +# permitted to connect TO (remote end-point) via the external (internet) +# interface. For example for blocking IRC (tcp 6666:6669). +# ----------------------------------------------------------------------------- +##DENY_TCP_OUTPUT="" +##DENY_UDP_OUTPUT="" +##DENY_IP_OUTPUT="" + +# Put in the following variables to which hosts THIS machine is NOT +# permitted to connect TO for certain services (remote end-point) +# via the external (internet) interface. In principle you can also +# use this to put your machine in a "virtual-DMZ" by blocking all traffic +# to your local subnet. +# TCP/UDP port format (HOST_DENY_TCP_OUTPUT & HOST_DENY_UDP_OUTPUT): +# "host1,host2>port1,port2 host3,host4>port3,port4 ..." +# +# IP protocol format (HOST_DENY_IP_OUTPUT): +# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." +# ----------------------------------------------------------------------------- +##HOST_DENY_TCP_OUTPUT="" +##HOST_DENY_UDP_OUTPUT="" +##HOST_DENY_IP_OUTPUT="" + +# Put in the following variable which TCP/UDP ports you don't want to +# see broadcasts from (ie. DHCP (67/68) on your EXTERNAL interface. Note that +# to make this properly work you also need to set "EXTERNAL_NET"! +# ----------------------------------------------------------------------------- +##BROADCAST_TCP_NOLOG="" +###BROADCAST_UDP_NOLOG="67 68" + +# Put in the following variable which hosts you want to block (blackhole, +# dropping every packet from the host). +# ----------------------------------------------------------------------------- +##BLOCK_HOSTS="" + +# Uncomment & specify here the location of the file that contains a list of +# hosts(IP's) that should be BLOCKED. IP ranges can (only) be specified as +# w.x.y.z1-z2 (ie. 192.168.1.10-15). Note that the last line of this file +# should always contain a carriage-return (enter)! +# ----------------------------------------------------------------------------- +###BLOCK_HOSTS_FILE=/etc/arno-firewall-blocked-hosts + Modified: trunk/package/iptables/iptables.init =================================================================== --- trunk/package/iptables/iptables.init 2006-08-11 07:04:51 UTC (rev 228) +++ trunk/package/iptables/iptables.init 2006-08-11 15:31:17 UTC (rev 229) @@ -1,70 +1,4227 @@ #!/bin/sh +# +# chkconfig: 2345 11 89 +# description: Arno's iptables firewall -. /etc/rc.conf +MY_VERSION="1.8.6c" +############################################################################################ +# You should put this script in eg. "/etc/init.d/" (or "/etc/rc.d/"). # +# Furthermore make sure it's executable! -> "chmod 700" or "chmod +x" it # +# If you want to run it upon boot, either add an entry in your "/etc/rc.d/rc.local" or # +# (for ie. Debian) in "/etc/rcS.d/" create a symlink to the arno-iptables-firewall script # +# ("ln -s /etc/init.d/arno-iptables-firewall script S99-arno-iptables-firewall script"). # +############################################################################################ -start () { -if [ "$INTIF" ] -then -echo "Starting iptables..." -if [ -x /mnt/kd/astfw ] -then -/mnt/kd/astfw +# Location of the configuration file for this firewall: +####################################################### +CONFIG_FILE=/etc/arno-iptables-firewall.conf + +# ------------------------------------------------------------------------------------------ +# -= Arno's iptables firewall =- +# Single- & multi-homed firewall script with DSL/ADSL support +# +# ~ In memory of my dear father ~ +# +# (C) Copyright 2001-2006 by Arno van Amersfoort +# Homepage : http://rocky.eld.leidenuniv.nl/ +# Freshmeat homepage : http://freshmeat.net/projects/iptables-firewall/?topic_id=151 +# Email : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l +# (note: you must remove all spaces and substitute the @ and the . +# at the proper locations!) +# ------------------------------------------------------------------------------------------ +# 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 2 +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# ------------------------------------------------------------------------------------------ + +printf "\033... [truncated message content] |
|
From: <kr...@us...> - 2006-08-11 15:33:21
|
Revision: 230 Author: krisk84 Date: 2006-08-11 08:33:14 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=230&view=rev Log Message: ----------- rp-pppoe that actually works Modified Paths: -------------- trunk/package/Config.in trunk/package/pppd/pppd.mk Added Paths: ----------- trunk/package/rp-pppoe/ trunk/package/rp-pppoe/Config.in trunk/package/rp-pppoe/rp-pppoe-3.5-Makefile.patch trunk/package/rp-pppoe/rp-pppoe-3.5-configure.patch trunk/package/rp-pppoe/rp-pppoe-3.5-scripts-fixes.patch trunk/package/rp-pppoe/rp-pppoe.mk Removed Paths: ------------- trunk/target/generic/target_skeleton/usr/sbin/adsl-connect trunk/target/generic/target_skeleton/usr/sbin/adsl-start trunk/target/generic/target_skeleton/usr/sbin/adsl-status trunk/target/generic/target_skeleton/usr/sbin/adsl-stop Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2006-08-11 15:31:17 UTC (rev 229) +++ trunk/package/Config.in 2006-08-11 15:33:14 UTC (rev 230) @@ -134,6 +134,7 @@ source "package/raidtools/Config.in" source "package/readline/Config.in" source "package/resconv/Config.in" +source "package/rp-pppoe/Config.in" source "package/rsync/Config.in" source "package/ruby/Config.in" source "package/rxvt/Config.in" Modified: trunk/package/pppd/pppd.mk =================================================================== --- trunk/package/pppd/pppd.mk 2006-08-11 15:31:17 UTC (rev 229) +++ trunk/package/pppd/pppd.mk 2006-08-11 15:33:14 UTC (rev 230) @@ -60,7 +60,7 @@ rm -rf $(TARGET_DIR)/usr/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc $(TARGET_DIR)/usr/share/man $(TARGET_DIR)/usr/include ln -sf /tmp/etc/ppp $(TARGET_DIR)/etc/ppp - ln -sf /usr/lib/pppd/2.4.3 $(TARGET_DIR)/usr/lib/ppp + # ln -sf /usr/lib/pppd/2.4.3 $(TARGET_DIR)/usr/lib/ppp pppd: uclibc $(TARGET_DIR)/$(PPPD_TARGET_BINARY) Added: trunk/package/rp-pppoe/Config.in =================================================================== --- trunk/package/rp-pppoe/Config.in (rev 0) +++ trunk/package/rp-pppoe/Config.in 2006-08-11 15:33:14 UTC (rev 230) @@ -0,0 +1,8 @@ +config BR2_PACKAGE_RP-PPPOE + bool "rp-pppoe" + default n + help + rp-pppoe is a PPPoE implementation for linux + + http://www.roaringpenguin.com/penguin/open_source_rp-pppoe.php + Added: trunk/package/rp-pppoe/rp-pppoe-3.5-Makefile.patch =================================================================== --- trunk/package/rp-pppoe/rp-pppoe-3.5-Makefile.patch (rev 0) +++ trunk/package/rp-pppoe/rp-pppoe-3.5-Makefile.patch 2006-08-11 15:33:14 UTC (rev 230) @@ -0,0 +1,217 @@ +diff -ruN rp-pppoe-3.5-orig/src/Makefile.in rp-pppoe-3.5-4/src/Makefile.in +--- rp-pppoe-3.5-orig/src/Makefile.in 2002-07-08 16:38:24.000000000 +0200 ++++ rp-pppoe-3.5-4/src/Makefile.in 2005-03-09 16:37:38.000000000 +0100 +@@ -62,21 +62,23 @@ + TARGETS=@TARGETS@ + PPPOE_SERVER_LIBS=$(LIC_LIBDIR) $(LIC_LIB) + ++LIBS="-lc" ++ + all: $(TARGETS) + @echo "" + @echo "Type 'make install' as root to install the software." + + pppoe-sniff: pppoe-sniff.o if.o common.o debug.o +- @CC@ -o pppoe-sniff pppoe-sniff.o if.o common.o debug.o ++ @CC@ $(CFLAGS) -o pppoe-sniff pppoe-sniff.o if.o common.o debug.o $(LIBS) + + pppoe-server: pppoe-server.o if.o debug.o common.o md5.o libevent/libevent.a @PPPOE_SERVER_DEPS@ +- @CC@ -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS) -Llibevent -levent ++ @CC@ $(CFLAGS) -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS) -Llibevent -levent $(LIBS) + + pppoe: pppoe.o if.o debug.o common.o ppp.o discovery.o +- @CC@ -o pppoe pppoe.o if.o debug.o common.o ppp.o discovery.o ++ @CC@ $(CFLAGS) -o pppoe pppoe.o if.o debug.o common.o ppp.o discovery.o $(LIBS) + + pppoe-relay: relay.o if.o debug.o common.o +- @CC@ -o pppoe-relay relay.o if.o debug.o common.o ++ @CC@ $(CFLAGS) -o pppoe-relay relay.o if.o debug.o common.o $(LIBS) + + pppoe.o: pppoe.c pppoe.h + @CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe.o pppoe.c +@@ -119,7 +121,7 @@ + @CC@ '-DRP_VERSION="$(VERSION)"' $(CFLAGS) -I$(PPPD_INCDIR) -c -o plugin/plugin.o -fPIC plugin.c + + plugin/libplugin.a: plugin/discovery.o plugin/if.o plugin/common.o plugin/debug.o +- ar -rc $@ $^ ++ $(AR) -rc $@ $^ + + plugin/discovery.o: discovery.c + @CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o plugin/discovery.o -fPIC discovery.c +@@ -134,78 +136,78 @@ + @CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o plugin/common.o -fPIC common.c + + install: all +- -mkdir -p $(RPM_INSTALL_ROOT)$(sbindir) +- $(install) -m 755 -s pppoe $(RPM_INSTALL_ROOT)$(sbindir) +- $(install) -m 755 -s pppoe-server $(RPM_INSTALL_ROOT)$(sbindir) +- if test -x licensed-only/pppoe-server-control ; then $(install) -m 755 -s licensed-only/pppoe-server-control $(RPM_INSTALL_ROOT)$(sbindir); fi +- if test -x pppoe-relay ; then $(install) -m 755 -s pppoe-relay $(RPM_INSTALL_ROOT)$(sbindir); fi +- if test -x pppoe-sniff; then $(install) -m 755 -s pppoe-sniff $(RPM_INSTALL_ROOT)$(sbindir); fi +- $(install) -m 755 ../scripts/adsl-connect $(RPM_INSTALL_ROOT)$(sbindir) +- $(install) -m 755 ../scripts/adsl-start $(RPM_INSTALL_ROOT)$(sbindir) +- $(install) -m 755 ../scripts/adsl-status $(RPM_INSTALL_ROOT)$(sbindir) +- $(install) -m 755 ../scripts/adsl-stop $(RPM_INSTALL_ROOT)$(sbindir) +- $(install) -m 755 ../scripts/adsl-setup $(RPM_INSTALL_ROOT)$(sbindir) +- -mkdir -p $(RPM_INSTALL_ROOT)$(docdir) +- $(install) -m 644 ../doc/CHANGES $(RPM_INSTALL_ROOT)$(docdir) +- $(install) -m 644 ../doc/KERNEL-MODE-PPPOE $(RPM_INSTALL_ROOT)$(docdir) +- $(install) -m 644 ../doc/HOW-TO-CONNECT $(RPM_INSTALL_ROOT)$(docdir) +- $(install) -m 644 ../doc/LICENSE $(RPM_INSTALL_ROOT)$(docdir) +- $(install) -m 644 ../README $(RPM_INSTALL_ROOT)$(docdir) +- $(install) -m 644 ../SERVPOET $(RPM_INSTALL_ROOT)$(docdir) +- $(install) -m 644 ../configs/pap-secrets $(RPM_INSTALL_ROOT)$(docdir) +- -mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man8 ++ -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir) ++ $(install) -m 755 pppoe $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir) ++ $(install) -m 755 pppoe-server $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir) ++ if test -x licensed-only/pppoe-server-control ; then $(install) -m 755 licensed-only/pppoe-server-control $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir); fi ++ if test -x pppoe-relay ; then $(install) -m 755 pppoe-relay $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir); fi ++ if test -x pppoe-sniff; then $(install) -m 755 pppoe-sniff $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir); fi ++ $(install) -m 755 ../scripts/adsl-connect $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir) ++ $(install) -m 755 ../scripts/adsl-start $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir) ++ $(install) -m 755 ../scripts/adsl-status $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir) ++ $(install) -m 755 ../scripts/adsl-stop $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir) ++ $(install) -m 755 ../scripts/adsl-setup $(RPM_INSTALL_ROOT)$(DESTDIR)$(sbindir) ++ -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)$(docdir) ++ $(install) -m 644 ../doc/CHANGES $(RPM_INSTALL_ROOT)$(DESTDIR)$(docdir) ++ $(install) -m 644 ../doc/KERNEL-MODE-PPPOE $(RPM_INSTALL_ROOT)$(DESTDIR)$(docdir) ++ $(install) -m 644 ../doc/HOW-TO-CONNECT $(RPM_INSTALL_ROOT)$(DESTDIR)$(docdir) ++ $(install) -m 644 ../doc/LICENSE $(RPM_INSTALL_ROOT)$(DESTDIR)$(docdir) ++ $(install) -m 644 ../README $(RPM_INSTALL_ROOT)$(DESTDIR)$(docdir) ++ $(install) -m 644 ../SERVPOET $(RPM_INSTALL_ROOT)$(DESTDIR)$(docdir) ++ $(install) -m 644 ../configs/pap-secrets $(RPM_INSTALL_ROOT)$(DESTDIR)$(docdir) ++ -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man8 + for i in $(TARGETS) ; do \ + if test -f ../man/$$i.8 ; then \ +- $(install) -m 644 ../man/$$i.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 || exit 1; \ ++ $(install) -m 644 ../man/$$i.8 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man8 || exit 1; \ + fi; \ + done +- $(install) -m 644 ../man/adsl-start.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 +- $(install) -m 644 ../man/adsl-stop.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 +- $(install) -m 644 ../man/adsl-status.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 +- $(install) -m 644 ../man/adsl-connect.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 +- $(install) -m 644 ../man/adsl-setup.8 $(RPM_INSTALL_ROOT)$(mandir)/man8 +- -mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man5 +- $(install) -m 644 ../man/pppoe.conf.5 $(RPM_INSTALL_ROOT)$(mandir)/man5 +- -mkdir -p $(RPM_INSTALL_ROOT)/etc/ppp +- -mkdir -p $(RPM_INSTALL_ROOT)$(PLUGIN_DIR) +- -echo "# Directory created by rp-pppoe for kernel-mode plugin" > $(RPM_INSTALL_ROOT)$(PLUGIN_DIR)/README +- @if test -r rp-pppoe.so; then $(install) -m 755 rp-pppoe.so $(RPM_INSTALL_ROOT)$(PLUGIN_DIR); fi +- @for i in pppoe.conf firewall-standalone firewall-masq ; do \ +- if [ ! -f $(RPM_INSTALL_ROOT)/etc/ppp/$$i ] ; then \ +- $(install) -m 644 ../configs/$$i $(RPM_INSTALL_ROOT)/etc/ppp ; \ ++ $(install) -m 644 ../man/adsl-start.8 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man8 ++ $(install) -m 644 ../man/adsl-stop.8 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man8 ++ $(install) -m 644 ../man/adsl-status.8 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man8 ++ $(install) -m 644 ../man/adsl-connect.8 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man8 ++ $(install) -m 644 ../man/adsl-setup.8 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man8 ++ -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man5 ++ $(install) -m 644 ../man/pppoe.conf.5 $(RPM_INSTALL_ROOT)$(DESTDIR)$(mandir)/man5 ++ -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/ppp ++ -mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)$(PLUGIN_DIR) ++ -echo "# Directory created by rp-pppoe for kernel-mode plugin" > $(RPM_INSTALL_ROOT)$(DESTDIR)$(PLUGIN_DIR)/README ++ @if test -r rp-pppoe.so; then $(install) -m 755 rp-pppoe.so $(RPM_INSTALL_ROOT)$(DESTDIR)$(PLUGIN_DIR); fi ++ @for i in pppoe.conf; do \ ++ if [ ! -f $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/$$i ] ; then \ ++ $(install) -m 644 ../configs/$$i $(RPM_INSTALL_ROOT)$(DESTDIR)/etc ; \ + else \ +- echo "NOT overwriting existing $(RPM_INSTALL_ROOT)/etc/ppp/$$i" ;\ +- $(install) -m 644 ../configs/$$i $(RPM_INSTALL_ROOT)/etc/ppp/$$i-$(VERSION) ;\ ++ echo "NOT overwriting existing $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/$$i" ;\ ++ $(install) -m 644 ../configs/$$i $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/$$i-$(VERSION) ;\ + fi ;\ + done +- @if [ ! -f $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS) ] ; then \ +- $(install) -m 644 ../configs/pppoe-server-options $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS) ; \ ++ @if [ ! -f $(RPM_INSTALL_ROOT)$(DESTDIR)$(PPPOESERVER_PPPD_OPTIONS) ] ; then \ ++ $(install) -m 644 ../configs/pppoe-server-options $(RPM_INSTALL_ROOT)$(DESTDIR)$(PPPOESERVER_PPPD_OPTIONS) ; \ + else \ +- echo "NOT overwriting existing $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS)"; \ +- $(install) -m 644 ../configs/pppoe-server-options $(RPM_INSTALL_ROOT)$(PPPOESERVER_PPPD_OPTIONS)-example ; \ ++ echo "NOT overwriting existing $(RPM_INSTALL_ROOT)$(DESTDIR)$(PPPOESERVER_PPPD_OPTIONS)"; \ ++ $(install) -m 644 ../configs/pppoe-server-options $(RPM_INSTALL_ROOT)$(DESTDIR)$(PPPOESERVER_PPPD_OPTIONS)-example ; \ + fi + @if [ -f /etc/redhat-release ] ; then \ +- echo "Looks like a Red Hat system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \ +- mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\ +- $(install) -m 755 ../scripts/adsl-init $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \ ++ echo "Looks like a Red Hat system; installing $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/rc.d/init.d/adsl" ; \ ++ mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/rc.d/init.d ;\ ++ $(install) -m 755 ../scripts/adsl-init $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/rc.d/init.d/adsl ; \ + fi + @if [ -f /etc/turbolinux-release ] ; then \ +- echo "Looks like a TurboLinux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \ +- mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\ +- $(install) -m 755 ../scripts/adsl-init-turbolinux $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \ ++ echo "Looks like a TurboLinux system; installing $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/rc.d/init.d/adsl" ; \ ++ mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/rc.d/init.d ;\ ++ $(install) -m 755 ../scripts/adsl-init-turbolinux $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/rc.d/init.d/adsl ; \ + fi + @if [ -f /etc/SuSE-release ] ; then \ +- echo "Looks like a SuSE Linux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl" ; \ +- mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\ +- $(install) -m 755 ../scripts/adsl-init-suse $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \ ++ echo "Looks like a SuSE Linux system; installing $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/rc.d/init.d/adsl" ; \ ++ mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/rc.d/init.d ;\ ++ $(install) -m 755 ../scripts/adsl-init-suse $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/rc.d/init.d/adsl ; \ + fi + + # L2TP + @if [ -f l2tp/handlers/sync-pppd.so ] ; then \ +- mkdir -p $(RPM_INSTALL_ROOT)/usr/lib/l2tp/plugins ; \ +- $(install) -m 755 l2tp/handlers/sync-pppd.so $(RPM_INSTALL_ROOT)/usr/lib/l2tp/plugins ; \ +- mkdir -p $(RPM_INSTALL_ROOT)/etc/l2tp ; \ +- $(install) -m 600 l2tp/l2tp.conf $(RPM_INSTALL_ROOT)/etc/l2tp/l2tp.conf.example ; \ ++ mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)/usr/lib/l2tp/plugins ; \ ++ $(install) -m 755 l2tp/handlers/sync-pppd.so $(RPM_INSTALL_ROOT)$(DESTDIR)/usr/lib/l2tp/plugins ; \ ++ mkdir -p $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/l2tp ; \ ++ $(install) -m 600 l2tp/l2tp.conf $(RPM_INSTALL_ROOT)$(DESTDIR)/etc/l2tp/l2tp.conf.example ; \ + fi + @echo "" + @echo "Type 'adsl-setup' to configure the software." +@@ -288,7 +290,7 @@ + cd .. && rpm -ba servpoet.spec + + clean: +- rm -f *.o pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~ ++ rm -f *.o pppoe pppoe-relay pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~ + test -f licensed-only/Makefile && $(MAKE) -C licensed-only clean || true + test -f libevent/Makefile && $(MAKE) -C libevent clean || true + test -f l2tp/Makefile && $(MAKE) -C l2tp clean || true +diff -ruN rp-pppoe-3.5-orig/src/libevent/Makefile.in rp-pppoe-3.5-4/src/libevent/Makefile.in +--- rp-pppoe-3.5-orig/src/libevent/Makefile.in 2002-07-08 16:38:24.000000000 +0200 ++++ rp-pppoe-3.5-4/src/libevent/Makefile.in 2005-03-09 16:37:38.000000000 +0100 +@@ -18,24 +18,24 @@ + + libevent.a: $(OBJS) + rm -f libevent.a +- ar -cq libevent.a $(OBJS) ++ $(AR) r libevent.a $(OBJS) + @RANLIB@ libevent.a + + event.o: event.c $(HDRS) +- gcc $(CFLAGS) -c -o event.o event.c ++ @CC@ $(CFLAGS) -c -o event.o event.c + + hash.o: hash.c $(HDRS) +- gcc $(CFLAGS) -c -o hash.o hash.c ++ @CC@ $(CFLAGS) -c -o hash.o hash.c + + event_sig.o: event_sig.c $(HDRS) +- gcc $(CFLAGS) -c -o event_sig.o event_sig.c ++ @CC@ $(CFLAGS) -c -o event_sig.o event_sig.c + + event_tcp.o: event_tcp.c $(HDRS) +- gcc $(CFLAGS) -c -o event_tcp.o event_tcp.c ++ @CC@ $(CFLAGS) -c -o event_tcp.o event_tcp.c + + clean: FORCE + rm -f *.a *.o *~ + + FORCE: + +-.phony: FORCE +\ No newline at end of file ++.phony: FORCE Added: trunk/package/rp-pppoe/rp-pppoe-3.5-configure.patch =================================================================== --- trunk/package/rp-pppoe/rp-pppoe-3.5-configure.patch (rev 0) +++ trunk/package/rp-pppoe/rp-pppoe-3.5-configure.patch 2006-08-11 15:33:14 UTC (rev 230) @@ -0,0 +1,241 @@ +diff -ruN rp-pppoe-3.5-orig/src/configure rp-pppoe-3.5-4/src/configure +--- rp-pppoe-3.5-orig/src/configure 2002-07-08 16:38:24.000000000 +0200 ++++ rp-pppoe-3.5-4/src/configure 2005-03-09 16:37:38.000000000 +0100 +@@ -1707,6 +1707,7 @@ + #line 1708 "configure" + #include "confdefs.h" + #include <stdio.h> ++#include <sys/types.h> + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -1715,7 +1716,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:1719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_unsigned_short=`cat conftestval` + else +@@ -1735,7 +1736,7 @@ + + + echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6 +-echo "configure:1739: checking size of unsigned int" >&5 ++echo "configure:1740: checking size of unsigned int" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1743,9 +1744,10 @@ + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext <<EOF +-#line 1747 "configure" ++#line 1748 "configure" + #include "confdefs.h" + #include <stdio.h> ++#include <sys/types.h> + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -1754,7 +1756,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:1758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_unsigned_int=`cat conftestval` + else +@@ -1774,7 +1776,7 @@ + + + echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 +-echo "configure:1778: checking size of unsigned long" >&5 ++echo "configure:1780: checking size of unsigned long" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1782,9 +1784,10 @@ + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext <<EOF +-#line 1786 "configure" ++#line 1788 "configure" + #include "confdefs.h" + #include <stdio.h> ++#include <sys/types.h> + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -1793,7 +1796,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:1797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_unsigned_long=`cat conftestval` + else +@@ -1816,7 +1819,7 @@ + # Extract the first word of "pppd", so it can be a program name with args. + set dummy pppd; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1820: checking for $ac_word" >&5 ++echo "configure:1823: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PPPD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1853,7 +1856,7 @@ + # Extract the first word of "setsid", so it can be a program name with args. + set dummy setsid; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1857: checking for $ac_word" >&5 ++echo "configure:1860: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SETSID'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1890,7 +1893,7 @@ + # Extract the first word of "id", so it can be a program name with args. + set dummy id; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1894: checking for $ac_word" >&5 ++echo "configure:1897: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_ID'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1925,14 +1928,11 @@ + + + echo $ac_n "checking for Linux 2.4.X kernel-mode PPPoE support""... $ac_c" 1>&6 +-echo "configure:1929: checking for Linux 2.4.X kernel-mode PPPoE support" >&5 +-if test "`uname -s`" = "Linux" ; then +-modprobe ppp_generic > /dev/null 2>&1 +-modprobe ppp_async > /dev/null 2>&1 +-modprobe n_hdlc > /dev/null 2>&1 +-modprobe ppp_synctty > /dev/null 2>&1 +-modprobe pppoe > /dev/null 2>&1 +-if test "$cross_compiling" = yes; then ++echo "configure:1932: checking for Linux 2.4.X kernel-mode PPPoE support" >&5 ++if eval "test \"`echo '$''{'ac_cv_linux_kernel_pppoe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ if test "$cross_compiling" = yes; then + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext <<EOF +@@ -1960,10 +1960,10 @@ + rm -fr conftest* + fi + +-else +- ac_cv_linux_kernel_pppoe=no + fi + ++echo "$ac_t""$ac_cv_linux_kernel_pppoe" 1>&6 ++ + $ECHO $ac_cv_linux_kernel_pppoe + if test "$ac_cv_linux_kernel_pppoe" != yes ; then + if test "$LINUX_KERNELMODE_PLUGIN" = rp-pppoe.so; then +@@ -2018,11 +2018,14 @@ + + echo $ac_n "checking packing order of bit fields""... $ac_c" 1>&6 + echo "configure:2021: checking packing order of bit fields" >&5 +-if test "$cross_compiling" = yes; then ++if eval "test \"`echo '$''{'ac_cv_pack_bitfields_reversed'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ if test "$cross_compiling" = yes; then + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext <<EOF +-#line 2026 "configure" ++#line 2029 "configure" + #include "confdefs.h" + + union foo { +@@ -2048,20 +2051,23 @@ + } + } + EOF +-if { (eval echo configure:2052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:2055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then +- PACK=normal ++ ac_cv_pack_bitfields_reversed=no + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* +- PACK=rev ++ ac_cv_pack_bitfields_reversed=yes + fi + rm -fr conftest* + fi + ++fi ++ ++echo "$ac_t""$ac_cv_pack_bitfields_reversed" 1>&6 + +-if test "$PACK" = "rev" ; then ++if test "$ac_cv_pack_bitfields_reversed" = "yes" ; then + $ECHO "reversed" + cat >> confdefs.h <<\EOF + #define PACK_BITFIELDS_REVERSED 1 +diff -ruN rp-pppoe-3.5-orig/src/configure.in rp-pppoe-3.5-4/src/configure.in +--- rp-pppoe-3.5-orig/src/configure.in 2002-07-08 16:38:24.000000000 +0200 ++++ rp-pppoe-3.5-4/src/configure.in 2005-03-09 16:37:38.000000000 +0100 +@@ -130,15 +130,8 @@ + AC_PATH_PROG(ID, id, "", /usr/xpg4/bin:$PATH) + + dnl Check for Linux-specific kernel support for PPPoE +-AC_MSG_CHECKING(for Linux 2.4.X kernel-mode PPPoE support) +-if test "`uname -s`" = "Linux" ; then +-dnl Do a bunch of modprobes. Can't hurt; might help. +-modprobe ppp_generic > /dev/null 2>&1 +-modprobe ppp_async > /dev/null 2>&1 +-modprobe n_hdlc > /dev/null 2>&1 +-modprobe ppp_synctty > /dev/null 2>&1 +-modprobe pppoe > /dev/null 2>&1 +-AC_TRY_RUN([#include <sys/socket.h> ++AC_CACHE_CHECK([for Linux 2.4.X kernel-mode PPPoE support], ac_cv_linux_kernel_pppoe, ++[AC_TRY_RUN([#include <sys/socket.h> + #include <net/ethernet.h> + #include <linux/if.h> + #include <linux/if_pppox.h> +@@ -146,10 +139,7 @@ + { + if (socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OE) >= 0) return 0; else return 1; + } +-], ac_cv_linux_kernel_pppoe=yes, ac_cv_linux_kernel_pppoe=no) +-else +- ac_cv_linux_kernel_pppoe=no +-fi ++], ac_cv_linux_kernel_pppoe=yes, ac_cv_linux_kernel_pppoe=no)]) + + $ECHO $ac_cv_linux_kernel_pppoe + if test "$ac_cv_linux_kernel_pppoe" != yes ; then +@@ -208,8 +198,8 @@ + esac + + dnl Figure out packing order of structures +-AC_MSG_CHECKING(packing order of bit fields) +-AC_TRY_RUN([ ++AC_CACHE_CHECK([packing order of bit fields], ac_cv_pack_bitfields_reversed, ++[AC_TRY_RUN([ + union foo { + struct bar { + unsigned int ver:4; +@@ -231,9 +221,9 @@ + } else { + return 2; + } +-}], PACK=normal, PACK=rev) ++}], ac_cv_pack_bitfields_reversed=no, ac_cv_pack_bitfields_reversed=yes)]) + +-if test "$PACK" = "rev" ; then ++if test "$ac_cv_pack_bitfields_reversed" = "yes" ; then + $ECHO "reversed" + AC_DEFINE(PACK_BITFIELDS_REVERSED) + else Added: trunk/package/rp-pppoe/rp-pppoe-3.5-scripts-fixes.patch =================================================================== --- trunk/package/rp-pppoe/rp-pppoe-3.5-scripts-fixes.patch (rev 0) +++ trunk/package/rp-pppoe/rp-pppoe-3.5-scripts-fixes.patch 2006-08-11 15:33:14 UTC (rev 230) @@ -0,0 +1,175 @@ +diff -ur rp-pppoe-3.5.orig/scripts/adsl-connect.in rp-pppoe-3.5/scripts/adsl-connect.in +--- rp-pppoe-3.5.orig/scripts/adsl-connect.in 2002-07-08 10:38:24.000000000 -0400 ++++ rp-pppoe-3.5/scripts/adsl-connect.in 2006-08-11 10:18:54.000000000 -0400 +@@ -18,7 +18,7 @@ + # Usage: adsl-connect [config_file] + # adsl-connect interface user [config_file] + # Second form overrides USER and ETH from config file. +-# If config_file is omitted, defaults to /etc//ppp/pppoe.conf ++# If config_file is omitted, defaults to /etc/ppp/pppoe.conf + # + #*********************************************************************** + +@@ -30,25 +30,22 @@ + # Paths to programs + IFCONFIG=/sbin/ifconfig + PPPD=@PPPD@ +-SETSID=@SETSID@ ++SETSID= + PPPOE=@sbindir@/pppoe + LOGGER="/usr/bin/logger -t `basename $0`" + ++MODPROBE=modprobe ++#MODPROBE=insmod ++ + # Set to "C" locale so we can parse messages from commands + LANG=C + export LANG + +-# Must be root +-if test "`@ID@ -u`" != 0 ; then +- echo "$0: You must be root to run this script" >& 2 +- exit 1 +-fi +- + if test "$SETSID" != "" -a ! -x "$SETSID"; then + SETSID="" + fi + +-CONFIG=/etc//ppp/pppoe.conf ++CONFIG=/etc/ppp/pppoe.conf + USER="" + ETH="" + +@@ -117,12 +114,12 @@ + if test `uname -s` = Linux ; then + $IFCONFIG $ETH up mtu 1500 + # For 2.4 kernels. Will fail on 2.2.x, but who cares? +- modprobe ppp_generic > /dev/null 2>&1 +- modprobe ppp_async > /dev/null 2>&1 +- modprobe ppp_synctty > /dev/null 2>&1 ++ $MODPROBE ppp_generic > /dev/null 2>&1 ++ $MODPROBE ppp_async > /dev/null 2>&1 ++ $MODPROBE ppp_synctty > /dev/null 2>&1 + if test -n "$LINUX_PLUGIN" ; then +- modprobe pppox > /dev/null 2>&1 +- modprobe pppoe > /dev/null 2>&1 ++ $MODPROBE pppox > /dev/null 2>&1 ++ $MODPROBE pppoe > /dev/null 2>&1 + fi + fi + +@@ -131,7 +128,7 @@ + PPPD_SYNC=sync + # Increase the chances of it working on Linux... + if test `uname -s` = Linux ; then +- modprobe n_hdlc > /dev/null 2>&1 ++ $MODPROBE n_hdlc > /dev/null 2>&1 + fi + else + PPPOE_SYNC="" +@@ -204,7 +201,7 @@ + + # Interface name MUST BE LAST!! + PLUGIN_OPTS="$PLUGIN_OPTS $ETH" +- modprobe pppoe > /dev/null 2>&1 ++ $MODPROBE pppoe > /dev/null 2>&1 + fi + + if test "$DEFAULTROUTE" != "no" ; then +diff -ur rp-pppoe-3.5.orig/scripts/adsl-setup.in rp-pppoe-3.5/scripts/adsl-setup.in +--- rp-pppoe-3.5.orig/scripts/adsl-setup.in 2002-07-08 10:38:24.000000000 -0400 ++++ rp-pppoe-3.5/scripts/adsl-setup.in 2006-08-11 10:19:25.000000000 -0400 +@@ -46,12 +46,6 @@ + $ECHO "properly..." + $ECHO "" + +-# Must be root +-if [ "`@ID@ -u`" != 0 ] ; then +- $ECHO "$0: Sorry, you must be root to run this script" +- exit 1 +-fi +- + # Prototype config file must exist + if [ ! -r "$CONFIG" ] ; then + $ECHO "Oh, dear, I don't see the file '$CONFIG' anywhere. Please" +@@ -280,12 +274,7 @@ + fi + fi + +-# Where is pppd likely to put its pid? +-if [ -d /var/run ] ; then +- VARRUN=/var/run +-else +- VARRUN=/etc/ppp +-fi ++VARRUN=/var/run + + # Some #$(*& ISP's use a slash in the user name... + sed -e "s&^USER=.*&USER='$U'&" \ +diff -ur rp-pppoe-3.5.orig/scripts/adsl-start.in rp-pppoe-3.5/scripts/adsl-start.in +--- rp-pppoe-3.5.orig/scripts/adsl-start.in 2002-07-08 10:38:24.000000000 -0400 ++++ rp-pppoe-3.5/scripts/adsl-start.in 2006-08-11 10:24:40.000000000 -0400 +@@ -40,11 +40,9 @@ + USER="" + ETH="" + ME=`basename $0` +-# Must be root +-if [ "`@ID@ -u`" != 0 ] ; then +- $ECHO "$ME: You must be root to run this script" >& 2 +- exit 1 +-fi ++ ++TTY_S="tty -s" ++#TTY_S=/bin/true + + # Debugging + if [ "$DEBUG" = "1" ] ; then +@@ -139,6 +137,8 @@ + fi + # Delete bogus PIDFILE + rm -f "$PIDFILE" "$PIDFILE.pppd" "$PIDFILE.pppoe" "$PIDFILE.start" ++else ++ mkdir -p /var/run + fi + + echo $$ > $PIDFILE.start +@@ -169,14 +169,14 @@ + # Looks like the interface came up + if [ $? = 0 ] ; then + # Print newline if standard input is a TTY +- tty -s && $ECHO " Connected!" ++ $TTY_S && $ECHO " Connected!" + exit 0 + fi + + if test -n "$FORCEPING" ; then + $ECHO -n "$FORCEPING" + else +- tty -s && $ECHO -n "$PING" ++ $TTY_S && $ECHO -n "$PING" + fi + sleep $CONNECT_POLL + TIME=`expr $TIME + $CONNECT_POLL` +diff -ur rp-pppoe-3.5.orig/scripts/adsl-status rp-pppoe-3.5/scripts/adsl-status +--- rp-pppoe-3.5.orig/scripts/adsl-status 2002-07-08 10:38:24.000000000 -0400 ++++ rp-pppoe-3.5/scripts/adsl-status 2006-08-11 10:20:32.000000000 -0400 +@@ -58,10 +58,7 @@ + + PPPD_PID=`cat "$PPPD_PIDFILE"` + +-# Sigh. Some versions of pppd put PID files in /var/run; others put them +-# in /etc/ppp. Since it's too messy to figure out what pppd does, we +-# try both locations. +-for i in /etc/ppp/ppp*.pid /var/run/ppp*.pid ; do ++for i in /var/run/ppp*.pid ; do + if [ -r $i ] ; then + PID=`cat $i` + if [ "$PID" = "$PPPD_PID" ] ; then +@@ -81,4 +78,4 @@ + + echo "adsl-status: Link is down -- could not find interface corresponding to" + echo "pppd pid $PPPD_PID" +-exit 1 +\ No newline at end of file ++exit 1 Added: trunk/package/rp-pppoe/rp-pppoe.mk =================================================================== --- trunk/package/rp-pppoe/rp-pppoe.mk (rev 0) +++ trunk/package/rp-pppoe/rp-pppoe.mk 2006-08-11 15:33:14 UTC (rev 230) @@ -0,0 +1,86 @@ +############################################################# +# +# rp-pppoe +# +############################################################# +# +RP-PPPOE_VERSION=3.5 +PPP_VERSION=2.4.3 +RP-PPPOE_SOURCE_URL=http://www.roaringpenguin.com/penguin/pppoe +RP-PPPOE_SOURCE=rp-pppoe-$(RP-PPPOE_VERSION).tar.gz +RP-PPPOE_BUILD_DIR=$(BUILD_DIR)/rp-pppoe-$(RP-PPPOE_VERSION) +RP-PPPOE_TARGET_BINARY:=usr/sbin/pppoe + +$(DL_DIR)/$(RP-PPPOE_SOURCE): + $(WGET) -P $(DL_DIR) $(RP-PPPOE_SOURCE_URL)/$(RP-PPPOE_SOURCE) + +$(RP-PPPOE_BUILD_DIR)/.unpacked: $(DL_DIR)/$(RP-PPPOE_SOURCE) + zcat $(DL_DIR)/$(RP-PPPOE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(RP-PPPOE_BUILD_DIR) package/rp-pppoe/ rp-pppoe\*.patch + touch $(RP-PPPOE_BUILD_DIR)/.unpacked + +$(RP-PPPOE_BUILD_DIR)/.configured: $(RP-PPPOE_BUILD_DIR)/.unpacked + (cd $(RP-PPPOE_BUILD_DIR)/src ; rm -rf config.{cache,status}; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ac_cv_func_setvbuf_reversed=no \ + ac_cv_sizeof_unsigned_short=2 \ + ac_cv_sizeof_unsigned_int=4 \ + ac_cv_sizeof_unsigned_long=4 \ + ac_cv_linux_kernel_pppoe=yes \ + ac_cv_pack_bitfields_reversed=yes \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + --enable-plugin=$(BUILD_DIR)/ppp-$(PPP_VERSION) \ + $(DISABLE_NLS) \ + ); + + touch $(RP-PPPOE_BUILD_DIR)/.configured + +$(RP-PPPOE_BUILD_DIR)/src/pppoe: $(RP-PPPOE_BUILD_DIR)/.configured + $(MAKE) -C $(RP-PPPOE_BUILD_DIR)/src + +$(TARGET_DIR)/$(RP-PPPOE_TARGET_BINARY): $(RP-PPPOE_BUILD_DIR)/src/pppoe + $(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/scripts/adsl-connect $(TARGET_DIR)/usr/sbin/adsl-connect + $(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/scripts/adsl-start $(TARGET_DIR)/usr/sbin/adsl-start + $(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/scripts/adsl-stop $(TARGET_DIR)/usr/sbin/adsl-stop + $(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/scripts/adsl-status $(TARGET_DIR)/usr/sbin/adsl-status + $(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/src/pppoe-server $(TARGET_DIR)/usr/sbin/pppoe-server + $(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/src/pppoe-sniff $(TARGET_DIR)/usr/sbin/pppoe-sniff + $(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/src/pppoe-relay $(TARGET_DIR)/usr/sbin/pppoe-relay + $(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/src/rp-pppoe.so $(TARGET_DIR)/usr/lib/ppp/rp-pppoe.so + $(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/src/pppoe $(TARGET_DIR)/usr/sbin/pppoe + +rp-pppoe: uclibc pppd $(TARGET_DIR)/$(RP-PPPOE_TARGET_BINARY) + +rp-pppoe-source: $(DL_DIR)/$(RP-PPPOE_SOURCE) + +rp-pppoe-clean: + -$(MAKE) -C $(RP-PPPOE_BUILD_DIR) clean + +rp-pppoe-dirclean: + rm -rf $(RP-PPPOE_BUILD_DIR) +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_RP-PPPOE)),y) +TARGETS+=rp-pppoe +endif Deleted: trunk/target/generic/target_skeleton/usr/sbin/adsl-connect =================================================================== --- trunk/target/generic/target_skeleton/usr/sbin/adsl-connect 2006-08-11 15:31:17 UTC (rev 229) +++ trunk/target/generic/target_skeleton/usr/sbin/adsl-connect 2006-08-11 15:33:14 UTC (rev 230) @@ -1,322 +0,0 @@ -#!/bin/sh -# Generated automatically from adsl-connect.in by configure. -#*********************************************************************** -# -# adsl-connect -# -# Shell script to connect to an ADSL provider using PPPoE -# -# Copyright (C) 2000 Roaring Penguin Software Inc. -# -# $Id: adsl-connect.in,v 1.23 2002/04/09 17:28:39 dfs Exp $ -# -# This file may be distributed under the terms of the GNU General -# Public License. -# -# LIC: GPL -# -# Usage: adsl-connect [config_file] -# adsl-connect interface user [config_file] -# Second form overrides USER and ETH from config file. -# If config_file is omitted, defaults to /etc//ppp/pppoe.conf -# -#*********************************************************************** - -# From AUTOCONF -prefix=/usr -exec_prefix=${prefix} -localstatedir=/var - -# Paths to programs -IFCONFIG=/sbin/ifconfig -PPPD=/usr/sbin/pppd -SETSID=/usr/bin/setsid -PPPOE=${exec_prefix}/sbin/pppoe -LOGGER="/usr/bin/logger -t `basename $0`" - -# Set to "C" locale so we can parse messages from commands -LANG=C -export LANG - -# Must be root -if test "`/usr/bin/id -u`" != 0 ; then - echo "$0: You must be root to run this script" >& 2 - exit 1 -fi - -if test "$SETSID" != "" -a ! -x "$SETSID"; then - SETSID="" -fi - -CONFIG=/etc//ppp/pppoe.conf -USER="" -ETH="" - -# Sort out command-line arguments -case "$#" in - 1) - CONFIG="$1" - ;; - 3) - CONFIG="$3" - ;; -esac - -if test ! -f "$CONFIG" -o ! -r "$CONFIG" ; then - echo "$0: Cannot read configuration file '$CONFIG'" >& 2 - exit 1 -fi - -. $CONFIG - -PPPOE_PIDFILE="$PIDFILE.pppoe" -PPPD_PIDFILE="$PIDFILE.pppd" - -# Check for command-line overriding of ETH and USER -case "$#" in - 2|3) - ETH="$1" - USER="$2" - ;; -esac - -# Check that config file is sane -if test "$USER" = "" ; then - echo "$0: Check '$CONFIG' -- no setting for USER" >& 2 - exit 1 -fi -if test "$ETH" = "" ; then - echo "$0: Check '$CONFIG' -- no setting for ETH" >& 2 - exit 1 -fi - -PPPD_PID=0 - -# Catch common error -if test "$DEBUG" = "1" ; then - echo "*** If you want to use DEBUG, invoke adsl-start, not adsl-connect." - exit 1 -fi - -if test "$DEBUG" != "" ; then - if test "$LINUX_PLUGIN" != "" ; then - echo "Cannot use DEBUG mode and LINUX_PLUGIN at the same time." - echo "Kernel-mode PPPoE is experimental and unsupported." - exit 1 - fi - echo "* The following section identifies your Ethernet interface" >> $DEBUG - echo "* and user name. Some ISP's need 'username'; others" >> $DEBUG - echo "* need 'use...@is...'. Try both" >> $DEBUG - echo "ETH=$ETH; USER=$USER" >> $DEBUG - echo "---------------------------------------------" >> $DEBUG -fi - -# MTU of Ethernet card attached to modem MUST be 1500. This apparently -# fails on some *BSD's, so we'll only do it under Linux - -if test `uname -s` = Linux ; then - $IFCONFIG $ETH up mtu 1500 - # For 2.4 kernels. Will fail on 2.2.x, but who cares? - modprobe ppp_generic > /dev/null 2>&1 - modprobe ppp_async > /dev/null 2>&1 - modprobe ppp_synctty > /dev/null 2>&1 - if test -n "$LINUX_PLUGIN" ; then - modprobe pppox > /dev/null 2>&1 - modprobe pppoe > /dev/null 2>&1 - fi -fi - -if test "$SYNCHRONOUS" = "yes" ; then - PPPOE_SYNC=-s - PPPD_SYNC=sync - # Increase the chances of it working on Linux... - if test `uname -s` = Linux ; then - modprobe n_hdlc > /dev/null 2>&1 - fi -else - PPPOE_SYNC="" - PPPD_SYNC="" -fi - -if test -n "$ACNAME" ; then - ACNAME="-C $ACNAME" -fi - -if test -n "$SERVICENAME" ; then - SERVICENAMEOPT="-S $SERVICENAME" -else - SERVICENAMEOPT="" -fi - -if test "$CLAMPMSS" = "no" ; then - CLAMPMSS="" -else - CLAMPMSS="-m $CLAMPMSS" -fi - -# If DNSTYPE is SERVER, we must use "usepeerdns" option to pppd. -if test "$DNSTYPE" = "SERVER" ; then - PEERDNS=yes - USEPEERDNS=yes -fi - -if test "$PEERDNS" = "yes" ; then - PEERDNS="usepeerdns" -else - PEERDNS="" -fi - -# Backward config file compatibility -- PEERDNS used to be USEPEERDNS -if test "$USEPEERDNS" = "yes" ; then - PEERDNS="usepeerdns" -fi -if test "$USEPEERDNS" = "no" ; then - PEERDNS="" -fi - - -# Backward config file compatibility -if test "$DEMAND" = "" ; then - DEMAND=no -fi - -if test "$DEMAND" = "no" ; then - DEMAND="" -else - DEMAND="demand persist idle $DEMAND 10.112.112.112:10.112.112.113 ipcp-accept-remote ipcp-accept-local connect true noipdefault ktune" -fi - -case "$FIREWALL" in - STANDALONE) - . /etc/ppp/firewall-standalone - ;; - MASQUERADE) - . /etc/ppp/firewall-masq - ;; -esac - -# If we're using kernel-mode PPPoE on Linux... -if test "$LINUX_PLUGIN" != "" ; then - PLUGIN_OPTS="plugin $LINUX_PLUGIN" - if test -n "$SERVICENAME" ; then - PLUGIN_OPTS="$PLUGIN_OPTS rp_pppoe_service $SERVICENAME" - fi - - # Interface name MUST BE LAST!! - PLUGIN_OPTS="$PLUGIN_OPTS nic-$ETH" - modprobe pppoe > /dev/null 2>&1 -fi - -if test "$DEFAULTROUTE" != "no" ; then - DEFAULTROUTE="defaultroute" -else - DEFAULTROUTE="" -fi - -# Standard PPP options we always use -PPP_STD_OPTIONS="$PLUGIN_OPTS noipdefault noauth default-asyncmap $DEFAULTROUTE hide-password nodetach $PEERDNS mtu 1492 mru 1492 noaccomp noccp nobsdcomp nodeflate nopcomp novj novjccomp user $USER lcp-echo-interval $LCP_INTERVAL lcp-echo-failure $LCP_FAILURE $PPPD_EXTRA" - -# Jigger DNS if required... -if test "$DNSTYPE" = "SERVER" ; then - # Sorry, dude... - rm -f /tmp/etc/resolv.conf - ln -s /etc/ppp/resolv.conf /tmp/etc/resolv.conf -elif test "$DNSTYPE" = "SPECIFY" ; then - # Sorry, dude... - rm -f /tmp/etc/resolv.conf - echo "nameserver $DNS1" > /tmp/etc/resolv.conf - if test -n "$DNS2" ; then - echo "nameserver $DNS2" >> /tmp/etc/resolv.conf - fi -fi - -# PPPoE invocation -PPPOE_CMD="$PPPOE -p $PPPOE_PIDFILE -I $ETH -T $PPPOE_TIMEOUT -U $PPPOE_SYNC $CLAMPMSS $ACNAME $SERVICENAMEOPT $PPPOE_EXTRA" -if test "$DEBUG" != "" ; then - if test "$DEMAND" != "" ; then - echo "(Turning off DEMAND for debugging purposes)" - DEMAND="" - fi - echo "* The following section shows the pppd command we will invoke" >> $DEBUG - echo "pppd invocation" >> $DEBUG - echo "$SETSID $PPPD pty '$PPPOE_CMD' $PPP_STD_OPTIONS $PPPD_SYNC debug" >> $DEBUG - echo "---------------------------------------------" >> $DEBUG - $SETSID $PPPD pty "$PPPOE_CMD -D $DEBUG-0" \ - $PPP_STD_OPTIONS \ - $PPPD_SYNC \ - debug >> $DEBUG 2>&1 - echo "---------------------------------------------" >> $DEBUG - echo "* The following section is an extract from your log." >> $DEBUG - echo "* Look for error messages from pppd, such as" >> $DEBUG - echo "* a lack of kernel support for PPP, authentication failure" >> $DEBUG - echo "* etc." >> $DEBUG - if test -f "/var/log/messages" ; then - echo "Extract from /var/log/messages" >> $DEBUG - grep 'ppp' /var/log/messages | tail -150 >> $DEBUG - elif test -f "/var/adm/messages"; then - echo "Extract from /var/adm/messages" >> $DEBUG - grep 'ppp' /var/adm/messages | tail -150 >> $DEBUG - else - echo "Can't find messages file (looked for /var/{log,adm}/messages" >> $DEBUG - fi - date >> $DEBUG - echo "---------------------------------------------" >> $DEBUG - echo "* The following section is a dump of the packets" >> $DEBUG - echo "* sent and received by rp-pppoe. If you don't see" >> $DEBUG - echo "* any output, it's an Ethernet driver problem. If you only" >> $DEBUG - echo "* see three PADI packets and nothing else, check your cables" >> $DEBUG - echo "* and modem. Make sure the modem lights flash when you try" >> $DEBUG - echo "* to connect. Check that your Ethernet card is in" >> $DEBUG - echo "* half-duplex, 10Mb/s mode. If all else fails," >> $DEBUG - echo "* try using pppoe-sniff." >> $DEBUG - echo "rp-pppoe debugging dump" >> $DEBUG - cat $DEBUG-0 >> $DEBUG - rm -f $DEBUG-0 - for i in 1 2 3 4 5 6 7 8 9 10 ; do - echo "" - echo "" - echo "" - done - echo "*** Finished debugging run. Please review the file" - echo "*** '$DEBUG' and try to" - echo "*** figure out what is going on." - echo "***" - echo "*** Unfortunately, we can NO LONGER accept debugging" - echo "*** output for analysis. Please do not send this to" - echo "*** Roaring Penguin; it is too time-consuming for" - echo "*** us to deal with all the analyses we have been sent." - exit 0 -fi - -echo $$ > $PIDFILE - -while [ true ] ; do - if test "$OVERRIDE_PPPD_COMMAND" != "" ; then - $SETSID $OVERRIDE_PPPD_COMMAND & - echo "$!" > $PPPD_PIDFILE - elif test "$LINUX_PLUGIN" != "" ; then - $SETSID $PPPD $PPP_STD_OPTIONS $DEMAND & - echo "$!" > $PPPD_PIDFILE - else - $SETSID $PPPD pty "$PPPOE_CMD" \ - $PPP_STD_OPTIONS \ - $DEMAND \ - $PPPD_SYNC & - echo "$!" > $PPPD_PIDFILE - fi - wait - - if test "$RETRY_ON_FAILURE" = "no" ; then - exit - fi - - # Run /etc/ppp/adsl-lost if it exists - test -x /etc/ppp/adsl-lost && /etc/ppp/adsl-lost - - # Re-establish the connection - $LOGGER -p daemon.notice \ - "ADSL connection lost; attempting re-connection." - - # Wait a bit in case a problem causes tons of log messages :-) - sleep 5 -done Deleted: trunk/target/generic/target_skeleton/usr/sbin/adsl-start =================================================================== --- trunk/target/generic/target_skeleton/usr/sbin/adsl-start 2006-08-11 15:31:17 UTC (rev 229) +++ trunk/target/generic/target_skeleton/usr/sbin/adsl-start 2006-08-11 15:33:14 UTC (rev 230) @@ -1,196 +0,0 @@ -#!/bin/sh -# Generated automatically from adsl-start.in by configure. -#*********************************************************************** -# -# adsl-start -# -# Shell script to bring up an ADSL connection -# -# Copyright (C) 2000 Roaring Penguin Software Inc. -# -# $Id: adsl-start.in,v 1.8 2002/04/09 17:28:39 dfs Exp $ -# -# This file may be distributed under the terms of the GNU General -# Public License. -# -# LIC: GPL -# -# Usage: adsl-start [config_file] -# adsl-start interface user [config_file] -# Second form overrides USER and ETH from config file. -# If config_file is omitted, defaults to /etc/ppp/pppoe.conf -# -#*********************************************************************** - -# From AUTOCONF -prefix=/usr -exec_prefix=${prefix} - -# Paths to programs -CONNECT=${exec_prefix}/sbin/adsl-connect -ECHO=/bin/echo -IFCONFIG=/sbin/ifconfig - -# Set to "C" locale so we can parse messages from commands -LANG=C -export LANG - -# Defaults -CONFIG=/etc/ppp/pppoe.conf -USER="" -ETH="" -ME=`basename $0` -# Must be root -if [ "`/usr/bin/id -u`" != 0 ] ; then - $ECHO "$ME: You must be root to run this script" >& 2 - exit 1 -fi - -# Debugging -if [ "$DEBUG" = "1" ] ; then - $ECHO "*** Running in debug mode... please be patient..." - DEBUG=/tmp/pppoe-debug-$$ - export DEBUG - mkdir $DEBUG - if [ "$?" != 0 ] ; then - $ECHO "Could not create directory $DEBUG... exiting" - exit 1 - fi - DEBUG=$DEBUG/pppoe-debug.txt - - # Initial debug output - $ECHO "---------------------------------------------" > $DEBUG - $ECHO "* The following section contains information about your system" >> $DEBUG - date >> $DEBUG - $ECHO "Output of uname -a" >> $DEBUG - uname -a >> $DEBUG - $ECHO "---------------------------------------------" >> $DEBUG - $ECHO "* The following section contains information about your network" >> $DEBUG - $ECHO "* interfaces. The one you chose for PPPoE should contain the words:" >> $DEBUG - $ECHO "* 'UP' and 'RUNNING'. If it does not, you probably have an Ethernet" >> $DEBUG - $ECHO "* driver problem." >> $DEBUG - $ECHO "Output of ifconfig -a" >> $DEBUG - $IFCONFIG -a >> $DEBUG - $ECHO "---------------------------------------------" >> $DEBUG - if [ "`uname -s`" = "Linux" ] ; then - $ECHO "* The following section contains information about kernel modules" >> $DEBUG - $ECHO "* If the module for your Ethernet card is 'tulip', you might" >> $DEBUG - $ECHO "* want to look for an updated version at http://www.scyld.com" >> $DEBUG - $ECHO "Output of lsmod" >> $DEBUG - lsmod >> $DEBUG - $ECHO "---------------------------------------------" >> $DEBUG - fi - $ECHO "* The following section lists your routing table." >> $DEBUG - $ECHO "* If you have an entry which starts with '0.0.0.0', you probably" >> $DEBUG - $ECHO "* have defined a default route and gateway, and pppd will" >> $DEBUG - $ECHO "* not create a default route using your ISP. Try getting" >> $DEBUG - $ECHO "* rid of this route." >> $DEBUG - $ECHO "Output of netstat -n -r" >> $DEBUG - netstat -n -r >> $DEBUG - $ECHO "---------------------------------------------" >> $DEBUG - $ECHO "Contents of /etc/resolv.conf" >> $DEBUG - $ECHO "* The following section lists DNS setup." >> $DEBUG - $ECHO "* If you can browse by IP address, but not name, suspect" >> $DEBUG - $ECHO "* a DNS problem." >> $DEBUG - cat /etc/resolv.conf >> $DEBUG - $ECHO "---------------------------------------------" >> $DEBUG - $ECHO "* The following section lists /etc/ppp/options." >> $DEBUG - $ECHO "* You should have NOTHING in that file." >> $DEBUG - $ECHO "Contents of /etc/ppp/options" >> $DEBUG - cat /etc/ppp/options >> $DEBUG 2>/dev/null - $ECHO "---------------------------------------------" >> $DEBUG -else - DEBUG="" -fi - -# Sort out command-line arguments -case "$#" in - 1) - CONFIG="$1" - ;; - 3) - CONFIG="$3" - ;; -esac - -if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then - $ECHO "$ME: Cannot read configuration file '$CONFIG'" >& 2 - exit 1 -fi - -. $CONFIG - -# Check for command-line overriding of ETH and USER -case "$#" in - 2|3) - ETH="$1" - USER="$2" - ;; -esac - -# Check for pidfile -if [ -r "$PIDFILE" ] ; then - PID=`cat "$PIDFILE"` - # Check if still running - kill -0 $PID > /dev/null 2>&1 - if [ $? = 0 ] ; then - $ECHO "$ME: There already seems to be an ADSL connection up (PID $PID)" >& 2 - exit 1 - fi - # Delete bogus PIDFILE - rm -f "$PIDFILE" "$PIDFILE.pppd" "$PIDFILE.pppoe" "$PIDFILE.start" -fi - -echo $$ > $PIDFILE.start - -# Start the connection in the background unless we're debugging -if [ "$DEBUG" != "" ] ; then - $CONNECT "$@" - exit 0 -fi - -$CONNECT "$@" > /dev/null 2>&1 & -CONNECT_PID=$! - -if [ "$CONNECT_TIMEOUT" = "" -o "$CONNECT_TIMEOUT" = 0 ] ; then - exit 0 -fi - -# Don't monitor connection if dial-on-demand -if [ "$DEMAND" != "" -a "$DEMAND" != "no" ] ; then - exit 0 -fi - -# Monitor connection -TIME=0 -while [ true ] ; do - ${exec_prefix}/sbin/adsl-status $CONFIG > /dev/null 2>&1 - - # Looks like the interface came up - if [ $? = 0 ] ; then - # Print newline if standard input is a TTY - tty -s && $ECHO " Connected!" - exit 0 - fi - - if test -n "$FORCEPING" ; then - $ECHO -n "$FORCEPING" - else - tty -s && $ECHO -n "$PING" - fi - sleep $CONNECT_POLL - TIME=`expr $TIME + $CONNECT_POLL` - if [ $TIME -gt $CONNECT_TIMEOUT ] ; then - break - fi -done - -$ECHO "TIMED OUT" >& 2 -# Timed out! Kill the adsl-connect process and quit -kill $CONNECT_PID > /dev/null 2>&1 - -# Clean up PIDFILE(s) -rm -f "$PIDFILE" "$PIDFILE.pppd" "$PIDFILE.pppoe" "$PIDFILE.start" - -exit 1 - Deleted: trunk/target/generic/target_skeleton/usr/sbin/adsl-status =================================================================== --- trunk/target/generic/target_skeleton/usr/sbin/adsl-status 2006-08-11 15:31:17 UTC (rev 229) +++ trunk/target/generic/target_skeleton/usr/sbin/adsl-status 2006-08-11 15:33:14 UTC (rev 230) @@ -1,84 +0,0 @@ -#!/bin/sh -#*********************************************************************** -# -# adsl-status -# -# Shell script to report on status of ADSL connection -# -# Copyright (C) 2000-2001 Roaring Penguin Software Inc. -# -# $Id: adsl-status,v 1.3 2002/04/09 17:28:39 dfs Exp $ -# -# This file may be distributed under the terms of the GNU General -# Public License. -# -# LIC: GPL -# -# Usage: adsl-status [config_file] -# If config_file is omitted, defaults to /etc/ppp/pppoe.conf -# -#*********************************************************************** - -# Defaults -CONFIG=/etc/ppp/pppoe.conf - -case "$#" in - 1) - CONFIG="$1" - ;; -esac - -if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then - echo "$0: Cannot read configuration file '$CONFIG'" >& 2 - exit 1 -fi - -. $CONFIG - -PPPOE_PIDFILE="$PIDFILE.pppoe" -PPPD_PIDFILE="$PIDFILE.pppd" - -if [ "$DEMAND" != "no" ] ; then - echo "Note: You have enabled demand-connection; adsl-status may be inaccurate." -fi - -# If no PPPOE_PIDFILE, connection is down, unless we're using the Linux plugin -if [ "$LINUX_PLUGIN" = "" ] ; then - if [ ! -r "$PPPOE_PIDFILE" ] ; then - echo "adsl-status: Link is down (can't read pppoe PID file $PPPOE_PIDFILE)" - exit 1 - fi -fi - -# If no PPPD_PIDFILE, something fishy! -if [ ! -r "$PPPD_PIDFILE" ] ; then - echo "adsl-status: Link is down (can't read pppd PID file $PPPD_PIDFILE)" - exit 1 -fi - -PPPD_PID=`cat "$PPPD_PIDFILE"` - -# Sigh. Some versions of pppd put PID files in /var/run; others put them -# in /etc/ppp. Since it's too messy to figure out what pppd does, we -# try both locations. -for i in /etc/ppp/ppp*.pid /var/run/ppp*.pid ; do - if [ -r $i ] ; then - PID=`cat $i` - if [ "$PID" = "$PPPD_PID" ] ; then - IF=`basename $i .pid` - netstat -rn | grep " ${IF}\$" > /dev/null - # /sbin/ifconfig $IF | grep "UP.*POINTOPOINT" > /dev/null - if [ "$?" != "0" ] ; then - echo "adsl-status: Link is attached to $IF, but $IF is down" - exit 1 - fi - echo "adsl-status: Link is up and running on interface $IF" - /sbin/ifconfig $IF - exit 0 - fi - fi -done - -echo "adsl-status: Link is down -- could not find interface corresponding to" -echo "pppd pid $PPPD_PID" -exit 1 \ No newline at end of file Deleted: trunk/target/generic/target_skeleton/usr/sbin/adsl-stop =================================================================== --- trunk/target/generic/target_skeleton/usr/sbin/adsl-stop 2006-08-11 15:31:17 UTC (rev 229) +++ trunk/target/generic/target_skeleton/usr/sbin/adsl-stop 2006-08-11 15:33:14 UTC (rev 230) @@ -1,90 +0,0 @@ -#!/bin/sh -# Generated automatically from adsl-stop.in by configure. -#*********************************************************************** -# -# adsl-stop -# -# Shell script to bring down an ADSL connection -# -# Copyright (C) 2000 Roaring Penguin Software Inc. -# -# $Id: adsl-stop.in,v 1.5 2002/04/09 17:28:39 dfs Exp $ -# -# This file may be distributed under the terms of the GNU General -# Public License. -# -# LIC: GPL -# -# Usage: adsl-stop [config_file] -# If config_file is omitted, defaults to /etc/ppp/pppoe.conf -# -#*********************************************************************** - -# Set to "C" locale so we can parse messages from commands -LANG=C -export LANG - -ME="`basename $0`" -LOGGER="/usr/bin/logger -t $ME" -CONFIG="$1" -if [ "$CONFIG" = "" ] ; then - CONFIG=/etc/ppp/pppoe.conf -fi - -if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then - echo "$ME: Cannot read configuration file '$CONFIG'" >& 2 - exit 1 -fi - -. $CONFIG - -PPPOE_PIDFILE="$PIDFILE.pppoe" -PPPD_PIDFILE="$PIDFILE.pppd" -STARTPID="$PIDFILE.start" - -# Backward config file compatibility -if test "$DEMAND" = "" ; then - DEMAND=no -fi - -# Ignore SIGTERM -trap "" 15 - -# Check for pidfile -if [ -r "$PIDFILE" ] ; then - PID=`cat $PIDFILE` - - # Check if still running - kill -0 $PID > /dev/null 2>&1 - if [ $? != 0 ] ; then - echo "$ME: The adsl-connect script (PID $PID) appears to have died" >& 2 - fi - - # Kill pppd, which should in turn kill pppoe - if [ -r "$PPPD_PIDFILE" ] ; then - PPPD_PID=`cat "$PPPD_PIDFILE"` - $LOGGER -p daemon.notice "Killing pppd" - echo "Killing pppd ($PPPD_PID)" - kill $PPPD_PID > /dev/null 2>&1 || exit 1 - fi - - # Kill adsl-start - PIDS=`cat $STARTPID` - kill -0 $PIDS > /dev/null 2>&1 - if [ $? = 0 ] ; then - $LOGGER -p daemon.notice "Killing adsl-connect" - kill $PIDS > /dev/null 2>&1 - fi - - # Kill adsl-connect - $LOGGER -p daemon.notice "Killing adsl-connect" - echo "Killing adsl-connect ($PID)" - kill $PID > /dev/null 2>&1 - - rm -f "$PIDFILE" "$PPPD_PIDFILE" "$PPPOE_PIDFILE" "$STARTPID" -else - echo "$ME: No ADSL connection appears to be running" >&2 - exit 1 -fi - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dha...@us...> - 2006-08-11 15:51:16
|
Revision: 231 Author: dhartman Date: 2006-08-11 08:50:59 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=231&view=rev Log Message: ----------- undoing accidental merge from dhartman branch Modified Paths: -------------- trunk/package/Config.in trunk/package/acpid/acpid.mk trunk/package/file/file.mk trunk/package/iptables/iptables.init trunk/package/iptables/iptables.mk trunk/target/generic/target_skeleton/etc/init.d/misc Added Paths: ----------- trunk/target/generic/target_skeleton/etc/runlevels/default/S02network trunk/target/generic/target_skeleton/etc/runlevels/default/S03ntpclient Removed Paths: ------------- trunk/package/acpid/acpid.init trunk/package/iaxmodem/ trunk/package/iptables/arno-iptables-firewall.conf trunk/package/libtiff/ trunk/package/openvpn/openvpn.init trunk/target/generic/target_skeleton/etc/openvpn.conf trunk/target/generic/target_skeleton/etc/runlevels/default/K26openvpn trunk/target/generic/target_skeleton/etc/runlevels/default/S02iptables trunk/target/generic/target_skeleton/etc/runlevels/default/S03network trunk/target/generic/target_skeleton/etc/runlevels/default/S04ntpclient trunk/target/generic/target_skeleton/etc/runlevels/default/S14openvpn trunk/target/generic/target_skeleton/etc/runlevels/default/S24acpid Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2006-08-11 15:33:14 UTC (rev 230) +++ trunk/package/Config.in 2006-08-11 15:50:59 UTC (rev 231) @@ -61,7 +61,6 @@ source "package/gzip/Config.in" source "package/hostap/Config.in" source "package/hotplug/Config.in" -source "package/iaxmodem/Config.in" source "package/inadyn/Config.in" source "package/iostat/Config.in" source "package/iproute2/Config.in" @@ -82,7 +81,6 @@ source "package/libpq/Config.in" source "package/libpri/Config.in" source "package/libsysfs/Config.in" -source "package/libtiff/Config.in" source "package/libtool/Config.in" source "package/libusb/Config.in" source "package/lighttpd/Config.in" Deleted: trunk/package/acpid/acpid.init =================================================================== --- trunk/package/acpid/acpid.init 2006-08-11 15:33:14 UTC (rev 230) +++ trunk/package/acpid/acpid.init 2006-08-11 15:50:59 UTC (rev 231) @@ -1,45 +0,0 @@ -#!/bin/sh - -. /etc/rc.conf - -start () { -if [ -x /usr/sbin/acpid ] -then -echo "Starting acpid..." -/usr/sbin/acpid -fi -} - -stop () { -if `ps | grep -q acpid` -then -echo "Stopping acpid..." -killall acpid 2> /dev/null -fi -} - -case $1 in - -start) -start -;; - -stop) -stop -;; - -init) -start -;; - -restart) -stop -sleep 2 -start -;; - -*) -echo "Usage: start|stop|restart" -;; - -esac Modified: trunk/package/acpid/acpid.mk =================================================================== --- trunk/package/acpid/acpid.mk 2006-08-11 15:33:14 UTC (rev 230) +++ trunk/package/acpid/acpid.mk 2006-08-11 15:50:59 UTC (rev 231) @@ -26,7 +26,6 @@ mkdir -p $(TARGET_DIR)/etc/acpi/events echo -e "event=button[ /]power\naction=/sbin/poweroff" > $(TARGET_DIR)/etc/acpi/events/powerbtn touch -c $(TARGET_DIR)/usr/sbin/acpid - $(INSTALL) -D -m 0755 package/acpid/acpid.init $(TARGET_DIR)/etc/init.d/acpid acpid: $(TARGET_DIR)/usr/sbin/acpid @@ -34,9 +33,6 @@ acpid-clean: -make -C $(ACPID_DIR) clean - rm -f $(TARGET_DIR)/usr/sbin/acpid - rm -f $(TARGET_DIR)/etc/init.d/acpid - rm -rf $(TARGET_DIR)/etc/acpi acpid-dirclean: rm -rf $(ACPID_DIR) Modified: trunk/package/file/file.mk =================================================================== --- trunk/package/file/file.mk 2006-08-11 15:33:14 UTC (rev 230) +++ trunk/package/file/file.mk 2006-08-11 15:50:59 UTC (rev 231) @@ -3,7 +3,7 @@ # file # ############################################################# -FILE_VER:=4.17 +FILE_VER:=4.15 FILE_SOURCE:=file-$(FILE_VER).tar.gz FILE_SITE:=ftp://ftp.astron.com/pub/file FILE_DIR1:=$(TOOL_BUILD_DIR)/file-$(FILE_VER) Deleted: trunk/package/iptables/arno-iptables-firewall.conf =================================================================== --- trunk/package/iptables/arno-iptables-firewall.conf 2006-08-11 15:33:14 UTC (rev 230) +++ trunk/package/iptables/arno-iptables-firewall.conf 2006-08-11 15:50:59 UTC (rev 231) @@ -1,961 +0,0 @@ -############################################################################### -# Modified by Darrick Hartman for use with Astlinux # -# basic settings in rc.conf. # -# These settings are commented out with two ## example ## EXT_IF="ppp+" # -# Make advanced setting in /mnt/kd/firewall.conf # -############################################################################### - -# --------------------------- Configuration file ------------------------------ -# -= Arno's iptables firewall =- -# Single- & multi-homed firewall script with DSL/ADSL support -# -# (C) Copyright 2001-2006 by Arno van Amersfoort -# Homepage : http://rocky.eld.leidenuniv.nl/ -# Freshmeat : http://freshmeat.net/projects/iptables-firewall/?topic_id=151 -# Email : arnova AT rocky DOT eld DOT leidenuniv DOT nl -# (note: you must remove all spaces and substitute the @ and the . -# at the proper locations!) -# ----------------------------------------------------------------------------- -# 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 2 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, write to the Free Software Foundation Inc., 59 Temple -# Place - Suite 330, Boston, MA 02111-1307, USA. -# ----------------------------------------------------------------------------- - -## Astlinux mod ## -# source rc.conf for basic settings - -. /etc/rc.conf - -# Location of the iptables-binary (use 'locate iptables' or 'whereis iptables' -# to manually locate it). -# ----------------------------------------------------------------------------- -IPTABLES="/usr/sbin/iptables" - -############################################################################### -# External (internet) interface settings # -############################################################################### - -# The external interface(s) that will be protected (and used as internet -# connection). This is probably ppp+ for non-transparent(!) (A)DSL modems -# otherwise it should be "ethX" (eg. eth0). Multiple interfaces should be space -# separated. -# ----------------------------------------------------------------------------- -##EXT_IF="ppp+" - -# Enable if THIS machines (dynamically) obtains its IP through DHCP (from your -# ISP). -# ----------------------------------------------------------------------------- -##EXT_IF_DHCP_IP=0 - -# (EXPERT SETTING!) Here you can specify your external(!) subnet(s). You should -# only use this if you for example have a corporate network and/or running a -# DHCP server on your external(!) interface. Home users should normally NOT -# touch this setting. Multiple subnets should be space separated. -# Don't forget to specify a proper subnet masker (eg. /24, /16 or /8)! -# ----------------------------------------------------------------------------- -EXTERNAL_NET="" - -# (EXPERT SETTING!) Here you can specify the IP address used for broadcasts -# on your external subnet. You only need to set this option if you want to use -# the BROADCAST_XXX_NOLOG variables AND you use a non-standard broadcast -# address (not *.255.255.255, *.*.255.255 or *.*.*.255)! So normally leaving -# this empty should work fine. Multiple addresses (if you have more than one -# external interface) should be space separated. -# ----------------------------------------------------------------------------- -EXT_NET_BCAST_ADDRESS="" - -# Enable this if THIS MACHINE is running a DHCP(BOOTP) server for a subnet on -# the external(!) interface. Note that you don't need this for internal -# subnets, as for these nets everything is accepted by default. Don't forget to -# configure the EXTERNAL_NET variable, to make this work. -# ----------------------------------------------------------------------------- -EXTERNAL_DHCP_SERVER=0 - - -############################################################################### -# Internal (LAN) interface settings # -############################################################################### - -# Internal network interface or interfaces (multiple(!) interfaces should be -# space separated). Remark this if you don't have any internal network -# interfaces. Note that ALL traffic is accepted from these interfaces. -# ----------------------------------------------------------------------------- -##INT_IF="" - -# Specify here the internal subnet which is connected to the internal interface -# (INT_IF). For multiple interfaces(!) you can either specify multiple subnets -# here or specify one big subnet for all internal interfaces. -# ----------------------------------------------------------------------------- -##INTERNAL_NET="192.168.0.0/24" - -# (EXPERT SETTING!) Here you can specify the IP address used for broadcasts -# on your internal subnet. You only need to set this option if you want to use -# the MAC filter AND you use a non-standard broadcast address -# (not *.255.255.255, *.*.255.255 or *.*.*.255)! So normally leaving -# this empty should work fine. Multiple addresses (if you have more than one -# external interface) should be space separated. -# ----------------------------------------------------------------------------- -INT_NET_BCAST_ADDRESS="" - -# Uncomment & specify here the location of the file that contains the MAC -# addresses of INTERNAL hosts that are allowed. The MAC addresses should be -# written like 00:11:22:33:44:55 -# Note that the last line of this -# file should always contain a carriage-return (enter)! -# ----------------------------------------------------------------------------- -#MAC_ADDRESS_FILE=/etc/arno-firewall-mac-addresses - - -############################################################################### -# DMZ (aka DeMilitarized Zone) settings # -############################################################################### - -# Put in the following variable the network interfaces that are DMZ-classified. -# You can also use this interface if you want to shield your Wireless network -# from your LAN. -# ----------------------------------------------------------------------------- -##DMZ_IF="" - -# Specify here the subnet which is connected to the DMZ interface (DMZ_IF). -# For multiple interfaces(!) you can either specify multiple subnets here or -# specify one big subnet for all DMZ interfaces. -# ----------------------------------------------------------------------------- -##DMZ_NET="" - - -############################################################################### -# NAT (Masquerade, SNAT, DNAT) settings # -############################################################################### - -# Enable this if you want to perform NAT (masquerading) for your internal -# network (LAN) (eg. share your internet connection with your internal -# net(s) connected to eg. INT_IF). -# ----------------------------------------------------------------------------- -##NAT=0 - -# (EXPERT SETTING!). By default only the first external interface (EXT_IF) -# is used for masquerading (NAT). By enabling this option ALL external -# interfaces *can* be used (load balancing / multi-route). Note that you should -# properly configure your route-table to make this work. Check the INSTALL file -# for more info. -# ----------------------------------------------------------------------------- -MASQ_MULTI_ROUTE=0 - -# (EXPERT SETTING!). In case you would like to use SNAT instead of -# MASQUERADING then uncomment and set the IP or IP's here of your static -# external address(es). Note that when multiple IP's are specified, SNAT -# multiroute is enabled (load balancing over multiple external (internet) -# interfaces, check the README file for more info). Note that the order of IP's -# should match the order of interfaces (they belond to) in $EXT_IF! -# ----------------------------------------------------------------------------- -#NAT_STATIC_IP="193.2.1.1" - -# (EXPERT SETTING!). Use this variable only if you want specific subnets or -# hosts to be able to access the internet. When no value is specified, your -# whole internal net will have access. In both cases it's obviously only -# meaningful when NAT is enabled. Note that you can also use this variable if -# you want to use NAT for your DMZ. -# ----------------------------------------------------------------------------- -NAT_INTERNAL_NET="$INTERNAL_NET" - -# NAT TCP/UDP/IP forwards. Forward ports or protocols from the gateway to -# an internal client through (D)NAT. Note that you can also use these -# variables to forward ports to DMZ hosts -# -# TCP/UDP form: -# "{SRCIP1,SRCIP2,...:}PORT1,PORT2-PORT3,...>DESTIP1{:port} \ -# {SRCIP3,...:}PORT3,...>DESTIP2:port}" -# -# IP form: -# "{SRCIP1,SRCIP2,...:}PROTO1,PROTO2,...>DESTIP1 \ -# {SRCIP3:}PROTO3,PROTO4,...>DESTIP2" -# -# TCP/UDP port forward examples: -# Simple (forward port 80 to internal host 192.168.0.10): -# NAT_xxx_FORWARD="80>192.168.0.10" -# Advanced (forward port 20 & 21 to 192.168.0.10 and -# forward from 1.2.3.4 port 81 to 192.168.0.11 port 80: -# NAT_xxx_FORWARD="20,21>192.168.0.10 1.2.3.4:81>192.168.0.11:80" -# -# IP protocol forward example: -# "47,48>192.168.0.10" (forward protocols 47 & 48 to 192.168.0.10 -# -# NOTE 1: {:port} is optional. Use it to redirect a specific port to a -# different port on the internal client. -# NOTE 2: {SRCIPx} is optional. Use it to restrict access to specific source -# IP addresses. -# NOTE 3: Port ranges can be written as "PORT1:PORT3" (ie. "1024:1030" would -# include ports 1024 until 1030). -# ----------------------------------------------------------------------------- -##NAT_TCP_FORWARD="" -##NAT_UDP_FORWARD="" -##NAT_IP_FORWARD="" - - -############################################################################### -# (ADSL) Modem settings # -# # -# The MODEM_xxx options should (only) be used when you have an ((A)DSL) # -# modem which works with a ppp-connection between the modem and the # -# host the modem is connected to. # -# # -# You can check whether this applies for your (hardware) setup with # -# 'ifconfig' (a 'ppp' device is shown). # -# This means that if your modem is bridging or an NAT router) or the # -# network interface the modem is connected to doesn't have an IP, you # -# should leave the MODEM_xxx options disabled (=default)! # -############################################################################### - -# The physical(!) network interface your ADSL modem is connected to (this is -# not ppp0!). -# ----------------------------------------------------------------------------- -##MODEM_IF="eth1" - -# (optional) The IP of the network interface (MODEM_IF) your ADSL modem is -# connected to (IP shown for the modem interface (MODEM_IF) in 'ifconfig'). -# ----------------------------------------------------------------------------- -##MODEM_IF_IP="10.0.0.150" - -# (optional) The IP of your (A)DSL modem itself. -# ----------------------------------------------------------------------------- -##MODEM_IP="10.0.0.138" - -# (EXPERT SETTING!). Here you can specify the hosts/local net(s) that should -# have access to the (A)DSL modem itself (manage modem settings). The default -# setting ($INTERNAL_NET) allows access from everybody on your LAN. -# ----------------------------------------------------------------------------- -MODEM_INTERNAL_NET=$INTERNAL_NET - - -############################################################################### -# General settings # -############################################################################### - -# Most people don't want to get any firewall logs being spit to the console. -# This option makes the kernel ring buffer only log messages with level -# "panic". -# ----------------------------------------------------------------------------- -##DMESG_PANIC_ONLY=1 - -# Enable this if you want TOS mangling (RFC) (recommended). -# ----------------------------------------------------------------------------- -##MANGLE_TOS=1 - -# Enable this if you want to set the maximum packet size via the -# Maximum Segment Size(through MSS field) (recommended). -# ----------------------------------------------------------------------------- -##SET_MSS=1 - -# Enable this if you want to increase the TTL value by one in the prerouting -# chain. This hides the firewall when performing eg. traceroutes to internal -# hosts. -# ----------------------------------------------------------------------------- -##TTL_INC=0 - -# (EXPERT SETTING!) Enable this if you want to set the TTL value for packets in -# the OUTPUT & FORWARD chain. Note that this only works with newer 2.6 kernels -# (2.6.14 or better) or patched 2.4 kernels, which have netfilter TTL target -# support. Don't mess with this unless you really know what you are doing! -# ----------------------------------------------------------------------------- -#PACKET_TTL="64" - -# Enable this to resolve names of DNS IP's etc. -# ----------------------------------------------------------------------------- -##RESOLV_IPS=0 - -# Enable this to support the IRC-protocol. -# ----------------------------------------------------------------------------- -##USE_IRC=0 - -# (EXPERT SETTING!). Loosen the forward chain for the external interface(s). -# Enable it to allow the use of protocols like UPnP. Note that it *could* be -# less secure. -# ----------------------------------------------------------------------------- -LOOSE_FORWARD=0 - -# (EXPERT SETTING!). Enable this if you want to drop packets originating from a -# private address. -# ----------------------------------------------------------------------------- -DROP_PRIVATE_ADDRESSES=0 - -# (EXPERT SETTING!). Protect this machine from being abused for a DRDOS-attack -# ("Distributed Reflection Denial Of Service"-attack). (STILL EXPERIMENTAL!) -# ----------------------------------------------------------------------------- -DRDOS_PROTECT=0 - -# Enable this if you want to allow/enable IPv6 traffic. Note that my firewall -# does NOT filter IPv6 traffic (yet), and thus NO checking is performed on it! -# ----------------------------------------------------------------------------- -IPV6_SUPPORT=0 - -# This option fixes problems with SMB broadcasts when using nmblookup -# ----------------------------------------------------------------------------- -NMB_BROADCAST_FIX=0 - -# (EXPERT SETTING!). Enter your remote Freeswan subnet(s) here to enable -# "Virtual IP" support for Freeswan. This allows you to have remote -# "Virtual IP's" which are in the same subnet as yourself, to be routed into -# your network (via NAT). Make sure you understand what this is and that you -# really want this (else leave it empty)! -# ----------------------------------------------------------------------------- -FREESWAN_NET="" - -# (EXPERT SETTING!). (Other) trusted network interfaces for which ALL IP -# traffic should be ACCEPTED. (multiple(!) interfaces should be space -# separated). Be warned that anything TO and FROM these interfaces is allowed -# (ACCEPTED) so make sure it's NOT routable(accessible) from the outside world -# (internet)! -# ----------------------------------------------------------------------------- -TRUSTED_IF="" - -# (EXPERT SETTING!). Put here the (internal) interfaces that should trust -# (accept forward traffic) each other. -# ----------------------------------------------------------------------------- -INT_IF_TRUST="" - -# Location of the custom iptables rules file (if any). -# ----------------------------------------------------------------------------- -##CUSTOM_RULES=/etc/arno-firewall-custom-rules - - -############################################################################### -# Logging options - All logging is rate limited to prevent log flooding # -############################################################################### - -# Enable logging for explicitly blocked hosts. -# ----------------------------------------------------------------------------- -BLOCKED_HOST_LOG=1 - -# Enable logging for various stealth scans (reliable). -# ----------------------------------------------------------------------------- -SCAN_LOG=1 - -# Enable logging for possible stealth scans (less reliable). -# ----------------------------------------------------------------------------- -POSSIBLE_SCAN_LOG=1 - -# Enable logging for TCP-packets with bad flags. -# ----------------------------------------------------------------------------- -BAD_FLAGS_LOG=1 - -# Enable logging of invalid packets. -# ----------------------------------------------------------------------------- -INVALID_PACKET_LOG=1 - -# Enable logging of source IP's with reserved addresses. -# ----------------------------------------------------------------------------- -RESERVED_NET_LOG=1 - -# Enable logging of fragmented packets. -# ----------------------------------------------------------------------------- -FRAG_LOG=1 - -# Enable logging of (probable) "lost TCP connections". Keep disabled to -# reduce false alarms. -# ----------------------------------------------------------------------------- -LOST_CONNECTION_LOG=0 - -# Enable logging of denied local (OUTPUT) connections. -# ----------------------------------------------------------------------------- -OUTPUT_DENY_LOG=1 - -# Enable logging of denied LAN output (FORWARD) connections. -# ----------------------------------------------------------------------------- -LAN_OUTPUT_DENY_LOG=1 - -# Enable logging of denied DMZ output (FORWARD) connections. -# ----------------------------------------------------------------------------- -DMZ_OUTPUT_DENY_LOG=1 - -# Enable logging of denied DMZ input (FORWARD) connections. -# ----------------------------------------------------------------------------- -DMZ_INPUT_DENY_LOG=1 - -# Enable logging of dropped ICMP-request packets (ping). -# ----------------------------------------------------------------------------- -ICMP_REQUEST_LOG=1 - -# Enable logging of dropped "other" ICMP packets. -# ----------------------------------------------------------------------------- -ICMP_OTHER_LOG=1 - -# Enable logging of normal connection attempts to privileged TCP ports. -# ----------------------------------------------------------------------------- -PRIV_TCP_LOG=1 - -# Enable logging of normal connection attempts to privileged UDP ports. -# ----------------------------------------------------------------------------- -PRIV_UDP_LOG=1 - -# Enable logging of normal connection attempts to unprivileged TCP ports. -# ----------------------------------------------------------------------------- -UNPRIV_TCP_LOG=1 - -# Enable logging of normal connection attempts to unprivileged UDP ports. -# ----------------------------------------------------------------------------- -UNPRIV_UDP_LOG=1 - -# Enable logging of normal connection attempts to "other-IP"-protocols (non -# TCP/UDP/ICMP). -# ----------------------------------------------------------------------------- -OTHER_IP_LOG=1 - -# Enable logging for ICMP flooding. -# ----------------------------------------------------------------------------- -ICMP_FLOOD_LOG=1 - -# Enable logging for not-allowed MAC addresses (if used). -# ----------------------------------------------------------------------------- -MAC_ADDRESS_LOG=1 - -# (EXPERT SETTING!). The location of the dedicated firewall log file. When -# enabled the firewall script will also log start/stop etc. info to this file -# as well. Note that in order to make this work, you should also configure -# syslogd to log firewall messages to this file (see LOGLEVEL below for further -# info). -# ----------------------------------------------------------------------------- -#FIREWALL_LOG=/var/log/firewall - -# (EXPERT SETTING!). Current log-level ("info": default kernel syslog level) -# "debug": can be used to log to /var/log/firewall.log, but you have to configure -# syslogd accordingly (see included syslogd.conf examples). -# ----------------------------------------------------------------------------- -LOGLEVEL=info - -# Put in the following variables which hosts you want to log certain incoming -# connection attempts for. -# TCP/UDP port format (LOG_HOST_xxx_INPUT): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# -# IP protocol format (LOG_HOST_IP_INPUT): -# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." -# ----------------------------------------------------------------------------- -LOG_HOST_TCP_INPUT="" -LOG_HOST_UDP_INPUT="" -LOG_HOST_IP_INPUT="" - -# Put in the following variables which hosts you want to log certain outgoing -# connection attempts for. -# TCP/UDP port format (LOG_HOST_xxx_OUTPUT): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# -# IP protocol format (LOG_HOST_IP_OUTPUT): -# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." -# ----------------------------------------------------------------------------- -LOG_HOST_TCP_OUTPUT="" -LOG_HOST_UDP_OUTPUT="" -LOG_HOST_IP_OUTPUT="" - -# Put in the following variables which services you want to log incoming -# connection attempts for. -# ----------------------------------------------------------------------------- -LOG_TCP_INPUT="" -LOG_UDP_INPUT="" -LOG_IP_INPUT="" - -# Put in the following variables which services you want to log outgoing -# connection attempts for. -# ----------------------------------------------------------------------------- -LOG_TCP_OUTPUT="" -LOG_UDP_OUTPUT="" -LOG_IP_OUTPUT="" - -# Put in the following variable which hosts you want to log incoming connection -# (attempts) for. -# ----------------------------------------------------------------------------- -LOG_HOST_INPUT="" - -# Put in the following variable which hosts you want to log outgoing connection -# (attempts) to. -# ----------------------------------------------------------------------------- -LOG_HOST_OUTPUT="" - - -############################################################################### -# /proc based settings (EXPERT SETTINGS!) # -############################################################################### - -# Enable for synflood protection (through /proc/.../tcp_syncookies). -# ----------------------------------------------------------------------------- -SYN_PROT=1 - -# Enable this to reduce the ability of others DOS'ing your machine. -# ----------------------------------------------------------------------------- -REDUCE_DOS_ABILITY=1 - -# Enable to ignore all ICMP echo-requests (IPv4) on ALL interfaces. -# ----------------------------------------------------------------------------- -ECHO_IGNORE=0 - -# Enable to log packets with impossible addresses to the kernel log. -# ----------------------------------------------------------------------------- -LOG_MARTIANS=0 - -# Only disable this if you're NOT using forwarding (required for NAT etc.) for -# increased security. -# ----------------------------------------------------------------------------- -IP_FORWARDING=1 - -# Enable if you want to accept ICMP redirect messages. Should be set to "0" in -# case of a router. -# ----------------------------------------------------------------------------- -ICMP_REDIRECT=0 - -# Enable/modify this if you want to be a able to handle a larger (or smaller) -# number of simultaneous connections. For high traffic machines I recommend to -# use a value of at least 16384 (note that a higher value (obviously) also uses -# more memory). -# ----------------------------------------------------------------------------- -CONNTRACK=16384 - -# You may need to enable this to get some internet games to work, but note that -# it's *less* secure. -# ----------------------------------------------------------------------------- -LOOSE_UDP_PATCH=0 - -# Enable ECN (Explicit Congestion Notification) TCP flag. Disabled by default, -# as some routers are still not compatible with this. -# ----------------------------------------------------------------------------- -ECN=0 - -# Enable to drop connections from non-routable IP's, eg. prevent source -# routing. By default the firewall itself also provides rules against source -# routing. Note than when you use eg. VPN (Freeswan), you should probably -# disable this setting. -# ----------------------------------------------------------------------------- -RP_FILTER=1 - -# Protect against source routed packets. Attackers can use source routing to -# generate traffic pretending to be from inside your network, but which is -# routed back along the path from which it came, namely outside, so attackers -# can compromise your network. Source routing is rarely used for legitimate -# purposes, so normally you should always leave this enabled(1)! -# ----------------------------------------------------------------------------- -SOURCE_ROUTE_PROTECTION=1 - -# Here we set the local port range (ports from which connections are -# initiated from our site). Don't mess with this unless you really know what -# you are doing! -# ----------------------------------------------------------------------------- -LOCAL_PORT_RANGE="32768 61000" - -# Here you can change the default TTL used for sending packets. The value -# should be between 10 and 255. Don't mess with this unless you really know -# what you are doing! -# ----------------------------------------------------------------------------- -DEFAULT_TTL=64 - -# In most cases pmtu discovery is ok, but in some rare cases (when having -# problems) you might want to disable it. -# ----------------------------------------------------------------------------- -NO_PMTU_DISCOVERY=0 - - -############################################################################### -# (Transparent) proxy settings (EXPERT SETTINGS!) # -############################################################################### -#HTTP_PROXY_PORT="3128" -HTTPS_PROXY_PORT="" -FTP_PROXY_PORT="" -SMTP_PROXY_PORT="" -POP3_PROXY_PORT="" - - -############################################################################### -# Firewall policies for the LAN (EXPERT SETTINGS!) # -############################################################################### - -############################################################################### -# LAN_INET_xxx = LAN->internet access rules (forward) # -# # -# Note that when both LAN_INET_OPEN_xxx & LAN_INET_HOST_OPEN_xxx are NOT # -# used, the default policy for that protocol/port is accept (unless denied # -# through LAN_INET_DENY_xxx and/or LAN_INET_HOST_DENY_xxx)! # -############################################################################### - -# Put in the following variables the TCP/UDP ports or IP -# protocols TO (remote end-point) which the LAN hosts are -# permitted to connect to via the external (internet) interface. -# ----------------------------------------------------------------------------- -LAN_INET_OPEN_TCP="" -LAN_INET_OPEN_UDP="" -LAN_INET_OPEN_IP="" - -# Put in the following variables the TCP/UDP ports or IP protocols TO (remote -# end-point) which the LAN hosts are NOT permitted to connect to -# via the external (internet) interface. Examples of usage are for blocking -# IRC (TCP 6666:6669) for the internal network. -# ----------------------------------------------------------------------------- -LAN_INET_DENY_TCP="" -LAN_INET_DENY_UDP="" -LAN_INET_DENY_IP="" - -# Put in the following variables the TCP/UDP ports or IP -# protocols TO (remote end-point) which certain LAN hosts are -# permitted to connect to via the external (internet) interface. Note that -# any ports/protocols specified here are made "exclusively" for the accompaning -# host(s), meaning that nobody else can use them! -# -# TCP/UDP port format (LAN_INET_HOST_OPEN_xxx): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# -# IP protocol format (LAN_INET_HOST_OPEN_xxx): -# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." -# ----------------------------------------------------------------------------- -LAN_INET_HOST_OPEN_TCP="" -LAN_INET_HOST_OPEN_UDP="" -LAN_INET_HOST_OPEN_IP="" - -# Put in the following variables the TCP/UDP ports or IP protocols TO (remote -# end-point) which certain LAN hosts are NOT permitted to connect to -# via the external (internet) interface. -# -# TCP/UDP port format (LAN_INET_HOST_DENY_xxx): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# -# IP protocol format (LAN_INET_HOST_DENY_xxx): -# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." -# ----------------------------------------------------------------------------- -LAN_INET_HOST_DENY_TCP="" -LAN_INET_HOST_DENY_UDP="" -LAN_INET_HOST_DENY_IP="" - - -############################################################################### -# Firewall policies for the DMZ (EXPERT SETTINGS!) # -############################################################################### - -############################################################################### -# INET_DMZ_xxx = Internet->DMZ access rules (forward) # -# DMZ_INET_xxx = DMZ->internet access rules (forward) # -# DMZ_LAN_xxx = DNZ->LAN access rules (forward) # -# DMZ_xxx = DMZ->local(this machine) access rules (input) # -# # -# Note that when both INET_DMZ_OPEN_xxx & INET_DMZ_HOST_OPEN_xxx are NOT # -# used, the default policy for that protocol/port is accept (unless denied # -# through INET_DMZ_DENY_xxx and/or INET_DMZ_HOST_DENY_xxx)! # -############################################################################### - -# Put in the following variables which INET hosts are permitted to connect to -# certain the TCP/UDP ports or IP protocols in the DMZ. -# ----------------------------------------------------------------------------- -INET_DMZ_OPEN_TCP="" -INET_DMZ_OPEN_UDP="" -INET_DMZ_OPEN_IP="" - -# Put in the following variables which INET hosts are NOT permitted to connect -# to certain the TCP/UDP ports or IP protocols in the DMZ. -# ----------------------------------------------------------------------------- -INET_DMZ_DENY_TCP="" -INET_DMZ_DENY_UDP="" -INET_DMZ_DENY_IP="" - -# Put in the following variables which INET hosts you want to allow for certain -# services. By default all services are allowed for DMZ hosts. -# TCP/UDP port format (INET_DMZ_HOST_OPEN_TCP & INET_DMZ_HOST_OPEN_UDP): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# -# IP protocol format (INET_DMZ_HOST_OPEN_IP): -# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." -# -# ICMP protocol format (INET_DMZ_HOST_OPEN_ICMP): -# "host1 host2 ...." -# ----------------------------------------------------------------------------- -INET_DMZ_HOST_OPEN_TCP="" -INET_DMZ_HOST_OPEN_UDP="" -INET_DMZ_HOST_OPEN_IP="" - -# Put in the following variables which INET hosts you want to deny for certain -# services (and logged). By default all services are allowed for DMZ -# hosts. -# TCP/UDP port format (INET_DMZ_HOST_OPEN_TCP & INET_DMZ_HOST_OPEN_UDP): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# -# IP protocol format (INET_DMZ_HOST_OPEN_IP): -# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." -# -# ICMP protocol format (INET_DMZ_HOST_OPEN_ICMP): -# "host1 host2 ...." -# ----------------------------------------------------------------------------- -INET_DMZ_HOST_DENY_TCP="" -INET_DMZ_HOST_DENY_UDP="" -INET_DMZ_HOST_DENY_IP="" - -############################################################################### -# Note that when both DMZ_INET_OPEN_xxx & DMZ_INET_HOST_OPEN_xxx are NOT # -# used, the default policy for that protocol/port is accept (unless denied # -# through DMZ_INET_DENY_xxx and/or DMZ_INET_HOST_DENY_xxx)! # -############################################################################### - -# Put in the following variables the TCP/UDP ports or IP -# protocols TO (remote end-point) which the DMZ hosts are -# permitted to connect to via the external (internet) interface. -# ----------------------------------------------------------------------------- -DMZ_INET_OPEN_TCP="" -DMZ_INET_OPEN_UDP="" -DMZ_INET_OPEN_IP="" - -# Put in the following variables the TCP/UDP ports or IP protocols TO (remote -# end-point) which the DMZ hosts are NOT permitted to connect to -# via the external (internet) interface. Examples of usage are for blocking -# IRC (TCP 6666:6669) for the internal network. -# ----------------------------------------------------------------------------- -DMZ_INET_DENY_TCP="" -DMZ_INET_DENY_UDP="" -DMZ_INET_DENY_IP="" - -# Put in the following variables which DMZ hosts you want to allow to connect -# to certain internet hosts for services. By default all inet services are -# allowed for DMZ hosts. -# -# TCP/UDP port format (DMZ_INET_HOST_OPEN_TCP & DMZ_INET_HOST_OPEN_UDP): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# -# IP protocol format (DMZ_INET_HOST_OPEN_IP): -# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." -# -# ICMP protocol format (DMZ_INET_HOST_OPEN_ICMP): -# "host1 host2 ...." -# ----------------------------------------------------------------------------- -DMZ_INET_HOST_OPEN_TCP="" -DMZ_INET_HOST_OPEN_UDP="" -DMZ_INET_HOST_OPEN_IP="" - -# Put in the following variables which DMZ hosts you want to deny to connect -# to certain internet hosts for services. -# -# TCP/UDP port format (DMZ_INET_HOST_OPEN_TCP & DMZ_INET_HOST_OPEN_UDP): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# -# IP protocol format (DMZ_INET_HOST_OPEN_IP): -# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." -# -# ICMP protocol format (DMZ_INET_HOST_OPEN_ICMP): -# "host1 host2 ...." -# ----------------------------------------------------------------------------- -DMZ_INET_HOST_DENY_TCP="" -DMZ_INET_HOST_DENY_UDP="" -DMZ_INET_HOST_DENY_IP="" - -# (EXPERT SETTING!) DMZ-to-LAN TCP/UDP/IP open ports/protocols. Open particular -# ports / protocols on LAN hosts(on INT_IF) for certain DMZ hosts.: -# TCP/UDP form: -# "SRCIP1,SRCIP2,...>DESTIP1:port \ -# SRCIP3,...>DESTIP2:port" -# -# IP form: -# "SRCIP1,SRCIP2,...>DESTIP1:protocol \ -# SRCIP3,...>DESTIP2:protocol" -# -# TCP/UDP examples: -# Simple (open port 80 on host 192.168.0.10 for all DMZ hosts): -# DMZ_LAN_HOST_OPEN_xxx="192.168.0.10:80" -# Advanced (open port 20 & 21 on 192.168.0.10 for all DMZ hosts and -# open port 80 on 192.168.0.11 for host 1.2.3.4 only: -# DMZ_LAN_HOST_OPEN_xxx="192.168.0.10:20,21 1.2.3.4>192.168.0.11:80" -# -# IP protocol forward example: -# "192.168.0.10:47,48" (open protocols 47 & 48 on 192.168.0.10 -# for all DMZ hosts) -# -# NOTE 1: {SRCIPx} is optional. Use it to restrict access to specific -# source IP addresses. -# NOTE 2: Port ranges can be written as "PORT1:PORT3" (ie. "1024:1030" would -# include ports 1024 until 1030). -# ----------------------------------------------------------------------------- -DMZ_LAN_HOST_OPEN_TCP="" -DMZ_LAN_HOST_OPEN_UDP="" -DMZ_LAN_HOST_OPEN_IP="" - -# Put in the following variables which DMZ hosts are permitted to connect to -# certain the TCP/UDP ports, IP protocols or ICMP. By default all (local) -# services are blocked for DMZ hosts. -# ----------------------------------------------------------------------------- -DMZ_OPEN_TCP="" -DMZ_OPEN_UDP="" -DMZ_OPEN_IP="" -DMZ_OPEN_ICMP=0 - -# Put in the following variables which DMZ hosts you want to allow for certain -# services. By default all (local) services are blocked for DMZ hosts. -# TCP/UDP port format (DMZ_HOST_OPEN_TCP & DMZ_HOST_OPEN_UDP): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# -# IP protocol format (DMZ_HOST_OPEN_IP): -# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." -# -# ICMP protocol format (DMZ_HOST_OPEN_ICMP): -# "host1 host2 ...." -# ----------------------------------------------------------------------------- -DMZ_HOST_OPEN_TCP="" -DMZ_HOST_OPEN_UDP="" -DMZ_HOST_OPEN_IP="" -DMZ_HOST_OPEN_ICMP="" - - -############################################################################### -# Firewall policies for the external (inet) interface (default policy = drop) # -############################################################################### - -# Put in the following variable which hosts (subnets) you want have full access -# via your internet (EXT_IF) connection(!). This is especially meant for -# networks/servers which use NIS/NFS, as these protocols require all ports -# to be open. -# NOTE: Don't mistake this variable with the one used for internal nets. -# ----------------------------------------------------------------------------- -##FULL_ACCESS_HOSTS="" - -# Put in the following variables which ports or IP protocols you want to leave -# open to the whole world. -# ----------------------------------------------------------------------------- -##OPEN_TCP="" -##OPEN_UDP="" -##OPEN_IP="" -##OPEN_ICMP=0 - -# Put in the following variables the TCP/UDP ports you want to DENY(DROP) for -# everyone (and logged). Also use these variables if you want to log connection -# attempts to these ports from everyone (also trusted/full access hosts). -# In principle you don't need these variables, as everything is already blocked -# (denied) by default, but just exists for consistency. -# ----------------------------------------------------------------------------- -##DENY_TCP="" -##DENY_UDP="" - -# Put in the following variables which ports you want to DENY(DROP) for -# everyone but NOT logged. This is very useful if you have constant probes on -# the same port(s) over and over again (code red worm) and don't want your logs -# flooded with it. -# ----------------------------------------------------------------------------- -##DENY_TCP_NOLOG="" -##DENY_UDP_NOLOG="" - -# Put in the following variables the TCP/UDP ports you want to REJECT (instead -# of DROP) for everyone (and logged). -# ----------------------------------------------------------------------------- -##REJECT_TCP="" -##REJECT_UDP="" - -# Put in the following variables the TCP/UDP ports you want to REJECT (instead -# of DROP) for everyone but NOT logged. -# ----------------------------------------------------------------------------- -##REJECT_TCP_NOLOG="" -##REJECT_UDP_NOLOG="" - -# Put in the following variables which hosts you want to allow for certain -# services. -# TCP/UDP port format (HOST_OPEN_TCP & HOST_OPEN_UDP): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# -# IP protocol format (HOST_OPEN_IP): -# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." -# -# ICMP protocol format (HOST_OPEN_ICMP): -# "host1 host2 ...." -# ----------------------------------------------------------------------------- -##HOST_OPEN_TCP="" -##HOST_OPEN_UDP="" -##HOST_OPEN_IP="" -##HOST_OPEN_ICMP="" - -# Put in the following variables which hosts you want to DENY(DROP) for certain -# services (and logged). -# to DENY(DROP) for certain hosts. -# TCP/UDP port format (HOST_DENY_TCP & HOST_DENY_UDP): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# -# IP protocol format (HOST_DENY_IP): -# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." -# -# ICMP protocol format (HOST_DENY_ICMP): -# "host1 host2 ...." -# ----------------------------------------------------------------------------- -##HOST_DENY_TCP="" -##HOST_DENY_UDP="" -##HOST_DENY_IP="" -##HOST_DENY_ICMP="" - -# Put in the following variables which hosts you want to DENY(DROP) for certain -# services but NOT logged. -# TCP/UDP port format (HOST_DENY_xxx_NOLOG): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# -# IP protocol format (HOST_DENY_IP_NOLOG): -# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." -# -# ICMP protocol format (HOST_DENY_ICMP_NOLOG): -# "host1 host2 ...." -# ----------------------------------------------------------------------------- -##HOST_DENY_TCP_NOLOG="" -##HOST_DENY_UDP_NOLOG="" -##HOST_DENY_IP_NOLOG="" -##HOST_DENY_ICMP_NOLOG="" - -# Put in the following variables which hosts you want to REJECT (instead of -# DROP) for certain TCP/UDP ports. -# TCP/UDP port format (HOST_REJECT_xxx): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# ----------------------------------------------------------------------------- -##HOST_REJECT_TCP="" -##HOST_REJECT_UDP="" - -# Put in the following variables which hosts you want to REJECT (instead of -# DROP) for certain services but NOT logged. -# TCP/UDP port format (HOST_REJECT_xxx_NOLOG): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# ----------------------------------------------------------------------------- -##HOST_REJECT_TCP_NOLOG="" -##HOST_REJECT_UDP_NOLOG="" - -# Put in the following variables which services THIS machine is NOT -# permitted to connect TO (remote end-point) via the external (internet) -# interface. For example for blocking IRC (tcp 6666:6669). -# ----------------------------------------------------------------------------- -##DENY_TCP_OUTPUT="" -##DENY_UDP_OUTPUT="" -##DENY_IP_OUTPUT="" - -# Put in the following variables to which hosts THIS machine is NOT -# permitted to connect TO for certain services (remote end-point) -# via the external (internet) interface. In principle you can also -# use this to put your machine in a "virtual-DMZ" by blocking all traffic -# to your local subnet. -# TCP/UDP port format (HOST_DENY_TCP_OUTPUT & HOST_DENY_UDP_OUTPUT): -# "host1,host2>port1,port2 host3,host4>port3,port4 ..." -# -# IP protocol format (HOST_DENY_IP_OUTPUT): -# "host1,host2>proto1,proto2 host3,host4>proto4,proto4 ..." -# ----------------------------------------------------------------------------- -##HOST_DENY_TCP_OUTPUT="" -##HOST_DENY_UDP_OUTPUT="" -##HOST_DENY_IP_OUTPUT="" - -# Put in the following variable which TCP/UDP ports you don't want to -# see broadcasts from (ie. DHCP (67/68) on your EXTERNAL interface. Note that -# to make this properly work you also need to set "EXTERNAL_NET"! -# ----------------------------------------------------------------------------- -##BROADCAST_TCP_NOLOG="" -###BROADCAST_UDP_NOLOG="67 68" - -# Put in the following variable which hosts you want to block (blackhole, -# dropping every packet from the host). -# ----------------------------------------------------------------------------- -##BLOCK_HOSTS="" - -# Uncomment & specify here the location of the file that contains a list of -# hosts(IP's) that should be BLOCKED. IP ranges can (only) be specified as -# w.x.y.z1-z2 (ie. 192.168.1.10-15). Note that the last line of this file -# should always contain a carriage-return (enter)! -# ----------------------------------------------------------------------------- -###BLOCK_HOSTS_FILE=/etc/arno-firewall-blocked-hosts - Modified: trunk/package/iptables/iptables.init =================================================================== --- trunk/package/iptables/iptables.init 2006-08-11 15:33:14 UTC (rev 230) +++ trunk/package/iptables/iptables.init 2006-08-11 15:50:59 UTC (rev 231) @@ -1,4227 +1,70 @@ #!/bin/sh -# -# chkconfig: 2345 11 89 -# description: Arno's iptables firewall -MY_VERSION="1.8.6c" -############################################################################################ -# You should put this script in eg. "/etc/init.d/" (or "/etc/rc.d/"). # -# Furthermore make sure it's executable! -> "chmod 700" or "chmod +x" it # -# If you want to run it upon boot, either add an entry in your "/etc/rc.d/rc.local" or # -# (for ie. Debian) in "/etc/rcS.d/" create a symlink to the arno-iptables-firewall script # -# ("ln -s /etc/init.d/arno-iptables-firewall script S99-arno-iptables-firewall script"). # -############################################################################################ +. /etc/rc.conf -# Location of the configuration file for this firewall: -####################################################### -CONFIG_FILE=/etc/arno-iptables-firewall.conf - -# ------------------------------------------------------------------------------------------ -# -= Arno's iptables firewall =- -# Single- & multi-homed firewall script with DSL/ADSL support -# -# ~ In memory of my dear father ~ -# -# (C) Copyright 2001-2006 by Arno van Amersfoort -# Homepage : http://rocky.eld.leidenuniv.nl/ -# Freshmeat homepage : http://freshmeat.net/projects/iptables-firewall/?topic_id=151 -# Email : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l -# (note: you must remove all spaces and substitute the @ and the . -# at the proper locations!) -# ------------------------------------------------------------------------------------------ -# 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 2 -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# ------------------------------------------------------------------------------------------ - -printf "\033[40m\033[1;32mArno's Iptables Firewall Script v$MY_VERSION\033[0m\n" -echo "-------------------------------------------------------------------------------" - -# Astlinux mod: check if config file is on key disk or use default from stat -############################################################################# -if [ -e /mnt/kd/arno-iptables-firewall.conf ]; then - ln -s /mnt/kd/arno-iptables-firewall.conf /tmp/etc/arno-iptables-firewall.conf +start () { +if [ "$INTIF" ] +then +echo "Starting iptables..." +if [ -x /mnt/kd/astfw ] +then +/mnt/kd/astfw else - cp /stat/etc/arno-iptables-firewall.conf /tmp/etc/arno-iptables-firewall.conf +/usr/sbin/astfw fi - -# Check if config file exists and if so load it -############################################### -if [ -e "$CONFIG_FILE" ]; then - . $CONFIG_FILE - # Check whether we also need to drop messages in a dedicated firewall log file - if [ -z "$FIREWALL_LOG" ]; then FIREWALL_LOG="/dev/null"; fi -else - printf "\033[40m\033[1;31mERROR: Could not read configuration file $CONFIG_FILE!\033[0m\n" - printf "\033[40m\033[1;31m Please, check the file's location and (root) rights.\033[0m\n" - exit 2 fi - -# if $LOGLEVEL is not set, default to "info" -############################################ -if [ -z "$LOGLEVEL" ]; then - LOGLEVEL="info" -fi - - -sanity_check() -{ - # root check - if [ "$(id -u)" != "0" ]; then - printf "\033[40m\033[1;31mERROR: Root check FAILED (you MUST be root to use this script)! Quitting...\033[0m\n" - exit 1 - fi - - # Make sure EXT_IF != "" - ######################## - if [ -z "$EXT_IF" ]; then - printf "\033[40m\033[1;31mERROR: The required variable EXT_IF is empty!\033[0m\n" - printf "\033[40m\033[1;31m Please, check the configuration file.\033[0m\n" - exit 2 - fi - - # Check whether EXT_IF's exists - ############################### - for interface in $EXT_IF; do - if [ -z "$(echo $interface |grep '\+')" ]; then - result=`ifconfig $interface >/dev/null 2>&1` - return_val=$? - if [ "$return_val" != "0" ]; then - printf "\033[40m\033[1;31mNOTE: External interface $interface does NOT exist (yet?)\033[0m\n" - printf "\033[40m\033[1;31mResult was: $result\033[0m\n" - fi - fi - done - - # Check whether MODEM_IF exists - ############################### - if [ -n "$MODEM_IF" ]; then - result=`ifconfig $MODEM_IF >/dev/null 2>&1` - return_val=$? - if [ "$return_val" != "0" ]; then - printf "\033[40m\033[1;31mNOTE: Modem interface $interface does NOT exist (yet?)\033[0m\n" - printf "\033[40m\033[1;31mResult was: $result\033[0m\n" - fi - fi - - # Check whether INT_IF's exists - ############################### - for interface in $INT_IF; do - if [ -z "$(echo $interface |grep '\+')" ]; then - result=`ifconfig $MODEM_IF >/dev/null 2>&1` - return_val=$? - if [ "$return_val" != "0" ]; then - printf "\033[40m\033[1;31mNOTE: Internal interface $interface does NOT exist (yet?)\033[0m\n" - printf "\033[40m\033[1;31mResult was: $result\033[0m\n" - fi - fi - done - - # Check whether DMZ_IF's exists - ############################### - for interface in $DMZ_IF; do - if [ -z "$(echo $interface |grep '\+')" ]; then - result=`ifconfig $MODEM_IF >/dev/null 2>&1` - return_val=$? - if [ "$return_val" != "0" ]; then - printf "\033[40m\033[1;31mNOTE: DMZ interface $interface does NOT exist (yet?)\033[0m\n" - printf "\033[40m\033[1;31mResult was: $result\033[0m\n" - fi - fi - done - - # Check whether TRUSTED_IF's exists - ################################### - for interface in $TRUSTED_IF; do - if [ -z "$(echo $interface |grep '\+')" ]; then - result=`ifconfig $MODEM_IF >/dev/null 2>&1` - return_val=$? - if [ "$return_val" != "0" ]; then - printf "\033[40m\033[1;31mNOTE: Trusted interface $interface does NOT exist (yet?)\033[0m\n" - printf "\033[40m\033[1;31mResult was: $result\033[0m\n" - fi - fi - done - - # Make sure INT_IF != EXT_IF - ############################ - for eif in $EXT_IF; do - for iif in $INT_IF; do - if [ "$iif" = "$eif" ]; then - printf "\033[40m\033[1;31mERROR: One or more interfaces specified in EXT_IF is the same as one in\033[0m\n" - printf "\033[40m\033[1;31m INT_IF! Please, check the configuration file.\033[0m\n" - exit 3 - fi - done - done - - # Make sure EXT_IF != MODEM_IF - ############################## - for eif in $EXT_IF; do - if [ "$eif" = "$MODEM_IF" ]; then - printf "\033[40m\033[1;31mERROR: One or more interfaces specified in EXT_IF is the same as the\033[0m\n" - printf "\033[40m\033[1;31m MODEM_IF! Please, check the configuration file.\033[0m\n" - exit 4 - fi - done - - # Make sure INT_IF != MODEM_IF - ############################## - if [ -n "$MODEM_IF" ]; then - for iif in $INT_IF; do - if [ "$iif" = "$MODEM_IF" ]; then - printf "\033[40m\033[1;31mERROR: One or more interfaces specified in INT_IF is the same as the one in\033[0m\n" - printf "\033[40m\033[1;31m MODEM_IF! Please, check the configuration file.\033[0m\n" - exit 5 - fi - done - fi - - # Make sure EXT_IF != lo / 127.0.0.1 - #################################### - for eif in $EXT_IF; do - if [ "$eif" = "lo" ] || [ "$eif" = "127.0.0.1" ]; then - printf "\033[40m\033[1;31mERROR: One or more interfaces specified in EXT_IF has the address or name of the\033[0m\n" - printf "\033[40m\033[1;31m local loopback device! Please, check the configuration file.\033[0m\n" - exit 6 - fi - done - - # Make sure INT_IF != lo / 127.0.0.1 - #################################### - for iif in $INT_IF; do - if [ "$iif" = "lo" ] || [ "$iif" = "127.0.0.1" ]; then - printf "\033[40m\033[1;31mERROR: At least one of the interfaces specified in INT_IF has the address or\033[0m\n" - printf "\033[40m\033[1;31m name of the local loopback device! Please, check the configuration file.\033[0m\n" - exit 7 - fi - done - - # Make sure MODEM_IF != lo / 127.0.0.1 - ###################################### - if [ "$MODEM_IF" = "lo" ] || [ "$MODEM_IF" = "127.0.0.1" ]; then - printf "\033[40m\033[1;31mERROR: The interface specified in MODEM_IF has the address or name of the local\033[0m\n" - printf "\033[40m\033[1;31m loopback device! Please, check the configuration file.\033[0m\n" - exit 8 - fi - - # Make sure than when multi route masquerade is enabled, multiple external - # interfaces exist - ########################################################################## - if [ "$MASQ_MULTI_ROUTE" = "1" ] && [ -z "$(echo $EXT_IF |grep ' ')" ]; then - printf "\033[40m\033[1;31mERROR: Multiroute masquerade is enabled but only one external interface is\033[0m\n" - printf "\033[40m\033[1;31m specified! Please, check the configuration file.\033[0m\n" - exit 9 - fi - - # If support for an DHCP server serving an external net is enabled, we - # also need to know what the external net is. - ########################################################################## - if [ "$EXTERNAL_DHCP_SERVER" = "1" ] && [ -z "$EXTERNAL_NET" ]; then - printf "\033[40m\033[1;31mERROR: You have enabled external DHCP server support but required variable\033[0m\n" - printf "\033[40m\033[1;31m EXTERNAL_NET has NOT been defined!\033[0m\n" - exit 10 - fi - - # We can only perform NAT if NAT_INTERNAL_NET is defined - if [ "$NAT" = "1" ] && [ -z "$NAT_INTERNAL_NET" ]; then - printf "\033[40m\033[1;31mERROR: Unable to enable NAT because there's no (NAT_)INTERNAL_NET specified!\033[0m\n" - exit 11 - fi - - # If support the nmb_broadcast_fix is enabled we need the EXTERNAL_NET set - ########################################################################## - if [ "$NMB_BROADCAST_FIX" = "1" ] && [ -z "$EXTERNAL_NET" ]; then - printf "\033[40m\033[1;31mERROR: You have enabled the NMB_BROADCAST_FIX but required variable\033[0m\n" - printf "\033[40m\033[1;31m EXTERNAL_NET has NOT been defined!\033[0m\n" - exit 12 - fi - - # Warn if no_broadcast variables are used and external net is NOT defined - ########################################################################## - if [ -n "$BROADCAST_TCP_NOLOG" ] || [ -n "$BROADCAST_UDP_NOLOG" ]; then - if [ -z "$EXTERNAL_NET" ]; then - printf "\033[40m\033[1;31mWARNING: You are using the BROADCAST_xxx_NOLOG variables but the EXTERNAL_NET\033[0m\n" - printf "\033[40m\033[1;31m has NOT been defined! This could be a problem.\033[0m\n" - fi - fi - - # Check whether the iptables binary exists and if it's executable - ################################################################# - if [ ! -x $IPTABLES ]; then - printf "\033[40m\033[1;31mERROR: Binary \"$IPTABLES\" does not exist or is not executable!\033[0m\n" - printf "\033[40m\033[1;31m Please, make... [truncated message content] |
|
From: <dha...@us...> - 2006-08-11 19:25:55
|
Revision: 241 Author: dhartman Date: 2006-08-11 12:25:48 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=241&view=rev Log Message: ----------- Add Arno's iptables firewall as an option Modified Paths: -------------- trunk/package/Config.in trunk/package/iptables/iptables.init trunk/target/generic/target_skeleton/stat/etc/rc.conf Added Paths: ----------- trunk/package/arno-fw/ trunk/package/arno-fw/Config.in trunk/package/arno-fw/arno-firewall.mk trunk/package/arno-fw/arno-iptables-firewall trunk/package/arno-fw/arno-iptables-firewall.conf Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2006-08-11 18:47:46 UTC (rev 240) +++ trunk/package/Config.in 2006-08-11 19:25:48 UTC (rev 241) @@ -25,6 +25,7 @@ comment "Other stuff" source "package/acpid/Config.in" +source "package/arno-fw/Config.in" source "package/asterisk/Config.in" source "package/asterisknativesounds/Config.in" source "package/app_bundle/Config.in" Added: trunk/package/arno-fw/Config.in =================================================================== --- trunk/package/arno-fw/Config.in (rev 0) +++ trunk/package/arno-fw/Config.in 2006-08-11 19:25:48 UTC (rev 241) @@ -0,0 +1,8 @@ +config BR2_PACKAGE_ARNO_FW + bool "Arno's Firewall Support" + default n + help + Arno's IPtables Firewall is a complete + Firewall script. + + http://rocky.molphys.leidenuniv.nl/ Added: trunk/package/arno-fw/arno-firewall.mk =================================================================== --- trunk/package/arno-fw/arno-firewall.mk (rev 0) +++ trunk/package/arno-fw/arno-firewall.mk 2006-08-11 19:25:48 UTC (rev 241) @@ -0,0 +1,29 @@ +############################################################# +# +# Arno's IPtables Firewall Script +# +############################################################# +ARNO_FW_DIR:=package/arno_fw +ARNO_FW_TARGET_BINARY=$(TARGET_DIR)/usr/sbin/arno-iptables-firewall + +$(ARNO_FW_TARGET_BINARY): + $(INSTALL) -D -m 0755 $(ARNO_FW_DIR)/arno-iptables-firewall $(TARGET_DIR)/usr/sbin/arno-iptables-firewall + $(INSTALL) -D -m 0755 $(ARNO_FW_DIR)/arno-iptables-firewall.conf $(TARGET_DIR)/stat/etc/arno-iptables-firewall.conf + +arno_fw: uclibc linux asterisk $(ARNO_FW_TARGET_BINARY) + +arno_fw-clean: + rm $(ARNO_FW_TARGET_BINARY) + rm $(TARGET_DIR)/stat/etc/arno-iptables-firewall.conf + +arno_fw-dirclean: + echo "Nothing to do" + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_ARNO_FW)),y) +TARGETS+= +endif Added: trunk/package/arno-fw/arno-iptables-firewall =================================================================== --- trunk/package/arno-fw/arno-iptables-firewall (rev 0) +++ trunk/package/arno-fw/arno-iptables-firewall 2006-08-11 19:25:48 UTC (rev 241) @@ -0,0 +1,4230 @@ +#!/bin/sh +# +# chkconfig: 2345 11 89 +# description: Arno's iptables firewall + +MY_VERSION="1.8.6c" + +# Astlinux modifications by Darrick Hartman +# +############################################################################################ +# You should put this script in eg. "/etc/init.d/" (or "/etc/rc.d/"). # +# Furthermore make sure it's executable! -> "chmod 700" or "chmod +x" it # +# If you want to run it upon boot, either add an entry in your "/etc/rc.d/rc.local" or # +# (for ie. Debian) in "/etc/rcS.d/" create a symlink to the arno-iptables-firewall script # +# ("ln -s /etc/init.d/arno-iptables-firewall script S99-arno-iptables-firewall script"). # +############################################################################################ + +# Location of the configuration file for this firewall: +####################################################### +CONFIG_FILE=/etc/arno-iptables-firewall.conf + +# ------------------------------------------------------------------------------------------ +# -= Arno's iptables firewall =- +# Single- & multi-homed firewall script with DSL/ADSL support +# +# ~ In memory of my dear father ~ +# +# (C) Copyright 2001-2006 by Arno van Amersfoort +# Homepage : http://rocky.eld.leidenuniv.nl/ +# Freshmeat homepage : http://freshmeat.net/projects/iptables-firewall/?topic_id=151 +# Email : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l +# (note: you must remove all spaces and substitute the @ and the . +# at the proper locations!) +# ------------------------------------------------------------------------------------------ +# 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 2 +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# ------------------------------------------------------------------------------------------ + +printf "\033[40m\033[1;32mArno's Iptables Firewall Script v$MY_VERSION\033[0m\n" +echo "-------------------------------------------------------------------------------" + +# Astlinux mod: check if config file is on key disk or use default from stat +############################################################################# +if [ -e /mnt/kd/arno-iptables-firewall.conf ]; then + ln -s /mnt/kd/arno-iptables-firewall.conf /tmp/etc/arno-iptables-firewall.conf +else + cp /stat/etc/arno-iptables-firewall.conf /tmp/etc/arno-iptables-firewall.conf +fi + +# Check if config file exists and if so load it +############################################### +if [ -e "$CONFIG_FILE" ]; then + . $CONFIG_FILE + # Check whether we also need to drop messages in a dedicated firewall log file + if [ -z "$FIREWALL_LOG" ]; then FIREWALL_LOG="/dev/null"; fi +else + printf "\033[40m\033[1;31mERROR: Could not read configuration file $CONFIG_FILE!\033[0m\n" + printf "\033[40m\033[1;31m Please, check the file's location and (root) rights.\033[0m\n" + exit 2 +fi + +# if $LOGLEVEL is not set, default to "info" +############################################ +if [ -z "$LOGLEVEL" ]; then + LOGLEVEL="info" +fi + + +sanity_check() +{ + # root check + if [ "$(id -u)" != "0" ]; then + printf "\033[40m\033[1;31mERROR: Root check FAILED (you MUST be root to use this script)! Quitting...\033[0m\n" + exit 1 + fi + + # Make sure EXT_IF != "" + ######################## + if [ -z "$EXT_IF" ]; then + printf "\033[40m\033[1;31mERROR: The required variable EXT_IF is empty!\033[0m\n" + printf "\033[40m\033[1;31m Please, check the configuration file.\033[0m\n" + exit 2 + fi + + # Check whether EXT_IF's exists + ############################### + for interface in $EXT_IF; do + if [ -z "$(echo $interface |grep '\+')" ]; then + result=`ifconfig $interface >/dev/null 2>&1` + return_val=$? + if [ "$return_val" != "0" ]; then + printf "\033[40m\033[1;31mNOTE: External interface $interface does NOT exist (yet?)\033[0m\n" + printf "\033[40m\033[1;31mResult was: $result\033[0m\n" + fi + fi + done + + # Check whether MODEM_IF exists + ############################### + if [ -n "$MODEM_IF" ]; then + result=`ifconfig $MODEM_IF >/dev/null 2>&1` + return_val=$? + if [ "$return_val" != "0" ]; then + printf "\033[40m\033[1;31mNOTE: Modem interface $interface does NOT exist (yet?)\033[0m\n" + printf "\033[40m\033[1;31mResult was: $result\033[0m\n" + fi + fi + + # Check whether INT_IF's exists + ############################### + for interface in $INT_IF; do + if [ -z "$(echo $interface |grep '\+')" ]; then + result=`ifconfig $MODEM_IF >/dev/null 2>&1` + return_val=$? + if [ "$return_val" != "0" ]; then + printf "\033[40m\033[1;31mNOTE: Internal interface $interface does NOT exist (yet?)\033[0m\n" + printf "\033[40m\033[1;31mResult was: $result\033[0m\n" + fi + fi + done + + # Check whether DMZ_IF's exists + ############################### + for interface in $DMZ_IF; do + if [ -z "$(echo $interface |grep '\+')" ]; then + result=`ifconfig $MODEM_IF >/dev/null 2>&1` + return_val=$? + if [ "$return_val" != "0" ]; then + printf "\033[40m\033[1;31mNOTE: DMZ interface $interface does NOT exist (yet?)\033[0m\n" + printf "\033[40m\033[1;31mResult was: $result\033[0m\n" + fi + fi + done + + # Check whether TRUSTED_IF's exists + ################################### + for interface in $TRUSTED_IF; do + if [ -z "$(echo $interface |grep '\+')" ]; then + result=`ifconfig $MODEM_IF >/dev/null 2>&1` + return_val=$? + if [ "$return_val" != "0" ]; then + printf "\033[40m\033[1;31mNOTE: Trusted interface $interface does NOT exist (yet?)\033[0m\n" + printf "\033[40m\033[1;31mResult was: $result\033[0m\n" + fi + fi + done + + # Make sure INT_IF != EXT_IF + ############################ + for eif in $EXT_IF; do + for iif in $INT_IF; do + if [ "$iif" = "$eif" ]; then + printf "\033[40m\033[1;31mERROR: One or more interfaces specified in EXT_IF is the same as one in\033[0m\n" + printf "\033[40m\033[1;31m INT_IF! Please, check the configuration file.\033[0m\n" + exit 3 + fi + done + done + + # Make sure EXT_IF != MODEM_IF + ############################## + for eif in $EXT_IF; do + if [ "$eif" = "$MODEM_IF" ]; then + printf "\033[40m\033[1;31mERROR: One or more interfaces specified in EXT_IF is the same as the\033[0m\n" + printf "\033[40m\033[1;31m MODEM_IF! Please, check the configuration file.\033[0m\n" + exit 4 + fi + done + + # Make sure INT_IF != MODEM_IF + ############################## + if [ -n "$MODEM_IF" ]; then + for iif in $INT_IF; do + if [ "$iif" = "$MODEM_IF" ]; then + printf "\033[40m\033[1;31mERROR: One or more interfaces specified in INT_IF is the same as the one in\033[0m\n" + printf "\033[40m\033[1;31m MODEM_IF! Please, check the configuration file.\033[0m\n" + exit 5 + fi + done + fi + + # Make sure EXT_IF != lo / 127.0.0.1 + #################################### + for eif in $EXT_IF; do + if [ "$eif" = "lo" ] || [ "$eif" = "127.0.0.1" ]; then + printf "\033[40m\033[1;31mERROR: One or more interfaces specified in EXT_IF has the address or name of the\033[0m\n" + printf "\033[40m\033[1;31m local loopback device! Please, check the configuration file.\033[0m\n" + exit 6 + fi + done + + # Make sure INT_IF != lo / 127.0.0.1 + #################################### + for iif in $INT_IF; do + if [ "$iif" = "lo" ] || [ "$iif" = "127.0.0.1" ]; then + printf "\033[40m\033[1;31mERROR: At least one of the interfaces specified in INT_IF has the address or\033[0m\n" + printf "\033[40m\033[1;31m name of the local loopback device! Please, check the configuration file.\033[0m\n" + exit 7 + fi + done + + # Make sure MODEM_IF != lo / 127.0.0.1 + ###################################### + if [ "$MODEM_IF" = "lo" ] || [ "$MODEM_IF" = "127.0.0.1" ]; then + printf "\033[40m\033[1;31mERROR: The interface specified in MODEM_IF has the address or name of the local\033[0m\n" + printf "\033[40m\033[1;31m loopback device! Please, check the configuration file.\033[0m\n" + exit 8 + fi + + # Make sure than when multi route masquerade is enabled, multiple external + # interfaces exist + ########################################################################## + if [ "$MASQ_MULTI_ROUTE" = "1" ] && [ -z "$(echo $EXT_IF |grep ' ')" ]; then + printf "\033[40m\033[1;31mERROR: Multiroute masquerade is enabled but only one external interface is\033[0m\n" + printf "\033[40m\033[1;31m specified! Please, check the configuration file.\033[0m\n" + exit 9 + fi + + # If support for an DHCP server serving an external net is enabled, we + # also need to know what the external net is. + ########################################################################## + if [ "$EXTERNAL_DHCP_SERVER" = "1" ] && [ -z "$EXTERNAL_NET" ]; then + printf "\033[40m\033[1;31mERROR: You have enabled external DHCP server support but required variable\033[0m\n" + printf "\033[40m\033[1;31m EXTERNAL_NET has NOT been defined!\033[0m\n" + exit 10 + fi + + # We can only perform NAT if NAT_INTERNAL_NET is defined + if [ "$NAT" = "1" ] && [ -z "$NAT_INTERNAL_NET" ]; then + printf "\033[40m\033[1;31mERROR: Unable to enable NAT because there's no (NAT_)INTERNAL_NET specified!\033[0m\n" + exit 11 + fi + + # If support the nmb_broadcast_fix is enabled we need the EXTERNAL_NET set + ########################################################################## + if [ "$NMB_BROADCAST_FIX" = "1" ] && [ -z "$EXTERNAL_NET" ]; then + printf "\033[40m\033[1;31mERROR: You have enabled the NMB_BROADCAST_FIX but required variable\033[0m\n" + printf "\033[40m\033[1;31m EXTERNAL_NET has NOT been defined!\033[0m\n" + exit 12 + fi + + # Warn if no_broadcast variables are used and external net is NOT defined + ########################################################################## + if [ -n "$BROADCAST_TCP_NOLOG" ] || [ -n "$BROADCAST_UDP_NOLOG" ]; then + if [ -z "$EXTERNAL_NET" ]; then + printf "\033[40m\033[1;31mWARNING: You are using the BROADCAST_xxx_NOLOG variables but the EXTERNAL_NET\033[0m\n" + printf "\033[40m\033[1;31m has NOT been defined! This could be a problem.\033[0m\n" + fi + fi + + # Check whether the iptables binary exists and if it's executable + ################################################################# + if [ ! -x $IPTABLES ]; then + printf "\033[40m\033[1;31mERROR: Binary \"$IPTABLES\" does not exist or is not executable!\033[0m\n" + printf "\033[40m\033[1;31m Please, make sure that IPTABLES is (properly) installed!\033[0m\n" + exit 13 + fi + + # Check that we have at least kernel 2.4 else generate a warning (no error as 2.2 kernels could be iptables patched) + #################################################################################################################### + KERNELMAJ=`uname -r |sed -e 's,\..*,,'` + KERNELMIN=`uname -r |sed -e 's,[^\.]*\.,,' -e 's,\..*,,'` + if [ "$KERNELMAJ" -lt 2 ] || [ "$KERNELMAJ" -eq 2 -a "$KERNELMIN" -lt 3 ]; then + printf "\033[40m\033[1;31mWARNING: Your kernel version is older than 2.4! Your kernel probably doesn't\033[0m\n" + printf "\033[40m\033[1;31m support IPTABLES unless an IPTABLES patch is compiled in it.\033[0m\n" + fi + + # Check whether IPCHAINS is active else IPTABLES won't work (RedHat <7.2 for example) + ########################################################################################### + if /sbin/lsmod 2>/dev/null |grep -q ipchains; then + printf "\033[40m\033[1;31mERROR: Found IPCHAINS module loaded in the kernel. Unable to load IPTABLES module because of this!\033[0m\n" + printf "\033[40m\033[1;31m Please, use \"rmmod ipchains\" (as root) to remove the IPCHAINS module and then run this script again.\033[0m\n" + exit 14 + fi + + # Passed all sanity checks :-) + ############################## + echo "Sanity checks passed...OK" +} + + +# Helper function to load a module +module_probe() +{ + if [ -x /sbin/modprobe ]; then + result=`/sbin/modprobe $1 2>&1` + else + # Let the path figure it out + result=`modprobe $1 2>&1` + fi + + if [ "$?" != "0" ]; then + printf "\033[40m\033[1;31m$result\033[0m\n" # Show any (error) messages generated by modprobe in red + else + if [ -n "$result" ]; then # If result is not empty, show it + echo "$result" + fi + fi +} + + +load_modules() +{ + if [ -f /lib/modules/`uname -r`/kernel/net/ipv4/netfilter/ip_tables.* ]; then + echo "Detected IPTABLES module... Loading additional IPTABLES modules:" + + module_probe ip_tables # Required; all ipv4 modules depend on this one + module_probe ip_conntrack # Allows connection tracking state match, which allows you to + # write rules matching the state of a connection + module_probe ip_conntrack_ftp # Permits active FTP; requires ip_conntrack + + module_probe ipt_conntrack # Allows tracking for various protocols, placing entries + # in the conntrack table etc. + module_probe ipt_limit # Allows log limits + module_probe ipt_state # Permits packet state checking (SYN, SYN-ACK, ACK, and so on). + module_probe ipt_multiport # Allows packet specifications on multiple ports + + module_probe iptable_filter # Implements the filter table + module_probe iptable_nat # Implements the nat table + + if [ -n "$MAC_ADDRESS_FILE" ]; then + module_probe ipt_mac # Allows specifying MAC address + fi + +# (Currently) unused modules: +# module_probe ipt_iprange # Allows to use IP ranges in rules +# module_probe ipt_addrtype # Allows matching src/dst address type (BROKEN!) +# module_probe ipt_pkttype # Permits checking for packet type (BROADCAST, MULTICAST etc.) (BROKEN!) +# module_probe ipt_recent # Allows checking for recent packets +# module_probe ip_queue # Allows queuing packets to user space +# module_probe ipt_owner # Permits user/group checking on OUTPUT packets +# module_probe ipt_mark # Allows use of mark match +# module_probe ip_conntrack_egg + + if [ "$USE_IRC" = "1" ]; then +# echo "Enabling IRC DCC module support..." + module_probe ip_conntrack_irc #ports=6661,6662,6663,6664,6665,6666,6667,6668,6669,7000,7001 + + if [ "$NAT" = "1" ]; then + module_probe ip_nat_irc #ports=6661,6662,6663,6664,6665,6666,6667,6668,6669,7000,7001 + fi + fi + + if [ "$SET_MSS" != "0" ]; then + module_probe ipt_tcpmss # Permits TCPMSS checking on a packet + fi + + if [ "$NAT" = "1" ]; then + module_probe iptable_nat # Implements nat table + module_probe ip_nat_ftp # Permits active FTP via nat; requires ip_conntrack, iptables_nat + fi + + if [ "$MANGLE_TOS" != "0" ] || [ "$PACKET_TTL" = "1" ] || [ "$TTL_INC" = "1" ]; then + module_probe iptable_mangle # Implements the mangle table + fi + + if [ "$MANGLE_TOS" != "0" ]; then + module_probe ipt_tos # Permits TOS checking on a packet + fi + + if [ "$PACKET_TTL" = "1" ] || [ "$TTL_INC" = "1" ]; then + module_probe ipt_ttl # Enable ttl manipulation + fi + +# if [ "$TRAFFIC_SHAPING" = "1" ]; then +# module_probe ipt_length +# fi + + echo "All IPTABLES modules loaded!" + else + echo "No module found for IPTABLES, assuming ALL modules are compiled in the kernel." + fi +} + + +setup_misc() +{ + # Most people don't want to get any firewall logs being spit to the console + # This option makes the kernel ring buffer to only log messages with level "panic" + if [ "$DMESG_PANIC_ONLY" = "1" ]; then + echo "Setting the kernel ring buffer to only log panic messages to the console" +# dmesg -c # Clear ring buffer + dmesg -n 1 # Only show panic messages on the console + fi +} + + +setup_proc_settings() +{ + echo "Configuring /proc/.... settings:" + + # Use /proc rp_filter values to drop connections from non-routable IPs + ###################################################################### + if [ -e /proc/sys/net/ipv4/conf/all/rp_filter ]; then + if [ "$RP_FILTER" = "1" ]; then + echo " Enabling anti-spoof with rp_filter." + else + echo " Disabling anti-spoof with rp_filter." + fi + + for i in /proc/sys/net/ipv4/conf/*/rp_filter; do +# if [ "$i" = "/proc/sys/net/ipv4/conf/$EXT_IF/rp_filter" ] || [ "$RP_FILTER" != "0" ]; then + if [ "$RP_FILTER" = "1" ]; then + echo "1" > $i + else + echo "0" > $i + fi + done + fi + + # Block ALL ICMP echo requests? + ############################### + if [ "$ECHO_IGNORE" = "1" ]; then + echo " Blocking all ICMP echo-requests" + echo "1" > /proc/sys/net/ipv4/icmp_echo_ignore_all + else + echo "0" > /proc/sys/net/ipv4/icmp_echo_ignore_all + fi + + # Add synflood protection? + ########################## + if [ -f /proc/sys/net/ipv4/tcp_syncookies ]; then + if [ "$SYN_PROT" != 0 ]; then + echo " Enabling SYN-flood protection via SYN-cookies." + echo "1" > /proc/sys/net/ipv4/tcp_syncookies + else + echo " Disabling SYN-flood protection via SYN-cookies." + echo "0" > /proc/sys/net/ipv4/tcp_syncookies + fi + fi + + # Log martians? + ############### + if [ "$LOG_MARTIANS" = "1" ]; then + echo " Enabling the logging of martians." + echo "1" > /proc/sys/net/ipv4/conf/all/log_martians + else + echo " Disabling the logging of martians." + echo "0" > /proc/sys/net/ipv4/conf/all/log_martians + fi + + # Accept ICMP redirect messages? + ################################ + if [ "$ICMP_REDIRECT" = "1" ]; then + echo " Enabling the acception of ICMP-redirect messages." + echo "1" > /proc/sys/net/ipv4/conf/all/accept_redirects + else + echo " Disabling the acception of ICMP-redirect messages." + echo "0" > /proc/sys/net/ipv4/conf/all/accept_redirects + fi + + # Set the maximum number of connections to track. + # The kernel "default" depends on the available amount of RAM, 128 MB of RAM -> 8192 + # possible entries, 256 MB of RAM --> 16376 possible entries, etc... + ####################################################################################### + if [ ! -f /proc/sys/net/ipv4/ip_conntrack_max ] && [ ! -f /proc/sys/net/ipv4/netfilter/ip_conntrack_max ] \ + && [ -n "$CONNTRACK" ]; then + printf "\033[40m\033[1;31m WARNING: /proc/../ip_conntrack_max was NOT found. This may be a problem!\033[0m\n" + else + if [ -n "$CONNTRACK" ]; then + echo " Setting the max. amount of simultaneous connections to $CONNTRACK." + else + echo " Setting the max. amount of simultaneous connections to 4096 (default)." + fi + + # Default location for ip_conntrack_max + if [ -f /proc/sys/net/ipv4/ip_conntrack_max ]; then + if [ -n "$CONNTRACK" ]; then + echo "$CONNTRACK" > /proc/sys/net/ipv4/ip_conntrack_max + else + echo "4096" > /proc/sys/net/ipv4/ip_conntrack_max + fi + fi + + # Alternate location for ip_conntrack_max + if [ -f /proc/sys/net/ipv4/netfilter/ip_conntrack_max ]; then + if [ -n "$CONNTRACK" ]; then + echo "$CONNTRACK" > /proc/sys/net/ipv4/netfilter/ip_conntrack_max + else + echo "4096" > /proc/sys/net/ipv4/netfilter/ip_conntrack_max + fi + fi + fi + + # Disable ICMP send_redirect + ############################ + if [ -e /proc/sys/net/ipv4/conf/all/send_redirects ]; then + for interface in /proc/sys/net/ipv4/conf/*/send_redirects; do + echo "0" > $interface + done + fi + + # Don't accept source routed packets. + # Attackers can use source routing to generate + # traffic pretending to be from inside your network, but which is routed back along + # the path from which it came, namely outside, so attackers can compromise your + # network. Source routing is rarely used for legitimate purposes. + ################################################################################### + if [ "$SOURCE_ROUTE_PROTECTION" = "0" ]; then + echo " DISABLING protection against source routed packets." + for interface in /proc/sys/net/ipv4/conf/*/accept_source_route; do + echo "1" > $interface + done + else + echo " Enabling protection against source routed packets." + for interface in /proc/sys/net/ipv4/conf/*/accept_source_route; do + echo "0" > $interface + done + fi + + # ICMP Broadcasting protection (smurf amplifier protection) + ########################################################### + if [ -e /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts ]; then + echo "1" > /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts + fi + + # ICMP Dead Error Messages protection + ##################################### + if [ -e /proc/sys/net/ipv4/icmp_ignore_bogus_error_responses ]; then + echo "1" > /proc/sys/net/ipv4/icmp_ignore_bogus_error_responses + fi + + # Enable automatic IP defragmenting (is obsolete for 2.4 kernels, but still used for 2.2 legacy support) + ######################################################################################################## + if [ -e /proc/sys/net/ipv4/ip_always_defrag ]; then + echo "1" > /proc/sys/net/ipv4/ip_always_defrag + fi + + # LooseUDP patch is required by some internet-based games + # + # If you are trying to get an internet game to work through your IP MASQ box, + # and you have set it up to the best of your ability without it working., try + # enabling this option. This option is disabled by default due to possible + # internal machine UDP port scanning vulnerabilities. + ############################################################################# + if [ "$LOOSE_UDP_PATCH" = "1" ]; then + if [ -e /proc/sys/net/ipv4/ip_masq_udp_dloose ]; then + echo " Enabling the LOOSE_UDP_PATCH (required for some internet games, but less secure!)." + echo "1" > /proc/sys/net/ipv4/ip_masq_udp_dloose + else + printf "\033[40m\033[1;31m WARNING: /proc/sys/net/ipv4/ip_masq_udp_dloose does not exist!\033[0m\n" + fi + else + if [ -e /proc/sys/net/ipv4/ip_masq_udp_dloose ]; then + echo " Disabling the LOOSE_UDP_PATCH (more secure)." + echo "0" > /proc/sys/net/ipv4/ip_masq_udp_dloose + fi + fi + + # IP forwarding (need it to perform for example NAT) + #################################################### + if [ "$IP_FORWARDING" != "0" ]; then + if [ -e /proc/sys/net/ipv4/ip_forward ]; then + echo "1" > /proc/sys/net/ipv4/ip_forward + else + printf "\033[40m\033[1;31m WARNING: /proc/sys/net/ipv4/ip_forward does not exist! If you're using\033[0m\n" + printf "\033[40m\033[1;31m NAT or any other type of forwarding this may be a problem.\033[0m\n" + fi + else + if [ -e /proc/sys/net/ipv4/ip_forward ]; then + echo "0" > /proc/sys/net/ipv4/ip_forward + fi + fi + + # Change some default timings to fix false logs generated by "lost connections" + ############################################################################### + echo " Setting default conntrack timeouts." + echo "60" > /proc/sys/net/ipv4/netfilter/ip_conntrack_udp_timeout + echo "180" > /proc/sys/net/ipv4/netfilter/ip_conntrack_udp_timeout_stream +# echo 10 >/proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_close +# echo 300 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_max_retrans +# echo 600 > /proc/sys/net/ipv4/netfilter/ip_conntrack_generic_timeout +# echo 30 > /proc/sys/net/ipv4/netfilter/ip_conntrack_icmp_timeout +# echo 120 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_time_wait +# echo 30 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_last_ack +# echo 60 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_close_wait +# echo 120 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_fin_wait +# echo 60 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_syn_recv +# echo 120 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_syn_sent + + + # Reduce DoS'ing ability by reducing timeouts + # Defaults: + # echo 60 > /proc/sys/net/ipv4/tcp_fin_timeout + # echo 7200 > /proc/sys/net/ipv4/tcp_keepalive_time + # echo 1 > /proc/sys/net/ipv4/tcp_window_scaling + # echo 1 > /proc/sys/net/ipv4/tcp_sack + ############################################################# + if [ "$REDUCE_DOS_ABILITY" = "1" ]; then + echo " Enabling reduction of the DoS'ing ability." + + echo "10" > /proc/sys/net/ipv4/tcp_fin_timeout + echo "1800" > /proc/sys/net/ipv4/tcp_keepalive_time + echo "0" > /proc/sys/net/ipv4/tcp_window_scaling + echo "0" > /proc/sys/net/ipv4/tcp_sack + fi + + # Set out local port range. Kernel default = "1024 4999" + ######################################################## + if [ -z "$LOCAL_PORT_RANGE" ]; then + LOCAL_PORT_RANGE="32768 61000" + fi + echo "$LOCAL_PORT_RANGE" > /proc/sys/net/ipv4/ip_local_port_range + # Now we change the LOCAL_PORT_RANGE for further use by iptables (replace space with :) + LOCAL_PORT_RANGE="$(echo $LOCAL_PORT_RANGE |sed s,' ',':',)" + + # Time To Live (TTL) is the term for a data field in the internet protocol. + # TTL is today interpreted to indicate the maximum number of routers a packet may transit. + # Each router that handles a packet will decrement the TTL field by 1. + # Raise if you have a huge network. + # Set the default ttl. (Kernel Default: 64) + ########################################################################################### + if [ -n "$DEFAULT_TTL" ]; then + if [ ! -e /proc/sys/net/ipv4/ip_default_ttl ]; then + printf "\033[40m\033[1;31m WARNING: /proc/sys/net/ipv4/ip_default_ttl does not exist!\033[0m\n" + else + if [ $DEFAULT_TTL -gt 9 ] && [ $DEFAULT_TTL -lt 256 ]; then + echo " Setting Default TTL=$DEFAULT_TTL" + echo "$DEFAULT_TTL" > /proc/sys/net/ipv4/ip_default_ttl + else + printf "\033[40m\033[1;31m WARNING: Ingoring invalid value for DEFAULT_TTL ($DEFAULT_TTL), it should be between 10 and 255!\033[0m\n" + fi + fi + else + # If no Variable is set... + if [ -e /proc/sys/net/ipv4/ip_default_ttl ]; then + echo " Setting default TTL to 64" + echo "64" > /proc/sys/net/ipv4/ip_default_ttl + fi + fi + + # Increase the default queuelength. (Kernel Default: 1024) + ########################################################## + if [ -e /proc/sys/net/ipv4/ipv4/ip_queue_maxlen ]; then + echo "2048" > /proc/sys/net/ipv4/ip_queue_maxlen + fi + + # Enable ECN? (Explicit Congestion Notification) + ################################################ + if [ "$ECN" = "1" ]; then + if [ -e /proc/sys/net/ipv4/tcp_ecn ]; then + echo " Enabling ECN (Explicit Congestion Notification)." + echo "1" > /proc/sys/net/ipv4/tcp_ecn + else + printf "\033[40m\033[1;31m WARNING: /proc/sys/net/ipv4/tcp_ecn does not exist!\033[0m\n" + fi + else + if [ -e /proc/sys/net/ipv4/tcp_ecn ]; then + echo " Disabling ECN (Explicit Congestion Notification)." + echo "0" > /proc/sys/net/ipv4/tcp_ecn + fi + fi + + # This enables dynamic-address hacking which makes the + # life with Diald and similar programs much easier. + ###################################################### + if [ "$EXT_IF_DHCP_IP" = "1" ]; then + echo " Enabling support for dynamic IP's" + echo "1" > /proc/sys/net/ipv4/ip_dynaddr + else + echo "0" > /proc/sys/net/ipv4/ip_dynaddr + fi + + # In most cases pmtu discovery is ok, but in some rare cases (when having problems) + # you might want to disable it. + if [ "$NO_PMTU_DISCOVERY" = "1" ]; then + echo " Disabling PMTU discovery" + echo "1" > /proc/sys/net/ipv4/ip_no_pmtu_disc + else + echo "0" > /proc/sys/net/ipv4/ip_no_pmtu_disc + fi + + echo "/proc/ setup done..." +} + + +setup_filter_table() +{ + echo "Flushing rules in the filter table." + + # Attempt to flush all rules in filter table + ############################################ + $IPTABLES -F + $IPTABLES -X + + # Flush built-in rules + ###################### + $IPTABLES -F INPUT + $IPTABLES -F OUTPUT + $IPTABLES -F FORWARD + $IPTABLES -t nat -F 2>/dev/null + $IPTABLES -t nat -X 2>/dev/null + $IPTABLES -t mangle -F 2>/dev/null + $IPTABLES -t mangle -X 2>/dev/null + + # New table named HOST_BLOCK, the block user defined hosts (blackhole) + ###################################################################### + $IPTABLES -N HOST_BLOCK + + # New table named MAC_FILTER, to filter internal hosts using their MAC address + ############################################################################## + $IPTABLES -N MAC_FILTER + + echo "Setting default (secure) policies." + # Set standard policies for the built-in tables (drop = very secure) + #################################################################### + $IPTABLES -P INPUT DROP + $IPTABLES -P FORWARD DROP + $IPTABLES -P OUTPUT ACCEPT + + $IPTABLES -t nat -P POSTROUTING ACCEPT 2>/dev/null + $IPTABLES -t nat -P PREROUTING ACCEPT 2>/dev/null + + $IPTABLES -t mangle -P OUTPUT ACCEPT 2>/dev/null + $IPTABLES -t mangle -P PREROUTING ACCEPT 2>/dev/null + + # Reset the iptables counters + $IPTABLES -Z + $IPTABLES -t nat -Z 2>/dev/null + $IPTABLES -t mangle -Z 2>/dev/null +} + + +# Helper function to split get hostname(s) from variable +get_dhost() +{ + # Get variable from stdin + read hosts_ports + + if [ -z "$(echo "$hosts_ports" |grep ":")" ]; then + echo "$hosts_ports" + return 1 + else + CHK_HOST="$(echo "$hosts_ports" |awk -F: '{ print $1 }')" + # IP or hostname? + if [ -n "$(echo "$CHK_HOST" |grep -i -e '\.' -e '[a-z]' )" ]; then + echo "$CHK_HOST" + else + echo "0/0" + fi + fi + + return 0 +} + + +# Helper function to split get port(s) from variable +get_dport() +{ + # Get variable from stdin + read hosts_ports + + if [ -z "$(echo "$hosts_ports" |grep ":")" ]; then + printf "" + return 1 + else + CHK_HOST="$(echo "$hosts_ports" |awk -F: '{ print $1 }')" + # IP or hostname? + if [ -n "$(echo "$CHK_HOST" |grep -i -e '\.' -e '[a-z]')" ]; then + hostname="$CHK_HOST" + echo "$(echo "$hosts_ports" |sed s/"^$hostname:"// |sed s/'-'/':'/g)" + else + echo "$(echo "$hosts_ports" |sed s/'-'/':'/g)" + fi + fi + + return 0 +} + + +# Helper function to split get hostname(s) from variable +get_shost() +{ + # Get variable from stdin + read hosts_ports + + if [ -z "$(echo "$hosts_ports" |grep ":")" ]; then + echo "0/0" + return 1 + else + CHK_HOST="$(echo "$hosts_ports" |awk -F: '{ print $1 }')" + # IP or hostname? + if [ -n "$(echo "$CHK_HOST" |grep -i -e '\.' -e '[a-z]')" ]; then + echo "$CHK_HOST" + else + echo "0/0" + fi + fi + + return 0 +} + + +# Helper function to split get port(s) from variable +get_sport() +{ + # Get variable from stdin + read hosts_ports + + if [ -z "$(echo "$hosts_ports" |grep ":")" ]; then + echo "$hosts_ports" |sed s/'-'/':'/g + return 1 + else + CHK_HOST="$(echo "$hosts_ports" |awk -F: '{ print $1 }')" + # IP or hostname? + if [ -n "$(echo "$CHK_HOST" |grep -i -e '\.' -e '[a-z]')" ]; then + hostname="$CHK_HOST" + echo "$(echo "$hosts_ports" |sed s/"^$hostname:"// |sed s/'-'/':'/g)" + else + echo "$(echo "$hosts_ports" |sed s/'-'/':'/g)" + fi + fi + + return 0 +} + + +# Helper function to resolve an IP to a DNS name +# $1 = IP. stdout = DNS name +get_hostname() +{ + if [ -n "$(echo "$1" |grep '/')" ]; then + return 1 + else + printf "$(dig +short +tries=1 +time=1 -x "$1" 2>/dev/null |grep -v "^;;" |head -n1)" + fi + + return 0 +} + + +################################################################################################################## +## Chain VALID_CHK - Check packets for invalid flags etc. ## +################################################################################################################## +setup_valid_chk_chain() +{ + # Create new chain: + $IPTABLES -N VALID_CHK + + ## Log scanning of nmap etc. + ############################ + if [ "$SCAN_LOG" != "0" ]; then + echo "Logging of stealth scans (nmap probes etc.) enabled." + + # (NMAP) FIN/URG/PSH + #################### + $IPTABLES -A VALID_CHK -p tcp --tcp-flags ALL FIN,URG,PSH \ + -m limit --limit 3/m --limit-burst 5 -j LOG --log-level $LOGLEVEL --log-prefix "Stealth XMAS scan: " + + # SYN/RST/ACK/FIN/URG + ##################### + $IPTABLES -A VALID_CHK -p tcp --tcp-flags ALL SYN,RST,ACK,FIN,URG \ + -m limit --limit 3/m --limit-burst 5 -j LOG --log-level $LOGLEVEL --log-prefix "Stealth XMAS-PSH scan: " + + # ALL/ALL + ######### + $IPTABLES -A VALID_CHK -p tcp --tcp-flags ALL ALL \ + -m limit --limit 3/m --limit-burst 5 -j LOG --log-level $LOGLEVEL --log-prefix "Stealth XMAS-ALL scan: " + + # NMAP FIN Stealth + ################## + $IPTABLES -A VALID_CHK -p tcp --tcp-flags ALL FIN \ + -m limit --limit 3/m --limit-burst 5 -j LOG --log-level $LOGLEVEL --log-prefix "Stealth FIN scan: " + + # SYN/RST + ######### + $IPTABLES -A VALID_CHK -p tcp --tcp-flags SYN,RST SYN,RST \ + -m limit --limit 3/m --limit-burst 5 -j LOG --log-level $LOGLEVEL --log-prefix "Stealth SYN/RST scan: " + + # SYN/FIN (probably) + #################### + $IPTABLES -A VALID_CHK -p tcp --tcp-flags SYN,FIN SYN,FIN \ + -m limit --limit 3/m --limit-burst 5 -j LOG --log-level $LOGLEVEL --log-prefix "Stealth SYN/FIN scan(?): " + + # Null scan + ########### + $IPTABLES -A VALID_CHK -p tcp --tcp-flags ALL NONE \ + -m limit --limit 3/m --limit-burst 5 -j LOG --log-level $LOGLEVEL --log-prefix "Stealth Null scan: " + + else + echo "Logging of stealth scans (nmap probes etc.) disabled." + fi + + # Drop (NMAP) scan packets: + ########################### + + # NMAP FIN/URG/PSH + ################## + $IPTABLES -A VALID_CHK -p tcp --tcp-flags ALL FIN,URG,PSH -j DROP + + # SYN/RST/ACK/FIN/URG + ##################### + $IPTABLES -A VALID_CHK -p tcp --tcp-flags ALL SYN,RST,ACK,FIN,URG -j DROP + + # ALL/ALL Scan + ############## + $IPTABLES -A VALID_CHK -p tcp --tcp-flags ALL ALL -j DROP + + # NMAP FIN Stealth + ################## + $IPTABLES -A VALID_CHK -p tcp --tcp-flags ALL FIN -j DROP + + # SYN/RST + ######### + $IPTABLES -A VALID_CHK -p tcp --tcp-flags SYN,RST SYN,RST -j DROP + + # SYN/FIN -- Scan(probably) + ########################### + $IPTABLES -A VALID_CHK -p tcp --tcp-flags SYN,FIN SYN,FIN -j DROP + + # NMAP Null Scan + ################ + $IPTABLES -A VALID_CHK -p tcp --tcp-flags ALL NONE -j DROP + + # Log packets with bad flags? + ############################# + if [ "$BAD_FLAGS_LOG" != "0" ]; then + echo "Logging of packets with bad TCP-flags enabled." + $IPTABLES -A VALID_CHK -p tcp --tcp-option 64 \ + -m limit --limit 3/m --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "Bad TCP flag(64): " + + $IPTABLES -A VALID_CHK -p tcp --tcp-option 128 \ + -m limit --limit 3/m --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "Bad TCP flag(128): " + else + echo "Logging of packets with bad TCP-flags disabled." + fi + + # Drop packets with bad tcp flags + ################################# + $IPTABLES -A VALID_CHK -p tcp --tcp-option 64 -j DROP + $IPTABLES -A VALID_CHK -p tcp --tcp-option 128 -j DROP + + # These packets are normally from "lost connection" and thus can generate false alarms + # So we might want to ignore such packets + ###################################################################################### + if [ "$LOST_CONNECTION_LOG" != "1" ]; then + $IPTABLES -A VALID_CHK -p tcp --tcp-flags SYN,ACK,FIN,RST ACK -j DROP + $IPTABLES -A VALID_CHK -p tcp --tcp-flags SYN,ACK,FIN,RST FIN -j DROP + $IPTABLES -A VALID_CHK -p tcp --tcp-flags SYN,ACK,FIN,RST RST -j DROP + $IPTABLES -A VALID_CHK -p tcp --tcp-flags SYN,ACK,FIN,RST ACK,FIN -j DROP + $IPTABLES -A VALID_CHK -p tcp --tcp-flags SYN,ACK,FIN,RST ACK,RST -j DROP + $IPTABLES -A VALID_CHK -p tcp --tcp-flags SYN,ACK,FIN,RST SYN,ACK -j DROP + fi + + # Logging of possible stealth scans + ################################### + if [ "$POSSIBLE_SCAN_LOG" = "1" ]; then + echo "Logging of possible stealth scans enabled." + if [ "$UNPRIV_TCP_LOG" != "0" ]; then + $IPTABLES -A VALID_CHK -p tcp ! --syn --dport 1024: \ + -m limit --limit 3/m --limit-burst 5 -j LOG --log-level $LOGLEVEL --log-prefix "Stealth scan (UNPRIV)?: " + fi + + if [ "$PRIV_TCP_LOG" != "0" ]; then + $IPTABLES -A VALID_CHK -p tcp ! --syn --dport :1023 \ + -m limit --limit 3/m --limit-burst 5 -j LOG --log-level $LOGLEVEL --log-prefix "Stealth scan (PRIV)?: " + fi + else + echo "Logging of possible stealth scans disabled." + fi + + # Possible stealth scan drop (we don't like "new"-packets which don't have SYN-only set) + ######################################################################################## + $IPTABLES -A VALID_CHK -p tcp ! --syn -j DROP + + # Here we add some protection from random packets we receive, such as random sweeps from other + # (possible) hacked computers, or just packets who are invalid, not belonging to ANY connection + ############################################################################################### + if [ "$INVALID_PACKET_LOG" != "0" ]; then + echo "Logging of INVALID packets enabled." + + # Only log INVALID ICMP-request packets when we also want to log "normal" ICMP-request packets + if [ "$ICMP_REQUEST_LOG" != "0" ]; then + $IPTABLES -A VALID_CHK -p icmp --icmp-type echo-request -m state --state INVALID \ + -m limit --limit 1/m --limit-burst 2 -j LOG --log-level $LOGLEVEL --log-prefix "INVALID packet: " + fi + + # Only log INVALID ICMP-other packets when we also want to log "normal" ICMP-other packets + if [ "$ICMP_OTHER_LOG" != "0" ]; then + $IPTABLES -A VALID_CHK -p icmp ! --icmp-type echo-request -m state --state INVALID \ + -m limit --limit 1/m --limit-burst 2 -j LOG --log-level $LOGLEVEL --log-prefix "INVALID packet: " + fi + + $IPTABLES -A VALID_CHK -p ! icmp -m state --state INVALID \ + -m limit --limit 1/m --limit-burst 2 -j LOG --log-level $LOGLEVEL --log-prefix "INVALID packet: " + else + echo "Logging of INVALID packets disabled." + fi + + # Drop invalid packets + ###################### + $IPTABLES -A VALID_CHK -m state --state INVALID -j DROP + + ## Log fragmented packets + ######################### + if [ "$FRAG_LOG" = "1" ]; then + echo "Logging of fragmented packets enabled." + $IPTABLES -A VALID_CHK -f -m limit --limit 3/m --limit-burst 1 -j LOG --log-prefix "Fragmented packet: " + else + echo "Logging of fragmented packets disabled." + fi + + # Drop fragmented packets + ######################### + $IPTABLES -A VALID_CHK -f -j DROP +} + + +################################################################################################################ +## Chain RESERVED_NET_CHK - Check if the source addresses of the packets are (in)valid ## +################################################################################################################ +setup_reserved_net_chk_chain() +{ + # Create new chain: + $IPTABLES -N RESERVED_NET_CHK + + # Log access from reserved addresses + #################################### + if [ "$RESERVED_NET_LOG" != "0" ]; then + echo "Logging of access from reserved addresses enabled." + $IPTABLES -A RESERVED_NET_CHK -s 10.0.0.0/8 \ + -m limit --limit 1/m --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "Class A address: " + + $IPTABLES -A RESERVED_NET_CHK -s 172.16.0.0/12 \ + -m limit --limit 1/m --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "Class B address: " + + $IPTABLES -A RESERVED_NET_CHK -s 192.168.0.0/16 \ + -m limit --limit 1/m --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "Class C address: " + + $IPTABLES -A RESERVED_NET_CHK -s 169.254.0.0/16 \ + -m limit --limit 1/m --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "Class M$ address: " + else + echo "Logging of access from reserved addresses disabled." + fi + + + # rp_filter drops some of these addresses, but just to be sure :) + ################################################################ + #echo "Denying access from reserved addresses..." + $IPTABLES -A RESERVED_NET_CHK -s 10.0.0.0/8 -j DROP + $IPTABLES -A RESERVED_NET_CHK -s 172.16.0.0/12 -j DROP + $IPTABLES -A RESERVED_NET_CHK -s 192.168.0.0/16 -j DROP + $IPTABLES -A RESERVED_NET_CHK -s 169.254.0.0/16 -j DROP +} + + +################################################################################################################ +## Chain SPOOF_CHK - Check if the source address is not spoofed ## +################################################################################################################ +setup_spoof_chk_chain() +{ + # Create new chain: + $IPTABLES -N SPOOF_CHK + + echo "Setting up anti-spoof rules." + + # Anti-spoof protection for the internal net + for net in $INTERNAL_NET; do + for interface in $INT_IF; do + # Any internal net is valid + $IPTABLES -A SPOOF_CHK -i $interface -s $net -j RETURN + done + $IPTABLES -A SPOOF_CHK -s $net -m limit --limit 3/m -j LOG --log-level $LOGLEVEL --log-prefix "Spoofed packet: " + $IPTABLES -A SPOOF_CHK -s $net -j DROP + done + + # Anti-spoof protection for the DMZ net + for net in $DMZ_NET; do + for interface in $DMZ_IF; do + # Any dmz net is valid + $IPTABLES -A SPOOF_CHK -i $interface -s $net -j RETURN + done + $IPTABLES -A SPOOF_CHK -s $net -m limit --limit 3/m -j LOG --log-level $LOGLEVEL --log-prefix "Spoofed packet: " + $IPTABLES -A SPOOF_CHK -s $net -j DROP + done + + if [ -n "$MODEM_IF" ] && [ -n "$MODEM_IF_IP" ]; then + # Anti spoof protection for the modem net + ######################################### + $IPTABLES -A SPOOF_CHK -i ! $MODEM_IF -s "$MODEM_IF_IP/24" \ + -m limit --limit 3/m -j LOG --log-level $LOGLEVEL --log-prefix "Spoofed (MODEM) packet: " + $IPTABLES -A SPOOF_CHK -i ! $MODEM_IF -s "$MODEM_IF_IP/24" -j DROP + fi + + # Everything else is valid + $IPTABLES -A SPOOF_CHK -j RETURN +} + + +################################################## +# Setup chain for the DMZ input traffic # +################################################## +setup_dmz_input_chain() +{ + # Create new chain: + $IPTABLES -N DMZ_INPUT_CHAIN 2>/dev/null + + # Adding TCP ports NOT to be firewalled + ####################################### + if [ -n "$DMZ_OPEN_TCP" ]; then + echo "Allowing DMZ hosts to connect to TCP port(s): $DMZ_OPEN_TCP" + for port in $DMZ_OPEN_TCP; do + $IPTABLES -A DMZ_INPUT_CHAIN -p tcp --syn --dport $port -j ACCEPT + done + fi + + # Adding UDP ports NOT to be firewalled + ####################################### + if [ -n "$DMZ_OPEN_UDP" ]; then + echo "Allowing DMZ hosts to connect to UDP port(s): $DMZ_OPEN_UDP" + for port in $DMZ_OPEN_UDP; do + $IPTABLES -A DMZ_INPUT_CHAIN -p udp --dport $port -j ACCEPT + done + fi + + # Adding IP protocols NOT to be firewalled + ########################################## + if [ -n "$DMZ_OPEN_IP" ]; then + echo "Allowing DMZ hosts to connect to IP protocol(s): $DMZ_OPEN_IP" + for proto in $DMZ_OPEN_IP; do + $IPTABLES -A DMZ_INPUT_CHAIN -p $proto -j ACCEPT + done + fi + + # Allow to send ICMP packets? + ############################# + if [ "$DMZ_OPEN_ICMP" = "1" ]; then + echo "Allowing DMZ hosts to send ICMP-requests(ping)." + $IPTABLES -A DMZ_INPUT_CHAIN -p icmp --icmp-type echo-request -m limit --limit 20/second --limit-burst 100 -j ACCEPT + fi + + # Add TCP ports to allow for certain hosts + ########################################## + for rule in $DMZ_HOST_OPEN_TCP; do + echo "$rule" | { + IFS='>' read hosts ports + + IFS=',' + + for host in $hosts; do + echo " Allowing DMZ host $host to connect to TCP port(s): $ports" + + for port in $ports; do + $IPTABLES -A DMZ_INPUT_CHAIN -s $host -p tcp --syn --dport $port -j ACCEPT + done + done + } + unset IFS + done + + # Add UDP ports to allow for certain hosts + ########################################## + for rule in $DMZ_HOST_OPEN_UDP; do + echo "$rule" | { + IFS='>' read hosts ports + + IFS=',' + for host in $hosts; do + echo " Allowing DMZ host $host to connect to UDP port(s): $ports" + + for port in $ports; do + $IPTABLES -A DMZ_INPUT_CHAIN -s $host -p udp --dport $port -j ACCEPT + done + done + } + unset IFS + done + + # Add ICMP to allow for certain hosts + ##################################### + for host in `echo "$DMZ_HOST_OPEN_ICMP" |sed s/' '/','/g`; do + echo " Allowing DMZ host $host to send ICMP-requests(ping)." + $IPTABLES -A DMZ_INPUT_CHAIN -s $host -p icmp --icmp-type echo-request -j ACCEPT + done + + # Add IP protocols to allow for certain hosts + ############################################# + for rule in $DMZ_HOST_OPEN_IP; do + echo "$rule" | { + IFS='>' read hosts protos + + IFS=',' + for host in $hosts; do + echo " Allowing DMZ host $host to connect to connect to IP protocol(s): $protos" + + for proto in $protos; do + $IPTABLES -A DMZ_INPUT_CHAIN -s $host -p $proto -j ACCEPT + done + done + } + unset IFS + done + + # Log everything else + $IPTABLES -A DMZ_INPUT_CHAIN -m limit --limit 3/m -j LOG --log-level $LOGLEVEL --log-prefix "Denied DMZ input packet: " + + # Everything else is denied + $IPTABLES -A DMZ_INPUT_CHAIN -j DROP +} + + +################################################## +# Setup chain for the DMZ-to-LAN forward traffic # +################################################## +setup_dmz_lan_forward_chain() +{ + # Create new chain: + $IPTABLES -N DMZ_LAN_FORWARD_CHAIN + + # DMZ-to-LAN TCP rules + for rule in $DMZ_LAN_HOST_OPEN_TCP; do + echo "$rule" | { + IFS='>' read shosts dhost_ports + + # SRC IP specified? + if [ -z "$dhost_ports" ]; then + dhost_ports="$shosts" + shosts="0/0" + fi + + if [ "$shosts" = "0/0" ]; then + echo " DMZ-TO-LAN: Allowing TCP port(s) $dhost_ports" + else + echo " DMZ-TO-LAN: Allowing TCP port(s) $dhost_ports for $shosts" + fi + + dhost=`echo "$dhost_ports" |get_dhost` + ports=`echo "$dhost_ports" |get_dport` + + IFS=',' + for shost in $shosts; do + for dport in $ports; do + $IPTABLES -A DMZ_LAN_FORWARD_CHAIN -s $shost -d $dhost -p tcp --syn --dport $dport -j ACCEPT + done + done + } + unset IFS + done + + # DMZ-to-LAN UDP rules + for rule in $DMZ_LAN_HOST_OPEN_UDP; do + echo "$rule" | { + IFS='>' read shosts dhost_ports + + # SRC IP specified? + if [ -z "$dhost_ports" ]; then + dhost_ports="$shosts" + shosts="0/0" + fi + + if [ "$shosts" = "0/0" ]; then + echo " DMZ-TO-LAN: Allowing UDP port(s) $dhost_ports" + else + echo " DMZ-TO-LAN: Allowing UDP port(s) $dhost_ports for $shosts" + fi + + dhost=`echo "$dhost_ports" |get_dhost` + ports=`echo "$dhost_ports" |get_dport` + + IFS=',' + for shost in $shosts; do + for dport in $ports; do + $IPTABLES -A DMZ_LAN_FORWARD_CHAIN -s $shost -d $dhost -p udp --dport $dport -j ACCEPT + done + done + } + unset IFS + done + + # DMZ-to-LAN IP-protocol rules + for rule in $DMZ_LAN_HOST_IP_FORWARD; do + echo "$rule" | { + IFS='>' read shosts dhost_protos + + # SRC IP specified? + if [ -z "$dhost_protos" ]; then + dhost_protos="$shosts" + shosts="0/0" + fi + + if [ "$shosts" = "0/0" ]; then + echo " DMZ-TO-LAN: Allowing IP protocol(s) $dhost_protos" + else + echo " DMZ-TO-LAN: Allowing IP protocol(s) $dhost_protos for $shosts" + fi + + dhost=`echo "$dhost_protos" |get_dhost` + protos=`echo "$dhost_protos" |get_dport` + + IFS=',' + for shost in $shosts; do + for proto in $protos; do + $IPTABLES -A DMZ_LAN_FORWARD_CHAIN -s $shost -d $dhost -p $proto -j ACCEPT + done + done + } + unset IFS + done + + # Log everything else + $IPTABLES -A DMZ_LAN_FORWARD_CHAIN -m limit --limit 3/m -j LOG --log-level $LOGLEVEL --log-prefix "Denied DMZ->LAN packet: " + + # Everything else is denied + $IPTABLES -A DMZ_LAN_FORWARD_CHAIN -j DROP +} + + +################################################### +# Setup chain for the INET-to-DMZ forward traffic # +################################################### +setup_inet_dmz_forward_chain() +{ + # Create new chain: + $IPTABLES -N INET_DMZ_FORWARD_CHAIN + + # TCP ports to DENY for certain LAN hosts + ######################################### + for rule in $INET_DMZ_HOST_DENY_TCP; do + echo "$rule" | { + IFS='>' read hosts ports + + IFS=',' + for host in $hosts; do + echo " Denying $host to connect to TCP port(s): $ports" + + for port in $ports; do + if [ "$DMZ_INPUT_DENY_LOG" != "0" ]; then + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -d $host -p tcp --dport $port \ + -m limit --limit 1/h --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "Hostwise INET->DMZ denied: " + fi + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -d $host -p tcp --dport $port -j DROP + done + done + } + unset IFS + done + + # UDP ports to DENY for certain LAN hosts + ######################################### + for rule in $INET_DMZ_HOST_DENY_UDP; do + echo "$rule" | { + IFS='>' read hosts ports + + IFS=',' + for host in $hosts; do + echo " Denying $host to connect to UDP port(s): $ports" + + for port in $ports; do + if [ "$DMZ_INPUT_DENY_LOG" != "0" ]; then + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -d $host -p udp --dport $port \ + -m limit --limit 1/h --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "Hostwise INET->DMZ denied: " + fi + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -d $host -p udp --dport $port -j DROP + done + done + } + unset IFS + done + + # IP protocols to DENY for certain LAN hosts + ############################################ + for rule in $INET_DMZ_HOST_DENY_IP; do + echo "$rule" | { + IFS='>' read hosts protos + + IFS=',' + for host in $hosts; do + echo " Denying $host to connect to IP protocol(s): $protos" + + for proto in $protos; do + if [ "$DMZ_INPUT_DENY_LOG" != "0" ]; then + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -d $host -p $proto \ + -m limit --limit 1/h --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "Hostwise INET->DMZ denied: " + fi + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -d $host -p $proto -j DROP + done + done + } + unset IFS + done + + # TCP ports to OPEN for certain LAN hosts + ######################################### + for rule in $INET_DMZ_HOST_OPEN_TCP; do + echo "$rule" | { + IFS='>' read hosts ports + + IFS=',' + for port in $ports; do + echo " Allowing $hosts (exclusively) for TCP port: $port" + + for host in $hosts; do + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -d $host -p tcp --dport $port -j ACCEPT + done + + if [ "$DMZ_INPUT_DENY_LOG" != "0" ]; then + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p tcp --dport $port -m limit \ + --limit 1/s --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "INET->DMZ denied: " + fi + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p tcp --dport $port -j DROP + done + } + unset IFS + done + + # UDP ports to OPEN for certain LAN hosts + ######################################### + for rule in $INET_DMZ_HOST_OPEN_UDP; do + echo "$rule" | { + IFS='>' read hosts ports + + IFS=',' + for port in $ports; do + echo " Allowing $hosts (exclusively) for UDP port: $port" + + for host in $hosts; do + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -d $host -p udp --dport $port -j ACCEPT + done + + if [ "$DMZ_INPUT_DENY_LOG" != "0" ]; then + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p udp --dport $port -m limit \ + --limit 1/s --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "INET->DMZ denied: " + fi + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p udp --dport $port -j DROP + done + } + unset IFS + done + + # IP protocols to OPEN for certain LAN hosts + ############################################ + for rule in $INET_DMZ_HOST_OPEN_IP; do + echo "$rule" | { + IFS='>' read hosts protos + + IFS=',' + for proto in $protos; do + echo " Allowing $hosts (exclusively) for IP protocol: $proto" + + for host in $hosts; do + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -d $host -p $proto -j ACCEPT + done + + if [ "$DMZ_INPUT_DENY_LOG" != "0" ]; then + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p $proto -m limit \ + --limit 1/s --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "INET->DMZ denied: " + fi + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p $proto -j DROP + done + } + unset IFS + done + + # This rule is for LAN output (FORWARD) TCP blocking + #################################################### + if [ -n "$INET_DMZ_DENY_TCP" ]; then + echo " Denying TCP port(s): $INET_DMZ_DENY_TCP" + for port in $INET_DMZ_DENY_TCP; do + if [ "$DMZ_INPUT_DENY_LOG" != "0" ]; then + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p tcp --dport $port -m limit \ + --limit 1/s --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "INET->DMZ denied: " + fi + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p tcp --dport $port -j DROP + done + fi + + # This rule is for LAN output (FORWARD) UDP blocking + #################################################### + if [ -n "$INET_DMZ_DENY_UDP" ]; then + echo " Denying UDP port(s): $INET_DMZ_DENY_UDP" + for port in $INET_DMZ_DENY_UDP; do + if [ "$DMZ_INPUT_DENY_LOG" != "0" ]; then + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p udp --dport $port -m limit \ + --limit 1/s --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "INET->DMZ denied: " + fi + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p udp --dport $port -j DROP + done + fi + + # This rule is for LAN output (FORWARD) IP blocking + ################################################### + if [ -n "$INET_DMZ_DENY_IP" ]; then + echo " Denying IP protocol(s): $INET_DMZ_DENY_IP" + for proto in $INET_DMZ_DENY_IP; do + if [ "$DMZ_INPUT_DENY_LOG" != "0" ]; then + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p $proto -m limit \ + --limit 1/s --limit-burst 1 -j LOG --log-level $LOGLEVEL --log-prefix "INET->DMZ denied: " + fi + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p $proto -j DROP + done + fi + + # Allow only certain TCP ports to be used from the INET->DMZ? + if [ -n "$INET_DMZ_OPEN_TCP" ]; then + echo " Allowing TCP port(s): $INET_DMZ_OPEN_TCP" + for port in $INET_DMZ_OPEN_TCP; do + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p tcp --dport $port -j ACCEPT + done + fi + + # Allow only certain UDP ports to be used from the INET->DMZ? + if [ -n "$INET_DMZ_OPEN_UDP" ]; then + echo " Allowing UDP port(s): $INET_DMZ_OPEN_UDP" + for port in $INET_DMZ_OPEN_UDP; do + $IPTABLES -A INET_DMZ_FORWARD_CHAIN -p udp --dport $port -j ACCEPT + done + fi + + # Allow only certain IP protocols to be used from the INET->DMZ? + if [ -n "$INET_DMZ_OPEN_IP" ]; then + echo " Allowing IP protocol(s): $INET_DMZ_OPEN_IP" + for proto in $INET_DMZ_OPEN_IP; do + $IPTABLES -A INET_DMZ_F... [truncated message content] |
|
From: <kr...@us...> - 2006-08-14 03:00:28
|
Revision: 251 Author: krisk84 Date: 2006-08-13 20:00:23 -0700 (Sun, 13 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=251&view=rev Log Message: ----------- BASIC openser support Modified Paths: -------------- trunk/package/Config.in Added Paths: ----------- trunk/package/openser/ trunk/package/openser/Config.in trunk/package/openser/openser.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2006-08-14 01:54:52 UTC (rev 250) +++ trunk/package/Config.in 2006-08-14 03:00:23 UTC (rev 251) @@ -116,6 +116,7 @@ source "package/newt/Config.in" source "package/ntp/Config.in" source "package/openntpd/Config.in" +source "package/openser/Config.in" source "package/openssh/Config.in" source "package/openssl/Config.in" source "package/openvpn/Config.in" Added: trunk/package/openser/Config.in =================================================================== --- trunk/package/openser/Config.in (rev 0) +++ trunk/package/openser/Config.in 2006-08-14 03:00:23 UTC (rev 251) @@ -0,0 +1,8 @@ +config BR2_PACKAGE_OPENSER + bool "openser" + default n + select BR2_PACKAGE_OPENSSL + help + OpenSER is a mature and flexible open source SIP server (RFC3261). + + http://www.openser.org Added: trunk/package/openser/openser.mk =================================================================== --- trunk/package/openser/openser.mk (rev 0) +++ trunk/package/openser/openser.mk 2006-08-14 03:00:23 UTC (rev 251) @@ -0,0 +1,62 @@ +############################################################# +# +# openser +# +############################################################## +OPENSER_VERSION := 1.1.0-notls_src +OPENSER_SOURCE := openser-$(OPENSER_VERSION).tar.gz +OPENSER_SITE := http://www.openser.org/pub/openser/latest/src/ +OPENSER_DIR := $(BUILD_DIR)/openser-1.1.0-notls +OPENSER_BINARY := openser +OPENSER_TARGET_BINARY := usr/sbin/openser + +$(DL_DIR)/$(OPENSER_SOURCE): + $(WGET) -P $(DL_DIR) $(OPENSER_SITE)/$(OPENSER_SOURCE) + +$(OPENSER_DIR)/.source: $(DL_DIR)/$(OPENSER_SOURCE) + zcat $(DL_DIR)/$(OPENSER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + # toolchain/patch-kernel.sh $(OPENSER_DIR) package/openser/ openser\*.patch + touch $(OPENSER_DIR)/.source + +$(OPENSER_DIR)/.configured: $(OPENSER_DIR)/.source + touch $(OPENSER_DIR)/.configured + +$(OPENSER_DIR)/$(OPENSER_BINARY): $(OPENSER_DIR)/.configured + $(MAKE1) -C $(OPENSER_DIR) \ + prefix=/usr/ \ + cfg-prefix=/ \ + extra_defs="-DUSE_PTHREAD_MUTEX " \ + CC="$(TARGET_CC)" \ + ARCH="$(ARCH)" \ + CFLAGS="$(TARGET_CFLAGS)" \ + LOCALBASE="$(STAGING_DIR)/usr" \ + all + touch -c $(TARGET_DIR)/$(OPENSER_BINARY) + +$(TARGET_DIR)/$(OPENSER_TARGET_BINARY): $(OPENSER_DIR)/$(OPENSER_BINARY) + install -D -m 0755 $(OPENSER_DIR)/$(OPENSER_BINARY) $(TARGET_DIR)/$(OPENSER_TARGET_BINARY) + install -D -m 0755 $(OPENSER_DIR)/scripts/openserctl $(TARGET_DIR)/usr/sbin/openserctl + install -D -m 0755 $(OPENSER_DIR)/scripts/mysqldb.sh $(TARGET_DIR)/usr/sbin/mysqldb.sh + touch -c $(TARGET_DIR)/$(OPENSER_TARGET_BINARY) + +openser: uclibc openssl $(TARGET_DIR)/$(OPENSER_TARGET_BINARY) + +openser-source: $(DL_DIR)/$(OPENSER_SOURCE) + +openser-clean: + rm -Rf $(TARGET_DIR)/$(OPENSER_TARGET_BINARY) + rm -rf $(TARGET_DIR)/usr/sbin/openserctl + rm -rf $(TARGET_DIR)/usr/sbin/mysqldb.sh + -$(MAKE) -C $(OPENSER_DIR) clean + +openser-dirclean: + rm -rf $(OPENSER_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_OPENSER)),y) +TARGETS+=openser +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-15 15:22:29
|
Revision: 257 Author: krisk84 Date: 2006-08-15 08:22:21 -0700 (Tue, 15 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=257&view=rev Log Message: ----------- initial stunnel support Modified Paths: -------------- trunk/package/Config.in Added Paths: ----------- trunk/package/stunnel/ trunk/package/stunnel/Config.in trunk/package/stunnel/stunnel.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2006-08-15 01:45:38 UTC (rev 256) +++ trunk/package/Config.in 2006-08-15 15:22:21 UTC (rev 257) @@ -146,6 +146,7 @@ source "package/socat/Config.in" source "package/sox/Config.in" source "package/strace/Config.in" +source "package/stunnel/Config.in" source "package/sysfsutils/Config.in" source "package/sysklogd/Config.in" source "package/sysvinit/Config.in" Added: trunk/package/stunnel/Config.in =================================================================== --- trunk/package/stunnel/Config.in (rev 0) +++ trunk/package/stunnel/Config.in 2006-08-15 15:22:21 UTC (rev 257) @@ -0,0 +1,8 @@ +config BR2_PACKAGE_STUNNEL + bool "stunnel" + default n + help + Stunnel is a program that allows you to encrypt + arbitrary TCP connections inside SSL + + http://www.stunnel.org Added: trunk/package/stunnel/stunnel.mk =================================================================== --- trunk/package/stunnel/stunnel.mk (rev 0) +++ trunk/package/stunnel/stunnel.mk 2006-08-15 15:22:21 UTC (rev 257) @@ -0,0 +1,73 @@ +############################################################# +# +# stunnel +# +############################################################# +STUNNEL_VER:=4.15 +STUNNEL_SOURCE:=stunnel-$(STUNNEL_VER).tar.gz +STUNNEL_SITE:=http://www.stunnel.org/download/stunnel/src +STUNNEL_CAT:=zcat +STUNNEL_DIR:=$(BUILD_DIR)/stunnel-$(STUNNEL_VER) + + +$(DL_DIR)/$(STUNNEL_SOURCE): + $(WGET) -P $(DL_DIR) $(STUNNEL_SITE)/$(STUNNEL_SOURCE) + +stunnel-source: $(DL_DIR)/$(STUNNEL_SOURCE) + +$(STUNNEL_DIR)/.unpacked: $(DL_DIR)/$(STUNNEL_SOURCE) + $(STUNNEL_CAT) $(DL_DIR)/$(STUNNEL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(STUNNEL_DIR) package/stunnel stunnel\*.patch + touch $(STUNNEL_DIR)/.unpacked + +$(STUNNEL_DIR)/.configured: $(STUNNEL_DIR)/.unpacked + (cd $(STUNNEL_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ac_cv_file___dev_ptmx_=yes \ + ac_cv_file___dev_ptc_=no \ + ac_cv_file___dev_urandom_=yes \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --libexecdir=/lib \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --with-ssl=$(STAGING_DIR) \ + --disable-libwrap \ + ); + touch $(STUNNEL_DIR)/.configured + +$(STUNNEL_DIR)/src/stunnel: $(STUNNEL_DIR)/.configured + $(MAKE) CC=$(TARGET_CC) -C $(STUNNEL_DIR) + +$(TARGET_DIR)/usr/sbin/stunnel: $(STUNNEL_DIR)/src/stunnel + install -m 0755 -c $(STUNNEL_DIR)/src/stunnel $(TARGET_DIR)/usr/sbin/stunnel + $(STRIP) $(TARGET_DIR)/usr/bin/stunnel > /dev/null 2>&1 + +stunnel: uclibc $(TARGET_DIR)/usr/sbin/stunnel + +stunnel-clean: + rm $(TARGET_DIR)/usr/sbin/stunnel + $(MAKE) -C $(STUNNEL_DIR) clean + +stunnel-dirclean: + rm -rf $(STUNNEL_DIR) + + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_STUNNEL)),y) +TARGETS+=stunnel +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-19 02:17:49
|
Revision: 282 Author: krisk84 Date: 2006-08-18 19:17:40 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=282&view=rev Log Message: ----------- via device support Modified Paths: -------------- trunk/package/Config.in trunk/target/device/via/Makefile.in Added Paths: ----------- trunk/target/device/via/busybox.config trunk/target/device/via/kernel-patches/ trunk/target/device/via/linux.config trunk/target/device/via/linux.mk trunk/target/device/via/target_skeleton/linux-vt1211.patch Removed Paths: ------------- trunk/package/linux/ trunk/target/device/via/linux-via-wlan-2.6.16.12.config Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2006-08-19 02:11:33 UTC (rev 281) +++ trunk/package/Config.in 2006-08-19 02:17:40 UTC (rev 282) @@ -3,7 +3,7 @@ comment "The default minimal system" source "package/busybox/Config.in" -source "package/linux/Config.in" +# source "package/linux/Config.in" comment "The minimum needed to build a uClibc development system" source "package/bash/Config.in" Modified: trunk/target/device/via/Makefile.in =================================================================== --- trunk/target/device/via/Makefile.in 2006-08-19 02:11:33 UTC (rev 281) +++ trunk/target/device/via/Makefile.in 2006-08-19 02:17:40 UTC (rev 282) @@ -2,9 +2,10 @@ VIA_PATH=target/device/via ifeq ($(strip $(BR2_TARGET_VIA)),y) -BR2_PACKAGE_LINUX_BASECONFIG=$(VIA_PATH)/linux-via-wlan +BR2_PACKAGE_LINUX_CONFIG=$(VIA_PATH)/linux.config UCLIBC_CONFIG_FILE=$(VIA_PATH)/uClibc.config TARGET_SKEL2_DIR=$(VIA_PATH)/target_skeleton +BR2_PACKAGE_BUSYBOX_CONFIG:=$(VIA_PATH)/busybox.config ifeq ($(strip $(BR2_PACKAGE_LINUX)),y) TARGETS+=linux Copied: trunk/target/device/via/busybox.config (from rev 281, trunk/target/device/net4801/busybox.config) =================================================================== --- trunk/target/device/via/busybox.config (rev 0) +++ trunk/target/device/via/busybox.config 2006-08-19 02:17:40 UTC (rev 282) @@ -0,0 +1,593 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# General Configuration +# +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +CONFIG_FEATURE_BUFFERS_GO_IN_BSS=y +CONFIG_FEATURE_VERBOSE_USAGE=y +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_LOCALE_SUPPORT is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_FEATURE_DEVPTS is not set +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set + +# +# Build Options +# +# CONFIG_STATIC is not set +CONFIG_LFS=y +# USING_CROSS_COMPILER is not set +CROSS_COMPILER_PREFIX="" +EXTRA_CFLAGS_OPTIONS="" +CONFIG_FEATURE_SUSv2=y +CONFIG_FEATURE_SUSv2_OBSOLETE=y + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Archival Utilities +# +# CONFIG_AR is not set +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +# CONFIG_CPIO is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_FROM is not set +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +CONFIG_CMP=y +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y + +# +# date (forced enabled for use with watch) +# +CONFIG_FEATURE_DATE_ISOFMT=y +CONFIG_DD=y +CONFIG_DF=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_EXPR=y +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +# CONFIG_FEATURE_FANCY_HEAD is not set +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_INSTALL=y +# CONFIG_LENGTH is not set +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +# CONFIG_MKFIFO is not set +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_NICE=y +CONFIG_NOHUP=y +# CONFIG_OD is not set +# CONFIG_PRINTENV is not set +# CONFIG_PRINTF is not set +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SLEEP=y +# CONFIG_FEATURE_FANCY_SLEEP is not set +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_STAT=y +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TEST=y + +# +# test (forced enabled for use with shell) +# +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +CONFIG_TR=y +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WATCH=y +CONFIG_WC=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls and more +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +# CONFIG_DUMPKMAP is not set +# CONFIG_LOADFONT is not set +# CONFIG_LOADKMAP is not set +CONFIG_OPENVT=y +CONFIG_RESET=y +# CONFIG_SETCONSOLE is not set +# CONFIG_SETKEYCODES is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_READLINK=y +# CONFIG_FEATURE_READLINK_FOLLOW is not set +CONFIG_RUN_PARTS=y +# CONFIG_START_STOP_DAEMON is not set +CONFIG_WHICH=y + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +CONFIG_E2FSCK=y +CONFIG_FSCK=y +CONFIG_LSATTR=y +CONFIG_MKE2FS=y +CONFIG_TUNE2FS=y +CONFIG_E2LABEL=y +CONFIG_FINDFS=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +# CONFIG_FEATURE_FIND_NEWER is not set +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +CONFIG_FEATURE_INITRD=y +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +CONFIG_HALT=y +# CONFIG_MESG is not set +CONFIG_POWEROFF=y +CONFIG_REBOOT=y + +# +# Login/Password Management Utilities +# +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +CONFIG_ADDGROUP=y +CONFIG_DELGROUP=y +CONFIG_ADDUSER=y +CONFIG_DELUSER=y +CONFIG_GETTY=y +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +CONFIG_LOGIN=y +# CONFIG_FEATURE_SECURETTY is not set +CONFIG_PASSWD=y +CONFIG_SU=y +CONFIG_SULOGIN=y +CONFIG_VLOCK=y + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +CONFIG_BBCONFIG=y +CONFIG_CROND=y +CONFIG_FEATURE_CROND_CALL_SENDMAIL=y +CONFIG_CRONTAB=y +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_EJECT is not set +CONFIG_LAST=y +CONFIG_LESS=y +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +# CONFIG_MOUNTPOINT is not set +CONFIG_MT=y +# BB_APPLET_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +CONFIG_TIME=y +CONFIG_WATCHDOG=y + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Networking Utilities +# +# CONFIG_FEATURE_IPV6 is not set +CONFIG_ARPING=y +CONFIG_ETHER_WAKE=y +CONFIG_FAKEIDENTD=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +CONFIG_INETD=y +# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +# CONFIG_IP is not set +# CONFIG_FEATURE_IP_ADDRESS is not set +# CONFIG_FEATURE_IP_LINK is not set +# CONFIG_FEATURE_IP_ROUTE is not set +# CONFIG_FEATURE_IP_TUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_NAMEIF is not set +CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING6 is not set +CONFIG_ROUTE=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set +CONFIG_TELNETD=y +# CONFIG_FEATURE_TELNETD_INETD is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_DEBUG=y +CONFIG_TRACEROUTE=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +# CONFIG_FEATURE_WGET_IP6_LITERAL is not set + +# +# udhcp Server/Client +# +# CONFIG_UDHCPD is not set +CONFIG_UDHCPC=y +# CONFIG_DUMPLEASES is not set +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_ZCIP is not set + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_UPTIME=y + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +CONFIG_ASH_MATH_SUPPORT_64=y +# CONFIG_ASH_GETOPTS is not set +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_BUILTIN_ECHO is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +# CONFIG_ASH_EXPAND_PRMT is not set +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +CONFIG_FEATURE_COMMAND_EDITING=y +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set +CONFIG_FEATURE_COMMAND_HISTORY=100 +CONFIG_FEATURE_COMMAND_SAVEHISTORY=y +CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y +CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION=y +CONFIG_FEATURE_SH_FANCY_PROMPT=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_KLOGD=y +CONFIG_LOGGER=y + +# +# Linux System Utilities +# +CONFIG_DMESG=y +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +CONFIG_GETOPT=y +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +CONFIG_MKSWAP=y +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_PIVOT_ROOT=y +# CONFIG_SWITCH_ROOT is not set +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +CONFIG_SWAPONOFF=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_UMOUNT=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set Deleted: trunk/target/device/via/linux-via-wlan-2.6.16.12.config =================================================================== --- trunk/target/device/via/linux-via-wlan-2.6.16.12.config 2006-08-19 02:11:33 UTC (rev 281) +++ trunk/target/device/via/linux-via-wlan-2.6.16.12.config 2006-08-19 02:17:40 UTC (rev 282) @@ -1,1727 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.16.12 -# Tue Aug 15 19:36:25 2006 -# -CONFIG_X86_32=y -CONFIG_SEMAPHORE_SLEEPERS=y -CONFIG_X86=y -CONFIG_MMU=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_DMI=y - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y -CONFIG_LOCK_KERNEL=y -CONFIG_INIT_ENV_ARG_LIMIT=32 - -# -# General setup -# -CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -# CONFIG_POSIX_MQUEUE is not set -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set -CONFIG_SYSCTL=y -# CONFIG_AUDIT is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -# CONFIG_CPUSETS is not set -CONFIG_INITRAMFS_SOURCE="" -CONFIG_UID16=y -CONFIG_VM86=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_EMBEDDED is not set -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_EXTRA_PASS is not set -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SHMEM=y -CONFIG_CC_ALIGN_FUNCTIONS=0 -CONFIG_CC_ALIGN_LABELS=0 -CONFIG_CC_ALIGN_LOOPS=0 -CONFIG_CC_ALIGN_JUMPS=0 -CONFIG_SLAB=y -# CONFIG_TINY_SHMEM is not set -CONFIG_BASE_SMALL=0 -# CONFIG_SLOB is not set - -# -# Loadable module support -# -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_OBSOLETE_MODPARM=y -CONFIG_MODVERSIONS=y -# CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_KMOD=y -CONFIG_STOP_MACHINE=y - -# -# Block layer -# -# CONFIG_LBD is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set -# CONFIG_IOSCHED_DEADLINE is not set -CONFIG_IOSCHED_CFQ=y -# CONFIG_DEFAULT_AS is not set -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" - -# -# Processor type and features -# -CONFIG_X86_PC=y -# CONFIG_X86_ELAN is not set -# CONFIG_X86_VOYAGER is not set -# CONFIG_X86_NUMAQ is not set -# CONFIG_X86_SUMMIT is not set -# CONFIG_X86_BIGSMP is not set -# CONFIG_X86_VISWS is not set -# CONFIG_X86_GENERICARCH is not set -# CONFIG_X86_ES7000 is not set -# CONFIG_M386 is not set -# CONFIG_M486 is not set -# CONFIG_M586 is not set -# CONFIG_M586TSC is not set -CONFIG_M586MMX=y -# CONFIG_M686 is not set -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set -# CONFIG_MK8 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP2 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -CONFIG_X86_GENERIC=y -CONFIG_X86_CMPXCHG=y -CONFIG_X86_XADD=y -CONFIG_X86_L1_CACHE_SHIFT=7 -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_X86_PPRO_FENCE=y -CONFIG_X86_F00F_BUG=y -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_ALIGNMENT_16=y -CONFIG_X86_GOOD_APIC=y -CONFIG_X86_INTEL_USERCOPY=y -CONFIG_X86_TSC=y -CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y -CONFIG_SMP=y -CONFIG_NR_CPUS=4 -CONFIG_SCHED_SMT=y -# CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y -CONFIG_PREEMPT_BKL=y -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y -CONFIG_X86_MCE=y -# CONFIG_X86_MCE_NONFATAL is not set -# CONFIG_X86_MCE_P4THERMAL is not set -# CONFIG_TOSHIBA is not set -# CONFIG_I8K is not set -CONFIG_X86_REBOOTFIXUPS=y -# CONFIG_MICROCODE is not set -# CONFIG_X86_MSR is not set -# CONFIG_X86_CPUID is not set - -# -# Firmware Drivers -# -# CONFIG_EDD is not set -# CONFIG_DELL_RBU is not set -# CONFIG_DCDBAS is not set -# CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set -CONFIG_VMSPLIT_3G=y -# CONFIG_VMSPLIT_3G_OPT is not set -# CONFIG_VMSPLIT_2G is not set -# CONFIG_VMSPLIT_1G is not set -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_HIGHMEM=y -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_SPARSEMEM_STATIC=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_HIGHPTE is not set -# CONFIG_MATH_EMULATION is not set -CONFIG_MTRR=y -# CONFIG_EFI is not set -CONFIG_IRQBALANCE=y -# CONFIG_REGPARM is not set -CONFIG_SECCOMP=y -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -CONFIG_HZ_1000=y -CONFIG_HZ=1000 -CONFIG_KEXEC=y -# CONFIG_CRASH_DUMP is not set -CONFIG_PHYSICAL_START=0x100000 -# CONFIG_HOTPLUG_CPU is not set -CONFIG_DOUBLEFAULT=y - -# -# Power management options (ACPI, APM) -# -CONFIG_PM=y -# CONFIG_PM_LEGACY is not set -# CONFIG_PM_DEBUG is not set - -# -# ACPI (Advanced Configuration and Power Interface) Support -# -CONFIG_ACPI=y -# CONFIG_ACPI_AC is not set -# CONFIG_ACPI_BATTERY is not set -CONFIG_ACPI_BUTTON=y -# CONFIG_ACPI_VIDEO is not set -# CONFIG_ACPI_HOTKEY is not set -# CONFIG_ACPI_FAN is not set -# CONFIG_ACPI_PROCESSOR is not set -# CONFIG_ACPI_ASUS is not set -# CONFIG_ACPI_IBM is not set -# CONFIG_ACPI_TOSHIBA is not set -CONFIG_ACPI_BLACKLIST_YEAR=0 -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_EC=y -CONFIG_ACPI_POWER=y -CONFIG_ACPI_SYSTEM=y -CONFIG_X86_PM_TIMER=y -# CONFIG_ACPI_CONTAINER is not set - -# -# APM (Advanced Power Management) BIOS Support -# -# CONFIG_APM is not set - -# -# CPU Frequency scaling -# -# CONFIG_CPU_FREQ is not set - -# -# Bus options (PCI, PCMCIA, EISA, MCA, ISA) -# -CONFIG_PCI=y -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_MMCONFIG=y -CONFIG_PCIEPORTBUS=y -# CONFIG_PCI_MSI is not set -CONFIG_PCI_LEGACY_PROC=y -CONFIG_ISA_DMA_API=y -CONFIG_ISA=y -# CONFIG_EISA is not set -# CONFIG_MCA is not set -# CONFIG_SCx200 is not set - -# -# PCCARD (PCMCIA/CardBus) support -# -# CONFIG_PCCARD is not set - -# -# PCI Hotplug Support -# -# CONFIG_HOTPLUG_PCI is not set - -# -# Executable file formats -# -CONFIG_BINFMT_ELF=y -# CONFIG_BINFMT_AOUT is not set -CONFIG_BINFMT_MISC=m - -# -# Networking -# -CONFIG_NET=y - -# -# Networking options -# -# CONFIG_NETDEBUG is not set -CONFIG_PACKET=y -# CONFIG_PACKET_MMAP is not set -CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=m -CONFIG_NET_KEY=m -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_ASK_IP_FIB_HASH=y -# CONFIG_IP_FIB_TRIE is not set -CONFIG_IP_FIB_HASH=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_FWMARK=y -# CONFIG_IP_ROUTE_MULTIPATH is not set -# CONFIG_IP_ROUTE_VERBOSE is not set -# CONFIG_IP_PNP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE=m -# CONFIG_NET_IPGRE_BROADCAST is not set -# CONFIG_IP_MROUTE is not set -# CONFIG_ARPD is not set -CONFIG_SYN_COOKIES=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_DIAG=m -CONFIG_INET_TCP_DIAG=m -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y - -# -# IP: Virtual Server Configuration -# -# CONFIG_IP_VS is not set -# CONFIG_IPV6 is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -# CONFIG_BRIDGE_NETFILTER is not set - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NETFILTER_XTABLES=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m - -# -# IP: Netfilter Configuration -# -CONFIG_IP_NF_CONNTRACK=m -CONFIG_IP_NF_CT_ACCT=y -CONFIG_IP_NF_CONNTRACK_MARK=y -CONFIG_IP_NF_CONNTRACK_EVENTS=y -CONFIG_IP_NF_CONNTRACK_NETLINK=m -# CONFIG_IP_NF_CT_PROTO_SCTP is not set -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -# CONFIG_IP_NF_NETBIOS_NS is not set -CONFIG_IP_NF_TFTP=m -CONFIG_IP_NF_AMANDA=m -CONFIG_IP_NF_PPTP=m -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_IPRANGE=m -CONFIG_IP_NF_MATCH_MULTIPORT=m -CONFIG_IP_NF_MATCH_TOS=m -CONFIG_IP_NF_MATCH_RECENT=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_DSCP=m -CONFIG_IP_NF_MATCH_AH_ESP=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_MATCH_OWNER=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_HASHLIMIT=m -CONFIG_IP_NF_MATCH_POLICY=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_TARGET_TCPMSS=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_SAME=m -CONFIG_IP_NF_NAT_SNMP_BASIC=m -CONFIG_IP_NF_NAT_IRC=m -CONFIG_IP_NF_NAT_FTP=m -CONFIG_IP_NF_NAT_TFTP=m -CONFIG_IP_NF_NAT_AMANDA=m -CONFIG_IP_NF_NAT_PPTP=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_TOS=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_DSCP=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# Bridge: Netfilter Configuration -# -# CONFIG_BRIDGE_NF_EBTABLES is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_SCTP is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# -# CONFIG_TIPC is not set -# CONFIG_ATM is not set -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m -# CONFIG_DECNET is not set -# CONFIG_LLC2 is not set -# CONFIG_IPX is not set -# CONFIG_ATALK is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_NET_DIVERT is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set - -# -# QoS and/or fair queueing -# -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_CLK_JIFFIES=y -# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set -# CONFIG_NET_SCH_CLK_CPU is not set - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_INGRESS=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -CONFIG_CLS_U32_PERF=y -# CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -# CONFIG_NET_CLS_RSVP6 is not set -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_STACK=32 -CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_U32=m -CONFIG_NET_EMATCH_META=m -CONFIG_NET_EMATCH_TEXT=m -# CONFIG_NET_CLS_ACT is not set -CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set -CONFIG_NET_ESTIMATOR=y - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -# CONFIG_HAMRADIO is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set -CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m -CONFIG_IEEE80211_CRYPT_CCMP=m -CONFIG_IEEE80211_CRYPT_TKIP=m - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=m - -# -# Connector - unified userspace <-> kernelspace linker -# -# CONFIG_CONNECTOR is not set - -# -# Memory Technology Devices (MTD) -# -# CONFIG_MTD is not set - -# -# Parallel port support -# -# CONFIG_PARPORT is not set - -# -# Plug and Play support -# -CONFIG_PNP=y -# CONFIG_PNP_DEBUG is not set - -# -# Protocols -# -CONFIG_ISAPNP=y -CONFIG_PNPBIOS=y -CONFIG_PNPBIOS_PROC_FS=y -CONFIG_PNPACPI=y - -# -# Block devices -# -CONFIG_BLK_DEV_FD=y -# CONFIG_BLK_DEV_XD is not set -# CONFIG_BLK_CPQ_DA is not set -# CONFIG_BLK_CPQ_CISS_DA is not set -# CONFIG_BLK_DEV_DAC960 is not set -# CONFIG_BLK_DEV_UMEM is not set -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_CRYPTOLOOP=m -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=4096 -CONFIG_BLK_DEV_INITRD=y -# CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set - -# -# ATA/ATAPI/MFM/RLL support -# -CONFIG_IDE=y -CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -# CONFIG_BLK_DEV_HD_IDE is not set -CONFIG_BLK_DEV_IDEDISK=y -CONFIG_IDEDISK_MULTI_MODE=y -CONFIG_BLK_DEV_IDECD=y -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_BLK_DEV_IDEFLOPPY is not set -# CONFIG_BLK_DEV_IDESCSI is not set -# CONFIG_IDE_TASK_IOCTL is not set - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=y -# CONFIG_BLK_DEV_CMD640 is not set -# CONFIG_BLK_DEV_IDEPNP is not set -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_IDEPCI_SHARE_IRQ=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=y -# CONFIG_BLK_DEV_OPTI621 is not set -# CONFIG_BLK_DEV_RZ1000 is not set -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -CONFIG_IDEDMA_PCI_AUTO=y -# CONFIG_IDEDMA_ONLYDISK is not set -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -CONFIG_BLK_DEV_AMD74XX=y -# CONFIG_BLK_DEV_ATIIXP is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_CY82C693 is not set -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_CS5530 is not set -# CONFIG_BLK_DEV_CS5535 is not set -# CONFIG_BLK_DEV_HPT34X is not set -# CONFIG_BLK_DEV_HPT366 is not set -# CONFIG_BLK_DEV_SC1200 is not set -CONFIG_BLK_DEV_PIIX=y -# CONFIG_BLK_DEV_IT821X is not set -# CONFIG_BLK_DEV_NS87415 is not set -CONFIG_BLK_DEV_PDC202XX_OLD=y -# CONFIG_PDC202XX_BURST is not set -CONFIG_BLK_DEV_PDC202XX_NEW=y -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SIS5513 is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -CONFIG_BLK_DEV_VIA82CXXX=y -# CONFIG_IDE_ARM is not set -# CONFIG_IDE_CHIPSETS is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_IVB is not set -CONFIG_IDEDMA_AUTO=y -# CONFIG_BLK_DEV_HD is not set - -# -# SCSI device support -# -# CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=y -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -# CONFIG_CHR_DEV_ST is not set -# CONFIG_CHR_DEV_OSST is not set -# CONFIG_BLK_DEV_SR is not set -# CONFIG_CHR_DEV_SG is not set -# CONFIG_CHR_DEV_SCH is not set - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -# CONFIG_SCSI_LOGGING is not set - -# -# SCSI Transport Attributes -# -# CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_SAS_ATTRS is not set - -# -# SCSI low-level drivers -# -# CONFIG_ISCSI_TCP is not set -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -# CONFIG_SCSI_3W_9XXX is not set -# CONFIG_SCSI_7000FASST is not set -# CONFIG_SCSI_ACARD is not set -# CONFIG_SCSI_AHA152X is not set -# CONFIG_SCSI_AHA1542 is not set -# CONFIG_SCSI_AACRAID is not set -# CONFIG_SCSI_AIC7XXX is not set -# CONFIG_SCSI_AIC7XXX_OLD is not set -# CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_DPT_I2O is not set -# CONFIG_SCSI_IN2000 is not set -# CONFIG_MEGARAID_NEWGEN is not set -# CONFIG_MEGARAID_LEGACY is not set -# CONFIG_MEGARAID_SAS is not set -CONFIG_SCSI_SATA=y -# CONFIG_SCSI_SATA_AHCI is not set -CONFIG_SCSI_SATA_SVW=y -CONFIG_SCSI_ATA_PIIX=y -# CONFIG_SCSI_SATA_MV is not set -CONFIG_SCSI_SATA_NV=y -# CONFIG_SCSI_PDC_ADMA is not set -# CONFIG_SCSI_SATA_QSTOR is not set -CONFIG_SCSI_SATA_PROMISE=y -CONFIG_SCSI_SATA_SX4=y -# CONFIG_SCSI_SATA_SIL is not set -# CONFIG_SCSI_SATA_SIL24 is not set -CONFIG_SCSI_SATA_SIS=y -# CONFIG_SCSI_SATA_ULI is not set -CONFIG_SCSI_SATA_VIA=y -# CONFIG_SCSI_SATA_VITESSE is not set -CONFIG_SCSI_SATA_INTEL_COMBINED=y -# CONFIG_SCSI_BUSLOGIC is not set -# CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_DTC3280 is not set -# CONFIG_SCSI_EATA is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set -# CONFIG_SCSI_GDTH is not set -# CONFIG_SCSI_GENERIC_NCR5380 is not set -# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set -# CONFIG_SCSI_IPS is not set -# CONFIG_SCSI_INITIO is not set -# CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_NCR53C406A is not set -# CONFIG_SCSI_SYM53C8XX_2 is not set -# CONFIG_SCSI_IPR is not set -# CONFIG_SCSI_PAS16 is not set -# CONFIG_SCSI_PSI240I is not set -# CONFIG_SCSI_QLOGIC_FAS is not set -# CONFIG_SCSI_QLOGIC_FC is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_QLA_FC is not set -# CONFIG_SCSI_LPFC is not set -# CONFIG_SCSI_SYM53C416 is not set -# CONFIG_SCSI_DC395x is not set -# CONFIG_SCSI_DC390T is not set -# CONFIG_SCSI_T128 is not set -# CONFIG_SCSI_U14_34F is not set -# CONFIG_SCSI_ULTRASTOR is not set -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_DEBUG is not set - -# -# Old CD-ROM drivers (not SCSI, not IDE) -# -# CONFIG_CD_NO_IDESCSI is not set - -# -# Multi-device support (RAID and LVM) -# -# CONFIG_MD is not set - -# -# Fusion MPT device support -# -# CONFIG_FUSION is not set -# CONFIG_FUSION_SPI is not set -# CONFIG_FUSION_FC is not set -# CONFIG_FUSION_SAS is not set - -# -# IEEE 1394 (FireWire) support -# -# CONFIG_IEEE1394 is not set - -# -# I2O device support -# -# CONFIG_I2O is not set - -# -# Network device support -# -CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set -CONFIG_BONDING=m -# CONFIG_EQUALIZER is not set -CONFIG_TUN=m -# CONFIG_NET_SB1000 is not set - -# -# ARCnet devices -# -# CONFIG_ARCNET is not set - -# -# PHY device support -# -# CONFIG_PHYLIB is not set - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y -CONFIG_MII=m -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNGEM is not set -# CONFIG_CASSINI is not set -CONFIG_NET_VENDOR_3COM=y -# CONFIG_EL1 is not set -# CONFIG_EL2 is not set -# CONFIG_ELPLUS is not set -# CONFIG_EL16 is not set -# CONFIG_EL3 is not set -# CONFIG_3C515 is not set -CONFIG_VORTEX=m -CONFIG_TYPHOON=m -CONFIG_LANCE=m -# CONFIG_NET_VENDOR_SMC is not set -# CONFIG_NET_VENDOR_RACAL is not set - -# -# Tulip family network device support -# -CONFIG_NET_TULIP=y -# CONFIG_DE2104X is not set -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -# CONFIG_TULIP_MMIO is not set -# CONFIG_TULIP_NAPI is not set -# CONFIG_DE4X5 is not set -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -# CONFIG_AT1700 is not set -# CONFIG_DEPCA is not set -# CONFIG_HP100 is not set -CONFIG_NET_ISA=y -# CONFIG_E2100 is not set -# CONFIG_EWRK3 is not set -# CONFIG_EEXPRESS is not set -# CONFIG_EEXPRESS_PRO is not set -# CONFIG_HPLAN_PLUS is not set -# CONFIG_HPLAN is not set -# CONFIG_LP486E is not set -# CONFIG_ETH16I is not set -CONFIG_NE2000=m -# CONFIG_ZNET is not set -# CONFIG_SEEQ8005 is not set -CONFIG_NET_PCI=y -CONFIG_PCNET32=m -CONFIG_AMD8111_ETH=m -# CONFIG_AMD8111E_NAPI is not set -CONFIG_ADAPTEC_STARFIRE=m -# CONFIG_ADAPTEC_STARFIRE_NAPI is not set -# CONFIG_AC3200 is not set -# CONFIG_APRICOT is not set -CONFIG_B44=m -CONFIG_FORCEDETH=m -# CONFIG_CS89x0 is not set -CONFIG_DGRS=m -CONFIG_EEPRO100=m -CONFIG_E100=m -CONFIG_FEALNX=m -CONFIG_NATSEMI=m -CONFIG_NE2K_PCI=m -CONFIG_8139CP=m -CONFIG_8139TOO=m -# CONFIG_8139TOO_PIO is not set -CONFIG_8139TOO_TUNE_TWISTER=y -CONFIG_8139TOO_8129=y -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_SIS900=m -CONFIG_EPIC100=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_TLAN=m -CONFIG_VIA_RHINE=m -# CONFIG_VIA_RHINE_MMIO is not set - -# -# Ethernet (1000 Mbit) -# -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_DL2K=m -CONFIG_E1000=m -# CONFIG_E1000_NAPI is not set -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set -CONFIG_R8169_VLAN=y -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_SK98LIN=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m - -# -# Ethernet (10000 Mbit) -# -# CONFIG_CHELSIO_T1 is not set -# CONFIG_IXGB is not set -# CONFIG_S2IO is not set - -# -# Token Ring devices -# -# CONFIG_TR is not set - -# -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y - -# -# Obsolete Wireless cards support (pre-802.11) -# -# CONFIG_STRIP is not set -# CONFIG_ARLAN is not set -# CONFIG_WAVELAN is not set - -# -# Wireless 802.11b ISA/PCI cards support -# -CONFIG_IPW2100=m -CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -# CONFIG_IPW2200_DEBUG is not set -CONFIG_AIRO=m -CONFIG_HERMES=m -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m - -# -# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support -# -CONFIG_PRISM54=m -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_NET_WIRELESS=y - -# -# Wan interfaces -# -CONFIG_WAN=y -# CONFIG_HOSTESS_SV11 is not set -# CONFIG_COSA is not set -# CONFIG_DSCC4 is not set -CONFIG_LANMEDIA=m -# CONFIG_SEALEVEL_4021 is not set -# CONFIG_SYNCLINK_SYNCPPP is not set -CONFIG_HDLC=m -CONFIG_HDLC_RAW=y -CONFIG_HDLC_RAW_ETH=y -CONFIG_HDLC_CISCO=y -CONFIG_HDLC_FR=y -CONFIG_HDLC_PPP=y - -# -# X.25/LAPB support is disabled -# -# CONFIG_PCI200SYN is not set -# CONFIG_WANXL is not set -# CONFIG_PC300 is not set -# CONFIG_N2 is not set -# CONFIG_C101 is not set -# CONFIG_FARSYNC is not set -CONFIG_DLCI=m -CONFIG_DLCI_COUNT=24 -CONFIG_DLCI_MAX=8 -# CONFIG_SDLA is not set -# CONFIG_SBNI is not set -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -# CONFIG_SLIP is not set -# CONFIG_NET_FC is not set -# CONFIG_SHAPER is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set - -# -# ISDN subsystem -# -CONFIG_ISDN=m - -# -# Old ISDN4Linux -# -# CONFIG_ISDN_I4L is not set - -# -# CAPI subsystem -# -CONFIG_ISDN_CAPI=m -# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_CAPI_CAPI20=m -CONFIG_ISDN_CAPI_CAPIFS_BOOL=y -CONFIG_ISDN_CAPI_CAPIFS=m - -# -# CAPI hardware drivers -# - -# -# Active AVM cards -# -# CONFIG_CAPI_AVM is not set - -# -# Active Eicon DIVA Server cards -# -# CONFIG_CAPI_EICON is not set - -# -# Telephony Support -# -# CONFIG_PHONE is not set - -# -# Input device support -# -CONFIG_INPUT=y - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_TSDEV is not set -# CONFIG_INPUT_EVDEV is not set -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y -# CONFIG_SERIO_SERPORT is not set -# CONFIG_SERIO_CT82C710 is not set -# CONFIG_SERIO_PCIPS2 is not set -CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set -# CONFIG_GAMEPORT is not set - -# -# Character devices -# -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y -# CONFIG_SERIAL_NONSTANDARD is not set - -# -# Serial drivers -# -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_SERIAL_8250_ACPI is not set -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -# CONFIG_SERIAL_8250_DETECT_IRQ is not set -# CONFIG_SERIAL_8250_RSA is not set -# CONFIG_SERIAL_8250_FOURPORT is not set -# CONFIG_SERIAL_8250_ACCENT is not set -# CONFIG_SERIAL_8250_BOCA is not set -# CONFIG_SERIAL_8250_HUB6 is not set - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -# CONFIG_SERIAL_JSM is not set -CONFIG_UNIX98_PTYS=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 - -# -# IPMI -# -# CONFIG_IPMI_HANDLER is not set - -# -# Watchdog Cards -# -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -# CONFIG_ACQUIRE_WDT is not set -# CONFIG_ADVANTECH_WDT is not set -# CONFIG_ALIM1535_WDT is not set -# CONFIG_ALIM7101_WDT is not set -# CONFIG_SC520_WDT is not set -# CONFIG_EUROTECH_WDT is not set -# CONFIG_IB700_WDT is not set -# CONFIG_IBMASR is not set -# CONFIG_WAFER_WDT is not set -# CONFIG_I6300ESB_WDT is not set -CONFIG_I8XX_TCO=m -# CONFIG_SC1200_WDT is not set -# CONFIG_60XX_WDT is not set -# CONFIG_SBC8360_WDT is not set -# CONFIG_CPU5_WDT is not set -# CONFIG_W83627HF_WDT is not set -# CONFIG_W83877F_WDT is not set -# CONFIG_W83977F_WDT is not set -# CONFIG_MACHZ_WDT is not set -# CONFIG_SBC_EPX_C3_WATCHDOG is not set - -# -# ISA-based Watchdog Cards -# -# CONFIG_PCWATCHDOG is not set -# CONFIG_MIXCOMWD is not set -# CONFIG_WDT is not set - -# -# PCI-based Watchdog Cards -# -# CONFIG_PCIPCWATCHDOG is not set -# CONFIG_WDTPCI is not set - -# -# USB-based Watchdog Cards -# -# CONFIG_USBPCWATCHDOG is not set -CONFIG_HW_RANDOM=m -# CONFIG_NVRAM is not set -CONFIG_RTC=y -# CONFIG_DTLK is not set -# CONFIG_R3964 is not set -# CONFIG_APPLICOM is not set -# CONFIG_SONYPI is not set - -# -# Ftape, the floppy tape device driver -# -# CONFIG_AGP is not set -# CONFIG_DRM is not set -# CONFIG_MWAVE is not set -# CONFIG_CS5535_GPIO is not set -# CONFIG_RAW_DRIVER is not set -# CONFIG_HPET is not set -# CONFIG_HANGCHECK_TIMER is not set - -# -# TPM devices -# -# CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set - -# -# I2C support -# -CONFIG_I2C=m -# CONFIG_I2C_CHARDEV is not set - -# -# I2C Algorithms -# -# CONFIG_I2C_ALGOBIT is not set -# CONFIG_I2C_ALGOPCF is not set -# CONFIG_I2C_ALGOPCA is not set - -# -# I2C Hardware Bus support -# -# CONFIG_I2C_ALI1535 is not set -# CONFIG_I2C_ALI1563 is not set -# CONFIG_I2C_ALI15X3 is not set -# CONFIG_I2C_AMD756 is not set -# CONFIG_I2C_AMD8111 is not set -# CONFIG_I2C_I801 is not set -# CONFIG_I2C_I810 is not set -# CONFIG_I2C_PIIX4 is not set -CONFIG_I2C_ISA=m -# CONFIG_I2C_NFORCE2 is not set -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_PROSAVAGE is not set -# CONFIG_I2C_SAVAGE4 is not set -# CONFIG_SCx200_ACB is not set -# CONFIG_I2C_SIS5595 is not set -# CONFIG_I2C_SIS630 is not set -# CONFIG_I2C_SIS96X is not set -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_VIA is not set -# CONFIG_I2C_VIAPRO is not set -# CONFIG_I2C_VOODOO3 is not set -# CONFIG_I2C_PCA_ISA is not set - -# -# Miscellaneous I2C Chip support -# -# CONFIG_SENSORS_DS1337 is not set -# CONFIG_SENSORS_DS1374 is not set -# CONFIG_SENSORS_EEPROM is not set -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_RTC8564 is not set -# CONFIG_SENSORS_MAX6875 is not set -# CONFIG_RTC_X1205_I2C is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set - -# -# SPI support -# -# CONFIG_SPI is not set -# CONFIG_SPI_MASTER is not set - -# -# Dallas's 1-wire bus -# -# CONFIG_W1 is not set - -# -# Hardware Monitoring support -# -CONFIG_HWMON=m -CONFIG_HWMON_VID=m -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SIS5595 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_VIA686A is not set -CONFIG_SENSORS_VT1211=m -# CONFIG_SENSORS_VT8231 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_SENSORS_HDAPS is not set -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Misc devices -# -# CONFIG_IBM_ASM is not set - -# -# Multimedia Capabilities Port drivers -# - -# -# Multimedia devices -# -# CONFIG_VIDEO_DEV is not set - -# -# Digital Video Broadcasting Devices -# -# CONFIG_DVB is not set - -# -# Graphics support -# -# CONFIG_FB is not set -# CONFIG_VIDEO_SELECT is not set - -# -# Console display driver support -# -CONFIG_VGA_CONSOLE=y -# CONFIG_MDA_CONSOLE is not set -CONFIG_DUMMY_CONSOLE=y - -# -# Sound -# -# CONFIG_SOUND is not set - -# -# USB support -# -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB=y -# CONFIG_USB_DEBUG is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_SUSPEND is not set -# CONFIG_USB_OTG is not set - -# -# USB Host Controller Drivers -# -CONFIG_USB_EHCI_HCD=y -# CONFIG_USB_EHCI_SPLIT_ISO is not set -# CONFIG_USB_EHCI_ROOT_HUB_TT is not set -# CONFIG_USB_ISP116X_HCD is not set -CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_BIG_ENDIAN is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=y -# CONFIG_USB_SL811_HCD is not set - -# -# USB Device Class drivers -# -# CONFIG_USB_ACM is not set -# CONFIG_USB_PRINTER is not set - -# -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' -# - -# -# may also be needed; see USB_STORAGE Help for more information -# -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DEBUG=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_DPCM=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -# CONFIG_USB_STORAGE_ALAUDA is not set -# CONFIG_USB_LIBUSUAL is not set - -# -# USB Input Devices -# -CONFIG_USB_HID=y -CONFIG_USB_HIDINPUT=y -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -# CONFIG_HID_FF is not set -# CONFIG_USB_HIDDEV is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_ACECAD is not set -# CONFIG_USB_KBTAB is not set -# CONFIG_USB_POWERMATE is not set -# CONFIG_USB_MTOUCH is not set -# CONFIG_USB_ITMTOUCH is not set -# CONFIG_USB_EGALAX is not set -# CONFIG_USB_YEALINK is not set -# CONFIG_USB_XPAD is not set -# CONFIG_USB_ATI_REMOTE is not set -# CONFIG_USB_ATI_REMOTE2 is not set -# CONFIG_USB_KEYSPAN_REMOTE is not set -# CONFIG_USB_APPLETOUCH is not set - -# -# USB Imaging devices -# -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set - -# -# USB Multimedia devices -# -# CONFIG_USB_DABUSB is not set - -# -# Video4Linux support is needed for USB Multimedia device support -# - -# -# USB Network Adapters -# -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set -# CONFIG_USB_ZD1201 is not set -# CONFIG_USB_MON is not set - -# -# USB port drivers -# - -# -# USB Serial Converter support -# -# CONFIG_USB_SERIAL is not set - -# -# USB Miscellaneous drivers -# -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_AUERSWALD is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_LED is not set -# CONFIG_USB_CYTHERM is not set -# CONFIG_USB_PHIDGETKIT is not set -# CONFIG_USB_PHIDGETSERVO is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_SISUSBVGA is not set -# CONFIG_USB_LD is not set -# CONFIG_USB_TEST is not set - -# -# USB DSL modem support -# - -# -# USB Gadget Support -# -# CONFIG_USB_GADGET is not set - -# -# MMC/SD Card support -# -# CONFIG_MMC is not set - -# -# InfiniBand support -# -# CONFIG_INFINIBAND is not set - -# -# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) -# -# CONFIG_EDAC is not set - -# -# File systems -# -CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set -# CONFIG_REISERFS_FS is not set -# CONFIG_JFS_FS is not set -CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set -# CONFIG_OCFS2_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_ROMFS_FS is not set -# CONFIG_INOTIFY is not set -# CONFIG_QUOTA is not set -CONFIG_DNOTIFY=y -# CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set -# CONFIG_FUSE_FS is not set - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=y -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_ZISOFS_FS=y -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -# CONFIG_PROC_KCORE is not set -CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_HUGETLBFS is not set -# CONFIG_HUGETLB_PAGE is not set -CONFIG_RAMFS=y -# CONFIG_RELAYFS_FS is not set -# CONFIG_CONFIGFS_FS is not set - -# -# Miscellaneous filesystems -# -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -# CONFIG_CRAMFS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set - -# -# Network File Systems -# -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -# CONFIG_NFS_DIRECTIO is not set -CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -CONFIG_NFSD_TCP=y -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_RPCSEC_GSS_SPKM3 is not set -# CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set -# CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set -# CONFIG_9P_FS is not set - -# -# Partition Types -# -# CONFIG_PARTITION_ADVANCED is not set -CONFIG_MSDOS_PARTITION=y - -# -# Native Language Support -# -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=y -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set - -# -# Instrumentation Support -# -# CONFIG_PROFILING is not set -# CONFIG_KPROBES is not set - -# -# Kernel hacking -# -# CONFIG_PRINTK_TIME is not set -# CONFIG_MAGIC_SYSRQ is not set -# CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=15 -CONFIG_DEBUG_BUGVERBOSE=y -CONFIG_EARLY_PRINTK=y -CONFIG_X86_FIND_SMP_CONFIG=y -CONFIG_X86_MPPARSE=y - -# -# Security options -# -# CONFIG_KEYS is not set -# CONFIG_SECURITY is not set - -# -# Cryptographic options -# -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -# CONFIG_CRYPTO_NULL is not set -# CONFIG_CRYPTO_MD4 is not set -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -# CONFIG_CRYPTO_WP512 is not set -# CONFIG_CRYPTO_TGR192 is not set -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -# CONFIG_CRYPTO_SERPENT is not set -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_AES_586=m -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set -# CONFIG_CRYPTO_TEA is not set -CONFIG_CRYPTO_ARC4=m -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_ANUBIS is not set -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -# CONFIG_CRYPTO_CRC32C is not set -# CONFIG_CRYPTO_TEST is not set - -# -# Hardware crypto devices -# -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=y - -# -# Library routines -# -CONFIG_CRC_CCITT=y -CONFIG_CRC16=y -CONFIG_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_X86_SMP=y -CONFIG_X86_HT=y -CONFIG_X86_BIOS_REBOOT=y -CONFIG_X86_TRAMPOLINE=y -CONFIG_KTIME_SCALAR=y Copied: trunk/target/device/via/linux.config (from rev 281, trunk/target/device/via/linux-via-wlan-2.6.16.12.config) =================================================================== --- trunk/target/device/via/linux.config (rev 0) +++ trunk/target/device/via/linux.config 2006-08-19 02:17:40 UTC (rev 282) @@ -0,0 +1,1727 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.16.12 +# Tue Aug 15 19:36:25 2006 +# +CONFIG_X86_32=y +CONFIG_SEMAPHORE_SLEEPERS=y +CONFIG_X86=y +CONFIG_MMU=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_DMI=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +# CONFIG_CPUSETS is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_VM86=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_CC_ALIGN_FUNCTIONS=0 +CONFIG_CC_ALIGN_LABELS=0 +CONFIG_CC_ALIGN_LOOPS=0 +CONFIG_CC_ALIGN_JUMPS=0 +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_OBSOLETE_MODPARM=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y +CONFIG_STOP_MACHINE=y + +# +# Block layer +# +# CONFIG_LBD is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +# CONFIG_IOSCHED_DEADLINE is not set +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" + +# +# Processor type and features +# +CONFIG_X86_PC=y +# CONFIG_X86_ELAN is not set +# CONFIG_X86_VOYAGER is not set +# CONFIG_X86_NUMAQ is not set +# CONFIG_X86_SUMMIT is not set +# CONFIG_X86_BIGSMP is not set +# CONFIG_X86_VISWS is not set +# CONFIG_X86_GENERICARCH is not set +# CONFIG_X86_ES7000 is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +CONFIG_M586MMX=y +# CONFIG_M686 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP2 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +CONFIG_X86_GENERIC=y +CONFIG_X86_CMPXCHG=y +CONFIG_X86_XADD=y +CONFIG_X86_L1_CACHE_SHIFT=7 +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_X86_PPRO_FENCE=y +CONFIG_X86_F00F_BUG=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_ALIGNMENT_16=y +CONFIG_X86_GOOD_APIC=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_TSC=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_SMP=y +CONFIG_NR_CPUS=4 +CONFIG_SCHED_SMT=y +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_BKL=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_MCE=y +# CONFIG_X86_MCE_NONFATAL is not set +# CONFIG_X86_MCE_P4THERMAL is not set +# CONFIG_TOSHIBA is not set +# CONFIG_I8K is not set +CONFIG_X86_REBOOTFIXUPS=y +# CONFIG_MICROCODE is not set +# CONFIG_X86_MSR is not set +# CONFIG_X86_CPUID is not set + +# +# Firmware Drivers +# +# CONFIG_EDD is not set +# CONFIG_DELL_RBU is not set +# CONFIG_DCDBAS is not set +# CONFIG_NOHIGHMEM is not set +CONFIG_HIGHMEM4G=y +# CONFIG_HIGHMEM64G is not set +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_3G_OPT is not set +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HIGHPTE is not set +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +# CONFIG_EFI is not set +CON... [truncated message content] |
|
From: <kr...@us...> - 2006-08-19 19:49:25
|
Revision: 295 Author: krisk84 Date: 2006-08-19 12:49:18 -0700 (Sat, 19 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=295&view=rev Log Message: ----------- gumstix build fixes Modified Paths: -------------- trunk/package/Makefile.in trunk/package/ipsec-tools/ipsec-tools.mk trunk/package/libmad/libmad.mk trunk/toolchain/Config.in Removed Paths: ------------- trunk/toolchain/kernel-headers/ Modified: trunk/package/Makefile.in =================================================================== --- trunk/package/Makefile.in 2006-08-19 16:57:10 UTC (rev 294) +++ trunk/package/Makefile.in 2006-08-19 19:49:18 UTC (rev 295) @@ -52,8 +52,8 @@ TARGET_RANLIB=$(TARGET_CROSS)ranlib STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note INSTALL=/usr/bin/install +QUILT:=$(BASE_DIR)/toolchain/quilt/bin/quilt --cmdpath $(BASE_DIR)/toolchain/quilt/share --quiltrc $(BASE_DIR)/toolchain/quilt/quilt.quiltrc - HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ -e 's/sparc.*/sparc/' \ -e 's/arm.*/arm/g' \ Modified: trunk/package/ipsec-tools/ipsec-tools.mk =================================================================== --- trunk/package/ipsec-tools/ipsec-tools.mk 2006-08-19 16:57:10 UTC (rev 294) +++ trunk/package/ipsec-tools/ipsec-tools.mk 2006-08-19 19:49:18 UTC (rev 295) @@ -101,7 +101,7 @@ $(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) install $(INSTALL) -D -m 0755 package/ipsec-tools/ipsec.init $(TARGET_DIR)/etc/init.d/ipsec ln -sf /tmp/etc/racoon.conf $(TARGET_DIR)/etc/racoon.conf - strip --strip-unneeded --remove-section=.comment \ + $(STRIP) --strip-unneeded --remove-section=.comment \ --remove-section=.note \ $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \ $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \ Modified: trunk/package/libmad/libmad.mk =================================================================== --- trunk/package/libmad/libmad.mk 2006-08-19 16:57:10 UTC (rev 294) +++ trunk/package/libmad/libmad.mk 2006-08-19 19:49:18 UTC (rev 295) @@ -11,6 +11,36 @@ LIBMAD_WORKDIR=$(BUILD_DIR)/libmad-$(LIBMAD_VERSION) LIBMAD_CAT:=zcat +LIBMAD_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ + -e 's/i.86/i386/' \ + -e 's/sparc.*/sparc/' \ + -e 's/arm.*/arm/g' \ + -e 's/m68k.*/m68k/' \ + -e 's/ppc/powerpc/g' \ + -e 's/v850.*/v850/g' \ + -e 's/sh[234].*/sh/' \ + -e 's/mips.*/mips/' \ + -e 's/mipsel.*/mips/' \ + -e 's/cris.*/cris/' \ + -e 's/nios2.*/nios2/' \ +) + +ifeq ($(strip $(LIBMAD_TARGET_ARCH)),i386) +LIBMAD_FPM=intel +endif + +ifeq ($(strip $(LIBMAD_TARGET_ARCH)),arm) +LIBMAD_FPM=arm +endif + +ifeq ($(strip $(LIBMAD_TARGET_ARCH)),powerpc) +LIBMAD_FPM=ppc +endif + +ifeq ($(strip $(LIBMAD_TARGET_ARCH)),mipsel) +LIBMAD_FPM=mips +endif + $(DL_DIR)/$(LIBMAD_SOURCE): $(WGET) -P $(DL_DIR) $(LIBMAD_SITE)/$(LIBMAD_SOURCE) @@ -27,7 +57,7 @@ --build=$(GNU_HOST_NAME) \ --prefix=/usr \ --sysconfdir=/etc \ - --enable-fpm=intel \ + --enable-fpm=$(LIBMAD_FPM) \ $(DISABLE_NLS) \ ); touch $(LIBMAD_DIR)/.configured Modified: trunk/toolchain/Config.in =================================================================== --- trunk/toolchain/Config.in 2006-08-19 16:57:10 UTC (rev 294) +++ trunk/toolchain/Config.in 2006-08-19 19:49:18 UTC (rev 295) @@ -3,7 +3,6 @@ menu "Toolchain Options" -source "toolchain/kernel-headers/Config.in" source "toolchain/uClibc/Config.in" source "toolchain/binutils/Config.in" source "toolchain/gcc/Config.in" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-21 19:46:52
|
Revision: 320 Author: krisk84 Date: 2006-08-21 12:46:46 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=320&view=rev Log Message: ----------- initial apcupsd support Modified Paths: -------------- trunk/package/Config.in Added Paths: ----------- trunk/package/apcupsd/ trunk/package/apcupsd/Config.in trunk/package/apcupsd/apcupsd.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2006-08-21 17:18:34 UTC (rev 319) +++ trunk/package/Config.in 2006-08-21 19:46:46 UTC (rev 320) @@ -33,6 +33,7 @@ source "package/appconference/Config.in" source "package/digiumg729/Config.in" source "package/chan_misdn/Config.in" +source "package/apcupsd/apcupsd/Config.in" source "package/astmanproxy/Config.in" source "package/at/Config.in" source "package/autoconf/Config.in" Added: trunk/package/apcupsd/Config.in =================================================================== --- trunk/package/apcupsd/Config.in (rev 0) +++ trunk/package/apcupsd/Config.in 2006-08-21 19:46:46 UTC (rev 320) @@ -0,0 +1,6 @@ +config BR2_PACKAGE_APCUPSD + bool "apcupsd" + default n + help + apcupsd is a daemon for controlling APC ups' + http://www.apcupsd.org/ Added: trunk/package/apcupsd/apcupsd.mk =================================================================== --- trunk/package/apcupsd/apcupsd.mk (rev 0) +++ trunk/package/apcupsd/apcupsd.mk 2006-08-21 19:46:46 UTC (rev 320) @@ -0,0 +1,66 @@ +############################################################# +# +# apcupsd +# +############################################################# +APCUPSD_SOURCE:=apcupsd-3.12.4.tar.gz +APCUPSD_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/apcupsd/ +APCUPSD_DIR:=$(BUILD_DIR)/apcupsd-3.12.4 +APCUPSD_CAT:=zcat +APCUPSD_BINARY:=apcupsd +APCUPSD_TARGET_BINARY:=usr/sbin/apcupsd + + +$(DL_DIR)/$(APCUPSD_SOURCE): + $(WGET) -P $(DL_DIR) $(APCUPSD_SITE)/$(APCUPSD_SOURCE) + + +apcupsd-source: $(DL_DIR)/$(APCUPSD_SOURCE) + +$(APCUPSD_DIR)/.source: $(DL_DIR)/$(APCUPSD_SOURCE) $(DL_DIR)/$(APCUPSD_PATCH) + zcat $(DL_DIR)/$(APCUPSD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(APCUPSD_DIR)/.source + + +$(APCUPSD_DIR)/.configured: $(APCUPSD_DIR)/.source + (cd $(APCUPSD_DIR); \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ac_cv_func_setpgrp_void=yes \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=$(STAGING_DIR) \ + --exec-prefix=/usr \ + --sysconfdir=/etc \ + --enable-usb \ + ); + touch $(APCUPSD_DIR)/.configured; + +$(APCUPSD_DIR)/$(APCUPSD_BINARY): $(APCUPSD_DIR)/.configured + $(MAKE) CC=$(TARGET_CC) -C $(APCUPSD_DIR) + +$(TARGET_DIR)/$(APCUPSD_TARGET_BINARY): $(APCUPSD_DIR)/$(APCUPSD_BINARY) + # $(MAKE) prefix=$(TARGET_DIR)/usr -C $(APCUPSD_DIR) install + # cp $(APCUPSD_DIR)/samples/apcupsd.conf $(TARGET_DIR)/etc/apcupsd.conf + rm -Rf $(TARGET_DIR)/usr/man + +apcupsd: uclibc $(TARGET_DIR)/$(APCUPSD_TARGET_BINARY) + +apcupsd-clean: + $(MAKE) DESTDIR=$(TARGET_DIR) -C $(APCUPSD_DIR) uninstall + -$(MAKE) -C $(APCUPSD_DIR) clean + +apcupsd-dirclean: + rm -rf $(APCUPSD_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_APCUPSD)),y) +TARGETS+=apcupsd +endif + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-21 20:01:03
|
Revision: 321 Author: krisk84 Date: 2006-08-21 13:00:56 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=321&view=rev Log Message: ----------- initial nocatsplash check-in Modified Paths: -------------- trunk/package/Config.in Added Paths: ----------- trunk/package/nocatsplash/ trunk/package/nocatsplash/Config.in trunk/package/nocatsplash/nocatsplash.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2006-08-21 19:46:46 UTC (rev 320) +++ trunk/package/Config.in 2006-08-21 20:00:56 UTC (rev 321) @@ -115,6 +115,7 @@ source "package/netkittelnet/Config.in" source "package/netsnmp/Config.in" source "package/newt/Config.in" +source "package/nocatsplash/Config.in" source "package/ntp/Config.in" source "package/openntpd/Config.in" source "package/openser/Config.in" Added: trunk/package/nocatsplash/Config.in =================================================================== --- trunk/package/nocatsplash/Config.in (rev 0) +++ trunk/package/nocatsplash/Config.in 2006-08-21 20:00:56 UTC (rev 321) @@ -0,0 +1,6 @@ +config BR2_PACKAGE_NOCATSPLASH + bool "nocatsplash" + default n + help + nocatsplash is C only version of nocat: + http://www.nocat.net Added: trunk/package/nocatsplash/nocatsplash.mk =================================================================== --- trunk/package/nocatsplash/nocatsplash.mk (rev 0) +++ trunk/package/nocatsplash/nocatsplash.mk 2006-08-21 20:00:56 UTC (rev 321) @@ -0,0 +1,64 @@ +############################################################# +# +# nocatsplash +# +############################################################# +NOCATSPLASH_SOURCE:=NoCatSplash-0.92.tar.gz +NOCATSPLASH_SITE:=http://nocat.net/download/NoCatSplash/$(NOCATSPLASH_SOURCE) +NOCATSPLASH_DIR:=$(BUILD_DIR)/NoCatSplash-0.92 +NOCATSPLASH_CAT:=zcat +NOCATSPLASH_BINARY:=nocatsplash +NOCATSPLASH_TARGET_BINARY:=usr/sbin/nocatsplash + +$(DL_DIR)/$(NOCATSPLASH_SOURCE): + $(WGET) -P $(DL_DIR) $(NOCATSPLASH_SITE)/$(NOCATSPLASH_SOURCE) + +nocatsplash-source: $(DL_DIR)/$(NOCATSPLASH_SOURCE) + +$(NOCATSPLASH_DIR)/.source: $(DL_DIR)/$(NOCATSPLASH_SOURCE) $(DL_DIR)/$(NOCATSPLASH_PATCH) + zcat $(DL_DIR)/$(NOCATSPLASH_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(NOCATSPLASH_DIR)/.source + +$(NOCATSPLASH_DIR)/.configured: $(NOCATSPLASH_DIR)/.source + (cd $(NOCATSPLASH_DIR); \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=$(STAGING_DIR) \ + --exec-prefix=/usr \ + --sysconfdir=/etc \ + --disable-glibtest \ + --with-firewall=iptables \ + --with-glib-prefix="$(STAGING_DIR)/usr" \ + ); + touch $(NOCATSPLASH_DIR)/.configured; + +$(NOCATSPLASH_DIR)/$(NOCATSPLASH_BINARY): $(NOCATSPLASH_DIR)/.configured + $(MAKE) CC=$(TARGET_CC) -C $(NOCATSPLASH_DIR) + +$(TARGET_DIR)/$(NOCATSPLASH_TARGET_BINARY): $(NOCATSPLASH_DIR)/$(NOCATSPLASH_BINARY) + # $(MAKE) prefix=$(TARGET_DIR)/usr -C $(NOCATSPLASH_DIR) install + # cp $(NOCATSPLASH_DIR)/samples/nocatsplash.conf $(TARGET_DIR)/etc/nocatsplash.conf + rm -Rf $(TARGET_DIR)/usr/man + +nocatsplash: uclibc $(TARGET_DIR)/$(NOCATSPLASH_TARGET_BINARY) + +nocatsplash-clean: + $(MAKE) DESTDIR=$(TARGET_DIR) -C $(NOCATSPLASH_DIR) uninstall + -$(MAKE) -C $(NOCATSPLASH_DIR) clean + +nocatsplash-dirclean: + rm -rf $(NOCATSPLASH_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_NOCATSPLASH)),y) +TARGETS+=nocatsplash +endif + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-09-07 04:39:06
|
Revision: 357
http://svn.sourceforge.net/astlinux/?rev=357&view=rev
Author: krisk84
Date: 2006-09-06 21:39:01 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
merge changes from Ingmar's branch
Modified Paths:
--------------
trunk/package/asterisk/asterisk.init
trunk/package/mqueue-isdn/mqueue-isdn.mk
trunk/package/usbutils/usbutils.mk
Modified: trunk/package/asterisk/asterisk.init
===================================================================
--- trunk/package/asterisk/asterisk.init 2006-09-07 04:35:59 UTC (rev 356)
+++ trunk/package/asterisk/asterisk.init 2006-09-07 04:39:01 UTC (rev 357)
@@ -84,8 +84,8 @@
if [ "$ISDN_MODPROBE" -o "$MISDN" ]
then
echo "Starting mISDN"
-/etc/init.d/misdn-init config
-/etc/init.d/misdn-init start
+/usr/sbin/misdn-init config
+/usr/sbin/misdn-init start
# Not needed
#mknod /dev/mISDN c 46 0
#modprobe mISDN_core
Modified: trunk/package/mqueue-isdn/mqueue-isdn.mk
===================================================================
--- trunk/package/mqueue-isdn/mqueue-isdn.mk 2006-09-07 04:35:59 UTC (rev 356)
+++ trunk/package/mqueue-isdn/mqueue-isdn.mk 2006-09-07 04:39:01 UTC (rev 357)
@@ -55,7 +55,7 @@
cp $(MQUEUEISDN_DIR)/mISDNuser/i4lnet/*.h $(STAGING_DIR)/usr/include/mISDNuser
touch $(MQUEUEISDN_DIR)/.installed2
-mqueue_misdn: uclibc linux asterisk bc bash pciutils $(MQUEUEISDN_DIR)/.installed2
+mqueue_misdn: uclibc linux asterisk bc bash pciutils usbutils $(MQUEUEISDN_DIR)/.installed2
mqueue_misdn-clean:
rm -Rf $(MQUEUEISDN_DIR)
Modified: trunk/package/usbutils/usbutils.mk
===================================================================
--- trunk/package/usbutils/usbutils.mk 2006-09-07 04:35:59 UTC (rev 356)
+++ trunk/package/usbutils/usbutils.mk 2006-09-07 04:39:01 UTC (rev 357)
@@ -3,7 +3,7 @@
# usbutils
#
#############################################################
-USBUTILS_VER:=0.71
+USBUTILS_VER:=0.72
USBUTILS_SOURCE:=usbutils-$(USBUTILS_VER).tar.gz
USBUTILS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/linux-usb/
USBUTILS_DIR:=$(BUILD_DIR)/usbutils-$(USBUTILS_VER)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2006-09-11 19:26:58
|
Revision: 360
http://svn.sourceforge.net/astlinux/?rev=360&view=rev
Author: krisk84
Date: 2006-09-11 12:26:52 -0700 (Mon, 11 Sep 2006)
Log Message:
-----------
zaptel cleanups and version bump
Modified Paths:
--------------
trunk/package/asterisk/asterisk.mk
trunk/package/zaptel/zaptel.mk
Added Paths:
-----------
trunk/package/zaptel/zaptel-tdmoe.patch
Modified: trunk/package/asterisk/asterisk.mk
===================================================================
--- trunk/package/asterisk/asterisk.mk 2006-09-08 15:43:51 UTC (rev 359)
+++ trunk/package/asterisk/asterisk.mk 2006-09-11 19:26:52 UTC (rev 360)
@@ -3,7 +3,7 @@
# asterisk
#
##############################################################
-ASTERISK_VERSION := 1.2.11
+ASTERISK_VERSION := 1.2.12
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
ASTERISK_SITE := ftp://ftp.digium.com/pub/asterisk/releases
ASTERISK_DIR := $(BUILD_DIR)/asterisk-$(ASTERISK_VERSION)
Added: trunk/package/zaptel/zaptel-tdmoe.patch
===================================================================
--- trunk/package/zaptel/zaptel-tdmoe.patch (rev 0)
+++ trunk/package/zaptel/zaptel-tdmoe.patch 2006-09-11 19:26:52 UTC (rev 360)
@@ -0,0 +1,228 @@
+diff -ur zaptel-1.2.9.orig/zaptel.h zaptel-1.2.9/zaptel.h
+--- zaptel-1.2.9.orig/zaptel.h 2005-12-16 21:04:05.000000000 -0500
++++ zaptel-1.2.9/zaptel.h 2006-09-11 11:26:38.000000000 -0400
+@@ -1359,6 +1359,9 @@
+ /* Transmit a given message */
+ int (*transmit)(void *tpipe, unsigned char *msg, int msglen);
+
++ /* Flush any pending messages */
++ int (*flush)(void);
++
+ struct zt_dynamic_driver *next;
+ };
+
+Only in zaptel-1.2.9: zaptel.h.orig
+diff -ur zaptel-1.2.9.orig/ztd-eth.c zaptel-1.2.9/ztd-eth.c
+--- zaptel-1.2.9.orig/ztd-eth.c 2005-11-29 13:42:08.000000000 -0500
++++ zaptel-1.2.9/ztd-eth.c 2006-09-11 11:26:38.000000000 -0400
+@@ -56,6 +56,8 @@
+ static spinlock_t zlock = SPIN_LOCK_UNLOCKED;
+ #endif
+
++static struct sk_buff_head skbs;
++
+ static struct ztdeth {
+ unsigned char addr[ETH_ALEN];
+ unsigned short subaddr; /* Network byte order */
+@@ -171,7 +173,7 @@
+ skb->dev = dev;
+ if (dev->hard_header)
+ dev->hard_header(skb, dev, ETH_P_ZTDETH, addr, dev->dev_addr, skb->len);
+- dev_queue_xmit(skb);
++ skb_queue_tail(&skbs, skb);
+ }
+ }
+ else
+@@ -179,6 +181,18 @@
+ return 0;
+ }
+
++
++static int ztdeth_flush(void)
++{
++ struct sk_buff *skb;
++
++ /* Handle all transmissions now */
++ while ((skb = skb_dequeue(&skbs))) {
++ dev_queue_xmit(skb);
++ }
++ return 0;
++}
++
+ static struct packet_type ztdeth_ptype = {
+ type: __constant_htons(ETH_P_ZTDETH), /* Protocol */
+ dev: NULL, /* Device (NULL = wildcard) */
+@@ -376,7 +390,8 @@
+ "Ethernet",
+ ztdeth_create,
+ ztdeth_destroy,
+- ztdeth_transmit
++ ztdeth_transmit,
++ ztdeth_flush
+ };
+
+ static struct notifier_block ztdeth_nblock = {
+@@ -388,6 +403,9 @@
+ dev_add_pack(&ztdeth_ptype);
+ register_netdevice_notifier(&ztdeth_nblock);
+ zt_dynamic_register(&ztd_eth);
++
++ skb_queue_head_init(&skbs);
++
+ return 0;
+ }
+
+diff -ur zaptel-1.2.9.orig/ztd-loc.c zaptel-1.2.9/ztd-loc.c
+--- zaptel-1.2.9.orig/ztd-loc.c 2005-11-29 13:42:08.000000000 -0500
++++ zaptel-1.2.9/ztd-loc.c 2006-09-11 11:26:38.000000000 -0400
+@@ -255,7 +255,8 @@
+ "Local",
+ ztdlocal_create,
+ ztdlocal_destroy,
+- ztdlocal_transmit
++ ztdlocal_transmit,
++ NULL /* flush */
+ };
+
+ /*static*/ int __init ztdlocal_init(void)
+diff -ur zaptel-1.2.9.orig/ztdynamic.c zaptel-1.2.9/ztdynamic.c
+--- zaptel-1.2.9.orig/ztdynamic.c 2005-11-29 13:42:08.000000000 -0500
++++ zaptel-1.2.9/ztdynamic.c 2006-09-11 11:26:38.000000000 -0400
+@@ -132,6 +132,12 @@
+ static spinlock_t dlock = SPIN_LOCK_UNLOCKED;
+ #endif
+
++#ifdef DEFINE_RWLOCK
++static DEFINE_RWLOCK(drvlock);
++#else
++static rwlock_t drvlock = RW_LOCK_UNLOCKED;
++#endif
++
+ static void checkmaster(void)
+ {
+ unsigned long flags;
+@@ -142,15 +148,13 @@
+ z = dspans;
+ while(z) {
+ if (z->timing) {
+- if (z->timing) {
+- z->master = 0;
+- newhasmaster = 1;
+- if (!z->alarm && (z->timing < best) && !z->dead) {
+- /* If not in alarm and they're
+- a better timing source, use them */
+- master = z;
+- best = z->timing;
+- }
++ z->master = 0;
++ newhasmaster = 1;
++ if (!z->alarm && (z->timing < best) && !z->dead) {
++ /* If not in alarm and they're
++ a better timing source, use them */
++ master = z;
++ best = z->timing;
+ }
+ }
+ z = z->next;
+@@ -230,6 +234,7 @@
+ {
+ unsigned long flags;
+ struct zt_dynamic *z;
++ struct zt_dynamic_driver *drv;
+ int y;
+ spin_lock_irqsave(&dlock, flags);
+ z = dspans;
+@@ -248,6 +253,17 @@
+ z = z->next;
+ }
+ spin_unlock_irqrestore(&dlock, flags);
++
++ read_lock(&drvlock);
++ drv = drivers;
++ while(drv) {
++ /* Flush any traffic still pending in the driver */
++ if (drv->flush) {
++ drv->flush();
++ }
++ drv = drv->next;
++ }
++ read_unlock(&drvlock);
+ }
+
+ #ifdef ENABLE_TASKLETS
+@@ -275,7 +291,7 @@
+ int x, bits, sig;
+ int nchans, master;
+ int newalarm;
+- unsigned short rxpos;
++ unsigned short rxpos, rxcnt;
+
+
+ spin_lock_irqsave(&dlock, flags);
+@@ -373,6 +389,9 @@
+
+ master = ztd->master;
+
++ rxcnt = ztd->rxcnt;
++ ztd->rxcnt = rxpos+1;
++
+ spin_unlock_irqrestore(&dlock, flags);
+
+ /* Check for Yellow alarm */
+@@ -388,6 +407,10 @@
+ /* Keep track of last received packet */
+ ztd->rxjif = jiffies;
+
++ /* note if we had a missing packet */
++ // if (rxpos != rxcnt)
++ // printk("Span %s: Expected seq no %d, but received %d instead\n", span->name, rxcnt, rxpos);
++
+ /* If this is our master span, then run everything */
+ if (master)
+ ztdynamic_run();
+@@ -710,14 +733,14 @@
+ {
+ unsigned long flags;
+ int res = 0;
+- spin_lock_irqsave(&dlock, flags);
++ write_lock_irqsave(&drvlock, flags);
+ if (find_driver(dri->name))
+ res = -1;
+ else {
+ dri->next = drivers;
+ drivers = dri;
+ }
+- spin_unlock_irqrestore(&dlock, flags);
++ write_unlock_irqrestore(&drvlock, flags);
+ return res;
+ }
+
+@@ -726,7 +749,7 @@
+ struct zt_dynamic_driver *cur, *prev=NULL;
+ struct zt_dynamic *z, *zp, *zn;
+ unsigned long flags;
+- spin_lock_irqsave(&dlock, flags);
++ write_lock_irqsave(&drvlock, flags);
+ cur = drivers;
+ while(cur) {
+ if (cur == dri) {
+@@ -739,6 +762,8 @@
+ prev = cur;
+ cur = cur->next;
+ }
++ write_unlock_irqrestore(&drvlock, flags);
++ spin_lock_irqsave(&dlock, flags);
+ z = dspans;
+ zp = NULL;
+ while(z) {
+@@ -773,8 +798,8 @@
+ z = dspans;
+ while(z) {
+ newalarm = z->span.alarms & ~ZT_ALARM_RED;
+- /* If nothing received for a minute, consider that RED ALARM */
+- if ((jiffies - z->rxjif) > 1000 / HZ) {
++ /* If nothing received for a second, consider that RED ALARM */
++ if ((jiffies - z->rxjif) > 1 * HZ) {
+ newalarm |= ZT_ALARM_RED;
+ if (z->span.alarms != newalarm) {
+ z->span.alarms = newalarm;
Modified: trunk/package/zaptel/zaptel.mk
===================================================================
--- trunk/package/zaptel/zaptel.mk 2006-09-08 15:43:51 UTC (rev 359)
+++ trunk/package/zaptel/zaptel.mk 2006-09-11 19:26:52 UTC (rev 360)
@@ -3,9 +3,10 @@
# zaptel
#
##############################################################
-ZAPTEL_VERSION := 1.2.8
+ZAPTEL_VERSION := 1.2.9
ZAPTEL_SOURCE := zaptel-$(ZAPTEL_VERSION).tar.gz
-ZAPTEL_SITE := ftp://ftp.digium.com/pub/zaptel/releases
+#ZAPTEL_SITE := ftp://ftp.digium.com/pub/zaptel/releases
+ZAPTEL_SITE := http://www.krisk.org/asterisk
ZAPTEL_DIR := $(BUILD_DIR)/zaptel-$(ZAPTEL_VERSION)
ZAPTEL_BINARY := ztcfg
ZAPTEL_TARGET_BINARY := sbin/ztcfg
@@ -35,37 +36,30 @@
$(DL_DIR)/$(ZAPTEL_SOURCE):
$(WGET) -P $(DL_DIR) $(ZAPTEL_SITE)/$(ZAPTEL_SOURCE)
- # Rhino-enabled
ifeq ($(BR2_PACKAGE_ZAPTEL_RHINO),y)
$(WGET) -P $(DL_DIR) $(RHINO_SITE)/$(RHINO_PKG)
endif
- # end Rhino
$(ZAPTEL_DIR)/.source: $(DL_DIR)/$(ZAPTEL_SOURCE)
zcat $(DL_DIR)/$(ZAPTEL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
ln -sf $(ZAPTEL_DIR) $(BUILD_DIR)/zaptel
toolchain/patch-kernel.sh $(ZAPTEL_DIR) package/zaptel/ zaptel\*.patch
- # Rhino-enabled
ifeq ($(BR2_PACKAGE_ZAPTEL_RHINO),y)
zcat $(DL_DIR)/$(RHINO_PKG) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- # Hopefully the astlinux mainline zaptel patches won't disrupt the Rhino's
toolchain/patch-kernel.sh $(ZAPTEL_DIR) $(RHINO_DIR)/ rhino-\*.patch
cp $(RHINO_DIR)/* $(ZAPTEL_DIR)/
endif
- # end Rhino
touch $(ZAPTEL_DIR)/.source
$(ZAPTEL_DIR)/.configured: $(ZAPTEL_DIR)/.source
touch $(ZAPTEL_DIR)/.configured
$(ZAPTEL_DIR)/$(ZAPTEL_BINARY): $(ZAPTEL_DIR)/.configured
- #CWD=$(shell pwd)
- #cd $(ZAPTEL_DIR)
- $(MAKE) -C $(ZAPTEL_DIR) CC=gcc makefw gendigits fw2h #hack
- $(MAKE) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) ARCH=$(ZAPTEL_TARGET_ARCH) \
+ $(MAKE) -C $(ZAPTEL_DIR) CC=gcc HOTPLUG_FIRMWARE=no PATH="$(ZAPTEL_DIR):$(PATH)" \
+ makefw gendigits tor2fw.h radfw.h #hack
+ $(MAKE) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) HOTPLUG_FIRMWARE=no ARCH=$(ZAPTEL_TARGET_ARCH) \
PROC=$(OPTIMIZE_FOR_CPU) KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) \
$(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" ZTTOOL=zttool INSTALL_BASE=/ PWD=$(ZAPTEL_DIR)
- #cd $(CWD)
$(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY): $(ZAPTEL_DIR)/$(ZAPTEL_BINARY)
mkdir -p $(STAGING_DIR)/etc/udev/rules.d #hack to get install to work...
@@ -73,7 +67,8 @@
mkdir -p $(STAGING_DIR)/lib/modules/$(LINUX_VER)/misc
$(MAKE) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) ARCH=$(ZAPTEL_TARGET_ARCH) \
KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) $(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" \
- INSTALL_PREFIX=$(STAGING_DIR) INSTALL_BASE=/ ZTTOOL=zttool PWD=$(ZAPTEL_DIR) install
+ INSTALL_PREFIX=$(STAGING_DIR) INSTALL_BASE=/ ZTTOOL=zttool PWD=$(ZAPTEL_DIR) HOTPLUG_FIRMWARE=no \
+ install
mkdir -p $(STAGING_DIR)/usr/include/linux
cp -a $(STAGING_DIR)/include/linux/zaptel.h $(STAGING_DIR)/usr/include/linux/zaptel.h #Hack for Asterisk to find us
cp -a $(STAGING_DIR)/lib/modules/$(LINUX_VER)/misc $(TARGET_DIR)/lib/modules/$(LINUX_VER)/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2006-10-09 17:00:42
|
Revision: 395
http://svn.sourceforge.net/astlinux/?rev=395&view=rev
Author: krisk84
Date: 2006-10-09 10:00:38 -0700 (Mon, 09 Oct 2006)
Log Message:
-----------
mISDN fixes merged from 0.4
Modified Paths:
--------------
trunk/package/chan_misdn/chan_misdn-make.patch
trunk/package/mqueue-isdn/i4lmake.patch
trunk/package/mqueue-isdn/mqueue-isdn-make.patch
trunk/package/mqueue-isdn/mqueue-user-isdn-make.patch
Modified: trunk/package/chan_misdn/chan_misdn-make.patch
===================================================================
--- trunk/package/chan_misdn/chan_misdn-make.patch 2006-10-09 15:25:12 UTC (rev 394)
+++ trunk/package/chan_misdn/chan_misdn-make.patch 2006-10-09 17:00:38 UTC (rev 395)
@@ -1,5 +1,5 @@
---- chan_misdn/Makefile.orig 2006-05-16 16:33:29.000000000 +0200
-+++ chan_misdn/Makefile 2006-05-26 08:35:30.000000000 +0200
+--- chan_misdn/Makefile.orig 2006-08-08 08:01:59.000000000 -0400
++++ chan_misdn/Makefile 2006-10-09 11:16:58.000000000 -0400
@@ -38,7 +38,7 @@
MISDNOBJS=chan_misdn.o misdn/chan_misdn_lib.a misdn_config.o
@@ -14,7 +14,7 @@
chan_misdn.so: $(MISDNOBJS) $(ADDOBJS)
- $(CC) -shared -Xlinker -x -L/usr/lib/mISDNuser -o $@ $(MISDNOBJS) -lisdnnet -lmISDN $(MEMPATROL) $(MISDNECLIB)
-+ $(CC) -shared -L$(MISDNUSERLIB) -o $@ $(MISDNOBJS) -lisdnnet -lmISDN $(MEMPATROL) $(MISDNECLIB)
++ $(CC) -shared -Xlinker -x -L$(MISDNUSERLIB) -o $@ $(MISDNOBJS) -lisdnnet -lmISDN $(MEMPATROL) $(MISDNECLIB)
chan_misdn.o: chan_misdn.c
$(CC) $(CFLAGS) -DCHAN_MISDN_VERSION=\"$(CANDIDATE_VERSION)\" -c chan_misdn.c
@@ -29,4 +29,4 @@
+ ar crv misdn/chan_misdn_lib.a misdn/fac.o misdn/isdn_lib.o misdn/isdn_msg_parser.o
install: chan_misdn.so
- install -m 644 chan_misdn.so $(INSTALL_MODPATH)/
+ install -m 644 chan_misdn.so $(INSTALL_PREFIX)$(INSTALL_MODPATH)/
Modified: trunk/package/mqueue-isdn/i4lmake.patch
===================================================================
--- trunk/package/mqueue-isdn/i4lmake.patch 2006-10-09 15:25:12 UTC (rev 394)
+++ trunk/package/mqueue-isdn/i4lmake.patch 2006-10-09 17:00:38 UTC (rev 395)
@@ -1,10 +1,11 @@
---- i4lnet/Makefile.orig 2006-03-06 14:08:28.000000000 +0100
-+++ i4lnet/Makefile 2006-05-26 08:14:55.000000000 +0200
-@@ -11,7 +11,7 @@
+--- i4lnet/Makefile.orig 2006-08-16 17:37:11.000000000 -0400
++++ i4lnet/Makefile 2006-10-09 11:08:40.000000000 -0400
+@@ -10,7 +10,7 @@
+ manager.o tone.o bchannel.o g711.o
libisdnnet.so: $(ISDNNETOBJ)
- $(CC) -shared -Xlinker -x -o $@ $^
-+ $(CC) -shared -Xlinker -x -o $@ $^ ../lib/libmISDN.so
++ $(CC) -shared -Xlinker -x -o $@ ../lib/libmISDN.so
libisdnnet.a: $(ISDNNETOBJ)
- ar cr $@ $^
+ ar cr $@ $^
Modified: trunk/package/mqueue-isdn/mqueue-isdn-make.patch
===================================================================
--- trunk/package/mqueue-isdn/mqueue-isdn-make.patch 2006-10-09 15:25:12 UTC (rev 394)
+++ trunk/package/mqueue-isdn/mqueue-isdn-make.patch 2006-10-09 17:00:38 UTC (rev 395)
@@ -1,6 +1,6 @@
---- mISDN/Makefile.orig 2006-05-29 14:30:35.000000000 +0200
-+++ mISDN/Makefile 2006-05-29 14:28:40.000000000 +0200
-@@ -1,16 +1,17 @@
+--- mISDN/Makefile.orig 2006-08-25 07:50:41.000000000 -0400
++++ mISDN/Makefile 2006-10-09 11:02:13.000000000 -0400
+@@ -1,16 +1,16 @@
-BASEDIR=$(shell pwd)
+# BASEDIR=$(shell pwd)
@@ -13,41 +13,37 @@
#LINUX=/usr/src/linux
-MODS=/lib/modules/$(shell uname -r)
-LINUX=$(MODS)/build
-+# MODS=/lib/modules/$(shell uname -r)
+LINUX=$(MODS)/linux
LINUX_SOURCE=$(MODS)/source
-UPDATE_MODULES=$(shell which update-modules)
-MODULES_UPDATE=$(shell which modules-update)
-+# UPDATE_MODULES=$(shell which update-modules)
-+# MODULES_UPDATE=$(shell which modules-update)
++#UPDATE_MODULES=$(shell which update-modules)
++#MODULES_UPDATE=$(shell which modules-update)
DEPMOD=$(shell which depmod)
-@@ -39,7 +40,7 @@
+@@ -39,7 +39,7 @@
MINCLUDES+=-I$(MISDNDIR)/include
-all: test_old_misdn
-+all:
++all:
@echo
- @echo "Makeing mISDN"
+ @echo "Making mISDN"
@echo "============="
-@@ -51,21 +52,20 @@
+@@ -51,8 +51,9 @@
install: all
cd $(LINUX) ; make INSTALL_MOD_PATH=$(INSTALL_PREFIX) SUBDIRS=$(MISDN_SRC) modules_install
- mkdir -p $(INSTALL_PREFIX)/usr/include/linux/
- cp $(MISDNDIR)/include/linux/*.h $(INSTALL_PREFIX)/usr/include/linux/
-+ cd $(LINUX) ; make INSTALL_MOD_PATH=$(MODS)/root SUBDIRS=$(MISDN_SRC) modules_install
+ mkdir -p $(INSTALL_BUILD)/usr/include/linux/
+ cp $(MISDNDIR)/include/linux/*.h $(INSTALL_BUILD)/usr/include/linux/
- mkdir -p $(INSTALL_PREFIX)/usr/sbin/
- install -m755 misdn-init $(INSTALL_PREFIX)/usr/sbin/
- if [ -d $(INSTALL_PREFIX)/etc/init.d ]; then \
- if [ -e $(INSTALL_PREFIX)/etc/init.d/misdn-init ]; then rm -rf $(INSTALL_PREFIX)/etc/init.d/misdn-init; fi; \
- ln -s $(INSTALL_PREFIX)/usr/sbin/misdn-init $(INSTALL_PREFIX)/etc/init.d/misdn-init; \
- fi
- mkdir -p $(INSTALL_PREFIX)/etc/modprobe.d
++ cd $(LINUX) ; make INSTALL_MOD_PATH=$(MODS)/root SUBDIRS=$(MISDN_SRC) modules_install
+ mkdir -p $(INSTALL_PREFIX)/usr/sbin/
+ install -m755 misdn-init $(INSTALL_PREFIX)/usr/sbin/
+ if [ -d $(INSTALL_PREFIX)/etc/init.d ]; then \
+@@ -63,9 +64,7 @@
cp mISDN.modprobe.d $(INSTALL_PREFIX)/etc/modprobe.d/mISDN
mkdir -p $(INSTALL_PREFIX)/etc/modules.d
cp mISDN.modprobe.d $(INSTALL_PREFIX)/etc/modules.d/mISDN
@@ -58,7 +54,7 @@
test_old_misdn:
@if echo -ne "#include <linux/mISDNif.h>" | gcc -C -E - 2>/dev/null 1>/dev/null ; then \
-@@ -87,8 +87,8 @@
+@@ -87,8 +86,8 @@
rm -f /usr/include/linux/isdn_compat.h
clean:
Modified: trunk/package/mqueue-isdn/mqueue-user-isdn-make.patch
===================================================================
--- trunk/package/mqueue-isdn/mqueue-user-isdn-make.patch 2006-10-09 15:25:12 UTC (rev 394)
+++ trunk/package/mqueue-isdn/mqueue-user-isdn-make.patch 2006-10-09 17:00:38 UTC (rev 395)
@@ -1,11 +1,11 @@
---- mISDNuser/Makefile.orig 2006-08-22 16:31:37.000000000 +0200
-+++ mISDNuser/Makefile 2006-08-22 16:29:01.000000000 +0200
+--- mISDNuser/Makefile.orig 2006-08-15 14:57:31.000000000 -0400
++++ mISDNuser/Makefile 2006-10-09 11:05:39.000000000 -0400
@@ -1,7 +1,7 @@
#
# Set this to your local copy of mISDN
#
-MISDNDIR := /usr/src/mqueue/mISDN
-+#MISDNDIR := /usr/src/mqueue/mISDN
++# MISDNDIR := /usr/src/mqueue/mISDN
PWD=$(shell pwd)
@@ -14,7 +14,7 @@
# includes
#
-INSTALL_PREFIX := /
-+INSTALL_PREFIX :=$(MODS)/root
++INSTALL_PREFIX := $(MODS)/root
export INSTALL_PREFIX
MISDNINCLUDEDIR := $(MISDNDIR)/include
@@ -25,15 +25,13 @@
export mISDN_DIR
INCLUDEDIR := $(mISDN_DIR)/include
-@@ -23,16 +23,18 @@
+@@ -23,16 +23,15 @@
CFLAGS:= -g -Wall -O2 -I $(INCLUDEDIR) -I $(MISDNINCLUDEDIR)
CFLAGS+= -D CLOSE_REPORT=1
-ifeq ($(shell uname -m),x86_64)
-+#ifeq ($(shell uname -m),x86_64)
- CFLAGS += -fPIC
+-CFLAGS += -fPIC
-endif
-+#endif
export CFLAGS
-mISDNLIB := $(PWD)/lib/libmISDN.a
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2006-10-30 17:34:18
|
Revision: 427
http://svn.sourceforge.net/astlinux/?rev=427&view=rev
Author: krisk84
Date: 2006-10-30 09:34:13 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
add sqlite
Modified Paths:
--------------
trunk/package/Config.in
Added Paths:
-----------
trunk/package/sqlite/
trunk/package/sqlite/Config.in
trunk/package/sqlite/sqlite.mk
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2006-10-30 17:32:34 UTC (rev 426)
+++ trunk/package/Config.in 2006-10-30 17:34:13 UTC (rev 427)
@@ -148,6 +148,7 @@
source "package/smartmontools/Config.in"
source "package/socat/Config.in"
source "package/sox/Config.in"
+source "package/sqlite/Config.in"
source "package/strace/Config.in"
source "package/stunnel/Config.in"
source "package/sysfsutils/Config.in"
Added: trunk/package/sqlite/Config.in
===================================================================
--- trunk/package/sqlite/Config.in (rev 0)
+++ trunk/package/sqlite/Config.in 2006-10-30 17:34:13 UTC (rev 427)
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SQLITE
+ bool "sqlite"
+ default n
+ select BR2_READLINE
+ select BR2_PACKAGE_NCURSES
+ help
+ SQLite is a small C library that implements a self-contained, embeddable,
+ zero-configuration SQL database engine
+
+ http://www.sqlite.org
Added: trunk/package/sqlite/sqlite.mk
===================================================================
--- trunk/package/sqlite/sqlite.mk (rev 0)
+++ trunk/package/sqlite/sqlite.mk 2006-10-30 17:34:13 UTC (rev 427)
@@ -0,0 +1,90 @@
+#############################################################
+#
+# sqlite
+#
+##############################################################
+SQLITE_VERSION := 3.3.8
+SQLITE_SOURCE := sqlite-$(SQLITE_VERSION).tar.gz
+SQLITE_SITE := http://www.sqlite.org
+SQLITE_DIR := $(BUILD_DIR)/sqlite-$(SQLITE_VERSION)
+SQLITE_BINARY := sqlite3
+SQLITE_TARGET_BINARY := usr/bin/sqlite3
+
+$(DL_DIR)/$(SQLITE_SOURCE):
+ $(WGET) -P $(DL_DIR) $(SQLITE_SITE)/$(SQLITE_SOURCE)
+
+$(SQLITE_DIR)/.source: $(DL_DIR)/$(SQLITE_SOURCE)
+ zcat $(DL_DIR)/$(SQLITE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(SQLITE_DIR) package/sqlite/ sqlite\*.patch
+ touch $(SQLITE_DIR)/.source
+
+$(SQLITE_DIR)/.configured: $(SQLITE_DIR)/.source
+ (cd $(SQLITE_DIR); rm -rf config.{cache,status} ; \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+ config_BUILD_CC="$(HOSTCC)" \
+ config_BUILD_CFLAGS="-O2" \
+ config_TARGET_CC="$(TARGET_CC)" \
+ config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \
+ config_TARGET_READLINE_INC="-I$(STAGING_DIR)/usr/include" \
+ config_TARGET_READLINE_LIBS="-L$(STAGING_DIR)/usr/lib -lreadline -lncurses" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --program-prefix="" \
+ --program-suffix="" \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --datadir=/usr/share \
+ --includedir=/usr/include \
+ --infodir=/usr/share/info \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --mandir=/usr/share/man \
+ --sbindir=/usr/sbin \
+ --sysconfdir=/etc \
+ $(DISABLE_LARGEFILE) \
+ $(DISABLE_NLS) \
+ --enable-shared \
+ --enable-static \
+ --disable-tcl \
+ );
+ touch $(SQLITE_DIR)/.configured
+
+$(SQLITE_DIR)/$(SQLITE_BINARY): $(SQLITE_DIR)/.configured
+ $(MAKE) -C $(SQLITE_DIR) \
+ DESTDIR="$(STAGING_DIR)" \
+ all install
+ touch -c $(TARGET_DIR)/$(SQLITE_BINARY)
+
+$(TARGET_DIR)/$(SQLITE_TARGET_BINARY): $(SQLITE_DIR)/$(SQLITE_BINARY)
+ cp -fpR $(STAGING_DIR)/usr/lib/libsqlite3.so.* $(TARGET_DIR)/usr/lib/
+ $(STRIP) $(TARGET_DIR)/usr/lib/libsqlite3.so.*
+ $(INSTALL) -D -m 0755 $(SQLITE_DIR)/$(SQLITE_BINARY) $(TARGET_DIR)/$(SQLITE_TARGET_BINARY)
+ touch -c $(TARGET_DIR)/$(SQLITE_TARGET_BINARY)
+
+sqlite: uclibc readline ncurses $(TARGET_DIR)/$(SQLITE_TARGET_BINARY)
+
+sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE)
+
+sqlite-clean:
+ -rm -rf $(TARGET_DIR)/usr/lib/libsqlite3.so.*
+ -rm -rf $(TARGET_DIR)/$(SQLITE_TARGET_BINARY)
+ -$(MAKE) -C $(SQLITE_DIR) clean
+
+sqlite-dirclean:
+ -rm -rf $(SQLITE_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_SQLITE)),y)
+TARGETS+=sqlite
+endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2006-10-31 16:05:04
|
Revision: 428
http://svn.sourceforge.net/astlinux/?rev=428&view=rev
Author: krisk84
Date: 2006-10-31 08:03:46 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
add appweb
Modified Paths:
--------------
trunk/package/Config.in
Added Paths:
-----------
trunk/package/appweb/
trunk/package/appweb/Config.in
trunk/package/appweb/appweb.mk
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2006-10-30 17:34:13 UTC (rev 427)
+++ trunk/package/Config.in 2006-10-31 16:03:46 UTC (rev 428)
@@ -34,6 +34,7 @@
source "package/digiumg729/Config.in"
source "package/chan_misdn/Config.in"
source "package/apcupsd/Config.in"
+source "package/appweb/Config.in"
source "package/astmanproxy/Config.in"
source "package/at/Config.in"
source "package/autoconf/Config.in"
Added: trunk/package/appweb/Config.in
===================================================================
--- trunk/package/appweb/Config.in (rev 0)
+++ trunk/package/appweb/Config.in 2006-10-31 16:03:46 UTC (rev 428)
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_APPWEBB
+ bool "appweb"
+ default n
+ help
+ appweb is a small, really cool web server
+ http://www.appweb.org/
Added: trunk/package/appweb/appweb.mk
===================================================================
--- trunk/package/appweb/appweb.mk (rev 0)
+++ trunk/package/appweb/appweb.mk 2006-10-31 16:03:46 UTC (rev 428)
@@ -0,0 +1,76 @@
+#############################################################
+#
+# appweb
+#
+#############################################################
+APPWEB_VERSION:=2.1.0-2
+APPWEB_SOURCE:=appWeb-src-$(APPWEB_VERSION).tar.gz
+APPWEB_SITE:=http://www.appwebserver.org/software/$(APPWEB_SOURCE)
+APPWEB_DIR:=$(BUILD_DIR)/appWeb-2.1.0
+APPWEB_CAT:=zcat
+APPWEB_BINARY:=bin/appWebStatic
+APPWEB_TARGET_BINARY:=usr/sbin/appWebStatic
+
+$(DL_DIR)/$(APPWEB_SOURCE):
+ $(WGET) -P $(DL_DIR) $(APPWEB_SITE)/$(APPWEB_SOURCE)
+
+
+appweb-source: $(DL_DIR)/$(APPWEB_SOURCE)
+
+$(APPWEB_DIR)/.source: $(DL_DIR)/$(APPWEB_SOURCE) $(DL_DIR)/$(APPWEB_PATCH)
+ zcat $(DL_DIR)/$(APPWEB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $(APPWEB_DIR)/.source
+
+
+$(APPWEB_DIR)/.configured: $(APPWEB_DIR)/.source
+ (cd $(APPWEB_DIR); \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ ./configure \
+ --host=$(GNU_TARGET_NAME) \
+ --webDir=/var/www/html \
+ --port=80 \
+ --sslPort=443 \
+ --setVersion=$(APPWEB_VERSION)-astlinux \
+ --enable-access-log \
+ --enable-config-parse \
+ --disable-config-save \
+ --disable-ipv6 \
+ --enable-run-as-service \
+ --disable-samples \
+ --enable-squeeze \
+ --without-aspnet \
+ --without-c-api \
+ --without-gacompat \
+ --without-egi \
+ --without-esp \
+ --without-xdb \
+ );
+ touch $(APPWEB_DIR)/.configured;
+
+$(APPWEB_DIR)/$(APPWEB_BINARY): $(APPWEB_DIR)/.configured
+ $(MAKE) CC=$(TARGET_CC) -C $(APPWEB_DIR) compile
+
+$(TARGET_DIR)/$(APPWEB_TARGET_BINARY): $(APPWEB_DIR)/$(APPWEB_BINARY)
+ # $(MAKE) prefix=$(TARGET_DIR)/usr -C $(APPWEB_DIR) install
+ # cp $(APPWEB_DIR)/samples/appweb.conf $(TARGET_DIR)/etc/appweb.conf
+ rm -Rf $(TARGET_DIR)/usr/man
+
+appweb: uclibc $(TARGET_DIR)/$(APPWEB_TARGET_BINARY)
+
+appweb-clean:
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(APPWEB_DIR) uninstall
+ -$(MAKE) -C $(APPWEB_DIR) clean
+
+appweb-dirclean:
+ rm -rf $(APPWEB_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_APPWEB)),y)
+TARGETS+=appweb
+endif
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2006-10-31 18:44:55
|
Revision: 430
http://svn.sourceforge.net/astlinux/?rev=430&view=rev
Author: krisk84
Date: 2006-10-31 10:44:50 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
add vm-messenger package
Modified Paths:
--------------
trunk/package/Config.in
Added Paths:
-----------
trunk/package/vm-messenger/
trunk/package/vm-messenger/Config.in
trunk/package/vm-messenger/vm-messenger.mk
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2006-10-31 18:28:18 UTC (rev 429)
+++ trunk/package/Config.in 2006-10-31 18:44:50 UTC (rev 430)
@@ -33,6 +33,7 @@
source "package/appconference/Config.in"
source "package/digiumg729/Config.in"
source "package/chan_misdn/Config.in"
+source "package/vm-messenger/Config.in"
source "package/apcupsd/Config.in"
source "package/appweb/Config.in"
source "package/astmanproxy/Config.in"
Added: trunk/package/vm-messenger/Config.in
===================================================================
--- trunk/package/vm-messenger/Config.in (rev 0)
+++ trunk/package/vm-messenger/Config.in 2006-10-31 18:44:50 UTC (rev 430)
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_VM-MESSENGER
+ bool "vm-messenger"
+ default n
+ depends BR2_PACKAGE_ASTERISK
+ depends BR2_PACKAGE_MINIHTTPD
+ help
+ vm-messenger is a dependency-free GUI for
+ asterisk voicemail access
+
+ http://www.plancomm.com
Added: trunk/package/vm-messenger/vm-messenger.mk
===================================================================
--- trunk/package/vm-messenger/vm-messenger.mk (rev 0)
+++ trunk/package/vm-messenger/vm-messenger.mk 2006-10-31 18:44:50 UTC (rev 430)
@@ -0,0 +1,38 @@
+#############################################################
+#
+# vm-messenger
+#
+#############################################################
+VM-MESSENGER_VER:=0.1c
+VM-MESSENGER_SOURCE:=messenger-$(VM-MESSENGER_VER).tar.gz
+VM-MESSENGER_SITE:=http://www.plancomm.com/downloads/
+VM-MESSENGER_DIR:=$(BUILD_DIR)/messenger-$(VM-MESSENGER_VER)
+VM-MESSENGER_CAT:=zcat
+VM-MESSENGER_TARGET_DIR=stat/var/www/vm
+
+$(DL_DIR)/$(VM-MESSENGER_SOURCE):
+ $(WGET) -P $(DL_DIR) $(VM-MESSENGER_SITE)/$(VM-MESSENGER_SOURCE)
+
+vm-messenger: $(DL_DIR)/$(VM-MESSENGER_SOURCE)
+ mkdir -p $(TARGET_DIR)/$(VM-MESSENGER_TARGET_DIR)
+ $(VM-MESSENGER_CAT) $(DL_DIR)/$(VM-MESSENGER_SOURCE) | tar -C $(TARGET_DIR)/$(VM-MESSENGER_TARGET_DIR) $(TAR_OPTIONS) -
+ mv $(TARGET_DIR)/$(VM-MESSENGER_TARGET_DIR)/messenger-$(VM-MESSENGER_VER)/* $(TARGET_DIR)/$(VM-MESSENGER_TARGET_DIR)/
+ rmdir $(TARGET_DIR)/$(VM-MESSENGER_TARGET_DIR)/messenger-$(VM-MESSENGER_VER)
+ chmod -R 755 $(TARGET_DIR)/$(VM-MESSENGER_TARGET_DIR)
+
+vm-messenger-clean:
+ -rm -rf $(TARGET_DIR)/$(VM-MESSENGER_TARGET_DIR)
+
+vm-messenger-dirclean:
+ -rm -rf $(TARGET_DIR)/$(VM-MESSENGER_TARGET_DIR)
+
+vm-messenger: uclibc asterisk minihttpd
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_VM-MESSENGER)),y)
+TARGETS+=vm-messenger
+endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-09-17 16:19:22
|
Revision: 1250
http://astlinux.svn.sourceforge.net/astlinux/?rev=1250&view=rev
Author: krisk84
Date: 2007-09-17 09:19:21 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
add support for unixodbc
Modified Paths:
--------------
trunk/package/Config.in
Added Paths:
-----------
trunk/package/unixodbc/
trunk/package/unixodbc/Config.in
trunk/package/unixodbc/unixodbc.mk
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2007-09-14 16:57:39 UTC (rev 1249)
+++ trunk/package/Config.in 2007-09-17 16:19:21 UTC (rev 1250)
@@ -179,6 +179,7 @@
source "package/ttcp/Config.in"
source "package/udev/Config.in"
source "package/udhcp/Config.in"
+source "package/unixodbc/Config.in"
source "package/usbutils/Config.in"
source "package/util-linux/Config.in"
source "package/valgrind/Config.in"
Added: trunk/package/unixodbc/Config.in
===================================================================
--- trunk/package/unixodbc/Config.in (rev 0)
+++ trunk/package/unixodbc/Config.in 2007-09-17 16:19:21 UTC (rev 1250)
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_UNIXODBC
+ bool "unixodbc"
+ default n
+ help
+
+ Connect to ODBC resources from Linux systems
+
+ http://www.unixodbc.org
Added: trunk/package/unixodbc/unixodbc.mk
===================================================================
--- trunk/package/unixodbc/unixodbc.mk (rev 0)
+++ trunk/package/unixodbc/unixodbc.mk 2007-09-17 16:19:21 UTC (rev 1250)
@@ -0,0 +1,59 @@
+#############################################################
+#
+# unixodbc
+#
+#############################################################
+
+UNIXODBC_SITE:=http://www.unixodbc.org
+UNIXODBC_DIR:=$(BUILD_DIR)/unixODBC-2.2.12
+UNIXODBC_SOURCE:=unixODBC-2.2.12.tar.gz
+
+$(DL_DIR)/$(UNIXODBC_SOURCE):
+ $(WGET) -P $(DL_DIR) $(UNIXODBC_SITE)/$(UNIXODBC_SOURCE)
+
+$(UNIXODBC_DIR)/.unpacked: $(DL_DIR)/$(UNIXODBC_SOURCE)
+ zcat $(DL_DIR)/$(UNIXODBC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(UNIXODBC_DIR) package/unixodbc/ unixodbc\*.patch
+ touch $(UNIXODBC_DIR)/.unpacked
+
+$(UNIXODBC_DIR)/.configured: $(UNIXODBC_DIR)/.unpacked
+ (cd $(UNIXODBC_DIR); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-static \
+ --enable-gui=no \
+ $(DISABLE_NLS) \
+ );
+ touch $(UNIXODBC_DIR)/.configured
+
+$(UNIXODBC_DIR)/exe/isql: $(UNIXODBC_DIR)/.configured
+ $(MAKE) -C $(UNIXODBC_DIR)
+
+$(TARGET_DIR)/usr/bin/isql: $(UNIXODBC_DIR)/exe/isql
+ $(MAKE1) -C $(UNIXODBC_DIR) DESTDIR=$(STAGING_DIR) install
+
+unixodbc: uclibc $(TARGET_DIR)/usr/bin/isql
+
+unixodbc-source: $(DL_DIR)/$(UNIXODBC_SOURCE)
+
+unixodbc-clean:
+ $(MAKE) -C $(UNIXODBC_DIR) clean
+ rm -f $(TARGET_DIR)/etc/ssh
+ rm -f $(TARGET_DIR)/etc/init.d/sshd
+
+unixodbc-dirclean:
+ rm -rf $(UNIXODBC_DIR)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_UNIXODBC)),y)
+TARGETS+=unixodbc
+endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2007-11-05 06:53:35
|
Revision: 1358
http://astlinux.svn.sourceforge.net/astlinux/?rev=1358&view=rev
Author: krisk84
Date: 2007-11-04 22:53:38 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
make padlock apply to the c7 as well
Modified Paths:
--------------
trunk/package/minihttpd/minihttpd.mk
trunk/package/openssh/openssh.mk
trunk/package/openssl/openssl.mk
trunk/package/openvpn/openvpn.mk
Modified: trunk/package/minihttpd/minihttpd.mk
===================================================================
--- trunk/package/minihttpd/minihttpd.mk 2007-11-05 06:08:21 UTC (rev 1357)
+++ trunk/package/minihttpd/minihttpd.mk 2007-11-05 06:53:38 UTC (rev 1358)
@@ -18,6 +18,9 @@
$(MINIHTTPD_DIR)/.unpacked: $(DL_DIR)/$(MINIHTTPD_SOURCE)
$(MINIHTTPD_CAT) $(DL_DIR)/$(MINIHTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ifeq ($(strip $(BR2_TARGET_VIAC7)),y)
+ toolchain/patch-kernel.sh $(MINIHTTPD_DIR) package/minihttpd/ padlock\*.patch
+endif
ifeq ($(strip $(BR2_TARGET_VIA)),y)
toolchain/patch-kernel.sh $(MINIHTTPD_DIR) package/minihttpd/ padlock\*.patch
endif
Modified: trunk/package/openssh/openssh.mk
===================================================================
--- trunk/package/openssh/openssh.mk 2007-11-05 06:08:21 UTC (rev 1357)
+++ trunk/package/openssh/openssh.mk 2007-11-05 06:53:38 UTC (rev 1358)
@@ -13,6 +13,9 @@
$(OPENSSH_DIR)/.unpacked: $(DL_DIR)/$(OPENSSH_SOURCE)
zcat $(DL_DIR)/$(OPENSSH_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ifeq ($(strip $(BR2_TARGET_VIAC7)),y)
+ toolchain/patch-kernel.sh $(OPENSSH_DIR) package/openssh/ padlock\*.patch
+endif
ifeq ($(strip $(BR2_TARGET_VIA)),y)
toolchain/patch-kernel.sh $(OPENSSH_DIR) package/openssh/ padlock\*.patch
endif
Modified: trunk/package/openssl/openssl.mk
===================================================================
--- trunk/package/openssl/openssl.mk 2007-11-05 06:08:21 UTC (rev 1357)
+++ trunk/package/openssl/openssl.mk 2007-11-05 06:53:38 UTC (rev 1358)
@@ -29,6 +29,9 @@
openssl-unpack: $(OPENSSL_DIR)/.unpacked
$(OPENSSL_DIR)/.unpacked: $(DL_DIR)/$(OPENSSL_SOURCE)
gunzip -c $(DL_DIR)/$(OPENSSL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ifeq ($(strip $(BR2_TARGET_VIAC7)),y)
+ toolchain/patch-kernel.sh $(OPENSSL_DIR) package/openssl/ padlock\*.patch
+endif
ifeq ($(strip $(BR2_TARGET_VIA)),y)
toolchain/patch-kernel.sh $(OPENSSL_DIR) package/openssl/ padlock\*.patch
endif
Modified: trunk/package/openvpn/openvpn.mk
===================================================================
--- trunk/package/openvpn/openvpn.mk 2007-11-05 06:08:21 UTC (rev 1357)
+++ trunk/package/openvpn/openvpn.mk 2007-11-05 06:53:38 UTC (rev 1358)
@@ -29,6 +29,9 @@
$(OPENVPN_DIR)/.unpacked: $(DL_DIR)/$(OPENVPN_SOURCE)
$(OPENVPN_CAT) $(DL_DIR)/$(OPENVPN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ifeq ($(strip $(BR2_TARGET_VIAC7)),y)
+ toolchain/patch-kernel.sh $(OPENVPN_DIR) package/openvpn/ padlock\*.patch
+endif
ifeq ($(strip $(BR2_TARGET_VIA)),y)
toolchain/patch-kernel.sh $(OPENVPN_DIR) package/openvpn/ padlock\*.patch
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2008-01-02 16:14:35
|
Revision: 1473
http://astlinux.svn.sourceforge.net/astlinux/?rev=1473&view=rev
Author: krisk84
Date: 2008-01-02 08:14:37 -0800 (Wed, 02 Jan 2008)
Log Message:
-----------
make sure busybox vi and vim don't clash
Modified Paths:
--------------
trunk/package/busybox/busybox.mk
trunk/package/config/conf
trunk/package/config/mconf
Modified: trunk/package/busybox/busybox.mk
===================================================================
--- trunk/package/busybox/busybox.mk 2008-01-02 16:07:33 UTC (rev 1472)
+++ trunk/package/busybox/busybox.mk 2008-01-02 16:14:37 UTC (rev 1473)
@@ -68,6 +68,9 @@
$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
$(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)/.config
endif
+ifeq ($(strip $(BR2_PACKAGE_VIM)),y)
+ $(SED) "s/^.*CONFIG_VI.*/CONFIG_VI=n/" $(BUSYBOX_DIR)/.config
+endif
yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
touch $@
Modified: trunk/package/config/conf
===================================================================
(Binary files differ)
Modified: trunk/package/config/mconf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dha...@us...> - 2008-01-08 23:34:01
|
Revision: 1494
http://astlinux.svn.sourceforge.net/astlinux/?rev=1494&view=rev
Author: dhartman
Date: 2008-01-08 15:34:04 -0800 (Tue, 08 Jan 2008)
Log Message:
-----------
merge asterisk-gui from asterisk-beta branch
Modified Paths:
--------------
trunk/package/Config.in
Added Paths:
-----------
trunk/package/asterisk-gui/
trunk/package/asterisk-gui/Config.in
trunk/package/asterisk-gui/asterisk-gui.mk
trunk/package/asterisk-gui/configs/
trunk/package/asterisk-gui/configs/http.conf
trunk/package/asterisk-gui/configs/manager.conf
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2008-01-08 20:37:20 UTC (rev 1493)
+++ trunk/package/Config.in 2008-01-08 23:34:04 UTC (rev 1494)
@@ -29,6 +29,7 @@
source "package/alsa-utils/Config.in"
source "package/arno-fw/Config.in"
source "package/asterisk/Config.in"
+source "package/asterisk-gui/Config.in"
source "package/app_bundle/Config.in"
source "package/mqueue-isdn/Config.in"
source "package/digiumg729/Config.in"
Added: trunk/package/asterisk-gui/Config.in
===================================================================
--- trunk/package/asterisk-gui/Config.in (rev 0)
+++ trunk/package/asterisk-gui/Config.in 2008-01-08 23:34:04 UTC (rev 1494)
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_ASTERISK-GUI
+ bool "asterisk-gui"
+ default n
+ help
+ The GUI for Asterisk 1.4.
+
+ http://www.asterisk.org/
Added: trunk/package/asterisk-gui/asterisk-gui.mk
===================================================================
--- trunk/package/asterisk-gui/asterisk-gui.mk (rev 0)
+++ trunk/package/asterisk-gui/asterisk-gui.mk 2008-01-08 23:34:04 UTC (rev 1494)
@@ -0,0 +1,70 @@
+#############################################################
+#
+# asterisk-gui
+#
+##############################################################
+ASTERISK-GUI_VERSION := 1.4-r2051
+ASTERISK-GUI_SOURCE := asterisk-gui-$(ASTERISK-GUI_VERSION).tar.gz
+ASTERISK-GUI_SITE := http://svn.digium.com/svn/asterisk-gui/trunk
+ASTERISK-GUI_DIR := $(BUILD_DIR)/asterisk-gui-$(ASTERISK-GUI_VERSION)
+ASTERISK-GUI_BINARY := tools/ztscan
+ASTERISK-GUI_TARGET_BINARY := sbin/ztscan
+
+$(DL_DIR)/$(ASTERISK-GUI_SOURCE):
+ svn co -r 2051 $(ASTERISK-GUI_SITE) $(DL_DIR)/asterisk-gui-$(ASTERISK-GUI_VERSION)
+ (cd $(DL_DIR); tar czf $(ASTERISK-GUI_SOURCE) asterisk-gui-$(ASTERISK-GUI_VERSION))
+
+$(ASTERISK-GUI_DIR)/.source: $(DL_DIR)/$(ASTERISK-GUI_SOURCE)
+ zcat $(DL_DIR)/$(ASTERISK-GUI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(ASTERISK-GUI_DIR) package/asterisk-gui/ asterisk-gui\*.patch
+ touch $(ASTERISK-GUI_DIR)/.source
+
+$(ASTERISK-GUI_DIR)/.configured: $(ASTERISK-GUI_DIR)/.source
+ (cd $(ASTERISK-GUI_DIR); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/ \
+ --exec-prefix=/usr \
+ --libdir=/usr/lib \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --sysconfdir=/etc \
+ );
+ touch $(ASTERISK-GUI_DIR)/.configured;
+
+$(ASTERISK-GUI_DIR)/$(ASTERISK-GUI_BINARY): $(ASTERISK-GUI_DIR)/.configured
+ $(MAKE1) -C $(ASTERISK-GUI_DIR) HOSTCC=gcc $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" ASTETCDIR=$(TARGET_DIR)/stat/etc/asterisk \
+ ASTVARLIBDIR=$(TARGET_DIR)/stat/var/lib/asterisk PBX_ZAPTEL=1
+
+$(TARGET_DIR)/$(ASTERISK-GUI_TARGET_BINARY): $(ASTERISK-GUI_DIR)/$(ASTERISK-GUI_BINARY)
+ $(MAKE1) -C $(ASTERISK-GUI_DIR) HOSTCC=gcc $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" ASTETCDIR=$(TARGET_DIR)/stat/etc/asterisk \
+ ASTVARLIBDIR=$(TARGET_DIR)/stat/var/lib/asterisk install
+ cp -a package/asterisk-gui/configs/* $(TARGET_DIR)/stat/etc/asterisk/
+
+asterisk-gui: uclibc zaptel asterisk $(TARGET_DIR)/$(ASTERISK-GUI_TARGET_BINARY)
+
+asterisk-gui-source: $(DL_DIR)/$(ASTERISK-GUI_SOURCE)
+
+asterisk-gui-unpack: $(ASTERISK-GUI_DIR)/.configured
+
+asterisk-gui-clean:
+ rm -Rf $(TARGET_DIR)/stat/var/lib/asterisk/http-static
+ # leave the configs for now
+
+asterisk-gui-dirclean:
+ rm -rf $(ASTERISK-GUI_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_ASTERISK-GUI)),y)
+TARGETS+=asterisk-gui
+endif
Added: trunk/package/asterisk-gui/configs/http.conf
===================================================================
--- trunk/package/asterisk-gui/configs/http.conf (rev 0)
+++ trunk/package/asterisk-gui/configs/http.conf 2008-01-08 23:34:04 UTC (rev 1494)
@@ -0,0 +1,22 @@
+;
+; Asterisk Builtin mini-HTTP server
+; Modified for use with asterisk-gui in AstLinux
+;
+[general]
+;
+; Whether HTTP interface is enabled or not. Default is no.
+;
+enabled=yes
+;
+; Whether Asterisk should serve static content from http-static
+; Default is no.
+;
+enablestatic=yes
+;
+; Address to bind to. Default is 0.0.0.0
+;
+bindaddr=0.0.0.0
+;
+; Port to bind to (default is 8088)
+;
+bindport=8088
Property changes on: trunk/package/asterisk-gui/configs/http.conf
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/package/asterisk-gui/configs/manager.conf
===================================================================
--- trunk/package/asterisk-gui/configs/manager.conf (rev 0)
+++ trunk/package/asterisk-gui/configs/manager.conf 2008-01-08 23:34:04 UTC (rev 1494)
@@ -0,0 +1,68 @@
+;
+; AMI - The Asterisk Manager Interface
+; Modified for use with asterisk-gui on AstLinux
+;
+; THIS IS INSECURE! CHANGE THE PASSWORD!!!
+;
+; Third party application call management support and PBX event supervision
+;
+; This configuration file is read every time someone logs in
+;
+; Use the "manager list commands" at the CLI to list available manager commands
+; and their authorization levels.
+;
+; "manager show command <command>" will show a help text.
+;
+; ---------------------------- SECURITY NOTE -------------------------------
+; Note that you should not enable the AMI on a public IP address. If needed,
+; block this TCP port with iptables (or another FW software) and reach it
+; with IPsec, SSH, or SSL vpn tunnel. You can also make the manager
+; interface available over http if Asterisk's http server is enabled in
+; http.conf and if both "enabled" and "webenabled" are set to yes in
+; this file. Both default to no. httptimeout provides the maximum
+; timeout in seconds before a web based session is discarded. The
+; default is 60 seconds.
+;
+[general]
+displaysystemname = yes
+enabled = yes
+webenabled = yes
+port = 5038
+
+httptimeout = 60
+; a) httptimeout sets the Max-Age of the http cookie
+; b) httptimeout is the amount of time the webserver waits
+; on a action=waitevent request (actually its httptimeout-10)
+; c) httptimeout is also the amount of time the webserver keeps
+; a http session alive after completing a successful action
+
+; THIS IS INSECURE! CHANGE THE BINDADDR!!!
+bindaddr = 0.0.0.0
+;displayconnects = yes
+;
+; Add a Unix epoch timestamp to events (not action responses)
+;
+;timestampevents = yes
+
+; Web interface user for AstLinux
+
+; THIS IS INSECURE! CHANGE THE PASSWORD!!!
+[admin]
+secret = astlinux
+read = system,call,log,verbose,command,agent,user,config
+write = system,call,log,verbose,command,agent,user,config
+
+;[mark]
+;secret = mysecret
+;deny=0.0.0.0/0.0.0.0
+;permit=209.16.236.73/255.255.255.0
+;
+; If the device connected via this user accepts input slowly,
+; the timeout for writes to it can be increased to keep it
+; from being disconnected (value is in milliseconds)
+;
+; writetimeout = 100
+;
+; Authorization for various classes
+;read = system,call,log,verbose,command,agent,user,config
+;write = system,call,log,verbose,command,agent,user,config
Property changes on: trunk/package/asterisk-gui/configs/manager.conf
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dha...@us...> - 2008-01-22 21:39:08
|
Revision: 1546
http://astlinux.svn.sourceforge.net/astlinux/?rev=1546&view=rev
Author: dhartman
Date: 2008-01-22 13:39:10 -0800 (Tue, 22 Jan 2008)
Log Message:
-----------
initial experimental tag to menuconfig
Modified Paths:
--------------
trunk/package/Config.in
trunk/package/which/Config.in
trunk/package/xorg/Config.in
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2008-01-22 21:11:55 UTC (rev 1545)
+++ trunk/package/Config.in 2008-01-22 21:39:10 UTC (rev 1546)
@@ -1,6 +1,17 @@
menu "Package Selection for the target"
+config BR2_PACKAGE_EXPERIMENTAL
+ bool "Enable Experimental/Test Packages"
+ default n
+ help
+ Select this to enable packages that are either not
+ currently maintained by the Astlinux team or are in
+ the testing phase.
+ WARNING!!! Not all packages will build. May break
+ other functions that do work. USE AT YOUR OWN RISK.
+
+
comment "The default minimal system"
source "package/busybox/Config.in"
# source "package/linux/Config.in"
Modified: trunk/package/which/Config.in
===================================================================
--- trunk/package/which/Config.in 2008-01-22 21:11:55 UTC (rev 1545)
+++ trunk/package/which/Config.in 2008-01-22 21:39:10 UTC (rev 1546)
@@ -1,6 +1,7 @@
config BR2_PACKAGE_WHICH
bool "which"
default n
+ depends on BR2_PACKAGE_EXPERIMENTAL
help
The standard 'which' utility.
Modified: trunk/package/xorg/Config.in
===================================================================
--- trunk/package/xorg/Config.in 2008-01-22 21:11:55 UTC (rev 1545)
+++ trunk/package/xorg/Config.in 2008-01-22 21:39:10 UTC (rev 1546)
@@ -2,6 +2,7 @@
bool "X.org X Window System"
default n
depends !BR2_PACKAGE_TINYX
+ depends on BR2_PACKAGE_EXPERIMENTAL
help
The official X Window system and server.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2008-03-20 03:27:40
|
Revision: 1672
http://astlinux.svn.sourceforge.net/astlinux/?rev=1672&view=rev
Author: krisk84
Date: 2008-03-19 20:27:46 -0700 (Wed, 19 Mar 2008)
Log Message:
-----------
more BR2_PACKAGE_READLINE fixes
Modified Paths:
--------------
trunk/package/ipsec-tools/Config.in
trunk/package/sqlite/Config.in
Modified: trunk/package/ipsec-tools/Config.in
===================================================================
--- trunk/package/ipsec-tools/Config.in 2008-03-20 03:26:29 UTC (rev 1671)
+++ trunk/package/ipsec-tools/Config.in 2008-03-20 03:27:46 UTC (rev 1672)
@@ -44,7 +44,7 @@
config BR2_PACKAGE_IPSEC_TOOLS_READLINE
default n
depends on BR2_PACKAGE_IPSEC_TOOLS
- select BR2_READLINE
+ select BR2_PACKAGE_READLINE
bool "Enable readline input support if available."
config BR2_PACKAGE_IPSEC_TOOLS_LIBS
Modified: trunk/package/sqlite/Config.in
===================================================================
--- trunk/package/sqlite/Config.in 2008-03-20 03:26:29 UTC (rev 1671)
+++ trunk/package/sqlite/Config.in 2008-03-20 03:27:46 UTC (rev 1672)
@@ -2,7 +2,7 @@
bool "sqlite"
default n
depends on BR2_PACKAGE_EXPERIMENTAL
- select BR2_READLINE
+ select BR2_PACKAGE_READLINE
select BR2_PACKAGE_NCURSES
help
SQLite is a small C library that implements a self-contained, embeddable,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X