Accepting request 48468 from home:vuntz:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/48468 OBS-URL: https://build.opensuse.org/package/show/Base:System/m4?expand=0&rev=9
2010-09-19 18:10:53 +00:00 · 2010-09-19 18:10:53 +00:00 · 0a2cf593e6
commit 0a2cf593e6
parent f7f1269cce
5 changed files with 38 additions and 90 deletions
--- a/m4-1.4.13.diff
+++ b/m4-1.4.13.diff
@ -1,67 +0,0 @@
-Index: m4/gnulib-comp.m4
-===================================================================
--- m4/gnulib-comp.m4.orig
-+++ m4/gnulib-comp.m4
-@@ -215,7 +215,6 @@ AC_DEFUN([M4_INIT],
-   gl_SPAWN_MODULE_INDICATOR([posix_spawnp])
-   gl_FUNC_PRINTF_FREXP
-   gl_FUNC_PRINTF_FREXPL
-  m4_divert_text([INIT_PREPARE], [gl_printf_safe=yes])
-   gl_QUOTEARG
-   gl_FUNC_RAWMEMCHR
-   gl_STRING_MODULE_INDICATOR([rawmemchr])
-Index: tests/test-isnanl.h
-===================================================================
--- tests/test-isnanl.h.orig
-+++ tests/test-isnanl.h
-@@ -74,7 +74,7 @@ main ()
-   /* Quiet NaN.  */
-   ASSERT (isnanl (NaNl ()));
- 
-#if defined LDBL_EXPBIT0_WORD && defined LDBL_EXPBIT0_BIT
-+#if defined LDBL_EXPBIT0_WORD && defined LDBL_EXPBIT0_BIT && 0
-   /* A bit pattern that is different from a Quiet NaN.  With a bit of luck,
-      it's a Signalling NaN.  */
-   {
-@@ -116,6 +116,7 @@ main ()
-       { LDBL80_WORDS (0xFFFF, 0x83333333, 0x00000000) };
-     ASSERT (isnanl (x.value));
-   }
-+#if 0
-   /* The isnanl function should recognize Pseudo-NaNs, Pseudo-Infinities,
-      Pseudo-Zeroes, Unnormalized Numbers, and Pseudo-Denormals, as defined in
-        Intel IA-64 Architecture Software Developer's Manual, Volume 1:
-@@ -149,6 +150,7 @@ main ()
-     ASSERT (isnanl (x.value));
-   }
- #endif
-+#endif
- 
-   return 0;
- }
-Index: tests/test-strtod.c
-===================================================================
--- tests/test-strtod.c.orig
-+++ tests/test-strtod.c
-@@ -673,9 +673,9 @@ main ()
-     /* Sign bits of NaN is a portability sticking point, not worth
-        worrying about.  */
-     ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, OSF/1 5.1, mingw */
-# endif
-     ASSERT (ptr1 == input + 6);         /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-     ASSERT (ptr2 == input + 6);         /* glibc-2.3.6, MacOS X 10.3, FreeBSD 6.2, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-+# endif
-     ASSERT (errno == 0);
- #else
-     ASSERT (result1 == 0.0);
-@@ -723,9 +723,9 @@ main ()
-     /* Sign bits of NaN is a portability sticking point, not worth
-        worrying about.  */
-     ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX 6.5, OSF/1 5.1, mingw */
-# endif
-     ASSERT (ptr1 == input + 7);         /* glibc-2.3.6, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-     ASSERT (ptr2 == input + 7);         /* glibc-2.3.6, OpenBSD 4.0, AIX 5.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
-+# endif
-     ASSERT (errno == 0);
- #else
-     ASSERT (result1 == 0.0);
--- a/m4-1.4.13.tar.lzma
+++ b/m4-1.4.13.tar.lzma
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a69ce082cdbd732204c36059c18b2a671c5eb92f4453bcc5ea1ab12dc6f88ed0
-size 835808
--- a/m4-1.4.15.tar.bz2
+++ b/m4-1.4.15.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0aafea5cb30f9304a73535c4ef473e6657a8fcfc0ccb2d0ae4861a4824d4fff9
+size 1201245
--- a/m4.changes
+++ b/m4.changes
@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Sun Sep 19 09:28:02 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 1.4.15:
+  + Fix regression introduced in 1.4.9b where the `format' builtin
+    could crash on an invalid format string.
+  + Fix compilation against newer glibc, and on AIX 7.1BETA.
+  + A number of portability improvements inherited from gnulib.
+- Changes from version 1.4.14:
+  + Fix regression introduced in 1.4.12 where executing with stdout
+    closed could crash m4 on exit on some platforms.
+  + Fix regressions introduced in 1.4.13 in the `esyscmd' builtin,
+    where closed file descriptors could interfere with child
+    execution, and where a child status of 127 made m4 print a
+    spurious message to stderr.
+  + Fix a security hole in 'make dist', present since at least M4
+    1.4, that could affect anybody attempting to redistribute
+    modified sources (see Automake CVE-2009-4029).
+  + A number of portability improvements inherited from gnulib.
+- Remove hacks from prep changing permissions: they're not needed
+  anymore.
+- Remove lzma BuildRequires as the source is bz2 now.
+- Remove AutoReqProv: it's default now.
+- Use %configure and %makeinstall macros.
+- Drop m4-1.4.13.diff: it doesn't seem to be needed (some parts are
+  upstream, at least), and it's not documented at all, so let's try
+  without it.
+
 -------------------------------------------------------------------
 Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de

--- a/m4.spec
+++ b/m4.spec
@ -1,5 +1,5 @@
 #
-# spec file for package m4 (Version 1.4.13)
+# spec file for package m4 (Version 1.4.15)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@ -21,36 +21,23 @@ Name:           m4
 License:        GPLv3+
 Group:          Development/Languages/Other
 Provides:       base:/usr/bin/m4
-AutoReqProv:    on
 PreReq:         %{install_info_prereq}
-Version:        1.4.13
-Release:        3
+Version:        1.4.15
+Release:        1
 Summary:        GNU m4
 Url:            http://www.gnu.org/software/m4/
-Source:         ftp://ftp.gnu.org/pub/gnu/m4/m4-%{version}.tar.lzma
-Patch:          m4-%{version}.diff
+Source:         http://ftp.gnu.org/pub/gnu/m4/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  lzma

 %description
 GNU m4 is an implementation of the traditional Unix macro processor.

-
-
-Authors:
--------
-    René Seindal <rene@seindal.dk>
-
 %prep
 %setup -q
-%patch
-chmod +x checks/*.test
-chmod -x COPYING

 %build
 AUTOPOINT=true autoreconf -fi
-./configure CFLAGS="$RPM_OPT_FLAGS" \
-	    --prefix=/usr --mandir=%{_mandir} --infodir=%{_infodir} \
+%configure \
 	    --without-included-regex \
 	    gl_cv_func_isnanl_works=yes \
 	    gl_cv_func_printf_directive_n=yes
@ -60,7 +47,7 @@ make %{?_smp_mflags}
 make %{?_smp_mflags} check || true

 %install
-make install DESTDIR="$RPM_BUILD_ROOT"
+%makeinstall

 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/m4.info.gz
@ -71,7 +58,7 @@ make install DESTDIR="$RPM_BUILD_ROOT"
 %files
 %defattr(-,root,root)
 %doc README COPYING NEWS THANKS TODO ChangeLog
-/usr/bin/*
+%{_bindir}/*
 %doc %{_infodir}/*.gz
 %{_mandir}/*/*