Merge pull request #4887 from diizzyy/patch-94
authorchamptar <champetier.etienne@gmail.com>
Mon, 9 Oct 2017 22:34:06 +0000 (15:34 -0700)
committerGitHub <noreply@github.com>
Mon, 9 Oct 2017 22:34:06 +0000 (15:34 -0700)
net/l7-protocols: Remove from tree

38 files changed:
lang/php7/Makefile
lang/python/python/Makefile
lang/python/python/files/python-package-install.sh
lang/python/python/files/python-package.mk
lang/python/python3/Makefile
lang/python/python3/files/python3-package-install.sh
lang/python/python3/files/python3-package.mk
libs/libevent/Makefile [deleted file]
libs/libxml2/Makefile
mail/postfix/Makefile
multimedia/ffmpeg/Makefile
multimedia/minidlna/patches/001-group-videos-by-directory-for-panasonic-tvs.patch [deleted file]
net/freeradius3/Makefile
net/freeradius3/patches/001-fix-cert-expiry.patch
net/freeradius3/patches/002-disable-session-cache-CVE-2017-9148.patch [new file with mode: 0644]
net/git/Makefile
net/gnunet/Makefile
net/gnurl/Makefile
net/horst/Makefile
net/horst/horst.config [new file with mode: 0644]
net/horst/horst.init [new file with mode: 0755]
net/horst/patches/0001-Remove-_GNU_SOURCE-from-ccan-config.patch [deleted file]
net/knxd/Makefile
net/knxd/files/knxd.config [new file with mode: 0644]
net/knxd/files/knxd.init
net/lftp/Makefile
net/noddos/Makefile
net/openssh/Makefile
net/rp-pppoe/Makefile
net/rp-pppoe/files/pppoe-relay.init
net/rp-pppoe/files/pppoe-server.init
net/wireguard/Makefile
utils/acpica-unix/Makefile
utils/f2fs-tools/Makefile [deleted file]
utils/f2fs-tools/patches/001-compile.patch [deleted file]
utils/f2fs-tools/patches/010-include-byteswap-h.patch [deleted file]
utils/f2fs-tools/patches/020-sload.f2fs-allow-to-build-without-libselinux.patch [deleted file]
utils/less/Makefile

index 2f4300c3fed9143b2354cd09028ce15c95c10ed1..d9965f1525c24a4f8002bbe2afa322bdf78511b3 100644 (file)
@@ -6,8 +6,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
-PKG_VERSION:=7.1.9
-PKG_RELEASE:=3
+PKG_VERSION:=7.1.10
+PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 
@@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.php.net/distributions/
-PKG_HASH:=ec9ca348dd51f19a84dc5d33acfff1fba1f977300604bdac08ed46ae2c281e8c
+PKG_HASH:=2b8efa771a2ead0bb3ae67b530ca505b5b286adc873cca9ce97a6e1d6815c50b
 
 PKG_FIXUP:=libtool autoreconf
 PKG_BUILD_PARALLEL:=1
index 96aac08b1f7cc254bd7356b58c4c58dd7c91d0fa..03cda5ce984c0343a5d03aa73d668d3073ac372a 100644 (file)
@@ -12,7 +12,9 @@ include ./files/python-version.mk
 
 PKG_NAME:=python
 PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
-PKG_RELEASE:=1
+# XXX: reset PKG_RELEASE to 1 only if Python's pip & setuptools versions have also bumped;
+#      otherwise, keep bumping PKG_RELEASE
+PKG_RELEASE:=2
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
index 94becf2c976927e044677d096e67e1d9b5cb8020..cefbce376a857aedaef5bc464ef99d6c941c3efb 100644 (file)
@@ -47,7 +47,8 @@ process_filespec "$src_dir" "$dst_dir" "$filespec" || {
 }
 
 # delete egg-info directories
-find "$dst_dir" -name "*.egg-info" | xargs rm -rf
+[ "$PYTHON_KEEP_EGGINFO" == "1" ] || \
+       find "$dst_dir" -name "*.egg-info" | xargs rm -rf
 
 if [ "$mode" == "sources" ] ; then
        # Copy only python source files
index 9c231f6ecfa0f8c8edc74ab3baa40fd85e4b634f..7e3cb2ce83698c3f786abaaddd6268ba7dccaf24 100644 (file)
@@ -32,6 +32,8 @@ ifdef CONFIG_USE_MIPS16
   TARGET_CFLAGS += -mno-mips16 -mno-interlink-mips16
 endif
 
+PYTHON_KEEP_EGGINFO ?= 0
+
 define PyPackage
 
   define Package/$(1)-src
@@ -68,11 +70,13 @@ define PyPackage
        $(call PyPackage/$(1)/install,$$(1))
        find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
        if [ -e files/python-package-install.sh ] ; then \
+               PYTHON_KEEP_EGGINFO="$(PYTHON_KEEP_EGGINFO)" \
                $(SHELL) files/python-package-install.sh \
                        "$(PKG_INSTALL_DIR)" "$$(1)" \
                        "$(HOST_PYTHON_BIN)" "$$(2)" \
                        "$$$$$$$$$$(call shvar,PyPackage/$(1)/filespec)" ; \
        elif [ -e $(STAGING_DIR)/mk/python-package-install.sh ] ; then \
+               PYTHON_KEEP_EGGINFO="$(PYTHON_KEEP_EGGINFO)" \
                $(SHELL) $(STAGING_DIR)/mk/python-package-install.sh \
                        "$(PKG_INSTALL_DIR)" "$$(1)" \
                        "$(HOST_PYTHON_BIN)" "$$(2)" \
index 7fdcb92fa7023d64663bf87f65caf4eb49a4802e..4b5311ecce048c31f91fdf0784f21922c18c7965 100644 (file)
@@ -16,7 +16,7 @@ PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)
 PKG_NAME:=python3
 # XXX: reset PKG_RELEASE to 1 only if Python's pip & setuptools versions have also bumped;
 #      otherwise, keep bumping PKG_RELEASE
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
index dd1e708fc5e35e9dd4d6e6465bec81632789fffb..0b68dd245c71696799c05692f9a7e2f6e7764c18 100644 (file)
@@ -47,7 +47,8 @@ process_filespec "$src_dir" "$dst_dir" "$filespec" || {
 }
 
 # delete egg-info directories
-find "$dst_dir" -name "*.egg-info" | xargs rm -rf
+[ "$PYTHON3_KEEP_EGGINFO" == "1" ] || \
+       find "$dst_dir" -name "*.egg-info" | xargs rm -rf
 
 if [ "$mode" == "sources" ] ; then
        # Copy only python source files
index 93b14fac23b25ade106bf2ea55ec1a2b0d362278..1d42b6dc3478a3cd5d92d81088f8ffcfae213089 100644 (file)
@@ -32,6 +32,8 @@ ifdef CONFIG_USE_MIPS16
   TARGET_CFLAGS += -mno-mips16 -mno-interlink-mips16
 endif
 
+PYTHON3_KEEP_EGGINFO ?= 0
+
 define Py3Package
 
   define Package/$(1)-src
@@ -68,11 +70,13 @@ define Py3Package
        $(call Py3Package/$(1)/install,$$(1))
        find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
        if [ -e files/python3-package-install.sh ] ; then \
+               PYTHON3_KEEP_EGGINFO="$(PYTHON3_KEEP_EGGINFO)" \
                $(SHELL) files/python3-package-install.sh \
                        "$(PKG_INSTALL_DIR)" "$$(1)" \
                        "$(HOST_PYTHON3_BIN)" "$$(2)" \
                        "$$$$$$$$$$(call shvar,Py3Package/$(1)/filespec)" ; \
        elif [ -e $(STAGING_DIR)/mk/python3-package-install.sh ] ; then \
+               PYTHON3_KEEP_EGGINFO="$(PYTHON3_KEEP_EGGINFO)" \
                $(SHELL) $(STAGING_DIR)/mk/python3-package-install.sh \
                        "$(PKG_INSTALL_DIR)" "$$(1)" \
                        "$(HOST_PYTHON3_BIN)" "$$(2)" \
diff --git a/libs/libevent/Makefile b/libs/libevent/Makefile
deleted file mode 100644 (file)
index b645cc3..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2006-2015 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:=libevent
-PKG_VERSION:=1.4.15
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION)-stable
-PKG_SOURCE:=release-$(PKG_VERSION)-stable.tar.gz
-PKG_SOURCE_URL:=https://github.com/libevent/libevent/archive/
-PKG_HASH:=e9a32238a98954081d7ed9918d8f799eb4c743fd570749c0721585140dd5de21
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libevent
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Event notification library (legacy)
-  DEPENDS:=+librt
-  URL:=http://www.libevent.org
-endef
-
-define Package/libevent/description
-       The libevent API provides a mechanism to execute a callback function
-       when a specific event occurs on a file descriptor or after a timeout
-       has been reached. Furthermore, libevent also support callbacks due
-       to signals or regular timeouts.
-
-       libevent is meant to replace the event loop found in event driven
-       network servers. An application just needs to call event_dispatch()
-       and then add or remove events dynamically without having to change
-       the event loop.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-       --enable-shared \
-       --enable-static \
-
-MAKE_FLAGS += \
-       CFLAGS="$(TARGET_CFLAGS)" \
-
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include/libevent
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/libevent/
-       $(INSTALL_DIR) $(1)/usr/lib/libevent
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so} $(1)/usr/lib/libevent/
-endef
-
-define Package/libevent/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libevent))
index 5033099743f001243d248b03a186a3363e7181fc..f33309643f739a3d5a8cd669a5e50d8bdd104524 100644 (file)
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libxml2
-PKG_VERSION:=2.9.5
+PKG_VERSION:=2.9.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://gd.tuwien.ac.at/languages/libxml/ \
        http://xmlsoft.org/sources/ \
        ftp://fr.rpmfind.net/pub/libxml/
-PKG_HASH:=4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38
+PKG_HASH:=8b9038cca7240e881d462ea391882092dfdc6d4f483f72683e817be08df5ebbc
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
index 2f7e8ace16759303be5e4c9d3e6cada4a3ab41f1..0039802c404a654165a6f1826ad877e02e6930f5 100644 (file)
@@ -8,10 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=postfix
-PKG_RELEASE:=3
-PKG_SOURCE_URL:=ftp://ftp.porcupine.org/mirrors/postfix-release/official/
-PKG_VERSION:=3.2.2
-PKG_HASH:=d06849418d119d09366997b2b481bb23f737629769b4e4a52da42fb3ad8b0576
+PKG_RELEASE:=1
+PKG_VERSION:=3.2.3
+PKG_SOURCE_URL:= \
+       https://cdn.postfix.johnriley.me/mirrors/postfix-release/official/ \
+       ftp://ftp.porcupine.org/mirrors/postfix-release/official/
+
+PKG_HASH:=5b0b975d075ea7561028d4109c581549b794aa92d733429ea6d9fa57751140bf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
 PKG_LICENSE:=IPL-1.0
index 058c8ddaada5bf740d0ebc89ddf2bf1b2376cbd7..f260642a8814ac4cfce32e336fc4f765b41fc2c0 100644 (file)
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=3.2.7
-PKG_RELEASE:=3
+PKG_VERSION:=3.2.8
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://ffmpeg.org/releases/
-PKG_HASH:=28e75fc32485a88035a7ebf0a956a1e5c7e93b440dd4bbd6bc30c7268cf34fe9
+PKG_HASH:=42e7362692318afc666f14378dd445effa9a1b09787504a6ab5811fe442674cd
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
                Ian Leonard <antonlacon@gmail.com>
 
@@ -420,7 +420,6 @@ ifneq ($(findstring arm,$(CONFIG_ARCH)),)
        else
                FFMPEG_CONFIGURE+= --disable-neon
        endif
-
 endif
 
 ifeq ($(ARCH),x86_64)
@@ -550,8 +549,7 @@ ifeq ($(BUILD_VARIANT),audio-dec)
        $(call FFMPEG_ENABLE,decoder,$(FFMPEG_AUDIO_DECODERS)) \
        $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_AUDIO_DEMUXERS)) \
        $(call FFMPEG_ENABLE,protocol,$(FFMPEG_AUDIO_PROTOCOLS)) \
-       --disable-decoder=pcm_bluray,pcm_dvd \
-
+       --disable-decoder=pcm_bluray,pcm_dvd
 endif
 
 ifeq ($(BUILD_VARIANT),mini)
diff --git a/multimedia/minidlna/patches/001-group-videos-by-directory-for-panasonic-tvs.patch b/multimedia/minidlna/patches/001-group-videos-by-directory-for-panasonic-tvs.patch
deleted file mode 100644 (file)
index f36edde..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-From c8245740c3a8699cfe7d7e5aa0d427b931018ad5 Mon Sep 17 00:00:00 2001
-From: Yusuke Yanbe <y.yanbe@gmail.com>
-Date: Mon, 4 Jul 2016 08:20:46 +0900
-Subject: [PATCH] Add support for grouping videos by directory for Panasonic
- TVs
-
----
- upnpsoap.c | 24 +++++++++++++++++++-----
- upnpsoap.h |  5 ++++-
- 2 files changed, 23 insertions(+), 6 deletions(-)
-
---- a/upnpsoap.c
-+++ b/upnpsoap.c
-@@ -1095,6 +1095,15 @@ callback(void *args, int argc, char **ar
-                                               add_res(size, duration, bitrate, sampleFrequency, nrAudioChannels,
-                                                       resolution, dlna_buf, mime, detailID, ext, passed_args);
-                                       }
-+
-+                                      DPRINTF(E_DEBUG, L_HTTP, "Title: %s -  %d Returned / %d childCount\n",
-+                                                              title, passed_args->returned, passed_args->childCount);
-+
-+                                      ret = strcatf(str, "&lt;pxn:groupTopFlag&gt;%d&lt;/pxn:groupTopFlag&gt;"
-+                                                         "&lt;pxn:groupID&gt;%s&lt;/pxn:groupID&gt;"
-+                                                         "&lt;pxn:groupTitle&gt;%s&lt;/pxn:groupTitle&gt;"
-+                                                         "&lt;pxn:groupMemberNum&gt;%d&lt;/pxn:groupMemberNum&gt;",
-+                                                         passed_args->returned == passed_args->childCount, parent, passed_args->parentTitle, passed_args->childCount);
-                                       break;
-                               case ESamsungSeriesCDE:
-                               case ELGDevice:
-@@ -1357,8 +1366,11 @@ BrowseContentDirectory(struct upnphttp *
-               if (!where[0])
-                       sqlite3_snprintf(sizeof(where), where, "PARENT_ID = '%q'", ObjectID);
--              if (!totalMatches)
-+              if (!totalMatches) {
-                       totalMatches = get_child_count(ObjectID, magic);
-+                      args.childCount = totalMatches;
-+                      args.parentTitle = sql_get_text_field(db, "SELECT d.TITLE FROM OBJECTS o LEFT JOIN DETAILS d ON (d.ID = o.DETAIL_ID) WHERE OBJECT_ID='%q'", ObjectID);
-+              }
-               ret = 0;
-               if (SortCriteria && !orderBy)
-               {
-@@ -1397,14 +1409,16 @@ BrowseContentDirectory(struct upnphttp *
-                       SoapError(h, 709, "Unsupported or invalid sort criteria");
-                       goto browse_error;
-               }
--
-               sql = sqlite3_mprintf("SELECT %s, %s, %s, " COLUMNS
-                                     "from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)"
--                                    " where %s %s limit %d, %d;",
-+                                    " where %s order by d.date limit %d, %d;",
-                                     objectid_sql, parentid_sql, refid_sql,
--                                    where, THISORNUL(orderBy), StartingIndex, RequestedCount);
-+                                    where, StartingIndex, RequestedCount);
-               DPRINTF(E_DEBUG, L_HTTP, "Browse SQL: %s\n", sql);
-               ret = sqlite3_exec(db, sql, callback, (void *) &args, &zErrMsg);
-+              if (args.parentTitle) {
-+                      sqlite3_free(args.parentTitle);
-+              }
-       }
-       if( (ret != SQLITE_OK) && (zErrMsg != NULL) )
-       {
-@@ -1838,7 +1852,7 @@ SearchContentDirectory(struct upnphttp *
-                             (*ContainerID == '*') ? NULL :
-                             sqlite3_mprintf("UNION ALL " SELECT_COLUMNS
-                                             "from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)"
--                                            " where OBJECT_ID = '%q' and (%s) ", ContainerID, where),
-+                                            " where OBJECT_ID = '%q' and (%s) ORDER BY d.date", ContainerID, where),
-                             orderBy, StartingIndex, RequestedCount);
-       DPRINTF(E_DEBUG, L_HTTP, "Search SQL: %s\n", sql);
-       ret = sqlite3_exec(db, sql, callback, (void *) &args, &zErrMsg);
---- a/upnpsoap.h
-+++ b/upnpsoap.h
-@@ -27,7 +27,8 @@
- #define CONTENT_DIRECTORY_SCHEMAS \
-       " xmlns:dc=\"http://purl.org/dc/elements/1.1/\"" \
-       " xmlns:upnp=\"urn:schemas-upnp-org:metadata-1-0/upnp/\"" \
--      " xmlns=\"urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/\""
-+      " xmlns=\"urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/\"" \
-+      " xmlns:pxn=\"urn:schemas-panasonic-com:pxn\""
- #define DLNA_NAMESPACE \
-       " xmlns:dlna=\"urn:schemas-dlna-org:metadata-1-0/\""
- #define PV_NAMESPACE \
-@@ -39,6 +40,8 @@ struct Response
-       int start;
-       int returned;
-       int requested;
-+      int childCount;
-+      char *parentTitle;
-       int iface;
-       uint32_t filter;
-       uint32_t flags;
index 48c083536f51fc02a70488e4ddf65707d0612b18..20d1dc5e2e7d8cccbcc3b288eaed7412f51f5419 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freeradius3
 PKG_VERSION:=release_3_0_11
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/FreeRADIUS/freeradius-server/archive
index b30b01279a2f4e4fc3c495e109c6158c3d18e47a..578bbbc0eb1e93392ac315834897c549b90d8668 100644 (file)
@@ -22,7 +22,7 @@
  preserve              = no
 --- a/raddb/certs/server.cnf
 +++ b/raddb/certs/server.cnf
-@@ -14,7 +14,7 @@ private_key          = $dir/ca.key
+@@ -14,7 +14,7 @@ private_key          = $dir/server.key
  RANDFILE              = $dir/.rand
  name_opt              = ca_default
  cert_opt              = ca_default
diff --git a/net/freeradius3/patches/002-disable-session-cache-CVE-2017-9148.patch b/net/freeradius3/patches/002-disable-session-cache-CVE-2017-9148.patch
new file mode 100644 (file)
index 0000000..458eeba
--- /dev/null
@@ -0,0 +1,47 @@
+Description: disable session caching in the server (as opposed to in the
+ config, which would be way harder to get right) to address
+ https://security-tracker.debian.org/tracker/CVE-2017-9148
+Author: Michael Stapelberg <stapelberg@debian.org>
+Forwarded: not-needed
+Last-Update: 2017-05-30
+
+---
+
+--- a/src/main/tls.c
++++ b/src/main/tls.c
+@@ -369,7 +369,7 @@ tls_session_t *tls_new_session(TALLOC_CT
+        *
+        *      FIXME: Also do it every N sessions?
+        */
+-      if (conf->session_cache_enable &&
++      if (/*conf->session_cache_enable*/0 &&
+           ((conf->session_last_flushed + ((int)conf->session_timeout * 1800)) <= request->timestamp)){
+               RDEBUG2("Flushing SSL sessions (of #%ld)", SSL_CTX_sess_number(conf->ctx));
+@@ -463,7 +463,7 @@ tls_session_t *tls_new_session(TALLOC_CT
+               state->mtu = vp->vp_integer;
+       }
+-      if (conf->session_cache_enable) state->allow_session_resumption = true; /* otherwise it's false */
++      if (/*conf->session_cache_enable*/0) state->allow_session_resumption = true; /* otherwise it's false */
+       return state;
+ }
+@@ -2675,7 +2675,7 @@ post_ca:
+       /*
+        *      Callbacks, etc. for session resumption.
+        */
+-      if (conf->session_cache_enable) {
++      if (/*conf->session_cache_enable*/0) {
+               /*
+                *      Cache sessions on disk if requested.
+                */
+@@ -2745,7 +2745,7 @@ post_ca:
+       /*
+        *      Setup session caching
+        */
+-      if (conf->session_cache_enable) {
++      if (/*conf->session_cache_enable*/0) {
+               /*
+                *      Create a unique context Id per EAP-TLS configuration.
+                */
index 5b126b2fe48a54cbaaca198cc34bfbfbee99addf..ec7c66a230b157227a6912c9441907884d28b638 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=git
-PKG_VERSION:=2.14.1
+PKG_VERSION:=2.14.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/scm/git/
-PKG_HASH:=6f724c6d0e9e13114ab35db6f67e1b2c1934b641e89366e6a0e37618231f2cc6
+PKG_HASH:=50e9723996114ad1eec4dda89960d9fe34461749ae42031008a261fedd03c7a1
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
index a73ee666b069d6a3fd975cd9818a7205e7a547da..56f694c2af21a1c4073ef570b59ad1ee14e4d807 100644 (file)
@@ -1,10 +1,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnunet
-PKG_SOURCE_VERSION:=556ccd6d483b3678867c3829e6979c307df04450
-PKG_MIRROR_HASH:=5ecf15575eccc30135b2dc9871d88de0b32b593dc79cf5b0632a4fe2ffd711df
+PKG_SOURCE_VERSION:=664aca2d29b15dd75967d2bb0298caf750993b6f
+PKG_MIRROR_HASH:=d3fd9f9275e3173b392ea3d151130fae9fb507986c5bd6a369303e0e1e0ab6d6
 
-PKG_VERSION:=0.10.2-git-20170626-$(PKG_SOURCE_VERSION)
+PKG_VERSION:=0.10.2-git-20171004-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+= \
        $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mysql),--with-mysql="$(STAGING_DIR)/usr",--without-mysql) \
        $(if $(CONFIG_PACKAGE_$(PKG_NAME)-pgsql),--with-postgresql="$(STAGING_DIR)/usr/bin/pg_config",--without-postgresql) \
        $(if $(CONFIG_PACKAGE_libsqlite3),--with-sqlite="$(STAGING_DIR)/usr",--without-sqlite) \
-       --disable-testing \
+       --enable-testing \
        --disable-testruns \
        --enable-experimental \
        --with-extractor=$(STAGING_DIR)/usr \
index 5f9a30c06347e40aaa692a2f965be4a1d6f17032..a1b44f4a5b764d629a1d5373764b9db56430c6de 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnurl
-PKG_VERSION:=7.55.0
+PKG_VERSION:=7.55.1-4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://gnunet.org/sites/default/files
 
-PKG_HASH:=761b3ddb32946965c62676ca4acf2ebaab38d09068aebeea78caaf6cce8c2b45
+PKG_HASH:=d4758822f84fe961d9253d3d7ff742c9cd0d39d5340d441b8014771eb95b8125
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
@@ -98,7 +98,7 @@ endef
 define Build/InstallDev
        $(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include/gnurl $(1)/usr/lib $(1)/usr/lib/pkgconfig
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnurl-config $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/curl/*.h $(1)/usr/include/gnurl
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/gnurl/*.h $(1)/usr/include/gnurl
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnurl.{a,so*} $(1)/usr/lib/
        $(CP) $(PKG_BUILD_DIR)/libgnurl.pc $(1)/usr/lib/pkgconfig/
        $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/gnurl-config
index 381878c384dc64a5aaec68b8d4256483b4406013..c18e7454e2b45d5a39c90a200977f67f14717d6d 100644 (file)
@@ -8,15 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=horst
-PKG_VERSION:=5.0
+PKG_VERSION:=5.1
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-git.tar.gz
-PKG_MIRROR_HASH:=3a677e504e8a1f27c899dfbf39da8c94412b24b08bb2eab0de7807cef07d078b
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=git://github.com/br101/horst.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=version-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/br101/horst/archive/v$(PKG_VERSION)/
+PKG_HASH:=74b4cb1143d93c73c3b4bbbe0c36f89a790401bde9e894e94e2a27339ca384d9
 
 PKG_MAINTAINER:=Bruno Randolf <br1@einfach.org>
 PKG_LICENSE:=GPL-2.0+
@@ -43,10 +40,18 @@ define Package/horst/description
        and especially IBSS (ad-hoc) mode and mesh networks (OLSR).
 endef
 
+define Package/horst/conffiles
+/etc/config/horst
+endef
+
 define Package/horst/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/horst $(1)/usr/sbin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/horst.sh $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./horst.init $(1)/etc/init.d/horst
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./horst.config $(1)/etc/config/horst
 endef
 
 $(eval $(call BuildPackage,horst))
diff --git a/net/horst/horst.config b/net/horst/horst.config
new file mode 100644 (file)
index 0000000..17c0097
--- /dev/null
@@ -0,0 +1,4 @@
+config init 'init'
+       option disabled 1
+       option interface 'mon0'
+       option scan 1
diff --git a/net/horst/horst.init b/net/horst/horst.init
new file mode 100755 (executable)
index 0000000..bba67a2
--- /dev/null
@@ -0,0 +1,22 @@
+#!/bin/sh /etc/rc.common
+
+START=94
+
+USE_PROCD=1
+PROG=/usr/sbin/horst
+
+start_service() {
+       config_load horst
+       config_get dis "init" 'disabled' '0'
+       [ "$dis" == "0" ] || exit
+
+       config_get intf "init" 'interface' 'wlan0'
+       config_get scan "init" 'scan' '0'
+       [ "$scan" == "0" ] && scan='' || scan="-s"
+
+       procd_open_instance
+       procd_set_param command $PROG -q -i $intf $scan -N
+       procd_set_param netdev $intf
+       procd_set_param respawn
+       procd_close_instance
+}
diff --git a/net/horst/patches/0001-Remove-_GNU_SOURCE-from-ccan-config.patch b/net/horst/patches/0001-Remove-_GNU_SOURCE-from-ccan-config.patch
deleted file mode 100644 (file)
index eeab738..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From c91e2f6d72823938052044eef858c3c675617ae4 Mon Sep 17 00:00:00 2001
-From: Bruno Randolf <br1@einfach.org>
-Date: Wed, 15 Mar 2017 21:22:48 +0000
-Subject: [PATCH] Remove _GNU_SOURCE from ccan config
-
-It creates problems with LEDEs FORTIFY and is not needed
----
- config.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/config.h b/config.h
-index 5c398c4..7e1027a 100644
---- a/config.h
-+++ b/config.h
-@@ -1,8 +1,5 @@
- /* Generated by CCAN configurator */
- #ifndef CCAN_CONFIG_H
- #define CCAN_CONFIG_H
--#ifndef _GNU_SOURCE
--#define _GNU_SOURCE /* Always use GNU extensions. */
--#endif
- #define HAVE_TYPEOF 1
- #endif /* CCAN_CONFIG_H */
--- 
-2.7.4
-
index 76711f3f9f5c0358350ce3e1d4206aac2ee84651..b77860dc2f2af79c441e1e481b6847681fc082d0 100644 (file)
@@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=knxd
 PKG_VERSION:=0.14.18
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/knxd/knxd.git
@@ -47,7 +47,8 @@ EIB KNX Daemon
 endef
 
 define Package/knxd/conffiles
-/etc/config/knxd.ini
+/etc/knxd.ini
+/etc/config/knxd
 endef
 
 TARGET_CXXFLAGS+= -std=c++0x
@@ -72,7 +73,8 @@ define Package/knxd/install
        $(INSTALL_BIN) ./files/knxd.init $(1)/etc/init.d/knxd
 
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_DATA) ./files/knxd.ini $(1)/etc/config/knxd.ini
+       $(INSTALL_DATA) ./files/knxd.ini $(1)/etc/knxd.ini
+       $(INSTALL_DATA) ./files/knxd.config $(1)/etc/config/knxd
 endef
 
 $(eval $(call BuildPackage,knxd))
diff --git a/net/knxd/files/knxd.config b/net/knxd/files/knxd.config
new file mode 100644 (file)
index 0000000..81dacaa
--- /dev/null
@@ -0,0 +1,43 @@
+config daemon args
+       # driver:[arg]  a Layer-2 driver to use (knxd supports more than one)
+       #option layer2 ""
+       # enable caching of group communication networkstate
+       option GroupCache 0
+       # FILE start the programm as daemon. Output will be written to FILE if given
+       option daemon "/var/log/knxd.log"
+       #enable the EIBnet/IP server to answer discovery and description requests (SEARCH, DESCRIPTION)
+       option Discovery 1
+       # EIBADDR set our EIB address to EIBADDR (default 0.0.1)
+       option eibaddr "0.0.2"
+       # LEVEL set error level
+       option error 0
+       # PORT listen at TCP port PORT (default 6720)
+       option listen_tcp "6720"
+       # wait for L_Data_ind while sending (for all EMI based backends)
+       option no_emisend_queuing 0
+       # SERVERNAME name of the EIBnet/IP server (default is 'knxd')
+       option Name "KNX2"
+       # do not assume KNXnet/IP Tunneling bus interface can handle parallel cEMI requests
+       option no_tunnel_client_queuing 0
+       # the next Layer2 interface may not enter monitor mode
+       option no_monitor 0
+       # enable EIBnet/IP Routing in the EIBnet/IP server
+       option Routing 1
+       # [ip[:port]] starts an EIBnet/IP multicast server
+       option Server '224.0.23.12'
+       # MASK set trace flags (bitmask)
+       option trace 0
+       # tpuarts backend should generate L2 acks for all group telegrams
+       option tpuarts_ack_all_group 0
+       # tpuarts backend should generate L2 acks for all individual telegrams
+       option tpuarts_ack_all_individual 0
+       # tpuarts backend should should use a full interface reset (for Disch TPUART interfaces)
+       option tpuarts_disch_reset 0
+       # enable EIBnet/IP Tunneling in the EIBnet/IP server
+       option Tunnelling 1
+       # FILE  listen at Unix domain socket FILE (default /tmp/eib)
+       option listen_local "/var/run/knxd"
+       # example with tpuarts interface
+       # option url 'tpuarts:/dev/ttyAMA0'
+       # example with IP interface in tunnel mode
+       option url 'usb:'
index d3f8475554b914d1dd8837c6aef9a3c35552fa29..92a08a12a99fe238716960b976fa682ac52cbb07 100644 (file)
@@ -33,15 +33,14 @@ start_service() {
        local options url
        config_load knxd
        append_parm args eibaddr "eibaddr" "0.0.1"
-       append_parm args client-addrs "client-addrs" "0.0.2:10"
+       append_parm args client_addrs "client-addrs" "0.0.2:10"
        append_parm args layer2 "layer2"
        append_bool args GroupCache "GroupCache" 0
        append_parm args daemon "daemon" "/var/log/knxd.log"
-       append_bool args Discovery "Discovery" 1
        append_parm args error "error" # "5"
        append_parm args listen_tcp "listen-tcp" "6720"
        append_parm args Interface "Interface" # "eth0"
-       append_parm args send-delay "send-delay" # "50"
+       append_parm args send_delay "send-delay" # "50"
        append_parm args Name "Name" "OpenWrt"
        append_bool args no_monitor "no-monitor" 0
        append_bool args Routing "Routing" 0
@@ -50,11 +49,17 @@ start_service() {
        append_bool args tpuarts_ack_all_individual "tpuarts-ack-all-individual" 0
        append_bool args tpuarts_disch_reset "tpuarts-disch-reset" 0
        append_bool args Tunnelling "Tunnelling" 1
-       append_bool args Server "Server" 1
+       append_bool args Discovery "Discovery" 1
+       append_parm args Server "Server" "224.0.23.12"
        append_parm args listen_local "listen-local" "/var/run/knxd"
        config_get url args url
+       if [ "$url" == "usb:" ] ; then
+               url="usb:""$(findknxusb | tail -n1 | sed -e 's/device: \([0-9]:[0-9]:[0-9]\):[0-9].*/\1/')"
+       fi
+       echo "/usr/lib/knxd_args $params $url"
+       /usr/lib/knxd_args $params $url > /tmp/etc/knxd.ini
        procd_open_instance
-       procd_set_param command $PROG $params $url
+       procd_set_param command $PROG "/tmp/etc/knxd.ini"
        procd_set_param respawn
        procd_close_instance
 }
index 02abaae00a74f44294326c3a1b051103b2a13fa2..7a4cd3685dc7829aae18041ca7cad19a73e69933 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lftp
-PKG_VERSION:=4.7.5
-PKG_RELEASE:=1
+PKG_VERSION:=4.8.2
+PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://lftp.tech/ftp/ \
-               ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/
-PKG_HASH:=53b5c5eba2e38b418bcf451776f2df596050dff4db90ab4ea73d872f8b1fd0d8
-
+               https://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/
+               
+PKG_HASH:=5c875b8476e05e856ebc8eec458e43317b2bebd6ed5f7725a733d4591548cd9c
 
 
 PKG_LICENSE:=GPL-3.0+
@@ -37,19 +37,9 @@ define Package/lftp/description
 LFTP is a sophisticated file transfer program with command line interface. It supports FTP, HTTP, FISH, SFTP, HTTPS and FTPS protocols. GNU Readline library is used for input.
 Every operation in lftp is reliable, that is any non-fatal error is handled and the operation is retried automatically. So if downloading breaks, it will be restarted from the point automatically. Even if ftp server does not support REST command, lftp will try to retrieve the file from the very beginning until the file is transferred completely. This is useful for dynamic-ip machines which change their IP addresses quite often, and for sites with very bad internet connectivity.
 
-If you exit lftp when some jobs are not finished yet, lftp will move itself to nohup mode in background. The same happens when you have a real modem hangup or when you close an xterm.
-
 lftp has shell-like command syntax allowing you to launch several commands in parallel in background (&). It is also possible to group commands within () and execute them in background. All background jobs are executed in the same single process. You can bring a foreground job to background with ^Z (c-z) and back with command `wait' (or `fg' which is alias to `wait'). To list running jobs, use command `jobs'. Some commands allow redirecting their output (cat, ls, ...) to file or via pipe to external command. Commands can be executed conditionally based on termination status of previous command (&&, ||).
 
 lftp has builtin mirror which can download or update a whole directory tree. There is also reverse mirror (mirror -R) which uploads or updates a directory tree on server.
-
-There is command `at' to launch a job at specified time in current context, command `queue' to queue commands for sequential execution for current server, and much more.
-
-LFTP supports IPv6 for both FTP and HTTP protocols. For FTP protocol it uses method described in RFC2428.
-
-Other low level stuff supported: ftp proxy, http proxy, ftp over http, opie/skey, fxp transfers, socks.
-
-LFTP supports secure versions of the protocols FTP and HTTP: FTPS (explicit and implicit) and HTTPS. LFTP needs to be linked with an SSL library to support them. GNU TLS and OpenSSL are both supported as SSL backend.
 endef
 
 CONFIGURE_ARGS += \
@@ -63,12 +53,7 @@ CONFIGURE_ARGS += \
        --with-zlib="$(STAGING_DIR)/usr" \
        --disable-static
 
-#CONFIGURE_VARS += \
-#      LIBS="-lz -lutil -lcurses -ldl" \
-#      i_cv_posix_fallocate_works=no
-
-#MAKE_VARS += \
-#      LD="$(TARGET_CXX)"
+TARGET_CXXFLAGS+= -std=c++11
 
 define Package/lftp/install
        $(INSTALL_DIR) $(1)/usr/bin
index 64cc369827698eebd45fcd0a1c1e910461644bef..7e05c3a4ef8d12e432e2c8294f54cc31cae4b2d4 100644 (file)
@@ -11,11 +11,12 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=noddos
 PKG_RELEASE:=1
 PKG_LICENSE:=GPLv3
+PKG_MAINTAINER:=Steven Hessing <steven.hessing@gmail.com>
 
-PKG_SOURCE_VERSION:=0.5.0
+PKG_SOURCE_VERSION:=0.5.2
 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:=61119d76bbc1e7de74c3f3cd58fe7048581a1653dbffa03ae4215163b5221b18
+PKG_HASH:=63fe85fc4a588da2d71b7b7db68f1c80ba19520467a3800bdb43bc516a6cff72
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 
index 1abc1532e7a4b674edaba03e5ecba874d2649924..e2bf01b6f867b0ef2060b2242e97a653b91d223b 100644 (file)
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
-PKG_VERSION:=7.5p1
-PKG_RELEASE:=4
+PKG_VERSION:=7.6p1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
                https://ftp.spline.de/pub/OpenBSD/OpenSSH/portable/ \
                https://anorien.csc.warwick.ac.uk/pub/OpenBSD/OpenSSH/portable/
-PKG_HASH:=9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0
+PKG_HASH:=a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723
 
 PKG_LICENSE:=BSD ISC
 PKG_LICENSE_FILES:=LICENCE
index 4b80ac00bd0cd34bf732da59e2f2504475acf72d..26b49273747355cfbb2ac4293494f6450a4cb5e1 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rp-pppoe
 PKG_VERSION:=3.12
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 PKG_MAINTAINER:=Daniel Dickinson <lede@cshore.thecshore.com>
 PKG_LICENSE:=LGPL-2.0+
 
index 4aeeee8c18483b45d97b9d54f338a0affa96d1a8..1c9b16ec77c8e7d4b942b2bea2ee24b4b9cd67a0 100755 (executable)
@@ -27,7 +27,7 @@ pppoe_relay_instance() {
     config_get server_interfaces "$cfg" server_interface
     config_get client_interfaces "$cfg" client_interface
     config_get both_interfaces "$cfg" both_interfaces
-    config_get maxsessions "$cfg" maxsesssions
+    config_get maxsessions "$cfg" maxsessions
     config_get timeout "$cfg" timeout
     config_get_bool use_non_uci_config "$cfg" use_non_uci_config 0
 
@@ -44,7 +44,7 @@ pppoe_relay_instance() {
        for interface in $both_interfaces; do
            append OPTIONS "-B $interface"
        done
-       [ -n "$maxsesssions" ] && append OPTIONS "-n $maxsesssions"
+       [ -n "$maxsessions" ] && append OPTIONS "-n $maxsessions"
        [ -n "$timeout" ] && append OPTIONS "-i $timeout"
     fi
 
index dd2568ec89863e09bed142584d49472835312d7d..f3a53dfd68f80d3bca3f7dfa6f2b715e68b60bc5 100755 (executable)
@@ -16,7 +16,7 @@ pppoe_instance() {
        config_get interface "$cfg" interface
        config_get ac_name "$cfg" ac_name
        config_get service_names "$cfg" service_name
-       config_get maxsessionsperpeer "$cfg" maxsesssionsperpeer
+       config_get maxsessionsperpeer "$cfg" maxsessionsperpeer
        config_get localip "$cfg" localip
        config_get firstremoteip "$cfg" firstremoteip
        config_get maxsessions "$cfg" maxsessions
@@ -38,7 +38,7 @@ pppoe_instance() {
                append OPTIONS "-S $service_name"
            done
            append OPTIONS "-I $interface"
-           [ -n "$maxsesssionsperpeer" ] && append OPTIONS "-x $maxsesssionsperpeer"
+           [ -n "$maxsessionsperpeer" ] && append OPTIONS "-x $maxsessionsperpeer"
            [ -n "$localip" ] && append OPTIONS "-L $localip"
            [ -n "$firstremoteip" ] && append OPTIONS "-R $firstremoteip"
            [ -n "maxsessions" ] && append OPTIONS "-N $maxsessions"
index de12fb379370ca84e1d79cb4f9f5e89640c93cdd..4679ff3ee3dd4617b7b08ffa8093d0a20454031d 100644 (file)
@@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=wireguard
 
-PKG_VERSION:=0.0.20170918
+PKG_VERSION:=0.0.20171005
 PKG_RELEASE:=1
 
 PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/
-PKG_HASH:=e083f18596574fb7050167090bfb4db4df09a1a99f3c1adc77f820c166368881
+PKG_HASH:=832a3b7cbb510f6986fd0c3a6b2d86bc75fc9f23b6754d8f46bc58ea8e02d608
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
index 8593f76995719a1a8386cb9d7edd25cbe0a961e6..f78c59f210455df5f7bfc9b1148566a09029cb75 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acpica-unix
-PKG_VERSION:=20170831
+PKG_VERSION:=20170929
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://acpica.org/sites/$(subst -unix,,$(PKG_NAME))/files/$(PKG_SOURCE_URL)
-PKG_HASH:=c918a422f6c72e27b08c841158b52d870b92730fb6406b33d20ef50b1d2b4113
+PKG_HASH:=c786868ae6c7a4c7bca19a5ca66bfb16740cad5c1c01b21642932f2f0dea9cc8
 PKG_MAINTAINER:=Philip Prindeville <philipp@redfish-solutions.com>
 
 PKG_LICENSE:=GPL-2.0
@@ -37,7 +37,7 @@ define Package/acpica-unix/description
        (AML) interpreter, a simulator, test suites, and a compiler to
        translate ACPI Source Language (ASL) into AML.
 
-       At this time, only acpidump is bundledr; more might be added later.
+       At this time, only acpidump is bundled; more might be added later.
 endef
 
 define Build/Configure
diff --git a/utils/f2fs-tools/Makefile b/utils/f2fs-tools/Makefile
deleted file mode 100644 (file)
index 6a39bc7..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# Copyright (C) 2014 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:=f2fs-tools
-PKG_VERSION:=1.7.0
-PKG_RELEASE:=1
-
-PKG_LICENSE:=GPLv2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/
-PKG_MD5SUM:=9db22274264f0c88dbee012f257917b1
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/f2fs-tools/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Filesystem
-  DEPENDS:=+libf2fs
-  URL:=http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git
-endef
-
-define Package/mkf2fs
-  $(Package/f2fs-tools/Default)
-  TITLE:=Utility for creating a Flash-Friendly File System (F2FS)
-endef
-
-define Package/f2fsck
-  $(Package/f2fs-tools/Default)
-  TITLE:=Utility for checking/repairing a Flash-Friendly File System (F2FS)
-endef
-
-define Package/f2fs-tools
-  $(Package/f2fs-tools/Default)
-  TITLE:=Tools for Flash-Friendly File System (F2FS)
-  DEPENDS += +mkf2fs +f2fsck
-endef
-
-define Package/libf2fs
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for Flash-Friendly File System (F2FS) tools
-  DEPENDS:=+libuuid
-endef
-
-define Package/libf2fs/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libf2fs.so* $(1)/usr/lib/
-endef
-
-define Package/mkf2fs/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.f2fs $(1)/usr/sbin
-endef
-
-define Package/f2fsck/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fsck.f2fs $(1)/usr/sbin
-       ln -s /usr/sbin/fsck.f2fs $(1)/usr/sbin/defrag.f2fs
-       ln -s /usr/sbin/fsck.f2fs $(1)/usr/sbin/dump.f2fs
-       ln -s /usr/sbin/fsck.f2fs $(1)/usr/sbin/sload.f2fs
-       ln -s /usr/sbin/fsck.f2fs $(1)/usr/sbin/resize.f2fs
-endef
-
-define Package/f2fs-tools/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/f2fstat $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fibmap.f2fs $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/parse.f2fs $(1)/usr/sbin
-endef
-
-$(eval $(call BuildPackage,libf2fs))
-$(eval $(call BuildPackage,mkf2fs))
-$(eval $(call BuildPackage,f2fsck))
-$(eval $(call BuildPackage,f2fs-tools))
diff --git a/utils/f2fs-tools/patches/001-compile.patch b/utils/f2fs-tools/patches/001-compile.patch
deleted file mode 100644 (file)
index 2ff6ee8..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,14 +20,9 @@ AC_DEFINE([F2FS_MINOR_VERSION], m4_bpats
-                               [\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]),
-                               [Minor version for f2fs-tools])
--AC_CHECK_FILE(.git,
--      AC_DEFINE([F2FS_TOOLS_DATE],
--              "m4_bpatsubst(f2fs_tools_gitdate,
--              [\([0-9-]*\)\(\w\|\W\)*], [\1])",
--              [f2fs-tools date based on Git commits]),
--      AC_DEFINE([F2FS_TOOLS_DATE],
-+AC_DEFINE([F2FS_TOOLS_DATE],
-               "f2fs_tools_date",
--              [f2fs-tools date based on Source releases]))
-+              [f2fs-tools date based on Source releases])
- AC_CONFIG_SRCDIR([config.h.in])
- AC_CONFIG_HEADER([config.h])
diff --git a/utils/f2fs-tools/patches/010-include-byteswap-h.patch b/utils/f2fs-tools/patches/010-include-byteswap-h.patch
deleted file mode 100644 (file)
index b8c9ff3..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/f2fs_fs.h
-+++ b/include/f2fs_fs.h
-@@ -12,6 +12,7 @@
- #include <inttypes.h>
- #include <linux/types.h>
- #include <sys/types.h>
-+#include <byteswap.h>
- #ifdef HAVE_CONFIG_H
- #include <config.h>
diff --git a/utils/f2fs-tools/patches/020-sload.f2fs-allow-to-build-without-libselinux.patch b/utils/f2fs-tools/patches/020-sload.f2fs-allow-to-build-without-libselinux.patch
deleted file mode 100644 (file)
index eac06c9..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-From b0a2386089fd6efade6b89094325ed8a9f8c6fff Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Sat, 22 Oct 2016 22:06:54 +0200
-Subject: [PATCH] sload.f2fs: allow to build without libselinux
-
-Some systems do not have libselinux. Allow to build sload.f2fs without
-support for selinux.
-
-Signed-off-by: Christian Hesse <mail@eworm.de>
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
----
- configure.ac |  4 +++-
- fsck/sload.c | 12 +++++++++++-
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f519790..7a62328 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -54,7 +54,9 @@ AC_PATH_PROG([LDCONFIG], [ldconfig],
- # Checks for libraries.
- PKG_CHECK_MODULES([libuuid], [uuid])
--PKG_CHECK_MODULES([libselinux], [libselinux])
-+PKG_CHECK_MODULES([libselinux], [libselinux],
-+      [AC_DEFINE([HAVE_LIBSELINUX], [1], [Use libselinux])],
-+      [AC_MSG_NOTICE([libselinux not found])])
- # Checks for header files.
- AC_CHECK_HEADERS([linux/fs.h fcntl.h mntent.h stdlib.h string.h \
-diff --git a/fsck/sload.c b/fsck/sload.c
-index ea072d1..68799c1 100644
---- a/fsck/sload.c
-+++ b/fsck/sload.c
-@@ -16,8 +16,11 @@
- #include <libgen.h>
- #include <dirent.h>
- #include <mntent.h>
-+
-+#ifdef HAVE_LIBSELINUX
- #include <selinux/selinux.h>
- #include <selinux/label.h>
-+#endif
- #ifdef WITH_ANDROID
- #include <selinux/label.h>
-@@ -110,10 +113,12 @@ static int build_directory(struct f2fs_sb_info *sbi, const char *full_path,
-               handle_selabel(dentries + i, S_ISDIR(stat.st_mode),
-                                                       target_out_dir);
-+#ifdef HAVE_LIBSELINUX
-               if (sehnd && selabel_lookup(sehnd, &dentries[i].secon,
-                                       dentries[i].path, stat.st_mode) < 0)
-                       ERR_MSG("Cannot lookup security context for %s\n",
-                                               dentries[i].path);
-+#endif
-               dentries[i].pino = dir_ino;
-@@ -174,6 +179,7 @@ static int build_directory(struct f2fs_sb_info *sbi, const char *full_path,
-                       MSG(1, "Error unknown file type\n");
-               }
-+#ifdef HAVE_LIBSELINUX
-               if (dentries[i].secon) {
-                       inode_set_selinux(sbi, dentries[i].ino, dentries[i].secon);
-                       MSG(1, "File = %s \n----->SELinux context = %s\n",
-@@ -184,10 +190,12 @@ static int build_directory(struct f2fs_sb_info *sbi, const char *full_path,
-                                       dentries[i].gid, dentries[i].capabilities);
-               }
-+              free(dentries[i].secon);
-+#endif
-+
-               free(dentries[i].path);
-               free(dentries[i].full_path);
-               free((void *)dentries[i].name);
--              free(dentries[i].secon);
-       }
-       free(dentries);
-@@ -218,6 +226,7 @@ int f2fs_sload(struct f2fs_sb_info *sbi, const char *from_dir,
-               return ret;
-       }
-+#ifdef HAVE_LIBSELINUX
-       if (sehnd) {
-               char *secontext = NULL;
-@@ -233,6 +242,7 @@ int f2fs_sload(struct f2fs_sb_info *sbi, const char *from_dir,
-               }
-               free(secontext);
-       }
-+#endif
-       /* update curseg info; can update sit->types */
-       move_curseg_info(sbi, SM_I(sbi)->main_blkaddr);
--- 
-2.10.0
-
index 2b600cd8ef94dd1ab1abaa729f2db7b69c52f675..5db0de7470c395f0e4cb29917218af29c5ed3edb 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=less
-PKG_VERSION:=481
+PKG_VERSION:=487
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.greenwoodsoftware.com/less
-PKG_HASH:=3fa38f2cf5e9e040bb44fffaa6c76a84506e379e47f5a04686ab78102090dda5
+PKG_HASH:=f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING