aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmanuel Haupt <ehaupt@FreeBSD.org>2014-09-24 17:52:22 +0000
committerEmanuel Haupt <ehaupt@FreeBSD.org>2014-09-24 17:52:22 +0000
commit02bf8e1285a3b8fffd75f1def57c2f88609c8f8e (patch)
tree68029920c3ecd33d402a1004ff135d68e81be660
parent7f9389e54bf6e02dab4e80c134e1dccf7182848c (diff)
downloadports-02bf8e1285a3b8fffd75f1def57c2f88609c8f8e.tar.gz
ports-02bf8e1285a3b8fffd75f1def57c2f88609c8f8e.zip
- Update to patch level 25 (4.3.25)
- Provide CPE information [1] Provided by: des [1] Security: CVE-2014-6271 Approved by: portmgr (bdrewery)
Notes
Notes: svn path=/branches/2014Q3/; revision=369191
-rw-r--r--shells/bash/Makefile7
-rw-r--r--shells/bash/distinfo14
-rw-r--r--shells/bash/pkg-plist4
3 files changed, 18 insertions, 7 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 18d5df60795c..e1e0b10c9575 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= bash
-PATCHLEVEL= 18
+PATCHLEVEL= 25
PORTVERSION= 4.3.${PATCHLEVEL:S/^0//g}
-PORTREVISION?= 2
+PORTREVISION?= 0
CATEGORIES= shells
MASTER_SITES= GNU
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -30,8 +30,9 @@ IMPLICITCD_DESC= Use directory name alone to cd into it
COLONBREAKSWORDS_DESC= Colons break words
HELP_DESC= Enable builtin help
-USES= bison makeinfo
+USES= bison cpe makeinfo
OPTIONS_SUB= yes
+CPE_VENDOR= gnu
IMPLICITCD_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-implicitcd
COLONBREAKSWORDS_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-colonbreakswords
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index c1accf9ea4d2..60674efb7a6b 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -36,3 +36,17 @@ SHA256 (bash/bash43-017) = 1267c25c6b5ba57042a7bb6c569a6de02ffd0d29530489a16666c
SIZE (bash/bash43-017) = 1565
SHA256 (bash/bash43-018) = 7aa8b40a9e973931719d8cc72284a8fb3292b71b522db57a5a79052f021a3d58
SIZE (bash/bash43-018) = 1315
+SHA256 (bash/bash43-019) = a7a91475228015d676cafa86d2d7aa9c5d2139aa51485b6bbdebfdfbcf0d2d23
+SIZE (bash/bash43-019) = 2610
+SHA256 (bash/bash43-020) = ca5e86d87f178128641fe91f2f094875b8c1eb2de9e0d2e9154f5d5cc0336c98
+SIZE (bash/bash43-020) = 2777
+SHA256 (bash/bash43-021) = 41439f06883e6bd11c591d9d5e9ae08afbc2abd4b935e1d244b08100076520a9
+SIZE (bash/bash43-021) = 1623
+SHA256 (bash/bash43-022) = fd4d47bb95c65863f634c4706c65e1e3bae4ee8460c72045c0a0618689061a88
+SIZE (bash/bash43-022) = 1782
+SHA256 (bash/bash43-023) = 9ac250c7397a8f53dbc84dfe790d2a418fbf1fe090bcece39b4a5c84a2d300d4
+SIZE (bash/bash43-023) = 3414
+SHA256 (bash/bash43-024) = 3b505882a0a6090667d75824fc919524cd44cc3bd89dd08b7c4e622d3f960f6c
+SIZE (bash/bash43-024) = 1909
+SHA256 (bash/bash43-025) = 1e5186f5c4a619bb134a1177d9e9de879f3bb85d9c5726832b03a762a2499251
+SIZE (bash/bash43-025) = 3940
diff --git a/shells/bash/pkg-plist b/shells/bash/pkg-plist
index 1adc63653eb8..51cec11e48e3 100644
--- a/shells/bash/pkg-plist
+++ b/shells/bash/pkg-plist
@@ -39,7 +39,3 @@ man/man1/bashbug.1.gz
%%NLS%%share/locale/vi/LC_MESSAGES/bash.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/bash.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/bash.mo
-%%NLS%%@dirrmtry share/locale/en@boldquot/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en@boldquot
-%%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en@quot