From 3e399582f0c3d72734e14b93870524c0e35d7d35 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 22:16:49 +0000 Subject: [PATCH 01/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ppp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ppp.spec b/ppp.spec index b2d6d21..cc14a39 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,7 +18,7 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Point-to-Point Protocol daemon License: BSD and LGPLv2+ and GPLv2+ and Public Domain URL: http://www.samba.org/ppp @@ -189,6 +189,9 @@ mkdir -p %{buildroot}%{_rundir}/ppp %{_libdir}/pkgconfig/pppd.pc %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 2.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jul 25 2023 Yaakov Selkowitz - 2.5.0-3 - Use bundled ATM in RHEL builds From 609188a4a4546d9663ef7e49ed823a1cd0c01bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 24 Jan 2024 16:31:03 +0100 Subject: [PATCH 02/25] Converted license to SPDX --- ppp.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ppp.spec b/ppp.spec index cc14a39..62ef388 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,9 +18,17 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Point-to-Point Protocol daemon -License: BSD and LGPLv2+ and GPLv2+ and Public Domain +# 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 @@ -189,6 +197,9 @@ mkdir -p %{buildroot}%{_rundir}/ppp %{_libdir}/pkgconfig/pppd.pc %changelog +* Wed Jan 24 2024 Jaroslav Škarvada - 2.5.0-5 +- Converted license to SPDX + * Sun Jan 21 2024 Fedora Release Engineering - 2.5.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 93a27465a6939919e74245d56af6fd9083044bf6 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Thu, 1 Feb 2024 15:02:25 +0200 Subject: [PATCH 03/25] Adapt ipv6-{up,down} to initscripts-less world Phase out use of initscripts for ipv6 if not installed --- ipv6-down | 58 +------------------------ ipv6-down.initscripts | 56 ++++++++++++++++++++++++ ipv6-up | 99 +------------------------------------------ ipv6-up.initscripts | 99 +++++++++++++++++++++++++++++++++++++++++++ ppp.spec | 6 +++ 5 files changed, 163 insertions(+), 155 deletions(-) create mode 100644 ipv6-down.initscripts create mode 100644 ipv6-up.initscripts diff --git a/ipv6-down b/ipv6-down index b290585..36e0c5f 100644 --- a/ipv6-down +++ b/ipv6-down @@ -6,65 +6,9 @@ # # This file should not be modified -- make local changes to # /etc/ppp/ipv6-down.local instead -# -# -# Taken from: -# (P) & (C) 2001-2006 by Peter Bieringer -# -# You will find more information on the initscripts-ipv6 homepage at -# http://www.deepspace6.net/projects/initscripts-ipv6.html -# -# RHL integration assistance by Pekka Savola -# -# Calling parameters: -# $1: interface name -# $6: logical interface name (set by pppd option ipparam) -# -# Version 2006-08-02 -# -# Uses following information from /etc/sysconfig/network-scripts/ifcfg-$1: -# IPV6INIT=yes|no: controls IPv6 configuration for this interface -# - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -export PATH - -LOGDEVICE=$6 -REALDEVICE=$1 - -[ -f /etc/sysconfig/network ] || exit 0 -. /etc/sysconfig/network - -cd /etc/sysconfig/network-scripts -. ./network-functions - -CONFIG=$LOGDEVICE -[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG -source_config - -[ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1 -. /etc/sysconfig/network-scripts/network-functions-ipv6 +[ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] && /etc/ppp/ipv6-down.initscripts "$@" [ -x /etc/ppp/ipv6-down.local ] && /etc/ppp/ipv6-down.local "$@" - -if [ "$IPV6_CONTROL_RADVD" = "yes" ]; then - # Control running radvd - ipv6_trigger_radvd down "$IPV6_RADVD_TRIGGER_ACTION" $IPV6_RADVD_PIDFILE -fi - -# IPv6 test, no module loaded, exit if system is not IPv6-ready -ipv6_test testonly || exit 0 - -# Test device status -ipv6_test_device_status $REALDEVICE -if [ $? != 0 -a $? != 11 ]; then - # device doesn't exist or other problem occurs - exit 1 -fi - -# Delete all current configured IPv6 addresses on this interface -ipv6_cleanup_device $REALDEVICE - exit 0 diff --git a/ipv6-down.initscripts b/ipv6-down.initscripts new file mode 100644 index 0000000..c8f228f --- /dev/null +++ b/ipv6-down.initscripts @@ -0,0 +1,56 @@ +#!/bin/sh +# +# +# Taken from: +# (P) & (C) 2001-2006 by Peter Bieringer +# +# You will find more information on the initscripts-ipv6 homepage at +# http://www.deepspace6.net/projects/initscripts-ipv6.html +# +# RHL integration assistance by Pekka Savola +# +# Calling parameters: +# $1: interface name +# $6: logical interface name (set by pppd option ipparam) +# +# Version 2006-08-02 +# +# Uses following information from /etc/sysconfig/network-scripts/ifcfg-$1: +# IPV6INIT=yes|no: controls IPv6 configuration for this interface +# +PATH=/sbin:/usr/sbin:/bin:/usr/bin +export PATH + +LOGDEVICE=$6 +REALDEVICE=$1 + +[ -f /etc/sysconfig/network ] || exit 0 +. /etc/sysconfig/network + +cd /etc/sysconfig/network-scripts +. ./network-functions + +CONFIG=$LOGDEVICE +[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG +source_config + +[ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1 +. /etc/sysconfig/network-scripts/network-functions-ipv6 + +if [ "$IPV6_CONTROL_RADVD" = "yes" ]; then + # Control running radvd + ipv6_trigger_radvd down "$IPV6_RADVD_TRIGGER_ACTION" $IPV6_RADVD_PIDFILE +fi + +# IPv6 test, no module loaded, exit if system is not IPv6-ready +ipv6_test testonly || exit 0 + +# Test device status +ipv6_test_device_status $REALDEVICE +if [ $? != 0 -a $? != 11 ]; then + # device doesn't exist or other problem occurs + exit 1 +fi + +# Delete all current configured IPv6 addresses on this interface +ipv6_cleanup_device $REALDEVICE diff --git a/ipv6-up b/ipv6-up index 059afec..623631a 100644 --- a/ipv6-up +++ b/ipv6-up @@ -7,105 +7,8 @@ # This file should not be modified -- make local changes to # /etc/ppp/ipv6-up.local instead # -# Taken from: -# (P) & (C) 2001-2006 by Peter Bieringer -# -# You will find more information on the initscripts-ipv6 homepage at -# http://www.deepspace6.net/projects/initscripts-ipv6.html -# -# RHL integration assistance by Pekka Savola -# -# Calling parameters: -# $1: interface name -# $6: logical interface name (set by pppd option ipparam) -# -# -# Version: 2006-08-02 -# -# Uses following information from "/etc/sysconfig/network": -# IPV6_DEFAULTDEV=: controls default route (optional) -# -# Uses following information from "/etc/sysconfig/network-scripts/ifcfg-$1": -# IPV6INIT=yes|no: controls IPv6 configuration for this interface -# IPV6ADDR=[/]: specify primary static IPv6 address -# IPV6ADDR_SECONDARIES="[/] ..." (optional) -# IPV6_MTU=: controls IPv6 MTU for this link (optional) -# - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -export PATH - -LOGDEVICE=$6 -REALDEVICE=$1 - -[ -f /etc/sysconfig/network ] || exit 0 -. /etc/sysconfig/network - -cd /etc/sysconfig/network-scripts -. ./network-functions -. ./network-functions-ipv6 - -CONFIG=$LOGDEVICE -[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG -source_config - -# Test whether IPv6 configuration is disabled for this interface -[[ "$IPV6INIT" = [nN0]* ]] && exit 0 - -[ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1 -. /etc/sysconfig/network-scripts/network-functions-ipv6 - -# IPv6 test, module loaded, exit if system is not IPv6-ready -ipv6_test || exit 1 - -# Test device status -ipv6_test_device_status $REALDEVICE -if [ $? != 0 -a $? != 11 ]; then - # device doesn't exist or other problem occurs - exit 1 -fi - -# Setup IPv6 address on specified interface -if [ -n "$IPV6ADDR" ]; then - ipv6_add_addr_on_device $REALDEVICE $IPV6ADDR || exit 1 -fi - -# Set IPv6 MTU, if given -if [ -n "$IPV6_MTU" ]; then - ipv6_set_mtu $REALDEVICE $IPV6_MTU -fi - -# Setup additional IPv6 addresses from list, if given -if [ -n "$IPV6ADDR_SECONDARIES" ]; then - for ipv6addr in $IPV6ADDR_SECONDARIES; do - ipv6_add_addr_on_device $REALDEVICE $ipv6addr - done -fi - -# Setup default IPv6 route through device -if [ "$IPV6_DEFAULTDEV" = "$LOGDEVICE" ]; then - ipv6_set_default_route "" "$REALDEVICE" "$REALDEVICE" -fi - -# Setup additional static IPv6 routes on specified interface, if given -if [ -f /etc/sysconfig/static-routes-ipv6 ]; then - LC_ALL=C grep -w "^$LOGDEVICE" /etc/sysconfig/static-routes-ipv6 | while read device args; do - ipv6_add_route $args $REALDEVICE - done -fi - -# Setup additional static IPv6 routes (newer config style) -if [ -f "/etc/sysconfig/network-scripts/route6-$DEVICE" ]; then - sed -ne 's/#.*//' -e '/[^[:space:]]/p' "/etc/sysconfig/network-scripts/route6-$DEVICE" | while read line; do - /sbin/ip -6 route add $line - done -fi - -if [ "$IPV6_CONTROL_RADVD" = "yes" ]; then - # Control running radvd - ipv6_trigger_radvd up "$IPV6_RADVD_TRIGGER_ACTION" $IPV6_RADVD_PIDFILE -fi +[ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] && /etc/ppp/ipv6-up.initscripts "$@" [ -x /etc/ppp/ipv6-up.local ] && /etc/ppp/ipv6-up.local "$@" diff --git a/ipv6-up.initscripts b/ipv6-up.initscripts new file mode 100644 index 0000000..98d6d63 --- /dev/null +++ b/ipv6-up.initscripts @@ -0,0 +1,99 @@ +#!/bin/sh +# Taken from: +# (P) & (C) 2001-2006 by Peter Bieringer +# +# You will find more information on the initscripts-ipv6 homepage at +# http://www.deepspace6.net/projects/initscripts-ipv6.html +# +# RHL integration assistance by Pekka Savola +# +# Calling parameters: +# $1: interface name +# $6: logical interface name (set by pppd option ipparam) +# +# +# Version: 2006-08-02 +# +# Uses following information from "/etc/sysconfig/network": +# IPV6_DEFAULTDEV=: controls default route (optional) +# +# Uses following information from "/etc/sysconfig/network-scripts/ifcfg-$1": +# IPV6INIT=yes|no: controls IPv6 configuration for this interface +# IPV6ADDR=[/]: specify primary static IPv6 address +# IPV6ADDR_SECONDARIES="[/] ..." (optional) +# IPV6_MTU=: controls IPv6 MTU for this link (optional) +# + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +export PATH + +LOGDEVICE=$6 +REALDEVICE=$1 + +[ -f /etc/sysconfig/network ] || exit 0 +. /etc/sysconfig/network + +cd /etc/sysconfig/network-scripts +. ./network-functions +. ./network-functions-ipv6 + +CONFIG=$LOGDEVICE +[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG +source_config + +# Test whether IPv6 configuration is disabled for this interface +[[ "$IPV6INIT" = [nN0]* ]] && exit 0 + +[ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1 +. /etc/sysconfig/network-scripts/network-functions-ipv6 + +# IPv6 test, module loaded, exit if system is not IPv6-ready +ipv6_test || exit 1 + +# Test device status +ipv6_test_device_status $REALDEVICE +if [ $? != 0 -a $? != 11 ]; then + # device doesn't exist or other problem occurs + exit 1 +fi + +# Setup IPv6 address on specified interface +if [ -n "$IPV6ADDR" ]; then + ipv6_add_addr_on_device $REALDEVICE $IPV6ADDR || exit 1 +fi + +# Set IPv6 MTU, if given +if [ -n "$IPV6_MTU" ]; then + ipv6_set_mtu $REALDEVICE $IPV6_MTU +fi + +# Setup additional IPv6 addresses from list, if given +if [ -n "$IPV6ADDR_SECONDARIES" ]; then + for ipv6addr in $IPV6ADDR_SECONDARIES; do + ipv6_add_addr_on_device $REALDEVICE $ipv6addr + done +fi + +# Setup default IPv6 route through device +if [ "$IPV6_DEFAULTDEV" = "$LOGDEVICE" ]; then + ipv6_set_default_route "" "$REALDEVICE" "$REALDEVICE" +fi + +# Setup additional static IPv6 routes on specified interface, if given +if [ -f /etc/sysconfig/static-routes-ipv6 ]; then + LC_ALL=C grep -w "^$LOGDEVICE" /etc/sysconfig/static-routes-ipv6 | while read device args; do + ipv6_add_route $args $REALDEVICE + done +fi + +# Setup additional static IPv6 routes (newer config style) +if [ -f "/etc/sysconfig/network-scripts/route6-$DEVICE" ]; then + sed -ne 's/#.*//' -e '/[^[:space:]]/p' "/etc/sysconfig/network-scripts/route6-$DEVICE" | while read line; do + /sbin/ip -6 route add $line + done +fi + +if [ "$IPV6_CONTROL_RADVD" = "yes" ]; then + # Control running radvd + ipv6_trigger_radvd up "$IPV6_RADVD_TRIGGER_ACTION" $IPV6_RADVD_PIDFILE +fi diff --git a/ppp.spec b/ppp.spec index 62ef388..38a8cad 100644 --- a/ppp.spec +++ b/ppp.spec @@ -44,6 +44,8 @@ Source9: ipv6-up Source10: ifup-ppp Source11: ifdown-ppp 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 @@ -136,6 +138,8 @@ install -p %{SOURCE6} %{buildroot}%{_sysconfdir}/ppp/ip-up install -p %{SOURCE7} %{buildroot}%{_sysconfdir}/ppp/ip-up.ipv6to4 install -p %{SOURCE8} %{buildroot}%{_sysconfdir}/ppp/ipv6-down install -p %{SOURCE9} %{buildroot}%{_sysconfdir}/ppp/ipv6-up +install -p %{SOURCE13} %{buildroot}%{_sysconfdir}/ppp/ipv6-down.initscripts +install -p %{SOURCE14} %{buildroot}%{_sysconfdir}/ppp/ipv6-up.initscripts install -d %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ install -p %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ppp @@ -164,7 +168,9 @@ mkdir -p %{buildroot}%{_rundir}/ppp %{_sysconfdir}/ppp/ip-up.ipv6to4 %{_sysconfdir}/ppp/ip-down.ipv6to4 %{_sysconfdir}/ppp/ipv6-up +%{_sysconfdir}/ppp/ipv6-up.initscripts %{_sysconfdir}/ppp/ipv6-down +%{_sysconfdir}/ppp/ipv6-down.initscripts %{_sysconfdir}/ppp/openssl.cnf %{_mandir}/man8/chat.8* %{_mandir}/man8/pppd.8* From 0f6bdc6ffe49833580f2c43ba308d11cf2d4db9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 14 Feb 2024 18:03:17 +0100 Subject: [PATCH 04/25] Dropped network scripts Resolves: rhbz#2262981 --- ifdown-ppp | 51 ----------------- ifup-ppp | 157 ----------------------------------------------------- ppp.spec | 25 ++------- 3 files changed, 5 insertions(+), 228 deletions(-) delete mode 100755 ifdown-ppp delete mode 100755 ifup-ppp diff --git a/ifdown-ppp b/ifdown-ppp deleted file mode 100755 index fca6463..0000000 --- a/ifdown-ppp +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/bash - -cd /etc/sysconfig/network-scripts -. ./network-functions - -CONFIG=$1 -source_config - -if [ "$TYPE" = "xDSL" ] && [ -x /usr/sbin/adsl-stop ] ; then - adsl-stop /etc/sysconfig/network-scripts/$CONFIG - exit $? -fi - -CONFIG=${CONFIG##ifcfg-} - -if [ "${DEMAND}" = "yes" ] && [ -f /var/run/ppp-${CONFIG}.pid ] ; then - PID=$(head -1 /var/run/ppp-${CONFIG}.pid) - kill -TERM ${PID} - sleep 2 - [ ! -d /proc/${PID} ] && exit 0 - sleep 5 - [ ! -d /proc/${PID} ] && exit 0 - kill -TERM ${PID} - [ ! -d /proc/${PID} ] && exit 0 - exit 1 -fi - -file=/var/run/pppwatch-${DEVICE}.pid - -if [ ! -f $file ]; then - # ppp isn't running, or we didn't start it - exit 0 -fi - -PID=$(cat $file) -[ -n "${PID}" ] || exit 1 - -kill -TERM ${PID} > /dev/null 2>&1 -[ ! -d /proc/${PID} ] && exit 0 -sleep 2 -[ ! -d /proc/${PID} ] && exit 0 -sleep 5 -[ ! -d /proc/${PID} ] && exit 0 -sleep 10 -[ ! -d /proc/${PID} ] && exit 0 - -# killing ppp-watch twice in a row causes it to send a SIGKILL to pppd pgrp -kill -TERM ${PID} > /dev/null 2>&1 -[ ! -d /proc/${PID} ] && exit 0 - -exit 1 diff --git a/ifup-ppp b/ifup-ppp deleted file mode 100755 index fb30639..0000000 --- a/ifup-ppp +++ /dev/null @@ -1,157 +0,0 @@ -#! /bin/bash - -. /etc/init.d/functions - -cd /etc/sysconfig/network-scripts -. ./network-functions - -# ifup-post for PPP is handled through /etc/ppp/ip-up -if [ "${1}" = daemon ] ; then - # we've been called from ppp-watch, so don't invoke it for persistence - shift -else - # just in case a full path to the configuration file is passed in - CONFIG=${1##*/} # CONFIG=$(basename $1) - [ -f "${CONFIG}" ] || CONFIG=ifcfg-${1} - source_config - # don't start ppp-watch by xDSL - if [ "${DEMAND}" != yes -a "$TYPE" != "xDSL" ] ; then - # let ppp-watch do the right thing - exec /sbin/ppp-watch "${CONFIG##ifcfg-}" "$2" - fi -fi - -CONFIG=$1 -[ -f "${CONFIG}" ] || CONFIG=ifcfg-${1} -source_config - -if [ -z "${DISCONNECTTIMEOUT}" ]; then - DISCONNECTTIMEOUT=2 -fi - -if [ -z "${RETRYTIMEOUT}" ]; then - RETRYTIMEOUT=30 -fi - -if [ -z "${IDLETIMEOUT}" ]; then - IDLETIMEOUT=600 -fi - -if [ "${2}" = "boot" -a "${ONBOOT}" = "no" ]; then - exit -fi - -[ -x /usr/sbin/pppd ] || { - echo $"pppd does not exist or is not executable" - echo $"ifup-ppp for ${DEVICE} exiting" - /usr/bin/logger -p daemon.info -t ifup-ppp \ - $"pppd does not exist or is not executable for ${DEVICE}" - exit 1 -} - -# check that xDSL connection -if [ "$TYPE" = "xDSL" ] ; then - if [ -x /usr/sbin/adsl-start ] ; then - adsl-start /etc/sysconfig/network-scripts/$CONFIG - exit $? - else - /usr/bin/logger -p daemon.info -t ifup-ppp \ - $"adsl-start does not exist or is not executable for ${DEVICE}" - exit 1 - fi -fi - -PEERCONF=/etc/ppp/peers/${DEVNAME} - -if [ "${DEBUG}" = "yes" ]; then - CHATDBG="-v" -fi - -if [ ! -f ${PEERCONF} ]; then - if [ -z "${WVDIALSECT}" ] ; then - CHATSCRIPT=/etc/sysconfig/network-scripts/chat-${DEVNAME} - [ -f ${CHATSCRIPT} ] || { - echo $"/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist" - echo $"ifup-ppp for ${DEVNAME} exiting" - /usr/bin/logger -p daemon.info -t ifup-ppp \ - $"/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist for ${DEVICE}" - exit 1 - } - fi - /usr/bin/logger -s -p daemon.notice -t ifup-ppp \ - $"Setting up a new ${PEERCONF} config file" - if [ -f /etc/ppp/peers/${DEVICE} ]; then - cp -f /etc/ppp/peers/${DEVICE} ${PEERCONF} - else - touch ${PEERCONF} - fi - if [ "${WVDIALSECT}" ]; then - echo "connect \"/usr/bin/wvdial --remotename ${DEVNAME} --chat '${WVDIALSECT}'\"" >> ${PEERCONF} - else - echo "connect \"/usr/sbin/chat ${CHATDBG} -f ${CHATSCRIPT}\"" >> ${PEERCONF} - fi -fi - -opts="lock" -if [ "${HARDFLOWCTL}" != no ] ; then - opts="$opts modem crtscts" -fi -if [ "${ESCAPECHARS}" != yes ] ; then - opts="$opts asyncmap 00000000" -fi -if [ "${DEFROUTE}" != no ] ; then - # pppd will no longer delete an existing default route - # so we have to help it out a little here. - DEFRT=$(ip route list match 0.0.0.0/0) - [ -n "${DEFRT}" ] && echo "$DEFRT" > /etc/default-routes - echo "$DEFRT" | while read spec; do - ip route del $spec; - done - opts="$opts defaultroute" -fi -if [ "${PEERDNS}" != no ] ; then - cp -f /etc/resolv.conf /etc/resolv.conf.save - opts="$opts usepeerdns" -fi -if [ -n "${MRU}" ] ; then - opts="$opts mru ${MRU}" -fi -if [ -n "${MTU}" ] ; then - opts="$opts mtu ${MTU}" -fi -if [ -n "${IPADDR}${REMIP}" ] ; then - # if either IP address is set, the following will work. - opts="$opts ${IPADDR}:${REMIP}" -fi -if [ -n "${PAPNAME}" ] ; then - opts="$opts user ${PAPNAME} remotename ${DEVNAME}" -fi -if [ "${DEBUG}" = yes ] ; then - opts="$opts debug" -fi - -if [ ${DEMAND} = yes ] ; then - opts="$opts demand ktune idle ${IDLETIMEOUT} holdoff ${RETRYTIMEOUT}" - exec= -else - opts="$opts nodetach" - exec=exec -fi - -/usr/bin/logger -p daemon.info -t ifup-ppp \ - $"pppd started for ${DEVNAME} on ${MODEMPORT} at ${LINESPEED}" - -$exec pppd $opts ${MODEMPORT} ${LINESPEED} \ - ipparam ${DEVNAME} linkname ${DEVNAME} call ${DEVNAME}\ - noauth \ - ${PPPOPTIONS} || exit - -if [ "${DEMAND}" = "yes" ] ; then - # pppd is a tad slow to write the pid-file. - sleep 2 - if [ -f /var/run/ppp-${DEVNAME}.pid ] ; then - REALDEVICE=$(tail -1 /var/run/ppp-${DEVNAME}.pid) - /etc/sysconfig/network-scripts/ifup-routes ${REALDEVICE} ${DEVNAME} - fi -fi - diff --git a/ppp.spec b/ppp.spec index 38a8cad..a8dbf03 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,7 +18,7 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Point-to-Point Protocol daemon # Add licenses: # https://gitlab.com/fedora/legal/fedora-license-data/-/issues/441 @@ -41,8 +41,6 @@ Source6: ip-up Source7: ip-up.ipv6to4 Source8: ipv6-down Source9: ipv6-up -Source10: ifup-ppp -Source11: ifdown-ppp Source12: ppp-watch.tar.xz Source13: ipv6-up.initscripts Source14: ipv6-down.initscripts @@ -81,15 +79,6 @@ transmitting datagrams over serial point-to-point links. PPP is usually used to dial in to an ISP (Internet Service Provider) or other organization over a modem and phone line. -%package -n network-scripts-%{name} -Summary: PPP legacy network service support -Requires: network-scripts -Supplements: (%{name} and network-scripts) - -%description -n network-scripts-%{name} -This provides the ifup and ifdown scripts for use with the legacy network -service. - %package devel Summary: Headers for ppp plugin development Requires: %{name}%{?_isa} = %{version}-%{release} @@ -141,10 +130,6 @@ install -p %{SOURCE9} %{buildroot}%{_sysconfdir}/ppp/ipv6-up install -p %{SOURCE13} %{buildroot}%{_sysconfdir}/ppp/ipv6-down.initscripts install -p %{SOURCE14} %{buildroot}%{_sysconfdir}/ppp/ipv6-up.initscripts -install -d %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ -install -p %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ppp -install -p %{SOURCE11} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifdown-ppp - # ghosts mkdir -p %{buildroot}%{_rundir}/ppp @@ -193,16 +178,16 @@ mkdir -p %{buildroot}%{_rundir}/ppp %config(noreplace) %{_sysconfdir}/logrotate.d/ppp %{_tmpfilesdir}/ppp.conf -%files -n network-scripts-%{name} -%{_sysconfdir}/sysconfig/network-scripts/ifdown-ppp -%{_sysconfdir}/sysconfig/network-scripts/ifup-ppp - %files devel %{_includedir}/pppd %doc PLUGINS %{_libdir}/pkgconfig/pppd.pc %changelog +* Tue Feb 13 2024 Jaroslav Škarvada - 2.5.0-6 +- Dropped network scripts + Resolves: rhbz#2262981 + * Wed Jan 24 2024 Jaroslav Škarvada - 2.5.0-5 - Converted license to SPDX From d6144dfaf9061ff160d88310c81bbc51c6be7401 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 21 Feb 2024 11:52:37 +0100 Subject: [PATCH 05/25] Obsolete dropped network-scripts-ppp subpackage --- ppp.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ppp.spec b/ppp.spec index a8dbf03..97e7889 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,7 +18,7 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The Point-to-Point Protocol daemon # Add licenses: # https://gitlab.com/fedora/legal/fedora-license-data/-/issues/441 @@ -72,6 +72,9 @@ Requires: systemd Requires(pre): /usr/bin/getent Requires(pre): /usr/sbin/groupadd +# Subpackage removed and obsoleted in F40 +Obsoletes: network-scripts-ppp < %{version}-%{release} + %description The ppp package contains the PPP (Point-to-Point Protocol) daemon and documentation for PPP support. The PPP protocol provides a method for @@ -184,6 +187,9 @@ mkdir -p %{buildroot}%{_rundir}/ppp %{_libdir}/pkgconfig/pppd.pc %changelog +* Wed Feb 21 2024 Kalev Lember - 2.5.0-7 +- Obsolete dropped network-scripts-ppp subpackage + * Tue Feb 13 2024 Jaroslav Škarvada - 2.5.0-6 - Dropped network scripts Resolves: rhbz#2262981 From 443df8f965e04c4bf52eaa21280cdbd08d58ffe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 9 Apr 2024 16:02:23 +0200 Subject: [PATCH 06/25] Added some missing SPDX licenses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- ppp.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ppp.spec b/ppp.spec index 97e7889..b42b2d2 100644 --- a/ppp.spec +++ b/ppp.spec @@ -21,14 +21,8 @@ Version: 2.5.0 Release: 7%{?dist} Summary: The Point-to-Point Protocol daemon # 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 +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 URL: http://www.samba.org/ppp Source0: https://github.com/paulusmack/ppp/archive/ppp-%{version}.tar.gz From 80279e6e879c7c06ac43a8be6409c78a6c42381e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sun, 14 Apr 2024 21:57:15 +0200 Subject: [PATCH 07/25] Added missing and recently approved SPDX licenses --- ppp.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ppp.spec b/ppp.spec index b42b2d2..a87b136 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,11 +18,9 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The Point-to-Point Protocol daemon -# Add licenses: -# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/444 -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 +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 @@ -181,6 +179,9 @@ mkdir -p %{buildroot}%{_rundir}/ppp %{_libdir}/pkgconfig/pppd.pc %changelog +* 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 From e8892074678e5386d7046d604387a6894168e6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 11 Apr 2024 20:12:15 +0200 Subject: [PATCH 08/25] Fix installation when %_sbindir==%_bindir --- ppp.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ppp.spec b/ppp.spec index a87b136..40b46d6 100644 --- a/ppp.spec +++ b/ppp.spec @@ -128,6 +128,10 @@ install -p %{SOURCE14} %{buildroot}%{_sysconfdir}/ppp/ipv6-up.initscripts # ghosts mkdir -p %{buildroot}%{_rundir}/ppp +%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 || : From eea1551e441d12519057055422f3020936220a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 9 May 2024 18:09:49 +0200 Subject: [PATCH 09/25] Pre-created upstream default lock dir --- ppp-tmpfiles.conf | 2 +- ppp.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ppp-tmpfiles.conf b/ppp-tmpfiles.conf index 1097cbe..a48a271 100644 --- a/ppp-tmpfiles.conf +++ b/ppp-tmpfiles.conf @@ -1 +1 @@ -d /run/ppp 0755 root root +d /run/pppd/lock 0755 root root diff --git a/ppp.spec b/ppp.spec index 40b46d6..79874ba 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,7 +18,7 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.0 -Release: 8%{?dist} +Release: 9%{?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 @@ -126,7 +126,7 @@ install -p %{SOURCE13} %{buildroot}%{_sysconfdir}/ppp/ipv6-down.initscripts install -p %{SOURCE14} %{buildroot}%{_sysconfdir}/ppp/ipv6-up.initscripts # ghosts -mkdir -p %{buildroot}%{_rundir}/ppp +mkdir -p %{buildroot}%{_rundir}/pppd/lock %if "%{_sbindir}" == "%{_bindir}" mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/ @@ -165,7 +165,8 @@ mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/ %{_mandir}/man8/pppoe-discovery.8* %{_mandir}/man8/ppp-watch.8* %{_libdir}/pppd -%ghost %dir %{_rundir}/ppp +%ghost %dir %{_rundir}/pppd +%ghost %dir %{_rundir}/pppd/lock %dir %{_sysconfdir}/logrotate.d %attr(700, root, root) %dir %{_localstatedir}/log/ppp %config(noreplace) %{_sysconfdir}/ppp/eaptls-client @@ -183,6 +184,9 @@ mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/ %{_libdir}/pkgconfig/pppd.pc %changelog +* 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 From a9c63b097bd6453a15691fd238eef2b8f7c1052a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 12 Jun 2024 15:31:39 +0200 Subject: [PATCH 10/25] Openssl engine API is deprecated for a while thus disable it --- ppp.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ppp.spec b/ppp.spec index 79874ba..c7e633a 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,7 +18,7 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.0 -Release: 9%{?dist} +Release: 10%{?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 @@ -90,7 +90,7 @@ tar -xJf %{SOURCE12} %build autoreconf -fi export CFLAGS="%{build_cflags} -fno-strict-aliasing" -%configure --enable-systemd --enable-cbcp --with-pam +%configure --enable-systemd --enable-cbcp --with-pam --disable-openssl-engine %make_build %make_build -C ppp-watch LDFLAGS="%{?build_ldflags} -pie" @@ -184,6 +184,9 @@ mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/ %{_libdir}/pkgconfig/pppd.pc %changelog +* 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 From 6707aaf9b1f6d789a79fd9e91200cfd80eb0c658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 24 Jun 2024 13:53:33 +0200 Subject: [PATCH 11/25] Fixed radiusclient parser --- ppp-2.5.0-radiusclient-parser-fix.patch | 49 +++++++++++++++++++++++++ ppp.spec | 8 +++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 ppp-2.5.0-radiusclient-parser-fix.patch diff --git a/ppp-2.5.0-radiusclient-parser-fix.patch b/ppp-2.5.0-radiusclient-parser-fix.patch new file mode 100644 index 0000000..a898e25 --- /dev/null +++ b/ppp-2.5.0-radiusclient-parser-fix.patch @@ -0,0 +1,49 @@ +From 7f89208b860ea0c41636410bfdb6a609b2772f47 Mon Sep 17 00:00:00 2001 +From: Eivind Naess +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 +--- + 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!"); diff --git a/ppp.spec b/ppp.spec index c7e633a..bc111db 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,7 +18,7 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.0 -Release: 10%{?dist} +Release: 11%{?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 @@ -40,6 +40,9 @@ 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 + BuildRequires: libtool BuildRequires: autoconf BuildRequires: automake @@ -184,6 +187,9 @@ mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/ %{_libdir}/pkgconfig/pppd.pc %changelog +* 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 From 6b4070612ff9c3456bcef69620a971f1a06a5622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 9 Jul 2024 13:49:47 +0200 Subject: [PATCH 12/25] Rebuilt for the bin-sbin merge https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin --- ppp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ppp.spec b/ppp.spec index bc111db..668f8d1 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,7 +18,7 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.0 -Release: 11%{?dist} +Release: 12%{?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 @@ -187,6 +187,9 @@ mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/ %{_libdir}/pkgconfig/pppd.pc %changelog +* 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 From 635ed2c4e49b0eb6d19a14f02902944455dc505c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 08:24:44 +0000 Subject: [PATCH 13/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ppp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ppp.spec b/ppp.spec index 668f8d1..ed6553f 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,7 +18,7 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.0 -Release: 12%{?dist} +Release: 13%{?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 @@ -187,6 +187,9 @@ mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/ %{_libdir}/pkgconfig/pppd.pc %changelog +* 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 From 8676c76d0b47be51e1094a9c3b0dbe7b255031f2 Mon Sep 17 00:00:00 2001 From: Ondrej Mejzlik Date: Mon, 14 Oct 2024 10:15:34 +0200 Subject: [PATCH 14/25] Update plans and gating --- gating.yaml | 12 +++++----- plans.fmf | 47 ++++++++++++++++++++++++++++++++++++++++ plans/public.fmf | 7 ------ plans/tier1-internal.fmf | 12 ---------- 4 files changed, 52 insertions(+), 26 deletions(-) create mode 100644 plans.fmf delete mode 100644 plans/public.fmf delete mode 100644 plans/tier1-internal.fmf diff --git a/gating.yaml b/gating.yaml index 285eb64..9b2646f 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/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} diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..1150d22 --- /dev/null +++ b/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 diff --git a/plans/public.fmf b/plans/public.fmf deleted file mode 100644 index 78f4e0e..0000000 --- a/plans/public.fmf +++ /dev/null @@ -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 - diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf deleted file mode 100644 index 3447b11..0000000 --- a/plans/tier1-internal.fmf +++ /dev/null @@ -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. From 239faff36a81e2f9c125afaed45e70ba934f9d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 16 Nov 2024 09:39:34 +0100 Subject: [PATCH 15/25] New version Resolves: rhbz#2313209 New version Resolves: rhbz#2313209 --- ppp.spec | 8 ++++++-- sources | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ppp.spec b/ppp.spec index ed6553f..dd0075d 100644 --- a/ppp.spec +++ b/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: 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 @@ -187,6 +187,10 @@ mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/ %{_libdir}/pkgconfig/pppd.pc %changelog +* 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 diff --git a/sources b/sources index 010a7fe..b93ac97 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (ppp-2.5.0.tar.gz) = cf62410a952053f9aa71c5179453831152e958fcad9e77df2ddac864e39aa71af0b746e54b91e8fa3ad6295d6d2b1bb736e36dc05521b495f573468679133324 -SHA512 (ppp-watch.tar.xz) = aee10735facf918b9a1e33408c9f19d8240c2cd265837da87ac9f58e097eece6bbe1abcaf426e2f10369d1368f6e9e68d2e07d005a19857f17d6318708ec438a +SHA512 (ppp-2.5.1.tar.gz) = 2e2a113fbb9ea1395ddde8711696e741b5ae66f5d5dc3f7d26be10bc09c605d13a972f067b7b4335f32d1f6952f5af8d59dec0cc28fa21d84664b236f0761216 From e3c470201bc6cd9fd9664df47349fe2178bbca9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 16 Nov 2024 09:45:56 +0100 Subject: [PATCH 16/25] New version Resolves: rhbz#2313209 New version Resolves: rhbz#2313209 --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index b93ac97..117d746 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (ppp-2.5.1.tar.gz) = 2e2a113fbb9ea1395ddde8711696e741b5ae66f5d5dc3f7d26be10bc09c605d13a972f067b7b4335f32d1f6952f5af8d59dec0cc28fa21d84664b236f0761216 +SHA512 (ppp-watch.tar.xz) = aee10735facf918b9a1e33408c9f19d8240c2cd265837da87ac9f58e097eece6bbe1abcaf426e2f10369d1368f6e9e68d2e07d005a19857f17d6318708ec438a From beb7e74ce7a786a9ff1811e30678b137af620d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 16 Nov 2024 09:58:25 +0100 Subject: [PATCH 17/25] Dropped radiusclient-parser-fix patch (upstreamed) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- ppp-2.5.0-radiusclient-parser-fix.patch | 49 ------------------------- ppp.spec | 3 -- 2 files changed, 52 deletions(-) delete mode 100644 ppp-2.5.0-radiusclient-parser-fix.patch diff --git a/ppp-2.5.0-radiusclient-parser-fix.patch b/ppp-2.5.0-radiusclient-parser-fix.patch deleted file mode 100644 index a898e25..0000000 --- a/ppp-2.5.0-radiusclient-parser-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7f89208b860ea0c41636410bfdb6a609b2772f47 Mon Sep 17 00:00:00 2001 -From: Eivind Naess -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 ---- - 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!"); diff --git a/ppp.spec b/ppp.spec index dd0075d..e22658a 100644 --- a/ppp.spec +++ b/ppp.spec @@ -40,9 +40,6 @@ 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 - BuildRequires: libtool BuildRequires: autoconf BuildRequires: automake From 8219d5b47f05bea6034920397cf937b52f51891e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 16 Nov 2024 10:22:50 +0100 Subject: [PATCH 18/25] Fixed installation of configuration files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- ppp.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ppp.spec b/ppp.spec index e22658a..3da4aaf 100644 --- a/ppp.spec +++ b/ppp.spec @@ -128,6 +128,14 @@ 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 From bd1d1479325c6964592ecc29bf10dfdbef56474d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 16 Nov 2024 11:09:22 +0100 Subject: [PATCH 19/25] Fixed spec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- ppp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ppp.spec b/ppp.spec index 3da4aaf..9c371c4 100644 --- a/ppp.spec +++ b/ppp.spec @@ -132,7 +132,7 @@ mkdir -p %{buildroot}%{_rundir}/pppd/lock pushd %{buildroot}%{_sysconfdir}/ppp for f in `ls *.example` do - mv "$f" "${f%%.example} + mv "$f" "${f%%.example}" done popd From 19a05d6af61664c3c65ae66a557f33fe4dbb9e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 12 Jan 2025 14:39:58 +0100 Subject: [PATCH 20/25] Rebuilt for the bin-sbin merge (2nd attempt) https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin --- ppp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ppp.spec b/ppp.spec index 9c371c4..d431a0b 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,7 +18,7 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -192,6 +192,9 @@ mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/ %{_libdir}/pkgconfig/pppd.pc %changelog +* 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 From b854e546bbaa42594ea206259fbf073292489959 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 10:44:02 +0000 Subject: [PATCH 21/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ppp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ppp.spec b/ppp.spec index d431a0b..cbd0167 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,7 +18,7 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?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 @@ -192,6 +192,9 @@ mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/ %{_libdir}/pkgconfig/pppd.pc %changelog +* 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) From dadb2d4d98a578f393f91536c04cdf6c93a57224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Feb 2025 19:56:45 +0100 Subject: [PATCH 22/25] Add explicit BR: libxcrypt-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- ppp.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ppp.spec b/ppp.spec index cbd0167..6086f25 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,7 +18,7 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.1 -Release: 3%{?dist} +Release: 4%{?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 @@ -51,6 +51,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 @@ -192,6 +193,9 @@ mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/ %{_libdir}/pkgconfig/pppd.pc %changelog +* 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 From 2e02872e926609aa240359830bc9bfe7d7277aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 16:44:31 +0100 Subject: [PATCH 23/25] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- ppp.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ppp.spec b/ppp.spec index 6086f25..1fa0bbc 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,7 +18,7 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.1 -Release: 4%{?dist} +Release: 5%{?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 @@ -62,8 +62,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} @@ -88,6 +86,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 </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 @@ -186,6 +189,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 @@ -193,6 +197,9 @@ mv %{buildroot}/usr/sbin/ppp-watch %{buildroot}%{_bindir}/ %{_libdir}/pkgconfig/pppd.pc %changelog +* 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 From 055f5683fd0028789391e47c1da866685b2189ee Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 25 Feb 2025 00:04:47 -0500 Subject: [PATCH 24/25] Fix build with GCC 15 --- ppp-2.5.1-gcc15.patch | 58 +++++++++++++++++++++++++++++++++++++++++++ ppp.spec | 2 ++ 2 files changed, 60 insertions(+) create mode 100644 ppp-2.5.1-gcc15.patch diff --git a/ppp-2.5.1-gcc15.patch b/ppp-2.5.1-gcc15.patch new file mode 100644 index 0000000..5f13bc9 --- /dev/null +++ b/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; diff --git a/ppp.spec b/ppp.spec index 1fa0bbc..d157c43 100644 --- a/ppp.spec +++ b/ppp.spec @@ -39,6 +39,8 @@ 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 From baad7a85acc667d45e0ad2a5ab0981a34946a03d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 06:07:04 +0000 Subject: [PATCH 25/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ppp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ppp.spec b/ppp.spec index d157c43..cdceb10 100644 --- a/ppp.spec +++ b/ppp.spec @@ -18,7 +18,7 @@ Name: ppp # These all need to be patched (if necessary) and rebuilt for new # versions of ppp. Version: 2.5.1 -Release: 5%{?dist} +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 @@ -199,6 +199,9 @@ 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