summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfishsoupisgood <github@madingley.org>2021-02-17 09:18:09 +0000
committerfishsoupisgood <github@madingley.org>2021-02-17 09:18:09 +0000
commitc495867b36e75b0cc8f1f423abcb973cac95cc1c (patch)
tree3abeecd4a77948eeadaf7388e79d122932755fcf
parent636d347e3df00f685923a30a4e11a95a49bd7b4c (diff)
downloadmaster-d20f4fc-pq-c495867b36e75b0cc8f1f423abcb973cac95cc1c.zip
master-d20f4fc-pq-c495867b36e75b0cc8f1f423abcb973cac95cc1c.tar.gz
master-d20f4fc-pq-c495867b36e75b0cc8f1f423abcb973cac95cc1c.tar.bz2
ship
-rw-r--r--master/endstop1376
-rw-r--r--master/fix-libftdi13
-rw-r--r--master/galaxy-tools56
-rw-r--r--master/my-config947
-rw-r--r--master/opensc-fix-piv-consent185
-rw-r--r--master/perl-modules576
-rw-r--r--master/pingid71
-rw-r--r--master/series7
-rw-r--r--master/status7
-rw-r--r--master/vlmcsd87
-rw-r--r--master/yubico-piv-tool91
11 files changed, 1961 insertions, 1455 deletions
diff --git a/master/endstop b/master/endstop
index bb3c0ae..e69de29 100644
--- a/master/endstop
+++ b/master/endstop
@@ -1,1376 +0,0 @@
-diff --git a/.config b/.config
-index 68963d7..606c05c 100644
---- a/.config
-+++ b/.config
-@@ -1401,8 +1401,8 @@ CONFIG_BUSYBOX_DEFAULT_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
- # CONFIG_BUSYBOX_DEFAULT_FEATURE_IPC_SYSLOG is not set
- CONFIG_BUSYBOX_DEFAULT_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
- # CONFIG_BUSYBOX_DEFAULT_FEATURE_KMSG_SYSLOG is not set
--# CONFIG_PACKAGE_ca-bundle is not set
--# CONFIG_PACKAGE_ca-certificates is not set
-+CONFIG_PACKAGE_ca-bundle=m
-+CONFIG_PACKAGE_ca-certificates=m
- CONFIG_PACKAGE_dnsmasq=y
- # CONFIG_PACKAGE_dnsmasq-dhcpv6 is not set
- # CONFIG_PACKAGE_dnsmasq-full is not set
-@@ -1807,10 +1807,10 @@ CONFIG_PACKAGE_kmod-hwmon-core=m
- #
- # Input modules
- #
--# CONFIG_PACKAGE_kmod-hid is not set
--# CONFIG_PACKAGE_kmod-hid-generic is not set
--# CONFIG_PACKAGE_kmod-input-core is not set
--# CONFIG_PACKAGE_kmod-input-evdev is not set
-+CONFIG_PACKAGE_kmod-hid=m
-+CONFIG_PACKAGE_kmod-hid-generic=m
-+CONFIG_PACKAGE_kmod-input-core=m
-+CONFIG_PACKAGE_kmod-input-evdev=m
- # CONFIG_PACKAGE_kmod-input-gpio-encoder is not set
- # CONFIG_PACKAGE_kmod-input-gpio-keys is not set
- # CONFIG_PACKAGE_kmod-input-gpio-keys-polled is not set
-@@ -2172,7 +2172,7 @@ CONFIG_PACKAGE_kmod-usb-core=y
- # CONFIG_PACKAGE_kmod-usb-dwc2 is not set
- # CONFIG_PACKAGE_kmod-usb-dwc3 is not set
- CONFIG_PACKAGE_kmod-usb-ehci=y
--# CONFIG_PACKAGE_kmod-usb-hid is not set
-+CONFIG_PACKAGE_kmod-usb-hid=m
- # CONFIG_PACKAGE_kmod-usb-ledtrig-usbport is not set
- CONFIG_PACKAGE_kmod-usb-net=m
- # CONFIG_PACKAGE_kmod-usb-net-asix is not set
-@@ -2455,7 +2455,170 @@ CONFIG_PACKAGE_kmod-mt76x2=y
- #
- # Perl
- #
--# CONFIG_PACKAGE_perl is not set
-+CONFIG_PACKAGE_perl=m
-+
-+#
-+# Configuration
-+#
-+CONFIG_PERL_THREADS=y
-+# CONFIG_PERL_TESTS is not set
-+CONFIG_PERL_NOCOMMENT=y
-+# CONFIG_PACKAGE_perl-authen-sasl is not set
-+# CONFIG_PACKAGE_perl-authen-sasl-xs is not set
-+CONFIG_PACKAGE_perl-autoloader=m
-+# CONFIG_PACKAGE_perl-cgi is not set
-+CONFIG_PACKAGE_perl-chipcard-pcsc=m
-+# CONFIG_PACKAGE_perl-compress-bzip2 is not set
-+CONFIG_PACKAGE_perl-crypt-openssl-guess=m
-+CONFIG_PACKAGE_perl-crypt-openssl-random=m
-+CONFIG_PACKAGE_perl-crypt-openssl-rsa=m
-+CONFIG_PACKAGE_perl-crypt-rsa=m
-+CONFIG_PACKAGE_perl-dbi=m
-+CONFIG_PACKAGE_perl-device-serialport=m
-+# CONFIG_PACKAGE_perl-device-usb is not set
-+CONFIG_PACKAGE_perl-digest-sha256=m
-+# CONFIG_PACKAGE_perl-encode-locale is not set
-+# CONFIG_PACKAGE_perl-file-listing is not set
-+# CONFIG_PACKAGE_perl-file-sharedir-install is not set
-+# CONFIG_PACKAGE_perl-html-form is not set
-+# CONFIG_PACKAGE_perl-html-parser is not set
-+# CONFIG_PACKAGE_perl-html-tagset is not set
-+# CONFIG_PACKAGE_perl-html-tree is not set
-+# CONFIG_PACKAGE_perl-http-cookies is not set
-+# CONFIG_PACKAGE_perl-http-daemon is not set
-+# CONFIG_PACKAGE_perl-http-date is not set
-+# CONFIG_PACKAGE_perl-http-message is not set
-+# CONFIG_PACKAGE_perl-http-negotiate is not set
-+# CONFIG_PACKAGE_perl-http-server-simple is not set
-+# CONFIG_PACKAGE_perl-inline is not set
-+# CONFIG_PACKAGE_perl-inline-c is not set
-+# CONFIG_PACKAGE_perl-io-html is not set
-+# CONFIG_PACKAGE_perl-lockfile-simple is not set
-+# CONFIG_PACKAGE_perl-lwp-mediatypes is not set
-+# CONFIG_PACKAGE_perl-net-http is not set
-+# CONFIG_PACKAGE_perl-net-telnet is not set
-+# CONFIG_PACKAGE_perl-parse-recdescent is not set
-+# CONFIG_PACKAGE_perl-sub-uplevel is not set
-+# CONFIG_PACKAGE_perl-test-harness is not set
-+# CONFIG_PACKAGE_perl-test-warn is not set
-+# CONFIG_PACKAGE_perl-text-csv_xs is not set
-+# CONFIG_PACKAGE_perl-uri is not set
-+# CONFIG_PACKAGE_perl-www is not set
-+# CONFIG_PACKAGE_perl-www-curl is not set
-+# CONFIG_PACKAGE_perl-www-mechanize is not set
-+# CONFIG_PACKAGE_perl-www-robotrules is not set
-+# CONFIG_PACKAGE_perl-xml-parser is not set
-+# CONFIG_PACKAGE_perlbase-anydbm-file is not set
-+# CONFIG_PACKAGE_perlbase-app is not set
-+# CONFIG_PACKAGE_perlbase-archive is not set
-+# CONFIG_PACKAGE_perlbase-arybase is not set
-+# CONFIG_PACKAGE_perlbase-attribute is not set
-+# CONFIG_PACKAGE_perlbase-attributes is not set
-+# CONFIG_PACKAGE_perlbase-autodie is not set
-+# CONFIG_PACKAGE_perlbase-autoloader is not set
-+# CONFIG_PACKAGE_perlbase-autosplit is not set
-+# CONFIG_PACKAGE_perlbase-autouse is not set
-+# CONFIG_PACKAGE_perlbase-b is not set
-+CONFIG_PACKAGE_perlbase-base=m
-+CONFIG_PACKAGE_perlbase-benchmark=m
-+# CONFIG_PACKAGE_perlbase-bigint is not set
-+# CONFIG_PACKAGE_perlbase-bignum is not set
-+# CONFIG_PACKAGE_perlbase-blib is not set
-+CONFIG_PACKAGE_perlbase-bytes=m
-+# CONFIG_PACKAGE_perlbase-charnames is not set
-+CONFIG_PACKAGE_perlbase-class=m
-+# CONFIG_PACKAGE_perlbase-compress is not set
-+CONFIG_PACKAGE_perlbase-config=m
-+# CONFIG_PACKAGE_perlbase-cpan is not set
-+CONFIG_PACKAGE_perlbase-cwd=m
-+CONFIG_PACKAGE_perlbase-data=m
-+# CONFIG_PACKAGE_perlbase-db is not set
-+# CONFIG_PACKAGE_perlbase-db-file is not set
-+# CONFIG_PACKAGE_perlbase-dbm-filter is not set
-+# CONFIG_PACKAGE_perlbase-devel is not set
-+# CONFIG_PACKAGE_perlbase-diagnostics is not set
-+# CONFIG_PACKAGE_perlbase-digest is not set
-+# CONFIG_PACKAGE_perlbase-dirhandle is not set
-+# CONFIG_PACKAGE_perlbase-dumpvalue is not set
-+# CONFIG_PACKAGE_perlbase-dumpvar is not set
-+CONFIG_PACKAGE_perlbase-dynaloader=m
-+# CONFIG_PACKAGE_perlbase-encode is not set
-+# CONFIG_PACKAGE_perlbase-encoding is not set
-+# CONFIG_PACKAGE_perlbase-english is not set
-+# CONFIG_PACKAGE_perlbase-env is not set
-+CONFIG_PACKAGE_perlbase-errno=m
-+CONFIG_PACKAGE_perlbase-essential=m
-+# CONFIG_PACKAGE_perlbase-experimental is not set
-+# CONFIG_PACKAGE_perlbase-extutils is not set
-+# CONFIG_PACKAGE_perlbase-fatal is not set
-+CONFIG_PACKAGE_perlbase-fcntl=m
-+# CONFIG_PACKAGE_perlbase-feature is not set
-+# CONFIG_PACKAGE_perlbase-fields is not set
-+CONFIG_PACKAGE_perlbase-file=m
-+# CONFIG_PACKAGE_perlbase-filecache is not set
-+CONFIG_PACKAGE_perlbase-filehandle=m
-+# CONFIG_PACKAGE_perlbase-filetest is not set
-+# CONFIG_PACKAGE_perlbase-filter is not set
-+# CONFIG_PACKAGE_perlbase-findbin is not set
-+# CONFIG_PACKAGE_perlbase-gdbm-file is not set
-+# CONFIG_PACKAGE_perlbase-getopt is not set
-+# CONFIG_PACKAGE_perlbase-hash is not set
-+# CONFIG_PACKAGE_perlbase-http-tiny is not set
-+CONFIG_PACKAGE_perlbase-i18n=m
-+# CONFIG_PACKAGE_perlbase-if is not set
-+CONFIG_PACKAGE_perlbase-integer=m
-+CONFIG_PACKAGE_perlbase-io=m
-+CONFIG_PACKAGE_perlbase-ipc=m
-+# CONFIG_PACKAGE_perlbase-json-pp is not set
-+# CONFIG_PACKAGE_perlbase-less is not set
-+CONFIG_PACKAGE_perlbase-list=m
-+CONFIG_PACKAGE_perlbase-locale=m
-+# CONFIG_PACKAGE_perlbase-math is not set
-+# CONFIG_PACKAGE_perlbase-memoize is not set
-+# CONFIG_PACKAGE_perlbase-meta-notation is not set
-+# CONFIG_PACKAGE_perlbase-mime is not set
-+# CONFIG_PACKAGE_perlbase-module is not set
-+# CONFIG_PACKAGE_perlbase-mro is not set
-+# CONFIG_PACKAGE_perlbase-net is not set
-+# CONFIG_PACKAGE_perlbase-next is not set
-+# CONFIG_PACKAGE_perlbase-o is not set
-+# CONFIG_PACKAGE_perlbase-opcode is not set
-+# CONFIG_PACKAGE_perlbase-open is not set
-+# CONFIG_PACKAGE_perlbase-ops is not set
-+# CONFIG_PACKAGE_perlbase-ostype is not set
-+CONFIG_PACKAGE_perlbase-params=m
-+# CONFIG_PACKAGE_perlbase-perl5db is not set
-+# CONFIG_PACKAGE_perlbase-perlio is not set
-+# CONFIG_PACKAGE_perlbase-pod is not set
-+CONFIG_PACKAGE_perlbase-posix=m
-+CONFIG_PACKAGE_perlbase-re=m
-+# CONFIG_PACKAGE_perlbase-safe is not set
-+CONFIG_PACKAGE_perlbase-scalar=m
-+# CONFIG_PACKAGE_perlbase-sdbm-file is not set
-+# CONFIG_PACKAGE_perlbase-search is not set
-+CONFIG_PACKAGE_perlbase-selectsaver=m
-+CONFIG_PACKAGE_perlbase-selfloader=m
-+# CONFIG_PACKAGE_perlbase-sigtrap is not set
-+CONFIG_PACKAGE_perlbase-socket=m
-+# CONFIG_PACKAGE_perlbase-sort is not set
-+CONFIG_PACKAGE_perlbase-storable=m
-+CONFIG_PACKAGE_perlbase-symbol=m
-+# CONFIG_PACKAGE_perlbase-sys is not set
-+CONFIG_PACKAGE_perlbase-tap=m
-+# CONFIG_PACKAGE_perlbase-term is not set
-+CONFIG_PACKAGE_perlbase-test=m
-+CONFIG_PACKAGE_perlbase-text=m
-+# CONFIG_PACKAGE_perlbase-thread is not set
-+# CONFIG_PACKAGE_perlbase-threads is not set
-+CONFIG_PACKAGE_perlbase-tie=m
-+# CONFIG_PACKAGE_perlbase-time is not set
-+# CONFIG_PACKAGE_perlbase-unicode is not set
-+CONFIG_PACKAGE_perlbase-unicore=m
-+CONFIG_PACKAGE_perlbase-universal=m
-+# CONFIG_PACKAGE_perlbase-user is not set
-+CONFIG_PACKAGE_perlbase-utf8=m
-+# CONFIG_PACKAGE_perlbase-version is not set
-+CONFIG_PACKAGE_perlbase-xsloader=m
-
- #
- # Python
-@@ -2915,10 +3078,27 @@ CONFIG_PACKAGE_libxtables=y
- #
- # SSL
- #
--# CONFIG_PACKAGE_libgnutls is not set
-+CONFIG_PACKAGE_libgnutls=m
-+
-+#
-+# Configuration
-+#
-+CONFIG_GNUTLS_DTLS_SRTP=y
-+CONFIG_GNUTLS_ALPN=y
-+CONFIG_GNUTLS_OCSP=y
-+# CONFIG_GNUTLS_CRYPTODEV is not set
-+CONFIG_GNUTLS_HEARTBEAT=y
-+# CONFIG_GNUTLS_OPENPGP is not set
-+# CONFIG_GNUTLS_SRP is not set
-+CONFIG_GNUTLS_PSK=y
-+CONFIG_GNUTLS_ANON=y
-+# CONFIG_GNUTLS_TPM is not set
-+CONFIG_GNUTLS_PKCS11=y
-+CONFIG_GNUTLS_EXT_LIBTASN1=y
- # CONFIG_PACKAGE_libmbedtls is not set
- CONFIG_PACKAGE_libopenssl=y
--# CONFIG_OPENSSL_WITH_EC is not set
-+CONFIG_OPENSSL_WITH_EC=y
-+# CONFIG_OPENSSL_WITH_EC2M is not set
- # CONFIG_OPENSSL_WITH_SSL3 is not set
- CONFIG_OPENSSL_WITH_DEPRECATED=y
- # CONFIG_OPENSSL_WITH_DTLS is not set
-@@ -3004,7 +3184,7 @@ CONFIG_SQLITE_RTREE=y
- # CONFIG_PACKAGE_bluez-libs is not set
- # CONFIG_PACKAGE_boost is not set
- CONFIG_PACKAGE_ccid=m
--# CONFIG_PACKAGE_check is not set
-+CONFIG_PACKAGE_check=m
- # CONFIG_PACKAGE_classpath is not set
- # CONFIG_PACKAGE_classpath-tools is not set
- # CONFIG_PACKAGE_confuse is not set
-@@ -3047,7 +3227,49 @@ CONFIG_PACKAGE_libblobmsg-json=y
- # CONFIG_PACKAGE_libcharset is not set
- # CONFIG_PACKAGE_libcoap is not set
- # CONFIG_PACKAGE_libconfig is not set
--# CONFIG_PACKAGE_libcurl is not set
-+CONFIG_PACKAGE_libcurl=m
-+
-+#
-+# SSL support
-+#
-+# CONFIG_LIBCURL_MBEDTLS is not set
-+# CONFIG_LIBCURL_WOLFSSL is not set
-+CONFIG_LIBCURL_OPENSSL=y
-+# CONFIG_LIBCURL_GNUTLS is not set
-+# CONFIG_LIBCURL_NOSSL is not set
-+
-+#
-+# Supported protocols
-+#
-+# CONFIG_LIBCURL_DICT is not set
-+CONFIG_LIBCURL_FILE=y
-+# CONFIG_LIBCURL_FTP is not set
-+# CONFIG_LIBCURL_GOPHER is not set
-+CONFIG_LIBCURL_HTTP=y
-+CONFIG_LIBCURL_COOKIES=y
-+# CONFIG_LIBCURL_IMAP is not set
-+# CONFIG_LIBCURL_LDAP is not set
-+# CONFIG_LIBCURL_POP3 is not set
-+# CONFIG_LIBCURL_RTSP is not set
-+# CONFIG_LIBCURL_SSH2 is not set
-+CONFIG_LIBCURL_NO_SMB="!"
-+# CONFIG_LIBCURL_SMTP is not set
-+# CONFIG_LIBCURL_TELNET is not set
-+# CONFIG_LIBCURL_TFTP is not set
-+# CONFIG_LIBCURL_NGHTTP2 is not set
-+
-+#
-+# Miscellaneous
-+#
-+CONFIG_LIBCURL_PROXY=y
-+# CONFIG_LIBCURL_CRYPTO_AUTH is not set
-+# CONFIG_LIBCURL_TLS_SRP is not set
-+# CONFIG_LIBCURL_LIBIDN2 is not set
-+# CONFIG_LIBCURL_THREADED_RESOLVER is not set
-+# CONFIG_LIBCURL_ZLIB is not set
-+# CONFIG_LIBCURL_UNIX_SOCKETS is not set
-+# CONFIG_LIBCURL_LIBCURL_OPTION is not set
-+# CONFIG_LIBCURL_VERBOSE is not set
- CONFIG_PACKAGE_libdaemon=m
- # CONFIG_PACKAGE_libdaq is not set
- CONFIG_PACKAGE_libdb47=m
-@@ -3163,7 +3385,12 @@ CONFIG_PACKAGE_libnetfilter-cttimeout=m
- # CONFIG_PACKAGE_libnetfilter-log is not set
- CONFIG_PACKAGE_libnetfilter-queue=m
- # CONFIG_PACKAGE_libnetsnmp is not set
--# CONFIG_PACKAGE_libnettle is not set
-+CONFIG_PACKAGE_libnettle=m
-+
-+#
-+# Configuration
-+#
-+# CONFIG_LIBNETTLE_MINI is not set
- CONFIG_PACKAGE_libnfnetlink=m
- # CONFIG_PACKAGE_libnftnl is not set
- # CONFIG_PACKAGE_libnghttp2 is not set
-@@ -3304,7 +3531,7 @@ CONFIG_PACKAGE_libusb-1.0=m
- CONFIG_PACKAGE_libusb-compat=m
- # CONFIG_PACKAGE_libusbmuxd is not set
- # CONFIG_PACKAGE_libustream-mbedtls is not set
--# CONFIG_PACKAGE_libustream-openssl is not set
-+CONFIG_PACKAGE_libustream-openssl=m
- # CONFIG_PACKAGE_libustream-wolfssl is not set
- # CONFIG_PACKAGE_libuuid is not set
- # CONFIG_PACKAGE_libuv is not set
-@@ -3421,6 +3648,7 @@ CONFIG_ZLIB_OPTIMIZE_SPEED=y
- # CONFIG_PACKAGE_luci-app-ahcp is not set
- # CONFIG_PACKAGE_luci-app-aria2 is not set
- # CONFIG_PACKAGE_luci-app-asterisk is not set
-+# CONFIG_PACKAGE_luci-app-attendedsysupgrade is not set
- # CONFIG_PACKAGE_luci-app-bcp38 is not set
- # CONFIG_PACKAGE_luci-app-bird1-ipv4 is not set
- # CONFIG_PACKAGE_luci-app-bird1-ipv6 is not set
-@@ -3648,7 +3876,7 @@ CONFIG_POSTFIX_PCRE=y
- # CONFIG_PACKAGE_aria2 is not set
- # CONFIG_PACKAGE_atftp is not set
- # CONFIG_PACKAGE_atftpd is not set
--# CONFIG_PACKAGE_curl is not set
-+CONFIG_PACKAGE_curl=m
- # CONFIG_PACKAGE_gnurl is not set
- # CONFIG_PACKAGE_lftp is not set
- CONFIG_PACKAGE_rsync=m
-@@ -4194,8 +4422,10 @@ CONFIG_PACKAGE_vpnc-scripts=m
- # Version Control Systems
- #
- # CONFIG_PACKAGE_fossil is not set
--# CONFIG_PACKAGE_git is not set
-+CONFIG_PACKAGE_git=m
-+# CONFIG_PACKAGE_git-gitweb is not set
- # CONFIG_PACKAGE_git-http is not set
-+# CONFIG_PACKAGE_gitolite is not set
- # CONFIG_PACKAGE_subversion-client is not set
- # CONFIG_PACKAGE_subversion-libs is not set
- # CONFIG_PACKAGE_subversion-server is not set
-@@ -4241,7 +4471,9 @@ CONFIG_PACKAGE_adb-enablemodem=m
- # CONFIG_PACKAGE_spawn-fcgi is not set
- # CONFIG_PACKAGE_squid is not set
- # CONFIG_PACKAGE_tinyproxy is not set
--# CONFIG_PACKAGE_uhttpd is not set
-+CONFIG_PACKAGE_uhttpd=m
-+# CONFIG_PACKAGE_uhttpd-mod-lua is not set
-+# CONFIG_PACKAGE_uhttpd-mod-ubus is not set
- # CONFIG_PACKAGE_uwsgi-cgi is not set
- # CONFIG_PACKAGE_uwsgi-cgi-luci-support is not set
-
-@@ -4619,7 +4851,7 @@ CONFIG_PACKAGE_vim-full=m
- # CONFIG_PACKAGE_cryptsetup is not set
- # CONFIG_PACKAGE_cryptsetup-openssl is not set
- # CONFIG_PACKAGE_gnupg is not set
--# CONFIG_PACKAGE_gnutls-utils is not set
-+CONFIG_PACKAGE_gnutls-utils=m
- # CONFIG_PACKAGE_gpgv is not set
- # CONFIG_PACKAGE_px5g-mbedtls is not set
- # CONFIG_PACKAGE_px5g-standalone is not set
-@@ -4779,7 +5011,107 @@ CONFIG_PACKAGE_adb=m
- # CONFIG_PACKAGE_cmdpad is not set
- # CONFIG_PACKAGE_coap-client is not set
- # CONFIG_PACKAGE_collectd is not set
--# CONFIG_PACKAGE_coreutils is not set
-+CONFIG_PACKAGE_coreutils=m
-+CONFIG_PACKAGE_coreutils-base64=m
-+# CONFIG_PACKAGE_coreutils-basename is not set
-+# CONFIG_PACKAGE_coreutils-cat is not set
-+# CONFIG_PACKAGE_coreutils-chcon is not set
-+# CONFIG_PACKAGE_coreutils-chgrp is not set
-+# CONFIG_PACKAGE_coreutils-chmod is not set
-+# CONFIG_PACKAGE_coreutils-chown is not set
-+# CONFIG_PACKAGE_coreutils-chroot is not set
-+# CONFIG_PACKAGE_coreutils-cksum is not set
-+# CONFIG_PACKAGE_coreutils-comm is not set
-+# CONFIG_PACKAGE_coreutils-cp is not set
-+# CONFIG_PACKAGE_coreutils-csplit is not set
-+# CONFIG_PACKAGE_coreutils-cut is not set
-+# CONFIG_PACKAGE_coreutils-date is not set
-+# CONFIG_PACKAGE_coreutils-dd is not set
-+# CONFIG_PACKAGE_coreutils-dir is not set
-+# CONFIG_PACKAGE_coreutils-dircolors is not set
-+# CONFIG_PACKAGE_coreutils-dirname is not set
-+# CONFIG_PACKAGE_coreutils-du is not set
-+# CONFIG_PACKAGE_coreutils-echo is not set
-+# CONFIG_PACKAGE_coreutils-env is not set
-+# CONFIG_PACKAGE_coreutils-expand is not set
-+# CONFIG_PACKAGE_coreutils-expr is not set
-+# CONFIG_PACKAGE_coreutils-factor is not set
-+# CONFIG_PACKAGE_coreutils-false is not set
-+# CONFIG_PACKAGE_coreutils-fmt is not set
-+# CONFIG_PACKAGE_coreutils-fold is not set
-+# CONFIG_PACKAGE_coreutils-groups is not set
-+# CONFIG_PACKAGE_coreutils-head is not set
-+# CONFIG_PACKAGE_coreutils-hostid is not set
-+# CONFIG_PACKAGE_coreutils-id is not set
-+# CONFIG_PACKAGE_coreutils-install is not set
-+# CONFIG_PACKAGE_coreutils-join is not set
-+# CONFIG_PACKAGE_coreutils-kill is not set
-+# CONFIG_PACKAGE_coreutils-link is not set
-+# CONFIG_PACKAGE_coreutils-ln is not set
-+# CONFIG_PACKAGE_coreutils-logname is not set
-+# CONFIG_PACKAGE_coreutils-ls is not set
-+# CONFIG_PACKAGE_coreutils-md5sum is not set
-+# CONFIG_PACKAGE_coreutils-mkdir is not set
-+# CONFIG_PACKAGE_coreutils-mkfifo is not set
-+# CONFIG_PACKAGE_coreutils-mknod is not set
-+# CONFIG_PACKAGE_coreutils-mktemp is not set
-+# CONFIG_PACKAGE_coreutils-mv is not set
-+# CONFIG_PACKAGE_coreutils-nice is not set
-+# CONFIG_PACKAGE_coreutils-nl is not set
-+# CONFIG_PACKAGE_coreutils-nohup is not set
-+# CONFIG_PACKAGE_coreutils-nproc is not set
-+# CONFIG_PACKAGE_coreutils-od is not set
-+# CONFIG_PACKAGE_coreutils-paste is not set
-+# CONFIG_PACKAGE_coreutils-pathchk is not set
-+# CONFIG_PACKAGE_coreutils-pinky is not set
-+# CONFIG_PACKAGE_coreutils-pr is not set
-+# CONFIG_PACKAGE_coreutils-printenv is not set
-+# CONFIG_PACKAGE_coreutils-printf is not set
-+# CONFIG_PACKAGE_coreutils-ptx is not set
-+# CONFIG_PACKAGE_coreutils-pwd is not set
-+# CONFIG_PACKAGE_coreutils-readlink is not set
-+# CONFIG_PACKAGE_coreutils-realpath is not set
-+# CONFIG_PACKAGE_coreutils-rm is not set
-+# CONFIG_PACKAGE_coreutils-rmdir is not set
-+# CONFIG_PACKAGE_coreutils-runcon is not set
-+# CONFIG_PACKAGE_coreutils-seq is not set
-+CONFIG_PACKAGE_coreutils-sha1sum=m
-+CONFIG_PACKAGE_coreutils-sha224sum=m
-+CONFIG_PACKAGE_coreutils-sha256sum=m
-+CONFIG_PACKAGE_coreutils-sha384sum=m
-+CONFIG_PACKAGE_coreutils-sha512sum=m
-+# CONFIG_PACKAGE_coreutils-shred is not set
-+# CONFIG_PACKAGE_coreutils-shuf is not set
-+# CONFIG_PACKAGE_coreutils-sleep is not set
-+# CONFIG_PACKAGE_coreutils-sort is not set
-+# CONFIG_PACKAGE_coreutils-split is not set
-+# CONFIG_PACKAGE_coreutils-stat is not set
-+# CONFIG_PACKAGE_coreutils-stdbuf is not set
-+# CONFIG_PACKAGE_coreutils-stty is not set
-+# CONFIG_PACKAGE_coreutils-sum is not set
-+# CONFIG_PACKAGE_coreutils-sync is not set
-+# CONFIG_PACKAGE_coreutils-tac is not set
-+# CONFIG_PACKAGE_coreutils-tail is not set
-+# CONFIG_PACKAGE_coreutils-tee is not set
-+# CONFIG_PACKAGE_coreutils-test is not set
-+# CONFIG_PACKAGE_coreutils-timeout is not set
-+# CONFIG_PACKAGE_coreutils-touch is not set
-+# CONFIG_PACKAGE_coreutils-tr is not set
-+# CONFIG_PACKAGE_coreutils-true is not set
-+# CONFIG_PACKAGE_coreutils-truncate is not set
-+# CONFIG_PACKAGE_coreutils-tsort is not set
-+# CONFIG_PACKAGE_coreutils-tty is not set
-+# CONFIG_PACKAGE_coreutils-uname is not set
-+# CONFIG_PACKAGE_coreutils-unexpand is not set
-+# CONFIG_PACKAGE_coreutils-uniq is not set
-+# CONFIG_PACKAGE_coreutils-unlink is not set
-+# CONFIG_PACKAGE_coreutils-uptime is not set
-+# CONFIG_PACKAGE_coreutils-users is not set
-+# CONFIG_PACKAGE_coreutils-vdir is not set
-+# CONFIG_PACKAGE_coreutils-wc is not set
-+# CONFIG_PACKAGE_coreutils-who is not set
-+# CONFIG_PACKAGE_coreutils-whoami is not set
-+# CONFIG_PACKAGE_coreutils-yes is not set
- # CONFIG_PACKAGE_crconf is not set
- # CONFIG_PACKAGE_crelay is not set
- # CONFIG_PACKAGE_ct-bugcheck is not set
-@@ -4795,7 +5127,7 @@ CONFIG_PACKAGE_digitemp-usb=m
- # CONFIG_PACKAGE_dump1090 is not set
- # CONFIG_PACKAGE_ecdsautils is not set
- # CONFIG_PACKAGE_elektra-kdb is not set
--# CONFIG_PACKAGE_evtest is not set
-+CONFIG_PACKAGE_evtest=m
- # CONFIG_PACKAGE_extract is not set
- # CONFIG_PACKAGE_fdt-utils is not set
- # CONFIG_PACKAGE_file is not set
-@@ -4907,6 +5239,7 @@ CONFIG_PACKAGE_openssl-util=m
- # CONFIG_PACKAGE_pciutils is not set
- # CONFIG_PACKAGE_pcsc-tools is not set
- CONFIG_PACKAGE_pcscd=m
-+CONFIG_PACKAGE_pingid=m
- # CONFIG_PACKAGE_pps-tools is not set
- # CONFIG_PACKAGE_prlimit is not set
- # CONFIG_PACKAGE_procps-ng is not set
-@@ -4969,6 +5302,7 @@ CONFIG_PACKAGE_usbutils=m
- # CONFIG_PACKAGE_xxd is not set
- # CONFIG_PACKAGE_yanglint is not set
- # CONFIG_PACKAGE_yara is not set
-+CONFIG_PACKAGE_yubico-piv-tool=m
- # CONFIG_PACKAGE_yunbridge is not set
-
- #
-diff --git a/feeds/packages/utils/opensc/patches/fix-piv-consent.patch b/feeds/packages/utils/opensc/patches/fix-piv-consent.patch
-new file mode 100644
-index 0000000..0cebec0
---- /dev/null
-+++ b/feeds/packages/utils/opensc/patches/fix-piv-consent.patch
-@@ -0,0 +1,179 @@
-+commit d7d674129ec021454b5f6285a213da912a50a39f
-+Author: Doug Engert <deengert@gmail.com>
-+Date: Mon Apr 16 10:08:43 2018 -0500
-+
-+ PIV History Object Related Changes - Fixes #1330
-+
-+ && is replaced by || in the test of valid key references
-+ for retired keys found in the Historic object.
-+
-+ For retired keys, the user_consent flag was being set by default.
-+ Thus a C_Login(CKU_CONTEXT_SPECIFIC) would be required.
-+ NIST 800-73 only requires PIN_Always on the Sign Key.
-+
-+ To extend the usefullnes of "retired keys" on non government
-+ issued PIV-like cards, code had already been added
-+ to use the certificate keyUsage flags to override the NIST
-+ defined key usage flags. The NONREPUDATION flag is now used
-+ to set the user_consent flag.
-+
-+ So rather then always requiring C_Login(CKU_CONTEXT_SPECIFIC)
-+ for any retured key, the code only requires it for non government
-+ cards where teh certificate has NONREPUDATION.
-+
-+ Changes to be committed:
-+ modified: card-piv.c
-+ modified: pkcs15-piv.c
-+
-+diff --git a/src/libopensc/card-piv.c b/src/libopensc/card-piv.c
-+index 8f7c4ebb..c8b39adf 100644
-+--- a/src/libopensc/card-piv.c
-++++ b/src/libopensc/card-piv.c
-+@@ -2871,7 +2871,7 @@ piv_process_history(sc_card_t *card)
-+ }
-+ keyref = sc_asn1_find_tag(card->ctx, seq, seqlen, 0x04, &keyreflen);
-+ if (!keyref || keyreflen != 1 ||
-+- (*keyref < 0x82 && *keyref > 0x95)) {
-++ (*keyref < 0x82 || *keyref > 0x95)) {
-+ sc_log(card->ctx, "DER problem");
-+ r = SC_ERROR_INVALID_ASN1_OBJECT;
-+ goto err;
-+diff --git a/src/libopensc/pkcs15-piv.c b/src/libopensc/pkcs15-piv.c
-+index 62a58123..1401ea4d 100644
-+--- a/src/libopensc/pkcs15-piv.c
-++++ b/src/libopensc/pkcs15-piv.c
-+@@ -528,83 +528,83 @@ static int sc_pkcs15emu_piv_init(sc_pkcs15_card_t *p15card)
-+ { "05", "Retired KEY MAN 1",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x82, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x82, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "06", "Retired KEY MAN 2",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x83, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x83, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "07", "Retired KEY MAN 3",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x84, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x84, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "08", "Retired KEY MAN 4",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x85, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x85, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "09", "Retired KEY MAN 5",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x86, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x86, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "10", "Retired KEY MAN 6",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x87, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x87, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "11", "Retired KEY MAN 7",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x88, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x88, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "12", "Retired KEY MAN 8",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x89, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x89, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "13", "Retired KEY MAN 9",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x8A, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x8A, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "14", "Retired KEY MAN 10",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x8B, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x8B, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "15", "Retired KEY MAN 11",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x8C, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x8C, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "16", "Retired KEY MAN 12",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x8D, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x8D, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "17", "Retired KEY MAN 13",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x8E, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x8E, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "18", "Retired KEY MAN 14",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x8F, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x8F, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "19", "Retired KEY MAN 15",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x90, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x90, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "20", "Retired KEY MAN 16",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x91, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x91, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "21", "Retired KEY MAN 17",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x92, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x92, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "22", "Retired KEY MAN 18",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x93, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x93, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "23", "Retired KEY MAN 19",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x94, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
-++ "", 0x94, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
-+ { "24", "Retired KEY MAN 20",
-+ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
-+ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
-+- "", 0x95, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1}
-++ "", 0x95, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0}
-+ };
-+
-+ int r, i;
-+@@ -1142,7 +1142,7 @@ sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "DEE Adding pin %d label=%s",i, label);
-+
-+ strncpy(prkey_obj.label, prkeys[i].label, SC_PKCS15_MAX_LABEL_SIZE - 1);
-+ prkey_obj.flags = prkeys[i].obj_flags;
-+- prkey_obj.user_consent = prkeys[i].user_consent;
-++ prkey_obj.user_consent = prkeys[i].user_consent; /* only Sign key */
-+
-+ if (prkeys[i].auth_id)
-+ sc_pkcs15_format_id(prkeys[i].auth_id, &prkey_obj.auth_id);
-+@@ -1165,6 +1165,10 @@ sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "DEE Adding pin %d label=%s",i, label);
-+ case SC_ALGORITHM_RSA:
-+ if(ckis[i].cert_keyUsage_present) {
-+ prkey_info.usage |= ckis[i].priv_usage;
-++ /* If retired key and non gov cert has NONREPUDIATION, treat as user_consent */
-++ if (i >= 4 && (ckis[i].priv_usage & SC_PKCS15_PRKEY_USAGE_NONREPUDIATION)) {
-++ prkey_obj.user_consent = 1;
-++ }
-+ } else {
-+ prkey_info.usage |= prkeys[i].usage_rsa;
-+ }
-+@@ -1174,6 +1178,10 @@ sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "DEE Adding pin %d label=%s",i, label);
-+ case SC_ALGORITHM_EC:
-+ if (ckis[i].cert_keyUsage_present) {
-+ prkey_info.usage |= ckis[i].priv_usage;
-++ /* If retired key and non gov cert has NONREPUDIATION, treat as user_consent */
-++ if (i >= 4 && (ckis[i].priv_usage & SC_PKCS15_PRKEY_USAGE_NONREPUDIATION)) {
-++ prkey_obj.user_consent = 1;
-++ }
-+ } else {
-+ prkey_info.usage |= prkeys[i].usage_ec;
-+ }
-diff --git a/package/jmm/pingid/Makefile b/package/jmm/pingid/Makefile
-new file mode 100644
-index 0000000..84aae52
---- /dev/null
-+++ b/package/jmm/pingid/Makefile
-@@ -0,0 +1,51 @@
-+#
-+# Copyright (C) 2014 OpenWrt.org
-+#
-+# This is free software, licensed under the GNU General Public License v2.
-+# See /LICENSE for more information.
-+#
-+
-+include $(TOPDIR)/rules.mk
-+include $(INCLUDE_DIR)/kernel.mk
-+
-+PKG_NAME:=pingid
-+PKG_VERSION:=2020-04-01
-+PKG_RELEASE=$(PKG_SOURCE_VERSION)
-+
-+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-+PKG_SOURCE_URL:=git://git.panaceas.org/openwrt/pingid
-+PKG_SOURCE_PROTO:=git
-+PKG_SOURCE_VERSION:=master
-+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.bz2
-+
-+PKG_MAINTAINER:=James McKenzie <meh@meh.meh>
-+PKG_LICENSE:=GPL-2.0+
-+
-+
-+include $(INCLUDE_DIR)/package.mk
-+
-+define Package/pingid
-+ SECTION:=utils
-+ CATEGORY:=Utilities
-+ TITLE:=pingid
-+endef
-+
-+
-+define Build/Compile
-+ $(call Build/Compile/Default)
-+ make -C $(PKG_BUILD_DIR) \
-+ DESTDIR="$(PKG_INSTALL_DIR)" \
-+ install
-+endef
-+
-+
-+
-+define Package/pingid/install
-+ $(INSTALL_DIR) $(1)/etc/init.d
-+ $(INSTALL_BIN) ./files/pingid.init $(1)/etc/init.d/pingid
-+ $(INSTALL_DIR) $(1)/www/cgi-bin/
-+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pingid $(1)/www/cgi-bin/
-+endef
-+
-+
-+$(eval $(call BuildPackage,pingid))
-diff --git a/package/jmm/pingid/files/pingid.init b/package/jmm/pingid/files/pingid.init
-new file mode 100755
-index 0000000..5b3b264
---- /dev/null
-+++ b/package/jmm/pingid/files/pingid.init
-@@ -0,0 +1,8 @@
-+#!/bin/sh /etc/rc.common
-+
-+START=99
-+
-+
-+start() {
-+ /www/cgi-bin/pingid
-+}
-diff --git a/package/network/utils/globalprotect/files/globalprotect.sh b/package/network/utils/globalprotect/files/globalprotect.sh
-index 1e40e05..cff74b8 100755
---- a/package/network/utils/globalprotect/files/globalprotect.sh
-+++ b/package/network/utils/globalprotect/files/globalprotect.sh
-@@ -20,6 +20,7 @@ proto_globalprotect_init_config() {
- proto_config_add_string "os"
- proto_config_add_string "csd_wrapper"
- proto_config_add_string "clientcert"
-+ proto_config_add_string "clientkey"
- no_device=1
- available=1
- }
-@@ -27,7 +28,7 @@ proto_globalprotect_init_config() {
- proto_globalprotect_setup() {
- local config="$1"
-
-- json_get_vars server port interface username serverhash authgroup password password2 token_mode token_secret token_script os csd_wrapper mtu juniper clientcert
-+ json_get_vars server port interface username serverhash authgroup password password2 token_mode token_secret token_script os csd_wrapper mtu juniper clientcert clientkey
-
- grep -q tun /proc/modules || insmod tun
- ifname="vpn-$config"
-@@ -50,6 +51,11 @@ proto_globalprotect_setup() {
- append cmdline "$clientcert"
- }
-
-+ [ -n "$clientkey" ] && {
-+ append cmdline "--sslkey"
-+ append cmdline "$clientkey"
-+ }
-+
- append cmdline "--protocol=gp"
-
- # migrate to standard config files
-diff --git a/package/perl/perl-autoloader/Makefile b/package/perl/perl-autoloader/Makefile
-new file mode 100644
-index 0000000..bd4481f
---- /dev/null
-+++ b/package/perl/perl-autoloader/Makefile
-@@ -0,0 +1,48 @@
-+#
-+# Copyright (C) 2014 - 2016 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:=perl-autoloader
-+PKG_VERSION:=5.74
-+PKG_RELEASE:=1
-+
-+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/S/SM/SMUELLER
-+PKG_SOURCE:=AutoLoader-$(PKG_VERSION).tar.gz
-+PKG_HASH:=2fac75b05309f71a6871804cd25e1a3ba0a28f43f294fb54528077558da3aff4
-+
-+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-+PKG_MAINTAINER:=me
-+
-+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/AutoLoader-$(PKG_VERSION)
-+
-+include $(INCLUDE_DIR)/package.mk
-+include ../perl/perlmod.mk
-+
-+define Package/perl-autoloader
-+ SUBMENU:=Perl
-+ SECTION:=lang
-+ CATEGORY:=Languages
-+ TITLE:=A Pure Perl RSA implementatino
-+ URL:=http://search.cpan.org/dist/AutoLoader/
-+ DEPENDS:=perl +perlbase-essential
-+endef
-+
-+define Build/Configure
-+ $(call perlmod/Configure,,)
-+endef
-+
-+define Build/Compile
-+ $(call perlmod/Compile,,)
-+endef
-+
-+define Package/perl-autoloader/install
-+ $(call perlmod/Install,$(1),AutoLoader.pm AutoSplit.pm auto/AutoLoader)
-+endef
-+
-+
-+$(eval $(call BuildPackage,perl-autoloader))
-diff --git a/package/perl/perl-chipcard-pcsc/Makefile b/package/perl/perl-chipcard-pcsc/Makefile
-new file mode 100644
-index 0000000..437b67c
---- /dev/null
-+++ b/package/perl/perl-chipcard-pcsc/Makefile
-@@ -0,0 +1,51 @@
-+#
-+# Copyright (C) 2014 - 2016 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:=perl-chipcard-pcsc
-+PKG_VERSION:=1.4.14
-+PKG_RELEASE:=1
-+
-+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/W/WH/WHOM
-+PKG_SOURCE:=pcsc-perl-$(PKG_VERSION).tar.bz2
-+PKG_HASH:=2722b7e5543e4faf3ba1ec6b29a7dfec6d92be1edec09d0a3191992d4d88c69d
-+
-+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-+PKG_MAINTAINER:=me
-+
-+#HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/Chipcard-PCSC-$(PKG_VERSION)
-+#HOST_BUILD_DEPENDS:=perl/host libpcsclite/host
-+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/pcsc-perl-$(PKG_VERSION)
-+PKG_BUILD_DEPENDS:=pcsc-lite
-+
-+include $(INCLUDE_DIR)/package.mk
-+include ../perl/perlmod.mk
-+
-+define Package/perl-chipcard-pcsc
-+ SUBMENU:=Perl
-+ SECTION:=lang
-+ CATEGORY:=Languages
-+ TITLE:=Perl PCSC implementation
-+ URL:=http://search.cpan.org/dist/Chipcard-PCSC/
-+ DEPENDS:=perl +perlbase-essential +perlbase-xsloader +libpcsclite +perl-autoloader +perlbase-dynaloader
-+endef
-+
-+define Build/Configure
-+ $(call perlmod/Configure,INC="-I${STAGING_DIR}/usr/include/PCSC" LIBS="-lpcsc",)
-+endef
-+
-+define Build/Compile
-+ $(call perlmod/Compile,,)
-+endef
-+
-+define Package/perl-chipcard-pcsc/install
-+ $(call perlmod/Install,$(1),Chipcard/PCSC.pm Chipcard/PCSC auto/Chipcard/PCSC)
-+endef
-+
-+
-+$(eval $(call BuildPackage,perl-chipcard-pcsc))
-diff --git a/package/perl/perl-crypt-openssl-guess/Makefile b/package/perl/perl-crypt-openssl-guess/Makefile
-new file mode 100644
-index 0000000..dcf4bba
---- /dev/null
-+++ b/package/perl/perl-crypt-openssl-guess/Makefile
-@@ -0,0 +1,64 @@
-+#
-+# Copyright (C) 2014 - 2016 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:=perl-crypt-guess
-+PKG_VERSION:=0.11
-+PKG_RELEASE:=1
-+
-+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/A/AK/AKIYM
-+PKG_SOURCE:=Crypt-OpenSSL-Guess-$(PKG_VERSION).tar.gz
-+PKG_HASH:=aa6b18e38cb852cbad80a58cd90c395b40819d4d01e0ab37e7703149094d7167
-+
-+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-+PKG_MAINTAINER:=me
-+
-+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/Crypt-OpenSSL-Guess-$(PKG_VERSION)
-+HOST_BUILD_DEPENDS:=perl/host
-+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Crypt-OpenSSL-Guess-$(PKG_VERSION)
-+
-+include $(INCLUDE_DIR)/package.mk
-+include $(INCLUDE_DIR)/host-build.mk
-+include ../perl/perlmod.mk
-+
-+define Package/perl-crypt-openssl-guess
-+ SUBMENU:=Perl
-+ SECTION:=lang
-+ CATEGORY:=Languages
-+ TITLE:=Perl OpenSSL Guess implementation
-+ URL:=http://search.cpan.org/dist/Crypt-OpenSSL-Guess/
-+ DEPENDS:=perl +perlbase-essential +perlbase-xsloader +libopenssl
-+endef
-+
-+define Host/Configure
-+ $(call perlmod/host/Configure,,,)
-+endef
-+
-+define Host/Compile
-+ $(call perlmod/host/Compile,,)
-+endef
-+
-+define Host/Install
-+ $(call perlmod/host/Install,$(1),)
-+endef
-+
-+define Build/Configure
-+ $(call perlmod/Configure,,)
-+endef
-+
-+define Build/Compile
-+ $(call perlmod/Compile,,)
-+endef
-+
-+define Package/perl-crypt-openssl-guess/install
-+ $(call perlmod/Install,$(1),Crypt/OpenSSL auto/Crypt/OpenSSL/Guess)
-+endef
-+
-+
-+$(eval $(call BuildPackage,perl-crypt-openssl-guess))
-+$(eval $(call HostBuild))
-diff --git a/package/perl/perl-crypt-openssl-random/Makefile b/package/perl/perl-crypt-openssl-random/Makefile
-new file mode 100644
-index 0000000..f0cd9d1
---- /dev/null
-+++ b/package/perl/perl-crypt-openssl-random/Makefile
-@@ -0,0 +1,65 @@
-+#
-+# Copyright (C) 2014 - 2016 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:=perl-crypt-random
-+PKG_VERSION:=0.15
-+PKG_RELEASE:=1
-+
-+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/R/RU/RURBAN
-+PKG_SOURCE:=Crypt-OpenSSL-Random-$(PKG_VERSION).tar.gz
-+PKG_HASH:=f0876faa1ba3111e39b86aa730c603211eff2905e460c72a57b61e8cf475cef4
-+
-+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-+PKG_MAINTAINER:=me
-+
-+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/Crypt-OpenSSL-Random-$(PKG_VERSION)
-+HOST_BUILD_DEPENDS:=perl/host perl-crypt-openssl-guess/host libopenssl/host
-+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Crypt-OpenSSL-Random-$(PKG_VERSION)
-+#PKG_BUILD_DEPENDS:=perl-crypt-openssl-guess/host libopenssl/host
-+PKG_BUILD_DEPENDS:=perl-crypt-openssl-guess/host
-+
-+include $(INCLUDE_DIR)/package.mk
-+#include $(INCLUDE_DIR)/host-build.mk
-+include ../perl/perlmod.mk
-+
-+define Package/perl-crypt-openssl-random
-+ SUBMENU:=Perl
-+ SECTION:=lang
-+ CATEGORY:=Languages
-+ TITLE:=Perl OpenSSL Random implementation
-+ URL:=http://search.cpan.org/dist/Crypt-OpenSSL-Random/
-+ DEPENDS:=perl +perlbase-essential +perlbase-xsloader +libopenssl +perl-crypt-openssl-guess
-+endef
-+
-+#define Host/Configure
-+# $(call perlmod/host/Configure,,,)
-+#endef
-+
-+#define Host/Compile
-+# $(call perlmod/host/Compile,,)
-+#endef
-+
-+#define Host/Install
-+# $(call perlmod/host/Install,$(1),)
-+#endef
-+
-+define Build/Configure
-+ $(call perlmod/Configure,INC= LIBS="-lssl -lcrypto",)
-+endef
-+
-+define Build/Compile
-+ $(call perlmod/Compile,,)
-+endef
-+
-+define Package/perl-crypt-openssl-random/install
-+ $(call perlmod/Install,$(1),Crypt/OpenSSL auto/Crypt/OpenSSL/Random)
-+endef
-+
-+
-+$(eval $(call BuildPackage,perl-crypt-openssl-random))
-diff --git a/package/perl/perl-crypt-openssl-rsa/Makefile b/package/perl/perl-crypt-openssl-rsa/Makefile
-new file mode 100644
-index 0000000..8aab1dc
---- /dev/null
-+++ b/package/perl/perl-crypt-openssl-rsa/Makefile
-@@ -0,0 +1,51 @@
-+#
-+# Copyright (C) 2014 - 2016 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:=perl-crypt-openssl-rsa
-+PKG_VERSION:=0.31
-+PKG_RELEASE:=1
-+
-+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/T/TO/TODDR
-+PKG_SOURCE:=Crypt-OpenSSL-RSA-$(PKG_VERSION).tar.gz
-+PKG_HASH:=4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436
-+
-+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-+PKG_MAINTAINER:=me
-+
-+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/Crypt-OpenSSL-RSA-$(PKG_VERSION)
-+HOST_BUILD_DEPENDS:=perl/host perl-crypt-openssl-guess/host libopenssl/host
-+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Crypt-OpenSSL-RSA-$(PKG_VERSION)
-+PKG_BUILD_DEPENDS:=perl-crypt-openssl-guess/host
-+
-+include $(INCLUDE_DIR)/package.mk
-+include ../perl/perlmod.mk
-+
-+define Package/perl-crypt-openssl-rsa
-+ SUBMENU:=Perl
-+ SECTION:=lang
-+ CATEGORY:=Languages
-+ TITLE:=Perl OpenSSL RSA implementation
-+ URL:=http://search.cpan.org/dist/Crypt-OpenSSL-RSA/
-+ DEPENDS:=perl +perlbase-essential +perlbase-xsloader +libopenssl +perl-crypt-openssl-guess +perl-autoloader
-+endef
-+
-+define Build/Configure
-+ $(call perlmod/Configure,INC= LIBS="-lssl -lcrypto",)
-+endef
-+
-+define Build/Compile
-+ $(call perlmod/Compile,,)
-+endef
-+
-+define Package/perl-crypt-openssl-rsa/install
-+ $(call perlmod/Install,$(1),Crypt/OpenSSL auto/Crypt/OpenSSL/RSA)
-+endef
-+
-+
-+$(eval $(call BuildPackage,perl-crypt-openssl-rsa))
-diff --git a/package/perl/perl-crypt-rsa/Makefile b/package/perl/perl-crypt-rsa/Makefile
-new file mode 100644
-index 0000000..569032d
---- /dev/null
-+++ b/package/perl/perl-crypt-rsa/Makefile
-@@ -0,0 +1,48 @@
-+#
-+# Copyright (C) 2014 - 2016 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:=perl-crypt-rsa
-+PKG_VERSION:=1.99
-+PKG_RELEASE:=1
-+
-+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/V/VI/VIPUL
-+PKG_SOURCE:=Crypt-RSA-$(PKG_VERSION).tar.gz
-+PKG_HASH:=4706fd6605c920cd1c79f4afc0036b14e233620162b3957abe9b5f1be50b24be
-+
-+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-+PKG_MAINTAINER:=me
-+
-+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Crypt-RSA-$(PKG_VERSION)
-+
-+include $(INCLUDE_DIR)/package.mk
-+include ../perl/perlmod.mk
-+
-+define Package/perl-crypt-rsa
-+ SUBMENU:=Perl
-+ SECTION:=lang
-+ CATEGORY:=Languages
-+ TITLE:=A Pure Perl RSA implementatino
-+ URL:=http://search.cpan.org/dist/Crypt-RSA/
-+ DEPENDS:=perl +perlbase-essential
-+endef
-+
-+define Build/Configure
-+ $(call perlmod/Configure,,)
-+endef
-+
-+define Build/Compile
-+ $(call perlmod/Compile,,)
-+endef
-+
-+define Package/perl-crypt-rsa/install
-+ $(call perlmod/Install,$(1),Crypt/RSA auto/Crypt/RSA)
-+endef
-+
-+
-+$(eval $(call BuildPackage,perl-crypt-rsa))
-diff --git a/package/perl/perl-digest-sha256/Makefile b/package/perl/perl-digest-sha256/Makefile
-new file mode 100644
-index 0000000..1f2f3fc
---- /dev/null
-+++ b/package/perl/perl-digest-sha256/Makefile
-@@ -0,0 +1,48 @@
-+#
-+# Copyright (C) 2014 - 2016 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:=perl-digest-sha256
-+PKG_VERSION:=0.01
-+PKG_RELEASE:=1
-+
-+PKG_SOURCE_URL:=http://www.cpan.org/authors/id/D/DI/DIDO
-+PKG_SOURCE:=SHA256-$(PKG_VERSION)b.tar.gz
-+PKG_HASH:=72bbb1e31bbfe39e9df930e9b34bbac25e5d1617b7289076945aa303ad03c170
-+
-+PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
-+PKG_MAINTAINER:=me
-+
-+PKG_BUILD_DIR:=$(BUILD_DIR)/perl/SHA256-$(PKG_VERSION)
-+
-+include $(INCLUDE_DIR)/package.mk
-+include ../perl/perlmod.mk
-+
-+define Package/perl-digest-sha256
-+ SUBMENU:=Perl
-+ SECTION:=lang
-+ CATEGORY:=Languages
-+ TITLE:=A Pure Perl SH256 implementation
-+ URL:=http://search.cpan.org/dist/Digest-SHA256/
-+ DEPENDS:=perl +perlbase-essential
-+endef
-+
-+define Build/Configure
-+ $(call perlmod/Configure,,)
-+endef
-+
-+define Build/Compile
-+ $(call perlmod/Compile,,)
-+endef
-+
-+define Package/perl-digest-sha256/install
-+ $(call perlmod/Install,$(1),Digest/SHA256.pm auto/Digest/SHA256)
-+endef
-+
-+
-+$(eval $(call BuildPackage,perl-digest-sha256))
-diff --git a/package/perl/perl-digest-sha256/patches/fix-endian-idiocy.patch b/package/perl/perl-digest-sha256/patches/fix-endian-idiocy.patch
-new file mode 100644
-index 0000000..b28ed79
---- /dev/null
-+++ b/package/perl/perl-digest-sha256/patches/fix-endian-idiocy.patch
-@@ -0,0 +1,50 @@
-+diff -uNr SHA256-0.01/Makefile.PL SHA256-0.01/Makefile.PL
-+--- SHA256-0.01/Makefile.PL 2001-03-12 05:19:07.000000000 +0000
-++++ SHA256-0.01/Makefile.PL 2020-04-26 09:28:20.773363674 +0100
-+@@ -19,14 +19,20 @@
-+ print EOUT <<"END_OF_STRING";
-+
-+
-+-#ifndef ENDIAN_H
-+-#define ENDIAN_H
-++#ifndef MY_ENDIAN_H
-++#define MY_ENDIAN_H
-+
-+ /* Warning! this file is automatically generated; changes WILL disappear */
-+
-+-#define BYTEORDER $Config{'byteorder'}
-++#include <endian.h>
-+
-+-#endif /* ENDIAN_H */
-++#if __BYTE_ORDER == __LITTLE_ENDIAN
-++#define BYTEORDER 1234
-++#else
-++#define BYTEORDER 4321
-++#endif
-++
-++#endif /* MY_ENDIAN_H */
-+ END_OF_STRING
-+ close EOUT
-+ or die "error: unable to properly close 'endian.h'\n";
-+diff -uNr SHA256-0.01/_sha256.c SHA256-0.01/_sha256.c
-+--- SHA256-0.01/_sha256.c 2001-03-12 07:14:08.000000000 +0000
-++++ SHA256-0.01/_sha256.c 2020-04-26 09:31:46.356338953 +0100
-+@@ -16,6 +16,7 @@
-+ */
-+
-+ #include <stdio.h>
-++#include <string.h>
-+ #include "sha.h"
-+ #include "endian.h"
-+
-+diff -uNr SHA256-0.01/sha384_512.c SHA256-0.01/sha384_512.c
-+--- SHA256-0.01/sha384_512.c 2001-03-16 04:35:15.000000000 +0000
-++++ SHA256-0.01/sha384_512.c 2020-04-26 09:31:50.576358988 +0100
-+@@ -16,6 +16,7 @@
-+ */
-+
-+ #include <stdio.h>
-++#include <string.h>
-+ #include "sha512.h"
-+ #include "endian.h"
-+
-diff --git a/package/perl/perl/perlmod.mk b/package/perl/perl/perlmod.mk
-new file mode 100644
-index 0000000..56e412a
---- /dev/null
-+++ b/package/perl/perl/perlmod.mk
-@@ -0,0 +1,2 @@
-+include ../../feeds/packages/perl/perlmod.mk
-+
-diff --git a/package/perl/perl/perlver.mk b/package/perl/perl/perlver.mk
-new file mode 100644
-index 0000000..d84830e
---- /dev/null
-+++ b/package/perl/perl/perlver.mk
-@@ -0,0 +1,2 @@
-+include ../../feeds/packages/perl/perlver.mk
-+
-diff --git a/package/utils/yubico-piv-tool/Makefile b/package/utils/yubico-piv-tool/Makefile
-new file mode 100644
-index 0000000..d253fa5
---- /dev/null
-+++ b/package/utils/yubico-piv-tool/Makefile
-@@ -0,0 +1,85 @@
-+#
-+# Copyright (C) 2006-2014 OpenWrt.org
-+# Copyright 2010 Vertical Communications
-+# This is free software, licensed under the GNU General Public License v2.
-+# See /LICENSE for more information.
-+#
-+
-+include $(TOPDIR)/rules.mk
-+
-+PKG_NAME:=yubico-piv-tool
-+PKG_VERSION:=1.7.0
-+PKG_HASH:=624d818f675941efb411f14b198007cfefc0bc10d7104548c7e106c81236e3a9
-+PKG_RELEASE:=1
-+
-+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-+PKG_SOURCE_URL:=git://github.com/Yubico/yubico-piv-tool
-+PKG_SOURCE_PROTO:=git
-+PKG_SOURCE_VERSION:=yubico-piv-tool-1.7.0
-+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-+PKG_LICENSE:=BSD
-+
-+PKG_INSTALL:=1
-+
-+PKG_BUILD_PARALLEL:=1
-+
-+PKG_FIXUP:=autoreconf
-+
-+include $(INCLUDE_DIR)/package.mk
-+
-+define Package/yubico-piv-tool
-+ SECTION:=utils
-+ CATEGORY:=Utilities
-+ TITLE:=yubico-piv-tool
-+ DEPENDS:= +libpcsclite +check +libopenssl
-+endef
-+
-+define Package/yubico-piv-tool/description
-+ yubico-piv-tool
-+endef
-+
-+
-+
-+#TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-+# $(INSTALL_DIR) $(1)/usr/bin
-+# $(INSTALL_DIR) $(1)/usr/lib
-+# $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sympathy $(1)/usr/bin/
-+# $(INSTALL_BIN) ${PKG_INSTALL_DIR}/usr/lib/libsympathy*.so* $(1)/usr/lib/
-+
-+# $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d
-+# $(INSTALL_BIN) ./files/sympathy.init $(1)/etc/init.d/sympathy
-+
-+
-+#TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections -flto
-+#TARGET_LDFLAGS += -flto
-+
-+#CONFIGURE_ARGS += \
-+# --disable-testio-debug \
-+# --enable-elf-shlibs \
-+# --disable-libuuid \
-+# --disable-libblkid \
-+# --disable-uuidd \
-+# --disable-tls \
-+# --disable-nls \
-+# --disable-rpath \
-+# --disable-fuse2fs
-+
-+define Build/Compile
-+ $(call Build/Compile/Default)
-+ make -C $(PKG_BUILD_DIR) \
-+ DESTDIR="$(PKG_INSTALL_DIR)" \
-+ install
-+endef
-+
-+
-+define Package/yubico-piv-tool/install
-+ $(INSTALL_DIR) $(1)/usr/bin
-+ $(INSTALL_DIR) $(1)/usr/lib
-+
-+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/yubico-piv-tool $(1)/usr/bin/
-+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libykcs11*.so* $(1)/usr/lib/
-+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libykpiv*.so* $(1)/usr/lib/
-+endef
-+
-+
-+$(eval $(call BuildPackage,yubico-piv-tool))
diff --git a/master/fix-libftdi b/master/fix-libftdi
new file mode 100644
index 0000000..d0f2542
--- /dev/null
+++ b/master/fix-libftdi
@@ -0,0 +1,13 @@
+diff --git a/feeds/packages/libs/libftdi1/Makefile b/feeds/packages/libs/libftdi1/Makefile
+index 35c3bf0..ed656f9 100644
+--- a/feeds/packages/libs/libftdi1/Makefile
++++ b/feeds/packages/libs/libftdi1/Makefile
+@@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=COPYING.LIB
+ PKG_INSTALL:=1
+ PKG_USE_MIPS16:=0
+
+-CMAKE_OPTIONS:=-DBUILD_TESTS=OFF
++CMAKE_OPTIONS:=-DBUILD_TESTS=OFF -DPYTHON_BINDINGS=OFF
+
+ include $(INCLUDE_DIR)/package.mk
+ include $(INCLUDE_DIR)/cmake.mk
diff --git a/master/galaxy-tools b/master/galaxy-tools
new file mode 100644
index 0000000..c5cd3cd
--- /dev/null
+++ b/master/galaxy-tools
@@ -0,0 +1,56 @@
+diff --git a/package/jmm/galaxy_tools/Makefile b/package/jmm/galaxy_tools/Makefile
+new file mode 100644
+index 0000000..6405116
+--- /dev/null
++++ b/package/jmm/galaxy_tools/Makefile
+@@ -0,0 +1,50 @@
++#
++# Copyright (C) 2009 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:=galaxy-tools
++PKG_VERSION:=2020-10-31
++PKG_RELEASE=$(PKG_SOURCE_VERSION)
++
++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
++PKG_SOURCE_URL:=git://git.panaceas.org/galaxy/galaxy_tools
++PKG_SOURCE_PROTO:=git
++PKG_SOURCE_VERSION:=master
++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.bz2
++
++
++PKG_NAME:=galaxy-tools
++PKG_RELEASE:=1
++
++include $(INCLUDE_DIR)/package.mk
++
++define Package/galaxy-tools
++ SECTION:=utils
++ CATEGORY:=Utilities
++ TITLE:=galaxy alarm tools
++ DEPENDS:= +libncursesw
++ VERSION:=1
++ MAINTAINER:=me <me@here>
++endef
++
++define Package/galaxy-tools/description
++ Tools for controlling galaxy dimension alarm panels
++endef
++
++define Build/Compile
++ make -C ${PKG_BUILD_DIR} CC=$(TARGET_CC)
++endef
++
++define Package/galaxy-tools/install
++ make -C $(PKG_BUILD_DIR) CC=${TARGET_CC} \
++ DESTDIR="$(1)" \
++ PREFIX=/usr \
++ install
++endef
++
++$(eval $(call BuildPackage,galaxy-tools))
diff --git a/master/my-config b/master/my-config
index dacb786..48c24d8 100644
--- a/master/my-config
+++ b/master/my-config
@@ -1,5 +1,5 @@
diff --git a/.config b/.config
-index d79707a..68963d7 100644
+index d79707a..c316295 100644
--- a/.config
+++ b/.config
@@ -134,6 +134,7 @@ CONFIG_PCI_SUPPORT=y
@@ -36,6 +36,15 @@ index d79707a..68963d7 100644
CONFIG_TARGET_ROOTFS_SQUASHFS=y
CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=256
CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP=y
+@@ -176,7 +186,7 @@ CONFIG_SIGNED_PACKAGES=y
+ # General build options
+ #
+ # CONFIG_DISPLAY_SUPPORT is not set
+-# CONFIG_BUILD_PATENTED is not set
++CONFIG_BUILD_PATENTED=y
+ # CONFIG_BUILD_NLS is not set
+ CONFIG_SHADOW_PASSWORDS=y
+ # CONFIG_CLEAN_IPKG is not set
@@ -326,7 +336,7 @@ CONFIG_TARGET_SUFFIX="musl"
# CONFIG_IB is not set
# CONFIG_SDK is not set
@@ -73,7 +82,14 @@ index d79707a..68963d7 100644
#
# Base system
-@@ -1387,14 +1406,7 @@ CONFIG_BUSYBOX_DEFAULT_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
+@@ -1382,19 +1401,12 @@ CONFIG_BUSYBOX_DEFAULT_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
+ # CONFIG_BUSYBOX_DEFAULT_FEATURE_IPC_SYSLOG is not set
+ CONFIG_BUSYBOX_DEFAULT_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
+ # CONFIG_BUSYBOX_DEFAULT_FEATURE_KMSG_SYSLOG is not set
+-# CONFIG_PACKAGE_ca-bundle is not set
+-# CONFIG_PACKAGE_ca-certificates is not set
++CONFIG_PACKAGE_ca-bundle=m
++CONFIG_PACKAGE_ca-certificates=m
CONFIG_PACKAGE_dnsmasq=y
# CONFIG_PACKAGE_dnsmasq-dhcpv6 is not set
# CONFIG_PACKAGE_dnsmasq-full is not set
@@ -89,15 +105,17 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_ead is not set
CONFIG_PACKAGE_firewall=y
CONFIG_PACKAGE_fstools=y
-@@ -1407,7 +1419,7 @@ CONFIG_PACKAGE_libc=y
+@@ -1407,8 +1419,8 @@ CONFIG_PACKAGE_libc=y
CONFIG_PACKAGE_libgcc=y
# CONFIG_PACKAGE_libgomp is not set
CONFIG_PACKAGE_libpthread=y
-# CONFIG_PACKAGE_librt is not set
+-# CONFIG_PACKAGE_libstdcpp is not set
+CONFIG_PACKAGE_librt=y
- # CONFIG_PACKAGE_libstdcpp is not set
++CONFIG_PACKAGE_libstdcpp=m
CONFIG_PACKAGE_logd=y
CONFIG_PACKAGE_mtd=y
+ CONFIG_PACKAGE_netifd=y
@@ -1423,7 +1435,7 @@ CONFIG_PACKAGE_procd=y
# CONFIG_PROCD_SHOW_BOOT is not set
# CONFIG_PROCD_ZRAM_TMPFS is not set
@@ -122,6 +140,15 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_gcc is not set
# CONFIG_PACKAGE_gdb is not set
# CONFIG_PACKAGE_gdbserver is not set
+@@ -1650,7 +1664,7 @@ CONFIG_PACKAGE_wireless-regdb=y
+ # CONFIG_PACKAGE_kmod-md-mod is not set
+ # CONFIG_PACKAGE_kmod-nbd is not set
+ # CONFIG_PACKAGE_kmod-scsi-cdrom is not set
+-# CONFIG_PACKAGE_kmod-scsi-core is not set
++CONFIG_PACKAGE_kmod-scsi-core=m
+ # CONFIG_PACKAGE_kmod-scsi-generic is not set
+ # CONFIG_PACKAGE_kmod-scsi-tape is not set
+
@@ -1662,46 +1676,48 @@ CONFIG_PACKAGE_wireless-regdb=y
#
# Cryptographic API modules
@@ -135,7 +162,8 @@ index d79707a..68963d7 100644
+CONFIG_PACKAGE_kmod-crypto-cbc=m
# CONFIG_PACKAGE_kmod-crypto-ccm is not set
# CONFIG_PACKAGE_kmod-crypto-cmac is not set
- # CONFIG_PACKAGE_kmod-crypto-crc32c is not set
+-# CONFIG_PACKAGE_kmod-crypto-crc32c is not set
++CONFIG_PACKAGE_kmod-crypto-crc32c=m
# CONFIG_PACKAGE_kmod-crypto-ctr is not set
# CONFIG_PACKAGE_kmod-crypto-cts is not set
-# CONFIG_PACKAGE_kmod-crypto-deflate is not set
@@ -189,7 +217,30 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_kmod-crypto-xts is not set
# CONFIG_PACKAGE_kmod-cryptodev is not set
-@@ -1746,7 +1762,30 @@ CONFIG_PACKAGE_wireless-regdb=y
+@@ -1714,8 +1730,9 @@ CONFIG_PACKAGE_wireless-regdb=y
+ # CONFIG_PACKAGE_kmod-fs-cifs is not set
+ # CONFIG_PACKAGE_kmod-fs-configfs is not set
+ # CONFIG_PACKAGE_kmod-fs-cramfs is not set
++CONFIG_PACKAGE_kmod-fs-exfat=m
+ # CONFIG_PACKAGE_kmod-fs-exportfs is not set
+-# CONFIG_PACKAGE_kmod-fs-ext4 is not set
++CONFIG_PACKAGE_kmod-fs-ext4=m
+ # CONFIG_PACKAGE_kmod-fs-f2fs is not set
+ # CONFIG_PACKAGE_kmod-fs-fscache is not set
+ # CONFIG_PACKAGE_kmod-fs-hfs is not set
+@@ -1734,9 +1751,9 @@ CONFIG_PACKAGE_wireless-regdb=y
+ # CONFIG_PACKAGE_kmod-fs-reiserfs is not set
+ # CONFIG_PACKAGE_kmod-fs-squashfs is not set
+ # CONFIG_PACKAGE_kmod-fs-udf is not set
+-# CONFIG_PACKAGE_kmod-fs-vfat is not set
++CONFIG_PACKAGE_kmod-fs-vfat=m
+ # CONFIG_PACKAGE_kmod-fs-xfs is not set
+-# CONFIG_PACKAGE_kmod-fuse is not set
++CONFIG_PACKAGE_kmod-fuse=m
+
+ #
+ # FireWire support
+@@ -1746,7 +1763,30 @@ CONFIG_PACKAGE_wireless-regdb=y
#
# Hardware Monitoring Support
#
@@ -221,7 +272,27 @@ index d79707a..68963d7 100644
#
# I2C support
-@@ -1803,7 +1842,9 @@ CONFIG_PACKAGE_kmod-lib-crc-ccitt=y
+@@ -1768,10 +1808,10 @@ CONFIG_PACKAGE_wireless-regdb=y
+ #
+ # Input modules
+ #
+-# CONFIG_PACKAGE_kmod-hid is not set
+-# CONFIG_PACKAGE_kmod-hid-generic is not set
+-# CONFIG_PACKAGE_kmod-input-core is not set
+-# CONFIG_PACKAGE_kmod-input-evdev is not set
++CONFIG_PACKAGE_kmod-hid=m
++CONFIG_PACKAGE_kmod-hid-generic=m
++CONFIG_PACKAGE_kmod-input-core=m
++CONFIG_PACKAGE_kmod-input-evdev=m
+ # CONFIG_PACKAGE_kmod-input-gpio-encoder is not set
+ # CONFIG_PACKAGE_kmod-input-gpio-keys is not set
+ # CONFIG_PACKAGE_kmod-input-gpio-keys-polled is not set
+@@ -1799,11 +1839,13 @@ CONFIG_PACKAGE_kmod-leds-gpio=y
+ # CONFIG_PACKAGE_kmod-lib-cordic is not set
+ CONFIG_PACKAGE_kmod-lib-crc-ccitt=y
+ # CONFIG_PACKAGE_kmod-lib-crc-itu-t is not set
+-# CONFIG_PACKAGE_kmod-lib-crc16 is not set
++CONFIG_PACKAGE_kmod-lib-crc16=m
# CONFIG_PACKAGE_kmod-lib-crc32c is not set
# CONFIG_PACKAGE_kmod-lib-crc7 is not set
# CONFIG_PACKAGE_kmod-lib-crc8 is not set
@@ -232,7 +303,33 @@ index d79707a..68963d7 100644
#
# Native Language Support
-@@ -1866,7 +1907,7 @@ CONFIG_PACKAGE_kmod-ipt-core=y
+@@ -1811,7 +1853,7 @@ CONFIG_PACKAGE_kmod-lib-crc-ccitt=y
+ CONFIG_PACKAGE_kmod-nls-base=y
+ # CONFIG_PACKAGE_kmod-nls-cp1250 is not set
+ # CONFIG_PACKAGE_kmod-nls-cp1251 is not set
+-# CONFIG_PACKAGE_kmod-nls-cp437 is not set
++CONFIG_PACKAGE_kmod-nls-cp437=m
+ # CONFIG_PACKAGE_kmod-nls-cp775 is not set
+ # CONFIG_PACKAGE_kmod-nls-cp850 is not set
+ # CONFIG_PACKAGE_kmod-nls-cp852 is not set
+@@ -1821,14 +1863,14 @@ CONFIG_PACKAGE_kmod-nls-base=y
+ # CONFIG_PACKAGE_kmod-nls-cp932 is not set
+ # CONFIG_PACKAGE_kmod-nls-cp936 is not set
+ # CONFIG_PACKAGE_kmod-nls-cp950 is not set
+-# CONFIG_PACKAGE_kmod-nls-iso8859-1 is not set
++CONFIG_PACKAGE_kmod-nls-iso8859-1=m
+ # CONFIG_PACKAGE_kmod-nls-iso8859-13 is not set
+ # CONFIG_PACKAGE_kmod-nls-iso8859-15 is not set
+ # CONFIG_PACKAGE_kmod-nls-iso8859-2 is not set
+ # CONFIG_PACKAGE_kmod-nls-iso8859-6 is not set
+ # CONFIG_PACKAGE_kmod-nls-iso8859-8 is not set
+ # CONFIG_PACKAGE_kmod-nls-koi8r is not set
+-# CONFIG_PACKAGE_kmod-nls-utf8 is not set
++CONFIG_PACKAGE_kmod-nls-utf8=m
+
+ #
+ # Netfilter Extensions
+@@ -1866,7 +1908,7 @@ CONFIG_PACKAGE_kmod-ipt-core=y
# CONFIG_PACKAGE_kmod-ipt-ipopt is not set
# CONFIG_PACKAGE_kmod-ipt-ipp2p is not set
# CONFIG_PACKAGE_kmod-ipt-iprange is not set
@@ -241,7 +338,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_kmod-ipt-ipset is not set
# CONFIG_PACKAGE_kmod-ipt-ipv4options is not set
# CONFIG_PACKAGE_kmod-ipt-led is not set
-@@ -1895,7 +1936,7 @@ CONFIG_PACKAGE_kmod-ipt-offload=y
+@@ -1895,7 +1937,7 @@ CONFIG_PACKAGE_kmod-ipt-offload=y
# CONFIG_PACKAGE_kmod-ipt-ulog is not set
# CONFIG_PACKAGE_kmod-netatop is not set
CONFIG_PACKAGE_kmod-nf-conntrack=y
@@ -250,7 +347,7 @@ index d79707a..68963d7 100644
CONFIG_PACKAGE_kmod-nf-conntrack6=y
CONFIG_PACKAGE_kmod-nf-flow=y
CONFIG_PACKAGE_kmod-nf-ipt=y
-@@ -1903,10 +1944,10 @@ CONFIG_PACKAGE_kmod-nf-ipt6=y
+@@ -1903,10 +1945,10 @@ CONFIG_PACKAGE_kmod-nf-ipt6=y
CONFIG_PACKAGE_kmod-nf-nat=y
# CONFIG_PACKAGE_kmod-nf-nat6 is not set
# CONFIG_PACKAGE_kmod-nf-nathelper is not set
@@ -263,7 +360,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_kmod-nfnetlink-log is not set
# CONFIG_PACKAGE_kmod-nfnetlink-queue is not set
# CONFIG_PACKAGE_kmod-nft-arp is not set
-@@ -1946,7 +1987,7 @@ CONFIG_PACKAGE_kmod-nf-reject6=y
+@@ -1946,7 +1988,7 @@ CONFIG_PACKAGE_kmod-nf-reject6=y
# CONFIG_PACKAGE_kmod-libphy is not set
# CONFIG_PACKAGE_kmod-macvlan is not set
# CONFIG_PACKAGE_kmod-mdio-gpio is not set
@@ -272,7 +369,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_kmod-natsemi is not set
# CONFIG_PACKAGE_kmod-ne2k-pci is not set
# CONFIG_PACKAGE_kmod-niu is not set
-@@ -1987,12 +2028,18 @@ CONFIG_PACKAGE_kmod-nf-reject6=y
+@@ -1987,12 +2029,18 @@ CONFIG_PACKAGE_kmod-nf-reject6=y
# CONFIG_PACKAGE_kmod-dnsresolver is not set
# CONFIG_PACKAGE_kmod-fou is not set
# CONFIG_PACKAGE_kmod-geneve is not set
@@ -295,7 +392,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_kmod-isdn4linux is not set
# CONFIG_PACKAGE_kmod-jool is not set
# CONFIG_PACKAGE_kmod-l2tp is not set
-@@ -2002,7 +2049,7 @@ CONFIG_PACKAGE_kmod-nf-reject6=y
+@@ -2002,7 +2050,7 @@ CONFIG_PACKAGE_kmod-nf-reject6=y
# CONFIG_PACKAGE_kmod-misdn is not set
# CONFIG_PACKAGE_kmod-mpls is not set
CONFIG_PACKAGE_kmod-ppp=y
@@ -304,7 +401,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_kmod-nat46 is not set
# CONFIG_PACKAGE_kmod-netem is not set
# CONFIG_PACKAGE_kmod-nlmon is not set
-@@ -2016,7 +2063,7 @@ CONFIG_PACKAGE_kmod-ppp=y
+@@ -2016,7 +2064,7 @@ CONFIG_PACKAGE_kmod-ppp=y
CONFIG_PACKAGE_kmod-pppoe=y
# CONFIG_PACKAGE_kmod-pppol2tp is not set
CONFIG_PACKAGE_kmod-pppox=y
@@ -313,7 +410,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_kmod-sched is not set
# CONFIG_PACKAGE_kmod-sched-cake is not set
# CONFIG_PACKAGE_kmod-sched-connmark is not set
-@@ -2026,7 +2073,7 @@ CONFIG_PACKAGE_kmod-pppox=y
+@@ -2026,7 +2074,7 @@ CONFIG_PACKAGE_kmod-pppox=y
CONFIG_PACKAGE_kmod-slhc=y
# CONFIG_PACKAGE_kmod-slip is not set
# CONFIG_PACKAGE_kmod-trelay is not set
@@ -322,7 +419,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_kmod-veth is not set
# CONFIG_PACKAGE_kmod-vxlan is not set
# CONFIG_PACKAGE_kmod-wireguard is not set
-@@ -2118,7 +2165,7 @@ CONFIG_PACKAGE_kmod-gpio-button-hotplug=y
+@@ -2118,25 +2166,71 @@ CONFIG_PACKAGE_kmod-gpio-button-hotplug=y
# USB Support
#
# CONFIG_PACKAGE_kmod-chaoskey is not set
@@ -331,9 +428,11 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_kmod-usb-atm is not set
# CONFIG_PACKAGE_kmod-usb-cm109 is not set
CONFIG_PACKAGE_kmod-usb-core=y
-@@ -2127,16 +2174,62 @@ CONFIG_PACKAGE_kmod-usb-core=y
+ # CONFIG_PACKAGE_kmod-usb-dwc2 is not set
+ # CONFIG_PACKAGE_kmod-usb-dwc3 is not set
CONFIG_PACKAGE_kmod-usb-ehci=y
- # CONFIG_PACKAGE_kmod-usb-hid is not set
+-# CONFIG_PACKAGE_kmod-usb-hid is not set
++CONFIG_PACKAGE_kmod-usb-hid=m
# CONFIG_PACKAGE_kmod-usb-ledtrig-usbport is not set
-# CONFIG_PACKAGE_kmod-usb-net is not set
+CONFIG_PACKAGE_kmod-usb-net=m
@@ -364,6 +463,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_kmod-usb-ohci-pci is not set
# CONFIG_PACKAGE_kmod-usb-printer is not set
-# CONFIG_PACKAGE_kmod-usb-serial is not set
+-# CONFIG_PACKAGE_kmod-usb-storage is not set
+CONFIG_PACKAGE_kmod-usb-serial=m
+# CONFIG_PACKAGE_kmod-usb-serial-ark3116 is not set
+# CONFIG_PACKAGE_kmod-usb-serial-belkin is not set
@@ -388,16 +488,17 @@ index d79707a..68963d7 100644
+# CONFIG_PACKAGE_kmod-usb-serial-visor is not set
+# CONFIG_PACKAGE_kmod-usb-serial-wwan is not set
+# CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common is not set
- # CONFIG_PACKAGE_kmod-usb-storage is not set
++CONFIG_PACKAGE_kmod-usb-storage=m
# CONFIG_PACKAGE_kmod-usb-storage-extras is not set
- # CONFIG_PACKAGE_kmod-usb-storage-uas is not set
+-# CONFIG_PACKAGE_kmod-usb-storage-uas is not set
++CONFIG_PACKAGE_kmod-usb-storage-uas=m
# CONFIG_PACKAGE_kmod-usb-uhci is not set
-# CONFIG_PACKAGE_kmod-usb-wdm is not set
+CONFIG_PACKAGE_kmod-usb-wdm=m
# CONFIG_PACKAGE_kmod-usb-yealink is not set
CONFIG_PACKAGE_kmod-usb2=y
# CONFIG_PACKAGE_kmod-usb2-pci is not set
-@@ -2163,7 +2256,17 @@ CONFIG_PACKAGE_kmod-usb2=y
+@@ -2163,7 +2257,17 @@ CONFIG_PACKAGE_kmod-usb2=y
#
# W1 support
#
@@ -416,7 +517,181 @@ index d79707a..68963d7 100644
#
# WPAN 802.15.4 Support
-@@ -2380,20 +2483,20 @@ CONFIG_PACKAGE_kmod-mt76x2=y
+@@ -2352,7 +2456,172 @@ CONFIG_PACKAGE_kmod-mt76x2=y
+ #
+ # Perl
+ #
+-# CONFIG_PACKAGE_perl is not set
++CONFIG_PACKAGE_perl=m
++
++#
++# Configuration
++#
++CONFIG_PERL_THREADS=y
++# CONFIG_PERL_TESTS is not set
++CONFIG_PERL_NOCOMMENT=y
++# CONFIG_PACKAGE_perl-authen-sasl is not set
++# CONFIG_PACKAGE_perl-authen-sasl-xs is not set
++CONFIG_PACKAGE_perl-autoloader=m
++# CONFIG_PACKAGE_perl-cgi is not set
++CONFIG_PACKAGE_perl-chipcard-pcsc=m
++# CONFIG_PACKAGE_perl-compress-bzip2 is not set
++CONFIG_PACKAGE_perl-crypt-openssl-guess=m
++CONFIG_PACKAGE_perl-crypt-openssl-random=m
++CONFIG_PACKAGE_perl-crypt-openssl-rsa=m
++CONFIG_PACKAGE_perl-crypt-rsa=m
++CONFIG_PACKAGE_perl-dbi=m
++CONFIG_PACKAGE_perl-device-serialport=m
++# CONFIG_PACKAGE_perl-device-usb is not set
++CONFIG_PACKAGE_perl-digest-sha256=m
++# CONFIG_PACKAGE_perl-encode-locale is not set
++# CONFIG_PACKAGE_perl-file-listing is not set
++# CONFIG_PACKAGE_perl-file-sharedir-install is not set
++# CONFIG_PACKAGE_perl-html-form is not set
++# CONFIG_PACKAGE_perl-html-parser is not set
++# CONFIG_PACKAGE_perl-html-tagset is not set
++# CONFIG_PACKAGE_perl-html-tree is not set
++# CONFIG_PACKAGE_perl-http-cookies is not set
++# CONFIG_PACKAGE_perl-http-daemon is not set
++# CONFIG_PACKAGE_perl-http-date is not set
++# CONFIG_PACKAGE_perl-http-message is not set
++# CONFIG_PACKAGE_perl-http-negotiate is not set
++# CONFIG_PACKAGE_perl-http-server-simple is not set
++# CONFIG_PACKAGE_perl-inline is not set
++# CONFIG_PACKAGE_perl-inline-c is not set
++# CONFIG_PACKAGE_perl-io-html is not set
++# CONFIG_PACKAGE_perl-lockfile-simple is not set
++# CONFIG_PACKAGE_perl-lwp-mediatypes is not set
++# CONFIG_PACKAGE_perl-net-http is not set
++CONFIG_PACKAGE_perl-net-mqtt-simple=m
++# CONFIG_PACKAGE_perl-net-telnet is not set
++# CONFIG_PACKAGE_perl-parse-recdescent is not set
++# CONFIG_PACKAGE_perl-sub-uplevel is not set
++CONFIG_PACKAGE_perl-sys-syslog=m
++# CONFIG_PACKAGE_perl-test-harness is not set
++# CONFIG_PACKAGE_perl-test-warn is not set
++# CONFIG_PACKAGE_perl-text-csv_xs is not set
++# CONFIG_PACKAGE_perl-uri is not set
++# CONFIG_PACKAGE_perl-www is not set
++# CONFIG_PACKAGE_perl-www-curl is not set
++# CONFIG_PACKAGE_perl-www-mechanize is not set
++# CONFIG_PACKAGE_perl-www-robotrules is not set
++# CONFIG_PACKAGE_perl-xml-parser is not set
++# CONFIG_PACKAGE_perlbase-anydbm-file is not set
++# CONFIG_PACKAGE_perlbase-app is not set
++# CONFIG_PACKAGE_perlbase-archive is not set
++# CONFIG_PACKAGE_perlbase-arybase is not set
++# CONFIG_PACKAGE_perlbase-attribute is not set
++# CONFIG_PACKAGE_perlbase-attributes is not set
++# CONFIG_PACKAGE_perlbase-autodie is not set
++# CONFIG_PACKAGE_perlbase-autoloader is not set
++# CONFIG_PACKAGE_perlbase-autosplit is not set
++# CONFIG_PACKAGE_perlbase-autouse is not set
++# CONFIG_PACKAGE_perlbase-b is not set
++CONFIG_PACKAGE_perlbase-base=m
++CONFIG_PACKAGE_perlbase-benchmark=m
++# CONFIG_PACKAGE_perlbase-bigint is not set
++# CONFIG_PACKAGE_perlbase-bignum is not set
++# CONFIG_PACKAGE_perlbase-blib is not set
++CONFIG_PACKAGE_perlbase-bytes=m
++# CONFIG_PACKAGE_perlbase-charnames is not set
++CONFIG_PACKAGE_perlbase-class=m
++# CONFIG_PACKAGE_perlbase-compress is not set
++CONFIG_PACKAGE_perlbase-config=m
++# CONFIG_PACKAGE_perlbase-cpan is not set
++CONFIG_PACKAGE_perlbase-cwd=m
++CONFIG_PACKAGE_perlbase-data=m
++# CONFIG_PACKAGE_perlbase-db is not set
++# CONFIG_PACKAGE_perlbase-db-file is not set
++# CONFIG_PACKAGE_perlbase-dbm-filter is not set
++# CONFIG_PACKAGE_perlbase-devel is not set
++# CONFIG_PACKAGE_perlbase-diagnostics is not set
++# CONFIG_PACKAGE_perlbase-digest is not set
++# CONFIG_PACKAGE_perlbase-dirhandle is not set
++# CONFIG_PACKAGE_perlbase-dumpvalue is not set
++# CONFIG_PACKAGE_perlbase-dumpvar is not set
++CONFIG_PACKAGE_perlbase-dynaloader=m
++# CONFIG_PACKAGE_perlbase-encode is not set
++# CONFIG_PACKAGE_perlbase-encoding is not set
++# CONFIG_PACKAGE_perlbase-english is not set
++# CONFIG_PACKAGE_perlbase-env is not set
++CONFIG_PACKAGE_perlbase-errno=m
++CONFIG_PACKAGE_perlbase-essential=m
++# CONFIG_PACKAGE_perlbase-experimental is not set
++# CONFIG_PACKAGE_perlbase-extutils is not set
++# CONFIG_PACKAGE_perlbase-fatal is not set
++CONFIG_PACKAGE_perlbase-fcntl=m
++# CONFIG_PACKAGE_perlbase-feature is not set
++# CONFIG_PACKAGE_perlbase-fields is not set
++CONFIG_PACKAGE_perlbase-file=m
++# CONFIG_PACKAGE_perlbase-filecache is not set
++CONFIG_PACKAGE_perlbase-filehandle=m
++# CONFIG_PACKAGE_perlbase-filetest is not set
++# CONFIG_PACKAGE_perlbase-filter is not set
++# CONFIG_PACKAGE_perlbase-findbin is not set
++# CONFIG_PACKAGE_perlbase-gdbm-file is not set
++# CONFIG_PACKAGE_perlbase-getopt is not set
++# CONFIG_PACKAGE_perlbase-hash is not set
++# CONFIG_PACKAGE_perlbase-http-tiny is not set
++CONFIG_PACKAGE_perlbase-i18n=m
++# CONFIG_PACKAGE_perlbase-if is not set
++CONFIG_PACKAGE_perlbase-integer=m
++CONFIG_PACKAGE_perlbase-io=m
++CONFIG_PACKAGE_perlbase-ipc=m
++# CONFIG_PACKAGE_perlbase-json-pp is not set
++# CONFIG_PACKAGE_perlbase-less is not set
++CONFIG_PACKAGE_perlbase-list=m
++CONFIG_PACKAGE_perlbase-locale=m
++# CONFIG_PACKAGE_perlbase-math is not set
++# CONFIG_PACKAGE_perlbase-memoize is not set
++# CONFIG_PACKAGE_perlbase-meta-notation is not set
++# CONFIG_PACKAGE_perlbase-mime is not set
++# CONFIG_PACKAGE_perlbase-module is not set
++# CONFIG_PACKAGE_perlbase-mro is not set
++# CONFIG_PACKAGE_perlbase-net is not set
++# CONFIG_PACKAGE_perlbase-next is not set
++# CONFIG_PACKAGE_perlbase-o is not set
++# CONFIG_PACKAGE_perlbase-opcode is not set
++# CONFIG_PACKAGE_perlbase-open is not set
++# CONFIG_PACKAGE_perlbase-ops is not set
++# CONFIG_PACKAGE_perlbase-ostype is not set
++CONFIG_PACKAGE_perlbase-params=m
++# CONFIG_PACKAGE_perlbase-perl5db is not set
++# CONFIG_PACKAGE_perlbase-perlio is not set
++# CONFIG_PACKAGE_perlbase-pod is not set
++CONFIG_PACKAGE_perlbase-posix=m
++CONFIG_PACKAGE_perlbase-re=m
++# CONFIG_PACKAGE_perlbase-safe is not set
++CONFIG_PACKAGE_perlbase-scalar=m
++# CONFIG_PACKAGE_perlbase-sdbm-file is not set
++# CONFIG_PACKAGE_perlbase-search is not set
++CONFIG_PACKAGE_perlbase-selectsaver=m
++CONFIG_PACKAGE_perlbase-selfloader=m
++# CONFIG_PACKAGE_perlbase-sigtrap is not set
++CONFIG_PACKAGE_perlbase-socket=m
++# CONFIG_PACKAGE_perlbase-sort is not set
++CONFIG_PACKAGE_perlbase-storable=m
++CONFIG_PACKAGE_perlbase-symbol=m
++# CONFIG_PACKAGE_perlbase-sys is not set
++CONFIG_PACKAGE_perlbase-tap=m
++# CONFIG_PACKAGE_perlbase-term is not set
++CONFIG_PACKAGE_perlbase-test=m
++CONFIG_PACKAGE_perlbase-text=m
++# CONFIG_PACKAGE_perlbase-thread is not set
++# CONFIG_PACKAGE_perlbase-threads is not set
++CONFIG_PACKAGE_perlbase-tie=m
++# CONFIG_PACKAGE_perlbase-time is not set
++# CONFIG_PACKAGE_perlbase-unicode is not set
++CONFIG_PACKAGE_perlbase-unicore=m
++CONFIG_PACKAGE_perlbase-universal=m
++# CONFIG_PACKAGE_perlbase-user is not set
++CONFIG_PACKAGE_perlbase-utf8=m
++# CONFIG_PACKAGE_perlbase-version is not set
++CONFIG_PACKAGE_perlbase-xsloader=m
+
+ #
+ # Python
+@@ -2380,20 +2649,20 @@ CONFIG_PACKAGE_kmod-mt76x2=y
# CONFIG_PACKAGE_openpyxl is not set
# CONFIG_PACKAGE_pillow is not set
# CONFIG_PACKAGE_pyjwt is not set
@@ -441,7 +716,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_python-compiler-src is not set
# CONFIG_PACKAGE_python-constantly is not set
# CONFIG_PACKAGE_python-constantly-src is not set
-@@ -2402,27 +2505,27 @@ CONFIG_PACKAGE_kmod-mt76x2=y
+@@ -2402,27 +2671,27 @@ CONFIG_PACKAGE_kmod-mt76x2=y
# CONFIG_PACKAGE_python-crypto-src is not set
# CONFIG_PACKAGE_python-cryptography is not set
# CONFIG_PACKAGE_python-cryptography-src is not set
@@ -475,7 +750,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_python-gdbm-src is not set
# CONFIG_PACKAGE_python-gmpy2 is not set
# CONFIG_PACKAGE_python-gnupg is not set
-@@ -2437,23 +2540,23 @@ CONFIG_PACKAGE_kmod-mt76x2=y
+@@ -2437,23 +2706,23 @@ CONFIG_PACKAGE_kmod-mt76x2=y
# CONFIG_PACKAGE_python-ldap is not set
# CONFIG_PACKAGE_python-lib2to3 is not set
# CONFIG_PACKAGE_python-lib2to3-src is not set
@@ -504,7 +779,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_python-openssl-src is not set
# CONFIG_PACKAGE_python-parsley is not set
# CONFIG_PACKAGE_python-parsley-src is not set
-@@ -2470,7 +2573,7 @@ CONFIG_PACKAGE_kmod-mt76x2=y
+@@ -2470,7 +2739,7 @@ CONFIG_PACKAGE_kmod-mt76x2=y
# CONFIG_PACKAGE_python-pyasn1-src is not set
# CONFIG_PACKAGE_python-pycparser is not set
# CONFIG_PACKAGE_python-pycparser-src is not set
@@ -513,7 +788,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_python-pydoc-src is not set
# CONFIG_PACKAGE_python-pyodbc is not set
# CONFIG_PACKAGE_python-pyopenssl is not set
-@@ -2489,14 +2592,14 @@ CONFIG_PACKAGE_kmod-mt76x2=y
+@@ -2489,65 +2758,65 @@ CONFIG_PACKAGE_kmod-mt76x2=y
# CONFIG_PACKAGE_python-six is not set
# CONFIG_PACKAGE_python-six-src is not set
# CONFIG_PACKAGE_python-smbus is not set
@@ -531,13 +806,150 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_python-xml-src is not set
# CONFIG_PACKAGE_python-yaml is not set
# CONFIG_PACKAGE_python-zope-interface is not set
-@@ -2634,17 +2737,31 @@ CONFIG_PACKAGE_kmod-mt76x2=y
+ # CONFIG_PACKAGE_python-zope-interface-src is not set
+-# CONFIG_PACKAGE_python3 is not set
+-# CONFIG_PACKAGE_python3-asn1crypto is not set
+-# CONFIG_PACKAGE_python3-asyncio is not set
++CONFIG_PACKAGE_python3=m
++CONFIG_PACKAGE_python3-asn1crypto=m
++CONFIG_PACKAGE_python3-asyncio=m
+ # CONFIG_PACKAGE_python3-asyncio-src is not set
+ # CONFIG_PACKAGE_python3-attrs is not set
+ # CONFIG_PACKAGE_python3-attrs-src is not set
+ # CONFIG_PACKAGE_python3-automat is not set
+ # CONFIG_PACKAGE_python3-automat-src is not set
+-# CONFIG_PACKAGE_python3-base is not set
++CONFIG_PACKAGE_python3-base=m
+ # CONFIG_PACKAGE_python3-base-src is not set
+ # CONFIG_PACKAGE_python3-bottle is not set
+-# CONFIG_PACKAGE_python3-cffi is not set
++CONFIG_PACKAGE_python3-cffi=m
+ # CONFIG_PACKAGE_python3-cffi-src is not set
+-# CONFIG_PACKAGE_python3-cgi is not set
++CONFIG_PACKAGE_python3-cgi=m
+ # CONFIG_PACKAGE_python3-cgi-src is not set
+-# CONFIG_PACKAGE_python3-cgitb is not set
++CONFIG_PACKAGE_python3-cgitb=m
+ # CONFIG_PACKAGE_python3-cgitb-src is not set
+ # CONFIG_PACKAGE_python3-click is not set
+-# CONFIG_PACKAGE_python3-codecs is not set
++CONFIG_PACKAGE_python3-codecs=m
+ # CONFIG_PACKAGE_python3-codecs-src is not set
+ # CONFIG_PACKAGE_python3-constantly is not set
+ # CONFIG_PACKAGE_python3-constantly-src is not set
+ # CONFIG_PACKAGE_python3-crypto is not set
+ # CONFIG_PACKAGE_python3-crypto-src is not set
+-# CONFIG_PACKAGE_python3-cryptography is not set
++CONFIG_PACKAGE_python3-cryptography=m
+ # CONFIG_PACKAGE_python3-cryptography-src is not set
+-# CONFIG_PACKAGE_python3-ctypes is not set
++CONFIG_PACKAGE_python3-ctypes=m
+ # CONFIG_PACKAGE_python3-ctypes-src is not set
+-# CONFIG_PACKAGE_python3-dbm is not set
++CONFIG_PACKAGE_python3-dbm=m
+ # CONFIG_PACKAGE_python3-dbm-src is not set
+-# CONFIG_PACKAGE_python3-decimal is not set
++CONFIG_PACKAGE_python3-decimal=m
+ # CONFIG_PACKAGE_python3-decimal-src is not set
+ # CONFIG_PACKAGE_python3-dev is not set
+ # CONFIG_PACKAGE_python3-dev-src is not set
+-# CONFIG_PACKAGE_python3-distutils is not set
++CONFIG_PACKAGE_python3-distutils=m
+ # CONFIG_PACKAGE_python3-distutils-src is not set
+-# CONFIG_PACKAGE_python3-email is not set
++CONFIG_PACKAGE_python3-email=m
+ # CONFIG_PACKAGE_python3-email-src is not set
+ # CONFIG_PACKAGE_python3-evdev is not set
+ # CONFIG_PACKAGE_python3-flask is not set
+-# CONFIG_PACKAGE_python3-gdbm is not set
++CONFIG_PACKAGE_python3-gdbm=m
+ # CONFIG_PACKAGE_python3-gdbm-src is not set
+ # CONFIG_PACKAGE_python3-gmpy2 is not set
+ # CONFIG_PACKAGE_python3-gnupg is not set
+ # CONFIG_PACKAGE_python3-hyperlink is not set
+ # CONFIG_PACKAGE_python3-hyperlink-src is not set
+-# CONFIG_PACKAGE_python3-idna is not set
++CONFIG_PACKAGE_python3-idna=m
+ # CONFIG_PACKAGE_python3-idna-src is not set
+ # CONFIG_PACKAGE_python3-incremental is not set
+ # CONFIG_PACKAGE_python3-incremental-src is not set
+@@ -2555,39 +2824,39 @@ CONFIG_PACKAGE_kmod-mt76x2=y
+ # CONFIG_PACKAGE_python3-jinja2 is not set
+ # CONFIG_PACKAGE_python3-lib2to3 is not set
+ # CONFIG_PACKAGE_python3-lib2to3-src is not set
+-# CONFIG_PACKAGE_python3-light is not set
++CONFIG_PACKAGE_python3-light=m
+
+ #
+ # Configuration
+ #
+ # CONFIG_PYTHON3_BLUETOOTH_SUPPORT is not set
+ # CONFIG_PACKAGE_python3-light-src is not set
+-# CONFIG_PACKAGE_python3-logging is not set
++CONFIG_PACKAGE_python3-logging=m
+ # CONFIG_PACKAGE_python3-logging-src is not set
+ # CONFIG_PACKAGE_python3-lxml is not set
+-# CONFIG_PACKAGE_python3-lzma is not set
++CONFIG_PACKAGE_python3-lzma=m
+ # CONFIG_PACKAGE_python3-lzma-src is not set
+ # CONFIG_PACKAGE_python3-markupsafe is not set
+-# CONFIG_PACKAGE_python3-multiprocessing is not set
++CONFIG_PACKAGE_python3-multiprocessing=m
+ # CONFIG_PACKAGE_python3-multiprocessing-src is not set
+ # CONFIG_PACKAGE_python3-mysql is not set
+-# CONFIG_PACKAGE_python3-ncurses is not set
++CONFIG_PACKAGE_python3-ncurses=m
+ # CONFIG_PACKAGE_python3-ncurses-src is not set
+-# CONFIG_PACKAGE_python3-openssl is not set
++CONFIG_PACKAGE_python3-openssl=m
+ # CONFIG_PACKAGE_python3-openssl-src is not set
+ # CONFIG_PACKAGE_python3-parsley is not set
+ # CONFIG_PACKAGE_python3-parsley-src is not set
+ # CONFIG_PACKAGE_python3-pip is not set
+ # CONFIG_PACKAGE_python3-pip-src is not set
+-# CONFIG_PACKAGE_python3-ply is not set
++CONFIG_PACKAGE_python3-ply=m
+ # CONFIG_PACKAGE_python3-ply-src is not set
+ # CONFIG_PACKAGE_python3-pyasn1 is not set
+ # CONFIG_PACKAGE_python3-pyasn1-modules is not set
+ # CONFIG_PACKAGE_python3-pyasn1-modules-src is not set
+ # CONFIG_PACKAGE_python3-pyasn1-src is not set
+-# CONFIG_PACKAGE_python3-pycparser is not set
++CONFIG_PACKAGE_python3-pycparser=m
+ # CONFIG_PACKAGE_python3-pycparser-src is not set
+-# CONFIG_PACKAGE_python3-pydoc is not set
++CONFIG_PACKAGE_python3-pydoc=m
+ # CONFIG_PACKAGE_python3-pydoc-src is not set
+ # CONFIG_PACKAGE_python3-pyodbc is not set
+ # CONFIG_PACKAGE_python3-pyopenssl is not set
+@@ -2598,15 +2867,15 @@ CONFIG_PACKAGE_kmod-mt76x2=y
+ # CONFIG_PACKAGE_python3-service-identity-src is not set
+ # CONFIG_PACKAGE_python3-setuptools is not set
+ # CONFIG_PACKAGE_python3-setuptools-src is not set
+-# CONFIG_PACKAGE_python3-six is not set
++CONFIG_PACKAGE_python3-six=m
+ # CONFIG_PACKAGE_python3-six-src is not set
+ # CONFIG_PACKAGE_python3-smbus is not set
+-# CONFIG_PACKAGE_python3-sqlite3 is not set
++CONFIG_PACKAGE_python3-sqlite3=m
+ # CONFIG_PACKAGE_python3-sqlite3-src is not set
+-# CONFIG_PACKAGE_python3-unittest is not set
++CONFIG_PACKAGE_python3-unittest=m
+ # CONFIG_PACKAGE_python3-unittest-src is not set
+ # CONFIG_PACKAGE_python3-werkzeug is not set
+-# CONFIG_PACKAGE_python3-xml is not set
++CONFIG_PACKAGE_python3-xml=m
+ # CONFIG_PACKAGE_python3-xml-src is not set
+ # CONFIG_PACKAGE_python3-yaml is not set
+ # CONFIG_PACKAGE_python3-zope-interface is not set
+@@ -2634,19 +2903,33 @@ CONFIG_PACKAGE_kmod-mt76x2=y
#
# Compression
#
-# CONFIG_PACKAGE_libbz2 is not set
+-# CONFIG_PACKAGE_liblzma is not set
+CONFIG_PACKAGE_libbz2=m
- # CONFIG_PACKAGE_liblzma is not set
++CONFIG_PACKAGE_liblzma=m
# CONFIG_PACKAGE_libunrar is not set
#
@@ -545,10 +957,11 @@ index d79707a..68963d7 100644
#
-# CONFIG_PACKAGE_libacl is not set
-# CONFIG_PACKAGE_libattr is not set
+-# CONFIG_PACKAGE_libfuse is not set
+-# CONFIG_PACKAGE_libow is not set
+CONFIG_PACKAGE_libacl=m
+CONFIG_PACKAGE_libattr=m
- # CONFIG_PACKAGE_libfuse is not set
--# CONFIG_PACKAGE_libow is not set
++CONFIG_PACKAGE_libfuse=m
+CONFIG_PACKAGE_libow=m
+
+#
@@ -565,15 +978,38 @@ index d79707a..68963d7 100644
+# CONFIG_LIBOW_DEBUG is not set
+# CONFIG_LIBOW_OWTRAFFIC is not set
# CONFIG_PACKAGE_libow-capi is not set
- # CONFIG_PACKAGE_libsysfs is not set
+-# CONFIG_PACKAGE_libsysfs is not set
++CONFIG_PACKAGE_libsysfs=m
-@@ -2800,7 +2917,18 @@ CONFIG_PACKAGE_libxtables=y
#
- # CONFIG_PACKAGE_libgnutls is not set
+ # Firewall
+@@ -2798,9 +3081,37 @@ CONFIG_PACKAGE_libxtables=y
+ #
+ # SSL
+ #
+-# CONFIG_PACKAGE_libgnutls is not set
++CONFIG_PACKAGE_libgnutls=m
++
++#
++# Configuration
++#
++CONFIG_GNUTLS_DTLS_SRTP=y
++CONFIG_GNUTLS_ALPN=y
++CONFIG_GNUTLS_OCSP=y
++# CONFIG_GNUTLS_CRYPTODEV is not set
++CONFIG_GNUTLS_HEARTBEAT=y
++# CONFIG_GNUTLS_OPENPGP is not set
++# CONFIG_GNUTLS_SRP is not set
++CONFIG_GNUTLS_PSK=y
++CONFIG_GNUTLS_ANON=y
++# CONFIG_GNUTLS_TPM is not set
++CONFIG_GNUTLS_PKCS11=y
++CONFIG_GNUTLS_EXT_LIBTASN1=y
# CONFIG_PACKAGE_libmbedtls is not set
-# CONFIG_PACKAGE_libopenssl is not set
+CONFIG_PACKAGE_libopenssl=y
-+# CONFIG_OPENSSL_WITH_EC is not set
++CONFIG_OPENSSL_WITH_EC=y
++# CONFIG_OPENSSL_WITH_EC2M is not set
+# CONFIG_OPENSSL_WITH_SSL3 is not set
+CONFIG_OPENSSL_WITH_DEPRECATED=y
+# CONFIG_OPENSSL_WITH_DTLS is not set
@@ -587,7 +1023,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_libwolfssl is not set
#
-@@ -2837,7 +2965,13 @@ CONFIG_PACKAGE_libxtables=y
+@@ -2837,7 +3148,13 @@ CONFIG_PACKAGE_libxtables=y
# database
#
# CONFIG_PACKAGE_libpq is not set
@@ -602,16 +1038,27 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_pgsqlodbc is not set
# CONFIG_PACKAGE_psqlodbca is not set
# CONFIG_PACKAGE_psqlodbcw is not set
-@@ -2869,7 +3003,7 @@ CONFIG_PACKAGE_libxtables=y
+@@ -2869,8 +3186,8 @@ CONFIG_PACKAGE_libxtables=y
# CONFIG_PACKAGE_bind-libs is not set
# CONFIG_PACKAGE_bluez-libs is not set
# CONFIG_PACKAGE_boost is not set
-# CONFIG_PACKAGE_ccid is not set
+-# CONFIG_PACKAGE_check is not set
+CONFIG_PACKAGE_ccid=m
- # CONFIG_PACKAGE_check is not set
++CONFIG_PACKAGE_check=m
# CONFIG_PACKAGE_classpath is not set
# CONFIG_PACKAGE_classpath-tools is not set
-@@ -2899,9 +3033,9 @@ CONFIG_PACKAGE_libxtables=y
+ # CONFIG_PACKAGE_confuse is not set
+@@ -2883,7 +3200,7 @@ CONFIG_PACKAGE_libxtables=y
+ # CONFIG_PACKAGE_giflib is not set
+ # CONFIG_PACKAGE_glib2 is not set
+ # CONFIG_PACKAGE_glog is not set
+-# CONFIG_PACKAGE_hidapi is not set
++CONFIG_PACKAGE_hidapi=m
+ # CONFIG_PACKAGE_ibrcommon is not set
+ # CONFIG_PACKAGE_ibrdtn is not set
+ # CONFIG_PACKAGE_icu is not set
+@@ -2899,24 +3216,67 @@ CONFIG_PACKAGE_libxtables=y
# CONFIG_PACKAGE_libarchive-noopenssl is not set
# CONFIG_PACKAGE_libartnet is not set
# CONFIG_PACKAGE_libaudiofile is not set
@@ -623,11 +1070,62 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_libavahi-nodbus-support is not set
# CONFIG_PACKAGE_libavl is not set
# CONFIG_PACKAGE_libbfd is not set
-@@ -2914,9 +3048,9 @@ CONFIG_PACKAGE_libblobmsg-json=y
+ # CONFIG_PACKAGE_libblkid is not set
+ CONFIG_PACKAGE_libblobmsg-json=y
+ # CONFIG_PACKAGE_libcanfestival is not set
+-# CONFIG_PACKAGE_libcap is not set
+-# CONFIG_PACKAGE_libcares is not set
++CONFIG_PACKAGE_libcap=m
++# CONFIG_PACKAGE_libcap-bin is not set
++CONFIG_PACKAGE_libcares=m
+ # CONFIG_PACKAGE_libcharset is not set
# CONFIG_PACKAGE_libcoap is not set
# CONFIG_PACKAGE_libconfig is not set
- # CONFIG_PACKAGE_libcurl is not set
+-# CONFIG_PACKAGE_libcurl is not set
-# CONFIG_PACKAGE_libdaemon is not set
++CONFIG_PACKAGE_libcurl=m
++
++#
++# SSL support
++#
++# CONFIG_LIBCURL_MBEDTLS is not set
++# CONFIG_LIBCURL_WOLFSSL is not set
++CONFIG_LIBCURL_OPENSSL=y
++# CONFIG_LIBCURL_GNUTLS is not set
++# CONFIG_LIBCURL_NOSSL is not set
++
++#
++# Supported protocols
++#
++# CONFIG_LIBCURL_DICT is not set
++CONFIG_LIBCURL_FILE=y
++# CONFIG_LIBCURL_FTP is not set
++# CONFIG_LIBCURL_GOPHER is not set
++CONFIG_LIBCURL_HTTP=y
++CONFIG_LIBCURL_COOKIES=y
++# CONFIG_LIBCURL_IMAP is not set
++# CONFIG_LIBCURL_LDAP is not set
++# CONFIG_LIBCURL_POP3 is not set
++# CONFIG_LIBCURL_RTSP is not set
++# CONFIG_LIBCURL_SSH2 is not set
++CONFIG_LIBCURL_NO_SMB="!"
++# CONFIG_LIBCURL_SMTP is not set
++# CONFIG_LIBCURL_TELNET is not set
++# CONFIG_LIBCURL_TFTP is not set
++# CONFIG_LIBCURL_NGHTTP2 is not set
++
++#
++# Miscellaneous
++#
++CONFIG_LIBCURL_PROXY=y
++# CONFIG_LIBCURL_CRYPTO_AUTH is not set
++# CONFIG_LIBCURL_TLS_SRP is not set
++# CONFIG_LIBCURL_LIBIDN2 is not set
++# CONFIG_LIBCURL_THREADED_RESOLVER is not set
++# CONFIG_LIBCURL_ZLIB is not set
++# CONFIG_LIBCURL_UNIX_SOCKETS is not set
++# CONFIG_LIBCURL_LIBCURL_OPTION is not set
++# CONFIG_LIBCURL_VERBOSE is not set
+CONFIG_PACKAGE_libdaemon=m
# CONFIG_PACKAGE_libdaq is not set
-# CONFIG_PACKAGE_libdb47 is not set
@@ -635,7 +1133,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_libdbi is not set
# CONFIG_PACKAGE_libdevmapper is not set
# CONFIG_PACKAGE_libdmapsharing is not set
-@@ -2927,7 +3061,7 @@ CONFIG_PACKAGE_libblobmsg-json=y
+@@ -2927,7 +3287,7 @@ CONFIG_PACKAGE_libblobmsg-json=y
# CONFIG_PACKAGE_libelf1 is not set
# CONFIG_PACKAGE_libcomerr is not set
# CONFIG_PACKAGE_libdb47xx is not set
@@ -644,7 +1142,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_libecdsautil is not set
# CONFIG_PACKAGE_libesmtp is not set
# CONFIG_PACKAGE_libestr is not set
-@@ -2940,7 +3074,7 @@ CONFIG_PACKAGE_libblobmsg-json=y
+@@ -2940,7 +3300,7 @@ CONFIG_PACKAGE_libblobmsg-json=y
# CONFIG_PACKAGE_libevent2-pthreads is not set
# CONFIG_PACKAGE_libevhtp is not set
# CONFIG_PACKAGE_libexif is not set
@@ -653,7 +1151,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_libexslt is not set
# CONFIG_PACKAGE_libext2fs is not set
# CONFIG_PACKAGE_libextractor is not set
-@@ -2949,7 +3083,7 @@ CONFIG_PACKAGE_libblobmsg-json=y
+@@ -2949,7 +3309,7 @@ CONFIG_PACKAGE_libblobmsg-json=y
# CONFIG_PACKAGE_libfastjson is not set
# CONFIG_PACKAGE_libfdisk is not set
# CONFIG_PACKAGE_libfdt is not set
@@ -662,8 +1160,12 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_libffmpeg-audio-dec is not set
# CONFIG_PACKAGE_libffmpeg-custom is not set
# CONFIG_PACKAGE_libffmpeg-full is not set
-@@ -2961,10 +3095,10 @@ CONFIG_PACKAGE_libblobmsg-json=y
- # CONFIG_PACKAGE_libftdi1 is not set
+@@ -2958,13 +3318,13 @@ CONFIG_PACKAGE_libblobmsg-json=y
+ # CONFIG_PACKAGE_libfmt is not set
+ # CONFIG_PACKAGE_libfreetype is not set
+ # CONFIG_PACKAGE_libftdi is not set
+-# CONFIG_PACKAGE_libftdi1 is not set
++CONFIG_PACKAGE_libftdi1=m
# CONFIG_PACKAGE_libgcrypt is not set
# CONFIG_PACKAGE_libgd is not set
-# CONFIG_PACKAGE_libgdbm is not set
@@ -675,7 +1177,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_libgnurl is not set
# CONFIG_PACKAGE_libgpg-error is not set
# CONFIG_PACKAGE_libgphoto2 is not set
-@@ -2997,7 +3131,7 @@ CONFIG_PACKAGE_libjson-c=y
+@@ -2997,7 +3357,7 @@ CONFIG_PACKAGE_libjson-c=y
# CONFIG_PACKAGE_liblucihttp is not set
# CONFIG_PACKAGE_liblucihttp-lua is not set
# CONFIG_PACKAGE_liblz4 is not set
@@ -684,16 +1186,20 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_libmad is not set
# CONFIG_PACKAGE_libmagic is not set
# CONFIG_PACKAGE_libmariadb is not set
-@@ -3007,7 +3141,7 @@ CONFIG_PACKAGE_libjson-c=y
+@@ -3007,30 +3367,36 @@ CONFIG_PACKAGE_libjson-c=y
# CONFIG_PACKAGE_libmilter-sendmail is not set
# CONFIG_PACKAGE_libminiupnpc is not set
# CONFIG_PACKAGE_libmms is not set
-# CONFIG_PACKAGE_libmnl is not set
+CONFIG_PACKAGE_libmnl=m
# CONFIG_PACKAGE_libmodbus is not set
- # CONFIG_PACKAGE_libmosquitto-nossl is not set
+-# CONFIG_PACKAGE_libmosquitto-nossl is not set
++CONFIG_PACKAGE_libmosquitto-nossl=m
# CONFIG_PACKAGE_libmosquitto-ssl is not set
-@@ -3017,20 +3151,20 @@ CONFIG_PACKAGE_libjson-c=y
++# CONFIG_PACKAGE_libmosquittopp is not set
+ # CONFIG_PACKAGE_libmount is not set
+ # CONFIG_PACKAGE_libmpdclient is not set
+ # CONFIG_PACKAGE_libmpeg2 is not set
# CONFIG_PACKAGE_libmpg123 is not set
# CONFIG_PACKAGE_libmraa is not set
# CONFIG_PACKAGE_libnatpmp is not set
@@ -714,13 +1220,19 @@ index d79707a..68963d7 100644
-# CONFIG_PACKAGE_libnetfilter-queue is not set
+CONFIG_PACKAGE_libnetfilter-queue=m
# CONFIG_PACKAGE_libnetsnmp is not set
- # CONFIG_PACKAGE_libnettle is not set
+-# CONFIG_PACKAGE_libnettle is not set
-# CONFIG_PACKAGE_libnfnetlink is not set
++CONFIG_PACKAGE_libnettle=m
++
++#
++# Configuration
++#
++# CONFIG_LIBNETTLE_MINI is not set
+CONFIG_PACKAGE_libnfnetlink=m
# CONFIG_PACKAGE_libnftnl is not set
# CONFIG_PACKAGE_libnghttp2 is not set
# CONFIG_PACKAGE_libnl is not set
-@@ -3046,23 +3180,59 @@ CONFIG_PACKAGE_libnl-tiny=y
+@@ -3046,23 +3412,59 @@ CONFIG_PACKAGE_libnl-tiny=y
# CONFIG_PACKAGE_libopendkim is not set
# CONFIG_PACKAGE_libopenldap is not set
# CONFIG_PACKAGE_libopenobex is not set
@@ -784,7 +1296,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_libpkcs11-spy is not set
# CONFIG_PACKAGE_libplist is not set
# CONFIG_PACKAGE_libplistcxx is not set
-@@ -3073,7 +3243,7 @@ CONFIG_PACKAGE_libpopt=m
+@@ -3073,7 +3475,7 @@ CONFIG_PACKAGE_libpopt=m
# CONFIG_PACKAGE_libpsl is not set
# CONFIG_PACKAGE_libqrencode is not set
# CONFIG_PACKAGE_libradcli is not set
@@ -793,7 +1305,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_libredblack is not set
# CONFIG_PACKAGE_libroxml is not set
# CONFIG_PACKAGE_librpc is not set
-@@ -3106,7 +3276,7 @@ CONFIG_PACKAGE_libpopt=m
+@@ -3106,7 +3508,7 @@ CONFIG_PACKAGE_libpopt=m
# CONFIG_PACKAGE_libstoken is not set
# CONFIG_PACKAGE_libstrophe is not set
# CONFIG_PACKAGE_libtalloc is not set
@@ -802,7 +1314,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_libtheora is not set
# CONFIG_PACKAGE_libtiff is not set
# CONFIG_PACKAGE_libtiffxx is not set
-@@ -3130,8 +3300,8 @@ CONFIG_PACKAGE_libuclient=y
+@@ -3130,13 +3532,13 @@ CONFIG_PACKAGE_libuclient=y
# CONFIG_PACKAGE_libupnp is not set
# CONFIG_PACKAGE_libupnpp is not set
# CONFIG_PACKAGE_liburcu is not set
@@ -812,9 +1324,22 @@ index d79707a..68963d7 100644
+CONFIG_PACKAGE_libusb-compat=m
# CONFIG_PACKAGE_libusbmuxd is not set
# CONFIG_PACKAGE_libustream-mbedtls is not set
- # CONFIG_PACKAGE_libustream-openssl is not set
-@@ -3150,7 +3320,7 @@ CONFIG_PACKAGE_libuclient=y
+-# CONFIG_PACKAGE_libustream-openssl is not set
++CONFIG_PACKAGE_libustream-openssl=m
+ # CONFIG_PACKAGE_libustream-wolfssl is not set
+-# CONFIG_PACKAGE_libuuid is not set
++CONFIG_PACKAGE_libuuid=m
+ # CONFIG_PACKAGE_libuv is not set
+ # CONFIG_PACKAGE_libuvc is not set
+ # CONFIG_PACKAGE_libv4l is not set
+@@ -3146,11 +3548,12 @@ CONFIG_PACKAGE_libuclient=y
+ # CONFIG_PACKAGE_libwebcam is not set
+ # CONFIG_PACKAGE_libwebsockets-full is not set
+ # CONFIG_PACKAGE_libwebsockets-mbedtls is not set
+-# CONFIG_PACKAGE_libwebsockets-openssl is not set
++CONFIG_PACKAGE_libwebsockets-openssl=m
# CONFIG_PACKAGE_libwrap is not set
++# CONFIG_PACKAGE_libx264 is not set
# CONFIG_PACKAGE_libxerces-c is not set
# CONFIG_PACKAGE_libxerces-c-samples is not set
-# CONFIG_PACKAGE_libxml2 is not set
@@ -822,7 +1347,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_libxslt is not set
# CONFIG_PACKAGE_libyaml-cpp is not set
# CONFIG_PACKAGE_libyang is not set
-@@ -3165,7 +3335,7 @@ CONFIG_PACKAGE_libuclient=y
+@@ -3165,7 +3568,7 @@ CONFIG_PACKAGE_libuclient=y
# CONFIG_PACKAGE_mxml is not set
# CONFIG_PACKAGE_nacl is not set
# CONFIG_PACKAGE_opencv is not set
@@ -831,7 +1356,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_pixman is not set
# CONFIG_PACKAGE_poco is not set
# CONFIG_PACKAGE_protobuf is not set
-@@ -3174,7 +3344,7 @@ CONFIG_PACKAGE_libuclient=y
+@@ -3174,7 +3577,7 @@ CONFIG_PACKAGE_libuclient=y
# CONFIG_PACKAGE_rpcd-mod-rrdns is not set
# CONFIG_PACKAGE_rxtx is not set
# CONFIG_PACKAGE_sbc is not set
@@ -840,7 +1365,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_tinycdb is not set
# CONFIG_PACKAGE_uclibcxx is not set
# CONFIG_PACKAGE_uw-imap is not set
-@@ -3182,7 +3352,12 @@ CONFIG_PACKAGE_libuclient=y
+@@ -3182,7 +3585,12 @@ CONFIG_PACKAGE_libuclient=y
# CONFIG_PACKAGE_xmlrpc-c-client is not set
# CONFIG_PACKAGE_xmlrpc-c-server is not set
# CONFIG_PACKAGE_yajl is not set
@@ -854,8 +1379,36 @@ index d79707a..68963d7 100644
#
# LuCI
-@@ -3476,7 +3651,10 @@ CONFIG_POSTFIX_PCRE=y
- # CONFIG_PACKAGE_curl is not set
+@@ -3246,6 +3654,7 @@ CONFIG_PACKAGE_libuclient=y
+ # CONFIG_PACKAGE_luci-app-ahcp is not set
+ # CONFIG_PACKAGE_luci-app-aria2 is not set
+ # CONFIG_PACKAGE_luci-app-asterisk is not set
++# CONFIG_PACKAGE_luci-app-attendedsysupgrade is not set
+ # CONFIG_PACKAGE_luci-app-bcp38 is not set
+ # CONFIG_PACKAGE_luci-app-bird1-ipv4 is not set
+ # CONFIG_PACKAGE_luci-app-bird1-ipv6 is not set
+@@ -3372,8 +3781,13 @@ CONFIG_PACKAGE_libuclient=y
+ # CONFIG_PACKAGE_mailman is not set
+ # CONFIG_PACKAGE_mailsend is not set
+ # CONFIG_PACKAGE_mailsend-nossl is not set
+-# CONFIG_PACKAGE_msmtp is not set
+-# CONFIG_PACKAGE_msmtp-nossl is not set
++CONFIG_PACKAGE_msmtp=m
++CONFIG_PACKAGE_msmtp-mta=m
++CONFIG_PACKAGE_msmtp-nossl=m
++CONFIG_PACKAGE_msmtp-queue=m
++CONFIG_PACKAGE_msmtpq-ng=m
++CONFIG_PACKAGE_msmtpq-ng-mta=m
++CONFIG_PACKAGE_msmtpq-ng-mta-smtpd=m
+ # CONFIG_PACKAGE_mutt is not set
+ # CONFIG_PACKAGE_nail is not set
+ # CONFIG_PACKAGE_opendkim is not set
+@@ -3473,10 +3887,13 @@ CONFIG_POSTFIX_PCRE=y
+ # CONFIG_PACKAGE_aria2 is not set
+ # CONFIG_PACKAGE_atftp is not set
+ # CONFIG_PACKAGE_atftpd is not set
+-# CONFIG_PACKAGE_curl is not set
++CONFIG_PACKAGE_curl=m
# CONFIG_PACKAGE_gnurl is not set
# CONFIG_PACKAGE_lftp is not set
-# CONFIG_PACKAGE_rsync is not set
@@ -866,7 +1419,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_rsyncd is not set
# CONFIG_PACKAGE_vsftpd is not set
# CONFIG_PACKAGE_vsftpd-tls is not set
-@@ -3491,14 +3669,14 @@ CONFIG_POSTFIX_PCRE=y
+@@ -3491,14 +3908,14 @@ CONFIG_POSTFIX_PCRE=y
# CONFIG_PACKAGE_nfs-kernel-server is not set
# CONFIG_PACKAGE_owftpd is not set
# CONFIG_PACKAGE_owhttpd is not set
@@ -883,7 +1436,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_conntrackd is not set
# CONFIG_PACKAGE_ebtables is not set
# CONFIG_PACKAGE_fwknop is not set
-@@ -3529,7 +3707,7 @@ CONFIG_PACKAGE_iptables=y
+@@ -3529,7 +3946,7 @@ CONFIG_PACKAGE_iptables=y
# CONFIG_PACKAGE_iptables-mod-ipopt is not set
# CONFIG_PACKAGE_iptables-mod-ipp2p is not set
# CONFIG_PACKAGE_iptables-mod-iprange is not set
@@ -892,7 +1445,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_iptables-mod-ipv4options is not set
# CONFIG_PACKAGE_iptables-mod-led is not set
# CONFIG_PACKAGE_iptables-mod-length2 is not set
-@@ -3584,7 +3762,7 @@ CONFIG_PACKAGE_iptables=y
+@@ -3584,7 +4001,7 @@ CONFIG_PACKAGE_iptables=y
# CONFIG_PACKAGE_avahi-autoipd is not set
# CONFIG_PACKAGE_avahi-daemon-service-http is not set
# CONFIG_PACKAGE_avahi-daemon-service-ssh is not set
@@ -901,7 +1454,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_avahi-dnsconfd is not set
# CONFIG_PACKAGE_avahi-nodbus-daemon is not set
# CONFIG_PACKAGE_avahi-utils is not set
-@@ -3747,14 +3925,25 @@ CONFIG_PACKAGE_iptables=y
+@@ -3747,32 +4164,43 @@ CONFIG_PACKAGE_iptables=y
# CONFIG_PACKAGE_igmpproxy is not set
# CONFIG_PACKAGE_ip-bridge is not set
# CONFIG_PACKAGE_ip-full is not set
@@ -929,7 +1482,14 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_rdma is not set
# CONFIG_PACKAGE_relayd is not set
# CONFIG_PACKAGE_smcroute is not set
-@@ -3768,11 +3957,11 @@ CONFIG_PACKAGE_iptables=y
+ # CONFIG_PACKAGE_ss is not set
+ # CONFIG_PACKAGE_sslh is not set
+ # CONFIG_PACKAGE_tc is not set
+-# CONFIG_PACKAGE_tcpproxy is not set
++CONFIG_PACKAGE_tcpproxy=m
+ # CONFIG_PACKAGE_vis is not set
+
+ #
# SSH
#
# CONFIG_PACKAGE_autossh is not set
@@ -946,7 +1506,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_openssh-server-pam is not set
# CONFIG_PACKAGE_openssh-sftp-avahi-service is not set
# CONFIG_PACKAGE_openssh-sftp-client is not set
-@@ -3872,109 +4061,130 @@ CONFIG_PACKAGE_iptables=y
+@@ -3872,109 +4300,130 @@ CONFIG_PACKAGE_iptables=y
#
# CONFIG_PACKAGE_chaosvpn is not set
# CONFIG_PACKAGE_fastd is not set
@@ -1138,7 +1698,19 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_wireguard is not set
# CONFIG_PACKAGE_wireguard-tools is not set
# CONFIG_PACKAGE_xl2tpd is not set
-@@ -3993,7 +4203,7 @@ CONFIG_PACKAGE_iptables=y
+@@ -3984,8 +4433,10 @@ CONFIG_PACKAGE_iptables=y
+ # Version Control Systems
+ #
+ # CONFIG_PACKAGE_fossil is not set
+-# CONFIG_PACKAGE_git is not set
++CONFIG_PACKAGE_git=m
++# CONFIG_PACKAGE_git-gitweb is not set
+ # CONFIG_PACKAGE_git-http is not set
++# CONFIG_PACKAGE_gitolite is not set
+ # CONFIG_PACKAGE_subversion-client is not set
+ # CONFIG_PACKAGE_subversion-libs is not set
+ # CONFIG_PACKAGE_subversion-server is not set
+@@ -3993,7 +4444,7 @@ CONFIG_PACKAGE_iptables=y
#
# WWAN
#
@@ -1147,7 +1719,48 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_comgt is not set
# CONFIG_PACKAGE_comgt-directip is not set
# CONFIG_PACKAGE_comgt-ncm is not set
-@@ -4258,7 +4468,7 @@ CONFIG_PACKAGE_ppp-mod-pppoe=y
+@@ -4031,7 +4482,9 @@ CONFIG_PACKAGE_iptables=y
+ # CONFIG_PACKAGE_spawn-fcgi is not set
+ # CONFIG_PACKAGE_squid is not set
+ # CONFIG_PACKAGE_tinyproxy is not set
+-# CONFIG_PACKAGE_uhttpd is not set
++CONFIG_PACKAGE_uhttpd=m
++# CONFIG_PACKAGE_uhttpd-mod-lua is not set
++# CONFIG_PACKAGE_uhttpd-mod-ubus is not set
+ # CONFIG_PACKAGE_uwsgi-cgi is not set
+ # CONFIG_PACKAGE_uwsgi-cgi-luci-support is not set
+
+@@ -4144,7 +4597,7 @@ CONFIG_PACKAGE_hostapd-common=y
+ # CONFIG_PACKAGE_ipset is not set
+ # CONFIG_PACKAGE_ipset-dns is not set
+ # CONFIG_PACKAGE_iptraf-ng is not set
+-# CONFIG_PACKAGE_iputils-arping is not set
++CONFIG_PACKAGE_iputils-arping=m
+ # CONFIG_PACKAGE_iputils-clockdiff is not set
+ # CONFIG_PACKAGE_iputils-ping is not set
+ # CONFIG_PACKAGE_iputils-ping6 is not set
+@@ -4175,9 +4628,9 @@ CONFIG_PACKAGE_iw=y
+ # CONFIG_PACKAGE_mikrotik-btest is not set
+ # CONFIG_PACKAGE_mini_snmpd is not set
+ # CONFIG_PACKAGE_minimalist-pcproxy is not set
+-# CONFIG_PACKAGE_mosquitto-client-nossl is not set
++CONFIG_PACKAGE_mosquitto-client-nossl=m
+ # CONFIG_PACKAGE_mosquitto-client-ssl is not set
+-# CONFIG_PACKAGE_mosquitto-nossl is not set
++CONFIG_PACKAGE_mosquitto-nossl=m
+ # CONFIG_PACKAGE_mosquitto-ssl is not set
+ # CONFIG_PACKAGE_mrd6 is not set
+ # CONFIG_PACKAGE_mtr is not set
+@@ -4245,7 +4698,7 @@ CONFIG_PACKAGE_ppp-mod-pppoe=y
+ # CONFIG_PACKAGE_seafile-ccnet is not set
+ # CONFIG_PACKAGE_seafile-seahub is not set
+ # CONFIG_PACKAGE_seafile-server is not set
+-# CONFIG_PACKAGE_ser2net is not set
++CONFIG_PACKAGE_ser2net=m
+ # CONFIG_PACKAGE_simple-adblock is not set
+ # CONFIG_PACKAGE_smartsnmpd is not set
+ # CONFIG_PACKAGE_snmp-mibs is not set
+@@ -4258,7 +4711,7 @@ CONFIG_PACKAGE_ppp-mod-pppoe=y
# CONFIG_PACKAGE_soloscli is not set
# CONFIG_PACKAGE_stunnel is not set
# CONFIG_PACKAGE_tayga is not set
@@ -1156,7 +1769,24 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_tcpdump-mini is not set
# CONFIG_PACKAGE_tor is not set
# CONFIG_PACKAGE_tor-gencert is not set
-@@ -4395,7 +4605,7 @@ CONFIG_PACKAGE_wpad-mini=y
+@@ -4303,7 +4756,7 @@ CONFIG_PACKAGE_wpad-mini=y
+ # CONFIG_PACKAGE_wpad-wolfssl is not set
+ # CONFIG_PACKAGE_wpan-tools is not set
+ # CONFIG_PACKAGE_wwan is not set
+-# CONFIG_PACKAGE_xinetd is not set
++CONFIG_PACKAGE_xinetd=m
+
+ #
+ # Sound
+@@ -4313,6 +4766,7 @@ CONFIG_PACKAGE_wpad-mini=y
+ # CONFIG_PACKAGE_alsa-utils-tests is not set
+ # CONFIG_PACKAGE_espeak is not set
+ # CONFIG_PACKAGE_faad2 is not set
++# CONFIG_PACKAGE_fdk-aac is not set
+ # CONFIG_PACKAGE_forked-daapd is not set
+ # CONFIG_PACKAGE_ices is not set
+ # CONFIG_PACKAGE_lame is not set
+@@ -4395,7 +4849,7 @@ CONFIG_PACKAGE_wpad-mini=y
# CONFIG_PACKAGE_joe is not set
# CONFIG_PACKAGE_nano is not set
# CONFIG_PACKAGE_vim is not set
@@ -1165,7 +1795,16 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_vim-fuller is not set
# CONFIG_PACKAGE_vim-help is not set
# CONFIG_PACKAGE_vim-runtime is not set
-@@ -4466,7 +4676,7 @@ CONFIG_PACKAGE_wpad-mini=y
+@@ -4409,7 +4863,7 @@ CONFIG_PACKAGE_wpad-mini=y
+ # CONFIG_PACKAGE_cryptsetup is not set
+ # CONFIG_PACKAGE_cryptsetup-openssl is not set
+ # CONFIG_PACKAGE_gnupg is not set
+-# CONFIG_PACKAGE_gnutls-utils is not set
++CONFIG_PACKAGE_gnutls-utils=m
+ # CONFIG_PACKAGE_gpgv is not set
+ # CONFIG_PACKAGE_px5g-mbedtls is not set
+ # CONFIG_PACKAGE_px5g-standalone is not set
+@@ -4466,7 +4920,7 @@ CONFIG_PACKAGE_wpad-mini=y
#
# CONFIG_PACKAGE_avrdude is not set
# CONFIG_PACKAGE_dfu-programmer is not set
@@ -1174,7 +1813,16 @@ index d79707a..68963d7 100644
#
# RTKLIB Suite
-@@ -4500,7 +4710,7 @@ CONFIG_PACKAGE_wpad-mini=y
+@@ -4480,7 +4934,7 @@ CONFIG_PACKAGE_wpad-mini=y
+ #
+ # Shells
+ #
+-# CONFIG_PACKAGE_bash is not set
++CONFIG_PACKAGE_bash=m
+ # CONFIG_PACKAGE_klish is not set
+ # CONFIG_PACKAGE_mksh is not set
+ # CONFIG_PACKAGE_tcsh is not set
+@@ -4500,7 +4954,7 @@ CONFIG_PACKAGE_wpad-mini=y
#
# CONFIG_PACKAGE_agetty is not set
# CONFIG_PACKAGE_dvtm is not set
@@ -1183,7 +1831,7 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_picocom is not set
# CONFIG_PACKAGE_rtty-mbedtls is not set
# CONFIG_PACKAGE_rtty-nossl is not set
-@@ -4548,7 +4758,7 @@ CONFIG_PACKAGE_wpad-mini=y
+@@ -4548,7 +5002,7 @@ CONFIG_PACKAGE_wpad-mini=y
# CONFIG_PACKAGE_sqlite3-cli is not set
# CONFIG_PACKAGE_unixodbc-tools is not set
# CONFIG_PACKAGE_acpid is not set
@@ -1192,7 +1840,112 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_ap51-flash is not set
# CONFIG_PACKAGE_at is not set
# CONFIG_PACKAGE_bandwidthd is not set
-@@ -4573,12 +4783,12 @@ CONFIG_PACKAGE_wpad-mini=y
+@@ -4569,23 +5023,124 @@ CONFIG_PACKAGE_wpad-mini=y
+ # CONFIG_PACKAGE_cmdpad is not set
+ # CONFIG_PACKAGE_coap-client is not set
+ # CONFIG_PACKAGE_collectd is not set
+-# CONFIG_PACKAGE_coreutils is not set
++CONFIG_PACKAGE_coreutils=m
++CONFIG_PACKAGE_coreutils-base64=m
++# CONFIG_PACKAGE_coreutils-basename is not set
++# CONFIG_PACKAGE_coreutils-cat is not set
++# CONFIG_PACKAGE_coreutils-chcon is not set
++# CONFIG_PACKAGE_coreutils-chgrp is not set
++# CONFIG_PACKAGE_coreutils-chmod is not set
++# CONFIG_PACKAGE_coreutils-chown is not set
++# CONFIG_PACKAGE_coreutils-chroot is not set
++# CONFIG_PACKAGE_coreutils-cksum is not set
++# CONFIG_PACKAGE_coreutils-comm is not set
++# CONFIG_PACKAGE_coreutils-cp is not set
++# CONFIG_PACKAGE_coreutils-csplit is not set
++# CONFIG_PACKAGE_coreutils-cut is not set
++# CONFIG_PACKAGE_coreutils-date is not set
++# CONFIG_PACKAGE_coreutils-dd is not set
++# CONFIG_PACKAGE_coreutils-dir is not set
++# CONFIG_PACKAGE_coreutils-dircolors is not set
++# CONFIG_PACKAGE_coreutils-dirname is not set
++# CONFIG_PACKAGE_coreutils-du is not set
++# CONFIG_PACKAGE_coreutils-echo is not set
++# CONFIG_PACKAGE_coreutils-env is not set
++# CONFIG_PACKAGE_coreutils-expand is not set
++# CONFIG_PACKAGE_coreutils-expr is not set
++# CONFIG_PACKAGE_coreutils-factor is not set
++# CONFIG_PACKAGE_coreutils-false is not set
++# CONFIG_PACKAGE_coreutils-fmt is not set
++# CONFIG_PACKAGE_coreutils-fold is not set
++# CONFIG_PACKAGE_coreutils-groups is not set
++# CONFIG_PACKAGE_coreutils-head is not set
++# CONFIG_PACKAGE_coreutils-hostid is not set
++# CONFIG_PACKAGE_coreutils-id is not set
++# CONFIG_PACKAGE_coreutils-install is not set
++# CONFIG_PACKAGE_coreutils-join is not set
++# CONFIG_PACKAGE_coreutils-kill is not set
++# CONFIG_PACKAGE_coreutils-link is not set
++# CONFIG_PACKAGE_coreutils-ln is not set
++# CONFIG_PACKAGE_coreutils-logname is not set
++# CONFIG_PACKAGE_coreutils-ls is not set
++# CONFIG_PACKAGE_coreutils-md5sum is not set
++# CONFIG_PACKAGE_coreutils-mkdir is not set
++# CONFIG_PACKAGE_coreutils-mkfifo is not set
++# CONFIG_PACKAGE_coreutils-mknod is not set
++# CONFIG_PACKAGE_coreutils-mktemp is not set
++# CONFIG_PACKAGE_coreutils-mv is not set
++# CONFIG_PACKAGE_coreutils-nice is not set
++# CONFIG_PACKAGE_coreutils-nl is not set
++# CONFIG_PACKAGE_coreutils-nohup is not set
++# CONFIG_PACKAGE_coreutils-nproc is not set
++# CONFIG_PACKAGE_coreutils-od is not set
++# CONFIG_PACKAGE_coreutils-paste is not set
++# CONFIG_PACKAGE_coreutils-pathchk is not set
++# CONFIG_PACKAGE_coreutils-pinky is not set
++# CONFIG_PACKAGE_coreutils-pr is not set
++# CONFIG_PACKAGE_coreutils-printenv is not set
++# CONFIG_PACKAGE_coreutils-printf is not set
++# CONFIG_PACKAGE_coreutils-ptx is not set
++# CONFIG_PACKAGE_coreutils-pwd is not set
++# CONFIG_PACKAGE_coreutils-readlink is not set
++# CONFIG_PACKAGE_coreutils-realpath is not set
++# CONFIG_PACKAGE_coreutils-rm is not set
++# CONFIG_PACKAGE_coreutils-rmdir is not set
++# CONFIG_PACKAGE_coreutils-runcon is not set
++# CONFIG_PACKAGE_coreutils-seq is not set
++CONFIG_PACKAGE_coreutils-sha1sum=m
++CONFIG_PACKAGE_coreutils-sha224sum=m
++CONFIG_PACKAGE_coreutils-sha256sum=m
++CONFIG_PACKAGE_coreutils-sha384sum=m
++CONFIG_PACKAGE_coreutils-sha512sum=m
++# CONFIG_PACKAGE_coreutils-shred is not set
++# CONFIG_PACKAGE_coreutils-shuf is not set
++# CONFIG_PACKAGE_coreutils-sleep is not set
++# CONFIG_PACKAGE_coreutils-sort is not set
++# CONFIG_PACKAGE_coreutils-split is not set
++# CONFIG_PACKAGE_coreutils-stat is not set
++# CONFIG_PACKAGE_coreutils-stdbuf is not set
++# CONFIG_PACKAGE_coreutils-stty is not set
++# CONFIG_PACKAGE_coreutils-sum is not set
++# CONFIG_PACKAGE_coreutils-sync is not set
++# CONFIG_PACKAGE_coreutils-tac is not set
++# CONFIG_PACKAGE_coreutils-tail is not set
++# CONFIG_PACKAGE_coreutils-tee is not set
++# CONFIG_PACKAGE_coreutils-test is not set
++# CONFIG_PACKAGE_coreutils-timeout is not set
++# CONFIG_PACKAGE_coreutils-touch is not set
++# CONFIG_PACKAGE_coreutils-tr is not set
++# CONFIG_PACKAGE_coreutils-true is not set
++# CONFIG_PACKAGE_coreutils-truncate is not set
++# CONFIG_PACKAGE_coreutils-tsort is not set
++# CONFIG_PACKAGE_coreutils-tty is not set
++# CONFIG_PACKAGE_coreutils-uname is not set
++# CONFIG_PACKAGE_coreutils-unexpand is not set
++# CONFIG_PACKAGE_coreutils-uniq is not set
++# CONFIG_PACKAGE_coreutils-unlink is not set
++# CONFIG_PACKAGE_coreutils-uptime is not set
++# CONFIG_PACKAGE_coreutils-users is not set
++# CONFIG_PACKAGE_coreutils-vdir is not set
++# CONFIG_PACKAGE_coreutils-wc is not set
++# CONFIG_PACKAGE_coreutils-who is not set
++# CONFIG_PACKAGE_coreutils-whoami is not set
++# CONFIG_PACKAGE_coreutils-yes is not set
# CONFIG_PACKAGE_crconf is not set
# CONFIG_PACKAGE_crelay is not set
# CONFIG_PACKAGE_ct-bugcheck is not set
@@ -1206,14 +1959,33 @@ index d79707a..68963d7 100644
+CONFIG_PACKAGE_digitemp=m
+CONFIG_PACKAGE_digitemp-usb=m
# CONFIG_PACKAGE_dmesg is not set
++# CONFIG_PACKAGE_domoticz is not set
# CONFIG_PACKAGE_dropbearconvert is not set
# CONFIG_PACKAGE_dtc is not set
-@@ -4673,14 +4883,30 @@ CONFIG_PACKAGE_libjson-script=y
+ # CONFIG_PACKAGE_dump1090 is not set
+ # CONFIG_PACKAGE_ecdsautils is not set
+ # CONFIG_PACKAGE_elektra-kdb is not set
+-# CONFIG_PACKAGE_evtest is not set
++CONFIG_PACKAGE_evtest=m
+ # CONFIG_PACKAGE_extract is not set
+ # CONFIG_PACKAGE_fdt-utils is not set
+ # CONFIG_PACKAGE_file is not set
+@@ -4601,6 +5156,7 @@ CONFIG_PACKAGE_wpad-mini=y
+ # CONFIG_PACKAGE_fritz-caldata is not set
+ # CONFIG_PACKAGE_fritz-tffs is not set
+ # CONFIG_PACKAGE_ftdi_eeprom is not set
++CONFIG_PACKAGE_galaxy-tools=m
+ # CONFIG_PACKAGE_gammu is not set
+ # CONFIG_PACKAGE_gawk is not set
+ # CONFIG_PACKAGE_getopt is not set
+@@ -4672,15 +5228,32 @@ CONFIG_PACKAGE_libjson-script=y
+ # CONFIG_PACKAGE_openldap-utils is not set
# CONFIG_PACKAGE_openobex is not set
# CONFIG_PACKAGE_openobex-apps is not set
- # CONFIG_PACKAGE_openocd is not set
+-# CONFIG_PACKAGE_openocd is not set
-# CONFIG_PACKAGE_opensc-utils is not set
-# CONFIG_PACKAGE_openssl-util is not set
++CONFIG_PACKAGE_openocd=m
+CONFIG_PACKAGE_opensc-utils=m
+CONFIG_PACKAGE_opensc-utils-cardos-tool=m
+# CONFIG_PACKAGE_opensc-utils-cryptoflex-tool is not set
@@ -1239,10 +2011,11 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_pcsc-tools is not set
-# CONFIG_PACKAGE_pcscd is not set
+CONFIG_PACKAGE_pcscd=m
++CONFIG_PACKAGE_pingid=m
# CONFIG_PACKAGE_pps-tools is not set
# CONFIG_PACKAGE_prlimit is not set
# CONFIG_PACKAGE_procps-ng is not set
-@@ -4707,10 +4933,11 @@ CONFIG_PACKAGE_libjson-script=y
+@@ -4707,10 +5280,11 @@ CONFIG_PACKAGE_libjson-script=y
# CONFIG_PACKAGE_sockread is not set
# CONFIG_PACKAGE_spi-tools is not set
# CONFIG_PACKAGE_spidev-test is not set
@@ -1255,12 +2028,28 @@ index d79707a..68963d7 100644
# CONFIG_PACKAGE_sysrepo is not set
# CONFIG_PACKAGE_sysrepocfg is not set
# CONFIG_PACKAGE_sysrepoctl is not set
-@@ -4729,7 +4956,7 @@ CONFIG_PACKAGE_libjson-script=y
+@@ -4728,13 +5302,14 @@ CONFIG_PACKAGE_libjson-script=y
+ # CONFIG_PACKAGE_unshare is not set
# CONFIG_PACKAGE_usb-modeswitch is not set
# CONFIG_PACKAGE_usbmuxd is not set
- # CONFIG_PACKAGE_usbreset is not set
+-# CONFIG_PACKAGE_usbreset is not set
-# CONFIG_PACKAGE_usbutils is not set
++CONFIG_PACKAGE_usbreset=m
+CONFIG_PACKAGE_usbutils=m
# CONFIG_PACKAGE_uuidd is not set
# CONFIG_PACKAGE_uuidgen is not set
# CONFIG_PACKAGE_uvcdynctrl is not set
+ # CONFIG_PACKAGE_v4l-utils is not set
+ # CONFIG_PACKAGE_view1090 is not set
++CONFIG_PACKAGE_vlmcsd=m
+ # CONFIG_PACKAGE_watchcat is not set
+ # CONFIG_PACKAGE_whereis is not set
+ # CONFIG_PACKAGE_wifitoggle is not set
+@@ -4742,6 +5317,7 @@ CONFIG_PACKAGE_libjson-script=y
+ # CONFIG_PACKAGE_xxd is not set
+ # CONFIG_PACKAGE_yanglint is not set
+ # CONFIG_PACKAGE_yara is not set
++CONFIG_PACKAGE_yubico-piv-tool=m
+ # CONFIG_PACKAGE_yunbridge is not set
+
+ #
diff --git a/master/opensc-fix-piv-consent b/master/opensc-fix-piv-consent
new file mode 100644
index 0000000..2012f82
--- /dev/null
+++ b/master/opensc-fix-piv-consent
@@ -0,0 +1,185 @@
+diff --git a/feeds/packages/utils/opensc/patches/fix-piv-consent.patch b/feeds/packages/utils/opensc/patches/fix-piv-consent.patch
+new file mode 100644
+index 0000000..0cebec0
+--- /dev/null
++++ b/feeds/packages/utils/opensc/patches/fix-piv-consent.patch
+@@ -0,0 +1,179 @@
++commit d7d674129ec021454b5f6285a213da912a50a39f
++Author: Doug Engert <deengert@gmail.com>
++Date: Mon Apr 16 10:08:43 2018 -0500
++
++ PIV History Object Related Changes - Fixes #1330
++
++ && is replaced by || in the test of valid key references
++ for retired keys found in the Historic object.
++
++ For retired keys, the user_consent flag was being set by default.
++ Thus a C_Login(CKU_CONTEXT_SPECIFIC) would be required.
++ NIST 800-73 only requires PIN_Always on the Sign Key.
++
++ To extend the usefullnes of "retired keys" on non government
++ issued PIV-like cards, code had already been added
++ to use the certificate keyUsage flags to override the NIST
++ defined key usage flags. The NONREPUDATION flag is now used
++ to set the user_consent flag.
++
++ So rather then always requiring C_Login(CKU_CONTEXT_SPECIFIC)
++ for any retured key, the code only requires it for non government
++ cards where teh certificate has NONREPUDATION.
++
++ Changes to be committed:
++ modified: card-piv.c
++ modified: pkcs15-piv.c
++
++diff --git a/src/libopensc/card-piv.c b/src/libopensc/card-piv.c
++index 8f7c4ebb..c8b39adf 100644
++--- a/src/libopensc/card-piv.c
+++++ b/src/libopensc/card-piv.c
++@@ -2871,7 +2871,7 @@ piv_process_history(sc_card_t *card)
++ }
++ keyref = sc_asn1_find_tag(card->ctx, seq, seqlen, 0x04, &keyreflen);
++ if (!keyref || keyreflen != 1 ||
++- (*keyref < 0x82 && *keyref > 0x95)) {
+++ (*keyref < 0x82 || *keyref > 0x95)) {
++ sc_log(card->ctx, "DER problem");
++ r = SC_ERROR_INVALID_ASN1_OBJECT;
++ goto err;
++diff --git a/src/libopensc/pkcs15-piv.c b/src/libopensc/pkcs15-piv.c
++index 62a58123..1401ea4d 100644
++--- a/src/libopensc/pkcs15-piv.c
+++++ b/src/libopensc/pkcs15-piv.c
++@@ -528,83 +528,83 @@ static int sc_pkcs15emu_piv_init(sc_pkcs15_card_t *p15card)
++ { "05", "Retired KEY MAN 1",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x82, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x82, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "06", "Retired KEY MAN 2",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x83, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x83, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "07", "Retired KEY MAN 3",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x84, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x84, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "08", "Retired KEY MAN 4",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x85, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x85, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "09", "Retired KEY MAN 5",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x86, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x86, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "10", "Retired KEY MAN 6",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x87, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x87, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "11", "Retired KEY MAN 7",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x88, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x88, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "12", "Retired KEY MAN 8",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x89, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x89, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "13", "Retired KEY MAN 9",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x8A, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x8A, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "14", "Retired KEY MAN 10",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x8B, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x8B, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "15", "Retired KEY MAN 11",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x8C, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x8C, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "16", "Retired KEY MAN 12",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x8D, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x8D, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "17", "Retired KEY MAN 13",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x8E, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x8E, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "18", "Retired KEY MAN 14",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x8F, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x8F, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "19", "Retired KEY MAN 15",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x90, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x90, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "20", "Retired KEY MAN 16",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x91, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x91, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "21", "Retired KEY MAN 17",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x92, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x92, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "22", "Retired KEY MAN 18",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x93, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x93, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "23", "Retired KEY MAN 19",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x94, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1},
+++ "", 0x94, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0},
++ { "24", "Retired KEY MAN 20",
++ /*RSA*/SC_PKCS15_PRKEY_USAGE_DECRYPT | SC_PKCS15_PRKEY_USAGE_UNWRAP,
++ /*EC*/SC_PKCS15_PRKEY_USAGE_DERIVE,
++- "", 0x95, "01", SC_PKCS15_CO_FLAG_PRIVATE, 1}
+++ "", 0x95, "01", SC_PKCS15_CO_FLAG_PRIVATE, 0}
++ };
++
++ int r, i;
++@@ -1142,7 +1142,7 @@ sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "DEE Adding pin %d label=%s",i, label);
++
++ strncpy(prkey_obj.label, prkeys[i].label, SC_PKCS15_MAX_LABEL_SIZE - 1);
++ prkey_obj.flags = prkeys[i].obj_flags;
++- prkey_obj.user_consent = prkeys[i].user_consent;
+++ prkey_obj.user_consent = prkeys[i].user_consent; /* only Sign key */
++
++ if (prkeys[i].auth_id)
++ sc_pkcs15_format_id(prkeys[i].auth_id, &prkey_obj.auth_id);
++@@ -1165,6 +1165,10 @@ sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "DEE Adding pin %d label=%s",i, label);
++ case SC_ALGORITHM_RSA:
++ if(ckis[i].cert_keyUsage_present) {
++ prkey_info.usage |= ckis[i].priv_usage;
+++ /* If retired key and non gov cert has NONREPUDIATION, treat as user_consent */
+++ if (i >= 4 && (ckis[i].priv_usage & SC_PKCS15_PRKEY_USAGE_NONREPUDIATION)) {
+++ prkey_obj.user_consent = 1;
+++ }
++ } else {
++ prkey_info.usage |= prkeys[i].usage_rsa;
++ }
++@@ -1174,6 +1178,10 @@ sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "DEE Adding pin %d label=%s",i, label);
++ case SC_ALGORITHM_EC:
++ if (ckis[i].cert_keyUsage_present) {
++ prkey_info.usage |= ckis[i].priv_usage;
+++ /* If retired key and non gov cert has NONREPUDIATION, treat as user_consent */
+++ if (i >= 4 && (ckis[i].priv_usage & SC_PKCS15_PRKEY_USAGE_NONREPUDIATION)) {
+++ prkey_obj.user_consent = 1;
+++ }
++ } else {
++ prkey_info.usage |= prkeys[i].usage_ec;
++ }
diff --git a/master/perl-modules b/master/perl-modules
new file mode 100644
index 0000000..6dd33c0
--- /dev/null
+++ b/master/perl-modules
@@ -0,0 +1,576 @@
+diff --git a/package/network/utils/globalprotect/files/globalprotect.sh b/package/network/utils/globalprotect/files/globalprotect.sh
+index 1e40e05..cff74b8 100755
+--- a/package/network/utils/globalprotect/files/globalprotect.sh
++++ b/package/network/utils/globalprotect/files/globalprotect.sh
+@@ -20,6 +20,7 @@ proto_globalprotect_init_config() {
+ proto_config_add_string "os"
+ proto_config_add_string "csd_wrapper"
+ proto_config_add_string "clientcert"
++ proto_config_add_string "clientkey"
+ no_device=1
+ available=1
+ }
+@@ -27,7 +28,7 @@ proto_globalprotect_init_config() {
+ proto_globalprotect_setup() {
+ local config="$1"
+
+- json_get_vars server port interface username serverhash authgroup password password2 token_mode token_secret token_script os csd_wrapper mtu juniper clientcert
++ json_get_vars server port interface username serverhash authgroup password password2 token_mode token_secret token_script os csd_wrapper mtu juniper clientcert clientkey
+
+ grep -q tun /proc/modules || insmod tun
+ ifname="vpn-$config"
+@@ -50,6 +51,11 @@ proto_globalprotect_setup() {
+ append cmdline "$clientcert"
+ }
+
++ [ -n "$clientkey" ] && {
++ append cmdline "--sslkey"
++ append cmdline "$clientkey"
++ }
++
+ append cmdline "--protocol=gp"
+
+ # migrate to standard config files
+diff --git a/package/perl/perl-autoloader/Makefile b/package/perl/perl-autoloader/Makefile
+new file mode 100644
+index 0000000..bd4481f
+--- /dev/null
++++ b/package/perl/perl-autoloader/Makefile
+@@ -0,0 +1,48 @@
++#
++# Copyright (C) 2014 - 2016 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:=perl-autoloader
++PKG_VERSION:=5.74
++PKG_RELEASE:=1
++
++PKG_SOURCE_URL:=http://www.cpan.org/authors/id/S/SM/SMUELLER
++PKG_SOURCE:=AutoLoader-$(PKG_VERSION).tar.gz
++PKG_HASH:=2fac75b05309f71a6871804cd25e1a3ba0a28f43f294fb54528077558da3aff4
++
++PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
++PKG_MAINTAINER:=me
++
++PKG_BUILD_DIR:=$(BUILD_DIR)/perl/AutoLoader-$(PKG_VERSION)
++
++include $(INCLUDE_DIR)/package.mk
++include ../perl/perlmod.mk
++
++define Package/perl-autoloader
++ SUBMENU:=Perl
++ SECTION:=lang
++ CATEGORY:=Languages
++ TITLE:=A Pure Perl RSA implementatino
++ URL:=http://search.cpan.org/dist/AutoLoader/
++ DEPENDS:=perl +perlbase-essential
++endef
++
++define Build/Configure
++ $(call perlmod/Configure,,)
++endef
++
++define Build/Compile
++ $(call perlmod/Compile,,)
++endef
++
++define Package/perl-autoloader/install
++ $(call perlmod/Install,$(1),AutoLoader.pm AutoSplit.pm auto/AutoLoader)
++endef
++
++
++$(eval $(call BuildPackage,perl-autoloader))
+diff --git a/package/perl/perl-chipcard-pcsc/Makefile b/package/perl/perl-chipcard-pcsc/Makefile
+new file mode 100644
+index 0000000..437b67c
+--- /dev/null
++++ b/package/perl/perl-chipcard-pcsc/Makefile
+@@ -0,0 +1,51 @@
++#
++# Copyright (C) 2014 - 2016 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:=perl-chipcard-pcsc
++PKG_VERSION:=1.4.14
++PKG_RELEASE:=1
++
++PKG_SOURCE_URL:=http://www.cpan.org/authors/id/W/WH/WHOM
++PKG_SOURCE:=pcsc-perl-$(PKG_VERSION).tar.bz2
++PKG_HASH:=2722b7e5543e4faf3ba1ec6b29a7dfec6d92be1edec09d0a3191992d4d88c69d
++
++PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
++PKG_MAINTAINER:=me
++
++#HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/Chipcard-PCSC-$(PKG_VERSION)
++#HOST_BUILD_DEPENDS:=perl/host libpcsclite/host
++PKG_BUILD_DIR:=$(BUILD_DIR)/perl/pcsc-perl-$(PKG_VERSION)
++PKG_BUILD_DEPENDS:=pcsc-lite
++
++include $(INCLUDE_DIR)/package.mk
++include ../perl/perlmod.mk
++
++define Package/perl-chipcard-pcsc
++ SUBMENU:=Perl
++ SECTION:=lang
++ CATEGORY:=Languages
++ TITLE:=Perl PCSC implementation
++ URL:=http://search.cpan.org/dist/Chipcard-PCSC/
++ DEPENDS:=perl +perlbase-essential +perlbase-xsloader +libpcsclite +perl-autoloader +perlbase-dynaloader
++endef
++
++define Build/Configure
++ $(call perlmod/Configure,INC="-I${STAGING_DIR}/usr/include/PCSC" LIBS="-lpcsc",)
++endef
++
++define Build/Compile
++ $(call perlmod/Compile,,)
++endef
++
++define Package/perl-chipcard-pcsc/install
++ $(call perlmod/Install,$(1),Chipcard/PCSC.pm Chipcard/PCSC auto/Chipcard/PCSC)
++endef
++
++
++$(eval $(call BuildPackage,perl-chipcard-pcsc))
+diff --git a/package/perl/perl-crypt-openssl-guess/Makefile b/package/perl/perl-crypt-openssl-guess/Makefile
+new file mode 100644
+index 0000000..dcf4bba
+--- /dev/null
++++ b/package/perl/perl-crypt-openssl-guess/Makefile
+@@ -0,0 +1,64 @@
++#
++# Copyright (C) 2014 - 2016 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:=perl-crypt-guess
++PKG_VERSION:=0.11
++PKG_RELEASE:=1
++
++PKG_SOURCE_URL:=http://www.cpan.org/authors/id/A/AK/AKIYM
++PKG_SOURCE:=Crypt-OpenSSL-Guess-$(PKG_VERSION).tar.gz
++PKG_HASH:=aa6b18e38cb852cbad80a58cd90c395b40819d4d01e0ab37e7703149094d7167
++
++PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
++PKG_MAINTAINER:=me
++
++HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/Crypt-OpenSSL-Guess-$(PKG_VERSION)
++HOST_BUILD_DEPENDS:=perl/host
++PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Crypt-OpenSSL-Guess-$(PKG_VERSION)
++
++include $(INCLUDE_DIR)/package.mk
++include $(INCLUDE_DIR)/host-build.mk
++include ../perl/perlmod.mk
++
++define Package/perl-crypt-openssl-guess
++ SUBMENU:=Perl
++ SECTION:=lang
++ CATEGORY:=Languages
++ TITLE:=Perl OpenSSL Guess implementation
++ URL:=http://search.cpan.org/dist/Crypt-OpenSSL-Guess/
++ DEPENDS:=perl +perlbase-essential +perlbase-xsloader +libopenssl
++endef
++
++define Host/Configure
++ $(call perlmod/host/Configure,,,)
++endef
++
++define Host/Compile
++ $(call perlmod/host/Compile,,)
++endef
++
++define Host/Install
++ $(call perlmod/host/Install,$(1),)
++endef
++
++define Build/Configure
++ $(call perlmod/Configure,,)
++endef
++
++define Build/Compile
++ $(call perlmod/Compile,,)
++endef
++
++define Package/perl-crypt-openssl-guess/install
++ $(call perlmod/Install,$(1),Crypt/OpenSSL auto/Crypt/OpenSSL/Guess)
++endef
++
++
++$(eval $(call BuildPackage,perl-crypt-openssl-guess))
++$(eval $(call HostBuild))
+diff --git a/package/perl/perl-crypt-openssl-random/Makefile b/package/perl/perl-crypt-openssl-random/Makefile
+new file mode 100644
+index 0000000..f0cd9d1
+--- /dev/null
++++ b/package/perl/perl-crypt-openssl-random/Makefile
+@@ -0,0 +1,65 @@
++#
++# Copyright (C) 2014 - 2016 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:=perl-crypt-random
++PKG_VERSION:=0.15
++PKG_RELEASE:=1
++
++PKG_SOURCE_URL:=http://www.cpan.org/authors/id/R/RU/RURBAN
++PKG_SOURCE:=Crypt-OpenSSL-Random-$(PKG_VERSION).tar.gz
++PKG_HASH:=f0876faa1ba3111e39b86aa730c603211eff2905e460c72a57b61e8cf475cef4
++
++PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
++PKG_MAINTAINER:=me
++
++HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/Crypt-OpenSSL-Random-$(PKG_VERSION)
++HOST_BUILD_DEPENDS:=perl/host perl-crypt-openssl-guess/host libopenssl/host
++PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Crypt-OpenSSL-Random-$(PKG_VERSION)
++#PKG_BUILD_DEPENDS:=perl-crypt-openssl-guess/host libopenssl/host
++PKG_BUILD_DEPENDS:=perl-crypt-openssl-guess/host
++
++include $(INCLUDE_DIR)/package.mk
++#include $(INCLUDE_DIR)/host-build.mk
++include ../perl/perlmod.mk
++
++define Package/perl-crypt-openssl-random
++ SUBMENU:=Perl
++ SECTION:=lang
++ CATEGORY:=Languages
++ TITLE:=Perl OpenSSL Random implementation
++ URL:=http://search.cpan.org/dist/Crypt-OpenSSL-Random/
++ DEPENDS:=perl +perlbase-essential +perlbase-xsloader +libopenssl +perl-crypt-openssl-guess
++endef
++
++#define Host/Configure
++# $(call perlmod/host/Configure,,,)
++#endef
++
++#define Host/Compile
++# $(call perlmod/host/Compile,,)
++#endef
++
++#define Host/Install
++# $(call perlmod/host/Install,$(1),)
++#endef
++
++define Build/Configure
++ $(call perlmod/Configure,INC= LIBS="-lssl -lcrypto",)
++endef
++
++define Build/Compile
++ $(call perlmod/Compile,,)
++endef
++
++define Package/perl-crypt-openssl-random/install
++ $(call perlmod/Install,$(1),Crypt/OpenSSL auto/Crypt/OpenSSL/Random)
++endef
++
++
++$(eval $(call BuildPackage,perl-crypt-openssl-random))
+diff --git a/package/perl/perl-crypt-openssl-rsa/Makefile b/package/perl/perl-crypt-openssl-rsa/Makefile
+new file mode 100644
+index 0000000..8aab1dc
+--- /dev/null
++++ b/package/perl/perl-crypt-openssl-rsa/Makefile
+@@ -0,0 +1,51 @@
++#
++# Copyright (C) 2014 - 2016 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:=perl-crypt-openssl-rsa
++PKG_VERSION:=0.31
++PKG_RELEASE:=1
++
++PKG_SOURCE_URL:=http://www.cpan.org/authors/id/T/TO/TODDR
++PKG_SOURCE:=Crypt-OpenSSL-RSA-$(PKG_VERSION).tar.gz
++PKG_HASH:=4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436
++
++PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
++PKG_MAINTAINER:=me
++
++HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/Crypt-OpenSSL-RSA-$(PKG_VERSION)
++HOST_BUILD_DEPENDS:=perl/host perl-crypt-openssl-guess/host libopenssl/host
++PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Crypt-OpenSSL-RSA-$(PKG_VERSION)
++PKG_BUILD_DEPENDS:=perl-crypt-openssl-guess/host
++
++include $(INCLUDE_DIR)/package.mk
++include ../perl/perlmod.mk
++
++define Package/perl-crypt-openssl-rsa
++ SUBMENU:=Perl
++ SECTION:=lang
++ CATEGORY:=Languages
++ TITLE:=Perl OpenSSL RSA implementation
++ URL:=http://search.cpan.org/dist/Crypt-OpenSSL-RSA/
++ DEPENDS:=perl +perlbase-essential +perlbase-xsloader +libopenssl +perl-crypt-openssl-guess +perl-autoloader
++endef
++
++define Build/Configure
++ $(call perlmod/Configure,INC= LIBS="-lssl -lcrypto",)
++endef
++
++define Build/Compile
++ $(call perlmod/Compile,,)
++endef
++
++define Package/perl-crypt-openssl-rsa/install
++ $(call perlmod/Install,$(1),Crypt/OpenSSL auto/Crypt/OpenSSL/RSA)
++endef
++
++
++$(eval $(call BuildPackage,perl-crypt-openssl-rsa))
+diff --git a/package/perl/perl-crypt-rsa/Makefile b/package/perl/perl-crypt-rsa/Makefile
+new file mode 100644
+index 0000000..569032d
+--- /dev/null
++++ b/package/perl/perl-crypt-rsa/Makefile
+@@ -0,0 +1,48 @@
++#
++# Copyright (C) 2014 - 2016 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:=perl-crypt-rsa
++PKG_VERSION:=1.99
++PKG_RELEASE:=1
++
++PKG_SOURCE_URL:=http://www.cpan.org/authors/id/V/VI/VIPUL
++PKG_SOURCE:=Crypt-RSA-$(PKG_VERSION).tar.gz
++PKG_HASH:=4706fd6605c920cd1c79f4afc0036b14e233620162b3957abe9b5f1be50b24be
++
++PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
++PKG_MAINTAINER:=me
++
++PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Crypt-RSA-$(PKG_VERSION)
++
++include $(INCLUDE_DIR)/package.mk
++include ../perl/perlmod.mk
++
++define Package/perl-crypt-rsa
++ SUBMENU:=Perl
++ SECTION:=lang
++ CATEGORY:=Languages
++ TITLE:=A Pure Perl RSA implementatino
++ URL:=http://search.cpan.org/dist/Crypt-RSA/
++ DEPENDS:=perl +perlbase-essential
++endef
++
++define Build/Configure
++ $(call perlmod/Configure,,)
++endef
++
++define Build/Compile
++ $(call perlmod/Compile,,)
++endef
++
++define Package/perl-crypt-rsa/install
++ $(call perlmod/Install,$(1),Crypt/RSA auto/Crypt/RSA)
++endef
++
++
++$(eval $(call BuildPackage,perl-crypt-rsa))
+diff --git a/package/perl/perl-digest-sha256/Makefile b/package/perl/perl-digest-sha256/Makefile
+new file mode 100644
+index 0000000..1f2f3fc
+--- /dev/null
++++ b/package/perl/perl-digest-sha256/Makefile
+@@ -0,0 +1,48 @@
++#
++# Copyright (C) 2014 - 2016 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:=perl-digest-sha256
++PKG_VERSION:=0.01
++PKG_RELEASE:=1
++
++PKG_SOURCE_URL:=http://www.cpan.org/authors/id/D/DI/DIDO
++PKG_SOURCE:=SHA256-$(PKG_VERSION)b.tar.gz
++PKG_HASH:=72bbb1e31bbfe39e9df930e9b34bbac25e5d1617b7289076945aa303ad03c170
++
++PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
++PKG_MAINTAINER:=me
++
++PKG_BUILD_DIR:=$(BUILD_DIR)/perl/SHA256-$(PKG_VERSION)
++
++include $(INCLUDE_DIR)/package.mk
++include ../perl/perlmod.mk
++
++define Package/perl-digest-sha256
++ SUBMENU:=Perl
++ SECTION:=lang
++ CATEGORY:=Languages
++ TITLE:=A Pure Perl SH256 implementation
++ URL:=http://search.cpan.org/dist/Digest-SHA256/
++ DEPENDS:=perl +perlbase-essential
++endef
++
++define Build/Configure
++ $(call perlmod/Configure,,)
++endef
++
++define Build/Compile
++ $(call perlmod/Compile,,)
++endef
++
++define Package/perl-digest-sha256/install
++ $(call perlmod/Install,$(1),Digest/SHA256.pm auto/Digest/SHA256)
++endef
++
++
++$(eval $(call BuildPackage,perl-digest-sha256))
+diff --git a/package/perl/perl-digest-sha256/patches/fix-endian-idiocy.patch b/package/perl/perl-digest-sha256/patches/fix-endian-idiocy.patch
+new file mode 100644
+index 0000000..b28ed79
+--- /dev/null
++++ b/package/perl/perl-digest-sha256/patches/fix-endian-idiocy.patch
+@@ -0,0 +1,50 @@
++diff -uNr SHA256-0.01/Makefile.PL SHA256-0.01/Makefile.PL
++--- SHA256-0.01/Makefile.PL 2001-03-12 05:19:07.000000000 +0000
+++++ SHA256-0.01/Makefile.PL 2020-04-26 09:28:20.773363674 +0100
++@@ -19,14 +19,20 @@
++ print EOUT <<"END_OF_STRING";
++
++
++-#ifndef ENDIAN_H
++-#define ENDIAN_H
+++#ifndef MY_ENDIAN_H
+++#define MY_ENDIAN_H
++
++ /* Warning! this file is automatically generated; changes WILL disappear */
++
++-#define BYTEORDER $Config{'byteorder'}
+++#include <endian.h>
++
++-#endif /* ENDIAN_H */
+++#if __BYTE_ORDER == __LITTLE_ENDIAN
+++#define BYTEORDER 1234
+++#else
+++#define BYTEORDER 4321
+++#endif
+++
+++#endif /* MY_ENDIAN_H */
++ END_OF_STRING
++ close EOUT
++ or die "error: unable to properly close 'endian.h'\n";
++diff -uNr SHA256-0.01/_sha256.c SHA256-0.01/_sha256.c
++--- SHA256-0.01/_sha256.c 2001-03-12 07:14:08.000000000 +0000
+++++ SHA256-0.01/_sha256.c 2020-04-26 09:31:46.356338953 +0100
++@@ -16,6 +16,7 @@
++ */
++
++ #include <stdio.h>
+++#include <string.h>
++ #include "sha.h"
++ #include "endian.h"
++
++diff -uNr SHA256-0.01/sha384_512.c SHA256-0.01/sha384_512.c
++--- SHA256-0.01/sha384_512.c 2001-03-16 04:35:15.000000000 +0000
+++++ SHA256-0.01/sha384_512.c 2020-04-26 09:31:50.576358988 +0100
++@@ -16,6 +16,7 @@
++ */
++
++ #include <stdio.h>
+++#include <string.h>
++ #include "sha512.h"
++ #include "endian.h"
++
+diff --git a/package/perl/perl-sys-syslog/Makefile b/package/perl/perl-sys-syslog/Makefile
+new file mode 100644
+index 0000000..68b2299
+--- /dev/null
++++ b/package/perl/perl-sys-syslog/Makefile
+@@ -0,0 +1,48 @@
++#
++# Copyright (C) 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:=perl-sys-syslog
++PKG_VERSION:=0.36
++PKG_RELEASE:=1
++
++PKG_SOURCE_URL:=https://cpan.metacpan.org/authors/id/S/SA/SAPER
++PKG_SOURCE:=Sys-Syslog-$(PKG_VERSION).tar.gz
++PKG_HASH:=ed42a9e5ba04ad4856cc0cb5d38d289c3c5d3764543ec04efafc4af7e3378df8
++
++PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
++PKG_MAINTAINER:=me <me@me>
++
++PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Sys-Syslog-$(PKG_VERSION)
++
++include $(INCLUDE_DIR)/package.mk
++include ../../feeds/packages/perl/perlmod.mk
++
++define Package/perl-sys-syslog
++ SUBMENU:=Perl
++ SECTION:=lang
++ CATEGORY:=Languages
++ TITLE:=Sys::Syslog
++ URL:=https://metacpan.org/pod/Sys::Syslog
++ DEPENDS:=perl +perlbase-essential +perlbase-file
++endef
++
++define Build/Configure
++ $(call perlmod/Configure,,)
++endef
++
++define Build/Compile
++ $(call perlmod/Compile,,)
++endef
++
++define Package/perl-sys-syslog/install
++ $(call perlmod/Install,$(1),Sys/Syslog.pm auto/Sys/Syslog)
++endef
++
++
++$(eval $(call BuildPackage,perl-sys-syslog))
+diff --git a/package/perl/perl/perlmod.mk b/package/perl/perl/perlmod.mk
+new file mode 100644
+index 0000000..56e412a
+--- /dev/null
++++ b/package/perl/perl/perlmod.mk
+@@ -0,0 +1,2 @@
++include ../../feeds/packages/perl/perlmod.mk
++
+diff --git a/package/perl/perl/perlver.mk b/package/perl/perl/perlver.mk
+new file mode 100644
+index 0000000..d84830e
+--- /dev/null
++++ b/package/perl/perl/perlver.mk
+@@ -0,0 +1,2 @@
++include ../../feeds/packages/perl/perlver.mk
++
diff --git a/master/pingid b/master/pingid
new file mode 100644
index 0000000..a95cd5b
--- /dev/null
+++ b/master/pingid
@@ -0,0 +1,71 @@
+diff --git a/package/jmm/pingid/Makefile b/package/jmm/pingid/Makefile
+new file mode 100644
+index 0000000..84aae52
+--- /dev/null
++++ b/package/jmm/pingid/Makefile
+@@ -0,0 +1,51 @@
++#
++# Copyright (C) 2014 OpenWrt.org
++#
++# This is free software, licensed under the GNU General Public License v2.
++# See /LICENSE for more information.
++#
++
++include $(TOPDIR)/rules.mk
++include $(INCLUDE_DIR)/kernel.mk
++
++PKG_NAME:=pingid
++PKG_VERSION:=2020-04-01
++PKG_RELEASE=$(PKG_SOURCE_VERSION)
++
++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
++PKG_SOURCE_URL:=git://git.panaceas.org/openwrt/pingid
++PKG_SOURCE_PROTO:=git
++PKG_SOURCE_VERSION:=master
++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.bz2
++
++PKG_MAINTAINER:=James McKenzie <meh@meh.meh>
++PKG_LICENSE:=GPL-2.0+
++
++
++include $(INCLUDE_DIR)/package.mk
++
++define Package/pingid
++ SECTION:=utils
++ CATEGORY:=Utilities
++ TITLE:=pingid
++endef
++
++
++define Build/Compile
++ $(call Build/Compile/Default)
++ make -C $(PKG_BUILD_DIR) \
++ DESTDIR="$(PKG_INSTALL_DIR)" \
++ install
++endef
++
++
++
++define Package/pingid/install
++ $(INSTALL_DIR) $(1)/etc/init.d
++ $(INSTALL_BIN) ./files/pingid.init $(1)/etc/init.d/pingid
++ $(INSTALL_DIR) $(1)/www/cgi-bin/
++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pingid $(1)/www/cgi-bin/
++endef
++
++
++$(eval $(call BuildPackage,pingid))
+diff --git a/package/jmm/pingid/files/pingid.init b/package/jmm/pingid/files/pingid.init
+new file mode 100644
+index 0000000..5b3b264
+--- /dev/null
++++ b/package/jmm/pingid/files/pingid.init
+@@ -0,0 +1,8 @@
++#!/bin/sh /etc/rc.common
++
++START=99
++
++
++start() {
++ /www/cgi-bin/pingid
++}
diff --git a/master/series b/master/series
index d7ccec7..082cac8 100644
--- a/master/series
+++ b/master/series
@@ -8,5 +8,12 @@ jffs2
globalprotect
openssh
pcsc-lite-network-sockets
+opensc-fix-piv-consent
+fix-libftdi
+pingid
+yubico-piv-tool
+perl-modules
+vlmcsd
+galaxy-tools
my-config
endstop
diff --git a/master/status b/master/status
index d7ccec7..082cac8 100644
--- a/master/status
+++ b/master/status
@@ -8,5 +8,12 @@ jffs2
globalprotect
openssh
pcsc-lite-network-sockets
+opensc-fix-piv-consent
+fix-libftdi
+pingid
+yubico-piv-tool
+perl-modules
+vlmcsd
+galaxy-tools
my-config
endstop
diff --git a/master/vlmcsd b/master/vlmcsd
new file mode 100644
index 0000000..1aafce6
--- /dev/null
+++ b/master/vlmcsd
@@ -0,0 +1,87 @@
+diff --git a/package/jmm/vlmcsd/Makefile b/package/jmm/vlmcsd/Makefile
+new file mode 100644
+index 0000000..e56d3e2
+--- /dev/null
++++ b/package/jmm/vlmcsd/Makefile
+@@ -0,0 +1,45 @@
++#
++# Copyright (C) 2014 OpenWrt.org
++#
++# This is free software, licensed under the GNU General Public License v2.
++# See /LICENSE for more information.
++#
++
++include $(TOPDIR)/rules.mk
++include $(INCLUDE_DIR)/kernel.mk
++
++PKG_NAME:=vlmcsd
++PKG_RELEASE:=1
++
++PKG_SOURCE_URL:=https://github.com/kebe7jun/linux-kms-server.git
++PKG_SOURCE_PROTO:=git
++PKG_SOURCE_DATE:=2018-03-30
++PKG_SOURCE_VERSION:=3bddc249d2f0ce257fbf13781cffc06b77c2579a
++PKG_MIRROR_HASH:=0ef8696b7f6fc3259fe8b2b18813a9135b75cae8ef8ad7d309f8d4d66ca4bcdb
++
++PKG_MAINTAINER:=me <meh@meh.meh>
++PKG_LICENSE:=GPL-2.0+
++
++MAKE_PATH:=vlmcsd
++
++include $(INCLUDE_DIR)/package.mk
++
++define Package/vlmcsd
++ SECTION:=utils
++ CATEGORY:=Utilities
++ TITLE:=linux-kms-server
++endef
++
++
++define Build/Compile
++ $(call Build/Compile/Default)
++endef
++
++define Package/vlmcsd/install
++ $(INSTALL_DIR) $(1)/usr/sbin
++ $(INSTALL_BIN) $(PKG_BUILD_DIR)/${MAKE_PATH}/vlmcsd $(1)/usr/sbin/
++ $(INSTALL_DIR) $(1)/etc/init.d
++ $(INSTALL_BIN) ./files/vlmcsd.init $(1)/etc/init.d/vlmcsd
++endef
++
++$(eval $(call BuildPackage,vlmcsd))
+diff --git a/package/jmm/vlmcsd/files/vlmcsd.init b/package/jmm/vlmcsd/files/vlmcsd.init
+new file mode 100755
+index 0000000..06dba05
+--- /dev/null
++++ b/package/jmm/vlmcsd/files/vlmcsd.init
+@@ -0,0 +1,30 @@
++#!/bin/sh /etc/rc.common
++# Copyright (C) 2006-2011 OpenWrt.org
++
++START=50
++STOP=50
++
++USE_PROCD=1
++PROG=/usr/sbin/vlmcsd
++
++start_service() {
++ procd_open_instance
++ procd_set_param command $PROG -D -v -l syslog
++ procd_close_instance
++}
++
++shutdown() {
++ local pid
++ local pids
++ local pid_mine
++
++ stop
++
++ # kill active clients
++ pid_mine="$$"
++ pids="$(pidof vlmcsd)"
++ for pid in $pids; do
++ [ "$pid" = "$pid_mine" ] && continue
++ [ -e "/proc/$pid/stat" ] && kill $pid
++ done
++}
diff --git a/master/yubico-piv-tool b/master/yubico-piv-tool
new file mode 100644
index 0000000..8e27a0f
--- /dev/null
+++ b/master/yubico-piv-tool
@@ -0,0 +1,91 @@
+diff --git a/package/utils/yubico-piv-tool/Makefile b/package/utils/yubico-piv-tool/Makefile
+new file mode 100644
+index 0000000..d253fa5
+--- /dev/null
++++ b/package/utils/yubico-piv-tool/Makefile
+@@ -0,0 +1,85 @@
++#
++# Copyright (C) 2006-2014 OpenWrt.org
++# Copyright 2010 Vertical Communications
++# This is free software, licensed under the GNU General Public License v2.
++# See /LICENSE for more information.
++#
++
++include $(TOPDIR)/rules.mk
++
++PKG_NAME:=yubico-piv-tool
++PKG_VERSION:=1.7.0
++PKG_HASH:=624d818f675941efb411f14b198007cfefc0bc10d7104548c7e106c81236e3a9
++PKG_RELEASE:=1
++
++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
++PKG_SOURCE_URL:=git://github.com/Yubico/yubico-piv-tool
++PKG_SOURCE_PROTO:=git
++PKG_SOURCE_VERSION:=yubico-piv-tool-1.7.0
++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
++PKG_LICENSE:=BSD
++
++PKG_INSTALL:=1
++
++PKG_BUILD_PARALLEL:=1
++
++PKG_FIXUP:=autoreconf
++
++include $(INCLUDE_DIR)/package.mk
++
++define Package/yubico-piv-tool
++ SECTION:=utils
++ CATEGORY:=Utilities
++ TITLE:=yubico-piv-tool
++ DEPENDS:= +libpcsclite +check +libopenssl
++endef
++
++define Package/yubico-piv-tool/description
++ yubico-piv-tool
++endef
++
++
++
++#TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
++# $(INSTALL_DIR) $(1)/usr/bin
++# $(INSTALL_DIR) $(1)/usr/lib
++# $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sympathy $(1)/usr/bin/
++# $(INSTALL_BIN) ${PKG_INSTALL_DIR}/usr/lib/libsympathy*.so* $(1)/usr/lib/
++
++# $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d
++# $(INSTALL_BIN) ./files/sympathy.init $(1)/etc/init.d/sympathy
++
++
++#TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections -flto
++#TARGET_LDFLAGS += -flto
++
++#CONFIGURE_ARGS += \
++# --disable-testio-debug \
++# --enable-elf-shlibs \
++# --disable-libuuid \
++# --disable-libblkid \
++# --disable-uuidd \
++# --disable-tls \
++# --disable-nls \
++# --disable-rpath \
++# --disable-fuse2fs
++
++define Build/Compile
++ $(call Build/Compile/Default)
++ make -C $(PKG_BUILD_DIR) \
++ DESTDIR="$(PKG_INSTALL_DIR)" \
++ install
++endef
++
++
++define Package/yubico-piv-tool/install
++ $(INSTALL_DIR) $(1)/usr/bin
++ $(INSTALL_DIR) $(1)/usr/lib
++
++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/yubico-piv-tool $(1)/usr/bin/
++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libykcs11*.so* $(1)/usr/lib/
++ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libykpiv*.so* $(1)/usr/lib/
++endef
++
++
++$(eval $(call BuildPackage,yubico-piv-tool))