[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 08d869d54f4903593992d7aee2ef17d79d235108 - IPFire-SCM

20 Mar 2024

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, next has been updated
       via  08d869d54f4903593992d7aee2ef17d79d235108 (commit)
       via  5e9fd833e6eac8bb3481b744782f1e2409eef6f7 (commit)
       via  d4f66c22a8a240ba87e63fcd7fa0174e6bea03ec (commit)
       via  3396c743034c41413a7078e752ef426ef074ef77 (commit)
       via  5552f51de026fe1657bf404ce73e73462389854a (commit)
       via  4913c14477214f285ade2dfc304baaa6fbfaf2d1 (commit)
       via  6e600296bb3ec7d5151ed6282726c06c5dda1569 (commit)
       via  cfb0ced3c413cdd4b02b222ed93cebaa75246d53 (commit)
       via  b1e521c8f107c97c2179f0a48907ae1ab6e2810a (commit)
       via  896ae6eaac5ff5d5cc8e2ad8ba507feb298b9b38 (commit)
       via  c11817a12db5dce22f34f289ff261288c58b2031 (commit)
      from  bd8cc16ffde139820e282de1ba253e2724320a98 (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 08d869d54f4903593992d7aee2ef17d79d235108
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 20 10:03:51 2024 +0000
suricata: Update to 7.0.4
https://suricata.io/2024/03/19/suricata-7-0-4-and-6-0-17-released/
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5e9fd833e6eac8bb3481b744782f1e2409eef6f7
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 20 10:01:13 2024 +0000
core185: Ship libhtp
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d4f66c22a8a240ba87e63fcd7fa0174e6bea03ec
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 20 10:00:51 2024 +0000
libhtp: Update to 0.5.47
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3396c743034c41413a7078e752ef426ef074ef77
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 20 09:56:14 2024 +0000
Config: Update source upload URL
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5552f51de026fe1657bf404ce73e73462389854a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Mar 19 11:14:42 2024 +0000
wsdd: Remove dropped initscript
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4913c14477214f285ade2dfc304baaa6fbfaf2d1
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Mar 18 19:43:14 2024 +0100
wsdd: Update install and uninstall pak files
- As wsdd is now started by samba when it is started then the wsdd install and uninstall
       paks no longer need to create the symlinks for starting and stopping wsdd and no longer
       need the start_service and stop_service commands in the paks.
Fixes: bug#13445
    Tested-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6e600296bb3ec7d5151ed6282726c06c5dda1569
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Mar 18 19:43:13 2024 +0100
wsdd: Update of lfs file - fixes bug#13445
- Removal of services line as wsdd will now be started by the samba option in the addon
       services wui page
    - Removal of installing separate wsdd initscript as it is nowe integrated into the samba
       initscript.
Fixes: bug#13445
    Tested-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cfb0ced3c413cdd4b02b222ed93cebaa75246d53
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Mar 18 19:43:12 2024 +0100
wsdd: remove wsdd initscript as now covered by samba - fixes bug#13445
Fixes: bug#13445
    Tested-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b1e521c8f107c97c2179f0a48907ae1ab6e2810a
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Mar 18 19:43:11 2024 +0100
samba: Integrate wsdd initscript into samba initscript - bug#13445
- This integrates the wsdd initscript functions into the samba initscript. When samba is
       started or stopped or the status requested then wsdd is part of that process.
    - Tested in my vm testbed and confirmed to work for start, stop and status. Confirmed
       pid's shown with status command are in the appropriate pid files.
Fixes: bug#13445
    Tested-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 896ae6eaac5ff5d5cc8e2ad8ba507feb298b9b38
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Mar 19 11:10:19 2024 +0000
core185: Ship ppp
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c11817a12db5dce22f34f289ff261288c58b2031
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Fri Mar 15 13:38:06 2024 +0100
ppp: Update to include bug fixes that should be in 2.5.1 but not yet released
- Update from version 2.5.0 to commit e1266c7
    - Update of rootfile
    - When ppp-2.5.0 was released it had a bug bin it that the lock and run directories
       had non standard defaults but also that if the directory did not exist ppp just
       ignored it and continued to start but would then have error messages in the logs about
       not being able to cretae the lock file
    - This issue was raised in the ppp github issues and a set of patches merged into ppp.
    - The plan was written in Nov 2023 that this would be released as 2.5.1, however nearly
       three months later there is no sight of 2.5.1 being released and people continue to
       flag up the lock directory issues and have to apply a workaround to create the directory
       in local.rc
    - This patch has taken the zip source tarball of master at the commit e1266c7. The zip
       tarball was then extracted and then tar'd back up as a tar.gz file with the version set
       at e1266c7 rather than master. I could not find any other way to get a source tarball\
       created at a certain commit stage.
    - The patch ppp-2.5.0-2-everywhere-O_CLOEXEC-harder.patch had to be updated due to some
       changes in the source files.
    - The patch ppp-2.5.0-7-add-configure-check-to-see-if-we-have-struct-sockaddr_ll.patch
       was removed as the changes are now built into the source tarball.
    - This will need to be tested thoroughly by people with ppp to confirm that the lock
       directory is created if it doesn't exist on the system. I can't test that as I have
       no access to a ppp connection system.
    - For a view of the changelog between 2.5.0 and e1266c7 the github commits list needs to
       be reviewed. https://github.com/ppp-project/ppp/commits/master/?before=e1266c76d1ad39f98f...
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/ppp                        | 46 ++++++------
 .../{oldcore/131 => core/185}/filelists/libhtp     |  0
 .../{oldcore/125 => core/185}/filelists/ppp        |  0
 config/rootfiles/core/185/update.sh                |  1 +
 config/rootfiles/packages/wsdd                     |  1 -
 lfs/Config                                         |  2 +-
 lfs/libhtp                                         |  4 +-
 lfs/ppp                                            | 10 +--
 lfs/suricata                                       |  4 +-
 lfs/wsdd                                           |  7 +-
 src/initscripts/packages/samba                     | 40 ++++++++++-
 src/initscripts/packages/wsdd                      | 78 --------------------
 src/paks/wsdd/install.sh                           |  7 +-
 src/paks/wsdd/uninstall.sh                         |  3 -
 ...heck-to-see-if-we-have-struct-sockaddr_ll.patch | 37 ----------
 ...pp-e1266c7-2-everywhere-O_CLOEXEC-harder.patch} | 82 +++++++++++-----------
 16 files changed, 117 insertions(+), 205 deletions(-)
 copy config/rootfiles/{oldcore/131 => core/185}/filelists/libhtp (100%)
 copy config/rootfiles/{oldcore/125 => core/185}/filelists/ppp (100%)
 delete mode 100644 src/initscripts/packages/wsdd
 delete mode 100644 src/patches/ppp/ppp-2.5.0-7-add-configure-check-to-see-if-we-have-struct-sockaddr_ll.patch
 rename src/patches/ppp/{ppp-2.5.0-2-everywhere-O_CLOEXEC-harder.patch => ppp-e1266c7-2-everywhere-O_CLOEXEC-harder.patch} (75%)
Difference in files:

diff --git a/config/rootfiles/common/ppp b/config/rootfiles/common/ppp
index 379c64af44..6a27af3e74 100644
--- a/config/rootfiles/common/ppp
+++ b/config/rootfiles/common/ppp
@@ -35,29 +35,29 @@ etc/ppp/standardloginscript
 #usr/include/pppd/upap.h
 #usr/lib/pkgconfig/pppd.pc
 usr/lib/pppd
-usr/lib/pppd/2.5.0
-#usr/lib/pppd/2.5.0/minconn.la
-usr/lib/pppd/2.5.0/minconn.so
-#usr/lib/pppd/2.5.0/openl2tp.la
-usr/lib/pppd/2.5.0/openl2tp.so
-#usr/lib/pppd/2.5.0/passprompt.la
-usr/lib/pppd/2.5.0/passprompt.so
-#usr/lib/pppd/2.5.0/passwordfd.la
-usr/lib/pppd/2.5.0/passwordfd.so
-#usr/lib/pppd/2.5.0/pppoatm.la
-usr/lib/pppd/2.5.0/pppoatm.so
-#usr/lib/pppd/2.5.0/pppoe.la
-usr/lib/pppd/2.5.0/pppoe.so
-#usr/lib/pppd/2.5.0/pppol2tp.la
-usr/lib/pppd/2.5.0/pppol2tp.so
-#usr/lib/pppd/2.5.0/radattr.la
-usr/lib/pppd/2.5.0/radattr.so
-#usr/lib/pppd/2.5.0/radius.la
-usr/lib/pppd/2.5.0/radius.so
-#usr/lib/pppd/2.5.0/radrealms.la
-usr/lib/pppd/2.5.0/radrealms.so
-#usr/lib/pppd/2.5.0/winbind.la
-usr/lib/pppd/2.5.0/winbind.so
+#usr/lib/pppd/2.5.1-dev
+#usr/lib/pppd/2.5.1-dev/minconn.la
+usr/lib/pppd/2.5.1-dev/minconn.so
+#usr/lib/pppd/2.5.1-dev/openl2tp.la
+usr/lib/pppd/2.5.1-dev/openl2tp.so
+#usr/lib/pppd/2.5.1-dev/passprompt.la
+usr/lib/pppd/2.5.1-dev/passprompt.so
+#usr/lib/pppd/2.5.1-dev/passwordfd.la
+usr/lib/pppd/2.5.1-dev/passwordfd.so
+#usr/lib/pppd/2.5.1-dev/pppoatm.la
+usr/lib/pppd/2.5.1-dev/pppoatm.so
+#usr/lib/pppd/2.5.1-dev/pppoe.la
+usr/lib/pppd/2.5.1-dev/pppoe.so
+#usr/lib/pppd/2.5.1-dev/pppol2tp.la
+usr/lib/pppd/2.5.1-dev/pppol2tp.so
+#usr/lib/pppd/2.5.1-dev/radattr.la
+usr/lib/pppd/2.5.1-dev/radattr.so
+#usr/lib/pppd/2.5.1-dev/radius.la
+usr/lib/pppd/2.5.1-dev/radius.so
+#usr/lib/pppd/2.5.1-dev/radrealms.la
+usr/lib/pppd/2.5.1-dev/radrealms.so
+#usr/lib/pppd/2.5.1-dev/winbind.la
+usr/lib/pppd/2.5.1-dev/winbind.so
 usr/sbin/chat
 usr/sbin/pppd
 usr/sbin/pppdump
diff --git a/config/rootfiles/core/185/filelists/libhtp b/config/rootfiles/core/185/filelists/libhtp
new file mode 120000
index 0000000000..676e2c5e87
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/libhtp
@@ -0,0 +1 @@
+../../../common/libhtp
\ No newline at end of file
diff --git a/config/rootfiles/core/185/filelists/ppp b/config/rootfiles/core/185/filelists/ppp
new file mode 120000
index 0000000000..4844a9b58c
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/ppp
@@ -0,0 +1 @@
+../../../common/ppp
\ No newline at end of file
diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/core/185/update.sh
index 3dce4693c4..2c95c41028 100644
--- a/config/rootfiles/core/185/update.sh
+++ b/config/rootfiles/core/185/update.sh
@@ -59,6 +59,7 @@ rm -rvf \
    /usr/lib/grub/x86_64-efi/shim_lock.* \
    /usr/lib/grub/x86_64-efi/verifiers.* \
    /usr/lib/grub/x86_64-efi/verify.* \
+	/usr/lib/pppd/2.5.0 \
    /usr/lib/snort_dynamic* \
    /usr/local/bin/snortctrl \
    /usr/share/usb_modeswitch/1033:0035 \
diff --git a/config/rootfiles/packages/wsdd b/config/rootfiles/packages/wsdd
index ce225043ae..f1d0a9a8a6 100644
--- a/config/rootfiles/packages/wsdd
+++ b/config/rootfiles/packages/wsdd
@@ -1,2 +1 @@
-etc/rc.d/init.d/wsdd
 usr/bin/wsdd
diff --git a/lfs/Config b/lfs/Config
index 589bd71956..6711af997b 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -79,7 +79,7 @@ ZSTD_OPTIONS = \
 #
 URL_IPFIRE  = https://source.ipfire.org/source-2.x
 URL_TOOLCHAIN = https://source.ipfire.org/toolchains
-URL_SOURCE = git.ipfire.org:/pub/sources/source-2.x
+URL_SOURCE = people.ipfire.org:/pub/sources/source-2.x
# Don't change this; it will be overridden by other makefiles where necessary.
 #
diff --git a/lfs/libhtp b/lfs/libhtp
index 882f191d70..cbd4cb0931 100644
--- a/lfs/libhtp
+++ b/lfs/libhtp
@@ -24,7 +24,7 @@
include Config
-VER        = 0.5.46
+VER        = 0.5.47
THISAPP    = libhtp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 326246433b3d8525cd211fec73bc0fdd9fb61a65001fc55d1fed4e966c53b16a1052ef0597990681d805c2c560e670b8b2d2558851971df6c31910dea571d0cc
+$(DL_FILE)_BLAKE2 = a2a126052ea528b84dfffd7926a80e633f649968bf098e3ff0f49d441821723a4d3f78f0f15d530e9ce9e393c6173aceced8c0d863afecbe65c736e4ab874a03
install : $(TARGET)
diff --git a/lfs/ppp b/lfs/ppp
index 54aa1caf52..a16859002f 100644
--- a/lfs/ppp
+++ b/lfs/ppp
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2023  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2024  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
include Config
-VER        = 2.5.0
+VER        = e1266c7
THISAPP    = ppp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6a0e9efcbff3cb499705071cc7d0e3411cf4871fd53b2bfedbb1f2cf3ad80728eb436050cf33b78e36d473be64f15907a21da17f283337455f0af379bc18272d
+$(DL_FILE)_BLAKE2 = be60fadeed632ae2511e2d60148905da9868bd4271139b4fecab6b4b93e4a403e645d84204f907a8661748fb1a18b59c893925d91565520b9af791a45b0aaf4f
install : $(TARGET)
@@ -72,13 +72,13 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./autogen.sh
    cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/ppp/ppp-2.5.0-1-we-don-t-want-to-accidentally-leak-fds.patch
-	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/ppp/ppp-2.5.0-2-everywhere-O_CLOEXEC-harder.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-e1266c7-2-everywhere-O_CLOEXEC-harder.patch
    cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/ppp/ppp-2.5.0-3-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
    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/lfs/suricata b/lfs/suricata
index e8729e3689..17cc455852 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -24,7 +24,7 @@
include Config
-VER        = 7.0.3
+VER        = 7.0.4
THISAPP    = suricata-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b42044428ae5ac4ecd6b41d083f0f3ac5839bf9a0734c3a64bb5e9a6f1a0ffe0c1f5da262f4e167461836bd26ebf9238ec9c0c213ba61f6419b6af1314f3becb
+$(DL_FILE)_BLAKE2 = 6c85ee7134548261a5a766ee3e7c0ce095ef478e9323342f17bb48eb0abc74035a66212c7f7e6ba45bd2efd552d82ad6d218d4b09279877f60526f8f79de9764
install : $(TARGET)
diff --git a/lfs/wsdd b/lfs/wsdd
index aa65e47ef0..bf2a1a0327 100644
--- a/lfs/wsdd
+++ b/lfs/wsdd
@@ -33,11 +33,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = wsdd
-PAK_VER    = 1
+PAK_VER    = 2
DEPS       =
-SERVICES   = wsdd
+SERVICES   =
###############################################################################
 # Top-level Rules
@@ -82,8 +82,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && cp src/wsdd.py /usr/bin/wsdd
-	#install initscripts
-	$(call INSTALL_INITSCRIPTS,$(SERVICES))
-
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/src/initscripts/packages/samba b/src/initscripts/packages/samba
index 93f14cd292..3945f4384f 100644
--- a/src/initscripts/packages/samba
+++ b/src/initscripts/packages/samba
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2024  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -30,6 +30,8 @@ function fix_permissions() {
    mkdir -p /var/run/samba/{nmbd,ncalrpc,winbindd}
 }
+eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
+
 case "$1" in
    start)
    	fix_permissions
@@ -42,6 +44,35 @@ case "$1" in
boot_mesg "Starting winbind..."
    	loadproc /usr/sbin/winbindd
+		
+		# Arguments for wsdd command
+		ARGS=(
+			# Launch as non-privileged user
+			"--user" "wsdd:wsdd"
+
+			# Launch in chroot
+			"--chroot" "/var/run/wsdd"
+
+			# Only use IPv4
+			"--ipv4only"
+
+			# Configure the workgroup
+			"--workgroup" "$(testparm -s --parameter-name workgroup 2>/dev/null)"
+		)
+
+		# Conditionally add the GREEN/BLUE interface
+		for intf in GREEN_DEV BLUE_DEV; do
+			if [ -n "${!intf}" ]; then
+				ARGS+=( "--interface" "${!intf}" )
+			fi
+		done
+
+		# Create chroot directory for wsdd
+		mkdir -p /var/run/wsdd
+
+		PIDFILE="/var/run/wsdd.pid"
+		boot_mesg "Starting Web Service Discovery Host Daemon..."
+		loadproc -b -p "${PIDFILE}" /usr/bin/wsdd "${ARGS[@]}"
    	;;
stop)
@@ -53,6 +84,10 @@ case "$1" in
boot_mesg "Stopping winbind..."
    	killproc /usr/sbin/winbindd
+
+		PIDFILE="/var/run/wsdd.pid"
+		boot_mesg "Stopping Web Service Discovery Host Daemon..."
+		killproc -p "${PIDFILE}" /usr/bin/wsdd
                 ;;
reload)
@@ -76,6 +111,9 @@ case "$1" in
    	statusproc /usr/sbin/nmbd
    	statusproc /usr/sbin/smbd
    	statusproc /usr/sbin/winbindd
+
+		PIDFILE="/var/run/wsdd.pid"
+		statusproc /usr/bin/wsdd
    	;;
*)
diff --git a/src/initscripts/packages/wsdd b/src/initscripts/packages/wsdd
deleted file mode 100644
index 68e8f3de00..0000000000
--- a/src/initscripts/packages/wsdd
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2024  IPFire Team  info@ipfire.org                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-. /etc/sysconfig/rc
-. $rc_functions
-
-eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
-
-PIDFILE="/var/run/wsdd.pid"
-
-case "$1" in
-	start)
-		ARGS=(
-			# Launch as non-privileged user
-			"--user" "wsdd:wsdd"
-
-			# Launch in chroot
-			"--chroot" "/var/run/wsdd"
-
-			# Only use IPv4
-			"--ipv4only"
-
-			# Configure the workgroup
-			"--workgroup" "$(testparm -s --parameter-name workgroup 2>/dev/null)"
-		)
-
-		# Conditionally add the GREEN/BLUE interface
-		for intf in GREEN_DEV BLUE_DEV; do
-			if [ -n "${!intf}" ]; then
-				ARGS+=( "--interface" "${!intf}" )
-			fi
-		done
-
-		# Create chroot directory for wsdd
-		mkdir -p /var/run/wsdd
-
-		boot_mesg "Starting Web Service Discovery Host Daemon..."
-		loadproc -b -p "${PIDFILE}" /usr/bin/wsdd "${ARGS[@]}"
-		;;
-
-	stop)
-		boot_mesg "Stopping Web Service Discovery Host Daemon..."
-		killproc -p "${PIDFILE}" /usr/bin/wsdd
-		;;
-
-	status)
-		statusproc /usr/bin/wsdd
-		;;
-
-	restart)
-		$0 stop
-		$0 start
-		;;
-
-	*)
-		echo "Usage: $0 (start|stop|status|restart)"
-		exit 1
-		;;
-esac
-
diff --git a/src/paks/wsdd/install.sh b/src/paks/wsdd/install.sh
index 181b84eb99..12fde4802e 100644
--- a/src/paks/wsdd/install.sh
+++ b/src/paks/wsdd/install.sh
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
# If the wsdd user does not exist yet, then create it and add to wsdd group.
-if ! getent user wsdd >/dev/null; then
+if ! getent passwd wsdd >/dev/null; then
    useradd -r -U -d / -s /bin/false -c "wsdd user" wsdd
    usermod -a -G wsdd wsdd
 fi
@@ -32,9 +32,4 @@ fi
 extract_files
 restore_backup ${NAME}
-# Create startlinks
-ln -sf ../init.d/wsdd /etc/rc.d/rc0.d/K35wsdd
-ln -sf ../init.d/wsdd /etc/rc.d/rc3.d/S65wsdd
-ln -sf ../init.d/wsdd /etc/rc.d/rc6.d/K35wsdd
-start_service ${NAME}
 exit 0
diff --git a/src/paks/wsdd/uninstall.sh b/src/paks/wsdd/uninstall.sh
index 4c52ee281e..9dc5202f47 100644
--- a/src/paks/wsdd/uninstall.sh
+++ b/src/paks/wsdd/uninstall.sh
@@ -22,9 +22,6 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
 make_backup ${NAME}
 remove_files
-# Remove all start links.
-rm -rf /etc/rc.d/rc*.d/*wsdd
 exit 0
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
deleted file mode 100644
index a7823d4249..0000000000
--- a/src/patches/ppp/ppp-2.5.0-7-add-configure-check-to-see-if-we-have-struct-sockaddr_ll.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9d6d326b2530cffb1414e4c401675117c42d43ce Mon Sep 17 00:00:00 2001
-From: Eivind Naess eivnaes@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@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
diff --git a/src/patches/ppp/ppp-2.5.0-2-everywhere-O_CLOEXEC-harder.patch b/src/patches/ppp/ppp-e1266c7-2-everywhere-O_CLOEXEC-harder.patch
similarity index 75%
rename from src/patches/ppp/ppp-2.5.0-2-everywhere-O_CLOEXEC-harder.patch
rename to src/patches/ppp/ppp-e1266c7-2-everywhere-O_CLOEXEC-harder.patch
index c205c0e08c..b6fd842a7f 100644
--- a/src/patches/ppp/ppp-2.5.0-2-everywhere-O_CLOEXEC-harder.patch
+++ b/src/patches/ppp/ppp-e1266c7-2-everywhere-O_CLOEXEC-harder.patch
@@ -1,6 +1,6 @@
-diff -Naur pppd.orig/eap.c pppd/eap.c
---- pppd.orig/eap.c	2023-03-25 05:38:30.000000000 +0100
-+++ pppd/eap.c	2023-06-30 12:58:07.984676045 +0200
+diff -Naur ppp-e1266c7-orig/pppd/eap.c ppp-e1266c7/pppd/eap.c
+--- ppp-e1266c7-orig/pppd/eap.c	2024-02-13 10:40:56.000000000 +0100
++++ ppp-e1266c7/pppd/eap.c	2024-03-15 10:40:53.637190252 +0100
 @@ -1542,7 +1542,7 @@
if ((path = name_of_pn_file()) == NULL)
@@ -10,10 +10,10 @@ diff -Naur pppd.orig/eap.c pppd/eap.c
    err = errno;
    free(path);
    errno = err;
-diff -Naur pppd.orig/main.c pppd/main.c
---- pppd.orig/main.c	2023-03-25 05:38:30.000000000 +0100
-+++ pppd/main.c	2023-06-30 13:00:15.155195676 +0200
-@@ -479,7 +479,7 @@
+diff -Naur ppp-e1266c7-orig/pppd/main.c ppp-e1266c7/pppd/main.c
+--- ppp-e1266c7-orig/pppd/main.c	2024-02-13 10:40:56.000000000 +0100
++++ ppp-e1266c7/pppd/main.c	2024-03-15 10:41:43.842037617 +0100
+@@ -480,7 +480,7 @@
    die(0);
/* Make sure fds 0, 1, 2 are open to somewhere. */
@@ -22,10 +22,10 @@ diff -Naur pppd.orig/main.c pppd/main.c
      if (fd_devnull < 0)
    fatal("Couldn't open %s: %m", PPP_DEVNULL);
      while (fd_devnull <= 2) {
-diff -Naur pppd.orig/options.c pppd/options.c
---- pppd.orig/options.c	2023-06-30 12:42:19.262593140 +0200
-+++ pppd/options.c	2023-06-30 13:01:58.388323345 +0200
-@@ -1718,9 +1718,9 @@
+diff -Naur ppp-e1266c7-orig/pppd/options.c ppp-e1266c7/pppd/options.c
+--- ppp-e1266c7-orig/pppd/options.c	2024-02-13 10:40:56.000000000 +0100
++++ ppp-e1266c7/pppd/options.c	2024-03-15 10:43:02.867753370 +0100
+@@ -1719,9 +1719,9 @@
    ppp_option_error("unable to drop permissions to open %s: %m", *argv);
    return 0;
      }
@@ -37,10 +37,10 @@ diff -Naur pppd.orig/options.c pppd/options.c
      err = errno;
      if (!privileged_option && seteuid(euid) == -1)
    fatal("unable to regain privileges: %m");
-diff -Naur pppd.orig/sys-linux.c pppd/sys-linux.c
---- pppd.orig/sys-linux.c	2023-06-30 12:43:20.634453475 +0200
-+++ pppd/sys-linux.c	2023-06-30 13:11:25.715511251 +0200
-@@ -666,7 +666,7 @@
+diff -Naur ppp-e1266c7-orig/pppd/sys-linux.c ppp-e1266c7/pppd/sys-linux.c
+--- ppp-e1266c7-orig/pppd/sys-linux.c	2024-02-13 10:40:56.000000000 +0100
++++ ppp-e1266c7/pppd/sys-linux.c	2024-03-15 10:49:59.310297165 +0100
+@@ -656,7 +656,7 @@
        goto err;
    }
    dbglog("using channel %d", chindex);
@@ -49,7 +49,7 @@ diff -Naur pppd.orig/sys-linux.c pppd/sys-linux.c
    if (fd < 0) {
        error("Couldn't reopen /dev/ppp: %m");
        goto err;
-@@ -904,7 +904,7 @@
+@@ -894,7 +894,7 @@
    	dbglog("in make_ppp_unit, already had /dev/ppp open?");
    	close(ppp_dev_fd);
    }
@@ -58,7 +58,7 @@ diff -Naur pppd.orig/sys-linux.c pppd/sys-linux.c
    if (ppp_dev_fd < 0)
    	fatal("Couldn't open /dev/ppp: %m");
    flags = fcntl(ppp_dev_fd, F_GETFL);
-@@ -1025,7 +1025,7 @@
+@@ -1015,7 +1015,7 @@
    if (!new_style_driver)
    	return -1;
@@ -67,7 +67,7 @@ diff -Naur pppd.orig/sys-linux.c pppd/sys-linux.c
    if (master_fd < 0)
    	fatal("Couldn't open /dev/ppp: %m");
    if (ioctl(master_fd, PPPIOCATTACH, &ifnum) < 0) {
-@@ -2533,7 +2533,7 @@
+@@ -2541,7 +2541,7 @@
    if (tune_kernel) {
        forw_path = path_to_procfs("/sys/net/ipv4/ip_forward");
        if (forw_path != 0) {
@@ -76,7 +76,7 @@ diff -Naur pppd.orig/sys-linux.c pppd/sys-linux.c
    	if (fd >= 0) {
    	    if (write(fd, "1", 1) != 1)
    		error("Couldn't enable IP forwarding: %m");
-@@ -2878,7 +2878,7 @@
+@@ -2886,7 +2886,7 @@
      sscanf(utsname.release, "%d.%d.%d", &osmaj, &osmin, &ospatch);
      kernel_version = KVERSION(osmaj, osmin, ospatch);
@@ -85,7 +85,7 @@ diff -Naur pppd.orig/sys-linux.c pppd/sys-linux.c
      if (fd >= 0) {
    new_style_driver = 1;
-@@ -3056,7 +3056,7 @@
+@@ -3064,7 +3064,7 @@
  #if __GLIBC__ >= 2
      updwtmp(_PATH_WTMP, &ut);
  #else
@@ -94,7 +94,7 @@ diff -Naur pppd.orig/sys-linux.c pppd/sys-linux.c
      if (wtmp >= 0) {
    flock(wtmp, LOCK_EX);
-@@ -3280,7 +3280,7 @@
+@@ -3288,7 +3288,7 @@
    int fd;
path = path_to_procfs("/sys/net/ipv4/ip_dynaddr");
@@ -103,7 +103,7 @@ diff -Naur pppd.orig/sys-linux.c pppd/sys-linux.c
        if (write(fd, "1", 1) != 1)
    	error("Couldn't enable dynamic IP addressing: %m");
        close(fd);
-@@ -3534,7 +3534,7 @@
+@@ -3542,7 +3542,7 @@
      /*
       * Try the unix98 way first.
       */
@@ -112,7 +112,7 @@ diff -Naur pppd.orig/sys-linux.c pppd/sys-linux.c
      if (mfd >= 0) {
    int ptn;
    if (ioctl(mfd, TIOCGPTN, &ptn) >= 0) {
-@@ -3545,7 +3545,8 @@
+@@ -3553,7 +3553,8 @@
        if (ioctl(mfd, TIOCSPTLCK, &ptn) < 0)
    	warn("Couldn't unlock pty slave %s: %m", pty_name);
  #endif
@@ -122,7 +122,7 @@ diff -Naur pppd.orig/sys-linux.c pppd/sys-linux.c
        {
    	warn("Couldn't open pty slave %s: %m", pty_name);
    	close(mfd);
-@@ -3559,10 +3560,10 @@
+@@ -3567,10 +3568,10 @@
    for (i = 0; i < 64; ++i) {
        slprintf(pty_name, sizeof(pty_name), "/dev/pty%c%x",
    	     'p' + i / 16, i % 16);
@@ -135,19 +135,19 @@ diff -Naur pppd.orig/sys-linux.c pppd/sys-linux.c
    	if (sfd >= 0) {
    	    ret = fchown(sfd, uid, -1);
    	    if (ret != 0) {
-diff -Naur pppd.orig/tdb.c pppd/tdb.c
---- pppd.orig/tdb.c	2021-07-23 06:41:07.000000000 +0200
-+++ pppd/tdb.c	2023-06-30 13:12:55.034900600 +0200
-@@ -1728,7 +1728,7 @@
- 		goto internal;
+diff -Naur ppp-e1266c7-orig/pppd/tdb.c ppp-e1266c7/pppd/tdb.c
+--- ppp-e1266c7-orig/pppd/tdb.c	2024-02-13 10:40:56.000000000 +0100
++++ ppp-e1266c7/pppd/tdb.c	2024-03-15 10:51:25.182882191 +0100
+@@ -1732,7 +1732,7 @@
    }
+ again:
 -	if ((tdb->fd = open(name, open_flags, mode)) == -1) {
 +	if ((tdb->fd = open(name, open_flags | O_CLOEXEC, mode)) == -1) {
- 		TDB_LOG((tdb, 5, "tdb_open_ex: could not open file %s: %s\n",
- 			 name, strerror(errno)));
- 		goto fail;	/* errno set by open(2) */
-@@ -1971,7 +1971,7 @@
+ 		if ((open_flags & O_CREAT) && errno == ENOENT &&
+ 			mkdir_recursive(PPP_PATH_VARRUN) == 0)
+ 			goto again;
+@@ -1979,7 +1979,7 @@
    }
    if (close(tdb->fd) != 0)
    	TDB_LOG((tdb, 0, "tdb_reopen: WARNING closing tdb->fd failed!\n"));
@@ -156,9 +156,9 @@ diff -Naur pppd.orig/tdb.c pppd/tdb.c
    if (tdb->fd == -1) {
    	TDB_LOG((tdb, 0, "tdb_reopen: open failed (%s)\n", strerror(errno)));
    	goto fail;
-diff -Naur pppd.orig/tty.c pppd/tty.c
---- pppd.orig/tty.c	2023-03-25 05:38:30.000000000 +0100
-+++ pppd/tty.c	2023-06-30 13:14:06.450418113 +0200
+diff -Naur ppp-e1266c7-orig/pppd/tty.c ppp-e1266c7/pppd/tty.c
+--- ppp-e1266c7-orig/pppd/tty.c	2024-02-13 10:40:56.000000000 +0100
++++ ppp-e1266c7/pppd/tty.c	2024-03-15 10:52:35.828341901 +0100
 @@ -621,7 +621,7 @@
    			ppp_set_status(EXIT_OPEN_FAILED);
    			goto errret;
@@ -177,10 +177,10 @@ diff -Naur pppd.orig/tty.c pppd/tty.c
    			break;
    		if (errno != EINTR) {
    			error("Failed to reopen %s: %m", devnam);
-diff -Naur pppd.orig/utils.c pppd/utils.c
---- pppd.orig/utils.c	2022-12-30 02:12:39.000000000 +0100
-+++ pppd/utils.c	2023-06-30 13:15:47.860182369 +0200
-@@ -843,14 +843,14 @@
+diff -Naur ppp-e1266c7-orig/pppd/utils.c ppp-e1266c7/pppd/utils.c
+--- ppp-e1266c7-orig/pppd/utils.c	2024-02-13 10:40:56.000000000 +0100
++++ ppp-e1266c7/pppd/utils.c	2024-03-15 10:55:27.176832115 +0100
+@@ -926,14 +926,14 @@
      slprintf(lock_file, sizeof(lock_file), "%s/LCK..%s", PPP_PATH_LOCKDIR, dev);
  #endif
@@ -197,7 +197,7 @@ diff -Naur pppd.orig/utils.c pppd/utils.c
    if (fd < 0) {
        if (errno == ENOENT) /* This is just a timing problem. */
    	continue;
-@@ -933,7 +933,7 @@
+@@ -1016,7 +1016,7 @@
if (lock_file[0] == 0)
    return -1;
hooks/post-receive
--
IPFire 2.x development tree

    