OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Oct-2006 16:43:52
Branch: HEAD Handle: 2006101115435200
Modified files:
openpkg-src/bash bash.patch bash.spec
Log:
upgrading package: bash 3.1.17 -> 3.2.16
Summary:
Revision Changes Path
1.15 +3 -58 openpkg-src/bash/bash.patch
1.80 +8 -23 openpkg-src/bash/bash.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 bash.patch
--- openpkg-src/bash/bash.patch 6 Mar 2006 21:50:50 -0000 1.14
+++ openpkg-src/bash/bash.patch 11 Oct 2006 14:43:52 -0000 1.15
@@ -4,7 +4,7 @@
Index: doc/bash.1
--- doc/bash.1.orig 2004-07-12 17:27:08 +0200
+++ doc/bash.1 2004-07-27 19:47:10 +0200
-@@ -113,6 +113,12 @@
+@@ -116,6 +116,12 @@
This option allows the positional parameters to be set
when invoking an interactive shell.
.TP
@@ -20,51 +20,12 @@
-----------------------------------------------------------------------------
-This patch makes sure a signal state variable is declared "volatile" so
-it is consistent throughout signal handling. This patch is derived from
-SuSE Linux.
-
-Index: quit.h
---- quit.h.orig 2001-09-10 16:08:33 +0200
-+++ quit.h 2004-07-27 19:47:10 +0200
-@@ -22,7 +22,7 @@
- #define _QUIT_H_
-
- /* Non-zero means SIGINT has already ocurred. */
--extern int interrupt_state;
-+extern volatile int interrupt_state;
-
- /* Macro to call a great deal. SIGINT just sets above variable. When
- it is safe, put QUIT in the code, and the "interrupt" will take place. */
-Index: sig.c
---- sig.c.orig 2003-12-19 22:11:35 +0100
-+++ sig.c 2004-07-27 19:47:10 +0200
-@@ -59,7 +59,7 @@
- extern int parse_and_execute_level, shell_initialized;
-
- /* Non-zero after SIGINT. */
--int interrupt_state;
-+volatile int interrupt_state = 0;
-
- /* The environment at the top-level R-E loop. We use this in
- the case of error return. */
-@@ -71,7 +71,7 @@
- #endif /* JOB_CONTROL */
-
- /* When non-zero, we throw_to_top_level (). */
--int interrupt_immediately = 0;
-+volatile int interrupt_immediately = 0;
-
- static void initialize_shell_signals __P((void));
-
------------------------------------------------------------------------------
-
Port to HP-UX 11i and similar less smart platforms.
Index: configure
--- configure.orig 2004-07-21 22:18:56 +0200
+++ configure 2004-07-27 19:47:10 +0200
-@@ -1479,6 +1479,7 @@
+@@ -1517,6 +1517,7 @@
*-beos*) opt_bash_malloc=no ;; # they say it's suitable
*-cygwin*) opt_bash_malloc=no ;; # Cygnus's CYGWIN environment
*-opennt*|*-interix*) opt_bash_malloc=no ;; # Interix, now owned by
Microsoft
@@ -72,7 +33,7 @@
esac
# memory scrambling on free()
-@@ -1624,7 +1625,7 @@
+@@ -1662,7 +1663,7 @@
else
MALLOC_LIB=
@@ -111,19 +72,3 @@
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.79 -r1.80 bash.spec
--- openpkg-src/bash/bash.spec 22 Jun 2006 14:56:40 -0000 1.79
+++ openpkg-src/bash/bash.spec 11 Oct 2006 14:43:52 -0000 1.80
@@ -23,10 +23,10 @@
##
# package version
-%define V_base_real 3.1
-%define V_base_comp 31
-%define V_plvl_raw 17
-%define V_plvl_pad 017
+%define V_base_real 3.2
+%define V_base_comp 32
+%define V_plvl_raw 16
+%define V_plvl_pad 0
# package information
Name: bash
@@ -39,29 +39,12 @@
Group: Shell
License: GPL
Version: %{V_base_real}.%{V_plvl_raw}
-Release: 20060622
+Release: 20061011
# list of sources
Source0: ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}.tar.gz
Source1: profile
Patch0: bash.patch
-Patch1:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-001
-Patch2:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-002
-Patch3:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-003
-Patch4:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-004
-Patch5:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-005
-Patch6:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-006
-Patch7:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-007
-Patch8:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-008
-Patch9:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-009
-Patch10:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-010
-Patch11:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-011
-Patch12:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-012
-Patch13:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-013
-Patch14:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-014
-Patch15:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-015
-Patch16:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-016
-Patch17:
ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/bash%{V_base_comp}-017
# build information
Prefix: %{l_prefix}
@@ -85,6 +68,8 @@
regex = bash-(__VER__)\.tar\.gz
}
prog bash:patches = {
+ disabled
+ comment = "cs: no patches available at this time"
version = %{V_base_comp}-%{V_plvl_pad}
url = ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}-patches/
regex = bash(\S+-\d+)
@@ -93,7 +78,7 @@
%prep
# 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 12 13 14 15 16 17
+ %patch -p0
sleep 1
touch y.tab.[ch]
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
