diff options
| author | James <> | 2020-06-26 15:25:23 +0100 |
|---|---|---|
| committer | James <> | 2020-06-26 15:25:23 +0100 |
| commit | 636d347e3df00f685923a30a4e11a95a49bd7b4c (patch) | |
| tree | af05e005b0642d225115ee98f1114ad6f41d1ffa | |
| parent | 56227c1f1aff909dbfa5e889cd7e8ff1607c0de3 (diff) | |
| download | master-d20f4fc-pq-636d347e3df00f685923a30a4e11a95a49bd7b4c.tar.gz master-d20f4fc-pq-636d347e3df00f685923a30a4e11a95a49bd7b4c.tar.bz2 master-d20f4fc-pq-636d347e3df00f685923a30a4e11a95a49bd7b4c.zip | |
hpvpn
| -rw-r--r-- | master/endstop | 1376 | ||||
| -rw-r--r-- | master/fix-gpios | 23 | ||||
| -rw-r--r-- | master/my-config | 860 | ||||
| -rw-r--r-- | master/pcsc-lite-network-sockets | 304 | ||||
| -rw-r--r-- | master/series | 2 | ||||
| -rw-r--r-- | master/status | 12 | ||||
| -rw-r--r-- | master/sympathy | 67 |
7 files changed, 2611 insertions, 33 deletions
diff --git a/master/endstop b/master/endstop index e69de29..bb3c0ae 100644 --- a/master/endstop +++ b/master/endstop @@ -0,0 +1,1376 @@ +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-gpios b/master/fix-gpios index 5c5cbc2..955ba96 100644 --- a/master/fix-gpios +++ b/master/fix-gpios @@ -1,13 +1,30 @@ diff --git a/target/linux/ramips/dts/GL-MT300N-V2.dts b/target/linux/ramips/dts/GL-MT300N-V2.dts -index 852b7b5..4eb0292 100644 +index 852b7b5..b005ea1 100644 --- a/target/linux/ramips/dts/GL-MT300N-V2.dts +++ b/target/linux/ramips/dts/GL-MT300N-V2.dts -@@ -81,7 +81,7 @@ +@@ -52,6 +52,7 @@ + linux,code = <KEY_RESTART>; + }; + ++/* + BTN_0 { + label = "BTN_0"; + gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; +@@ -63,6 +64,8 @@ + gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + linux,code = <BTN_1>; + }; ++*/ ++ + }; + + gpio_export { +@@ -81,7 +84,7 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "wdt", "gpio", "wled_an", "p0led_an", "p1led_an", "i2s"; -+ ralink,group = "wdt", "gpio", "wled_an", "p0led_an", "p1led_an", "i2s", "uart1", "i2c"; ++ ralink,group = "wdt", "gpio", "wled_an", "p0led_an", "p1led_an", "i2s", "i2c"; ralink,function = "gpio"; }; }; diff --git a/master/my-config b/master/my-config index 8dc17dc..dacb786 100644 --- a/master/my-config +++ b/master/my-config @@ -1,5 +1,5 @@ diff --git a/.config b/.config -index d79707a..ea0b9b3 100644 +index d79707a..68963d7 100644 --- a/.config +++ b/.config @@ -134,6 +134,7 @@ CONFIG_PCI_SUPPORT=y @@ -107,7 +107,7 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_rpcd is not set # CONFIG_PACKAGE_snapshot-tool is not set # CONFIG_PACKAGE_sqm-scripts is not set -@@ -1484,6 +1496,8 @@ CONFIG_PACKAGE_usign=y +@@ -1484,11 +1496,13 @@ CONFIG_PACKAGE_usign=y # # Libraries # @@ -116,7 +116,204 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_ar is not set # CONFIG_PACKAGE_autoconf is not set # CONFIG_PACKAGE_automake is not set -@@ -2026,7 +2040,7 @@ CONFIG_PACKAGE_kmod-pppox=y + # CONFIG_PACKAGE_binutils is not set +-# CONFIG_PACKAGE_diffutils is not set ++CONFIG_PACKAGE_diffutils=m + # CONFIG_PACKAGE_gcc is not set + # CONFIG_PACKAGE_gdb is not set + # CONFIG_PACKAGE_gdbserver is not set +@@ -1662,46 +1676,48 @@ CONFIG_PACKAGE_wireless-regdb=y + # + # Cryptographic API modules + # +-# CONFIG_PACKAGE_kmod-crypto-aead is not set +-# CONFIG_PACKAGE_kmod-crypto-authenc is not set +-# CONFIG_PACKAGE_kmod-crypto-cbc is not set ++CONFIG_PACKAGE_kmod-crypto-acompress=m ++CONFIG_PACKAGE_kmod-crypto-aead=m ++CONFIG_PACKAGE_kmod-crypto-authenc=m ++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-ctr is not set + # CONFIG_PACKAGE_kmod-crypto-cts is not set +-# CONFIG_PACKAGE_kmod-crypto-deflate is not set +-# CONFIG_PACKAGE_kmod-crypto-des is not set +-# CONFIG_PACKAGE_kmod-crypto-ecb is not set ++CONFIG_PACKAGE_kmod-crypto-deflate=m ++CONFIG_PACKAGE_kmod-crypto-des=m ++CONFIG_PACKAGE_kmod-crypto-ecb=m + # CONFIG_PACKAGE_kmod-crypto-ecdh is not set +-# CONFIG_PACKAGE_kmod-crypto-echainiv is not set ++CONFIG_PACKAGE_kmod-crypto-echainiv=m + # CONFIG_PACKAGE_kmod-crypto-fcrypt is not set + # CONFIG_PACKAGE_kmod-crypto-gcm is not set + # CONFIG_PACKAGE_kmod-crypto-gf128 is not set + # CONFIG_PACKAGE_kmod-crypto-ghash is not set +-# CONFIG_PACKAGE_kmod-crypto-hash is not set +-# CONFIG_PACKAGE_kmod-crypto-hmac is not set ++CONFIG_PACKAGE_kmod-crypto-hash=m ++CONFIG_PACKAGE_kmod-crypto-hmac=m + # CONFIG_PACKAGE_kmod-crypto-hw-ccp is not set + # CONFIG_PACKAGE_kmod-crypto-hw-geode is not set + # CONFIG_PACKAGE_kmod-crypto-hw-hifn-795x is not set + # CONFIG_PACKAGE_kmod-crypto-hw-padlock is not set + # CONFIG_PACKAGE_kmod-crypto-hw-talitos is not set +-# CONFIG_PACKAGE_kmod-crypto-manager is not set ++CONFIG_PACKAGE_kmod-crypto-iv=m ++CONFIG_PACKAGE_kmod-crypto-manager=m + # CONFIG_PACKAGE_kmod-crypto-md4 is not set +-# CONFIG_PACKAGE_kmod-crypto-md5 is not set ++CONFIG_PACKAGE_kmod-crypto-md5=m + # CONFIG_PACKAGE_kmod-crypto-michael-mic is not set + # CONFIG_PACKAGE_kmod-crypto-misc is not set +-# CONFIG_PACKAGE_kmod-crypto-null is not set ++CONFIG_PACKAGE_kmod-crypto-null=m + # CONFIG_PACKAGE_kmod-crypto-pcbc is not set +-# CONFIG_PACKAGE_kmod-crypto-pcompress is not set +-# CONFIG_PACKAGE_kmod-crypto-rng is not set ++CONFIG_PACKAGE_kmod-crypto-pcompress=m ++CONFIG_PACKAGE_kmod-crypto-rng=m + # CONFIG_PACKAGE_kmod-crypto-seqiv is not set +-# CONFIG_PACKAGE_kmod-crypto-sha1 is not set +-# CONFIG_PACKAGE_kmod-crypto-sha256 is not set ++CONFIG_PACKAGE_kmod-crypto-sha1=m ++CONFIG_PACKAGE_kmod-crypto-sha256=m + # CONFIG_PACKAGE_kmod-crypto-sha512 is not set + # CONFIG_PACKAGE_kmod-crypto-test is not set +-# CONFIG_PACKAGE_kmod-crypto-user is not set +-# CONFIG_PACKAGE_kmod-crypto-wq is not set ++CONFIG_PACKAGE_kmod-crypto-user=m ++CONFIG_PACKAGE_kmod-crypto-wq=m + # CONFIG_PACKAGE_kmod-crypto-xts is not set + # CONFIG_PACKAGE_kmod-cryptodev is not set + +@@ -1746,7 +1762,30 @@ CONFIG_PACKAGE_wireless-regdb=y + # + # Hardware Monitoring Support + # +-# CONFIG_PACKAGE_kmod-hwmon-core is not set ++CONFIG_PACKAGE_kmod-hwmon-core=m ++# CONFIG_PACKAGE_kmod-hwmon-adcxx is not set ++# CONFIG_PACKAGE_kmod-hwmon-adt7410 is not set ++# CONFIG_PACKAGE_kmod-hwmon-adt7475 is not set ++# CONFIG_PACKAGE_kmod-hwmon-gpiofan is not set ++# CONFIG_PACKAGE_kmod-hwmon-ina209 is not set ++# CONFIG_PACKAGE_kmod-hwmon-ina2xx is not set ++# CONFIG_PACKAGE_kmod-hwmon-it87 is not set ++# CONFIG_PACKAGE_kmod-hwmon-lm63 is not set ++# CONFIG_PACKAGE_kmod-hwmon-lm75 is not set ++# CONFIG_PACKAGE_kmod-hwmon-lm77 is not set ++# CONFIG_PACKAGE_kmod-hwmon-lm85 is not set ++# CONFIG_PACKAGE_kmod-hwmon-lm90 is not set ++# CONFIG_PACKAGE_kmod-hwmon-lm92 is not set ++# CONFIG_PACKAGE_kmod-hwmon-lm95241 is not set ++# CONFIG_PACKAGE_kmod-hwmon-ltc4151 is not set ++# CONFIG_PACKAGE_kmod-hwmon-pwmfan is not set ++# CONFIG_PACKAGE_kmod-hwmon-sch5627 is not set ++# CONFIG_PACKAGE_kmod-hwmon-sht21 is not set ++# CONFIG_PACKAGE_kmod-hwmon-tmp102 is not set ++# CONFIG_PACKAGE_kmod-hwmon-tmp103 is not set ++# CONFIG_PACKAGE_kmod-hwmon-tmp421 is not set ++# CONFIG_PACKAGE_kmod-hwmon-vid is not set ++# CONFIG_PACKAGE_kmod-hwmon-w83793 is not set + + # + # I2C support +@@ -1803,7 +1842,9 @@ CONFIG_PACKAGE_kmod-lib-crc-ccitt=y + # CONFIG_PACKAGE_kmod-lib-crc32c is not set + # CONFIG_PACKAGE_kmod-lib-crc7 is not set + # CONFIG_PACKAGE_kmod-lib-crc8 is not set +-# CONFIG_PACKAGE_kmod-lib-textsearch is not set ++CONFIG_PACKAGE_kmod-lib-textsearch=m ++CONFIG_PACKAGE_kmod-lib-zlib-deflate=m ++CONFIG_PACKAGE_kmod-lib-zlib-inflate=m + + # + # Native Language Support +@@ -1866,7 +1907,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 +-# CONFIG_PACKAGE_kmod-ipt-ipsec is not set ++CONFIG_PACKAGE_kmod-ipt-ipsec=m + # 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 + # CONFIG_PACKAGE_kmod-ipt-ulog is not set + # CONFIG_PACKAGE_kmod-netatop is not set + CONFIG_PACKAGE_kmod-nf-conntrack=y +-# CONFIG_PACKAGE_kmod-nf-conntrack-netlink is not set ++CONFIG_PACKAGE_kmod-nf-conntrack-netlink=m + 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 + CONFIG_PACKAGE_kmod-nf-nat=y + # CONFIG_PACKAGE_kmod-nf-nat6 is not set + # CONFIG_PACKAGE_kmod-nf-nathelper is not set +-# CONFIG_PACKAGE_kmod-nf-nathelper-extra is not set ++CONFIG_PACKAGE_kmod-nf-nathelper-extra=m + CONFIG_PACKAGE_kmod-nf-reject=y + CONFIG_PACKAGE_kmod-nf-reject6=y +-# CONFIG_PACKAGE_kmod-nfnetlink is not set ++CONFIG_PACKAGE_kmod-nfnetlink=m + # 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 + # CONFIG_PACKAGE_kmod-libphy is not set + # CONFIG_PACKAGE_kmod-macvlan is not set + # CONFIG_PACKAGE_kmod-mdio-gpio is not set +-# CONFIG_PACKAGE_kmod-mii is not set ++CONFIG_PACKAGE_kmod-mii=m + # 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 + # CONFIG_PACKAGE_kmod-dnsresolver is not set + # CONFIG_PACKAGE_kmod-fou is not set + # CONFIG_PACKAGE_kmod-geneve is not set +-# CONFIG_PACKAGE_kmod-gre is not set ++CONFIG_PACKAGE_kmod-gre=m + # CONFIG_PACKAGE_kmod-gre6 is not set +-# CONFIG_PACKAGE_kmod-ip6-tunnel is not set ++CONFIG_PACKAGE_kmod-ip-vti=m ++CONFIG_PACKAGE_kmod-ip6-tunnel=m ++CONFIG_PACKAGE_kmod-ip6-vti=m + # CONFIG_PACKAGE_kmod-ipip is not set +-# CONFIG_PACKAGE_kmod-ipsec is not set +-# CONFIG_PACKAGE_kmod-iptunnel6 is not set ++CONFIG_PACKAGE_kmod-ipsec=m ++CONFIG_PACKAGE_kmod-ipsec4=m ++CONFIG_PACKAGE_kmod-ipsec6=m ++CONFIG_PACKAGE_kmod-iptunnel=m ++CONFIG_PACKAGE_kmod-iptunnel4=m ++CONFIG_PACKAGE_kmod-iptunnel6=m + # 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 + # CONFIG_PACKAGE_kmod-misdn is not set + # CONFIG_PACKAGE_kmod-mpls is not set + CONFIG_PACKAGE_kmod-ppp=y +-# CONFIG_PACKAGE_kmod-mppe is not set ++CONFIG_PACKAGE_kmod-mppe=m + # 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 + CONFIG_PACKAGE_kmod-pppoe=y + # CONFIG_PACKAGE_kmod-pppol2tp is not set + CONFIG_PACKAGE_kmod-pppox=y +-# CONFIG_PACKAGE_kmod-pptp is not set ++CONFIG_PACKAGE_kmod-pptp=m + # 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 CONFIG_PACKAGE_kmod-slhc=y # CONFIG_PACKAGE_kmod-slip is not set # CONFIG_PACKAGE_kmod-trelay is not set @@ -125,7 +322,224 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_kmod-veth is not set # CONFIG_PACKAGE_kmod-vxlan is not set # CONFIG_PACKAGE_kmod-wireguard is not set -@@ -2641,8 +2655,8 @@ CONFIG_PACKAGE_kmod-mt76x2=y +@@ -2118,7 +2165,7 @@ CONFIG_PACKAGE_kmod-gpio-button-hotplug=y + # USB Support + # + # CONFIG_PACKAGE_kmod-chaoskey is not set +-# CONFIG_PACKAGE_kmod-usb-acm is not set ++CONFIG_PACKAGE_kmod-usb-acm=m + # 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-ehci=y + # CONFIG_PACKAGE_kmod-usb-hid is not set + # CONFIG_PACKAGE_kmod-usb-ledtrig-usbport is not set +-# CONFIG_PACKAGE_kmod-usb-net is not set ++CONFIG_PACKAGE_kmod-usb-net=m ++# CONFIG_PACKAGE_kmod-usb-net-asix is not set ++# CONFIG_PACKAGE_kmod-usb-net-asix-ax88179 is not set ++CONFIG_PACKAGE_kmod-usb-net-cdc-eem=m ++CONFIG_PACKAGE_kmod-usb-net-cdc-ether=m ++# CONFIG_PACKAGE_kmod-usb-net-cdc-mbim is not set ++CONFIG_PACKAGE_kmod-usb-net-cdc-ncm=m ++CONFIG_PACKAGE_kmod-usb-net-cdc-subset=m ++# CONFIG_PACKAGE_kmod-usb-net-dm9601-ether is not set ++# CONFIG_PACKAGE_kmod-usb-net-hso is not set ++CONFIG_PACKAGE_kmod-usb-net-huawei-cdc-ncm=m ++CONFIG_PACKAGE_kmod-usb-net-ipheth=m ++# CONFIG_PACKAGE_kmod-usb-net-kalmia is not set ++# CONFIG_PACKAGE_kmod-usb-net-kaweth is not set ++# CONFIG_PACKAGE_kmod-usb-net-mcs7830 is not set ++# CONFIG_PACKAGE_kmod-usb-net-pegasus is not set ++# CONFIG_PACKAGE_kmod-usb-net-pl is not set ++# CONFIG_PACKAGE_kmod-usb-net-qmi-wwan is not set ++CONFIG_PACKAGE_kmod-usb-net-rndis=m ++# CONFIG_PACKAGE_kmod-usb-net-rtl8150 is not set ++# CONFIG_PACKAGE_kmod-usb-net-rtl8152 is not set ++# CONFIG_PACKAGE_kmod-usb-net-sierrawireless is not set ++# CONFIG_PACKAGE_kmod-usb-net-smsc95xx is not set ++# CONFIG_PACKAGE_kmod-usb-net-sr9700 is not set + CONFIG_PACKAGE_kmod-usb-ohci=y + # 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-serial=m ++# CONFIG_PACKAGE_kmod-usb-serial-ark3116 is not set ++# CONFIG_PACKAGE_kmod-usb-serial-belkin is not set ++CONFIG_PACKAGE_kmod-usb-serial-ch341=m ++CONFIG_PACKAGE_kmod-usb-serial-cp210x=m ++# CONFIG_PACKAGE_kmod-usb-serial-cypress-m8 is not set ++# CONFIG_PACKAGE_kmod-usb-serial-dmx_usb_module is not set ++# CONFIG_PACKAGE_kmod-usb-serial-edgeport is not set ++CONFIG_PACKAGE_kmod-usb-serial-ftdi=m ++# CONFIG_PACKAGE_kmod-usb-serial-garmin is not set ++# CONFIG_PACKAGE_kmod-usb-serial-ipw is not set ++# CONFIG_PACKAGE_kmod-usb-serial-keyspan is not set ++# CONFIG_PACKAGE_kmod-usb-serial-mct is not set ++CONFIG_PACKAGE_kmod-usb-serial-mos7720=m ++# CONFIG_PACKAGE_kmod-usb-serial-option is not set ++# CONFIG_PACKAGE_kmod-usb-serial-oti6858 is not set ++CONFIG_PACKAGE_kmod-usb-serial-pl2303=m ++# CONFIG_PACKAGE_kmod-usb-serial-qualcomm is not set ++# CONFIG_PACKAGE_kmod-usb-serial-sierrawireless is not set ++# CONFIG_PACKAGE_kmod-usb-serial-simple is not set ++# CONFIG_PACKAGE_kmod-usb-serial-ti-usb is not set ++# 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-extras is not set + # CONFIG_PACKAGE_kmod-usb-storage-uas is not set + # 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 + # + # W1 support + # +-# CONFIG_PACKAGE_kmod-w1 is not set ++CONFIG_PACKAGE_kmod-w1=m ++CONFIG_PACKAGE_kmod-w1-gpio-custom=m ++# CONFIG_PACKAGE_kmod-w1-master-ds2482 is not set ++CONFIG_PACKAGE_kmod-w1-master-ds2490=m ++CONFIG_PACKAGE_kmod-w1-master-gpio=m ++# CONFIG_PACKAGE_kmod-w1-slave-ds2413 is not set ++CONFIG_PACKAGE_kmod-w1-slave-ds2431=m ++CONFIG_PACKAGE_kmod-w1-slave-ds2433=m ++# CONFIG_PACKAGE_kmod-w1-slave-ds2760 is not set ++# CONFIG_PACKAGE_kmod-w1-slave-smem is not set ++CONFIG_PACKAGE_kmod-w1-slave-therm=m + + # + # WPAN 802.15.4 Support +@@ -2380,20 +2483,20 @@ CONFIG_PACKAGE_kmod-mt76x2=y + # CONFIG_PACKAGE_openpyxl is not set + # CONFIG_PACKAGE_pillow is not set + # CONFIG_PACKAGE_pyjwt is not set +-# CONFIG_PACKAGE_python is not set ++CONFIG_PACKAGE_python=m + # CONFIG_PACKAGE_python-asn1crypto is not set + # CONFIG_PACKAGE_python-attrs is not set + # CONFIG_PACKAGE_python-attrs-src is not set + # CONFIG_PACKAGE_python-automat is not set + # CONFIG_PACKAGE_python-automat-src is not set +-# CONFIG_PACKAGE_python-base is not set ++CONFIG_PACKAGE_python-base=m + # CONFIG_PACKAGE_python-base-src is not set + # CONFIG_PACKAGE_python-certifi is not set + # CONFIG_PACKAGE_python-cffi is not set + # CONFIG_PACKAGE_python-cffi-src is not set +-# CONFIG_PACKAGE_python-codecs is not set ++CONFIG_PACKAGE_python-codecs=m + # CONFIG_PACKAGE_python-codecs-src is not set +-# CONFIG_PACKAGE_python-compiler is not set ++CONFIG_PACKAGE_python-compiler=m + # 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 + # CONFIG_PACKAGE_python-crypto-src is not set + # CONFIG_PACKAGE_python-cryptography is not set + # CONFIG_PACKAGE_python-cryptography-src is not set +-# CONFIG_PACKAGE_python-ctypes is not set ++CONFIG_PACKAGE_python-ctypes=m + # CONFIG_PACKAGE_python-ctypes-src is not set + # CONFIG_PACKAGE_python-curl is not set + # CONFIG_PACKAGE_python-dateutil is not set +-# CONFIG_PACKAGE_python-db is not set ++CONFIG_PACKAGE_python-db=m + # CONFIG_PACKAGE_python-db-src is not set +-# CONFIG_PACKAGE_python-decimal is not set ++CONFIG_PACKAGE_python-decimal=m + # CONFIG_PACKAGE_python-decimal-src is not set + # CONFIG_PACKAGE_python-dev is not set + # CONFIG_PACKAGE_python-dev-src is not set +-# CONFIG_PACKAGE_python-distutils is not set ++CONFIG_PACKAGE_python-distutils=m + # CONFIG_PACKAGE_python-distutils-src is not set + # CONFIG_PACKAGE_python-dns is not set + # CONFIG_PACKAGE_python-dpkt is not set + # CONFIG_PACKAGE_python-egenix-mx-base is not set +-# CONFIG_PACKAGE_python-email is not set ++CONFIG_PACKAGE_python-email=m + # CONFIG_PACKAGE_python-email-src is not set + # CONFIG_PACKAGE_python-enum34 is not set + # CONFIG_PACKAGE_python-enum34-src is not set + # CONFIG_PACKAGE_python-evdev is not set +-# CONFIG_PACKAGE_python-gdbm is not set ++CONFIG_PACKAGE_python-gdbm=m + # 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 + # CONFIG_PACKAGE_python-ldap is not set + # CONFIG_PACKAGE_python-lib2to3 is not set + # CONFIG_PACKAGE_python-lib2to3-src is not set +-# CONFIG_PACKAGE_python-light is not set ++CONFIG_PACKAGE_python-light=m + + # + # Configuration + # + # CONFIG_PYTHON_BLUETOOTH_SUPPORT is not set + # CONFIG_PACKAGE_python-light-src is not set +-# CONFIG_PACKAGE_python-logging is not set ++CONFIG_PACKAGE_python-logging=m + # CONFIG_PACKAGE_python-logging-src is not set + # CONFIG_PACKAGE_python-lxml is not set +-# CONFIG_PACKAGE_python-multiprocessing is not set ++CONFIG_PACKAGE_python-multiprocessing=m + # CONFIG_PACKAGE_python-multiprocessing-src is not set + # CONFIG_PACKAGE_python-mysql is not set +-# CONFIG_PACKAGE_python-ncurses is not set ++CONFIG_PACKAGE_python-ncurses=m + # CONFIG_PACKAGE_python-ncurses-src is not set + # CONFIG_PACKAGE_python-oauthlib is not set +-# CONFIG_PACKAGE_python-openssl is not set ++CONFIG_PACKAGE_python-openssl=m + # 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 + # CONFIG_PACKAGE_python-pyasn1-src is not set + # CONFIG_PACKAGE_python-pycparser is not set + # CONFIG_PACKAGE_python-pycparser-src is not set +-# CONFIG_PACKAGE_python-pydoc is not set ++CONFIG_PACKAGE_python-pydoc=m + # 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 + # CONFIG_PACKAGE_python-six is not set + # CONFIG_PACKAGE_python-six-src is not set + # CONFIG_PACKAGE_python-smbus is not set +-# CONFIG_PACKAGE_python-sqlite3 is not set ++CONFIG_PACKAGE_python-sqlite3=m + # CONFIG_PACKAGE_python-sqlite3-src is not set + # CONFIG_PACKAGE_python-txsocksx is not set + # CONFIG_PACKAGE_python-txsocksx-src is not set +-# CONFIG_PACKAGE_python-unittest is not set ++CONFIG_PACKAGE_python-unittest=m + # CONFIG_PACKAGE_python-unittest-src is not set + # CONFIG_PACKAGE_python-urllib3 is not set +-# CONFIG_PACKAGE_python-xml is not set ++CONFIG_PACKAGE_python-xml=m + # 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 + # + # Compression + # +-# CONFIG_PACKAGE_libbz2 is not set ++CONFIG_PACKAGE_libbz2=m + # CONFIG_PACKAGE_liblzma is not set + # CONFIG_PACKAGE_libunrar is not set + # # Filesystem # @@ -134,9 +548,26 @@ index d79707a..ea0b9b3 100644 +CONFIG_PACKAGE_libacl=m +CONFIG_PACKAGE_libattr=m # CONFIG_PACKAGE_libfuse is not set - # CONFIG_PACKAGE_libow is not set +-# CONFIG_PACKAGE_libow is not set ++CONFIG_PACKAGE_libow=m ++ ++# ++# Customize libow ++# ++ ++# ++# Bus master and adapter support ++# ++# CONFIG_LIBOW_MASTER_USB is not set ++# CONFIG_LIBOW_MASTER_I2C is not set ++CONFIG_LIBOW_MASTER_W1=y ++# CONFIG_LIBOW_ZEROCONF is not set ++# CONFIG_LIBOW_DEBUG is not set ++# CONFIG_LIBOW_OWTRAFFIC is not set # CONFIG_PACKAGE_libow-capi is not set -@@ -2800,7 +2814,18 @@ CONFIG_PACKAGE_libxtables=y + # CONFIG_PACKAGE_libsysfs is not set + +@@ -2800,7 +2917,18 @@ CONFIG_PACKAGE_libxtables=y # # CONFIG_PACKAGE_libgnutls is not set # CONFIG_PACKAGE_libmbedtls is not set @@ -156,7 +587,22 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_libwolfssl is not set # -@@ -2869,7 +2894,7 @@ CONFIG_PACKAGE_libxtables=y +@@ -2837,7 +2965,13 @@ CONFIG_PACKAGE_libxtables=y + # database + # + # CONFIG_PACKAGE_libpq is not set +-# CONFIG_PACKAGE_libsqlite3 is not set ++CONFIG_PACKAGE_libsqlite3=m ++ ++# ++# Configuration ++# ++CONFIG_SQLITE_FTS3=y ++CONFIG_SQLITE_RTREE=y + # 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 # CONFIG_PACKAGE_bind-libs is not set # CONFIG_PACKAGE_bluez-libs is not set # CONFIG_PACKAGE_boost is not set @@ -165,7 +611,71 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_check is not set # CONFIG_PACKAGE_classpath is not set # CONFIG_PACKAGE_classpath-tools is not set -@@ -2997,7 +3022,7 @@ CONFIG_PACKAGE_libjson-c=y +@@ -2899,9 +3033,9 @@ CONFIG_PACKAGE_libxtables=y + # CONFIG_PACKAGE_libarchive-noopenssl is not set + # CONFIG_PACKAGE_libartnet is not set + # CONFIG_PACKAGE_libaudiofile is not set +-# CONFIG_PACKAGE_libavahi-client is not set ++CONFIG_PACKAGE_libavahi-client=m + # CONFIG_PACKAGE_libavahi-compat-libdnssd is not set +-# CONFIG_PACKAGE_libavahi-dbus-support is not set ++CONFIG_PACKAGE_libavahi-dbus-support=m + # 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_libcoap is not set + # CONFIG_PACKAGE_libconfig is not set + # CONFIG_PACKAGE_libcurl is not set +-# CONFIG_PACKAGE_libdaemon is not set ++CONFIG_PACKAGE_libdaemon=m + # CONFIG_PACKAGE_libdaq is not set +-# CONFIG_PACKAGE_libdb47 is not set ++CONFIG_PACKAGE_libdb47=m + # 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 + # CONFIG_PACKAGE_libelf1 is not set + # CONFIG_PACKAGE_libcomerr is not set + # CONFIG_PACKAGE_libdb47xx is not set +-# CONFIG_PACKAGE_libdbus is not set ++CONFIG_PACKAGE_libdbus=m + # 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 + # CONFIG_PACKAGE_libevent2-pthreads is not set + # CONFIG_PACKAGE_libevhtp is not set + # CONFIG_PACKAGE_libexif is not set +-# CONFIG_PACKAGE_libexpat is not set ++CONFIG_PACKAGE_libexpat=m + # 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 + # CONFIG_PACKAGE_libfastjson is not set + # CONFIG_PACKAGE_libfdisk is not set + # CONFIG_PACKAGE_libfdt is not set +-# CONFIG_PACKAGE_libffi is not set ++CONFIG_PACKAGE_libffi=m + # 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 + # CONFIG_PACKAGE_libgcrypt is not set + # CONFIG_PACKAGE_libgd is not set +-# CONFIG_PACKAGE_libgdbm is not set ++CONFIG_PACKAGE_libgdbm=m + # CONFIG_PACKAGE_libgee is not set + # CONFIG_PACKAGE_libglpk is not set +-# CONFIG_PACKAGE_libgmp is not set ++CONFIG_PACKAGE_libgmp=m + # 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 # CONFIG_PACKAGE_liblucihttp is not set # CONFIG_PACKAGE_liblucihttp-lua is not set # CONFIG_PACKAGE_liblz4 is not set @@ -174,7 +684,16 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_libmad is not set # CONFIG_PACKAGE_libmagic is not set # CONFIG_PACKAGE_libmariadb is not set -@@ -3017,7 +3042,7 @@ CONFIG_PACKAGE_libjson-c=y +@@ -3007,7 +3141,7 @@ 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-ssl is not set +@@ -3017,20 +3151,20 @@ CONFIG_PACKAGE_libjson-c=y # CONFIG_PACKAGE_libmpg123 is not set # CONFIG_PACKAGE_libmraa is not set # CONFIG_PACKAGE_libnatpmp is not set @@ -183,7 +702,25 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_libndpi is not set # CONFIG_PACKAGE_libneon is not set # CONFIG_PACKAGE_libnet-1.2.x is not set -@@ -3046,23 +3071,59 @@ CONFIG_PACKAGE_libnl-tiny=y + # CONFIG_PACKAGE_libnetconf2 is not set + # CONFIG_PACKAGE_libnetfilter-acct is not set +-# CONFIG_PACKAGE_libnetfilter-conntrack is not set +-# CONFIG_PACKAGE_libnetfilter-cthelper is not set +-# CONFIG_PACKAGE_libnetfilter-cttimeout is not set ++CONFIG_PACKAGE_libnetfilter-conntrack=m ++CONFIG_PACKAGE_libnetfilter-cthelper=m ++CONFIG_PACKAGE_libnetfilter-cttimeout=m + # CONFIG_PACKAGE_libnetfilter-log is not set +-# 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_libnfnetlink 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 # CONFIG_PACKAGE_libopendkim is not set # CONFIG_PACKAGE_libopenldap is not set # CONFIG_PACKAGE_libopenobex is not set @@ -247,7 +784,7 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_libpkcs11-spy is not set # CONFIG_PACKAGE_libplist is not set # CONFIG_PACKAGE_libplistcxx is not set -@@ -3073,7 +3134,7 @@ CONFIG_PACKAGE_libpopt=m +@@ -3073,7 +3243,7 @@ CONFIG_PACKAGE_libpopt=m # CONFIG_PACKAGE_libpsl is not set # CONFIG_PACKAGE_libqrencode is not set # CONFIG_PACKAGE_libradcli is not set @@ -256,7 +793,7 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_libredblack is not set # CONFIG_PACKAGE_libroxml is not set # CONFIG_PACKAGE_librpc is not set -@@ -3106,7 +3167,7 @@ CONFIG_PACKAGE_libpopt=m +@@ -3106,7 +3276,7 @@ CONFIG_PACKAGE_libpopt=m # CONFIG_PACKAGE_libstoken is not set # CONFIG_PACKAGE_libstrophe is not set # CONFIG_PACKAGE_libtalloc is not set @@ -265,16 +802,18 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_libtheora is not set # CONFIG_PACKAGE_libtiff is not set # CONFIG_PACKAGE_libtiffxx is not set -@@ -3130,7 +3191,7 @@ CONFIG_PACKAGE_libuclient=y +@@ -3130,8 +3300,8 @@ CONFIG_PACKAGE_libuclient=y # CONFIG_PACKAGE_libupnp is not set # CONFIG_PACKAGE_libupnpp is not set # CONFIG_PACKAGE_liburcu is not set -# CONFIG_PACKAGE_libusb-1.0 is not set +-# CONFIG_PACKAGE_libusb-compat is not set +CONFIG_PACKAGE_libusb-1.0=m - # CONFIG_PACKAGE_libusb-compat is not set ++CONFIG_PACKAGE_libusb-compat=m # CONFIG_PACKAGE_libusbmuxd is not set # CONFIG_PACKAGE_libustream-mbedtls is not set -@@ -3150,7 +3211,7 @@ CONFIG_PACKAGE_libuclient=y + # CONFIG_PACKAGE_libustream-openssl is not set +@@ -3150,7 +3320,7 @@ CONFIG_PACKAGE_libuclient=y # CONFIG_PACKAGE_libwrap is not set # CONFIG_PACKAGE_libxerces-c is not set # CONFIG_PACKAGE_libxerces-c-samples is not set @@ -283,7 +822,7 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_libxslt is not set # CONFIG_PACKAGE_libyaml-cpp is not set # CONFIG_PACKAGE_libyang is not set -@@ -3165,7 +3226,7 @@ CONFIG_PACKAGE_libuclient=y +@@ -3165,7 +3335,7 @@ CONFIG_PACKAGE_libuclient=y # CONFIG_PACKAGE_mxml is not set # CONFIG_PACKAGE_nacl is not set # CONFIG_PACKAGE_opencv is not set @@ -292,7 +831,7 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_pixman is not set # CONFIG_PACKAGE_poco is not set # CONFIG_PACKAGE_protobuf is not set -@@ -3174,7 +3235,7 @@ CONFIG_PACKAGE_libuclient=y +@@ -3174,7 +3344,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 @@ -301,7 +840,7 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_tinycdb is not set # CONFIG_PACKAGE_uclibcxx is not set # CONFIG_PACKAGE_uw-imap is not set -@@ -3182,7 +3243,12 @@ CONFIG_PACKAGE_libuclient=y +@@ -3182,7 +3352,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 @@ -315,7 +854,7 @@ index d79707a..ea0b9b3 100644 # # LuCI -@@ -3476,7 +3542,10 @@ CONFIG_POSTFIX_PCRE=y +@@ -3476,7 +3651,10 @@ CONFIG_POSTFIX_PCRE=y # CONFIG_PACKAGE_curl is not set # CONFIG_PACKAGE_gnurl is not set # CONFIG_PACKAGE_lftp is not set @@ -327,7 +866,50 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_rsyncd is not set # CONFIG_PACKAGE_vsftpd is not set # CONFIG_PACKAGE_vsftpd-tls is not set -@@ -3754,7 +3823,18 @@ CONFIG_PACKAGE_iptables=y +@@ -3491,14 +3669,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 +-# CONFIG_PACKAGE_owserver is not set ++CONFIG_PACKAGE_owserver=m + # CONFIG_PACKAGE_sshfs is not set + + # + # Firewall + # + # CONFIG_PACKAGE_arptables is not set +-# CONFIG_PACKAGE_conntrack is not set ++CONFIG_PACKAGE_conntrack=m + # 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 + # CONFIG_PACKAGE_iptables-mod-ipopt is not set + # CONFIG_PACKAGE_iptables-mod-ipp2p is not set + # CONFIG_PACKAGE_iptables-mod-iprange is not set +-# CONFIG_PACKAGE_iptables-mod-ipsec is not set ++CONFIG_PACKAGE_iptables-mod-ipsec=m + # 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 + # 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 +-# CONFIG_PACKAGE_avahi-dbus-daemon is not set ++CONFIG_PACKAGE_avahi-dbus-daemon=m + # 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 + # CONFIG_PACKAGE_igmpproxy is not set + # CONFIG_PACKAGE_ip-bridge is not set + # CONFIG_PACKAGE_ip-full is not set +-# CONFIG_PACKAGE_ip-tiny is not set ++CONFIG_PACKAGE_ip-tiny=m + # CONFIG_PACKAGE_lldpd is not set + # CONFIG_PACKAGE_mcproxy is not set + # CONFIG_PACKAGE_mwan3 is not set # CONFIG_PACKAGE_nstat is not set # CONFIG_PACKAGE_olsrd is not set # CONFIG_PACKAGE_prince is not set @@ -347,7 +929,7 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_rdma is not set # CONFIG_PACKAGE_relayd is not set # CONFIG_PACKAGE_smcroute is not set -@@ -3768,11 +3848,11 @@ CONFIG_PACKAGE_iptables=y +@@ -3768,11 +3957,11 @@ CONFIG_PACKAGE_iptables=y # SSH # # CONFIG_PACKAGE_autossh is not set @@ -364,15 +946,16 @@ index d79707a..ea0b9b3 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,6 +3952,7 @@ CONFIG_PACKAGE_iptables=y +@@ -3872,109 +4061,130 @@ CONFIG_PACKAGE_iptables=y # # CONFIG_PACKAGE_chaosvpn is not set # CONFIG_PACKAGE_fastd is not set +-# CONFIG_PACKAGE_ipsec-tools is not set +CONFIG_PACKAGE_globalprotect=m - # CONFIG_PACKAGE_ipsec-tools is not set ++CONFIG_PACKAGE_ipsec-tools=m # CONFIG_PACKAGE_ocserv is not set # CONFIG_PACKAGE_openconnect is not set -@@ -3879,7 +3960,21 @@ CONFIG_PACKAGE_iptables=y + # CONFIG_PACKAGE_opennhrp is not set # CONFIG_PACKAGE_openvpn-easy-rsa is not set # CONFIG_PACKAGE_openvpn-mbedtls is not set # CONFIG_PACKAGE_openvpn-nossl is not set @@ -395,7 +978,158 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_pptpd is not set # CONFIG_PACKAGE_softethervpn is not set # CONFIG_PACKAGE_sstp-client is not set -@@ -3974,7 +4069,7 @@ CONFIG_PACKAGE_iptables=y +-# CONFIG_PACKAGE_strongswan is not set +-# CONFIG_PACKAGE_strongswan-charon is not set +-# CONFIG_PACKAGE_strongswan-charon-cmd is not set +-# CONFIG_PACKAGE_strongswan-default is not set +-# CONFIG_PACKAGE_strongswan-ipsec is not set +-# CONFIG_PACKAGE_strongswan-isakmp is not set +-# CONFIG_PACKAGE_strongswan-libtls is not set ++CONFIG_PACKAGE_strongswan=m ++ ++# ++# Configuration ++# ++CONFIG_STRONGSWAN_ROUTING_TABLE="220" ++CONFIG_STRONGSWAN_ROUTING_TABLE_PRIO="220" ++CONFIG_PACKAGE_strongswan-charon=m ++CONFIG_PACKAGE_strongswan-charon-cmd=m ++CONFIG_PACKAGE_strongswan-default=m ++CONFIG_PACKAGE_strongswan-ipsec=m ++CONFIG_PACKAGE_strongswan-isakmp=m ++CONFIG_PACKAGE_strongswan-libtls=m + # CONFIG_PACKAGE_strongswan-minimal is not set + # CONFIG_PACKAGE_strongswan-mod-addrblock is not set +-# CONFIG_PACKAGE_strongswan-mod-aes is not set +-# CONFIG_PACKAGE_strongswan-mod-af-alg is not set ++CONFIG_PACKAGE_strongswan-mod-aes=m ++CONFIG_PACKAGE_strongswan-mod-af-alg=m + # CONFIG_PACKAGE_strongswan-mod-agent is not set +-# CONFIG_PACKAGE_strongswan-mod-attr is not set ++CONFIG_PACKAGE_strongswan-mod-attr=m + # CONFIG_PACKAGE_strongswan-mod-attr-sql is not set +-# CONFIG_PACKAGE_strongswan-mod-blowfish is not set +-# CONFIG_PACKAGE_strongswan-mod-ccm is not set +-# CONFIG_PACKAGE_strongswan-mod-cmac is not set +-# CONFIG_PACKAGE_strongswan-mod-connmark is not set +-# CONFIG_PACKAGE_strongswan-mod-constraints is not set ++CONFIG_PACKAGE_strongswan-mod-blowfish=m ++CONFIG_PACKAGE_strongswan-mod-ccm=m ++CONFIG_PACKAGE_strongswan-mod-cmac=m ++CONFIG_PACKAGE_strongswan-mod-connmark=m ++CONFIG_PACKAGE_strongswan-mod-constraints=m + # CONFIG_PACKAGE_strongswan-mod-coupling is not set + # CONFIG_PACKAGE_strongswan-mod-ctr is not set + # CONFIG_PACKAGE_strongswan-mod-curl is not set + # CONFIG_PACKAGE_strongswan-mod-curve25519 is not set +-# CONFIG_PACKAGE_strongswan-mod-des is not set ++CONFIG_PACKAGE_strongswan-mod-des=m + # CONFIG_PACKAGE_strongswan-mod-dhcp is not set +-# CONFIG_PACKAGE_strongswan-mod-dnskey is not set ++CONFIG_PACKAGE_strongswan-mod-dnskey=m + # CONFIG_PACKAGE_strongswan-mod-duplicheck is not set +-# CONFIG_PACKAGE_strongswan-mod-eap-identity is not set +-# CONFIG_PACKAGE_strongswan-mod-eap-md5 is not set +-# CONFIG_PACKAGE_strongswan-mod-eap-mschapv2 is not set ++CONFIG_PACKAGE_strongswan-mod-eap-identity=m ++CONFIG_PACKAGE_strongswan-mod-eap-md5=m ++CONFIG_PACKAGE_strongswan-mod-eap-mschapv2=m + # CONFIG_PACKAGE_strongswan-mod-eap-radius is not set +-# CONFIG_PACKAGE_strongswan-mod-eap-tls is not set ++CONFIG_PACKAGE_strongswan-mod-eap-tls=m + # CONFIG_PACKAGE_strongswan-mod-farp is not set +-# CONFIG_PACKAGE_strongswan-mod-fips-prf is not set ++CONFIG_PACKAGE_strongswan-mod-fips-prf=m + # CONFIG_PACKAGE_strongswan-mod-forecast is not set + # CONFIG_PACKAGE_strongswan-mod-gcm is not set + # CONFIG_PACKAGE_strongswan-mod-gcrypt is not set +-# CONFIG_PACKAGE_strongswan-mod-gmp is not set +-# CONFIG_PACKAGE_strongswan-mod-gmpdh is not set ++CONFIG_PACKAGE_strongswan-mod-gmp=m ++CONFIG_PACKAGE_strongswan-mod-gmpdh=m + # CONFIG_PACKAGE_strongswan-mod-ha is not set +-# CONFIG_PACKAGE_strongswan-mod-hmac is not set +-# CONFIG_PACKAGE_strongswan-mod-kernel-libipsec is not set +-# CONFIG_PACKAGE_strongswan-mod-kernel-netlink is not set ++CONFIG_PACKAGE_strongswan-mod-hmac=m ++CONFIG_PACKAGE_strongswan-mod-kernel-libipsec=m ++CONFIG_PACKAGE_strongswan-mod-kernel-netlink=m + # CONFIG_PACKAGE_strongswan-mod-ldap is not set + # CONFIG_PACKAGE_strongswan-mod-led is not set + # CONFIG_PACKAGE_strongswan-mod-load-tester is not set +-# CONFIG_PACKAGE_strongswan-mod-md4 is not set +-# CONFIG_PACKAGE_strongswan-mod-md5 is not set ++CONFIG_PACKAGE_strongswan-mod-md4=m ++CONFIG_PACKAGE_strongswan-mod-md5=m + # CONFIG_PACKAGE_strongswan-mod-mysql is not set +-# CONFIG_PACKAGE_strongswan-mod-nonce is not set +-# CONFIG_PACKAGE_strongswan-mod-openssl is not set +-# CONFIG_PACKAGE_strongswan-mod-pem is not set +-# CONFIG_PACKAGE_strongswan-mod-pgp is not set +-# CONFIG_PACKAGE_strongswan-mod-pkcs1 is not set +-# CONFIG_PACKAGE_strongswan-mod-pkcs11 is not set +-# CONFIG_PACKAGE_strongswan-mod-pkcs12 is not set +-# CONFIG_PACKAGE_strongswan-mod-pkcs7 is not set +-# CONFIG_PACKAGE_strongswan-mod-pkcs8 is not set +-# CONFIG_PACKAGE_strongswan-mod-pubkey is not set +-# CONFIG_PACKAGE_strongswan-mod-random is not set +-# CONFIG_PACKAGE_strongswan-mod-rc2 is not set +-# CONFIG_PACKAGE_strongswan-mod-resolve is not set +-# CONFIG_PACKAGE_strongswan-mod-revocation is not set +-# CONFIG_PACKAGE_strongswan-mod-sha1 is not set +-# CONFIG_PACKAGE_strongswan-mod-sha2 is not set +-# CONFIG_PACKAGE_strongswan-mod-smp is not set +-# CONFIG_PACKAGE_strongswan-mod-socket-default is not set +-# CONFIG_PACKAGE_strongswan-mod-socket-dynamic is not set ++CONFIG_PACKAGE_strongswan-mod-nonce=m ++CONFIG_PACKAGE_strongswan-mod-openssl=m ++CONFIG_PACKAGE_strongswan-mod-pem=m ++CONFIG_PACKAGE_strongswan-mod-pgp=m ++CONFIG_PACKAGE_strongswan-mod-pkcs1=m ++CONFIG_PACKAGE_strongswan-mod-pkcs11=m ++CONFIG_PACKAGE_strongswan-mod-pkcs12=m ++CONFIG_PACKAGE_strongswan-mod-pkcs7=m ++CONFIG_PACKAGE_strongswan-mod-pkcs8=m ++CONFIG_PACKAGE_strongswan-mod-pubkey=m ++CONFIG_PACKAGE_strongswan-mod-random=m ++CONFIG_PACKAGE_strongswan-mod-rc2=m ++CONFIG_PACKAGE_strongswan-mod-resolve=m ++CONFIG_PACKAGE_strongswan-mod-revocation=m ++CONFIG_PACKAGE_strongswan-mod-sha1=m ++CONFIG_PACKAGE_strongswan-mod-sha2=m ++CONFIG_PACKAGE_strongswan-mod-smp=m ++CONFIG_PACKAGE_strongswan-mod-socket-default=m ++CONFIG_PACKAGE_strongswan-mod-socket-dynamic=m + # CONFIG_PACKAGE_strongswan-mod-sql is not set + # CONFIG_PACKAGE_strongswan-mod-sqlite is not set +-# CONFIG_PACKAGE_strongswan-mod-sshkey is not set +-# CONFIG_PACKAGE_strongswan-mod-stroke is not set ++CONFIG_PACKAGE_strongswan-mod-sshkey=m ++CONFIG_PACKAGE_strongswan-mod-stroke=m + # CONFIG_PACKAGE_strongswan-mod-test-vectors is not set +-# CONFIG_PACKAGE_strongswan-mod-uci is not set ++CONFIG_PACKAGE_strongswan-mod-uci=m + # CONFIG_PACKAGE_strongswan-mod-unity is not set +-# CONFIG_PACKAGE_strongswan-mod-updown is not set +-# CONFIG_PACKAGE_strongswan-mod-vici is not set ++CONFIG_PACKAGE_strongswan-mod-updown=m ++CONFIG_PACKAGE_strongswan-mod-vici=m + # CONFIG_PACKAGE_strongswan-mod-whitelist is not set +-# CONFIG_PACKAGE_strongswan-mod-x509 is not set ++CONFIG_PACKAGE_strongswan-mod-x509=m + # CONFIG_PACKAGE_strongswan-mod-xauth-eap is not set +-# CONFIG_PACKAGE_strongswan-mod-xauth-generic is not set +-# CONFIG_PACKAGE_strongswan-mod-xcbc is not set +-# CONFIG_PACKAGE_strongswan-pki is not set ++CONFIG_PACKAGE_strongswan-mod-xauth-generic=m ++CONFIG_PACKAGE_strongswan-mod-xcbc=m ++CONFIG_PACKAGE_strongswan-pki=m + # CONFIG_PACKAGE_strongswan-scepclient is not set +-# CONFIG_PACKAGE_strongswan-swanctl is not set ++CONFIG_PACKAGE_strongswan-swanctl=m + # CONFIG_PACKAGE_tinc is not set + # CONFIG_PACKAGE_uanytun is not set + # CONFIG_PACKAGE_uanytun-nettle is not set # CONFIG_PACKAGE_uanytun-nocrypt is not set # CONFIG_PACKAGE_uanytun-sslcrypt is not set # CONFIG_PACKAGE_vpnc is not set @@ -404,7 +1138,16 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_wireguard is not set # CONFIG_PACKAGE_wireguard-tools is not set # CONFIG_PACKAGE_xl2tpd is not set -@@ -4258,7 +4353,7 @@ CONFIG_PACKAGE_ppp-mod-pppoe=y +@@ -3993,7 +4203,7 @@ CONFIG_PACKAGE_iptables=y + # + # WWAN + # +-# CONFIG_PACKAGE_adb-enablemodem is not set ++CONFIG_PACKAGE_adb-enablemodem=m + # 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 # CONFIG_PACKAGE_soloscli is not set # CONFIG_PACKAGE_stunnel is not set # CONFIG_PACKAGE_tayga is not set @@ -413,7 +1156,7 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_tcpdump-mini is not set # CONFIG_PACKAGE_tor is not set # CONFIG_PACKAGE_tor-gencert is not set -@@ -4395,7 +4490,7 @@ CONFIG_PACKAGE_wpad-mini=y +@@ -4395,7 +4605,7 @@ CONFIG_PACKAGE_wpad-mini=y # CONFIG_PACKAGE_joe is not set # CONFIG_PACKAGE_nano is not set # CONFIG_PACKAGE_vim is not set @@ -422,11 +1165,55 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_vim-fuller is not set # CONFIG_PACKAGE_vim-help is not set # CONFIG_PACKAGE_vim-runtime is not set -@@ -4673,14 +4768,30 @@ CONFIG_PACKAGE_libjson-script=y +@@ -4466,7 +4676,7 @@ CONFIG_PACKAGE_wpad-mini=y + # + # CONFIG_PACKAGE_avrdude is not set + # CONFIG_PACKAGE_dfu-programmer is not set +-# CONFIG_PACKAGE_stm32flash is not set ++CONFIG_PACKAGE_stm32flash=m + + # + # RTKLIB Suite +@@ -4500,7 +4710,7 @@ CONFIG_PACKAGE_wpad-mini=y + # + # CONFIG_PACKAGE_agetty is not set + # CONFIG_PACKAGE_dvtm is not set +-# CONFIG_PACKAGE_minicom is not set ++CONFIG_PACKAGE_minicom=m + # 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 + # CONFIG_PACKAGE_sqlite3-cli is not set + # CONFIG_PACKAGE_unixodbc-tools is not set + # CONFIG_PACKAGE_acpid is not set +-# CONFIG_PACKAGE_adb is not set ++CONFIG_PACKAGE_adb=m + # 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 + # CONFIG_PACKAGE_crconf is not set + # CONFIG_PACKAGE_crelay is not set + # CONFIG_PACKAGE_ct-bugcheck is not set +-# CONFIG_PACKAGE_dbus is not set ++CONFIG_PACKAGE_dbus=m + # CONFIG_PACKAGE_dbus-utils is not set + # CONFIG_PACKAGE_device-observatory is not set + # CONFIG_PACKAGE_dfu-util is not set +-# CONFIG_PACKAGE_digitemp is not set +-# CONFIG_PACKAGE_digitemp-usb is not set ++CONFIG_PACKAGE_digitemp=m ++CONFIG_PACKAGE_digitemp-usb=m + # CONFIG_PACKAGE_dmesg 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_openobex is not set # CONFIG_PACKAGE_openobex-apps 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_opensc-utils=m +CONFIG_PACKAGE_opensc-utils-cardos-tool=m +# CONFIG_PACKAGE_opensc-utils-cryptoflex-tool is not set @@ -444,7 +1231,7 @@ index d79707a..ea0b9b3 100644 +CONFIG_PACKAGE_opensc-utils-pkcs15-tool=m +CONFIG_PACKAGE_opensc-utils-sc-hsm-tool=m +# CONFIG_PACKAGE_opensc-utils-westcos-tool is not set - # CONFIG_PACKAGE_openssl-util is not set ++CONFIG_PACKAGE_openssl-util=m # CONFIG_PACKAGE_openzwave is not set # CONFIG_PACKAGE_openzwave-config is not set # CONFIG_PACKAGE_owipcalc is not set @@ -455,7 +1242,7 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_pps-tools is not set # CONFIG_PACKAGE_prlimit is not set # CONFIG_PACKAGE_procps-ng is not set -@@ -4707,7 +4818,7 @@ CONFIG_PACKAGE_libjson-script=y +@@ -4707,10 +4933,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 @@ -464,3 +1251,16 @@ index d79707a..ea0b9b3 100644 # CONFIG_PACKAGE_strace_libunwind is not set # CONFIG_PACKAGE_stress is not set # CONFIG_PACKAGE_sumo is not set ++CONFIG_PACKAGE_sympathy=m + # 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 + # CONFIG_PACKAGE_usb-modeswitch is not set + # CONFIG_PACKAGE_usbmuxd is not set + # CONFIG_PACKAGE_usbreset is not set +-# CONFIG_PACKAGE_usbutils is not set ++CONFIG_PACKAGE_usbutils=m + # CONFIG_PACKAGE_uuidd is not set + # CONFIG_PACKAGE_uuidgen is not set + # CONFIG_PACKAGE_uvcdynctrl is not set diff --git a/master/pcsc-lite-network-sockets b/master/pcsc-lite-network-sockets new file mode 100644 index 0000000..e723913 --- /dev/null +++ b/master/pcsc-lite-network-sockets @@ -0,0 +1,304 @@ +diff --git a/feeds/packages/utils/pcsc-lite/patches/support-network-sockets.patch b/feeds/packages/utils/pcsc-lite/patches/support-network-sockets.patch +new file mode 100644 +index 0000000..d4fff6f +--- /dev/null ++++ b/feeds/packages/utils/pcsc-lite/patches/support-network-sockets.patch +@@ -0,0 +1,298 @@ ++diff --git a/src/winscard_clnt.c b/src/winscard_clnt.c ++index 7cd85ff..8ec452a 100644 ++--- a/src/winscard_clnt.c +++++ b/src/winscard_clnt.c ++@@ -3513,6 +3513,7 @@ static LONG SCardGetContextAndChannelFromHandleTH(SCARDHANDLE hCard, ++ */ ++ LONG SCardCheckDaemonAvailability(void) ++ { +++#if 0 ++ LONG rv; ++ struct stat statBuffer; ++ char *socketName; ++@@ -3526,6 +3527,7 @@ LONG SCardCheckDaemonAvailability(void) ++ socketName, strerror(errno)); ++ return SCARD_E_NO_SERVICE; ++ } +++#endif ++ ++ return SCARD_S_SUCCESS; ++ } ++diff --git a/src/winscard_msg.c b/src/winscard_msg.c ++index bd165d0..844c310 100644 ++--- a/src/winscard_msg.c +++++ b/src/winscard_msg.c ++@@ -49,6 +49,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ #include <sys/socket.h> ++ #include <sys/time.h> ++ #include <sys/un.h> +++#include <netinet/in.h> +++#include <arpa/inet.h> ++ #include <sys/ioctl.h> ++ #include <errno.h> ++ #include <stdio.h> ++@@ -81,6 +83,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++ #define member_size(type, member) sizeof(((type *)0)->member) ++ +++#if 0 ++ char *getSocketName(void) ++ { ++ static char socketName[member_size(struct sockaddr_un, sun_path)]; ++@@ -102,6 +105,7 @@ char *getSocketName(void) ++ ++ return socketName; ++ } +++#endif ++ ++ /** ++ * @brief Prepares a communication channel for the client to talk to the server. ++@@ -118,28 +122,86 @@ char *getSocketName(void) ++ */ ++ INTERNAL int ClientSetupSession(uint32_t *pdwClientID) ++ { ++- struct sockaddr_un svc_addr; ++ int ret; ++- char *socketName; ++ ++- ret = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); ++- if (ret < 0) +++ union ++ { ++- Log2(PCSC_LOG_CRITICAL, "Error: create on client socket: %s", ++- strerror(errno)); +++ struct sockaddr sa; +++ struct sockaddr_un un; +++ struct sockaddr_in in; +++ } sa; +++ +++ const char *socket_name = getenv("PCSCLITE_CSOCK_NAME"); +++ size_t sa_len = 0; +++ +++ if (!socket_name) +++ socket_name = PCSCLITE_CSOCK_NAME; +++ +++ if (socket_name[0] == '/') { +++ /* +++ * Create the common shared connection socket +++ */ +++ if ((*pdwClientID = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)) < 0) +++ { +++ Log2(PCSC_LOG_CRITICAL, "Unable to create socket: %s", +++ strerror(errno)); +++ return -1; +++ } +++ +++ memset(&sa, 0, sizeof sa); +++ sa.un.sun_family = AF_UNIX; +++ strncpy(sa.un.sun_path, socket_name, sizeof sa.un.sun_path); +++ +++ sa_len = sizeof(sa.un); +++ } else if (!strncmp(socket_name, "tcp:", 4)) { +++ char address[128]; +++ char *port; +++ struct sockaddr_in local; +++ +++ +++ if ((*pdwClientID = socket(PF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0)) < 0) +++ { +++ Log2(PCSC_LOG_CRITICAL, "Unable to create socket: %s", +++ strerror(errno)); +++ return -1; +++ } +++ +++ strncpy(address, socket_name + 4, sizeof(address)); +++ address[sizeof(address) - 1] = 0; +++ +++ port = rindex(address, ':'); +++ if (port) +++ *(port++) = 0; +++ else +++ port = "3213"; +++ +++ +++ memset(&local, 0, sizeof(local)); +++ local.sin_family = AF_INET; +++ local.sin_port = 0; +++ local.sin_addr.s_addr = INADDR_ANY; +++ +++ if (bind(*pdwClientID, (struct sockaddr *) &local, sizeof(local))) { +++ Log2(PCSC_LOG_CRITICAL, "Unable to bind socket: %s", +++ strerror(errno)); +++ return -1; +++ } +++ +++ memset(&sa, 0, sizeof sa); +++ sa.in.sin_family = AF_INET; +++ sa.in.sin_port = htons(atoi(port)); +++ inet_aton(address, &sa.in.sin_addr); +++ +++ sa_len = sizeof(sa.in); +++ } else { +++ Log2(PCSC_LOG_CRITICAL, "unknown socket type: %s", socket_name); ++ return -1; ++ } ++- *pdwClientID = ret; ++- ++- socketName = getSocketName(); ++- svc_addr.sun_family = AF_UNIX; ++- strncpy(svc_addr.sun_path, socketName, sizeof(svc_addr.sun_path)); ++ ++- if (connect(*pdwClientID, (struct sockaddr *) &svc_addr, ++- sizeof(svc_addr.sun_family) + strlen(svc_addr.sun_path) + 1) < 0) +++ if (connect(*pdwClientID, &sa.sa, sa_len) < 0) ++ { ++- Log3(PCSC_LOG_CRITICAL, "Error: connect to client socket %s: %s", ++- socketName, strerror(errno)); +++ Log3(PCSC_LOG_CRITICAL, "Error: connect %s: %s", +++ socket_name, strerror(errno)); ++ (void)close(*pdwClientID); ++ return -1; ++ } ++@@ -148,7 +211,7 @@ INTERNAL int ClientSetupSession(uint32_t *pdwClientID) ++ if (ret < 0) ++ { ++ Log3(PCSC_LOG_CRITICAL, "Error: cannot retrieve socket %s flags: %s", ++- socketName, strerror(errno)); +++ socket_name, strerror(errno)); ++ (void)close(*pdwClientID); ++ return -1; ++ } ++@@ -156,7 +219,7 @@ INTERNAL int ClientSetupSession(uint32_t *pdwClientID) ++ if (fcntl(*pdwClientID, F_SETFL, ret | O_NONBLOCK) < 0) ++ { ++ Log3(PCSC_LOG_CRITICAL, "Error: cannot set socket %s nonblocking: %s", ++- socketName, strerror(errno)); +++ socket_name, strerror(errno)); ++ (void)close(*pdwClientID); ++ return -1; ++ } ++diff --git a/src/winscard_msg.h b/src/winscard_msg.h ++index ad06042..3abfd9c 100644 ++--- a/src/winscard_msg.h +++++ b/src/winscard_msg.h ++@@ -276,7 +276,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ int32_t ListenExistingSocket(int fd); ++ int32_t ProcessEventsServer(/*@out@*/ uint32_t *); ++ #else ++- char *getSocketName(void); +++// char *getSocketName(void); ++ int32_t ClientSetupSession(uint32_t *); ++ void ClientCloseSession(uint32_t); ++ LONG MessageReceiveTimeout(uint32_t command, /*@out@*/ void *buffer, ++diff --git a/src/winscard_msg_srv.c b/src/winscard_msg_srv.c ++index 7287279..5a5383f 100644 ++--- a/src/winscard_msg_srv.c +++++ b/src/winscard_msg_srv.c ++@@ -49,9 +49,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ #include <sys/socket.h> ++ #include <sys/time.h> ++ #include <sys/un.h> +++#include <netinet/in.h> +++#include <arpa/inet.h> ++ #include <sys/ioctl.h> ++ #include <errno.h> ++ #include <stdio.h> +++#include <stdlib.h> ++ #include <time.h> ++ #include <string.h> ++ #ifdef HAVE_SYS_FILIO_H ++@@ -125,24 +128,76 @@ INTERNAL int32_t InitializeSocket(void) ++ { ++ struct sockaddr sa; ++ struct sockaddr_un un; +++ struct sockaddr_in in; ++ } sa; ++ ++- /* ++- * Create the common shared connection socket ++- */ ++- if ((commonSocket = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) ++- { ++- Log2(PCSC_LOG_CRITICAL, "Unable to create common socket: %s", ++- strerror(errno)); +++ const char *socket_name = getenv("PCSCLITE_CSOCK_NAME"); +++ size_t sa_len = 0; +++ +++ if (!socket_name) +++ socket_name = PCSCLITE_CSOCK_NAME; +++ +++ if (socket_name[0] == '/') { +++ /* +++ * Create the common shared connection socket +++ */ +++ if ((commonSocket = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) +++ { +++ Log2(PCSC_LOG_CRITICAL, "Unable to create common socket: %s", +++ strerror(errno)); +++ return -1; +++ } +++ +++ memset(&sa, 0, sizeof sa); +++ sa.un.sun_family = AF_UNIX; +++ strncpy(sa.un.sun_path, socket_name, sizeof sa.un.sun_path); +++ (void)remove(socket_name); +++ +++ sa_len = sizeof(sa.un); +++ } else if (!strncmp(socket_name, "tcp:", 4)) { +++ char address[128]; +++ char *port; +++ int one = 1; +++ +++ if ((commonSocket = socket(PF_INET, SOCK_STREAM, 0)) < 0) +++ { +++ Log2(PCSC_LOG_CRITICAL, "Unable to create common socket: %s", +++ strerror(errno)); +++ return -1; +++ } +++ +++ if (setsockopt(commonSocket, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0) { +++ Log2(PCSC_LOG_CRITICAL, "setsockopt(SO_REUSEADDR): %s", +++ strerror(errno)); +++ return -1; +++ } +++ +++ strncpy(address, socket_name + 4, sizeof(address)); +++ address[sizeof(address) - 1] = 0; +++ +++ port = rindex(address, ':'); +++ if (port) +++ *(port++) = 0; +++ else +++ port = "3213"; +++ +++ +++ fprintf(stderr,"port = %s\n",port); +++ +++ +++ memset(&sa, 0, sizeof sa); +++ sa.in.sin_family = AF_INET; +++ sa.in.sin_port = htons(atoi(port)); +++ inet_aton(address, &sa.in.sin_addr); +++ +++ sa_len = sizeof(sa.in); +++ } else { +++ Log2(PCSC_LOG_CRITICAL, "unknown socket type: %s", socket_name); ++ return -1; ++ } ++ ++- memset(&sa, 0, sizeof sa); ++- sa.un.sun_family = AF_UNIX; ++- strncpy(sa.un.sun_path, PCSCLITE_CSOCK_NAME, sizeof sa.un.sun_path); ++- (void)remove(PCSCLITE_CSOCK_NAME); ++ ++- if (bind(commonSocket, &sa.sa, sizeof sa) < 0) +++ if (bind(commonSocket, &sa.sa, sa_len) < 0) ++ { ++ Log2(PCSC_LOG_CRITICAL, "Unable to bind common socket: %s", ++ strerror(errno)); ++@@ -159,7 +214,8 @@ INTERNAL int32_t InitializeSocket(void) ++ /* ++ * Chmod the public entry channel ++ */ ++- (void)chmod(PCSCLITE_CSOCK_NAME, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); +++ if (socket_name[0] == '/') +++ (void)chmod(socket_name, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); ++ ++ return 0; ++ } diff --git a/master/series b/master/series index 38f354d..d7ccec7 100644 --- a/master/series +++ b/master/series @@ -3,8 +3,10 @@ feeds-install config defconfig fix-gpios +sympathy jffs2 globalprotect openssh +pcsc-lite-network-sockets my-config endstop diff --git a/master/status b/master/status index e69de29..d7ccec7 100644 --- a/master/status +++ b/master/status @@ -0,0 +1,12 @@ +feeds +feeds-install +config +defconfig +fix-gpios +sympathy +jffs2 +globalprotect +openssh +pcsc-lite-network-sockets +my-config +endstop diff --git a/master/sympathy b/master/sympathy new file mode 100644 index 0000000..a6dfcab --- /dev/null +++ b/master/sympathy @@ -0,0 +1,67 @@ +diff --git a/package/jmm/sympathy/Makefile b/package/jmm/sympathy/Makefile +new file mode 100644 +index 0000000..fb5afb9 +--- /dev/null ++++ b/package/jmm/sympathy/Makefile +@@ -0,0 +1,61 @@ ++# ++# 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:=sympathy ++PKG_VERSION:=2018-04-02 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) ++ ++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) ++PKG_SOURCE_URL:=git://git.panaceas.org/tools/sympathy ++PKG_SOURCE_PROTO:=git ++PKG_SOURCE_VERSION:=master ++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.bz2 ++ ++PKG_FIXUP:=autoreconf ++ ++PKG_MAINTAINER:=James McKenzie <meh@meh.meh> ++PKG_LICENSE:=GPL-2.0+ ++ ++ ++TARGET_CPPFLAGS:= -I$(LINUX_DIR)/user_headers/include -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include ++ ++#CONFIGURE_VARS+= \ ++# CFLAGS="$(TARGET_CFLAGS)" ++ ++include $(INCLUDE_DIR)/package.mk ++ ++define Package/sympathy ++ SECTION:=utils ++ CATEGORY:=Utilities ++ TITLE:=sympathy ++endef ++ ++ ++define Build/Compile ++ $(call Build/Compile/Default) ++ make -C $(PKG_BUILD_DIR) \ ++ DESTDIR="$(PKG_INSTALL_DIR)" \ ++ install ++endef ++ ++ ++#TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include ++ ++define Package/sympathy/install ++ $(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/ ++endef ++ ++# $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d ++# $(INSTALL_BIN) ./files/sympathy.init $(1)/etc/init.d/sympathy ++ ++$(eval $(call BuildPackage,sympathy)) |