diff --git a/gating.yaml b/gating.yaml index 9b2646f..285eb64 100644 --- a/gating.yaml +++ b/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/tier1-public.functional} - + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional} + #Rawhide --- !Policy product_versions: @@ -13,14 +13,16 @@ product_versions: decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} - + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional} + #gating rhel --- !Policy product_versions: - rhel-* decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional} + - !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-internal.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional} diff --git a/plans.fmf b/plans.fmf deleted file mode 100644 index 1150d22..0000000 --- a/plans.fmf +++ /dev/null @@ -1,47 +0,0 @@ -/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 diff --git a/plans/public.fmf b/plans/public.fmf new file mode 100644 index 0000000..78f4e0e --- /dev/null +++ b/plans/public.fmf @@ -0,0 +1,7 @@ +summary: Test plan with all Fedora tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/ppp.git +execute: + how: tmt + diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf new file mode 100644 index 0000000..3447b11 --- /dev/null +++ b/plans/tier1-internal.fmf @@ -0,0 +1,12 @@ +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. 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-tmpfiles.conf b/ppp-tmpfiles.conf index a48a271..1097cbe 100644 --- a/ppp-tmpfiles.conf +++ b/ppp-tmpfiles.conf @@ -1 +1 @@ -d /run/pppd/lock 0755 root root +d /run/ppp 0755 root root diff --git a/ppp.spec b/ppp.spec index cdceb10..97e7889 100644 --- a/ppp.spec +++ b/ppp.spec @@ -17,10 +17,18 @@ Name: ppp # sstp-client # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. -Version: 2.5.1 -Release: 6%{?dist} +Version: 2.5.0 +Release: 7%{?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 +# Add licenses: +# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/441 +# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/442 +# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/443 +# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/444 +# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/445 +# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/446 +# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/447 +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 URL: http://www.samba.org/ppp Source0: https://github.com/paulusmack/ppp/archive/ppp-%{version}.tar.gz @@ -39,8 +47,6 @@ 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 @@ -53,7 +59,6 @@ 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,6 +69,8 @@ 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} @@ -88,15 +95,10 @@ This package contains the header files for building plugins for ppp. tar -xJf %{SOURCE12} -# Create a sysusers.d config file -cat >ppp.sysusers.conf </dev/null 2>&1 || /usr/sbin/groupadd -r -g 40 dip >/dev/null 2>&1 || : %post %tmpfiles_create ppp.conf @@ -179,8 +169,7 @@ install -m0644 -D ppp.sysusers.conf %{buildroot}%{_sysusersdir}/ppp.conf %{_mandir}/man8/pppoe-discovery.8* %{_mandir}/man8/ppp-watch.8* %{_libdir}/pppd -%ghost %dir %{_rundir}/pppd -%ghost %dir %{_rundir}/pppd/lock +%ghost %dir %{_rundir}/ppp %dir %{_sysconfdir}/logrotate.d %attr(700, root, root) %dir %{_localstatedir}/log/ppp %config(noreplace) %{_sysconfdir}/ppp/eaptls-client @@ -191,7 +180,6 @@ install -m0644 -D ppp.sysusers.conf %{buildroot}%{_sysusersdir}/ppp.conf %config(noreplace) %{_sysconfdir}/pam.d/ppp %config(noreplace) %{_sysconfdir}/logrotate.d/ppp %{_tmpfilesdir}/ppp.conf -%{_sysusersdir}/ppp.conf %files devel %{_includedir}/pppd @@ -199,43 +187,6 @@ install -m0644 -D ppp.sysusers.conf %{buildroot}%{_sysusersdir}/ppp.conf %{_libdir}/pkgconfig/pppd.pc %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 2.5.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.5.1-5 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Sat Feb 01 2025 Björn Esser - 2.5.1-4 -- Add explicit BR: libxcrypt-devel - -* Sat Jan 18 2025 Fedora Release Engineering - 2.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 2.5.1-2 -- Rebuilt for the bin-sbin merge (2nd attempt) - -* Sat Nov 16 2024 Jaroslav Škarvada - 2.5.1-1 -- New version - Resolves: rhbz#2313209 - -* Fri Jul 19 2024 Fedora Release Engineering - 2.5.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek - 2.5.0-12 -- Rebuilt for the bin-sbin merge - -* Mon Jun 24 2024 Jaroslav Škarvada - 2.5.0-11 -- Fixed radiusclient parser - -* Wed Jun 12 2024 Jaroslav Škarvada - 2.5.0-10 -- Openssl engine API is deprecated for a while thus disable it - -* Thu May 9 2024 Jaroslav Škarvada - 2.5.0-9 -- Pre-created upstream default lock dir - -* Sun Apr 14 2024 Jaroslav Škarvada - 2.5.0-8 -- Added missing and recently approved SPDX licenses - * Wed Feb 21 2024 Kalev Lember - 2.5.0-7 - Obsolete dropped network-scripts-ppp subpackage diff --git a/sources b/sources index 117d746..010a7fe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ppp-2.5.1.tar.gz) = 2e2a113fbb9ea1395ddde8711696e741b5ae66f5d5dc3f7d26be10bc09c605d13a972f067b7b4335f32d1f6952f5af8d59dec0cc28fa21d84664b236f0761216 +SHA512 (ppp-2.5.0.tar.gz) = cf62410a952053f9aa71c5179453831152e958fcad9e77df2ddac864e39aa71af0b746e54b91e8fa3ad6295d6d2b1bb736e36dc05521b495f573468679133324 SHA512 (ppp-watch.tar.xz) = aee10735facf918b9a1e33408c9f19d8240c2cd265837da87ac9f58e097eece6bbe1abcaf426e2f10369d1368f6e9e68d2e07d005a19857f17d6318708ec438a