[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 121652cf5320851cc4f6cfce1fb9c179319ee6b1

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 121652cf5320851cc4f6cfce1fb9c179319ee6b1

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 5877 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  121652cf5320851cc4f6cfce1fb9c179319ee6b1 (commit)
       via  fb7869feb2c9b8665c2f9e77c2d6e2f0ff9ad832 (commit)
       via  3dcbb53a21b69ff34fc60d7d75c1ebdbd58bc425 (commit)
      from  b5d85855e5c24d41d65bd9a4218e789974fc2722 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 121652cf5320851cc4f6cfce1fb9c179319ee6b1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Aug 24 10:11:28 2023 +0000

    core179: Start OpenVPN N2N connections even if the RW server is disabled
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit fb7869feb2c9b8665c2f9e77c2d6e2f0ff9ad832
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Wed Aug 23 14:43:00 2023 +0000

    Core Update 179: Only start services if they are enabled
    
    Doing so avoids situations where a service is started without being
    configured to do so, thus reducing the potential for confusion and
    exposure of services not intended to be exposed by the user.
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 3dcbb53a21b69ff34fc60d7d75c1ebdbd58bc425
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Thu Aug 24 10:37:26 2023 +0200

    ppp: Patch to stop CU179 Testing error msg - pppd uses obsolete (PF_INET, SOCK_PACKET)
    
    - This issue was found by Peter Müller in the CU179 Testing evaluation.
    - The issue was found to have already been raised and closed on the ppp github issues page.
    - Patch for fix downloaded and applied to this submission.
    - When ppp-2.5.1 is released then this patch can be removed.
    - update of rootfile not required.
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/179/update.sh                |  8 +++--
 lfs/ppp                                            |  1 +
 ...heck-to-see-if-we-have-struct-sockaddr_ll.patch | 37 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 src/patches/ppp/ppp-2.5.0-7-add-configure-check-to-see-if-we-have-struct-sockaddr_ll.patch

Difference in files:
diff --git a/config/rootfiles/core/179/update.sh b/config/rootfiles/core/179/update.sh
index 636792d82..09db135d5 100644
--- a/config/rootfiles/core/179/update.sh
+++ b/config/rootfiles/core/179/update.sh
@@ -86,8 +86,12 @@ migrate_extrahd
 
 # Start services
 /etc/init.d/udev restart
-/etc/init.d/squid restart
-/usr/local/bin/openvpnctrl -s
+if [ -f /var/ipfire/proxy/enable ]; then
+	/etc/init.d/squid restart
+fi
+if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then
+	/usr/local/bin/openvpnctrl -s
+fi
 /usr/local/bin/openvpnctrl -sn2n
 
 # This update needs a reboot...
diff --git a/lfs/ppp b/lfs/ppp
index a6bd633b4..54aa1caf5 100644
--- a/lfs/ppp
+++ b/lfs/ppp
@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/ppp/ppp-2.5.0-4-increase-max-padi-attempts.patch
 	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/ppp/ppp-2.5.0-5-headers_4.9.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.5.0-6-patch-configure-to-handle-cflags-properly.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.5.0-7-add-configure-check-to-see-if-we-have-struct-sockaddr_ll.patch
 	cd $(DIR_APP) && ./configure \
 					--prefix=/usr \
 					--sysconfdir=/etc \
diff --git a/src/patches/ppp/ppp-2.5.0-7-add-configure-check-to-see-if-we-have-struct-sockaddr_ll.patch b/src/patches/ppp/ppp-2.5.0-7-add-configure-check-to-see-if-we-have-struct-sockaddr_ll.patch
new file mode 100644
index 000000000..a7823d424
--- /dev/null
+++ b/src/patches/ppp/ppp-2.5.0-7-add-configure-check-to-see-if-we-have-struct-sockaddr_ll.patch
@@ -0,0 +1,37 @@
+From 9d6d326b2530cffb1414e4c401675117c42d43ce Mon Sep 17 00:00:00 2001
+From: Eivind Naess <eivnaes(a)yahoo.com>
+Date: Sun, 23 Apr 2023 11:30:43 -0700
+Subject: [PATCH] Add configure check to see if we have struct sockaddr_ll
+
+Fixes issue #411.
+
+Signed-off-by: Eivind Naess <eivnaes(a)yahoo.com>
+---
+ configure.ac                   | 3 ++-
+ pppd/plugins/pppoe/config.h.in | 2 ++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1180f64ec..38b24af92 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -75,7 +75,8 @@ AM_COND_IF([LINUX], [
+         linux/if_ether.h        \
+         linux/if_packet.h       \
+         netinet/if_ether.h      \
+-        netpacket/packet.h])])
++        netpacket/packet.h])
++    AC_CHECK_TYPES([struct sockaddr_ll], [], [], [#include <linux/if_packet.h>])])
+ 
+ AC_CHECK_SIZEOF(unsigned int)
+ AC_CHECK_SIZEOF(unsigned long)
+diff --git a/pppd/plugins/pppoe/config.h.in b/pppd/plugins/pppoe/config.h.in
+index d447f5e89..d7d61c01c 100644
+--- a/pppd/plugins/pppoe/config.h.in
++++ b/pppd/plugins/pppoe/config.h.in
+@@ -69,3 +69,5 @@
+ /* The size of `unsigned short', as computed by sizeof. */
+ #undef SIZEOF_UNSIGNED_SHORT
+ 
++/* Define to 1 if the system has the type `struct sockaddr_ll'. */
++#undef HAVE_STRUCT_SOCKADDR_LL


hooks/post-receive
--
IPFire 2.x development tree