Update to bash 4.4. See the announcement at

https://lists.gnu.org/archive/html/bug-bash/2016-09/msg00018.html
for an overview of significant changes.

Jump right to patchlevel 5, which among other things fixes a use-after-free
bug discovered by otto malloc.
This commit is contained in:
naddy 2016-11-11 22:39:48 +00:00
parent 86b42df898
commit 0806913c0a
4 changed files with 114 additions and 53 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.101 2016/11/01 16:31:57 naddy Exp $
# $OpenBSD: Makefile,v 1.102 2016/11/11 22:39:48 naddy Exp $
COMMENT= GNU Bourne Again Shell
DISTNAME= bash-4.3.30
PKGNAME= bash-4.3.48
DISTNAME= bash-4.4
PKGNAME= ${DISTNAME}.5
CATEGORIES= shells
HOMEPAGE= http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
HOMEPAGE= https://www.gnu.org/software/bash/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
@ -13,10 +13,10 @@ MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_GNU:=bash/}
MASTER_SITES0= ${MASTER_SITE_GNU:=bash/bash-4.3-patches/}
MASTER_SITES0= ${MASTER_SITE_GNU:=bash/bash-4.4-patches/}
DIST_SUBDIR= bash
.for i in 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
PATCHFILES+= bash43-0$i:0
.for i in 01 02 03 04 05
PATCHFILES+= bash44-0$i:0
.endfor
LIB_DEPENDS= devel/gettext
@ -25,7 +25,4 @@ WANTLIB= c iconv intl termcap
CONFIGURE_STYLE=gnu
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/support
# Prefer system mktemp(3) and mkstemp(3) over homegrown replacements
CONFIGURE_ENV= CPPFLAGS="-DUSE_MKTEMP -DUSE_MKSTEMP"
.include <bsd.port.mk>

View File

@ -1,38 +1,12 @@
SHA256 (bash/bash-4.3.30.tar.gz) = MXiBAZu/ImL7gUt92OQGMtE8NgjS8jeACogo+7imQN0=
SHA256 (bash/bash43-031) = zVKfWd0PL91J1hn+NGkdpvCv/t+HzDfNRgqfP+gSph0=
SHA256 (bash/bash43-032) = iJNX0ppgBbLDMIyltihssiO16cCDIZ5dsxVigt1VT0o=
SHA256 (bash/bash43-033) = +yp3h6E/vgJ6czWspus8Ic29gT6e3CISdLap2GkuqhY=
SHA256 (bash/bash43-034) = 8WlPBPEQ3v4TMKhRzCdo5+V93S39sOPjUMoOPCFP+Ik=
SHA256 (bash/bash43-035) = Nw2F5ReAA28jhtwYxe/pluuo5lL8GXPw9PKrVamTweM=
SHA256 (bash/bash43-036) = rF+CRFs279tUPb+uZK/tY/WG11dLgz6aqc1RcLxf0nw=
SHA256 (bash/bash43-037) = M/Fw3XQAqzQY10nFXGORsdFh7y3nrO0Yc0UbOj/KWBM=
SHA256 (bash/bash43-038) = rb6qUAynqCU18OiNZzZhlj+KX83HrWNEXmi/W0l4Y2c=
SHA256 (bash/bash43-039) = q5Tc7SIVVBCXaR9gw+syPMKO8lSUY+alM0u8weYedOw=
SHA256 (bash/bash43-040) = hLs5a5JimSylQk/qtu0+w58ZPvXHbf5KYrVRvY3Z12s=
SHA256 (bash/bash43-041) = TsQylm5BmFJKfgzWhf4iLpYEN2nJYT5mdCrEddsTLBo=
SHA256 (bash/bash43-042) = rCGTItsnkdqHpJbubo5VRIRklL2q6iYmJwwvc8EESRk=
SHA256 (bash/bash43-043) = R6ijwAW0biWCH02PXMsEwdZTscgpy0BWjVU9xE96YYA=
SHA256 (bash/bash43-044) = kziCBjC/Zzc7RNjqaECfZRYup6R7myms4GoK7RJWf5k=
SHA256 (bash/bash43-045) = um7Dl46eqh6z+r2vPMb9+MRgasHFmfqutOLWmGQVACM=
SHA256 (bash/bash43-046) = s7RWpraQzSkzU/F+ItkqICs8i85YeuXyZnwgyatvaI8=
SHA256 (bash/bash43-047) = xpJI3n54umuS8Rj+HvR7yGR51QQP4LH5CKzhyePGfEo=
SHA256 (bash/bash43-048) = W4IVRRxdCWyh4RUwf/5mE1U1UacDaVJaB3jyFsOk36I=
SIZE (bash/bash-4.3.30.tar.gz) = 7977214
SIZE (bash/bash43-031) = 3689
SIZE (bash/bash43-032) = 1734
SIZE (bash/bash43-033) = 7038
SIZE (bash/bash43-034) = 2392
SIZE (bash/bash43-035) = 1800
SIZE (bash/bash43-036) = 1539
SIZE (bash/bash43-037) = 1284
SIZE (bash/bash43-038) = 2354
SIZE (bash/bash43-039) = 1531
SIZE (bash/bash43-040) = 1532
SIZE (bash/bash43-041) = 2362
SIZE (bash/bash43-042) = 1535
SIZE (bash/bash43-043) = 1942
SIZE (bash/bash43-044) = 1658
SIZE (bash/bash43-045) = 1312
SIZE (bash/bash43-046) = 1494
SIZE (bash/bash43-047) = 4437
SIZE (bash/bash43-048) = 1612
SHA256 (bash/bash-4.4.tar.gz) = 2GszksEgLo/1pCOzAuYoTbf49DXqnzm1sbIP06w238s=
SHA256 (bash/bash44-001) = PijZFTF1LfmoyxZ60HzFQquvlE3pNT/oxqU1yfHxfw8=
SHA256 (bash/bash44-002) = cCCgGD4XpyM+ZluXnHjBhOo2nPrz6LSxH1VH7LfBPFM=
SHA256 (bash/bash44-003) = Ud9akZL97+DdykvfKQky90vgP/0FA6PREuQZmQXnGLI=
SHA256 (bash/bash44-004) = rQgKMKSsbBJzNzYX8pYozDIKNcjNBpE4lHlCk9xSyLM=
SHA256 (bash/bash44-005) = Ih5Lclt3CtC7aSTfP40E+J7spFWPbkx3ffqT6WcJBSk=
SIZE (bash/bash-4.4.tar.gz) = 9377313
SIZE (bash/bash44-001) = 1896
SIZE (bash/bash44-002) = 1946
SIZE (bash/bash44-003) = 1593
SIZE (bash/bash44-004) = 2350
SIZE (bash/bash44-005) = 1439

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2014/03/10 11:58:31 naddy Exp $
--- Makefile.in.orig Sat Jan 25 22:27:30 2014
+++ Makefile.in Wed Mar 5 22:28:22 2014
@@ -353,7 +353,7 @@ INTL_LIBDIR = $(dot)/$(LIBSUBDIR)/intl
$OpenBSD: patch-Makefile_in,v 1.5 2016/11/11 22:39:48 naddy Exp $
--- Makefile.in.orig Fri Jan 15 14:55:37 2016
+++ Makefile.in Sun Sep 25 22:47:37 2016
@@ -354,7 +354,7 @@ INTL_LIBDIR = $(dot)/$(LIBSUBDIR)/intl
INTL_ABSSRC = ${topdir}/$(INTL_LIB)
INTL_BUILDDIR = ${LIBBUILD}/intl

View File

@ -1,8 +1,97 @@
@comment $OpenBSD: PLIST,v 1.16 2014/03/10 11:58:31 naddy Exp $
@comment $OpenBSD: PLIST,v 1.17 2016/11/11 22:39:48 naddy Exp $
@pkgpath shells/bash,static
@shell bin/bash
bin/bashbug
include/bash/
include/bash/alias.h
include/bash/array.h
include/bash/arrayfunc.h
include/bash/assoc.h
include/bash/bashansi.h
include/bash/bashintl.h
include/bash/bashjmp.h
include/bash/bashtypes.h
include/bash/builtins/
include/bash/builtins.h
include/bash/builtins/bashgetopt.h
include/bash/builtins/builtext.h
include/bash/builtins/common.h
include/bash/builtins/getopt.h
include/bash/command.h
include/bash/config-bot.h
include/bash/config-top.h
include/bash/config.h
include/bash/conftypes.h
include/bash/dispose_cmd.h
include/bash/error.h
include/bash/externs.h
include/bash/general.h
include/bash/hashlib.h
include/bash/include/
include/bash/include/ansi_stdlib.h
include/bash/include/chartypes.h
include/bash/include/filecntl.h
include/bash/include/gettext.h
include/bash/include/maxpath.h
include/bash/include/memalloc.h
include/bash/include/ocache.h
include/bash/include/posixdir.h
include/bash/include/posixjmp.h
include/bash/include/posixstat.h
include/bash/include/posixtime.h
include/bash/include/posixwait.h
include/bash/include/shmbchar.h
include/bash/include/shmbutil.h
include/bash/include/shtty.h
include/bash/include/stat-time.h
include/bash/include/stdc.h
include/bash/include/systimes.h
include/bash/include/typemax.h
include/bash/include/unionwait.h
include/bash/jobs.h
include/bash/make_cmd.h
include/bash/pathnames.h
include/bash/quit.h
include/bash/shell.h
include/bash/sig.h
include/bash/siglist.h
include/bash/signames.h
include/bash/subst.h
include/bash/syntax.h
include/bash/unwind_prot.h
include/bash/variables.h
include/bash/version.h
include/bash/xmalloc.h
include/bash/y.tab.h
@info info/bash.info
lib/bash/
lib/bash/Makefile.inc
@bin lib/bash/basename
@bin lib/bash/dirname
@bin lib/bash/finfo
@bin lib/bash/head
@bin lib/bash/id
@bin lib/bash/ln
@bin lib/bash/logname
@bin lib/bash/mkdir
@bin lib/bash/mypid
@bin lib/bash/pathchk
@bin lib/bash/print
@bin lib/bash/printenv
@bin lib/bash/push
@bin lib/bash/realpath
@bin lib/bash/rmdir
@bin lib/bash/setpgid
@bin lib/bash/sleep
@bin lib/bash/strftime
@bin lib/bash/sync
@bin lib/bash/tee
@bin lib/bash/truefalse
@bin lib/bash/tty
@bin lib/bash/uname
@bin lib/bash/unlink
@bin lib/bash/whoami
lib/pkgconfig/bash.pc
@man man/man1/bash.1
@man man/man1/bashbug.1
share/doc/bash/
@ -42,6 +131,7 @@ share/locale/ja/LC_MESSAGES/bash.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/bash.mo
share/locale/nb/LC_MESSAGES/bash.mo
share/locale/nl/LC_MESSAGES/bash.mo
share/locale/pl/LC_MESSAGES/bash.mo
share/locale/pt_BR/LC_MESSAGES/bash.mo