summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/Config.in3
-rw-r--r--package/Makefile5
-rw-r--r--package/atftp/Config.in1
-rw-r--r--package/atftp/ipkg/atftp.control1
-rw-r--r--package/atftp/ipkg/atftpd.control1
-rwxr-xr-xpackage/base-files/default/etc/init.d/S45firewall8
-rwxr-xr-xpackage/base-files/default/sbin/mount_root2
-rw-r--r--package/dnsmasq/Makefile4
-rw-r--r--package/rrdcollect/files/rrdcollect.conf12
-rw-r--r--package/wireless-tools/Makefile6
-rw-r--r--target/linux/image/brcm/Makefile10
11 files changed, 34 insertions, 19 deletions
diff --git a/package/Config.in b/package/Config.in
index 83ef404e1e..6f1c5fe300 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -130,6 +130,7 @@ source "package/slurm/Config.in"
source "package/snort/Config.in"
source "package/snort-wireless/Config.in"
source "package/socat/Config.in"
+source "package/ssltunnel/Config.in"
source "package/ssmtp/Config.in"
source "package/srelay/Config.in"
source "package/tmsnc/Config.in"
@@ -179,6 +180,7 @@ source "package/libamsel/Config.in"
source "package/libao/Config.in"
source "package/libart/Config.in"
source "package/libcli/Config.in"
+source "package/clinkc/Config.in"
source "package/curl/Config.in" # libcurl
source "package/libdaemon/Config.in"
source "package/libdb/Config.in"
@@ -254,7 +256,6 @@ source "package/setserial/Config.in"
comment "Utilities"
source "package/bc/Config.in"
source "package/gdbserver/Config.in"
-source "package/madwifi-tools/Config.in"
source "package/pcmcia-cs/Config.in" # pcmcia-utils
source "package/usbutils/Config.in" # lsusb
source "package/pciutils/Config.in"
diff --git a/package/Makefile b/package/Makefile
index f2ad1c2061..5e29f88073 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -21,6 +21,7 @@ package-$(BR2_PACKAGE_BWM) += bwm
package-$(BR2_PACKAGE_CGILIB) += cgilib
package-$(BR2_PACKAGE_CHILLISPOT) += chillispot
package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount
+package-$(BR2_PACKAGE_CLINKC) += clinkc
package-$(BR2_PACKAGE_COLLECTD) += collectd
package-$(BR2_PACKAGE_CUPS) += cups
package-$(BR2_COMPILE_CURL) += curl
@@ -209,6 +210,7 @@ package-$(BR2_COMPILE_SPEEX) += speex
package-$(BR2_COMPILE_SQLITE) += sqlite
package-$(BR2_COMPILE_SQLITE2) += sqlite2
package-$(BR2_PACKAGE_SSMTP) += ssmtp
+package-$(BR2_PACKAGE_SSLTUNNEL) += ssltunnel
package-$(BR2_PACKAGE_SRELAY) += srelay
package-$(BR2_PACKAGE_STRACE) += strace
package-$(BR2_PACKAGE_TCPDUMP) += tcpdump
@@ -269,6 +271,7 @@ arpwatch-compile: libpcap-compile
atftp-compile: readline-compile
avahi-compile: libdaemon-compile expat-compile libgdbm-compile
bind-compile: openssl-compile
+clinkc-compile: expat-compile
curl-compile: openssl-compile zlib-compile
cyrus-sasl-compile: openssl-compile
deco-compile: ncurses-compile
@@ -305,6 +308,7 @@ lighttpd-compile: openssl-compile pcre-compile
madplay-compile: libid3tag-compile libmad-compile
miax-compile: bluez-libs-compile
miredo-compile: uclibc++-compile
+monit-compile: openssl-compile
mt-daapd-compile: howl-compile libgdbm-compile libid3tag-compile
mtr-compile: ncurses-compile
mysql-compile: ncurses-compile zlib-compile readline-compile
@@ -345,6 +349,7 @@ sipsak-compile: openssl-compile
socat-compile: openssl-compile
sqlite-compile: ncurses-compile readline-compile
sqlite2-compile: ncurses-compile readline-compile
+ssltunnel-compile: openssl-compile ppp-compile
tcpdump-compile: libpcap-compile
tinc-compile: zlib-compile openssl-compile liblzo-compile
tor-compile: libevent-compile openssl-compile zlib-compile
diff --git a/package/atftp/Config.in b/package/atftp/Config.in
index 32ab9512a3..296faec842 100644
--- a/package/atftp/Config.in
+++ b/package/atftp/Config.in
@@ -4,6 +4,7 @@ config BR2_COMPILE_ATFTP
tristate
default n
depends BR2_PACKAGE_ATFTP || BR2_PACKAGE_ATFTPD
+ select BR2_PACKAGE_LIBREADLINE
config BR2_PACKAGE_ATFTP
prompt "atftp............................. TFTP client"
diff --git a/package/atftp/ipkg/atftp.control b/package/atftp/ipkg/atftp.control
index d2083fc619..ca4d86a308 100644
--- a/package/atftp/ipkg/atftp.control
+++ b/package/atftp/ipkg/atftp.control
@@ -2,3 +2,4 @@ Package: atftp
Priority: optional
Section: net
Description: tftp client
+Depends: libreadline
diff --git a/package/atftp/ipkg/atftpd.control b/package/atftp/ipkg/atftpd.control
index efb40299c3..acdd2f1ced 100644
--- a/package/atftp/ipkg/atftpd.control
+++ b/package/atftp/ipkg/atftpd.control
@@ -2,3 +2,4 @@ Package: atftpd
Priority: optional
Section: net
Description: tftp server
+Depends: libreadline
diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall
index 0110cfc775..2942f3118e 100755
--- a/package/base-files/default/etc/init.d/S45firewall
+++ b/package/base-files/default/etc/init.d/S45firewall
@@ -81,11 +81,9 @@ iptables -t nat -N postrouting_rule
iptables -A FORWARD -j forwarding_rule
# allow
- # if there is bridge splitting this workaround works too
- for iface in $LAN; do
- iptables -A FORWARD -i $iface -o $iface -j ACCEPT
- [ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT
- done
+ iptables -A FORWARD -i br0 -o br0 -j ACCEPT
+ [ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT
+
# reject (what to do with anything not allowed earlier)
# uses the default -P DROP
diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root
index 693c694c1b..427ff0444f 100755
--- a/package/base-files/default/sbin/mount_root
+++ b/package/base-files/default/sbin/mount_root
@@ -30,7 +30,7 @@ if [ "$1" != "failsafe" ]; then
pivot_root /jffs /jffs/rom
mount none /proc -t proc
mount none /dev -t devfs
- umount /rom/proc rom/dev >&-
+ umount /rom/proc /rom/dev >&-
fi
fi
fi
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 215697cdb3..eeaad10e48 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -3,9 +3,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
-PKG_VERSION:=2.25
+PKG_VERSION:=2.26
PKG_RELEASE:=1
-PKG_MD5SUM:=a5a387aed551acf91990567a5e8e4fa4
+PKG_MD5SUM:=ae04abb5db4a8cc43c24f432f0c44d5c
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/package/rrdcollect/files/rrdcollect.conf b/package/rrdcollect/files/rrdcollect.conf
index 1b374548ee..e34c9bff7b 100644
--- a/package/rrdcollect/files/rrdcollect.conf
+++ b/package/rrdcollect/files/rrdcollect.conf
@@ -19,15 +19,15 @@ exec:///bin/df
# LAN: vlan0, WAN: vlan1, WIFI: eth1
file:///proc/net/dev
-"vlan0: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo
-"vlan1: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo
-"eth1: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo
-#"tun0: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo
+" vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo
+" vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo
+" eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo
+#" tun0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo
file:///proc/slabinfo
"ip_conntrack %d %*d %*d %*d %*d %*d" SYS.rrd:con
"arp_cache %d %*d %*d %*d %*d %*d" SYS.rrd:arp
file:///proc/interrupts
-"4: %d MIPS eth1" SYS.rrd:irw
-"5: %d MIPS eth0" SYS.rrd:ire
+" 4: %d MIPS eth1" SYS.rrd:irw
+" 5: %d MIPS eth0" SYS.rrd:ire
diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index 209f800df4..24e6f61b13 100644
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -24,18 +24,18 @@ $(PKG_BUILD_DIR)/.configured:
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \
- all iwmulticall
+ libiw.so.28 iwmulticall
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
PREFIX="$(PKG_INSTALL_DIR)" \
INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \
INSTALL_LIB="$(PKG_INSTALL_DIR)/usr/lib" \
- install install-iwmulticall
+ install-iwmulticall
touch $@
$(IPKG_WIRELESS_TOOLS):
mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/
+ $(CP) $(PKG_BUILD_DIR)/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/
mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/
$(RSTRIP) $(IDIR_WIRELESS_TOOLS)
diff --git a/target/linux/image/brcm/Makefile b/target/linux/image/brcm/Makefile
index 18bd3265c3..494450f247 100644
--- a/target/linux/image/brcm/Makefile
+++ b/target/linux/image/brcm/Makefile
@@ -78,6 +78,14 @@ FSNAME:=$(patsubst jffs2-%,jffs2,$(FS))
#
# install: $(BIN_DIR)/openwrt-wap54g-$(KERNEL)-$(FSNAME).trx
# endif
+
+ifneq ($(FS),jffs2-8MB)
+$(BIN_DIR)/openwrt-wrt54g3g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
+ $(STAGING_DIR)/bin/addpattern -4 -p W54F -v v1.99.5 -i $< -o $@ -g
+
+$(BIN_DIR)/openwrt-wrt54g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
+ $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g
+
$(BIN_DIR)/openwrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
$(STAGING_DIR)/bin/addpattern -4 -p W54s -v v1.05.2 -i $< -o $@ -g
@@ -112,7 +120,7 @@ endif
install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
install-ib:
mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
- $(CP) -fpR $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin
+ $(CP) $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin
mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
$(CP) $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/
$(CP) $(BUILD_DIR)/loader.elf $(IB_DIR)/build_$(ARCH)/
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-29 19:14:08 +0000