Merge pull request #4971 from StevenHessing/noddos
authorHannu Nyman <hannu.nyman@iki.fi>
Sat, 21 Oct 2017 06:12:01 +0000 (09:12 +0300)
committerGitHub <noreply@github.com>
Sat, 21 Oct 2017 06:12:01 +0000 (09:12 +0300)
noddos: v0.5.4 SendUdpPing fix

12 files changed:
lang/vala/Makefile
libs/boost/Makefile
libs/libiio/Makefile
libs/libiio/files/iiod.init [new file with mode: 0644]
libs/libpng/Makefile
libs/libxml2/Makefile
net/dhcpcd/Makefile
net/dhcpcd/patches/001-fix-musl.patch [deleted file]
net/squid/Makefile
net/squid/patches/001-cross_compile.patch
net/squid/patches/100-mime.patch [deleted file]
sound/mpg123/Makefile

index 2296f5fa497f76b01ca76983f1fa2a651470bae0..6337b40722eb8a292bde6da8e886876f6ebd3ef5 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2016 OpenWrt.org
+# Copyright (C) 2006-2017 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vala
-PKG_VERSION:=0.34.2
+PKG_VERSION:=0.34.5
 PKG_RELEASE:=1
 PKG_LICENSE:=LGPL-2.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/vala/0.34/
-PKG_HASH:=765e9c2b429a66db93247940f8588319b43f35c173d057bcae5717a97d765c41
+PKG_HASH:=3fd4ba371778bc87da42827b8d23f1f42b0629759a9a1c40c9683dfb7e73fae5
 
 PKG_BUILD_DEPENDS:=glib2 glib2/host vala/host
 HOST_BUILD_DEPENDS:=glib2/host
index b449dee45b7969a6b19186ad4d21c2f2f70953e8..351d36a373f5cc0272c8648790eee32c6f105674 100644 (file)
@@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/target.mk
 PKG_NAME:=boost
 PKG_VERSION:=1.65.1
 PKG_SOURCE_VERSION:=1_65_1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://sourceforge.net/projects/boost/files/boost/$(PKG_VERSION)
@@ -54,8 +54,8 @@ Boost is a set of free, peer-reviewed, portable C++ source libraries.
 | compile the kernel with Full Language Support.                            |
 | Without these requirerements, the following libs will not be available:   |
 | - Boost.Locale                                                            |
-| - Boost.Coroutine2                                                        |
-| - Boost.Fiber                                                             |
+| - Boost.Coroutine2 (header-only library - requires C++11)                 |
+| - Boost.Fiber (requires C++14)                                            |
 -----------------------------------------------------------------------------
 
 This package provides the following run-time libraries:
@@ -307,7 +307,7 @@ $(eval $(call DefineBoostLibrary,date_time,,))
 $(eval $(call DefineBoostLibrary,fiber,coroutine filesystem,,))
 $(eval $(call DefineBoostLibrary,filesystem,system,))
 $(eval $(call DefineBoostLibrary,graph,regex,))
-$(eval $(call DefineBoostLibrary,iostreams,,+zlib +liblzma))
+$(eval $(call DefineBoostLibrary,iostreams,,+zlib +liblzma +libbz2))
 $(eval $(call DefineBoostLibrary,locale,system,$(ICONV_DEPENDS),BUILD_NLS))
 $(eval $(call DefineBoostLibrary,log,system chrono date_time thread filesystem regex,))
 $(eval $(call DefineBoostLibrary,math,,))
@@ -389,13 +389,15 @@ define Build/Compile
                        $(if $(CONFIG_boost-single-thread),threading=single,) \
                        threading=multi \
                        --without-mpi \
-                       $(if $(CONFIG_boost-coroutine2),,--without-coroutine2) \
                        $(if $(CONFIG_boost-graph-parallel),,--without-graph_parallel) \
                        $(if $(CONFIG_PACKAGE_boost-test),,--without-test) \
                        $(foreach lib,$(BOOST_LIBS), \
                                $(if $(findstring python,$(lib)), \
                                        $(if $(CONFIG_PACKAGE_boost-python),python=2.7,--without-python), \
-                                       $(if $(CONFIG_PACKAGE_boost-$(lib)),,--without-$(lib))) \
+                                               $(if $(CONFIG_PACKAGE_boost-$(lib)),, \
+                                                       $(if $(findstring $(lib),wserialization),,--without-$(lib)) \
+                                               ) \
+                                       ) \
                        ) \
                        $(if $(CONFIG_PACKAGE_boost-locale),boost.locale.iconv=on -sICONV_PATH=$(ICONV_PREFIX) boost.locale.posix=$(if $(USE_MUSL),on,off), \
                                boost.locale.iconv=off) \
@@ -403,26 +405,32 @@ define Build/Compile
                        $(if $(CONFIG_PACKAGE_boost-iostreams),-sNO_BZIP2=1 -sZLIB_INCLUDE=$(STAGING_DIR)/usr/include \
                                -sZLIB_LIBPATH=$(STAGING_DIR)/usr/lib) \
                        install ;\
-               b2 \
-                       $(CONFIGURE_ARGS) \
-                       --ignore-site-config \
-                       --toolset=gcc-$(ARCH) abi=$(BOOST_ABI) \
-                       --disable-long-double \
-                       $(if $(CONFIG_boost-variant-release), variant=release,) \
-                       $(if $(CONFIG_boost-variant-debug), variant=debug,) \
-                       $(if $(CONFIG_boost-variant-profile), variant=profile,) \
-                       $(if $(CONFIG_boost-use-name-tags),--layout=tagged,--layout=system) \
-                       $(if $(CONFIG_boost-build-type-complete),--build-type=complete,--build-type=minimal) \
-                       $(if $(CONFIG_boost-shared-libs),link=shared,) \
-                       $(if $(CONFIG_boost-static-libs),link=static,) \
-                       $(if $(CONFIG_boost-static-and-shared-libs),link=static$(comma)shared,) \
-                       $(if $(CONFIG_boost-runtime-shared),runtime-link=shared,) \
-                       $(if $(CONFIG_boost-runtime-static),runtime-link=static,) \
-                       $(if $(CONFIG_boost-runtime-static-and-shared),runtime-link=shared$(comma)static,) \
-                       $(if $(CONFIG_boost-single-thread),threading=single,) \
-                       threading=multi \
-                       $(if $(CONFIG_PACKAGE_boost-python3),--with-python python=3.6,) \
-                       install ;\
+                       $(if $(CONFIG_PACKAGE_boost-python3), \
+                               b2 \
+                                       $(CONFIGURE_ARGS) \
+                                       --ignore-site-config \
+                                       --toolset=gcc-$(ARCH) abi=$(BOOST_ABI) \
+                                       --disable-long-double \
+                                       $(if $(CONFIG_boost-variant-release), variant=release,) \
+                                       $(if $(CONFIG_boost-variant-debug), variant=debug,) \
+                                       $(if $(CONFIG_boost-variant-profile), variant=profile,) \
+                                       $(if $(CONFIG_boost-use-name-tags),--layout=tagged,--layout=system) \
+                                       $(if $(CONFIG_boost-build-type-complete),--build-type=complete,--build-type=minimal) \
+                                       $(if $(CONFIG_boost-shared-libs),link=shared,) \
+                                       $(if $(CONFIG_boost-static-libs),link=static,) \
+                                       $(if $(CONFIG_boost-static-and-shared-libs),link=static$(comma)shared,) \
+                                       $(if $(CONFIG_boost-runtime-shared),runtime-link=shared,) \
+                                       $(if $(CONFIG_boost-runtime-static),runtime-link=static,) \
+                                       $(if $(CONFIG_boost-runtime-static-and-shared),runtime-link=shared$(comma)static,) \
+                                       $(if $(CONFIG_boost-single-thread),threading=single,) \
+                                       threading=multi \
+                                       $(foreach lib,$(BOOST_LIBS), \
+                                               $(if $(findstring python,$(lib)), \
+                                                       $(if $(CONFIG_PACKAGE_boost-python3),python=3.6,), \
+                                               ) \
+                                       ) \
+                               install ;\
+                       ,) \
        )
 endef
 
index 4a9b4406d8dc313f0ac4fe7dca91ed38c211e0cf..9105568db57332aa2282a94fc521f14aee304deb 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiio
 PKG_VERSION:=0.10
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/analogdevicesinc/libiio/tar.gz/v$(PKG_VERSION)?
@@ -91,6 +91,8 @@ define Package/libiio/install
 endef
 
 define Package/iiod/install
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/iiod.init $(1)/etc/init.d/iiod
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iiod $(1)/usr/sbin/
 endef
diff --git a/libs/libiio/files/iiod.init b/libs/libiio/files/iiod.init
new file mode 100644 (file)
index 0000000..1ac62f3
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/sh /etc/rc.common
+
+START=90
+USE_PROCD=1
+PROG=/usr/sbin/iiod
+
+start_service() {
+       procd_open_instance
+       procd_set_param command $PROG
+       procd_set_param respawn
+       procd_close_instance
+}
index ac782c8a31cb68d9773319b3f419b9484dc8ad6c..b7beabf4e9fc3884f64375fb40132f4484ce1ce8 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpng
-PKG_VERSION:=1.6.29
-PKG_RELEASE:=2
+PKG_VERSION:=1.6.32
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/libpng
-PKG_HASH:=4245b684e8fe829ebb76186327bb37ce5a639938b219882b53d64bd3cfc5f239
+PKG_HASH:=c918c3113de74a692f0a1526ce881dc26067763eb3915c57ef3a0f7b6886f59b
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 
 PKG_LICENSE:=Libpng GPL-2.0+ BSD-3-Clause
@@ -39,6 +39,7 @@ TARGET_CFLAGS += $(FPIC)
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
+       $(if $(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),--enable-hardware-optimizations=yes --enable-arm-neon=yes)
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/bin
index f33309643f739a3d5a8cd669a5e50d8bdd104524..bd1e6a1bccf12b10edc8b8ccbf646752aaf0ecfa 100644 (file)
@@ -118,6 +118,10 @@ define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{la,a,so*} $(1)/usr/lib/
 
+       $(INSTALL_DIR) $(1)/usr/lib/cmake/libxml2
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake/libxml2/libxml2-config.cmake \
+               $(1)/usr/lib/cmake/libxml2
+
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc $(1)/usr/lib/pkgconfig/
 
index e11083d739258408752e228a8d5e520c1a79bf97..a5119c6da0bb72950091ca651ef0edd7844a9734 100644 (file)
@@ -8,18 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcpcd
-PKG_VERSION:=6.4.3
+PKG_VERSION:=6.11.5
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=ftp://roy.marples.name/pub/dhcpcd \
     http://roy.marples.name/downloads/dhcpcd
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=36ad01619ee81ac3815467d0157c38a14f5db464371326e97f719be362d5ab9c
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_HASH:=6f9674dc7e27e936cc787175404a6171618675ecfb6903ab9887b1b66a87d69e
 
 PKG_LICENSE:=BSD-2c
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Roy Marples <roy@marples.name>
+PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
@@ -45,8 +45,11 @@ define Package/dhcpcd/description
     * ARP ping profiles
 endef
 
-CONFIGURE_ARGS+=       --prefix=/ --sbindir=/sbin \
-                       --libexecdir=/lib/dhcpcd --dbdir=/var/dhcpcd
+CONFIGURE_ARGS+= \
+       --prefix=/ \
+       --sbindir=/sbin \
+       --libexecdir=/lib/dhcpcd \
+       --dbdir=/var/dhcpcd
 
 define Package/dhcpcd/install
        $(INSTALL_DIR) $(1)/sbin $(1)/etc $(1)/lib/dhcpcd/dhcpcd-hooks
diff --git a/net/dhcpcd/patches/001-fix-musl.patch b/net/dhcpcd/patches/001-fix-musl.patch
deleted file mode 100644 (file)
index 5751a4c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/dhcp6.c
-+++ b/dhcp6.c
-@@ -1047,8 +1047,8 @@ logsend:
-       ctx = ifp->ctx->ipv6;
-       dst.sin6_scope_id = ifp->index;
--      ctx->sndhdr.msg_name = (caddr_t)&dst;
--      ctx->sndhdr.msg_iov[0].iov_base = (caddr_t)state->send;
-+      ctx->sndhdr.msg_name = (void *)&dst;
-+      ctx->sndhdr.msg_iov[0].iov_base = (void *)state->send;
-       ctx->sndhdr.msg_iov[0].iov_len = state->send_len;
-       /* Set the outbound interface */
index f971abfc432e63143ef8a216b210651626d8dd7d..b9cedd7eaebb6d6d9fdf5cc2b3387c59cdc5e3fc 100644 (file)
@@ -8,15 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=squid
-PKG_VERSION:=3.5.12
+PKG_VERSION:=3.5.27
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
+PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v3/3.5/
-PKG_HASH:=8bc83f3869f7404aefb10883109e28443255cf6dde50a13904c7954619707a42
+PKG_SOURCE_URL:=http://www3.us.squid-cache.org/Versions/v3/3.5/ \
+       http://www2.pl.squid-cache.org/Versions/v3/3.5/ \
+       http://www.squid-cache.org/Versions/v3/3.5/
+PKG_HASH:=5ddb4367f2dc635921f9ca7a59d8b87edb0412fa203d1543393ac3c7f9fef0ec
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
@@ -28,11 +30,11 @@ define Package/squid/Default
   CATEGORY:=Network
   SUBMENU:=Web Servers/Proxies
   URL:=http://www.squid-cache.org/
+  MENU:=1
 endef
 
 define Package/squid
   $(call Package/squid/Default)
-  MENU:=1
   DEPENDS:=+libopenssl +libpthread +librt +libltdl +libstdcpp
   TITLE:=full-featured Web proxy cache
 endef
index c7493bbceee54959fbe069d5323ad3f86513aaf5..be9fdcd25dc4283934654cd9abf5b2488b15a84f 100644 (file)
@@ -1,24 +1,40 @@
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -7761,3 +7761,3 @@ cache_cf.o: cf_parser.cci
+@@ -7984,7 +7984,7 @@ cache_cf.o: cf_parser.cci
+ # cf_gen builds the configuration files.
  cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
 -      $(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
 +      g++ -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
  
+ # squid.conf.default is built by cf_gen when making cf_parser.cci
+ squid.conf.default squid.conf.documented: cf_parser.cci
 --- a/configure
 +++ b/configure
-@@ -20133,3 +20133,3 @@ if test "$cross_compiling" = yes; then :
+@@ -20842,7 +20842,7 @@ else
+ if test "$cross_compiling" = yes; then :
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -as_fn_error $? "cannot run test program while cross compiling
 +_as_fn_error $? "cannot run test program while cross compiling
  See \`config.log' for more details" "$LINENO" 5; }
-@@ -28289,3 +28289,3 @@ else
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -29142,7 +29142,7 @@ else
+     if test "$cross_compiling" = yes; then :
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -as_fn_error $? "cannot run test program while cross compiling
 +_as_fn_error $? "cannot run test program while cross compiling
  See \`config.log' for more details" "$LINENO" 5; }
-@@ -28314,3 +28314,3 @@ else
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -29167,7 +29167,7 @@ else
+     if test "$cross_compiling" = yes; then :
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -as_fn_error $? "cannot run test program while cross compiling
 +_as_fn_error $? "cannot run test program while cross compiling
  See \`config.log' for more details" "$LINENO" 5; }
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/net/squid/patches/100-mime.patch b/net/squid/patches/100-mime.patch
deleted file mode 100644 (file)
index 1138a41..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/src/mime.conf.default
-+++ b/src/mime.conf.default
-@@ -1,20 +1,3 @@
--## Copyright (C) 1996-2015 The Squid Software Foundation and contributors
--##
--## Squid software is distributed under GPLv2+ license and includes
--## contributions from numerous individuals and organizations.
--## Please see the COPYING and CONTRIBUTORS files for details.
--##
--#
--# This file associates URL patterns for servers or services
--# that don't automatically include Content-Type (like ftp) with a mime type
--# and a graphical icon.
--#
--# Content-Encodings are taken from section 3.1 of RFC2068 (HTTP/1.1)
--#
--# This file has the format :
--#
--# regexp      content-type                    icon                            encoding mode   actions
--#--------------------------------------------------------------------------------------------------------
- \.gif$                        image/gif               silk/image.png                  -       image   +download
- \.mime$                       www/mime                silk/page_white_text.png        -       ascii   +download
- ^internal-dirup$      -                       silk/arrow_up.png               -       -
-@@ -191,6 +174,4 @@ README             text/plain                      silk/information.pn
- \.xml$                text/xml                        silk/page_world.png             -       ascii   +download
- \.xsl$                text/xml                        silk/layout.png                 -       ascii   +download
- \.xyz$                chemical/x-xyz                  silk/chart_line.png             -       image   +download
--#
--# the default
- .             text/plain                      silk/bullet_red.png             -       image   +download +view
index c518430e9f41c426f36e4adec66bf97cba48c348..1b7ca4a01782b19b9928af6998c90eb3f4037000 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mpg123
-PKG_VERSION:=1.25.6
+PKG_VERSION:=1.25.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/mpg123
-PKG_HASH:=0f0458c9b87799bc2c9bf9455279cc4d305e245db43b51a39ef27afe025c5a8e
+PKG_HASH:=31b15ebcf26111b874732e07c8e60de5053ee555eea15fb70c657a4f9f0344f3
 PKG_MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
 
 PKG_FIXUP:=libtool