[packages/ppp] - updated to 2.5.2
qboosh
qboosh at pld-linux.org
Sat Feb 1 10:10:22 CET 2025
commit 1a1718b3f213b108c35e111cb60c7305987716d0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Feb 1 09:01:38 2025 +0100
- updated to 2.5.2
ppp-2.4.3-mppe-mppc-1.1.patch | 115 +++++++++++++-----------------------------
ppp.spec | 22 ++++----
2 files changed, 46 insertions(+), 91 deletions(-)
---
diff --git a/ppp.spec b/ppp.spec
index 88ffe08..a8f4060 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -3,10 +3,10 @@
# - check if %{_libdir}/pppd/%{version} path is needed, if not drop the symlink
# Conditional build:
-%bcond_with mppc # MPPC/MPPE-56/LZS support (upstream-incompatible configuration, support not in mainline/PLD kernel)
+%bcond_with mppc # MPPC/MPPE-56/LZS support (upstream-incompatible configuration, support not in mainline/PLD kernel)
%bcond_without system_libatm # link PPPoATM plugin against system libatm
-%bcond_with srp # SRP support (pppd/srp-entry.8 missing in dist)
-%bcond_without systemd # systemd notifications
+%bcond_with srp # SRP support (pppd/srp-entry.8 missing in dist)
+%bcond_without systemd # systemd notifications
#
Summary: ppp daemon package for Linux
Summary(de.UTF-8): ppp-Dämonpaket für Linux
@@ -18,13 +18,13 @@ Summary(ru.UTF-8): Демон ppp
Summary(tr.UTF-8): PPP sunucu süreci
Summary(zh_CN.UTF-8): PPP 配置和管理软件包
Name: ppp
-Version: 2.5.1
+Version: 2.5.2
Release: 1
Epoch: 3
License: distributable
Group: Networking/Daemons
Source0: https://download.samba.org/pub/ppp/%{name}-%{version}.tar.gz
-# Source0-md5: c2d96ac7eb2020d3ed0e6e05fe996afe
+# Source0-md5: 28744065f8062622e2ab59901a310b2a
Source1: %{name}.pamd
Source2: %{name}.pon
Source3: %{name}.poff
@@ -47,6 +47,7 @@ BuildRequires: libtool >= 2:2
BuildRequires: linux-libc-headers >= 7:2.6.23
BuildRequires: openssl-devel
BuildRequires: pam-devel
+BuildRequires: pkgconfig
%{?with_srp:BuildRequires: srp-devel}
%{?with_systemd:BuildRequires: systemd-devel >= 1:209}
Requires: pam >= 0.77.3
@@ -115,15 +116,15 @@ Wtyczka PPPoATM dla pppd.
%prep
%setup -q
-%patch2 -p1
-%patch4 -p1
-%patch7 -p1
+%patch -P2 -p1
+%patch -P4 -p1
+%patch -P7 -p1
%if %{with mppc}
-%patch10 -p1
+%patch -P10 -p1
%endif
# use headers from llh instead of older supplied by ppp, incompatible with current llh
-%{__rm} include/linux/*.h
+%{__rm} include/linux/ppp_defs.h
%{__sed} -i -e 's,/usr/lib64/openssl/engines/,/%{_lib}/engines-3/,' \
-e 's,/usr/lib64/,%{_libdir}/,' etc.ppp/openssl.cnf.example
@@ -206,7 +207,6 @@ fi
%dir %{_libdir}/pppd/plugins
%attr(755,root,root) %{_libdir}/pppd/plugins/minconn.so
%attr(755,root,root) %{_libdir}/pppd/plugins/openl2tp.so
-%attr(755,root,root) %{_libdir}/pppd/plugins/passprompt.so
%attr(755,root,root) %{_libdir}/pppd/plugins/passwordfd.so
%attr(755,root,root) %{_libdir}/pppd/plugins/pppoe.so
%attr(755,root,root) %{_libdir}/pppd/plugins/pppol2tp.so
diff --git a/ppp-2.4.3-mppe-mppc-1.1.patch b/ppp-2.4.3-mppe-mppc-1.1.patch
index c85860d..63b7cff 100644
--- a/ppp-2.4.3-mppe-mppc-1.1.patch
+++ b/ppp-2.4.3-mppe-mppc-1.1.patch
@@ -1,15 +1,6 @@
diff -ruN ppp-2.4.3.orig/include/linux/ppp-comp.h ppp-2.4.3/include/linux/ppp-comp.h
--- ppp-2.4.3.orig/include/linux/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100
+++ ppp-2.4.3/include/linux/ppp-comp.h 2004-11-21 13:54:09.000000000 +0100
-@@ -36,7 +36,7 @@
- */
-
- /*
-- * ==FILEVERSION 20020319==
-+ * ==FILEVERSION 20020715==
- *
- * NOTE TO MAINTAINERS:
- * If you modify this file at all, please set the above date.
@@ -86,7 +86,7 @@
/* Compress a packet */
@@ -62,46 +53,9 @@ diff -ruN ppp-2.4.3.orig/include/linux/ppp-comp.h ppp-2.4.3/include/linux/ppp-co
/*
* Definitions for other, as yet unsupported, compression methods.
*/
-diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
---- ppp-2.4.3.orig/include/net/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100
-+++ ppp-2.4.3/include/net/ppp-comp.h 2004-11-21 13:54:09.000000000 +0100
-@@ -255,6 +255,33 @@
- #define CI_MPPE 18 /* config option for MPPE */
- #define CILEN_MPPE 6 /* length of config option */
-
-+/* MPPE/MPPC definitions by J.D.*/
-+#define MPPE_STATELESS MPPE_H_BIT /* configuration bit H */
-+#define MPPE_40BIT MPPE_L_BIT /* configuration bit L */
-+#define MPPE_56BIT MPPE_M_BIT /* configuration bit M */
-+#define MPPE_128BIT MPPE_S_BIT /* configuration bit S */
-+#define MPPE_MPPC MPPE_C_BIT /* configuration bit C */
-+
-+/*
-+ * Definitions for Stac LZS.
-+ */
-+
-+#define CI_LZS 17 /* config option for Stac LZS */
-+#define CILEN_LZS 5 /* length of config option */
-+
-+#define LZS_OVHD 4 /* max. LZS overhead */
-+#define LZS_HIST_LEN 2048 /* LZS history size */
-+#define LZS_MAX_CCOUNT 0x0FFF /* max. coherency counter value */
-+
-+#define LZS_MODE_NONE 0
-+#define LZS_MODE_LCB 1
-+#define LZS_MODE_CRC 2
-+#define LZS_MODE_SEQ 3
-+#define LZS_MODE_EXT 4
-+
-+#define LZS_EXT_BIT_FLUSHED 0x80 /* bit A */
-+#define LZS_EXT_BIT_COMP 0x20 /* bit C */
-+
- /*
- * Definitions for other, as yet unsupported, compression methods.
- */
---- ppp-2.5.0/pppd/ccp.c.orig 2022-12-30 02:12:39.000000000 +0100
-+++ ppp-2.5.0/pppd/ccp.c 2023-09-03 14:16:15.333281107 +0200
-@@ -36,11 +36,7 @@
+--- ppp-2.5.2/pppd/ccp.c.orig 2024-12-19 07:55:32.000000000 +0100
++++ ppp-2.5.2/pppd/ccp.c 2025-02-01 08:08:38.499770701 +0100
+@@ -30,11 +30,7 @@
#include <stdlib.h>
#include <string.h>
@@ -113,7 +67,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
#include "pppd-private.h"
#include "options.h"
-@@ -73,7 +73,8 @@ static char deflate_value[8];
+@@ -67,7 +63,8 @@ static char deflate_value[8];
* Option variables.
*/
#ifdef PPP_WITH_MPPE
@@ -123,7 +77,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
#endif
static struct option ccp_option_list[] = {
-@@ -115,54 +116,36 @@ static struct option ccp_option_list[] =
+@@ -109,54 +106,36 @@ static struct option ccp_option_list[] =
"don't allow Predictor-1", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR,
&ccp_allowoptions[0].predictor_1 },
@@ -207,7 +161,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
#endif /* MPPE */
{ NULL }
-@@ -248,7 +231,7 @@ static fsm_callbacks ccp_callbacks = {
+@@ -242,7 +221,7 @@ static fsm_callbacks ccp_callbacks = {
*/
#define ANY_COMPRESS(opt) ((opt).deflate || (opt).bsd_compress \
|| (opt).predictor_1 || (opt).predictor_2 \
@@ -216,7 +170,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
/*
* Local state (mainly for handling reset-reqs and reset-acks).
-@@ -349,6 +332,100 @@ setdeflate(char **argv)
+@@ -343,6 +322,100 @@ setdeflate(char **argv)
return 1;
}
@@ -317,7 +271,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
/*
* ccp_init - initialize CCP.
*/
-@@ -382,6 +459,30 @@ ccp_init(int unit)
+@@ -376,6 +449,30 @@ ccp_init(int unit)
ccp_allowoptions[0].bsd_bits = BSD_MAX_BITS;
ccp_allowoptions[0].predictor_1 = 1;
@@ -348,7 +302,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
}
/*
-@@ -451,7 +552,7 @@ ccp_input(int unit, u_char *p, int len)
+@@ -445,7 +542,7 @@ ccp_input(int unit, u_char *p, int len)
if (oldstate == OPENED && p[0] == TERMREQ && f->state != OPENED) {
notice("Compression disabled by peer.");
#ifdef PPP_WITH_MPPE
@@ -357,7 +311,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
error("MPPE disabled, closing LCP");
lcp_close(unit, "MPPE disabled by peer");
}
-@@ -479,6 +580,15 @@ ccp_extcode(fsm *f, int code, int id, u_
+@@ -473,6 +570,15 @@ ccp_extcode(fsm *f, int code, int id, u_
break;
/* send a reset-ack, which the transmitter will see and
reset its compression state. */
@@ -373,7 +327,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
fsm_sdata(f, CCP_RESETACK, id, NULL, 0);
break;
-@@ -506,7 +616,7 @@ ccp_protrej(int unit)
+@@ -500,7 +606,7 @@ ccp_protrej(int unit)
fsm_lowerdown(&ccp_fsm[unit]);
#ifdef PPP_WITH_MPPE
@@ -382,7 +336,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
error("MPPE required but peer negotiation failed");
lcp_close(unit, "MPPE required but peer negotiation failed");
}
-@@ -527,7 +637,7 @@ ccp_resetci(fsm *f)
+@@ -521,7 +627,7 @@ ccp_resetci(fsm *f)
all_rejected[f->unit] = 0;
#ifdef PPP_WITH_MPPE
@@ -391,7 +345,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
ccp_options *ao = &ccp_allowoptions[f->unit];
int auth_mschap_bits = auth_done[f->unit];
#ifdef PPP_WITH_EAPTLS
-@@ -544,6 +654,7 @@ ccp_resetci(fsm *f)
+@@ -538,6 +644,7 @@ ccp_resetci(fsm *f)
* NB: If MPPE is required, all other compression opts are invalid.
* So, we return right away if we can't do it.
*/
@@ -399,7 +353,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
/* Leave only the mschap auth bits set */
auth_mschap_bits &= (CHAP_MS_WITHPEER | CHAP_MS_PEER |
-@@ -588,49 +699,80 @@ ccp_resetci(fsm *f)
+@@ -582,49 +689,80 @@ ccp_resetci(fsm *f)
lcp_close(f->unit, "MPPE required but not available");
return;
}
@@ -516,17 +470,18 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
if (go->bsd_compress) {
opt_buf[0] = CI_BSD_COMPRESS;
opt_buf[1] = CILEN_BSD_COMPRESS;
-@@ -685,7 +827,8 @@ static int
+@@ -679,8 +817,9 @@ static int
+ (go->deflate && go->deflate_draft? CILEN_DEFLATE: 0)
+ (go->predictor_1? CILEN_PREDICTOR_1: 0)
+ (go->predictor_2? CILEN_PREDICTOR_2: 0)
-- + (go->mppe? CILEN_MPPE: 0);
+ + (go->lzs? CILEN_LZS: 0)
+ #ifdef PPP_WITH_MPPE
+- + (go->mppe? CILEN_MPPE: 0)
+ + ((go->mppe || go->mppc)? CILEN_MPPE: 0);
+ #endif
+ ;
}
-
- /*
-@@ -696,6 +839,8 @@ static void
+@@ -693,6 +832,8 @@ static void
{
int res;
ccp_options *go = &ccp_gotoptions[f->unit];
@@ -535,7 +490,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
u_char *p0 = p;
/*
-@@ -704,22 +849,42 @@ static void
+@@ -701,22 +842,42 @@ static void
* in case it gets Acked.
*/
#ifdef PPP_WITH_MPPE
@@ -585,7 +540,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
if (go->deflate) {
p[0] = go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT;
p[1] = CILEN_DEFLATE;
-@@ -811,24 +976,44 @@ static int
+@@ -808,24 +969,44 @@ static int
ccp_ackci(fsm *f, u_char *p, int len)
{
ccp_options *go = &ccp_gotoptions[f->unit];
@@ -639,7 +594,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
if (go->deflate) {
if (len < CILEN_DEFLATE
|| p[0] != (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT)
-@@ -891,12 +1076,14 @@ static int
+@@ -888,12 +1069,14 @@ static int
/*
* ccp_nakci - process received configure-nak.
@@ -655,7 +610,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
ccp_options no; /* options we've seen already */
ccp_options try; /* options to ask for next time */
-@@ -904,28 +1091,98 @@ static int
+@@ -901,28 +1084,98 @@ static int
try = *go;
#ifdef PPP_WITH_MPPE
@@ -772,7 +727,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
if (go->deflate && len >= CILEN_DEFLATE
&& p[0] == (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT)
&& p[1] == CILEN_DEFLATE) {
-@@ -995,14 +1252,50 @@ ccp_rejci(fsm *f, u_char *p, int len)
+@@ -992,14 +1245,50 @@ ccp_rejci(fsm *f, u_char *p, int len)
return -1;
#ifdef PPP_WITH_MPPE
@@ -826,7 +781,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
if (go->deflate_correct && len >= CILEN_DEFLATE
&& p[0] == CI_DEFLATE && p[1] == CILEN_DEFLATE) {
if (p[2] != DEFLATE_MAKE_OPT(go->deflate_size)
-@@ -1062,13 +1355,13 @@ static int
+@@ -1059,13 +1348,13 @@ static int
ccp_reqci(fsm *f, u_char *p, int *lenp, int dont_nak)
{
int ret, newret, res;
@@ -843,7 +798,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
#endif
ret = CONFACK;
-@@ -1092,105 +1385,305 @@ ccp_reqci(fsm *f, u_char *p, int *lenp,
+@@ -1089,105 +1378,305 @@ ccp_reqci(fsm *f, u_char *p, int *lenp,
switch (type) {
#ifdef PPP_WITH_MPPE
case CI_MPPE:
@@ -1222,7 +1177,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
case CI_DEFLATE:
case CI_DEFLATE_DRAFT:
if (!ao->deflate || clen != CILEN_DEFLATE
-@@ -1332,12 +1825,6 @@ ccp_reqci(fsm *f, u_char *p, int *lenp,
+@@ -1329,12 +1818,6 @@ ccp_reqci(fsm *f, u_char *p, int *lenp,
else
*lenp = retp - p0;
}
@@ -1235,7 +1190,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
return ret;
}
-@@ -1358,24 +1845,35 @@ method_name(ccp_options *opt, ccp_option
+@@ -1355,24 +1838,35 @@ method_name(ccp_options *opt, ccp_option
char *p = result;
char *q = result + sizeof(result); /* 1 past result */
@@ -1287,7 +1242,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
case CI_DEFLATE:
case CI_DEFLATE_DRAFT:
if (opt2 != NULL && opt2->deflate_size != opt->deflate_size)
-@@ -1430,7 +1928,7 @@ ccp_up(fsm *f)
+@@ -1427,7 +1921,7 @@ ccp_up(fsm *f)
} else if (ANY_COMPRESS(*ho))
notice("%s transmit compression enabled", method_name(ho, NULL));
#ifdef PPP_WITH_MPPE
@@ -1296,7 +1251,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
mppe_clear_keys();
continue_networks(f->unit); /* Bring up IP et al */
}
-@@ -1456,7 +1954,7 @@ ccp_down(fsm *f)
+@@ -1453,7 +1947,7 @@ ccp_down(fsm *f)
lcp_close(f->unit, "MPPE disabled");
}
}
@@ -1305,7 +1260,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
}
/*
-@@ -1513,24 +2011,28 @@ ccp_printpkt(u_char *p, int plen,
+@@ -1510,24 +2004,28 @@ ccp_printpkt(u_char *p, int plen,
#ifdef PPP_WITH_MPPE
case CI_MPPE:
if (optlen >= CILEN_MPPE) {
@@ -1345,7 +1300,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
case CI_DEFLATE:
case CI_DEFLATE_DRAFT:
if (optlen >= CILEN_DEFLATE) {
-@@ -1613,6 +2115,7 @@ ccp_datainput(int unit, u_char *pkt, int
+@@ -1610,6 +2108,7 @@ ccp_datainput(int unit, u_char *pkt, int
error("Lost compression sync: disabling compression");
ccp_close(unit, "Lost compression sync");
#ifdef PPP_WITH_MPPE
@@ -1353,7 +1308,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
/*
* If we were doing MPPE, we must also take the link down.
*/
-@@ -1620,9 +2123,18 @@ ccp_datainput(int unit, u_char *pkt, int
+@@ -1617,9 +2116,18 @@ ccp_datainput(int unit, u_char *pkt, int
error("Too many MPPE errors, closing LCP");
lcp_close(unit, "Too many MPPE errors");
}
@@ -1373,7 +1328,7 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
* Send a reset-request to reset the peer's compressor.
* We don't do that if we are still waiting for an
* acknowledgement to a previous reset-request.
-@@ -1652,4 +2164,3 @@ ccp_rack_timeout(void *arg)
+@@ -1649,4 +2157,3 @@ ccp_rack_timeout(void *arg)
} else
ccp_localstate[f->unit] &= ~RACK_PENDING;
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ppp.git/commitdiff/1a1718b3f213b108c35e111cb60c7305987716d0
More information about the pld-cvs-commit
mailing list