Changeset 30654

Timestamp:

2012-02-19T19:37:02+01:00 (6 years ago)

Author:

jow

Message:

[packages_10.03.2] bash: merge r30653

Location:

branches/packages_10.03.2/utils/bash

Files:

• Makefile (modified) (2 diffs)
• patches/001-compile-fix.patch (modified) (1 diff)
• patches/002-force-internal-readline.patch (copied) (copied from packages/utils/bash/patches/002-force-internal-readline.patch)

branches/packages_10.03.2/utils/bash/Makefile

@@ -1 +1 @@
 #
-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2007-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -10 +10 @@
 PKG_NAME:=bash
 PKG_VERSION:=4.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

branches/packages_10.03.2/utils/bash/patches/001-compile-fix.patch

@@ -1 @@
-Index: bash-4.2/execute_cmd.c
-===================================================================
---- bash-4.2.orig/execute_cmd.c 2011-07-04 11:16:23.000000000 +0200
-+++ bash-4.2/execute_cmd.c      2011-07-04 11:17:33.000000000 +0200
-@@ -2202,7 +2202,11 @@
+--- a/execute_cmd.c
++++ b/execute_cmd.c
+@@ -2202,7 +2202,11 @@ execute_pipeline (command, asynchronous,
    /* If the `lastpipe' option is set with shopt, and job control is not
       enabled, execute the last element of non-async pipelines in the