Date: Sunday, November 6, 2016 @ 18:07:27 Author: bpiotrowski Revision: 279932
upgpkg: bash 4.4-1 new upstream release Modified: bash/trunk/PKGBUILD bash/trunk/system.bashrc Deleted: bash/trunk/bash-4.3-old-memleak.patch bash/trunk/privmode-setuid-fail.patch ----------------------------+ PKGBUILD | 118 ++----------------------------------------- bash-4.3-old-memleak.patch | 24 -------- privmode-setuid-fail.patch | 29 ---------- system.bashrc | 3 - 4 files changed, 8 insertions(+), 166 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-11-06 18:07:04 UTC (rev 279931) +++ PKGBUILD 2016-11-06 18:07:27 UTC (rev 279932) @@ -4,9 +4,9 @@ # Contributor: Aaron Griffin <[email protected]> pkgname=bash -_basever=4.3 -_patchlevel=046 -pkgver=$_basever.$_patchlevel +_basever=4.4 +_patchlevel=0 +pkgver=$_basever pkgrel=1 pkgdesc='The GNU Bourne Again shell' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url='http://www.gnu.org/software/bash/bash.html' groups=('base') backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout}) -depends=('readline>=6.3' 'glibc' 'ncurses' 'libncursesw.so') +depends=('readline>=7.0' 'glibc' 'ncurses' 'libncursesw.so') optdepends=('bash-completion: for tab completion') provides=('sh') source=(https://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} @@ -22,9 +22,7 @@ dot.bash_profile dot.bash_logout system.bashrc - system.bash_logout - privmode-setuid-fail.patch - bash-4.3-old-memleak.patch) + system.bash_logout) validpgpkeys=('7C0135FB088AAF6C66C650B9BB5869F064EA74AB') # Chet Ramey if [[ $((10#${_patchlevel})) -gt 0 ]]; then @@ -40,12 +38,6 @@ msg "applying patch bash${_basever//.}-$(printf "%03d" $_p)" patch -p0 -i ../bash${_basever//.}-$(printf "%03d" $_p) done - - # http://hmarco.org/bugs/bash_4.3-setuid-bug.html (FS#40663) - patch -p0 -i ../privmode-setuid-fail.patch - - # https://bugs.archlinux.org/task/45891 - patch -p1 -i ../bash-4.3-old-memleak.patch } build() { @@ -81,104 +73,10 @@ install -m644 dot.bash_logout "$pkgdir"/etc/skel/.bash_logout } -md5sums=('81348932d5da294953e15d4814c74dd1' +md5sums=('148888a7c95ac23705559b6f477dfe25' 'SKIP' '027d6bd8f5f6a06b75bb7698cb478089' '2902e0fee7a9168f3a4fd2ccd60ff047' '42f4400ed2314bd7519c020d0187edc5' - '561949793177116b7be29a07c385ba8b' - '472f536d7c9e8250dc4568ec4cfaf294' - 'a577d42e38249d298d6a8d4bf2823883' - '5bb46160bba51ff904922c6ccfd9c49e' - '1ab682b4e36afa4cf1b426aa7ac81c0d' - 'SKIP' - '8fc22cf50ec85da00f6af3d66f7ddc1b' - 'SKIP' - 'a41728eca78858758e26b5dea64ae506' - 'SKIP' - 'bf8d53d227829d67235927689a03cc7a' - 'SKIP' - 'c0c00935c8b8ffff76e8ab77e7be7d15' - 'SKIP' - '6f01e364cd092faa28dd7119f47ddb5f' - 'SKIP' - 'dcf471d222bcd83283d3094e6ceeb6f8' - 'SKIP' - 'f7553416646dc26c266454c78a916d36' - 'SKIP' - '7e73d2151f4064b484a4ba2c4b09960e' - 'SKIP' - 'a275463d21735bb6d7161f9fbd320d8f' - 'SKIP' - 'c17103ee20420d77e46b224c8d3fceda' - 'SKIP' - '3e2a057a19d02b3f92a3a09eacbc03ae' - 'SKIP' - 'fb377143a996d4ff087a2771bc8332f9' - 'SKIP' - '1a1aaecc99a9d0cbc310e8e247dcc8b6' - 'SKIP' - '4f04387458a3c1b4d460d199f49991a8' - 'SKIP' - '90e759709720c4f877525bebc9d5dc06' - 'SKIP' - '11e4046e1b86070f6adbb7ffc89641be' - 'SKIP' - 'cd5a9b46f5bea0dc0248c93c7dfac011' - 'SKIP' - 'cff4dc024d9d3456888aaaf8a36ca774' - 'SKIP' - '167839c5f147347f4a03d88ab97ff787' - 'SKIP' - '1d350671c48dec30b34d8b81f09cd79d' - 'SKIP' - '11c349af66a55481a3215ef2520bec36' - 'SKIP' - 'b3cb0d80fd0c47728264405cbb3b23c7' - 'SKIP' - 'b5ea5600942acceb4b6f07313d2de74e' - 'SKIP' - '193c06f578d38ffdbaebae9c51a7551f' - 'SKIP' - '922578e2be7ed03729454e92ee8d3f3a' - 'SKIP' - '8ff6948b16f2db5c29b1b9ae1085bbe7' - 'SKIP' - 'dd51fa67913b5dca45a702b672b3323f' - 'SKIP' - '0729364c977ef4271e9f8dfafadacf67' - 'SKIP' - 'efb709fdb1368945513de23ccbfae053' - 'SKIP' - '236df1ac1130a033ed0dbe2d2115f28f' - 'SKIP' - '2360f7e79cfb28526f80021025ea5909' - 'SKIP' - 'b551c4ee7b8713759e4143499d0bbd48' - 'SKIP' - 'c9a56fbe0348e05a886dff97f2872b74' - 'SKIP' - 'e564e8ab44ed1ca3a4e315a9f6cabdc9' - 'SKIP' - 'b00ff66c41a7c0f06e191200981980b0' - 'SKIP' - 'be2a7b05f6ae560313f3c9d5f7127bda' - 'SKIP' - '61e0522830b24fbe8c0d1b010f132470' - 'SKIP' - 'a4775487abe958536751c8ce53cdf6f9' - 'SKIP' - '80d3587c58854e226055ef099ffeb535' - 'SKIP' - '20bf63eef7cb441c0b1cc49ef3191d03' - 'SKIP' - '70790646ae61e207c995e44931390e50' - 'SKIP' - '855a46955cb251534e80b4732b748e37' - 'SKIP' - '29623d3282fcbb37e1158136509b5bb8' - 'SKIP' - '4473244ca5abfd4b018ea26dc73e7412' - 'SKIP' - '7e5fb09991c077076b86e0e057798913' - 'SKIP') + '09c6f7f099f18e01cc2250719757c9a2' + '472f536d7c9e8250dc4568ec4cfaf294') Deleted: bash-4.3-old-memleak.patch =================================================================== --- bash-4.3-old-memleak.patch 2016-11-06 18:07:04 UTC (rev 279931) +++ bash-4.3-old-memleak.patch 2016-11-06 18:07:27 UTC (rev 279932) @@ -1,24 +0,0 @@ -diff -up bash-4.3/subst.c.old bash-4.3/subst.c ---- bash-4.3/subst.c.old 2015-08-03 10:32:37.353490080 +0200 -+++ bash-4.3/subst.c 2015-08-03 10:33:34.818533408 +0200 -@@ -9492,7 +9492,7 @@ make_internal_declare (word, option) - char *word; - char *option; - { -- int t; -+ int t, r; - WORD_LIST *wl; - WORD_DESC *w; - -@@ -9504,7 +9504,10 @@ make_internal_declare (word, option) - wl = make_word_list (w, (WORD_LIST *)NULL); - wl = make_word_list (make_word (option), wl); - -- return (declare_builtin (wl)); -+ r = declare_builtin (wl); -+ -+ dispose_words (wl); -+ return r; - } - #endif - Deleted: privmode-setuid-fail.patch =================================================================== --- privmode-setuid-fail.patch 2016-11-06 18:07:04 UTC (rev 279931) +++ privmode-setuid-fail.patch 2016-11-06 18:07:27 UTC (rev 279932) @@ -1,29 +0,0 @@ -*** ../bash-4.3-patched/shell.c 2014-01-14 08:04:32.000000000 -0500 ---- shell.c 2014-06-06 16:29:01.000000000 -0400 -*************** -*** 1227,1232 **** - disable_priv_mode () - { -! setuid (current_user.uid); -! setgid (current_user.gid); - current_user.euid = current_user.uid; - current_user.egid = current_user.gid; ---- 1229,1246 ---- - disable_priv_mode () - { -! int e; -! -! if (setuid (current_user.uid) < 0) -! { -! e = errno; -! sys_error (_("cannot set uid to %d: effective uid %d"), current_user.uid, current_user.euid); -! #if defined (EXIT_ON_SETUID_FAILURE) -! if (e == EAGAIN) -! exit (e); -! #endif -! } -! if (setgid (current_user.gid) < 0) -! sys_error (_("cannot set gid to %d: effective gid %d"), current_user.gid, current_user.egid); -! - current_user.euid = current_user.uid; - current_user.egid = current_user.gid; Modified: system.bashrc =================================================================== --- system.bashrc 2016-11-06 18:07:04 UTC (rev 279931) +++ system.bashrc 2016-11-06 18:07:27 UTC (rev 279932) @@ -6,9 +6,6 @@ [[ $- != *i* ]] && return PS1='[\u@\h \W]\$ ' -PS2='> ' -PS3='> ' -PS4='+ ' case ${TERM} in xterm*|rxvt*|Eterm|aterm|kterm|gnome*)
