Merge pull request #9988 from neheb/mot
authorRosen Penev <rosenp@gmail.com>
Fri, 20 Sep 2019 07:58:29 +0000 (00:58 -0700)
committerGitHub <noreply@github.com>
Fri, 20 Sep 2019 07:58:29 +0000 (00:58 -0700)
motion: Update to 4.2.2

211 files changed:
devel/automake/Makefile
devel/gcc/Makefile
devel/libtool-bin/Makefile
devel/m4/Makefile
devel/make/Makefile
devel/scons/Makefile [new file with mode: 0644]
devel/scons/files/pywrap.sh [new file with mode: 0755]
devel/scons/patches/001-platform_env.patch [new file with mode: 0644]
devel/scons/scons.mk [new file with mode: 0644]
lang/erlang/Makefile
lang/luaexpat/Makefile
lang/perl-html-parser/Makefile
lang/perl/Makefile
lang/python/django/Makefile
lang/python/python-certifi/Makefile
lang/python/python-schema/Makefile
lang/tcl/Makefile
libs/apr-util/Makefile
libs/boost/Makefile
libs/classpath/Makefile
libs/dtc/Makefile
libs/dtc/patches/0001-use-cflags-from-build-system.patch [deleted file]
libs/dtc/patches/0002-export-fdt_check_full-and-others.patch [deleted file]
libs/faad2/Makefile
libs/glib2/Makefile
libs/ldns/Makefile
libs/leptonica/Makefile
libs/libcups/Makefile
libs/libexif/Makefile
libs/libfmt/Makefile
libs/libftdi1/Makefile
libs/libgd/Makefile
libs/libgd/patches/210-generate-install-gdlib.pc-for-cmake-builds-too-164.patch
libs/libgpiod/Makefile
libs/libid3tag/Makefile
libs/libiio/Makefile
libs/liblz4/Makefile
libs/libmcrypt/Makefile
libs/libmms/Makefile
libs/libmodbus/Makefile
libs/libmodbus/patches/0001-Fixed-MODBUS_GET_-macros-in-case-of-negative-values.patch [new file with mode: 0644]
libs/libmodbus/patches/0001-Only-set-SER_RS485_ENABLED-bit-of-existing-RS485-set.patch [deleted file]
libs/libmodbus/patches/0002-Oops-fix-OR-on-RS485-settings-1c5d969.patch [deleted file]
libs/libogg/Makefile
libs/librsocket-cpp/Makefile
libs/librsocket-cpp/patches/101-do-not-use-gold.patch
libs/libshout/Makefile
libs/libsndfile/Makefile
libs/libsoxr/Makefile
libs/libtasn1/Makefile
libs/libupnp/Makefile
libs/libuv/Makefile
libs/libvorbis/Makefile
libs/neon/Makefile
libs/openldap/Makefile
libs/p11-kit/Makefile
libs/p11-kit/patches/010-uclibc.patch [deleted file]
libs/pcre/Makefile
libs/pcre2/Makefile
libs/postgresql/Makefile
libs/protobuf/Makefile
libs/speex/Makefile
libs/vips/Makefile
mail/bogofilter/Makefile
mail/dovecot/Makefile
mail/mutt/Makefile
mail/pigeonhole/Makefile
mail/postfix/Makefile
mail/sendmail/Makefile
mail/ssmtp/Makefile
multimedia/graphicsmagick/Makefile
multimedia/gst1-plugins-base/Makefile
multimedia/gst1-plugins-good/Makefile
multimedia/gstreamer1/Makefile
multimedia/lcdgrilo/Makefile
multimedia/lcdgrilo/patches/020-vala.patch [new file with mode: 0644]
multimedia/mjpg-streamer/Config.in [deleted file]
multimedia/mjpg-streamer/Makefile
multimedia/motion/Makefile
net/adblock/Makefile
net/adblock/files/adblock.init
net/adblock/files/adblock.sh
net/aircrack-ng/Makefile
net/apcupsd/Makefile
net/aria2/Makefile
net/beanstalkd/Makefile
net/bitlbee/Makefile
net/chrony/Makefile
net/cifs-utils/Makefile
net/davfs2/Makefile
net/dhcpcd/Makefile
net/dnscrypt-proxy/Makefile
net/dnscrypt-proxy/files/dnscrypt-proxy.init
net/dnscrypt-proxy/files/dnscrypt-resolvers.csv
net/freeradius3/Makefile
net/fwknop/Makefile
net/git/Makefile
net/gitolite/Makefile
net/gnunet/Makefile
net/haproxy/Makefile
net/iodine/Makefile
net/iotivity/Makefile
net/irssi/Makefile
net/isc-dhcp/Makefile
net/kismet/Makefile
net/krb5/Makefile
net/lftp/Makefile
net/libndp/Makefile
net/lynx/Makefile
net/mdnsresponder/Makefile
net/memcached/Makefile
net/miniupnpc/Makefile
net/miniupnpd/Makefile
net/mtr/Makefile
net/nbd/Makefile
net/net-snmp/Makefile
net/netatalk/Makefile
net/netperf/Makefile
net/nginx/Makefile
net/ngircd/Makefile
net/nmap/Makefile
net/nut/Makefile
net/nut/patches/010-libgd-pkgconfig.patch [new file with mode: 0644]
net/openconnect/Makefile
net/openssh/Makefile
net/openvswitch/Makefile
net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch
net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch
net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch
net/openvswitch/patches/0004-build-disable-building-tests.patch
net/openvswitch/patches/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch [deleted file]
net/pdns/Makefile
net/polipo/Makefile
net/pptpd/Makefile
net/privoxy/Makefile
net/radicale/Makefile
net/radicale2/Makefile
net/radsecproxy/Makefile
net/rp-pppoe/Makefile
net/rsync/Makefile
net/rsyslog/Makefile
net/samba4/Makefile
net/scapy/Makefile
net/smartsnmpd/Makefile
net/snort/Makefile
net/snort3/Makefile
net/socat/Makefile
net/sqm-scripts/Makefile
net/squid/Makefile
net/strongswan/Makefile
net/strongswan/patches/305-minimal_dh_plugin.patch
net/tgt/Makefile
net/tinc/Makefile
net/tinyproxy/Makefile
net/transmission/Makefile
net/ulogd/Makefile
net/xinetd/Makefile
net/zerotier/Makefile
sound/forked-daapd/Makefile
sound/forked-daapd/patches/010-alsa.patch [new file with mode: 0644]
sound/mpg123/Makefile
sound/pulseaudio/Makefile
sound/pulseaudio/patches/010-also-include.patch [new file with mode: 0644]
utils/acpid/Makefile
utils/bash/Makefile
utils/bigclown/bigclown-firmware-tool/Makefile
utils/bigclown/bigclown-mqtt2influxdb/Makefile
utils/bigclown/bigclown-mqtt2influxdb/files/init
utils/bluez/Makefile
utils/collectd/Makefile
utils/collectd/files/collectd.init
utils/collectd/files/collectd.uci
utils/collectd/files/usr/share/collectd/plugin/apcups.json [new file with mode: 0644]
utils/collectd/files/usr/share/collectd/plugin/cpu.json
utils/collectd/files/usr/share/collectd/plugin/curl.json [new file with mode: 0644]
utils/collectd/files/usr/share/collectd/plugin/iptables.json [new file with mode: 0644]
utils/collectd/files/usr/share/collectd/plugin/memory.json
utils/collectd/files/usr/share/collectd/plugin/network.json [new file with mode: 0644]
utils/coreutils/Makefile
utils/dbus/Makefile
utils/dosfstools/Makefile
utils/findutils/Makefile
utils/fish/Makefile
utils/fontconfig/Makefile
utils/gpsd/Makefile
utils/grep/Makefile
utils/gzip/Makefile
utils/joe/Makefile
utils/lcdproc/Makefile
utils/less/Makefile
utils/lm-sensors/Makefile
utils/logrotate/Makefile
utils/lvm2/Makefile
utils/mc/Makefile
utils/minicom/Makefile
utils/nano/Makefile
utils/ntfs-3g/Makefile
utils/owfs/Makefile
utils/pcsc-lite/Makefile
utils/qemu/Makefile
utils/screen/Makefile
utils/shadow/Makefile
utils/squashfs-tools/Makefile
utils/sysstat/Makefile
utils/tcsh/Makefile
utils/tmux/Makefile
utils/usbmuxd/Makefile
utils/wipe/Makefile [new file with mode: 0644]
utils/wipe/patches/001-ignore_git_version_hash_and_fix_release_version.patch [new file with mode: 0644]
utils/zoneinfo/Makefile
utils/zstd/Makefile

index d49f3e2b35867ada5f6a58c5d7a4e49f06fa78af..b7539ad2022d9279c62f17eb9a0723d78489adb4 100644 (file)
@@ -16,6 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_HASH:=af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf
 PKG_MAINTAINER:=Heinrich Schuchardt <xypron.glpk@gmx.de>
 PKG_LICENSE:=GPL-3.0-or-later
+PKG_CPE_ID:=cpe:/a:gnu:automake
 
 PKG_INSTALL:=1
 
index e2eef4889ec907d3ad490f97a45ea88ce233eb10..00f8e190de4564dd0f8b5e199c1c63ad4f2e5a9b 100644 (file)
@@ -31,6 +31,8 @@ PKG_INSTALL:=1
 PKG_FIXUP:=libtool
 PKG_BUILD_PARALLEL:=1
 
+PKG_CPE_ID:=cpe:/a:gnu:gcc
+
 ifeq ($(PKG_VERSION),7.3.0)
        PKG_HASH:=832ca6ae04636adbb430e865a1451adf6979ab44ca1c8374f61fba65645ce15c
 endif
index fcaf51388dd2cace72dd0dee66357a99da9a7736..c63fd951c6c5a425eccb8e484e5bc3c00dce5fe4 100644 (file)
@@ -16,6 +16,8 @@ PKG_SOURCE_URL:=@GNU/libtool
 PKG_HASH:=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f
 PKG_MAINTAINER:=Heinrich Schuchardt <xypron.glpk@gmx.de>
 PKG_LICENSE:=GPL-2.0-or-later
+PKG_CPE_ID:=cpe:/a:gnu:libtool
+
 PKG_BUILD_DIR = $(BUILD_DIR)/libtool-bin/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_INSTALL:=1
index 16dbb69d26a67c07d7aba65b6590cc2ecf169b02..69ca0fd55b555b91e4bbaf8a6067b3597059768d 100644 (file)
@@ -16,6 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_HASH:=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07
 PKG_MAINTAINER:=Heinrich Schuchardt <xypron.glpk@gmx.de>
 PKG_LICENSE:=GPL-3.0-or-later
+PKG_CPE_ID:=cpe:/a:gnu:m4
 
 PKG_INSTALL:=1
 
index 9de2bbbf73bcda9fb7adce724c7a3cc27b7513f6..946a2bcbfa85fff3b097d4825be9dbb6a61041f2 100644 (file)
@@ -16,6 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_HASH:=d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589
 PKG_MAINTAINER:=Heinrich Schuchardt <xypron.glpk@gmx.de>
 PKG_LICENSE:=GPL-3.0-or-later
+PKG_CPE_ID:=cpe:/a:gnu:make
 
 PKG_INSTALL:=1
 
diff --git a/devel/scons/Makefile b/devel/scons/Makefile
new file mode 100644 (file)
index 0000000..fa18487
--- /dev/null
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2011-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:=scons
+PKG_VERSION:=3.1.1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/scons \
+               https://fossies.org/linux/misc/
+PKG_HASH:=4cea417fdd7499a36f407923d03b4b7000b0f9e8fd7b31b316b9ce7eba9143a5
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+define Package/scons
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=scons
+  HIDDEN:=1
+endef
+
+define Package/scons/description
+  SCons is an Open Source software construction tool—that is, a
+  next-generation build tool. Think of SCons as an improved, cross-platform
+  substitute for the classic Make utility with integrated functionality
+  similar to autoconf/automake and compiler caches such as ccache. In short,
+  SCons is an easier, more reliable and faster way to build software.
+endef
+
+define Host/Configure
+endef
+
+define Host/Compile
+endef
+
+define Host/Install
+       ./files/pywrap.sh $(HOST_BUILD_DIR)/setup.py install --prefix=$(STAGING_DIR_HOST)
+       rm -f $(STAGING_DIR_HOST)/bin/scons*.py
+       for bin in $(STAGING_DIR_HOST)/bin/scons*; do \
+               mv "$$$$bin" "$$$$bin.py";                \
+               cp ./files/pywrap.sh "$$$$bin";           \
+       done
+endef
+
+$(eval $(call BuildPackage,scons))
+$(eval $(call HostBuild))
diff --git a/devel/scons/files/pywrap.sh b/devel/scons/files/pywrap.sh
new file mode 100755 (executable)
index 0000000..bb99029
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+case "${0##*/}" in
+       pywrap.sh) arg1="";;
+       *) arg1="$0.py" ;;
+esac
+
+for bin in python python3; do
+    case "$($bin -V 2>&1)" in
+        "Python 3"*) exec $bin $arg1 "$@" ;;
+    esac
+done
+
+echo "Unable to find a Python 3.x interpreter for executing ${arg1:+$arg1 }$* !" >&2
+exit 1
diff --git a/devel/scons/patches/001-platform_env.patch b/devel/scons/patches/001-platform_env.patch
new file mode 100644 (file)
index 0000000..2be3147
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/engine/SCons/Platform/__init__.py
++++ b/engine/SCons/Platform/__init__.py
+@@ -65,6 +65,8 @@ def platform_default():
+     care about the machine architecture.
+     """
+     osname = os.name
++    if 'PLATFORM' in os.environ:
++        return os.environ['PLATFORM']
+     if osname == 'java':
+         osname = os._osType
+     if osname == 'posix':
diff --git a/devel/scons/scons.mk b/devel/scons/scons.mk
new file mode 100644 (file)
index 0000000..2b76710
--- /dev/null
@@ -0,0 +1,23 @@
+export PLATFORM=posix
+
+SCONS_VARS = \
+       CC="$(TARGET_CC_NOCACHE)" \
+       CXX="$(TARGET_CXX_NOCACHE)" \
+       CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+       CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
+       CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+       LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
+       DESTDIR="$(PKG_INSTALL_DIR)"
+
+define Build/Configure/Default
+       (cd $(PKG_BUILD_DIR); \
+               $(SCONS_VARS) \
+               scons \
+                       prefix=/usr \
+                       $(SCONS_OPTIONS) \
+               install \
+       )
+endef
+
+define Build/Compile
+endef
index bc922f081a75aef76c30790f2aa6f4eb5a0a4eff..83c7a7091b2953e58ba6ced713c1030d3ecb5668 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=c7d247c0cad2d2e718eaca2e2dff051136a1347a92097abf19ebf65ea2870131
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE.txt
 PKG_MAINTAINER:=Arnaud Sautaux <arnaud.sautaux@infoteam.ch>
+PKG_CPE_ID:=cpe:/a:erlang:erlang
 
 PKG_BUILD_DEPENDS:=erlang/host openssl
 PKG_USE_MIPS16:=0
index f4ebef8e416e49b20eb6215644011f76bb61ef5d..b5d7699d5a925bda2fb304f63a9694598beec327 100644 (file)
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://matthewwild.co.uk/projects/luaexpat
 PKG_HASH:=d060397960d87b2c89cf490f330508b7def1a0677bdc120531c571609fc57dc3
 
+PKG_CPE_ID:=cpe:/a:matthewwild:luaexpat
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/luaexpat
index 82e1a48837e7d7ae9c32712d91d8e4e2bc527baa..b000bea7251b0c79257fac51ad1cffe9d7afe2f1 100644 (file)
@@ -17,6 +17,7 @@ PKG_HASH:=ec28c7e1d9e67c45eca197077f7cdc41ead1bb4c538c7f02a3296a4bb92f608b
 
 PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+PKG_CPE_ID:=cpe:/a:derrick_oswald:html-parser
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Parser-$(PKG_VERSION)
 
index af881d198ef519a719ed1ede597c8c94443738db..7c7dde21c51bd33ed9f8adf343ef2c67d85febb8 100644 (file)
@@ -27,6 +27,7 @@ PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_LICENSE_FILES:=Copying Artistic README
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>, \
                Philip Prindeville <philipp@redfish-solutions.com>
+PKG_CPE_ID:=cpe:/a:perl:perl
 
 # Build settings
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION)
index 3c51c7c21bdf6006532d9b5b1299fa66311842c5..175a3a5fa0c424895e0a91a30744273090c8276d 100644 (file)
@@ -8,21 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django
-PKG_VERSION:=1.11.17
-PKG_RELEASE=4
+PKG_VERSION:=1.11.24
+PKG_RELEASE:=1
 
 PKG_SOURCE:=Django-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/D/Django
-PKG_HASH:=a787ee66f4b4cf8ed753661cabcec603989677fa3a107fcb7f15511a44bdb483
-PKG_BUILD_DIR=$(BUILD_DIR)/Django-$(PKG_VERSION)
+PKG_HASH:=215c27453f775b6b1add83a185f76c2e2ab711d17786a6704bd62eabd93f89e3
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-django-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE LICENSE.python
 PKG_CPE_ID:=cpe:/a:djangoproject:django
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-django-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 include ../python-package.mk
 include ../python3-package.mk
index 5ee031944d39baadbdd29e98dadc536342c7bd60..acece86bb76f7b72fd017a47c36fd73abb5fd8ab 100644 (file)
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-certifi
-PKG_VERSION:=2019.6.16
+PKG_VERSION:=2019.9.11
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com>
@@ -15,7 +15,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE:=certifi-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/c/certifi
-PKG_HASH:=945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695
+PKG_HASH:=e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-certifi-$(PKG_VERSION)
 
index 65ba4fd08ba185bb03d3aeff5e3ca8ea09a0838c..4c96f39cd8df6cc12b33ce73e9611d38eefb8a42 100644 (file)
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-schema
-PKG_VERSION:=0.7.0
+PKG_VERSION:=0.7.1
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz>
 
 PKG_SOURCE_URL:=https://codeload.github.com/keleshev/schema/tar.gz/v$(PKG_VERSION)?
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=6c6da2154c0f63025127a1ecb3b2f07b95ec8dd029663fc74ab2e972bf770c72
+PKG_HASH:=0edc47b343450c116dd67267b6951b43916b2e6893e896da1eefb7a69ef7c83d
 PKG_BUILD_DIR:=$(BUILD_DIR)/schema-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
index 2f75f493dea9bc538c374aace5bf6be1b6785398..a4f310a42d0366c9f34f49d744e4a34f21667e6e 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=ad0cd2de2c87b9ba8086b43957a0de3eb2eb565c7159d5f53ccbba3feb915f4e
 PKG_LICENSE:=TCL
 PKG_LICENSE_FILES:=license.terms
 PKG_MAINTAINER:=Joe Mistachkin <joe@mistachkin.com>
+PKG_CPE_ID:=cpe:/a:tcl_tk:tcl_tk
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION)
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)$(PKG_VERSION)
index 2a4cd2a05ce9384e659a850b80133b9839e0ba70..b067359f8c7062be060538bfa868dbafa2948e7b 100644 (file)
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@APACHE/apr/
 PKG_HASH:=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
 PKG_LICENSE:=Apache License
+PKG_CPE_ID:=cpe:/a:apache:apr-util
 
 PKG_FIXUP:=autoreconf
 PKG_REMOVE_FILES:=aclocal.m4 build/ltmain.sh
index b79cb10fe297b71929e09ac99ee9dffd51b2687f..dc7fab029797950c9af6d307572657de353ddb6e 100644 (file)
@@ -22,6 +22,7 @@ PKG_HASH:=d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee
 PKG_MAINTAINER:=Carlos M. Ferreira <carlosmf.pt@gmail.com>
 PKG_LICENSE:=BSL-1.0
 PKG_LICENSE_FILES:=LICENSE_1_0.txt
+PKG_CPE_ID:=cpe:/a:boost:boost
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_SOURCE_VERSION)
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)_$(PKG_SOURCE_VERSION)
index 1e1b044b70c6a1c8c2135521869b5c7f621b535c..f9d58b3fdef787c85d954ea32462806c08dce011 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8
 PKG_MAINTAINER:=Dana H. Myers <k6jq@comcast.net>
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:gnu:classpath
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
index a806dac197f4b0a18b0f65d9766320827f67e8bb..b905f266431587958d112d02e73d8c9e978b5a76 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016-2018 Yousong Zhou <yszhou4tech@gmail.com>
+# Copyright (C) 2016-2019 Yousong Zhou <yszhou4tech@gmail.com>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dtc
-PKG_VERSION:=1.5.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.5.1
+PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=c672e443c9f7e39f5a7c8e602da6777f9ad55ad70de87de300a43828c8050172
+PKG_HASH:=660b74039690fc37013660544d09191834efb58503c73c555c5513ba75ab031f
 PKG_SOURCE_URL:=@KERNEL/software/utils/dtc
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=GPL
@@ -46,6 +46,7 @@ define Package/fdt-utils
   CATEGORY:=Utilities
   TITLE:=Flat Device Tree Utilities
   URL:=https://git.kernel.org/pub/scm/utils/dtc/dtc.git
+  DEPENDS:=+libfdt
 endef
 
 define Package/fdt-utils/install
@@ -80,6 +81,7 @@ MAKE_FLAGS += \
        NO_PYTHON=1 \
        NO_VALGRIND=1 \
        NO_YAML=1 \
+       EXTRA_CFLAGS=$(EXTRA_CFLAGS) \
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib
diff --git a/libs/dtc/patches/0001-use-cflags-from-build-system.patch b/libs/dtc/patches/0001-use-cflags-from-build-system.patch
deleted file mode 100644 (file)
index 15d47c5..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.orig    2019-03-15 03:55:48.407966162 +0000
-+++ b/Makefile 2019-03-15 03:56:01.320976021 +0000
-@@ -15,10 +15,10 @@ EXTRAVERSION =
- LOCAL_VERSION =
- CONFIG_LOCALVERSION =
--CPPFLAGS = -I libfdt -I .
-+CPPFLAGS += -I libfdt -I .
- WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
-       -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
--CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS)
-+CFLAGS += $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS)
- BISON = bison
- LEX = flex
diff --git a/libs/dtc/patches/0002-export-fdt_check_full-and-others.patch b/libs/dtc/patches/0002-export-fdt_check_full-and-others.patch
deleted file mode 100644 (file)
index bef8c10..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From eac2ad495b29f15d78daa2a7226653f36515cd7a Mon Sep 17 00:00:00 2001
-From: David Gibson <david@gibson.dropbear.id.au>
-Date: Mon, 25 Mar 2019 14:52:47 +1100
-Subject: [PATCH] Update version.lds again
-
-Yet again, we've added several functions to libfdt that were supposed
-to be exported, but forgotten to add them to the versio.lds script.
-This adds them.
-
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
----
- libfdt/version.lds | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libfdt/version.lds b/libfdt/version.lds
-index 9f5d708..a5fe62d 100644
---- a/libfdt/version.lds
-+++ b/libfdt/version.lds
-@@ -66,6 +66,10 @@ LIBFDT_1.2 {
-               fdt_resize;
-               fdt_overlay_apply;
-               fdt_get_string;
-+              fdt_get_max_phandle;
-+              fdt_check_full;
-+              fdt_setprop_placeholder;
-+              fdt_property_placeholder;
-       local:
-               *;
- };
index 77027b5be063efdfd71fb3c37b9fbb12d2914538..1f609b542bbec90c53366a7a8f4f5457f7e556cd 100644 (file)
@@ -13,6 +13,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/faac/faad2-src/$(PKG_NAME)-2.8.0
 PKG_HASH:=985c3fadb9789d2815e50f4ff714511c79c2710ac27a4aaaf5c0c2662141426d
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
+PKG_CPE_ID:=cpe:/a:audiocoding:faad2
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index 508599328953ca8cf7288defabd3015696dffe9b..8205edaba168e18de74c939d390918754b17fcbb 100644 (file)
@@ -23,6 +23,8 @@ HOST_BUILD_DEPENDS:=gettext-full/host libiconv/host libffi/host
 PKG_INSTALL:=1
 PKG_USE_MIPS16:=0
 
+PKG_CPE_ID:=cpe:/a:gnome:glib
+
 PKG_FIXUP:=autoreconf
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
index 1a6369ba4ca804ae3f48a39a2a25571c25c2fd1e..484e5c368a3905fb67657ff0a9ca5c756eebc4e1 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=
+PKG_CPE_ID:=cpe:/a:nlnetlabs:ldns
 
 PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
index 4c553199a1838f709aef11ae7034a63a278e4a27..6fff834e9ad295e84fbabdbcb66f59c8e0512c07 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=leptonica
 PKG_VERSION:=1.78.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.leptonica.org/source/
@@ -30,7 +30,7 @@ define Package/libleptonica
   CATEGORY:=Libraries
   TITLE:=A library for efficient image processing and image analysis operations
   URL:=http://www.leptonica.org/
-  DEPENDS:=+giflib +libjpeg +libpng +libtiff +zlib
+  DEPENDS:=+giflib +libjpeg +libpng +libtiff +libwebp +zlib
 endef
 
 TARGET_CFLAGS:=$(filter-out -O%,$(TARGET_CFLAGS)) -O3
index da319855fd4d3f3ab58bc787e091023c57cccc7c..ebe8f0a839f5a7aa199ca3d9d17da083339c1062 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8
 PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE.txt
+PKG_CPE_ID:=cpe:/a:apple:cups
 
 include $(INCLUDE_DIR)/package.mk
 
index badfc350f52ce8c7489ae77cdc1d76d37f4e1e25..d80ad7218586d5d2f822a635548971d7fc6638cd 100644 (file)
@@ -17,6 +17,7 @@ PKG_HASH:=16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a
 
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:libexif:libexif
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index 376e8a26e7ab99d069eac04ab48e70872ca212da..632dd86718ac61476b314501bd51e26b927c8438 100644 (file)
@@ -43,6 +43,12 @@ define Package/libfmt/description
   It can be used as a safe alternative to printf or as a fast alternative to IOStreams.
 endef
 
+define Build/InstallDev
+       $(call Build/InstallDev/cmake,$(1))
+       $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/fmt.pc
+       $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/fmt.pc
+endef
+
 define Package/libfmt/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfmt.so* $(1)/usr/lib/
index 706cb69afad0430945290a06f15da4c363e8063c..8f90440794e6d418cd7f1c8c659718198be55ec6 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libftdi1
 PKG_VERSION:=1.4
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.intra2net.com/en/developer/libftdi/download/
@@ -62,8 +62,15 @@ endef
 CMAKE_OPTIONS += \
        -DBoost_NO_BOOST_CMAKE=ON \
        -DBUILD_TESTS=OFF \
-       -DEXAMPLES=OFF \
-       -DFTDI_EEPROM=OFF
+       -DEXAMPLES=OFF
+
+define Build/InstallDev
+       $(call Build/InstallDev/cmake,$(1))
+       $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libftdi1.pc
+       $(SED) 's,/usr/lib,$$$${prefix}/lib,g' $(1)/usr/lib/pkgconfig/libftdi1.pc
+       $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libftdipp1.pc
+       $(SED) 's,/usr/lib,$$$${prefix}/lib,g' $(1)/usr/lib/pkgconfig/libftdipp1.pc
+endef
 
 define Package/libftdi1/install
        $(INSTALL_DIR) $(1)/usr/bin
index 2bd12b7ef418a64b9985ccd4b2ff2bb2236d6386..e298e9fc4bd3f0aed2a41aed47ec63f5d7af1c52 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=8c302ccbf467faec732f0741a859eef4ecae22fea2d2ab87467be940842bde51
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:libgd:gd_graphics_library
 
 CMAKE_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
index 78a1988edea395c42207d2b26dabc1bd6ef21254..79e44e670ebd5ebf94dfa077ff73d61b75f4333f 100644 (file)
@@ -14,9 +14,11 @@ new file mode 100644
 index 00000000..fb828882
 --- /dev/null
 +++ b/config/gdlib.pc.cmake
-@@ -0,0 +1,9 @@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+@@ -0,0 +1,11 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=@CMAKE_INSTALL_PREFIX@
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 +
 +Name: gd
 +Description: GD graphics library
index ce393cdb4a3199b4de68e1cb3bd4c4a5391bab88..5b43ede8f150e1b2281d28f4f20071552dca4690 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgpiod
-PKG_VERSION:=1.4
+PKG_VERSION:=1.4.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/libs/libgpiod/
-PKG_HASH:=ebde83aaf14be3abd33e7a90faa487a2ee231e242897afe7fdefb765386b3c8b
+PKG_HASH:=21ae8fd1f8dafc2eb2ba50e652390cf533d21351419a7426255895cb52e21b1c
 
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING
@@ -67,7 +67,7 @@ endef
 
 define Package/libgpiod/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpiod.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpiod.so.* $(1)/usr/lib/
 endef
 
 define Package/gpiod-tools/install
index 9c104965569a450c2b6034b6fa87f6b6c44a31f8..e51000c278b89d02b29d1dd2f577000e52be010c 100644 (file)
@@ -18,6 +18,7 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
 PKG_LICENSE:=GPL-2
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:media-libs:libid3tag
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index f3559f37e7111d49436ada8e39ce4018cd47ad57..b1260936a29e27f073f9df80d8389b5306e48851 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiio
-PKG_VERSION:=0.16
+PKG_VERSION:=0.18
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/analogdevicesinc/libiio/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=5eb3ec24342eb01c49235a1d8a053462f930835a3002e687371b680a9bb150f6
+PKG_HASH:=bc2c5299974b65cfe9aa4a06d8c74d7651594e026bce416db48a2c5aa7ba2554
 
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=COPYING.txt
@@ -133,7 +133,7 @@ endef
 
 define Package/libiio/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiio.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiio.so.* $(1)/usr/lib/
 endef
 
 define Package/iiod/install
index e6c4d61d6768d7b63f0649f04e9ddff8972f4dab..6f3383825aedfea17335c3ee99d9ce7cad13b621 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=liblz4
-PKG_VERSION:=1.9.1
-PKG_RELEASE:=2
+PKG_VERSION:=1.9.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/lz4/lz4/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=f8377c89dad5c9f266edc0be9b73595296ecafd5bfa1000de148096c50052dc4
+PKG_HASH:=658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc
 PKG_BUILD_DIR:=$(BUILD_DIR)/lz4-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Darik Horn <dajhorn@vanadac.com>
index b18f8735c0b33fbfb2e7a7b99a7fcf496b217248..a160620ce67244a1cc98cf92f56e2e201bb6d202 100644 (file)
@@ -15,6 +15,7 @@ PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 
 PKG_LICENSE:=LGPLv2.1
 PKG_LICENSE_FILES:=COPYING.LIB
+PKG_CPE_ID:=cpe:/a:mcrypt:libmcrypt
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/mcrypt
index fa24a5c731f8bf52bc1ad6d4d9ee1477a1d10957..49000a632218a4b33bc55600ad189c0c517fbde1 100644 (file)
@@ -16,6 +16,7 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
 PKG_LICENSE:=LGPLv2.1
 PKG_LICENSE_FILES:=COPYING.LIB
+PKG_CPE_ID:=cpe:/a:libmms_project:libmms
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index c1dddb5ff96ed75d189977e0c02eb8fd1915c2b2..4ae5bb53aab24cb44b2268faaa2927a7962ef5c6 100644 (file)
@@ -8,17 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmodbus
-PKG_VERSION:=3.1.4
-PKG_RELEASE:=3
+PKG_VERSION:=3.1.6
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://libmodbus.org/releases
-PKG_HASH:=c8c862b0e9a7ba699a49bc98f62bdffdfafd53a5716c0e162696b4bf108d3637
+PKG_HASH:=d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16
 
 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 
-PKG_LICENSE:=GPL-3.0-or-later LGPL-2.1-or-later
-PKG_LICENSE_FILES:=COPYING COPYING.LESSER
+PKG_LICENSE:=LGPL-2.1-or-later
+PKG_LICENSE_FILES:=COPYING.LESSER
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
@@ -50,7 +50,7 @@ endef
 
 define Package/libmodbus/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmodbus.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmodbus.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libmodbus))
diff --git a/libs/libmodbus/patches/0001-Fixed-MODBUS_GET_-macros-in-case-of-negative-values.patch b/libs/libmodbus/patches/0001-Fixed-MODBUS_GET_-macros-in-case-of-negative-values.patch
new file mode 100644 (file)
index 0000000..1ce28ff
--- /dev/null
@@ -0,0 +1,35 @@
+From f1eb4bc7ccb09cd8d19ab641ee37637f8c34d16d Mon Sep 17 00:00:00 2001
+From: i-ky <gl.ivanovsky@gmail.com>
+Date: Tue, 10 Jul 2018 15:58:45 +0300
+Subject: [PATCH] Fixed MODBUS_GET_* macros in case of negative values
+
+In case resulting value should be negative it is incorrect to use '+' operator to construct it from pieces, because highest bytes will result in negative number after bitwise shift while others will stay positive. Replacing addition with '|' should solve the issue.
+---
+ src/modbus.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/modbus.h b/src/modbus.h
+index f6e9a5f..c63f5ce 100644
+--- a/src/modbus.h
++++ b/src/modbus.h
+@@ -245,12 +245,12 @@ MODBUS_API int modbus_reply_exception(modbus_t *ctx, const uint8_t *req,
+ #define MODBUS_GET_HIGH_BYTE(data) (((data) >> 8) & 0xFF)
+ #define MODBUS_GET_LOW_BYTE(data) ((data) & 0xFF)
+ #define MODBUS_GET_INT64_FROM_INT16(tab_int16, index) \
+-    (((int64_t)tab_int16[(index)    ] << 48) + \
+-     ((int64_t)tab_int16[(index) + 1] << 32) + \
+-     ((int64_t)tab_int16[(index) + 2] << 16) + \
++    (((int64_t)tab_int16[(index)    ] << 48) | \
++     ((int64_t)tab_int16[(index) + 1] << 32) | \
++     ((int64_t)tab_int16[(index) + 2] << 16) | \
+       (int64_t)tab_int16[(index) + 3])
+-#define MODBUS_GET_INT32_FROM_INT16(tab_int16, index) ((tab_int16[(index)] << 16) + tab_int16[(index) + 1])
+-#define MODBUS_GET_INT16_FROM_INT8(tab_int8, index) ((tab_int8[(index)] << 8) + tab_int8[(index) + 1])
++#define MODBUS_GET_INT32_FROM_INT16(tab_int16, index) ((tab_int16[(index)] << 16) | tab_int16[(index) + 1])
++#define MODBUS_GET_INT16_FROM_INT8(tab_int8, index) ((tab_int8[(index)] << 8) | tab_int8[(index) + 1])
+ #define MODBUS_SET_INT16_TO_INT8(tab_int8, index, value) \
+     do { \
+         tab_int8[(index)] = (value) >> 8;  \
+-- 
+2.17.1
+
diff --git a/libs/libmodbus/patches/0001-Only-set-SER_RS485_ENABLED-bit-of-existing-RS485-set.patch b/libs/libmodbus/patches/0001-Only-set-SER_RS485_ENABLED-bit-of-existing-RS485-set.patch
deleted file mode 100644 (file)
index d24ef27..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1c5d969f46ccd5333f602dfbe2b0a1295650b9b0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
-Date: Wed, 25 Oct 2017 20:35:47 +0200
-Subject: [PATCH 1/2] Only set SER_RS485_ENABLED bit of existing RS485 settings
-
-Thanks to @JCWren
----
- src/modbus-rtu.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/modbus-rtu.c b/src/modbus-rtu.c
-index 8d9f386..f2911d6 100644
---- a/src/modbus-rtu.c
-+++ b/src/modbus-rtu.c
-@@ -909,9 +909,13 @@ int modbus_rtu_set_serial_mode(modbus_t *ctx, int mode)
- #if HAVE_DECL_TIOCSRS485
-         modbus_rtu_t *ctx_rtu = ctx->backend_data;
-         struct serial_rs485 rs485conf;
--        memset(&rs485conf, 0x0, sizeof(struct serial_rs485));
-         if (mode == MODBUS_RTU_RS485) {
-+            // Get
-+            if (ioctl(ctx->s, TIOCGRS485, &rs485conf) < 0) {
-+                return -1;
-+            }
-+            // Set
-             rs485conf.flags = SER_RS485_ENABLED;
-             if (ioctl(ctx->s, TIOCSRS485, &rs485conf) < 0) {
-                 return -1;
-@@ -923,6 +927,10 @@ int modbus_rtu_set_serial_mode(modbus_t *ctx, int mode)
-             /* Turn off RS485 mode only if required */
-             if (ctx_rtu->serial_mode == MODBUS_RTU_RS485) {
-                 /* The ioctl call is avoided because it can fail on some RS232 ports */
-+                if (ioctl(ctx->s, TIOCGRS485, &rs485conf) < 0) {
-+                    return -1;
-+                }
-+                rs485conf.flags &= ~SER_RS485_ENABLED;
-                 if (ioctl(ctx->s, TIOCSRS485, &rs485conf) < 0) {
-                     return -1;
-                 }
--- 
-2.21.0
-
diff --git a/libs/libmodbus/patches/0002-Oops-fix-OR-on-RS485-settings-1c5d969.patch b/libs/libmodbus/patches/0002-Oops-fix-OR-on-RS485-settings-1c5d969.patch
deleted file mode 100644 (file)
index 3742457..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From 91a1d74f76c64e7b35bfb10114e1a4a6ff351656 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
-Date: Thu, 26 Oct 2017 11:10:31 +0200
-Subject: [PATCH 2/2] Oops fix OR on RS485 settings (1c5d969)
-
----
- src/modbus-rtu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modbus-rtu.c b/src/modbus-rtu.c
-index f2911d6..190298e 100644
---- a/src/modbus-rtu.c
-+++ b/src/modbus-rtu.c
-@@ -916,7 +916,7 @@ int modbus_rtu_set_serial_mode(modbus_t *ctx, int mode)
-                 return -1;
-             }
-             // Set
--            rs485conf.flags = SER_RS485_ENABLED;
-+            rs485conf.flags |= SER_RS485_ENABLED;
-             if (ioctl(ctx->s, TIOCSRS485, &rs485conf) < 0) {
-                 return -1;
-             }
--- 
-2.21.0
-
index cc363e0515389fe1de949fb6c0ae8554dee4f2f5..91dfe8e1c3296a1c0d66d08298c8d3d81ff4cc69 100644 (file)
@@ -8,20 +8,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libogg
-PKG_VERSION:=1.3.3
+PKG_VERSION:=1.3.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://downloads.xiph.org/releases/ogg/
-PKG_HASH:=4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
+PKG_HASH:=c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe
 
+PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
 
 PKG_FIXUP:=autoreconf
-
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -29,7 +29,8 @@ define Package/libogg
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=libogg
-  URL:=http://xiph.org/ogg/
+  URL:=https://xiph.org/ogg/
+  ABI_VERSION:=0
 endef
 
 define Package/libogg/description
@@ -40,6 +41,8 @@ possible, as well as mixing several sepearate, concurrent media
 streams into a single physical bitstream.
 endef
 
+TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
+
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/ogg/
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/ogg/* $(1)/usr/include/ogg/
@@ -53,7 +56,7 @@ endef
 
 define Package/libogg/install
        $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libogg.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libogg))
index e34b93a18d4cf30f28fa4aea230e0d22dc98fc6b..ae0dba8e002fe28ba77d014f1c21ab9493431767 100644 (file)
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=librsocket-cpp
-PKG_SOURCE_DATE:=2019-06-11
-PKG_SOURCE_VERSION:=741f817fd519e0610cddb5783aae812355e19435
+PKG_SOURCE_DATE:=2019-09-12
+PKG_SOURCE_VERSION:=9226988e3da89eff8cd55952ccae61fcac0881fa
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/rsocket/rsocket-cpp/tar.gz/$(PKG_SOURCE_VERSION)?
-PKG_HASH:=56886deba0f3594b4a430b1f515c90a138800b8e387440e6b8bf728d660f457a
+PKG_HASH:=3273012c1ffa149fddfac2b547315834e9a02ff0d8d1357196fec95391150ed6
 PKG_BUILD_DIR:=$(BUILD_DIR)/rsocket-cpp-$(PKG_SOURCE_VERSION)
 
 PKG_MAINTAINER:=Amol Bhave <ambhave@fb.com>
@@ -22,42 +22,31 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/librsocket-cpp
-       SECTION:=libs
-       CATEGORY:=Libraries
-       TITLE:=C++ implementation of RSocket
-       DEPENDS:=+libyarpl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=C++ implementation of RSocket
+  DEPENDS:=+libyarpl
 endef
 
 define Package/libyarpl
-       SECTION:=libs
-       CATEGORY:=Libraries
-       TITLE:=yarpl: Yet Another Reactive Programming Library
-       DEPENDS:=+libfolly
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=yarpl: Yet Another Reactive Programming Library
+  DEPENDS:=+libfolly
 endef
 
 define Package/librsocket-cpp/description
-       C++ implementation of RSocket, and Application protocol providing Reactive Streams semantics
+  C++ implementation of RSocket, and Application protocol providing Reactive Streams semantics
 endef
 
 define Package/libyarpl/description
-       C++ implementation of reactive functional programming including both Observable and Flowable types.
+  C++ implementation of reactive functional programming including both Observable and Flowable types.
 endef
 
 CMAKE_OPTIONS += \
        -DBUILD_BENCHMARKS=OFF \
        -DBUILD_EXAMPLES=OFF \
-       -DBUILD_TESTS=OFF \
-       -DBUILD_SHARED_LIBS=ON
-
-define Package/librsocket-cpp/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libReactiveSocket.so* $(1)/usr/lib/
-endef
-
-define Package/libyarpl/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libyarpl*.so* $(1)/usr/lib/
-endef
+       -DBUILD_TESTS=OFF
 
 $(eval $(call BuildPackage,librsocket-cpp))
 $(eval $(call BuildPackage,libyarpl))
index c9f33876fc77dcf493f9394348f37169f2f5b8c1..a65154e58693c72e567a0504c974b5113aee9d55 100644 (file)
@@ -1,4 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -67,7 +67,6 @@
index 21a8fa14d18311af29fcdb1aa9e1d80b7fc2e3f2..8790fdff255e43e587468fa81f52163b4b2b1573 100644 (file)
@@ -17,6 +17,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=LGPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:libshout:libshout
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index cae33e3da9a76abd991b6f3cf0daef9f8275d65b..41cbf92bc0f3e50c6db3d54906ca9ce73d41bc8d 100644 (file)
@@ -18,6 +18,7 @@ PKG_MIRROR_HASH:=9b3beef70003456ff297ce50ecd5cb1d066ca98f10f6363562431d773b3fcb3
 
 PKG_LICENSE:=LGPLv2.1
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:libsndfile_project:libsndfile
 
 PKG_INSTALL:=1
 
index 69dffc7de687b17435028c4b75b299755a4fa7d5..07ada61484fea28082625a2bd275543eed8bb5ff 100644 (file)
@@ -20,6 +20,7 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
 
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENCE
+PKG_CPE_ID:=cpe:/a:sox:sox
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
index 992f16bae015cab0ad10a5e4c2baf49e0c32a79d..01347bfb067eb9567dcb9172b1d7a0cc7f5f523e 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08
 PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING.LIB
+PKG_CPE_ID:=cpe:/a:gnu:libtasn1
 
 #PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index 407a717c6090ab4a8a7357163d9a1dfe5858565b..799f19f5e98e4cd01458c9cef76c85e9fa9fd315 100644 (file)
@@ -8,6 +8,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/pupnp
 PKG_HASH:=188d3f786d92fe14191f17634d2d87847eee7d2b568a5257ea23262fec9973d6
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
+PKG_CPE_ID:=cpe:/a:portable_sdk_for_upnp_project:portable_sdk_for_upnp
 
 PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
index 16e966b34d3ed806f58bda3e025d8563ef4c9de5..80c8b678862c0d6ad40ddf9bbc2007eeac55c138 100644 (file)
@@ -8,31 +8,33 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libuv
-PKG_VERSION:=1.29.1
+PKG_VERSION:=1.32.0
 PKG_RELEASE:=1
 
-PKG_LICENSE_FILES:=LICENSE
-
-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:=1486043da5ccaf86d451a5fe93920c5b66770b132d92b6d0a15d636346ca570c
-
+PKG_HASH:=203927683d53d1b82eee766c8ffecfa8ed0e392679c15d5ad3a23504eda0ed1f
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
 
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
+PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:libuv_project:libuv
+
+CMAKE_INSTALL:=1
+CMAKE_BINARY_SUBDIR:=out/cmake
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/libuv
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Cross-platform asychronous I/O library
-  URL:=https://github.com/libuv/libuv
+  URL:=https://libuv.org/
   DEPENDS:=+libpthread +librt
+  ABI_VERSION:=1
 endef
 
 define Package/libuv/description
@@ -41,36 +43,17 @@ define Package/libuv/description
  pyuv, and others.
 endef
 
-define Build/Configure
-       ( cd $(PKG_BUILD_DIR); ./autogen.sh )
-       $(call Build/Configure/Default)
-endef
+CMAKE_OPTIONS += -DBUILD_TESTING=OFF
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include/
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/include/* \
-               $(1)/usr/include/
-
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libuv.so* \
-               $(1)/usr/lib/
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libuv.a \
-               $(1)/usr/lib/
-
-       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libuv.pc \
-               $(1)/usr/lib/pkgconfig/
+       $(call Build/InstallDev/cmake,$(1))
+       $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libuv.pc
+       $(SED) 's,/usr/lib,$$$${prefix}/lib,g' $(1)/usr/lib/pkgconfig/libuv.pc
 endef
 
 define Package/libuv/install
        $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libuv.so* \
-               $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuv.so* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libuv))
index 95c85598be3bc80d5a81f94a3b12612be6e39381..d755506b0087b601126f2fa145b36ef53993afbb 100644 (file)
@@ -16,6 +16,7 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:xiph.org:libvorbis
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index 65be717d6319d428b0d0bb89f59c6dfbf53b0c71..a482818fd4c3693af7695dbee846d6c9f609ad80 100644 (file)
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://web.archive.org/web/20170923042221/http://webdav.org:80/neon/
 PKG_HASH:=db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
 
+PKG_CPE_ID:=cpe:/a:webdav:neon
+
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
index d7db725ce4417e1a6d5f11f1e9ecd9f7b1bf1a98..a25c3d0bebf3af24f81178a60dca3cf8e901fb88 100644 (file)
@@ -8,17 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openldap
-PKG_VERSION:=2.4.47
-PKG_RELEASE:=3
+PKG_VERSION:=2.4.48
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=https://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/ \
        http://mirror.eu.oneandone.net/software/openldap/openldap-release/ \
        http://mirror.switch.ch/ftp/software/mirror/OpenLDAP/openldap-release/ \
        https://www.openldap.org/software/download/OpenLDAP/openldap-release/
-PKG_HASH:=f54c5877865233d9ada77c60c0f69b3e0bfd8b1b55889504c650047cc305520b
+PKG_HASH:=d9523ffcab5cd14b709fcf3cb4d04e8bc76bb8970113255f372bc74954c6074d
 PKG_LICENSE:=OLDAP-2.8
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:openldap:openldap
 
 PKG_FIXUP:=autoreconf
 
index ef48b76a9ef8be4df5a548e9047d3b332e886345..e829f0e6a93e17aa614e89ad6757c77fd43f2ec8 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=p11-kit
-PKG_VERSION:=0.23.16.1
-PKG_RELEASE:=2
+PKG_VERSION:=0.23.17
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/p11-glue/p11-kit/releases/download/$(PKG_VERSION)
-PKG_HASH:=4b34e92ae36fa493e0d94366c767f06d5f9951e3d8581d10fd935d738db1574d
+PKG_HASH:=5447b25d66c05f86cce5bc8856f7a074be84c186730e32c74069ca03386d7c1e
 
 PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/libs/p11-kit/patches/010-uclibc.patch b/libs/p11-kit/patches/010-uclibc.patch
deleted file mode 100644 (file)
index 642fdb4..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/common/compat.c
-+++ b/common/compat.c
-@@ -97,8 +97,12 @@
- #include <unistd.h>
- #if defined (HAVE_PROGRAM_INVOCATION_SHORT_NAME) && !HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
-+#ifdef __UCLIBC__
-+extern const char *program_invocation_short_name;
-+#else
- extern char *program_invocation_short_name;
- #endif
-+#endif
- #if defined (HAVE___PROGNAME) && !HAVE_DECL___PROGNAME
- extern char *__progname;
index 3dd7c728ee9c44aad2a04932d351ffb83375c1bf..720142332b2fbe68e085f450db3e433548cab620 100644 (file)
@@ -18,6 +18,7 @@ PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENCE
+PKG_CPE_ID:=cpe:/a:pcre:pcre
 
 PKG_FIXUP:=autoreconf
 
index fbc81c6ea842fd3bf46ea63584e6f934269be870..3c84903051b6d14827462dd173f188c63c8c8fbf 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=f29e89cc5de813f45786580101aaee3984a65818631d4ddbda7b32f699b87c2e
 PKG_MAINTAINER:=Shane Peelar <lookatyouhacker@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENCE
+PKG_CPE_ID:=cpe:/a:pcre:pcre
 
 PKG_FIXUP:=autoreconf
 
index 8d294fa74e37f802f3c8416a0852a721d529aa29..810f59c5504849b644c829f245e2ef9ac2649004 100644 (file)
@@ -9,6 +9,7 @@ PKG_VERSION:=11.3
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=PostgreSQL
+PKG_CPE_ID:=cpe:/a:postgresql:postgresql
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=\
index 49d6d74f1946a1d872c2dacfa217ea601311f831..fb2d84fddd8851b51bc5f6260797f64758e5dd95 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=protobuf
 PKG_VERSION:=3.8.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION)
@@ -19,12 +19,14 @@ PKG_MAINTAINER:=Ken Keys <kkeys@caida.org>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=protobuf/host
+HOST_BUILD_PARALLEL:=1
 PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
+CMAKE_INSTALL:=1
+CMAKE_SOURCE_SUBDIR:=cmake
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/protobuf/Default
   SECTION:=libs
@@ -64,20 +66,24 @@ This package provides the libprotobuf-lite library.
 
 endef
 
-CONFIGURE_ARGS += --with-protoc=$(STAGING_DIR_HOSTPKG)/bin/protoc
+CMAKE_HOST_OPTIONS += \
+       -Dprotobuf_BUILD_PROTOC_BINARIES=ON \
+       -Dprotobuf_BUILD_TESTS=OFF
 
-define Build/InstallDev
-       $(INSTALL_DIR) \
-               $(1)/usr/lib \
-               $(1)/usr/include
+CMAKE_OPTIONS += \
+       -Dprotobuf_BUILD_PROTOC_BINARIES=ON \
+       -Dprotobuf_BUILD_TESTS=OFF \
+       -Dprotobuf_WITH_ZLIB=ON \
+       -DBUILD_SHARED_LIBS=ON
 
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/include/* \
-               $(1)/usr/include/
+TARGET_LDFLAGS += -latomic
 
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/* \
-               $(1)/usr/lib/
+define Build/InstallDev
+       $(call Build/InstallDev/cmake,$(1))
+       $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/protobuf.pc
+       $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/protobuf.pc
+       $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/protobuf-lite.pc
+       $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/protobuf-lite.pc
 endef
 
 define Package/protobuf-lite/install
index 01538ebe1804c3f58754d0bb768ebf5b5331576d..63180ff4d75fff97f66ab8aed4005779a495d5f3 100644 (file)
@@ -18,6 +18,8 @@ PKG_HASH:=eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
+PKG_CPE_ID:=cpe:/a:xiph:speex
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libspeex
index ee07d6e85946a928565dbf872cb372d838aa6b28..95dc1cde727ecf1d6ac7b80b97d4bc890636db21 100644 (file)
@@ -6,16 +6,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vips
-PKG_VERSION:=8.7.4
-PKG_RELEASE:=3
+PKG_VERSION:=8.8.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/libvips/libvips/releases/download/v$(PKG_VERSION)
-PKG_HASH:=ce7518a8f31b1d29a09b3d7c88e9852a5a2dcb3ee1501524ab477e433383f205
+PKG_HASH:=aba3f97d60c344c5d40ffcec524460e378dab939f873ec5d155bbc510a4fbd5d
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:vips:vips
 
 PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
index d921dae47425431aec23f3611bfd8342f86584f0..265d424839f2a1d58df94b002ce1dc2b5d8c9343 100644 (file)
@@ -13,6 +13,7 @@ PKG_RELEASE:=5
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:bogofilter:bogofilter
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/bogofilter
index ca4ada6258eed173070c7a7b3d60bc6990ca24a4..21ff060191cc92db648dc0448eec257c1d2aacb0 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=666ce084760a47e601d49a9be3c7993c48789d332631e8dfb45f443b367b1260
 PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
 PKG_LICENSE:=LGPL-2.1-only MIT BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING COPYING.LGPL COPYING.MIT
+PKG_CPE_ID:=cpe:/a:dovecot:dovecot
 
 PKG_BUILD_DEPENDS:=libiconv
 PKG_CONFIG_DEPENDS:= \
index 74445114c44a782b4252f8daac867fb88371597d..09a4ac00d06fa39d45277c793d32003acc4791c6 100644 (file)
@@ -19,6 +19,7 @@ PKG_HASH:=01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c
 PKG_MAINTAINER:=Phil Eichinger <phil@zankapfel.net>
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=GPL
+PKG_CPE_ID:=cpe:/a:mutt:mutt
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index d28479aa321d3cf9981e3d6edc8b063015921a1c..518da6f5811c41e699b795c6f5e610f740cbda68 100644 (file)
@@ -20,6 +20,7 @@ PKG_SOURCE_URL:=https://pigeonhole.dovecot.org/releases/$(DOVECOT_VERSION)
 PKG_HASH:=cbaa106e1c2b23824420efdd6a9f8572c64c8dccf75a3101a899b6ddb25149a5
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=COPYING COPYING.LGPL
+PKG_CPE_ID:=cpe:/a:dovecot:pigeonhole
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/dovecot-$(DOVECOT_VERSION)-pigeonhole-$(PKG_VERSION_PLUGIN)
 PKG_INSTALL:=1
index 0db3271ccb51927822469d84717944ab99a9efa4..82d7677c9b2efc22ae9f0b4d8afb2003fa254a05 100644 (file)
@@ -19,6 +19,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
 PKG_LICENSE:=IPL-1.0
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:postfix:postfix
+
 PKG_BUILD_DEPENDS:=POSTFIX_CDB:tinycdb
 PKG_CONFIG_DEPENDS:= \
        CONFIG_POSTFIX_TLS \
index c93b728b59eeef726b3a2164d9e205fa48719be2..512de95aa0dac8cab21cc025511e56a0ab7891ff 100644 (file)
@@ -19,6 +19,7 @@ PKG_MAINTAINER:=Val Kulkov <val.kulkov@gmail.com>
 
 PKG_LICENSE:=Sendmail
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:sendmail:sendmail
 
 PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=openssl
index 3010132e5be3c7adc51dcc10f0b317e4e8f8ccfc..0b430cb24771b51bc1593626cffa2516e515fb49 100644 (file)
@@ -12,6 +12,7 @@ PKG_VERSION:=2.64
 PKG_RELEASE:=7
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 PKG_LICENSE:=GPL-2.0-or-later
+PKG_CPE_ID:=cpe:/a:ssmtp:ssmtp
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.bz2
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/s/ssmtp
index 69b3e16c518301a847e21adb5fca90f94d13e4d6..6bb185f0547a62bbcae44b3a240b080143aeeacf 100644 (file)
@@ -16,6 +16,7 @@ PKG_HASH:=d18aaca2d79a10270d49ad1aaa01dce24752f7548880138d59874a78ac62e11f
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=Copyright.txt
 PKG_MAINTAINER:=Val Kulkov <val.kulkov@gmail.com>
+PKG_CPE_ID:=cpe:/a:graphicsmagick:graphicsmagick
 
 PKG_BUILD_PARALLEL:=1
 DISABLE_NLS:=
index d67006e086562b40167560f63afdb79e3867084e..c797e2c44394259a3f1ccf3505aab94c9b34b468 100644 (file)
@@ -16,6 +16,7 @@ PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
 
 PKG_LICENSE:=LGPLv2 GPLv2
 PKG_LICENSE_FILES:=COPYING.LIB COPYING
+PKG_CPE_ID:=cpe:/a:gstreamer:gst-plugins-base
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION)
 PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz
index 0971ffa9ca48c5da707227eaefa8957c459c75bc..2c0a718a6641a36bf56bea122ce7dee64503bead 100644 (file)
@@ -16,6 +16,7 @@ PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
 
 PKG_LICENSE:=LGPLv2
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:gstreamer:good_plug-ins
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION)
 PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz
index f693ec36de5b03743b65be3417350d1d7758fa8a..0e149074074c79bc956f42f88bff5df3eb669750 100644 (file)
@@ -16,6 +16,7 @@ PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
 
 PKG_LICENSE:=LGPLv2
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:gstreamer_project:gstreamer
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION)
 PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz
index 3f161683e9b51130e0a8ae8eda29f235204e26f5..178745d7eb5a18ad5a6d134f2ab8d45f90f39b8b 100644 (file)
@@ -9,20 +9,20 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lcdgrilo
 PKG_VERSION:=0.0.12
-PKG_RELEASE:=2
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.flyn.org/projects/lcdgrilo
 PKG_HASH:=2e5028fff7a90b1a3688c466f048e978a52d9a4da20a382546d5e5bd42e2fc6a
-PKG_BUILD_DEPENDS:=vala/host
 
-PKG_INSTALL:=1
+PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_LICENSE_FILES:=COPYING
+
 PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_BUILD_DEPENDS:=vala/host
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
@@ -32,7 +32,7 @@ define Package/lcdgrilo
   CATEGORY:=Multimedia
   DEPENDS:=+grilo +grilo-plugins +libgee +libgstreamer1
   TITLE:=lcdgrilo
-  URL:=http://www.flyn.org/projects/lcdgrilo/
+  URL:=https://www.flyn.org/projects/lcdgrilo/
 endef
 
 define Package/lcdgrilo/decription
diff --git a/multimedia/lcdgrilo/patches/020-vala.patch b/multimedia/lcdgrilo/patches/020-vala.patch
new file mode 100644 (file)
index 0000000..c35e227
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/src/lcdgrilo.vala
++++ b/src/lcdgrilo.vala
+@@ -47,7 +47,7 @@ private class LCDPlayer {
+       private int current = 0;
+       private Transitions transitions;
+       private MainLoop loop;
+-      private Gee.ArrayList<Grl.Source> sources = new Gee.ArrayList<unowned Grl.Source> ();
++      private Gee.ArrayList<weak Grl.Source> sources = new Gee.ArrayList<unowned Grl.Source> ();
+       private uint watch_id = 0;
+       public LCDPlayer () {
diff --git a/multimedia/mjpg-streamer/Config.in b/multimedia/mjpg-streamer/Config.in
deleted file mode 100644 (file)
index 08eea1d..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-
-if PACKAGE_mjpg-streamer
-
-config MJPG_STREAMER_V4L2
-       bool "Build input_uvc with libv4l2 (camera controls)"
-       default n
-       select PACKAGE_libv4l
-
-config MJPG_STREAMER_INPUT_FILE
-       bool "Install input file plugin"
-       default n
-
-config MJPG_STREAMER_INPUT_UVC
-       bool "Install input uvc plugin"
-       default y
-
-config MJPG_STREAMER_INPUT_HTTP
-       bool "Install input HTTP plugin"
-       default n
-
-config MJPG_STREAMER_OUTPUT_RTSP
-       bool "Install output RTSP plugin"
-       default n
-
-config MJPG_STREAMER_OUTPUT_UDP
-       bool "Install output UDP plugin"
-       default n
-
-config MJPG_STREAMER_OUTPUT_FILE
-       bool "Install output file plugin"
-       default n
-
-config MJPG_STREAMER_OUTPUT_HTTP
-       bool "Install output HTTP plugin"
-       default y
-
-config MJPG_STREAMER_WWW
-       bool "Install complete Web UI files (includes cambozola)"
-       default n
-
-endif
index dad986f33c7a4bedcc2d746c5d163e1ac397ab1f..921d4368802143bd9ac7937707369e70fb90826c 100644 (file)
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mjpg-streamer
 PKG_VERSION:=2018-10-25
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>, \
                Ted Hess <thess@kitschensync.net>
 
@@ -24,7 +24,7 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-PKG_BUILD_DEPENDS:=MJPG_STREAMER_V4L2:libv4l
+PKG_BUILD_DEPENDS:=MJPG_STREAMER_V4L2:libv4l zmq protobuf-c
 
 define Package/mjpg-streamer
   SECTION:=multimedia
@@ -32,21 +32,151 @@ define Package/mjpg-streamer
   TITLE:=MJPG-streamer
   DEPENDS:=+libpthread +libjpeg +MJPG_STREAMER_V4L2:libv4l
   URL:=https://github.com/jacksonliam/mjpg-streamer
-  MENU:=1
 endef
 
-define Package/mjpg-streamer/description
+define Package/mjpg-streamer/Default/description
  Streaming application for Linux-UVC compatible webcams
 endef
 
-define Package/mjpg-streamer/config
-  source "$(SOURCE)/Config.in"
+define Package/mjpg-streamer/description
+$(call Package/mjpg-streamer/Default/description)
 endef
 
 define Package/mjpg-streamer/conffiles
 /etc/config/mjpg-streamer
 endef
 
+define Package/mjpg-streamer/config
+if PACKAGE_mjpg-streamer-input-uvc
+
+config MJPG_STREAMER_V4L2
+       bool "Build input_uvc with libv4l2 (camera controls)"
+       default n
+       select PACKAGE_libv4l
+endif
+endef
+
+define Package/mjpg-streamer/Default
+  SECTION:=multimedia
+  CATEGORY:=Multimedia
+  TITLE:=MJPG-streamer
+  URL:=https://github.com/jacksonliam/mjpg-streamer
+  DEPENDS:=mjpg-streamer
+endef
+
+define Package/mjpg-streamer-input-file
+$(call Package/mjpg-streamer/Default)
+  TITLE+= (file input)
+endef
+
+define Package/mjpg-streamer-input-file/description
+$(call Package/mjpg-streamer/Default/description)
+
+This package provides the file input plugin.
+endef
+
+define Package/mjpg-streamer-input-uvc
+$(call Package/mjpg-streamer/Default)
+  TITLE+= (UVC input)
+endef
+
+define Package/mjpg-streamer-input-uvc/description
+$(call Package/mjpg-streamer/Default/description)
+
+This package provides the UVC input plugin.
+endef
+
+define Package/mjpg-streamer-input-http
+$(call Package/mjpg-streamer/Default)
+  TITLE+= (HTTP input)
+endef
+
+define Package/mjpg-streamer-input-http/description
+$(call Package/mjpg-streamer/Default/description)
+
+This package provides the http input plugin.
+endef
+
+define Package/mjpg-streamer-output-rtsp
+$(call Package/mjpg-streamer/Default)
+  TITLE+= (RTSP output)
+endef
+
+define Package/mjpg-streamer-output-rtsp/description
+$(call Package/mjpg-streamer/Default/description)
+
+This package provides the RTSP output plugin.
+endef
+
+define Package/mjpg-streamer-output-udp
+$(call Package/mjpg-streamer/Default)
+  TITLE+= (UDP output)
+endef
+
+define Package/mjpg-streamer-output-udp/description
+$(call Package/mjpg-streamer/Default/description)
+
+This package provides the UDP output plugin.
+endef
+
+define Package/mjpg-streamer-output-file
+$(call Package/mjpg-streamer/Default)
+  TITLE+= (file output)
+endef
+
+define Package/mjpg-streamer-output-file/description
+$(call Package/mjpg-streamer/Default/description)
+
+This package provides the file output plugin.
+endef
+
+define Package/mjpg-streamer-output-http
+$(call Package/mjpg-streamer/Default)
+  TITLE+= (HTTP output)
+endef
+
+define Package/mjpg-streamer-output-http/description
+$(call Package/mjpg-streamer/Default/description)
+
+This package provides the HTTP output plugin.
+endef
+
+define Package/mjpg-streamer-output-zmq
+$(call Package/mjpg-streamer/Default)
+  TITLE+= (zmq output)
+  DEPENDS+= +libzmq +libprotobuf-c
+endef
+
+define Package/mjpg-streamer-output-zmq/description
+$(call Package/mjpg-streamer/Default/description)
+
+This package provides the ZeroMQ output plugin.
+endef
+
+define Package/mjpg-streamer-www
+$(call Package/mjpg-streamer/Default)
+  TITLE+= (full www)
+  CONFLICTS:=mjpg-streamer-www-simple
+endef
+
+define Package/mjpg-streamer-www/description
+$(call Package/mjpg-streamer/Default/description)
+
+This package provides full version of the web content.
+Includes cambozola applet.
+endef
+
+define Package/mjpg-streamer-www-simple
+$(call Package/mjpg-streamer/Default)
+  TITLE+= (simple www)
+endef
+
+define Package/mjpg-streamer-www-simple/description
+$(call Package/mjpg-streamer/Default/description)
+
+This package provides simple version of the web content.
+endef
+
 CAMBOZOLA:=cambozola-0.936.tar.gz
 
 # Distribution URL doesn't always have the correct version
@@ -67,7 +197,7 @@ define Build/Prepare
        $(Build/Patch)
     # Fetch latest cambozola that works with latest Java(s)
     # Yes, I know this is ugly
-    ifeq ($(CONFIG_MJPG_STREAMER_WWW),y)
+    ifneq ($(CONFIG_PACKAGE_mjpg-streamer-www),)
        $(eval $(call Download,cambozola))
        $(TAR) -xf $(DL_DIR)/$(CAMBOZOLA) --strip=2 --wildcards \
                -C $(PKG_BUILD_DIR)/www */dist/cambozola.jar
@@ -76,9 +206,10 @@ endef
 
 define Build/Configure
     $(RM) $(PKG_BUILD_DIR)/plugins/input_uvc/uvcvideo.h
+$(call Build/Configure/Default)
 endef
 
-    TARGET_LDFLAGS+= -ljpeg
+TARGET_LDFLAGS+= -ljpeg
 
 ifeq ($(CONFIG_MJPG_STREAMER_V4L2),y)
     TARGET_CFLAGS+= -DUSE_LIBV4L2
@@ -87,41 +218,72 @@ endif
 
 define Package/mjpg-streamer/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/mjpg_streamer $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mjpg_streamer $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/etc/config
        $(CP) ./files/mjpg-streamer.config $(1)/etc/config/mjpg-streamer
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/mjpg-streamer.init $(1)/etc/init.d/mjpg-streamer
        $(INSTALL_DIR) $(1)/etc/hotplug.d/usb
        $(INSTALL_DATA) ./files/mjpg-streamer.hotplug $(1)/etc/hotplug.d/usb/20-mjpg-streamer
-       $(INSTALL_DIR) $(1)/usr/lib
-ifeq ($(CONFIG_MJPG_STREAMER_INPUT_FILE),y)
-       $(CP) $(PKG_BUILD_DIR)/input_file.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_INPUT_UVC),y)
-       $(CP) $(PKG_BUILD_DIR)/input_uvc.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_INPUT_HTTP),y)
-       $(CP) $(PKG_BUILD_DIR)/input_http.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_OUTPUT_RTSP),y)
-       $(CP) $(PKG_BUILD_DIR)/output_rtsp.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_OUTPUT_UDP),y)
-       $(CP) $(PKG_BUILD_DIR)/output_udp.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_OUTPUT_FILE),y)
-       $(CP) $(PKG_BUILD_DIR)/output_file.so $(1)/usr/lib
-endif
-ifeq ($(CONFIG_MJPG_STREAMER_OUTPUT_HTTP),y)
-       $(CP) $(PKG_BUILD_DIR)/output_http.so $(1)/usr/lib
+endef
+
+define Package/mjpg-streamer-input-file/install
+       $(INSTALL_DIR) $(1)/usr/lib/mjpg-streamer
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/mjpg-streamer/input_file.so $(1)/usr/lib/mjpg-streamer
+endef
+
+define Package/mjpg-streamer-input-uvc/install
+       $(INSTALL_DIR) $(1)/usr/lib/mjpg-streamer
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/mjpg-streamer/input_uvc.so $(1)/usr/lib/mjpg-streamer
+endef
+
+define Package/mjpg-streamer-input-http/install
+       $(INSTALL_DIR) $(1)/usr/lib/mjpg-streamer
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/mjpg-streamer/input_http.so $(1)/usr/lib/mjpg-streamer
+endef
+
+define Package/mjpg-streamer-output-rtsp/install
+       $(INSTALL_DIR) $(1)/usr/lib/mjpg-streamer
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/mjpg-streamer/output_rtsp.so $(1)/usr/lib/mjpg-streamer
+endef
+
+define Package/mjpg-streamer-output-udp/install
+       $(INSTALL_DIR) $(1)/usr/lib/mjpg-streamer
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/mjpg-streamer/output_udp.so $(1)/usr/lib/mjpg-streamer
+endef
+
+define Package/mjpg-streamer-output-file/install
+       $(INSTALL_DIR) $(1)/usr/lib/mjpg-streamer
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/mjpg-streamer/output_file.so $(1)/usr/lib/mjpg-streamer
+endef
+
+define Package/mjpg-streamer-output-http/install
+       $(INSTALL_DIR) $(1)/usr/lib/mjpg-streamer
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/mjpg-streamer/output_http.so $(1)/usr/lib/mjpg-streamer
+endef
+
+define Package/mjpg-streamer-output-zmq/install
+       $(INSTALL_DIR) $(1)/usr/lib/mjpg-streamer
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/mjpg-streamer/output_zmqserver.so $(1)/usr/lib/mjpg-streamer
+endef
+
+define Package/mjpg-streamer-www/install
        $(INSTALL_DIR) $(1)/www/webcam
-    ifeq ($(CONFIG_MJPG_STREAMER_WWW),y)
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/www/* $(1)/www/webcam
-    else
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/www/stream_simple.html $(1)/www/webcam/index.html
-    endif
-endif
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/mjpg-streamer/www/* $(1)/www/webcam
+endef
+
+define Package/mjpg-streamer-www-simple/install
+       $(INSTALL_DIR) $(1)/www/webcam
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/mjpg-streamer/www/stream_simple.html $(1)/www/webcam/index.html
 endef
 
 $(eval $(call BuildPackage,mjpg-streamer))
+$(eval $(call BuildPackage,mjpg-streamer-input-file))
+$(eval $(call BuildPackage,mjpg-streamer-input-uvc))
+$(eval $(call BuildPackage,mjpg-streamer-input-http))
+$(eval $(call BuildPackage,mjpg-streamer-output-rtsp))
+$(eval $(call BuildPackage,mjpg-streamer-output-file))
+$(eval $(call BuildPackage,mjpg-streamer-output-http))
+$(eval $(call BuildPackage,mjpg-streamer-output-zmq))
+$(eval $(call BuildPackage,mjpg-streamer-www))
+$(eval $(call BuildPackage,mjpg-streamer-www-simple))
index 0adc8bfe757341f54cde1b822b19b72f0f21905c..037afcd0ca19108b7b0345d31ce83e551ffdeb09 100644 (file)
@@ -14,6 +14,7 @@ PKG_RELEASE:=1
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:lavrsen:motion
 
 PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/Motion-Project/motion/tar.gz/release-$(PKG_VERSION)?
index 6b9d5a909cfdd3bcf7beaa3b10488de4f956f3ec..670d951473da3e318ea03f2e84be3746bc31f986 100644 (file)
@@ -6,8 +6,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
-PKG_VERSION:=3.8.5
-PKG_RELEASE:=2
+PKG_VERSION:=3.8.6
+PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 
index 946a7525b5e269aa11e22d0f78cdd2104274bb8b..0917288ea9e167c4515ed53eefd2d99657e3d4d3 100755 (executable)
@@ -106,7 +106,7 @@ status()
 
 service_triggers()
 {
-       local trigger="$(uci_get adblock global adb_trigger)" 
+       local trigger="$(uci_get adblock global adb_trigger)"
        local delay="$(uci_get adblock extra adb_triggerdelay "2")"
 
        PROCD_RELOAD_DELAY=$((delay*1000))
index 8caf424ed426f28a6ac927013aaf2ca89d400388..b8bfbb775d60a0f589a0b71e91dcd3a57e2e1b32 100755 (executable)
@@ -13,7 +13,7 @@
 #
 LC_ALL=C
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-adb_ver="3.8.5"
+adb_ver="3.8.6"
 adb_basever=""
 adb_enabled=0
 adb_debug=0
@@ -164,6 +164,7 @@ f_load()
                f_extconf
                f_temp
                f_rmdns
+               f_bgserv "stop"
                f_jsnup "disabled"
                f_log "info" "adblock is currently disabled, please set the config option 'adb_enabled' to '1' to use this service"
                exit 0
@@ -181,23 +182,26 @@ f_load()
                sleep "${adb_triggerdelay}"
        fi
 
-       while [ "${cnt}" -le 30 ]
-       do
-               dns_up="$(ubus -S call service list "{\"name\":\"${adb_dns}\"}" 2>/dev/null | jsonfilter -l1 -e "@[\"${adb_dns}\"].instances.*.running" 2>/dev/null)"
-               if [ "${dns_up}" = "true" ]
+       if [ "${adb_action}" != "stop" ]
+       then
+               while [ "${cnt}" -le 30 ]
+               do
+                       dns_up="$(ubus -S call service list "{\"name\":\"${adb_dns}\"}" 2>/dev/null | jsonfilter -l1 -e "@[\"${adb_dns}\"].instances.*.running" 2>/dev/null)"
+                       if [ "${dns_up}" = "true" ]
+                       then
+                               break
+                       fi
+                       sleep 1
+                       cnt=$((cnt+1))
+               done
+
+               if [ "${dns_up}" != "true" ] || [ -z "${adb_dns}" ] || [ ! -x "$(command -v "${adb_dns}")" ]
+               then
+                       f_log "err" "dns backend '${adb_dns}' not running or executable"
+               elif [ ! -d "${adb_dnsdir}" ]
                then
-                       break
+                       f_log "err" "dns backend directory '${adb_dnsdir}' not found"
                fi
-               sleep 1
-               cnt=$((cnt+1))
-       done
-
-       if [ "${dns_up}" != "true" ] || [ -z "${adb_dns}" ] || [ ! -x "$(command -v "${adb_dns}")" ]
-       then
-               f_log "err" "'${adb_dns}' not running or executable"
-       elif [ ! -d "${adb_dnsdir}" ]
-       then
-               f_log "err" "'${adb_dnsdir}' dns backend directory not found"
        fi
 
        # inotify check
@@ -208,7 +212,7 @@ f_load()
                then
                        adb_dnsfilereset="false"
                fi
-               f_log "info" "Inotify is enabled for '${adb_dns}', adblock restart and file reset will be disabled"
+               f_log "info" "inotify is enabled for '${adb_dns}', adblock restart and file reset will be disabled"
        fi
 }
 
@@ -226,7 +230,7 @@ f_env()
        #
        if [ ! -d "${adb_backupdir}" ]
        then
-               f_log "err" "the backup directory '${adb_backupdir}' does not exist/is not mounted yet, please create the directory or raise the 'adb_triggerdelay' to defer the adblock start"
+               f_log "err" "backup directory '${adb_backupdir}' does not exist/is not mounted yet, please create the directory or raise the 'adb_triggerdelay' to defer the adblock start"
        fi
 
        # check fetch utility
@@ -304,15 +308,23 @@ f_rmtemp()
 #
 f_rmdns()
 {
-       if [ -n "${adb_dns}" ]
+       local status dns_status rc
+
+       status="$(ubus -S call service list '{"name":"adblock"}' 2>/dev/null | jsonfilter -l1 -e '@["adblock"].instances.*.running' 2>/dev/null)"
+       if [ -n "${adb_dns}" ] && [ -n "${status}" ]
        then
+               dns_status="$(ubus -S call service list "{\"name\":\"${adb_dns}\"}" 2>/dev/null | jsonfilter -l1 -e "@[\"${adb_dns}\"].instances.*.running" 2>/dev/null)"
                printf "%s\\n" "${adb_dnsheader}" > "${adb_dnsdir}/${adb_dnsfile}"
                > "${adb_rtfile}"
-               rm -f "${adb_backupdir}/${adb_dnsprefix}"*.gz
-               f_dnsup 4
-               f_rmtemp
+               rm "${adb_backupdir}/${adb_dnsprefix}".*.gz 2>/dev/null
+               rc="${?}"
+               if [ "${rc}" -eq 0 ] && [ -n "${dns_status}" ]
+               then
+                       f_dnsup 4
+               fi
        fi
-       f_log "debug" "f_rmdns  ::: dns: ${adb_dns}, dns_dir: ${adb_dnsdir}, dns_file: ${adb_dnsfile}, rt_file: ${adb_rtfile}, backup_dir: ${adb_backupdir}"
+       f_rmtemp
+       f_log "debug" "f_rmdns  ::: status: ${status:-"-"}, dns_status: ${dns_status:-"-"}, rc: ${rc:-"-"}, dns: ${adb_dns}, dns_dir: ${adb_dnsdir}, dns_file: ${adb_dnsfile}, rt_file: ${adb_rtfile}, backup_dir: ${adb_backupdir}"
 }
 
 # commit uci changes
@@ -908,6 +920,7 @@ f_log()
                if [ "${class}" = "err" ]
                then
                        f_rmdns
+                       f_bgserv "stop"
                        f_jsnup "error"
                        logger -p "${class}" -t "adblock-${adb_ver}[${$}]" "Please also check 'https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md'"
                        exit 1
index a7dcf101220bd64a72f1480465fdb34366fb8644..63a4ff7129ca5f4bd76e0a90856b261ea3434d9b 100644 (file)
@@ -12,6 +12,7 @@ PKG_VERSION:=1.5.2
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:aircrack-ng:aircrack-ng
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/aircrack-ng/aircrack-ng.git
index 5e4974c950e44dec3840bf9074585e586ae816ce..f6143a29346b67840eda3d18f1ec5253cab70ae3 100644 (file)
@@ -18,6 +18,7 @@ PKG_LICENSE_FILES:=COPYING
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/apcupsd
 PKG_HASH:=db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867
+PKG_CPE_ID:=cpe:/a:apc:apcupsd
 
 PKG_BUILD_DEPENDS:=libgd
 
index 672894aede4915d1342a3acfc0691b114a772e41..e521b453873d86e5c95ac703d1b17b27785da455 100644 (file)
@@ -21,6 +21,7 @@ PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>, \
        Hsing-Wang Liao <kuoruan@gmail.com>
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:tatsuhiro_tsujikawa:aria2
 
 PKG_CONFIG_DEPENDS := \
        CONFIG_ARIA2_NOSSL \
index db9d2573bb064865074067731ed539e8bfd86c01..3bedb09bc9e4ba5c304034b63b8db0c64fd82147 100644 (file)
@@ -19,6 +19,7 @@ PKG_HASH:=6d5155ab347b731640495b1f0df6a4a849e84194d2ef0c2ec6af3879ee1aca2c
 PKG_MAINTAINER:=Philip Prindeville <philipp@redfish-solutions.com>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:wildbit:beanstalkd
 
 include $(INCLUDE_DIR)/package.mk
 
index cab5951611d3cf8ad5e82ed7f51926171b1e2720..2742766b27ec76b993fc7a3a00674e10947a2575 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=9f15de46f29b46bf1e39fc50bdf4515e71b17f551f3955094c5da792d962107e
 PKG_MAINTAINER:=Nikil Mehta <nikil.mehta@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:bitlbee:bitlbee
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
index b08d158b6acfd5cd5613e06207832ebcd8058951..9d400568e1c81253b2b99a27bb843fb3883d0be5 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=4e02795b1260a4ec51e6ace84149036305cc9fc340e65edb9f8452aa611339b5
 PKG_MAINTAINER:=Miroslav Lichvar <mlichvar0@gmail.com>
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:tuxfamily:chrony
 
 PKG_BUILD_DEPENDS:=pps-tools
 
index bdd01974801a758bb4a29db14e2473d2bfc4df13..b76b27f838e7f8aadd13dcd7785f89ecb38720f0 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=18d8f1bf92c13c4d611502dbd6759e3a766ddc8467ec8a2eda3f589e40b9ac9c
 PKG_MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:debian:cifs-utils
 
 include $(INCLUDE_DIR)/package.mk
 
index e1d3202fd3a5b9cf2ee6d303344eab407f8fc47c..18b7969adc3614a5ebdce69b82d7d3c75823c577 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=587c6a25ad78109995a7ccb8e60aa1c491b149f2c99d47033f3d5e648430ad2f
 PKG_MAINTAINER:=Federico Di Marco <fededim@gmail.com>
 PKG_LICENSE:=GPL-3
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:davfs2:davfs2
 
 PKG_FIXUP:=gettext-version autoreconf
 PKG_BUILD_PARALLEL:=1
index 5bd204fb9846a8cbcde92a24c0de2142b4d95c7d..71c3afb7f5dbcdbd6efa2d05acc7d853799fa798 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=3db7ff18cba9274da1d2176fb3c7cbe23926a8e58d5c8e244ad55c62d38ba09e
 
 PKG_LICENSE:=BSD-2c
 PKG_LICENSE_FILES:=
+PKG_CPE_ID:=cpe:/a:roy_marples:dhcpcd
 
 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
 
index 32a7c00e7f1ad574c440777b8abf19ab012fdad1..9bbfa8a08a3bd7bbc31225e52a0a67e634e067a3 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnscrypt-proxy
-PKG_SOURCE_DATE:=2018-11-22
-PKG_SOURCE_VERSION:=f61ca76a852cf56e399a458f9e002886b1b049f0
+PKG_SOURCE_DATE:=2019-08-20
+PKG_SOURCE_VERSION:=07ac3825b5069adc28e2547c16b1d983a8ed8d80
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/dyne/dnscrypt-proxy
-PKG_MIRROR_HASH:=1de8d9913aea4528920dbc6fcd4769a7ab70f7c1c73abba39e68e07376cbb395
+PKG_MIRROR_HASH:=c5c074f52732f14f026002bc48bdffcf0b212092de5798120209b2e6b65fc3e6
 
 PKG_MAINTAINER:=Damiano Renfer <damiano.renfer@gmail.com>
 PKG_LICENSE:=ISC
index 0958c92844447e657e0d936d825d15dc5c3d61cb..7df6b220cd17e19699ccbc595bab7b66aec982ca 100644 (file)
@@ -1,6 +1,7 @@
 #!/bin/sh /etc/rc.common
 
-START=30
+# Startup before dnsmasq
+START=18
 USE_PROCD=1
 PROG=/usr/sbin/dnscrypt-proxy
 CONFIG_DIR=/var/etc
index e2cf7b1324aa5ed127a68f4f7edfa5131b85edf1..de8feb5e32118097eb3a590b957a6ac4b9f5128d 100644 (file)
@@ -84,8 +84,8 @@ d0wn-us-ns1,"D0wn Resolver United States of America 01","Server provided by Mart
 d0wn-us-ns2,"D0wn Resolver United States of America 02","Server provided by Martin 'd0wn' Albus","United States of America","",https://dns.d0wn.biz,1,yes,yes,no,192.252.222.24,2.dnscrypt-cert.us2.d0wn.biz,729B:FABE:2295:D469:E911:F97E:3EE4:F6DB:0190:EA6F:7CF3:F7EE:BB6B:99B1:698A:237D,pubkey.us2.dnscrypt.d0wn.biz
 d0wn-us-ns4,"D0wn Resolver United States of America 04","Server provided by Martin 'd0wn' Albus","United States of America","",https://dns.d0wn.biz,1,yes,yes,no,107.181.168.52,2.dnscrypt-cert.us4.d0wn.biz,F392:5D53:A315:66C2:ACF2:B2D2:8A69:6739:B066:1B8C:EF1B:3AFD:E828:0D83:D4EA:6D7D,pubkey.us4.dnscrypt.d0wn.biz
 d0wn-za-ns1,"D0wn Resolver South Africa 01","Server provided by Martin 'd0wn' Albus","South Africa","",https://dns.d0wn.biz,1,yes,yes,no,169.239.181.3,2.dnscrypt-cert.za.d0wn.biz,FBBD:0F3A:AF2B:B1BB:CD8F:9324:D5F6:A68C:E722:3890:8B90:92CF:F6D2:BF7C:9EC1:1368,pubkey.za.dnscrypt.d0wn.biz
-dnscrypt.ca-1,"dnscrypt.ca Server 1","Uncensored DNSSEC validating and log-free","Montreal, Canada","","https://dnscrypt.ca/",1,yes,yes,no,"199.167.130.118:5353","2.dnscrypt-cert.dnscrypt.ca-1",74F7:4555:17BC:26F7:1177:E56D:7293:2788:6C72:915B:3F46:2830:3F91:0C47:C38E:8279,
-dnscrypt.ca-2,"dnscrypt.ca Server 2","Uncensored DNSSEC validating and log-free","Montreal, Canada","","https://dnscrypt.ca/",1,yes,yes,no,"199.167.128.112:5353","2.dnscrypt-cert.dnscrypt.ca-2",43D5:2C82:5922:96C2:DB6F:8D48:CE22:4FDC:C726:26E1:06F6:E388:6193:FA00:9029:631B,
+dnscrypt.ca-1,"dnscrypt.ca Server 1","Uncensored DNSSEC validating and log-free","Montreal, Canada","","https://dnscrypt.ca/",1,yes,yes,no,"192.99.183.132:443","2.dnscrypt-cert.dnscrypt.ca-1",1A53:A3C9:5078:9CBD:D10B:1933:A468:9B6C:846A:40F1:B73D:1752:AECA:C982:9ECB:7CE2,
+dnscrypt.ca-2,"dnscrypt.ca Server 2","Uncensored DNSSEC validating and log-free","Montreal, Canada","","https://dnscrypt.ca/",1,yes,yes,no,"149.56.228.45:443","2.dnscrypt-cert.dnscrypt.ca-2",0108:54AB:3B56:A7EE:F9D3:9158:FEF6:820B:FF93:A235:7C89:1608:DB9E:15D3:BBE0:1185,
 dnscrypt.eu-dk,"DNSCrypt.eu Denmark","Free, non-logged, uncensored. Hosted by Netgroup.","Denmark","",https://dnscrypt.eu,1,yes,yes,no,77.66.84.233,2.dnscrypt-cert.resolver2.dnscrypt.eu,3748:5585:E3B9:D088:FD25:AD36:B037:01F5:520C:D648:9E9A:DD52:1457:4955:9F0A:9955,pubkey.resolver2.dnscrypt.eu
 dnscrypt.eu-dk-ipv6,"DNSCrypt.eu Denmark over IPv6","Free, non-logged, uncensored. Hosted by Netgroup.","Denmark","",https://dnscrypt.eu,1,yes,yes,no,[2001:1448:243::dc2]:443,2.dnscrypt-cert.resolver2.dnscrypt.eu,3748:5585:E3B9:D088:FD25:AD36:B037:01F5:520C:D648:9E9A:DD52:1457:4955:9F0A:9955,pubkey.resolver2.dnscrypt.eu
 dnscrypt.eu-nl,"DNSCrypt.eu Holland","Free, non-logged, uncensored. Hosted by RamNode.","Netherlands","",https://dnscrypt.eu,1,yes,yes,no,176.56.237.171,2.dnscrypt-cert.resolver1.dnscrypt.eu,67C0:0F2C:21C5:5481:45DD:7CB4:6A27:1AF2:EB96:9931:40A3:09B6:2B8D:1653:1185:9C66,pubkey.resolver1.dnscrypt.eu
index fa417df5407602f0f440898316b4f2b9dc386775..575568c374ce38ca5fc02f7e0a2a2a6025601d97 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=34c50ac47a683b13eae1a02f2d0263c0bd51a83f01b99c02c5fe25df07a1ee77
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYRIGHT LICENSE
+PKG_CPE_ID:=cpe:/a:freeradius:freeradius
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/freeradius-server-$(PKG_VERSION)
 PKG_FIXUP:=autoreconf
index 71077734e77847a22ee654c176b1e5c9c392ee8a..577b586e5a0ca196dad73d60e3aa9b23955dca35 100644 (file)
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=https://www.cipherdyne.org/fwknop/download
 PKG_HASH:=f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77
 PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>
 PKG_LICENSE:=GPL-2.0-or-later
+PKG_CPE_ID:=cpe:/a:cipherdyne:fwknop
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
index 2f2a7d6a8457adf56b219036c5f9a4c7c6e52a28..42a1adc3dbfae42331686e8460a2a5754b42728f 100644 (file)
@@ -19,6 +19,8 @@ PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
 
+PKG_CPE_ID:=cpe:/a:git:git
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/git/Default
index 4edcd9cbafc6dcc4aafda3be08fc53dd6e00c2b2..487ffe8719a1bee5aa686e9d39d2b6b9bf11be16 100644 (file)
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_HASH:=2166a61b14de19e605b14f4a13a070fbfd5ecd247b6fd725108f111198a2c121
 PKG_SOURCE_URL:=https://codeload.github.com/sitaramc/gitolite/tar.gz/v$(PKG_VERSION)?
 
+PKG_CPE_ID:=cpe:/a:sitaram_chamarty:gitolite
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/gitolite
index 2be414f4dfffb9839cd96b963f507054468645f0..e35e6ee8b3fc0cc46a44b35b91ba11de7039a38f 100644 (file)
@@ -11,6 +11,7 @@ PKG_HASH:=f8a07063b1e0890a1386fed2313a967f58f5495c075a25725aba200469c857bf
 PKG_LICENSE:=AGPL-3.0
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+PKG_CPE_ID:=cpe:/a:gnunet:gnunet
 
 PKG_BUILD_PARALLEL:=1
 PKG_FIXUP:=gettext-version
index 7959aeb70b2638129a85c192a261054bc5f66825..12f99cc5ca3ec33da7dd3363c3090f660a578368 100644 (file)
@@ -22,6 +22,7 @@ PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>, \
                Christian Lachner <gladiac@gmail.com>
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:haproxy:haproxy
 
 include $(INCLUDE_DIR)/package.mk
 
index bf4d2f50b798b85d6defb2250ec091de91861338..434876abecdeec58bcaa131fbef6b212017c1498 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=ad2b40acf1421316ec15800dcde0f587ab31d7d6f891fa8b9967c4ded93c013e
 PKG_MAINTAINER:=Uwe Kleine-König <uwe+openwrt@kleine-koenig.org>
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=README
+PKG_CPE_ID:=cpe:/a:kryo:iodine
 
 include $(INCLUDE_DIR)/package.mk
 
index cbaf945d6633b520efe53d0ed37a767fc221c194..488f575c387e45d56ca476b961b6ba5474cbb210 100644 (file)
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://mirrors.kernel.org/${PKG_NAME}/${PKG_VERSION}/
 PKG_HASH:=7dcd9f0f48263c6b27a2c3d085dd7278b5c0feed1dfec8872a04899707fa23d8
 PKG_USE_MIPS16:=0
 
-PKG_BUILD_DEPENDS:=boost python/host
+PKG_BUILD_DEPENDS:=boost python/host scons/host
 
 PKG_MAINTAINER:=Hauke Mehrtens <hauke.mehrtens@intel.com>
 
@@ -37,7 +37,7 @@ PKG_CONFIG_DEPENDS := \
        CONFIG_PACKAGE_iotivity_SECURE
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/scons.mk
+include ../../devel/scons/scons.mk
 
 
 define Package/iotivity
index 0682038592fc0cb7835e9448e234144a3e0ad480..95e841f4847feb925746a5940fede0c9ec7a7a1e 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=irssi
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.2.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://github.com/irssi/irssi/releases/download/1.2.1/
-PKG_HASH:=5466a1ed9612cfa707d9a37d60b29d027b4ac7d83c74ceb1a410e2b59edba92c
+PKG_SOURCE_URL:=https://github.com/irssi/irssi/releases/download/$(PKG_VERSION)/
+PKG_HASH:=6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
index 7c29f1b510dc781c828902ef0157b7f8b8a93888..6f8a9455aaedea2c353c6b08a2d4bead69fce875 100644 (file)
@@ -15,6 +15,7 @@ PKG_RELEASE:=4
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Philip Prindeville <philipp@redfish-solutions.com>
+PKG_CPE_ID:=cpe:/a:isc:dhcp
 
 PKG_SOURCE:=$(UPSTREAM_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.isc.org/isc/dhcp/$(PKG_VERSION) \
index c44080752dfbd23b51f963d6bc12f38036ef44a3..b174a2c06259496f1126ced2d84b2500f585f900 100644 (file)
@@ -12,6 +12,7 @@ PKG_VERSION:=2016-07-R1
 PKG_RELEASE:=1
 
 PKG_LICENSE:=LGPLv2.1
+PKG_CPE_ID:=cpe:/a:kismet:kismet
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.kismetwireless.net/code
index d72e29d2e77a380bba8503d8801f2a17ed05a864..c268950cc216d51fbfec50c997839bc4c985d988 100644 (file)
@@ -15,6 +15,7 @@ PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=NOTICE
+PKG_CPE_ID:=cpe:/a:mit:kerberos
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://web.mit.edu/kerberos/dist/krb5/1.17
index 2479ea600dbce0ab347f7938d54a448de38151bd..020f933d4ec544aac5e133b5943c1d140a9af9da 100644 (file)
@@ -19,6 +19,7 @@ PKG_HASH:=4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62
 
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:alexander_v._lukyanov:lftp
 
 include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
index e56547e8532bf6242055ab65acc27d1d60f60622..406b049f0922e17a528e5ed0ad352f7610171076 100644 (file)
@@ -12,6 +12,7 @@ PKG_VERSION:=1.7
 PKG_RELEASE:=1
 PKG_LICENSE:=LGPL-2.1
 PKG_MAINTAINER:=Thomas Guyot-Sionnest <tguyot@gmail.com>
+PKG_CPE_ID:=cpe:/a:libndp:libndp
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://libndp.org/files/
index 5c324c6197c536e23d69268e1fd0983ea8ec56b1..3efea46de05e91c90578cba75bc220775b73249c 100644 (file)
@@ -12,6 +12,7 @@ PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Leonid Esman <leonid.esman@gmail.com>
+PKG_CPE_ID:=cpe:/a:lynx:lynx
 PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://invisible-mirror.net/archives/lynx/tarballs/ \
                 https://ftp.icm.edu.pl/packages/lynx/tarballs/ \
index 6cb5ebd4b9b4ecdc91ada5850783104fe55432f5..ccc1eeeb75a27335e87e79bbe9c15a778a13e213 100644 (file)
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=https://opensource.apple.com/tarballs/mDNSResponder/IETF/
 PKG_HASH:=b3a76fd35cf2d561546c2fbeaea1e5998b7e04b8330afb918ea5fbdeb202162c
 PKG_MAINTAINER:=
 PKG_LICENSE:=Apache-2.0
+PKG_CPE_ID:=cpe:/a:apple:mdnsresponder
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/mDNSResponder-$(PKG_VERSION)
 
index 8f2b4641983ba5dcf3b07d8d5996036100e39442..1c2f64807c7d579d8f1273181032a7a984d4f7e6 100644 (file)
@@ -19,6 +19,7 @@ PKG_HASH:=9c5bdf29a780fb6c6f7c9eaaeeda0583efdf663193758c3e316c969a510af2a9
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:memcachedb:memcached
 
 PKG_INSTALL:=1
 
index 7ad1a284b04bb4ed61eab99fcdf8c5391a50cc46..99231b5ff8c8ba15e56ec6c0ace8efa8ec1ccf91 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=8723f5d7fd7970de23635547700878cd29a5c2bb708b5e5475b2d1d2510317fb
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=BSD-3c
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:miniupnp_project:miniupnp
 
 PKG_INSTALL:=1
 
index 822a297dab552a797f6b340be98526a7c08f05f6..886d95f86bb8c0242f1743982c9812562d1ac872 100644 (file)
@@ -17,6 +17,7 @@ PKG_HASH:=4175d588f600e2877503c781c5d75320dfce572669fcab7604434b07ec5c0d5d
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:miniupnp_project:miniupnpd
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/version.mk
index cd22f92c86f2c06368c79a9d2b6414f2bb1b4746..ce62d3ccfaa164644a6fafa2386924c5d898e92f 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=f2979db9e2f41aa8e6574e7771767c9afe111d9213814eb47f5e1e71876e4382
 PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:matt_kimball_and_roger_wolff:mtr
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
index 9f67eb62c459097d57b97a92b0fdf91a6f0748e5..971829012069c4624b89821f471357eca18846bc 100644 (file)
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@SF/nbd
 PKG_HASH:=b4466412f13e057659f25d35e1e8e181afd62c7179bff22a6add81445ecb8690
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_MAINTAINER:=Marcin Jurkowski <marcin1j@gmail.com>
+PKG_CPE_ID:=cpe:/a:network_block_device:nbd
 
 PKG_INSTALL:=1
 
index bfcaa90661728c3a57cd2287adc00fa007f34984..7aa4235ad5f50e25251fec98cb503f55f4ac2dae 100644 (file)
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=@SF/net-snmp
 PKG_HASH:=b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf
 PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be>
 PKG_LICENSE:=MIT BSD-3-Clause-Clear
+PKG_CPE_ID:=cpe:/a:net-snmp:net-snmp
 
 PKG_FIXUP:=autoreconf
 
index a156316b319f109cd7a859c92a3653a55ffd37b7..d34b5f895f81f2f95fd64a8acc1c4e15d998a6b8 100644 (file)
@@ -19,6 +19,8 @@ PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
 
+PKG_CPE_ID:=cpe:/a:netatalk:netatalk
+
 PKG_BUILD_DEPENDS:=libevent2
 
 include $(INCLUDE_DIR)/package.mk
index 5f15333949e1009065f29e60a542867c1be3f29a..032ded5866f2998b72a4714e86a79ebaf400f197 100644 (file)
@@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.netperf.org/netperf/
 PKG_HASH:=842af17655835c8be7203808c3393e6cb327a8067f3ed1f1053eb78b4e40375a
 
+PKG_CPE_ID:=cpe:/a:netperf:netperf
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/netperf
index 40449b2a2d75b27df71d73658eca46c5e2f1f27c..244b7abe096434012cdef1a1f0988641724bbc4e 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> \
                                Ansuel Smith <ansuelsmth@gmail.com>
 PKG_LICENSE:=2-clause BSD-like license
+PKG_CPE_ID:=cpe:/a:nginx:nginx
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
index 48773f4eae1a3d05a057b430979220f22774baa9..94fd4910f65e841abfdfef6986e22da00ea483f9 100644 (file)
@@ -19,6 +19,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:ngircd:ngircd
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
index cf921f0ab41cd8bbe3b60ad6bae7a80a36146252..e8efdbeb8829330a173856b389b57e0aa6683999 100644 (file)
@@ -22,6 +22,7 @@ PKG_SOURCE_URL:=https://nmap.org/dist/
 PKG_HASH:=847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:nmap:nmap
 
 PKG_INSTALL:=1
 
index 56cfd87a30622c84c9b30fb88f025b84a29f45a0..614a3dae9d0d61c357db17bfca29ab3a7dc5fbfa 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nut
 PKG_VERSION:=2.7.4
-PKG_RELEASE:=17
+PKG_RELEASE:=18
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.7/
diff --git a/net/nut/patches/010-libgd-pkgconfig.patch b/net/nut/patches/010-libgd-pkgconfig.patch
new file mode 100644 (file)
index 0000000..bb87090
--- /dev/null
@@ -0,0 +1,79 @@
+--- a/m4/nut_check_libgd.m4
++++ b/m4/nut_check_libgd.m4
+@@ -9,37 +9,27 @@ if test -z "${nut_have_libgd_seen}"; then
+       nut_have_libgd_seen=yes
+       CFLAGS_ORIG="${CFLAGS}"
+-      LDFLAGS_ORIG="${LDFLAGS}"
+       LIBS_ORIG="${LIBS}"
+-      dnl Initial defaults. These are only used if gdlib-config is
+-      dnl unusable and the user fails to pass better values in --with
+-      dnl arguments
+-      CFLAGS=""
+-      LDFLAGS="-L/usr/X11R6/lib"
+-      LIBS="-lgd -lpng -lz -ljpeg -lfreetype -lm -lXpm -lX11"
+-
+-      AC_MSG_CHECKING(for gd version via gdlib-config)
+-      GD_VERSION=`gdlib-config --version 2>/dev/null`
+-      if test "$?" != "0" -o -z "${GD_VERSION}"; then
+-              GD_VERSION="none"
++      AC_MSG_CHECKING(for gd version via pkg-config)
++      GD_VERSION=`pkg-config --silence-errors --modversion gdlib 2>/dev/null`
++      if test "$?" != "0" -a -n "${GD_VERSION}"; then
++              CFLAGS"`pkg-config --silence-errors --cflags gdllib 2>/dev/null`"
++              LIBS="`pkg-config --silence-errors --libs gdlib 2>/dev/null`"
++      else
++              AC_MSG_CHECKING(via gdlib-config)
++              GD_VERSION="`gdlib-config --version 2>/dev/null`"
++              if test "$?" = "0" -a -n "${GD_VERSION}"; then
++                      CFLAGS="`gdlib-config --cflags 2>/dev/null`"
++                      LIBS="`gdlib-config --libs 2>/dev/null`"
++              else
++                      GD_VERSION="none"
++                      CFLAGS=""
++                      LIBS="-lgd"
++              fi
+       fi
+       AC_MSG_RESULT(${GD_VERSION} found)
+-      case "${GD_VERSION}" in
+-      none)
+-              ;;
+-      2.0.5 | 2.0.6 | 2.0.7)
+-              AC_MSG_WARN([[gd ${GD_VERSION} detected, unable to use gdlib-config script]])
+-              AC_MSG_WARN([[If gd detection fails, upgrade gd or use --with-gd-includes and --with-gd-libs]])
+-              ;;
+-      *)
+-              CFLAGS="`gdlib-config --includes 2>/dev/null`"
+-              LDFLAGS="`gdlib-config --ldflags 2>/dev/null`"
+-              LIBS="`gdlib-config --libs 2>/dev/null`"
+-              ;;
+-      esac
+-
+       dnl Now allow overriding gd settings if the user knows best
+       AC_MSG_CHECKING(for gd include flags)
+       AC_ARG_WITH(gd-includes,
+@@ -70,7 +60,7 @@ if test -z "${nut_have_libgd_seen}"; then
+                       ;;
+               esac
+       ], [])
+-      AC_MSG_RESULT([${LDFLAGS} ${LIBS}])
++      AC_MSG_RESULT([${LIBS}])
+       dnl check if gd is usable
+       AC_CHECK_HEADERS(gd.h gdfontmb.h, [nut_have_libgd=yes], [nut_have_libgd=no], [AC_INCLUDES_DEFAULT])
+@@ -79,12 +69,11 @@ if test -z "${nut_have_libgd_seen}"; then
+       if test "${nut_have_libgd}" = "yes"; then
+               AC_DEFINE(HAVE_LIBGD, 1, [Define if you have Boutell's libgd installed])
+               LIBGD_CFLAGS="${CFLAGS}"
+-              LIBGD_LDFLAGS="${LDFLAGS} ${LIBS}"
++              LIBGD_LDFLAGS="${LIBS}"
+       fi
+       dnl put back the original versions
+       CFLAGS="${CFLAGS_ORIG}"
+-      LDFLAGS="${LDFLAGS_ORIG}"
+       LIBS="${LIBS_ORIG}"
+ fi
+ ])
index d4e62dd42d621e7b1a25d3b3bedcf1ad29e5d7f3..70454a4fd28ebe8d9cdbbd7b05e665a5c293a01d 100644 (file)
@@ -17,6 +17,7 @@ PKG_HASH:=98979c6e3f78b294dc663e3fd75d5c9e9d779f247be9d4e3ab84b5e90565f81f
 
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING.LGPL
+PKG_CPE_ID:=cpe:/a:infradead:openconnect
 
 PKG_CONFIG_DEPENDS:= \
        CONFIG_OPENCONNECT_GNUTLS \
index 3eb9413239a970e66a13aa4ff872ac23eaa00517..094b13d387592048ca4430ce22fb9963c1ea6ccf 100644 (file)
@@ -19,7 +19,7 @@ PKG_HASH:=bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68
 
 PKG_LICENSE:=BSD ISC
 PKG_LICENSE_FILES:=LICENCE
-
+PKG_CPE_ID:=cpe:/a:openssh:openssh
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_REMOVE_FILES:=
index 709e8190a3a9e4b7f3524e914ad5a4e23c847c2c..ee03c78fe63d92cb83669f7f2fb8796747c5b75b 100644 (file)
@@ -15,14 +15,15 @@ include $(INCLUDE_DIR)/kernel.mk
 #  - Check and update kmod dependencies when necessary (runtime module load check in the least)
 #
 PKG_NAME:=openvswitch
-PKG_VERSION:=2.11.1
-PKG_RELEASE:=2
+PKG_VERSION:=2.12.0
+PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.openvswitch.org/releases/
-PKG_HASH:=c1296ae44a7b176150915e33bc497cc0a7a02caeba84ea43ce9b6a2509d9b5dc
+PKG_HASH:=13fd42703180b4b1146c7e97926d09225485868cc2fbbd58dc0c421b4b8fe8f8
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:openvswitch:openvswitch
 
 PKG_BUILD_DEPENDS+=python3/host python-six/host
 PKG_USE_MIPS16:=0
@@ -40,7 +41,7 @@ include ../../lang/python/python3-package.mk
 
 ovs_kmod_packages:=
 ovs_kmod_intree_kernel_patchver_min:=3.10
-ovs_kmod_intree_kernel_patchver_max:=4.18
+ovs_kmod_intree_kernel_patchver_max:=5.0
 ovs_kmod_intree_not_supported:=$(strip $(call kernel_patchver_lt,$(ovs_kmod_intree_kernel_patchver_min))$(call kernel_patchver_gt,$(ovs_kmod_intree_kernel_patchver_max)))
 ovs_kmod_intree_dir:=$(PKG_BUILD_DIR)/datapath/linux
 ovs_kmod_upstream_dir:=$(LINUX_DIR)/net/openvswitch
@@ -111,14 +112,19 @@ $(eval $(call OvsKmodPackageTemplate,openvswitch-geneve))
 #    will be pulled in by kmod-gre6.  NOTE that tunnel6.ko itself cannot be
 #    enabled and selected on its own
 #
+#  - kmod-ipt-conntrack-extra: required for nf_conncount.ko
+#
 ovs_kmod_openvswitch-intree_title:=Open vSwitch kernel datapath (in tree)
 ovs_kmod_openvswitch-intree_depends:=\
          +kmod-lib-crc32c \
          +kmod-nf-nat \
          +IPV6:kmod-nf-nat6 \
          +kmod-nf-conntrack \
-         +IPV6:kmod-nf-conntrack6 \
-         +kmod-gre +IPV6:kmod-gre6 \
+         +(IPV6&&(LINUX_4_9||LINUX_4.14)):kmod-nf-conntrack6 \
+         +(LINUX_4_9||LINUX_4.14):kmod-gre \
+         +(IPV6&&(LINUX_4_9||LINUX_4.14)):kmod-gre6 \
+         +(!LINUX_4_9&&!LINUX_4.14):kmod-udptunnel4 \
+         +(!LINUX_4_9&&!LINUX_4.14):kmod-ipt-conntrack-extra \
 
 ovs_kmod_openvswitch-intree_files:= $(ovs_kmod_intree_dir)/openvswitch.ko
 $(eval $(call OvsKmodPackageTemplate,openvswitch-intree))
index 33af680592a1c4429e809e6e9d0f7ee12f795ef0..3a293f21a2b91d9531fef0da262de663369d32fa 100644 (file)
@@ -1,7 +1,7 @@
-From bfcee43923a4bb07954f6648bde1abdcbfa5d95f Mon Sep 17 00:00:00 2001
+From d215c18a17e82194d4ab9ecd14776712f12d6b07 Mon Sep 17 00:00:00 2001
 From: Helmut Schaa <helmut.schaa@googlemail.com>
 Date: Wed, 8 Jan 2014 13:48:49 +0100
-Subject: [PATCH 1/5] netdev-linux: Let interface flag survive internal port
+Subject: [PATCH 1/4] netdev-linux: Let interface flag survive internal port
  setup
 
 Due to a race condition when bringing up an internal port on Linux
@@ -18,10 +18,10 @@ Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
-index 25d037cb6..ba1427986 100644
+index 2432cd176..11efbdbc9 100644
 --- a/lib/netdev-linux.c
 +++ b/lib/netdev-linux.c
-@@ -3117,7 +3117,13 @@ update_flags(struct netdev_linux *netdev, enum netdev_flags off,
+@@ -3161,7 +3161,13 @@ update_flags(struct netdev_linux *netdev, enum netdev_flags off,
      unsigned int old_flags, new_flags;
      int error = 0;
  
index 5cfbecb25235a70c53b619d3ec6c504fd1d131ed..73f40ff314f273569b431ca543cdc45041ae461d 100644 (file)
@@ -1,7 +1,7 @@
-From e881c50ff537d4b34c10227360589f83d90ce373 Mon Sep 17 00:00:00 2001
+From e2d9b5d6fc33d7b9cbb7dc16832c5c86e6470966 Mon Sep 17 00:00:00 2001
 From: Yousong Zhou <zhouyousong@yunionyun.com>
 Date: Tue, 21 Aug 2018 12:21:05 +0000
-Subject: [PATCH 2/5] python: separate host/target python for cross-compile
+Subject: [PATCH 2/4] python: separate host/target python for cross-compile
 
 At the moment, python-six is a requirement for openvswitch python
 library on target machine.
@@ -26,10 +26,10 @@ index ff1f94b48..417f53230 100644
  ALL_LOCAL =
  BUILT_SOURCES =
 diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
-index 41042c98e..4a5f0a84a 100644
+index cd6b51d86..6dc9d630b 100644
 --- a/m4/openvswitch.m4
 +++ b/m4/openvswitch.m4
-@@ -449,7 +449,9 @@ AC_DEFUN([OVS_CHECK_PYTHON],
+@@ -456,7 +456,9 @@ AC_DEFUN([OVS_CHECK_PYTHON],
        fi])
      AC_SUBST([PYTHON])
      PYTHON=$ovs_cv_python
index 667f38e0f729447aff08199c6be456c57882bbb3..4d9b04de3b7a626e24167fe95ad3bf98d63f3586 100644 (file)
@@ -1,7 +1,7 @@
-From b65652ff441c4236b51f037a76147331c1ffd5fd Mon Sep 17 00:00:00 2001
+From 10fa6a820c155b6b7a97875de0b805aacf1046b8 Mon Sep 17 00:00:00 2001
 From: Yousong Zhou <yszhou4tech@gmail.com>
 Date: Wed, 14 Mar 2018 16:44:13 +0800
-Subject: [PATCH 3/5] ovs-lib: fix install_dir()
+Subject: [PATCH 3/4] ovs-lib: fix install_dir()
 
 The command "install" is not available in OpenWrt by default
 
@@ -11,7 +11,7 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
-index 9a0af2e82..68ab3f250 100644
+index d646b444a..dee63dece 100644
 --- a/utilities/ovs-lib.in
 +++ b/utilities/ovs-lib.in
 @@ -159,7 +159,10 @@ install_dir () {
index 6d552ac08611293f18de1871b9ea03fbe9ba12f2..e1c0f82111fcf2b004db46ebae1fd74a8659efef 100644 (file)
@@ -1,7 +1,7 @@
-From 2f9075aca5f54b8d0c14517c408f162985fb1b18 Mon Sep 17 00:00:00 2001
+From 77dfef9dd14987b091c2d4fc9475690759e1f4d7 Mon Sep 17 00:00:00 2001
 From: Yousong Zhou <zhouyousong@yunionyun.com>
 Date: Tue, 21 Aug 2018 13:02:21 +0000
-Subject: [PATCH 4/5] build: disable building tests
+Subject: [PATCH 4/4] build: disable building tests
 
 Signed-off-by: Yousong Zhou <zhouyousong@yunionyun.com>
 ---
diff --git a/net/openvswitch/patches/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch b/net/openvswitch/patches/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
deleted file mode 100644 (file)
index 1f77ab5..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001
-From: Yousong Zhou <zhouyousong@yunionyun.com>
-Date: Fri, 3 May 2019 15:03:24 +0000
-Subject: [PATCH 5/5] datapath: conntrack: fix include for
- IP6_DEFRAG_CONNTRACK_IN
-
-The enum definition is now inside include/net/ipv6_frag.h since upstream commit
-70b095c ("ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module") which was
-backported to stable trees (4.9, 4.14, 4.19) only these days.
-
-The error message
-
-         CC [M]  /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o
-       /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c: In function 'handle_fragments':
-       /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:8: error: variable 'user' has initializer but incomplete type
-          enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
-               ^~~~~~~~~~~~~~~~
-       /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: error: 'IP6_DEFRAG_CONNTRACK_IN' undeclared (first use in this function); did you mean 'IP_DEFRAG_CONNTRACK_IN'?
-          enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
-                                       ^~~~~~~~~~~~~~~~~~~~~~~
-                                       IP_DEFRAG_CONNTRACK_IN
-       /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: note: each undeclared identifier is reported only once for each function it appears in
-       /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: error: storage size of 'user' isn't known
-          enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
-                                ^~~~
-       /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: warning: unused variable 'user' [-Wunused-variable]
-       scripts/Makefile.build:326: recipe for target '/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o' failed
-
-Reference: https://github.com/openwrt/packages/issues/8548#issuecomment-488871090
-Signed-off-by: Yousong Zhou <zhouyousong@yunionyun.com>
----
- datapath/conntrack.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/datapath/conntrack.c b/datapath/conntrack.c
-index a7dc9e0c3..69bda5a9c 100644
---- a/datapath/conntrack.c
-+++ b/datapath/conntrack.c
-@@ -31,6 +31,7 @@
- #include <net/netfilter/nf_conntrack_seqadj.h>
- #include <net/netfilter/nf_conntrack_zones.h>
- #include <net/netfilter/ipv6/nf_defrag_ipv6.h>
-+#include <net/ipv6_frag.h>
- #ifdef CONFIG_NF_NAT_NEEDED
- #include <linux/netfilter/nf_nat.h>
index 7b8075a7abd8c95ef110a40b30a35899abef1f07..41c4e42f0b58b0d74029fb9be2ba8526175a9b70 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pdns
 PKG_VERSION:=4.2.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/
@@ -175,6 +175,7 @@ CONFIGURE_ARGS+= \
        --sysconfdir=/etc/powerdns \
        --libdir=/usr/lib/powerdns  \
        --with-dynmodules="$(foreach backend,$(PDNS_BACKENDS),$(if $(CONFIG_PACKAGE_pdns-backend-$(backend)),$(PDNS_BACKEND_$(backend)_LIB),))" \
+       --with-lua="lua" \
        --with-modules="bind random" \
        --with-mysql-lib=$(STAGING_DIR)/usr \
        --with-mysql-includes=$(STAGING_DIR)/usr \
index 93aa18a26a28b5e6cfd98904d27268f67ba77a02..52ccf6e2717fe9308f4e2837d17d3032fc82af98 100644 (file)
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/$(PKG_NAME)/
 PKG_HASH:=a259750793ab79c491d05fcee5a917faf7d9030fb5d15e05b3704e9c9e4ee015
 
+PKG_CPE_ID:=cpe:/a:pps.jussieu:polipo
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/polipo
index 083254b834bcf0553650009b1c9b12954fcd8abf..6c90f4f492b74153d6c020b74a47fd0659083e8d 100644 (file)
@@ -18,6 +18,8 @@ PKG_HASH:=8fcd8b8a42de2af59e9fe8cbaa9f894045c977f4d038bbd6346a8522bb7f06c0
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
+PKG_CPE_ID:=cpe:/a:poptop:pptp_server
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/pptpd
index d350875d3c15cc4639165deec7ffa0dc88cc4e49..c33efd9c6b611b5fde6b73a272943d1c57e71bd2 100644 (file)
@@ -20,6 +20,7 @@ PKG_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:privoxy:privoxy
 
 PKG_MAINTAINER:=
 
index 864f10353f419c5350d97cfd1f8877c04b0afed7..6f589509578d5457d25106c6cae3f9026050a53c 100644 (file)
@@ -19,6 +19,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/Radicale-$(PKG_VERSION)
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:radicale:radicale
 
 include $(INCLUDE_DIR)/package.mk
 include ../../lang/python/python3-package.mk
index 5bf5c1f44417d73df57d229321087874b3c7c240..1ed70584813813dc4bf713c623a9374c435472b0 100644 (file)
@@ -10,6 +10,7 @@ PKG_MAINTAINER:=Daniel Dickinson <cshored@thecshore.com>
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:radicale:radicale
 
 PKG_SOURCE:=Radicale-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/R/Radicale/
index 76a1a3ca90f28b0e4e9112ce7826c272ab33da15..8a0f9ebebbf927d0512ae29e3884399b19453433 100644 (file)
@@ -17,6 +17,7 @@ PKG_HASH:=2cf23e618ab9275221350acf5a97bce4ff18aee472045f8a3b4c7673491079d2
 
 PKG_LICENSE:=BSD-3-CLAUSE
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:uninett:radsecproxy
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index 4898037cd1d1d1d8451ee5171459765d6751ab2f..cff70a7a4810b3f382b4f7c3ed98f801d33fdc3c 100644 (file)
@@ -11,6 +11,7 @@ PKG_NAME:=rp-pppoe
 PKG_VERSION:=3.12
 PKG_RELEASE:=7
 PKG_LICENSE:=LGPL-2.0-or-later
+PKG_CPE_ID:=cpe:/a:roaring_penguin:pppoe
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://roaringpenguin.com/files/download
index 0831a9e08e78d61d17abb19f8dc396346d357f00..a0c6b4569b001ce02c5358f813e8a4d14458af9c 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0
 PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:rsync:rsync
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
index 78a26d136892567a8395b622f3bbb6488c83d3c0..2b47af5c2ae9c284db5599bbd98bb4f6059307f1 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=c71f96fed6538de397df25da602384f6ee2cb67329d9f3362af2a18508616ab4
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:rsyslog:rsyslog
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
index bb5841e304c8217b99e64d18f180c4a976ebcaac..faa9abc128a92533cb802c7e4bdcafb26e64cc85 100644 (file)
@@ -17,6 +17,7 @@ PKG_HASH:=ab18331e37766b13dbb07d1f115bda3d794917baf502d0ca2b2b8fff014b88f2
 PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:samba:samba
 
 # samba4=(asn1_compile) e2fsprogs=(compile_et) nfs-kernel-server=(rpcgen)
 HOST_BUILD_DEPENDS:=python/host nfs-kernel-server/host e2fsprogs/host
index c6b8ce61624cc7829654ef5b00dbe68cf3387981..19c06031e2b69a56d2fad7ce467d7bbc2984ada7 100644 (file)
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=scapy
-PKG_VERSION:=2.4.2
+PKG_VERSION:=2.4.3
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=PKG-INFO
+PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/secdev/scapy/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=141ee386cf6f296e8c9fae94a40a5386ac2d9bfa43a3870b13f575200c46b5f8
+PKG_HASH:=6cacd9ebe2beeb06b10ff57bff3632222755e9d62f1b38e71b02edab6e71d776
 
 include $(INCLUDE_DIR)/package.mk
 include ../../lang/python/python3-package.mk
index f54189670b8ea226bc6f8ad21fd6016a4a3f418b..369a2e34d941098167bfed84aaec6d498ad45d40 100644 (file)
@@ -23,7 +23,7 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_BUILD_DEPENDS:=scons/host
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/scons.mk
+include ../../devel/scons/scons.mk
 
 define Package/smartsnmpd
   SECTION:=net
index 2f65527e15785d4c8ed4bab269455a3c74acc56c..073ce7891406a37a4d3b6530695862c9a8094bcd 100644 (file)
@@ -13,6 +13,7 @@ PKG_RELEASE:=8
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+PKG_CPE_ID:=cpe:/a:snort:snort
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.snort.org/downloads/snort/ \
index 73c6ce825fa2458c4aaa1fcc3167e6ceee3a7cb0..bbe0be642c2056fc8b8c482c3d5c27248cd8d2b3 100644 (file)
@@ -12,6 +12,7 @@ PKG_RELEASE:=3
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+PKG_CPE_ID:=cpe:/a:snort:snort
 
 PKG_SOURCE:=snort-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.snort.org/downloads/snortplus/
index b664b4590614fc2afbf19b9f9b557c220fef625a..33a4bf1cddb07696b96f03a9b8507aafb115e85e 100644 (file)
@@ -16,6 +16,7 @@ PKG_HASH:=0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=GPL-2.0-or-later OpenSSL
 PKG_LICENSE_FILES:=COPYING COPYING.OpenSSL
+PKG_CPE_ID:=cpe:/a:dest-unreach:socat
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
index 95497a693554569a23dc59d0eafff210b3b5f0a4..654a61f4c2681a335730646bc8d76c6c040e046c 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sqm-scripts
-PKG_SOURCE_VERSION:=4d6ec3349026dac798b5dd84dbffa0bc8331ff04
-PKG_VERSION:=1.3.0
+PKG_SOURCE_VERSION:=ab763cba8b1516b3afa99760e0ca884f8b8d93b8
+PKG_VERSION:=1.4.0
 PKG_RELEASE:=1
 PKG_LICENSE:=GPLv2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.xz
-PKG_MIRROR_HASH:=ae61179fb60a44e5b657f4d6cdce861b91fc20c224465d2b2ddf2d12d1833edf
+PKG_MIRROR_HASH:=00bc93f667ad417d4ba9bea4a01d87e3c670a294f61de13348a0f71e7700241f
 PKG_SOURCE_URL:=https://github.com/tohojo/sqm-scripts.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)
index 21ca810ca3a49ac78cb01b4d1a66f9b2c107e919..e59f70203a7f13bd6f16a47f8bec139fca28b1ae 100644 (file)
@@ -19,6 +19,7 @@ PKG_HASH:=015bade5d3a4905142c4c605df5c4216471e3d8338079955e0e44b0ae0303d41
 
 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
 PKG_LICENSE:=GPL-2.0-or-later
+PKG_CPE_ID:=cpe:/a:squid-cache:squid
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
index ea2cfce04ebbf2f8b23072c4cb476de05939bf26..6daa4e4208f4ea6210e2fba61cc50e82fd51ccec 100644 (file)
@@ -8,14 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=strongswan
-PKG_VERSION:=5.8.0
-PKG_RELEASE:=2
+PKG_VERSION:=5.8.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/
-PKG_HASH:=15b1e10c7dd6253ab5d791fe9b9cb84624e24c118aecd9b90251b4e60daa0933
+PKG_HASH:=d9af70acea5c054952ad1584916c1bf231b064eb6c8a9791dcb6ae90a769990c
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be>
+PKG_CPE_ID:=cpe:/a:strongswan:strongswan
 
 PKG_MOD_AVAILABLE:= \
        addrblock \
index ef0c51c2ce255bd45256f0bf1cd18eb2525e8ae8..70ccc885951a1da282dd49c461bc464c0e7afaa6 100644 (file)
@@ -8,7 +8,7 @@
  ARG_DISBL_SET([curve25519],     [disable Curve25519 Diffie-Hellman plugin.])
  ARG_DISBL_SET([hmac],           [disable HMAC crypto implementation plugin.])
  ARG_ENABL_SET([md4],            [enable MD4 software implementation plugin.])
-@@ -1423,6 +1424,7 @@ ADD_PLUGIN([botan],                [s ch
+@@ -1431,6 +1432,7 @@ ADD_PLUGIN([botan],                [s ch
  ADD_PLUGIN([af-alg],               [s charon scepclient pki scripts medsrv attest nm cmd aikgen])
  ADD_PLUGIN([fips-prf],             [s charon nm cmd])
  ADD_PLUGIN([gmp],                  [s charon scepclient pki scripts manager medsrv attest nm cmd aikgen fuzz])
@@ -16,7 +16,7 @@
  ADD_PLUGIN([curve25519],           [s charon pki scripts nm cmd])
  ADD_PLUGIN([agent],                [s charon nm cmd])
  ADD_PLUGIN([keychain],             [s charon cmd])
-@@ -1563,6 +1565,7 @@ AM_CONDITIONAL(USE_SHA3, test x$sha3 = x
+@@ -1571,6 +1573,7 @@ AM_CONDITIONAL(USE_SHA3, test x$sha3 = x
  AM_CONDITIONAL(USE_MGF1, test x$mgf1 = xtrue)
  AM_CONDITIONAL(USE_FIPS_PRF, test x$fips_prf = xtrue)
  AM_CONDITIONAL(USE_GMP, test x$gmp = xtrue)
@@ -24,7 +24,7 @@
  AM_CONDITIONAL(USE_CURVE25519, test x$curve25519 = xtrue)
  AM_CONDITIONAL(USE_RDRAND, test x$rdrand = xtrue)
  AM_CONDITIONAL(USE_AESNI, test x$aesni = xtrue)
-@@ -1838,6 +1841,7 @@ AC_CONFIG_FILES([
+@@ -1846,6 +1849,7 @@ AC_CONFIG_FILES([
        src/libstrongswan/plugins/mgf1/Makefile
        src/libstrongswan/plugins/fips_prf/Makefile
        src/libstrongswan/plugins/gmp/Makefile
index 5a72a2701b061ec3701da9a49131a26c2d2e74e9..d7a8d5ee05de6560155799db551b8d6c365d2b55 100644 (file)
@@ -13,6 +13,7 @@ PKG_HASH:=6736d799a202ff665549359859441c6d2b5e3425bffef9ee60ab5a101342a40d
 
 PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
 PKG_LICENSE:=GPL-2.0-only
+PKG_CPE_ID:=cpe:/a:zaal:tgt
 
 PKG_USE_MIPS16:=0
 PKG_INSTALL:=1
index a70f018f95a2efc75c0c46652ad15b8dd1858827..8b24aae7240c38f39acd5970094fc90c37f15f21 100644 (file)
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.tinc-vpn.org/packages
 PKG_HASH:=18c83b147cc3e2133a7ac2543eeb014d52070de01c7474287d3ccecc9b16895e
 
+PKG_CPE_ID:=cpe:/a:tinc:tinc
+
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
index a7865c96e862d23e22caa27428a2fc332f9a2314..7400ac9dedbe31453ff44c11071b6e9faf8b2118 100644 (file)
@@ -16,6 +16,8 @@ PKG_SOURCE_URL:=http://www.banu.com/pub/tinyproxy/1.8/
 PKG_HASH:=be559b54eb4772a703ad35239d1cb59d32f7cf8a739966742622d57df88b896e
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 
+PKG_CPE_ID:=cpe:/a:banu:tinyproxy
+
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
index 9c4265b7a0933a55cc971a7de84940c67ee3b525..917739313d697897d9fd9c4ab9ade3586e613937 100644 (file)
@@ -19,6 +19,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
 
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:transmissionbt:transmission
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index 12826f45b9bfbe4f77b5f2f5529f043f7d1e5efb..188091a1e69c5a37424b0b43d6b82e7697f68247 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ulogd
 PKG_VERSION:=2.0.7
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://netfilter.org/projects/ulogd/files/ \
@@ -20,6 +20,7 @@ PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=COPYING
 
+PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
index c7c0ded851a143fa4b6f2940e4f02dff4b4cafb7..a1050091078265a00fdc775daad65e9bc48767ec 100644 (file)
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=https://github.com/xinetd-org/xinetd/archive
 PKG_HASH:=bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3
 PKG_LICENSE:=xinetd
 PKG_LICENSE_FILES:=COPYRIGHT
+PKG_CPE_ID:=cpe:/a:xinetd:xinetd
 
 PKG_INSTALL:=1
 
index f2e28cc75f2637a95fe5e66cc817ee157a63bba1..4413da2df0d9284bba0c28c4735e7c05dc0ad4b4 100644 (file)
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zerotier
-PKG_VERSION:=1.4.4
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.6
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=0c11aab77b1c30fb8932e31906fc93fe7cb38c579c33740c1d407ec13d5b3e12
+PKG_HASH:=d1a0eeb03acfa446f67adf5901902d17de14b4648c21e160024acf476e3d4fba
 PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de>
index c2cb4e941d6624a1a95e84a742e6d9a04c5442f8..76d21a59af6ce575e77f00f073df277b82c83b3f 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=forked-daapd
 PKG_VERSION:=26.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/ejurgensen/$(PKG_NAME)/releases/download/$(PKG_VERSION)/
diff --git a/sound/forked-daapd/patches/010-alsa.patch b/sound/forked-daapd/patches/010-alsa.patch
new file mode 100644 (file)
index 0000000..a4256ab
--- /dev/null
@@ -0,0 +1,36 @@
+From 20f5118f7505e2e82be3504624ac934b8837d25b Mon Sep 17 00:00:00 2001
+From: Scott Shambarger <devel@shambarger.net>
+Date: Tue, 11 Jun 2019 20:10:04 -0700
+Subject: [PATCH] [alsa] asoundlib.h should be alsa/asoundlib.h
+
+---
+ configure.ac       | 2 +-
+ src/outputs/alsa.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9ec5eb101..98068bf11 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -238,7 +238,7 @@ AC_CHECK_SIZEOF([void *])
+ dnl --- Begin configuring the options ---
+ dnl ALSA
+ FORK_ARG_WITH_CHECK([FORKED_OPTS], [ALSA support], [alsa], [ALSA],
+-      [alsa], [snd_mixer_open], [asoundlib.h])
++      [alsa], [snd_mixer_open], [alsa/asoundlib.h])
+ AM_CONDITIONAL([COND_ALSA], [[test "x$with_alsa" = "xyes"]])
+ dnl PULSEAUDIO
+diff --git a/src/outputs/alsa.c b/src/outputs/alsa.c
+index b696f0c3d..1a32aad19 100644
+--- a/src/outputs/alsa.c
++++ b/src/outputs/alsa.c
+@@ -30,7 +30,7 @@
+ #include <inttypes.h>
+ #include <event2/event.h>
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ #include "misc.h"
+ #include "conffile.h"
index 3218b2e95db2535ad8bf4bc32856b8e67fc95fa4..f301f89b67b4ed87833630b4a4adaa38622c944c 100644 (file)
@@ -20,6 +20,7 @@ PKG_FIXUP:=libtool
 
 PKG_LICENSE:=LGPL-2.1 GPL-2.0
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:mpg123:mpg123
 
 PKG_INSTALL:=1
 
index fc6c9aadecd98172a17f95120a605a6658d84237..1688f7c37273cb9ee2b52a19c842354ad1c3273b 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pulseaudio
 PKG_VERSION:=12.2
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases/
@@ -17,6 +17,7 @@ PKG_HASH:=809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055
 
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=GPL LICENSE
+PKG_CPE_ID:=cpe:/a:pulseaudio:pulseaudio
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
@@ -116,6 +117,7 @@ CONFIGURE_ARGS += \
        --disable-jack \
        --disable-asyncns \
        --disable-lirc \
+       --disable-tests \
        --disable-udev \
        --without-fftw \
        --without-soxr \
diff --git a/sound/pulseaudio/patches/010-also-include.patch b/sound/pulseaudio/patches/010-also-include.patch
new file mode 100644 (file)
index 0000000..aec5b17
--- /dev/null
@@ -0,0 +1,130 @@
+From 993d3fd89e5611997f1e165bf03edefb0204b0a4 Mon Sep 17 00:00:00 2001
+From: Olaf Hering <olaf@aepfle.de>
+Date: Wed, 27 Mar 2019 09:35:05 +0100
+Subject: [PATCH] alsa: Use correct header path
+
+Consumers are expected to use <alsa/asoundlib.h> instead of
+<asoundlib.h>.
+
+This is in preparation of an change to pkgconfig(alsa) to
+not pollute CFLAGS with -I/usr/include/alsa anymore.
+
+Signed-off-by: Olaf Hering <olaf@aepfle.de>
+---
+ src/modules/alsa/alsa-mixer.c         | 2 +-
+ src/modules/alsa/alsa-mixer.h         | 2 +-
+ src/modules/alsa/alsa-sink.c          | 2 +-
+ src/modules/alsa/alsa-source.c        | 2 +-
+ src/modules/alsa/alsa-ucm.c           | 2 +-
+ src/modules/alsa/alsa-util.c          | 2 +-
+ src/modules/alsa/alsa-util.h          | 2 +-
+ src/modules/alsa/module-alsa-source.c | 2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
+index 5cb99c8fd..cd99a75f8 100644
+--- a/src/modules/alsa/alsa-mixer.c
++++ b/src/modules/alsa/alsa-mixer.c
+@@ -23,7 +23,7 @@
+ #endif
+ #include <sys/types.h>
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ #include <math.h>
+ #ifdef HAVE_VALGRIND_MEMCHECK_H
+diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
+index 3ea4d7329..65b071165 100644
+--- a/src/modules/alsa/alsa-mixer.h
++++ b/src/modules/alsa/alsa-mixer.h
+@@ -21,7 +21,7 @@
+   along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+ ***/
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ #include <pulse/sample.h>
+ #include <pulse/mainloop-api.h>
+diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
+index 28143402a..4b46708ce 100644
+--- a/src/modules/alsa/alsa-sink.c
++++ b/src/modules/alsa/alsa-sink.c
+@@ -25,7 +25,7 @@
+ #include <signal.h>
+ #include <stdio.h>
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ #ifdef HAVE_VALGRIND_MEMCHECK_H
+ #include <valgrind/memcheck.h>
+diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
+index 8129220b0..c8bf649e1 100644
+--- a/src/modules/alsa/alsa-source.c
++++ b/src/modules/alsa/alsa-source.c
+@@ -25,7 +25,7 @@
+ #include <signal.h>
+ #include <stdio.h>
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ #include <pulse/rtclock.h>
+ #include <pulse/timeval.h>
+diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
+index 341c8012e..0a40ca8fe 100644
+--- a/src/modules/alsa/alsa-ucm.c
++++ b/src/modules/alsa/alsa-ucm.c
+@@ -27,7 +27,7 @@
+ #include <ctype.h>
+ #include <sys/types.h>
+ #include <limits.h>
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ #ifdef HAVE_VALGRIND_MEMCHECK_H
+ #include <valgrind/memcheck.h>
+diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
+index e8d712e72..bd0a47e50 100644
+--- a/src/modules/alsa/alsa-util.c
++++ b/src/modules/alsa/alsa-util.c
+@@ -23,7 +23,7 @@
+ #endif
+ #include <sys/types.h>
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ #include <pulse/sample.h>
+ #include <pulse/xmalloc.h>
+diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
+index 6b27339ec..4ceaa06ee 100644
+--- a/src/modules/alsa/alsa-util.h
++++ b/src/modules/alsa/alsa-util.h
+@@ -21,7 +21,7 @@
+   along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+ ***/
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ #include <pulse/sample.h>
+ #include <pulse/channelmap.h>
+diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
+index af6800dd2..747ba9342 100644
+--- a/src/modules/alsa/module-alsa-source.c
++++ b/src/modules/alsa/module-alsa-source.c
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ #ifdef HAVE_VALGRIND_MEMCHECK_H
+ #include <valgrind/memcheck.h>
+-- 
+2.22.0
+
index c327aa8489787a7ed85fc9c5c3572ef306665bd3..7c9b32228fe46b8b3d6c49fcd939ba6ab4dafcd5 100644 (file)
@@ -17,6 +17,7 @@ PKG_HASH:=28b77b62d3f64ebd1c2a3d16bccc6d4333b4e24a86aeacebec255fad223cf4cb
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:tedfelix:acpid
 
 include $(INCLUDE_DIR)/package.mk
 
index d825d6055e08c438b28d043844fa1063f6187a15..ce3f03ddc732c89c2bdc1ebd71e020db4c22e30b 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+PKG_CPE_ID:=cpe:/a:gnu:bash
 
 PKG_INSTALL:=1
 
index 2412d33b6e7352e06e30fbfe25e52845d29fa782..9722d62644ba30aabd2be15e041a527a23d75b9c 100644 (file)
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bigclown-firmware-tool
-PKG_VERSION:=1.3.0
+PKG_VERSION:=1.4.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/bigclownlabs/bch-firmware-tool/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=2ba459148a5f23773ab14d0f5d5cc381c441d758cb9f23cdbec18b30b07675ab
+PKG_HASH:=076acd25af717fa9cc0ce180e2e863cfce8957d00cc24e982f44c91bae10f956
 PKG_BUILD_DIR:=$(BUILD_DIR)/bch-firmware-tool-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz>
index 14a462f81bcd4bc760ff7e4197e48f9f79c7977a..b87b548a1b68e3aa8863ccd24028a77df3919c60 100644 (file)
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bigclown-mqtt2influxdb
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.2.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://codeload.github.com/bigclownlabs/bch-mqtt2influxdb/tar.gz/v$(PKG_VERSION)?
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=5be14132311e85215abbfd732fe6cd652522ea0a343ee8ba7abab3ec7578eb99
+PKG_HASH:=60a3ba8a3d76356ed46fbb7bcbedaf439b7edc2dfc2d43232c9250db80c77387
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz>
 PKG_BUILD_DIR:=$(BUILD_DIR)/bch-mqtt2influxdb-$(PKG_VERSION)
index 55a3e665fcf4836d218bcb55c05f45221334aca7..5c95600ffd8e3b41dca55dfaa9acea8bb1fa67c5 100644 (file)
@@ -10,8 +10,7 @@ CONF=/etc/bigclown-mqtt2influxdb.yml
 
 start_service() {
        procd_open_instance
-       procd_set_param respawn 3600 5 5
-       procd_set_param command "$PROG" -c "$CONF"
+       procd_set_param command "$PROG" -d -c "$CONF"
        procd_set_param stdout 1
        procd_set_param stderr 1
        procd_close_instance
index 77a3dd74bbe134fb1addecfbe2ca771ab3c6e4a7..7a700320e0b1d3e652d9b4865d98338966eca86b 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=
+PKG_CPE_ID:=cpe:/a:bluez:bluez
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
index 21a2285ddc810f191a06110b0956ff36c3159268..83080488644e86104ed9d67728d682769e01046f 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=collectd
 PKG_VERSION:=5.9.0
-PKG_RELEASE:=4
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://collectd.org/files/ \
@@ -19,6 +19,7 @@ PKG_HASH:=7b220f8898a061f6e7f29a8c16697d1a198277f813da69474a67911097c0626b
 PKG_FIXUP:=autoreconf
 PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>, Hannu Nyman <hannu.nyman@iki.fi>
+PKG_CPE_ID:=cpe:/a:collectd:collectd
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
index a9182380f48348f7fdc860d588394b0df1c7f2de..89715d4c465b4e3ac4e49f3cd35efbb602774003 100644 (file)
@@ -44,6 +44,129 @@ process_exec_sections() {
        fi
 }
 
+process_curl() {
+       printf "<Plugin curl>\n" >> "$COLLECTD_CONF"
+       config_foreach process_curl_page curl_page
+       printf "</Plugin>\n\n" >> "$COLLECTD_CONF"
+}
+
+process_curl_page() {
+       local cfg="$1"
+
+       local name url
+
+       config_get name "$cfg" name
+       [ -z "$name" ] && {
+               $LOG notice "No name option in config $cfg defined"
+               return 0
+       }
+
+       config_get url "$cfg" url
+       [ -z "$url" ] && {
+               $LOG notice "No URL option in config $cfg defined"
+               return 0
+       }
+
+       printf "\\t<Page \"%s\">\n" "${name}" >> "$COLLECTD_CONF"
+       printf "\\t\\tURL \"%s\"\n" "${url}" >> "$COLLECTD_CONF"
+       printf "\\t\\tMeasureResponseTime true\n" >> "$COLLECTD_CONF"
+       printf "\\t</Page>\n" >> "$COLLECTD_CONF"
+}
+
+process_network() {
+       local cfg="$1"
+
+       local TimeToLive Forward CacheFlush
+
+       printf "<Plugin network>\n" >> "$COLLECTD_CONF"
+       config_foreach process_network_sections network_listen "listen"
+       config_foreach process_network_sections network_server "server"
+
+       config_get TimeToLive "$cfg" TimeToLive
+       [ -z "$TimeToLive" ] || {
+               printf "\\tTimeToLive %s\n" "${TimeToLive}" >> "$COLLECTD_CONF"
+       }
+
+       config_get CacheFlush "$cfg" CacheFlush
+       [ -z "$CacheFlush" ] || {
+               printf "\\tCacheFlush %s\n" "${CacheFlush}" >> "$COLLECTD_CONF"
+       }
+
+       config_get_bool Forward "$cfg" Forward
+       if [ "$value" = "0" ]; then
+               printf "\\tForward false\n" >> "$COLLECTD_CONF"
+       else
+               printf "\\tForward true\n" >> "$COLLECTD_CONF"
+       fi
+
+       printf "</Plugin>\n\n" >> "$COLLECTD_CONF"
+}
+
+process_network_sections() {
+       local cfg="$1"
+       local section="$2"
+
+       local host port output
+
+       config_get host "$cfg" host
+       [ -z "$host" ] && {
+               $LOG notice "No host option in config $cfg defined"
+               return 0
+       }
+
+       if [ "$section" = "server" ]; then
+               output="Server \"$host\""
+       else
+               output="Listen \"$host\""
+       fi
+
+       config_get port "$cfg" port
+       if [ -z "$port" ]; then
+               printf "\\t%s\n" "${output}" >> "$COLLECTD_CONF"
+       else
+               printf "\\t%s \"%s\"\n" "${output}" "${port}" >> "$COLLECTD_CONF"
+       fi
+}
+
+process_iptables() {
+       local cfg="$1"
+
+       printf "<Plugin iptables>\n" >> "$COLLECTD_CONF"
+       config_foreach process_iptables_sections iptables_match
+       printf "</Plugin>\n\n" >> "$COLLECTD_CONF"
+}
+
+process_iptables_sections() {
+       local cfg="$1"
+
+       local table chain
+
+       config_get table "$cfg" table
+       [ -z "$table" ] && {
+               $LOG notice "No table option in config $cfg defined"
+               return 0
+       }
+
+       config_get chain "$cfg" chain
+       [ -z "$chain" ] && {
+               $LOG notice "No chain option in config $cfg defined"
+               return 0
+       }
+
+       config_get index "$cfg" index
+       [ -z "$index" ] && {
+               $LOG notice "No index option in config $cfg defined"
+               return 0
+       }
+
+       config_get name "$cfg" name
+       if [ -z "$name" ]; then
+               printf "\\tChain %s %s %s\n" "${table}" "${chain}" "${index}" >> "$COLLECTD_CONF"
+       else
+               printf "\\tChain %s %s %s \"%s\"\n" "${table}" "${chain}" "${index}" "${name}">> "$COLLECTD_CONF"
+       fi
+}
+
 CONFIG_LIST=""
 add_list_option() {
        local value="$1"
@@ -139,6 +262,18 @@ process_plugins() {
                        CONFIG_STRING=""
                        process_exec
                        ;;
+               curl)
+                       CONFIG_STRING=""
+                       process_curl
+                       ;;
+               network)
+                       CONFIG_STRING=""
+                       process_network "$cfg"
+                       ;;
+               iptables)
+                       CONFIG_STRING=""
+                       process_iptables
+                       ;;
                *)
                        CONFIG_STRING=""
                        process_generic "$cfg" "\\t" "/usr/share/collectd/plugin/$cfg.json"
index 73e2c2ab597976f14d1e111c791545cb3d231d3b..a04cbc31a2800b18c4f7b287bfeb4fa3403d47bd 100644 (file)
@@ -8,6 +8,11 @@ config globals 'globals'
 #      option Interval '30'
 #      option ReadThreads '2'
 
+#config plugin 'apcups'
+#      option enable '0'
+#      option Host 'localhost'
+#      option Port '3551'
+
 #config plugin 'conntrack'
 #      option enable '0'
 
@@ -25,6 +30,13 @@ config globals 'globals'
 #      option StoreRates '0'
 #      option DataDir '/tmp'
 
+#config plugin 'curl'
+#      option enable '0'
+
+#config curl_page
+#      option name 'test'
+#      option url 'http://finance.google.com/finance?q=NYSE%3AAMD%22'
+
 #config plugin 'df'
 #      option enable '0'
 #      list Device '/dev/mtdblock/4'
@@ -69,6 +81,15 @@ config globals 'globals'
 #      list Interface 'br-lan'
 #      option IgnoreSelected '0'
 
+#config plugin 'iptables'
+#      option enable '1'
+
+#config iptables_match
+#      option table 'nat'
+#      option chain 'zone_wan_postrouting'
+#      option index '1'
+#      option name 'WLAN-Clients traffic'
+
 #config plugin 'irq'
 #      option enable '0'
 #      list Irq '2'
@@ -96,6 +117,20 @@ config globals 'globals'
 #      list VerboseInterface 'br-lan'
 #      list QDisc 'br-lan'
 
+#config plugin 'network'
+#      option enable '1'
+#      option TimeToLive '128'
+#      option Forward '1'
+#      option CacheFlush '86400'
+
+#config network_listen
+#      option host '0.0.0.0'
+#      option port '25826'
+
+#config network_server
+#      option host '1.1.1.1'
+#      option port '25826'
+
 #config plugin 'nut'
 #      option enable '0'
 #      option UPS 'myupsname'
diff --git a/utils/collectd/files/usr/share/collectd/plugin/apcups.json b/utils/collectd/files/usr/share/collectd/plugin/apcups.json
new file mode 100644 (file)
index 0000000..15a31df
--- /dev/null
@@ -0,0 +1,6 @@
+{
+       "string": [
+               "Host",
+               "Port"
+       ]
+}
index 2c63c0851048d8f7bff41ecf0f8cee05f52fd120..ef28a43e833d9ad238842953e1df91aede1a47ad 100644 (file)
@@ -1,2 +1,7 @@
 {
+       "bool": [
+               "ValuesPercentage",
+               "ReportByCpu",
+               "ReportByState"
+       ]
 }
diff --git a/utils/collectd/files/usr/share/collectd/plugin/curl.json b/utils/collectd/files/usr/share/collectd/plugin/curl.json
new file mode 100644 (file)
index 0000000..2c63c08
--- /dev/null
@@ -0,0 +1,2 @@
+{
+}
diff --git a/utils/collectd/files/usr/share/collectd/plugin/iptables.json b/utils/collectd/files/usr/share/collectd/plugin/iptables.json
new file mode 100644 (file)
index 0000000..2c63c08
--- /dev/null
@@ -0,0 +1,2 @@
+{
+}
index 2c63c0851048d8f7bff41ecf0f8cee05f52fd120..fc43e2fe9e550a5e624758f1b88ade614bbaac34 100644 (file)
@@ -1,2 +1,6 @@
 {
+       "bool": [
+               "ValuesPercentage",
+               "ValuesAbsolute"
+       ]
 }
diff --git a/utils/collectd/files/usr/share/collectd/plugin/network.json b/utils/collectd/files/usr/share/collectd/plugin/network.json
new file mode 100644 (file)
index 0000000..2c63c08
--- /dev/null
@@ -0,0 +1,2 @@
+{
+}
index 7c72e23746a088fc710ce42af5fa0ac240063724..420a2f866f681ca1f19cc9426c695511e4858bb0 100644 (file)
@@ -15,6 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/coreutils
 PKG_HASH:=e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
+PKG_CPE_ID:=cpe:/a:gnu:coreutils
 
 PKG_BUILD_PARALLEL:=1
 
index 107dda6c0a7017a4a9ff9844b5b4a1368f100806..9875e05fc460086ff480bb8803979891b78afc74 100644 (file)
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus/
 PKG_HASH:=9546f226011a1e5d9d77245fe5549ef25af4694053189d624d0d6ac127ecf5f8
 PKG_MAINTAINER:=
 PKG_LICENSE:=AFL-2.1
+PKG_CPE_ID:=cpe:/a:freedesktop:dbus
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
index 38ad39c280bb3b257c510aeb6e331d0883624899..38c304112200ab4bf778081c6a68c291b7527bf3 100644 (file)
@@ -19,6 +19,7 @@ PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:dosfstools_project:dosfstools
 
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
index 74861029d764e7cb0f7afe18a6d28484eb4c737c..aac9bc850ead3a0b999885d75615c640e9c42730 100644 (file)
@@ -17,6 +17,7 @@ PKG_HASH:=ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
 PKG_MAINTAINER:=Daniel Dickinson <cshored@thecshore.com>
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:gnu:findutils
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
index 8ce4474256fb9336034e4f83f894637892a3d810..69b292275570917f86233dd4d7b6586e9c9f2bef 100644 (file)
@@ -13,6 +13,7 @@ PKG_SOURCE_URL:=https://github.com/fish-shell/fish-shell/releases/download/$(PKG
 PKG_HASH:=14728ccc6b8e053d01526ebbd0822ca4eb0235e6487e832ec1d0d22f1395430e
 PKG_MAINTAINER:=Curtis Jiang <jqqqqqqqqqq@gmail.com>, Hao Dong <halbertdong@gmail.com>
 PKG_LICENSE:=GPL-2.0
+PKG_CPE_ID:=cpe:/a:fishshell:fish
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index 9a6a55f19a093fcaa0587caf5510da09372c8768..1a6567be95d579e79cc8527f5607e765a5f179ff 100644 (file)
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://fontconfig.org/release/
 PKG_HASH:=dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99
 
+PKG_CPE_ID:=cpe:/a:fontconfig_project:fontconfig
+
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
index 55c975d0aa6f24ff39d26480228e76f488bb48f7..721e3197bd8d2e9c46d116ae6d64a4c578869da1 100644 (file)
@@ -15,12 +15,15 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME)
 PKG_HASH:=27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39
 
+PKG_BUILD_DEPENDS:=scons/host
+
 PKG_MAINTAINER:=Pushpal Sidhu <psidhu.devel@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:berlios:gps_daemon
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/scons.mk
+include ../../devel/scons/scons.mk
 
 define Package/gpsd/Default
   DEPENDS+= +libusb-1.0
index d1e4d8f3b8b961272dcc67281e1e9445ab51c158..cd0fe6e76443257a5a5cd29a508a818e7187498f 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514
 PKG_MAINTAINER:=Julen Landa Alustiza <julen@zokormazo.info>
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:gnu:grep
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
index 67998f7f600eecc35f3dd93dc6d07238e5ecd54f..0b64553e3f1c13726f9574dbab3ff0dcd6b44f32 100644 (file)
@@ -15,6 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/gzip
 PKG_HASH:=8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0
 PKG_LICENSE:=GPL-3.0-or-later
+PKG_CPE_ID:=cpe:/a:gnu:gzip
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
index 409369903ad5029707d70b6bd3d4d7d6dd08c7c0..66843072e3471ab1bb69ca77783f0037de4230e5 100644 (file)
@@ -29,6 +29,7 @@ PKG_HASH:=495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de
 
 PKG_MAINTAINER:=Vitaly Protsko <villy@sft.ru>
 PKG_LICENCE:=GPL-2.0
+PKG_CPE_ID:=cpe:/a:joseph_allen:joe
 
 include $(INCLUDE_DIR)/package.mk
 
index 00fd460bac0b12b7a0da015e3856caadf8b8d339..231f03e88f5768670f39b98e3f107bf5bc9e2d8a 100644 (file)
@@ -19,6 +19,7 @@ PKG_MAINTAINER:=Harald Geyer <harald@ccbib.org>, \
                Philip Prindeville <philipp@redfish-solutions.com>
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:lcdproc:lcdproc
 
 include $(INCLUDE_DIR)/package.mk
 
index 9b334f13cc2412e1827a0c080f85dfd762e3d0e6..f74a40122f22cbcac79c55c6701ca59e9b9ee3ae 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=503f91ab0af4846f34f0444ab71c4b286123f0044a4964f1ae781486c617f2e2
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Julen Landa Alustiza <julen@zokormazo.info>
+PKG_CPE_ID:=cpe:/a:gnu:less
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL:=1
index 591dd9f226de5cfcff113a1321c53e248f90f21d..5cacb6112ac1d18649c029b7e8c85055010cee60 100644 (file)
@@ -19,6 +19,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION_SUBST)
 
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later
+PKG_CPE_ID:=cpe:/a:lm_sensors:lm_sensors
 
 PKG_BUILD_PARALLEL:=1
 
index 9a0304e12b1a6da49e9e844b19cab8934307a54f..6b44088eb2b6b05c77eced37901099df90ea8353 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=313612c4776a305393454c874ef590d8acf84c9ffa648717731dfe902284ff8f
 PKG_MAINTAINER:=Christian Beier <cb@shoutrlabs.com>
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:gentoo:logrotate
 
 include $(INCLUDE_DIR)/package.mk
 
index f14fd0b689e109de5adfd33c1f9c0f0afdf8dc76..d351763f3b1115c36c8d714437fc09b91c5e5152 100644 (file)
@@ -20,6 +20,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=GPL-2.0 LGPL-2.1
 PKG_LICENSE_FILES:=COPYING COPYING.lib
+PKG_CPE_ID:=cpe:/a:heinz_mauelshagen:lvm2
 
 include $(INCLUDE_DIR)/package.mk
 
index f50f7da38680da305915cf4f0ba03d6c5e74f1a8..1f031646c7e202dc2c96e2f086013abc82aea449 100644 (file)
@@ -10,6 +10,7 @@ PKG_VERSION:=4.8.23
 PKG_RELEASE:=2
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 PKG_LICENSE:=GPL-3.0-or-later
+PKG_CPE_ID:=cpe:/a:midnight_commander:midnight_commander
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://ftp.midnight-commander.org/
index 5bffc22c6b3997be7cabdcc71dda0258273773df..5376eeb70eec5149dc072533851a4972abe16fb8 100644 (file)
@@ -18,6 +18,7 @@ PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:minicom:minicom
 
 PKG_FIXUP:=autoreconf
 
index 5b1e3d817e6edd90fc9386f7d6ccc58c37aad4ff..3398dc1fe050e91dd2cc635257f88166ba2f220c 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=2af222e0354848ffaa3af31b5cd0a77917e9cb7742cd073d762f3c32f0f582c7
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>, Hannu Nyman <hannu.nyman@iki.fi>
+PKG_CPE_ID:=cpe:/a:gnu:nano
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
index 627871367efb628552b41b163327594a02b7219f..19fbc14319c8ca4d69def164d5d252d235725f26 100644 (file)
@@ -15,6 +15,7 @@ PKG_HASH:=3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5
 
 PKG_LICENSE:=GPL-2.0 LGPL-2.0
 PKG_LICENSE_FILES:=COPYING COPYING.LIB
+PKG_CPE_ID:=cpe:/a:ntfs-3g:ntfs-3g
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
index 48953a4edb25460d366ecd960adcbb1b256c7831..4b611d1b3a60976addef3c471af1eda0c425f451 100644 (file)
@@ -17,6 +17,7 @@ PKG_HASH:=b8d33eba57d4a2f6c8a11ff23f233e3248bd75a42c8219b058a888846edd8717
 
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=GPL-2.0
+PKG_CPE_ID:=cpe:/a:owfs:owfs
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index bfbd0964e491b8e6209a22bee2a4d2c33fecbe16..a360590d7ae87a8e117b15bde05fd07d3dfb9bc9 100644 (file)
@@ -17,6 +17,7 @@ PKG_HASH:=d76d79edc31cf76e782b9f697420d3defbcc91778c3c650658086a1b748e8792
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:muscle:pcsc-lite
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index 77d5bac897a6e5f7b4dfeb59b0cc29b1ee137a9b..43eeeaccd531416fca2e92134cc6e3590a8d3333 100644 (file)
@@ -17,6 +17,7 @@ PKG_SOURCE_URL:=http://download.qemu.org/
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE tcg/LICENSE
 PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
+PKG_CPE_ID:=cpe:/a:qemu:qemu
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
index 20136ce1dd7f976ea73f5eb8010e875ee348bdd2..93119305d8ba71ae1c5bd10b0356f8c0c5aa828f 100644 (file)
@@ -18,6 +18,7 @@ PKG_HASH:=1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a
 PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:gnu:screen
 
 PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
index 8e9e31197c6f34dcf058a7ff0ab29554e2696e6e..dddeffb5944cb49e671856a45f5fdbb1d3bee91e 100644 (file)
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=https://github.com/shadow-maint/shadow/releases/download/$(PKG_V
 PKG_HASH:=0998c8d84242a231ab0acb7f8613927ff5bcff095f8aa6b79478893a03f05583
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=BSD-3-Clause
+PKG_CPE_ID:=cpe:/a:debian:shadow
 
 PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
index d856ce7c150e5f13628077a57c26941f9dec2742..d9ef50e373c25003733229e0fa15eacc118fdba2 100644 (file)
@@ -12,6 +12,7 @@ PKG_VERSION:=4.3
 PKG_RELEASE:=6
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:phillip_lougher:squashfs
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/plougher/squashfs-tools
index 6aa5151e8bda07be5a2088666eaff175ae452724..0c31291c402214517a516ca519fede95ba5b065f 100644 (file)
@@ -13,6 +13,7 @@ PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
+PKG_CPE_ID:=cpe:/a:sysstat:sysstat
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://pagesperso-orange.fr/sebastien.godard/
index 4f22824752697fa1835ebabba5490a6ae75851d8..49d1552e4490bd9fb853c7098f3ac53f67b4868a 100644 (file)
@@ -20,6 +20,7 @@ PKG_HASH:=b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=Copyright
+PKG_CPE_ID:=cpe:/a:tcsh:tcsh
 
 PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
 
index b46d4c2fa231883a62d1c031f4dccd5efd2fab61..c1281488db896d7b905588ba86d18476b44ea249 100644 (file)
@@ -12,6 +12,7 @@ PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
 
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:nicholas_marriott:tmux
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
index 091e14e481d885b38e1fec5616df85df4f8abffd..58e59ebb3f6c5172921346bd6eb14646db9d4393 100644 (file)
@@ -15,6 +15,7 @@ PKG_RELEASE:=1
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING.GPLv2
+PKG_CPE_ID:=cpe:/a:nikias_bassen:usbmuxd
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
 PKG_SOURCE_URL=https://codeload.github.com/libimobiledevice/usbmuxd/tar.gz/$(PKG_SOURCE_VERSION)?
diff --git a/utils/wipe/Makefile b/utils/wipe/Makefile
new file mode 100644 (file)
index 0000000..84053d3
--- /dev/null
@@ -0,0 +1,42 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wipe
+PKG_VERSION:=0.24
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/berke/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=aefb4403333562f9af5e3e03ecbba4b124e98788c688662240f9b04d80bfdb2f
+
+PKG_MAINTAINER:=Toni Uhlig <matzeton@googlemail.com>
+PKG_LICENSE:=GPL-2.0-only
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/wipe
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=securely erase files
+  URL:=http://lambda-diode.com/software/wipe/
+endef
+
+define Package/wipe/description
+  wipe is a little command for securely erasing files from magnetic media.
+endef
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR) linux \
+               CC_LINUX="$(TARGET_CC)" \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
+               CPPFLAGS="$(TARGET_CPPFLAGS)"
+endef
+
+define Package/wipe/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/wipe $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,wipe))
diff --git a/utils/wipe/patches/001-ignore_git_version_hash_and_fix_release_version.patch b/utils/wipe/patches/001-ignore_git_version_hash_and_fix_release_version.patch
new file mode 100644 (file)
index 0000000..945d63e
--- /dev/null
@@ -0,0 +1,30 @@
+diff --git a/Makefile b/Makefile
+index 5757ae3..20d52ce 100644
+--- a/Makefile
++++ b/Makefile
+@@ -157,11 +157,7 @@ wipe.o    :       wipe.c random.h misc.h version.h
+               $(CC) $(CCO) $(CCOC) wipe.c -o wipe.o
+ version.h: always
+-              if which git >/dev/null 2>&1 ; then \
+-                      git rev-list --max-count=1 HEAD | sed -e 's/^/#define WIPE_GIT "/' -e 's/$$/"/' >version.h ; \
+-        else \
+-                      echo '#define WIPE_GIT "(unknown, compiled without git)"' >version.h ; \
+-        fi
++              echo '#define WIPE_GIT "(unknown, compiled without git)"' >version.h ; \
+ random.o      :       random.c misc.h md5.h
+               $(CC) $(CCO) $(CCOC) random.c -o random.o
+diff --git a/wipe.c b/wipe.c
+index 5a215e8..5a4f2ad 100644
+--- a/wipe.c
++++ b/wipe.c
+@@ -24,7 +24,7 @@
+ /*** defines */
+-#define WIPE_VERSION "0.23"
++#define WIPE_VERSION "0.24"
+ #define WIPE_DATE "2016-11-03"
+ /* exit codes */
index b6a3722e6e4cda88075ad96136cc97d094f27280..6981b5762ed313f7795e30063a37f05d8541e1fa 100644 (file)
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zoneinfo
-PKG_VERSION:=2019b
+PKG_VERSION:=2019c
 PKG_RELEASE:=1
 
 #As i couldn't find real license used "Public Domain"
@@ -19,14 +19,14 @@ PKG_LICENSE:=Public Domain
 PKG_SOURCE:=tzdata$(PKG_VERSION).tar.gz
 PKG_SOURCE_CODE:=tzcode$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.iana.org/time-zones/repository/releases
-PKG_HASH:=05d9092c90dcf9ec4f3ccfdea80c7dcea5e882b3b105c3422da172aaa9a50c64
+PKG_HASH:=79c7806dab09072308da0e3d22c37d3b245015a591891ea147d3b133b60ffc7c
 
 include $(INCLUDE_DIR)/package.mk
 
 define Download/tzcode
    FILE=$(PKG_SOURCE_CODE)
    URL=$(PKG_SOURCE_URL)
-   HASH:=2e479d409337da41408629ce6c3b4d8410b10ba6d4431d862e22d2b137d7756d
+   HASH:=f6ebd3668e02d5ed223d3b7b1947561bf2d2da2f4bd1db61efefd9e06c167ed4
 endef
 
 $(eval $(call Download,tzcode))
index 03931dbe471c36af8cb6d6496cff2c5e50353584..bcfdd644bbcc77f07d06a96fcd371a7da8ad34c2 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zstd
 PKG_VERSION:=1.4.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/facebook/zstd/tar.gz/v$(PKG_VERSION)?
@@ -68,6 +68,12 @@ endif
 TARGET_CFLAGS += -flto
 TARGET_LDFLAGS += -Wl,--as-needed
 
+define Build/InstallDev
+       $(call Build/InstallDev/cmake,$(1))
+       $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libzstd.pc
+       $(SED) 's,/usr/lib,$$$${prefix}/lib,g' $(1)/usr/lib/pkgconfig/libzstd.pc
+endef
+
 define Package/libzstd/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libzstd.so* $(1)/usr/lib/