Menu
▾
▴
astlinux-commits — Commits to the AstLinux SVN repository
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(6) |
Jul
(14) |
Aug
(156) |
Sep
(35) |
Oct
(48) |
Nov
(55) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(24) |
Feb
(154) |
Mar
(139) |
Apr
(175) |
May
(87) |
Jun
(34) |
Jul
(42) |
Aug
(68) |
Sep
(41) |
Oct
(76) |
Nov
(77) |
Dec
(50) |
| 2008 |
Jan
(98) |
Feb
(43) |
Mar
(102) |
Apr
(27) |
May
(55) |
Jun
(13) |
Jul
(58) |
Aug
(62) |
Sep
(61) |
Oct
(43) |
Nov
(87) |
Dec
(134) |
| 2009 |
Jan
(175) |
Feb
(106) |
Mar
(58) |
Apr
(41) |
May
(74) |
Jun
(123) |
Jul
(252) |
Aug
(192) |
Sep
(69) |
Oct
(38) |
Nov
(117) |
Dec
(95) |
| 2010 |
Jan
(146) |
Feb
(76) |
Mar
(90) |
Apr
(60) |
May
(23) |
Jun
(19) |
Jul
(208) |
Aug
(140) |
Sep
(103) |
Oct
(114) |
Nov
(50) |
Dec
(47) |
| 2011 |
Jan
(59) |
Feb
(47) |
Mar
(61) |
Apr
(58) |
May
(41) |
Jun
(11) |
Jul
(17) |
Aug
(49) |
Sep
(34) |
Oct
(166) |
Nov
(38) |
Dec
(70) |
| 2012 |
Jan
(87) |
Feb
(37) |
Mar
(28) |
Apr
(25) |
May
(29) |
Jun
(30) |
Jul
(43) |
Aug
(27) |
Sep
(46) |
Oct
(27) |
Nov
(51) |
Dec
(70) |
| 2013 |
Jan
(92) |
Feb
(34) |
Mar
(58) |
Apr
(37) |
May
(46) |
Jun
(9) |
Jul
(38) |
Aug
(22) |
Sep
(28) |
Oct
(42) |
Nov
(44) |
Dec
(34) |
| 2014 |
Jan
(63) |
Feb
(39) |
Mar
(48) |
Apr
(31) |
May
(21) |
Jun
(43) |
Jul
(36) |
Aug
(69) |
Sep
(53) |
Oct
(56) |
Nov
(46) |
Dec
(49) |
| 2015 |
Jan
(63) |
Feb
(35) |
Mar
(30) |
Apr
(38) |
May
(27) |
Jun
(42) |
Jul
(42) |
Aug
(63) |
Sep
(18) |
Oct
(45) |
Nov
(65) |
Dec
(71) |
| 2016 |
Jan
(54) |
Feb
(79) |
Mar
(59) |
Apr
(38) |
May
(32) |
Jun
(46) |
Jul
(42) |
Aug
(30) |
Sep
(58) |
Oct
(33) |
Nov
(98) |
Dec
(59) |
| 2017 |
Jan
(79) |
Feb
(12) |
Mar
(43) |
Apr
(32) |
May
(76) |
Jun
(59) |
Jul
(44) |
Aug
(14) |
Sep
|
Oct
|
Nov
|
Dec
|
|
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: <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: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 07:04:55
|
Revision: 228 Author: krisk84 Date: 2006-08-11 00:04:51 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=228&view=rev Log Message: ----------- openntpd fix, flite makefile tweaks Modified Paths: -------------- trunk/package/flite/flite.mk trunk/package/openntpd/openntpd.mk Modified: trunk/package/flite/flite.mk =================================================================== --- trunk/package/flite/flite.mk 2006-08-11 05:34:49 UTC (rev 227) +++ trunk/package/flite/flite.mk 2006-08-11 07:04:51 UTC (rev 228) @@ -35,7 +35,7 @@ $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(FLITE_DIR) $(TARGET_DIR)/$(FLITE_TARGET_BINARY): $(FLITE_DIR)/$(FLITE_BINARY) - install -D $(FLITE_DIR)/$(FLITE_BINARY) $(TARGET_DIR)/$(FLITE_TARGET_BINARY) + $(INSTALL) -D -m 0755 $(FLITE_DIR)/$(FLITE_BINARY) $(TARGET_DIR)/$(FLITE_TARGET_BINARY) $(STRIP) $(TARGET_DIR)/$(FLITE_TARGET_BINARY) flite: uclibc $(TARGET_DIR)/$(FLITE_TARGET_BINARY) Modified: trunk/package/openntpd/openntpd.mk =================================================================== --- trunk/package/openntpd/openntpd.mk 2006-08-11 05:34:49 UTC (rev 227) +++ trunk/package/openntpd/openntpd.mk 2006-08-11 07:04:51 UTC (rev 228) @@ -42,6 +42,7 @@ $(INSTALL) -D -m 0755 package/openntpd/ntpd.init $(TARGET_DIR)/etc/init.d/ntpd echo "_ntp:x:123:123:OpenNTPD:/usr/share/empty:/bin/false" >> $(TARGET_DIR)/etc/passwd echo "_ntp:!:3656:0:99999:7:::" >> $(TARGET_DIR)/etc/shadow + chmod 750 $(TARGET_DIR)/usr/share/empty rm -Rf $(TARGET_DIR)/usr/man rm $(TARGET_DIR)/etc/ntpd.conf ln -sf /tmp/etc/ntpd.conf $(TARGET_DIR)/etc/ntpd.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-11 05:34:52
|
Revision: 227 Author: krisk84 Date: 2006-08-10 22:34:49 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=227&view=rev Log Message: ----------- vsftpd version bump and makefile tweak Modified Paths: -------------- trunk/package/vsftpd/vsftpd.mk Modified: trunk/package/vsftpd/vsftpd.mk =================================================================== --- trunk/package/vsftpd/vsftpd.mk 2006-08-11 05:30:28 UTC (rev 226) +++ trunk/package/vsftpd/vsftpd.mk 2006-08-11 05:34:49 UTC (rev 227) @@ -3,7 +3,7 @@ # vsftpd # ############################################################# -VSFTPD_VER:=2.0.4 +VSFTPD_VER:=2.0.5 VSFTPD_SOURCE:=vsftpd-$(VSFTPD_VER).tar.gz VSFTPD_SITE:=ftp://vsftpd.beasts.org/users/cevans/ VSFTPD_DIR:=$(BUILD_DIR)/vsftpd-$(VSFTPD_VER) @@ -29,7 +29,7 @@ $(INSTALL) -D -m 0755 $(VSFTPD_DIR)/$(VSFTPD_BINARY) $(TARGET_DIR)/$(VSFTPD_TARGET_BINARY) $(INSTALL) -D -m 0755 package/vsftpd/vsftpd.init $(TARGET_DIR)/etc/init.d/vsftpd ln -sf /tmp/etc/vsftpd.conf $(TARGET_DIR)/etc/vsftpd.conf - mkdir $(TARGET_DIR)/usr/share/empty + mkdir -p $(TARGET_DIR)/usr/share/empty vsftpd: uclibc $(TARGET_DIR)/$(VSFTPD_TARGET_BINARY) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-11 05:30:33
|
Revision: 226 Author: krisk84 Date: 2006-08-10 22:30:28 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=226&view=rev Log Message: ----------- openssh version bump - rejoice it is much more cross-compile friendly Modified Paths: -------------- trunk/package/openssh/openssh.mk Removed Paths: ------------- trunk/package/openssh/openssh.patch Modified: trunk/package/openssh/openssh.mk =================================================================== --- trunk/package/openssh/openssh.mk 2006-08-11 05:15:24 UTC (rev 225) +++ trunk/package/openssh/openssh.mk 2006-08-11 05:30:28 UTC (rev 226) @@ -5,15 +5,15 @@ ############################################################# OPENSSH_SITE:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable -OPENSSH_DIR:=$(BUILD_DIR)/openssh-3.9p1 -OPENSSH_SOURCE:=openssh-3.9p1.tar.gz +OPENSSH_DIR:=$(BUILD_DIR)/openssh-4.3p2 +OPENSSH_SOURCE:=openssh-4.3p2.tar.gz $(DL_DIR)/$(OPENSSH_SOURCE): $(WGET) -P $(DL_DIR) $(OPENSSH_SITE)/$(OPENSSH_SOURCE) $(OPENSSH_DIR)/.unpacked: $(DL_DIR)/$(OPENSSH_SOURCE) zcat $(DL_DIR)/$(OPENSSH_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(OPENSSH_DIR) package/openssh/ openssh\*.patch + # toolchain/patch-kernel.sh $(OPENSSH_DIR) package/openssh/ openssh\*.patch touch $(OPENSSH_DIR)/.unpacked $(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked Deleted: trunk/package/openssh/openssh.patch =================================================================== --- trunk/package/openssh/openssh.patch 2006-08-11 05:15:24 UTC (rev 225) +++ trunk/package/openssh/openssh.patch 2006-08-11 05:30:28 UTC (rev 226) @@ -1,289 +0,0 @@ ---- openssh-3.6.1p1/Makefile.in.orig 2003-03-20 17:34:34.000000000 -0700 -+++ openssh-3.6.1p1/Makefile.in 2003-04-25 17:09:00.000000000 -0600 -@@ -27,7 +27,7 @@ - RAND_HELPER=$(libexecdir)/ssh-rand-helper - PRIVSEP_PATH=@PRIVSEP_PATH@ - SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ --STRIP_OPT=@STRIP_OPT@ -+STRIP_OPT= - - PATHS= -DSSHDIR=\"$(sysconfdir)\" \ - -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ ---- openssh-3.8p1/configure.ac.orig 2004-02-23 22:47:04.000000000 -0700 -+++ openssh-3.8p1/configure.ac 2004-03-19 01:41:47.000000000 -0700 -@@ -481,6 +481,9 @@ - [ - AC_MSG_RESULT(no) - AC_MSG_ERROR([*** compiler cannot create working executables, check config.log ***]) -+ ], -+ [AC_MSG_RESULT(yes) -+ AC_MSG_WARN([Cannot run test when crosscompiling, defaulted to yes.]) - ] - ) - -@@ -632,6 +635,9 @@ - else - AC_MSG_WARN([zlib version may have security problems]) - fi -+ ], -+ [AC_MSG_RESULT(yes) -+ AC_MSG_WARN([Cannot run test when crosscompiling, defaulted to yes.]) - ] - ) - -@@ -696,6 +702,9 @@ - [ - AC_MSG_RESULT(no) - AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME) -+ ], -+ [AC_MSG_RESULT(yes) -+ AC_MSG_WARN([Cannot run test when crosscompiling, defaulted to yes.]) - ] - ) - -@@ -727,6 +736,9 @@ - [ - AC_MSG_RESULT(no) - AC_MSG_ERROR([** Incomplete or missing s/key libraries.]) -+ ], -+ [AC_MSG_RESULT(yes) -+ AC_MSG_WARN([Cannot run test when crosscompiling, defaulted to yes.]) - ]) - fi - ] -@@ -840,7 +852,11 @@ - ], - [AC_MSG_RESULT(yes)], - [AC_DEFINE(BROKEN_SETRESUID) -- AC_MSG_RESULT(not implemented)] -+ AC_MSG_RESULT(not implemented) -+ ], -+ [AC_MSG_RESULT(yes) -+ AC_MSG_WARN([Cannot run test when crosscompiling, defaulted to yes.]) -+ ] - ) - ]) - -@@ -854,7 +870,11 @@ - ], - [AC_MSG_RESULT(yes)], - [AC_DEFINE(BROKEN_SETRESGID) -- AC_MSG_RESULT(not implemented)] -+ AC_MSG_RESULT(not implemented) -+ ], -+ [AC_MSG_RESULT(yes) -+ AC_MSG_WARN([Cannot run test when crosscompiling, defaulted to yes.]) -+ ] - ) - ]) - -@@ -890,6 +910,9 @@ - AC_MSG_RESULT(no) - AC_DEFINE(BROKEN_SNPRINTF) - AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) -+ ], -+ [AC_MSG_RESULT(yes) -+ AC_MSG_WARN([Cannot run test when crosscompiling, defaulted to yes.]) - ] - ) - fi -@@ -963,7 +986,10 @@ - [ - AC_MSG_RESULT(no) - AC_DEFINE(SSHD_ACQUIRES_CTTY) -- ] -+ ], -+ [AC_MSG_RESULT(yes) -+ AC_MSG_WARN([Cannot run test when crosscompiling, defaulted to yes.]) -+ ] - ) - fi - -@@ -1096,6 +1122,10 @@ - [ - AC_MSG_RESULT(not found) - AC_MSG_ERROR(OpenSSL version header not found.) -+ ], -+ [ -+ ssl_header_ver="0x0090704fL (OpenSSL 0.9.7d 17 Mar 2004)" -+ AC_MSG_WARN([Cannot run test when crosscompiling, defaulted to $ssl_header_ver]) - ] - ) - -@@ -1129,6 +1159,10 @@ - [ - AC_MSG_RESULT(not found) - AC_MSG_ERROR(OpenSSL library not found.) -+ ], -+ [ -+ ssl_header_ver="0x0090704fL (OpenSSL 0.9.7d 17 Mar 2004)" -+ AC_MSG_WARN([Cannot run test when crosscompiling, defaulted to $ssl_library_ver]) - ] - ) - -@@ -1148,7 +1182,11 @@ - AC_MSG_ERROR([Your OpenSSL headers do not match your library. - Check config.log for details. - Also see contrib/findssl.sh for help identifying header/library mismatches.]) -- ] -+ ], -+ [ -+ AC_MSG_RESULT(yes) -+ AC_MSG_WARN([Cannot run test when crosscompiling, defaulted to yes.]) -+ ] - ) - - # Some systems want crypt() from libcrypt, *not* the version in OpenSSL, -@@ -1183,6 +1221,11 @@ - # Default to use of the rand helper if OpenSSL doesn't - # seed itself - USE_RAND_HELPER=yes -+ ], -+ [ -+ OPENSSL_SEEDS_ITSELF=yes -+ AC_MSG_RESULT(yes) -+ AC_MSG_WARN([Cannot run test when crosscompiling, defaulted to yes.]) - ] - ) - -@@ -1773,7 +1816,8 @@ - #else - main() { exit(0); } - #endif -- ], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ] -+ ], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ], -+ [ true ] - ) - fi - -@@ -1893,6 +1937,7 @@ - } - ], - [ ac_cv_have_accrights_in_msghdr="yes" ], -+ [ ac_cv_have_accrights_in_msghdr="no" ], - [ ac_cv_have_accrights_in_msghdr="no" ] - ) - ]) -@@ -1917,7 +1962,8 @@ - } - ], - [ ac_cv_have_control_in_msghdr="yes" ], -- [ ac_cv_have_control_in_msghdr="no" ] -+ [ ac_cv_have_control_in_msghdr="no" ], -+ [ ac_cv_have_control_in_msghdr="yes" ] - ) - ]) - if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then -@@ -2229,12 +2275,9 @@ - ) - fi - fi --AC_CHECK_FILE("/dev/ptc", -- [ -- AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC) -- have_dev_ptc=1 -- ] --) -+AC_MSG_CHECKING([for "/dev/ptc"]) -+AC_MSG_RESULT(no) -+have_dev_ptc=0 - - # Options from here on. Some of these are preset by platform above - AC_ARG_WITH(mantype, -@@ -2329,15 +2372,8 @@ - fi - - # check for /etc/default/login and use it if present. --AC_ARG_ENABLE(etc-default-login, -- [ --disable-etc-default-login Disable using PATH from /etc/default/login [no]],, --[ --AC_CHECK_FILE("/etc/default/login", [ external_path_file=/etc/default/login ]) -- --if test "x$external_path_file" = "x/etc/default/login"; then -- AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN) --fi --]) -+AC_MSG_CHECKING([for "/etc/default/login"]) -+AC_MSG_RESULT(no) - - dnl BSD systems use /etc/login.conf so --with-default-path= has no effect - if test $ac_cv_func_login_getcapbool = "yes" -a \ ---- openssh-3.8p1.orig/sshd_config Fri Sep 27 05:21:58 2002 -+++ openssh-3.8p1/sshd_config Mon Mar 17 14:55:00 2003 -@@ -89,5 +89,8 @@ - #Banner /some/path - #VerifyReverseMapping no - -+ClientAliveInterval 15 -+ClientAliveCountMax 4 -+ - # override default of no subsystems --Subsystem sftp /usr/libexec/sftp-server -+Subsystem sftp /usr/sbin/sftp-server ---- openssh-3.6.1p1/S50sshd Fri Sep 27 05:21:58 2002 -+++ openssh-3.6.1p1/S50sshd Mon Mar 17 14:55:00 2003 -@@ -0,0 +1,64 @@ -+#!/bin/sh -+# -+# sshd Starts sshd. -+# -+ -+# Make sure the ssh-keygen progam exists -+[ -f /usr/bin/ssh-keygen ] || exit 0 -+ -+# Check for the SSH1 RSA key -+if [ ! -f /etc/ssh_host_key ] ; then -+ echo Generating RSA Key... -+ /usr/bin/ssh-keygen -t rsa1 -f /etc/ssh_host_key -C '' -N '' -+fi -+ -+# Check for the SSH2 RSA key -+if [ ! -f /etc/ssh_host_rsa_key ] ; then -+ echo Generating RSA Key... -+ /usr/bin/ssh-keygen -t rsa -f /etc/ssh_host_rsa_key -C '' -N '' -+fi -+ -+# Check for the SSH2 DSA key -+if [ ! -f /etc/ssh_host_dsa_key ] ; then -+ echo Generating DSA Key... -+ echo THIS CAN TAKE A MINUTE OR TWO DEPENDING ON YOUR PROCESSOR! -+ echo -+ /usr/bin/ssh-keygen -t dsa -f /etc/ssh_host_dsa_key -C '' -N '' -+fi -+ -+umask 077 -+ -+start() { -+ echo -n "Starting sshd: " -+ /usr/sbin/sshd -+ touch /var/lock/sshd -+ echo "OK" -+} -+stop() { -+ echo -n "Stopping sshd: " -+ killall sshd -+ rm -f /var/lock/sshd -+ echo "OK" -+} -+restart() { -+ stop -+ start -+} -+ -+case "$1" in -+ start) -+ start -+ ;; -+ stop) -+ stop -+ ;; -+ restart|reload) -+ restart -+ ;; -+ *) -+ echo $"Usage: $0 {start|stop|restart}" -+ exit 1 -+esac -+ -+exit $? -+ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-11 05:15:28
|
Revision: 225 Author: krisk84 Date: 2006-08-10 22:15:24 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=225&view=rev Log Message: ----------- openntpd version bump Modified Paths: -------------- trunk/package/openntpd/openntpd.mk Modified: trunk/package/openntpd/openntpd.mk =================================================================== --- trunk/package/openntpd/openntpd.mk 2006-08-11 05:11:55 UTC (rev 224) +++ trunk/package/openntpd/openntpd.mk 2006-08-11 05:15:24 UTC (rev 225) @@ -3,7 +3,7 @@ # OpenNTPD # ############################################################# -OPENNTPD_VERSION:=3.6.1p1 +OPENNTPD_VERSION:=3.9p1 OPENNTPD_SOURCE:=openntpd-$(OPENNTPD_VERSION).tar.gz OPENNTPD_SITE:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD OPENNTPD_DIR:=$(BUILD_DIR)/openntpd-$(OPENNTPD_VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-11 05:11:59
|
Revision: 224 Author: krisk84 Date: 2006-08-10 22:11:55 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=224&view=rev Log Message: ----------- lcdproc version bump Modified Paths: -------------- trunk/package/lcdproc/lcdproc.mk Modified: trunk/package/lcdproc/lcdproc.mk =================================================================== --- trunk/package/lcdproc/lcdproc.mk 2006-08-11 05:09:10 UTC (rev 223) +++ trunk/package/lcdproc/lcdproc.mk 2006-08-11 05:11:55 UTC (rev 224) @@ -3,10 +3,10 @@ # lcdproc # ############################################################# -LCDPROC_VER:=0.4.5 -LCDPROC_SOURCE:=lcdproc-$(LCDPROC_VER).tar.bz2 +LCDPROC_VER:=0.5.0 +LCDPROC_SOURCE:=lcdproc-$(LCDPROC_VER).tar.gz LCDPROC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lcdproc -LCDPROC_CAT:=bzcat +LCDPROC_CAT:=zcat LCDPROC_DIR:=$(BUILD_DIR)/lcdproc-$(LCDPROC_VER) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-11 05:09:12
|
Revision: 223 Author: krisk84 Date: 2006-08-10 22:09:10 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=223&view=rev Log Message: ----------- dnsmasq version bump and makefile fixes Modified Paths: -------------- trunk/package/dnsmasq/dnsmasq.mk Modified: trunk/package/dnsmasq/dnsmasq.mk =================================================================== --- trunk/package/dnsmasq/dnsmasq.mk 2006-08-11 05:03:22 UTC (rev 222) +++ trunk/package/dnsmasq/dnsmasq.mk 2006-08-11 05:09:10 UTC (rev 223) @@ -5,15 +5,9 @@ ############################################################# DNSMASQ_SITE=http://thekelleys.org.uk/dnsmasq -ifeq ($(filter $(TARGETS),dnsmasq1),) -DNSMASQ_UPVER=2.22 -DNSMASQ_VER=dnsmasq2 -else -DNSMASQ_UPVER=1.18 -DNSMASQ_VER=dnsmasq1 -endif -DNSMASQ_SOURCE=dnsmasq-$(DNSMASQ_UPVER).tar.gz -DNSMASQ_DIR=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_UPVER) +DNSMASQ_VER=2.33 +DNSMASQ_SOURCE=dnsmasq-$(DNSMASQ_VER).tar.gz +DNSMASQ_DIR=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_VER) DNSMASQ_BINARY=dnsmasq DNSMASQ_TARGET_BINARY=usr/sbin/dnsmasq This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-11 05:03:25
|
Revision: 222 Author: krisk84 Date: 2006-08-10 22:03:22 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=222&view=rev Log Message: ----------- astmanproxy version bump Modified Paths: -------------- trunk/package/astmanproxy/astmanproxy.mk Modified: trunk/package/astmanproxy/astmanproxy.mk =================================================================== --- trunk/package/astmanproxy/astmanproxy.mk 2006-08-11 04:57:49 UTC (rev 221) +++ trunk/package/astmanproxy/astmanproxy.mk 2006-08-11 05:03:22 UTC (rev 222) @@ -3,8 +3,8 @@ # astmanproxy # ############################################################# -ASTMANPROXY_VER:=1.13 -ASTMANPROXY_SOURCE:=astmanproxy-$(ASTMANPROXY_VER)-20051224-1315.tgz +ASTMANPROXY_VER:=1.21 +ASTMANPROXY_SOURCE:=astmanproxy-$(ASTMANPROXY_VER).tgz ASTMANPROXY_SITE:=http://www.krisk.org/asterisk ASTMANPROXY_DIR:=$(BUILD_DIR)/astmanproxy-$(ASTMANPROXY_VER) ASTMANPROXY_CAT:=zcat This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-11 04:57:53
|
Revision: 221 Author: krisk84 Date: 2006-08-10 21:57:49 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=221&view=rev Log Message: ----------- chan_skinny version bump and minor install fix Modified Paths: -------------- trunk/package/chansccp/chansccp.mk Modified: trunk/package/chansccp/chansccp.mk =================================================================== --- trunk/package/chansccp/chansccp.mk 2006-08-11 04:54:55 UTC (rev 220) +++ trunk/package/chansccp/chansccp.mk 2006-08-11 04:57:49 UTC (rev 221) @@ -3,7 +3,7 @@ # chansccp # ############################################################# -CHANSCCP_VER:=20060204 +CHANSCCP_VER:=20060408 CHANSCCP_SOURCE:=chan_sccp-$(CHANSCCP_VER).tar.bz2 CHANSCCP_SITE:=ftp://ftp.berlios.de/pub/chan-sccp CHANSCCP_DIR:=$(BUILD_DIR)/chan_sccp-$(CHANSCCP_VER) @@ -27,8 +27,8 @@ OSNAME=Linux INSTALL_PREFIX=$(STAGING_DIR) PROC=$(OPTIMIZE_FOR_CPU) DEBUG= $(TARGET_DIR)/$(CHANSCCP_TARGET_BINARY): $(CHANSCCP_DIR)/$(CHANSCCP_BINARY) - install -D $(CHANSCCP_DIR)/$(CHANSCCP_BINARY) $(TARGET_DIR)/$(CHANSCCP_TARGET_BINARY) - rm $(TARGET_DIR)/usr/lib/asterisk/modules/chan_skinny.so + $(INSTALL) -D -m 0755 $(CHANSCCP_DIR)/$(CHANSCCP_BINARY) $(TARGET_DIR)/$(CHANSCCP_TARGET_BINARY) + -rm $(TARGET_DIR)/usr/lib/asterisk/modules/chan_skinny.so chansccp: uclibc asterisk $(TARGET_DIR)/$(CHANSCCP_TARGET_BINARY) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-11 04:54:57
|
Revision: 220 Author: krisk84 Date: 2006-08-10 21:54:55 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=220&view=rev Log Message: ----------- res_conv install fixes Modified Paths: -------------- trunk/package/resconv/resconv.mk Modified: trunk/package/resconv/resconv.mk =================================================================== --- trunk/package/resconv/resconv.mk 2006-08-11 04:52:48 UTC (rev 219) +++ trunk/package/resconv/resconv.mk 2006-08-11 04:54:55 UTC (rev 220) @@ -26,7 +26,7 @@ AST_HEADER=$(BUILD_DIR)/asterisk/include $(TARGET_DIR)/$(RESCONV_TARGET_BINARY): $(RESCONV_DIR)/$(RESCONV_BINARY) - install -D $(RESCONV_DIR)/$(RESCONV_BINARY) $(TARGET_DIR)/$(RESCONV_TARGET_BINARY) + $(INSTALL) -D -m 0755 $(RESCONV_DIR)/$(RESCONV_BINARY) $(TARGET_DIR)/$(RESCONV_TARGET_BINARY) resconv: uclibc asterisk $(TARGET_DIR)/$(RESCONV_TARGET_BINARY) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-11 04:52:50
|
Revision: 219 Author: krisk84 Date: 2006-08-10 21:52:48 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=219&view=rev Log Message: ----------- install perl symlink with microperl Modified Paths: -------------- trunk/package/microperl/microperl.mk Modified: trunk/package/microperl/microperl.mk =================================================================== --- trunk/package/microperl/microperl.mk 2006-08-11 04:48:35 UTC (rev 218) +++ trunk/package/microperl/microperl.mk 2006-08-11 04:52:48 UTC (rev 219) @@ -19,7 +19,8 @@ $(MAKE) -f Makefile.micro CC=$(TARGET_CC) -C $(MICROPERL_DIR) $(TARGET_DIR)/usr/bin/microperl: $(MICROPERL_DIR)/microperl - cp -dpf $(MICROPERL_DIR)/microperl $(TARGET_DIR)/usr/bin/microperl + install -D -m 0755 $(MICROPERL_DIR)/microperl $(TARGET_DIR)/usr/bin/microperl + ln -s /usr/bin/microperl $(TARGET_DIR)/usr/bin/perl microperl: uclibc $(TARGET_DIR)/usr/bin/microperl @@ -27,6 +28,7 @@ microperl-clean: rm -f $(TARGET_DIR)/usr/bin/microperl + rm -f $(TARGET_DIR)/usr/bin/perl -$(MAKE) -C $(MICROPERL_DIR) clean microperl-dirclean: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-11 04:48:39
|
Revision: 218 Author: krisk84 Date: 2006-08-10 21:48:35 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=218&view=rev Log Message: ----------- msmtp version bump clean and init fixes Modified Paths: -------------- trunk/package/lmsensors/lmsensors.mk trunk/package/msmtp/msmtp.mk trunk/package/netsnmp/netsnmp.mk Modified: trunk/package/lmsensors/lmsensors.mk =================================================================== --- trunk/package/lmsensors/lmsensors.mk 2006-08-10 22:10:25 UTC (rev 217) +++ trunk/package/lmsensors/lmsensors.mk 2006-08-11 04:48:35 UTC (rev 218) @@ -50,6 +50,8 @@ rm -Rf $(STAGING_DIR)/include/lmsensors.h rm -Rf $(STAGING_DIR)/usr/lib/lmsensors* rm -Rf $(TARGET_DIR)/usr/lib/lmsensors* + rm -Rf $(TARGET_DIR)/$(LMSENSORS_TARGET_BINARY) + rm -Rf $(TARGET_DIR)/etc/init.d/lmsensors -$(MAKE) -C $(LMSENSORS_DIR) clean lmsensors-dirclean: Modified: trunk/package/msmtp/msmtp.mk =================================================================== --- trunk/package/msmtp/msmtp.mk 2006-08-10 22:10:25 UTC (rev 217) +++ trunk/package/msmtp/msmtp.mk 2006-08-11 04:48:35 UTC (rev 218) @@ -3,7 +3,7 @@ # msmtp # ############################################################# -MSMTP_VER:=1.4.5 +MSMTP_VER:=1.4.6 MSMTP_SOURCE:=msmtp-$(MSMTP_VER).tar.bz2 MSMTP_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/msmtp/ MSMTP_DIR:=$(BUILD_DIR)/msmtp-$(MSMTP_VER) @@ -37,6 +37,8 @@ $(TARGET_DIR)/$(MSMTP_TARGET_BINARY): $(MSMTP_DIR)/$(MSMTP_BINARY) install -D $(MSMTP_DIR)/$(MSMTP_BINARY) $(TARGET_DIR)/$(MSMTP_TARGET_BINARY) + $(STRIP) $(TARGET_DIR)/$(MSMTP_TARGET_BINARY) + ln -s /usr/sbin/msmtp $(TARGET_DIR)/usr/sbin/sendmail ln -sf /tmp/etc/msmtprc $(TARGET_DIR)/etc/msmtprc msmtp: uclibc $(TARGET_DIR)/$(MSMTP_TARGET_BINARY) Modified: trunk/package/netsnmp/netsnmp.mk =================================================================== --- trunk/package/netsnmp/netsnmp.mk 2006-08-10 22:10:25 UTC (rev 217) +++ trunk/package/netsnmp/netsnmp.mk 2006-08-11 04:48:35 UTC (rev 218) @@ -7,8 +7,6 @@ NETSNMP_URL:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp/ NETSNMP_DIR:=$(BUILD_DIR)/net-snmp-5.3.1 NETSNMP_SOURCE:=net-snmp-5.3.1.tar.gz -#NETSNMP_PATCH1:=net-snmp_5.1.2-6.2.diff.gz -#NETSNMP_PATCH1_URL:=http://ftp.debian.org/debian/pool/main/n/net-snmp/ NETSNMP_MODULES:=host smux ucd-snmp/dlmod udp-mib tcp-mib ip-mib/ipv4InterfaceTable @@ -20,12 +18,8 @@ $(DL_DIR)/$(NETSNMP_SOURCE): $(WGET) -P $(DL_DIR) $(NETSNMP_URL)/$(NETSNMP_SOURCE) -#$(DL_DIR)/$(NETSNMP_PATCH1): -# $(WGET) -P $(DL_DIR) $(NETSNMP_PATCH1_URL)/$(NETSNMP_PATCH1) - $(NETSNMP_DIR)/.unpacked: $(DL_DIR)/$(NETSNMP_SOURCE) $(DL_DIR)/$(NETSNMP_PATCH1) zcat $(DL_DIR)/$(NETSNMP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - -# zcat $(DL_DIR)/$(NETSNMP_PATCH1) | patch -p1 -d $(NETSNMP_DIR) # toolchain/patch-kernel.sh $(NETSNMP_DIR) package/netsnmp/ netsnmp\*.patch touch $(NETSNMP_DIR)/.unpacked @@ -83,13 +77,6 @@ -C $(NETSNMP_DIR) install; rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc - # Copy the .conf files. - # mkdir -p $(TARGET_DIR)/etc/snmp - # cp $(NETSNMP_DIR)/EXAMPLE.conf $(TARGET_DIR)/etc/snmp/snmpd.conf - # cp $(NETSNMP_DIR)/EXAMPLE-trap.conf $(TARGET_DIR)/etc/snmp/snmptrapd.conf - # -mv $(TARGET_DIR)/usr/share/snmp/mib2c*.conf $(TARGET_DIR)/etc/snmp - # mkdir -p $(TARGET_DIR)/etc/default - # cp $(NETSNMP_DIR)/debian/snmpd.default $(TARGET_DIR)/etc/default/snmpd # Remove the unsupported snmpcheck program rm $(TARGET_DIR)/usr/bin/snmpcheck # Remove default config stuff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dha...@us...> - 2006-08-10 22:10:39
|
Revision: 217 Author: dhartman Date: 2006-08-10 15:10:25 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=217&view=rev Log Message: ----------- initial Arno's Firewall integration Modified Paths: -------------- branches/dhartman/package/iptables/iptables.init branches/dhartman/package/iptables/iptables.mk branches/dhartman/target/generic/target_skeleton/etc/rc Added Paths: ----------- branches/dhartman/package/iptables/arno-iptables-firewall.conf branches/dhartman/target/generic/target_skeleton/etc/runlevels/default/S02iptables branches/dhartman/target/generic/target_skeleton/etc/runlevels/default/S03network branches/dhartman/target/generic/target_skeleton/etc/runlevels/default/S04ntpclient Removed Paths: ------------- branches/dhartman/target/generic/target_skeleton/etc/runlevels/default/S02network branches/dhartman/target/generic/target_skeleton/etc/runlevels/default/S03ntpclient Added: branches/dhartman/package/iptables/arno-iptables-firewall.conf =================================================================== --- branches/dhartman/package/iptables/arno-iptables-firewall.conf (rev 0) +++ branches/dhartman/package/iptables/arno-iptables-firewall.conf 2006-08-10 22:10:25 UTC (rev 217) @@ -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: branches/dhartman/package/iptables/iptables.init =================================================================== --- branches/dhartman/package/iptables/iptables.init 2006-08-10 20:59:46 UTC (rev 216) +++ branches/dhartman/package/iptables/iptables.init 2006-08-10 22:10:25 UTC (rev 217) @@ -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[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 -/usr/sbin/astfw + 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" } -stop () { -if [ "$INTIF" ] -then -echo "Stopping iptables..." -sysctl -w net.ipv4.ip_forward=0 -for a in `cat /proc/net/ip_tables_names`; do -/usr/sbin/iptables -F -t $a -/usr/sbin/iptables -X -t $a -if [ "$a" = "nat" ]; then -/usr/sbin/iptables -t nat -P PREROUTING ACCEPT -/usr/sbin/iptables -t nat -P POSTROUTING ACCEPT -/usr/sbin/iptables -t nat -P OUTPUT ACCEPT -elif [ "$a" = "mangle" ]; then -/usr/sbin/iptables -t mangle -P PREROUTING ACCEPT -/usr/sbin/iptables -t mangle -P INPUT ACCEPT -/usr/sbin/iptables -t mangle -P FORWARD ACCEPT -/usr/sbin/iptables -t mangle -P OUTPUT ACCEPT -/usr/sbin/iptables -t mangle -P POSTROUTING ACCEPT -elif [ "$a" = "filter" ]; then -/usr/sbin/iptables -t filter -P INPUT ACCEPT -/usr/sbin/iptables -t filter -P FORWARD ACCEPT -/usr/sbin/iptables -t filter -P OUTPUT ACCEPT -fi -done -fi +# 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 } -case $1 in -start) -start -;; +load_modules() +{ + if [ -f /lib/modules/`uname -r`/kernel/net/ipv4/netfilter/ip_tables.* ]; then + echo "Detected IPTABLES module... Loading additional IPTABLES modules:" -stop) -stop -;; + module_probe ip_tables # Required; all ipv4 mod... [truncated message content] |
|
From: <kr...@us...> - 2006-08-10 20:59:49
|
Revision: 216 Author: krisk84 Date: 2006-08-10 13:59:46 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=216&view=rev Log Message: ----------- soekris lmsensors init fix Modified Paths: -------------- trunk/package/lmsensors/lmsensors.init Modified: trunk/package/lmsensors/lmsensors.init =================================================================== --- trunk/package/lmsensors/lmsensors.init 2006-08-10 19:12:09 UTC (rev 215) +++ trunk/package/lmsensors/lmsensors.init 2006-08-10 20:59:46 UTC (rev 216) @@ -29,7 +29,7 @@ if `grep -q "astlinux=net4801" /proc/cmdline` then -modprobe -q pc87360 init=1 +modprobe -q pc87360 init=2 fi sensors -s This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-10 19:12:14
|
Revision: 215 Author: krisk84 Date: 2006-08-10 12:12:09 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=215&view=rev Log Message: ----------- asterisk log fixes Modified Paths: -------------- trunk/package/asterisk/asterisk.mk trunk/package/lmsensors/lmsensors.init trunk/package/netsnmp/netsnmp.init Added Paths: ----------- trunk/package/asterisk/logger.conf Modified: trunk/package/asterisk/asterisk.mk =================================================================== --- trunk/package/asterisk/asterisk.mk 2006-08-10 18:55:38 UTC (rev 214) +++ trunk/package/asterisk/asterisk.mk 2006-08-10 19:12:09 UTC (rev 215) @@ -71,6 +71,7 @@ touch -c $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY) -rm $(TARGET_DIR)/etc/asterisk/*.old mv $(TARGET_DIR)/etc/asterisk $(TARGET_DIR)/stat/etc/ + $(INSTALL) -D -m 0755 package/asterisk/logger.conf $(TARGET_DIR)/stat/etc/asterisk/logger.conf chmod 750 $(TARGET_DIR)/stat/etc/asterisk chmod 640 $(TARGET_DIR)/stat/etc/asterisk/* ln -sf /tmp/etc/asterisk $(TARGET_DIR)/etc/asterisk Added: trunk/package/asterisk/logger.conf =================================================================== --- trunk/package/asterisk/logger.conf (rev 0) +++ trunk/package/asterisk/logger.conf 2006-08-10 19:12:09 UTC (rev 215) @@ -0,0 +1,69 @@ +; +; Logging Configuration +; +; In this file, you configure logging to files or to +; the syslog system. +; +; "logger reload" at the CLI will reload configuration +; of the logging system. + +[general] +; Customize the display of debug message time stamps +; this example is the ISO 8601 date format (yyyy-mm-dd HH:MM:SS) +; see strftime(3) Linux manual for format specifiers +;dateformat=%F %T +; +; This appends the hostname to the name of the log files. +;appendhostname = yes +; +; This determines whether or not we log queue events to a file +; (defaults to yes). +;queue_log = no +; +; This determines whether or not we log generic events to a file +; (defaults to yes). +;event_log = no +; +; +; For each file, specify what to log. +; +; For console logging, you set options at start of +; Asterisk with -v for verbose and -d for debug +; See 'asterisk -h' for more information. +; +; Directory for log files is configures in asterisk.conf +; option astlogdir +; +[logfiles] +; +; Format is "filename" and then "levels" of debugging to be included: +; debug +; notice +; warning +; error +; verbose +; dtmf +; +; Special filename "console" represents the system console +; +; We highly recommend that you DO NOT turn on debug mode if you are simply +; running a production system. Debug mode turns on a LOT of extra messages, +; most of which you are unlikely to understand without an understanding of +; the underlying code. Do NOT report debug messages as code issues, unless +; you have a specific issue that you are attempting to debug. They are +; messages for just that -- debugging -- and do not rise to the level of +; something that merit your attention as an Asterisk administrator. Debug +; messages are also very verbose and can and do fill up logfiles quickly; +; this is another reason not to have debug mode on a production system unless +; you are in the process of debugging a specific issue. +; +;debug => debug +console => notice,warning,error +;console => notice,warning,error,debug +;messages => notice,warning,error +;full => notice,warning,error,debug,verbose + +;syslog keyword : This special keyword logs to syslog facility +; +syslog.local0 => notice,warning,error +; Modified: trunk/package/lmsensors/lmsensors.init =================================================================== --- trunk/package/lmsensors/lmsensors.init 2006-08-10 18:55:38 UTC (rev 214) +++ trunk/package/lmsensors/lmsensors.init 2006-08-10 19:12:09 UTC (rev 215) @@ -17,7 +17,7 @@ start () { if [ -r /etc/sensors.conf ] then -echo "Configuring sensors" +echo "Configuring sensors..." if [ "$SENSEMODS" ] then Modified: trunk/package/netsnmp/netsnmp.init =================================================================== --- trunk/package/netsnmp/netsnmp.init 2006-08-10 18:55:38 UTC (rev 214) +++ trunk/package/netsnmp/netsnmp.init 2006-08-10 19:12:09 UTC (rev 215) @@ -17,7 +17,7 @@ start () { if [ -f /etc/snmp/snmpd.conf ] then -echo "Starting snmpd" +echo "Starting snmpd..." snmpd -u nobody -g nobody -p /var/run/snmpd.pid fi } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-10 18:55:40
|
Revision: 214 Author: krisk84 Date: 2006-08-10 11:55:38 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=214&view=rev Log Message: ----------- lmsensors init typo fixes Modified Paths: -------------- trunk/package/lmsensors/lmsensors.init Modified: trunk/package/lmsensors/lmsensors.init =================================================================== --- trunk/package/lmsensors/lmsensors.init 2006-08-10 17:33:43 UTC (rev 213) +++ trunk/package/lmsensors/lmsensors.init 2006-08-10 18:55:38 UTC (rev 214) @@ -31,7 +31,8 @@ then modprobe -q pc87360 init=1 fi -lmsensors -s + +sensors -s fi } @@ -41,6 +42,7 @@ echo "Stopping sensors" if [ "$SENSEMODS" ] +then for i in "$SENSEMODS" do modprobe -r $i This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-10 17:33:47
|
Revision: 213 Author: krisk84 Date: 2006-08-10 10:33:43 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=213&view=rev Log Message: ----------- lmsensors/snmp compile fix default config update Modified Paths: -------------- trunk/astlinux.config trunk/package/lmsensors/lmsensors.mk Modified: trunk/astlinux.config =================================================================== --- trunk/astlinux.config 2006-08-10 16:07:35 UTC (rev 212) +++ trunk/astlinux.config 2006-08-10 17:33:43 UTC (rev 213) @@ -34,7 +34,7 @@ BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" BR2_GNU_BUILD_SUFFIX="pc-linux-gnu" -BR2_JLEVEL=1 +BR2_JLEVEL=2 # # Toolchain Options @@ -177,11 +177,10 @@ # BR2_PACKAGE_ASTERISKNATIVESOUNDS_GSM is not set BR2_PACKAGE_ASTERISKNATIVESOUNDS_G729=y # BR2_PACKAGE_ASTERISKNATIVESOUNDS_SLN is not set -BR2_PACKAGE_ASTERISKAPPBUNDLE=y -BR2_PACKAGE_ASTERISKMQUEUE=y +# BR2_PACKAGE_ASTERISKAPPBUNDLE is not set +# BR2_PACKAGE_ASTERISKMQUEUE is not set BR2_PACKAGE_ASTERISKAPPCONFERENCE=y BR2_PACKAGE_DIGIUMG729=y -BR2_PACKAGE_ASTERISKCHANMISDN=y BR2_PACKAGE_ASTMANPROXY=y # BR2_PACKAGE_AT is not set # BR2_PACKAGE_AUTOCONF is not set @@ -243,7 +242,7 @@ # BR2_PACKAGE_LIBUSB is not set # BR2_PACKAGE_LIGHTTPD is not set BR2_PACKAGE_LINKS=y -# BR2_PACKAGE_LMSENSORS is not set +BR2_PACKAGE_LMSENSORS=y # BR2_PACKAGE_LRZSZ is not set # BR2_PACKAGE_LTP-TESTSUITE is not set # BR2_PACKAGE_LTRACE is not set @@ -304,7 +303,7 @@ # BR2_PACKAGE_SOCAT is not set # BR2_PACKAGE_SOX is not set BR2_PACKAGE_STRACE=y -# BR2_PACKAGE_SYSFSUTILS is not set +BR2_PACKAGE_SYSFSUTILS=y # BR2_PACKAGE_SYSKLOGD is not set # BR2_PACKAGE_SYSVINIT is not set # BR2_PACKAGE_TCL is not set Modified: trunk/package/lmsensors/lmsensors.mk =================================================================== --- trunk/package/lmsensors/lmsensors.mk 2006-08-10 16:07:35 UTC (rev 212) +++ trunk/package/lmsensors/lmsensors.mk 2006-08-10 17:33:43 UTC (rev 213) @@ -34,6 +34,10 @@ INCLUDEDIR=$(STAGING_DIR)/include $(TARGET_CONFIGURE_OPTS) MODVER=0 DESTDIR=$(STAGING_DIR) user_install install -D -m 0755 $(STAGING_DIR)/$(LMSENSORS_TARGET_BINARY) $(TARGET_DIR)/$(LMSENSORS_TARGET_BINARY) install -D -m 0755 package/lmsensors/lmsensors.init $(TARGET_DIR)/etc/init.d/lmsensors + # fix broken header install + -cp -a $(STAGING_DIR)$(STAGING_DIR)/* $(STAGING_DIR)/ + # copy libs as well + -cp -a $(STAGING_DIR)/usr/lib/libsensors.s* $(STAGING_DIR)/lib/ $(STRIP) $(TARGET_DIR)/$(LMSENSORS_TARGET_BINARY) cp -a $(STAGING_DIR)/usr/lib/libsensors.s* $(TARGET_DIR)/usr/lib/ touch -c $(TARGET_DIR)/$(LMSENSORS_TARGET_BINARY) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-10 16:07:44
|
Revision: 212 Author: krisk84 Date: 2006-08-10 09:07:35 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=212&view=rev Log Message: ----------- add lmsensors setup call to init script Modified Paths: -------------- trunk/package/lmsensors/lmsensors.init Added Paths: ----------- trunk/target/device/net4801/target_skeleton/stat/ trunk/target/device/net4801/target_skeleton/stat/etc/ trunk/target/device/net4801/target_skeleton/stat/etc/sensors.conf Modified: trunk/package/lmsensors/lmsensors.init =================================================================== --- trunk/package/lmsensors/lmsensors.init 2006-08-10 16:05:25 UTC (rev 211) +++ trunk/package/lmsensors/lmsensors.init 2006-08-10 16:07:35 UTC (rev 212) @@ -31,7 +31,7 @@ then modprobe -q pc87360 init=1 fi - +lmsensors -s fi } Added: trunk/target/device/net4801/target_skeleton/stat/etc/sensors.conf =================================================================== --- trunk/target/device/net4801/target_skeleton/stat/etc/sensors.conf (rev 0) +++ trunk/target/device/net4801/target_skeleton/stat/etc/sensors.conf 2006-08-10 16:07:35 UTC (rev 212) @@ -0,0 +1,117 @@ +chip "pc87366-*" + +# Soekris net4801 configuration + +# Written by Henrik Brix Andersen <br...@ge...> +# Latest version can be found at http://dev.gentoo.org/~brix/ + +# The configuration is partly based on the PC87366 datasheet and +# partly borrowed from the env4801 utility by Poul-Henning +# Kamp <ph...@ph...> + +# Datasheet: http://www.winbond.com/PDF/APCsheet/PC87366.pdf +# env4801: http://phk.freebsd.dk/soekris/env4801/ + + +# Voltage inputs + ignore vid + + # Unknown + # label in0 "avi0" + ignore in0 + + + # Core Voltage, +2.0V + label in1 "VCORE" + set in1_min 1.9 + set in1_max 2.1 + + + # VCC, +5.0V + label in2 "VCC" + compute in2 @*2, @/2 + + + # Power Supply Input, +6.0V - +28.0V + label in3 "VPWR" + compute in3 @*20.1, @/20.1 + set in3_min 6.0 + set in3_max 28.0 + + + # +12V + label in4 "+12V" + compute in4 @*4.83, @/4.83 + set in4_min 11 + set in4_max 13 + + + # -12V + label in5 "-12V" + # If in10 on your net4801 doesn't have the 3.3V reference, use this + # compute line instead: + # compute in5 (@-3.3)*19.2+3.3, (@-3.3)/19.2+3.3 + compute in5 (@-in10)*19.2+in10, (@-in10)/19.2+in10 + set in5_min -13 + set in5_max -11 + + + # GND, 0V + label in6 "GND" + set in6_min 0 + set in6_max 0 + + + # Standby Voltage, +3.3V + # Internally divided by 2 + label in7 "Vsb" + compute in7 @*2, @/2 + set in7_min 3.0 + set in7_max 3.6 + + + # Supply Voltage, +3.3V + # Internally divided by 2 + label in8 "Vdd" + compute in8 @*2, @/2 + set in8_min 3.0 + set in8_max 3.6 + + + # Battery Backup Supply Voltage, +3.0V + label in9 "Vbat" + set in9_min 2.4 + set in9_max 3.6 + + + # Analog Supply Voltage, +3.3V + # Internally divided by 2 + label in10 "AVdd" + compute in10 @*2, @/2 + set in10_min 3.0 + set in10_max 3.6 + + +# Temperature inputs + ignore temp1 + ignore temp2 + + # PC87366 Internal Temperature + # PC87366 Recommended Operating Conditions: 0 - 70C + # SC1100 Recommended Operating Conditions: 0 - 85C + label temp3 "Temp" + label temp3_crit "Critical" + set temp3_min 0 + set temp3_max 70 + set temp3_crit 85 + + + ignore temp4 + ignore temp5 + ignore temp6 + + +# Fan inputs + ignore fan1 + ignore fan2 + ignore fan3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-10 16:05:29
|
Revision: 211 Author: krisk84 Date: 2006-08-10 09:05:25 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=211&view=rev Log Message: ----------- forgot sensors.conf Added Paths: ----------- trunk/target/generic/target_skeleton/etc/sensors.conf Added: trunk/target/generic/target_skeleton/etc/sensors.conf =================================================================== --- trunk/target/generic/target_skeleton/etc/sensors.conf (rev 0) +++ trunk/target/generic/target_skeleton/etc/sensors.conf 2006-08-10 16:05:25 UTC (rev 211) @@ -0,0 +1 @@ +link /tmp/etc/sensors.conf \ No newline at end of file Property changes on: trunk/target/generic/target_skeleton/etc/sensors.conf ___________________________________________________________________ Name: svn:special + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-10 16:05:00
|
Revision: 210 Author: krisk84 Date: 2006-08-10 09:04:53 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=210&view=rev Log Message: ----------- symlink fixes, lmsensor init support: Modified Paths: -------------- trunk/package/lmsensors/lmsensors.mk Added Paths: ----------- trunk/package/lmsensors/lmsensors.init trunk/target/generic/target_skeleton/etc/localtime Added: trunk/package/lmsensors/lmsensors.init =================================================================== --- trunk/package/lmsensors/lmsensors.init (rev 0) +++ trunk/package/lmsensors/lmsensors.init 2006-08-10 16:04:53 UTC (rev 210) @@ -0,0 +1,83 @@ +#!/bin/sh + +. /etc/rc.conf + +init () { +if [ -f /stat/etc/sensors.conf ] +then +ln -sf /stat/etc/sensors.conf /tmp/etc/sensors.conf +fi + +if [ -f /mnt/kd/sensors.conf ] +then +ln -sf /mnt/kd/sensors.conf /tmp/etc/sensors.conf +fi +} + +start () { +if [ -r /etc/sensors.conf ] +then +echo "Configuring sensors" + +if [ "$SENSEMODS" ] +then +for i in "$SENSEMODS" +do +modprobe -q $i +done +fi + +if `grep -q "astlinux=net4801" /proc/cmdline` +then +modprobe -q pc87360 init=1 +fi + +fi +} + +stop () { +if [ -r /etc/sensors.conf ] +then +echo "Stopping sensors" + +if [ "$SENSEMODS" ] +for i in "$SENSEMODS" +do +modprobe -r $i +done +fi + +if `grep -q "astlinux=net4801" /proc/cmdline` +then +modprobe -r pc87360 +fi + +fi +} + +case $1 in + +init) +init +start +;; + +start) +start +;; + +stop) +stop +;; + +restart) +stop +sleep 2 +start +;; + +*) +echo "Usage: start|stop|restart" +;; + +esac Property changes on: trunk/package/lmsensors/lmsensors.init ___________________________________________________________________ Name: svn:executable + * Modified: trunk/package/lmsensors/lmsensors.mk =================================================================== --- trunk/package/lmsensors/lmsensors.mk 2006-08-10 15:56:20 UTC (rev 209) +++ trunk/package/lmsensors/lmsensors.mk 2006-08-10 16:04:53 UTC (rev 210) @@ -33,6 +33,7 @@ LINUX=$(BUILD_DIR)/linux PREFIX=/usr KERNELVERSION=$(LINUX_VER) I2C_HEADERS=$(BUILD_DIR)/linux/include \ INCLUDEDIR=$(STAGING_DIR)/include $(TARGET_CONFIGURE_OPTS) MODVER=0 DESTDIR=$(STAGING_DIR) user_install install -D -m 0755 $(STAGING_DIR)/$(LMSENSORS_TARGET_BINARY) $(TARGET_DIR)/$(LMSENSORS_TARGET_BINARY) + install -D -m 0755 package/lmsensors/lmsensors.init $(TARGET_DIR)/etc/init.d/lmsensors $(STRIP) $(TARGET_DIR)/$(LMSENSORS_TARGET_BINARY) cp -a $(STAGING_DIR)/usr/lib/libsensors.s* $(TARGET_DIR)/usr/lib/ touch -c $(TARGET_DIR)/$(LMSENSORS_TARGET_BINARY) Added: trunk/target/generic/target_skeleton/etc/localtime =================================================================== --- trunk/target/generic/target_skeleton/etc/localtime (rev 0) +++ trunk/target/generic/target_skeleton/etc/localtime 2006-08-10 16:04:53 UTC (rev 210) @@ -0,0 +1 @@ +link /tmp/etc/localtime \ No newline at end of file Property changes on: trunk/target/generic/target_skeleton/etc/localtime ___________________________________________________________________ Name: svn:special + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-10 15:56:23
|
Revision: 209 Author: krisk84 Date: 2006-08-10 08:56:20 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=209&view=rev Log Message: ----------- netsnmp init scripts and fixes Modified Paths: -------------- trunk/package/netsnmp/netsnmp.mk Added Paths: ----------- trunk/package/netsnmp/netsnmp.init Added: trunk/package/netsnmp/netsnmp.init =================================================================== --- trunk/package/netsnmp/netsnmp.init (rev 0) +++ trunk/package/netsnmp/netsnmp.init 2006-08-10 15:56:20 UTC (rev 209) @@ -0,0 +1,58 @@ +#!/bin/sh + +. /etc/rc.conf + +init () { +if [ -d /stat/etc/snmp ] +then +ln -sf /stat/etc/snmp /tmp/etc/snmp +fi + +if [ -d /mnt/kd/snmp ] +then +ln -sf /mnt/kd/snmp /tmp/etc/snmp +fi +} + +start () { +if [ -f /etc/snmp/snmpd.conf ] +then +echo "Starting snmpd" +snmpd -u nobody -g nobody -p /var/run/snmpd.pid +fi +} + +stop () { +if [ -r /var/run/snmpd.pid ] +then +echo "Stopping snmpd" +kill `cat /var/run/snmpd.pid` +fi +} + +case $1 in + +init) +init +start +;; + +start) +start +;; + +stop) +stop +;; + +restart) +stop +sleep 2 +start +;; + +*) +echo "Usage: start|stop|restart" +;; + +esac Property changes on: trunk/package/netsnmp/netsnmp.init ___________________________________________________________________ Name: svn:executable + * Modified: trunk/package/netsnmp/netsnmp.mk =================================================================== --- trunk/package/netsnmp/netsnmp.mk 2006-08-10 15:36:24 UTC (rev 208) +++ trunk/package/netsnmp/netsnmp.mk 2006-08-10 15:56:20 UTC (rev 209) @@ -92,6 +92,11 @@ # cp $(NETSNMP_DIR)/debian/snmpd.default $(TARGET_DIR)/etc/default/snmpd # Remove the unsupported snmpcheck program rm $(TARGET_DIR)/usr/bin/snmpcheck + # Remove default config stuff + rm -rf $(TARGET_DIR)/etc/snmp + # symlink because that is what we like to do + ln -s /tmp/etc/snmp $(TARGET_DIR)/etc/snmp + $(INSTALL) -D -m 0755 package/netsnmp/netsnmp.init $(TARGET_DIR)/etc/init.d/snmpd # Install the "broken" headers cp $(NETSNMP_DIR)/agent/mibgroup/struct.h $(STAGING_DIR)/include/net-snmp/agent cp $(NETSNMP_DIR)/agent/mibgroup/util_funcs.h $(STAGING_DIR)/include/net-snmp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kr...@us...> - 2006-08-10 15:40:10
|
Revision: 208 Author: krisk84 Date: 2006-08-10 08:36:24 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=208&view=rev Log Message: ----------- add lmsensors, snmpd to startup add zoneinfo Added Paths: ----------- trunk/target/generic/target_skeleton/etc/runlevels/default/K31snmpd trunk/target/generic/target_skeleton/etc/runlevels/default/K32lmsensors trunk/target/generic/target_skeleton/etc/runlevels/default/S06lmsensors trunk/target/generic/target_skeleton/etc/runlevels/default/S11snmpd trunk/target/generic/target_skeleton/usr/share/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Adak trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Anchorage trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Anguilla trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Antigua trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Araguaina trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Aruba trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Asuncion trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Bahia trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Barbados trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Belem trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Belize trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Boa_Vista trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Bogota trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Boise trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Buenos_Aires trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cambridge_Bay trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Campo_Grande trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cancun trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Caracas trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Catamarca trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cayenne trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cayman trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Chicago trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Chihuahua trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cordoba trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Costa_Rica trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cuiaba trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Curacao trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Danmarkshavn trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Dawson trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Dawson_Creek trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Denver trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Detroit trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Dominica trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Edmonton trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Eirunepe trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/El_Salvador trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Fortaleza trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Glace_Bay trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Godthab trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Goose_Bay trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Grand_Turk trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Grenada trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Guadeloupe trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Guatemala trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Guayaquil trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Guyana trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Halifax trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Havana trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Hermosillo trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indiana/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indiana/Indianapolis trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indiana/Knox trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indiana/Marengo trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indiana/Vevay trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indianapolis trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Inuvik trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Iqaluit trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Jamaica trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Jujuy trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Juneau trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Kentucky/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Kentucky/Louisville trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Kentucky/Monticello trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/La_Paz trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Lima trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Los_Angeles trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Louisville trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Maceio trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Managua trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Manaus trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Martinique trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Mazatlan trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Mendoza trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Menominee trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Merida trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Mexico_City trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Miquelon trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Monterrey trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Montevideo trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Montreal trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Montserrat trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Nassau trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/New_York trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Nipigon trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Nome trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Noronha trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/North_Dakota/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/North_Dakota/Center trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Panama trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Pangnirtung trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Paramaribo trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Phoenix trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Port-au-Prince trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Port_of_Spain trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Porto_Velho trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Puerto_Rico trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Rainy_River trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Rankin_Inlet trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Recife trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Regina trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Rio_Branco trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Santiago trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Santo_Domingo trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Sao_Paulo trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Scoresbysund trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Shiprock trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/St_Johns trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/St_Kitts trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/St_Lucia trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/St_Thomas trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/St_Vincent trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Swift_Current trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Tegucigalpa trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Thule trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Thunder_Bay trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Tijuana trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Toronto trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Tortola trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Vancouver trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Whitehorse trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Winnipeg trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Yakutat trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Yellowknife trunk/target/generic/target_skeleton/usr/share/zoneinfo/Antarctica/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/Antarctica/Casey trunk/target/generic/target_skeleton/usr/share/zoneinfo/Antarctica/Davis trunk/target/generic/target_skeleton/usr/share/zoneinfo/Antarctica/DumontDUrville trunk/target/generic/target_skeleton/usr/share/zoneinfo/Antarctica/Mawson trunk/target/generic/target_skeleton/usr/share/zoneinfo/Antarctica/McMurdo trunk/target/generic/target_skeleton/usr/share/zoneinfo/Antarctica/Palmer trunk/target/generic/target_skeleton/usr/share/zoneinfo/Antarctica/Rothera trunk/target/generic/target_skeleton/usr/share/zoneinfo/Antarctica/South_Pole trunk/target/generic/target_skeleton/usr/share/zoneinfo/Antarctica/Syowa trunk/target/generic/target_skeleton/usr/share/zoneinfo/Antarctica/Vostok trunk/target/generic/target_skeleton/usr/share/zoneinfo/Arctic/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/Arctic/Longyearbyen trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Aden trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Almaty trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Amman trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Anadyr trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Aqtau trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Aqtobe trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Ashgabat trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Baghdad trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Bahrain trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Baku trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Bangkok trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Beirut trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Bishkek trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Brunei trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Calcutta trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Choibalsan trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Chongqing trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Colombo trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Damascus trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Dhaka trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Dili trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Dubai trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Dushanbe trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Gaza trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Harbin trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Hong_Kong trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Hovd trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Irkutsk trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Istanbul trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Jakarta trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Jayapura trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Jerusalem trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Kabul trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Kamchatka trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Karachi trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Kashgar trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Katmandu trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Krasnoyarsk trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Kuala_Lumpur trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Kuching trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Kuwait trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Macau trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Magadan trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Makassar trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Manila trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Muscat trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Nicosia trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Novosibirsk trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Omsk trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Oral trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Phnom_Penh trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Pontianak trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Pyongyang trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Qatar trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Qyzylorda trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Rangoon trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Riyadh trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Riyadh87 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Riyadh88 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Riyadh89 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Saigon trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Sakhalin trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Samarkand trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Seoul trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Shanghai trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Singapore trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Taipei trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Tashkent trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Tbilisi trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Tehran trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Thimphu trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Tokyo trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Ulaanbaatar trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Urumqi trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Vientiane trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Vladivostok trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Yakutsk trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Yekaterinburg trunk/target/generic/target_skeleton/usr/share/zoneinfo/Asia/Yerevan trunk/target/generic/target_skeleton/usr/share/zoneinfo/Atlantic/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/Atlantic/Azores trunk/target/generic/target_skeleton/usr/share/zoneinfo/Atlantic/Bermuda trunk/target/generic/target_skeleton/usr/share/zoneinfo/Atlantic/Canary trunk/target/generic/target_skeleton/usr/share/zoneinfo/Atlantic/Cape_Verde trunk/target/generic/target_skeleton/usr/share/zoneinfo/Atlantic/Faeroe trunk/target/generic/target_skeleton/usr/share/zoneinfo/Atlantic/Jan_Mayen trunk/target/generic/target_skeleton/usr/share/zoneinfo/Atlantic/Madeira trunk/target/generic/target_skeleton/usr/share/zoneinfo/Atlantic/Reykjavik trunk/target/generic/target_skeleton/usr/share/zoneinfo/Atlantic/South_Georgia trunk/target/generic/target_skeleton/usr/share/zoneinfo/Atlantic/St_Helena trunk/target/generic/target_skeleton/usr/share/zoneinfo/Atlantic/Stanley trunk/target/generic/target_skeleton/usr/share/zoneinfo/Australia/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/Australia/Adelaide trunk/target/generic/target_skeleton/usr/share/zoneinfo/Australia/Brisbane trunk/target/generic/target_skeleton/usr/share/zoneinfo/Australia/Broken_Hill trunk/target/generic/target_skeleton/usr/share/zoneinfo/Australia/Darwin trunk/target/generic/target_skeleton/usr/share/zoneinfo/Australia/Hobart trunk/target/generic/target_skeleton/usr/share/zoneinfo/Australia/Lindeman trunk/target/generic/target_skeleton/usr/share/zoneinfo/Australia/Lord_Howe trunk/target/generic/target_skeleton/usr/share/zoneinfo/Australia/Melbourne trunk/target/generic/target_skeleton/usr/share/zoneinfo/Australia/Perth trunk/target/generic/target_skeleton/usr/share/zoneinfo/Australia/Sydney trunk/target/generic/target_skeleton/usr/share/zoneinfo/CET trunk/target/generic/target_skeleton/usr/share/zoneinfo/CST6CDT trunk/target/generic/target_skeleton/usr/share/zoneinfo/EET trunk/target/generic/target_skeleton/usr/share/zoneinfo/EST trunk/target/generic/target_skeleton/usr/share/zoneinfo/EST5EDT trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT+0 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT+1 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT+10 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT+11 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT+12 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT+2 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT+3 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT+4 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT+5 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT+6 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT+7 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT+8 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT+9 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-0 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-1 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-10 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-11 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-12 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-13 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-14 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-2 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-3 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-4 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-5 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-6 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-7 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-8 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT-9 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/GMT0 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/Greenwich trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/UCT trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/UTC trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/Universal trunk/target/generic/target_skeleton/usr/share/zoneinfo/Etc/Zulu trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Amsterdam trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Andorra trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Athens trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Belfast trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Belgrade trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Berlin trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Bratislava trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Brussels trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Bucharest trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Budapest trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Chisinau trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Copenhagen trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Dublin trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Gibraltar trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Helsinki trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Istanbul trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Kaliningrad trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Kiev trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Lisbon trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Ljubljana trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/London trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Luxembourg trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Madrid trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Malta trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Minsk trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Monaco trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Moscow trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Nicosia trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Oslo trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Paris trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Prague trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Riga trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Rome trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Samara trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/San_Marino trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Sarajevo trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Simferopol trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Skopje trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Sofia trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Stockholm trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Tallinn trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Tirane trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Uzhgorod trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Vaduz trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Vatican trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Vienna trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Vilnius trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Warsaw trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Zagreb trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Zaporozhye trunk/target/generic/target_skeleton/usr/share/zoneinfo/Europe/Zurich trunk/target/generic/target_skeleton/usr/share/zoneinfo/Factory trunk/target/generic/target_skeleton/usr/share/zoneinfo/GMT trunk/target/generic/target_skeleton/usr/share/zoneinfo/HST trunk/target/generic/target_skeleton/usr/share/zoneinfo/Indian/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/Indian/Antananarivo trunk/target/generic/target_skeleton/usr/share/zoneinfo/Indian/Chagos trunk/target/generic/target_skeleton/usr/share/zoneinfo/Indian/Christmas trunk/target/generic/target_skeleton/usr/share/zoneinfo/Indian/Cocos trunk/target/generic/target_skeleton/usr/share/zoneinfo/Indian/Comoro trunk/target/generic/target_skeleton/usr/share/zoneinfo/Indian/Kerguelen trunk/target/generic/target_skeleton/usr/share/zoneinfo/Indian/Mahe trunk/target/generic/target_skeleton/usr/share/zoneinfo/Indian/Maldives trunk/target/generic/target_skeleton/usr/share/zoneinfo/Indian/Mauritius trunk/target/generic/target_skeleton/usr/share/zoneinfo/Indian/Mayotte trunk/target/generic/target_skeleton/usr/share/zoneinfo/Indian/Reunion trunk/target/generic/target_skeleton/usr/share/zoneinfo/MET trunk/target/generic/target_skeleton/usr/share/zoneinfo/MST trunk/target/generic/target_skeleton/usr/share/zoneinfo/MST7MDT trunk/target/generic/target_skeleton/usr/share/zoneinfo/Mideast/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/Mideast/Riyadh87 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Mideast/Riyadh88 trunk/target/generic/target_skeleton/usr/share/zoneinfo/Mideast/Riyadh89 trunk/target/generic/target_skeleton/usr/share/zoneinfo/PST8PDT trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/ trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Apia trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Auckland trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Chatham trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Easter trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Efate trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Enderbury trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Fakaofo trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Fiji trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Funafuti trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Galapagos trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Gambier trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Guadalcanal trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Guam trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Honolulu trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Johnston trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Kiritimati trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Kosrae trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Kwajalein trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Majuro trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Marquesas trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Midway trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Nauru trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Niue trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Norfolk trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Noumea trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Pago_Pago trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Palau trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Pitcairn trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Ponape trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Port_Moresby trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Rarotonga trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Saipan trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Tahiti trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Tarawa trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Tongatapu trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Truk trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Wake trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Wallis trunk/target/generic/target_skeleton/usr/share/zoneinfo/Pacific/Yap trunk/target/generic/target_skeleton/usr/share/zoneinfo/WET Added: trunk/target/generic/target_skeleton/etc/runlevels/default/K31snmpd =================================================================== --- trunk/target/generic/target_skeleton/etc/runlevels/default/K31snmpd (rev 0) +++ trunk/target/generic/target_skeleton/etc/runlevels/default/K31snmpd 2006-08-10 15:36:24 UTC (rev 208) @@ -0,0 +1 @@ +link ../../init.d/snmpd \ No newline at end of file Property changes on: trunk/target/generic/target_skeleton/etc/runlevels/default/K31snmpd ___________________________________________________________________ Name: svn:special + * Added: trunk/target/generic/target_skeleton/etc/runlevels/default/K32lmsensors =================================================================== --- trunk/target/generic/target_skeleton/etc/runlevels/default/K32lmsensors (rev 0) +++ trunk/target/generic/target_skeleton/etc/runlevels/default/K32lmsensors 2006-08-10 15:36:24 UTC (rev 208) @@ -0,0 +1 @@ +link ../../init.d/lmsensors \ No newline at end of file Property changes on: trunk/target/generic/target_skeleton/etc/runlevels/default/K32lmsensors ___________________________________________________________________ Name: svn:special + * Added: trunk/target/generic/target_skeleton/etc/runlevels/default/S06lmsensors =================================================================== --- trunk/target/generic/target_skeleton/etc/runlevels/default/S06lmsensors (rev 0) +++ trunk/target/generic/target_skeleton/etc/runlevels/default/S06lmsensors 2006-08-10 15:36:24 UTC (rev 208) @@ -0,0 +1 @@ +link ../../init.d/lmsensors \ No newline at end of file Property changes on: trunk/target/generic/target_skeleton/etc/runlevels/default/S06lmsensors ___________________________________________________________________ Name: svn:special + * Added: trunk/target/generic/target_skeleton/etc/runlevels/default/S11snmpd =================================================================== --- trunk/target/generic/target_skeleton/etc/runlevels/default/S11snmpd (rev 0) +++ trunk/target/generic/target_skeleton/etc/runlevels/default/S11snmpd 2006-08-10 15:36:24 UTC (rev 208) @@ -0,0 +1 @@ +link ../../init.d/snmpd \ No newline at end of file Property changes on: trunk/target/generic/target_skeleton/etc/runlevels/default/S11snmpd ___________________________________________________________________ Name: svn:special + * Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Adak =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Adak ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Anchorage =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Anchorage ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Anguilla =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Anguilla ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Antigua =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Antigua ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Araguaina =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Araguaina ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Aruba =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Aruba ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Asuncion =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Asuncion ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Bahia =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Bahia ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Barbados =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Barbados ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Belem =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Belem ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Belize =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Belize ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Boa_Vista =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Boa_Vista ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Bogota =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Bogota ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Boise =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Boise ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Buenos_Aires =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Buenos_Aires ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cambridge_Bay =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cambridge_Bay ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Campo_Grande =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Campo_Grande ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cancun =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cancun ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Caracas =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Caracas ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Catamarca =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Catamarca ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cayenne =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cayenne ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cayman =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cayman ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Chicago =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Chicago ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Chihuahua =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Chihuahua ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cordoba =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cordoba ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Costa_Rica =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Costa_Rica ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cuiaba =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Cuiaba ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Curacao =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Curacao ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Danmarkshavn =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Danmarkshavn ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Dawson =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Dawson ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Dawson_Creek =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Dawson_Creek ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Denver =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Denver ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Detroit =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Detroit ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Dominica =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Dominica ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Edmonton =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Edmonton ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Eirunepe =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Eirunepe ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/El_Salvador =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/El_Salvador ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Fortaleza =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Fortaleza ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Glace_Bay =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Glace_Bay ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Godthab =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Godthab ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Goose_Bay =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Goose_Bay ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Grand_Turk =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Grand_Turk ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Grenada =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Grenada ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Guadeloupe =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Guadeloupe ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Guatemala =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Guatemala ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Guayaquil =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Guayaquil ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Guyana =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Guyana ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Halifax =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Halifax ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Havana =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Havana ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Hermosillo =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Hermosillo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indiana/Indianapolis =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indiana/Indianapolis ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indiana/Knox =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indiana/Knox ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indiana/Marengo =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indiana/Marengo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indiana/Vevay =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indiana/Vevay ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indianapolis =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Indianapolis ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Inuvik =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Inuvik ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Iqaluit =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Iqaluit ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Jamaica =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Jamaica ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Jujuy =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Jujuy ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Juneau =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Juneau ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Kentucky/Louisville =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Kentucky/Louisville ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Kentucky/Monticello =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Kentucky/Monticello ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/La_Paz =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/La_Paz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Lima =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Lima ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Los_Angeles =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Los_Angeles ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Louisville =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Louisville ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Maceio =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Maceio ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Managua =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Managua ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Manaus =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Manaus ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Martinique =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Martinique ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Mazatlan =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Mazatlan ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Mendoza =================================================================== (Binary files differ) Property changes on: trunk/target/generic/target_skeleton/usr/share/zoneinfo/America/Mendoza ___________________________________________________________________ Na... [truncated message content] |
|
From: <kr...@us...> - 2006-08-10 14:55:20
|
Revision: 207 Author: krisk84 Date: 2006-08-10 07:55:17 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/astlinux/?rev=207&view=rev Log Message: ----------- pciutils fixes Modified Paths: -------------- trunk/package/pciutils/pciutils.mk Modified: trunk/package/pciutils/pciutils.mk =================================================================== --- trunk/package/pciutils/pciutils.mk 2006-08-10 06:24:33 UTC (rev 206) +++ trunk/package/pciutils/pciutils.mk 2006-08-10 14:55:17 UTC (rev 207) @@ -29,7 +29,7 @@ touch $(PCIUTILS_DIR)/.unpacked $(PCIUTILS_DIR)/.compiled: $(PCIUTILS_DIR)/.unpacked - $(MAKE1) CC=$(TARGET_CC) OPT="$(TARGET_CFLAGS)" -C $(PCIUTILS_DIR) + $(MAKE1) CC=$(TARGET_CC) OPT="$(TARGET_CFLAGS)" PREFIX=/usr -C $(PCIUTILS_DIR) touch $(PCIUTILS_DIR)/.compiled $(TARGET_DIR)/sbin/lspci: $(PCIUTILS_DIR)/.compiled @@ -39,12 +39,12 @@ install -c $(PCIUTILS_DIR)/setpci $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/usr/share/misc/pci.ids: $(PCIUTILS_DIR)/.compiled - install -Dc $(PCIUTILS_DIR)/pci.ids $(TARGET_DIR)/usr/share/misc/pci.ids + install -Dc $(PCIUTILS_DIR)/pci.ids $(TARGET_DIR)/usr/share/pci.ids -pciutils: uclibc $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/pci.ids +pciutils: uclibc $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/pci.ids pciutils-clean: - rm $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/usr/share/misc/pci.ids + rm $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/usr/share/pci.ids -$(MAKE) -C $(PCIUTILS_DIR) clean pciutils-dirclean: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
1 message has been excluded from this view by a project administrator.
