Fix apt-cacher-ng not proxying correctly

meta-citadel/recipes-citadel/bbappends/network-manager-applet_%.bbappend

@@ -1 +0,0 @@
-RDEPENDS:${PN}:append = "gnome-keyring"

meta-citadel/recipes-citadel/citadel-config/files/apt-cacher-ng/acng.conf

@@ -387,7 +387,7 @@ LocalDirs: acng-doc /usr/share/doc/apt-cacher-ng
 # This restriction can be disabled by specifying a list of allowed ports or 0
 # for any port.
 #
-# AllowUserPorts: 80
+AllowUserPorts: 80 443
 
 # Normally the HTTP redirection responses are forwarded to the original caller
 # (i.e. APT) which starts a new download attempt from the new URL. This

meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch

@@ -1,42 +0,0 @@
-From 647f3d946ec3fe4800b2bec89371f85a1a4b15cf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 23 May 2019 23:44:06 +0200
-Subject: [PATCH] Set paths to ssh-agent and ssh-add by configure options
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We have no executables in our sysroot so configuration won't find them.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
----
- configure.ac | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f4f793c..5194e5d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -356,8 +356,15 @@ if test "$enable_ssh_agent" = "no"; then
- 	SSH_AGENT=false
- 	SSH_ADD=false
- else
--	AC_PATH_PROG([SSH_AGENT], [ssh-agent], [no])
--	AC_PATH_PROG([SSH_ADD], [ssh-add], [no])
-+    AC_ARG_WITH([ssh-agent-path],
-+                [AC_HELP_STRING([--with-ssh-agent-path=PATH],
-+                                 [path to ssh-agent])],
-+                 [SSH_AGENT=$with_ssh_agent_path], [SSH_AGENT=no])
-+    AC_ARG_WITH([ssh-add-path],
-+                [AC_HELP_STRING([--with-ssh-add-path=PATH],
-+                                 [path to ssh-add])],
-+                 [SSH_ADD=$with_ssh_add_path], [SSH_ADD=no])
-+
- 	if test "$SSH_AGENT" = "no" -o "$SSH_ADD" = "no"; then
- 		AC_MSG_ERROR([the ssh-agent and ssh-add commands were not found])
- 	else
-
-

meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/musl.patch

@@ -1,19 +0,0 @@
-include sys/select.h for FD_* macros
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
-Index: gnome-keyring-2.32.1/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c
-===================================================================
---- gnome-keyring-2.32.1.orig/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c
-+++ gnome-keyring-2.32.1/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c
-@@ -32,6 +32,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/select.h>
- 
- #include <dlfcn.h>
- #include <pthread.h>
-
-

meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb

@@ -1,51 +0,0 @@
-SUMMARY = "Password and keyring managing daemon"
-HOMEPAGE = "http://www.gnome.org/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-SECTION = "x11/gnome"
-
-LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later & LGPL-2.1-or-later"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
-"
-
-DEPENDS = " \
-    glib-2.0-native \
-    gtk+3 \
-    gcr3 \
-    libgcrypt \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \
-"
-
-GNOMEBASEBUILDCLASS = "autotools"
-inherit gnomebase gsettings features_check gettext
-
-ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-
-SRC_URI[archive.sha256sum] = "b1d3ae9132ff2f8b3f25a190790892968e3d0acf952a487e40f644a8550ce3f6"
-SRC_URI += " \
-    file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \
-    file://musl.patch \
-"
-
-PACKAGECONFIG ??= "ssh-agent"
-PACKAGECONFIG[ssh-agent] = "--enable-ssh-agent --with-ssh-agent-path=${bindir}/ssh-agent --with-ssh-add-path=${bindir}/ssh-add,--disable-ssh-agent,,openssh-misc"
-
-EXTRA_OECONF = " \
-    --disable-doc \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)} \
-"
-
-FILES:${PN} += " \
-    ${datadir}/dbus-1/services \
-    ${datadir}/p11-kit \
-    ${datadir}/xdg-desktop-portal \
-    ${base_libdir}/security/*${SOLIBSDEV} \
-    ${libdir}/pkcs11/gnome-keyring-pkcs11.so \
-    ${systemd_user_unitdir} \
-"
-# fix | gnome-keyring-daemon: insufficient process capabilities, unsecure memory might get used
-pkg_postinst:${PN} () {
-    setcap cap_ipc_lock+ep $D/${bindir}/gnome-keyring-daemon
-}
-PACKAGE_WRITE_DEPS += "libcap-native"

meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.26.0.bb

@@ -4,14 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "gtk+3 libnma libnotify libsecret libgudev networkmanager iso-codes nss"
 
-inherit features_check gnomebase gsettings gtk-icon-cache gettext pkgconfig
+inherit features_check gnomebase gsettings gtk-icon-cache gettext
 
-ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+REQUIRED_DISTRO_FEATURES = "x11"
-REQUIRED_DISTRO_FEATURES = "opengl"
 
-SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}"
+SRC_URI[archive.sha256sum] = "69611b29064adbd57395fe3e51a9ebde1ea794615f776900453a2bbe3d8cddfd"
-
-SRC_URI[archive.sha256sum] = "a84704487ea3afe1485c47fb2ab598b8f779f540ae0dcbf0a1c5f85e64a7e253"
 
 # We don't not have ubuntu's appindicator (yet?)
 EXTRA_OEMESON = "-Dappindicator=no"
@@ -28,4 +25,4 @@ FILES:${PN} += " \
     ${datadir}/nm-applet/ \
     ${datadir}/libnma/wifi.ui \
     ${datadir}/metainfo \
-"
+"