Changeset 273

Show
Ignore:
Timestamp:
07/18/11 22:04:01 (10 months ago)
Author:
root
Message:

Various fixes I should have synced earlier and one new feature (!).

Now it will attept to save and then use the last address it got from the DHCP server through reboots.

Location:
floppyfw-3.0
Files:
1 added
10 modified

Legend:

Unmodified
Added
Removed

  • floppyfw-3.0/Makefile

    r271 r273  
    3838 
    3939# Which version of floppyfw is this? 
    40 FLOPPYFW_VERSION=3.0.14 
     40FLOPPYFW_VERSION=3.0.15 
    4141 
    4242# What sortof target system shall we compile this for? 
    … …  
    8383 
    8484# Sourceforge-mirror: 
    85 SF_HOST=superb-east 
     85SF_HOST=voxel 
    8686SF_MIRROR=http://$(SF_HOST).dl.sourceforge.net 
    8787 
    … …  
    197197TARGETS+=micro_proxy 
    198198# TARGETS+=quagga 
     199# TARGETS+=openssl 
     200# TARGETS+=openvpn 
    199201 
    200202# The hostap target will add patches to the kernel and build a hostap.ffw 
    … …  
    222224TARGET_CC=gcc 
    223225TARGET_CX=g++ 
     226 
     227#TARGET_CONFIGURE_OPTS=--host=$(ARCH)-ucblic-linux --target=$(ARCH)-uclibc-linux 
     228CONFIGURE_OPTS=--target=$(ARCH)-uclibc-linux 
    224229 
    225230HOSTCC:=distcc gcc 

  • floppyfw-3.0/makefiles/add.mk

    r236 r273  
    1212        # 
    1313        cp $(SCRIPTS_DIR)/udhcpcrenew.sh $(ADD_MASTER)/etc/. 
     14        cp $(SCRIPTS_DIR)/udhcpc.sh $(ADD_MASTER)/etc/. 
    1415        cp $(SCRIPTS_DIR)/renew-dnsmasq.sh $(ADD_MASTER)/etc/. 
    1516        cp $(SCRIPTS_DIR)/free-outside.sh $(ADD_MASTER)/etc/. 

  • floppyfw-3.0/makefiles/busybox.mk

    r269 r273  
    55############################################################# 
    66 
    7 BUSYBOX_VERSION=1.11.2 
     7BUSYBOX_VERSION=1.11.3 
    88BUSYBOX_CONFIG_VERSION=1.11 
    99# Newest version did not compile. 
    10 #BUSYBOX_VERSION=1.17.3 
     10#BUSYBOX_VERSION=1.18.5 
    1111#BUSYBOX_CONFIG_VERSION=1.17 
    1212 

  • floppyfw-3.0/makefiles/libosip2.mk

    r27 r273  
    66 
    77LIBOSIP2_SOURCE_URL=http://ftp.gnu.org/gnu/osip/ 
    8 LIBOSIP2_SOURCE=libosip2-2.0.9.tar.gz 
    9 LIBOSIP2_DIR=$(BUILD_DIR)/libosip2-2.0.9 
     8LIBOSIP2_VERSION=2.2.2 
     9# LIBOSIP2_VERSION=3.3.0 
     10LIBOSIP2_SOURCE=libosip2-$(LIBOSIP2_VERSION).tar.gz 
     11LIBOSIP2_DIR=$(BUILD_DIR)/libosip2-$(LIBOSIP2_VERSION) 
    1012 
    1113LIBOSIP2_PKG_DIR=/usr 
    … …  
    3032        touch $(LIBOSIP2_DIR)/.configured 
    3133 
    32 $(LIBOSIP2_DIR)/src/osip2/.libs/libosip2.so.2.0.9: $(LIBOSIP2_DIR)/.configured 
     34$(LIBOSIP2_DIR)/src/osip2/.libs/libosip2.so.$(LIBOSIP2_VERSION): $(LIBOSIP2_DIR)/.configured 
    3335        $(MAKE) -C $(LIBOSIP2_DIR) 
    3436 
    35 $(LIBOSIP2_PKG_DIR)/lib/libosip2.so.2.0.9: $(LIBOSIP2_DIR)/src/osip2/.libs/libosip2.so.2.0.9 
     37$(LIBOSIP2_PKG_DIR)/lib/libosip2.so.$(LIBOSIP2_VERSION): $(LIBOSIP2_DIR)/src/osip2/.libs/libosip2.so.$(LIBOSIP2_VERSION) 
    3638        $(MAKE) -C $(LIBOSIP2_DIR) install 
    3739 
    38 libosip2: $(LIBOSIP2_PKG_DIR)/lib/libosip2.so.2.0.9 
     40libosip2: $(LIBOSIP2_PKG_DIR)/lib/libosip2.so.$(LIBOSIP2_VERSION) 
    3941 
    4042libosip2-clean: 

  • floppyfw-3.0/makefiles/linux.mk

    r269 r273  
    2727 
    2828# Version of Linux to download and then apply patches to 
    29 DOWNLOAD_LINUX_VERSION=2.4.37.10 
     29DOWNLOAD_LINUX_VERSION=2.4.37.11 
    3030# Version of Linux AFTER patches 
    3131LINUX_VERSION=$(DOWNLOAD_LINUX_VERSION)-floppyfw-$(FLOPPYFW_VERSION) 

  • floppyfw-3.0/makefiles/openvpn.mk

    r27 r273  
    55############################################################# 
    66 
    7 OPENVPN_SOURCE_URL=$(SF_MIRROR)/sourceforge/openvpn/ 
    8 OPENVPN_SOURCE=openvpn-2.0_beta11.tar.gz 
    9 OPENVPN_DIR=$(BUILD_DIR)/openvpn-2.0_beta11 
     7OPENVPN_SOURCE_URL=http://swupdate.openvpn.net/community/releases/ 
     8OPENVPN_VERSION=2.2.1 
     9OPENVPN_SOURCE=openvpn-$(OPENVPN_VERSION).tar.gz 
     10OPENVPN_DIR=$(BUILD_DIR)/openvpn-$(OPENVPN_VERSION) 
    1011 
    1112OPENVPN_PKG_DIR=$(PACKAGES_DIR)/openvpn 

  • floppyfw-3.0/makefiles/siproxd.mk

    r97 r273  
    55############################################################# 
    66 
    7 SIPROXD_SOURCE_URL=$(SF_MIRROR)/sourceforge/siproxd/ 
    8 SIPROXD_SOURCE=siproxd-0.5.7.tar.gz 
    9 SIPROXD_DIR=$(BUILD_DIR)/siproxd-0.5.7 
     7SIPROXD_SOURCE_URL=$(SF_MIRROR)/sourceforge/siproxd 
     8SIPROXD_VERSION=0.5.13 
     9SIPROXD_SOURCE=siproxd-$(SIPROXD_VERSION).tar.gz 
     10SIPROXD_DIR=$(BUILD_DIR)/siproxd-$(SIPROXD_VERSION) 
    1011 
    1112SIPROXD_PKG_DIR=$(PACKAGES_DIR)/siproxd 
    1213 
    1314$(DL_DIR)/$(SIPROXD_SOURCE): 
    14          $(WGET) -P $(DL_DIR) $(SIPROXD_SOURCE_URL)$(SIPROXD_SOURCE) 
     15         $(WGET) -P $(DL_DIR) $(SIPROXD_SOURCE_URL)/$(SIPROXD_SOURCE) 
    1516 
    1617siproxd-source: $(DL_DIR)/$(SIPROXD_SOURCE) 

  • floppyfw-3.0/scripts/config

    r269 r273  
    3333CONNECT_TYPE=DHCP       # For getting the IP address by DHCP, often used  
    3434                        # on cable modems. 
     35 
     36DHCP_USE_LAST_ADDR=y    # I'll make this new feature a default yes. 
     37                        # Reason is simple; I Want it and I presume 
     38                        # most others want it aswell. 
     39                        # Since it tries to store the address on the 
     40                        # root / source media, this only works with a  
     41                        # writeable source. 
     42 
    3543# CONNECT_TYPE=STATIC   # For the good old LAN/WAN connections with 
    3644                        # static IP addresses on the outside. 

  • floppyfw-3.0/scripts/network.ini

    r269 r273  
    140140                echo "Connetion method is DHCP" 
    141141                echo "OUTSIDE_DEVICE=$OUTSIDE_DEV" > /etc/outside.info 
    142                 HARGS= 
    143                 [ "$USER_IDENT" != "" ] && HARGS="-H $USER_IDENT" 
    144                 if /sbin/udhcpc -n -s /etc/udhcpcrenew.sh $HARGS -i $OUTSIDE_DEV 
     142                if /etc/udhcpc.sh 
    145143                then 
    146144                        . /etc/outside.info 
    147145                else 
    148146                        echo "duh!"     # Or some more useful error handling 
     147                        echo -n "Sorry, I could not get an IP address," 
     148                        echo -n " I'd better quit." 
     149                        exit; 
    149150                fi 
    150151                ;; 

  • floppyfw-3.0/scripts/rc.initrd

    r3 r273  
    2828while [ "$1" -a "$2" ] 
    2929do 
    30        echo "Attempting to mount $1 ($2)" 
    31        load_fsmod $1 $2 
    32        if mount -t $2 $1 /mnt/tmp 
     30       SOURCE_DEV=$1 
     31       SOURCE_FS=$2 
     32       echo "Attempting to mount $SOURCE_DEV ($SOURCE_FS)" 
     33       load_fsmod $SOURCE_DEV $SOURCE_FS 
     34       if mount -t $SOURCE_FS $SOURCE_DEV /mnt/tmp 
    3335        then 
    34          echo "Mounted $1 on /mnt/tmp" 
     36         echo "Mounted $SOURCE_DEV on /mnt/tmp" 
    3537         break 
    3638       else 
    … …  
    153155stripcr /mnt/tmp/floppyfw.msg /etc/issue 644 
    154156 
     157# I also want to add the source device and file system so that I can remount. 
     158echo "SOURCE_DEV=$SOURCE_DEV" >> /etc/config 
     159echo "SOURCE_FS=$SOURCE_FS" >> /etc/config 
     160 
    155161# 
    156162# Before I source it I want to fix the password. It's in the config but