diff --git a/.cvsignore b/.cvsignore index 6bd47d5..49733a1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,5 @@ m4-1.4.8.tar.bz2.sig m4-1.4.9.tar.bz2 m4-1.4.9.tar.bz2.sig m4-1.4.10.tar.bz2.sig +m4-1.4.11.tar.bz2 +m4-1.4.11.tar.bz2.sig diff --git a/m4-1.4.10-snprintf.patch b/m4-1.4.10-snprintf.patch deleted file mode 100644 index 29f86bb..0000000 --- a/m4-1.4.10-snprintf.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- m4-1.4.10/lib/vasnprintf.c_old 2007-07-05 13:48:27.000000000 +0200 -+++ m4-1.4.10/lib/vasnprintf.c 2007-12-13 13:38:39.000000000 +0100 -@@ -3385,10 +3385,22 @@ - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF -+#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; - #else -+ /* On glibc2 systems from glibc >= 2.3 - probably also older -+ ones - we know that snprintf's returns value conforms to -+ ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes. -+ Therefore we can avoid using %n in this situation. -+ On glibc2 systems from 2004-10-18 or newer, the use of %n -+ in format strings in writable memory may crash the program -+ (if compiled with _FORTIFY_SOURCE=2), so we should avoid it -+ in this situation. */ -+ fbp[1] = '\0'; -+#endif -+#else - fbp[1] = '\0'; - #endif - diff --git a/m4.spec b/m4.spec index 9a3a263..5155124 100644 --- a/m4.spec +++ b/m4.spec @@ -1,12 +1,11 @@ Summary: The GNU macro processor Name: m4 -Version: 1.4.10 -Release: 3%{?dist} +Version: 1.4.11 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2 Source1: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2.sig -Patch0: m4-1.4.10-snprintf.patch URL: http://www.gnu.org/software/m4/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info @@ -24,7 +23,6 @@ Install m4 if you need a macro processor. %prep %setup -q -%patch0 -p1 -b .snprintf %build %configure @@ -55,6 +53,11 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 23 2008 Vitezslav Crhonek - 1.4.11-1 +- Update to m4-1.4.11 (removed vasnprintf patch, it's included in + upstream source) + Resolves: #443589 + * Mon Feb 11 2008 Vitezslav Crhonek - 1.4.10-3 - Fix Buildroot diff --git a/sources b/sources index f92fc74..4c12a56 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -3710d56d8b684bfebef424c98f2828c8 m4-1.4.10.tar.bz2.sig -0a35bab2f5d605e08083d7e3cbd4b8b0 m4-1.4.10.tar.bz2 +96ec473c2a6f203976c028e896a01b28 m4-1.4.11.tar.bz2 +35b3a5a6c9b231527318bc3b4447adae m4-1.4.11.tar.bz2.sig