summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames <31272717+gpd-pocket-hacker@users.noreply.github.com>2019-03-14 16:50:57 +0000
committerJames <31272717+gpd-pocket-hacker@users.noreply.github.com>2019-03-14 16:50:57 +0000
commit64827945d80912e8d73b1e97c3d3cf9bc0e0a060 (patch)
treee50e2c5199c23523bd6cc0b54faa5f6a323515a2
parent2529bb240d5d1d02250d810d87b8892f74ab7d44 (diff)
downloadmaster-d20f4fc-pq-64827945d80912e8d73b1e97c3d3cf9bc0e0a060.zip
master-d20f4fc-pq-64827945d80912e8d73b1e97c3d3cf9bc0e0a060.tar.gz
master-d20f4fc-pq-64827945d80912e8d73b1e97c3d3cf9bc0e0a060.tar.bz2
tidy up pq
-rw-r--r--master/endstop24
-rw-r--r--master/globalprotect20
-rw-r--r--master/my-config54
-rw-r--r--master/status10
4 files changed, 73 insertions, 35 deletions
diff --git a/master/endstop b/master/endstop
index 7424e07..e69de29 100644
--- a/master/endstop
+++ b/master/endstop
@@ -1,24 +0,0 @@
-diff --git a/.config b/.config
-index fcabd04..f152aa1 100644
---- a/.config
-+++ b/.config
-@@ -364,8 +364,8 @@ CONFIG_VERSION_BUG_URL=""
- CONFIG_VERSION_SUPPORT_URL=""
- CONFIG_VERSION_PRODUCT=""
- CONFIG_VERSION_HWREV=""
--CONFIG_VERSION_FILENAMES=y
--CONFIG_VERSION_CODE_FILENAMES=y
-+# CONFIG_VERSION_FILENAMES is not set
-+# CONFIG_VERSION_CODE_FILENAMES is not set
- # CONFIG_PER_FEED_REPO is not set
-
- #
-@@ -4815,7 +4815,7 @@ CONFIG_PACKAGE_pcscd=m
- # CONFIG_PACKAGE_sockread is not set
- # CONFIG_PACKAGE_spi-tools is not set
- # CONFIG_PACKAGE_spidev-test is not set
--# CONFIG_PACKAGE_strace is not set
-+CONFIG_PACKAGE_strace=m
- # CONFIG_PACKAGE_strace_libunwind is not set
- # CONFIG_PACKAGE_stress is not set
- # CONFIG_PACKAGE_sumo is not set
diff --git a/master/globalprotect b/master/globalprotect
index c0fb27f..c1def9a 100644
--- a/master/globalprotect
+++ b/master/globalprotect
@@ -1149,3 +1149,23 @@ index 0000000..93ef78d
+
+ <INCLUDE file="inc/footer.tmpl" />
+ </PAGE>
+diff --git a/package/network/utils/globalprotect/patches/0003-make-default-pkcs11-opensc.patch b/package/network/utils/globalprotect/patches/0003-make-default-pkcs11-opensc.patch
+new file mode 100644
+index 0000000..52c0bdf
+--- /dev/null
++++ b/package/network/utils/globalprotect/patches/0003-make-default-pkcs11-opensc.patch
+@@ -0,0 +1,14 @@
++Index: globalprotect-2018-11-19/configure.ac
++===================================================================
++--- globalprotect-2018-11-19/configure.ac 2019-01-05 12:47:22.490825396 +0000
+++++ globalprotect-2018-11-19/configure.ac 2019-01-05 18:48:14.110431665 +0000
++@@ -325,7 +325,8 @@
++ [PKG_CHECK_MODULES(LIBP11, libp11,
++ [AC_DEFINE(HAVE_LIBP11, 1, [Have libp11 and p11-kit for OpenSSL])
++ AC_SUBST(P11KIT_PC, ["libp11 p11-kit-1"])
++- proxy_module="`$PKG_CONFIG --variable=proxy_module p11-kit-1`"
+++ #proxy_module="`$PKG_CONFIG --variable=proxy_module p11-kit-1`"
+++ proxy_module="/usr/lib/pkcs11/opensc-pkcs11.so"
++ pkcs11_support="libp11"
++ AC_DEFINE_UNQUOTED([DEFAULT_PKCS11_MODULE], "${proxy_module}", [p11-kit proxy])],
++ [:])], [:])
diff --git a/master/my-config b/master/my-config
index 116b14c..8dc17dc 100644
--- a/master/my-config
+++ b/master/my-config
@@ -1,5 +1,5 @@
diff --git a/.config b/.config
-index d79707a..fcabd04 100644
+index d79707a..ea0b9b3 100644
--- a/.config
+++ b/.config
@@ -134,6 +134,7 @@ CONFIG_PCI_SUPPORT=y
@@ -67,8 +67,8 @@ index d79707a..fcabd04 100644
+CONFIG_VERSION_SUPPORT_URL=""
+CONFIG_VERSION_PRODUCT=""
+CONFIG_VERSION_HWREV=""
-+CONFIG_VERSION_FILENAMES=y
-+CONFIG_VERSION_CODE_FILENAMES=y
++# CONFIG_VERSION_FILENAMES is not set
++# CONFIG_VERSION_CODE_FILENAMES is not set
+# CONFIG_PER_FEED_REPO is not set
#
@@ -125,6 +125,17 @@ index d79707a..fcabd04 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
+ #
+ # Filesystem
+ #
+-# CONFIG_PACKAGE_libacl is not set
+-# CONFIG_PACKAGE_libattr is not set
++CONFIG_PACKAGE_libacl=m
++CONFIG_PACKAGE_libattr=m
+ # CONFIG_PACKAGE_libfuse is not set
+ # CONFIG_PACKAGE_libow is not set
+ # CONFIG_PACKAGE_libow-capi is not set
@@ -2800,7 +2814,18 @@ CONFIG_PACKAGE_libxtables=y
#
# CONFIG_PACKAGE_libgnutls is not set
@@ -304,7 +315,19 @@ index d79707a..fcabd04 100644
#
# LuCI
-@@ -3754,7 +3820,18 @@ CONFIG_PACKAGE_iptables=y
+@@ -3476,7 +3542,10 @@ CONFIG_POSTFIX_PCRE=y
+ # CONFIG_PACKAGE_curl is not set
+ # CONFIG_PACKAGE_gnurl is not set
+ # CONFIG_PACKAGE_lftp is not set
+-# CONFIG_PACKAGE_rsync is not set
++CONFIG_PACKAGE_rsync=m
++# CONFIG_RSYNC_xattr is not set
++# CONFIG_RSYNC_acl is not set
++# CONFIG_RSYNC_zlib is not set
+ # 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
# CONFIG_PACKAGE_nstat is not set
# CONFIG_PACKAGE_olsrd is not set
# CONFIG_PACKAGE_prince is not set
@@ -324,7 +347,7 @@ index d79707a..fcabd04 100644
# CONFIG_PACKAGE_rdma is not set
# CONFIG_PACKAGE_relayd is not set
# CONFIG_PACKAGE_smcroute is not set
-@@ -3768,11 +3845,11 @@ CONFIG_PACKAGE_iptables=y
+@@ -3768,11 +3848,11 @@ CONFIG_PACKAGE_iptables=y
# SSH
#
# CONFIG_PACKAGE_autossh is not set
@@ -341,7 +364,7 @@ index d79707a..fcabd04 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 +3949,7 @@ CONFIG_PACKAGE_iptables=y
+@@ -3872,6 +3952,7 @@ CONFIG_PACKAGE_iptables=y
#
# CONFIG_PACKAGE_chaosvpn is not set
# CONFIG_PACKAGE_fastd is not set
@@ -349,7 +372,7 @@ index d79707a..fcabd04 100644
# CONFIG_PACKAGE_ipsec-tools is not set
# CONFIG_PACKAGE_ocserv is not set
# CONFIG_PACKAGE_openconnect is not set
-@@ -3879,7 +3957,21 @@ CONFIG_PACKAGE_iptables=y
+@@ -3879,7 +3960,21 @@ CONFIG_PACKAGE_iptables=y
# CONFIG_PACKAGE_openvpn-easy-rsa is not set
# CONFIG_PACKAGE_openvpn-mbedtls is not set
# CONFIG_PACKAGE_openvpn-nossl is not set
@@ -372,7 +395,7 @@ index d79707a..fcabd04 100644
# CONFIG_PACKAGE_pptpd is not set
# CONFIG_PACKAGE_softethervpn is not set
# CONFIG_PACKAGE_sstp-client is not set
-@@ -3974,7 +4066,7 @@ CONFIG_PACKAGE_iptables=y
+@@ -3974,7 +4069,7 @@ CONFIG_PACKAGE_iptables=y
# CONFIG_PACKAGE_uanytun-nocrypt is not set
# CONFIG_PACKAGE_uanytun-sslcrypt is not set
# CONFIG_PACKAGE_vpnc is not set
@@ -381,7 +404,7 @@ index d79707a..fcabd04 100644
# CONFIG_PACKAGE_wireguard is not set
# CONFIG_PACKAGE_wireguard-tools is not set
# CONFIG_PACKAGE_xl2tpd is not set
-@@ -4258,7 +4350,7 @@ CONFIG_PACKAGE_ppp-mod-pppoe=y
+@@ -4258,7 +4353,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
@@ -390,7 +413,7 @@ index d79707a..fcabd04 100644
# CONFIG_PACKAGE_tcpdump-mini is not set
# CONFIG_PACKAGE_tor is not set
# CONFIG_PACKAGE_tor-gencert is not set
-@@ -4395,7 +4487,7 @@ CONFIG_PACKAGE_wpad-mini=y
+@@ -4395,7 +4490,7 @@ CONFIG_PACKAGE_wpad-mini=y
# CONFIG_PACKAGE_joe is not set
# CONFIG_PACKAGE_nano is not set
# CONFIG_PACKAGE_vim is not set
@@ -399,7 +422,7 @@ index d79707a..fcabd04 100644
# CONFIG_PACKAGE_vim-fuller is not set
# CONFIG_PACKAGE_vim-help is not set
# CONFIG_PACKAGE_vim-runtime is not set
-@@ -4673,14 +4765,30 @@ CONFIG_PACKAGE_libjson-script=y
+@@ -4673,14 +4768,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
@@ -432,3 +455,12 @@ index d79707a..fcabd04 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
+ # CONFIG_PACKAGE_sockread is not set
+ # CONFIG_PACKAGE_spi-tools is not set
+ # CONFIG_PACKAGE_spidev-test is not set
+-# CONFIG_PACKAGE_strace is not set
++CONFIG_PACKAGE_strace=m
+ # CONFIG_PACKAGE_strace_libunwind is not set
+ # CONFIG_PACKAGE_stress is not set
+ # CONFIG_PACKAGE_sumo is not set
diff --git a/master/status b/master/status
index e69de29..38f354d 100644
--- a/master/status
+++ b/master/status
@@ -0,0 +1,10 @@
+feeds
+feeds-install
+config
+defconfig
+fix-gpios
+jffs2
+globalprotect
+openssh
+my-config
+endstop