From 9ba50e7eade4ff37639650f2b8ea364f45f6eccb Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 02:51:26 +0000 Subject: auto-import a2ps-4.13b-15 from a2ps-4.13b-15.src.rpm --- diff --git a/a2ps-4.13-varargs.patch b/a2ps-4.13-varargs.patch new file mode 100644 index 0000000..7339376 --- /dev/null +++ b/a2ps-4.13-varargs.patch @@ -0,0 +1,45 @@ +--- a2ps-4.13/lib/printlen.c.orig Fri Jun 1 16:38:21 2001 ++++ a2ps-4.13/lib/printlen.c Fri Jun 1 16:38:28 2001 +@@ -28,14 +28,15 @@ + unsigned long strtoul (); + + static int +-int_printflen (const char *format, va_list *args) ++int_printflen (const char *format, va_list args) + { + const char *cp; + int total_width = 0; + int width = 0; + va_list ap; + +- memcpy (&ap, args, sizeof (va_list)); ++ __va_copy(ap, args); ++ /* memcpy (&ap, args, sizeof (va_list)); */ + + for (cp = format ; *cp ; cp++) + { +@@ -99,7 +100,7 @@ + int + vprintflen (const char *format, va_list args) + { +- return int_printflen (format, &args); ++ return int_printflen (format, args); + } + + int +--- a2ps-4.13/lib/title.c.orig Fri Jun 1 16:19:04 2001 ++++ a2ps-4.13/lib/title.c Fri Jun 1 16:20:16 2001 +@@ -83,11 +83,13 @@ + VA_START (args, format); + + len = vprintflen (format, args); ++ va_end(args); + if (format [strlen (format) - 1] == '\n') + len --; + if (center_p) + for (padding = 0 ; padding < 79 - len ; padding += 2) + putc (' ', stream); ++ VA_START (args, format); + # if HAVE_VPRINTF || _LIBC + vfprintf (stream, format, args); + # else diff --git a/a2ps.spec b/a2ps.spec index af77498..1aa0f8d 100644 --- a/a2ps.spec +++ b/a2ps.spec @@ -1,5 +1,5 @@ %define ver 4.13b -%define rel 14 +%define rel 15 Summary: Converts text and other types of files to PostScript(TM). Name: a2ps @@ -14,6 +14,7 @@ Patch1: a2ps-4.13-etc.patch Patch2: a2ps-4.13-flex.patch Patch3: a2ps-4.13-security.patch Patch4: a2ps-4.13-glibcpaper.patch +Patch5: a2ps-4.13-varargs.patch # EUC-JP support Patch10: a2ps-4.13-eucjp.patch.bz2 Patch11: a2ps-4.13-autoenc.patch @@ -37,6 +38,7 @@ and medias. %patch2 -p1 %patch3 -p1 -b .security %patch4 -p1 -b .glibcpaper +%patch5 -p1 %patch10 -p1 -b .euc %patch11 -p1 -b .ae @@ -139,6 +141,9 @@ fi %dir %{_datadir}/a2ps %changelog +* Fri Jun 1 2001 Oliver Paukstadt +- fixed varargs-usage in title.c + * Thu Apr 26 2001 Florian La Roche - call libtoolize to allow easy porting to new archs