Skip to content
Snippets Groups Projects
Commit cec73eed authored by Ariadne Conill's avatar Ariadne Conill
Browse files

main/bash: fix applying vendor patches

parent 46285f60
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ pkgver=4.4.12 ...@@ -6,7 +6,7 @@ pkgver=4.4.12
_patchlevel=${pkgver##*.} _patchlevel=${pkgver##*.}
_myver=${pkgver%.*} _myver=${pkgver%.*}
_patchbase=${_myver/./} _patchbase=${_myver/./}
pkgrel=0 pkgrel=1
pkgdesc="The GNU Bourne Again shell" pkgdesc="The GNU Bourne Again shell"
url="http://www.gnu.org/software/bash/bash.html" url="http://www.gnu.org/software/bash/bash.html"
arch="all" arch="all"
...@@ -30,13 +30,29 @@ while [ $_i -le $_patchlevel ]; do ...@@ -30,13 +30,29 @@ while [ $_i -le $_patchlevel ]; do
done done
# secfixes: # secfixes:
# 4.4.12-r0: # 4.4.12-r1:
# - CCVE-2016-0634 # - CVE-2016-0634
builddir="$srcdir"/$pkgname-$_myver builddir="$srcdir"/$pkgname-$_myver
prepare() { prepare() {
cd "$builddir" cd "$builddir"
# NOTE: This section is for applying the vendor patches, which are required to fix
# security holes. `default_prepare` does *not* apply vendor patches in the format
# shipped with bash. We also need to make sure vendor patches are applied before
# our own.
# If you disagree, please request an experimental rebuild with bash as /bin/sh,
# before removing this section.
for p in $source; do
case $p in
*/bash[0-9][0-9]-[0-9]*)
msg "$p (vendor)"
patch -p0 -i "$srcdir"/${p##*/} || return 1
;;
esac
done
default_prepare default_prepare
update_config_sub update_config_sub
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment