OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Mar-2006 22:50:50
Branch: HEAD Handle: 2006030621505000
Modified files:
openpkg-src/bash bash.patch bash.spec
Log:
Remove dependency to Bison/Yacc by applying a vendor patch to a
generated file.
Summary:
Revision Changes Path
1.14 +16 -0 openpkg-src/bash/bash.patch
1.74 +3 -1 openpkg-src/bash/bash.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 bash.patch
--- openpkg-src/bash/bash.patch 8 Dec 2005 19:19:11 -0000 1.13
+++ openpkg-src/bash/bash.patch 6 Mar 2006 21:50:50 -0000 1.14
@@ -111,3 +111,19 @@
printf (_("Copyright (C) 2004 Free Software Foundation, Inc.\n"));
}
+-----------------------------------------------------------------------------
+
+Remove dependency to Bison/Yacc by applying a vendor patch to a generated
file.
+
+Index: y.tab.c
+--- y.tab.c.orig 2005-11-14 15:53:30 +0100
++++ y.tab.c 2006-03-06 22:46:56 +0100
+@@ -4237,7 +4237,7 @@
+ if (open == ch) /* undo previous increment */
+ count--;
+ if (ch == '(') /* ) */
+- nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags);
++ nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags &
~P_DQUOTE);
+ else if (ch == '{') /* } */
+ nestret = parse_matched_pair (0, '{', '}', &nestlen,
P_FIRSTCLOSE|rflags);
+ else if (ch == '[') /* ] */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.spec
============================================================================
$ cvs diff -u -r1.73 -r1.74 bash.spec
--- openpkg-src/bash/bash.spec 27 Feb 2006 21:16:30 -0000 1.73
+++ openpkg-src/bash/bash.spec 6 Mar 2006 21:50:50 -0000 1.74
@@ -39,7 +39,7 @@
Group: Shell
License: GPL
Version: %{V_base_real}.%{V_plvl_raw}
-Release: 20060227
+Release: 20060306
# list of sources
Source0: ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}.tar.gz
@@ -88,6 +88,8 @@
# unpack and patch distribution
%setup -q -n bash-%{V_base_real}
%patch -p0 -P 0 1 2 3 4 5 6 7 8 9 10 11
+ sleep 1
+ touch y.tab.c
# brand with OpenPKG release and fix patchlevel
%{l_shtool} subst \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
