ppp: Fix definition of directory for pid files

Message ID 20240611151150.127838-1-adolf.belka@ipfire.org
State New
Headers
Series ppp: Fix definition of directory for pid files |

Commit Message

Adolf Belka June 11, 2024, 3:11 p.m. UTC
  - When ppp was updated from version 2.5.0 to e1266c7 I missed that a new configure option
   was introduced. This is --with-runtime-dir=DIR.
- If this option is used then the run time directory for the pid files is defined by that
   DIR entry. If the option is not used then the pid directory is fixed as /var/run/pppd/
- Even if the --runstatedir=DIR option is used then it is ignored if the
   --with-runtime-dir=DIR option is used or not used even though both effectively deal
   with the same aspect.
- Some users in the forum had noticed that they had log messages saying that pid files
   could not be created because the files or directories did not exist. The pid files
   were being tried to be stored in /var/run/pppd/ but the pppd directory did not exist.
- This patch submission adds the --with-runtime-dir=/var/run option to the ppp configure
   command. This basically makes ppp act the same as it used to do previously with version
   2.5.0 and earlier.
- Changing IPFire to use /var/run/pppd/ is not a good idea as then there are several
   locations in IPFire that specify the pid directory location to /var/run/ as hard coded
   path. All of these locations would need to be identified and changed.
- Leaving IPFire to use /var/run means that only the ppp configure command needs to be
   modified.
- I hope that @adamgibbo and @markadewwet will be able to test out this change in CU187
   Testing when it is accepted. Those two users have got the pid error messages.
- Even if the ppp pid file can not be stored ppp will still successfully start. However
   the likelihood is that stoppinf ppp will not work as would be expected. This patch
   ensures that ppp will be able to store its pid files asa required whyen starting up.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 lfs/ppp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
  

Patch

diff --git a/lfs/ppp b/lfs/ppp
index a16859002..9290a7c41 100644
--- a/lfs/ppp
+++ b/lfs/ppp
@@ -72,7 +72,7 @@  $(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) && autoreconf -vfi
 	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 -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
@@ -84,6 +84,7 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 					--sysconfdir=/etc \
 					--with-logfile-dir=/var/log \
 					--localstatedir=/var \
+					--with-runtime-dir=/var/run \
 					cc="gcc" \
 					cflags="$(CFLAGS)"
 	cd $(DIR_APP) && make $(MAKETUNING)