[rpms/ppp] rawhide: New version

[rpms/ppp] rawhide: New version

[@ 2026-06-04 15:52 UTC (permalink / raw)]

          A new commit has been pushed.

          Repo   : rpms/ppp
          Branch : rawhide
          Commit : 5517476084546ef1a4ef840866f650870538f965
          Author : Jaroslav Škarvada <jskarvad@redhat.com>
          Date   : 2026-06-04T17:52:49+02:00
          Stats  : +9/-119 in 4 file(s)
          URL    : https://src.fedoraproject.org/rpms/ppp/c/5517476084546ef1a4ef840866f650870538f965?branch=rawhide

          Log:
          New version

Resolves: rhbz#2335040

---
diff --git a/ppp-2.5.0-use-change-resolv-function.patch b/ppp-2.5.0-use-change-resolv-function.patch
deleted file mode 100644
index 30a07fe..0000000
--- a/ppp-2.5.0-use-change-resolv-function.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/scripts/ip-down.local.add b/scripts/ip-down.local.add
-index b93590e..8889cb6 100644
---- a/scripts/ip-down.local.add
-+++ b/scripts/ip-down.local.add
-@@ -9,12 +9,13 @@
- #
- # Nick Walker (nickwalker@email.com)
- #
-+. /etc/sysconfig/network-scripts/network-functions
- 
- if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
- 	if [ -f /etc/ppp/resolv.prev ]; then
--		cp -f /etc/ppp/resolv.prev /etc/resolv.conf
-+		change_resolv_conf /etc/ppp/resolv.prev
- 	else
--		rm -f /etc/resolv.conf
-+		change_resolv_conf
- 	fi
- fi
- 
-diff --git a/scripts/ip-up.local.add b/scripts/ip-up.local.add
-index 8017209..5ced496 100644
---- a/scripts/ip-up.local.add
-+++ b/scripts/ip-up.local.add
-@@ -9,16 +9,22 @@
- #
- # Nick Walker (nickwalker@email.com)
- #
-+. /etc/sysconfig/network-scripts/network-functions
- 
- if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
- 	rm -f /etc/ppp/resolv.prev
- 	if [ -f /etc/resolv.conf ]; then
- 		cp /etc/resolv.conf /etc/ppp/resolv.prev
--		grep domain /etc/ppp/resolv.prev > /etc/resolv.conf
--		grep search /etc/ppp/resolv.prev >> /etc/resolv.conf
--		cat /etc/ppp/resolv.conf >> /etc/resolv.conf
-+		rscf=/etc/ppp/resolv.new
-+		grep domain /etc/ppp/resolv.prev > $rscf
-+		grep search /etc/ppp/resolv.prev >> $rscf
-+		if [ -f /etc/ppp/resolv.conf ]; then
-+			cat /etc/ppp/resolv.conf >> $rscf
-+		fi
-+		change_resolv_conf $rscf
-+		rm -f $rscf
- 	else
--		cp /etc/ppp/resolv.conf /etc
-+		change_resolv_conf /etc/ppp/resolv.conf
- 	fi
- fi
- 

diff --git a/ppp-2.5.1-gcc15.patch b/ppp-2.5.1-gcc15.patch
deleted file mode 100644
index 5f13bc9..0000000
--- a/ppp-2.5.1-gcc15.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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;

diff --git a/ppp.spec b/ppp.spec
index 11e5d76..223d121 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -17,13 +17,13 @@ Name:    ppp
 # sstp-client
 # These all need to be patched (if necessary) and rebuilt for new
 # versions of ppp.
-Version: 2.5.1
-Release: 7%{?dist}
+Version: 2.5.3
+Release: 1%{?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
 
-Source0: https://github.com/paulusmack/ppp/archive/ppp-%{version}.tar.gz
+Source0: https://github.com/paulusmack/ppp/archive/v%{version}/ppp-%{version}.tar.gz
 Source1: ppp-pam.conf
 Source2: ppp-logrotate.conf
 Source3: ppp-tmpfiles.conf
@@ -37,11 +37,6 @@ Source12: ppp-watch.tar.xz
 Source13: ipv6-up.initscripts
 Source14: ipv6-down.initscripts
 
-# Fedora-specific
-Patch0: ppp-2.5.0-use-change-resolv-function.patch
-# Fix build with GCC 15
-Patch1: ppp-2.5.1-gcc15.patch
-
 BuildRequires: libtool
 BuildRequires: autoconf
 BuildRequires: automake
@@ -84,7 +79,7 @@ Requires: pkgconf-pkg-config
 This package contains the header files for building plugins for ppp.
 
 %prep
-%autosetup -p1 -n %{name}-%{name}-%{version}
+%autosetup -p1
 
 tar -xJf %{SOURCE12}
 
@@ -199,6 +194,10 @@ install -m0644 -D ppp.sysusers.conf %{buildroot}%{_sysusersdir}/ppp.conf
 %{_libdir}/pkgconfig/pppd.pc
 
 %changelog
+* Thu Jun 04 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.3-1
+- New version
+  Resolves: rhbz#2335040
+
 * Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

diff --git a/sources b/sources
index 117d746..c8f4254 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ppp-2.5.1.tar.gz) = 2e2a113fbb9ea1395ddde8711696e741b5ae66f5d5dc3f7d26be10bc09c605d13a972f067b7b4335f32d1f6952f5af8d59dec0cc28fa21d84664b236f0761216
+SHA512 (ppp-2.5.3.tar.gz) = ab9f46aab15c5d8f779ca86dd03b993edb85efcca55b3ac1e97e4e9f55ddf3daa9f4f6f152ccb35e38dea5b415364aaeb0f75fa9ed1e913e4a7636e45adef1af
 SHA512 (ppp-watch.tar.xz) = aee10735facf918b9a1e33408c9f19d8240c2cd265837da87ac9f58e097eece6bbe1abcaf426e2f10369d1368f6e9e68d2e07d005a19857f17d6318708ec438a