Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.

gating.yaml

@@ -4,8 +4,8 @@ product_versions:
 decision_context: bodhi_update_push_testing
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional}
-
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
 #Rawhide
 --- !Policy
 product_versions:
@@ -13,16 +13,14 @@ product_versions:
 decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional}
-
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
 #gating rhel
 --- !Policy
 product_versions:
   - rhel-*
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional}
 

plans.fmf

@@ -0,0 +1,47 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/ppp.git
+      name: /plans/tier1/internal
+  adjust:
+    enabled: false
+    when: distro == centos-stream, fedora
+    because: They don't have access to internal repos.
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/ppp.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/ppp.git
+      name: /plans/tier2-tier3/internal
+  adjust:
+    enabled: false
+    when: distro == centos-stream, fedora
+    because: They don't have access to internal repos.
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/ppp.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/ppp.git
+      name: /plans/others/internal
+  adjust:
+    enabled: false
+    when: distro == centos-stream, fedora
+    because: They don't have access to internal repos.
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/ppp.git
+      name: /plans/others/public

plans/public.fmf

@@ -1,7 +0,0 @@
-summary: Test plan with all Fedora tests
-discover:
-       how: fmf
-       url: https://src.fedoraproject.org/tests/ppp.git
-execute:
-       how: tmt
-

plans/tier1-internal.fmf

@@ -1,12 +0,0 @@
-summary: CI plan, picks internal Tier1 tests, runs in beakerlib.
-discover:
-  - name: rhel
-    how: fmf
-    filter: 'tier: 1'
-    url: git://pkgs.devel.redhat.com/tests/ppp
-execute:
-    how: tmt 
-adjust:
-    enabled: false
-    when: distro == centos-stream, fedora
-    because: They don't have access to internal repos.

ppp-2.5.0-radiusclient-parser-fix.patch

@@ -1,49 +0,0 @@
-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!");

ppp-2.5.1-gcc15.patch

@@ -0,0 +1,58 @@
+Fix build with GCC 15
+
+GCC 15 defaults to C23 which does not allow K&R declarations.
+
+diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c
+index 16a5ffb..5708177 100644
+--- a/pppdump/pppdump.c
++++ b/pppdump/pppdump.c
+@@ -51,14 +51,12 @@ int tot_sent, tot_rcvd;
+ extern int optind;
+ extern char *optarg;
+ 
+-void dumplog();
+-void dumpppp();
+-void show_time();
++void dumplog(FILE *);
++void dumpppp(FILE *);
++void show_time(FILE *, int);
+ 
+ int
+-main(ac, av)
+-    int ac;
+-    char **av;
++main(int ac, char **av)
+ {
+     int i;
+     char *p;
+@@ -106,8 +104,7 @@ main(ac, av)
+ }
+ 
+ void
+-dumplog(f)
+-    FILE *f;
++dumplog(FILE *f)
+ {
+     int c, n, k, col;
+     int nb, c2;
+@@ -250,8 +247,7 @@ struct pkt {
+ unsigned char dbuf[8192];
+ 
+ void
+-dumpppp(f)
+-    FILE *f;
++dumpppp(FILE *f)
+ {
+     int c, n, k;
+     int nb, nl, dn, proto, rv;
+@@ -384,9 +380,7 @@ dumpppp(f)
+ }
+ 
+ void
+-show_time(f, c)
+-    FILE *f;
+-    int c;
++show_time(FILE *f, int c)
+ {
+     time_t t;
+     int n;

ppp.spec

@@ -17,8 +17,8 @@ Name:    ppp
 # sstp-client
 # These all need to be patched (if necessary) and rebuilt for new
 # versions of ppp.
-Version: 2.5.0
-Release: 13%{?dist}
+Version: 2.5.1
+Release: 6%{?dist}
 Summary: The Point-to-Point Protocol daemon
 License: bsd-3-clause AND zlib AND licenseref-fedora-public-domain AND bsd-attribution-hpnd-disclaimer AND bsd-4.3tahoe AND bsd-4-clause-uc AND apache-2.0 AND lgpl-2.0-or-later AND (gpl-2.0-or-later OR bsd-2-clause OR bsd-3-clause OR bsd-4-clause) AND gpl-2.0-or-later AND xlock AND gpl-1.0-or-later AND mackerras-3-clause-acknowledgment AND mackerras-3-clause AND hpnd-fenneberg-Livingston AND sun-ppp AND hpnd-inria-imag AND sun-ppp-2000
 URL:     http://www.samba.org/ppp
@@ -39,9 +39,8 @@ Source14: ipv6-down.initscripts
 
 # Fedora-specific
 Patch0: ppp-2.5.0-use-change-resolv-function.patch
-
-# https://github.com/ppp-project/ppp/commit/7f89208b860ea0c41636410bfdb6a609b2772f47
-Patch1: ppp-2.5.0-radiusclient-parser-fix.patch
+# Fix build with GCC 15
+Patch1: ppp-2.5.1-gcc15.patch
 
 BuildRequires: libtool
 BuildRequires: autoconf
@@ -54,6 +53,7 @@ BuildRequires: systemd
 BuildRequires: systemd-devel
 BuildRequires: glib2-devel
 BuildRequires: openssl-devel
+BuildRequires: libxcrypt-devel
 %if %{defined rhel}
 Provides: bundled(linux-atm) = 2.4.1
 %else
@@ -64,8 +64,6 @@ Requires: glibc >= 2.0.6
 Requires: /etc/pam.d/system-auth
 Requires: libpcap >= 14:0.8.3-6
 Requires: systemd
-Requires(pre): /usr/bin/getent
-Requires(pre): /usr/sbin/groupadd
 
 # Subpackage removed and obsoleted in F40
 Obsoletes: network-scripts-ppp < %{version}-%{release}
@@ -90,6 +88,11 @@ This package contains the header files for building plugins for ppp.
 
 tar -xJf %{SOURCE12}
 
+# Create a sysusers.d config file
+cat >ppp.sysusers.conf <<EOF
+g dip 40
+EOF
+
 %build
 autoreconf -fi
 export CFLAGS="%{build_cflags} -fno-strict-aliasing"
@@ -131,12 +134,20 @@ install -p %{SOURCE14} %{buildroot}%{_sysconfdir}/ppp/ipv6-up.initscripts
 # ghosts
 mkdir -p %{buildroot}%{_rundir}/pppd/lock
 
+# fix configuration files suffix
+pushd %{buildroot}%{_sysconfdir}/ppp
+for f in `ls *.example`
+do
+  mv "$f" "${f%%.example}"
+done
+popd
+
 %if "%{_sbindir}" == "%{_bindir}"
 mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/
 %endif
 
-%pre
-/usr/bin/getent group dip >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 40 dip >/dev/null 2>&1 || :
+install -m0644 -D ppp.sysusers.conf %{buildroot}%{_sysusersdir}/ppp.conf
+
 
 %post
 %tmpfiles_create ppp.conf
@@ -180,6 +191,7 @@ mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/
 %config(noreplace) %{_sysconfdir}/pam.d/ppp
 %config(noreplace) %{_sysconfdir}/logrotate.d/ppp
 %{_tmpfilesdir}/ppp.conf
+%{_sysusersdir}/ppp.conf
 
 %files devel
 %{_includedir}/pppd
@@ -187,6 +199,25 @@ mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/
 %{_libdir}/pkgconfig/pppd.pc
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.5.1-5
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
+* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 2.5.1-4
+- Add explicit BR: libxcrypt-devel
+
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.5.1-2
+- Rebuilt for the bin-sbin merge (2nd attempt)
+
+* Sat Nov 16 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.1-1
+- New version
+  Resolves: rhbz#2313209
+
 * Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-SHA512 (ppp-2.5.0.tar.gz) = cf62410a952053f9aa71c5179453831152e958fcad9e77df2ddac864e39aa71af0b746e54b91e8fa3ad6295d6d2b1bb736e36dc05521b495f573468679133324
+SHA512 (ppp-2.5.1.tar.gz) = 2e2a113fbb9ea1395ddde8711696e741b5ae66f5d5dc3f7d26be10bc09c605d13a972f067b7b4335f32d1f6952f5af8d59dec0cc28fa21d84664b236f0761216
 SHA512 (ppp-watch.tar.xz) = aee10735facf918b9a1e33408c9f19d8240c2cd265837da87ac9f58e097eece6bbe1abcaf426e2f10369d1368f6e9e68d2e07d005a19857f17d6318708ec438a