Changeset 93451a15 in freewrt


Ignore:
Timestamp:
Sep 20, 2006, 6:19:37 PM (19 years ago)
Author:
Dirk Nehring <dnehring@…>
Children:
71e2dd2
Parents:
468e005
Message:

Sync to HEAD

git-svn-id: ​svn://www.freewrt.org/branches/dn-kernel-2.4.33@640 afb5a338-a214-0410-bd46-81f09a774fd1

Files:
17 added
2 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • package/Config.in

    r468e005 r93451a15  
    1111menu "Base system"
    1212source "package/busybox/Config.in"
    13 source "package/bridge/Config.in"
    14 source "package/dnsmasq/Config.in"
    15 source "package/iptables/Config.in"
    16 source "package/mtd/Config.in"
     13menu "Board specific packages"
     14menu "Broadcom"
     15source "package/broadcom-nas/Config.in"
    1716source "package/nvram/Config.in"
    1817source "package/jffs2root/Config.in"
     18source "package/mtd/Config.in"
    1919source "package/webif/Config.in"
    2020endmenu
    21 
     21endmenu
     22endmenu
    2223
    2324menu "Shells"
    … …  
    8485source "package/bind/Config.in"
    8586source "package/bitlbee/Config.in"
     87source "package/bridge/Config.in"
    8688source "package/bwm/Config.in"
    8789source "package/chillispot/Config.in"
    … …  
    9294source "package/dhcp/Config.in"
    9395source "package/dhcp-forwarder/Config.in"
     96source "package/dnsmasq/Config.in"
    9497source "package/dropbear/Config.in"
    9598source "package/dsniff/Config.in"
    … …  
    110113source "package/htpdate/Config.in"
    111114source "package/httping/Config.in"
     115source "package/httptunnel/Config.in"
    112116source "package/iftop/Config.in"
    113117source "package/igmpproxy/Config.in"
    … …  
    117121source "package/ipsec-tools/Config.in"
    118122source "package/ipset/Config.in"
     123source "package/iptables/Config.in"
    119124source "package/iptables-snmp/Config.in"
    120125source "package/iptraf/Config.in"

  • package/Makefile

    r468e005 r93451a15  
    2222package-$(FWRT_PACKAGE_BLUEZ_UTILS) += bluez-utils
    2323package-$(FWRT_PACKAGE_BRIDGE) += bridge
     24package-$(FWRT_PACKAGE_BROADCOM_NAS) += broadcom-nas
    2425package-$(FWRT_PACKAGE_BUSYBOX) += busybox
    2526package-$(FWRT_PACKAGE_BWM) += bwm
    … …  
    3132package-$(FWRT_PACKAGE_CLINKC) += clinkc
    3233package-$(FWRT_PACKAGE_COLLECTD) += collectd
     34package-$(FWRT_PACKAGE_COMGT) += comgt
    3335package-$(FWRT_PACKAGE_CTORRENT) += ctorrent
    3436package-$(FWRT_PACKAGE_CUPS) += cups
    … …  
    3638package-$(FWRT_PACKAGE_CUTTER) += cutter
    3739package-$(FWRT_COMPILE_CYRUS_SASL) += cyrus-sasl
    38 package-$(FWRT_COMPILE_DB) += libdb
    3940package-$(FWRT_PACKAGE_DECO) += deco
    4041package-$(FWRT_COMPILE_DHCP) += dhcp
     42package-$(FWRT_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
    4143package-$(FWRT_PACKAGE_DHCP6) += dhcp6
    42 package-$(FWRT_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
    4344package-$(FWRT_PACKAGE_DIGITEMP) += digitemp
    4445package-$(FWRT_PACKAGE_DNSMASQ) += dnsmasq
    … …  
    5051package-$(FWRT_PACKAGE_ELINKS) += elinks
    5152package-$(FWRT_PACKAGE_ETHER_WAKE) += ether-wake
     53package-$(FWRT_PACKAGE_ETHTOOL) += ethtool
    5254package-$(FWRT_COMPILE_EXPAT) += expat
    5355package-$(FWRT_PACKAGE_EZIPUPDATE) += ez-ipupdate
    … …  
    6264package-$(FWRT_PACKAGE_FRICKIN) += frickin
    6365package-$(FWRT_COMPILE_FUSE) += fuse
    64 package-$(FWRT_PACKAGE_COMGT) += comgt
    6566package-$(FWRT_PACKAGE_GDBSERVER) += gdbserver
    6667package-$(FWRT_COMPILE_GLIB) += glib
    … …  
    6869package-$(FWRT_COMPILE_GMP) += gmp
    6970package-$(FWRT_COMPILE_GNUTLS) += gnutls
     71package-$(FWRT_PACKAGE_GPG) += gpg
    7072package-$(FWRT_PACKAGE_GPSD) += gpsd
    71 package-$(FWRT_PACKAGE_GPG) += gpg
    7273package-$(FWRT_COMPILE_GSM) += gsm
    7374package-$(FWRT_PACKAGE_HASERL) += haserl
    … …  
    7980package-$(FWRT_PACKAGE_HTPDATE) += htpdate
    8081package-$(FWRT_PACKAGE_HTTPING) += httping
     82package-$(FWRT_PACKAGE_HTTPTUNNEL) += httptunnel
    8183package-$(FWRT_PACKAGE_ICECAST) += icecast
    8284package-$(FWRT_PACKAGE_ID3LIB) += id3lib
    … …  
    107109package-$(FWRT_PACKAGE_LIBCLI) += libcli
    108110package-$(FWRT_PACKAGE_LIBDAEMON) += libdaemon
     111package-$(FWRT_COMPILE_DB) += libdb
    109112package-$(FWRT_PACKAGE_LIBDNET) += libdnet
    110113package-$(FWRT_PACKAGE_LIBELF) += libelf
    … …  
    133136package-$(FWRT_PACKAGE_LIBVORBIS) += libvorbis
    134137package-$(FWRT_PACKAGE_LIBVORBISIDEC) += libvorbisidec
    135 package-$(FWRT_PACKAGE_LIBWRAP) += tcp_wrappers
    136138package-$(FWRT_PACKAGE_LIBXML2) += libxml2
    137139package-$(FWRT_PACKAGE_LIBXSLT) += libxslt
    … …  
    166168package-$(FWRT_PACKAGE_NANO) += nano
    167169package-$(FWRT_COMPILE_NCURSES) += ncurses
     170package-$(FWRT_PACKAGE_LIBNCURSES) += ncurses
    168171package-$(FWRT_COMPILE_NDISC6) += ndisc
    169172package-$(FWRT_COMPILE_NET_SNMP) += net-snmp
    … …  
    187190package-$(FWRT_COMPILE_OSIRIS) += osiris
    188191package-$(FWRT_COMPILE_OWFS) += owfs
     192package-$(FWRT_PACKAGE_P910ND) += p910nd
    189193package-$(FWRT_PACKAGE_PALANTIR) += palantir
    190 package-$(FWRT_PACKAGE_P910ND) += p910nd
    191194package-$(FWRT_PACKAGE_PARPROUTED) += parprouted
    192195package-$(FWRT_PACKAGE_PCIUTILS) += pciutils
    … …  
    249252package-$(FWRT_COMPILE_SQLITE2) += sqlite2
    250253package-$(FWRT_PACKAGE_SQUID) += squid
     254package-$(FWRT_PACKAGE_SRELAY) += srelay
     255package-$(FWRT_PACKAGE_SSLTUNNEL) += ssltunnel
    251256package-$(FWRT_PACKAGE_SSMTP) += ssmtp
    252 package-$(FWRT_PACKAGE_SSLTUNNEL) += ssltunnel
    253 package-$(FWRT_PACKAGE_SRELAY) += srelay
    254257package-$(FWRT_PACKAGE_STRACE) += strace
    255258package-$(FWRT_PACKAGE_SYSLOG_NG) += syslog-ng
     259package-$(FWRT_PACKAGE_LIBWRAP) += tcp_wrappers
    256260package-$(FWRT_PACKAGE_TCPDUMP) += tcpdump
    257261package-$(FWRT_PACKAGE_TINC) += tinc
    … …  
    260264package-$(FWRT_PACKAGE_TTCP) += ttcp
    261265package-$(FWRT_PACKAGE_UCLIBCXX) += uclibc++
     266package-$(FWRT_PACKAGE_UDEV) += udev
    262267package-$(FWRT_PACKAGE_UDP_BROADCAST_RELAY) += udp-broadcast-relay
    263268package-$(FWRT_PACKAGE_ULOGD) += ulogd
    … …  
    266271package-$(FWRT_PACKAGE_USTL) += ustl
    267272package-$(FWRT_COMPILE_UTIL_LINUX) += util-linux
    268 package-$(FWRT_PACKAGE_UDEV) += udev
     273package-$(FWRT_PACKAGE_VGP) += vgp
    269274package-$(FWRT_PACKAGE_VIM) += vim
    270 package-$(FWRT_PACKAGE_VGP) += vgp
     275package-$(FWRT_PACKAGE_VNC_REFLECTOR) += vnc-reflector
    271276package-$(FWRT_PACKAGE_VNCREPEATER) += vncrepeater
    272 package-$(FWRT_PACKAGE_VNC_REFLECTOR) += vnc-reflector
    273277package-$(FWRT_PACKAGE_VNSTAT) += vnstat
    274278package-$(FWRT_PACKAGE_VPNC) += vpnc
    275279package-$(FWRT_PACKAGE_VRRPD) += vrrpd
     280package-$(FWRT_PACKAGE_VSFTPD) += vsftpd
    276281package-$(FWRT_PACKAGE_VTUN) += vtun
    277 package-$(FWRT_PACKAGE_VSFTPD) += vsftpd
    278282package-$(FWRT_PACKAGE_WATCHDOG) += watchdog
    279283package-$(FWRT_PACKAGE_WCCPD) += wccpd
    … …  
    282286package-$(FWRT_PACKAGE_WIFICONF) += wificonf
    283287package-$(FWRT_PACKAGE_WIFIDOG) += wifidog
     288package-$(FWRT_PACKAGE_WIRELESS_TOOLS) += wireless-tools
    284289package-$(FWRT_PACKAGE_WIVIZ) += wiviz
    285 package-$(FWRT_PACKAGE_WIRELESS_TOOLS) += wireless-tools
    286290package-$(FWRT_PACKAGE_WKNOCK) += wknock
    287291package-$(FWRT_PACKAGE_WOL) += wol
    … …  
    295299package-$(FWRT_PACKAGE_ZLIB) += zlib
    296300# kernel addon packages
     301package-$(FWRT_PACKAGE_KMOD_BROADCOM_DIAG) += broadcom-diag
    297302package-$(FWRT_PACKAGE_KMOD_BROADCOM_WL) += broadcom-wl
    298 package-$(FWRT_PACKAGE_KMOD_BROADCOM_DIAG) += broadcom-diag
    299303package-$(FWRT_PACKAGE_KMOD_MADWIFI) += madwifi
    300304package-$(FWRT_PACKAGE_KMOD_MINI_FO) += mini_fo
    … …  
    347351        @$(END_TRACE)
    348352
    349 %-rebuild: 
     353%-rebuild:
    350354        @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)-rebuild: "
    351355        @rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
    … …  
    360364        @$(CMD_TRACE) " done"
    361365        @$(END_TRACE)
    362 

  • package/atftp/Makefile

    r468e005 r93451a15  
    5959$(IPKG_ATFTP):
    6060        $(INSTALL_DIR) $(IDIR_ATFTP)/usr/bin
    61         $(INSTALL_DATA) $(WRKBUILD)/atftp $(IDIR_ATFTP)/usr/bin
     61       $(INSTALL_BIN) $(WRKBUILD)/atftp $(IDIR_ATFTP)/usr/bin
    6262        $(RSTRIP) $(IDIR_ATFTP)
    6363        $(IPKG_BUILD) $(IDIR_ATFTP) $(PACKAGE_DIR)
    … …  
    6565$(IPKG_ATFTPD):
    6666        $(INSTALL_DIR) $(IDIR_ATFTPD)/usr/sbin
    67         $(INSTALL_DATA) $(WRKBUILD)/atftpd $(IDIR_ATFTPD)/usr/sbin
     67       $(INSTALL_BIN) $(WRKBUILD)/atftpd $(IDIR_ATFTPD)/usr/sbin
    6868        $(RSTRIP) $(IDIR_ATFTPD)
    6969        $(IPKG_BUILD) $(IDIR_ATFTPD) $(PACKAGE_DIR)

  • package/comgt/Makefile

    r468e005 r93451a15  
    1515PKG_SOURCE:=            $(PKG_NAME)$(PKG_VERSION).tgz
    1616
    17 WRKSRC:=                ${WRKDIR}
     17WRKSRC=                 ${WRKDIR}
    1818
    1919include $(TOPDIR)/mk/package.mk

  • package/dnsmasq/Makefile

    r468e005 r93451a15  
    3434        $(INSTALL_BIN) $(WRKBUILD)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/
    3535        $(INSTALL_DATA) ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf
    36         $(INSTALL_DATA) ./files/dnsmasq.init \
    37                  $(IDIR_DNSMASQ)/etc/init.d/S$(PKG_INIT)dnsmasq
     36        $(INSTALL_BIN) ./files/dnsmasq.init \
     37                $(IDIR_DNSMASQ)/etc/init.d/S$(PKG_INIT)dnsmasq
    3838        $(RSTRIP) $(IDIR_DNSMASQ)
    3939        $(IPKG_BUILD) $(IDIR_DNSMASQ) $(PACKAGE_DIR)

  • package/openvpn/Makefile

    r468e005 r93451a15  
    8989                  $(ENABLE_SMALL) \
    9090        );
    91         touch $(WRKBUILD)/.configured
     91        touch $@
    9292
    9393$(WRKBUILD)/.built:
    … …  
    116116
    117117$(IPKG_OPENVPN_WEBIF):
     118        install -d -m0755 $(IDIR_OPENVPN)/etc/init.d
    118119        install -d -m0755 $(IDIR_OPENVPN_WEBIF)/www/cgi-bin/webif
     120        $(CP) ./files/openvpn-webif.init \
     121                $(IDIR_OPENVPN)/etc/init.d/S$(PKG_INIT)openvpn
    119122        $(CP) ./files/openvpn.sh $(IDIR_OPENVPN_WEBIF)/www/cgi-bin/webif
    120123        $(IPKG_BUILD) $(IDIR_OPENVPN_WEBIF) $(PACKAGE_DIR)

  • package/openvpn/files/openvpn.init

    r468e005 r93451a15  
    11#!/bin/sh
    22
    3 case "$(nvram get openvpn_cli)" in
    4         on|enabled|1)
    5                 continue
    6         ;;
    7         off|disabled|0)
    8                 exit 0
    9         ;;
    10 esac
     3. /etc/rc.conf
    114
    125case "$1" in
    … …  
    169                ;;
    1710        start)
    18                 SERVER=$(nvram get openvpn_cli_server)
    19                 PROTO=$(nvram get openvpn_cli_proto)
    20                 PORT=$(nvram get openvpn_cli_port)
    21 
    22                 [ "$SERVER" ] || {
    23                         logger "$0: remote server not configured!"
    24                         exit
    25                 }
    26                 case "$(nvram get openvpn_cli_auth)" in
    27                         cert)
    28                                 AUTH_OPTION="--ns-cert-type server --pkcs12"
    29                                 AUTH_FILE="/etc/openvpn/certificate.p12"
    30                                 PKCS12PASS="$(nvram get openvpn_cli_pkcs12pass)"
    31                                 [ "$PKCS12PASS" ] && {
    32                                         echo -n "$PKCS12PASS" > /etc/openvpn/pkcs12pass.tmp
    33                                         chmod 600 /etc/openvpn/pkcs12pass.tmp
    34                                         AUTH_OPTION="--askpass /etc/openvpn/pkcs12pass.tmp $AUTH_OPTION"
    35                                 }
    36                         ;;
    37                         psk)
    38                                 AUTH_OPTION="--secret"
    39                                 AUTH_FILE="/etc/openvpn/shared.key"
    40                         ;;
    41                         *)
    42                                 logger "$0: unknown authentication type, aborting!"
    43                                 exit
    44                         ;;
    45                 esac
    46                 [ -f "$AUTH_FILE" ] || {
    47                         logger "$0: no certificat/keyfile found!"
    48                         exit
    49                 }
    50                 openvpn --client                                \
    51                         --proto  "${PROTO:-udp}"                \
    52                         --port   "${PORT:-1194}"                \
    53                         --remote "$SERVER"                      \
    54                         --dev tun                               \
    55                         --nobind                                \
    56                         $AUTH_OPTION "$AUTH_FILE"               \
    57                         --comp-lzo                              \
    58                         --daemon                                \
    59                         --status /tmp/openvpn-status.log        \
    60                         --verb 3
     11                [ -f /etc/openvpn/openvpn.conf ] || exit
     12                openvpn --daemon --config openvpn.conf --cd /etc/openvpn
     13        ;;
     14        stop)
     15                killall openvpn
    6116        ;;
    6217        restart)
    … …  
    6520                $0 start
    6621        ;;
    67         reload)
    68                 killall -SIGHUP openvpn
    69         ;;
    70         stop)
    71                 killall openvpn
    72         ;;
    7322esac
     23exit $?

  • package/screen/Config.in

    r468e005 r93451a15  
    22        prompt "screen............................ Full-screen terminal window manager"
    33        tristate
    4         default m if CONFIG_DEVEL
     4        default n
     5        select FWRT_PACKAGE_LIBNCURSES
    56        help
    67          Screen is a full-screen window manager that multiplexes a physical

  • package/squid/Makefile

    r468e005 r93451a15  
    120120                ac_cv_func___va_copy=no \
    121121                ./configure \
     122                        --disable-dependency-tracking \
    122123                        --target=$(GNU_TARGET_NAME) \
    123124                        --host=$(GNU_TARGET_NAME) \

  • package/webif/Makefile

    r468e005 r93451a15  
    99PKG_NAME:=              webif
    1010PKG_VERSION:=           0.2
    11 PKG_RELEASE:=           2
     11PKG_RELEASE:=           3
    1212
    1313include $(TOPDIR)/mk/package.mk

  • package/webif/files/usr/lib/webif/common.awk

    r468e005 r93451a15  
     1# $FreeWRT$
     2
     3function portstr(type, str) {
     4        gsub(/-/, ":", str)
     5        if (insmod_mport != 1) {
     6                print "insmod ipt_multiport >&- 2>&-"
     7                insmod_mport = 1
     8        }
     9        if (type == "src") return " -m multiport --sports " str
     10        else return " -m multiport --dports " str
     11}
     12
     13function str2ipt(str) {
     14        str2data(str)
     15        _cmd = ""
     16        if (_l["src"] != "") _cmd = _cmd " -s " _l["src"]
     17        if (_l["dest"] != "") _cmd = _cmd " -d " _l["dest"]
     18        if (_l["proto"] != "") {
     19                _cmd = _cmd " -p " _l["proto"]
     20        }
     21        # scripts need to check for proto="" and emit two rules in that case
     22        if ((_l["proto"] == "") || (_l["proto"] == "tcp") || (_l["proto"] == "udp")) {
     23                if (_l["sport"] != "") _cmd = _cmd portstr("src", _l["sport"])
     24                if (_l["dport"] != "") _cmd = _cmd portstr("dest", _l["dport"])
     25        }
     26        if (_l["layer7"] != "") {
     27                if (insmod_l7 != 1) {
     28                        print "insmod ipt_layer7 >&- 2>&-"
     29                        insmod_l7 = 1
     30                }
     31                _cmd = _cmd " -m layer7 --l7proto " _l["layer7"]
     32        }
     33        return _cmd
     34}
     35
     36function str2data(str) {
     37        delete _l
     38        _n = split(str, _o, "[\t ]")
     39        for (_i = 1; _i <= _n; _i++) {
     40                _n2 = split(_o[_i], _c, "=")
     41                if (_n2 == 2) _l[_c[1]] = _c[2]
     42        }
     43}
     44
     45function bitcount(c) {
     46        c=and(rshift(c, 1),0x55555555)+and(c,0x55555555)
     47        c=and(rshift(c, 2),0x33333333)+and(c,0x33333333)
     48        c=and(rshift(c, 4),0x0f0f0f0f)+and(c,0x0f0f0f0f)
     49        c=and(rshift(c, 8),0x00ff00ff)+and(c,0x00ff00ff)
     50        c=and(rshift(c,16),0x0000ffff)+and(c,0x0000ffff)
     51        return c
     52}
     53
     54function validate_netmask(nm) {
     55        return and(-nm,compl(nm))
     56}
     57
     58function ip2int(ip) {
     59        for (ret=0,n=split(ip,a,"\."),x=1;x<=n;x++) ret=or(lshift(ret,8),a[x])
     60        return ret
     61}
     62
     63function int2ip(ip,ret,x) {
     64        ret=and(ip,255)
     65        ip=rshift(ip,8)
     66        for(;x<3;ret=and(ip,255)"."ret,ip=rshift(ip,8),x++);
     67        return ret
     68}
     69
    170function start_form(title, field_opts, field_opts2) {
    271        print "<div class=\"settings\"" field_opts ">"

  • package/webif/files/www/cgi-bin/webif/lan.sh

    r468e005 r93451a15  
    3838                save_setting dhcp dhcp_enabled $FORM_dhcp_enabled
    3939                FORM_dhcp_num=$(
    40 awk -f /usr/lib/common.awk -f - $FORM_dhcp_start $FORM_dhcp_end <<EOF
     40awk -f /usr/lib/webif/common.awk -f - $FORM_dhcp_start $FORM_dhcp_end <<EOF
    4141BEGIN   {
    4242        ipstart=ip2int(ARGV[1])

  • target/Config.in

    r468e005 r93451a15  
     1# $FreeWRT$
     2#-
     3# This file is part of the FreeWRT project. FreeWRT is copyrighted
     4# material, please see the LICENCE file in the top-level directory
     5# or at http://www.freewrt.org/license for details.
     6
    17#menu "Target System"
    2 
    38#menu "Broadcom devices"
    4 
    59menu "Target system (Broadcom)"
    610
    … …  
    1115
    1216config FWRT_TARGET_ROOTFS_JFFS2
    13         bool "Firmware images with writable root filesystem"
     17        bool "Firmware image with writable root filesystem"
    1418        select FWRT_PACKAGE_JFFS2ROOT
    1519        help
    … …  
    1721
    1822config FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY
    19         bool "Firmware images with read-only root filesystem and overlay fs"
     23        bool "Firmware image with read-only root filesystem and overlay fs"
    2024        select FWRT_PACKAGE_KMOD_MINI_FO
    2125        select FWRT_PACKAGE_JFFS2ROOT
Note: See TracChangeset for help on using the changeset viewer.