packages/ppp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix up parsing in radiusclient.conf and add check for struct sockaddr_ll

Browse Source
This commit is contained in:
eaglegai 2025-02-14 07:15:38 +00:00
parent 9674319392
commit 5275f2591d
3 changed files with 98 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
backport-Add-configure-check-to-see-if-we-have-struct-sockaddr_ll.patch Normal file
View File

@ -0,0 +1,37 @@
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

49
backport-Fixing-up-parsing-in-radiusclient.conf.patch Normal file
View File

@ -0,0 +1,49 @@
From 7f89208b860ea0c41636410bfdb6a609b2772f47 Mon Sep 17 00:00:00 2001
From: Eivind Naess <eivnaes@yahoo.com>
Date: Sun, 23 Apr 2023 11:37:01 -0700
Subject: [PATCH] Closes #411, Fixing up parsing in radiusclient.conf
Adding curly braces to fix the code.
Signed-off-by: Eivind Naess <eivnaes@yahoo.com>
---
pppd/plugins/radius/config.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/pppd/plugins/radius/config.c b/pppd/plugins/radius/config.c
index 39744fca1..e1a481487 100644
--- a/pppd/plugins/radius/config.c
+++ b/pppd/plugins/radius/config.c
@@ -235,24 +235,28 @@ int rc_read_config(char *filename)
switch (option->type) {
case OT_STR:
- if (set_option_str(filename, line, option, p) < 0)
+ if (set_option_str(filename, line, option, p) < 0) {
fclose(configfd);
return (-1);
+ }
break;
case OT_INT:
- if (set_option_int(filename, line, option, p) < 0)
+ if (set_option_int(filename, line, option, p) < 0) {
fclose(configfd);
return (-1);
+ }
break;
case OT_SRV:
- if (set_option_srv(filename, line, option, p) < 0)
+ if (set_option_srv(filename, line, option, p) < 0) {
fclose(configfd);
return (-1);
+ }
break;
case OT_AUO:
- if (set_option_auo(filename, line, option, p) < 0)
+ if (set_option_auo(filename, line, option, p) < 0) {
fclose(configfd);
return (-1);
+ }
break;
default:
fatal("rc_read_config: impossible case branch!");

13
ppp.spec
View File

@ -1,6 +1,6 @@
Name: ppp
Version: 2.5.0
Release: 3
Release: 4
Summary: The Point-to-Point Protocol
License: BSD and LGPLv2+ and GPLv2+ and Public Domain
@ -36,6 +36,9 @@ Patch0008: backport-0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.p
Patch0009: refuse-pap-by-default-for-security.patch
Patch0010: backport-Fixing-up-parsing-in-radiusclient.conf.patch
Patch0011: backport-Add-configure-check-to-see-if-we-have-struct-sockaddr_ll.patch
%description
The Point-to-Point Protocol (PPP) provides a standard way to establish
a network connection over a serial link. At present, this package
@ -138,6 +141,14 @@ mkdir -p %{buildroot}%{_rundir}/pppd/lock
%{_mandir}/man8/*.8.gz
%changelog
* Fri Feb 14 2025 gaihuiying <eaglegai@163.com> - 2.5.0-4
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:backport upstream
Fixing up parsing in radiusclient.conf
Add configure check to see if we have struct sockaddr_ll
* Mon Aug 05 2024 gaihuiying <eaglegai@163.com> - 2.5.0-3
- Type:bugfix
- CVE:NA