Skip to content
Snippets Groups Projects
Commit cb655ef8 authored by Milan P. Stanić's avatar Milan P. Stanić Committed by Natanael Copa
Browse files

main/ppp: upgrade to 2.5.1

remove 0001-Revert-lock-path-to-var-lock-435.patch, fixed upstream
refactor 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch to
apply to this pppd version
parent 9f5f51be
No related branches found
No related tags found
1 merge request!72734main/ppp: upgrade to 2.5.1
Pipeline #262098 skipped
From 99cbf5e269994482edaf64624be8b1c806f9587c Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Tue, 10 Oct 2023 10:05:50 +0900
Subject: [PATCH] Revert lock path to /var/lock (#435)
lock dir changed on linux from /var/lock to /run/pppd/lock with
pppd-2.5.0, which makes pppd fail to start if the distribution does not
pre-create the directory.
This reverts it back to /var/lock.
The paths for other OS should be identical as LOCALSTATEDIR should be
/var, but also revert them back as well just in case.
Since the variable is no longer used remove it from makefiles.
Fixes: 66a8c74c3f73 ("Let ./configure control the paths for pppd")
Fixes: #419
Signed-off-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
Co-authored-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
---
pppd/Makefile.am | 2 +-
pppd/pathnames.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index e5bedf26af96..7cb30053322e 100644
--- a/pppd/Makefile.am
+++ b/pppd/Makefile.am
@@ -83,7 +83,7 @@ pppd_SOURCES = \
upap.c \
utils.c
-pppd_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\" -DLOCALSTATEDIR=\"${localstatedir}\" -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"'
+pppd_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\" -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"'
pppd_LDFLAGS =
pppd_LIBS =
diff --git a/pppd/pathnames.h b/pppd/pathnames.h
index de2fb6889005..12609a969429 100644
--- a/pppd/pathnames.h
+++ b/pppd/pathnames.h
@@ -120,12 +120,12 @@
#define PPP_PATH_PPPDB PPP_PATH_VARRUN "/pppd2.tdb"
#ifdef __linux__
-#define PPP_PATH_LOCKDIR PPP_PATH_VARRUN "/lock"
+#define PPP_PATH_LOCKDIR "/var/lock"
#else
#ifdef SVR4
-#define PPP_PATH_LOCKDIR LOCALSTATEDIR "/spool/locks"
+#define PPP_PATH_LOCKDIR "/var/spool/locks"
#else
-#define PPP_PATH_LOCKDIR LOCALSTATEDIR "/spool/lock"
+#define PPP_PATH_LOCKDIR "/var/spool/lock"
#endif
#endif
--
2.39.2
......@@ -23,17 +23,19 @@ index 6d10836..78d6939 100644
.LP
\fBSAY\fR strings must be enclosed in single or double quotes. If
carriage return and line feed are needed in the string to be output,
diff --git a/pppd/pathnames.h b/pppd/pathnames.h
index de2fb68..84cf008 100644
--- a/pppd/pathnames.h
+++ b/pppd/pathnames.h
@@ -105,9 +105,9 @@
--- a/pppd/pathnames.h 2024-09-18 04:30:31.000000000 +0000
+++ b/pppd/pathnames.h 2024-09-29 11:14:53.504983766 +0000
@@ -105,13 +105,13 @@
#define PPP_PATH_AUTHDOWN PPP_PATH_CONFDIR "/auth-down"
#define PPP_PATH_TTYOPT PPP_PATH_CONFDIR "/options."
#define PPP_PATH_PEERFILES PPP_PATH_CONFDIR "/peers/"
-#define PPP_PATH_RESOLV PPP_PATH_CONFDIR "/resolv.conf"
+#define PPP_PATH_RESOLV "/run/ppp/resolv.conf"
#define PPP_PATH_NET_INIT PPP_PATH_CONFDIR "/net-init"
#define PPP_PATH_NET_PREUP PPP_PATH_CONFDIR "/net-pre-up"
#define PPP_PATH_NET_DOWN PPP_PATH_CONFDIR "/net-down"
-#define PPP_PATH_CONNERRS PPP_PATH_VARLOG "/connect-errors"
+#define PPP_PATH_CONNERRS "/var/log/ppp/connect-errors"
......
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ppp
pkgver=2.5.0
pkgrel=5
pkgver=2.5.1
pkgrel=0
pkgdesc="A daemon which implements the PPP protocol for dial-up networking"
url="https://ppp.samba.org/"
arch="all"
......@@ -48,7 +48,6 @@ source="https://github.com/paulusmack/ppp/archive/ppp-$pkgver.tar.gz
0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
fix-paths.patch
musl-fix-headers.patch
0001-Revert-lock-path-to-var-lock-435.patch
ip-down
ip-up
pppd.initd
......@@ -207,11 +206,10 @@ openrc() {
}
sha512sums="
cf62410a952053f9aa71c5179453831152e958fcad9e77df2ddac864e39aa71af0b746e54b91e8fa3ad6295d6d2b1bb736e36dc05521b495f573468679133324 ppp-2.5.0.tar.gz
1e1962503ea7639b2683920c73a848d680d1daf444fb978a42639f1671b2c38282d181be120fbf035220bcfe8768229897b7e5a59e6ddf09d4edb3666ebf3399 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
2e2a113fbb9ea1395ddde8711696e741b5ae66f5d5dc3f7d26be10bc09c605d13a972f067b7b4335f32d1f6952f5af8d59dec0cc28fa21d84664b236f0761216 ppp-2.5.1.tar.gz
3d2c9113ed2350e66192a49d4b3c25268ef542825a2324ddfb65263bb8b2082db18ed9e8d28c1ce65c3ec5805b6a73cba2c4dbae402f02b6123684f527baba97 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
f8ad85423ccf19a6cea66e9debea81dc1842bf499b279b77c058cc2ff10aae7f48c3430a63050b97c4f535f5dcca449261fc7476f90cb2d30dfca9359490d6bd fix-paths.patch
8efb0750fb64cc6cbb3e5fce4a79e842db3c7fd08c3c1899cda4201a80f9ec7a4c88d88be833579b9470c1d851f01fbf2cd82b51912ebc4f05bbb168f6e73bc3 musl-fix-headers.patch
218f5ae25f059f4ab614d6c613f8317dd136a59378f31e3b7c868f79869a17a79f1d88bf226828e7a21db07337f5c2328ce3f4579d747b9bfe1082b1023193f0 0001-Revert-lock-path-to-var-lock-435.patch
160260bd2a788beaac395eadb38efbfd1e0e1a458fe151555acacf2c4f3a12381d644672c664f9793db6e3459a4f05a54e3ff6d407b0d37e8014b15bd0f11bcc ip-down
8258c95a6b6e8e94d6001b5cd3a99bd3270f29ba0f2e5050a26c8d5f1b67eead8d039e71ce86a784d45e620047b0a2bb14b258d80a9ea62084ba588a4c2e2d84 ip-up
845d99cefd9e3ebfd4ff61dbf86d5bc1a698abbf204fed5a577fbc873e378c6d5d35712331b97dfd9fa37d1f7157a034f2584521f3a28ec18b883ab8d420e028 pppd.initd
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment