From 7656d4e8e0d822db432d9c5c6ef2abf260006420 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 10:41:21 +0000 Subject: [PATCH] auto-import changelog data from ppp-2.4.1-7.src.rpm Mon Jul 22 2002 Florian La Roche - add patch: Thu Jun 06 2002 Phil Knirsch - Fixed varargs problem for s390/s390x. --- ppp-2.4.1-varargs.patch | 11 +++++++++++ ppp.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 ppp-2.4.1-varargs.patch diff --git a/ppp-2.4.1-varargs.patch b/ppp-2.4.1-varargs.patch new file mode 100644 index 0000000..d3d22a3 --- /dev/null +++ b/ppp-2.4.1-varargs.patch @@ -0,0 +1,11 @@ +--- ppp-2.4.1/pppd/utils.c.varargs Thu Jun 6 16:22:58 2002 ++++ ppp-2.4.1/pppd/utils.c Thu Jun 6 16:22:00 2002 +@@ -254,7 +254,7 @@ + break; + case 'r': + f = va_arg(args, char *); +-#ifndef __powerpc__ ++#if !defined(__powerpc__) && !defined(__s390__) && !defined(__s390x__) + n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list)); + #else + /* On the powerpc, a va_list is an array of 1 structure */ diff --git a/ppp.spec b/ppp.spec index ac03aa0..3798faf 100644 --- a/ppp.spec +++ b/ppp.spec @@ -1,7 +1,7 @@ Summary: The PPP (Point-to-Point Protocol) daemon. Name: ppp Version: 2.4.1 -Release: 6 +Release: 7 License: distributable Group: System Environment/Daemons Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz @@ -12,6 +12,7 @@ Patch2: ppp-2.3.9-wtmp.patch Patch3: ppp-2.4.0-reap.patch Patch4: ppp-2.3.11-pam_session.patch Patch5: ppp-2.4.1-warnings.patch +Patch6: ppp-2.4.1-varargs.patch BuildRoot: %{_tmppath}/%{name}-root BuildPrereq: pam-devel Requires: glibc >= 2.0.6, /etc/pam.d/system-auth @@ -32,6 +33,7 @@ organization over a modem and phone line. %patch3 -p1 -b .reap %patch4 -p1 -b .pam_session %patch5 -p1 -b .warnings +%patch6 -p1 -b .varargs find . -type f -name "*.sample" | xargs rm -f %build @@ -70,6 +72,11 @@ rm -rf $RPM_BUILD_ROOT %doc README README.linux scripts sample %changelog +* Mon Jul 22 2002 Florian La Roche +- add patch: + * Thu Jun 06 2002 Phil Knirsch + - Fixed varargs problem for s390/s390x. + * Fri Jun 21 2002 Tim Powers - automated rebuild