diff options
Diffstat (limited to 'package/network/services')
19 files changed, 53 insertions, 112 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 2ea73af..942acd7 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -293,15 +293,22 @@ dhcp_host_add() { config_get ip "$cfg" ip [ -n "$ip" -o -n "$name" ] || return 0 + config_get_bool dns "$cfg" dns 0 + [ "$dns" = "1" -a -n "$ip" -a -n "$name" ] && { + echo "$ip $name${DOMAIN:+.$DOMAIN}" >> $HOSTFILE + } + config_get mac "$cfg" mac - [ -z "$mac" ] && { + if [ -n "$mac" ]; then + # --dhcp-host=00:20:e0:3b:13:af,192.168.0.199,lap + macs="" + for m in $mac; do append macs "$m" ","; done + else + # --dhcp-host=lap,192.168.0.199 [ -n "$name" ] || return 0 - mac="$name" + macs="$name" name="" - } - - macs="" - for m in $mac; do append macs "$m" ","; done + fi config_get tag "$cfg" tag @@ -309,11 +316,6 @@ dhcp_host_add() { [ "$broadcast" = "0" ] && broadcast= xappend "--dhcp-host=$macs${networkid:+,net:$networkid}${broadcast:+,set:needs-broadcast}${tag:+,set:$tag}${ip:+,$ip}${name:+,$name}" - - config_get_bool dns "$cfg" dns 0 - [ "$dns" = "1" ] && { - echo "$ip $name${DOMAIN:+.$DOMAIN}" >> $HOSTFILE - } } dhcp_tag_add() { @@ -441,13 +443,10 @@ dhcp_domain_add() { [ -n "$ip" ] || return 0 for name in $names; do - [ "${name%.*}" == "$name" ] && \ - name="$name${DOMAIN:+.$DOMAIN}" - - record="${record:+$record/}$name" + record="${record:+$record }$name" done - xappend "--address=/$record/$ip" + echo "$ip $record" >> $HOSTFILE } dhcp_srv_add() { @@ -572,7 +571,7 @@ start_service() { local lanaddr [ $ADD_LOCAL_HOSTNAME -eq 1 ] && network_get_ipaddr lanaddr "lan" && { local hostname="$(uci_get system @system[0] hostname OpenWrt)" - dhcp_hostrecord_add "" "${hostname%.$DOMAIN}${DOMAIN:+.$DOMAIN ${hostname%.$DOMAIN}}" "$lanaddr" + dhcp_domain_add "" "$hostname" "$lanaddr" } echo >> $CONFIGFILE diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index f793e9b..8a2bc27 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -8,19 +8,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear -PKG_VERSION:=2014.65 -PKG_RELEASE:=1 +PKG_VERSION:=2014.63 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://matt.ucc.asn.au/dropbear/releases/ \ https://dropbear.nl/mirror/releases/ -PKG_MD5SUM:=1918604238817385a156840fa2c39490 +PKG_MD5SUM:=7066bb9a2da708f3ed06314fdc9c47fd PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE PKG_BUILD_PARALLEL:=1 +PKG_USE_MIPS16:=0 PKG_CONFIG_DEPENDS:=CONFIG_DROPBEAR_ECC diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init index 5206426..c6f3d9b 100755 --- a/package/network/services/dropbear/files/dropbear.init +++ b/package/network/services/dropbear/files/dropbear.init @@ -47,7 +47,6 @@ validate_section_dropbear() 'Port:list(port):22' \ 'SSHKeepAlive:uinteger:300' \ 'IdleTimeout:uinteger:0' - return $? } dropbear_instance() diff --git a/package/network/services/dropbear/patches/001-dont_send_SSH_MSG_IMPLEMENTED.patch b/package/network/services/dropbear/patches/001-dont_send_SSH_MSG_IMPLEMENTED.patch deleted file mode 100644 index fe222f5..0000000 --- a/package/network/services/dropbear/patches/001-dont_send_SSH_MSG_IMPLEMENTED.patch +++ /dev/null @@ -1,58 +0,0 @@ - -# HG changeset patch -# User Matt Johnston <matt@ucc.asn.au> -# Date 1407937727 -28800 -# Node ID f7f6c15b0ec30b0def69c9ccbb3dc4eb97374abc -# Parent 02821319ab1f1208b7ab5de4af82a562c386d40d -Don't send SSH_MSG_UNIMPLEMENTED for keepalive responses - -diff -r 02821319ab1f -r f7f6c15b0ec3 cli-session.c ---- a/cli-session.c Fri Aug 08 21:53:47 2014 +0800 -+++ b/cli-session.c Wed Aug 13 21:48:47 2014 +0800 -@@ -73,6 +73,8 @@ - #ifdef ENABLE_CLI_REMOTETCPFWD - {SSH_MSG_REQUEST_SUCCESS, cli_recv_msg_request_success}, /* client */ - {SSH_MSG_REQUEST_FAILURE, cli_recv_msg_request_failure}, /* client */ -+#else -+ {SSH_MSG_REQUEST_FAILURE, ignore_recv_msg_request_failure}, /* for keepalive */ - #endif - {0, 0} /* End */ - }; -diff -r 02821319ab1f -r f7f6c15b0ec3 common-session.c ---- a/common-session.c Fri Aug 08 21:53:47 2014 +0800 -+++ b/common-session.c Wed Aug 13 21:48:47 2014 +0800 -@@ -394,6 +394,11 @@ - return pos+1; - } - -+void ignore_recv_msg_request_failure() { -+ // Do nothing -+ TRACE(("Ignored msg_request_failure")) -+} -+ - static void send_msg_keepalive() { - CHECKCLEARTOWRITE(); - time_t old_time_idle = ses.last_packet_time_idle; -diff -r 02821319ab1f -r f7f6c15b0ec3 session.h ---- a/session.h Fri Aug 08 21:53:47 2014 +0800 -+++ b/session.h Wed Aug 13 21:48:47 2014 +0800 -@@ -47,6 +47,7 @@ - void session_cleanup(); - void send_session_identification(); - void send_msg_ignore(); -+void ignore_recv_msg_request_failure(); - - void update_channel_prio(); - -diff -r 02821319ab1f -r f7f6c15b0ec3 svr-session.c ---- a/svr-session.c Fri Aug 08 21:53:47 2014 +0800 -+++ b/svr-session.c Wed Aug 13 21:48:47 2014 +0800 -@@ -58,6 +58,7 @@ - {SSH_MSG_CHANNEL_OPEN, recv_msg_channel_open}, - {SSH_MSG_CHANNEL_EOF, recv_msg_channel_eof}, - {SSH_MSG_CHANNEL_CLOSE, recv_msg_channel_close}, -+ {SSH_MSG_REQUEST_FAILURE, ignore_recv_msg_request_failure}, /* for keepalive */ - #ifdef USING_LISTENERS - {SSH_MSG_CHANNEL_OPEN_CONFIRMATION, recv_msg_channel_open_confirmation}, - {SSH_MSG_CHANNEL_OPEN_FAILURE, recv_msg_channel_open_failure}, - diff --git a/package/network/services/dropbear/patches/110-change_user.patch b/package/network/services/dropbear/patches/110-change_user.patch index 44bfe14..48228ea 100644 --- a/package/network/services/dropbear/patches/110-change_user.patch +++ b/package/network/services/dropbear/patches/110-change_user.patch @@ -1,6 +1,6 @@ --- a/svr-chansession.c +++ b/svr-chansession.c -@@ -902,12 +902,12 @@ static void execchild(void *user_data) { +@@ -889,12 +889,12 @@ static void execchild(void *user_data) { /* We can only change uid/gid as root ... */ if (getuid() == 0) { diff --git a/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch index 0a5e8ba..6de652b 100644 --- a/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch +++ b/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch @@ -1,6 +1,6 @@ --- a/cli-runopts.c +++ b/cli-runopts.c -@@ -312,6 +312,10 @@ void cli_getopts(int argc, char ** argv) +@@ -309,6 +309,10 @@ void cli_getopts(int argc, char ** argv) debug_trace = 1; break; #endif @@ -11,10 +11,10 @@ case 'F': case 'e': #ifndef ENABLE_USER_ALGO_LIST -@@ -329,7 +333,6 @@ void cli_getopts(int argc, char ** argv) - print_version(); - exit(EXIT_SUCCESS); - break; +@@ -322,7 +326,6 @@ void cli_getopts(int argc, char ** argv) + #ifndef ENABLE_CLI_LOCALTCPFWD + case 'L': + #endif - case 'o': case 'b': next = &dummy; diff --git a/package/network/services/dropbear/patches/140-disable_assert.patch b/package/network/services/dropbear/patches/140-disable_assert.patch index 0717228..edc7547 100644 --- a/package/network/services/dropbear/patches/140-disable_assert.patch +++ b/package/network/services/dropbear/patches/140-disable_assert.patch @@ -1,6 +1,6 @@ --- a/dbutil.h +++ b/dbutil.h -@@ -101,7 +101,11 @@ int m_str_to_uint(const char* str, unsig +@@ -92,7 +92,11 @@ int m_str_to_uint(const char* str, unsig #define DEF_MP_INT(X) mp_int X = {0, 0, 0, NULL} /* Dropbear assertion */ diff --git a/package/network/services/dropbear/patches/500-set-default-path.patch b/package/network/services/dropbear/patches/500-set-default-path.patch index f4cbdee..4eea57d 100644 --- a/package/network/services/dropbear/patches/500-set-default-path.patch +++ b/package/network/services/dropbear/patches/500-set-default-path.patch @@ -1,6 +1,6 @@ --- a/options.h +++ b/options.h -@@ -323,7 +323,7 @@ be overridden at runtime with -I. 0 disa +@@ -318,7 +318,7 @@ be overridden at runtime with -I. 0 disa #define DEFAULT_IDLE_TIMEOUT 0 /* The default path. This will often get replaced by the shell */ diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index f8c76ca..da8f16b 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -8,12 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd -PKG_VERSION:=2014-06-03 +PKG_VERSION:=2014-06-03.1 PKG_RELEASE:=1 PKG_REV:=84df167554569af8c87f0a8ac1fb508192417d8e PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git +#PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git +PKG_SOURCE_URL:=https://github.com/greearb/hostap-ct.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_PROTO:=git diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index 2a16bb4..b8ba7bd 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -196,13 +196,13 @@ hostapd_set_bss_options() { config_get device_type "$vif" wps_device_type "6-0050F204-1" config_get device_name "$vif" wps_device_name "OpenWrt AP" config_get manufacturer "$vif" wps_manufacturer "openwrt.org" - config_get wps_pin "$vif" wps_pin "12345670" + config_get wps_pin "$vif" wps_pin config_get_bool ext_registrar "$vif" ext_registrar 0 [ "$ext_registrar" -gt 0 -a -n "$bridge" ] && append "$var" "upnp_iface=$bridge" "$N" append "$var" "eap_server=1" "$N" - append "$var" "ap_pin=$wps_pin" "$N" + [ -n "$wps_pin" ] && append "$var" "ap_pin=$wps_pin" "$N" append "$var" "wps_state=${wps_not_configured:-2}" "$N" append "$var" "ap_setup_locked=0" "$N" append "$var" "device_type=$device_type" "$N" diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh index 7cdcb52..30d12e9 100644 --- a/package/network/services/hostapd/files/netifd.sh +++ b/package/network/services/hostapd/files/netifd.sh @@ -290,7 +290,6 @@ hostapd_set_bss_options() { set_default wps_device_type "6-0050F204-1" set_default wps_device_name "OpenWrt AP" set_default wps_manufacturer "openwrt.org" - set_default wps_pin "12345670" wps_state=2 [ -n "$wps_configured" ] && wps_state=1 @@ -298,7 +297,7 @@ hostapd_set_bss_options() { [ "$ext_registrar" -gt 0 -a -n "$network_bridge" ] && append bss_conf "upnp_iface=$network_bridge" "$N" append bss_conf "eap_server=1" "$N" - append bss_conf "ap_pin=$wps_pin" "$N" + [ -n "$wps_pin" ] && append bss_conf "ap_pin=$wps_pin" "$N" append bss_conf "wps_state=$wps_state" "$N" append bss_conf "ap_setup_locked=0" "$N" append bss_conf "device_type=$wps_device_type" "$N" @@ -417,7 +416,7 @@ _wpa_supplicant_common() { wpa_supplicant_teardown_interface() { _wpa_supplicant_common "$1" - rm -rf "$_rpath" "$_config" + rm -rf "$_rpath/$1" "$_config" } wpa_supplicant_prepare_interface() { diff --git a/package/network/services/hostapd/patches/120-daemonize_fix.patch b/package/network/services/hostapd/patches/120-daemonize_fix.patch index 20a1eb3..032e207 100644 --- a/package/network/services/hostapd/patches/120-daemonize_fix.patch +++ b/package/network/services/hostapd/patches/120-daemonize_fix.patch @@ -1,14 +1,14 @@ --- a/src/utils/os_unix.c +++ b/src/utils/os_unix.c -@@ -9,6 +9,7 @@ - #include "includes.h" +@@ -10,6 +10,7 @@ #include <time.h> + #include <sys/wait.h> +#include <fcntl.h> #ifdef ANDROID #include <sys/capability.h> -@@ -154,59 +155,46 @@ int os_gmtime(os_time_t t, struct os_tm +@@ -155,59 +156,46 @@ int os_gmtime(os_time_t t, struct os_tm return 0; } diff --git a/package/network/services/hostapd/patches/370-ap_sta_support.patch b/package/network/services/hostapd/patches/370-ap_sta_support.patch index 8a92ead..4b1f2ab 100644 --- a/package/network/services/hostapd/patches/370-ap_sta_support.patch +++ b/package/network/services/hostapd/patches/370-ap_sta_support.patch @@ -157,7 +157,7 @@ #include "drivers/driver.h" #include "wpa_supplicant_i.h" #include "config.h" -@@ -247,6 +248,10 @@ static void calculate_update_time(const +@@ -247,6 +248,10 @@ static void calculate_update_time(const static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src, struct os_reltime *fetch_time) { diff --git a/package/network/services/hostapd/patches/450-limit_debug_messages.patch b/package/network/services/hostapd/patches/450-limit_debug_messages.patch index 08f17dc..7030ef2 100644 --- a/package/network/services/hostapd/patches/450-limit_debug_messages.patch +++ b/package/network/services/hostapd/patches/450-limit_debug_messages.patch @@ -166,7 +166,7 @@ /** * wpa_hexdump_ascii_key - conditional hex dump, hide keys -@@ -142,8 +177,14 @@ void wpa_hexdump_ascii(int level, const +@@ -142,8 +177,14 @@ void wpa_hexdump_ascii(int level, const * bytes per line will be shown. This works like wpa_hexdump_ascii(), but by * default, does not include secret keys (passwords, etc.) in debug output. */ diff --git a/package/network/services/hostapd/patches/470-hostapd_cli_ifdef.patch b/package/network/services/hostapd/patches/470-hostapd_cli_ifdef.patch index d4a0f12..7d67091 100644 --- a/package/network/services/hostapd/patches/470-hostapd_cli_ifdef.patch +++ b/package/network/services/hostapd/patches/470-hostapd_cli_ifdef.patch @@ -16,7 +16,7 @@ " get_config show current configuration\n" " help show this usage help\n" " interface [ifname] show interfaces/select interface\n" -@@ -362,7 +360,6 @@ static int hostapd_cli_cmd_sa_query(stru +@@ -353,7 +351,6 @@ static int hostapd_cli_cmd_sa_query(stru #endif /* CONFIG_IEEE80211W */ @@ -24,7 +24,7 @@ static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc, char *argv[]) { -@@ -588,7 +585,6 @@ static int hostapd_cli_cmd_wps_config(st +@@ -579,7 +576,6 @@ static int hostapd_cli_cmd_wps_config(st ssid_hex, argv[1]); return wpa_ctrl_command(ctrl, buf); } @@ -32,7 +32,7 @@ static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc, -@@ -979,7 +975,6 @@ static struct hostapd_cli_cmd hostapd_cl +@@ -970,7 +966,6 @@ static struct hostapd_cli_cmd hostapd_cl #ifdef CONFIG_IEEE80211W { "sa_query", hostapd_cli_cmd_sa_query }, #endif /* CONFIG_IEEE80211W */ @@ -40,7 +40,7 @@ { "wps_pin", hostapd_cli_cmd_wps_pin }, { "wps_check_pin", hostapd_cli_cmd_wps_check_pin }, { "wps_pbc", hostapd_cli_cmd_wps_pbc }, -@@ -993,7 +988,6 @@ static struct hostapd_cli_cmd hostapd_cl +@@ -984,7 +979,6 @@ static struct hostapd_cli_cmd hostapd_cl { "wps_ap_pin", hostapd_cli_cmd_wps_ap_pin }, { "wps_config", hostapd_cli_cmd_wps_config }, { "wps_get_status", hostapd_cli_cmd_wps_get_status }, diff --git a/package/network/services/hostapd/patches/490-scan_wait.patch b/package/network/services/hostapd/patches/490-scan_wait.patch index 3459a61..2c0f284 100644 --- a/package/network/services/hostapd/patches/490-scan_wait.patch +++ b/package/network/services/hostapd/patches/490-scan_wait.patch @@ -33,7 +33,7 @@ /* Initialize the driver interface */ if (!(b[0] | b[1] | b[2] | b[3] | b[4] | b[5])) b = NULL; -@@ -372,8 +384,6 @@ static void hostapd_global_deinit(const +@@ -372,8 +384,6 @@ static void hostapd_global_deinit(const #endif /* CONFIG_NATIVE_WINDOWS */ eap_server_unregister_methods(); diff --git a/package/network/services/mdns/Makefile b/package/network/services/mdns/Makefile index f3e6f51..d065f8e 100644 --- a/package/network/services/mdns/Makefile +++ b/package/network/services/mdns/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mdns -PKG_VERSION:=2014-06-25 +PKG_VERSION:=2014-09-02 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=git://git.openwrt.org/project/mdnsd.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=902e2d1eaaff0d3d33dee605a4746fd5d4b6b999 +PKG_SOURCE_VERSION:=b7e5cb7ab91a9487ec71a14b706b5589cefe9052 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org> diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile index f9b3a57..e1655b2 100644 --- a/package/network/services/odhcpd/Makefile +++ b/package/network/services/odhcpd/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=odhcpd -PKG_VERSION:=2014-08-19 +PKG_VERSION:=2014-09-25 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=git://github.com/sbyx/odhcpd.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=710744ecea73b6a3cf560776e298741b04fb727a +PKG_SOURCE_VERSION:=a6e2953843eaf6c93764f9feef10466e7a84ec85 PKG_MAINTAINER:=Steven Barth <steven@midlink.org> diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile index 1e0c7fa..1ab8be9 100644 --- a/package/network/services/openvpn/Makefile +++ b/package/network/services/openvpn/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2013 OpenWrt.org +# Copyright (C) 2010-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn -PKG_VERSION:=2.3.4 -PKG_RELEASE:=1 +PKG_VERSION:=2.3.6 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://swupdate.openvpn.net/community/releases PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MD5SUM:=04d47237907faabe9d046970ffe44b2e +PKG_MD5SUM:=6ca03fe0fd093e0d01601abee808835c PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) |