- Rebase ta 20100216

- Drop the buffer overflow patch, upstream implements this - Resolves: #577016
2010-04-07 15:09:19 +00:00 · 2010-04-07 15:09:19 +00:00 · 699722220f
commit 699722220f
parent 2ba77fd308
4 changed files with 9 additions and 29 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1,2 +1,3 @@
 byacc-20070509.tar.gz
 byacc-20070509.tgz
+byacc-20100216.tgz
--- a/byacc.spec
+++ b/byacc.spec
@ -1,14 +1,13 @@
-%define byaccdate 20070509
+%define byaccdate 20100216

 Summary: Berkeley Yacc, a parser generator
 Name: byacc
 Version: 1.9.%{byaccdate}
-Release: 6%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 Group: Development/Tools
 URL: http://invisible-island.net/byacc/byacc.html
 Source: ftp://invisible-island.net/byacc/byacc-%{byaccdate}.tgz
-Patch1: skeleton.c.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 %description
@ -20,7 +19,6 @@ this package.

 %prep
 %setup -q -n byacc-%{byaccdate}
-%patch1 -p1

 %build
 %configure --disable-dependency-tracking
@ -49,6 +47,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/byacc.1*

 %changelog
+* Wed Apr  7 2010 Petr Machata <pmachata@redhat.com> - 1.9.20100216-1
+- Rebase ta 20100216
+- Drop the buffer overflow patch, upstream implements this
+- Resolves: #577016
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.20070509-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

--- a/skeleton.c.diff
+++ b/skeleton.c.diff
@ -1,24 +0,0 @@
-diff -urp byacc-20070509/skeleton.c byacc-20070509-pm/skeleton.c
--- byacc-20070509/skeleton.c	2005-05-05 01:39:36.000000000 +0200
-+++ byacc-20070509-pm/skeleton.c	2008-07-14 13:03:36.000000000 +0200
-@@ -21,6 +21,7 @@ char *banner[] =
-     "#endif",
-     "",
-     "#include <stdlib.h>",
-+    "#include <string.h>",
-     "",
-     "#define YYBYACC 1",
-     CONCAT1("#define YYMAJOR ", YYMAJOR),
-@@ -275,7 +276,10 @@ char *body[] =
-     "                YYPREFIX, yystate, yyn, yyrule[yyn]);",
-     "#endif",
-     "    yym = yylen[yyn];",
-    "    yyval = yyvsp[1-yym];",
-+    "    if (yym)",
-+    "        yyval = yyvsp[1-yym];",
-+    "    else",
-+    "        memset(&yyval, 0, sizeof yyval);",
-     "    switch (yyn)",
-     "    {",
-     0
-Only in byacc-20070509-pm/: skeleton.c~
--- a/2
+++ b/2
@ -1 +1 @@
-3dba490d29a509df796c9639e819d0c7  byacc-20070509.tgz
+8f3cefac0fa2145b6601df2d6569de4e  byacc-20100216.tgz