Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
# $NetBSD: Makefile,v 1.58 2013/06/09 18:12:14 bsiegert Exp $
|
||||
# $NetBSD: Makefile,v 1.61 2014/03/12 10:08:46 wiz Exp $
|
||||
|
||||
BASH_VERSION= 4.2
|
||||
BASH_VERSION= 4.3
|
||||
|
||||
DISTNAME= bash-${BASH_VERSION}
|
||||
#PKGNAME= bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
|
||||
PKGREVISION= 3
|
||||
CATEGORIES= shells
|
||||
MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \
|
||||
ftp://ftp.cwru.edu/pub/bash/
|
||||
@@ -79,9 +78,7 @@ CONFIGURE_ARGS+= --enable-job-control
|
||||
.if ${OPSYS} == "Darwin"
|
||||
CONFIGURE_ARGS+= --with-installed-readline
|
||||
|
||||
USE_GNU_READLINE= yes
|
||||
BUILDLINK_API_DEPENDS.readline+= readline>=6.0
|
||||
|
||||
.include "../../devel/readline/buildlink3.mk"
|
||||
.endif
|
||||
|
||||
|
||||
@@ -1,14 +1,26 @@
|
||||
@comment $NetBSD: PLIST,v 1.6 2011/03/12 15:55:22 wiz Exp $
|
||||
@comment $NetBSD: PLIST,v 1.7 2014/03/12 10:08:46 wiz Exp $
|
||||
bin/bash
|
||||
bin/bashbug
|
||||
info/bash.info
|
||||
man/man1/bash.1
|
||||
man/man1/bashbug.1
|
||||
share/doc/bash/CHANGES
|
||||
share/doc/bash/COMPAT
|
||||
share/doc/bash/FAQ
|
||||
share/doc/bash/INTRO
|
||||
share/doc/bash/NEWS
|
||||
share/doc/bash/POSIX
|
||||
share/doc/bash/RBASH
|
||||
share/doc/bash/README
|
||||
share/doc/bash/bash.html
|
||||
share/doc/bash/bashref.html
|
||||
share/locale/af/LC_MESSAGES/bash.mo
|
||||
share/locale/bg/LC_MESSAGES/bash.mo
|
||||
share/locale/ca/LC_MESSAGES/bash.mo
|
||||
share/locale/cs/LC_MESSAGES/bash.mo
|
||||
share/locale/da/LC_MESSAGES/bash.mo
|
||||
share/locale/de/LC_MESSAGES/bash.mo
|
||||
share/locale/el/LC_MESSAGES/bash.mo
|
||||
share/locale/en@boldquot/LC_MESSAGES/bash.mo
|
||||
share/locale/en@quot/LC_MESSAGES/bash.mo
|
||||
share/locale/eo/LC_MESSAGES/bash.mo
|
||||
@@ -17,8 +29,11 @@ share/locale/et/LC_MESSAGES/bash.mo
|
||||
share/locale/fi/LC_MESSAGES/bash.mo
|
||||
share/locale/fr/LC_MESSAGES/bash.mo
|
||||
share/locale/ga/LC_MESSAGES/bash.mo
|
||||
share/locale/gl/LC_MESSAGES/bash.mo
|
||||
share/locale/hr/LC_MESSAGES/bash.mo
|
||||
share/locale/hu/LC_MESSAGES/bash.mo
|
||||
share/locale/id/LC_MESSAGES/bash.mo
|
||||
share/locale/it/LC_MESSAGES/bash.mo
|
||||
share/locale/ja/LC_MESSAGES/bash.mo
|
||||
share/locale/lt/LC_MESSAGES/bash.mo
|
||||
share/locale/nl/LC_MESSAGES/bash.mo
|
||||
@@ -27,6 +42,8 @@ share/locale/pt_BR/LC_MESSAGES/bash.mo
|
||||
share/locale/ro/LC_MESSAGES/bash.mo
|
||||
share/locale/ru/LC_MESSAGES/bash.mo
|
||||
share/locale/sk/LC_MESSAGES/bash.mo
|
||||
share/locale/sl/LC_MESSAGES/bash.mo
|
||||
share/locale/sr/LC_MESSAGES/bash.mo
|
||||
share/locale/sv/LC_MESSAGES/bash.mo
|
||||
share/locale/tr/LC_MESSAGES/bash.mo
|
||||
share/locale/uk/LC_MESSAGES/bash.mo
|
||||
|
||||
@@ -1,13 +1,9 @@
|
||||
$NetBSD: distinfo,v 1.27 2013/06/09 18:12:14 bsiegert Exp $
|
||||
$NetBSD: distinfo,v 1.29 2014/03/12 10:08:46 wiz Exp $
|
||||
|
||||
SHA1 (bash-4.2.tar.gz) = 487840ab7134eb7901fbb2e49b0ee3d22de15cb8
|
||||
RMD160 (bash-4.2.tar.gz) = df7ae51783f039a1234d3b720ffcf4bfa5d09673
|
||||
Size (bash-4.2.tar.gz) = 7009201 bytes
|
||||
SHA1 (bash-4.3.tar.gz) = 45ac3c5727e7262334f4dfadecdf601b39434e84
|
||||
RMD160 (bash-4.3.tar.gz) = cd21a9f51ea7780994d4e2c9c7d16d5eb000f845
|
||||
Size (bash-4.3.tar.gz) = 7955839 bytes
|
||||
SHA1 (patch-af) = dfd1d1be3d822cfc3ae0fd21bb2bbd3e35b11f0d
|
||||
SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
|
||||
SHA1 (patch-ai) = 26825922898567841bed0bf62a8dee3bcc50cd75
|
||||
SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e
|
||||
SHA1 (patch-ak) = 6dfb7195f45f81064f687a4c9febb9dcae721aa7
|
||||
SHA1 (patch-builtins_ulimit.def) = d4cb59bedc6a6199f9a99a3530c99374e428baeb
|
||||
SHA1 (patch-execute_cmd.c) = ce9fe5820188aa218bac74316d45cbdabadb1785
|
||||
SHA1 (patch-lib_sh_eaccess.c) = 484577f09efe67f604c3fb85afdb5a58b64f5b6c
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
$NetBSD: patch-ai,v 1.1 2011/02/20 14:22:15 wiz Exp $
|
||||
|
||||
Add MirBSD.
|
||||
|
||||
--- support/shobj-conf.orig Wed Oct 28 13:19:57 2009
|
||||
+++ support/shobj-conf
|
||||
@@ -197,7 +197,7 @@ darwin*|macosx*)
|
||||
SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
|
||||
;;
|
||||
|
||||
-openbsd*|netbsd*)
|
||||
+openbsd*|netbsd*|mirbsd*)
|
||||
SHOBJ_CFLAGS=-fPIC
|
||||
SHOBJ_LD='${CC}'
|
||||
SHOBJ_LDFLAGS='-shared'
|
||||
@@ -1,14 +0,0 @@
|
||||
$NetBSD: patch-ak,v 1.1 2011/02/20 14:22:16 wiz Exp $
|
||||
|
||||
Add MirBSD.
|
||||
|
||||
--- configure.orig Tue Dec 29 13:34:27 2009
|
||||
+++ configure
|
||||
@@ -2192,6 +2192,7 @@ sparc-linux*) opt_bash_malloc=no ;; # sp
|
||||
#*-freebsd*-gnu) opt_bash_malloc=no ;; # there's some undetermined problem here
|
||||
#*-freebsd*) opt_bash_malloc=no ;; # they claim it's better; I disagree
|
||||
*-openbsd*) opt_bash_malloc=no ;; # they claim it needs eight-bit alignment
|
||||
+*-mirbsd*) opt_bash_malloc=no ;; # they claim it needs eight-bit alignment
|
||||
*-aix*) opt_bash_malloc=no ;; # AIX machines
|
||||
*-nextstep*) opt_bash_malloc=no ;; # NeXT machines running NeXTstep
|
||||
*-macos*) opt_bash_malloc=no ;; # Apple MacOS X
|
||||
@@ -1,31 +0,0 @@
|
||||
$NetBSD: patch-execute_cmd.c,v 1.1 2013/02/12 23:31:41 tcort Exp $
|
||||
|
||||
Allow bash to compile with JOB_CONTROL disabled.
|
||||
|
||||
http://ftp.gnu.org/gnu/bash/bash-4.2-patches/bash42-018
|
||||
|
||||
--- execute_cmd.c.orig Wed Feb 9 22:32:25 2011
|
||||
+++ execute_cmd.c Tue Feb 12 11:48:00 2013
|
||||
@@ -2196,6 +2196,7 @@
|
||||
if (ignore_return && cmd)
|
||||
cmd->flags |= CMD_IGNORE_RETURN;
|
||||
|
||||
+#if defined (JOB_CONTROL)
|
||||
lastpipe_flag = 0;
|
||||
begin_unwind_frame ("lastpipe-exec");
|
||||
lstdin = -1;
|
||||
@@ -2219,11 +2220,14 @@
|
||||
}
|
||||
if (prev >= 0)
|
||||
add_unwind_protect (close, prev);
|
||||
+#endif
|
||||
|
||||
exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close);
|
||||
|
||||
+#if defined (JOB_CONTROL)
|
||||
if (lstdin > 0)
|
||||
restore_stdin (lstdin);
|
||||
+#endif
|
||||
|
||||
if (prev >= 0)
|
||||
close (prev);
|
||||
@@ -1,37 +0,0 @@
|
||||
$NetBSD: patch-lib_sh_eaccess.c,v 1.1 2012/07/18 15:43:12 spz Exp $
|
||||
|
||||
from ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-033
|
||||
|
||||
Bash-Release: 4.2
|
||||
Patch-ID: bash42-033
|
||||
|
||||
Bug-Reported-by: David Leverton <levertond@googlemail.com>
|
||||
Bug-Reference-ID: <4FCCE737.1060603@googlemail.com>
|
||||
Bug-Reference-URL:
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash uses a static buffer when expanding the /dev/fd prefix for the test
|
||||
and conditional commands, among other uses, when it should use a dynamic
|
||||
buffer to avoid buffer overflow.
|
||||
|
||||
--- lib/sh/eaccess.c.orig 2011-01-09 01:50:10.000000000 +0000
|
||||
+++ lib/sh/eaccess.c
|
||||
@@ -82,6 +82,8 @@ sh_stat (path, finfo)
|
||||
const char *path;
|
||||
struct stat *finfo;
|
||||
{
|
||||
+ static char *pbuf = 0;
|
||||
+
|
||||
if (*path == '\0')
|
||||
{
|
||||
errno = ENOENT;
|
||||
@@ -106,7 +108,7 @@ sh_stat (path, finfo)
|
||||
trailing slash. Make sure /dev/fd/xx really uses DEV_FD_PREFIX/xx.
|
||||
On most systems, with the notable exception of linux, this is
|
||||
effectively a no-op. */
|
||||
- char pbuf[32];
|
||||
+ pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8));
|
||||
strcpy (pbuf, DEV_FD_PREFIX);
|
||||
strcat (pbuf, path + 8);
|
||||
return (stat (pbuf, finfo));
|
||||
Reference in New Issue
Block a user