#
-# Copyright (C) 2006-2015 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.
include $(TOPDIR)/rules.mk
PKG_NAME:=sudo
-PKG_VERSION:=1.8.14p3
+PKG_VERSION:=1.8.21p2
PKG_RELEASE:=1
PKG_LICENSE:=ISC
PKG_LICENSE_FILES:=doc/LICENSE
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.sudo.ws/dist
-PKG_HASH:=a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237
+PKG_HASH:=74c5746cd33a814e2431c39faf0d76f7f8a697379bd073862e3b156cf0d76368
PKG_INSTALL:=1
include $(TOPDIR)/rules.mk
PKG_NAME:=django
-PKG_VERSION:=1.8.17
+PKG_VERSION:=1.8.18
PKG_RELEASE=1
PKG_LICENSE:=BSD-3-Clause
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/django/django.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=d3d12fc11da56e4ea8af37a22a9a0aa6579ab2d5
+PKG_SOURCE_VERSION:=2d4bc5a60aa8a076689667c550ded96b87bc463e
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=7d8c4e58486c3a539f17437b3a802b67d53401971eceac2be50c47bcc756c27b
+PKG_MIRROR_HASH:=c82c2cc338ae46ba8572d9960fc98dca932edc43a00f011fed102810a86185ae
PKG_BUILD_DEPENDS:=python python-setuptools
include $(INCLUDE_DIR)/package.mk
#
-# 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.
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
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)
| 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:
$(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,,))
$(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) \
$(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
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)?
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
--- /dev/null
+#!/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
+}
PKG_LICENSE:=BSD-3-Clause
PKG_MAINTAINER:=Mislav Novakovic <mislav.novakovic@sartura.hr>
-PKG_VERSION:=0.9.15
+PKG_VERSION:=0.9.22
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cea46db1edb72231c9e009d7e6d6799256676eb8
-PKG_MIRROR_HASH:=a686754cef2ef29a511b8ea06d121f0ce562b570d6cea6c6a7562ff47b91d2a2
+PKG_SOURCE_VERSION:=8aafe1286cb4036b87054e6e1ca5edc34a31595c
+PKG_MIRROR_HASH:=ac6fca84ba903825958afe313ff0795c34eb0865ed7b5003b7112afcb24b9d94
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/cesnet/libnetconf2/
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
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
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
include $(TOPDIR)/rules.mk
PKG_NAME:=libuv
-PKG_VERSION:=1.14.0
+PKG_VERSION:=1.15.0
PKG_RELEASE:=1
PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Luka Perkov <luka.perkov@sartura.hr>
+PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://dist.libuv.org/dist/v$(PKG_VERSION)/
-PKG_HASH:=7267f1564fc6bd84e1721ad7e3cdd7b5da06faab9fa09522f33589dc08d3edf9
+PKG_HASH:=28b1b334ae79fdbb025c7a4dacf3cb14738f9d336998bc42bbdbe72b8799fe85
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
PKG_BUILD_PARALLEL:=1
$(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/
include $(TOPDIR)/rules.mk
PKG_NAME:=libyang
-PKG_VERSION:=0.13.46
+PKG_VERSION:=0.13.75
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_LICENSE:=GPL-2.0+
PKG_MAINTAINER:=Mislav Novakovic <mislav.novakovic@sartura.hr>
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d1556e0ae3872d676dfd63bd6073fe7e72d0130f
-PKG_MIRROR_HASH:=4a23a3854ceca147e113ab65ecdce3371e30b59436680e7d981b0bab6dbe751d
+PKG_SOURCE_VERSION:=e11255e32a63fdafe31764f5d594bed46d08f6a9
+PKG_MIRROR_HASH:=916cbfd52a04c6b306afa5fb684299f202c1c235689d8b57546a6b4eb4cc5a39
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/CESNET/libyang.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
include $(TOPDIR)/rules.mk
PKG_NAME:=dovecot
-PKG_VERSION:=2.2.32
-PKG_RELEASE:=2
+PKG_VERSION:=2.2.33.1
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.dovecot.org/releases/2.2
-PKG_HASH:=160b2151e2af359877f69cb2dcdfe1a3f4138ad3766e3b8562b96616e2f6bc2e
+PKG_HASH:=e4d9a182408100dce70e05dad1f8a703252a497aeb25706642286d84a118890b
PKG_LICENSE:=LGPL-2.1 MIT BSD-3-Clause Unique
PKG_LICENSE_FILES:=COPYING COPYING.LGPL COPYING.MIT
include $(TOPDIR)/rules.mk
PKG_NAME:=mutt
-PKG_VERSION:=1.7.2
+PKG_VERSION:=1.9.1
PKG_RELEASE:=1
PKG_SOURCE_URL:=ftp://ftp.mutt.org/pub/mutt/ \
https://bitbucket.org/mutt/mutt/downloads/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9
+PKG_HASH:=749b83a96373c6e2101ebe8c4b9a651735e02c478edb750750a5146a15d91bb1
PKG_LICENSE:=GPL-2.0+
PKG_LICENSE_FILES:=GPL
PKG_MAINTAINER:=Phil Eichinger <phil@zankapfel.net>
+PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
--enable-pop \
--enable-imap \
--with-ssl \
- --without-idn
+ --without-idn \
+ --disable-doc
define Package/mutt/install
$(INSTALL_DIR) $(1)/usr/bin
+++ /dev/null
-From b0e285a8c7faaec8807fdd677da6750f341f0109 Mon Sep 17 00:00:00 2001
-From: Phil Eichinger <phil@zankapfel.net>
-Date: Thu, 19 Nov 2015 13:18:53 +0100
-Subject: [PATCH] no po and docs
-
-[adapted old patch and converted to git patch]
-Signed-off-by: Phil Eichinger <phil@zankapfel.net>
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 1909835..cfa7ca0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -470,7 +470,7 @@ get_cs_cmdline = $(call get_cs_compile,$
- AUTOMAKE_OPTIONS = 1.6 foreign
- @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
- @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
--SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
-+SUBDIRS = m4 intl contrib $(IMAP_SUBDIR)
- bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
- @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
- BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)
---
-2.1.4
-
--- /dev/null
+From 6dbfafd4b8bfc9f5e53db90c5279784c506a3253 Mon Sep 17 00:00:00 2001
+From: Phil Eichinger <phil@zankapfel.net>
+Date: Tue, 17 Oct 2017 06:44:04 +0200
+Subject: [PATCH] no po
+
+docs are disabled via ./configure --disable-doc now
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4bc2db4..bb00927 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -14,7 +14,7 @@ IMAP_SUBDIR = imap
+ IMAP_INCLUDES = -I$(top_srcdir)/imap
+ endif
+
+-SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)
++SUBDIRS = m4 intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)
+
+ bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
+
+--
+2.11.0
+
+++ /dev/null
-From: Antonio Radici <antonio@debian.org>
-Date: Fri, 18 Sep 2015 11:48:47 +0200
-Subject: 771125-CVE-2014-9116-jessie
-
-This patch solves the issue raised by CVE-2014-9116 in bug 771125.
-
-We correctly redefine what are the whitespace characters as per RFC5322; by
-doing so we prevent mutt_substrdup from being used in a way that could lead to
-a segfault.
-
-The lib.c part was written by Antonio Radici <antonio@debian.org> to prevent
-crashes due to this kind of bugs from happening again.
-
-Signed-off-by: Matteo F. Vescovi <mfv@debian.org>
----
- lib.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff -rupN a/lib.c b/lib.c
---- a/lib.c
-+++ b/lib.c
-@@ -815,6 +815,9 @@ char *mutt_substrdup (const char *begin,
- size_t len;
- char *p;
-
-+ if (end != NULL && end < begin)
-+ return NULL;
-+
- if (end)
- len = end - begin;
- else
include $(TOPDIR)/rules.mk
PKG_NAME:=adblock
-PKG_VERSION:=3.0.2
+PKG_VERSION:=3.0.3
PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
* => infrequent updates, approx. 400 entries (enabled by default)
* [adguard](https://adguard.com)
* => numerous updates on the same day, approx. 12.000 entries
+ * [bitcoin](https://github.com/hoshsadiq/adblock-nocoin-list)
+ * => infrequent updates, approx. 15 entries
* [blacklist]()
* => static local blacklist, located by default in '/etc/adblock/adblock.blacklist'
* [disconnect](https://disconnect.me)
option adb_src_rset '{FS=\"[|^]\"} \$0 ~/^\|\|([A-Za-z0-9_-]+\.){1,}[A-Za-z]+\^$/{print tolower(\$3)}'
option adb_src_desc 'combined adguard dns filter list, approx. 12.000 entries'
+config source 'bitcoin'
+ option enabled '0'
+ option adb_src 'https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt'
+ option adb_src_rset '\$0 ~/^0\.0\.0\.0[ \t]+([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$2)}'
+ option adb_src_desc 'focus on malicious bitcoin mining sites, infrequent updates, approx. 15 entries'
+
config source 'blacklist'
option enabled '0'
option adb_src '/etc/adblock/adblock.blacklist'
#
LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-adb_ver="3.0.2"
+adb_ver="3.0.3"
adb_sysver="unknown"
adb_enabled=0
adb_debug=0
PKG_NAME:=clamav
PKG_VERSION:=0.99.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> \
--with-group nogroup \
--with-pcre="$(STAGING_DIR)/usr/" \
--with-openssl="$(STAGING_DIR)/usr/" \
+ --with-zlib="$(STAGING_DIR)/usr/" \
+ --disable-zlib-vcheck \
+ --disable-clamdtop \
)
endef
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
* 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
+++ /dev/null
---- 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 */
include $(TOPDIR)/rules.mk
PKG_NAME:=nbd
-PKG_VERSION:=3.11
+PKG_VERSION:=3.16.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@SF/nbd
-PKG_HASH:=14420f74cb16dc609a9302ed1efd653064bed7a8357e9d73daabc33608e3f2a0
+PKG_HASH:=422f62bdf6e6b973bd82083dc52b6577396fe00aa6607837ac464e476124155b
PKG_LICENSE:=GPL-2.0+
PKG_MAINTAINER:=Marcin Jurkowski <marcin1j@gmail.com>
--- /dev/null
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -35,7 +35,7 @@ nbd_client_CFLAGS = $(client_flags) @Gnu
+ nbd_client_LDADD = $(client_libs) @GnuTLS_LIBS@
+ else
+ nbd_client_SOURCES = $(client_srcs)
+-nbd_client_CFLAGS = $(client_flags)
++nbd_client_CFLAGS = $(client_flags) -DNOTLS -DPROG_NAME='"nbd-client"'
+ nbd_client_LDADD = $(client_libs)
+ endif
+ endif
PKG_LICENSE:=BSD-3-Clause
PKG_MAINTAINER:=Mislav Novakovic <mislav.novakovic@sartura.hr>
-PKG_VERSION:=0.4.0
+PKG_VERSION:=0.4.3
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d028c1f931819db4b3e3cb1fd2d349a4fd5c0459
-PKG_MIRROR_HASH:=7f5b3ad49aaf2a8ceea2c17a37e276f5694af570ef904cfc5a6f53d295809cef
+PKG_SOURCE_VERSION:=e7c821cde14df31a03d23293f84e0aed9cb1a457
+PKG_MIRROR_HASH:=88a4c06e9cdb81879de7311138acbfe9fe5207db14fbb93c5ba4d6947d616aec
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/CESNET/Netopeer2.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
+++ /dev/null
-Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/server/ietf_netconf_server.c
-===================================================================
---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/server/ietf_netconf_server.c
-+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/server/ietf_netconf_server.c
-@@ -1161,8 +1161,8 @@ feature_change_ietf_netconf_server(const
- {
- int rc, rc2 = 0;
- const char *path = NULL;
-- sr_val_iter_t *sr_iter;
-- sr_val_t *sr_val;
-+ sr_val_t *values;
-+ size_t value_cnt;
-
- assert(feature_name);
-
-@@ -1180,26 +1180,26 @@ feature_change_ietf_netconf_server(const
- return EXIT_SUCCESS;
- }
-
-- rc = sr_get_items_iter(np2srv.sr_sess.srs, path, &sr_iter);
-+ rc =sr_get_items(np2srv.sr_sess.srs, path, &values, &value_cnt);
- if (rc != SR_ERR_OK) {
- ERR("Failed to get \"%s\" values iterator from sysrepo (%s).", sr_strerror(rc));
- return EXIT_FAILURE;
- }
-
-- while ((rc = sr_get_item_next(np2srv.sr_sess.srs, sr_iter, &sr_val)) == SR_ERR_OK) {
-- if (sr_val->type == SR_LIST_T) {
-+ size_t i;
-+ for(i = 0; i < value_cnt; i++) {
-+ if (values[i].type == SR_LIST_T) {
- /* no semantic meaning */
- continue;
- }
-
-- rc2 = module_change_resolve(np2srv.sr_sess.srs, SR_OP_CREATED, NULL, sr_val, NULL, NULL);
-- sr_free_val(sr_val);
-+ rc2 = module_change_resolve(np2srv.sr_sess.srs, SR_OP_CREATED, NULL, &values[i], NULL, NULL);
- if (rc2) {
- ERR("Failed to enable nodes depending on the \"%s\" ietf-netconf-server feature.", feature_name);
- break;
- }
- }
-- sr_free_val_iter(sr_iter);
-+ sr_free_values(values, value_cnt);
- if (rc2) {
- return EXIT_FAILURE;
- } else if ((rc != SR_ERR_OK) && (rc != SR_ERR_NOT_FOUND)) {
+++ /dev/null
-Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/CMakeLists.txt
-===================================================================
---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/cli/CMakeLists.txt
-+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/CMakeLists.txt
-@@ -67,6 +67,9 @@ if(NOT MAN_INSTALL_DIR)
- set(MAN_INSTALL_DIR share/man)
- endif()
-
-+include(CheckFunctionExists)
-+check_function_exists(eaccess HAVE_EACCESS)
-+
- # install binary
- install(TARGETS netopeer2-cli DESTINATION ${BIN_INSTALL_DIR})
-
-Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/commands.c
-===================================================================
---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/cli/commands.c
-+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/commands.c
-@@ -37,6 +37,10 @@
- # include <openssl/x509v3.h>
- #endif
-
-+#ifndef HAVE_EACCESS
-+#define eaccess access
-+#endif
-+
- #include "commands.h"
- #include "configuration.h"
- #include "completion.h"
-Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/completion.c
-===================================================================
---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/cli/completion.c
-+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/completion.c
-@@ -27,6 +27,10 @@
-
- #include <nc_client.h>
-
-+#ifndef HAVE_EACCESS
-+#define eaccess access
-+#endif
-+
- #include "commands.h"
- #include "linenoise/linenoise.h"
-
-Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/configuration.c
-===================================================================
---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/cli/configuration.c
-+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/configuration.c
-@@ -28,6 +28,10 @@
- #include <libyang/libyang.h>
- #include <nc_client.h>
-
-+#ifndef HAVE_EACCESS
-+#define eaccess access
-+#endif
-+
- #include "configuration.h"
- #include "commands.h"
- #include "linenoise/linenoise.h"
+++ /dev/null
-Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/CMakeLists.txt
-===================================================================
---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/cli/CMakeLists.txt
-+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/CMakeLists.txt
-@@ -69,6 +69,10 @@ endif()
-
- include(CheckFunctionExists)
- check_function_exists(eaccess HAVE_EACCESS)
-+check_function_exists(mkstemps HAVE_MKSTEMPS)
-+if(HAVE_MKSTEMPS)
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_MKSTEMPS")
-+endif(HAVE_MKSTEMPS)
-
- # install binary
- install(TARGETS netopeer2-cli DESTINATION ${BIN_INSTALL_DIR})
-Index: netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/completion.c
-===================================================================
---- netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459.orig/cli/completion.c
-+++ netopeer2-0.4.0-d028c1f931819db4b3e3cb1fd2d349a4fd5c0459/cli/completion.c
-@@ -120,6 +120,7 @@ readinput(const char *instruction, const
- char* tmpname = NULL, *input = NULL, *old_content = NULL, *ptr, *ptr2;
-
- /* Create a unique temporary file */
-+#ifdef HAVE_MKSTEMPS
- if (asprintf(&tmpname, "/tmp/tmpXXXXXX.xml") == -1) {
- ERROR(__func__, "asprintf() failed (%s).", strerror(errno));
- goto fail;
-@@ -129,6 +130,23 @@ readinput(const char *instruction, const
- ERROR(__func__, "Failed to create a temporary file (%s).", strerror(errno));
- goto fail;
- }
-+#else
-+ if (asprintf(&tmpname, "/tmp/tmpXXXXXX") == -1) {
-+ ERROR(__func__, "asprintf() failed (%s).", strerror(errno));
-+ goto fail;
-+ }
-+ /* cannot fail */
-+ mktemp(tmpname);
-+ if (asprintf(&tmpname, ".xml") == -1) {
-+ ERROR(__func__, "asprintf() failed (%s).", strerror(errno));
-+ goto fail;
-+ }
-+ tmpfd = open(tmpname, O_RDWR | O_CREAT | O_EXCL, 0600);
-+ if (tmpfd == -1) {
-+ ERROR(__func__, "Failed to create a temporary file (%s).", strerror(errno));
-+ goto fail;
-+ }
-+#endif /* #ifdef HAVE_MKSTEMPS */
-
- /* Read the old content, if any */
- if (old_tmp != NULL) {
PKG_LICENSE:=GPLv3
PKG_MAINTAINER:=Steven Hessing <steven.hessing@gmail.com>
-PKG_SOURCE_VERSION:=0.5.3
+PKG_SOURCE_VERSION:=0.5.4
PKG_SOURCE_URL:=https://github.com/noddos/noddos/releases/download/v$(PKG_SOURCE_VERSION)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.xz
-PKG_HASH:=a7f66d6eea17eb6bbd79470ae6f1d97d474c659b8b8259bf0027cae6b4cf8b04
+PKG_HASH:=1021a72fd66f4901cdc1e7bd3a203450cee5c453ec52ea7c6d8f8691fc4e9d0e
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
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
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
--- 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
+++ /dev/null
---- 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
PKG_MAINTAINER:=Mislav Novakovic <mislav.novakovic@sartura.hr>
PKG_NAME:=sysrepo
-PKG_VERSION:=0.7.0
+PKG_VERSION:=0.7.1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7aa2f18d234267403147df92c0005c871f0aa840
-PKG_MIRROR_HASH:=31125596ae1c4dbf8dd48c639bf78043060ab1b89678c860eb2b10606fe4b686
+PKG_SOURCE_VERSION:=0b36f308574a60d7ee36b1a3118b999618bb40d8
+PKG_MIRROR_HASH:=d28ff0356b6ac4b934bb45ff77973efe7964b86a54270d11e1fd06a2af9bdbc8
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/sysrepo/sysrepo.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
stop_service()
{
+ kill -9 `ps | grep netopeer2-server | grep -v grep | awk '{print $1}'` >/dev/null 2>&1
service_stop ${PROG_PLUGIN}
service_stop ${PROG_DEAMON}
+ rm -rf /var/run/sysrepo-subscriptions/*
}
include $(TOPDIR)/rules.mk
PKG_NAME:=xl2tpd
-PKG_VERSION:=devel-20151125
-PKG_RELEASE:=3
+PKG_VERSION:=1.3.10
+PKG_RELEASE:=1
PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/xelerance/xl2tpd.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=e2065bf0fc22ba33001ad503c01bba01648024a8
+PKG_SOURCE_VERSION:=090d1bef577cabdb3495d76acd814733fa66ef57
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MIRROR_HASH:=8b15c0069cdab7080796f92f86c84b79e430679ce77fb6ea95749fe932bb87c4
+PKG_MIRROR_HASH:=bcddc10e28a74dec607e67cbbea97220f6bfd696b0378a7c30ec8a3e0ac86be1
+
+PKG_BUILD_DEPENDS:=libpcap
PKG_INSTALL:=1
main goal of this protocol is to tunnel PPP frame trough an IP network.
endef
-# Use optimization options from OpenWrt build system
-MAKE_FLAGS += OFLAGS=""
-
ifneq (0,0)
# debugging options from Makefile of xl2tpd package
EXTRA_CFLAGS += \
#
-
-lock
noauth
debug
dump
novjccomp
nopcomp
noaccomp
+mtu 1400
+mru 1400
+require-mschap-v2
+lcp-echo-interval 20
+lcp-echo-failure 5
+connect-delay 5000
+nodefaultroute
+noipdefault
+proxyarp
+++ /dev/null
---- a/Makefile
-+++ b/Makefile
-@@ -97,7 +97,8 @@ OSFLAGS+= -DUSE_KERNEL
-
- IPFLAGS?= -DIP_ALLOCATION
-
--CFLAGS+= $(DFLAGS) -Os -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
-+OFLAGS=-Os
-+CFLAGS+= $(DFLAGS) $(OFLAGS) -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
- HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h
- OBJS=xl2tpd.o pty.o misc.o control.o avp.o call.o network.o avpsend.o scheduler.o file.o aaa.o md5.o
- SRCS=${OBJS:.o=.c} ${HDRS}
+++ /dev/null
---- a/Makefile
-+++ b/Makefile
-@@ -113,10 +113,10 @@ BINDIR?=$(DESTDIR)${PREFIX}/bin
- MANDIR?=$(DESTDIR)${PREFIX}/share/man
-
-
--all: $(EXEC) pfc $(CONTROL_EXEC)
-+all: $(EXEC) $(CONTROL_EXEC)
-
- clean:
-- rm -f $(OBJS) $(EXEC) pfc.o pfc $(CONTROL_EXEC)
-+ rm -f $(OBJS) $(EXEC) $(CONTROL_EXEC)
-
- $(EXEC): $(OBJS) $(HDRS)
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
-@@ -124,14 +124,10 @@ $(EXEC): $(OBJS) $(HDRS)
- $(CONTROL_EXEC): $(CONTROL_SRCS)
- $(CC) $(CFLAGS) $(LDFLAGS) $(CONTROL_SRCS) -o $@
-
--pfc:
-- $(CC) $(CFLAGS) -c contrib/pfc.c
-- $(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS)
--
- romfs:
- $(ROMFSINST) /bin/$(EXEC)
-
--install: ${EXEC} pfc ${CONTROL_EXEC}
-+install: ${EXEC} ${CONTROL_EXEC}
- install -d -m 0755 ${SBINDIR}
- install -m 0755 $(EXEC) ${SBINDIR}/$(EXEC)
- install -d -m 0755 ${MANDIR}/man5
-@@ -139,11 +135,6 @@ install: ${EXEC} pfc ${CONTROL_EXEC}
- install -m 0644 doc/xl2tpd.8 ${MANDIR}/man8/
- install -m 0644 doc/xl2tpd.conf.5 doc/l2tp-secrets.5 \
- ${MANDIR}/man5/
-- # pfc
-- install -d -m 0755 ${BINDIR}
-- install -m 0755 pfc ${BINDIR}/pfc
-- install -d -m 0755 ${MANDIR}/man1
-- install -m 0644 contrib/pfc.1 ${MANDIR}/man1/
- # control exec
- install -d -m 0755 ${SBINDIR}
- install -m 0755 $(CONTROL_EXEC) ${SBINDIR}/$(CONTROL_EXEC)
+++ /dev/null
---- a/xl2tpd.c
-+++ b/xl2tpd.c
-@@ -30,7 +30,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <time.h>
--#if (__GLIBC__ < 2)
-+#if defined (__GLIBC__) && (__GLIBC__ < 2)
- # if defined(FREEBSD) || defined(OPENBSD)
- # include <sys/signal.h>
- # elif defined(LINUX)
+++ /dev/null
-From 97adf987cf230e47a4800c2f0a0940a1d0d98109 Mon Sep 17 00:00:00 2001
-From: wendy2001011 <wendy2001011@163.com>
-Date: Thu, 9 Feb 2017 17:32:14 +0800
-Subject: [PATCH] xl2tpd-control: fix xl2tpd hanged up in "fopen"
-
-This is a fix for xl2tpd hanged up in "fopen" result fifo while working
-on xl2tpd with OpenWrt.
-
-Root cause is as followings,
-1. xl2tpd-control open result fifo ##fifo readers=1
-2. xl2tpd-control read result fifo
-3. xl2tpd-control close result fifo ##fifo readers=0
-4. xl2tpd fopen result fifo ##xl2tpd is hanged up here to wait readers
-5. xl2tpd-control unlink result fifo
-
-The fix replaces the order of "unlink" and "close" when cleaning up to
-avoid hang up issue in fopen, and add the retry waiting when reading
-result fifo.
-
-[Yousong Zhou: 2s as the timeout and 10ms as the check interval]
----
- xl2tpd-control.c | 23 +++++++++++++++++++++--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/xl2tpd-control.c b/xl2tpd-control.c
-index 9fcab76..b8bf822 100644
---- a/xl2tpd-control.c
-+++ b/xl2tpd-control.c
-@@ -35,6 +35,7 @@
-
- #define TUNNEL_REQUIRED 1
- #define TUNNEL_NOT_REQUIRED 0
-+#define TIMEOUT 2000000 //timeout is 2s
-
- char result_filename[128];
- int result_fd = -1;
-@@ -149,9 +150,9 @@ void help()
- void cleanup(void)
- {
- /* cleaning up */
-- if (result_fd >= 0)
-- close (result_fd);
- unlink (result_filename);
-+ if (result_fd >= 0)
-+ close (result_fd);
- }
-
- int main (int argc, char *argv[])
-@@ -340,6 +341,7 @@ void print_error (int level, const char *fmt, ...)
- va_end (args);
- }
-
-+
- int read_result(int result_fd, char* buf, ssize_t size)
- {
- /* read result from result_fd */
-@@ -348,6 +350,11 @@ int read_result(int result_fd, char* buf, ssize_t size)
- */
- ssize_t readed = 0;
- ssize_t len;
-+ int write_pipe = 0;
-+ struct timeval tvs;
-+ struct timeval tve;
-+ unsigned long diff;
-+ gettimeofday(&tvs, NULL);
-
- do
- {
-@@ -360,8 +367,20 @@ int read_result(int result_fd, char* buf, ssize_t size)
- "error: can't read command result: %s\n", strerror (errno));
- break;
- } else if (len == 0) {
-+ if(!write_pipe) {
-+ gettimeofday(&tve, NULL);
-+ diff = (tve.tv_sec - tvs.tv_sec) * 1000000 + (tve.tv_usec - tvs.tv_usec);
-+ if (diff >= TIMEOUT) {
-+ print_error (DEBUG_LEVEL, "error: read timout\n");
-+ break;
-+ } else {
-+ usleep(10000);
-+ continue;
-+ }
-+ }
- break;
- } else {
-+ write_pipe = 1;
- readed += len;
- if ((size - readed) <= 0)
- break;
---
-2.6.4
-
include $(TOPDIR)/rules.mk
PKG_NAME:=lame
-PKG_VERSION:=3.99.5
-PKG_RELEASE:=2
+PKG_VERSION:=3.100
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/lame
-PKG_HASH:=24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff
+PKG_HASH:=ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e
PKG_FIXUP:=autoreconf
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
$(call Package/lame/Default)
TITLE:=lame
MENU:=1
- DEPENDS += +libncurses
+ DEPENDS += +libncurses +lame-lib
endef
define Package/lame/description
lame mp3 encoder libs
endef
-CONFIG_VARS+=NASM=no
-
ifeq ($(ARCH),i386)
TARGET_CFLAGS+=-msse
endif
+CONFIGURE_ARGS += --disable-gtktest --disable-static
+
define Package/lame/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lame $(1)/usr/bin/
+++ /dev/null
---- a/configure.in
-+++ b/configure.in
-@@ -393,7 +393,7 @@ CONFIG_MATH_LIB="${USE_LIBM}"
-
- dnl configure use of features
-
--AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
-+HAVE_GTK="no"
-
- dnl ElectricFence malloc debugging
- AC_MSG_CHECKING(use of ElectricFence malloc debugging)
---- a/frontend/Makefile.am
-+++ b/frontend/Makefile.am
-@@ -35,7 +35,7 @@ lame_SOURCES = lame_main.c $(common_sour
- mp3rtp_SOURCES = mp3rtp.c rtp.c $(common_sources)
- mp3x_SOURCES = mp3x.c gtkanal.c gpkplotting.c $(common_sources)
-
--CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
-+CFLAGS = @CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
- LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
-
- INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
---- a/frontend/Makefile.in
-+++ b/frontend/Makefile.in
-@@ -99,7 +99,7 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
-+CFLAGS = @CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
- CONFIG_DEFS = @CONFIG_DEFS@
- CONFIG_MATH_LIB = @CONFIG_MATH_LIB@
- CPP = @CPP@
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
include $(TOPDIR)/rules.mk
PKG_NAME:=at
-PKG_VERSION:=3.1.16
-PKG_RELEASE:=2
+PKG_VERSION:=3.1.20
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/a/at
-PKG_HASH:=cb9af59c6a54edce9536ba629841055409d1f89d8ae26494727a97141fb4d5c1
+PKG_HASH:=0871923cab73050b98ace020664eb2ddc1e669e4166b5abb64d864d02fcefab9
PKG_LICENSE:=GPL-2.0+ GPL-3.0+ ISC
PKG_LICENSE_FILES:=COPYING Copyright
select KERNEL_CGROUPS
select KERNEL_NAMESPACES
select KERNEL_LXC_MISC
+ select KERNEL_CGROUP_SCHED
+ select KERNEL_FAIR_GROUP_SCHED
+ select KERNEL_RT_GROUP_SCHED
+ select KERNEL_CGROUP_CPUACCT
+ select KERNEL_MEMCG
+ select KERNEL_MEMCG_KMEM
+ select KERNEL_CPUSETS
help
Select needed kernel options for LXC related utilities. Options
include cgroups, namespaces and other miscellaneous options. These
Build LXC with support for seccomp filters.
Select libseccomp which also pulls-in the needed kernel features.
+config LXC_NETWORKING
+ bool "Enable networking support for LXC containers"
+ default n
+ select PACKAGE_kmod-veth
+ select PACKAGE_kmod-macvlan
+ help
+ Enable "veth pair device" and "macvlan"
+
endmenu
include $(TOPDIR)/rules.mk
PKG_NAME:=lxc
-PKG_VERSION:=1.1.5
-PKG_RELEASE:=3
+PKG_VERSION:=2.1.0
+PKG_RELEASE:=1
PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause 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.gz
-PKG_SOURCE_URL:=http://linuxcontainers.org/downloads/lxc/
-PKG_HASH:=9588ad1b04e114ee7370f690c65131e28098b28d2521d97c73557d11897ed0be
+PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/
+PKG_HASH:=394407305a409eb1f95fe06e7718acfe89b1d5df267b0c6aafb1d714e2038de2
PKG_BUILD_DEPENDS:=lua
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
LXC_APPLETS_BIN += \
- attach autostart cgroup clone config console create destroy device \
+ attach autostart cgroup copy config console create destroy device \
execute freeze info monitor snapshot start stop unfreeze unshare \
- usernsexec wait
+ usernsexec wait top ls
LXC_APPLETS_LIB += \
monitord user-nic
LXC_SCRIPTS += \
- checkconfig ls top
+ checkconfig
DEPENDS_APPLETS = +libpthread +libcap +liblxc
DEPENDS_create = +lxc-configs +lxc-hooks +lxc-templates +flock
-DEPENDS_ls = +lxc-config
-DEPENDS_top = +lxc-lua +luafilesystem @BROKEN
-
-
define Package/lxc/Default
SECTION:=utils
CATEGORY:=Utilities
define Package/lxc-lua
$(call Package/lxc/Default)
TITLE:=LXC Lua bindings
- DEPENDS:= lxc +liblua +liblxc +luafilesystem
+ DEPENDS:= lxc +liblua +liblxc
endef
define Package/lxc-init
--- /dev/null
+--- a/src/lxc/storage/overlay.c
++++ b/src/lxc/storage/overlay.c
+@@ -747,7 +747,7 @@ int ovl_mkdir(const struct mntent *mntent, const struct lxc_rootfs *rootfs,
+ char lxcpath[MAXPATHLEN];
+ char **opts;
+ int ret;
+- size_t arrlen, dirlen, i, len, rootfslen;
++ size_t arrlen, i, len, rootfslen, dirlen = 0;
+ int fret = -1;
+ char *rootfs_dir = NULL, *rootfs_path = NULL, *upperdir = NULL,
+ *workdir = NULL;
--- /dev/null
+--- a/src/lxc/storage/aufs.h
++++ b/src/lxc/storage/aufs.h
+@@ -24,7 +24,6 @@
+ #ifndef __LXC_AUFS_H
+ #define __LXC_AUFS_H
+
+-#define _GNU_SOURCE
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdint.h>
--- /dev/null
+--- a/src/lxc/confile_utils.c
++++ b/src/lxc/confile_utils.c
+@@ -690,7 +690,7 @@ bool parse_limit_value(const char **value, unsigned long *res)
+ char *endptr = NULL;
+
+ if (strncmp(*value, "unlimited", sizeof("unlimited") - 1) == 0) {
+- *res = RLIM_INFINITY;
++ *res = (unsigned long)RLIM_INFINITY;
+ *value += sizeof("unlimited") - 1;
+ return true;
+ }
--- a/configure.ac
+++ b/configure.ac
-@@ -31,30 +31,6 @@ AC_CANONICAL_HOST
- AM_PROG_CC_C_O
- AC_GNU_SOURCE
+@@ -47,34 +47,6 @@ AC_GNU_SOURCE
+ LT_INIT
+ AC_SUBST([LIBTOOL_DEPS])
-# Detect the distribution. This is used for the default configuration and
-# for some distro-specific build options.
-AC_MSG_CHECKING([host distribution])
--AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, oracle, centos, fedora, suse, gentoo, debian, arch, slackware, paldo, openmandriva or pardus.]))
+-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, oracle, centos, fedora, suse, gentoo, debian, arch, slackware, plamo, paldo, openmandriva, pardus, sparclinux, altlinux.]))
-if type lsb_release >/dev/null 2>&1 && test "z$with_distro" = "z"; then
- with_distro=`lsb_release -is`
-fi
-if test "z$with_distro" = "z"; then
- AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
- AC_CHECK_FILE(/etc/oracle-release,with_distro="oracle")
+- AC_CHECK_FILE(/etc/sparclinux-release,with_distro="sparclinux")
- AC_CHECK_FILE(/etc/centos-release,with_distro="centos")
- AC_CHECK_FILE(/etc/fedora-release,with_distro="fedora")
- AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
- AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
- AC_CHECK_FILE(/etc/arch-release,with_distro="arch")
- AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
+- AC_CHECK_FILE(/etc/plamo-version,with_distro="plamo")
- AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware")
- AC_CHECK_FILE(/etc/mandrakelinux-release, with_distro="openmandriva")
- AC_CHECK_FILE(/etc/mandriva-release,with_distro="openmandriva")
- AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
+- AC_CHECK_FILE(/etc/altlinux-release,with_distro="altlinux")
+- AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
-fi
-with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]'`
-
- if test "z$with_distro" = "z"; then
- with_distro="unknown"
+ if test "z$with_distro" = "zforsparc"; then
+ with_distro="sparclinux"
fi
--- a/src/lxc/utils.h
+++ b/src/lxc/utils.h
-@@ -41,11 +41,7 @@ extern int mkdir_p(const char *dir, mode
+@@ -59,11 +59,7 @@ extern int mkdir_p(const char *dir, mode_t mode);
extern char *get_rundir(void);
/* Define getline() if missing from the C library */
---- a/src/lxc/lxc-checkconfig.in
-+++ b/src/lxc/lxc-checkconfig.in
-@@ -4,6 +4,17 @@
+--- a/src/lxc/tools/lxc-checkconfig.in
++++ b/src/lxc/tools/lxc-checkconfig.in
+@@ -3,6 +3,17 @@
+ # Allow environment variables to override config
: ${CONFIG:=/proc/config.gz}
- : ${GREP:=zgrep}
: ${MODNAME:=configs}
+: ${ZGREP:=zgrep}
+: ${GUNZIP:=gunzip}
+ GREP=grep
+fi
- SETCOLOR_SUCCESS="printf \\033[1;32m"
- SETCOLOR_FAILURE="printf \\033[1;31m"
+ CAT="cat"
+
--- a/templates/lxc-download.in
+++ b/templates/lxc-download.in
-@@ -494,15 +494,7 @@ fi
+@@ -505,20 +505,7 @@ fi
# Unpack the rootfs
echo "Unpacking the rootfs"
-EXCLUDES=""
-excludelist=$(relevant_file excludes)
-if [ -f "${excludelist}" ]; then
-- while read line; do
-- EXCLUDES="$EXCLUDES --exclude=$line"
-- done < $excludelist
+- while read -r line; do
+- EXCLUDES="${EXCLUDES} --exclude=${line}"
+- done < "${excludelist}"
-fi
-
+-# Do not surround ${EXCLUDES} by quotes. This does not work. The solution could
+-# use array but this is not POSIX compliant. The only POSIX compliant solution
+-# is to use a function wrapper, but the latter can't be used here as the args
+-# are dynamic. We thus need to ignore the warning brought by shellcheck.
+-# shellcheck disable=SC2086
-tar --anchored ${EXCLUDES} --numeric-owner -xpJf \
+tar --numeric-owner -xpJf \
- ${LXC_CACHE_PATH}/rootfs.tar.xz -C ${LXC_ROOTFS}
+ "${LXC_CACHE_PATH}/rootfs.tar.xz" -C "${LXC_ROOTFS}"
- mkdir -p ${LXC_ROOTFS}/dev/pts/
+ mkdir -p "${LXC_ROOTFS}/dev/pts/"
+++ /dev/null
---- a/templates/lxc-download.in
-+++ b/templates/lxc-download.in
-@@ -39,7 +39,7 @@ DOWNLOAD_LIST_IMAGES="false"
- DOWNLOAD_MODE="system"
- DOWNLOAD_READY_GPG="false"
- DOWNLOAD_RELEASE=
--DOWNLOAD_SERVER="images.linuxcontainers.org"
-+DOWNLOAD_SERVER="virtualwrt.org/containers/"
- DOWNLOAD_SHOW_GPG_WARNING="true"
- DOWNLOAD_SHOW_HTTP_WARNING="true"
- DOWNLOAD_TARGET="system"
-@@ -257,14 +257,6 @@ for bin in tar xz wget; do
- fi
- done
-
--# Check for GPG
--if [ "$DOWNLOAD_VALIDATE" = "true" ]; then
-- if ! type gpg >/dev/null 2>&1; then
-- echo "ERROR: Missing recommended tool: gpg" 1>&2
-- echo "You can workaround this by using --no-validate." 1>&2
-- exit 1
-- fi
--fi
-
- # Check that we have all variables we need
- if [ -z "$LXC_NAME" ] || [ -z "$LXC_PATH" ] || [ -z "$LXC_ROOTFS" ]; then
-@@ -456,16 +448,9 @@ if [ "$DOWNLOAD_USE_CACHE" = "false" ];
- echo "Downloading the rootfs"
- download_file $DOWNLOAD_URL/rootfs.tar.xz \
- ${DOWNLOAD_TEMP}/rootfs.tar.xz normal
-- download_sig $DOWNLOAD_URL/rootfs.tar.xz.asc \
-- ${DOWNLOAD_TEMP}/rootfs.tar.xz.asc normal
-- gpg_validate ${DOWNLOAD_TEMP}/rootfs.tar.xz.asc
--
- echo "Downloading the metadata"
- download_file $DOWNLOAD_URL/meta.tar.xz \
- ${DOWNLOAD_TEMP}/meta.tar.xz normal
-- download_sig $DOWNLOAD_URL/meta.tar.xz.asc \
-- ${DOWNLOAD_TEMP}/meta.tar.xz.asc normal
-- gpg_validate ${DOWNLOAD_TEMP}/meta.tar.xz.asc
-
- if [ -d $LXC_CACHE_PATH ]; then
- rm -Rf $LXC_CACHE_PATH
+++ /dev/null
---- a/src/lxc/bdev.c
-+++ b/src/lxc/bdev.c
-@@ -1939,7 +1939,7 @@ static int find_free_loopdev(int *retfd,
-
- static int loop_mount(struct bdev *bdev)
- {
-- int lfd, ffd = -1, ret = -1;
-+ int lfd = -1, ffd = -1, ret = -1;
- struct loop_info64 lo;
- char loname[100];
-
-@@ -1977,7 +1977,7 @@ out:
- if (ffd > -1)
- close(ffd);
- if (ret < 0) {
-- close(lfd);
-+ if (lfd > -1) close(lfd);
- bdev->lofd = -1;
- }
- return ret;
include $(TOPDIR)/rules.mk
PKG_NAME:=vim
-PKG_VERSION:=8.0.069
-PKG_RELEASE:=4
+PKG_VERSION:=8.0.586
+PKG_RELEASE:=1
VIMVER:=80
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.vim.org/pub/vim/unix/
-PKG_HASH:=2e179182814715c3c77010c7300a4abcb964ba8a99a470640f9f2f03884b2ccb
+PKG_HASH:=08bd0d1dd30ece3cb9905ccd48b82b2f81c861696377508021265177dc153a61
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(VIMVER)
projects / feed / packages.git / commitdiff