Skip to content

Commit 95bd091

Browse files
dschodscho
committed
Merge remote-tracking branch 'dscho/openssh'
This updates primarily the definition of OpenSSH to the latest version, but at the same time updates everything else to current upstream, too. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents d725052 + da63f58 commit 95bd091

File tree

167 files changed

+12340
-2173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+12340
-2173
lines changed

Diff for: ‎.drone.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
build:
2-
image: teaci/msys32
2+
image: teaci/msys$$arch
33
pull: true
4-
shell: msys32
4+
shell: msys$$arch
55
commands:
6-
- export RUNTEST=$$runtest
6+
# TODO: remove this option when not anymore needed
7+
- if [ $$arch = 32 ]; then export DISABLE_QUALITY_CHECK=true; fi
78
- ./ci-build.sh
89

910
notify:
@@ -16,7 +17,7 @@ notify:
1617
port: 6667
1718

1819
matrix:
19-
runtest:
20-
- false
21-
# Temprorary disable matrix build to workaround irc plugin bug on wine-ci.org, see https://github.com/drone/drone/issues/1459
22-
# - true # allow failures
20+
arch:
21+
- 64
22+
- 32
23+
#FIXME: When a matrix build is done, only the build status of the last job in a matrix is sent to notification plugins, this confuses our irc plugin, see https://github.com/drone/drone/issues/1459. Github pull request Web UI status and Tea CI Web UI status works fine with matrix build.

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MSYS2-packages
33

44
Package scripts for MSYS2.
55

6-
To build these, run msys2_shell.bat then from the bash prompt.
6+
To build these, run msys2_shell.cmd then from the bash prompt.
77

88
cd ${package-name}
99
makepkg

Diff for: ‎appveyor.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ environment:
66
BUILD_URL: https://ci.appveyor.com/project/$(APPVEYOR_ACCOUNT_NAME)/$(APPVEYOR_PROJECT_NAME)/build/$(APPVEYOR_BUILD_VERSION)
77

88
build_script:
9-
# TODO: implement update-core --noconfirm and replace the below command line
10-
- C:\msys64\usr\bin\pacman --sync --refresh --refresh --needed --noconfirm msys2-runtime msys2-runtime-devel bash pacman pacman-mirrors
9+
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade
1110
- C:\msys64\usr\bin\bash --login -c "$(cygpath ${APPVEYOR_BUILD_FOLDER})/ci-build.sh"
1211

1312
artifacts:
@@ -23,4 +22,4 @@ deploy:
2322
publish: true
2423
override: true
2524
api_key:
26-
secure: BINTRAY_TOKEN_ENCRYPTED_BY_APPVEYOR
25+
secure: B2XBLbsX8EQOpWyyaHskipMoF2+Tbt6hc/afbVm82f01CBKruspjwhee4K4C7/xf

Diff for: ‎bash/0001-bash-4.3-cygwin.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
@@ -161,6 +166,9 @@ static struct {
210210
{ "compat40", &shopt_compat40, set_compatibility_level },
211211
{ "compat41", &shopt_compat41, set_compatibility_level },
212-
{ "compat42", &shopt_compat41, set_compatibility_level },
212+
{ "compat42", &shopt_compat42, set_compatibility_level },
213213
+#if __CYGWIN__
214214
+ { "completion_strip_exe", &completion_strip_exe, NULL },
215215
+#endif

Diff for: ‎bash/PKGBUILD

+12-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
pkgbase=bash
55
pkgname=('bash' 'bash-devel')
66
_basever=4.3
7-
_patchlevel=042 #prepare for some patches
7+
_patchlevel=046 #prepare for some patches
88
pkgver=${_basever}.${_patchlevel}
9-
pkgrel=4
9+
pkgrel=1
1010
pkgdesc="The GNU Bourne Again shell"
1111
arch=('i686' 'x86_64')
1212
license=('GPL')
@@ -132,7 +132,7 @@ package_bash-devel() {
132132

133133
sha256sums=('afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4'
134134
'SKIP'
135-
'4e3bd589c3b3b39ced9ce824f9da39667ee8d6c8cc86de080b2714cb0db36d9a'
135+
'4266bbb4c406e1b42b160e46897b9745621ac7cf2aad059ff270ba8312113edc'
136136
'da08e4661fdcb179f7749dd1c8ce728d0ed8d4ca07e50da757046c06c6464dee'
137137
'd833f89569b3d4ea4c78d998db087e60a426b8360a34707e80d71f3ce6ecc415'
138138
'9829166ecd5d48651fb4a139f7e05053c775aa1a760ff4cf9561bbe6bae3d308'
@@ -222,4 +222,13 @@ sha256sums=('afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4'
222222
'SKIP'
223223
'4ec432966e4198524a7e0cd685fe222e96043769c9613e66742ac475db132c1a'
224224
'SKIP'
225+
'b75a53141ab3d8fff3fa74b5f3dc76468b01eae299f50bbc2bc71ae395d690af'
226+
'SKIP'
227+
'47a8a3c005b46e25821f4d8f5ccb04c1d653b1c829cb40568d553dc44f7a6180'
228+
'SKIP'
229+
'9338820630bf67373b44d8ea68409f65162ea7a47b9b29ace06a0aed12567f99'
230+
'SKIP'
231+
'ba6ec3978e9eaa1eb3fabdaf3cc6fdf8c4606ac1c599faaeb4e2d69864150023'
232+
'SKIP'
233+
'b3b456a6b690cd293353f17e22d92a202b3c8bce587ae5f2667c20c9ab6f688f'
225234
'SKIP')

Diff for: ‎bash/bash.install

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ info_dir=usr/share/info
22
info_files=bash.info
33

44
post_upgrade() {
5-
[ -x usr/bin/install-info ]
5+
[ -x usr/bin/install-info ] || return 0
66
for f in ${info_files}; do
77
usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
88
done
99
}
1010

1111
pre_remove() {
12-
[ -x usr/bin/install-info ]
12+
[ -x usr/bin/install-info ] || return 0
1313
for f in ${info_files}; do
1414
usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
1515
done

Diff for: ‎bash/bash43-043

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
BASH PATCH REPORT
2+
=================
3+
4+
Bash-Release: 4.3
5+
Patch-ID: bash43-043
6+
7+
Bug-Reported-by: lolilolicon <[email protected]>
8+
Bug-Reference-ID: <CAMtVo_MF16KWanCB4C8WxA88Qt26zWsvV6V7+_U2fM0E6tCDxw@mail.gmail.com>
9+
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00040.html
10+
11+
Bug-Description:
12+
13+
When the lastpipe option is enabled, the last component can contain nested
14+
pipelines and cause a segmentation fault under certain circumestances.
15+
16+
Patch (apply with `patch -p0'):
17+
18+
*** ../bash-4.3-patched/execute_cmd.c 2014-07-30 10:26:52.000000000 -0400
19+
--- execute_cmd.c 2014-08-15 08:55:24.000000000 -0400
20+
***************
21+
*** 2406,2412 ****
22+
{
23+
#if defined (JOB_CONTROL)
24+
! append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid);
25+
! #endif
26+
lstdin = wait_for (lastpid);
27+
#if defined (JOB_CONTROL)
28+
/* If wait_for removes the job from the jobs table, use result of last
29+
--- 2433,2447 ----
30+
{
31+
#if defined (JOB_CONTROL)
32+
! if (INVALID_JOB (lastpipe_jid) == 0)
33+
! {
34+
! append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid);
35+
! lstdin = wait_for (lastpid);
36+
! }
37+
! else
38+
! lstdin = wait_for_single_pid (lastpid); /* checks bgpids list */
39+
! #else
40+
lstdin = wait_for (lastpid);
41+
+ #endif
42+
+
43+
#if defined (JOB_CONTROL)
44+
/* If wait_for removes the job from the jobs table, use result of last
45+
*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
46+
--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
47+
***************
48+
*** 26,30 ****
49+
looks for to find the patch level (for the sccs version string). */
50+
51+
! #define PATCHLEVEL 42
52+
53+
#endif /* _PATCHLEVEL_H_ */
54+
--- 26,30 ----
55+
looks for to find the patch level (for the sccs version string). */
56+
57+
! #define PATCHLEVEL 43
58+
59+
#endif /* _PATCHLEVEL_H_ */

Diff for: ‎bash/bash43-043.sig

72 Bytes
Binary file not shown.

Diff for: ‎bash/bash43-044

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
BASH PATCH REPORT
2+
=================
3+
4+
Bash-Release: 4.3
5+
Patch-ID: bash43-044
6+
7+
Bug-Reported-by: Ondrej Oprala <[email protected]>
8+
Bug-Reference-ID: <[email protected]>
9+
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00046.html
10+
11+
Bug-Description:
12+
13+
A typo prevents the `compat42' shopt option from working as intended.
14+
15+
Patch (apply with `patch -p0'):
16+
17+
diff -rC 2 bash-4.3.42/builtins/shopt.def bash-4.3.43/builtins/shopt.def
18+
*** bash-4.3.42/builtins/shopt.def 2013-02-27 09:43:20.000000000 -0500
19+
--- builtins/shopt.def 2015-10-16 11:25:28.000000000 -0400
20+
***************
21+
*** 161,165 ****
22+
{ "compat40", &shopt_compat40, set_compatibility_level },
23+
{ "compat41", &shopt_compat41, set_compatibility_level },
24+
! { "compat42", &shopt_compat41, set_compatibility_level },
25+
#if defined (READLINE)
26+
{ "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
27+
--- 161,165 ----
28+
{ "compat40", &shopt_compat40, set_compatibility_level },
29+
{ "compat41", &shopt_compat41, set_compatibility_level },
30+
! { "compat42", &shopt_compat42, set_compatibility_level },
31+
#if defined (READLINE)
32+
{ "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
33+
34+
*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
35+
--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
36+
***************
37+
*** 26,30 ****
38+
looks for to find the patch level (for the sccs version string). */
39+
40+
! #define PATCHLEVEL 43
41+
42+
#endif /* _PATCHLEVEL_H_ */
43+
--- 26,30 ----
44+
looks for to find the patch level (for the sccs version string). */
45+
46+
! #define PATCHLEVEL 44
47+
48+
#endif /* _PATCHLEVEL_H_ */

Diff for: ‎bash/bash43-044.sig

72 Bytes
Binary file not shown.

Diff for: ‎bash/bash43-045

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
BASH PATCH REPORT
2+
=================
3+
4+
Bash-Release: 4.3
5+
Patch-ID: bash43-045
6+
7+
Bug-Reported-by: Basin Ilya <[email protected]>
8+
Bug-Reference-ID: <[email protected]>
9+
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-10/msg00141.html
10+
11+
Bug-Description:
12+
13+
If a file open attempted as part of a redirection fails because it is interrupted
14+
by a signal, the shell needs to process any pending traps to allow the redirection
15+
to be canceled.
16+
17+
Patch (apply with `patch -p0'):
18+
19+
*** bash-20150109/redir.c 2014-12-03 10:47:38.000000000 -0500
20+
--- redir.c 2015-01-16 10:15:47.000000000 -0500
21+
***************
22+
*** 672,676 ****
23+
e = errno;
24+
if (fd < 0 && e == EINTR)
25+
! QUIT;
26+
errno = e;
27+
}
28+
--- 672,679 ----
29+
e = errno;
30+
if (fd < 0 && e == EINTR)
31+
! {
32+
! QUIT;
33+
! run_pending_traps ();
34+
! }
35+
errno = e;
36+
}
37+
38+
*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
39+
--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
40+
***************
41+
*** 26,30 ****
42+
looks for to find the patch level (for the sccs version string). */
43+
44+
! #define PATCHLEVEL 44
45+
46+
#endif /* _PATCHLEVEL_H_ */
47+
--- 26,30 ----
48+
looks for to find the patch level (for the sccs version string). */
49+
50+
! #define PATCHLEVEL 45
51+
52+
#endif /* _PATCHLEVEL_H_ */

Diff for: ‎bash/bash43-045.sig

72 Bytes
Binary file not shown.

Diff for: ‎bash/bash43-046

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
BASH PATCH REPORT
2+
=================
3+
4+
Bash-Release: 4.3
5+
Patch-ID: bash43-046
6+
7+
Bug-Reported-by: Sergey Tselikh <[email protected]>
8+
Bug-Reference-ID: <[email protected]>
9+
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-08/msg00080.html
10+
11+
Bug-Description:
12+
13+
An incorrect conversion from an indexed to associative array can result in a
14+
core dump.
15+
16+
Patch (apply with `patch -p0'):
17+
18+
*** /fs2/chet/bash/bash-20150813/subst.c 2015-08-13 11:32:54.000000000 -0400
19+
--- subst.c 2015-08-18 10:13:59.000000000 -0400
20+
***************
21+
*** 9562,9566 ****
22+
opts[opti] = '\0';
23+
if (opti > 0)
24+
! make_internal_declare (tlist->word->word, opts);
25+
26+
t = do_word_assignment (tlist->word, 0);
27+
--- 9562,9573 ----
28+
opts[opti] = '\0';
29+
if (opti > 0)
30+
! {
31+
! t = make_internal_declare (tlist->word->word, opts);
32+
! if (t != EXECUTION_SUCCESS)
33+
! {
34+
! last_command_exit_value = t;
35+
! exp_jump_to_top_level (DISCARD);
36+
! }
37+
! }
38+
39+
t = do_word_assignment (tlist->word, 0);
40+
41+
*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
42+
--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
43+
***************
44+
*** 26,30 ****
45+
looks for to find the patch level (for the sccs version string). */
46+
47+
! #define PATCHLEVEL 45
48+
49+
#endif /* _PATCHLEVEL_H_ */
50+
--- 26,30 ----
51+
looks for to find the patch level (for the sccs version string). */
52+
53+
! #define PATCHLEVEL 46
54+
55+
#endif /* _PATCHLEVEL_H_ */

Diff for: ‎bash/bash43-046.sig

72 Bytes
Binary file not shown.

Diff for: ‎ccache/PKGBUILD

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Maintainer: Mateusz Mikuła <[email protected]>
2+
# Contributor: Renato Silva <[email protected]>
23

34
pkgname=ccache
4-
pkgver=3.2.4
5-
pkgrel=1
5+
pkgver=3.2.5
6+
pkgrel=2
67
pkgdesc="A compiler cache (mingw-w64)"
78
arch=('i686' 'x86_64')
89
url="https://ccache.samba.org/"
@@ -11,9 +12,11 @@ replaces=("${pkgname}-git")
1112
makedepends=("gcc" "pkg-config")
1213
depends=("gcc-libs" "zlib")
1314
options=('staticlibs' 'strip')
15+
install="${pkgname}.install"
1416
source=(https://samba.org/ftp/ccache/${pkgname}-${pkgver}.tar.bz2{,.asc}
1517
"MSYS2-dont-use-symlinks.patch")
16-
sha256sums=('ffeb967edb549e67da0bd5f44f729a2022de9fdde65dfd80d2a7204d7f75332e'
18+
validpgpkeys=("5A939A71A46792CF57866A51996DDA075594ADB8") #Joel Rosdahl <[email protected]>
19+
sha256sums=('7a553809e90faf9de3a23ee9c5b5f786cfd4836bf502744bedb824a24bee1097'
1720
'SKIP'
1821
'a0d2ea2ef1c9e59d4e5fdd659d291a4c7f4afc48ad50b1bc00f77349337d3167')
1922

@@ -38,11 +41,4 @@ build() {
3841
package() {
3942
cd "${srcdir}/build-${CHOST}"
4043
make DESTDIR="${pkgdir}" install
41-
42-
install -d ${pkgdir}/usr/lib/ccache/bin
43-
cd ${pkgdir}/usr/lib/ccache/bin
44-
scripts=(c++ cc cpp gcc g++ ${CARCH}-pc-msys-g++ ${CARCH}-pc-msys-c++ ${CARCH}-pc-msys-gcc)
45-
for fn in ${scripts[*]}; do
46-
echo -e '#!/bin/bash\n\nccache /usr/bin/'$fn' "$@"' > $fn
47-
done
4844
}

Diff for: ‎ccache/ccache.install

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
post_install() {
2+
mkdir -p /usr/lib/ccache/bin
3+
for compiler in c++ cc cpp gcc g++ {i686,x86_64}-{pc-msys,w64-mingw32}-{g++,c++,gcc}; do
4+
MSYS='winsymlinks:lnk' ln -sf /usr/bin/ccache /usr/lib/ccache/bin/${compiler}
5+
done
6+
}
7+
8+
pre_remove() { rm -rf /usr/lib/ccache; }
9+
pre_upgrade() { pre_remove; }
10+
post_upgrade() { post_install; }

Diff for: ‎ci-build.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ define_build_order || failure 'Could not determine build order'
2222

2323
# Build
2424
message 'Building packages' "${packages[@]}"
25-
execute 'Upgrading the system' pacman --noconfirm --noprogressbar --sync --refresh --refresh --sysupgrade
25+
execute 'Updating system' update_system
26+
execute 'Approving recipe quality' check_recipe_quality
2627
for package in "${packages[@]}"; do
2728
execute 'Building binary' makepkg --noconfirm --noprogressbar --skippgpcheck --nocheck --syncdeps --rmdeps --cleanbuild
2829
execute 'Building source' makepkg --noconfirm --noprogressbar --skippgpcheck --allsource
29-
yes|execute 'Installing' pacman --noprogressbar --upgrade *.pkg.tar.xz
30+
execute 'Installing' yes:pacman --noprogressbar --upgrade *.pkg.tar.xz
3031
deploy_enabled && mv "${package}"/*.pkg.tar.xz artifacts
3132
deploy_enabled && mv "${package}"/*.src.tar.gz artifacts
3233
unset package

0 commit comments

Comments
 (0)