diff --git a/COPYING b/COPYING
index eeef41a5ef..fd049ce868 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
- Copyright (c) 2008-2016 Juan Romero Pardines and contributors
+ Copyright (c) 2008-2017 Juan Romero Pardines and contributors
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/Manual.md b/Manual.md
index 449a5b2ce6..2712c04c5f 100644
--- a/Manual.md
+++ b/Manual.md
@@ -42,7 +42,6 @@ packages for XBPS, the `Void Linux` native packaging system.
* [Contributing via git](#contributing)
* [Help](#help)
-
## Introduction
@@ -54,13 +53,17 @@ The `template files` are `GNU bash` shell scripts that must define some required
`variables` and `functions` that are processed by `xbps-src` (the package builder)
to generate the resulting binary packages.
+By convention, all templates start with a comment briefly explaining what they
+are. In addition, pkgname and version can't have any characters in them that
+would require them to be quoted, so they are not quoted.
+
A simple `template` example is as follows:
```
# Template file for 'foo'
-pkgname="foo"
-version="1.0"
+pkgname=foo
+version=1.0
revision=1
build_style=gnu-configure
short_desc="A short description max 72 chars"
@@ -505,12 +508,22 @@ default all binaries are stripped.
sonames in shared libraries.
- `nocross` If set, cross compilation won't be allowed and will exit immediately.
+This should be set to a string describing why it fails, or a link to a travis
+buildlog demonstrating the failure.
+
+- `restricted` If set, xbps-src will refuse to build the package unless
+`etc/conf` has `XBPS_ALLOW_RESTRICTED=yes`. The primary builders for Void
+Linux do not have this setting, so the primary repositories will not have any
+restricted package. This is useful for packages where the license forbids
+redistribution.
- `subpackages` A white space separated list of subpackages (matching `foo_package()`)
to override the guessed list. Only use this if a specific order of subpackages is required,
otherwise the default would work in most cases.
- `broken` If set, building the package won't be allowed because its state is currently broken.
+This should be set to a string describing why it is broken, or a link to a travis
+buildlog demonstrating the failure.
- `shlib_provides` A white space separated list of additional sonames the package provides on.
This appends to the generated file rather than replacing it.
@@ -642,7 +655,10 @@ arguments can be passed in via `configure_args`.
- `gnu-makefile` For packages that use GNU make, build arguments can be passed in via
`make_build_args` and install arguments via `make_install_args`. The build
target can be overridden via `make_build_target` and the install target
-via `make_install_target`.
+via `make_install_target`. This build style tries to compensate for makefiles
+that do not respect environment variables, so well written makefiles, those
+that do such things as append (`+=`) to variables, should have `make_use_env`
+set in the body of the template.
- `go` For programs written in Go that follow the standard package
structure. The variable `go_import_path` must be set to the package's
diff --git a/common/build-profiles/README b/common/build-profiles/README
index 111b1574a7..f179a0dbff 100644
--- a/common/build-profiles/README
+++ b/common/build-profiles/README
@@ -7,3 +7,4 @@ for a specific architecture:
- XBPS_TRIPLET (the compiler triplet)
- XBPS_CFLAGS (C compiler flags for host compiler)
- XBPS_CXXFLAGS (C++ compiler flags for the host compiler)
+ - XBPS_FFLAGS (Fortran compiler flags for the host compiler)
diff --git a/common/build-profiles/aarch64-musl.sh b/common/build-profiles/aarch64-musl.sh
index bfa9a53732..795db9f870 100644
--- a/common/build-profiles/aarch64-musl.sh
+++ b/common/build-profiles/aarch64-musl.sh
@@ -1,3 +1,4 @@
XBPS_TARGET_CFLAGS="-march=armv8-a"
XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
XBPS_TRIPLET="aarch64-unknown-linux-musl"
diff --git a/common/build-profiles/aarch64.sh b/common/build-profiles/aarch64.sh
index 2e7fe408b6..0c4cd3dafb 100644
--- a/common/build-profiles/aarch64.sh
+++ b/common/build-profiles/aarch64.sh
@@ -1,3 +1,4 @@
XBPS_TARGET_CFLAGS="-march=armv8-a"
XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
XBPS_TRIPLET="aarch64-unknown-linux-gnu"
diff --git a/common/build-profiles/armv6l-musl.sh b/common/build-profiles/armv6l-musl.sh
index 7dcb03e3a4..f58452e44d 100644
--- a/common/build-profiles/armv6l-musl.sh
+++ b/common/build-profiles/armv6l-musl.sh
@@ -1,3 +1,4 @@
XBPS_TARGET_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
XBPS_TRIPLET="armv6l-linux-musleabihf"
diff --git a/common/build-profiles/armv6l.sh b/common/build-profiles/armv6l.sh
index 873be80a37..a08c589d89 100644
--- a/common/build-profiles/armv6l.sh
+++ b/common/build-profiles/armv6l.sh
@@ -1,3 +1,4 @@
XBPS_TARGET_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
XBPS_TRIPLET="armv6l-unknown-linux-gnueabihf"
diff --git a/common/build-profiles/armv7l-musl.sh b/common/build-profiles/armv7l-musl.sh
index 107e2b6001..a8fadb347a 100644
--- a/common/build-profiles/armv7l-musl.sh
+++ b/common/build-profiles/armv7l-musl.sh
@@ -1,3 +1,4 @@
XBPS_TARGET_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
XBPS_TARGET_CXXFLAGS="$XBPS_CXXFLAGS"
+XBPS_TARGET_FFLAGS=""
XBPS_TRIPLET="armv7l-linux-musleabihf"
diff --git a/common/build-profiles/armv7l.sh b/common/build-profiles/armv7l.sh
index 87bed5995d..bde53ea67c 100644
--- a/common/build-profiles/armv7l.sh
+++ b/common/build-profiles/armv7l.sh
@@ -1,3 +1,4 @@
XBPS_TARGET_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
XBPS_TRIPLET="armv7l-unknown-linux-gnueabihf"
diff --git a/common/build-profiles/bootstrap.sh b/common/build-profiles/bootstrap.sh
index 604347f79a..abc0c3713f 100644
--- a/common/build-profiles/bootstrap.sh
+++ b/common/build-profiles/bootstrap.sh
@@ -1,2 +1,3 @@
XBPS_CFLAGS="-O2 -pipe"
XBPS_CXXFLAGS="$XBPS_CFLAGS"
+XBPS_FFLAGS="-fPIC -pipe"
diff --git a/common/build-profiles/i686-musl.sh b/common/build-profiles/i686-musl.sh
index eff0c95ae7..f3bf32cc50 100644
--- a/common/build-profiles/i686-musl.sh
+++ b/common/build-profiles/i686-musl.sh
@@ -1,3 +1,4 @@
XBPS_TARGET_CFLAGS="-mtune=i686"
XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
XBPS_TRIPLET="i686-pc-linux-musl"
diff --git a/common/build-profiles/i686.sh b/common/build-profiles/i686.sh
index 45a9117413..ea38e8fa6e 100644
--- a/common/build-profiles/i686.sh
+++ b/common/build-profiles/i686.sh
@@ -1,3 +1,4 @@
XBPS_TARGET_CFLAGS="-mtune=i686"
XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
XBPS_TRIPLET="i686-pc-linux-gnu"
diff --git a/common/build-profiles/x86_64-musl.sh b/common/build-profiles/x86_64-musl.sh
index 7f06682ceb..7dbb0f5c4b 100644
--- a/common/build-profiles/x86_64-musl.sh
+++ b/common/build-profiles/x86_64-musl.sh
@@ -1,3 +1,4 @@
XBPS_TARGET_CFLAGS="-mtune=generic"
XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
XBPS_TRIPLET="x86_64-unknown-linux-musl"
diff --git a/common/build-profiles/x86_64.sh b/common/build-profiles/x86_64.sh
index dee94e1694..ff9dd9902f 100644
--- a/common/build-profiles/x86_64.sh
+++ b/common/build-profiles/x86_64.sh
@@ -1,3 +1,4 @@
XBPS_TARGET_CFLAGS="-mtune=generic"
XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
XBPS_TRIPLET="x86_64-unknown-linux-gnu"
diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh
index b328431e55..123eba5746 100644
--- a/common/build-style/gnu-makefile.sh
+++ b/common/build-style/gnu-makefile.sh
@@ -4,11 +4,15 @@
do_build() {
: ${make_cmd:=make}
- ${make_cmd} \
- CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
- CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" CFLAGS="$CFLAGS" \
- LDFLAGS="$LDFLAGS" \
- ${makejobs} ${make_build_args} ${make_build_target}
+ if [ -z "$make_use_env" ]; then
+ ${make_cmd} \
+ CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+ CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
+ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+ ${makejobs} ${make_build_args} ${make_build_target}
+ else
+ ${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+ fi
}
do_install() {
diff --git a/common/build-style/haskell-stack.sh b/common/build-style/haskell-stack.sh
index 9b4f0ec4bd..f09acd1ab3 100644
--- a/common/build-style/haskell-stack.sh
+++ b/common/build-style/haskell-stack.sh
@@ -17,11 +17,12 @@ do_build() {
stack init --force --resolver ${stackage}
fi
- STACK_ROOT=$wrksrc/.stack stack ${makejobs} build ${make_build_args}
+ STACK_ROOT=$wrksrc/.stack stack --system-ghc ${makejobs} build \
+ ${make_build_args}
}
do_install() {
vmkdir usr/bin
- STACK_ROOT=$wrksrc/.stack stack install ${make_build_args} \
- --local-bin-path=${DESTDIR}/usr/bin
+ STACK_ROOT=$wrksrc/.stack stack --system-ghc install \
+ ${make_build_args} --local-bin-path=${DESTDIR}/usr/bin
}
diff --git a/common/build-style/qmake.sh b/common/build-style/qmake.sh
index abd4f92548..1966b6c4b5 100644
--- a/common/build-style/qmake.sh
+++ b/common/build-style/qmake.sh
@@ -2,7 +2,19 @@
# This helper is for templates using Qt4/Qt5 qmake.
#
do_configure() {
- qmake ${configure_args} \
+ local qmake
+ if [ -x "/usr/lib/qt5/bin/qmake" ]; then
+ # Qt5 qmake
+ qmake="/usr/lib/qt5/bin/qmake"
+ fi
+ if [ -x "/usr/lib/qt/bin/qmake" ]; then
+ # Qt4 qmake
+ qmake="/usr/lib/qt/bin/qmake"
+ fi
+ if [ -z "${qmake}" ]; then
+ msg_error "${pkgver}: Could not find qmake - missing in hostdepends?\n"
+ fi
+ ${qmake} ${configure_args} \
PREFIX=/usr \
LIB=/usr/lib \
QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX \
diff --git a/common/cross-profiles/README b/common/cross-profiles/README
index 0c52195b6b..9069084a80 100644
--- a/common/cross-profiles/README
+++ b/common/cross-profiles/README
@@ -8,6 +8,7 @@ A cross profile file must provide the following variables:
- XBPS_CROSS_TRIPLET (the cross compiler triplet)
- XBPS_CROSS_CFLAGS (C compiler flags for the cross compiler)
- XBPS_CROSS_CXXFLAGS (C++ compiler flags for the cross compiler)
+ - XBPS_CROSS_FFLAGS (Fortran compiler flags for the cross compiler)
- XBPS_CROSS_CPPFLAGS (Preprocessor flags for the cross compiler)
- XBPS_CROSS_LDFLAGS (Linker flags for the cross compiler)
diff --git a/common/cross-profiles/aarch64-musl.sh b/common/cross-profiles/aarch64-musl.sh
index fda5ac09c6..d17a09b5ad 100644
--- a/common/cross-profiles/aarch64-musl.sh
+++ b/common/cross-profiles/aarch64-musl.sh
@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="aarch64-musl"
XBPS_CROSS_TRIPLET="aarch64-linux-musl"
XBPS_CROSS_CFLAGS="-march=armv8-a"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/cross-profiles/aarch64.sh b/common/cross-profiles/aarch64.sh
index 42e0068d3b..c4ab53f788 100644
--- a/common/cross-profiles/aarch64.sh
+++ b/common/cross-profiles/aarch64.sh
@@ -6,3 +6,4 @@ XBPS_CFLAGS="-O2 -pipe" # XXX not yet supported: -fstack-protector-strong
XBPS_CXXFLAGS="$XBPS_CFLAGS"
XBPS_CROSS_CFLAGS="-march=armv8-a"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/cross-profiles/armv5tel-musl.sh b/common/cross-profiles/armv5tel-musl.sh
index a238957968..cd3020ffab 100644
--- a/common/cross-profiles/armv5tel-musl.sh
+++ b/common/cross-profiles/armv5tel-musl.sh
@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="armv5tel-musl"
XBPS_CROSS_TRIPLET="arm-linux-musleabi"
XBPS_CROSS_CFLAGS="-march=armv5te -msoft-float -mfloat-abi=soft"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/cross-profiles/armv5tel.sh b/common/cross-profiles/armv5tel.sh
index d654ad9362..cb1e28a4b0 100644
--- a/common/cross-profiles/armv5tel.sh
+++ b/common/cross-profiles/armv5tel.sh
@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="armv5tel"
XBPS_CROSS_TRIPLET="arm-linux-gnueabi"
XBPS_CROSS_CFLAGS="-march=armv5te -msoft-float -mfloat-abi=soft"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/cross-profiles/armv6l-musl.sh b/common/cross-profiles/armv6l-musl.sh
index ecb78479fb..b03e7a8d54 100644
--- a/common/cross-profiles/armv6l-musl.sh
+++ b/common/cross-profiles/armv6l-musl.sh
@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="armv6l-musl"
XBPS_CROSS_TRIPLET="arm-linux-musleabihf"
XBPS_CROSS_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/cross-profiles/armv6l.sh b/common/cross-profiles/armv6l.sh
index 9576d030d3..8d52f97cd4 100644
--- a/common/cross-profiles/armv6l.sh
+++ b/common/cross-profiles/armv6l.sh
@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="armv6l"
XBPS_CROSS_TRIPLET="arm-linux-gnueabihf"
XBPS_CROSS_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/cross-profiles/armv7l-musl.sh b/common/cross-profiles/armv7l-musl.sh
index bff5aba119..3b88cd4bad 100644
--- a/common/cross-profiles/armv7l-musl.sh
+++ b/common/cross-profiles/armv7l-musl.sh
@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="armv7l-musl"
XBPS_CROSS_TRIPLET="armv7l-linux-musleabihf"
XBPS_CROSS_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/cross-profiles/armv7l.sh b/common/cross-profiles/armv7l.sh
index d9d439dec3..8e8a378f1f 100644
--- a/common/cross-profiles/armv7l.sh
+++ b/common/cross-profiles/armv7l.sh
@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="armv7l"
XBPS_CROSS_TRIPLET="armv7l-linux-gnueabihf"
XBPS_CROSS_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/cross-profiles/i686-musl.sh b/common/cross-profiles/i686-musl.sh
index 80a5e560d4..e658725283 100644
--- a/common/cross-profiles/i686-musl.sh
+++ b/common/cross-profiles/i686-musl.sh
@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="i686-musl"
XBPS_CROSS_TRIPLET="i686-linux-musl"
XBPS_CROSS_CFLAGS="-march=i686"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/cross-profiles/i686.sh b/common/cross-profiles/i686.sh
index c69e94448f..9937694530 100644
--- a/common/cross-profiles/i686.sh
+++ b/common/cross-profiles/i686.sh
@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="i686"
XBPS_CROSS_TRIPLET="i686-pc-linux-gnu"
XBPS_CROSS_CFLAGS="-march=i686"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/cross-profiles/mips-musl.sh b/common/cross-profiles/mips-musl.sh
index c20a6ac592..7867721c38 100644
--- a/common/cross-profiles/mips-musl.sh
+++ b/common/cross-profiles/mips-musl.sh
@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="mips-musl"
XBPS_CROSS_TRIPLET="mips-linux-musl"
XBPS_CROSS_CFLAGS="-mtune=mips32r2 -mabi=32 -msoft-float"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/cross-profiles/mipsel-musl.sh b/common/cross-profiles/mipsel-musl.sh
index 359b4fe7b0..5866c1f92a 100644
--- a/common/cross-profiles/mipsel-musl.sh
+++ b/common/cross-profiles/mipsel-musl.sh
@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="mipsel-musl"
XBPS_CROSS_TRIPLET="mipsel-linux-musl"
XBPS_CROSS_CFLAGS="-mtune=mips32r2 -mabi=32 -msoft-float"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/cross-profiles/mipselhf-musl.sh b/common/cross-profiles/mipselhf-musl.sh
index c75451bc30..5989669e94 100644
--- a/common/cross-profiles/mipselhf-musl.sh
+++ b/common/cross-profiles/mipselhf-musl.sh
@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="mipselhf-musl"
XBPS_CROSS_TRIPLET="mipsel-linux-muslhf"
XBPS_CROSS_CFLAGS="-mtune=mips32r2 -mabi=32 -mhard-float"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/cross-profiles/x86_64-musl.sh b/common/cross-profiles/x86_64-musl.sh
index 3ef9244250..58df5faa29 100644
--- a/common/cross-profiles/x86_64-musl.sh
+++ b/common/cross-profiles/x86_64-musl.sh
@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="x86_64-musl"
XBPS_CROSS_TRIPLET="x86_64-linux-musl"
XBPS_CROSS_CFLAGS="-mtune=generic"
XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""
diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index 46c6b38b3e..34e6cbf770 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -10,8 +10,7 @@ UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool"
XORG_SITE="http://xorg.freedesktop.org/releases/individual"
DEBIAN_SITE="http://ftp.debian.org/debian/pool"
GNOME_SITE="http://ftp.gnome.org/pub/GNOME/sources"
-KERNEL_SITE="http://www.kernel.org/pub/linux"
-#KERNEL_SITE="http://mirror.be.gbxs.net/pub/linux"
+KERNEL_SITE="https://www.kernel.org/pub/linux"
CPAN_SITE="http://cpan.perl.org/modules/by-module"
PYPI_SITE="https://files.pythonhosted.org/packages/source"
MOZILLA_SITE="http://ftp.mozilla.org/pub"
diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh
index d7dc8cd3b3..8c1db5679f 100644
--- a/common/environment/setup/sourcepkg.sh
+++ b/common/environment/setup/sourcepkg.sh
@@ -6,10 +6,10 @@ unset -v pkgname version revision short_desc homepage license maintainer
unset -v only_for_archs distfiles checksum build_style nocross broken
unset -v configure_script configure_args wrksrc build_wrksrc create_wrksrc
unset -v make_cmd make_build_args make_install_args make_build_target make_install_target python_version stackage
-unset -v patch_args disable_parallel_build keep_libtool_archives
-unset -v reverts subpackages makedepends hostmakedepends checkdepends depends restricted
+unset -v patch_args disable_parallel_build keep_libtool_archives make_use_env
+unset -v reverts subpackages makedepends hostmakedepends depends restricted
unset -v nopie build_options build_options_default bootstrap repository reverts
-unset -v CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH
+unset -v CFLAGS CXXFLAGS FFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH
unset -v CC CXX CPP GCC LD AR AS RANLIB NM OBJDUMP OBJCOPY STRIP READELF
# hooks/do-extract/00-distfiles
diff --git a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
index 40487d73a7..81e45b9821 100644
--- a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
+++ b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
@@ -19,9 +19,9 @@ hook() {
fi
shebang="#!/usr/bin/python${pyver%.*}"
- find ${PKGDESTDIR} -type f -print0 | \
- xargs -0 grep -H -b -m 1 "^#!.*\([[:space:]]\|/\)python\([[:space:]]*\|$\)" -- | while IFS=: read -r f off _; do
- [ -z "$off" ] && continue
+ find "${PKGDESTDIR}" -type f -print0 | \
+ xargs -0 grep -H -b -m 1 "^#!.*\([[:space:]]\|/\)python\([0-9]\.[0-9]\)\?\([[:space:]]\+\|$\)" -- | while IFS=: read -r f off _; do
+ [ -z "$off" ] && continue
echo " Shebang converted to '$shebang': ${f#$PKGDESTDIR}"
sed -i "1s@.*python.*@${shebang}@" -- "$f"
done
diff --git a/common/options.description b/common/options.description
index e66d9b8133..3a4c1dc868 100644
--- a/common/options.description
+++ b/common/options.description
@@ -1,5 +1,6 @@
desc_option_aalib="Enable support for aalib video output"
desc_option_acl="Enable support for ACLs and Extended Attributes"
+desc_option_alsa="Enable support for ALSA"
desc_option_backtrace="Enable support for backtraces via libunwind"
desc_option_bluetooth="Enable support for bluetooth"
desc_option_cdparanoia="Enable support for CD audio (cdparanoia)"
diff --git a/common/shlibs b/common/shlibs
index 5452ddd71e..626c305040 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -17,36 +17,36 @@
# one (order top->bottom) is preferred over the next ones.
#
libc.so musl-0.9.9_1
-libc.so.6 glibc-2.8_1
-libm.so.6 glibc-2.8_1
-libpthread.so.0 glibc-2.8_1
-librt.so.1 glibc-2.8_1
-libdl.so.2 glibc-2.8_1
-ld-linux-x86-64.so.2 glibc-2.8_1 x86_64
-ld-linux.so.2 glibc-2.8_1 i686
-ld-linux.so.3 glibc-2.17_1 armv5tel
-ld-linux-aarch64.so.1 glibc-2.19_1 aarch64
-ld.so.1 glibc-2.17_1 mips
-ld-linux-armhf.so.3 glibc-2.17_1
-libresolv.so.2 glibc-2.8_1
-libanl.so.1 glibc-2.8_1
-libthread_db.so.1 glibc-2.8_1
-libutil.so.1 glibc-2.8_1
-libnsl.so.1 glibc-2.8_1
-libnss_db.so.2 glibc-2.22_1
-libnss_files.so.2 glibc-2.8_1
-libnss_compat.so.2 glibc-2.8_1
-libnss_dns.so.2 glibc-2.8_1
-libnss_hesiod.so.2 glibc-2.8_1
-libnss_nisplus.so.2 glibc-2.8_1
-libnss_nis.so.2 glibc-2.8_1
-libcrypt.so.1 glibc-2.8_1
-libBrokenLocale.so.1 glibc-2.8_1
-libmemusage.so glibc-2.8_1
-libSegFault.so glibc-2.8_1
-libpcprofile.so glibc-2.8_1
-libcidn.so.1 glibc-2.8_1
-libmvec.so.1 glibc-2.22_1
+libc.so.6 glibc-2.25_1
+libm.so.6 glibc-2.25_1
+libpthread.so.0 glibc-2.25_1
+librt.so.1 glibc-2.25_1
+libdl.so.2 glibc-2.25_1
+ld-linux-x86-64.so.2 glibc-2.25_1 x86_64
+ld-linux.so.2 glibc-2.25_1 i686
+ld-linux.so.3 glibc-2.25_1 armv5tel
+ld-linux-aarch64.so.1 glibc-2.25_1 aarch64
+ld.so.1 glibc-2.25_1 mips
+ld-linux-armhf.so.3 glibc-2.25_1
+libresolv.so.2 glibc-2.25_1
+libanl.so.1 glibc-2.25_1
+libthread_db.so.1 glibc-2.25_1
+libutil.so.1 glibc-2.25_1
+libnsl.so.1 glibc-2.25_1
+libnss_db.so.2 glibc-2.25_1
+libnss_files.so.2 glibc-2.25_1
+libnss_compat.so.2 glibc-2.25_1
+libnss_dns.so.2 glibc-2.25_1
+libnss_hesiod.so.2 glibc-2.25_1
+libnss_nisplus.so.2 glibc-2.25_1
+libnss_nis.so.2 glibc-2.25_1
+libcrypt.so.1 glibc-2.25_1
+libBrokenLocale.so.1 glibc-2.25_1
+libmemusage.so glibc-2.25_1
+libSegFault.so glibc-2.25_1
+libpcprofile.so glibc-2.25_1
+libcidn.so.1 glibc-2.25_1
+libmvec.so.1 glibc-2.25_1
libz.so.1 zlib-1.2.3_1
libbz2.so.1 bzip2-1.0.5_1
libarchive.so.13 libarchive-3.1.2_1
@@ -360,7 +360,7 @@ libMagickCore-6.Q16.so.4 libmagick-6.9.7.6_1
libMagickWand-6.Q16.so.4 libmagick-6.9.7.6_1
libMagick++-6.Q16.so.7 libmagick-6.9.6.8_1
libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.66 poppler-0.50.0_1
+libpoppler.so.67 poppler-0.53.0_1
libpoppler-glib.so.8 poppler-glib-0.18.2_1
libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
libpoppler-qt4.so.4 poppler-qt4-0.22.3_1
@@ -469,7 +469,7 @@ libphysfs.so.1 physfs-2.0.0_1
libSDL_ttf-2.0.so.0 SDL_ttf-2.0.9_1
libparted.so.2 libparted-3.1_1
libparted-fs-resize.so.0 libparted-3.1_1
-libntfs-3g.so.87 ntfs-3g-2016.2.22_1
+libntfs-3g.so.88 ntfs-3g-2017.3.23_1
libruby.so.2.4 ruby-2.4.0_1
libxenctrl.so.4.7 xen-libs-4.7_1
libxenguest.so.4.7 xen-libs-4.7_1
@@ -488,14 +488,14 @@ libKF5SyntaxHighlighting.so.5 syntax-highlighting-5.29.0_1
libbabl-0.1.so.0 babl-0.1.10_1
libbamf3.so.2 bamf-0.5.1_1
libgegl-0.2.so.0 gegl-0.2.0_1
-libiculx.so.57 icu-libs-57.1_1
-libicule.so.57 icu-libs-57.1_1
-libicuio.so.57 icu-libs-57.1_1
-libicui18n.so.57 icu-libs-57.1_1
-libicudata.so.57 icu-libs-57.1_1
-libicutu.so.57 icu-libs-57.1_1
-libicuuc.so.57 icu-libs-57.1_1
-libicutest.so.57 icu-libs-57.1_1
+libiculx.so.58 icu-libs-58.2_1
+libicule.so.58 icu-libs-58.2_1
+libicuio.so.58 icu-libs-58.2_1
+libicui18n.so.58 icu-libs-58.2_1
+libicudata.so.58 icu-libs-58.2_1
+libicutu.so.58 icu-libs-58.2_1
+libicuuc.so.58 icu-libs-58.2_1
+libicutest.so.58 icu-libs-58.2_1
libaspell.so.15 aspell-0.60_1
libpspell.so.15 aspell-0.60_1
libenchant.so.1 enchant-1.4.2_1
@@ -565,15 +565,14 @@ libical_cxx.so.2 libical-2.0.0_1
libicalss.so.2 libical-2.0.0_1
libicalss_cxx.so.2 libical-2.0.0_1
libicalvcal.so.2 libical-2.0.0_1
-libcamel-1.2.so.59 evolution-data-server-3.22.0_1
libedataserver-1.2.so.22 evolution-data-server-3.22.0_1
-libcamel-1.2.so.59 evolution-data-server-3.22.0_1
+libcamel-1.2.so.60 evolution-data-server-3.24.0_1
libedataserver-1.2.so.22 evolution-data-server-3.22.0_1
libebackend-1.2.so.10 evolution-data-server-3.17.90_1
libedataserverui-1.2.so.1 evolution-data-server-3.8.0_1
libebook-contacts-1.2.so.2 evolution-data-server-3.17.90_1
libedata-book-1.2.so.25 evolution-data-server-3.8.0_1
-libebook-1.2.so.16 evolution-data-server-3.8.0_1
+libebook-1.2.so.19 evolution-data-server-3.24.0_1
libecal-1.2.so.19 evolution-data-server-3.18.0_1
libedata-cal-1.2.so.28 evolution-data-server-3.18.0_1
libgdata.so.19 libgdata-0.15.0_1
@@ -589,38 +588,39 @@ libnm-glib-vpn.so.1 libnm-0.9.1.90_1
libnm.so.0 libnm-1.0.0_1
libKF5ItemModels.so.5 kitemmodels-5.26.0_1
libpanel-applet-4.so.0 gnome-panel-3.3.92_1
-libboost_context.so.1.62.0 boost-1.62<1.63_1
-libboost_coroutine.so.1.62.0 boost-1.62<1.63_1
-libboost_container.so.1.62.0 boost-1.62<1.63_1
-libboost_prg_exec_monitor.so.1.62.0 boost-1.62<1.63_1
-libboost_signals.so.1.62.0 boost-1.62<1.63_1
-libboost_timer.so.1.62.0 boost-1.62<1.63_1
-libboost_random.so.1.62.0 boost-1.62<1.63_1
-libboost_filesystem.so.1.62.0 boost-1.62<1.63_1
-libboost_unit_test_framework.so.1.62.0 boost-1.62<1.63_1
-libboost_math_c99f.so.1.62.0 boost-1.62<1.63_1
-libboost_math_tr1f.so.1.62.0 boost-1.62<1.63_1
-libboost_regex.so.1.62.0 boost-1.62<1.63_1
-libboost_serialization.so.1.62.0 boost-1.62<1.63_1
-libboost_chrono.so.1.62.0 boost-1.62<1.63_1
-libboost_wserialization.so.1.62.0 boost-1.62<1.63_1
-libboost_graph.so.1.62.0 boost-1.62<1.63_1
-libboost_log.so.1.62.0 boost-1.62<1.63_1
-libboost_locale.so.1.62.0 boost-1.62<1.63_1
-libboost_math_tr1l.so.1.62.0 boost-1.62<1.63_1
-libboost_program_options.so.1.62.0 boost-1.62<1.63_1
-libboost_iostreams.so.1.62.0 boost-1.62<1.63_1
-libboost_system.so.1.62.0 boost-1.62<1.63_1
-libboost_thread.so.1.62.0 boost-1.62<1.63_1
-libboost_log_setup.so.1.62.0 boost-1.62<1.63_1
-libboost_date_time.so.1.62.0 boost-1.62<1.63_1
-libboost_math_c99.so.1.62.0 boost-1.62<1.63_1
-libboost_wave.so.1.62.0 boost-1.62<1.63_1
-libboost_math_tr1.so.1.62.0 boost-1.62<1.63_1
-libboost_atomic.so.1.62.0 boost-1.62<1.63_1
-libboost_math_c99l.so.1.62.0 boost-1.62<1.63_1
-libboost_type_erasure.so.1.62.0 boost-1.62<1.63_1
-libboost_python.so.1.62.0 boost-python-1.62<1.63_1
+libboost_context.so.1.64.0 boost-1.64<1.65_1
+libboost_coroutine.so.1.64.0 boost-1.64<1.65_1
+libboost_container.so.1.64.0 boost-1.64<1.65_1
+libboost_prg_exec_monitor.so.1.64.0 boost-1.64<1.65_1
+libboost_signals.so.1.64.0 boost-1.64<1.65_1
+libboost_timer.so.1.64.0 boost-1.64<1.65_1
+libboost_random.so.1.64.0 boost-1.64<1.65_1
+libboost_filesystem.so.1.64.0 boost-1.64<1.65_1
+libboost_unit_test_framework.so.1.64.0 boost-1.64<1.65_1
+libboost_math_c99f.so.1.64.0 boost-1.64<1.65_1
+libboost_math_tr1f.so.1.64.0 boost-1.64<1.65_1
+libboost_regex.so.1.64.0 boost-1.64<1.65_1
+libboost_serialization.so.1.64.0 boost-1.64<1.65_1
+libboost_chrono.so.1.64.0 boost-1.64<1.65_1
+libboost_wserialization.so.1.64.0 boost-1.64<1.65_1
+libboost_graph.so.1.64.0 boost-1.64<1.65_1
+libboost_log.so.1.64.0 boost-1.64<1.65_1
+libboost_locale.so.1.64.0 boost-1.64<1.65_1
+libboost_math_tr1l.so.1.64.0 boost-1.64<1.65_1
+libboost_program_options.so.1.64.0 boost-1.64<1.65_1
+libboost_iostreams.so.1.64.0 boost-1.64<1.65_1
+libboost_system.so.1.64.0 boost-1.64<1.65_1
+libboost_thread.so.1.64.0 boost-1.64<1.65_1
+libboost_log_setup.so.1.64.0 boost-1.64<1.65_1
+libboost_date_time.so.1.64.0 boost-1.64<1.65_1
+libboost_math_c99.so.1.64.0 boost-1.64<1.65_1
+libboost_wave.so.1.64.0 boost-1.64<1.65_1
+libboost_math_tr1.so.1.64.0 boost-1.64<1.65_1
+libboost_atomic.so.1.64.0 boost-1.64<1.65_1
+libboost_math_c99l.so.1.64.0 boost-1.64<1.65_1
+libboost_type_erasure.so.1.64.0 boost-1.64<1.65_1
+libboost_fiber.so.1.64.0 boost-1.64<1.65_1
+libboost_python.so.1.64.0 boost-python-1.64<1.65_1
libexempi.so.3 exempi-2.1.1_1
libatasmart.so.4 libatasmart-0.17_1
libsgutils2.so.2 libsgutils-1.42_1
@@ -650,9 +650,9 @@ libsasl2.so.3 libsasl-2.1.26_1
liblber-2.4.so.2 libldap-2.4.21_1
libldap-2.4.so.2 libldap-2.4.21_1
libldap_r-2.4.so.2 libldap-2.4.21_1
-libevent-2.0.so.5 libevent-2.0.10_1
-libevent_core-2.0.so.5 libevent-2.0.21_1
-libevent_pthreads-2.0.so.5 libevent-2.0.21_1
+libevent-2.1.so.6 libevent-2.1.8_1
+libevent_core-2.1.so.6 libevent-2.1.8_1
+libevent_pthreads-2.1.so.6 libevent-2.1.8_1
libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
libapr-1.so.0 apr-1.4.2_1
libaprutil-1.so.0 apr-util-1.3.9_1
@@ -723,6 +723,7 @@ libvala-0.26.so.0 libvala-0.26.2_1
libvala-0.28.so.0 libvala-0.28.0_1
libvala-0.30.so.0 libvala-0.30.0_1
libvala-0.34.so.0 libvala-0.34.0_1
+libvala-0.36.so.0 libvala-0.36.1_1
libSDL_net-1.2.so.0 SDL_net-1.2.7_1
libmodplug.so.1 libmodplug-0.8.8_1
libfetch.so.2 libfetch-2.34_8
@@ -819,10 +820,10 @@ libquadmath.so.0 libquadmath-4.4.0_1
libgfortran.so.3 libgfortran-4.4.0_1
libblktapctl.so.1 xen-4.1.2_1
libmozjs185.so.1.0 js-1.8.5_1
-libwebp.so.6 libwebp-0.5.0_1
-libwebpmux.so.2 libwebp-0.5.0_1
+libwebp.so.7 libwebp-0.6.0_1
+libwebpmux.so.3 libwebp-0.6.0_1
libwebpdemux.so.2 libwebp-0.5.0_1
-libwebpdecoder.so.2 libwebp-0.5.0_1
+libwebpdecoder.so.3 libwebp-0.6.0_1
libva-x11.so.1 libva-1.0.14_1
libva.so.1 libva-1.0.14_1
libva-glx.so.1 libva-glx-1.5.0_1
@@ -955,6 +956,7 @@ libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
libyajl.so.2 yajl-2.0.1_1
libconfuse.so.1 confuse-3.0_1
libclang.so clang-3.4.2_1
+libclang.so.3.9 clang-3.9.1_2
liblldb.so lldb-3.5.1_1
libLLVM-3.5.so libllvm-3.5.0_1
libLLVM-3.6.so libllvm3.6-3.6.0_1
@@ -1380,7 +1382,7 @@ libgda-5.0.so.4 libgda-5.1.2_1
libgda-report-5.0.so.4 libgda-5.1.2_1
libgda-ui-5.0.so.4 libgda-5.1.2_1
libgda-xslt-5.0.so.4 libgda-5.1.2_1
-libdevhelp-3.so.2 devhelp-libs-3.8.2_1
+libdevhelp-3.so.3 devhelp-libs-3.24.0_1
libunistring.so.2 libunistring-0.9.4_1
libguile-2.0.so.22 libguile-2.0.9_3
libopts.so.25 libopts-5.18.4_6
@@ -1542,7 +1544,7 @@ libwx_gtk2u_webview-3.0.so.0 wxWidgets-3.0.2_3
libmspack.so.0 libmspack-0.4alpha_1
libslim.so.1.3.6 slim-1.3.6_1
libmozjs-24.so mozjs24-24.2.0_1
-libmediaart-1.0.so.0 libmediaart-0.3.0_1
+libmediaart-2.0.so.0 libmediaart-1.9.1_1
libinput.so.10 libinput-1.2.0_1
libvaladoc.so.0 valadoc-git-20140327_1
libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1
@@ -1726,14 +1728,17 @@ libcrypto.so.34 libcrypto34-2.2.1_1
libcrypto.so.35 libcrypto35-2.2.2_1
libcrypto.so.37 libcrypto37-2.3.3_1
libcrypto.so.38 libcrypto38-2.4.2_1
+libcrypto.so.41 libcrypto41-2.5.3_1
libssl.so.33 libssl33-2.2.1_1
libssl.so.35 libssl35-2.2.2_1
libssl.so.38 libssl38-2.3.3_1
libssl.so.39 libssl39-2.4.2_1
+libssl.so.43 libssl43-2.5.3_1
libtls.so.4 libtls4-2.2.1_1
libtls.so.6 libtls6-2.2.2_1
libtls.so.10 libtls10-2.3.3_1
libtls.so.11 libtls11-2.4.2_1
+libtls.so.15 libtls15-2.5.3_1
libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
libportmidi.so portmidi-217_1
libsox.so.3 sox-14.4.2_1
@@ -1750,7 +1755,6 @@ libfdisk.so.1 libfdisk-2.26_1
libspiro.so.0 libspiro-0.2_1
libopenjp2.so.7 libopenjpeg2-2.1.0_1
libcln.so.6 cln-1.3.3_1
-libqalculate.so.6 libqalculate-0.9.9_1
libkfilemetadata.so.4 kfilemetadata-4.13.3_1
libbaloofiles.so.4 baloo-4.13.3_1
libbaloocore.so.4 baloo-4.13.3_1
@@ -1790,6 +1794,7 @@ libslab.so.0 libmate-control-center-1.8.2_1
liblz4.so.1 lz4-1.7.3_1
libatrilview.so.3 libatril-1.8.0_1
libatrildocument.so.3 libatril-1.8.0_1
+libjawt.so openjdk-jre-8u20_2
libawt.so openjdk-jre-8u20_1
libawt_xawt.so openjdk-jre-8u20_1
libjava.so openjdk-jre-8u20_1
@@ -1819,7 +1824,7 @@ libgioftp.so.2 fontforge-2.0.20140101_3
libfontforge.so.2 fontforge-2.0.20140101_3
libgdraw.so.5 fontforge-2.0.20140101_3
libfontforgeexe.so.2 fontforge-2.0.20140101_3
-libwraster.so.5 WindowMaker-0.95.6_3
+libwraster.so.6 WindowMaker-0.95.8_1
libWUtil.so.5 WindowMaker-0.95.6_3
libWINGs.so.3 WindowMaker-0.95.6_3
libWMaker.so.1 WindowMaker-0.95.6_3
@@ -1935,7 +1940,7 @@ libglfw.so.3 glfw-3.0.4_1
libusbmuxd.so.4 libusbmuxd-1.0.10_1
libimobiledevice.so.6 libimobiledevice-1.2.0_1
libstfl.so.0 stfl-0.23_1
-libenventor.so.0 enventor-0.4.1_1
+libenventor.so.1 enventor-1.0.0_1
libCDApplet.so cairo-dock-plugins-3.4.0_1
libhydrogen-core-0.9.6.1.so hydrogen-0.9.6.1_1
libldns.so.2 libldns-1.7.0_1
@@ -1985,10 +1990,10 @@ libfcitx-qt.so.0 libfcitx-qt-4.2.8_1
liblastfm.so.1 liblastfm-1.0.9_1
liblastfm_fingerprint.so.1 liblastfm-1.0.9_1
libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1
-libdruntime-ldc-debug.so.70 ldc-runtime-1.0.0_1
-libdruntime-ldc.so.70 ldc-runtime-1.0.0_1
-libphobos2-ldc.so.70 ldc-runtime-1.0.0_1
-libphobos2-ldc-debug.so.70 ldc-runtime-1.0.0_1
+libdruntime-ldc-debug.so.71 ldc-runtime-1.1.1_1
+libdruntime-ldc.so.71 ldc-runtime-1.1.1_1
+libphobos2-ldc.so.71 ldc-runtime-1.1.1_1
+libphobos2-ldc-debug.so.71 ldc-runtime-1.1.1_1
libmarblewidget.so.19 marble-4.14.3_2
libastro.so.1 marble-4.14.3_2
libparrot.so.6.9.0 parrot-6.9.0_1
@@ -2071,7 +2076,7 @@ libcvm-v1client.so.1 cvm-0.97_1
libcvm-v2client.so.1 cvm-0.97_1
libudns.so.0 udns-0.4_1
libcriu.so.1 criu-1.5.1_2
-libwebsockets.so.9 libwebsockets-2.1.0_1
+libwebsockets.so.10 libwebsockets-2.2.0_1
libbitcoinconsensus.so.0 litecoin-0.10.1.2_1
libnfc.so.0 libnfc-1.7.1_1
libfuzzy.so.2 libfuzzy-2.12_1
@@ -2086,8 +2091,8 @@ libsfml-graphics.so.2.4 SFML-2.4.1_1
libclamav.so.7 clamav-0.98.6_1
libclamunrar.so.7 clamav-0.98.6_1
libclamunrar_iface.so.7 clamav-0.98.6_1
-libqca.so.2 qca-qt5-2.1.0_1
-libqt5keychain.so.0 qtkeychain-qt5-0.4.0_1
+libqca-qt5.so.2 qca-qt5-2.1.3_1
+libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
libphonon4qt5.so.4 phonon-qt5-4.8.3_1
libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
@@ -2097,7 +2102,7 @@ libKF5Attica.so.5 attica-qt5-5.6.0_1
libechonest5.so.2.3 libechonest-qt5-2.3.0_1
liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1
liblastfm5.so.1 liblastfm-qt5-1.0.9_1
-libquazip.so.1 quazip-qt5-0.7.1_1
+libquazip5.so.1 quazip-qt5-0.7.3_2
libjreen-qt5.so.1 jreen-qt5-1.2.0_1
libtomahawk.so.0.8.4 tomahawk-qt5-0.8.4_3
libtomahawk-playdarapi.so.0.8.4 tomahawk-qt5-0.8.4_3
@@ -2134,12 +2139,11 @@ libopenrawgnome.so.7 libopenraw-0.1.0_1
libgeda.so.42 geda-1.8.2_1
libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1
libgsound.so.0 gsound-1.0.1_1
-libmediaart-2.0.so.0 libmediaart2-1.9.0_1
libgegl-0.3.so.0 gegl3-0.3.0_1
libgegl-npd-0.3.so gegl3-0.3.0_1
libgegl-sc-0.3.so gegl3-0.3.0_1
libprocps.so.6 procps-ng-3.3.12_1
-libskarnet.so.2.4 skalibs-2.4.0.0_1
+libskarnet.so.2.5 skalibs-2.5.0.0_1
libtidy.so.5 libtidy5-5.1.25_1
libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
libQupZilla.so.2 qupzilla-2.0.0_1
@@ -2165,12 +2169,12 @@ libgtkimageview.so.0 gtkimageview-1.6.4_1
libgoocanvas.so.3 goocanvas1-1.0.0_1
libplatform.so.2.0 platform-2.0.1_1
libp8-platform.so.2.0 p8-platform-2.0.1_1
-libfacter.so.3.6.1 facter-3.6.1_1
+libfacter.so.3.6.2 facter-3.6.2_1
libOIS-1.3.0.so ois-1.3_1
libSILLY.so.1 silly-0.1.0_1
libkeybinder-3.0.so.0 libkeybinder3-0.3.0_1
libbrlapi.so.0.6 brltty-5.2_1
-liblouis.so.9 liblouis-2.6.4_1
+liblouis.so.12 liblouis-3.1.0_1
libCEGUIBase-0.7.9.so cegui07-0.7.9_1
libCEGUIFalagardWRBase-0.7.9.so cegui07-0.7.9_1
libCEGUIDevILImageCodec-0.7.9.so cegui07-0.7.9_1
@@ -2352,10 +2356,10 @@ libpjsip-ua.so.2 pjproject-2.4.5_1
libpjsip.so.2 pjproject-2.4.5_1
libpjsua.so.2 pjproject-2.4.5_1
libpjsua2.so.2 pjproject-2.4.5_1
-libhdf5_hl.so.10 hdf5-1.8.17_1
-libhdf5.so.10 hdf5-1.8.17_1
-libhdf5_hl_cpp.so.11 hdf5-1.8.17_2
-libhdf5_cpp.so.12 hdf5-1.8.17_2
+libhdf5_hl.so.10 hdf5-1.8.18_1
+libhdf5.so.10 hdf5-1.8.18_1
+libhdf5_hl_cpp.so.11 hdf5-1.8.18_1
+libhdf5_cpp.so.13 hdf5-1.8.18_1
libcryptmount.so.0 libpam-mount-2.15_1
libglob.so.0 libglob-1.0_1
libepub.so.0 ebook-tools-0.2.2_1
@@ -2610,7 +2614,7 @@ libsss_simpleifp.so.0 sssd-1.13.4_1
libforms.so.2 xforms-1.2.4_2
libflimage.so.2 xforms-1.2.4_2
libutilspp.so.0 curlpp-0.7.3_2
-libcurlpp.so.0 curlpp-0.7.3_2
+libcurlpp.so.1 curlpp-0.8.1_1
libtcd.so.1 libtcd-2.2.7.r2_1
libaccounts-glib.so.0 libaccounts-glib-1.21_1
libaccounts-qt5.so.1 libaccounts-qt5-1.14_1
@@ -2789,3 +2793,33 @@ libmutter-cogl-path.so mutter-3.22.0_1
libmutter-cogl.so mutter-3.22.0_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub.so.0 libgepub-0.4_1
+libslopy.so.0.1.0 slop-5.3.37_1
+libbcunit.so.1 bcunit-3.0_1
+libomxil-bellagio.so.0 libomxil-bellagio-0.9.3_1
+libomxdynamicloader.so.0 libomxil-bellagio-0.9.3_1
+libomxaudio_effects.so.0 libomxil-bellagio-0.9.3_1
+libomxclocksrc.so.0 libomxil-bellagio-0.9.3_1
+libomxvideosched.so.0 libomxil-bellagio-0.9.3_1
+libnss_libvirt_guest.so.2 libvirt-3.1.0_1
+libvirt-admin.so.0 libvirt-3.1.0_1
+libnss_libvirt.so.2 libvirt-3.1.0_1
+libassimp.so.3 libassimp-3.3.1_1
+libdouble-conversion.so.1 double-conversion-2.0.1_1
+libspectrum.so.8 libspectrum-1.2.2_1
+libbearssl.so.0 bearssl-0.3_1
+libXfont2.so.2 libXfont2-2.0.1_1
+libqalculate.so.7 libqalculate-0.9.11_1
+libweston-2.so.0 weston-2.0.0_1
+libmutter-0.so.0 mutter-3.24.0_1
+libmutter-clutter-0.so mutter-3.24.0_1
+libmutter-cogl-path-0.so mutter-3.24.0_1
+libmutter-cogl-0.so mutter-3.24.0_1
+libmutter-cogl-pango-0.so mutter-3.24.0_1
+libmozjs-.so mozjs38-38.8.0_1
+libostree-1.so.1 libostree-2017.3_1
+librhash.so.0 rhash-1.3.4_1
+libserialport.so.0 libserialport-0.1.1_1
+libsigrok.so.3 libsigrok-0.4.0_1
+libsigrokcxx.so.3 libsigrok-0.4.0_1
+libsigrokdecode.so.3 libsigrokdecode-0.4.1_1
+libglyr.so.1 glyr-1.0.8_1
diff --git a/common/xbps-src/libexec/build.sh b/common/xbps-src/libexec/build.sh
index 931f888a29..c7489accb7 100755
--- a/common/xbps-src/libexec/build.sh
+++ b/common/xbps-src/libexec/build.sh
@@ -33,7 +33,6 @@ show_pkg_build_options
check_pkg_arch $XBPS_CROSS_BUILD
if [ -z "$XBPS_CROSS_PREPARE" ]; then
- install_cross_pkg $XBPS_CROSS_BUILD || exit $?
prepare_cross_sysroot $XBPS_CROSS_BUILD || exit $?
fi
if [ -z "$XBPS_DEPENDENCY" -a -z "$XBPS_TEMP_MASTERDIR" -a -n "$XBPS_KEEP_ALL" -a "$XBPS_CHROOT_CMD" = "proot" ]; then
@@ -44,6 +43,10 @@ if [ "$PKGNAME" != "$XBPS_TARGET_PKG" -o -z "$XBPS_SKIP_DEPS" ]; then
install_pkg_deps $PKGNAME $XBPS_TARGET_PKG pkg $XBPS_CROSS_BUILD $XBPS_CROSS_PREPARE || exit $?
fi
+if [ -z "$XBPS_CROSS_PREPARE" ]; then
+ install_cross_pkg $XBPS_CROSS_BUILD || exit $?
+fi
+
# Fetch distfiles after installing required dependencies,
# because some of them might be required for do_fetch().
$XBPS_LIBEXECDIR/xbps-src-dofetch.sh $SOURCEPKG $XBPS_CROSS_BUILD || exit 1
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index f367fdb37b..551674237c 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -1,5 +1,7 @@
# vim: set ts=4 sw=4 et:
+# FIXME: $XBPS_FFLAGS is not set when chroot_init() is run
+# It is set in common/build-profiles/bootstrap.sh but lost somewhere?
chroot_init() {
XBPSSRC_CF=$XBPS_MASTERDIR/etc/xbps/xbps-src.conf
@@ -15,6 +17,7 @@ _EOF
XBPS_MASTERDIR=/
XBPS_CFLAGS="$XBPS_CFLAGS"
XBPS_CXXFLAGS="$XBPS_CXXFLAGS"
+XBPS_FFLAGS="-fPIC -pipe"
XBPS_CPPFLAGS="$XBPS_CPPFLAGS"
XBPS_LDFLAGS="$XBPS_LDFLAGS"
XBPS_HOSTDIR=/host
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index ab3a546ab1..5a6b52379e 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -219,7 +219,7 @@ setup_pkg() {
basepkg=${pkg%-32bit}
# Start with a sane environment
- unset -v PKG_BUILD_OPTIONS XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_CPPFLAGS XBPS_CROSS_LDFLAGS
+ unset -v PKG_BUILD_OPTIONS XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_FFLAGS XBPS_CROSS_CPPFLAGS XBPS_CROSS_LDFLAGS
unset -v subpackages run_depends build_depends host_build_depends
unset_package_funcs
@@ -249,7 +249,7 @@ setup_pkg() {
else
export XBPS_TARGET_MACHINE=${XBPS_ARCH:-$XBPS_MACHINE}
- unset XBPS_CROSS_BASE XBPS_CROSS_LDFLAGS
+ unset XBPS_CROSS_BASE XBPS_CROSS_LDFLAGS XBPS_CROSS_FFLAGS
unset XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_CPPFLAGS
XBPS_INSTALL_XCMD="$XBPS_INSTALL_CMD"
@@ -380,6 +380,7 @@ setup_pkg() {
export CFLAGS="$XBPS_TARGET_CFLAGS $XBPS_CFLAGS $XBPS_CROSS_CFLAGS $CFLAGS $dbgflags"
export CXXFLAGS="$XBPS_TARGET_CXXFLAGS $XBPS_CXXFLAGS $XBPS_CROSS_CXXFLAGS $CXXFLAGS $dbgflags"
+ export FFLAGS="$XBPS_TARGET_FFLAGS $XBPS_FFLAGS $XBPS_CROSS_FFLAGS $FFLAGS"
export CPPFLAGS="$XBPS_TARGET_CPPFLAGS $XBPS_CPPFLAGS $XBPS_CROSS_CPPFLAGS $CPPFLAGS"
export LDFLAGS="$XBPS_TARGET_LDFLAGS $XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
@@ -388,21 +389,25 @@ setup_pkg() {
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
export BUILD_LDFLAGS="$XBPS_LDFLAGS"
+ export BUILD_FFLAGS="$XBPS_FFLAGS"
export CC_FOR_BUILD="cc"
export CXX_FOR_BUILD="g++"
export CPP_FOR_BUILD="cpp"
+ export FC_FOR_BUILD="gfortran"
export LD_FOR_BUILD="ld"
export CFLAGS_FOR_BUILD="$XBPS_CFLAGS"
export CXXFLAGS_FOR_BUILD="$XBPS_CXXFLAGS"
export CPPFLAGS_FOR_BUILD="$XBPS_CPPFLAGS"
export LDFLAGS_FOR_BUILD="$XBPS_LDFLAGS"
+ export FFLAGS_FOR_BUILD="$XBPS_FFLAGS"
if [ -n "$cross" ]; then
# Regular tools names
export CC="${XBPS_CROSS_TRIPLET}-gcc"
export CXX="${XBPS_CROSS_TRIPLET}-c++"
export CPP="${XBPS_CROSS_TRIPLET}-cpp"
+ export FC="${XBPS_CROSS_TRIPLET}-gfortran"
export GCC="$CC"
export LD="${XBPS_CROSS_TRIPLET}-ld"
export AR="${XBPS_CROSS_TRIPLET}-ar"
@@ -418,6 +423,7 @@ setup_pkg() {
export CXX_target="$CXX"
export CPP_target="$CPP"
export GCC_target="$GCC"
+ export FC_target="$FC"
export LD_target="$LD"
export AR_target="$AR"
export AS_target="$AS"
@@ -437,6 +443,7 @@ setup_pkg() {
export CXX_host="g++"
export CPP_host="cpp"
export GCC_host="$CC_host"
+ export FC_host="gfortran"
export LD_host="ld"
export AR_host="ar"
export AS_host="as"
@@ -456,6 +463,7 @@ setup_pkg() {
export CXX="g++"
export CPP="cpp"
export GCC="$CC"
+ export FC="gfortran"
export LD="ld"
export AR="ar"
export AS="as"
@@ -466,10 +474,10 @@ setup_pkg() {
export NM="nm"
export READELF="readelf"
# Unse cross evironment variables
- unset CC_target CXX_target CPP_target GCC_target LD_target AR_target AS_target
+ unset CC_target CXX_target CPP_target GCC_target FC_target LD_target AR_target AS_target
unset RANLIB_target STRIP_target OBJDUMP_target OBJCOPY_target NM_target READELF_target
unset CFLAGS_target CXXFLAGS_target CPPFLAGS_target LDFLAGS_target
- unset CC_host CXX_host CPP_host GCC_host LD_host AR_host AS_host
+ unset CC_host CXX_host CPP_host GCC_host FC_host LD_host AR_host AS_host
unset RANLIB_host STRIP_host OBJDUMP_host OBJCOPY_host NM_host READELF_host
unset CFLAGS_host CXXFLAGS_host CPPFLAGS_host LDFLAGS_host
fi
diff --git a/etc/defaults.conf b/etc/defaults.conf
index 701444500a..2326184cfe 100644
--- a/etc/defaults.conf
+++ b/etc/defaults.conf
@@ -17,7 +17,7 @@
# [OPTIONAL]
# Enable optional arguments to xbps-install for the host system.
# Currently used in the binary-bootstrap bootstrap-update targets.
-XBPS_INSTALL_ARGS="--repository=https://repo.voidlinux.eu/current --repository=https://repo.voidlinux.eu/current/musl"
+XBPS_INSTALL_ARGS="--repository=https://repo.voidlinux.eu/current --repository=https://repo.voidlinux.eu/current/musl --repository=https://repo.voidlinux.eu/current/aarch64"
# [OPTIONAL]
# Native Compilation/Preprocessor flags for C and C++. Additional settings
diff --git a/srcpkgs/2bwm/template b/srcpkgs/2bwm/template
index 65237ca857..500370822c 100644
--- a/srcpkgs/2bwm/template
+++ b/srcpkgs/2bwm/template
@@ -1,28 +1,28 @@
# Template file for '2bwm'
pkgname=2bwm
-version=0.1
+version=0.2
revision=1
build_style=gnu-makefile
-makedepends="libxcb-devel xcb-util-devel xcb-util-keysyms-devel xcb-util-wm-devel"
+makedepends="libxcb-devel xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-xrm-devel"
short_desc="Fast floating window manager"
maintainer='Juan RP '
license="ISC"
-homepage="https://github.com/venam/${pkgname}"
+homepage="https://github.com/venam/2bwm"
distfiles="https://github.com/venam/${pkgname}/archive/v${version}.tar.gz"
-checksum="13d98f229545e143f7bc5b54d137d47e08a8608dfa89792cdcd88386ac4ed78c"
-replaces="2bwm>=0"
+checksum=5d071bdbe6d3b4b79b5462cc1b36afe357030fb70c7e64f88d9c7d541d648439
pre_build() {
sed -i 's|-Os ||g' Makefile
sed -i 's|^CFLAGS+=|override CFLAGS +=|g' Makefile
sed -i 's|^LDFLAGS+=|override LDFLAGS +=|g' Makefile
sed -i '/#include /i#define _GNU_SOURCE' 2bwm.c
+ sed -n 1,17p 2bwm.c >LICENSE
}
-
do_install() {
vbin 2bwm
vbin hidden
vman 2bwm.man 2bwm.1
vman hidden.man hidden.1
vdoc README.md README
+ vlicense LICENSE
}
diff --git a/srcpkgs/Adapta/template b/srcpkgs/Adapta/template
index 7b61af84a9..0943ecdcf0 100644
--- a/srcpkgs/Adapta/template
+++ b/srcpkgs/Adapta/template
@@ -1,6 +1,6 @@
# Template file for 'Adapta'
pkgname=Adapta
-version=3.89.4.92
+version=3.90.0.108
revision=1
build_style=gnu-configure
wrksrc="adapta-gtk-theme-$version"
@@ -11,7 +11,7 @@ maintainer="demiaster "
license="GPL-2"
homepage="https://github.com/tista500/$pkgname"
distfiles="$homepage/archive/$version.tar.gz"
-checksum=720a7c2f8950225b3785fe6bd557074cf54a0a455ebcef50195542abb9c72172
+checksum=d79d1790f6c2826920fdaebeb2d153a8b8eb246439a2678dfb51e949822b6a47
noarch=y
diff --git a/srcpkgs/Autodia/template b/srcpkgs/Autodia/template
index 040da4e1ea..5901269bf5 100644
--- a/srcpkgs/Autodia/template
+++ b/srcpkgs/Autodia/template
@@ -8,7 +8,7 @@ hostmakedepends="perl"
makedepends="${hostmakedepends}"
depends="${makedepends} perl-Template-Toolkit"
short_desc="UML diagram generator for dia"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
homepage="http://search.cpan.org/dist/Autodia"
license="Artistic, GPL-1"
distfiles="http://search.cpan.org/CPAN/authors/id/T/TE/TEEJAY/Autodia-${version}.tar.gz"
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 5df1d45a49..538b9958df 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -7,6 +7,6 @@ depends="python"
short_desc="A tool that generates a compilation database for clang tooling"
maintainer="Alain Kalker "
license="GPL-3"
-homepage="https://github.com/rizsotto/${pkgname}"
-distfiles="https://github.com/rizsotto/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
+homepage="https://github.com/rizsotto/Bear"
+distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=bfe711fae29f173f9d33a7d8c42434a2f40d0247fbb6ff618fdd91c878f76a7b
diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template
index 73efae0faf..f26d7fe06d 100644
--- a/srcpkgs/CopyQ/template
+++ b/srcpkgs/CopyQ/template
@@ -1,6 +1,6 @@
# Template file for 'CopyQ'
pkgname=CopyQ
-version=2.9.0
+version=3.0.0
revision=1
build_style=cmake
hostmakedepends="qt5-host-tools qt5-tools-devel"
@@ -10,5 +10,5 @@ maintainer="Enno Boland "
license="GPL-3"
homepage="https://hluk.github.io/CopyQ/"
distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=4cdd953dbff5755b8c6a08bbd6e4f4b41694d622a31e34e149498fa1b96a3dbc
+checksum=10137a47e506cde74a76236ef5d040a2d31b824325a90c7b7b39d54a9a63611c
configure_args="-DWITH_QT5=TRUE"
diff --git a/srcpkgs/ETL/template b/srcpkgs/ETL/template
index 3f87822b2d..44eb6f64eb 100644
--- a/srcpkgs/ETL/template
+++ b/srcpkgs/ETL/template
@@ -1,11 +1,11 @@
# Template file for 'ETL'
pkgname=ETL
-version=0.04.19
+version=0.04.22
revision=1
build_style=gnu-configure
short_desc="Extended Template Library"
maintainer="Diogo Leal "
license="GPL-3"
homepage="http://www.synfig.org/"
-distfiles="http://download.tuxfamily.org/synfig/releases/1.0.1/${pkgname}-${version}.tar.gz"
-checksum=21696881fab1b9a3458aaa77a8b10c899c297b2d132e3ed4cfb7ffa29cd8b8fe
+distfiles="https://downloads.sourceforge.net/project/synfig/releases/1.2.0/source/${pkgname}-${version}.tar.gz"
+checksum=ac5aeb9b8ec2c69dd455c6c72e104ff20c43e1e5dde6c0cd87f3f7d1b41d2746
diff --git a/srcpkgs/EmulationStation/template b/srcpkgs/EmulationStation/template
index 51b4e38c61..27f56da06e 100644
--- a/srcpkgs/EmulationStation/template
+++ b/srcpkgs/EmulationStation/template
@@ -1,7 +1,7 @@
# Template file for 'EmulationStation'
pkgname=EmulationStation
version=2.0.1a
-revision=3
+revision=4
_githash=93f6e11c95f9e7a0c00d3a70c744b22d9a931127
build_style=cmake
makedepends="libcurl-devel MesaLib-devel freetype-devel freeimage-devel
diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template
new file mode 100644
index 0000000000..4e380c886e
--- /dev/null
+++ b/srcpkgs/FeedReader/template
@@ -0,0 +1,23 @@
+# Template file for 'FeedReader'
+pkgname=FeedReader
+version=2.0.2
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config intltool itstool glib-devel vala
+ $(vopt_if gir gobject-introspection)"
+makedepends="gtk+3-devel vala-devel json-glib-devel libgee08-devel libsoup-devel
+ sqlite-devel libsecret-devel libnotify-devel libxml2-devel rest-devel
+ webkit2gtk-devel gstreamer-devel libpeas-devel libcurl-devel
+ gnome-online-accounts-devel gst-plugins-base1-devel"
+short_desc="Modern desktop RSS desktop client"
+maintainer="Enno Boland "
+license="GPL-3"
+homepage="https://jangernert.github.io/FeedReader/"
+distfiles="https://github.com/jangernert/$pkgname/archive/v$version.tar.gz"
+checksum=949262912bc07f8d1ec72dfa1bbeafb0ed1cea992589e1ee5901e0630c714261
+make_build_args="VERBOSE=1"
+
+pre_build() {
+ : sed '/\/usr\/bin\/valac/s#--pkg=goa-#--pkg=Goa-#' \
+ -i $(find build -name build.make)
+}
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 1875d15e7d..d0b837a928 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -2,7 +2,7 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
version=3.0.12
-revision=1
+revision=2
wrksrc=freeradius-server-${version}
build_style=gnu-configure
nocross=yes # Not supported by upstream
diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index e4a67daa0c..08f241cc75 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,7 +1,7 @@
# Template file for 'GraphicsMagick'
pkgname=GraphicsMagick
version=1.3.25
-revision=1
+revision=2
keep_libtool_archives=yes
build_style=gnu-configure
configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index 5469db02ac..531c71a2da 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,7 +1,7 @@
# Template file for 'Ice'
pkgname=Ice
version=3.5.1
-revision=14
+revision=15
build_wrksrc=cpp
homepage="http://www.zeroc.com"
# XXX: other language bindings
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 6344917db5..541da48ede 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
# Template file for 'ImageMagick'
pkgname=ImageMagick
-_majorver=6.9.7
-_patchver=10
+_majorver=6.9.8
+_patchver=4
version=${_majorver}.${_patchver}
revision=1
wrksrc=${pkgname}-${_majorver}-${_patchver}
@@ -16,7 +16,7 @@ maintainer="Juan RP "
homepage="http://www.imagemagick.org/"
license="ImageMagick"
distfiles="http://www.imagemagick.org/download/ImageMagick-${_majorver}-${_patchver}.tar.xz"
-checksum=0bfb2e3459b739669845c20ee1b6014a1a3c429fb0cb9777a8b65cd5c3effb09
+checksum=a6c24f6badc30ba624f1dda14e7927fa3109dea7dd6a7e4408e127f65107cb11
subpackages="libmagick libmagick-devel"
diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template
index 965b822e92..bda69360f1 100644
--- a/srcpkgs/Lucene++/template
+++ b/srcpkgs/Lucene++/template
@@ -1,9 +1,10 @@
# Template file for 'Lucene++'
pkgname=Lucene++
version=3.0.7
-revision=3
+revision=5
wrksrc=LucenePlusPlus-rel_$version
build_style=cmake
+configure_args="-Wno-dev"
makedepends="boost-devel gtest-devel"
short_desc="A C++ port of the popular text search engine"
maintainer="Enno Boland "
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e5776eb427..1298e5393b 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -44,8 +44,6 @@ make_dirs="
/etc/NetworkManager/dispatcher.d/pre-down.d 0750 root root
"
case "$XBPS_TARGET_MACHINE" in
- aarch64-musl) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/1391/steps/shell_3/logs/stdio"
- ;;
*-musl) CFLAGS+=" -DHAVE_SECURE_GETENV -Dsecure_getenv=getenv -D__USE_POSIX199309"
;;
esac
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index f379bc025d..a78be87624 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,6 +1,6 @@
# Template file for 'R'
pkgname=R
-version=3.3.3
+version=3.4.0
revision=1
nocross=yes
build_style=gnu-configure
@@ -19,7 +19,7 @@ license="GPL-2"
homepage="http://www.r-project.org/"
_changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
distfiles="http://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz"
-checksum=5ab768053a275084618fb669b4fbaadcc39158998a87e8465323829590bcfc6c
+checksum=288e9ed42457c47720780433b3d5c3c20983048b789291cc6a7baa11f9428b91
shlib_provides="libR.so"
pre_configure() {
diff --git a/srcpkgs/ReText/template b/srcpkgs/ReText/template
index 0b1053fb4e..31d00aef7c 100644
--- a/srcpkgs/ReText/template
+++ b/srcpkgs/ReText/template
@@ -1,7 +1,7 @@
# Template file for 'ReText'
pkgname=ReText
-version=6.0.2
-revision=4
+version=7.0.0
+revision=1
noarch=yes
build_style=python3-module
pycompile_module="ReText"
@@ -13,7 +13,7 @@ maintainer="Enno Boland "
license="GPL-3"
homepage="http://retext.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/retext/ReText-${version%.*}/ReText-${version}.tar.gz"
-checksum=ce28b20673627bd4e17c750d71b73e073776e291b2a1736dd561a1a24aa7f70b
+checksum=01eaf11768f27ba1da2572f2dbcf9b6857d5baa3ca1f50d1cacad894a228f032
post_install() {
lrelease locale/*.ts
diff --git a/srcpkgs/SDL2_image/template b/srcpkgs/SDL2_image/template
index e45958ae96..0749a8d07c 100644
--- a/srcpkgs/SDL2_image/template
+++ b/srcpkgs/SDL2_image/template
@@ -1,7 +1,7 @@
# Template file for 'SDL2_image'
pkgname=SDL2_image
version=2.0.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static --disable-jpg-shared
--disable-png-shared --disable-webp-shared --disable-tif-shared"
diff --git a/srcpkgs/SDL_gfx/template b/srcpkgs/SDL_gfx/template
index 15e66e6390..65afe0ead7 100644
--- a/srcpkgs/SDL_gfx/template
+++ b/srcpkgs/SDL_gfx/template
@@ -1,7 +1,7 @@
# Template file for 'SDL_gfx'
pkgname=SDL_gfx
-version=2.0.25
-revision=2
+version=2.0.26
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="SDL-devel"
@@ -9,8 +9,8 @@ short_desc="Graphics drawing primitives for SDL"
maintainer="Jürgen Buchmüller "
license="BSD"
homepage="http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"
-distfiles="http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.25.tar.gz"
-checksum=556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0
+distfiles="http://www.ferzkopp.net/Software/SDL_gfx-${version%.*}/SDL_gfx-${version}.tar.gz"
+checksum=7ceb4ffb6fc63ffba5f1290572db43d74386cd0781c123bc912da50d34945446
pre_configure() {
case "${XBPS_TARGET_MACHINE}" in
diff --git a/srcpkgs/SFML/template b/srcpkgs/SFML/template
index a28d09eb75..380995104f 100644
--- a/srcpkgs/SFML/template
+++ b/srcpkgs/SFML/template
@@ -8,7 +8,7 @@ makedepends="libsndfile-devel libXrandr-devel libjpeg-turbo-devel
libopenal-devel glew-devel freetype-devel MesaLib-devel glu-devel
xcb-util-image-devel"
short_desc="Simple and Fast Multimedia Library"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
license="zlib"
homepage="http://www.sfml-dev.org/"
distfiles="https://github.com/LaurentGomila/${pkgname}/archive/${version}.tar.gz"
diff --git a/srcpkgs/SMC/template b/srcpkgs/SMC/template
index 95e150434f..9654c6dfb6 100644
--- a/srcpkgs/SMC/template
+++ b/srcpkgs/SMC/template
@@ -1,7 +1,7 @@
# Template file for 'SMC'.
pkgname=SMC
version=1.9
-revision=3
+revision=4
wrksrc=${pkgname,,}-${version}
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel pkg-config unzip"
diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template
index 3fdd7484bb..b840532f58 100644
--- a/srcpkgs/TSC/template
+++ b/srcpkgs/TSC/template
@@ -1,7 +1,7 @@
# Template file for 'TSC'
pkgname=TSC
version=2.0.0
-revision=3
+revision=4
build_style=cmake
build_wrksrc=tsc
configure_args="-DFIXED_DATA_DIR=/usr/share/TSC -DBINARY_DIR=/usr/bin"
diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index bcfb705d57..eb6dc21d99 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,6 +1,6 @@
# Template file for 'VirtualGL'
pkgname=VirtualGL
-version=2.5.1
+version=2.5.2
revision=1
build_style=cmake
configure_args="-DTJPEG_INCLUDE_DIR=/usr/include
@@ -12,7 +12,7 @@ maintainer="Juan RP "
homepage="http://www.virtualgl.org/"
license="LGPL-2.1"
distfiles="${SOURCEFORGE_SITE}/virtualgl/${version}/${pkgname}-${version}.tar.gz"
-checksum=da342e0157257cd7b7c9c6705c7f2b9853f28f6bb6c51c90c710cc14257f3659
+checksum=4f43387678b289a24139c5b7c3699740ca555a9f10011c979e51aa4df2b93238
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
diff --git a/srcpkgs/WindowMaker/template b/srcpkgs/WindowMaker/template
index 4e23189d76..f41eecf007 100644
--- a/srcpkgs/WindowMaker/template
+++ b/srcpkgs/WindowMaker/template
@@ -1,7 +1,7 @@
# Template file for 'WindowMaker'
pkgname=WindowMaker
-version=0.95.7
-revision=2
+version=0.95.8
+revision=1
build_style=gnu-configure
configure_args="--enable-xinerama --localedir=/usr/share/locale
--enable-usermenu --enable-modelock --enable-xrandr --enable-wmreplace
@@ -21,7 +21,7 @@ maintainer="Juan RP "
license="GPL-3"
homepage="http://www.windowmaker.org/"
distfiles="http://windowmaker.org/pub/source/release/${pkgname}-${version}.tar.gz"
-checksum=842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9
+checksum=9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
pre_configure() {
autoreconf -fi
diff --git a/srcpkgs/abootimg/template b/srcpkgs/abootimg/template
index ad7c8cba55..8a39564185 100644
--- a/srcpkgs/abootimg/template
+++ b/srcpkgs/abootimg/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
wrksrc="abootimg-$_commit-$_commit"
makedepends="libblkid-devel"
short_desc="Manipulate Android Boot Images"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
license="GPL-2"
homepage="http://gitorious.org/ac100/abootimg"
distfiles="https://gitlab.com/ajs124/abootimg/repository/archive.tar.gz?ref=$_commit>archive.tar.gz"
diff --git a/srcpkgs/acbuild/template b/srcpkgs/acbuild/template
index 772f4b27e1..cbeca56af9 100644
--- a/srcpkgs/acbuild/template
+++ b/srcpkgs/acbuild/template
@@ -1,7 +1,7 @@
# Template file for 'acbuild'
pkgname=acbuild
version=0.4.0
-revision=3
+revision=4
wrksrc="build-${version}"
build_style=go
go_import_path=github.com/appc/acbuild
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index 7ce5ddec8a..01f8fab95c 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,7 +1,7 @@
# Template file for 'accountsservice'
pkgname=accountsservice
-version=0.6.43
-revision=2
+version=0.6.45
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-systemd $(vopt_enable gir introspection)
ac_cv_file__etc_redhat_release=no ac_cv_file__etc_debian_version=no"
@@ -15,7 +15,7 @@ maintainer="Juan RP "
homepage="http://cgit.freedesktop.org/accountsservice/"
license="GPL-3"
distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
-checksum=ed3ba94aa38ceb822a0e1a1ac71bf1a8123babf90be049397b3a00900e48d6cc
+checksum=fb0fc293aa75d59f5ef5db719d37a21831c4dd74a97526ee7e51ce936311ef26
# Package build options
build_options="gir"
diff --git a/srcpkgs/acct/template b/srcpkgs/acct/template
index 06dc554bed..acd0bc7d86 100644
--- a/srcpkgs/acct/template
+++ b/srcpkgs/acct/template
@@ -1,7 +1,7 @@
# Template file for 'acct'
pkgname=acct
-version=6.6.2
-revision=3
+version=6.6.3
+revision=1
build_style=gnu-configure
configure_args="--sbindir=/usr/bin"
short_desc="GNU Accounting Utilities"
@@ -9,7 +9,7 @@ homepage="https://www.gnu.org/software/acct/"
license="GPL-3"
maintainer="Juan RP "
distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=8ed47b2f893b08f0d67720880adbb48b835a826c314fa52fd52af1cee6870101
+checksum=5eae79323bf1ce403704d2b70483c46e7c853276ee7b5ad561ec3ccae9fca093
nocross=yes
post_install() {
diff --git a/srcpkgs/ack/template b/srcpkgs/ack/template
index 58c3affc70..cfd79ed4ff 100644
--- a/srcpkgs/ack/template
+++ b/srcpkgs/ack/template
@@ -1,15 +1,15 @@
-# Template build file for 'ack'.
+# Template file for 'ack'
pkgname=ack
-version=2.14
-revision=3
+version=2.18
+revision=1
+noarch=yes
build_style=perl-module
-hostmakedepends="perl perl-File-Next"
+hostmakedepends="perl-File-Next"
makedepends="${hostmakedepends}"
depends="${makedepends}"
-noarch="yes"
-short_desc="A Perl-based grep replacement, aimed at programmers with large trees of heterogeneous source code"
+short_desc="Tool like grep, optimized for programmers"
maintainer="Jan S. "
-homepage="http://betterthangrep.com/"
-license="PerlArtistic"
-distfiles="http://www.cpan.org/modules/by-authors/id/P/PE/PETDANCE/${pkgname}-${version}.tar.gz"
-checksum=8549a833efec158dc85bc6334b3a384ae5a389896942eab9a58c6e630c181b3f
+homepage="https://beyondgrep.com/"
+license="Artistic-2.0"
+distfiles="${CPAN_SITE}/App/ack-${version}.tar.gz"
+checksum=fb4a0a11a5411cba5764163b8d074a447c2a753758821151b31dc7533663f058
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
index 373ab95a20..7583581d4a 100644
--- a/srcpkgs/acme-client/template
+++ b/srcpkgs/acme-client/template
@@ -1,7 +1,7 @@
# Template file for 'acme-client'
pkgname=acme-client
version=0.1.11
-revision=2
+revision=3
_distver=VERSION_${version//./_}
wrksrc=acme-client-portable-${_distver}
build_style=gnu-makefile
diff --git a/srcpkgs/acmetool/template b/srcpkgs/acmetool/template
index 1f6b70e3f0..97e864da2f 100644
--- a/srcpkgs/acmetool/template
+++ b/srcpkgs/acmetool/template
@@ -1,7 +1,7 @@
# Template file for 'acmetool'
pkgname=acmetool
version=0.0.59
-revision=1
+revision=2
wrksrc="acme-${version}"
build_style=go
go_import_path=github.com/hlandau/acme
diff --git a/srcpkgs/acpi_call-dkms/template b/srcpkgs/acpi_call-dkms/template
index 23b60415fe..4cf0a59c53 100644
--- a/srcpkgs/acpi_call-dkms/template
+++ b/srcpkgs/acpi_call-dkms/template
@@ -3,7 +3,7 @@ pkgname=acpi_call-dkms
version=1.2.0
revision=1
wrksrc=acpi_call-${version}
-only_for_archs="i686 x86_64"
+only_for_archs="i686 x86_64 x86_64-musl"
short_desc="Kernel module allowing calls to ACPI methods through /proc/acpi/call"
maintainer="Daniel A. Maierhofer "
license="GPL-3"
diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template
index dad2d391a2..5f5b433fda 100644
--- a/srcpkgs/acpica-utils/template
+++ b/srcpkgs/acpica-utils/template
@@ -1,19 +1,19 @@
# Template file for 'acpica-utils'
pkgname=acpica-utils
-version=20161222
+version=20170303
revision=1
wrksrc="acpica-unix-${version}"
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
hostmakedepends="flex"
short_desc="Intel ACPI CA Unix utilities"
homepage="https://www.acpica.org/"
-license="GPL-2"
+license="GPL-2, 3-clause-BSD"
maintainer="Juan RP "
distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
-checksum=0cfe1b622b8663ff9c46dd23b8c2fe7c7191d8b433cd6decdce6403321b37120
+checksum=c093c9eabd1f8c51d79364d829975c5335c8028c4816a7a80dfb8590f31889b5
do_build() {
- sed -e 's/_CYGWIN/_LINUX/g' -e 's/-Werror//g' -i generate/unix/Makefile.config
+ sed -e 's/_CYGWIN/_LINUX/g' -e 's/-Werror//g' -i generate/unix/Makefile.config generate/unix/iasl/Makefile
case "$XBPS_TARGET_MACHINE" in
i686*) make BITS=32;;
diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template
index 994bad5b27..6b152a1cee 100644
--- a/srcpkgs/adobe-flash-plugin/template
+++ b/srcpkgs/adobe-flash-plugin/template
@@ -1,6 +1,6 @@
# Template file for 'adobe-flash-plugin'
pkgname=adobe-flash-plugin
-version=24.0.0.221
+version=25.0.0.148
revision=1
# The EULA file
_eula="https://www.adobe.com/content/dam/Adobe/en/legal/licenses-terms/pdf/PlatformClients_PC_WWEULA-en_US-20150407_1357.pdf"
@@ -8,10 +8,10 @@ _eulacksum=91e504a9e99ebd988ffa95ce0d5feaf340410c03709348297301a22dc11df1a8
_url=http://fpdownload.adobe.com/get/flashplayer/pdc/${version}
if [ "$XBPS_MACHINE" = "x86_64" ]; then
_disttarball="${_url}/flash_player_npapi_linux.x86_64.tar.gz"
- _distcksum=087048af5fa3c46a8c283403a341d4684ef4b966f4e407195b43c24bf5ae64b1
+ _distcksum=72f93bf2d2f6b6e7ed34321de8324f14d9ddff8bc9f42717691b8904be50e758
else
_disttarball="${_url}/flash_player_npapi_linux.i386.tar.gz"
- _distcksum=7495689ad778cae778f19ac085d362cbae63c7a4ad806fd9ece1844040ba9eed
+ _distcksum=7d9ffcdca435429d8578adf348ff6e2c336787d2cfca4d28742c92adce8061b1
fi
distfiles="${_eula} ${_disttarball}"
checksum="${_eulacksum} ${_distcksum}"
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 236fb019c8..6f0adf5f16 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,7 +1,7 @@
# Template build file for 'adwaita-icon-theme'.
pkgname=adwaita-icon-theme
-version=3.22.0
-revision=3
+version=3.24.0
+revision=1
noarch=yes
build_style=gnu-configure
configure_args="--enable-icon-mapping"
@@ -12,4 +12,4 @@ maintainer="Juan RP "
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7
+checksum=ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a
diff --git a/srcpkgs/afl/template b/srcpkgs/afl/template
index 95ad40ba1f..0fbc889aed 100644
--- a/srcpkgs/afl/template
+++ b/srcpkgs/afl/template
@@ -1,6 +1,6 @@
# Template file for 'afl'
pkgname=afl
-version=2.39b
+version=2.41b
revision=1
build_style=gnu-makefile
# x86 only currently
@@ -11,7 +11,7 @@ maintainer="Juan RP "
license="Apache-2.0"
homepage="http://lcamtuf.coredump.cx/afl/"
distfiles="http://lcamtuf.coredump.cx/afl/releases/afl-${version}.tgz"
-checksum=968eceae4d013eee62bc8f2fdddbb7060b92e03a0175153b0285ec7f5c78f141
+checksum=0670b13235264e688a7ccfbeeee257e9c57dcc86ead676247d92d199c194968f
nopie=yes # clang flags
nostrip_files="small_archive.a small_exec.elf"
diff --git a/srcpkgs/aha/template b/srcpkgs/aha/template
index e95f84428a..8e6f411d61 100644
--- a/srcpkgs/aha/template
+++ b/srcpkgs/aha/template
@@ -1,6 +1,6 @@
# Template file for 'aha'
pkgname=aha
-version=0.4.10.5
+version=0.4.10.6
revision=1
build_style=gnu-makefile
short_desc="Converts SGR-colored Input to W3C conform HTML-Code"
@@ -8,7 +8,7 @@ maintainer="Enno Boland "
license="LGPL-2, MPL"
homepage="https://github.com/theZiz/aha"
distfiles="https://github.com/theZiz/aha/archive/$version.tar.gz"
-checksum=b2cd7a1a0f7b3a70c37446d7157b4b58e2939535cdd71112a2228b2e78f7e620
+checksum=747e939787dca7a9620869fefc17b60f5e29f0ea3965548d15dc9b2a1f31c3f6
do_configure() {
sed -i 's/gcc/$(CC)/' Makefile
diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index 8ecf20ad5c..461aa20232 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -3,7 +3,7 @@ pkgname=aircrack-ng
_aircrack_ver=1.2
_aircrack_rc=rc4
version="${_aircrack_ver}${_aircrack_rc}"
-revision=4
+revision=5
wrksrc="${pkgname}-${_aircrack_ver}-${_aircrack_rc}"
hostmakedepends="pkg-config"
makedepends="zlib-devel libressl-devel sqlite-devel libnl3-devel"
diff --git a/srcpkgs/akonadi/template b/srcpkgs/akonadi/template
index 288aeb6b10..bd1179d6ec 100644
--- a/srcpkgs/akonadi/template
+++ b/srcpkgs/akonadi/template
@@ -1,7 +1,7 @@
# Template file for 'akonadi'
pkgname=akonadi
version=1.13.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DAKONADI_BUILD_TESTS=OFF -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DDATABASE_BACKEND=SQLITE -DWITH_SOPRANO=OFF"
hostmakedepends="automoc4 pkg-config libxslt"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 95181f181f..2d4f0687d9 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,8 +1,8 @@
# Template file for 'alacritty'
pkgname=alacritty
-version=0.1.0.20170303
+version=0.1.0.20170417
revision=1
-_commit=aa76b29ff7dbf4af8d83c9f461889249fe53ea77
+_commit=d372f2e591020b5824797db826159351d19c3906
wrksrc="$pkgname-$_commit"
hostmakedepends="rust cargo cmake pkg-config"
makedepends="freetype-devel fontconfig-devel"
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni "
license="Apache-2.0"
homepage="https://github.com/jwilm/alacritty"
distfiles="$homepage/archive/${_commit}.tar.gz"
-checksum=af1871b77576f4877a8e0c30d03df1901f9b7daa2d57a54bfac9a287dc2ba472
+checksum=a78476e49270212c138551a6644ba17ad3eabb7567c9ca5407392b0f0093e54a
nocross=yes
diff --git a/srcpkgs/albert/template b/srcpkgs/albert/template
index 7bfbd3d5cb..5eeccb7057 100644
--- a/srcpkgs/albert/template
+++ b/srcpkgs/albert/template
@@ -1,6 +1,6 @@
# Template file for 'albert'
pkgname=albert
-version=0.9.3
+version=0.11.1
revision=1
build_style=cmake
makedepends="muparser-devel qt5-svg-devel qt5-x11extras-devel qt5-plugin-mysql
@@ -10,8 +10,8 @@ short_desc="Lightweight desktop environment agnostic launcher"
maintainer="Nemh "
license="GPL-3"
homepage="https://github.com/ManuelSchneid3r/albert"
-distfiles="https://github.com/ManuelSchneid3r/${pkgname}/archive/v${version}.tar.gz"
-checksum=5e16e369e38267e861407e5315c841e07ee04cf14caf0294e8c33d837c1931f4
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=d214b73bf154bef59d36a4b128493b5dd9ecc7ba059a606f9b4659b57741f390
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-svg-devel qt5-x11extras-devel"
diff --git a/srcpkgs/alfred/template b/srcpkgs/alfred/template
index 60f7d4f81d..02d5ed5ae2 100644
--- a/srcpkgs/alfred/template
+++ b/srcpkgs/alfred/template
@@ -1,6 +1,6 @@
# Template file for 'alfred'
pkgname=alfred
-version=2016.5
+version=2017.0
revision=1
build_style=gnu-makefile
short_desc="Daemon for distributing arbitrary information over a batman mesh"
@@ -8,7 +8,7 @@ maintainer="Enno Boland "
license="GPL-2, ISC"
homepage="http://www.open-mesh.org/projects/open-mesh/wiki/Alfred"
distfiles="http://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-${version}.tar.gz"
-checksum=37b3babf7f37643cf296be11fb82d5730cf441a5a56f72fba96edae9f149c9d2
+checksum=f8d6d83d2ce30b2238354ce12073285387c0f4ca1a28060390ff50b411b50fa8
hostmakedepends="pkg-config"
makedepends="libcap-devel libnl3-devel"
make_build_args="CONFIG_ALFRED_GPSD=n"
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index aa65d4356f..61b3c18e3f 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,24 +1,24 @@
# Template file for 'alpine'
pkgname=alpine
-version=2.20
-revision=6
+version=2.21
+revision=2
create_wrksrc=yes
build_wrksrc="${pkgname}-${version}"
build_style=gnu-configure
configure_args="--without-passfile --without-tcl --disable-shared
- --with-ssl-dir=${XBPS_CROSS_BASE}/usr
+ --with-ssl-dir=${XBPS_CROSS_BASE}/usr alpine_SSLPROVIDER=libressl
--with-system-pinerc=/etc/${pkgname}.d/pine.conf
--with-system-fixed-pinerc=/etc/${pkgname}.d/pine.conf.fixed"
hostmakedepends="hunspell"
makedepends="pam-devel ncurses-devel gettext-devel libldap-devel mit-krb5-devel"
short_desc="Apache-licensed PINE mail user agent (with Chappa patches)"
-maintainer="Christian Neukirchen "
+maintainer="Leah Neukirchen "
license="Apache-2.0"
homepage="http://patches.freeiz.com/alpine/"
distfiles="http://patches.freeiz.com/${pkgname}/patches/${pkgname}-${version}/all.patch.gz
http://patches.freeiz.com/${pkgname}/release/src/${pkgname}-${version}.tar.xz"
-checksum="31c75e13d47d9dbf92839e2dca503a13316d720a6b64eac0857f4bb726f3daf8
- ed639b6e5bb97e6b0645c85262ca6a784316195d461ce8d8411999bf80449227"
+checksum="590e6774c60c6738e31b0bd440b28c54bff25c5f87be9aa2d8d4671fdf1e3450
+ 6030b6881b8168546756ab3a5e43628d8d564539b0476578e287775573a77438"
post_extract() {
patch -Np0
+ #include
++#include
+
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index e74819d9e1..b072a72195 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ _distver=7.0.0_r5
# of android used by android-tools. Check for diff with:
# curl -L http://git.io/vvC0Z | sh -s 5.0.2_r1 5.1.0_r1
version=${_distver/_/}
-revision=4
+revision=5
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="git"
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 12d41258c9..eb6256f15d 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,7 +1,7 @@
# Template file for 'anjuta'
pkgname=anjuta
version=3.22.0
-revision=3
+revision=4
build_style=gnu-configure
build_options="gir"
configure_args="$(vopt_enable gir introspection)"
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index dd7cb65b47..6920a2348f 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
# Template file for 'ansible'
pkgname=ansible
-version=2.2.1.0
+version=2.3.0.0
revision=1
noarch=yes
build_style=python2-module
@@ -13,7 +13,7 @@ maintainer="Juan RP "
license="GPL-3"
homepage="https://www.ansible.com/"
distfiles="https://releases.ansible.com/ansible/${pkgname}-${version}.tar.gz"
-checksum=63a12ea784c0f90e43293b973d5c75263634c7415e463352846cd676c188e93f
+checksum=299f3907cd566a20e163942fa82b6afc86ef89c2726ba503b90c1a651e82a458
post_install() {
for f in examples/*; do
diff --git a/srcpkgs/aoeui/template b/srcpkgs/aoeui/template
index 66038877e0..52bc1a822b 100644
--- a/srcpkgs/aoeui/template
+++ b/srcpkgs/aoeui/template
@@ -1,15 +1,17 @@
# Template file for 'aoeui'
pkgname=aoeui
version=1.7
-revision=5
+revision=6
+_githash=4e5dee93ebbaf5bd7bd7da80ce34b2eef196cd08
+wrksrc="${pkgname}-${_githash}"
build_style=gnu-makefile
hostmakedepends="m4"
short_desc="Lightweight UNIX-friendly text editor"
-maintainer="Christian Neukirchen "
+maintainer="Leah Neukirchen "
license="GPL-2"
-homepage="http://sites.google.com/site/aoeuiandasdfg/Home"
-distfiles="https://github.com/adnelson/aoeui/raw/master/${pkgname}-${version}.tgz"
-checksum=f4c067ad2c3b95ad130411195dd53ea49300e8e3496ecf0deceff20350c7670d
+homepage="https://github.com/pklausler/aoeui"
+distfiles="https://github.com/pklausler/aoeui/archive/${_githash}.tar.gz"
+checksum=3b06c7950b0fcbdfe57e78de8cb9b9d7af141932459a32d72a029f96839d667f
post_extract() {
echo 'LIBS += $(LDFLAGS)' >>Makefile
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 27f8a13f3a..fd5c503f63 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.25
-revision=2
+revision=3
wrksrc=httpd-${version}
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
diff --git a/srcpkgs/apk-tools/patches/vfs.patch b/srcpkgs/apk-tools/patches/vfs.patch
new file mode 100644
index 0000000000..3dfb15b77f
--- /dev/null
+++ b/srcpkgs/apk-tools/patches/vfs.patch
@@ -0,0 +1,11 @@
+--- src/database.c.orig
++++ src/database.c
+@@ -26,6 +26,8 @@
+ #include
+ #include
+ #include
++#include
++#include
+ #include
+
+ #include "apk_defines.h"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index f3b87359b8..1408975f0d 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,17 +1,17 @@
# Template file for 'apk-tools'
pkgname=apk-tools
-version=2.6.8
+version=2.7.1
revision=1
build_style=gnu-makefile
make_build_args="LUAAPK="
hostmakedepends="pkg-config"
makedepends="libressl-devel zlib-devel libfetch-devel"
short_desc="Alpine Package Keeper (Alpine package manager)"
-maintainer="Christian Neukirchen "
+maintainer="Leah Neukirchen "
license="GPL-2"
homepage="http://git.alpinelinux.org/cgit/apk-tools"
distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b
+checksum=5abac5f1f19d64ce7201e66fcd86b430240895d3002323a4a11ad17c6f4b44e7
CFLAGS=-Wno-error
post_extract() {
diff --git a/srcpkgs/apl/template b/srcpkgs/apl/template
new file mode 100644
index 0000000000..d175ce1179
--- /dev/null
+++ b/srcpkgs/apl/template
@@ -0,0 +1,17 @@
+# Template file for 'apl'
+pkgname=apl
+version=1.7
+revision=2
+build_style=gnu-configure
+makedepends="ncurses-devel sqlite-devel"
+short_desc="GNU interpreter for APL (A Programming Language)"
+maintainer="Leah Neukirchen "
+license="GPL-3"
+homepage="http://www.gnu.org/software/apl"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=8ff6e28256d7a3cdfa9dc6025e3905312310b27a43645ef5d617fd4a5b43b81f
+
+post_install() {
+ vdoc support-files/Dyalog-Keyboard/apl.xkb
+ vdoc support-files/Dyalog-Keyboard/apl.xmodmap
+}
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index e932053b15..a6d33bd209 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
# Template file for 'apr-util'
pkgname=apr-util
version=1.5.4
-revision=8
+revision=9
build_style=gnu-configure
configure_args="
--with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config --with-pgsql --with-ldap
diff --git a/srcpkgs/apulse/template b/srcpkgs/apulse/template
index 14e0a7d503..b1edd23cb7 100644
--- a/srcpkgs/apulse/template
+++ b/srcpkgs/apulse/template
@@ -1,6 +1,6 @@
# Template file for 'apulse'
pkgname=apulse
-version=0.1.7
+version=0.1.10
revision=1
build_style=cmake
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller "
license="MIT"
homepage="http://github.com/i-rinat/apulse"
distfiles="https://codeload.github.com/i-rinat/${pkgname}/tar.gz/v${version}>${pkgname}-${version}.tar.gz"
-checksum=fc0e4853684ca5145950690405b0d4f89bf3a5aef7a86addec451561fb5f3e1b
+checksum=4f8aa9059d07bac1006e920a4a6b875ad63fdde973b83c138507812c00dd5cd6
post_install() {
vlicense LICENSE.MIT
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 2b0a66e26d..24125c4df5 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -7,7 +7,7 @@ configure_args="--with-backends=jack,alsa --libjack=weak --optimize --docs"
hostmakedepends="python git graphviz doxygen pkg-config clang perl"
makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel taglib-devel aubio-devel rubberband-devel alsa-lib-devel libsndfile-devel vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2 sratom-devel gtkmm2-devel"
short_desc="Professional-grade digital audio workstation"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
license="GPL-2"
homepage="http://ardour.org"
CXXFLAGS="-std=c++11"
diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index b7e504ee1e..4de0e97a92 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,7 +1,7 @@
# Template file for 'argyllcms'
pkgname=argyllcms
version=1.9.2
-revision=1
+revision=2
wrksrc="Argyll_V${version}"
hostmakedepends="ftjam zip unzip"
makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index bd27ae1bc9..24371e4b46 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,7 +1,7 @@
# Template file for 'aria2'
pkgname=aria2
version=1.31.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-openssl --with-libexpat --without-gnutls
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 8177019994..21b7973b4a 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -6,7 +6,7 @@ build_style=cmake
hostmakedepends="automoc4"
makedepends="kdelibs-devel libarchive-devel phonon-devel"
short_desc="KDE Archiving Tool"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
license="GPL-2"
homepage="http://kde.org/applications/utilities/ark"
distfiles="http://download.kde.org/Attic/applications/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/ark/update b/srcpkgs/ark/update
index 75e0e58a25..4f99554769 100644
--- a/srcpkgs/ark/update
+++ b/srcpkgs/ark/update
@@ -1,3 +1,3 @@
site="http://download.kde.org/stable/applications/"
pattern='href="\K[\d\.]+(?=/")'
-ignore="15.* 16.*" # can't compile until we port new kde libs
+ignore="15.* 16.* 17.*" # can't compile until we port new kde libs
diff --git a/srcpkgs/arpwatch/template b/srcpkgs/arpwatch/template
index 376917ce3f..5eb0da24e5 100644
--- a/srcpkgs/arpwatch/template
+++ b/srcpkgs/arpwatch/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
makedepends="libpcap-devel"
short_desc="Ethernet/FDDI station activity monitor"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
license="BSD"
homepage="ftp://ftp.ee.lbl.gov"
distfiles="ftp://ftp.ee.lbl.gov/$pkgname-$version.tar.gz"
diff --git a/srcpkgs/asciinema/template b/srcpkgs/asciinema/template
index b3473adce9..92ec2e71cc 100644
--- a/srcpkgs/asciinema/template
+++ b/srcpkgs/asciinema/template
@@ -1,7 +1,7 @@
# Template file for 'asciinema'
pkgname=asciinema
-version=1.3.0
-revision=2
+version=1.4.0
+revision=1
noarch=yes
build_style=python3-module
pycompile_module="asciinema"
@@ -13,4 +13,4 @@ license="GPL-3"
# changelog="https://github.com/asciinema/asciinema/blob/master/CHANGELOG.md"
homepage="https://asciinema.org/"
distfiles="${PYPI_SITE}/a/asciinema/asciinema-${version}.tar.gz"
-checksum=acc1a07306c7af02cd9bc97c32e4748dbfa57ff11beb17fea64eaee67eaa2db3
+checksum=fb31457e7a4689340b872f625658dbaea33bcf6863fb5d696cf3857010432ecb
diff --git a/srcpkgs/assimp/template b/srcpkgs/assimp/template
new file mode 100644
index 0000000000..4b117d1dba
--- /dev/null
+++ b/srcpkgs/assimp/template
@@ -0,0 +1,52 @@
+# Template file for 'assimp'
+pkgname=assimp
+version=3.3.1
+revision=2
+build_style=cmake
+hostmakedepends="cmake pkg-config doxygen"
+makedepends="boost-devel zlib-devel"
+short_desc="Import library for various well-known 3D model formats"
+maintainer="Jürgen Buchmüller "
+license="3-clause-BSD"
+homepage="http://assimp.sourceforge.net/"
+distfiles="https://github.com/assimp/assimp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=d385c3f90876241343f09e45f4e5033a6a05861b971c63d1f6d512371ffdc7bf
+depends="libassimp>=${version}_${revision}"
+
+post_install() {
+ cd doc
+ # Create command documentation
+ rm -rf AssimpCmdDoc_Html
+ doxygen Doxyfile_Cmd
+ vmkdir usr/share/doc/${pkgname}
+ vcopy AssimpCmdDoc_Html/* usr/share/doc/${pkgname}
+ # Create library documentation
+ rm -rf AssimpDoc_Html
+ doxygen Doxyfile
+ vmkdir usr/share/doc/${pkgname}/lib
+ vcopy AssimpDoc_Html/* usr/share/doc/${pkgname}/lib
+ cd ..
+ vlicense LICENSE
+}
+
+libassimp_package() {
+ short_desc+=" - libraries"
+ depends="${makedepends}"
+ pkg_install() {
+ vmove usr/lib/*.so.*
+ vlicense LICENSE
+ }
+}
+libassimp-devel_package() {
+ short_desc+=" - development files"
+ depends="libassimp>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.so
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmkdir usr/share/doc/libassimp
+ mv ${DESTDIR}/usr/share/doc/${sourcepkg}/lib/* \
+ ${PKGDESTDIR}/usr/share/doc/libassimp/
+ }
+}
diff --git a/srcpkgs/astyle/template b/srcpkgs/astyle/template
index 059f90a383..0b678ebd97 100644
--- a/srcpkgs/astyle/template
+++ b/srcpkgs/astyle/template
@@ -1,6 +1,6 @@
# Template file for 'astyle'
pkgname=astyle
-version=2.06
+version=3.0
revision=1
wrksrc="$pkgname"
build_wrksrc="build/gcc"
@@ -10,7 +10,7 @@ maintainer="Juan RP "
license="LGPL-3"
homepage="http://astyle.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${version}_linux.tar.gz"
-checksum=3b7212210dc139e8f648e004b758c0be1b3ceb1694b22a879202d2b833db7c7e
+checksum=983e4fe87f20427ddf0d06fa5ba046b5ee95347f9ada33a681af3892426a4ff3
do_install() {
vbin bin/astyle
diff --git a/srcpkgs/asus-kbd-backlight/template b/srcpkgs/asus-kbd-backlight/template
index 120c473359..8761a05960 100644
--- a/srcpkgs/asus-kbd-backlight/template
+++ b/srcpkgs/asus-kbd-backlight/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
noarch=yes
depends="bash"
short_desc="Helper for adjusting keyboard backlight brightness in Asus Zenbook"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
license="FDL1.3"
homepage="https://wiki.archlinux.org/index.php/ASUS_Zenbook_Prime_UX31A#keyboard_backlight_script"
diff --git a/srcpkgs/at-spi2-atk/template b/srcpkgs/at-spi2-atk/template
index 94a5f5d688..ef71c9e59c 100644
--- a/srcpkgs/at-spi2-atk/template
+++ b/srcpkgs/at-spi2-atk/template
@@ -1,6 +1,6 @@
# Template file for 'at-spi2-atk'
pkgname=at-spi2-atk
-version=2.22.0
+version=2.24.0
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config intltool glib-devel"
@@ -10,7 +10,7 @@ maintainer="Juan RP "
homepage="http://www.gnome.org"
license="LGPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=e8bdedbeb873eb229eb08c88e11d07713ec25ae175251648ad1a9da6c21113c1
+checksum=022d68497c05cc65ba7cd2b166132de9a160c8d90e9200b5faa473ef7e784c61
pre_configure() {
autoreconf -fi
diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index 8ea595c8be..2971776095 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -1,6 +1,6 @@
# Template file for 'at-spi2-core'
pkgname=at-spi2-core
-version=2.22.0
+version=2.24.0
revision=1
build_style=gnu-configure
configure_args="$(vopt_enable gir introspection)"
@@ -11,7 +11,7 @@ maintainer="Juan RP "
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=415ea3af21318308798e098be8b3a17b2f0cf2fe16cecde5ad840cf4e0f2c80a
+checksum=6179f314fbd903b3cd3477a57b6b1fecca88b76ce769ce777fda0d3e5f61afcd
# Package build options
build_options="gir"
diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template
index 0e314248cf..cdabe5a855 100644
--- a/srcpkgs/atk/template
+++ b/srcpkgs/atk/template
@@ -1,6 +1,6 @@
# Template build file for 'atk'.
pkgname=atk
-version=2.22.0
+version=2.24.0
revision=1
build_style=gnu-configure
configure_args="$(vopt_enable gir introspection)"
@@ -11,7 +11,7 @@ maintainer="Juan RP "
homepage="http://www.gtk.org/"
license="LGPL-2.1"
distfiles="${GNOME_SITE}/atk/${version%.*}/atk-${version}.tar.xz"
-checksum=d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6
+checksum=bb2daa9a808c73a7a79d2983f333e0ba74be42fc51e3ba1faf2551a636487a49
# Package build options
build_options="gir"
diff --git a/srcpkgs/atom/template b/srcpkgs/atom/template
index 75434951d9..57faf541ef 100644
--- a/srcpkgs/atom/template
+++ b/srcpkgs/atom/template
@@ -7,7 +7,7 @@ nostrip=yes
hostmakedepends="git pkg-config python-devel nodejs git-perl"
makedepends="python-devel GConf-devel libgnome-keyring-devel"
short_desc="Chrome-based text editor from Github"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
license="MIT"
homepage="https://atom.io"
distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
diff --git a/srcpkgs/atop/patches/atop-bb-compat.patch b/srcpkgs/atop/patches/atop-bb-compat.patch
index d967423aac..5173ba56f8 100644
--- a/srcpkgs/atop/patches/atop-bb-compat.patch
+++ b/srcpkgs/atop/patches/atop-bb-compat.patch
@@ -5,6 +5,7 @@ index c72214c..ac4b3b7 100755
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
+
CURDAY=`date +%Y%m%d`
LOGPATH=/var/log/atop
BINPATH=/usr/bin
diff --git a/srcpkgs/atop/patches/musl-fix-includes.patch b/srcpkgs/atop/patches/musl-fix-includes.patch
index f59880b15d..ae1cff0966 100644
--- a/srcpkgs/atop/patches/musl-fix-includes.patch
+++ b/srcpkgs/atop/patches/musl-fix-includes.patch
@@ -19,47 +19,3 @@
#include "atop.h"
#include "photoproc.h"
---- showgeneric.c.orig
-+++ showgeneric.c
-@@ -268,7 +268,7 @@
- #include
- #include
- #include
--#include
-+#include
- #include
- #include
- #include
---- showlinux.c.orig
-+++ showlinux.c
-@@ -274,7 +274,7 @@
- #include
- #include
- #include
--#include
-+#include
- #include
- #include
- #include
---- showprocs.c.orig
-+++ showprocs.c
-@@ -94,7 +94,7 @@
- #include
- #include
- #include
--#include
-+#include
- #include
- #include
- #include
---- showsys.c.orig
-+++ showsys.c
-@@ -80,7 +80,7 @@
- #include
- #include
- #include
--#include
-+#include
- #include
- #include
- #include
diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template
index 872a5e4755..df84c0b051 100644
--- a/srcpkgs/atop/template
+++ b/srcpkgs/atop/template
@@ -1,15 +1,15 @@
# Template file for 'atop'
pkgname=atop
-version=2.1
-revision=5
+version=2.3.0
+revision=1
build_style=gnu-makefile
makedepends="ncurses-devel zlib-devel"
short_desc="A system and process level monitor"
maintainer="Juan RP "
license="GPL-2"
homepage="http://www.atoptool.nl/"
-distfiles="http://www.atoptool.nl/download/atop-${version}-1.tar.gz"
-checksum=39a2d4febc338dd4147904b1496d1aa9513da0d22ad0602b66023452bdc7989f
+distfiles="http://www.atoptool.nl/download/atop-${version}.tar.gz"
+checksum=73e4725de0bafac8c63b032e8479e2305e3962afbe977ec1abd45f9e104eb264
pre_install() {
sed -i '/chown/d' Makefile
@@ -17,7 +17,7 @@ pre_install() {
sed -i 's,sbin,bin,g' Makefile
}
do_install() {
- make PREFIX=/usr SBINDIR=/usr/bin DESTDIR=${DESTDIR} install
+ make PREFIX=/usr SBINDIR=/usr/bin DESTDIR=${DESTDIR} sysvinstall
vsv atop
# Remove unused stuff.
rm -f ${DESTDIR}/usr/bin/atop{,sar}-${version}
diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template
index 514adebad3..03d8c04e8b 100644
--- a/srcpkgs/atril/template
+++ b/srcpkgs/atril/template
@@ -1,10 +1,10 @@
# Template file for 'atril'
pkgname=atril
-version=1.16.1
+version=1.18.0
revision=1
build_style=gnu-configure
build_options="gir"
-configure_args="--with-gtk=3.0 --disable-schemas-compile --enable-djvu
+configure_args="--disable-schemas-compile --enable-djvu
--enable-dvi --enable-t1lib --enable-pixbuf --enable-comics --enable-xps
--disable-static $(vopt_enable gir introspection)"
hostmakedepends="pkg-config intltool itstool glib-devel
@@ -19,7 +19,7 @@ maintainer="Juan RP "
license="GPL-2"
homepage="http://mate-desktop.org"
distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c74a5f8c8603fa5952efb4343f055677e4474f1907080be9658d4456d3dc092f
+checksum=c2284f17f7b683efa22615f00cf2768ea07667981d8304566e49c3d863de80fd
if [ -z "$CROSS_BUILD" ]; then
build_options_default="gir"
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 56b3812604..40261e94fb 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,7 +1,7 @@
# Template file for 'attic'
pkgname=attic
version=0.16
-revision=7
+revision=8
wrksrc="Attic-$version"
build_style=python3-module
hostmakedepends="python3-setuptools python3-devel libressl-devel python3-Sphinx"
diff --git a/srcpkgs/aubio/template b/srcpkgs/aubio/template
index 6a6ef5602b..7442e2a8aa 100644
--- a/srcpkgs/aubio/template
+++ b/srcpkgs/aubio/template
@@ -1,6 +1,6 @@
# Template file for 'aubio'
pkgname=aubio
-version=0.4.4
+version=0.4.5
revision=1
build_style=waf
# XXX lash, pure and swig support.
@@ -11,7 +11,7 @@ maintainer="Juan RP "
license="GPL-2"
homepage="http://aubio.org"
distfiles="${homepage}/pub/${pkgname}-${version}.tar.bz2"
-checksum=2acdb92623b9d4ba641c387760ffe3ec1e4c6ab498e64e5e2286c99e36ffbff8
+checksum=70c2804e6f4fbf0ebc0fb9ac8cc9d465ef4a4d438311c074c9a7364e98827af6
pre_configure() {
# disable tests to allow cross builds
diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template
index 8c5070e9aa..fa99ea30d5 100644
--- a/srcpkgs/audacious/template
+++ b/srcpkgs/audacious/template
@@ -1,7 +1,7 @@
# Template file for 'audacious'.
pkgname=audacious
version=3.8.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-thunar"
hostmakedepends="pkg-config glib-devel"
diff --git a/srcpkgs/audacity/patches/fix-musl.patch b/srcpkgs/audacity/patches/fix-musl.patch
deleted file mode 100644
index b078de3d34..0000000000
--- a/srcpkgs/audacity/patches/fix-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./src/effects/VST/VSTEffect.cpp.orig 2015-10-21 14:25:52.942716426 -0400
-+++ ./src/effects/VST/VSTEffect.cpp 2015-10-21 14:28:45.521711160 -0400
-@@ -2576,6 +2576,11 @@
- // symbols.
- //
- // Once we define a proper external API, the flags can be removed.
-+
-+#ifndef RTLD_DEEPBIND
-+#define RTLD_DEEPBIND 0
-+#endif
-+
- void *lib = dlopen((const char *)wxString(realPath).ToUTF8(), RTLD_NOW | RTLD_LOCAL | RTLD_DEEPBIND);
- if (!lib)
- {
diff --git a/srcpkgs/audacity/patches/fix-return_null.patch b/srcpkgs/audacity/patches/fix-return_null.patch
deleted file mode 100644
index 158117cd26..0000000000
--- a/srcpkgs/audacity/patches/fix-return_null.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/import/ImportFLAC.cpp 2016-01-08 23:05:48.000000000 +0100
-+++ src/import/ImportFLAC.cpp 2016-10-14 22:19:44.434290227 +0200
-@@ -296,7 +296,7 @@
- int cnt;
- wxFile binaryFile;
- if (!binaryFile.Open(filename)) {
-- return false; // File not found
-+ return NULL; // File not found
- }
-
- #ifdef USE_LIBID3TAG
-@@ -313,7 +313,7 @@
-
- if (cnt == wxInvalidOffset || strncmp(buf, FLAC_HEADER, 4) != 0) {
- // File is not a FLAC file
-- return false;
-+ return NULL;
- }
-
- // Open the file for import
diff --git a/srcpkgs/audacity/patches/fix-vamp-build.patch b/srcpkgs/audacity/patches/fix-vamp-build.patch
deleted file mode 100644
index 8bf946dbb0..0000000000
--- a/srcpkgs/audacity/patches/fix-vamp-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/effects/vamp/LoadVamp.cpp.orig
-+++ src/effects/vamp/LoadVamp.cpp
-@@ -266,7 +266,7 @@ Plugin *VampEffectsModule::FindPlugin(co
- Plugin *vp = PluginLoader::getInstance()->loadPlugin(key, 48000); // rate doesn't matter here
- if (!vp)
- {
-- return false;
-+ return 0;
- }
-
- // We limit the listed plugin outputs to those whose results can
diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template
index 3c613efc03..9b81278676 100644
--- a/srcpkgs/audacity/template
+++ b/srcpkgs/audacity/template
@@ -1,7 +1,7 @@
# Template file for 'audacity'
pkgname=audacity
-version=2.1.2
-revision=3
+version=2.1.3
+revision=1
wrksrc="${pkgname}-Audacity-${version}"
build_style=gnu-configure
configure_args="--with-libsamplerate"
@@ -11,11 +11,11 @@ makedepends="jack-devel wxWidgets-devel gtk+-devel expat-devel
vamp-plugin-sdk-devel lame-devel libid3tag-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Graphical cross-platform audio editor"
-maintainer="Christian Neukirchen "
+maintainer="Leah Neukirchen "
license="GPL-2"
homepage="http://audacityteam.org/"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/Audacity-${version}.tar.gz"
-checksum=90007b50cdc3885607b1afef2f158777a61c1658e869a88ec4d98c59c133f9bd
+checksum=cb30870b93c7f6f90b2ec70807ab6dcd9c3a3a29015478ae7b19af46d63bbd86
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) ;;
diff --git a/srcpkgs/autoconf-archive/template b/srcpkgs/autoconf-archive/template
index d65795254c..6fc58898a1 100644
--- a/srcpkgs/autoconf-archive/template
+++ b/srcpkgs/autoconf-archive/template
@@ -1,7 +1,7 @@
# Template file for 'autoconf-archive'
pkgname=autoconf-archive
-version=2016.09.16
-revision=3
+version=2017.03.21
+revision=1
noarch=yes
build_style=gnu-configure
depends="autoconf"
@@ -10,4 +10,4 @@ maintainer="Steve Prybylski "
license="GPL-3"
homepage="http://www.gnu.org/software/autoconf-archive/"
distfiles="http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=e8f2efd235f842bad2f6938bf4a72240a5e5fcd248e8444335e63beb60fabd82
+checksum=386ad455f12bdeb3a7d19280441a5ab77355142349200ff11040a8d9d455d765
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index 42d39f39f1..8ff68536b6 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
-version=2.6.18
-revision=2
+version=2.6.20
+revision=1
wrksrc="${pkgname}_${version}"
hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel yasm"
makedepends="alsa-lib-devel faac-devel faad2-devel gettext-devel jack-devel glu-devel
@@ -16,7 +16,7 @@ maintainer="Jürgen Buchmüller "
license="GPL-2"
homepage="http://avidemux.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/avidemux/avidemux/${version}/${pkgname}_${version}.tar.gz"
-checksum=340c66009ffbf41ae4a06c88e5d96c735d01576d152277216272c1c65167aafe
+checksum=03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f
if [ -z "$CROSS_BUILD" ]; then
# x265 can not be cross compiled
diff --git a/srcpkgs/avogadro/patches/glibc.patch b/srcpkgs/avogadro/patches/glibc.patch
new file mode 100644
index 0000000000..4d652af22c
--- /dev/null
+++ b/srcpkgs/avogadro/patches/glibc.patch
@@ -0,0 +1,18 @@
+--- libavogadro/src/extensions/symmetry/libmsym/src/orbital.c.orig
++++ libavogadro/src/extensions/symmetry/libmsym/src/orbital.c
+@@ -67,13 +67,13 @@
+ }
+ case 2 : {
+ //o->v = dpolynomial[m+l];
+- char *d = (signbit(m) == 1 ? "-" : "+");
++ char *d = (signbit(m*1.0) == 1 ? "-" : "+");
+ snprintf(o->name, sizeof(o->name), "%dd%d%s",n,abs(m),d);
+ break;
+ }
+ default : {
+ char t = 'f' - 3 + l;
+- char *d = (signbit(m) == 1 ? "-" : "+");
++ char *d = (signbit(m*1.0) == 1 ? "-" : "+");
+ snprintf(o->name, sizeof(o->name), "%d%c%d%s",n,t,abs(m),d);
+ }
+ }
diff --git a/srcpkgs/avogadro/template b/srcpkgs/avogadro/template
index 9591603aeb..6e0e552ad2 100644
--- a/srcpkgs/avogadro/template
+++ b/srcpkgs/avogadro/template
@@ -1,7 +1,7 @@
# Template file for 'avogadro'
pkgname=avogadro
version=1.2.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_TESTING:BOOL=OFF"
hostmakedepends="eigen2 pkg-config doxygen"
@@ -14,6 +14,9 @@ homepage="http://avogadro.cc"
distfiles="https://github.com/cryos/avogadro/archive/${version}.tar.gz"
checksum=6453e36e8ae3e61655cbe062df6d6fa6b2409122c7b5abc0a6f1d410a181640b
+pre_build() {
+ sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|g' CMakeLists.txt
+}
post_install() {
rm -rf ${DESTDIR}/usr/features
}
diff --git a/srcpkgs/awesome/template b/srcpkgs/awesome/template
index 7f094ef226..6cfed1a135 100644
--- a/srcpkgs/awesome/template
+++ b/srcpkgs/awesome/template
@@ -1,6 +1,6 @@
# Template file for 'awesome'
pkgname=awesome
-version=4.0
+version=4.1
revision=1
build_style=cmake
configure_args="-DSYSCONFDIR=/etc
@@ -20,7 +20,7 @@ maintainer="Juan RP "
license="GPL-2"
homepage="http://awesomewm.org"
distfiles="https://github.com/awesomeWM/awesome-releases/raw/master/${pkgname}-${version}.tar.xz"
-checksum=5c009730126fcef6bdcb6939084c9736fa02debbe28a5adc1b66297dcc67f333
+checksum=27a1db13ef4aa8e104a795e8c11c8611d75d8b0d864c277b8ef7c6f1ab6d04b8
pre_configure() {
# Russian manpages fail to build.
diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index 8a246ceba3..33373ba041 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,7 +1,7 @@
# Template file for 'axel'
pkgname=axel
version=2.12
-revision=1
+revision=2
wrksrc=${pkgname}-${version}${_patch}
build_style=gnu-configure
conf_files=/etc/axelrc
diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 13adf2077a..0b114ffa0c 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,7 +1,7 @@
# Template file for 'badvpn'
pkgname=badvpn
version=1.999.130
-revision=6
+revision=7
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libressl-devel nspr-devel nss-devel"
diff --git a/srcpkgs/balsa/template b/srcpkgs/balsa/template
index 51801d6afe..96933238a4 100644
--- a/srcpkgs/balsa/template
+++ b/srcpkgs/balsa/template
@@ -1,7 +1,7 @@
# Template file for 'balsa'.
pkgname=balsa
version=2.5.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--without-nm --without-gtkspell --without-gnome --with-ssl
--with-libsecret --with-gpgme --with-sqlite --with-html-widget=webkit"
diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 97660a0855..650f84ceb8 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,6 +1,6 @@
# Template file for 'baobab'
pkgname=baobab
-version=3.22.1
+version=3.24.0
revision=1
build_style=gnu-configure
configure_args="--disable-schemas-compile"
@@ -12,4 +12,4 @@ maintainer="Juan RP "
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=5bebcb1797888503d75c9985404e534940c211ffc37e5c7de09eed058dfc97ff
+checksum=5980e96df9f3d1751a969869ec07bc184ae3ad667d5a3eb06cf1297091fdfc3f
diff --git a/srcpkgs/base-files/files/vkpurge b/srcpkgs/base-files/files/vkpurge
index ea954322a2..50ee04f4d8 100644
--- a/srcpkgs/base-files/files/vkpurge
+++ b/srcpkgs/base-files/files/vkpurge
@@ -97,12 +97,6 @@ remove_kernel()
fi
}
-ARCH=$(uname -m)
-case "$ARCH" in
- i686*|x86_64*);;
- *) echo "vkpurge is x86 specific, exiting..."; exit 0;;
-esac
-
if [ "$1" = "list" ]; then
list_kernels
elif [ "$1" = "rm" ]; then
diff --git a/srcpkgs/base-files/files/vkpurge.8 b/srcpkgs/base-files/files/vkpurge.8
index 4ea9633b51..fcd56a055b 100644
--- a/srcpkgs/base-files/files/vkpurge.8
+++ b/srcpkgs/base-files/files/vkpurge.8
@@ -13,9 +13,8 @@
.Sh DESCRIPTION
The
.Nm
-command is used to properly remove old or unwanted kernels from an
-x86-based Void Linux system, by running the appropiate removal hooks
-and doing the removal.
+command is used to properly remove old or unwanted kernels from Void Linux
+systems, by running the appropiate removal hooks and doing the removal.
.Ss Justification
.Xr xbps-install 1
will leave old kernels in place when the kernel package gets upgraded, and
@@ -59,4 +58,5 @@ The following command will delete the kernels with version 2.6.39_2 and 4.3.4_1
.Xr xbps-install 1 ,
.Xr xbps-remove 1
.Sh BUGS
-There is no support as of yet for non-x86 platforms.
+There is no support as of yet for all kernels, specific series like rpi-kernel
+are not supported
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 1b9abb1ad2..0a743bd739 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
# Template file for 'base-files'
pkgname=base-files
version=0.139
-revision=6
+revision=7
bootstrap=yes
depends="xbps-triggers"
short_desc="Void Linux base system files"
diff --git a/srcpkgs/bash-preexec/template b/srcpkgs/bash-preexec/template
index 409415dfc7..d3ae03e1f0 100644
--- a/srcpkgs/bash-preexec/template
+++ b/srcpkgs/bash-preexec/template
@@ -5,7 +5,7 @@ revision=1
noarch=yes
depends="bash"
short_desc="Preexec and Precmd functions for Bash just like Zsh"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
license="MIT"
homepage="https://github.com/rcaloras/bash-preexec"
distfiles="https://github.com/rcaloras/bash-preexec/archive/${version}.tar.gz"
diff --git a/srcpkgs/bash/files/bash43-001 b/srcpkgs/bash/files/bash43-001
deleted file mode 100644
index ea1c6b2653..0000000000
--- a/srcpkgs/bash/files/bash43-001
+++ /dev/null
@@ -1,58 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-001
-
-Bug-Reported-by: NBaH
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00092.html
-
-Bug-Description:
-
-A missing check for a valid option prevented `test -R' from working. There
-is another problem that causes bash to look up the wrong variable name when
-processing the argument to `test -R'.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/test.c 2014-02-04 16:52:58.000000000 -0500
---- test.c 2014-02-28 21:22:44.000000000 -0500
-***************
-*** 647,652 ****
-
- case 'R':
-! v = find_variable (arg);
-! return (v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v) ? TRUE : FALSE);
- }
-
---- 647,652 ----
-
- case 'R':
-! v = find_variable_noref (arg);
-! return ((v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v)) ? TRUE : FALSE);
- }
-
-***************
-*** 724,727 ****
---- 724,728 ----
- case 'u': case 'v': case 'w': case 'x': case 'z':
- case 'G': case 'L': case 'O': case 'S': case 'N':
-+ case 'R':
- return (1);
- }
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 0
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 1
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-002 b/srcpkgs/bash/files/bash43-002
deleted file mode 100644
index 735b7b81a1..0000000000
--- a/srcpkgs/bash/files/bash43-002
+++ /dev/null
@@ -1,62 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-002
-
-Bug-Reported-by: Moe Tunes
-Bug-Reference-ID: <53103F49.3070100@gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00086.html
-
-Bug-Description:
-
-A change to save state while running the DEBUG trap caused pipelines to hang
-on systems which need process group synchronization while building pipelines.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/trap.c 2014-02-05 10:03:21.000000000 -0500
---- trap.c 2014-02-28 09:51:43.000000000 -0500
-***************
-*** 921,925 ****
-
- #if defined (JOB_CONTROL)
-! save_pipeline (1); /* XXX only provides one save level */
- #endif
-
---- 921,926 ----
-
- #if defined (JOB_CONTROL)
-! if (sig != DEBUG_TRAP) /* run_debug_trap does this */
-! save_pipeline (1); /* XXX only provides one save level */
- #endif
-
-***************
-*** 941,945 ****
-
- #if defined (JOB_CONTROL)
-! restore_pipeline (1);
- #endif
-
---- 942,947 ----
-
- #if defined (JOB_CONTROL)
-! if (sig != DEBUG_TRAP) /* run_debug_trap does this */
-! restore_pipeline (1);
- #endif
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 1
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 2
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-003 b/srcpkgs/bash/files/bash43-003
deleted file mode 100644
index 0f32f410d3..0000000000
--- a/srcpkgs/bash/files/bash43-003
+++ /dev/null
@@ -1,48 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-003
-
-Bug-Reported-by: Anatol Pomozov
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html
-
-Bug-Description:
-
-When in callback mode, some readline commands can cause readline to seg
-fault by passing invalid contexts to callback functions.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/lib/readline/readline.c 2013-10-28 14:58:06.000000000 -0400
---- lib/readline/readline.c 2014-03-10 14:15:02.000000000 -0400
-***************
-*** 745,749 ****
-
- RL_CHECK_SIGNALS ();
-! if (r == 0) /* success! */
- {
- _rl_keyseq_chain_dispose ();
---- 745,750 ----
-
- RL_CHECK_SIGNALS ();
-! /* We only treat values < 0 specially to simulate recursion. */
-! if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */
- {
- _rl_keyseq_chain_dispose ();
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 2
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 3
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-004 b/srcpkgs/bash/files/bash43-004
deleted file mode 100644
index 010f04a2a8..0000000000
--- a/srcpkgs/bash/files/bash43-004
+++ /dev/null
@@ -1,47 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-004
-
-Bug-Reported-by: Daan van Rossum
-Bug-Reference-ID: <20140307072523.GA14250@flash.uchicago.edu>
-Bug-Reference-URL:
-
-Bug-Description:
-
-The `.' command in vi mode cannot undo multi-key commands beginning with
-`c', `d', and `y' (command plus motion specifier).
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/lib/readline/readline.c 2013-10-28 14:58:06.000000000 -0400
---- lib/readline/readline.c 2014-03-07 15:20:33.000000000 -0500
-***************
-*** 965,969 ****
- if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
- key != ANYOTHERKEY &&
-! rl_key_sequence_length == 1 && /* XXX */
- _rl_vi_textmod_command (key))
- _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
---- 965,969 ----
- if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
- key != ANYOTHERKEY &&
-! _rl_dispatching_keymap == vi_movement_keymap &&
- _rl_vi_textmod_command (key))
- _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 3
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 4
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-005 b/srcpkgs/bash/files/bash43-005
deleted file mode 100644
index bcd40697cb..0000000000
--- a/srcpkgs/bash/files/bash43-005
+++ /dev/null
@@ -1,63 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-005
-
-Bug-Reported-by: David Sines
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00037.html
-
-Bug-Description:
-
-When in Posix mode, bash did not correctly interpret the ANSI-C-style
-$'...' quoting mechanism when performing pattern substitution word
-expansions within double quotes.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/parse.y 2014-02-11 09:42:10.000000000 -0500
---- parse.y 2014-03-07 20:57:15.000000000 -0500
-***************
-*** 3399,3403 ****
- unescaped double-quotes or single-quotes, if any, shall occur." */
- /* This was changed in Austin Group Interp 221 */
-! if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
- continue;
-
---- 3399,3403 ----
- unescaped double-quotes or single-quotes, if any, shall occur." */
- /* This was changed in Austin Group Interp 221 */
-! if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
- continue;
-
-*** ../bash-4.3/y.tab.c 2014-02-11 10:57:47.000000000 -0500
---- y.tab.c 2014-03-28 10:41:15.000000000 -0400
-***************
-*** 5711,5715 ****
- unescaped double-quotes or single-quotes, if any, shall occur." */
- /* This was changed in Austin Group Interp 221 */
-! if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
- continue;
-
---- 5711,5715 ----
- unescaped double-quotes or single-quotes, if any, shall occur." */
- /* This was changed in Austin Group Interp 221 */
-! if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
- continue;
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 4
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 5
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-006 b/srcpkgs/bash/files/bash43-006
deleted file mode 100644
index 24ff057a55..0000000000
--- a/srcpkgs/bash/files/bash43-006
+++ /dev/null
@@ -1,48 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-006
-
-Bug-Reported-by: Eduardo A . Bustamante Lopez
-Bug-Reference-ID: <20140228170013.GA16015@dualbus.me>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00091.html
-
-Bug-Description:
-
-A shell that started with job control active but was not interactive left
-the terminal in the wrong process group when exiting, causing its parent
-shell to get a stop signal when it attempted to read from the terminal.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/jobs.c 2014-01-10 09:05:34.000000000 -0500
---- jobs.c 2014-03-02 18:05:09.000000000 -0500
-***************
-*** 4375,4379 ****
- end_job_control ()
- {
-! if (interactive_shell) /* XXX - should it be interactive? */
- {
- terminate_stopped_jobs ();
---- 4375,4379 ----
- end_job_control ()
- {
-! if (interactive_shell || job_control) /* XXX - should it be just job_control? */
- {
- terminate_stopped_jobs ();
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 5
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 6
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-007 b/srcpkgs/bash/files/bash43-007
deleted file mode 100644
index 0d62c9ec6f..0000000000
--- a/srcpkgs/bash/files/bash43-007
+++ /dev/null
@@ -1,50 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-007
-
-Bug-Reported-by: geir.hauge@gmail.com
-Bug-Reference-ID: <20140318093650.B181C1C5B0B@gina.itea.ntnu.no>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00095.html
-
-Bug-Description:
-
-Using compound assignments for associative arrays like
-
-assoc=( [x]= [y]=bar )
-
-left the value corresponding to the key `x' NULL. This caused subsequent
-lookups to interpret it as unset.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/arrayfunc.c 2013-08-02 16:19:59.000000000 -0400
---- arrayfunc.c 2014-03-18 11:08:15.000000000 -0400
-***************
-*** 598,601 ****
---- 598,606 ----
- {
- val = expand_assignment_string_to_string (val, 0);
-+ if (val == 0)
-+ {
-+ val = (char *)xmalloc (1);
-+ val[0] = '\0'; /* like do_assignment_internal */
-+ }
- free_val = 1;
- }
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 6
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 7
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-008 b/srcpkgs/bash/files/bash43-008
deleted file mode 100644
index 0ae7c9522e..0000000000
--- a/srcpkgs/bash/files/bash43-008
+++ /dev/null
@@ -1,188 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-008
-
-Bug-Reported-by: Stephane Chazelas
-Bug-Reference-ID: <20140318135901.GB22158@chaz.gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00098.html
-
-Bug-Description:
-
-Some extended glob patterns incorrectly matched filenames with a leading
-dot, regardless of the setting of the `dotglob' option.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/lib/glob/gmisc.c 2013-10-28 14:45:25.000000000 -0400
---- lib/glob/gmisc.c 2014-03-19 09:16:08.000000000 -0400
-***************
-*** 211,214 ****
---- 211,215 ----
- case '!':
- case '@':
-+ case '?':
- return (pat[1] == LPAREN);
- default:
-*** ../bash-4.3/lib/glob/glob.c 2014-01-31 21:43:51.000000000 -0500
---- lib/glob/glob.c 2014-03-20 09:01:26.000000000 -0400
-***************
-*** 180,202 ****
- int flags;
- {
-! char *pp, *pe, *t;
-! int n, r;
-
- pp = pat + 2;
-! pe = pp + strlen (pp) - 1; /*(*/
-! if (*pe != ')')
-! return 0;
-! if ((t = strchr (pp, '|')) == 0) /* easy case first */
- {
- *pe = '\0';
- r = skipname (pp, dname, flags); /*(*/
- *pe = ')';
- return r;
- }
- while (t = glob_patscan (pp, pe, '|'))
- {
- n = t[-1];
- t[-1] = '\0';
- r = skipname (pp, dname, flags);
- t[-1] = n;
- if (r == 0) /* if any pattern says not skip, we don't skip */
---- 180,215 ----
- int flags;
- {
-! char *pp, *pe, *t, *se;
-! int n, r, negate;
-
-+ negate = *pat == '!';
- pp = pat + 2;
-! se = pp + strlen (pp) - 1; /* end of string */
-! pe = glob_patscan (pp, se, 0); /* end of extglob pattern (( */
-! /* we should check for invalid extglob pattern here */
-! /* if pe != se we have more of the pattern at the end of the extglob
-! pattern. Check the easy case first ( */
-! if (pe == se && *pe == ')' && (t = strchr (pp, '|')) == 0)
- {
- *pe = '\0';
-+ #if defined (HANDLE_MULTIBYTE)
-+ r = mbskipname (pp, dname, flags);
-+ #else
- r = skipname (pp, dname, flags); /*(*/
-+ #endif
- *pe = ')';
- return r;
- }
-+
-+ /* check every subpattern */
- while (t = glob_patscan (pp, pe, '|'))
- {
- n = t[-1];
- t[-1] = '\0';
-+ #if defined (HANDLE_MULTIBYTE)
-+ r = mbskipname (pp, dname, flags);
-+ #else
- r = skipname (pp, dname, flags);
-+ #endif
- t[-1] = n;
- if (r == 0) /* if any pattern says not skip, we don't skip */
-***************
-*** 205,219 ****
- } /*(*/
-
-! if (pp == pe) /* glob_patscan might find end of pattern */
- return r;
-
-! *pe = '\0';
-! # if defined (HANDLE_MULTIBYTE)
-! r = mbskipname (pp, dname, flags); /*(*/
-! # else
-! r = skipname (pp, dname, flags); /*(*/
-! # endif
-! *pe = ')';
-! return r;
- }
- #endif
---- 218,227 ----
- } /*(*/
-
-! /* glob_patscan might find end of pattern */
-! if (pp == se)
- return r;
-
-! /* but if it doesn't then we didn't match a leading dot */
-! return 0;
- }
- #endif
-***************
-*** 278,289 ****
- {
- #if EXTENDED_GLOB
-! wchar_t *pp, *pe, *t, n;
-! int r;
-
- pp = pat + 2;
-! pe = pp + wcslen (pp) - 1; /*(*/
-! if (*pe != L')')
-! return 0;
-! if ((t = wcschr (pp, L'|')) == 0)
- {
- *pe = L'\0';
---- 286,298 ----
- {
- #if EXTENDED_GLOB
-! wchar_t *pp, *pe, *t, n, *se;
-! int r, negate;
-
-+ negate = *pat == L'!';
- pp = pat + 2;
-! se = pp + wcslen (pp) - 1; /*(*/
-! pe = glob_patscan_wc (pp, se, 0);
-!
-! if (pe == se && *pe == ')' && (t = wcschr (pp, L'|')) == 0)
- {
- *pe = L'\0';
-***************
-*** 292,295 ****
---- 301,306 ----
- return r;
- }
-+
-+ /* check every subpattern */
- while (t = glob_patscan_wc (pp, pe, '|'))
- {
-***************
-*** 306,313 ****
- return r;
-
-! *pe = L'\0';
-! r = wchkname (pp, dname); /*(*/
-! *pe = L')';
-! return r;
- #else
- return (wchkname (pat, dname));
---- 317,322 ----
- return r;
-
-! /* but if it doesn't then we didn't match a leading dot */
-! return 0;
- #else
- return (wchkname (pat, dname));
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 7
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 8
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-009 b/srcpkgs/bash/files/bash43-009
deleted file mode 100644
index 015835cde5..0000000000
--- a/srcpkgs/bash/files/bash43-009
+++ /dev/null
@@ -1,64 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-009
-
-Bug-Reported-by: Matthias Klose
-Bug-Reference-ID: <53346FC8.6090005@debian.org>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00171.html
-
-Bug-Description:
-
-There is a problem with unsigned sign extension when attempting to reallocate
-the input line when it is fewer than 3 characters long and there has been a
-history expansion. The sign extension causes the shell to not reallocate the
-line, which results in a segmentation fault when it writes past the end.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/parse.y 2014-02-11 09:42:10.000000000 -0500
---- parse.y 2014-03-27 16:33:29.000000000 -0400
-***************
-*** 2425,2429 ****
- if (shell_input_line_terminator != EOF)
- {
-! if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3)
- shell_input_line = (char *)xrealloc (shell_input_line,
- 1 + (shell_input_line_size += 2));
---- 2425,2429 ----
- if (shell_input_line_terminator != EOF)
- {
-! if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size))
- shell_input_line = (char *)xrealloc (shell_input_line,
- 1 + (shell_input_line_size += 2));
-*** ../bash-4.3-patched/y.tab.c 2014-03-28 11:17:06.000000000 -0400
---- y.tab.c 2014-04-07 11:48:31.000000000 -0400
-***************
-*** 4737,4741 ****
- if (shell_input_line_terminator != EOF)
- {
-! if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3)
- shell_input_line = (char *)xrealloc (shell_input_line,
- 1 + (shell_input_line_size += 2));
---- 4737,4741 ----
- if (shell_input_line_terminator != EOF)
- {
-! if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size))
- shell_input_line = (char *)xrealloc (shell_input_line,
- 1 + (shell_input_line_size += 2));
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 8
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 9
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-010 b/srcpkgs/bash/files/bash43-010
deleted file mode 100644
index 835a96ead3..0000000000
--- a/srcpkgs/bash/files/bash43-010
+++ /dev/null
@@ -1,157 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-010
-
-Bug-Reported-by: Albert Shih
-Bug-Reference-ID: Wed, 5 Mar 2014 23:01:40 +0100
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00028.html
-
-Bug-Description:
-
-Patch (apply with `patch -p0'):
-
-This patch changes the behavior of programmable completion to compensate
-for two assumptions made by the bash-completion package. Bash-4.3 changed
-to dequote the argument to programmable completion only under certain
-circumstances, to make the behavior of compgen more consistent when run
-from the command line -- closer to the behavior when run by a shell function
-run as part of programmable completion. Bash-completion can pass quoted
-arguments to compgen when the original word to be completed was not quoted,
-expecting programmable completion to dequote the word before attempting
-completion.
-
-This patch fixes two cases:
-
-1. An empty string that bash-completion passes to compgen as a quoted null
- string ('').
-
-2. An unquoted word that bash-completion quotes using single quotes or
- backslashes before passing it to compgen.
-
-In these cases, since readline did not detect a quote character in the original
-word to be completed, bash-4.3
-
-*** ../bash-4.3/externs.h 2014-01-02 14:58:20.000000000 -0500
---- externs.h 2014-03-13 14:42:57.000000000 -0400
-***************
-*** 325,328 ****
---- 325,329 ----
- extern char *sh_backslash_quote_for_double_quotes __P((char *));
- extern int sh_contains_shell_metas __P((char *));
-+ extern int sh_contains_quotes __P((char *));
-
- /* declarations for functions defined in lib/sh/spell.c */
-*** ../bash-4.3/lib/sh/shquote.c 2013-03-31 21:53:32.000000000 -0400
---- lib/sh/shquote.c 2014-03-13 14:42:57.000000000 -0400
-***************
-*** 312,313 ****
---- 312,327 ----
- return (0);
- }
-+
-+ int
-+ sh_contains_quotes (string)
-+ char *string;
-+ {
-+ char *s;
-+
-+ for (s = string; s && *s; s++)
-+ {
-+ if (*s == '\'' || *s == '"' || *s == '\\')
-+ return 1;
-+ }
-+ return 0;
-+ }
-*** ../bash-4.3/pcomplete.c 2013-08-26 15:23:45.000000000 -0400
---- pcomplete.c 2014-03-25 17:23:23.000000000 -0400
-***************
-*** 184,187 ****
---- 184,188 ----
- COMPSPEC *pcomp_curcs;
- const char *pcomp_curcmd;
-+ const char *pcomp_curtxt;
-
- #ifdef DEBUG
-***************
-*** 754,757 ****
---- 755,784 ----
- dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
- }
-+ /* Intended to solve a mismatched assumption by bash-completion. If
-+ the text to be completed is empty, but bash-completion turns it into
-+ a quoted string ('') assuming that this code will dequote it before
-+ calling readline, do the dequoting. */
-+ else if (iscompgen && iscompleting &&
-+ pcomp_curtxt && *pcomp_curtxt == 0 &&
-+ text && (*text == '\'' || *text == '"') && text[1] == text[0] && text[2] == 0 &&
-+ rl_filename_dequoting_function)
-+ dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
-+ /* Another mismatched assumption by bash-completion. If compgen is being
-+ run as part of bash-completion, and the argument to compgen is not
-+ the same as the word originally passed to the programmable completion
-+ code, dequote the argument if it has quote characters. It's an
-+ attempt to detect when bash-completion is quoting its filename
-+ argument before calling compgen. */
-+ /* We could check whether gen_shell_function_matches is in the call
-+ stack by checking whether the gen-shell-function-matches tag is in
-+ the unwind-protect stack, but there's no function to do that yet.
-+ We could simply check whether we're executing in a function by
-+ checking variable_context, and may end up doing that. */
-+ else if (iscompgen && iscompleting && rl_filename_dequoting_function &&
-+ pcomp_curtxt && text &&
-+ STREQ (pcomp_curtxt, text) == 0 &&
-+ variable_context &&
-+ sh_contains_quotes (text)) /* guess */
-+ dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
- else
- dfn = savestring (text);
-***************
-*** 1523,1527 ****
- {
- COMPSPEC *cs, *oldcs;
-! const char *oldcmd;
- STRINGLIST *ret;
-
---- 1550,1554 ----
- {
- COMPSPEC *cs, *oldcs;
-! const char *oldcmd, *oldtxt;
- STRINGLIST *ret;
-
-***************
-*** 1546,1552 ****
---- 1573,1581 ----
- oldcs = pcomp_curcs;
- oldcmd = pcomp_curcmd;
-+ oldtxt = pcomp_curtxt;
-
- pcomp_curcs = cs;
- pcomp_curcmd = cmd;
-+ pcomp_curtxt = word;
-
- ret = gen_compspec_completions (cs, cmd, word, start, end, foundp);
-***************
-*** 1554,1557 ****
---- 1583,1587 ----
- pcomp_curcs = oldcs;
- pcomp_curcmd = oldcmd;
-+ pcomp_curtxt = oldtxt;
-
- /* We need to conditionally handle setting *retryp here */
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 9
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 10
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-011 b/srcpkgs/bash/files/bash43-011
deleted file mode 100644
index cdc1572eec..0000000000
--- a/srcpkgs/bash/files/bash43-011
+++ /dev/null
@@ -1,49 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-011
-
-Bug-Reported-by: Egmont Koblinger
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00153.html
-
-Bug-Description:
-
-The signal handling changes to bash and readline (to avoid running any code
-in a signal handler context) cause the cursor to be placed on the wrong
-line of a multi-line command after a ^C interrupts editing.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/lib/readline/display.c 2013-12-27 13:10:56.000000000 -0500
---- lib/readline/display.c 2014-03-27 11:52:45.000000000 -0400
-***************
-*** 2678,2682 ****
- if (_rl_echoing_p)
- {
-! _rl_move_vert (_rl_vis_botlin);
- _rl_vis_botlin = 0;
- fflush (rl_outstream);
---- 2678,2683 ----
- if (_rl_echoing_p)
- {
-! if (_rl_vis_botlin > 0) /* minor optimization plus bug fix */
-! _rl_move_vert (_rl_vis_botlin);
- _rl_vis_botlin = 0;
- fflush (rl_outstream);
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 10
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 11
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-012 b/srcpkgs/bash/files/bash43-012
deleted file mode 100644
index 176fa15bdb..0000000000
--- a/srcpkgs/bash/files/bash43-012
+++ /dev/null
@@ -1,43 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-012
-
-Bug-Reported-by: Eduardo A. Bustamante López
-Bug-Reference-ID: <5346B54C.4070205@case.edu>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00051.html
-
-Bug-Description:
-
-When a SIGCHLD trap runs a command containing a shell builtin while
-a script is running `wait' to wait for all running children to complete,
-the SIGCHLD trap will not be run once for each child that terminates.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/jobs.c 2014-03-28 10:54:19.000000000 -0400
---- jobs.c 2014-04-15 08:47:03.000000000 -0400
-***************
-*** 3598,3601 ****
---- 3598,3602 ----
- unwind_protect_pointer (the_pipeline);
- unwind_protect_pointer (subst_assign_varlist);
-+ unwind_protect_pointer (this_shell_builtin);
-
- /* We have to add the commands this way because they will be run
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 11
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 12
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-013 b/srcpkgs/bash/files/bash43-013
deleted file mode 100644
index 8f4006b489..0000000000
--- a/srcpkgs/bash/files/bash43-013
+++ /dev/null
@@ -1,66 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-013
-
-Bug-Reported-by:
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00069.html
-
-Bug-Description:
-
-Using reverse-i-search when horizontal scrolling is enabled does not redisplay
-the entire line containing the successful search results.
-
-Patch (apply with `patch -p0'):
-*** ../bash-4.3-patched/lib/readline/display.c 2014-04-08 18:19:36.000000000 -0400
---- lib/readline/display.c 2014-04-20 18:32:52.000000000 -0400
-***************
-*** 1638,1642 ****
- the spot of first difference is before the end of the invisible chars,
- lendiff needs to be adjusted. */
-! if (current_line == 0 && !_rl_horizontal_scroll_mode &&
- current_invis_chars != visible_wrap_offset)
- {
---- 1638,1642 ----
- the spot of first difference is before the end of the invisible chars,
- lendiff needs to be adjusted. */
-! if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
- current_invis_chars != visible_wrap_offset)
- {
-***************
-*** 1826,1831 ****
- _rl_last_c_pos += bytes_to_insert;
-
- if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
-! goto clear_rest_of_line;
- }
- }
---- 1826,1836 ----
- _rl_last_c_pos += bytes_to_insert;
-
-+ /* XXX - we only want to do this if we are at the end of the line
-+ so we move there with _rl_move_cursor_relative */
- if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
-! {
-! _rl_move_cursor_relative (ne-new, new);
-! goto clear_rest_of_line;
-! }
- }
- }
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 12
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 13
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-014 b/srcpkgs/bash/files/bash43-014
deleted file mode 100644
index f8371967f4..0000000000
--- a/srcpkgs/bash/files/bash43-014
+++ /dev/null
@@ -1,102 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-014
-
-Bug-Reported-by: Greg Wooledge
-Bug-Reference-ID: <20140418202123.GB7660@eeg.ccf.org>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/help-bash/2014-04/msg00004.html
-
-Bug-Description:
-
-Under certain circumstances, $@ is expanded incorrectly in contexts where
-word splitting is not performed.
-
-Patch (apply with `patch -p0'):
-*** ../bash-4.3-patched/subst.c 2014-01-23 16:26:37.000000000 -0500
---- subst.c 2014-04-19 15:41:26.000000000 -0400
-***************
-*** 3249,3254 ****
---- 3249,3256 ----
- return ((char *)NULL);
-
-+ expand_no_split_dollar_star = 1;
- w->flags |= W_NOSPLIT2;
- l = call_expand_word_internal (w, 0, 0, (int *)0, (int *)0);
-+ expand_no_split_dollar_star = 0;
- if (l)
- {
-***************
-*** 7848,7851 ****
---- 7850,7857 ----
- according to POSIX.2, this expands to a list of the positional
- parameters no matter what IFS is set to. */
-+ /* XXX - what to do when in a context where word splitting is not
-+ performed? Even when IFS is not the default, posix seems to imply
-+ that we behave like unquoted $* ? Maybe we should use PF_NOSPLIT2
-+ here. */
- temp = string_list_dollar_at (list, (pflags & PF_ASSIGNRHS) ? (quoted|Q_DOUBLE_QUOTES) : quoted);
-
-***************
-*** 8817,8820 ****
---- 8823,8827 ----
- {
- char *ifs_chars;
-+ char *tstring;
-
- ifs_chars = (quoted_dollar_at || has_dollar_at) ? ifs_value : (char *)NULL;
-***************
-*** 8831,8834 ****
---- 8838,8865 ----
- if (split_on_spaces)
- list = list_string (istring, " ", 1); /* XXX quoted == 1? */
-+ /* If we have $@ (has_dollar_at != 0) and we are in a context where we
-+ don't want to split the result (W_NOSPLIT2), and we are not quoted,
-+ we have already separated the arguments with the first character of
-+ $IFS. In this case, we want to return a list with a single word
-+ with the separator possibly replaced with a space (it's what other
-+ shells seem to do).
-+ quoted_dollar_at is internal to this function and is set if we are
-+ passed an argument that is unquoted (quoted == 0) but we encounter a
-+ double-quoted $@ while expanding it. */
-+ else if (has_dollar_at && quoted_dollar_at == 0 && ifs_chars && quoted == 0 && (word->flags & W_NOSPLIT2))
-+ {
-+ /* Only split and rejoin if we have to */
-+ if (*ifs_chars && *ifs_chars != ' ')
-+ {
-+ list = list_string (istring, *ifs_chars ? ifs_chars : " ", 1);
-+ tstring = string_list (list);
-+ }
-+ else
-+ tstring = istring;
-+ tword = make_bare_word (tstring);
-+ if (tstring != istring)
-+ free (tstring);
-+ goto set_word_flags;
-+ }
- else if (has_dollar_at && ifs_chars)
- list = list_string (istring, *ifs_chars ? ifs_chars : " ", 1);
-***************
-*** 8836,8839 ****
---- 8867,8871 ----
- {
- tword = make_bare_word (istring);
-+ set_word_flags:
- if ((quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)) || (quoted_state == WHOLLY_QUOTED))
- tword->flags |= W_QUOTED;
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 13
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 14
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-015 b/srcpkgs/bash/files/bash43-015
deleted file mode 100644
index 9c4e5ea48f..0000000000
--- a/srcpkgs/bash/files/bash43-015
+++ /dev/null
@@ -1,58 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-015
-
-Bug-Reported-by: Clark Wang
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00095.html
-
-Bug-Description:
-
-When completing directory names, the directory name is dequoted twice.
-This causes problems for directories with single and double quotes in
-their names.
-
-Patch (apply with `patch -p0'):
-*** ../bash-4.3-patched/bashline.c 2014-02-09 19:56:58.000000000 -0500
---- bashline.c 2014-04-25 14:57:52.000000000 -0400
-***************
-*** 4168,4174 ****
-
- qc = rl_dispatching ? rl_completion_quote_character : 0;
-! dfn = bash_dequote_filename ((char *)text, qc);
- m1 = rl_completion_matches (dfn, rl_filename_completion_function);
-! free (dfn);
-
- if (m1 == 0 || m1[0] == 0)
---- 4209,4222 ----
-
- qc = rl_dispatching ? rl_completion_quote_character : 0;
-! /* If rl_completion_found_quote != 0, rl_completion_matches will call the
-! filename dequoting function, causing the directory name to be dequoted
-! twice. */
-! if (rl_dispatching && rl_completion_found_quote == 0)
-! dfn = bash_dequote_filename ((char *)text, qc);
-! else
-! dfn = (char *)text;
- m1 = rl_completion_matches (dfn, rl_filename_completion_function);
-! if (dfn != text)
-! free (dfn);
-
- if (m1 == 0 || m1[0] == 0)
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 14
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 15
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-016 b/srcpkgs/bash/files/bash43-016
deleted file mode 100644
index 882d5939b0..0000000000
--- a/srcpkgs/bash/files/bash43-016
+++ /dev/null
@@ -1,132 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-016
-
-Bug-Reported-by: Pierre Gaston
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00100.html
-
-Bug-Description:
-
-An extended glob pattern containing a slash (`/') causes the globbing code
-to misinterpret it as a directory separator.
-
-Patch (apply with `patch -p0'):
-*** ../bash-4.3-patched/lib/glob/glob.c 2014-03-28 10:54:23.000000000 -0400
---- lib/glob/glob.c 2014-05-02 10:24:28.000000000 -0400
-***************
-*** 124,127 ****
---- 124,129 ----
- extern wchar_t *glob_patscan_wc __P((wchar_t *, wchar_t *, int));
-
-+ extern char *glob_dirscan __P((char *, int));
-+
- /* Compile `glob_loop.c' for single-byte characters. */
- #define CHAR unsigned char
-***************
-*** 188,191 ****
---- 190,196 ----
- pe = glob_patscan (pp, se, 0); /* end of extglob pattern (( */
- /* we should check for invalid extglob pattern here */
-+ if (pe == 0)
-+ return 0;
-+
- /* if pe != se we have more of the pattern at the end of the extglob
- pattern. Check the easy case first ( */
-***************
-*** 1016,1020 ****
- char **result;
- unsigned int result_size;
-! char *directory_name, *filename, *dname;
- unsigned int directory_len;
- int free_dirname; /* flag */
---- 1021,1025 ----
- char **result;
- unsigned int result_size;
-! char *directory_name, *filename, *dname, *fn;
- unsigned int directory_len;
- int free_dirname; /* flag */
-***************
-*** 1032,1035 ****
---- 1037,1052 ----
- /* Find the filename. */
- filename = strrchr (pathname, '/');
-+ #if defined (EXTENDED_GLOB)
-+ if (filename && extended_glob)
-+ {
-+ fn = glob_dirscan (pathname, '/');
-+ #if DEBUG_MATCHING
-+ if (fn != filename)
-+ fprintf (stderr, "glob_filename: glob_dirscan: fn (%s) != filename (%s)\n", fn ? fn : "(null)", filename);
-+ #endif
-+ filename = fn;
-+ }
-+ #endif
-+
- if (filename == NULL)
- {
-*** ../bash-4.3-patched/lib/glob/gmisc.c 2014-03-28 10:54:23.000000000 -0400
---- lib/glob/gmisc.c 2014-05-02 09:35:57.000000000 -0400
-***************
-*** 43,46 ****
---- 43,48 ----
- #define WRPAREN L')'
-
-+ extern char *glob_patscan __P((char *, char *, int));
-+
- /* Return 1 of the first character of WSTRING could match the first
- character of pattern WPAT. Wide character version. */
-***************
-*** 376,377 ****
---- 378,410 ----
- return matlen;
- }
-+
-+ /* Skip characters in PAT and return the final occurrence of DIRSEP. This
-+ is only called when extended_glob is set, so we have to skip over extglob
-+ patterns x(...) */
-+ char *
-+ glob_dirscan (pat, dirsep)
-+ char *pat;
-+ int dirsep;
-+ {
-+ char *p, *d, *pe, *se;
-+
-+ d = pe = se = 0;
-+ for (p = pat; p && *p; p++)
-+ {
-+ if (extglob_pattern_p (p))
-+ {
-+ if (se == 0)
-+ se = p + strlen (p) - 1;
-+ pe = glob_patscan (p + 2, se, 0);
-+ if (pe == 0)
-+ continue;
-+ else if (*pe == 0)
-+ break;
-+ p = pe - 1; /* will do increment above */
-+ continue;
-+ }
-+ if (*p == dirsep)
-+ d = p;
-+ }
-+ return d;
-+ }
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 15
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 16
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-017 b/srcpkgs/bash/files/bash43-017
deleted file mode 100644
index 4016fb934e..0000000000
--- a/srcpkgs/bash/files/bash43-017
+++ /dev/null
@@ -1,51 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-017
-
-Bug-Reported-by: Dan Douglas
-Bug-Reference-ID: <7781746.RhfoTROLxF@smorgbox>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-05/msg00026.html
-
-Bug-Description:
-
-The code that creates local variables should not clear the `invisible'
-attribute when returning an existing local variable. Let the code that
-actually assigns a value clear it.
-
-Patch (apply with `patch -p0'):
-*** ../bash-4.3-patched/variables.c 2014-02-14 11:55:12.000000000 -0500
---- variables.c 2014-05-07 10:53:57.000000000 -0400
-***************
-*** 2198,2205 ****
- old_var = find_variable (name);
- if (old_var && local_p (old_var) && old_var->context == variable_context)
-! {
-! VUNSETATTR (old_var, att_invisible); /* XXX */
-! return (old_var);
-! }
-
- was_tmpvar = old_var && tempvar_p (old_var);
---- 2260,2264 ----
- old_var = find_variable (name);
- if (old_var && local_p (old_var) && old_var->context == variable_context)
-! return (old_var);
-
- was_tmpvar = old_var && tempvar_p (old_var);
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 16
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 17
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-018 b/srcpkgs/bash/files/bash43-018
deleted file mode 100644
index 39499f6637..0000000000
--- a/srcpkgs/bash/files/bash43-018
+++ /dev/null
@@ -1,44 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-018
-
-Bug-Reported-by: Geir Hauge
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-05/msg00040.html
-
-Bug-Description:
-
-When assigning an array variable using the compound assignment syntax,
-but using `declare' with the rhs of the compound assignment quoted, the
-shell did not mark the variable as visible after successfully performing
-the assignment.
-
-Patch (apply with `patch -p0'):
-*** ../bash-4.3-patched/arrayfunc.c 2014-03-28 10:54:21.000000000 -0400
---- arrayfunc.c 2014-05-12 11:19:00.000000000 -0400
-***************
-*** 180,183 ****
---- 180,184 ----
- FREE (newval);
-
-+ VUNSETATTR (entry, att_invisible); /* no longer invisible */
- return (entry);
- }
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 17
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 18
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-019 b/srcpkgs/bash/files/bash43-019
deleted file mode 100644
index a93714bebc..0000000000
--- a/srcpkgs/bash/files/bash43-019
+++ /dev/null
@@ -1,84 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-019
-
-Bug-Reported-by: John Lenton
-Bug-Reference-ID:
-Bug-Reference-URL: https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1317476
-
-Bug-Description:
-
-The -t timeout option to `read' does not work when the -e option is used.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/lib/readline/input.c 2014-01-10 15:07:08.000000000 -0500
---- lib/readline/input.c 2014-05-22 18:40:59.000000000 -0400
-***************
-*** 535,540 ****
---- 538,551 ----
- else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM)
- return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
-+ /* keyboard-generated signals of interest */
- else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT)
- RL_CHECK_SIGNALS ();
-+ /* non-keyboard-generated signals of interest */
-+ else if (_rl_caught_signal == SIGALRM
-+ #if defined (SIGVTALRM)
-+ || _rl_caught_signal == SIGVTALRM
-+ #endif
-+ )
-+ RL_CHECK_SIGNALS ();
-
- if (rl_signal_event_hook)
-*** ../bash-4.3-patched/builtins/read.def 2013-09-02 11:54:00.000000000 -0400
---- builtins/read.def 2014-05-08 11:43:35.000000000 -0400
-***************
-*** 443,447 ****
- #if defined (READLINE)
- if (edit)
-! add_unwind_protect (reset_attempted_completion_function, (char *)NULL);
- #endif
- falarm (tmsec, tmusec);
---- 443,450 ----
- #if defined (READLINE)
- if (edit)
-! {
-! add_unwind_protect (reset_attempted_completion_function, (char *)NULL);
-! add_unwind_protect (bashline_reset_event_hook, (char *)NULL);
-! }
- #endif
- falarm (tmsec, tmusec);
-***************
-*** 1022,1025 ****
---- 1025,1029 ----
- old_attempted_completion_function = rl_attempted_completion_function;
- rl_attempted_completion_function = (rl_completion_func_t *)NULL;
-+ bashline_set_event_hook ();
- if (itext)
- {
-***************
-*** 1033,1036 ****
---- 1037,1041 ----
- rl_attempted_completion_function = old_attempted_completion_function;
- old_attempted_completion_function = (rl_completion_func_t *)NULL;
-+ bashline_reset_event_hook ();
-
- if (ret == 0)
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 18
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 19
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-020 b/srcpkgs/bash/files/bash43-020
deleted file mode 100644
index 5f533ef8d9..0000000000
--- a/srcpkgs/bash/files/bash43-020
+++ /dev/null
@@ -1,110 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-020
-
-Bug-Reported-by: Jared Yanovich
-Bug-Reference-ID: <20140417073654.GB26875@nightderanger.psc.edu>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00065.html
-
-Bug-Description:
-
-When PS2 contains a command substitution, here-documents entered in an
-interactive shell can sometimes cause a segmentation fault.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/shell.h 2012-12-25 21:11:01.000000000 -0500
---- shell.h 2014-06-03 09:24:28.000000000 -0400
-***************
-*** 169,173 ****
- int expand_aliases;
- int echo_input_at_read;
-!
- } sh_parser_state_t;
-
---- 169,174 ----
- int expand_aliases;
- int echo_input_at_read;
-! int need_here_doc;
-!
- } sh_parser_state_t;
-
-*** ../bash-4.3-patched/parse.y 2014-05-14 09:16:40.000000000 -0400
---- parse.y 2014-04-30 09:27:59.000000000 -0400
-***************
-*** 2643,2647 ****
-
- r = 0;
-! while (need_here_doc)
- {
- parser_state |= PST_HEREDOC;
---- 2643,2647 ----
-
- r = 0;
-! while (need_here_doc > 0)
- {
- parser_state |= PST_HEREDOC;
-***************
-*** 6076,6079 ****
---- 6076,6080 ----
- ps->expand_aliases = expand_aliases;
- ps->echo_input_at_read = echo_input_at_read;
-+ ps->need_here_doc = need_here_doc;
-
- ps->token = token;
-***************
-*** 6124,6127 ****
---- 6125,6129 ----
- expand_aliases = ps->expand_aliases;
- echo_input_at_read = ps->echo_input_at_read;
-+ need_here_doc = ps->need_here_doc;
-
- FREE (token);
-*** ../bash-4.3-patched/y.tab.c 2014-04-07 11:56:12.000000000 -0400
---- y.tab.c 2014-07-30 09:55:57.000000000 -0400
-***************
-*** 4955,4959 ****
-
- r = 0;
-! while (need_here_doc)
- {
- parser_state |= PST_HEREDOC;
---- 5151,5155 ----
-
- r = 0;
-! while (need_here_doc > 0)
- {
- parser_state |= PST_HEREDOC;
-***************
-*** 8388,8391 ****
---- 8584,8588 ----
- ps->expand_aliases = expand_aliases;
- ps->echo_input_at_read = echo_input_at_read;
-+ ps->need_here_doc = need_here_doc;
-
- ps->token = token;
-***************
-*** 8436,8439 ****
---- 8633,8637 ----
- expand_aliases = ps->expand_aliases;
- echo_input_at_read = ps->echo_input_at_read;
-+ need_here_doc = ps->need_here_doc;
-
- FREE (token);
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 19
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 20
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-021 b/srcpkgs/bash/files/bash43-021
deleted file mode 100644
index fd1c945ec1..0000000000
--- a/srcpkgs/bash/files/bash43-021
+++ /dev/null
@@ -1,52 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-021
-
-Bug-Reported-by: Jared Yanovich
-Bug-Reference-ID: <20140625225019.GJ17044@nightderanger.psc.edu>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00070.html
-
-Bug-Description:
-
-When the readline `revert-all-at-newline' option is set, pressing newline
-when the current line is one retrieved from history results in a double free
-and a segmentation fault.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/lib/readline/misc.c 2012-09-01 18:03:11.000000000 -0400
---- lib/readline/misc.c 2014-06-30 13:41:19.000000000 -0400
-***************
-*** 462,465 ****
---- 462,466 ----
- /* Set up rl_line_buffer and other variables from history entry */
- rl_replace_from_history (entry, 0); /* entry->line is now current */
-+ entry->data = 0; /* entry->data is now current undo list */
- /* Undo all changes to this history entry */
- while (rl_undo_list)
-***************
-*** 469,473 ****
- FREE (entry->line);
- entry->line = savestring (rl_line_buffer);
-- entry->data = 0;
- }
- entry = previous_history ();
---- 470,473 ----
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 20
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 21
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-022 b/srcpkgs/bash/files/bash43-022
deleted file mode 100644
index 7ce39ec0a2..0000000000
--- a/srcpkgs/bash/files/bash43-022
+++ /dev/null
@@ -1,56 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-022
-
-Bug-Reported-by: scorp.dev.null@gmail.com
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00061.html
-
-Bug-Description:
-
-Using nested pipelines within loops with the `lastpipe' option set can result
-in a segmentation fault.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/execute_cmd.c 2014-01-31 10:54:52.000000000 -0500
---- execute_cmd.c 2014-06-19 08:05:49.000000000 -0400
-***************
-*** 2410,2414 ****
- lstdin = wait_for (lastpid);
- #if defined (JOB_CONTROL)
-! exec_result = job_exit_status (lastpipe_jid);
- #endif
- unfreeze_jobs_list ();
---- 2425,2438 ----
- lstdin = wait_for (lastpid);
- #if defined (JOB_CONTROL)
-! /* If wait_for removes the job from the jobs table, use result of last
-! command as pipeline's exit status as usual. The jobs list can get
-! frozen and unfrozen at inconvenient times if there are multiple pipelines
-! running simultaneously. */
-! if (INVALID_JOB (lastpipe_jid) == 0)
-! exec_result = job_exit_status (lastpipe_jid);
-! else if (pipefail_opt)
-! exec_result = exec_result | lstdin; /* XXX */
-! /* otherwise we use exec_result */
-!
- #endif
- unfreeze_jobs_list ();
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 21
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 22
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-023 b/srcpkgs/bash/files/bash43-023
deleted file mode 100644
index d1e4e9d7c7..0000000000
--- a/srcpkgs/bash/files/bash43-023
+++ /dev/null
@@ -1,104 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-023
-
-Bug-Reported-by: Tim Friske
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00056.html
-
-Bug-Description:
-
-Bash does not correctly parse process substitution constructs that contain
-unbalanced parentheses as part of the contained command.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/subst.h 2014-01-11 21:02:27.000000000 -0500
---- subst.h 2014-07-20 17:25:01.000000000 -0400
-***************
-*** 83,87 ****
- Start extracting at (SINDEX) as if we had just seen "<(".
- Make (SINDEX) get the position just after the matching ")". */
-! extern char *extract_process_subst __P((char *, char *, int *));
- #endif /* PROCESS_SUBSTITUTION */
-
---- 83,87 ----
- Start extracting at (SINDEX) as if we had just seen "<(".
- Make (SINDEX) get the position just after the matching ")". */
-! extern char *extract_process_subst __P((char *, char *, int *, int));
- #endif /* PROCESS_SUBSTITUTION */
-
-*** ../bash-4.3-patched/subst.c 2014-05-15 08:26:45.000000000 -0400
---- subst.c 2014-07-20 17:26:44.000000000 -0400
-***************
-*** 1193,1202 ****
- Make (SINDEX) get the position of the matching ")". */ /*))*/
- char *
-! extract_process_subst (string, starter, sindex)
- char *string;
- char *starter;
- int *sindex;
- {
- return (extract_delimited_string (string, sindex, starter, "(", ")", SX_COMMAND));
- }
- #endif /* PROCESS_SUBSTITUTION */
---- 1193,1208 ----
- Make (SINDEX) get the position of the matching ")". */ /*))*/
- char *
-! extract_process_subst (string, starter, sindex, xflags)
- char *string;
- char *starter;
- int *sindex;
-+ int xflags;
- {
-+ #if 0
- return (extract_delimited_string (string, sindex, starter, "(", ")", SX_COMMAND));
-+ #else
-+ xflags |= (no_longjmp_on_fatal_error ? SX_NOLONGJMP : 0);
-+ return (xparse_dolparen (string, string+*sindex, sindex, xflags));
-+ #endif
- }
- #endif /* PROCESS_SUBSTITUTION */
-***************
-*** 1786,1790 ****
- if (string[si] == '\0')
- CQ_RETURN(si);
-! temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si);
- free (temp); /* no SX_ALLOC here */
- i = si;
---- 1792,1796 ----
- if (string[si] == '\0')
- CQ_RETURN(si);
-! temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si, 0);
- free (temp); /* no SX_ALLOC here */
- i = si;
-***************
-*** 8250,8254 ****
- t_index = sindex + 1; /* skip past both '<' and LPAREN */
-
-! temp1 = extract_process_subst (string, (c == '<') ? "<(" : ">(", &t_index); /*))*/
- sindex = t_index;
-
---- 8256,8260 ----
- t_index = sindex + 1; /* skip past both '<' and LPAREN */
-
-! temp1 = extract_process_subst (string, (c == '<') ? "<(" : ">(", &t_index, 0); /*))*/
- sindex = t_index;
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 22
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 23
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-024 b/srcpkgs/bash/files/bash43-024
deleted file mode 100644
index a24b8fbbca..0000000000
--- a/srcpkgs/bash/files/bash43-024
+++ /dev/null
@@ -1,54 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-024
-
-Bug-Reported-by: Corentin Peuvrel
-Bug-Reference-ID: <53CE9E5D.6050203@pom-monitoring.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-07/msg00021.html
-
-Bug-Description:
-
-Indirect variable references do not work correctly if the reference
-variable expands to an array reference using a subscript other than 0
-(e.g., foo='bar[1]' ; echo ${!foo}).
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/subst.c 2014-06-03 09:32:44.000000000 -0400
---- subst.c 2014-07-23 09:58:19.000000000 -0400
-***************
-*** 7375,7379 ****
-
- if (want_indir)
-! tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
- else
- tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind);
---- 7445,7455 ----
-
- if (want_indir)
-! {
-! tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
-! /* Turn off the W_ARRAYIND flag because there is no way for this function
-! to return the index we're supposed to be using. */
-! if (tdesc && tdesc->flags)
-! tdesc->flags &= ~W_ARRAYIND;
-! }
- else
- tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind);
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 23
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 24
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-025 b/srcpkgs/bash/files/bash43-025
deleted file mode 100644
index 721aca0307..0000000000
--- a/srcpkgs/bash/files/bash43-025
+++ /dev/null
@@ -1,123 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-025
-
-Bug-Reported-by: Stephane Chazelas
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-Under certain circumstances, bash will execute user code while processing the
-environment for exported function definitions.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/builtins/common.h 2013-07-08 16:54:47.000000000 -0400
---- builtins/common.h 2014-09-12 14:25:47.000000000 -0400
-***************
-*** 34,37 ****
---- 49,54 ----
- #define SEVAL_PARSEONLY 0x020
- #define SEVAL_NOLONGJMP 0x040
-+ #define SEVAL_FUNCDEF 0x080 /* only allow function definitions */
-+ #define SEVAL_ONECMD 0x100 /* only allow a single command */
-
- /* Flags for describe_command, shared between type.def and command.def */
-*** ../bash-4.3-patched/builtins/evalstring.c 2014-02-11 09:42:10.000000000 -0500
---- builtins/evalstring.c 2014-09-14 14:15:13.000000000 -0400
-***************
-*** 309,312 ****
---- 313,324 ----
- struct fd_bitmap *bitmap;
-
-+ if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
-+ {
-+ internal_warning ("%s: ignoring function definition attempt", from_file);
-+ should_jump_to_top_level = 0;
-+ last_result = last_command_exit_value = EX_BADUSAGE;
-+ break;
-+ }
-+
- bitmap = new_fd_bitmap (FD_BITMAP_SIZE);
- begin_unwind_frame ("pe_dispose");
-***************
-*** 369,372 ****
---- 381,387 ----
- dispose_fd_bitmap (bitmap);
- discard_unwind_frame ("pe_dispose");
-+
-+ if (flags & SEVAL_ONECMD)
-+ break;
- }
- }
-*** ../bash-4.3-patched/variables.c 2014-05-15 08:26:50.000000000 -0400
---- variables.c 2014-09-14 14:23:35.000000000 -0400
-***************
-*** 359,369 ****
- strcpy (temp_string + char_index + 1, string);
-
-! if (posixly_correct == 0 || legal_identifier (name))
-! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST);
-!
-! /* Ancient backwards compatibility. Old versions of bash exported
-! functions like name()=() {...} */
-! if (name[char_index - 1] == ')' && name[char_index - 2] == '(')
-! name[char_index - 2] = '\0';
-
- if (temp_var = find_function (name))
---- 364,372 ----
- strcpy (temp_string + char_index + 1, string);
-
-! /* Don't import function names that are invalid identifiers from the
-! environment, though we still allow them to be defined as shell
-! variables. */
-! if (legal_identifier (name))
-! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
-
- if (temp_var = find_function (name))
-***************
-*** 382,389 ****
- report_error (_("error importing function definition for `%s'"), name);
- }
--
-- /* ( */
-- if (name[char_index - 1] == ')' && name[char_index - 2] == '\0')
-- name[char_index - 2] = '('; /* ) */
- }
- #if defined (ARRAY_VARS)
---- 385,388 ----
-*** ../bash-4.3-patched/subst.c 2014-08-11 11:16:35.000000000 -0400
---- subst.c 2014-09-12 15:31:04.000000000 -0400
-***************
-*** 8048,8052 ****
- goto return0;
- }
-! else if (var = find_variable_last_nameref (temp1))
- {
- temp = nameref_cell (var);
---- 8118,8124 ----
- goto return0;
- }
-! else if (var && (invisible_p (var) || var_isset (var) == 0))
-! temp = (char *)NULL;
-! else if ((var = find_variable_last_nameref (temp1)) && var_isset (var) && invisible_p (var) == 0)
- {
- temp = nameref_cell (var);
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 24
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 25
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-026 b/srcpkgs/bash/files/bash43-026
deleted file mode 100644
index d5d5b1dd04..0000000000
--- a/srcpkgs/bash/files/bash43-026
+++ /dev/null
@@ -1,60 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-026
-
-Bug-Reported-by: Tavis Ormandy
-Bug-Reference-ID:
-Bug-Reference-URL: http://twitter.com/taviso/statuses/514887394294652929
-
-Bug-Description:
-
-Under certain circumstances, bash can incorrectly save a lookahead character and
-return it on a subsequent call, even when reading a new line.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3.25/parse.y 2014-07-30 10:14:31.000000000 -0400
---- parse.y 2014-09-25 20:20:21.000000000 -0400
-***************
-*** 2954,2957 ****
---- 2954,2959 ----
- word_desc_to_read = (WORD_DESC *)NULL;
-
-+ eol_ungetc_lookahead = 0;
-+
- current_token = '\n'; /* XXX */
- last_read_token = '\n';
-*** ../bash-4.3.25/y.tab.c 2014-07-30 10:14:32.000000000 -0400
---- y.tab.c 2014-09-25 20:21:48.000000000 -0400
-***************
-*** 5266,5269 ****
---- 5266,5271 ----
- word_desc_to_read = (WORD_DESC *)NULL;
-
-+ eol_ungetc_lookahead = 0;
-+
- current_token = '\n'; /* XXX */
- last_read_token = '\n';
-***************
-*** 8540,8542 ****
- }
- #endif /* HANDLE_MULTIBYTE */
--
---- 8542,8543 ----
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 25
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 26
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-027 b/srcpkgs/bash/files/bash43-027
deleted file mode 100644
index ef48bd82da..0000000000
--- a/srcpkgs/bash/files/bash43-027
+++ /dev/null
@@ -1,221 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-027
-
-Bug-Reported-by: Florian Weimer
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-This patch changes the encoding bash uses for exported functions to avoid
-clashes with shell variables and to avoid depending only on an environment
-variable's contents to determine whether or not to interpret it as a shell
-function.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3.26/variables.c 2014-09-25 23:02:18.000000000 -0400
---- variables.c 2014-09-27 20:52:04.000000000 -0400
-***************
-*** 84,87 ****
---- 84,92 ----
- #define ifsname(s) ((s)[0] == 'I' && (s)[1] == 'F' && (s)[2] == 'S' && (s)[3] == '\0')
-
-+ #define BASHFUNC_PREFIX "BASH_FUNC_"
-+ #define BASHFUNC_PREFLEN 10 /* == strlen(BASHFUNC_PREFIX */
-+ #define BASHFUNC_SUFFIX "%%"
-+ #define BASHFUNC_SUFFLEN 2 /* == strlen(BASHFUNC_SUFFIX) */
-+
- extern char **environ;
-
-***************
-*** 280,284 ****
- static void dispose_temporary_env __P((sh_free_func_t *));
-
-! static inline char *mk_env_string __P((const char *, const char *));
- static char **make_env_array_from_var_list __P((SHELL_VAR **));
- static char **make_var_export_array __P((VAR_CONTEXT *));
---- 285,289 ----
- static void dispose_temporary_env __P((sh_free_func_t *));
-
-! static inline char *mk_env_string __P((const char *, const char *, int));
- static char **make_env_array_from_var_list __P((SHELL_VAR **));
- static char **make_var_export_array __P((VAR_CONTEXT *));
-***************
-*** 350,369 ****
- /* If exported function, define it now. Don't import functions from
- the environment in privileged mode. */
-! if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4))
- {
- string_length = strlen (string);
-! temp_string = (char *)xmalloc (3 + string_length + char_index);
-
-! strcpy (temp_string, name);
-! temp_string[char_index] = ' ';
-! strcpy (temp_string + char_index + 1, string);
-
- /* Don't import function names that are invalid identifiers from the
- environment, though we still allow them to be defined as shell
- variables. */
-! if (legal_identifier (name))
-! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
-
-! if (temp_var = find_function (name))
- {
- VSETATTR (temp_var, (att_exported|att_imported));
---- 355,385 ----
- /* If exported function, define it now. Don't import functions from
- the environment in privileged mode. */
-! if (privmode == 0 && read_but_dont_execute == 0 &&
-! STREQN (BASHFUNC_PREFIX, name, BASHFUNC_PREFLEN) &&
-! STREQ (BASHFUNC_SUFFIX, name + char_index - BASHFUNC_SUFFLEN) &&
-! STREQN ("() {", string, 4))
- {
-+ size_t namelen;
-+ char *tname; /* desired imported function name */
-+
-+ namelen = char_index - BASHFUNC_PREFLEN - BASHFUNC_SUFFLEN;
-+
-+ tname = name + BASHFUNC_PREFLEN; /* start of func name */
-+ tname[namelen] = '\0'; /* now tname == func name */
-+
- string_length = strlen (string);
-! temp_string = (char *)xmalloc (namelen + string_length + 2);
-
-! memcpy (temp_string, tname, namelen);
-! temp_string[namelen] = ' ';
-! memcpy (temp_string + namelen + 1, string, string_length + 1);
-
- /* Don't import function names that are invalid identifiers from the
- environment, though we still allow them to be defined as shell
- variables. */
-! if (absolute_program (tname) == 0 && (posixly_correct == 0 || legal_identifier (tname)))
-! parse_and_execute (temp_string, tname, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
-
-! if (temp_var = find_function (tname))
- {
- VSETATTR (temp_var, (att_exported|att_imported));
-***************
-*** 378,383 ****
- }
- last_command_exit_value = 1;
-! report_error (_("error importing function definition for `%s'"), name);
- }
- }
- #if defined (ARRAY_VARS)
---- 394,402 ----
- }
- last_command_exit_value = 1;
-! report_error (_("error importing function definition for `%s'"), tname);
- }
-+
-+ /* Restore original suffix */
-+ tname[namelen] = BASHFUNC_SUFFIX[0];
- }
- #if defined (ARRAY_VARS)
-***************
-*** 2955,2959 ****
-
- INVALIDATE_EXPORTSTR (var);
-! var->exportstr = mk_env_string (name, value);
-
- array_needs_making = 1;
---- 2974,2978 ----
-
- INVALIDATE_EXPORTSTR (var);
-! var->exportstr = mk_env_string (name, value, 0);
-
- array_needs_making = 1;
-***************
-*** 3853,3871 ****
-
- static inline char *
-! mk_env_string (name, value)
- const char *name, *value;
- {
-! int name_len, value_len;
-! char *p;
-
- name_len = strlen (name);
- value_len = STRLEN (value);
-! p = (char *)xmalloc (2 + name_len + value_len);
-! strcpy (p, name);
-! p[name_len] = '=';
- if (value && *value)
-! strcpy (p + name_len + 1, value);
- else
-! p[name_len + 1] = '\0';
- return (p);
- }
---- 3872,3911 ----
-
- static inline char *
-! mk_env_string (name, value, isfunc)
- const char *name, *value;
-+ int isfunc;
- {
-! size_t name_len, value_len;
-! char *p, *q;
-
- name_len = strlen (name);
- value_len = STRLEN (value);
-!
-! /* If we are exporting a shell function, construct the encoded function
-! name. */
-! if (isfunc && value)
-! {
-! p = (char *)xmalloc (BASHFUNC_PREFLEN + name_len + BASHFUNC_SUFFLEN + value_len + 2);
-! q = p;
-! memcpy (q, BASHFUNC_PREFIX, BASHFUNC_PREFLEN);
-! q += BASHFUNC_PREFLEN;
-! memcpy (q, name, name_len);
-! q += name_len;
-! memcpy (q, BASHFUNC_SUFFIX, BASHFUNC_SUFFLEN);
-! q += BASHFUNC_SUFFLEN;
-! }
-! else
-! {
-! p = (char *)xmalloc (2 + name_len + value_len);
-! memcpy (p, name, name_len);
-! q = p + name_len;
-! }
-!
-! q[0] = '=';
- if (value && *value)
-! memcpy (q + 1, value, value_len + 1);
- else
-! q[1] = '\0';
-!
- return (p);
- }
-***************
-*** 3953,3957 ****
- using the cached exportstr... */
- list[list_index] = USE_EXPORTSTR ? savestring (value)
-! : mk_env_string (var->name, value);
-
- if (USE_EXPORTSTR == 0)
---- 3993,3997 ----
- using the cached exportstr... */
- list[list_index] = USE_EXPORTSTR ? savestring (value)
-! : mk_env_string (var->name, value, function_p (var));
-
- if (USE_EXPORTSTR == 0)
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 26
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 27
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-028 b/srcpkgs/bash/files/bash43-028
deleted file mode 100644
index 7448cf814f..0000000000
--- a/srcpkgs/bash/files/bash43-028
+++ /dev/null
@@ -1,2265 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-028
-
-Bug-Reported-by: Florian Weimer
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-There are two local buffer overflows in parse.y that can cause the shell
-to dump core when given many here-documents attached to a single command
-or many nested loops.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/parse.y 2014-09-25 23:02:35.000000000 -0400
---- parse.y 2014-09-29 16:47:03.000000000 -0400
-***************
-*** 169,172 ****
---- 169,175 ----
- static int reserved_word_acceptable __P((int));
- static int yylex __P((void));
-+
-+ static void push_heredoc __P((REDIRECT *));
-+ static char *mk_alexpansion __P((char *));
- static int alias_expand_token __P((char *));
- static int time_command_acceptable __P((void));
-***************
-*** 266,270 ****
- /* Variables to manage the task of reading here documents, because we need to
- defer the reading until after a complete command has been collected. */
-! static REDIRECT *redir_stack[10];
- int need_here_doc;
-
---- 269,275 ----
- /* Variables to manage the task of reading here documents, because we need to
- defer the reading until after a complete command has been collected. */
-! #define HEREDOC_MAX 16
-!
-! static REDIRECT *redir_stack[HEREDOC_MAX];
- int need_here_doc;
-
-***************
-*** 308,312 ****
- index is decremented after a case, select, or for command is parsed. */
- #define MAX_CASE_NEST 128
-! static int word_lineno[MAX_CASE_NEST];
- static int word_top = -1;
-
---- 313,317 ----
- index is decremented after a case, select, or for command is parsed. */
- #define MAX_CASE_NEST 128
-! static int word_lineno[MAX_CASE_NEST+1];
- static int word_top = -1;
-
-***************
-*** 521,525 ****
- redir.filename = $2;
- $$ = make_redirection (source, r_reading_until, redir, 0);
-! redir_stack[need_here_doc++] = $$;
- }
- | NUMBER LESS_LESS WORD
---- 526,530 ----
- redir.filename = $2;
- $$ = make_redirection (source, r_reading_until, redir, 0);
-! push_heredoc ($$);
- }
- | NUMBER LESS_LESS WORD
-***************
-*** 528,532 ****
- redir.filename = $3;
- $$ = make_redirection (source, r_reading_until, redir, 0);
-! redir_stack[need_here_doc++] = $$;
- }
- | REDIR_WORD LESS_LESS WORD
---- 533,537 ----
- redir.filename = $3;
- $$ = make_redirection (source, r_reading_until, redir, 0);
-! push_heredoc ($$);
- }
- | REDIR_WORD LESS_LESS WORD
-***************
-*** 535,539 ****
- redir.filename = $3;
- $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN);
-! redir_stack[need_here_doc++] = $$;
- }
- | LESS_LESS_MINUS WORD
---- 540,544 ----
- redir.filename = $3;
- $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN);
-! push_heredoc ($$);
- }
- | LESS_LESS_MINUS WORD
-***************
-*** 542,546 ****
- redir.filename = $2;
- $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
-! redir_stack[need_here_doc++] = $$;
- }
- | NUMBER LESS_LESS_MINUS WORD
---- 547,551 ----
- redir.filename = $2;
- $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
-! push_heredoc ($$);
- }
- | NUMBER LESS_LESS_MINUS WORD
-***************
-*** 549,553 ****
- redir.filename = $3;
- $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
-! redir_stack[need_here_doc++] = $$;
- }
- | REDIR_WORD LESS_LESS_MINUS WORD
---- 554,558 ----
- redir.filename = $3;
- $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
-! push_heredoc ($$);
- }
- | REDIR_WORD LESS_LESS_MINUS WORD
-***************
-*** 556,560 ****
- redir.filename = $3;
- $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN);
-! redir_stack[need_here_doc++] = $$;
- }
- | LESS_LESS_LESS WORD
---- 561,565 ----
- redir.filename = $3;
- $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN);
-! push_heredoc ($$);
- }
- | LESS_LESS_LESS WORD
-***************
-*** 2637,2640 ****
---- 2642,2660 ----
- static int esacs_needed_count;
-
-+ static void
-+ push_heredoc (r)
-+ REDIRECT *r;
-+ {
-+ if (need_here_doc >= HEREDOC_MAX)
-+ {
-+ last_command_exit_value = EX_BADUSAGE;
-+ need_here_doc = 0;
-+ report_syntax_error (_("maximum here-document count exceeded"));
-+ reset_parser ();
-+ exit_shell (last_command_exit_value);
-+ }
-+ redir_stack[need_here_doc++] = r;
-+ }
-+
- void
- gather_here_documents ()
-*** ../bash-4.3.27/y.tab.c 2014-10-01 11:38:24.000000000 -0400
---- y.tab.c 2014-10-01 12:46:11.000000000 -0400
-***************
-*** 169,173 ****
-
- /* Copy the first part of user declarations. */
-! #line 21 "/usr/homes/chet/src/bash/src/parse.y"
-
- #include "config.h"
---- 169,173 ----
-
- /* Copy the first part of user declarations. */
-! #line 21 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-
- #include "config.h"
-***************
-*** 320,323 ****
---- 320,326 ----
- static int reserved_word_acceptable __P((int));
- static int yylex __P((void));
-+
-+ static void push_heredoc __P((REDIRECT *));
-+ static char *mk_alexpansion __P((char *));
- static int alias_expand_token __P((char *));
- static int time_command_acceptable __P((void));
-***************
-*** 417,421 ****
- /* Variables to manage the task of reading here documents, because we need to
- defer the reading until after a complete command has been collected. */
-! static REDIRECT *redir_stack[10];
- int need_here_doc;
-
---- 420,426 ----
- /* Variables to manage the task of reading here documents, because we need to
- defer the reading until after a complete command has been collected. */
-! #define HEREDOC_MAX 16
-!
-! static REDIRECT *redir_stack[HEREDOC_MAX];
- int need_here_doc;
-
-***************
-*** 459,463 ****
- index is decremented after a case, select, or for command is parsed. */
- #define MAX_CASE_NEST 128
-! static int word_lineno[MAX_CASE_NEST];
- static int word_top = -1;
-
---- 464,468 ----
- index is decremented after a case, select, or for command is parsed. */
- #define MAX_CASE_NEST 128
-! static int word_lineno[MAX_CASE_NEST+1];
- static int word_top = -1;
-
-***************
-*** 493,497 ****
- #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
- typedef union YYSTYPE
-! #line 324 "/usr/homes/chet/src/bash/src/parse.y"
- {
- WORD_DESC *word; /* the word that we read. */
---- 498,502 ----
- #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
- typedef union YYSTYPE
-! #line 329 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- WORD_DESC *word; /* the word that we read. */
-***************
-*** 504,508 ****
- }
- /* Line 193 of yacc.c. */
-! #line 507 "y.tab.c"
- YYSTYPE;
- # define yystype YYSTYPE /* obsolescent; will be withdrawn */
---- 509,513 ----
- }
- /* Line 193 of yacc.c. */
-! #line 512 "y.tab.c"
- YYSTYPE;
- # define yystype YYSTYPE /* obsolescent; will be withdrawn */
-***************
-*** 517,521 ****
-
- /* Line 216 of yacc.c. */
-! #line 520 "y.tab.c"
-
- #ifdef short
---- 522,526 ----
-
- /* Line 216 of yacc.c. */
-! #line 525 "y.tab.c"
-
- #ifdef short
-***************
-*** 887,907 ****
- static const yytype_uint16 yyrline[] =
- {
-! 0, 377, 377, 388, 397, 412, 422, 424, 428, 434,
-! 440, 446, 452, 458, 464, 470, 476, 482, 488, 494,
-! 500, 506, 512, 518, 525, 532, 539, 546, 553, 560,
-! 566, 572, 578, 584, 590, 596, 602, 608, 614, 620,
-! 626, 632, 638, 644, 650, 656, 662, 668, 674, 680,
-! 686, 692, 700, 702, 704, 708, 712, 723, 725, 729,
-! 731, 733, 749, 751, 755, 757, 759, 761, 763, 765,
-! 767, 769, 771, 773, 775, 779, 784, 789, 794, 799,
-! 804, 809, 814, 821, 826, 831, 836, 843, 848, 853,
-! 858, 863, 868, 875, 880, 885, 892, 895, 898, 902,
-! 904, 935, 942, 947, 964, 969, 986, 993, 995, 997,
-! 1002, 1006, 1010, 1014, 1016, 1018, 1022, 1023, 1027, 1029,
-! 1031, 1033, 1037, 1039, 1041, 1043, 1045, 1047, 1051, 1053,
-! 1062, 1070, 1071, 1077, 1078, 1085, 1089, 1091, 1093, 1100,
-! 1102, 1104, 1108, 1109, 1112, 1114, 1116, 1120, 1121, 1130,
-! 1143, 1159, 1174, 1176, 1178, 1185, 1188, 1192, 1194, 1200,
-! 1206, 1223, 1243, 1245, 1268, 1272, 1274, 1276
- };
- #endif
---- 892,912 ----
- static const yytype_uint16 yyrline[] =
- {
-! 0, 382, 382, 393, 402, 417, 427, 429, 433, 439,
-! 445, 451, 457, 463, 469, 475, 481, 487, 493, 499,
-! 505, 511, 517, 523, 530, 537, 544, 551, 558, 565,
-! 571, 577, 583, 589, 595, 601, 607, 613, 619, 625,
-! 631, 637, 643, 649, 655, 661, 667, 673, 679, 685,
-! 691, 697, 705, 707, 709, 713, 717, 728, 730, 734,
-! 736, 738, 754, 756, 760, 762, 764, 766, 768, 770,
-! 772, 774, 776, 778, 780, 784, 789, 794, 799, 804,
-! 809, 814, 819, 826, 831, 836, 841, 848, 853, 858,
-! 863, 868, 873, 880, 885, 890, 897, 900, 903, 907,
-! 909, 940, 947, 952, 969, 974, 991, 998, 1000, 1002,
-! 1007, 1011, 1015, 1019, 1021, 1023, 1027, 1028, 1032, 1034,
-! 1036, 1038, 1042, 1044, 1046, 1048, 1050, 1052, 1056, 1058,
-! 1067, 1075, 1076, 1082, 1083, 1090, 1094, 1096, 1098, 1105,
-! 1107, 1109, 1113, 1114, 1117, 1119, 1121, 1125, 1126, 1135,
-! 1148, 1164, 1179, 1181, 1183, 1190, 1193, 1197, 1199, 1205,
-! 1211, 1228, 1248, 1250, 1273, 1277, 1279, 1281
- };
- #endif
-***************
-*** 2094,2098 ****
- {
- case 2:
-! #line 378 "/usr/homes/chet/src/bash/src/parse.y"
- {
- /* Case of regular command. Discard the error
---- 2099,2103 ----
- {
- case 2:
-! #line 383 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- /* Case of regular command. Discard the error
-***************
-*** 2108,2112 ****
-
- case 3:
-! #line 389 "/usr/homes/chet/src/bash/src/parse.y"
- {
- /* Case of regular command, but not a very
---- 2113,2117 ----
-
- case 3:
-! #line 394 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- /* Case of regular command, but not a very
-***************
-*** 2120,2124 ****
-
- case 4:
-! #line 398 "/usr/homes/chet/src/bash/src/parse.y"
- {
- /* Error during parsing. Return NULL command. */
---- 2125,2129 ----
-
- case 4:
-! #line 403 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- /* Error during parsing. Return NULL command. */
-***************
-*** 2138,2142 ****
-
- case 5:
-! #line 413 "/usr/homes/chet/src/bash/src/parse.y"
- {
- /* Case of EOF seen by itself. Do ignoreeof or
---- 2143,2147 ----
-
- case 5:
-! #line 418 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- /* Case of EOF seen by itself. Do ignoreeof or
-***************
-*** 2149,2163 ****
-
- case 6:
-! #line 423 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
- break;
-
- case 7:
-! #line 425 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(2) - (2)].word), (yyvsp[(1) - (2)].word_list)); }
- break;
-
- case 8:
-! #line 429 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 1;
---- 2154,2168 ----
-
- case 6:
-! #line 428 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
- break;
-
- case 7:
-! #line 430 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(2) - (2)].word), (yyvsp[(1) - (2)].word_list)); }
- break;
-
- case 8:
-! #line 434 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
-***************
-*** 2168,2172 ****
-
- case 9:
-! #line 435 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 0;
---- 2173,2177 ----
-
- case 9:
-! #line 440 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
-***************
-*** 2177,2181 ****
-
- case 10:
-! #line 441 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2182,2186 ----
-
- case 10:
-! #line 446 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2186,2190 ****
-
- case 11:
-! #line 447 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2191,2195 ----
-
- case 11:
-! #line 452 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2195,2199 ****
-
- case 12:
-! #line 453 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2200,2204 ----
-
- case 12:
-! #line 458 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2204,2208 ****
-
- case 13:
-! #line 459 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2209,2213 ----
-
- case 13:
-! #line 464 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2213,2217 ****
-
- case 14:
-! #line 465 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 1;
---- 2218,2222 ----
-
- case 14:
-! #line 470 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
-***************
-*** 2222,2226 ****
-
- case 15:
-! #line 471 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2227,2231 ----
-
- case 15:
-! #line 476 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2231,2235 ****
-
- case 16:
-! #line 477 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2236,2240 ----
-
- case 16:
-! #line 482 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2240,2244 ****
-
- case 17:
-! #line 483 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 1;
---- 2245,2249 ----
-
- case 17:
-! #line 488 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
-***************
-*** 2249,2253 ****
-
- case 18:
-! #line 489 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2254,2258 ----
-
- case 18:
-! #line 494 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2258,2262 ****
-
- case 19:
-! #line 495 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2263,2267 ----
-
- case 19:
-! #line 500 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2267,2271 ****
-
- case 20:
-! #line 501 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 0;
---- 2272,2276 ----
-
- case 20:
-! #line 506 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
-***************
-*** 2276,2280 ****
-
- case 21:
-! #line 507 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2281,2285 ----
-
- case 21:
-! #line 512 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2285,2289 ****
-
- case 22:
-! #line 513 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2290,2294 ----
-
- case 22:
-! #line 518 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2294,2358 ****
-
- case 23:
-! #line 519 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 0;
- redir.filename = (yyvsp[(2) - (2)].word);
- (yyval.redirect) = make_redirection (source, r_reading_until, redir, 0);
-! redir_stack[need_here_doc++] = (yyval.redirect);
- }
- break;
-
- case 24:
-! #line 526 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
- redir.filename = (yyvsp[(3) - (3)].word);
- (yyval.redirect) = make_redirection (source, r_reading_until, redir, 0);
-! redir_stack[need_here_doc++] = (yyval.redirect);
- }
- break;
-
- case 25:
-! #line 533 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
- redir.filename = (yyvsp[(3) - (3)].word);
- (yyval.redirect) = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN);
-! redir_stack[need_here_doc++] = (yyval.redirect);
- }
- break;
-
- case 26:
-! #line 540 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 0;
- redir.filename = (yyvsp[(2) - (2)].word);
- (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, 0);
-! redir_stack[need_here_doc++] = (yyval.redirect);
- }
- break;
-
- case 27:
-! #line 547 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
- redir.filename = (yyvsp[(3) - (3)].word);
- (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, 0);
-! redir_stack[need_here_doc++] = (yyval.redirect);
- }
- break;
-
- case 28:
-! #line 554 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
- redir.filename = (yyvsp[(3) - (3)].word);
- (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN);
-! redir_stack[need_here_doc++] = (yyval.redirect);
- }
- break;
-
- case 29:
-! #line 561 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 0;
---- 2299,2363 ----
-
- case 23:
-! #line 524 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
- redir.filename = (yyvsp[(2) - (2)].word);
- (yyval.redirect) = make_redirection (source, r_reading_until, redir, 0);
-! push_heredoc ((yyval.redirect));
- }
- break;
-
- case 24:
-! #line 531 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
- redir.filename = (yyvsp[(3) - (3)].word);
- (yyval.redirect) = make_redirection (source, r_reading_until, redir, 0);
-! push_heredoc ((yyval.redirect));
- }
- break;
-
- case 25:
-! #line 538 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
- redir.filename = (yyvsp[(3) - (3)].word);
- (yyval.redirect) = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN);
-! push_heredoc ((yyval.redirect));
- }
- break;
-
- case 26:
-! #line 545 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
- redir.filename = (yyvsp[(2) - (2)].word);
- (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, 0);
-! push_heredoc ((yyval.redirect));
- }
- break;
-
- case 27:
-! #line 552 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
- redir.filename = (yyvsp[(3) - (3)].word);
- (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, 0);
-! push_heredoc ((yyval.redirect));
- }
- break;
-
- case 28:
-! #line 559 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
- redir.filename = (yyvsp[(3) - (3)].word);
- (yyval.redirect) = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN);
-! push_heredoc ((yyval.redirect));
- }
- break;
-
- case 29:
-! #line 566 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
-***************
-*** 2363,2367 ****
-
- case 30:
-! #line 567 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2368,2372 ----
-
- case 30:
-! #line 572 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2372,2376 ****
-
- case 31:
-! #line 573 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2377,2381 ----
-
- case 31:
-! #line 578 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2381,2385 ****
-
- case 32:
-! #line 579 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 0;
---- 2386,2390 ----
-
- case 32:
-! #line 584 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
-***************
-*** 2390,2394 ****
-
- case 33:
-! #line 585 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2395,2399 ----
-
- case 33:
-! #line 590 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2399,2403 ****
-
- case 34:
-! #line 591 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2404,2408 ----
-
- case 34:
-! #line 596 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2408,2412 ****
-
- case 35:
-! #line 597 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 1;
---- 2413,2417 ----
-
- case 35:
-! #line 602 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
-***************
-*** 2417,2421 ****
-
- case 36:
-! #line 603 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2422,2426 ----
-
- case 36:
-! #line 608 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2426,2430 ****
-
- case 37:
-! #line 609 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2431,2435 ----
-
- case 37:
-! #line 614 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2435,2439 ****
-
- case 38:
-! #line 615 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 0;
---- 2440,2444 ----
-
- case 38:
-! #line 620 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
-***************
-*** 2444,2448 ****
-
- case 39:
-! #line 621 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2449,2453 ----
-
- case 39:
-! #line 626 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2453,2457 ****
-
- case 40:
-! #line 627 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2458,2462 ----
-
- case 40:
-! #line 632 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2462,2466 ****
-
- case 41:
-! #line 633 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 1;
---- 2467,2471 ----
-
- case 41:
-! #line 638 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
-***************
-*** 2471,2475 ****
-
- case 42:
-! #line 639 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2476,2480 ----
-
- case 42:
-! #line 644 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2480,2484 ****
-
- case 43:
-! #line 645 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2485,2489 ----
-
- case 43:
-! #line 650 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2489,2493 ****
-
- case 44:
-! #line 651 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 1;
---- 2494,2498 ----
-
- case 44:
-! #line 656 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
-***************
-*** 2498,2502 ****
-
- case 45:
-! #line 657 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2503,2507 ----
-
- case 45:
-! #line 662 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2507,2511 ****
-
- case 46:
-! #line 663 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2512,2516 ----
-
- case 46:
-! #line 668 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2516,2520 ****
-
- case 47:
-! #line 669 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 0;
---- 2521,2525 ----
-
- case 47:
-! #line 674 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
-***************
-*** 2525,2529 ****
-
- case 48:
-! #line 675 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2530,2534 ----
-
- case 48:
-! #line 680 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2534,2538 ****
-
- case 49:
-! #line 681 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2539,2543 ----
-
- case 49:
-! #line 686 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2543,2547 ****
-
- case 50:
-! #line 687 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 1;
---- 2548,2552 ----
-
- case 50:
-! #line 692 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
-***************
-*** 2552,2556 ****
-
- case 51:
-! #line 693 "/usr/homes/chet/src/bash/src/parse.y"
- {
- source.dest = 1;
---- 2557,2561 ----
-
- case 51:
-! #line 698 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
-***************
-*** 2561,2580 ****
-
- case 52:
-! #line 701 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
- break;
-
- case 53:
-! #line 703 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
- break;
-
- case 54:
-! #line 705 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.element).redirect = (yyvsp[(1) - (1)].redirect); (yyval.element).word = 0; }
- break;
-
- case 55:
-! #line 709 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.redirect) = (yyvsp[(1) - (1)].redirect);
---- 2566,2585 ----
-
- case 52:
-! #line 706 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
- break;
-
- case 53:
-! #line 708 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
- break;
-
- case 54:
-! #line 710 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.element).redirect = (yyvsp[(1) - (1)].redirect); (yyval.element).word = 0; }
- break;
-
- case 55:
-! #line 714 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.redirect) = (yyvsp[(1) - (1)].redirect);
-***************
-*** 2583,2587 ****
-
- case 56:
-! #line 713 "/usr/homes/chet/src/bash/src/parse.y"
- {
- register REDIRECT *t;
---- 2588,2592 ----
-
- case 56:
-! #line 718 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- register REDIRECT *t;
-***************
-*** 2595,2619 ****
-
- case 57:
-! #line 724 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_simple_command ((yyvsp[(1) - (1)].element), (COMMAND *)NULL); }
- break;
-
- case 58:
-! #line 726 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_simple_command ((yyvsp[(2) - (2)].element), (yyvsp[(1) - (2)].command)); }
- break;
-
- case 59:
-! #line 730 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = clean_simple_command ((yyvsp[(1) - (1)].command)); }
- break;
-
- case 60:
-! #line 732 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 61:
-! #line 734 "/usr/homes/chet/src/bash/src/parse.y"
- {
- COMMAND *tc;
---- 2600,2624 ----
-
- case 57:
-! #line 729 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_simple_command ((yyvsp[(1) - (1)].element), (COMMAND *)NULL); }
- break;
-
- case 58:
-! #line 731 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_simple_command ((yyvsp[(2) - (2)].element), (yyvsp[(1) - (2)].command)); }
- break;
-
- case 59:
-! #line 735 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = clean_simple_command ((yyvsp[(1) - (1)].command)); }
- break;
-
- case 60:
-! #line 737 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 61:
-! #line 739 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- COMMAND *tc;
-***************
-*** 2634,2703 ****
-
- case 62:
-! #line 750 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 63:
-! #line 752 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 64:
-! #line 756 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 65:
-! #line 758 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 66:
-! #line 760 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_while_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
- break;
-
- case 67:
-! #line 762 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_until_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
- break;
-
- case 68:
-! #line 764 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 69:
-! #line 766 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 70:
-! #line 768 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 71:
-! #line 770 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 72:
-! #line 772 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 73:
-! #line 774 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 74:
-! #line 776 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 75:
-! #line 780 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
---- 2639,2708 ----
-
- case 62:
-! #line 755 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 63:
-! #line 757 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 64:
-! #line 761 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 65:
-! #line 763 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 66:
-! #line 765 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_while_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
- break;
-
- case 67:
-! #line 767 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_until_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
- break;
-
- case 68:
-! #line 769 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 69:
-! #line 771 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 70:
-! #line 773 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 71:
-! #line 775 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 72:
-! #line 777 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 73:
-! #line 779 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 74:
-! #line 781 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 75:
-! #line 785 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
-***************
-*** 2707,2711 ****
-
- case 76:
-! #line 785 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
---- 2712,2716 ----
-
- case 76:
-! #line 790 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
-***************
-*** 2715,2719 ****
-
- case 77:
-! #line 790 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
---- 2720,2724 ----
-
- case 77:
-! #line 795 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
-***************
-*** 2723,2727 ****
-
- case 78:
-! #line 795 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
---- 2728,2732 ----
-
- case 78:
-! #line 800 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
-***************
-*** 2731,2735 ****
-
- case 79:
-! #line 800 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
---- 2736,2740 ----
-
- case 79:
-! #line 805 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
-***************
-*** 2739,2743 ****
-
- case 80:
-! #line 805 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
---- 2744,2748 ----
-
- case 80:
-! #line 810 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
-***************
-*** 2747,2751 ****
-
- case 81:
-! #line 810 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
---- 2752,2756 ----
-
- case 81:
-! #line 815 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
-***************
-*** 2755,2759 ****
-
- case 82:
-! #line 815 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
---- 2760,2764 ----
-
- case 82:
-! #line 820 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
-***************
-*** 2763,2767 ****
-
- case 83:
-! #line 822 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
---- 2768,2772 ----
-
- case 83:
-! #line 827 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
-***************
-*** 2771,2775 ****
-
- case 84:
-! #line 827 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
---- 2776,2780 ----
-
- case 84:
-! #line 832 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
-***************
-*** 2779,2783 ****
-
- case 85:
-! #line 832 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
---- 2784,2788 ----
-
- case 85:
-! #line 837 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
-***************
-*** 2787,2791 ****
-
- case 86:
-! #line 837 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
---- 2792,2796 ----
-
- case 86:
-! #line 842 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
-***************
-*** 2795,2799 ****
-
- case 87:
-! #line 844 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
---- 2800,2804 ----
-
- case 87:
-! #line 849 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
-***************
-*** 2803,2807 ****
-
- case 88:
-! #line 849 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
---- 2808,2812 ----
-
- case 88:
-! #line 854 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
-***************
-*** 2811,2815 ****
-
- case 89:
-! #line 854 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
---- 2816,2820 ----
-
- case 89:
-! #line 859 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
-***************
-*** 2819,2823 ****
-
- case 90:
-! #line 859 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
---- 2824,2828 ----
-
- case 90:
-! #line 864 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
-***************
-*** 2827,2831 ****
-
- case 91:
-! #line 864 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
---- 2832,2836 ----
-
- case 91:
-! #line 869 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
-***************
-*** 2835,2839 ****
-
- case 92:
-! #line 869 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
---- 2840,2844 ----
-
- case 92:
-! #line 874 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
-***************
-*** 2843,2847 ****
-
- case 93:
-! #line 876 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (PATTERN_LIST *)NULL, word_lineno[word_top]);
---- 2848,2852 ----
-
- case 93:
-! #line 881 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (PATTERN_LIST *)NULL, word_lineno[word_top]);
-***************
-*** 2851,2855 ****
-
- case 94:
-! #line 881 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_case_command ((yyvsp[(2) - (7)].word), (yyvsp[(5) - (7)].pattern), word_lineno[word_top]);
---- 2856,2860 ----
-
- case 94:
-! #line 886 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_case_command ((yyvsp[(2) - (7)].word), (yyvsp[(5) - (7)].pattern), word_lineno[word_top]);
-***************
-*** 2859,2863 ****
-
- case 95:
-! #line 886 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (yyvsp[(5) - (6)].pattern), word_lineno[word_top]);
---- 2864,2868 ----
-
- case 95:
-! #line 891 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (yyvsp[(5) - (6)].pattern), word_lineno[word_top]);
-***************
-*** 2867,2891 ****
-
- case 96:
-! #line 893 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_function_def ((yyvsp[(1) - (5)].word), (yyvsp[(5) - (5)].command), function_dstart, function_bstart); }
- break;
-
- case 97:
-! #line 896 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_function_def ((yyvsp[(2) - (6)].word), (yyvsp[(6) - (6)].command), function_dstart, function_bstart); }
- break;
-
- case 98:
-! #line 899 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_function_def ((yyvsp[(2) - (4)].word), (yyvsp[(4) - (4)].command), function_dstart, function_bstart); }
- break;
-
- case 99:
-! #line 903 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 100:
-! #line 905 "/usr/homes/chet/src/bash/src/parse.y"
- {
- COMMAND *tc;
---- 2872,2896 ----
-
- case 96:
-! #line 898 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_function_def ((yyvsp[(1) - (5)].word), (yyvsp[(5) - (5)].command), function_dstart, function_bstart); }
- break;
-
- case 97:
-! #line 901 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_function_def ((yyvsp[(2) - (6)].word), (yyvsp[(6) - (6)].command), function_dstart, function_bstart); }
- break;
-
- case 98:
-! #line 904 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_function_def ((yyvsp[(2) - (4)].word), (yyvsp[(4) - (4)].command), function_dstart, function_bstart); }
- break;
-
- case 99:
-! #line 908 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 100:
-! #line 910 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- COMMAND *tc;
-***************
-*** 2919,2923 ****
-
- case 101:
-! #line 936 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_subshell_command ((yyvsp[(2) - (3)].command));
---- 2924,2928 ----
-
- case 101:
-! #line 941 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_subshell_command ((yyvsp[(2) - (3)].command));
-***************
-*** 2927,2931 ****
-
- case 102:
-! #line 943 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_coproc_command ("COPROC", (yyvsp[(2) - (2)].command));
---- 2932,2936 ----
-
- case 102:
-! #line 948 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_coproc_command ("COPROC", (yyvsp[(2) - (2)].command));
-***************
-*** 2935,2939 ****
-
- case 103:
-! #line 948 "/usr/homes/chet/src/bash/src/parse.y"
- {
- COMMAND *tc;
---- 2940,2944 ----
-
- case 103:
-! #line 953 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- COMMAND *tc;
-***************
-*** 2955,2959 ****
-
- case 104:
-! #line 965 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_coproc_command ((yyvsp[(2) - (3)].word)->word, (yyvsp[(3) - (3)].command));
---- 2960,2964 ----
-
- case 104:
-! #line 970 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_coproc_command ((yyvsp[(2) - (3)].word)->word, (yyvsp[(3) - (3)].command));
-***************
-*** 2963,2967 ****
-
- case 105:
-! #line 970 "/usr/homes/chet/src/bash/src/parse.y"
- {
- COMMAND *tc;
---- 2968,2972 ----
-
- case 105:
-! #line 975 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- COMMAND *tc;
-***************
-*** 2983,2987 ****
-
- case 106:
-! #line 987 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = make_coproc_command ("COPROC", clean_simple_command ((yyvsp[(2) - (2)].command)));
---- 2988,2992 ----
-
- case 106:
-! #line 992 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_coproc_command ("COPROC", clean_simple_command ((yyvsp[(2) - (2)].command)));
-***************
-*** 2991,3105 ****
-
- case 107:
-! #line 994 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (COMMAND *)NULL); }
- break;
-
- case 108:
-! #line 996 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (7)].command), (yyvsp[(4) - (7)].command), (yyvsp[(6) - (7)].command)); }
- break;
-
- case 109:
-! #line 998 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(5) - (6)].command)); }
- break;
-
- case 110:
-! #line 1003 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_group_command ((yyvsp[(2) - (3)].command)); }
- break;
-
- case 111:
-! #line 1007 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_arith_command ((yyvsp[(1) - (1)].word_list)); }
- break;
-
- case 112:
-! #line 1011 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(2) - (3)].command); }
- break;
-
- case 113:
-! #line 1015 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (4)].command), (yyvsp[(4) - (4)].command), (COMMAND *)NULL); }
- break;
-
- case 114:
-! #line 1017 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(6) - (6)].command)); }
- break;
-
- case 115:
-! #line 1019 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (yyvsp[(5) - (5)].command)); }
- break;
-
- case 117:
-! #line 1024 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyvsp[(2) - (2)].pattern)->next = (yyvsp[(1) - (2)].pattern); (yyval.pattern) = (yyvsp[(2) - (2)].pattern); }
- break;
-
- case 118:
-! #line 1028 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (yyvsp[(4) - (4)].command)); }
- break;
-
- case 119:
-! #line 1030 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (COMMAND *)NULL); }
- break;
-
- case 120:
-! #line 1032 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (yyvsp[(5) - (5)].command)); }
- break;
-
- case 121:
-! #line 1034 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (COMMAND *)NULL); }
- break;
-
- case 122:
-! #line 1038 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
- break;
-
- case 123:
-! #line 1040 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
- break;
-
- case 124:
-! #line 1042 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
- break;
-
- case 125:
-! #line 1044 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
- break;
-
- case 126:
-! #line 1046 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_TESTNEXT; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
- break;
-
- case 127:
-! #line 1048 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_TESTNEXT; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
- break;
-
- case 128:
-! #line 1052 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
- break;
-
- case 129:
-! #line 1054 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(3) - (3)].word), (yyvsp[(1) - (3)].word_list)); }
- break;
-
- case 130:
-! #line 1063 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = (yyvsp[(2) - (2)].command);
---- 2996,3110 ----
-
- case 107:
-! #line 999 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (COMMAND *)NULL); }
- break;
-
- case 108:
-! #line 1001 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (7)].command), (yyvsp[(4) - (7)].command), (yyvsp[(6) - (7)].command)); }
- break;
-
- case 109:
-! #line 1003 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(5) - (6)].command)); }
- break;
-
- case 110:
-! #line 1008 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_group_command ((yyvsp[(2) - (3)].command)); }
- break;
-
- case 111:
-! #line 1012 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_arith_command ((yyvsp[(1) - (1)].word_list)); }
- break;
-
- case 112:
-! #line 1016 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(2) - (3)].command); }
- break;
-
- case 113:
-! #line 1020 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (4)].command), (yyvsp[(4) - (4)].command), (COMMAND *)NULL); }
- break;
-
- case 114:
-! #line 1022 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(6) - (6)].command)); }
- break;
-
- case 115:
-! #line 1024 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (yyvsp[(5) - (5)].command)); }
- break;
-
- case 117:
-! #line 1029 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyvsp[(2) - (2)].pattern)->next = (yyvsp[(1) - (2)].pattern); (yyval.pattern) = (yyvsp[(2) - (2)].pattern); }
- break;
-
- case 118:
-! #line 1033 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (yyvsp[(4) - (4)].command)); }
- break;
-
- case 119:
-! #line 1035 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (COMMAND *)NULL); }
- break;
-
- case 120:
-! #line 1037 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (yyvsp[(5) - (5)].command)); }
- break;
-
- case 121:
-! #line 1039 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (COMMAND *)NULL); }
- break;
-
- case 122:
-! #line 1043 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
- break;
-
- case 123:
-! #line 1045 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
- break;
-
- case 124:
-! #line 1047 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
- break;
-
- case 125:
-! #line 1049 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
- break;
-
- case 126:
-! #line 1051 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_TESTNEXT; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
- break;
-
- case 127:
-! #line 1053 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_TESTNEXT; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
- break;
-
- case 128:
-! #line 1057 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
- break;
-
- case 129:
-! #line 1059 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(3) - (3)].word), (yyvsp[(1) - (3)].word_list)); }
- break;
-
- case 130:
-! #line 1068 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = (yyvsp[(2) - (2)].command);
-***************
-*** 3110,3114 ****
-
- case 132:
-! #line 1072 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = (yyvsp[(2) - (2)].command);
---- 3115,3119 ----
-
- case 132:
-! #line 1077 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = (yyvsp[(2) - (2)].command);
-***************
-*** 3117,3121 ****
-
- case 134:
-! #line 1079 "/usr/homes/chet/src/bash/src/parse.y"
- {
- if ((yyvsp[(1) - (3)].command)->type == cm_connection)
---- 3122,3126 ----
-
- case 134:
-! #line 1084 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- if ((yyvsp[(1) - (3)].command)->type == cm_connection)
-***************
-*** 3127,3141 ****
-
- case 136:
-! #line 1090 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
- break;
-
- case 137:
-! #line 1092 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
- break;
-
- case 138:
-! #line 1094 "/usr/homes/chet/src/bash/src/parse.y"
- {
- if ((yyvsp[(1) - (4)].command)->type == cm_connection)
---- 3132,3146 ----
-
- case 136:
-! #line 1095 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
- break;
-
- case 137:
-! #line 1097 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
- break;
-
- case 138:
-! #line 1099 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- if ((yyvsp[(1) - (4)].command)->type == cm_connection)
-***************
-*** 3147,3181 ****
-
- case 139:
-! #line 1101 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
- break;
-
- case 140:
-! #line 1103 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
- break;
-
- case 141:
-! #line 1105 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 144:
-! #line 1113 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.number) = '\n'; }
- break;
-
- case 145:
-! #line 1115 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.number) = ';'; }
- break;
-
- case 146:
-! #line 1117 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.number) = yacc_EOF; }
- break;
-
- case 149:
-! #line 1131 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = (yyvsp[(1) - (1)].command);
---- 3152,3186 ----
-
- case 139:
-! #line 1106 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
- break;
-
- case 140:
-! #line 1108 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
- break;
-
- case 141:
-! #line 1110 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 144:
-! #line 1118 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.number) = '\n'; }
- break;
-
- case 145:
-! #line 1120 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.number) = ';'; }
- break;
-
- case 146:
-! #line 1122 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.number) = yacc_EOF; }
- break;
-
- case 149:
-! #line 1136 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = (yyvsp[(1) - (1)].command);
-***************
-*** 3193,3197 ****
-
- case 150:
-! #line 1144 "/usr/homes/chet/src/bash/src/parse.y"
- {
- if ((yyvsp[(1) - (2)].command)->type == cm_connection)
---- 3198,3202 ----
-
- case 150:
-! #line 1149 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- if ((yyvsp[(1) - (2)].command)->type == cm_connection)
-***************
-*** 3212,3216 ****
-
- case 151:
-! #line 1160 "/usr/homes/chet/src/bash/src/parse.y"
- {
- (yyval.command) = (yyvsp[(1) - (2)].command);
---- 3217,3221 ----
-
- case 151:
-! #line 1165 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = (yyvsp[(1) - (2)].command);
-***************
-*** 3228,3242 ****
-
- case 152:
-! #line 1175 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
- break;
-
- case 153:
-! #line 1177 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
- break;
-
- case 154:
-! #line 1179 "/usr/homes/chet/src/bash/src/parse.y"
- {
- if ((yyvsp[(1) - (3)].command)->type == cm_connection)
---- 3233,3247 ----
-
- case 152:
-! #line 1180 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
- break;
-
- case 153:
-! #line 1182 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
- break;
-
- case 154:
-! #line 1184 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- if ((yyvsp[(1) - (3)].command)->type == cm_connection)
-***************
-*** 3248,3267 ****
-
- case 155:
-! #line 1186 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), ';'); }
- break;
-
- case 156:
-! #line 1189 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 157:
-! #line 1193 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 158:
-! #line 1195 "/usr/homes/chet/src/bash/src/parse.y"
- {
- if ((yyvsp[(2) - (2)].command))
---- 3253,3272 ----
-
- case 155:
-! #line 1191 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), ';'); }
- break;
-
- case 156:
-! #line 1194 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 157:
-! #line 1198 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 158:
-! #line 1200 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- if ((yyvsp[(2) - (2)].command))
-***************
-*** 3272,3276 ****
-
- case 159:
-! #line 1201 "/usr/homes/chet/src/bash/src/parse.y"
- {
- if ((yyvsp[(2) - (2)].command))
---- 3277,3281 ----
-
- case 159:
-! #line 1206 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- if ((yyvsp[(2) - (2)].command))
-***************
-*** 3281,3285 ****
-
- case 160:
-! #line 1207 "/usr/homes/chet/src/bash/src/parse.y"
- {
- ELEMENT x;
---- 3286,3290 ----
-
- case 160:
-! #line 1212 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- ELEMENT x;
-***************
-*** 3301,3305 ****
-
- case 161:
-! #line 1224 "/usr/homes/chet/src/bash/src/parse.y"
- {
- ELEMENT x;
---- 3306,3310 ----
-
- case 161:
-! #line 1229 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- ELEMENT x;
-***************
-*** 3322,3331 ****
-
- case 162:
-! #line 1244 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '|'); }
- break;
-
- case 163:
-! #line 1246 "/usr/homes/chet/src/bash/src/parse.y"
- {
- /* Make cmd1 |& cmd2 equivalent to cmd1 2>&1 | cmd2 */
---- 3327,3336 ----
-
- case 162:
-! #line 1249 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '|'); }
- break;
-
- case 163:
-! #line 1251 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- /* Make cmd1 |& cmd2 equivalent to cmd1 2>&1 | cmd2 */
-***************
-*** 3353,3372 ****
-
- case 164:
-! #line 1269 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 165:
-! #line 1273 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.number) = CMD_TIME_PIPELINE; }
- break;
-
- case 166:
-! #line 1275 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
- break;
-
- case 167:
-! #line 1277 "/usr/homes/chet/src/bash/src/parse.y"
- { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
- break;
---- 3358,3377 ----
-
- case 164:
-! #line 1274 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 165:
-! #line 1278 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.number) = CMD_TIME_PIPELINE; }
- break;
-
- case 166:
-! #line 1280 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
- break;
-
- case 167:
-! #line 1282 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
- break;
-***************
-*** 3374,3378 ****
-
- /* Line 1267 of yacc.c. */
-! #line 3377 "y.tab.c"
- default: break;
- }
---- 3379,3383 ----
-
- /* Line 1267 of yacc.c. */
-! #line 3382 "y.tab.c"
- default: break;
- }
-***************
-*** 3588,3592 ****
-
-
-! #line 1279 "/usr/homes/chet/src/bash/src/parse.y"
-
-
---- 3593,3597 ----
-
-
-! #line 1284 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-
-
-***************
-*** 4949,4952 ****
---- 4954,4972 ----
- static int esacs_needed_count;
-
-+ static void
-+ push_heredoc (r)
-+ REDIRECT *r;
-+ {
-+ if (need_here_doc >= HEREDOC_MAX)
-+ {
-+ last_command_exit_value = EX_BADUSAGE;
-+ need_here_doc = 0;
-+ report_syntax_error (_("maximum here-document count exceeded"));
-+ reset_parser ();
-+ exit_shell (last_command_exit_value);
-+ }
-+ redir_stack[need_here_doc++] = r;
-+ }
-+
- void
- gather_here_documents ()
-***************
-*** 8542,8543 ****
---- 8562,8564 ----
- }
- #endif /* HANDLE_MULTIBYTE */
-+
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 27
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 28
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-029 b/srcpkgs/bash/files/bash43-029
deleted file mode 100644
index 93bd390a8e..0000000000
--- a/srcpkgs/bash/files/bash43-029
+++ /dev/null
@@ -1,59 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-029
-
-Bug-Reported-by: Michal Zalewski
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-When bash is parsing a function definition that contains a here-document
-delimited by end-of-file (or end-of-string), it leaves the closing delimiter
-uninitialized. This can result in an invalid memory access when the parsed
-function is later copied.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3.28/make_cmd.c 2011-12-16 08:08:01.000000000 -0500
---- make_cmd.c 2014-10-02 11:24:23.000000000 -0400
-***************
-*** 693,696 ****
---- 693,697 ----
- temp->redirector = source;
- temp->redirectee = dest_and_filename;
-+ temp->here_doc_eof = 0;
- temp->instruction = instruction;
- temp->flags = 0;
-*** ../bash-4.3.28/copy_cmd.c 2009-09-11 16:28:02.000000000 -0400
---- copy_cmd.c 2014-10-02 11:24:23.000000000 -0400
-***************
-*** 127,131 ****
- case r_reading_until:
- case r_deblank_reading_until:
-! new_redirect->here_doc_eof = savestring (redirect->here_doc_eof);
- /*FALLTHROUGH*/
- case r_reading_string:
---- 127,131 ----
- case r_reading_until:
- case r_deblank_reading_until:
-! new_redirect->here_doc_eof = redirect->here_doc_eof ? savestring (redirect->here_doc_eof) : 0;
- /*FALLTHROUGH*/
- case r_reading_string:
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 28
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 29
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-030 b/srcpkgs/bash/files/bash43-030
deleted file mode 100644
index 78984da265..0000000000
--- a/srcpkgs/bash/files/bash43-030
+++ /dev/null
@@ -1,2064 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-030
-
-Bug-Reported-by: Michal Zalewski
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-A combination of nested command substitutions and function importing from
-the environment can cause bash to execute code appearing in the environment
-variable value following the function definition.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3.29/builtins/evalstring.c 2014-10-01 12:57:47.000000000 -0400
---- builtins/evalstring.c 2014-10-03 11:57:04.000000000 -0400
-***************
-*** 309,318 ****
- struct fd_bitmap *bitmap;
-
-! if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
- {
-! internal_warning ("%s: ignoring function definition attempt", from_file);
-! should_jump_to_top_level = 0;
-! last_result = last_command_exit_value = EX_BADUSAGE;
-! break;
- }
-
---- 313,335 ----
- struct fd_bitmap *bitmap;
-
-! if (flags & SEVAL_FUNCDEF)
- {
-! char *x;
-!
-! /* If the command parses to something other than a straight
-! function definition, or if we have not consumed the entire
-! string, or if the parser has transformed the function
-! name (as parsing will if it begins or ends with shell
-! whitespace, for example), reject the attempt */
-! if (command->type != cm_function_def ||
-! ((x = parser_remaining_input ()) && *x) ||
-! (STREQ (from_file, command->value.Function_def->name->word) == 0))
-! {
-! internal_warning (_("%s: ignoring function definition attempt"), from_file);
-! should_jump_to_top_level = 0;
-! last_result = last_command_exit_value = EX_BADUSAGE;
-! reset_parser ();
-! break;
-! }
- }
-
-***************
-*** 379,383 ****
-
- if (flags & SEVAL_ONECMD)
-! break;
- }
- }
---- 396,403 ----
-
- if (flags & SEVAL_ONECMD)
-! {
-! reset_parser ();
-! break;
-! }
- }
- }
-*** ../bash-4.3.29/parse.y 2014-10-01 12:58:43.000000000 -0400
---- parse.y 2014-10-03 14:48:59.000000000 -0400
-***************
-*** 2539,2542 ****
---- 2539,2552 ----
- }
-
-+ char *
-+ parser_remaining_input ()
-+ {
-+ if (shell_input_line == 0)
-+ return 0;
-+ if (shell_input_line_index < 0 || shell_input_line_index >= shell_input_line_len)
-+ return '\0'; /* XXX */
-+ return (shell_input_line + shell_input_line_index);
-+ }
-+
- #ifdef INCLUDE_UNUSED
- /* Back the input pointer up by one, effectively `ungetting' a character. */
-***************
-*** 4028,4033 ****
- /* reset_parser clears shell_input_line and associated variables */
- restore_input_line_state (&ls);
-! if (interactive)
-! token_to_read = 0;
-
- /* Need to find how many characters parse_and_execute consumed, update
---- 4053,4058 ----
- /* reset_parser clears shell_input_line and associated variables */
- restore_input_line_state (&ls);
-!
-! token_to_read = 0;
-
- /* Need to find how many characters parse_and_execute consumed, update
-*** ../bash-4.3.29/shell.h 2014-10-01 12:57:39.000000000 -0400
---- shell.h 2014-10-03 14:49:12.000000000 -0400
-***************
-*** 181,184 ****
---- 181,186 ----
-
- /* Let's try declaring these here. */
-+ extern char *parser_remaining_input __P((void));
-+
- extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *));
- extern void restore_parser_state __P((sh_parser_state_t *));
-*** ../bash-4.3.28/y.tab.c 2014-10-01 13:09:46.000000000 -0400
---- y.tab.c 2014-10-04 19:26:22.000000000 -0400
-***************
-*** 169,173 ****
-
- /* Copy the first part of user declarations. */
-! #line 21 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-
- #include "config.h"
---- 169,173 ----
-
- /* Copy the first part of user declarations. */
-! #line 21 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-
- #include "config.h"
-***************
-*** 498,502 ****
- #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
- typedef union YYSTYPE
-! #line 329 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- WORD_DESC *word; /* the word that we read. */
---- 498,502 ----
- #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
- typedef union YYSTYPE
-! #line 329 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- WORD_DESC *word; /* the word that we read. */
-***************
-*** 2099,2103 ****
- {
- case 2:
-! #line 383 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- /* Case of regular command. Discard the error
---- 2099,2103 ----
- {
- case 2:
-! #line 383 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- /* Case of regular command. Discard the error
-***************
-*** 2113,2117 ****
-
- case 3:
-! #line 394 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- /* Case of regular command, but not a very
---- 2113,2117 ----
-
- case 3:
-! #line 394 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- /* Case of regular command, but not a very
-***************
-*** 2125,2129 ****
-
- case 4:
-! #line 403 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- /* Error during parsing. Return NULL command. */
---- 2125,2129 ----
-
- case 4:
-! #line 403 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- /* Error during parsing. Return NULL command. */
-***************
-*** 2143,2147 ****
-
- case 5:
-! #line 418 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- /* Case of EOF seen by itself. Do ignoreeof or
---- 2143,2147 ----
-
- case 5:
-! #line 418 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- /* Case of EOF seen by itself. Do ignoreeof or
-***************
-*** 2154,2168 ****
-
- case 6:
-! #line 428 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
- break;
-
- case 7:
-! #line 430 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(2) - (2)].word), (yyvsp[(1) - (2)].word_list)); }
- break;
-
- case 8:
-! #line 434 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
---- 2154,2168 ----
-
- case 6:
-! #line 428 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
- break;
-
- case 7:
-! #line 430 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(2) - (2)].word), (yyvsp[(1) - (2)].word_list)); }
- break;
-
- case 8:
-! #line 434 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 1;
-***************
-*** 2173,2177 ****
-
- case 9:
-! #line 440 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
---- 2173,2177 ----
-
- case 9:
-! #line 440 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 0;
-***************
-*** 2182,2186 ****
-
- case 10:
-! #line 446 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2182,2186 ----
-
- case 10:
-! #line 446 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2191,2195 ****
-
- case 11:
-! #line 452 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2191,2195 ----
-
- case 11:
-! #line 452 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2200,2204 ****
-
- case 12:
-! #line 458 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2200,2204 ----
-
- case 12:
-! #line 458 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2209,2213 ****
-
- case 13:
-! #line 464 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2209,2213 ----
-
- case 13:
-! #line 464 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2218,2222 ****
-
- case 14:
-! #line 470 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
---- 2218,2222 ----
-
- case 14:
-! #line 470 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 1;
-***************
-*** 2227,2231 ****
-
- case 15:
-! #line 476 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2227,2231 ----
-
- case 15:
-! #line 476 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2236,2240 ****
-
- case 16:
-! #line 482 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2236,2240 ----
-
- case 16:
-! #line 482 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2245,2249 ****
-
- case 17:
-! #line 488 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
---- 2245,2249 ----
-
- case 17:
-! #line 488 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 1;
-***************
-*** 2254,2258 ****
-
- case 18:
-! #line 494 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2254,2258 ----
-
- case 18:
-! #line 494 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2263,2267 ****
-
- case 19:
-! #line 500 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2263,2267 ----
-
- case 19:
-! #line 500 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2272,2276 ****
-
- case 20:
-! #line 506 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
---- 2272,2276 ----
-
- case 20:
-! #line 506 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 0;
-***************
-*** 2281,2285 ****
-
- case 21:
-! #line 512 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2281,2285 ----
-
- case 21:
-! #line 512 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2290,2294 ****
-
- case 22:
-! #line 518 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2290,2294 ----
-
- case 22:
-! #line 518 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2299,2303 ****
-
- case 23:
-! #line 524 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
---- 2299,2303 ----
-
- case 23:
-! #line 524 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 0;
-***************
-*** 2309,2313 ****
-
- case 24:
-! #line 531 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2309,2313 ----
-
- case 24:
-! #line 531 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2319,2323 ****
-
- case 25:
-! #line 538 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2319,2323 ----
-
- case 25:
-! #line 538 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2329,2333 ****
-
- case 26:
-! #line 545 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
---- 2329,2333 ----
-
- case 26:
-! #line 545 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 0;
-***************
-*** 2339,2343 ****
-
- case 27:
-! #line 552 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2339,2343 ----
-
- case 27:
-! #line 552 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2349,2353 ****
-
- case 28:
-! #line 559 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2349,2353 ----
-
- case 28:
-! #line 559 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2359,2363 ****
-
- case 29:
-! #line 566 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
---- 2359,2363 ----
-
- case 29:
-! #line 566 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 0;
-***************
-*** 2368,2372 ****
-
- case 30:
-! #line 572 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2368,2372 ----
-
- case 30:
-! #line 572 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2377,2381 ****
-
- case 31:
-! #line 578 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2377,2381 ----
-
- case 31:
-! #line 578 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2386,2390 ****
-
- case 32:
-! #line 584 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
---- 2386,2390 ----
-
- case 32:
-! #line 584 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 0;
-***************
-*** 2395,2399 ****
-
- case 33:
-! #line 590 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2395,2399 ----
-
- case 33:
-! #line 590 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2404,2408 ****
-
- case 34:
-! #line 596 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2404,2408 ----
-
- case 34:
-! #line 596 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2413,2417 ****
-
- case 35:
-! #line 602 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
---- 2413,2417 ----
-
- case 35:
-! #line 602 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 1;
-***************
-*** 2422,2426 ****
-
- case 36:
-! #line 608 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2422,2426 ----
-
- case 36:
-! #line 608 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2431,2435 ****
-
- case 37:
-! #line 614 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2431,2435 ----
-
- case 37:
-! #line 614 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2440,2444 ****
-
- case 38:
-! #line 620 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
---- 2440,2444 ----
-
- case 38:
-! #line 620 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 0;
-***************
-*** 2449,2453 ****
-
- case 39:
-! #line 626 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2449,2453 ----
-
- case 39:
-! #line 626 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2458,2462 ****
-
- case 40:
-! #line 632 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2458,2462 ----
-
- case 40:
-! #line 632 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2467,2471 ****
-
- case 41:
-! #line 638 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
---- 2467,2471 ----
-
- case 41:
-! #line 638 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 1;
-***************
-*** 2476,2480 ****
-
- case 42:
-! #line 644 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2476,2480 ----
-
- case 42:
-! #line 644 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2485,2489 ****
-
- case 43:
-! #line 650 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2485,2489 ----
-
- case 43:
-! #line 650 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2494,2498 ****
-
- case 44:
-! #line 656 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
---- 2494,2498 ----
-
- case 44:
-! #line 656 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 1;
-***************
-*** 2503,2507 ****
-
- case 45:
-! #line 662 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2503,2507 ----
-
- case 45:
-! #line 662 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2512,2516 ****
-
- case 46:
-! #line 668 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2512,2516 ----
-
- case 46:
-! #line 668 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2521,2525 ****
-
- case 47:
-! #line 674 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 0;
---- 2521,2525 ----
-
- case 47:
-! #line 674 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 0;
-***************
-*** 2530,2534 ****
-
- case 48:
-! #line 680 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
---- 2530,2534 ----
-
- case 48:
-! #line 680 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = (yyvsp[(1) - (3)].number);
-***************
-*** 2539,2543 ****
-
- case 49:
-! #line 686 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
---- 2539,2543 ----
-
- case 49:
-! #line 686 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.filename = (yyvsp[(1) - (3)].word);
-***************
-*** 2548,2552 ****
-
- case 50:
-! #line 692 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
---- 2548,2552 ----
-
- case 50:
-! #line 692 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 1;
-***************
-*** 2557,2561 ****
-
- case 51:
-! #line 698 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- source.dest = 1;
---- 2557,2561 ----
-
- case 51:
-! #line 698 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- source.dest = 1;
-***************
-*** 2566,2585 ****
-
- case 52:
-! #line 706 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
- break;
-
- case 53:
-! #line 708 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
- break;
-
- case 54:
-! #line 710 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.element).redirect = (yyvsp[(1) - (1)].redirect); (yyval.element).word = 0; }
- break;
-
- case 55:
-! #line 714 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.redirect) = (yyvsp[(1) - (1)].redirect);
---- 2566,2585 ----
-
- case 52:
-! #line 706 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
- break;
-
- case 53:
-! #line 708 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
- break;
-
- case 54:
-! #line 710 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.element).redirect = (yyvsp[(1) - (1)].redirect); (yyval.element).word = 0; }
- break;
-
- case 55:
-! #line 714 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.redirect) = (yyvsp[(1) - (1)].redirect);
-***************
-*** 2588,2592 ****
-
- case 56:
-! #line 718 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- register REDIRECT *t;
---- 2588,2592 ----
-
- case 56:
-! #line 718 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- register REDIRECT *t;
-***************
-*** 2600,2624 ****
-
- case 57:
-! #line 729 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_simple_command ((yyvsp[(1) - (1)].element), (COMMAND *)NULL); }
- break;
-
- case 58:
-! #line 731 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_simple_command ((yyvsp[(2) - (2)].element), (yyvsp[(1) - (2)].command)); }
- break;
-
- case 59:
-! #line 735 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = clean_simple_command ((yyvsp[(1) - (1)].command)); }
- break;
-
- case 60:
-! #line 737 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 61:
-! #line 739 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- COMMAND *tc;
---- 2600,2624 ----
-
- case 57:
-! #line 729 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_simple_command ((yyvsp[(1) - (1)].element), (COMMAND *)NULL); }
- break;
-
- case 58:
-! #line 731 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_simple_command ((yyvsp[(2) - (2)].element), (yyvsp[(1) - (2)].command)); }
- break;
-
- case 59:
-! #line 735 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = clean_simple_command ((yyvsp[(1) - (1)].command)); }
- break;
-
- case 60:
-! #line 737 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 61:
-! #line 739 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- COMMAND *tc;
-***************
-*** 2639,2708 ****
-
- case 62:
-! #line 755 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 63:
-! #line 757 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 64:
-! #line 761 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 65:
-! #line 763 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 66:
-! #line 765 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_while_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
- break;
-
- case 67:
-! #line 767 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_until_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
- break;
-
- case 68:
-! #line 769 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 69:
-! #line 771 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 70:
-! #line 773 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 71:
-! #line 775 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 72:
-! #line 777 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 73:
-! #line 779 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 74:
-! #line 781 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 75:
-! #line 785 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
---- 2639,2708 ----
-
- case 62:
-! #line 755 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 63:
-! #line 757 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 64:
-! #line 761 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 65:
-! #line 763 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 66:
-! #line 765 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_while_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
- break;
-
- case 67:
-! #line 767 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_until_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
- break;
-
- case 68:
-! #line 769 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 69:
-! #line 771 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 70:
-! #line 773 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 71:
-! #line 775 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 72:
-! #line 777 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 73:
-! #line 779 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 74:
-! #line 781 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 75:
-! #line 785 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
-***************
-*** 2712,2716 ****
-
- case 76:
-! #line 790 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
---- 2712,2716 ----
-
- case 76:
-! #line 790 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
-***************
-*** 2720,2724 ****
-
- case 77:
-! #line 795 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
---- 2720,2724 ----
-
- case 77:
-! #line 795 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
-***************
-*** 2728,2732 ****
-
- case 78:
-! #line 800 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
---- 2728,2732 ----
-
- case 78:
-! #line 800 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
-***************
-*** 2736,2740 ****
-
- case 79:
-! #line 805 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
---- 2736,2740 ----
-
- case 79:
-! #line 805 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
-***************
-*** 2744,2748 ****
-
- case 80:
-! #line 810 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
---- 2744,2748 ----
-
- case 80:
-! #line 810 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
-***************
-*** 2752,2756 ****
-
- case 81:
-! #line 815 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
---- 2752,2756 ----
-
- case 81:
-! #line 815 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
-***************
-*** 2760,2764 ****
-
- case 82:
-! #line 820 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
---- 2760,2764 ----
-
- case 82:
-! #line 820 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
-***************
-*** 2768,2772 ****
-
- case 83:
-! #line 827 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
---- 2768,2772 ----
-
- case 83:
-! #line 827 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
-***************
-*** 2776,2780 ****
-
- case 84:
-! #line 832 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
---- 2776,2780 ----
-
- case 84:
-! #line 832 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
-***************
-*** 2784,2788 ****
-
- case 85:
-! #line 837 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
---- 2784,2788 ----
-
- case 85:
-! #line 837 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
-***************
-*** 2792,2796 ****
-
- case 86:
-! #line 842 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
---- 2792,2796 ----
-
- case 86:
-! #line 842 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
-***************
-*** 2800,2804 ****
-
- case 87:
-! #line 849 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
---- 2800,2804 ----
-
- case 87:
-! #line 849 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
-***************
-*** 2808,2812 ****
-
- case 88:
-! #line 854 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
---- 2808,2812 ----
-
- case 88:
-! #line 854 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
-***************
-*** 2816,2820 ****
-
- case 89:
-! #line 859 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
---- 2816,2820 ----
-
- case 89:
-! #line 859 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
-***************
-*** 2824,2828 ****
-
- case 90:
-! #line 864 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
---- 2824,2828 ----
-
- case 90:
-! #line 864 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
-***************
-*** 2832,2836 ****
-
- case 91:
-! #line 869 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
---- 2832,2836 ----
-
- case 91:
-! #line 869 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
-***************
-*** 2840,2844 ****
-
- case 92:
-! #line 874 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
---- 2840,2844 ----
-
- case 92:
-! #line 874 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
-***************
-*** 2848,2852 ****
-
- case 93:
-! #line 881 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (PATTERN_LIST *)NULL, word_lineno[word_top]);
---- 2848,2852 ----
-
- case 93:
-! #line 881 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (PATTERN_LIST *)NULL, word_lineno[word_top]);
-***************
-*** 2856,2860 ****
-
- case 94:
-! #line 886 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_case_command ((yyvsp[(2) - (7)].word), (yyvsp[(5) - (7)].pattern), word_lineno[word_top]);
---- 2856,2860 ----
-
- case 94:
-! #line 886 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_case_command ((yyvsp[(2) - (7)].word), (yyvsp[(5) - (7)].pattern), word_lineno[word_top]);
-***************
-*** 2864,2868 ****
-
- case 95:
-! #line 891 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (yyvsp[(5) - (6)].pattern), word_lineno[word_top]);
---- 2864,2868 ----
-
- case 95:
-! #line 891 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (yyvsp[(5) - (6)].pattern), word_lineno[word_top]);
-***************
-*** 2872,2896 ****
-
- case 96:
-! #line 898 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_function_def ((yyvsp[(1) - (5)].word), (yyvsp[(5) - (5)].command), function_dstart, function_bstart); }
- break;
-
- case 97:
-! #line 901 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_function_def ((yyvsp[(2) - (6)].word), (yyvsp[(6) - (6)].command), function_dstart, function_bstart); }
- break;
-
- case 98:
-! #line 904 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_function_def ((yyvsp[(2) - (4)].word), (yyvsp[(4) - (4)].command), function_dstart, function_bstart); }
- break;
-
- case 99:
-! #line 908 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 100:
-! #line 910 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- COMMAND *tc;
---- 2872,2896 ----
-
- case 96:
-! #line 898 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_function_def ((yyvsp[(1) - (5)].word), (yyvsp[(5) - (5)].command), function_dstart, function_bstart); }
- break;
-
- case 97:
-! #line 901 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_function_def ((yyvsp[(2) - (6)].word), (yyvsp[(6) - (6)].command), function_dstart, function_bstart); }
- break;
-
- case 98:
-! #line 904 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_function_def ((yyvsp[(2) - (4)].word), (yyvsp[(4) - (4)].command), function_dstart, function_bstart); }
- break;
-
- case 99:
-! #line 908 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 100:
-! #line 910 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- COMMAND *tc;
-***************
-*** 2924,2928 ****
-
- case 101:
-! #line 941 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_subshell_command ((yyvsp[(2) - (3)].command));
---- 2924,2928 ----
-
- case 101:
-! #line 941 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_subshell_command ((yyvsp[(2) - (3)].command));
-***************
-*** 2932,2936 ****
-
- case 102:
-! #line 948 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_coproc_command ("COPROC", (yyvsp[(2) - (2)].command));
---- 2932,2936 ----
-
- case 102:
-! #line 948 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_coproc_command ("COPROC", (yyvsp[(2) - (2)].command));
-***************
-*** 2940,2944 ****
-
- case 103:
-! #line 953 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- COMMAND *tc;
---- 2940,2944 ----
-
- case 103:
-! #line 953 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- COMMAND *tc;
-***************
-*** 2960,2964 ****
-
- case 104:
-! #line 970 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_coproc_command ((yyvsp[(2) - (3)].word)->word, (yyvsp[(3) - (3)].command));
---- 2960,2964 ----
-
- case 104:
-! #line 970 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_coproc_command ((yyvsp[(2) - (3)].word)->word, (yyvsp[(3) - (3)].command));
-***************
-*** 2968,2972 ****
-
- case 105:
-! #line 975 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- COMMAND *tc;
---- 2968,2972 ----
-
- case 105:
-! #line 975 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- COMMAND *tc;
-***************
-*** 2988,2992 ****
-
- case 106:
-! #line 992 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = make_coproc_command ("COPROC", clean_simple_command ((yyvsp[(2) - (2)].command)));
---- 2988,2992 ----
-
- case 106:
-! #line 992 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = make_coproc_command ("COPROC", clean_simple_command ((yyvsp[(2) - (2)].command)));
-***************
-*** 2996,3110 ****
-
- case 107:
-! #line 999 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (COMMAND *)NULL); }
- break;
-
- case 108:
-! #line 1001 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (7)].command), (yyvsp[(4) - (7)].command), (yyvsp[(6) - (7)].command)); }
- break;
-
- case 109:
-! #line 1003 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(5) - (6)].command)); }
- break;
-
- case 110:
-! #line 1008 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_group_command ((yyvsp[(2) - (3)].command)); }
- break;
-
- case 111:
-! #line 1012 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_arith_command ((yyvsp[(1) - (1)].word_list)); }
- break;
-
- case 112:
-! #line 1016 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(2) - (3)].command); }
- break;
-
- case 113:
-! #line 1020 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (4)].command), (yyvsp[(4) - (4)].command), (COMMAND *)NULL); }
- break;
-
- case 114:
-! #line 1022 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(6) - (6)].command)); }
- break;
-
- case 115:
-! #line 1024 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (yyvsp[(5) - (5)].command)); }
- break;
-
- case 117:
-! #line 1029 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyvsp[(2) - (2)].pattern)->next = (yyvsp[(1) - (2)].pattern); (yyval.pattern) = (yyvsp[(2) - (2)].pattern); }
- break;
-
- case 118:
-! #line 1033 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (yyvsp[(4) - (4)].command)); }
- break;
-
- case 119:
-! #line 1035 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (COMMAND *)NULL); }
- break;
-
- case 120:
-! #line 1037 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (yyvsp[(5) - (5)].command)); }
- break;
-
- case 121:
-! #line 1039 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (COMMAND *)NULL); }
- break;
-
- case 122:
-! #line 1043 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
- break;
-
- case 123:
-! #line 1045 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
- break;
-
- case 124:
-! #line 1047 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
- break;
-
- case 125:
-! #line 1049 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
- break;
-
- case 126:
-! #line 1051 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_TESTNEXT; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
- break;
-
- case 127:
-! #line 1053 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_TESTNEXT; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
- break;
-
- case 128:
-! #line 1057 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
- break;
-
- case 129:
-! #line 1059 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(3) - (3)].word), (yyvsp[(1) - (3)].word_list)); }
- break;
-
- case 130:
-! #line 1068 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = (yyvsp[(2) - (2)].command);
---- 2996,3110 ----
-
- case 107:
-! #line 999 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (COMMAND *)NULL); }
- break;
-
- case 108:
-! #line 1001 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (7)].command), (yyvsp[(4) - (7)].command), (yyvsp[(6) - (7)].command)); }
- break;
-
- case 109:
-! #line 1003 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(5) - (6)].command)); }
- break;
-
- case 110:
-! #line 1008 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_group_command ((yyvsp[(2) - (3)].command)); }
- break;
-
- case 111:
-! #line 1012 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_arith_command ((yyvsp[(1) - (1)].word_list)); }
- break;
-
- case 112:
-! #line 1016 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(2) - (3)].command); }
- break;
-
- case 113:
-! #line 1020 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (4)].command), (yyvsp[(4) - (4)].command), (COMMAND *)NULL); }
- break;
-
- case 114:
-! #line 1022 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(6) - (6)].command)); }
- break;
-
- case 115:
-! #line 1024 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (yyvsp[(5) - (5)].command)); }
- break;
-
- case 117:
-! #line 1029 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyvsp[(2) - (2)].pattern)->next = (yyvsp[(1) - (2)].pattern); (yyval.pattern) = (yyvsp[(2) - (2)].pattern); }
- break;
-
- case 118:
-! #line 1033 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (yyvsp[(4) - (4)].command)); }
- break;
-
- case 119:
-! #line 1035 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (COMMAND *)NULL); }
- break;
-
- case 120:
-! #line 1037 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (yyvsp[(5) - (5)].command)); }
- break;
-
- case 121:
-! #line 1039 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (COMMAND *)NULL); }
- break;
-
- case 122:
-! #line 1043 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
- break;
-
- case 123:
-! #line 1045 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
- break;
-
- case 124:
-! #line 1047 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
- break;
-
- case 125:
-! #line 1049 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
- break;
-
- case 126:
-! #line 1051 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_TESTNEXT; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
- break;
-
- case 127:
-! #line 1053 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_TESTNEXT; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
- break;
-
- case 128:
-! #line 1057 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
- break;
-
- case 129:
-! #line 1059 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.word_list) = make_word_list ((yyvsp[(3) - (3)].word), (yyvsp[(1) - (3)].word_list)); }
- break;
-
- case 130:
-! #line 1068 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = (yyvsp[(2) - (2)].command);
-***************
-*** 3115,3119 ****
-
- case 132:
-! #line 1077 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = (yyvsp[(2) - (2)].command);
---- 3115,3119 ----
-
- case 132:
-! #line 1077 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = (yyvsp[(2) - (2)].command);
-***************
-*** 3122,3126 ****
-
- case 134:
-! #line 1084 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- if ((yyvsp[(1) - (3)].command)->type == cm_connection)
---- 3122,3126 ----
-
- case 134:
-! #line 1084 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- if ((yyvsp[(1) - (3)].command)->type == cm_connection)
-***************
-*** 3132,3146 ****
-
- case 136:
-! #line 1095 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
- break;
-
- case 137:
-! #line 1097 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
- break;
-
- case 138:
-! #line 1099 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- if ((yyvsp[(1) - (4)].command)->type == cm_connection)
---- 3132,3146 ----
-
- case 136:
-! #line 1095 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
- break;
-
- case 137:
-! #line 1097 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
- break;
-
- case 138:
-! #line 1099 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- if ((yyvsp[(1) - (4)].command)->type == cm_connection)
-***************
-*** 3152,3186 ****
-
- case 139:
-! #line 1106 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
- break;
-
- case 140:
-! #line 1108 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
- break;
-
- case 141:
-! #line 1110 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 144:
-! #line 1118 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.number) = '\n'; }
- break;
-
- case 145:
-! #line 1120 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.number) = ';'; }
- break;
-
- case 146:
-! #line 1122 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.number) = yacc_EOF; }
- break;
-
- case 149:
-! #line 1136 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = (yyvsp[(1) - (1)].command);
---- 3152,3186 ----
-
- case 139:
-! #line 1106 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
- break;
-
- case 140:
-! #line 1108 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
- break;
-
- case 141:
-! #line 1110 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 144:
-! #line 1118 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.number) = '\n'; }
- break;
-
- case 145:
-! #line 1120 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.number) = ';'; }
- break;
-
- case 146:
-! #line 1122 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.number) = yacc_EOF; }
- break;
-
- case 149:
-! #line 1136 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = (yyvsp[(1) - (1)].command);
-***************
-*** 3198,3202 ****
-
- case 150:
-! #line 1149 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- if ((yyvsp[(1) - (2)].command)->type == cm_connection)
---- 3198,3202 ----
-
- case 150:
-! #line 1149 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- if ((yyvsp[(1) - (2)].command)->type == cm_connection)
-***************
-*** 3217,3221 ****
-
- case 151:
-! #line 1165 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- (yyval.command) = (yyvsp[(1) - (2)].command);
---- 3217,3221 ----
-
- case 151:
-! #line 1165 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- (yyval.command) = (yyvsp[(1) - (2)].command);
-***************
-*** 3233,3247 ****
-
- case 152:
-! #line 1180 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
- break;
-
- case 153:
-! #line 1182 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
- break;
-
- case 154:
-! #line 1184 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- if ((yyvsp[(1) - (3)].command)->type == cm_connection)
---- 3233,3247 ----
-
- case 152:
-! #line 1180 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
- break;
-
- case 153:
-! #line 1182 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
- break;
-
- case 154:
-! #line 1184 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- if ((yyvsp[(1) - (3)].command)->type == cm_connection)
-***************
-*** 3253,3272 ****
-
- case 155:
-! #line 1191 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), ';'); }
- break;
-
- case 156:
-! #line 1194 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 157:
-! #line 1198 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 158:
-! #line 1200 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- if ((yyvsp[(2) - (2)].command))
---- 3253,3272 ----
-
- case 155:
-! #line 1191 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), ';'); }
- break;
-
- case 156:
-! #line 1194 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 157:
-! #line 1198 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 158:
-! #line 1200 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- if ((yyvsp[(2) - (2)].command))
-***************
-*** 3277,3281 ****
-
- case 159:
-! #line 1206 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- if ((yyvsp[(2) - (2)].command))
---- 3277,3281 ----
-
- case 159:
-! #line 1206 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- if ((yyvsp[(2) - (2)].command))
-***************
-*** 3286,3290 ****
-
- case 160:
-! #line 1212 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- ELEMENT x;
---- 3286,3290 ----
-
- case 160:
-! #line 1212 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- ELEMENT x;
-***************
-*** 3306,3310 ****
-
- case 161:
-! #line 1229 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- ELEMENT x;
---- 3306,3310 ----
-
- case 161:
-! #line 1229 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- ELEMENT x;
-***************
-*** 3327,3336 ****
-
- case 162:
-! #line 1249 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '|'); }
- break;
-
- case 163:
-! #line 1251 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- {
- /* Make cmd1 |& cmd2 equivalent to cmd1 2>&1 | cmd2 */
---- 3327,3336 ----
-
- case 162:
-! #line 1249 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '|'); }
- break;
-
- case 163:
-! #line 1251 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- {
- /* Make cmd1 |& cmd2 equivalent to cmd1 2>&1 | cmd2 */
-***************
-*** 3358,3377 ****
-
- case 164:
-! #line 1274 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 165:
-! #line 1278 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.number) = CMD_TIME_PIPELINE; }
- break;
-
- case 166:
-! #line 1280 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
- break;
-
- case 167:
-! #line 1282 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
- { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
- break;
---- 3358,3377 ----
-
- case 164:
-! #line 1274 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.command) = (yyvsp[(1) - (1)].command); }
- break;
-
- case 165:
-! #line 1278 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.number) = CMD_TIME_PIPELINE; }
- break;
-
- case 166:
-! #line 1280 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
- break;
-
- case 167:
-! #line 1282 "/usr/src/local/bash/bash-4.3-patched/parse.y"
- { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
- break;
-***************
-*** 3593,3597 ****
-
-
-! #line 1284 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
-
-
---- 3593,3597 ----
-
-
-! #line 1284 "/usr/src/local/bash/bash-4.3-patched/parse.y"
-
-
-***************
-*** 4851,4854 ****
---- 4851,4864 ----
- }
-
-+ char *
-+ parser_remaining_input ()
-+ {
-+ if (shell_input_line == 0)
-+ return 0;
-+ if (shell_input_line_index < 0 || shell_input_line_index >= shell_input_line_len)
-+ return '\0'; /* XXX */
-+ return (shell_input_line + shell_input_line_index);
-+ }
-+
- #ifdef INCLUDE_UNUSED
- /* Back the input pointer up by one, effectively `ungetting' a character. */
-***************
-*** 6340,6345 ****
- /* reset_parser clears shell_input_line and associated variables */
- restore_input_line_state (&ls);
-! if (interactive)
-! token_to_read = 0;
-
- /* Need to find how many characters parse_and_execute consumed, update
---- 6350,6355 ----
- /* reset_parser clears shell_input_line and associated variables */
- restore_input_line_state (&ls);
-!
-! token_to_read = 0;
-
- /* Need to find how many characters parse_and_execute consumed, update
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 29
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 30
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-031 b/srcpkgs/bash/files/bash43-031
deleted file mode 100644
index a6519560a8..0000000000
--- a/srcpkgs/bash/files/bash43-031
+++ /dev/null
@@ -1,112 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-031
-
-Bug-Reported-by: lolilolicon
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00139.html
-
-Bug-Description:
-
-The new nameref assignment functionality introduced in bash-4.3 did not perform
-enough validation on the variable value and would create variables with
-invalid names.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/subst.h 2014-01-11 21:02:27.000000000 -0500
---- subst.h 2014-09-01 12:16:56.000000000 -0400
-***************
-*** 48,51 ****
---- 48,52 ----
- #define ASS_MKGLOBAL 0x0008 /* force global assignment */
- #define ASS_NAMEREF 0x0010 /* assigning to nameref variable */
-+ #define ASS_FROMREF 0x0020 /* assigning from value of nameref variable */
-
- /* Flags for the string extraction functions. */
-*** ../bash-4.3-patched/variables.c 2014-05-15 08:26:50.000000000 -0400
---- variables.c 2014-09-01 14:37:44.000000000 -0400
-***************
-*** 2504,2511 ****
- int hflags, aflags;
- {
-! char *newval;
- SHELL_VAR *entry;
-
- entry = (hflags & HASH_NOSRCH) ? (SHELL_VAR *)NULL : hash_lookup (name, table);
- /* Follow the nameref chain here if this is the global variables table */
- if (entry && nameref_p (entry) && (invisible_p (entry) == 0) && table == global_variables->table)
---- 2566,2590 ----
- int hflags, aflags;
- {
-! char *newname, *newval;
- SHELL_VAR *entry;
-+ #if defined (ARRAY_VARS)
-+ arrayind_t ind;
-+ char *subp;
-+ int sublen;
-+ #endif
-
-+ newname = 0;
-+ #if defined (ARRAY_VARS)
-+ if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference (name))
-+ {
-+ newname = array_variable_name (name, &subp, &sublen);
-+ if (newname == 0)
-+ return (SHELL_VAR *)NULL; /* XXX */
-+ entry = hash_lookup (newname, table);
-+ }
-+ else
-+ #endif
- entry = (hflags & HASH_NOSRCH) ? (SHELL_VAR *)NULL : hash_lookup (name, table);
-+
- /* Follow the nameref chain here if this is the global variables table */
- if (entry && nameref_p (entry) && (invisible_p (entry) == 0) && table == global_variables->table)
-***************
-*** 2538,2541 ****
---- 2617,2630 ----
- }
- }
-+ #if defined (ARRAY_VARS)
-+ else if (entry == 0 && newname)
-+ {
-+ entry = make_new_array_variable (newname); /* indexed array by default */
-+ if (entry == 0)
-+ return entry;
-+ ind = array_expand_index (name, subp, sublen);
-+ bind_array_element (entry, ind, value, aflags);
-+ }
-+ #endif
- else if (entry == 0)
- {
-***************
-*** 2658,2662 ****
- if (nameref_cell (nv) == 0)
- return (bind_variable_internal (nv->name, value, nvc->table, 0, flags));
-! return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags));
- }
- else
---- 2747,2752 ----
- if (nameref_cell (nv) == 0)
- return (bind_variable_internal (nv->name, value, nvc->table, 0, flags));
-! /* XXX - bug here with ref=array[index] */
-! return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags|ASS_FROMREF));
- }
- else
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 30
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 31
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-032 b/srcpkgs/bash/files/bash43-032
deleted file mode 100644
index 0843719cb2..0000000000
--- a/srcpkgs/bash/files/bash43-032
+++ /dev/null
@@ -1,51 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-032
-
-Bug-Reported-by: crispusfairbairn@gmail.com
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00013.html
-
-Bug-Description:
-
-When bash is running in Posix mode, it allows signals -- including SIGCHLD --
-to interrupt the `wait' builtin, as Posix requires. However, the interrupt
-causes bash to not run a SIGCHLD trap for all exited children. This patch
-fixes the issue and restores the documented behavior in Posix mode.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/jobs.c 2014-05-14 09:20:15.000000000 -0400
---- jobs.c 2014-09-09 11:50:38.000000000 -0400
-***************
-*** 3340,3344 ****
- {
- interrupt_immediately = 0;
-! trap_handler (SIGCHLD); /* set pending_traps[SIGCHLD] */
- wait_signal_received = SIGCHLD;
- /* If we're in a signal handler, let CHECK_WAIT_INTR pick it up;
---- 3346,3352 ----
- {
- interrupt_immediately = 0;
-! /* This was trap_handler (SIGCHLD) but that can lose traps if
-! children_exited > 1 */
-! queue_sigchld_trap (children_exited);
- wait_signal_received = SIGCHLD;
- /* If we're in a signal handler, let CHECK_WAIT_INTR pick it up;
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 31
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 32
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-033 b/srcpkgs/bash/files/bash43-033
deleted file mode 100644
index 5f5147ffdc..0000000000
--- a/srcpkgs/bash/files/bash43-033
+++ /dev/null
@@ -1,225 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-033
-
-Bug-Reported-by: mickael9@gmail.com, Jan Rome
-Bug-Reference-ID: <20140907224046.382ED3610CC@mickael-laptop.localdomain>,
- <540D661D.50908@gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00029.html
- http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00030.html
-
-Bug-Description:
-
-Bash does not clean up the terminal state in all cases where bash or
-readline modifies it and bash is subsequently terminated by a fatal signal.
-This happens when the `read' builtin modifies the terminal settings, both
-when readline is active and when it is not. It occurs most often when a script
-installs a trap that exits on a signal without re-sending the signal to itself.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/shell.c 2014-01-14 08:04:32.000000000 -0500
---- shell.c 2014-12-22 10:27:50.000000000 -0500
-***************
-*** 74,77 ****
---- 74,78 ----
-
- #if defined (READLINE)
-+ # include
- # include "bashline.h"
- #endif
-***************
-*** 910,913 ****
---- 912,923 ----
- fflush (stderr);
-
-+ /* Clean up the terminal if we are in a state where it's been modified. */
-+ #if defined (READLINE)
-+ if (RL_ISSTATE (RL_STATE_TERMPREPPED) && rl_deprep_term_function)
-+ (*rl_deprep_term_function) ();
-+ #endif
-+ if (read_tty_modified ())
-+ read_tty_cleanup ();
-+
- /* Do trap[0] if defined. Allow it to override the exit status
- passed to us. */
-*** ../bash-4.3-patched/builtins/read.def 2014-10-01 12:57:38.000000000 -0400
---- builtins/read.def 2014-12-22 10:48:54.000000000 -0500
-***************
-*** 141,148 ****
- int sigalrm_seen;
-
-! static int reading;
- static SigHandler *old_alrm;
- static unsigned char delim;
-
- /* In all cases, SIGALRM just sets a flag that we check periodically. This
- avoids problems with the semi-tricky stuff we do with the xfree of
---- 141,150 ----
- int sigalrm_seen;
-
-! static int reading, tty_modified;
- static SigHandler *old_alrm;
- static unsigned char delim;
-
-+ static struct ttsave termsave;
-+
- /* In all cases, SIGALRM just sets a flag that we check periodically. This
- avoids problems with the semi-tricky stuff we do with the xfree of
-***************
-*** 189,193 ****
- SHELL_VAR *var;
- TTYSTRUCT ttattrs, ttset;
-- struct ttsave termsave;
- #if defined (ARRAY_VARS)
- WORD_LIST *alist;
---- 191,194 ----
-***************
-*** 222,226 ****
- USE_VAR(lastsig);
-
-! sigalrm_seen = reading = 0;
-
- i = 0; /* Index into the string that we are reading. */
---- 223,227 ----
- USE_VAR(lastsig);
-
-! sigalrm_seen = reading = tty_modified = 0;
-
- i = 0; /* Index into the string that we are reading. */
-***************
-*** 439,442 ****
---- 440,445 ----
- goto assign_vars;
- }
-+ if (interactive_shell == 0)
-+ initialize_terminating_signals ();
- old_alrm = set_signal_handler (SIGALRM, sigalrm);
- add_unwind_protect (reset_alarm, (char *)NULL);
-***************
-*** 483,487 ****
---- 486,493 ----
- if (i < 0)
- sh_ttyerror (1);
-+ tty_modified = 1;
- add_unwind_protect ((Function *)ttyrestore, (char *)&termsave);
-+ if (interactive_shell == 0)
-+ initialize_terminating_signals ();
- }
- }
-***************
-*** 498,502 ****
---- 504,511 ----
- sh_ttyerror (1);
-
-+ tty_modified = 1;
- add_unwind_protect ((Function *)ttyrestore, (char *)&termsave);
-+ if (interactive_shell == 0)
-+ initialize_terminating_signals ();
- }
-
-***************
-*** 589,592 ****
---- 598,603 ----
- else
- lastsig = 0;
-+ if (terminating_signal && tty_modified)
-+ ttyrestore (&termsave); /* fix terminal before exiting */
- CHECK_TERMSIG;
- eof = 1;
-***************
-*** 979,982 ****
---- 990,1007 ----
- {
- ttsetattr (ttp->fd, ttp->attrs);
-+ tty_modified = 0;
-+ }
-+
-+ void
-+ read_tty_cleanup ()
-+ {
-+ if (tty_modified)
-+ ttyrestore (&termsave);
-+ }
-+
-+ int
-+ read_tty_modified ()
-+ {
-+ return (tty_modified);
- }
-
-*** ../bash-4.3-patched/builtins/common.h 2014-10-01 12:57:47.000000000 -0400
---- builtins/common.h 2014-12-22 10:10:14.000000000 -0500
-***************
-*** 123,126 ****
---- 141,148 ----
- extern void getopts_reset __P((int));
-
-+ /* Functions from read.def */
-+ extern void read_tty_cleanup __P((void));
-+ extern int read_tty_modified __P((void));
-+
- /* Functions from set.def */
- extern int minus_o_option_value __P((char *));
-*** ../bash-4.3-patched/bashline.c 2014-05-14 09:22:39.000000000 -0400
---- bashline.c 2014-09-08 11:28:56.000000000 -0400
-***************
-*** 203,206 ****
---- 203,207 ----
- extern int array_needs_making;
- extern int posixly_correct, no_symbolic_links;
-+ extern int sigalrm_seen;
- extern char *current_prompt_string, *ps1_prompt;
- extern STRING_INT_ALIST word_token_alist[];
-***************
-*** 4209,4214 ****
- /* If we're going to longjmp to top_level, make sure we clean up readline.
- check_signals will call QUIT, which will eventually longjmp to top_level,
-! calling run_interrupt_trap along the way. */
-! if (interrupt_state)
- rl_cleanup_after_signal ();
- bashline_reset_event_hook ();
---- 4262,4268 ----
- /* If we're going to longjmp to top_level, make sure we clean up readline.
- check_signals will call QUIT, which will eventually longjmp to top_level,
-! calling run_interrupt_trap along the way. The check for sigalrm_seen is
-! to clean up the read builtin's state. */
-! if (terminating_signal || interrupt_state || sigalrm_seen)
- rl_cleanup_after_signal ();
- bashline_reset_event_hook ();
-*** ../bash-4.3-patched/sig.c 2014-01-10 15:06:06.000000000 -0500
---- sig.c 2014-09-08 11:26:33.000000000 -0400
-***************
-*** 533,538 ****
- /* Set the event hook so readline will call it after the signal handlers
- finish executing, so if this interrupted character input we can get
-! quick response. */
-! if (interactive_shell && interactive && no_line_editing == 0)
- bashline_set_event_hook ();
- #endif
---- 533,540 ----
- /* Set the event hook so readline will call it after the signal handlers
- finish executing, so if this interrupted character input we can get
-! quick response. If readline is active or has modified the terminal we
-! need to set this no matter what the signal is, though the check for
-! RL_STATE_TERMPREPPED is possibly redundant. */
-! if (RL_ISSTATE (RL_STATE_SIGHANDLER) || RL_ISSTATE (RL_STATE_TERMPREPPED))
- bashline_set_event_hook ();
- #endif
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 32
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 33
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-034 b/srcpkgs/bash/files/bash43-034
deleted file mode 100644
index 17372aa2ac..0000000000
--- a/srcpkgs/bash/files/bash43-034
+++ /dev/null
@@ -1,90 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-034
-
-Bug-Reported-by: Dreamcat4
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-05/msg00001.html
-
-Bug-Description:
-
-If neither the -f nor -v options is supplied to unset, and a name argument is
-found to be a function and unset, subsequent name arguments are not treated as
-variables before attempting to unset a function by that name.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/builtins/set.def 2013-04-19 07:20:34.000000000 -0400
---- builtins/set.def 2015-05-05 13:25:36.000000000 -0400
-***************
-*** 752,758 ****
---- 797,805 ----
- {
- int unset_function, unset_variable, unset_array, opt, nameref, any_failed;
-+ int global_unset_func, global_unset_var;
- char *name;
-
- unset_function = unset_variable = unset_array = nameref = any_failed = 0;
-+ global_unset_func = global_unset_var = 0;
-
- reset_internal_getopt ();
-***************
-*** 762,769 ****
- {
- case 'f':
-! unset_function = 1;
- break;
- case 'v':
-! unset_variable = 1;
- break;
- case 'n':
---- 809,816 ----
- {
- case 'f':
-! global_unset_func = 1;
- break;
- case 'v':
-! global_unset_var = 1;
- break;
- case 'n':
-***************
-*** 778,782 ****
- list = loptend;
-
-! if (unset_function && unset_variable)
- {
- builtin_error (_("cannot simultaneously unset a function and a variable"));
---- 825,829 ----
- list = loptend;
-
-! if (global_unset_func && global_unset_var)
- {
- builtin_error (_("cannot simultaneously unset a function and a variable"));
-***************
-*** 796,799 ****
---- 843,849 ----
- name = list->word->word;
-
-+ unset_function = global_unset_func;
-+ unset_variable = global_unset_var;
-+
- #if defined (ARRAY_VARS)
- unset_array = 0;
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 33
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 34
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-035 b/srcpkgs/bash/files/bash43-035
deleted file mode 100644
index f18bc60260..0000000000
--- a/srcpkgs/bash/files/bash43-035
+++ /dev/null
@@ -1,63 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-035
-
-Bug-Reported-by:
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00045.html
-
-Bug-Description:
-
-A locale with a long name can trigger a buffer overflow and core dump. This
-applies on systems that do not have locale_charset in libc, are not using
-GNU libiconv, and are not using the libintl that ships with bash in lib/intl.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/lib/sh/unicode.c 2014-01-30 16:47:19.000000000 -0500
---- lib/sh/unicode.c 2015-05-01 08:58:30.000000000 -0400
-***************
-*** 79,83 ****
- if (s)
- {
-! strcpy (charsetbuf, s+1);
- t = strchr (charsetbuf, '@');
- if (t)
---- 79,84 ----
- if (s)
- {
-! strncpy (charsetbuf, s+1, sizeof (charsetbuf) - 1);
-! charsetbuf[sizeof (charsetbuf) - 1] = '\0';
- t = strchr (charsetbuf, '@');
- if (t)
-***************
-*** 85,89 ****
- return charsetbuf;
- }
-! strcpy (charsetbuf, locale);
- return charsetbuf;
- }
---- 86,91 ----
- return charsetbuf;
- }
-! strncpy (charsetbuf, locale, sizeof (charsetbuf) - 1);
-! charsetbuf[sizeof (charsetbuf) - 1] = '\0';
- return charsetbuf;
- }
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 34
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 35
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-036 b/srcpkgs/bash/files/bash43-036
deleted file mode 100644
index 5b42c246c1..0000000000
--- a/srcpkgs/bash/files/bash43-036
+++ /dev/null
@@ -1,57 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-036
-
-Bug-Reported-by: emanuelczirai@cryptolab.net
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00071.html
-
-Bug-Description:
-
-When evaluating and setting integer variables, and the assignment fails to
-create a variable (for example, when performing an operation on an array
-variable with an invalid subscript), bash attempts to dereference a null
-pointer, causing a segmentation violation.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-20150206/variables.c 2015-01-23 20:39:27.000000000 -0500
---- variables.c 2015-02-19 13:56:12.000000000 -0500
-***************
-*** 2834,2841 ****
- v = bind_variable (lhs, rhs, 0);
-
-! if (v && isint)
-! VSETATTR (v, att_integer);
-!
-! VUNSETATTR (v, att_invisible);
-
- return (v);
---- 2834,2843 ----
- v = bind_variable (lhs, rhs, 0);
-
-! if (v)
-! {
-! if (isint)
-! VSETATTR (v, att_integer);
-! VUNSETATTR (v, att_invisible);
-! }
-
- return (v);
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 35
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 36
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-037 b/srcpkgs/bash/files/bash43-037
deleted file mode 100644
index f04012bada..0000000000
--- a/srcpkgs/bash/files/bash43-037
+++ /dev/null
@@ -1,43 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-037
-
-Bug-Reported-by: Greg Wooledge
-Bug-Reference-ID: <20150204144240.GN13956@eeg.ccf.org>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00007.html
-
-Bug-Description:
-
-If an associative array uses `@' or `*' as a subscript, `declare -p' produces
-output that cannot be reused as input.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/assoc.c 2011-11-05 16:39:05.000000000 -0400
---- assoc.c 2015-02-04 15:28:25.000000000 -0500
-***************
-*** 437,440 ****
---- 440,445 ----
- if (sh_contains_shell_metas (tlist->key))
- istr = sh_double_quote (tlist->key);
-+ else if (ALL_ELEMENT_SUB (tlist->key[0]) && tlist->key[1] == '\0')
-+ istr = sh_double_quote (tlist->key);
- else
- istr = tlist->key;
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 36
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 37
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-038 b/srcpkgs/bash/files/bash43-038
deleted file mode 100644
index e0de74e081..0000000000
--- a/srcpkgs/bash/files/bash43-038
+++ /dev/null
@@ -1,88 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-038
-
-Bug-Reported-by: worley@alum.mit.edu (Dale R. Worley)
-Bug-Reference-ID: <201406100051.s5A0pCeB014978@hobgoblin.ariadne.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00028.html
-
-Bug-Description:
-
-There are a number of instances where `time' is not recognized as a reserved
-word when the shell grammar says it should be.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/parse.y 2014-04-07 11:56:12.000000000 -0400
---- parse.y 2014-06-11 10:25:53.000000000 -0400
-***************
-*** 2819,2827 ****
- case OR_OR:
- case '&':
- case DO:
- case THEN:
- case ELSE:
- case '{': /* } */
-! case '(': /* ) */
- case BANG: /* ! time pipeline */
- case TIME: /* time time pipeline */
---- 2819,2832 ----
- case OR_OR:
- case '&':
-+ case WHILE:
- case DO:
-+ case UNTIL:
-+ case IF:
- case THEN:
-+ case ELIF:
- case ELSE:
- case '{': /* } */
-! case '(': /* )( */
-! case ')': /* only valid in case statement */
- case BANG: /* ! time pipeline */
- case TIME: /* time time pipeline */
-*** ../bash-4.3-patched/y.tab.c 2014-10-05 13:52:50.000000000 -0400
---- y.tab.c 2015-05-19 15:08:43.000000000 -0400
-***************
-*** 5131,5139 ****
- case OR_OR:
- case '&':
- case DO:
- case THEN:
- case ELSE:
- case '{': /* } */
-! case '(': /* ) */
- case BANG: /* ! time pipeline */
- case TIME: /* time time pipeline */
---- 5131,5144 ----
- case OR_OR:
- case '&':
-+ case WHILE:
- case DO:
-+ case UNTIL:
-+ case IF:
- case THEN:
-+ case ELIF:
- case ELSE:
- case '{': /* } */
-! case '(': /* )( */
-! case ')': /* only valid in case statement */
- case BANG: /* ! time pipeline */
- case TIME: /* time time pipeline */
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 37
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 38
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-039 b/srcpkgs/bash/files/bash43-039
deleted file mode 100644
index e5e3887078..0000000000
--- a/srcpkgs/bash/files/bash43-039
+++ /dev/null
@@ -1,57 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-039
-
-Bug-Reported-by: SN
-Bug-Reference-ID: <54E2554C.205@gazeta.pl>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00060.html
-
-Bug-Description:
-
-Using the output of `declare -p' when run in a function can result in variables
-that are invisible to `declare -p'. This problem occurs when an assignment
-builtin such as `declare' receives a quoted compound array assignment as one of
-its arguments.
-
-Patch (apply with `patch -p0'):
-
-*** /usr/src/local/bash/bash-4.3-patched/arrayfunc.c 2014-10-01 13:08:48.000000000 -0400
---- arrayfunc.c 2015-02-19 14:33:05.000000000 -0500
-***************
-*** 405,408 ****
---- 405,411 ----
- else
- array_insert (a, i, l->word->word);
-+
-+ VUNSETATTR (var, att_invisible); /* no longer invisible */
-+
- return var;
- }
-***************
-*** 635,638 ****
---- 638,645 ----
- if (nlist)
- dispose_words (nlist);
-+
-+ if (var)
-+ VUNSETATTR (var, att_invisible); /* no longer invisible */
-+
- return (var);
- }
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 38
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 39
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-040 b/srcpkgs/bash/files/bash43-040
deleted file mode 100644
index 978ce1cd57..0000000000
--- a/srcpkgs/bash/files/bash43-040
+++ /dev/null
@@ -1,47 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-040
-
-Bug-Reported-by: Jean Delvare
-Bug-Reference-ID: <20150609180231.5f463695@endymion.delvare>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00033.html
-
-Bug-Description:
-
-There is a memory leak that occurs when bash expands an array reference on
-the rhs of an assignment statement.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/subst.c 2014-10-01 12:57:47.000000000 -0400
---- subst.c 2015-06-22 09:16:53.000000000 -0400
-***************
-*** 5783,5787 ****
- if (pflags & PF_ASSIGNRHS)
- {
-! temp = array_variable_name (name, &tt, (int *)0);
- if (ALL_ELEMENT_SUB (tt[0]) && tt[1] == ']')
- temp = array_value (name, quoted|Q_DOUBLE_QUOTES, 0, &atype, &ind);
---- 5783,5787 ----
- if (pflags & PF_ASSIGNRHS)
- {
-! var = array_variable_part (name, &tt, (int *)0);
- if (ALL_ELEMENT_SUB (tt[0]) && tt[1] == ']')
- temp = array_value (name, quoted|Q_DOUBLE_QUOTES, 0, &atype, &ind);
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 39
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 40
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-041 b/srcpkgs/bash/files/bash43-041
deleted file mode 100644
index a040a2ac5d..0000000000
--- a/srcpkgs/bash/files/bash43-041
+++ /dev/null
@@ -1,72 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-041
-
-Bug-Reported-by: Hanno Böck
-Bug-Reference-ID: <20150623131106.6f111da9@pc1>, <20150707004640.0e61d2f9@pc1>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00089.html,
- http://lists.gnu.org/archive/html/bug-bash/2015-07/msg00018.html
-
-Bug-Description:
-
-There are several out-of-bounds read errors that occur when completing command
-lines where assignment statements appear before the command name. The first
-two appear only when programmable completion is enabled; the last one only
-happens when listing possible completions.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3.40/bashline.c 2014-12-29 14:39:43.000000000 -0500
---- bashline.c 2015-08-12 10:21:58.000000000 -0400
-***************
-*** 1469,1476 ****
---- 1469,1489 ----
- os = start;
- n = 0;
-+ was_assignment = 0;
- s = find_cmd_start (os);
- e = find_cmd_end (end);
- do
- {
-+ /* Don't read past the end of rl_line_buffer */
-+ if (s > rl_end)
-+ {
-+ s1 = s = e1;
-+ break;
-+ }
-+ /* Or past point if point is within an assignment statement */
-+ else if (was_assignment && s > rl_point)
-+ {
-+ s1 = s = e1;
-+ break;
-+ }
- /* Skip over assignment statements preceding a command name. If we
- don't find a command name at all, we can perform command name
-*** ../bash-4.3.40/lib/readline/complete.c 2013-10-14 09:27:10.000000000 -0400
---- lib/readline/complete.c 2015-07-31 09:34:39.000000000 -0400
-***************
-*** 690,693 ****
---- 690,695 ----
- if (temp == 0 || *temp == '\0')
- return (pathname);
-+ else if (temp[1] == 0 && temp == pathname)
-+ return (pathname);
- /* If the basename is NULL, we might have a pathname like '/usr/src/'.
- Look for a previous slash and, if one is found, return the portion
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 40
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 41
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-042 b/srcpkgs/bash/files/bash43-042
deleted file mode 100644
index 472c605abd..0000000000
--- a/srcpkgs/bash/files/bash43-042
+++ /dev/null
@@ -1,55 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-042
-
-Bug-Reported-by: Nathan Neulinger
-Bug-Reference-ID: <558EFDF2.7060402@neulinger.org>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00096.html
-
-Bug-Description:
-
-There is a problem when parsing command substitutions containing `case'
-commands within pipelines that causes the parser to not correctly identify
-the end of the command substitution.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/parse.y 2015-05-18 19:27:05.000000000 -0400
---- parse.y 2015-06-29 10:59:27.000000000 -0400
-***************
-*** 3709,3712 ****
---- 3709,3714 ----
- tflags |= LEX_INWORD;
- lex_wlen = 0;
-+ if (tflags & LEX_RESWDOK)
-+ lex_rwlen = 0;
- }
- }
-*** ../bash-4.3-patched/y.tab.c 2015-05-18 19:27:05.000000000 -0400
---- y.tab.c 2015-06-29 10:59:27.000000000 -0400
-***************
-*** 6021,6024 ****
---- 6021,6026 ----
- tflags |= LEX_INWORD;
- lex_wlen = 0;
-+ if (tflags & LEX_RESWDOK)
-+ lex_rwlen = 0;
- }
- }
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 41
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 42
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-043 b/srcpkgs/bash/files/bash43-043
deleted file mode 100644
index ad82c29258..0000000000
--- a/srcpkgs/bash/files/bash43-043
+++ /dev/null
@@ -1,59 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-043
-
-Bug-Reported-by: lolilolicon
-Bug-Reference-ID:
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00040.html
-
-Bug-Description:
-
-When the lastpipe option is enabled, the last component can contain nested
-pipelines and cause a segmentation fault under certain circumestances.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/execute_cmd.c 2014-07-30 10:26:52.000000000 -0400
---- execute_cmd.c 2014-08-15 08:55:24.000000000 -0400
-***************
-*** 2406,2412 ****
- {
- #if defined (JOB_CONTROL)
-! append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid);
-! #endif
- lstdin = wait_for (lastpid);
- #if defined (JOB_CONTROL)
- /* If wait_for removes the job from the jobs table, use result of last
---- 2433,2447 ----
- {
- #if defined (JOB_CONTROL)
-! if (INVALID_JOB (lastpipe_jid) == 0)
-! {
-! append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid);
-! lstdin = wait_for (lastpid);
-! }
-! else
-! lstdin = wait_for_single_pid (lastpid); /* checks bgpids list */
-! #else
- lstdin = wait_for (lastpid);
-+ #endif
-+
- #if defined (JOB_CONTROL)
- /* If wait_for removes the job from the jobs table, use result of last
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 42
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 43
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-044 b/srcpkgs/bash/files/bash43-044
deleted file mode 100644
index d8f1ce0723..0000000000
--- a/srcpkgs/bash/files/bash43-044
+++ /dev/null
@@ -1,48 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-044
-
-Bug-Reported-by: Ondrej Oprala
-Bug-Reference-ID: <539ED55B.2080103@redhat.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00046.html
-
-Bug-Description:
-
-A typo prevents the `compat42' shopt option from working as intended.
-
-Patch (apply with `patch -p0'):
-
-diff -rC 2 bash-4.3.42/builtins/shopt.def bash-4.3.43/builtins/shopt.def
-*** bash-4.3.42/builtins/shopt.def 2013-02-27 09:43:20.000000000 -0500
---- builtins/shopt.def 2015-10-16 11:25:28.000000000 -0400
-***************
-*** 161,165 ****
- { "compat40", &shopt_compat40, set_compatibility_level },
- { "compat41", &shopt_compat41, set_compatibility_level },
-! { "compat42", &shopt_compat41, set_compatibility_level },
- #if defined (READLINE)
- { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
---- 161,165 ----
- { "compat40", &shopt_compat40, set_compatibility_level },
- { "compat41", &shopt_compat41, set_compatibility_level },
-! { "compat42", &shopt_compat42, set_compatibility_level },
- #if defined (READLINE)
- { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 43
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 44
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-045 b/srcpkgs/bash/files/bash43-045
deleted file mode 100644
index 25dc3587ac..0000000000
--- a/srcpkgs/bash/files/bash43-045
+++ /dev/null
@@ -1,52 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-045
-
-Bug-Reported-by: Basin Ilya
-Bug-Reference-ID: <5624C0AC.8070802@gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-10/msg00141.html
-
-Bug-Description:
-
-If a file open attempted as part of a redirection fails because it is interrupted
-by a signal, the shell needs to process any pending traps to allow the redirection
-to be canceled.
-
-Patch (apply with `patch -p0'):
-
-*** bash-20150109/redir.c 2014-12-03 10:47:38.000000000 -0500
---- redir.c 2015-01-16 10:15:47.000000000 -0500
-***************
-*** 672,676 ****
- e = errno;
- if (fd < 0 && e == EINTR)
-! QUIT;
- errno = e;
- }
---- 672,679 ----
- e = errno;
- if (fd < 0 && e == EINTR)
-! {
-! QUIT;
-! run_pending_traps ();
-! }
- errno = e;
- }
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 44
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 45
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-046 b/srcpkgs/bash/files/bash43-046
deleted file mode 100644
index bea3970a2a..0000000000
--- a/srcpkgs/bash/files/bash43-046
+++ /dev/null
@@ -1,55 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-046
-
-Bug-Reported-by: Sergey Tselikh
-Bug-Reference-ID: <20150816110235.91f3e12e3f20d20cdaad963e@gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-08/msg00080.html
-
-Bug-Description:
-
-An incorrect conversion from an indexed to associative array can result in a
-core dump.
-
-Patch (apply with `patch -p0'):
-
-*** /fs2/chet/bash/bash-20150813/subst.c 2015-08-13 11:32:54.000000000 -0400
---- subst.c 2015-08-18 10:13:59.000000000 -0400
-***************
-*** 9562,9566 ****
- opts[opti] = '\0';
- if (opti > 0)
-! make_internal_declare (tlist->word->word, opts);
-
- t = do_word_assignment (tlist->word, 0);
---- 9562,9573 ----
- opts[opti] = '\0';
- if (opti > 0)
-! {
-! t = make_internal_declare (tlist->word->word, opts);
-! if (t != EXECUTION_SUCCESS)
-! {
-! last_command_exit_value = t;
-! exp_jump_to_top_level (DISCARD);
-! }
-! }
-
- t = do_word_assignment (tlist->word, 0);
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 45
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 46
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-047 b/srcpkgs/bash/files/bash43-047
deleted file mode 100644
index 316e3afcdb..0000000000
--- a/srcpkgs/bash/files/bash43-047
+++ /dev/null
@@ -1,150 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-047
-
-Bug-Reported-by: Bernd Dietzel
-Bug-Reference-ID:
-Bug-Reference-URL: https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1507025
-
-Bug-Description:
-
-Bash performs word expansions on the prompt strings after the special
-escape sequences are expanded. If a malicious user can modify the system
-hostname or change the name of the bash executable and coerce a user into
-executing it, and the new name contains word expansions (including
-command substitution), bash will expand them in prompt strings containing
-the \h or \H and \s escape sequences, respectively.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/parse.y 2015-08-13 15:11:54.000000000 -0400
---- parse.y 2016-03-07 15:44:14.000000000 -0500
-***************
-*** 5259,5263 ****
- int result_size, result_index;
- int c, n, i;
-! char *temp, octal_string[4];
- struct tm *tm;
- time_t the_time;
---- 5259,5263 ----
- int result_size, result_index;
- int c, n, i;
-! char *temp, *t_host, octal_string[4];
- struct tm *tm;
- time_t the_time;
-***************
-*** 5407,5411 ****
- case 's':
- temp = base_pathname (shell_name);
-! temp = savestring (temp);
- goto add_string;
-
---- 5407,5415 ----
- case 's':
- temp = base_pathname (shell_name);
-! /* Try to quote anything the user can set in the file system */
-! if (promptvars || posixly_correct)
-! temp = sh_backslash_quote_for_double_quotes (temp);
-! else
-! temp = savestring (temp);
- goto add_string;
-
-***************
-*** 5497,5503 ****
- case 'h':
- case 'H':
-! temp = savestring (current_host_name);
-! if (c == 'h' && (t = (char *)strchr (temp, '.')))
- *t = '\0';
- goto add_string;
-
---- 5501,5515 ----
- case 'h':
- case 'H':
-! t_host = savestring (current_host_name);
-! if (c == 'h' && (t = (char *)strchr (t_host, '.')))
- *t = '\0';
-+ if (promptvars || posixly_correct)
-+ /* Make sure that expand_prompt_string is called with a
-+ second argument of Q_DOUBLE_QUOTES if we use this
-+ function here. */
-+ temp = sh_backslash_quote_for_double_quotes (t_host);
-+ else
-+ temp = savestring (t_host);
-+ free (t_host);
- goto add_string;
-
-*** ../bash-4.3-patched/y.tab.c 2015-08-13 15:11:54.000000000 -0400
---- y.tab.c 2016-03-07 15:44:14.000000000 -0500
-***************
-*** 7571,7575 ****
- int result_size, result_index;
- int c, n, i;
-! char *temp, octal_string[4];
- struct tm *tm;
- time_t the_time;
---- 7571,7575 ----
- int result_size, result_index;
- int c, n, i;
-! char *temp, *t_host, octal_string[4];
- struct tm *tm;
- time_t the_time;
-***************
-*** 7719,7723 ****
- case 's':
- temp = base_pathname (shell_name);
-! temp = savestring (temp);
- goto add_string;
-
---- 7719,7727 ----
- case 's':
- temp = base_pathname (shell_name);
-! /* Try to quote anything the user can set in the file system */
-! if (promptvars || posixly_correct)
-! temp = sh_backslash_quote_for_double_quotes (temp);
-! else
-! temp = savestring (temp);
- goto add_string;
-
-***************
-*** 7809,7815 ****
- case 'h':
- case 'H':
-! temp = savestring (current_host_name);
-! if (c == 'h' && (t = (char *)strchr (temp, '.')))
- *t = '\0';
- goto add_string;
-
---- 7813,7827 ----
- case 'h':
- case 'H':
-! t_host = savestring (current_host_name);
-! if (c == 'h' && (t = (char *)strchr (t_host, '.')))
- *t = '\0';
-+ if (promptvars || posixly_correct)
-+ /* Make sure that expand_prompt_string is called with a
-+ second argument of Q_DOUBLE_QUOTES if we use this
-+ function here. */
-+ temp = sh_backslash_quote_for_double_quotes (t_host);
-+ else
-+ temp = savestring (t_host);
-+ free (t_host);
- goto add_string;
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 46
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 47
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash43-048 b/srcpkgs/bash/files/bash43-048
deleted file mode 100644
index 6a8588ec02..0000000000
--- a/srcpkgs/bash/files/bash43-048
+++ /dev/null
@@ -1,54 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-048
-
-Bug-Reported-by: up201407890@alunos.dcc.fc.up.pt
-Bug-Reference-ID: <20151210201649.126444eionzfsam8@webmail.alunos.dcc.fc.up.pt>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-12/msg00054.html
-
-Bug-Description:
-
-If a malicious user can inject a value of $SHELLOPTS containing `xtrace'
-and a value for $PS4 that includes a command substitution into a shell
-running as root, bash will expand the command substitution as part of
-expanding $PS4 when it executes a traced command.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/variables.c 2015-11-26 12:31:21.000000000 -0500
---- variables.c 2015-12-23 10:19:01.000000000 -0500
-***************
-*** 496,500 ****
- set_if_not ("PS2", secondary_prompt);
- }
-! set_if_not ("PS4", "+ ");
-
- /* Don't allow IFS to be imported from the environment. */
---- 496,504 ----
- set_if_not ("PS2", secondary_prompt);
- }
-!
-! if (current_user.euid == 0)
-! bind_variable ("PS4", "+ ", 0);
-! else
-! set_if_not ("PS4", "+ ");
-
- /* Don't allow IFS to be imported from the environment. */
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 47
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 48
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash44-001 b/srcpkgs/bash/files/bash44-001
new file mode 100644
index 0000000000..7b848feec7
--- /dev/null
+++ b/srcpkgs/bash/files/bash44-001
@@ -0,0 +1,60 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.4
+Patch-ID: bash44-001
+
+Bug-Reported-by: Sean Zha
+Bug-Reference-ID:
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00107.html
+
+Bug-Description:
+
+Bash-4.4 changed the way the history list is initially allocated to reduce
+the number of reallocations and copies. Users who set HISTSIZE to a very
+large number to essentially unlimit the size of the history list will get
+memory allocation errors
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.4/lib/readline/history.c 2015-12-28 13:50:31.000000000 -0500
+--- lib/readline/history.c 2016-09-30 14:28:40.000000000 -0400
+***************
+*** 58,61 ****
+--- 58,63 ----
+ #define DEFAULT_HISTORY_INITIAL_SIZE 502
+
++ #define MAX_HISTORY_INITIAL_SIZE 8192
++
+ /* The number of slots to increase the_history by. */
+ #define DEFAULT_HISTORY_GROW_SIZE 50
+***************
+*** 308,312 ****
+ {
+ if (history_stifled && history_max_entries > 0)
+! history_size = history_max_entries + 2;
+ else
+ history_size = DEFAULT_HISTORY_INITIAL_SIZE;
+--- 310,316 ----
+ {
+ if (history_stifled && history_max_entries > 0)
+! history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE)
+! ? MAX_HISTORY_INITIAL_SIZE
+! : history_max_entries + 2;
+ else
+ history_size = DEFAULT_HISTORY_INITIAL_SIZE;
+*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 0
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 1
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash44-002 b/srcpkgs/bash/files/bash44-002
new file mode 100644
index 0000000000..6d8baef140
--- /dev/null
+++ b/srcpkgs/bash/files/bash44-002
@@ -0,0 +1,69 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.4
+Patch-ID: bash44-002
+
+Bug-Reported-by: Eric Pruitt
+Bug-Reference-ID: <20160916055120.GA28272@sinister.codevat.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00015.html
+
+Bug-Description:
+
+Bash-4.4 warns when discarding NUL bytes in command substitution output
+instead of silently dropping them. This patch changes the warnings from
+one per NUL byte encountered to one warning per command substitution.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400
+--- subst.c 2016-09-26 10:20:19.000000000 -0400
+***************
+*** 5932,5935 ****
+--- 5933,5937 ----
+ int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul;
+ ssize_t bufn;
++ int nullbyte;
+
+ istring = (char *)NULL;
+***************
+*** 5939,5942 ****
+--- 5941,5946 ----
+ skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL;
+
++ nullbyte = 0;
++
+ /* Read the output of the command through the pipe. This may need to be
+ changed to understand multibyte characters in the future. */
+***************
+*** 5957,5961 ****
+ {
+ #if 1
+! internal_warning ("%s", _("command substitution: ignored null byte in input"));
+ #endif
+ continue;
+--- 5961,5969 ----
+ {
+ #if 1
+! if (nullbyte == 0)
+! {
+! internal_warning ("%s", _("command substitution: ignored null byte in input"));
+! nullbyte = 1;
+! }
+ #endif
+ continue;
+*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 1
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 2
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash44-003 b/srcpkgs/bash/files/bash44-003
new file mode 100644
index 0000000000..01b6b6c9d3
--- /dev/null
+++ b/srcpkgs/bash/files/bash44-003
@@ -0,0 +1,58 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.4
+Patch-ID: bash44-003
+
+Bug-Reported-by: op7ic \x00
+Bug-Reference-ID:
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00005.html
+
+Bug-Description:
+
+Specially-crafted input, in this case an incomplete pathname expansion
+bracket expression containing an invalid collating symbol, can cause the
+shell to crash.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.4/lib/glob/sm_loop.c 2016-04-10 11:23:21.000000000 -0400
+--- lib/glob/sm_loop.c 2016-11-02 14:03:34.000000000 -0400
+***************
+*** 331,334 ****
+--- 331,340 ----
+ if (p[pc] == L('.') && p[pc+1] == L(']'))
+ break;
++ if (p[pc] == 0)
++ {
++ if (vp)
++ *vp = INVALID;
++ return (p + pc);
++ }
+ val = COLLSYM (p, pc);
+ if (vp)
+***************
+*** 484,487 ****
+--- 490,496 ----
+ c = FOLD (c);
+
++ if (c == L('\0'))
++ return ((test == L('[')) ? savep : (CHAR *)0);
++
+ if ((flags & FNM_PATHNAME) && c == L('/'))
+ /* [/] can never match when matching a pathname. */
+*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 2
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 3
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash44-004 b/srcpkgs/bash/files/bash44-004
new file mode 100644
index 0000000000..1d8af26a91
--- /dev/null
+++ b/srcpkgs/bash/files/bash44-004
@@ -0,0 +1,84 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.4
+Patch-ID: bash44-004
+
+Bug-Reported-by: Christian Weisgerber
+Bug-Reference-ID: <20161101160302.GB54856@lorvorc.mips.inka.de>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00004.html
+
+Bug-Description:
+
+There is a race condition that can result in bash referencing freed memory
+when freeing data associated with the last process substitution.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.4/jobs.c 2016-08-23 16:38:44.000000000 -0400
+--- jobs.c 2016-11-02 18:24:45.000000000 -0400
+***************
+*** 454,457 ****
+--- 454,472 ----
+ }
+
++ void
++ discard_last_procsub_child ()
++ {
++ PROCESS *disposer;
++ sigset_t set, oset;
++
++ BLOCK_CHILD (set, oset);
++ disposer = last_procsub_child;
++ last_procsub_child = (PROCESS *)NULL;
++ UNBLOCK_CHILD (oset);
++
++ if (disposer)
++ discard_pipeline (disposer);
++ }
++
+ struct pipeline_saver *
+ alloc_pipeline_saver ()
+*** ../bash-4.4/jobs.h 2016-04-27 10:35:51.000000000 -0400
+--- jobs.h 2016-11-02 18:25:08.000000000 -0400
+***************
+*** 191,194 ****
+--- 191,195 ----
+ extern void stop_making_children __P((void));
+ extern void cleanup_the_pipeline __P((void));
++ extern void discard_last_procsub_child __P((void));
+ extern void save_pipeline __P((int));
+ extern PROCESS *restore_pipeline __P((int));
+*** ../bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400
+--- subst.c 2016-11-02 18:23:24.000000000 -0400
+***************
+*** 5809,5816 ****
+ #if defined (JOB_CONTROL)
+ if (last_procsub_child)
+! {
+! discard_pipeline (last_procsub_child);
+! last_procsub_child = (PROCESS *)NULL;
+! }
+ last_procsub_child = restore_pipeline (0);
+ #endif
+--- 5834,5838 ----
+ #if defined (JOB_CONTROL)
+ if (last_procsub_child)
+! discard_last_procsub_child ();
+ last_procsub_child = restore_pipeline (0);
+ #endif
+*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 3
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 4
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash44-005 b/srcpkgs/bash/files/bash44-005
new file mode 100644
index 0000000000..bacd67aea7
--- /dev/null
+++ b/srcpkgs/bash/files/bash44-005
@@ -0,0 +1,47 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.4
+Patch-ID: bash44-005
+
+Bug-Reported-by: Dr. Werner Fink
+Bug-Reference-ID: <20161107100936.ajnojd7dspirdflf@noether.suse.de>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00054.html
+
+Bug-Description:
+
+Under certain circumstances, a simple command is optimized to eliminate a
+fork, resulting in an EXIT trap not being executed.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.4/builtins/evalstring.c 2016-08-11 14:18:51.000000000 -0400
+--- builtins/evalstring.c 2016-11-08 15:05:07.000000000 -0500
+***************
+*** 105,114 ****
+ *bash_input.location.string == '\0' &&
+ command->type == cm_simple &&
+- #if 0
+ signal_is_trapped (EXIT_TRAP) == 0 &&
+ signal_is_trapped (ERROR_TRAP) == 0 &&
+- #else
+ any_signals_trapped () < 0 &&
+- #endif
+ command->redirects == 0 && command->value.Simple->redirects == 0 &&
+ ((command->flags & CMD_TIME_PIPELINE) == 0) &&
+--- 105,111 ----
+*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 4
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 5
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash44-006 b/srcpkgs/bash/files/bash44-006
new file mode 100644
index 0000000000..f68c7ab476
--- /dev/null
+++ b/srcpkgs/bash/files/bash44-006
@@ -0,0 +1,59 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.4
+Patch-ID: bash44-006
+
+Bug-Reported-by:
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+Out-of-range negative offsets to popd can cause the shell to crash attempting
+to free an invalid memory block.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.4-patched/builtins/pushd.def 2016-01-25 13:31:49.000000000 -0500
+--- builtins/pushd.def 2016-10-28 10:46:49.000000000 -0400
+***************
+*** 366,370 ****
+ }
+
+! if (which > directory_list_offset || (directory_list_offset == 0 && which == 0))
+ {
+ pushd_error (directory_list_offset, which_word ? which_word : "");
+--- 366,370 ----
+ }
+
+! if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0))
+ {
+ pushd_error (directory_list_offset, which_word ? which_word : "");
+***************
+*** 388,391 ****
+--- 388,396 ----
+ of the list into place. */
+ i = (direction == '+') ? directory_list_offset - which : which;
++ if (i < 0 || i > directory_list_offset)
++ {
++ pushd_error (directory_list_offset, which_word ? which_word : "");
++ return (EXECUTION_FAILURE);
++ }
+ free (pushd_directory_list[i]);
+ directory_list_offset--;
+*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 5
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 6
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash44-007 b/srcpkgs/bash/files/bash44-007
new file mode 100644
index 0000000000..5fb55ca407
--- /dev/null
+++ b/srcpkgs/bash/files/bash44-007
@@ -0,0 +1,151 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.4
+Patch-ID: bash44-007
+
+Bug-Reported-by: Jens Heyens
+Bug-Reference-ID:
+Bug-Reference-URL: https://savannah.gnu.org/support/?109224
+
+Bug-Description:
+
+When performing filename completion, bash dequotes the directory name being
+completed, which can result in match failures and potential unwanted
+expansion.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.4-patched/bashline.c 2016-08-05 21:44:05.000000000 -0400
+--- bashline.c 2017-01-19 13:15:51.000000000 -0500
+***************
+*** 143,147 ****
+ static void restore_directory_hook __P((rl_icppfunc_t));
+
+! static int directory_exists __P((const char *));
+
+ static void cleanup_expansion_error __P((void));
+--- 144,148 ----
+ static void restore_directory_hook __P((rl_icppfunc_t));
+
+! static int directory_exists __P((const char *, int));
+
+ static void cleanup_expansion_error __P((void));
+***************
+*** 3103,3111 ****
+ }
+
+! /* Check whether not the (dequoted) version of DIRNAME, with any trailing slash
+! removed, exists. */
+ static int
+! directory_exists (dirname)
+ const char *dirname;
+ {
+ char *new_dirname;
+--- 3107,3116 ----
+ }
+
+! /* Check whether not DIRNAME, with any trailing slash removed, exists. If
+! SHOULD_DEQUOTE is non-zero, we dequote the directory name first. */
+ static int
+! directory_exists (dirname, should_dequote)
+ const char *dirname;
++ int should_dequote;
+ {
+ char *new_dirname;
+***************
+*** 3113,3118 ****
+ struct stat sb;
+
+! /* First, dequote the directory name */
+! new_dirname = bash_dequote_filename ((char *)dirname, rl_completion_quote_character);
+ dirlen = STRLEN (new_dirname);
+ if (new_dirname[dirlen - 1] == '/')
+--- 3118,3124 ----
+ struct stat sb;
+
+! /* We save the string and chop the trailing slash because stat/lstat behave
+! inconsistently if one is present. */
+! new_dirname = should_dequote ? bash_dequote_filename ((char *)dirname, rl_completion_quote_character) : savestring (dirname);
+ dirlen = STRLEN (new_dirname);
+ if (new_dirname[dirlen - 1] == '/')
+***************
+*** 3146,3150 ****
+ should_expand_dirname = '`';
+
+! if (should_expand_dirname && directory_exists (local_dirname))
+ should_expand_dirname = 0;
+
+--- 3152,3156 ----
+ should_expand_dirname = '`';
+
+! if (should_expand_dirname && directory_exists (local_dirname, 0))
+ should_expand_dirname = 0;
+
+***************
+*** 3156,3160 ****
+ global_nounset = unbound_vars_is_error;
+ unbound_vars_is_error = 0;
+! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE); /* does the right thing */
+ unbound_vars_is_error = global_nounset;
+ if (wl)
+--- 3162,3166 ----
+ global_nounset = unbound_vars_is_error;
+ unbound_vars_is_error = 0;
+! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE); /* does the right thing */
+ unbound_vars_is_error = global_nounset;
+ if (wl)
+***************
+*** 3245,3249 ****
+ }
+
+! if (should_expand_dirname && directory_exists (local_dirname))
+ should_expand_dirname = 0;
+
+--- 3262,3266 ----
+ }
+
+! if (should_expand_dirname && directory_exists (local_dirname, 1))
+ should_expand_dirname = 0;
+
+***************
+*** 3251,3255 ****
+ {
+ new_dirname = savestring (local_dirname);
+! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE); /* does the right thing */
+ if (wl)
+ {
+--- 3268,3272 ----
+ {
+ new_dirname = savestring (local_dirname);
+! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE); /* does the right thing */
+ if (wl)
+ {
+*** ../bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400
+--- subst.c 2017-01-19 07:09:57.000000000 -0500
+***************
+*** 9459,9462 ****
+--- 9459,9466 ----
+ if (word->flags & W_COMPLETE)
+ tword->flags |= W_COMPLETE; /* for command substitutions */
++ if (word->flags & W_NOCOMSUB)
++ tword->flags |= W_NOCOMSUB;
++ if (word->flags & W_NOPROCSUB)
++ tword->flags |= W_NOPROCSUB;
+
+ temp = (char *)NULL;
+*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 6
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 7
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash44-008 b/srcpkgs/bash/files/bash44-008
new file mode 100644
index 0000000000..94c5d4aeb0
--- /dev/null
+++ b/srcpkgs/bash/files/bash44-008
@@ -0,0 +1,84 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.4
+Patch-ID: bash44-008
+
+Bug-Reported-by: Koichi MURASE
+Bug-Reference-ID:
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00050.html
+
+Bug-Description:
+
+Under certain circumstances, bash will evaluate arithmetic expressions as
+part of reading an expression token even when evaluation is suppressed. This
+happens while evaluating a conditional expression and skipping over the
+failed branch of the expression.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.4-patched/expr.c 2015-10-11 14:46:36.000000000 -0400
+--- expr.c 2016-11-08 11:55:46.000000000 -0500
+***************
+*** 579,585 ****
+ if (curtok == QUES) /* found conditional expr */
+ {
+- readtok ();
+- if (curtok == 0 || curtok == COL)
+- evalerror (_("expression expected"));
+ if (cval == 0)
+ {
+--- 579,582 ----
+***************
+*** 588,591 ****
+--- 585,592 ----
+ }
+
++ readtok ();
++ if (curtok == 0 || curtok == COL)
++ evalerror (_("expression expected"));
++
+ val1 = EXP_HIGHEST ();
+
+***************
+*** 594,600 ****
+ if (curtok != COL)
+ evalerror (_("`:' expected for conditional expression"));
+! readtok ();
+! if (curtok == 0)
+! evalerror (_("expression expected"));
+ set_noeval = 0;
+ if (cval)
+--- 595,599 ----
+ if (curtok != COL)
+ evalerror (_("`:' expected for conditional expression"));
+!
+ set_noeval = 0;
+ if (cval)
+***************
+*** 604,608 ****
+--- 603,611 ----
+ }
+
++ readtok ();
++ if (curtok == 0)
++ evalerror (_("expression expected"));
+ val2 = expcond ();
++
+ if (set_noeval)
+ noeval--;
+*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 7
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 8
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash44-009 b/srcpkgs/bash/files/bash44-009
new file mode 100644
index 0000000000..26a054af48
--- /dev/null
+++ b/srcpkgs/bash/files/bash44-009
@@ -0,0 +1,107 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.4
+Patch-ID: bash44-009
+
+Bug-Reported-by: Hong Cho
+Bug-Reference-ID:
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-12/msg00043.html
+
+Bug-Description:
+
+There is a race condition in add_history() that can be triggered by a fatal
+signal arriving between the time the history length is updated and the time
+the history list update is completed. A later attempt to reference an
+invalid history entry can cause a crash.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.4-patched/lib/readline/history.c 2016-11-11 13:42:49.000000000 -0500
+--- lib/readline/history.c 2016-12-05 10:37:51.000000000 -0500
+***************
+*** 280,283 ****
+--- 280,284 ----
+ {
+ HIST_ENTRY *temp;
++ int new_length;
+
+ if (history_stifled && (history_length == history_max_entries))
+***************
+*** 296,306 ****
+ /* Copy the rest of the entries, moving down one slot. Copy includes
+ trailing NULL. */
+- #if 0
+- for (i = 0; i < history_length; i++)
+- the_history[i] = the_history[i + 1];
+- #else
+ memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *));
+- #endif
+
+ history_base++;
+ }
+--- 297,303 ----
+ /* Copy the rest of the entries, moving down one slot. Copy includes
+ trailing NULL. */
+ memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *));
+
++ new_length = history_length;
+ history_base++;
+ }
+***************
+*** 316,320 ****
+ history_size = DEFAULT_HISTORY_INITIAL_SIZE;
+ the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *));
+! history_length = 1;
+ }
+ else
+--- 313,317 ----
+ history_size = DEFAULT_HISTORY_INITIAL_SIZE;
+ the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *));
+! new_length = 1;
+ }
+ else
+***************
+*** 326,330 ****
+ xrealloc (the_history, history_size * sizeof (HIST_ENTRY *));
+ }
+! history_length++;
+ }
+ }
+--- 323,327 ----
+ xrealloc (the_history, history_size * sizeof (HIST_ENTRY *));
+ }
+! new_length = history_length + 1;
+ }
+ }
+***************
+*** 332,337 ****
+ temp = alloc_history_entry ((char *)string, hist_inittime ());
+
+! the_history[history_length] = (HIST_ENTRY *)NULL;
+! the_history[history_length - 1] = temp;
+ }
+
+--- 329,335 ----
+ temp = alloc_history_entry ((char *)string, hist_inittime ());
+
+! the_history[new_length] = (HIST_ENTRY *)NULL;
+! the_history[new_length - 1] = temp;
+! history_length = new_length;
+ }
+
+*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 8
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 9
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash44-010 b/srcpkgs/bash/files/bash44-010
new file mode 100644
index 0000000000..2346005c35
--- /dev/null
+++ b/srcpkgs/bash/files/bash44-010
@@ -0,0 +1,49 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.4
+Patch-ID: bash44-010
+
+Bug-Reported-by: Clark Wang
+Bug-Reference-ID:
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00104.html
+
+Bug-Description:
+
+Depending on compiler optimizations and behavior, the `read' builtin may not
+save partial input when a timeout occurs.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.4-patched/builtins/read.def 2016-05-16 14:24:56.000000000 -0400
+--- builtins/read.def 2016-11-25 12:37:56.000000000 -0500
+***************
+*** 182,186 ****
+ {
+ register char *varname;
+! int size, i, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2;
+ int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul;
+ int raw, edit, nchars, silent, have_timeout, ignore_delim, fd, lastsig, t_errno;
+--- 182,187 ----
+ {
+ register char *varname;
+! int size, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2;
+! volatile int i;
+ int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul;
+ int raw, edit, nchars, silent, have_timeout, ignore_delim, fd, lastsig, t_errno;
+
+*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 9
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 10
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash44-011 b/srcpkgs/bash/files/bash44-011
new file mode 100644
index 0000000000..2eb9957ff2
--- /dev/null
+++ b/srcpkgs/bash/files/bash44-011
@@ -0,0 +1,50 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.4
+Patch-ID: bash44-011
+
+Bug-Reported-by: Russell King
+Bug-Reference-ID:
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2017-01/msg00000.html
+
+Bug-Description:
+
+Subshells begun to run command and process substitutions may attempt to
+set the terminal's process group to an incorrect value if they receive
+a fatal signal. This depends on the behavior of the process that starts
+the shell.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.4-patched/sig.c 2016-02-11 15:02:45.000000000 -0500
+--- sig.c 2017-01-04 09:09:47.000000000 -0500
+***************
+*** 586,590 ****
+ if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
+ hangup_all_jobs ();
+! end_job_control ();
+ #endif /* JOB_CONTROL */
+
+--- 571,576 ----
+ if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
+ hangup_all_jobs ();
+! if ((subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)) == 0)
+! end_job_control ();
+ #endif /* JOB_CONTROL */
+
+*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 10
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 11
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/files/bash44-012 b/srcpkgs/bash/files/bash44-012
new file mode 100644
index 0000000000..182fd7cb13
--- /dev/null
+++ b/srcpkgs/bash/files/bash44-012
@@ -0,0 +1,161 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.4
+Patch-ID: bash44-012
+
+Bug-Reported-by: Clark Wang
+Bug-Reference-ID:
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00106.html
+
+Bug-Description:
+
+When -N is used, the input is not supposed to be split using $IFS, but
+leading and trailing IFS whitespace was still removed.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.4-patched/subst.c 2017-01-20 14:22:01.000000000 -0500
+--- subst.c 2017-01-25 13:43:22.000000000 -0500
+***************
+*** 2826,2834 ****
+ /* Parse a single word from STRING, using SEPARATORS to separate fields.
+ ENDPTR is set to the first character after the word. This is used by
+! the `read' builtin. This is never called with SEPARATORS != $IFS;
+! it should be simplified.
+
+ XXX - this function is very similar to list_string; they should be
+ combined - XXX */
+ char *
+ get_word_from_string (stringp, separators, endptr)
+--- 2826,2838 ----
+ /* Parse a single word from STRING, using SEPARATORS to separate fields.
+ ENDPTR is set to the first character after the word. This is used by
+! the `read' builtin.
+!
+! This is never called with SEPARATORS != $IFS, and takes advantage of that.
+
+ XXX - this function is very similar to list_string; they should be
+ combined - XXX */
++
++ #define islocalsep(c) (local_cmap[(unsigned char)(c)] != 0)
++
+ char *
+ get_word_from_string (stringp, separators, endptr)
+***************
+*** 2838,2841 ****
+--- 2842,2846 ----
+ char *current_word;
+ int sindex, sh_style_split, whitesep, xflags;
++ unsigned char local_cmap[UCHAR_MAX+1]; /* really only need single-byte chars here */
+ size_t slen;
+
+***************
+*** 2847,2854 ****
+ separators[2] == '\n' &&
+ separators[3] == '\0';
+! for (xflags = 0, s = ifs_value; s && *s; s++)
+ {
+ if (*s == CTLESC) xflags |= SX_NOCTLESC;
+ if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL;
+ }
+
+--- 2852,2861 ----
+ separators[2] == '\n' &&
+ separators[3] == '\0';
+! memset (local_cmap, '\0', sizeof (local_cmap));
+! for (xflags = 0, s = separators; s && *s; s++)
+ {
+ if (*s == CTLESC) xflags |= SX_NOCTLESC;
+ if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL;
++ local_cmap[(unsigned char)*s] = 1; /* local charmap of separators */
+ }
+
+***************
+*** 2857,2864 ****
+
+ /* Remove sequences of whitespace at the beginning of STRING, as
+! long as those characters appear in IFS. */
+! if (sh_style_split || !separators || !*separators)
+ {
+! for (; *s && spctabnl (*s) && isifs (*s); s++);
+
+ /* If the string is nothing but whitespace, update it and return. */
+--- 2864,2872 ----
+
+ /* Remove sequences of whitespace at the beginning of STRING, as
+! long as those characters appear in SEPARATORS. This happens if
+! SEPARATORS == $' \t\n' or if IFS is unset. */
+! if (sh_style_split || separators == 0)
+ {
+! for (; *s && spctabnl (*s) && islocalsep (*s); s++);
+
+ /* If the string is nothing but whitespace, update it and return. */
+***************
+*** 2879,2885 ****
+ This obeys the field splitting rules in Posix.2. */
+ sindex = 0;
+! /* Don't need string length in ADVANCE_CHAR or string_extract_verbatim
+! unless multibyte chars are possible. */
+! slen = (MB_CUR_MAX > 1) ? STRLEN (s) : 1;
+ current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags);
+
+--- 2887,2893 ----
+ This obeys the field splitting rules in Posix.2. */
+ sindex = 0;
+! /* Don't need string length in ADVANCE_CHAR unless multibyte chars are
+! possible, but need it in string_extract_verbatim for bounds checking */
+! slen = STRLEN (s);
+ current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags);
+
+***************
+*** 2900,2904 ****
+ /* Now skip sequences of space, tab, or newline characters if they are
+ in the list of separators. */
+! while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
+ sindex++;
+
+--- 2908,2912 ----
+ /* Now skip sequences of space, tab, or newline characters if they are
+ in the list of separators. */
+! while (s[sindex] && spctabnl (s[sindex]) && islocalsep (s[sindex]))
+ sindex++;
+
+***************
+*** 2907,2916 ****
+ delimiter, not a separate delimiter that would result in an empty field.
+ Look at POSIX.2, 3.6.5, (3)(b). */
+! if (s[sindex] && whitesep && isifs (s[sindex]) && !spctabnl (s[sindex]))
+ {
+ sindex++;
+ /* An IFS character that is not IFS white space, along with any adjacent
+ IFS white space, shall delimit a field. */
+! while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
+ sindex++;
+ }
+--- 2915,2924 ----
+ delimiter, not a separate delimiter that would result in an empty field.
+ Look at POSIX.2, 3.6.5, (3)(b). */
+! if (s[sindex] && whitesep && islocalsep (s[sindex]) && !spctabnl (s[sindex]))
+ {
+ sindex++;
+ /* An IFS character that is not IFS white space, along with any adjacent
+ IFS white space, shall delimit a field. */
+! while (s[sindex] && spctabnl (s[sindex]) && islocalsep(s[sindex]))
+ sindex++;
+ }
+*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 11
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 12
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index ced6536156..4623be14bb 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -1,11 +1,9 @@
# Template build file for 'bash'.
pkgname=bash
-_bash_distver=4.3
-_bash_patchlevel=048
-# Dracut breaks with bash 4.4. See https://github.com/dracutdevs/dracut/issues/118
-reverts=4.4.0_1
+_bash_distver=4.4
+_bash_patchlevel=012
version=${_bash_distver}.${_bash_patchlevel}
-revision=3
+revision=1
wrksrc=${pkgname}-${_bash_distver}
build_style=gnu-configure
configure_args="--without-bash-malloc --with-curses --without-installed-readline"
@@ -21,7 +19,7 @@ license="GPL-3"
distfiles="${GNU_SITE}/$pkgname/$pkgname-${_bash_distver}.tar.gz"
CFLAGS="-DSYS_BASHRC='\"/etc/bash/bashrc\"'"
make_dirs="/etc/bash/bashrc.d 755 root root"
-checksum=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4
+checksum=d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb
alternatives="
sh:sh:/usr/bin/bash
diff --git a/srcpkgs/bc/patches/bc-1.06-info-dir-entry_from_arch.patch b/srcpkgs/bc/patches/bc-1.06-info-dir-entry_from_arch.patch
deleted file mode 100644
index c9bcc06f0f..0000000000
--- a/srcpkgs/bc/patches/bc-1.06-info-dir-entry_from_arch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/bc.info.info-dir-entry 2000-10-03 20:36:31.000000000 +0200
-+++ doc/bc.info 2003-01-06 14:07:40.000000000 +0100
-@@ -1,5 +1,8 @@
- This is bc.info, produced by makeinfo version 4.0 from bc.texi.
-
-+START-INFO-DIR-ENTRY
-+* bc: (bc). Arbritrary precision calculator language.
-+END-INFO-DIR-ENTRY
-
- File: bc.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir)
-
diff --git a/srcpkgs/bc/patches/bc-1.06.95-memory_leak-1.patch b/srcpkgs/bc/patches/bc-1.06.95-memory_leak-1.patch
deleted file mode 100644
index 35c7382f09..0000000000
--- a/srcpkgs/bc/patches/bc-1.06.95-memory_leak-1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Submitted By: Bruce Dubbs (bdubbs at linuxfromscratch dot org)
-Date: 2014-04-18
-Initial Package Version: 1.06.95
-Origin: Gentoo
-Description: Fixes memory leaks and an uninitialized variable
-
---- bc/bc.y 2006-09-04 21:39:31.000000000 -0500
-+++ bc/bc.y 2014-04-09 13:27:04.602661243 -0500
-@@ -569,6 +569,7 @@
- generate (">");
- break;
- }
-+ free($2);
- }
- | expression '+' expression
- {
---- bc/storage.c 2006-09-04 21:39:31.000000000 -0500
-+++ bc/storage.c 2014-04-09 13:28:11.770763410 -0500
-@@ -99,6 +99,7 @@
- {
- f = &functions[indx];
- f->f_defined = FALSE;
-+ f->f_void = FALSE;
- f->f_body = (char *) bc_malloc (BC_START_SIZE);
- f->f_body_size = BC_START_SIZE;
- f->f_code_size = 0;
---- bc/util.c 2006-09-04 21:39:31.000000000 -0500
-+++ bc/util.c 2014-04-09 13:27:39.841190064 -0500
-@@ -602,8 +602,7 @@
- case FUNCTDEF:
- if (id->f_name != 0)
- {
-- if (namekind != FUNCT)
-- free(name);
-+ free(name);
- /* Check to see if we are redefining a math lib function. */
- if (use_math && namekind == FUNCTDEF && id->f_name <= 6)
- id->f_name = next_func++;
diff --git a/srcpkgs/bc/patches/read.patch b/srcpkgs/bc/patches/read.patch
new file mode 100644
index 0000000000..f45a2b0d2b
--- /dev/null
+++ b/srcpkgs/bc/patches/read.patch
@@ -0,0 +1,44 @@
+--- bc/execute.c
++++ bc/execute.c
+@@ -638,19 +638,19 @@ push_constant (int (*in_char)(VOID), int conv_base)
+ }
+
+ /* Check for the special case of a single digit. */
+- if (in_ch < 36)
++ if (in_ch < 16)
+ {
+ first_ch = in_ch;
+ in_ch = in_char();
+- if (in_ch < 36 && first_ch >= conv_base)
++ if (in_ch < 16 && first_ch >= conv_base)
+ first_ch = conv_base - 1;
+ bc_int2num (&build, (int) first_ch);
+ }
+
+ /* Convert the integer part. */
+- while (in_ch < 36)
++ while (in_ch < 16)
+ {
+- if (in_ch < 36 && in_ch >= conv_base) in_ch = conv_base-1;
++ if (in_ch < 16 && in_ch >= conv_base) in_ch = conv_base-1;
+ bc_multiply (build, mult, &result, 0);
+ bc_int2num (&temp, (int) in_ch);
+ bc_add (result, temp, &build, 0);
+@@ -665,7 +665,7 @@ push_constant (int (*in_char)(VOID), int conv_base)
+ divisor = bc_copy_num (_one_);
+ result = bc_copy_num (_zero_);
+ digits = 0;
+- while (in_ch < 36)
++ while (in_ch < 16)
+ {
+ bc_multiply (result, mult, &result, 0);
+ bc_int2num (&temp, (int) in_ch);
+@@ -673,7 +673,7 @@ push_constant (int (*in_char)(VOID), int conv_base)
+ bc_multiply (divisor, mult, &divisor, 0);
+ digits++;
+ in_ch = in_char();
+- if (in_ch < 36 && in_ch >= conv_base) in_ch = conv_base-1;
++ if (in_ch < 16 && in_ch >= conv_base) in_ch = conv_base-1;
+ }
+ bc_divide (result, divisor, &result, digits);
+ bc_add (build, result, &build, 0);
diff --git a/srcpkgs/bc/template b/srcpkgs/bc/template
index f8372ba5bb..7fb3dfb4fd 100644
--- a/srcpkgs/bc/template
+++ b/srcpkgs/bc/template
@@ -1,18 +1,30 @@
# Template file for 'bc'
pkgname=bc
-version=1.06.95
-revision=7
+version=1.07.1
+revision=1
build_style=gnu-configure
configure_args="--with-readline"
-hostmakedepends="flex"
+hostmakedepends="ed flex"
makedepends="readline-devel"
short_desc="An arbitrary precision numeric processing language"
maintainer="Juan RP "
homepage="http://www.gnu.org/software/${pkgname}/"
license="GPL-3"
-distfiles="http://alpha.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a
+disable_parallel_build=yes
+nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/2093/steps/shell_3/logs/stdio"
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" bc"
+ pre_build() {
+ (
+ cd bc
+ bc -c libmath.b libmath.h
+ ./fix-libmath_h
+ )
+ }
+fi
do_build() {
make ${makejobs} LEX="flex -I"
}
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index f3a718c21e..ff974066ba 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,22 +1,23 @@
# Template file for 'bcc'
pkgname=bcc
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
build_style=cmake
configure_args="-DREVISION=${version}"
hostmakedepends="flex"
-makedepends="clang elfutils-devel lld-devel llvm ncurses-devel python-devel zlib-devel"
+makedepends="clang elfutils-devel lld-devel llvm ncurses-devel
+ python-devel zlib-devel"
short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
-maintainer="Christian Neukirchen "
+maintainer="Leah Neukirchen "
license="Apache-2.0"
homepage="https://github.com/iovisor/bcc"
distfiles="https://github.com/iovisor/${pkgname}/archive/v${version}.tar.gz"
-checksum=8bdea41286dda0605e3e52fc76d345356dc637434935a112e6378e2dcb439a70
-
-if [ "${XBPS_TARGET_MACHINE##*-}" = musl ]; then
- broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/13841/steps/shell_3/logs/stdio"
-fi
+checksum=88f54dff96c30c6e7b45f475938eef790b1c9485f794b1ac6791c4e56007f7cc
+nocross=yes # https://github.com/voidlinux/void-packages/issues/4738
+post_extract() {
+ sed -i 's/REG_/BCC_REG_/g' src/cc/usdt_args.cc src/cc/usdt.h
+}
bcc-tools_package() {
short_desc+=" - tools"
depends="python-bcc>=${version}_${revision} linux-headers"
diff --git a/srcpkgs/bcunit-devel b/srcpkgs/bcunit-devel
new file mode 120000
index 0000000000..8a56f76b8e
--- /dev/null
+++ b/srcpkgs/bcunit-devel
@@ -0,0 +1 @@
+bcunit
\ No newline at end of file
diff --git a/srcpkgs/bcunit/template b/srcpkgs/bcunit/template
new file mode 100644
index 0000000000..083674aa15
--- /dev/null
+++ b/srcpkgs/bcunit/template
@@ -0,0 +1,33 @@
+# Template file for 'bcunit'
+pkgname=bcunit
+version=3.0
+revision=2
+_gitrev=29c556fa8ac1ab21fba1291231ffa8dea43cf32a
+wrksrc="${pkgname}-${_gitrev}"
+build_style=gnu-configure
+hostmakedepends="automake libtool"
+short_desc="Lightweight unit tests in C"
+maintainer="Jürgen Buchmüller "
+license="LGPL-2"
+homepage="https://github.com/BelledonneCommunications/bcunit"
+distfiles="https://github.com/BelledonneCommunications/bcunit/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=e379c26a429537da8408361a99f04c4492786f21d2ce6abb55fe7dcde4bc6206
+
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+post_install() {
+ mv ${DESTDIR}/usr/doc ${DESTDIR}/usr/share
+}
+
+bcunit-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.so
+ vmove usr/lib/pkgconfig
+ vmove usr/share
+ }
+}
diff --git a/srcpkgs/bdf2psf/template b/srcpkgs/bdf2psf/template
index b189b5004e..9e6e5c5092 100644
--- a/srcpkgs/bdf2psf/template
+++ b/srcpkgs/bdf2psf/template
@@ -1,6 +1,6 @@
# Template file for 'bdf2psf'
pkgname=bdf2psf
-version=1.163
+version=1.164
revision=1
wrksrc="console-setup-${version}"
depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen "
license="GPL-2"
homepage="https://packages.debian.org/sid/bdf2psf"
distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=3c268222617e0db2c8b1d6377c286d7649dcdc5c2c5e7651cc5951f46870c562
+checksum=0c062a4dd93d03b5bc6d24a77fb14ed53e50d7e59dba6bf58a63e290ac728dfa
noarch=yes
post_extract() {
diff --git a/srcpkgs/bearssl-devel b/srcpkgs/bearssl-devel
new file mode 120000
index 0000000000..0fcc137f92
--- /dev/null
+++ b/srcpkgs/bearssl-devel
@@ -0,0 +1 @@
+bearssl
\ No newline at end of file
diff --git a/srcpkgs/bearssl/template b/srcpkgs/bearssl/template
new file mode 100644
index 0000000000..b3dbcdc217
--- /dev/null
+++ b/srcpkgs/bearssl/template
@@ -0,0 +1,31 @@
+# Template file for 'bearssl'
+pkgname=bearssl
+version=0.4
+revision=1
+build_style=gnu-makefile
+short_desc="Implementation of the SSL/TLS protocol in C"
+maintainer="Leah Neukirchen "
+license="MIT"
+homepage="https://www.bearssl.org/"
+_changelog="https://www.bearssl.org/changelog.html"
+distfiles="https://www.bearssl.org/${pkgname}-${version}.tar.gz"
+checksum=674d69ca6811a4a091de96d5866e22f06ffbf8d3765f0e884d9daeb80aa904d4
+CFLAGS="-fPIC"
+make_build_args="D=.so.${version} LDDLL=\$(CC) LD=\$(CC) LDDLLFLAGS=-shared LDDLLFLAGS+=-Wl,-soname,libbearssl.so.0"
+
+do_install() {
+ vbin build/brssl
+ vinstall build/libbearssl.a 0644 usr/lib
+ vinstall build/libbearssl.so.${version} 0644 usr/lib
+ ln -s libbearssl.so.${version} ${DESTDIR}/usr/lib/libbearssl.so
+ vcopy inc usr/include
+}
+bearssl-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.a
+ vmove usr/lib/*.so
+ }
+}
diff --git a/srcpkgs/beep/template b/srcpkgs/beep/template
index aec4605fb7..ac0bc12a21 100644
--- a/srcpkgs/beep/template
+++ b/srcpkgs/beep/template
@@ -5,7 +5,7 @@ revision=3
build_style=gnu-makefile
make_build_args="beep"
short_desc="Beep music composer"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
license="GPL-3"
depends="libcap-progs"
homepage="http://www.johnath.com/beep/"
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 4ba91de833..2625a774da 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,7 +1,7 @@
# Template file for 'bijiben'
pkgname=bijiben
-version=3.20.2
-revision=2
+version=3.21.2
+revision=1
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool itstool gobject-introspection"
@@ -16,4 +16,4 @@ maintainer="Juan RP "
homepage="http://live.gnome.org/Apps/Bijiben"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=5774dfdedb79f5ffe5bac3cebe0816dc7e6410381744dcb999815061dee6a981
+checksum=d7f05abd82da837d8d48d9f7acc6035a289d934c722fc89870d17007ba158e0d
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index b74d392141..e41d8434dd 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -3,7 +3,7 @@ pkgname=bind
_distver=9.10.4
_patchver=P6
version="${_distver}${_patchver}"
-revision=3
+revision=4
wrksrc="${pkgname}-${_distver}-${_patchver}"
short_desc="Berkeley Internet Name Domain server"
maintainer="Juan RP "
diff --git a/srcpkgs/bindfs/template b/srcpkgs/bindfs/template
index 94d5f815d4..62cca9ab72 100644
--- a/srcpkgs/bindfs/template
+++ b/srcpkgs/bindfs/template
@@ -1,6 +1,6 @@
# Template file for 'bindfs'
pkgname=bindfs
-version=1.13.6
+version=1.13.7
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Juan RP "
homepage="http://bindfs.org"
license="GPL-2"
distfiles="http://bindfs.org/downloads/bindfs-${version}.tar.gz"
-checksum=3c654c2d5d9780189b87b19002ecdeb32d97914481f5f1f841f7585700f8df97
+checksum=09a41b32db5ef54220161a79ffa4721507bc18bf9b3f6fcbbc05f0c661060041
diff --git a/srcpkgs/binfmt-support/template b/srcpkgs/binfmt-support/template
index 69acce63a9..dbab19b745 100644
--- a/srcpkgs/binfmt-support/template
+++ b/srcpkgs/binfmt-support/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libpipeline-devel"
short_desc="Register interpreters for various binary formats"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
license="GPL-3"
homepage="http://packages.debian.org/en/sid/binfmt-support"
distfiles="${DEBIAN_SITE}/main/b/binfmt-support/binfmt-support_$version.orig.tar.gz"
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index c6e48c79f1..9c67ee4d6f 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,15 +1,14 @@
# Template file for 'binutils'
pkgname=binutils
-version=2.27
-revision=2
+version=2.28
+revision=1
bootstrap=yes
short_desc="GNU binary utilities"
maintainer="Juan RP "
homepage="http://www.gnu.org/software/binutils/"
license="GPL-3"
distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88
-nopie=yes
+checksum=6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72
if [ "$CHROOT_READY" ]; then
hostmakedepends="flex perl"
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index ccaba941cd..cd0bb8c2a9 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,7 +1,7 @@
# Template file for 'bitchx'
pkgname=bitchx
version=1.2.1
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-ssl --with-ipv6 --with-plugins"
makedepends="libressl-devel ncurses-devel"
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 208f862036..fecd82eb63 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=0.13.1
-revision=1
+revision=4
create_wrksrc=yes
hostmakedepends="pkg-config yasm"
makedepends="db-devel protobuf-devel boost-devel miniupnpc-devel libevent-devel qrencode-devel"
diff --git a/srcpkgs/bitlbee-facebook/template b/srcpkgs/bitlbee-facebook/template
index 1e4acc82a9..9204101fd7 100644
--- a/srcpkgs/bitlbee-facebook/template
+++ b/srcpkgs/bitlbee-facebook/template
@@ -1,16 +1,16 @@
# Template file for 'bitlbee-facebook'
pkgname=bitlbee-facebook
-version=1.0.0
+version=1.1.1
revision=1
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config glib-devel"
makedepends="bitlbee-devel json-glib-devel"
short_desc="Facebook protocol plugin for BitlBee"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
license="GPL-2"
homepage="https://github.com/jgeboski/bitlbee-facebook"
distfiles="${homepage}/archive/v$version.tar.gz"
-checksum=20e0c41393be151735463b206625c91977706db144ff8ff1d4d726e1f33fd124
+checksum=100cd5977fdb2495cb7d0325d12cc3825ccba0c7a2adce9146c9228f15c4e699
pre_configure() {
autoreconf -fi
diff --git a/srcpkgs/bitlbee-steam/template b/srcpkgs/bitlbee-steam/template
index f94c855eaa..1af7705331 100644
--- a/srcpkgs/bitlbee-steam/template
+++ b/srcpkgs/bitlbee-steam/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="bitlbee-devel"
short_desc="Steam protocol plugin for BitlBee"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
license="GPL-2"
homepage="https://github.com/jgeboski/bitlbee-steam"
distfiles="${homepage}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/bitlbee/template b/srcpkgs/bitlbee/template
index 22690e4830..091c2569f1 100644
--- a/srcpkgs/bitlbee/template
+++ b/srcpkgs/bitlbee/template
@@ -1,7 +1,7 @@
# Template file for 'bitlbee'
pkgname=bitlbee
version=3.5.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--etcdir=/etc/bitlbee --sbindir=/usr/bin
--pidfile=/run/${pkgname}/${pkgname}.pid
diff --git a/srcpkgs/blender/patches/1a01ef4ae903f05ae4ff14bd585ed909e35fc089.diff b/srcpkgs/blender/patches/1a01ef4ae903f05ae4ff14bd585ed909e35fc089.diff
new file mode 100644
index 0000000000..83ea387348
--- /dev/null
+++ b/srcpkgs/blender/patches/1a01ef4ae903f05ae4ff14bd585ed909e35fc089.diff
@@ -0,0 +1,269 @@
+upstream patch: https://developer.blender.org/rB1a01ef4ae903f05ae4ff14bd585ed909e35fc089
+
+diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h
+index e97a250cd2..0126e30d90 100644
+--- a/source/blender/blenlib/BLI_math_base.h
++++ b/source/blender/blenlib/BLI_math_base.h
+@@ -1,262 +1,205 @@
+ /*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: some of this file.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ * */
+
+ #ifndef __BLI_MATH_BASE_H__
+ #define __BLI_MATH_BASE_H__
+
+ /** \file BLI_math_base.h
+ * \ingroup bli
+ */
+
+ #ifdef _MSC_VER
+ # define _USE_MATH_DEFINES
+ #endif
+
+ #include
+ #include "BLI_math_inline.h"
+
+ #ifndef M_PI
+ #define M_PI 3.14159265358979323846 /* pi */
+ #endif
+ #ifndef M_PI_2
+ #define M_PI_2 1.57079632679489661923 /* pi/2 */
+ #endif
+ #ifndef M_PI_4
+ #define M_PI_4 0.78539816339744830962 /* pi/4 */
+ #endif
+ #ifndef M_SQRT2
+ #define M_SQRT2 1.41421356237309504880 /* sqrt(2) */
+ #endif
+ #ifndef M_SQRT1_2
+ #define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */
+ #endif
+ #ifndef M_SQRT3
+ #define M_SQRT3 1.73205080756887729352 /* sqrt(3) */
+ #endif
+ #ifndef M_SQRT1_3
+ #define M_SQRT1_3 0.57735026918962576450 /* 1/sqrt(3) */
+ #endif
+ #ifndef M_1_PI
+ #define M_1_PI 0.318309886183790671538 /* 1/pi */
+ #endif
+ #ifndef M_E
+ #define M_E 2.7182818284590452354 /* e */
+ #endif
+ #ifndef M_LOG2E
+ #define M_LOG2E 1.4426950408889634074 /* log_2 e */
+ #endif
+ #ifndef M_LOG10E
+ #define M_LOG10E 0.43429448190325182765 /* log_10 e */
+ #endif
+ #ifndef M_LN2
+ #define M_LN2 0.69314718055994530942 /* log_e 2 */
+ #endif
+ #ifndef M_LN10
+ #define M_LN10 2.30258509299404568402 /* log_e 10 */
+ #endif
+
+ #if defined(__GNUC__)
+ # define NAN_FLT __builtin_nanf("")
+ #else
+ /* evil quiet NaN definition */
+ static const int NAN_INT = 0x7FC00000;
+ # define NAN_FLT (*((float *)(&NAN_INT)))
+ #endif
+
+-/* do not redefine functions from C99, POSIX.1-2001 or MSVC12 (partial C99) */
+-#if !(defined(_ISOC99_SOURCE) || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || defined(_MSC_VER))
+-
+-#ifndef sqrtf
+-#define sqrtf(a) ((float)sqrt(a))
+-#endif
+-#ifndef powf
+-#define powf(a, b) ((float)pow(a, b))
+-#endif
+-#ifndef cosf
+-#define cosf(a) ((float)cos(a))
+-#endif
+-#ifndef sinf
+-#define sinf(a) ((float)sin(a))
+-#endif
+-#ifndef acosf
+-#define acosf(a) ((float)acos(a))
+-#endif
+-#ifndef asinf
+-#define asinf(a) ((float)asin(a))
+-#endif
+-#ifndef atan2f
+-#define atan2f(a, b) ((float)atan2(a, b))
+-#endif
+-#ifndef tanf
+-#define tanf(a) ((float)tan(a))
+-#endif
+-#ifndef atanf
+-#define atanf(a) ((float)atan(a))
+-#endif
+-#ifndef floorf
+-#define floorf(a) ((float)floor(a))
+-#endif
+-#ifndef ceilf
+-#define ceilf(a) ((float)ceil(a))
+-#endif
+-#ifndef fabsf
+-#define fabsf(a) ((float)fabs(a))
+-#endif
+-#ifndef logf
+-#define logf(a) ((float)log(a))
+-#endif
+-#ifndef expf
+-#define expf(a) ((float)exp(a))
+-#endif
+-#ifndef fmodf
+-#define fmodf(a, b) ((float)fmod(a, b))
+-#endif
+-#ifndef hypotf
+-#define hypotf(a, b) ((float)hypot(a, b))
+-#endif
+-#ifndef copysignf
+-#define copysignf(a, b) ((float)copysign(a, b))
+-#endif
+-
+-#endif /* C99, POSIX.1-2001 or MSVC12 (partial C99) */
+-
+ #if BLI_MATH_DO_INLINE
+ #include "intern/math_base_inline.c"
+ #endif
+
+ #ifdef BLI_MATH_GCC_WARN_PRAGMA
+ # pragma GCC diagnostic push
+ # pragma GCC diagnostic ignored "-Wredundant-decls"
+ #endif
+
+ /******************************* Float ******************************/
+
+ MINLINE float pow2f(float x);
+ MINLINE float pow3f(float x);
+ MINLINE float pow4f(float x);
+ MINLINE float pow7f(float x);
+
+ MINLINE float sqrt3f(float f);
+ MINLINE double sqrt3d(double d);
+
+ MINLINE float sqrtf_signed(float f);
+
+ MINLINE float saacosf(float f);
+ MINLINE float saasinf(float f);
+ MINLINE float sasqrtf(float f);
+ MINLINE float saacos(float fac);
+ MINLINE float saasin(float fac);
+ MINLINE float sasqrt(float fac);
+
+ MINLINE float interpf(float a, float b, float t);
+
+ MINLINE float min_ff(float a, float b);
+ MINLINE float max_ff(float a, float b);
+ MINLINE float min_fff(float a, float b, float c);
+ MINLINE float max_fff(float a, float b, float c);
+ MINLINE float min_ffff(float a, float b, float c, float d);
+ MINLINE float max_ffff(float a, float b, float c, float d);
+
+ MINLINE int min_ii(int a, int b);
+ MINLINE int max_ii(int a, int b);
+ MINLINE int min_iii(int a, int b, int c);
+ MINLINE int max_iii(int a, int b, int c);
+ MINLINE int min_iiii(int a, int b, int c, int d);
+ MINLINE int max_iiii(int a, int b, int c, int d);
+
+ MINLINE int compare_ff(float a, float b, const float max_diff);
+ MINLINE int compare_ff_relative(float a, float b, const float max_diff, const int max_ulps);
+
+ MINLINE float signf(float f);
+ MINLINE int signum_i_ex(float a, float eps);
+ MINLINE int signum_i(float a);
+
+ MINLINE float power_of_2(float f);
+
+ /* these don't really fit anywhere but were being copied about a lot */
+ MINLINE int is_power_of_2_i(int n);
+ MINLINE int power_of_2_max_i(int n);
+ MINLINE int power_of_2_min_i(int n);
+
+ MINLINE unsigned int power_of_2_max_u(unsigned int x);
+ MINLINE unsigned int power_of_2_min_u(unsigned int x);
+
+ MINLINE int iroundf(float a);
+ MINLINE int divide_round_i(int a, int b);
+ MINLINE int mod_i(int i, int n);
+
+ int pow_i(int base, int exp);
+ double double_round(double x, int ndigits);
+
+ #ifdef BLI_MATH_GCC_WARN_PRAGMA
+ # pragma GCC diagnostic pop
+ #endif
+
+ /* asserts, some math functions expect normalized inputs
+ * check the vector is unit length, or zero length (which can't be helped in some cases).
+ */
+ #ifndef NDEBUG
+ /* note: 0.0001 is too small becaues normals may be converted from short's: see [#34322] */
+ # define BLI_ASSERT_UNIT_EPSILON 0.0002f
+ # define BLI_ASSERT_UNIT_V3(v) { \
+ const float _test_unit = len_squared_v3(v); \
+ BLI_assert((fabsf(_test_unit - 1.0f) < BLI_ASSERT_UNIT_EPSILON) || \
+ (fabsf(_test_unit) < BLI_ASSERT_UNIT_EPSILON)); \
+ } (void)0
+
+ # define BLI_ASSERT_UNIT_V2(v) { \
+ const float _test_unit = len_squared_v2(v); \
+ BLI_assert((fabsf(_test_unit - 1.0f) < BLI_ASSERT_UNIT_EPSILON) || \
+ (fabsf(_test_unit) < BLI_ASSERT_UNIT_EPSILON)); \
+ } (void)0
+
+ # define BLI_ASSERT_UNIT_QUAT(q) { \
+ const float _test_unit = dot_qtqt(q, q); \
+ BLI_assert((fabsf(_test_unit - 1.0f) < BLI_ASSERT_UNIT_EPSILON * 10) || \
+ (fabsf(_test_unit) < BLI_ASSERT_UNIT_EPSILON * 10)); \
+ } (void)0
+
+ # define BLI_ASSERT_ZERO_M3(m) { \
+ BLI_assert(dot_vn_vn((const float *)m, (const float *)m, 9) != 0.0); \
+ } (void)0
+
+ # define BLI_ASSERT_ZERO_M4(m) { \
+ BLI_assert(dot_vn_vn((const float *)m, (const float *)m, 16) != 0.0); \
+ } (void)0
+ # define BLI_ASSERT_UNIT_M3(m) { \
+ BLI_ASSERT_UNIT_V3((m)[0]); \
+ BLI_ASSERT_UNIT_V3((m)[1]); \
+ BLI_ASSERT_UNIT_V3((m)[2]); \
+ } (void)0
+ #else
+ # define BLI_ASSERT_UNIT_V2(v) (void)(v)
+ # define BLI_ASSERT_UNIT_V3(v) (void)(v)
+ # define BLI_ASSERT_UNIT_QUAT(v) (void)(v)
+ # define BLI_ASSERT_ZERO_M3(m) (void)(m)
+ # define BLI_ASSERT_ZERO_M4(m) (void)(m)
+ # define BLI_ASSERT_UNIT_M3(m) (void)(m)
+ #endif
+
+ #endif /* __BLI_MATH_BASE_H__ */
diff --git a/srcpkgs/blender/patches/blender-2.78a-musl.patch b/srcpkgs/blender/patches/blender-2.78a-musl.patch
new file mode 100644
index 0000000000..1ffd09cd57
--- /dev/null
+++ b/srcpkgs/blender/patches/blender-2.78a-musl.patch
@@ -0,0 +1,67 @@
+diff -ru blender-2.78.orig/CMakeLists.txt blender-2.78a/CMakeLists.txt
+--- blender-2.78.orig/CMakeLists.txt 2016-10-25 12:09:56.000000000 +0000
++++ blender-2.78a/CMakeLists.txt 2017-02-07 14:50:03.967828817 +0000
+@@ -181,6 +181,18 @@
+ set(_init_SDL OFF)
+ set(_init_FFTW3 OFF)
+ set(_init_OPENSUBDIV OFF)
++ # musl-libc related checks (missing execinfo.h, and feenableexcept())
++ include(CheckIncludeFiles)
++ check_include_files(execinfo.h HAVE_EXECINFO_H)
++ if (HAVE_EXECINFO_H)
++ add_definitions(-DHAVE_EXECINFO_H)
++ endif()
++
++ include(CheckLibraryExists)
++ check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
++ if (HAVE_FEENABLEEXCEPT)
++ add_definitions(-DHAVE_FEENABLEEXCEPT)
++ endif()
+ elseif(WIN32)
+ set(_init_JACK OFF)
+ elseif(APPLE)
+diff -ru blender-2.78.orig/intern/guardedalloc/intern/mallocn_intern.h blender-2.78a/intern/guardedalloc/intern/mallocn_intern.h
+--- blender-2.78.orig/intern/guardedalloc/intern/mallocn_intern.h 2016-09-28 09:26:55.000000000 +0000
++++ blender-2.78a/intern/guardedalloc/intern/mallocn_intern.h 2017-02-07 14:44:35.213040733 +0000
+@@ -52,7 +52,7 @@
+ #undef HAVE_MALLOC_STATS
+ #define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */
+
+-#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || defined(__GLIBC__)
++#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || defined(__GLIBC__)
+ # include
+ # define HAVE_MALLOC_STATS
+ #elif defined(__FreeBSD__)
+diff -ru blender-2.78.orig/source/blender/blenlib/intern/system.c blender-2.78a/source/blender/blenlib/intern/system.c
+--- blender-2.78.orig/source/blender/blenlib/intern/system.c 2016-10-25 09:59:23.000000000 +0000
++++ blender-2.78a/source/blender/blenlib/intern/system.c 2017-02-07 14:44:35.213040733 +0000
+@@ -31,7 +31,7 @@
+ #include "MEM_guardedalloc.h"
+
+ /* for backtrace */
+-#if defined(__linux__) || defined(__APPLE__)
++#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) || defined(__APPLE__)
+ # include
+ #elif defined(WIN32)
+ # include
+@@ -77,7 +77,7 @@
+ {
+ /* ------------- */
+ /* Linux / Apple */
+-#if defined(__linux__) || defined(__APPLE__)
++#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) || defined(__APPLE__)
+
+ #define SIZE 100
+ void *buffer[SIZE];
+diff -ru blender-2.78.orig/source/creator/creator_signals.c blender-2.78a/source/creator/creator_signals.c
+--- blender-2.78.orig/source/creator/creator_signals.c 2016-10-24 14:13:56.000000000 +0000
++++ blender-2.78a/source/creator/creator_signals.c 2017-02-07 14:47:01.888625973 +0000
+@@ -309,7 +309,7 @@
+ * set breakpoints on sig_handle_fpe */
+ signal(SIGFPE, sig_handle_fpe);
+
+-# if defined(__linux__) && defined(__GNUC__)
++# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT)
+ feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
+ # endif /* defined(__linux__) && defined(__GNUC__) */
+ # if defined(OSX_SSE_FPE)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a58bbfa85b..b8f492bba7 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,21 +1,22 @@
# Template file for 'blender'
pkgname=blender
-version=2.78b
-revision=1
+version=2.78c
+revision=3
build_style="cmake"
makedepends="
libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
libopenexr-devel libopenjpeg-devel libXi-devel openimageio-devel
- opencolorio-devel jemalloc-devel opencollada-devel"
+ opencolorio-devel opencollada-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="3D graphics creation suite"
maintainer="Enno Boland "
license="GPL-2"
homepage="http://blender.org"
distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.gz"
-checksum=4d888ee4c90743b2f2414af6f386d75d696ce698795f277c0accc0683fc7f971
+checksum=64a98ff30300f79385ddb9ad016aa790a92720ff2feb84ddb1d097e6531dd338
+patch_args="-Np1"
pycompile_version="$py3_ver"
pycompile_dirs="/usr/share/blender/$version/scripts"
@@ -43,5 +44,8 @@ configure_args="
-DPYTHON_INCLUDE_DIRS=$py3_inc"
case "$XBPS_TARGET_MACHINE" in
- *-musl) broken="http://build.voidlinux.eu/builders/x86_64-musl_builder/builds/3998/steps/shell_3/logs/stdio";;
+ *-musl) # crashes at startup in jemallocs free()
+ ;;
+ *) makedepends+=" jemalloc-devel"
+ ;;
esac
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 6bc238462f..fed8ccf362 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
# Template file for 'bmake'
pkgname=bmake
-version=20170301
+version=20170421
revision=1
create_wrksrc=yes
short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Juan RP "
license="BSD"
homepage="http://www.crufty.net/help/sjg/bmake.html"
distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=1253b7efb305c9d3de3202b1c18950a27ff54669ed07090bd9b02b0a2bcc42cf
+checksum=763104954b566ae9f575ea682dc38ed5c73057336f5f6090fb7489a5399511c5
do_configure() {
cd bmake
diff --git a/srcpkgs/bochs/template b/srcpkgs/bochs/template
index a9d361421b..49e26c39b2 100644
--- a/srcpkgs/bochs/template
+++ b/srcpkgs/bochs/template
@@ -1,6 +1,6 @@
# Template file for 'bochs'
pkgname="bochs"
-version="2.6.8"
+version="2.6.9"
revision=1
build_style=gnu-configure
short_desc="Highly portable open source IA-32 (x86) PC emulator"
@@ -12,7 +12,7 @@ makedepends="libX11-devel libXrandr-devel gtk+-devel"
configure_args="--enable-debugger --enable-disasm --disable-readline"
disable_parallel_build=yes
distfiles="$SOURCEFORGE_SITE/bochs/bochs-${version}.tar.gz"
-checksum="79700ef0914a0973f62d9908ff700ef7def62d4a28ed5de418ef61f3576585ce"
+checksum=ee5b677fd9b1b9f484b5aeb4614f43df21993088c0c0571187f93acb0866e98c
pre_build() {
sed -i 's/^LIBS = /LIBS = -lpthread/g' Makefile
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index cf1397a1c6..f459ae34f2 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,8 +1,8 @@
# Template file for 'boinc'
pkgname=boinc
-version=7.6.33
+version=7.6.34
revision=1
-wrksrc=boinc-client_release-${version%.*}-${version}
+wrksrc=boinc-client_release-${version%.*}-${version%4}
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config python"
makedepends="glu-devel libfreeglut-devel libcurl-devel wxWidgets-devel webkitgtk2-devel
@@ -17,7 +17,7 @@ maintainer="Jürgen Buchmüller "
license="LGPL-3.0"
homepage="https://boinc.berkeley.edu/"
distfiles="https://github.com/BOINC/boinc/archive/client_release/${version%.*}/${version}.tar.gz>boinc-${version}.tar.gz"
-checksum=c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d
+checksum=9c58df3925e75f99ce46e0abcc4a90b58d345e568198bcb33a4d98bcd318709a
conflicts="boinc-nox>=0"
CXXFLAGS="-Wno-redundant-decls"
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
index f741229087..e6dbd88127 100644
--- a/srcpkgs/bomi/template
+++ b/srcpkgs/bomi/template
@@ -1,7 +1,7 @@
# Template file for 'bomi'
pkgname=bomi
version=0.9.11
-revision=7
+revision=8
build_style=configure
short_desc="A powerful and easy-to-use Qt5 multimedia player"
maintainer="Jakub Skrzypnik "
diff --git a/srcpkgs/boost/patches/fix-ublas-storage.patch b/srcpkgs/boost/patches/fix-ublas-storage.patch
new file mode 100644
index 0000000000..0138ceb214
--- /dev/null
+++ b/srcpkgs/boost/patches/fix-ublas-storage.patch
@@ -0,0 +1,10 @@
+--- boost/numeric/ublas/storage.hpp.orig 2017-04-17 02:22:23.000000000 +0000
++++ boost/numeric/ublas/storage.hpp 2017-04-22 14:00:01.928830045 +0000
+@@ -19,6 +19,7 @@
+ #endif
+
+ #include
++#include
+ #include
+ #include
+
diff --git a/srcpkgs/boost/patches/libressl.patch b/srcpkgs/boost/patches/libressl.patch
deleted file mode 100644
index 9b93e20610..0000000000
--- a/srcpkgs/boost/patches/libressl.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- boost/asio/ssl/impl/context.ipp.orig 2016-09-29 11:44:54.479184454 +0200
-+++ boost/asio/ssl/impl/context.ipp 2016-09-29 11:44:56.838184575 +0200
-@@ -228,7 +228,7 @@
- {
- if (handle_)
- {
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
- void* cb_userdata = handle_->default_passwd_callback_userdata;
-@@ -239,7 +239,7 @@
- static_cast(
- cb_userdata);
- delete callback;
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- ::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0);
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
- handle_->default_passwd_callback_userdata = 0;
-@@ -578,7 +578,7 @@
- bio_cleanup bio = { make_buffer_bio(chain) };
- if (bio.p)
- {
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
- void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-@@ -682,7 +682,7 @@
- {
- ::ERR_clear_error();
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
- void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-@@ -749,7 +749,7 @@
- {
- ::ERR_clear_error();
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
- void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-@@ -988,7 +988,7 @@
- boost::system::error_code context::do_set_password_callback(
- detail::password_callback_base* callback, boost::system::error_code& ec)
- {
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
- ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback);
- #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 2b38248b6b..2468f52bd7 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
# Template file for 'boost'
pkgname=boost
-version=1.62.0
-revision=3
+version=1.64.0
+revision=1
wrksrc="${pkgname}_${version//\./_}"
hostmakedepends="bzip2-devel icu-devel python-devel"
makedepends="zlib-devel bzip2-devel icu-devel python-devel"
@@ -10,7 +10,7 @@ maintainer="Juan RP "
homepage="http://www.boost.org/"
license="Boost Software License 1.0"
distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${version//\./_}.tar.bz2"
-checksum=36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0
+checksum=7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332
CXXFLAGS="-std=c++11"
diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index 7e7fbfd643..cdfe1547ab 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,7 +1,7 @@
# Template file for 'borg'
pkgname=borg
version=1.0.10
-revision=1
+revision=2
wrksrc="borgbackup-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-devel libressl-devel
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index ba6d38105c..e91e6ca279 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.0.1
-revision=1
+revision=2
wrksrc="${pkgname^}-${version}"
build_style=gnu-makefile
hostmakedepends="doxygen epstopdf python"
diff --git a/srcpkgs/brltty/patches/crosspython.patch b/srcpkgs/brltty/patches/crosspython.patch
new file mode 100644
index 0000000000..da3ee93a2b
--- /dev/null
+++ b/srcpkgs/brltty/patches/crosspython.patch
@@ -0,0 +1,10 @@
+diff -Naur brltty-5.5/Bindings/Python/Makefile.in brltty-5.5.new/Bindings/Python/Makefile.in
+--- Bindings/Python/Makefile.in 2017-04-18 15:35:13.000000000 -0700
++++ Bindings/Python/Makefile.in 2017-04-23 17:36:27.797793633 -0700
+@@ -1,3 +1,6 @@
++export LDFLAGS= @LDFLAGS@ @PYTHON_LIBS@
++export CFLAGS= @CFLAGS@ @PYTHON_CPPFLAGS@
++export LDSHARED= @CC@ -shared @LDFLAGS@
+ ###############################################################################
+ # libbrlapi - A library providing access to braille terminals for applications.
+ #
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index ad535607ce..27b9401227 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,22 +1,33 @@
# Template file for 'brltty'
pkgname=brltty
-version=5.4
+version=5.5
revision=1
build_style=gnu-configure
-makedepends="ncurses-devel alsa-lib-devel gpm-devel at-spi2-core-devel"
-configure_args="--enable-gpm --with-screen-driver=lx --with-tables-directory=/usr/share/brltty"
+hostmakedepends="pkg-config python3-Cython python3 xproto"
+makedepends="ncurses-devel alsa-lib-devel gpm-devel at-spi2-core-devel dbus-devel glib-devel xproto icu-devel python3-devel libbluetooth-devel"
+depends="python3"
+configure_args="--enable-gpm --with-screen-driver=lx,a2,sc --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
short_desc="Braille display driver for Linux/Unix"
maintainer="Juan RP "
license="GPL-2, LGPL-2.1"
homepage="http://mielke.cc/brltty/"
distfiles="http://mielke.cc/brltty/archive/brltty-${version}.tar.xz"
-checksum=5d071bd6be9e7f3f85745088e00471c8dec6ebb77fd5b5c89e8f4cbc2d2c5d4f
+checksum=4ebf1df5922df0efccac4795f5bd1c514fc850348c34d9ec0868e2798b565a36
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*) configure_args="${configure_args} --with-ports-package=glibc";;
+ *) configure_args="${configure_args} --with-ports-package=none";;
+esac
+# glibc is a misnomer here, it's just ioperm inb outp and friends, works
+# fine with musl.
pre_configure() {
case "$XBPS_TARGET_MACHINE" in
*-musl) # There is no ldconfig in musl libc
sed -e "s;/sbin/ldconfig -n;echo;" -i configure
esac
+ export PYTHON_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython3.5m"
+ export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python3.5m"
}
post_configure() {
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/brotli-devel b/srcpkgs/brotli-devel
new file mode 120000
index 0000000000..ac6cebc820
--- /dev/null
+++ b/srcpkgs/brotli-devel
@@ -0,0 +1 @@
+brotli
\ No newline at end of file
diff --git a/srcpkgs/brotli/template b/srcpkgs/brotli/template
index e67a15ed74..c67a985d1a 100644
--- a/srcpkgs/brotli/template
+++ b/srcpkgs/brotli/template
@@ -1,15 +1,25 @@
# Template file for 'brotli'
pkgname=brotli
-version=0.5.2
+version=0.6.0
revision=1
build_style=cmake
short_desc="Generic-purpose lossless compression algorithm"
-maintainer="Christian Neukirchen "
+maintainer="Leah Neukirchen "
license="MIT"
homepage="https://github.com/google/brotli"
distfiles="https://github.com/google/${pkgname}/archive/v${version}.tar.gz"
-checksum=2b7b1183682a17d8a9b83170fccdbec270c9e56baf8c0082f5d9c4528412d343
+checksum=69cdbdf5709051dd086a2f020f5abf9e32519eafe0ad6be820c667c3a9c9ee0f
post_install() {
vlicense LICENSE
}
+
+brotli-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/*.so
+ vmove usr/lib/pkgconfig
+ }
+}
diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template
index d0fb4e438e..e5cf98b880 100644
--- a/srcpkgs/btfs/template
+++ b/srcpkgs/btfs/template
@@ -1,7 +1,7 @@
# Template file for 'btfs'
pkgname=btfs
version=2.13
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake pkg-config"
makedepends="boost-devel libcurl-devel libtorrent-rasterbar-devel fuse-devel"
diff --git a/srcpkgs/btrfs-progs/patches/musl-compat.patch b/srcpkgs/btrfs-progs/patches/musl-compat.patch
deleted file mode 100644
index 99b45ed4f2..0000000000
--- a/srcpkgs/btrfs-progs/patches/musl-compat.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- utils.c 2015-11-20 01:15:32.227019383 +0100
-+++ utils.c 2015-11-20 01:16:59.419971215 +0100
-@@ -1208,13 +1208,19 @@ static int resolve_loop_device(const cha
- {
- int ret;
- FILE *f;
-+ struct stat stat_buf;
- char fmt[20];
- char p[PATH_MAX];
- char real_loop_dev[PATH_MAX];
-
- if (!realpath(loop_dev, real_loop_dev))
- return -errno;
-- snprintf(p, PATH_MAX, "/sys/block/%s/loop/backing_file", strrchr(real_loop_dev, '/'));
-+
-+ if (stat(real_loop_dev, &stat_buf) || !S_ISBLK(stat_buf.st_mode))
-+ return -errno;
-+
-+ snprintf(p, PATH_MAX, "/sys/dev/block/%d:%d/loop/backing_file",
-+ major(stat_buf.st_rdev), minor(stat_buf.st_rdev));
- if (!(f = fopen(p, "r"))) {
- if (errno == ENOENT)
- /*
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 53dec1663a..f5e49db2ed 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,6 +1,6 @@
# Template file for 'btrfs-progs'
pkgname=btrfs-progs
-version=4.9.1
+version=4.10.2
revision=1
wrksrc=${pkgname}-v${version}
build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Juan RP "
license="GPL-2"
homepage="http://btrfs.wiki.kernel.org/"
distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=464a9bfd2b5eda76b0246ee0a4043f4de8d17c10312bc8b84abc5fbf9317fede
+checksum=ed09df670338562a52d9e7d76a362cc932737e2a67adca4c09395374be1de60a
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
new file mode 100644
index 0000000000..d25b31a5bf
--- /dev/null
+++ b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
@@ -0,0 +1,19 @@
+Musl realpath() implementation currently depends on /proc which is
+not available when setting up pivot root. For the time being just
+fallback to given path if realpath() fails. If there was symlinks
+that would have required normalizing the following parse_mountinfo()
+will fail.
+
+diff --git bind-mount.c bind-mount.c
+index 7d3543f..c33b701 100644
+--- bind-mount.c
++++ bind-mount.c
+@@ -397,7 +397,7 @@ bind_mount (int proc_fd,
+ path, so to find it in the mount table we need to do that too. */
+ resolved_dest = realpath (dest, NULL);
+ if (resolved_dest == NULL)
+- return 2;
++ resolved_dest = strdup (dest);
+
+ mount_tab = parse_mountinfo (proc_fd, resolved_dest);
+ if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
new file mode 100644
index 0000000000..884c159fe2
--- /dev/null
+++ b/srcpkgs/bubblewrap/template
@@ -0,0 +1,17 @@
+# Template file for 'bubblewrap'
+pkgname=bubblewrap
+version=0.1.8
+revision=2
+build_style=gnu-configure
+hostmakedepends="automake pkg-config"
+makedepends="libcap-devel"
+short_desc="Unprivileged sandboxing tool"
+maintainer="Duncaen "
+license="LGPL-2"
+homepage="https://github.com/projectatomic/bubblewrap"
+distfiles="https://github.com/projectatomic/bubblewrap/archive/v${version}.tar.gz"
+checksum=64f264f1ae3d7b8fbcfb7102592d42096f41ac7edda97ce57486aa3e05d8d489
+
+pre_configure() {
+ autoreconf -fi
+}
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index af0c26f130..ff912ebc48 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,12 +1,12 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
-version=10.2.9
+version=10.3
revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config intltool libtool gobject-introspection"
+hostmakedepends="meson gtk-doc pkg-config intltool libtool gobject-introspection"
makedepends="libglib-devel gtk+3-devel libpeas-devel pulseaudio-devel gnome-desktop-devel
mutter-devel gnome-menus-devel libwnck-devel libupower-glib1 vala
- libuuid-devel polkit-devel gettext-devel ibus-devel"
+ libuuid-devel polkit-devel gettext-devel ibus-devel accountsservice-devel
+ upower-devel gnome-bluetooth-devel"
depends="gnome-session"
# Needs gobject-introspection and libgirepository-devel, vala, gjs ...
nocross=yes
@@ -15,8 +15,16 @@ maintainer="Frankie Wilde "
license="GPL-2, LGPL-2.1"
homepage="https://github.com/solus-project/budgie-desktop"
distfiles="https://github.com/solus-project/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=80c49c462dffbc1af7e1264be5add7e11ff23909c715adeb0aa22129ac524c48
+checksum=bb37acbc6edddf64860352fac73fd968801e29ce0e66962ef2a3dd3a443d568f
-pre_configure() {
- autoreconf -if
+do_configure() {
+ meson --prefix=/usr --buildtype=plain build
+}
+
+do_build() {
+ ninja -C build
+}
+
+do_install() {
+ LD=$CC DESTDIR="$DESTDIR" ninja -C build install
}
diff --git a/srcpkgs/buku/template b/srcpkgs/buku/template
index f67419d918..3b348d1c11 100644
--- a/srcpkgs/buku/template
+++ b/srcpkgs/buku/template
@@ -1,17 +1,17 @@
# Template file for 'buku'
pkgname=buku
-version=2.9
+version=3.0
revision=1
wrksrc=Buku-${version}
noarch=yes
python_version="3"
-depends="python3"
+depends="python3 python3-requests"
short_desc="A cmdline bookmark management utility"
maintainer="Diogo Leal "
license="GPL-3"
homepage="https://github.com/jarun/Buku"
distfiles="https://github.com/jarun/Buku/archive/v${version}.tar.gz"
-checksum=d4175aab5fab72d41cd646f688311bc347d5fcdad23dc58ee87dffb695c5a51b
+checksum=5a6f66366bd2e1f2e85f386efd44f126bf313dc3a0d552330051916708afe497
do_install() {
vbin buku.py buku
diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template
index 639347123a..3a44213e67 100644
--- a/srcpkgs/bup/template
+++ b/srcpkgs/bup/template
@@ -1,6 +1,6 @@
# Template file for 'bup'
pkgname=bup
-version=0.29
+version=0.29.1
revision=1
build_style=configure
hostmakedepends="python perl git"
@@ -10,7 +10,7 @@ maintainer="Enno Boland "
license="LGPL-2"
homepage="https://github.com/bup/bup"
distfiles="https://github.com/bup/bup/archive/${version}.tar.gz"
-checksum=7cdfd8a7f081059f0c125a4363a6d1f59c8e95c7f57aa660ca31516af946186c
+checksum=d24b53c842d1edc907870aa69facbd45f68d778cc013b1c311b655d10d017250
nocross=yes
pre_configure() {
diff --git a/srcpkgs/burp-server/patches/fix-gcc6-narrowing.patch b/srcpkgs/burp-server/patches/fix-gcc6-narrowing.patch
new file mode 100644
index 0000000000..14643dd215
--- /dev/null
+++ b/srcpkgs/burp-server/patches/fix-gcc6-narrowing.patch
@@ -0,0 +1,49 @@
+--- src/conf.c.orig
++++ src/conf.c
+@@ -538,7 +538,7 @@ static void do_build_regex(struct strlis
+ struct fstype
+ {
+ const char *str;
+- long flag;
++ unsigned int flag;
+ };
+
+ static struct fstype fstypes[]={
+@@ -590,7 +590,7 @@ int main(int argc, char *argv[])
+
+ #endif
+
+-static int fstype_to_flag(const char *fstype, long *flag)
++static int fstype_to_flag(const char *fstype, unsigned int *flag)
+ {
+ #ifdef HAVE_LINUX_OS
+ int i=0;
+--- src/strlist.c.orig
++++ src/strlist.c
+@@ -21,7 +21,7 @@ void strlists_free(struct strlist **bd,
+ }
+ }
+
+-int strlist_add(struct strlist ***bdlist, int *count, char *path, long flag)
++int strlist_add(struct strlist ***bdlist, int *count, char *path, unsigned int flag)
+ {
+ //int b=0;
+ struct strlist *bdnew=NULL;
+--- src/strlist.h.orig
++++ src/strlist.h
+@@ -11,13 +11,13 @@ typedef struct strlist strlist_t;
+
+ struct strlist
+ {
+- long flag;
++ unsigned int flag;
+ char *path;
+ regex_t *re;
+ };
+
+ extern void strlists_free(struct strlist **bd, int count);
+-extern int strlist_add(struct strlist ***bdlist, int *count, char *path, long flag);
++extern int strlist_add(struct strlist ***bdlist, int *count, char *path, unsigned int flag);
+ extern int strlist_sort(struct strlist **a, struct strlist **b);
+
+ #endif
diff --git a/srcpkgs/burp-server/template b/srcpkgs/burp-server/template
index 1179828124..c3cdfe7744 100644
--- a/srcpkgs/burp-server/template
+++ b/srcpkgs/burp-server/template
@@ -3,7 +3,7 @@ _desc="A network-based backup and restore program"
pkgname=burp-server
version=1.4.40
-revision=4
+revision=5
short_desc="${_desc} - Server"
maintainer="Pierre Bourgin "
license="AGPL-3, BSD, GPL-2.1 and LGPL-2.1"
diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index 21c5922a0f..c40ad31c2d 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -2,8 +2,8 @@
_desc="A network-based backup and restore program"
pkgname=burp2-server
-version=2.1.4
-revision=1
+version=2.1.6
+revision=2
short_desc="${_desc} - Server"
maintainer="Pierre Bourgin "
license="AGPL-3, BSD, GPL-2.1 and LGPL-2.1"
@@ -11,7 +11,7 @@ homepage="http://burp.grke.org/"
wrksrc="burp-${version}"
patch_args='-Np1'
distfiles="https://github.com/grke/burp/archive/${version}.tar.gz"
-checksum=e486e3b0d2d15a9a0f9bb3f7823ea3e790cfd03979d3ab5bee44dc18704e310c
+checksum=3917383e7313d59c5082c196eb4c509cc246db06105a19e02263b411818ff218
hostmakedepends="automake libtool perl"
makedepends="
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 37dd0865af..ca2b843e48 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
# Template file for 'byacc'
pkgname=byacc
-version=20170201
+version=20170430
revision=1
build_style=gnu-configure
configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen "
license="Public Domain"
homepage="http://invisible-island.net/byacc/"
distfiles="ftp://invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=90b768d177f91204e6e7cef226ae1dc7cac831b625774cebd3e233a917754f91
+checksum=44cb43306c0f1e7b8539025fb02120261488d872969c8aa658bd50b0a5467299
alternatives="
yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/byobu/template b/srcpkgs/byobu/template
index 4b6fea643e..d2d8f4a7fe 100644
--- a/srcpkgs/byobu/template
+++ b/srcpkgs/byobu/template
@@ -1,6 +1,6 @@
# Template file for 'byobu'
pkgname=byobu
-version=5.115
+version=5.117
revision=1
build_style=gnu-configure
short_desc="A text-based window manager and terminal multiplexer"
@@ -8,4 +8,4 @@ maintainer="Diogo Leal "
license="GPL-3"
homepage="http://byobu.co/"
distfiles="https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"
-checksum=9ebc01c6b104a4bf072496f350eab04a0971aeb0f21e142d44180bf539765348
+checksum=64b0deac161a1d979e656052e23b13496c2d262fd7a069abddd21afbc7d0fca2
diff --git a/srcpkgs/cachefilesd/template b/srcpkgs/cachefilesd/template
index 6b15cd9f2c..4f5c454c7d 100644
--- a/srcpkgs/cachefilesd/template
+++ b/srcpkgs/cachefilesd/template
@@ -1,6 +1,6 @@
# Template file for 'cachefilesd'
pkgname=cachefilesd
-version=0.10.9
+version=0.10.10
revision=1
build_style=gnu-makefile
short_desc="Userspace daemon acting as a backend for FS-Cache"
@@ -8,7 +8,7 @@ maintainer="Enno Boland "
license="GPL-2"
homepage="https://people.redhat.com/~dhowells/fscache/"
distfiles="http://people.redhat.com/~dhowells/fscache/${pkgname}-${version}.tar.bz2"
-checksum=c897ec6704615f26de3ddc20ff30a191ce995cb8973d2cde88b4b28c1a1e6bca
+checksum=0d0309851efabd02b7c849f73535b8ad3f831570e83e4f65e42354da18e11a02
make_install_args="SBINDIR=/usr/bin BINDIR=/usr/bin"
conf_files="/etc/cachefilesd.conf"
diff --git a/srcpkgs/cairo-dock-plugins/patches/fix-timeval-redef.patch b/srcpkgs/cairo-dock-plugins/patches/fix-timeval-redef.patch
new file mode 100644
index 0000000000..da2155621d
--- /dev/null
+++ b/srcpkgs/cairo-dock-plugins/patches/fix-timeval-redef.patch
@@ -0,0 +1,56 @@
+--- alsaMixer/src/applet-struct.h.orig 2017-04-28 15:38:01.448075750 +0200
++++ alsaMixer/src/applet-struct.h 2017-04-28 15:38:10.281059992 +0200
+@@ -23,6 +23,8 @@
+ #include
+ #include
+ #define _STRUCT_TIMEVAL
++#define __timeval_defined 1
++#define __timespec_defined 1
+ #include
+
+ #ifdef INDICATOR_SOUNDMENU_WITH_IND3
+--- alsaMixer/src/applet-notifications.c.orig 2017-04-28 15:48:09.445991115 +0200
++++ alsaMixer/src/applet-notifications.c 2017-04-28 15:48:21.549969521 +0200
+@@ -17,6 +17,7 @@
+ * along with this program. If not, see .
+ */
+
++#define __timespec_defined 1
+ #include
+
+ #include "applet-struct.h"
+
+--- alsaMixer/src/applet-draw.c.orig 2017-04-28 15:51:33.625626869 +0200
++++ alsaMixer/src/applet-draw.c 2017-04-28 15:51:15.744658767 +0200
+@@ -19,6 +19,7 @@
+
+ #include
+ #include
++#define __timespec_defined 1
+ #include
+
+ #include "applet-struct.h"
+
+--- alsaMixer/src/applet-backend-alsamixer.c.orig 2017-04-28 15:56:14.587125649 +0200
++++ alsaMixer/src/applet-backend-alsamixer.c 2017-04-28 15:55:56.683157588 +0200
+@@ -20,6 +20,7 @@
+ #include
+ #include
+ #include
++#define __timespec_defined 1
+ #include
+
+ #include "applet-struct.h"
+
+--- Sound-Effects/src/applet-struct.h.orig 2017-04-28 16:00:52.732629452 +0200
++++ Sound-Effects/src/applet-struct.h 2017-04-28 16:00:36.919657661 +0200
+@@ -24,6 +24,8 @@
+ #include
+ #include
+ #define _STRUCT_TIMEVAL
++#define __timeval_defined 1
++#define __timespec_defined 1
+ #include
+
+ //\___________ structure containing the applet's configuration parameters.
+
diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 53dbdfb21d..7818a6863a 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'cairo-dock-plugins'
pkgname=cairo-dock-plugins
version=3.4.1
-revision=3
+revision=4
build_style=cmake
hostmakedepends="pkg-config"
# XXX libetpan, libdbusmenu, etc
diff --git a/srcpkgs/caja-extensions/template b/srcpkgs/caja-extensions/template
index 4d07b3ba6e..837ad31365 100644
--- a/srcpkgs/caja-extensions/template
+++ b/srcpkgs/caja-extensions/template
@@ -1,9 +1,8 @@
# Template file for 'caja-extensions'
pkgname=caja-extensions
-version=1.16.0
+version=1.18.1
revision=1
build_style=gnu-configure
-configure_args="--with-gtk=3.0"
hostmakedepends="pkg-config intltool glib-devel"
makedepends="libcaja-devel mate-desktop-devel dbus-glib-devel gupnp-devel"
depends="caja"
@@ -12,7 +11,7 @@ maintainer="Juan RP "
license="GPL-2"
homepage="http://mate-desktop.org"
distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7c6c2e414c391f8f2879dd9578e49f1c146eedf306c2ad7789c81032a9f28171
+checksum=bcb2f355c883bdca06a28028ca9a832d84e693257a60ea24304abbf98fa2ea41
caja-gksu_package() {
short_desc="A Caja extension for executing files with elevated privileges"
diff --git a/srcpkgs/caja/template b/srcpkgs/caja/template
index 2615a7d6e2..ee824cfda8 100644
--- a/srcpkgs/caja/template
+++ b/srcpkgs/caja/template
@@ -1,22 +1,22 @@
# Template file for 'caja'
pkgname=caja
-version=1.16.2
+version=1.18.2
revision=1
build_style=gnu-configure
-configure_args="--with-gtk=3.0 --disable-static --enable-unique
+configure_args="--disable-static --disable-packagekit --disable-schemas-compile
--disable-update-mimedb $(vopt_enable gir introspection)"
hostmakedepends="automake libtool gettext-devel pkg-config
intltool itstool glib-devel gobject-introspection"
-makedepends="pangox-compat-devel gtk+3-devel dbus-devel exempi-devel libexif-devel
- libXt-devel mate-desktop-devel startup-notification-devel gvfs-devel libxml2-devel
- libunique-devel"
+makedepends="gtk+3-devel dbus-devel exempi-devel libexif-devel libXt-devel
+ mate-desktop-devel startup-notification-devel gvfs-devel libxml2-devel
+ libnotify-devel"
depends="dbus desktop-file-utils gvfs mate-desktop mate-icon-theme"
short_desc="The MATE shell and file manager"
maintainer="Juan RP "
license="LGPL-2"
-homepage="http://mate-desktop.org"
-distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fd834c8b5e1a3d94feb8b1ce1bdefdc4154a906ad487887a330b1fa67323fb3a
+homepage="https://mate-desktop.org"
+distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=117fbc320bf73e76b20eeef87c69e2b2245b50520cf33b51999abe53929686a6
build_options="gir"
if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index b8e39e8f02..c98ed4256c 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,11 +1,10 @@
# Template file for 'calibre'
pkgname=calibre
-version=2.80.0
-revision=2
+version=2.83.0
+revision=1
hostmakedepends="qt5-qmake python-devel pkg-config
python-dateutil python-lxml python-Pillow
- python-PyQt5-webkit python-apsw python-cssutils python-CherryPy
- python-html5lib"
+ python-PyQt5-webkit python-apsw python-cssutils python-CherryPy"
makedepends="python-PyQt5-devel glib-devel libwmf-devel
fontconfig-devel libmagick-devel libressl-devel icu-devel sqlite-devel
libchmlib-devel libpodofo-devel qt5-devel libusb-devel libmtp-devel
@@ -13,15 +12,15 @@ makedepends="python-PyQt5-devel glib-devel libwmf-devel
depends="python-six python-dateutil python-cssutils python-CherryPy
python-Pillow python-dnspython python-PyQt5 python-PyQt5-svg
python-PyQt5-webkit python-psutil python-dbus python-netifaces
- python-cssselect python-apsw qt5-webkit qt5-svg python-chardet python-html5lib
+ python-cssselect python-apsw qt5-webkit qt5-svg python-chardet
python-Pygments python-mechanize python-lxml
shared-mime-info desktop-file-utils gtk-update-icon-cache optipng"
short_desc="Ebook management application"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
license="GPL-3"
homepage="https://calibre-ebook.com"
distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=33a6dbc578c7a2f3d1c97253769506a1afc10f688c062f027d64d7081618f2b1
+checksum=96166e8c74047cfbae9289c38ab5e2f661168048e568cd187f908242d98426ab
nocross=yes
pycompile_dirs="/usr/lib/calibre/"
@@ -30,7 +29,6 @@ do_configure() {
# Remove unneeded files and libs
rm -rf resources/${pkgname}-portable.* \
src/cherrypy \
- src/html5lib \
src/chardet
# Desktop integration (e.g. enforce arch defaults)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 50bf09bf0f..924bf3f2e5 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=2.9.11
-revision=9
+revision=11
build_style=cmake
configure_args="-Wno-dev -DBUILD_active=OFF -DWITH_Soprano=OFF -DBUILD_krita=OFF"
hostmakedepends="automoc4 perl pkg-config eigen3.2"
diff --git a/srcpkgs/cantata/patches/musl.patch b/srcpkgs/cantata/patches/musl.patch
new file mode 100644
index 0000000000..0d048eb879
--- /dev/null
+++ b/srcpkgs/cantata/patches/musl.patch
@@ -0,0 +1,11 @@
+--- 3rdparty/solid-lite/backends/udisks2/udisksblock.h.orig 2016-01-08 19:44:42.000000000 +0100
++++ 3rdparty/solid-lite/backends/udisks2/udisksblock.h 2017-03-09 11:41:06.071250302 +0100
+@@ -21,6 +21,7 @@
+ #ifndef UDISKS2BLOCK_H
+ #define UDISKS2BLOCK_H
+
++#include
+ #include
+ #include "udisksdeviceinterface.h"
+
+
diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template
index 31df974740..da7e8a1ef0 100644
--- a/srcpkgs/cantata/template
+++ b/srcpkgs/cantata/template
@@ -1,15 +1,18 @@
# Template file for 'cantata'
pkgname=cantata
-version=1.5.2
-revision=2
+version=2.0.1
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="qt-devel zlib-devel ffmpeg-devel taglib-devel taglib-extras-devel libmtp-devel mpg123-devel
-libcdparanoia-devel libcddb-devel speex-devel eudev-libudev-devel udisks2-devel libmusicbrainz5-devel"
+makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-xmlpatterns-devel
+ qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-odbc
+ qt5-plugin-tds vlc-devel zlib-devel ffmpeg-devel taglib-devel
+ taglib-extras-devel libmtp-devel mpg123-devel libcdparanoia-devel libcddb-devel
+ speex-devel eudev-libudev-devel udisks2-devel libmusicbrainz5-devel"
depends="media-player-info"
short_desc="Qt client for the music player daemon (MPD)"
maintainer="LockeAnarchist "
license="GPL-3"
homepage="https://github.com/cdrummond/cantata"
-distfiles="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60LV9rM3RMQk85Z1E>cantata-${version}.tar.bz2"
-checksum=4de985b74597c4c3936982437ea562711d08c37d318b61e04f5c07af55f52c5f
+distfiles="https://github.com/CDrummond/cantata/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
+checksum="122bda13c0b4078b84640dabef444b37d705d71c6f95209a2d949acd28a0bbca"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index a9bf3ee775..9a675bbfaa 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
-version=0.16.0
-revision=2
+version=0.17.0
+revision=3
_githash_installer=4f994850808a572e2cc8d43f968893c8e942e9bf
patch_args="-Np1"
build_style=gnu-configure
@@ -15,7 +15,7 @@ license="MIT, Apache-2.0"
homepage="https://crates.io/"
distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz
https://github.com/rust-lang/rust-installer/archive/${_githash_installer}.tar.gz"
-checksum="5f7a7669daea152e84bbf9e6d4ee0ccc6c8e49dd0042f546ba80629bbc0191a4
+checksum="fc689ca7a09f1e6a1c31e69f0e2616a93576a68e0e1d7f0ae4c0d3301ff21ff8
dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae"
nocross=yes
diff --git a/srcpkgs/cava/template b/srcpkgs/cava/template
index 2ec821d3ad..15733e7955 100644
--- a/srcpkgs/cava/template
+++ b/srcpkgs/cava/template
@@ -1,6 +1,6 @@
# Template file for 'Cava'
pkgname=cava
-version=0.4.2
+version=0.4.3
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool"
@@ -10,7 +10,7 @@ maintainer="Juan RP "
homepage="https://github.com/karlstav/cava"
license="MIT"
distfiles="https://github.com/karlstav/${pkgname}/archive/${version}.tar.gz"
-checksum=914c8edca2df6f938879e56da07a314c3b3b0668ac60b8a9ad25cf8c9fec4abe
+checksum=9aa6a7c97b8877a6ba3bfa037cb74ee8c77b71fa1020a1507425890d676e20fb
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template
index 96a752b623..c15e988c3d 100644
--- a/srcpkgs/cclive/template
+++ b/srcpkgs/cclive/template
@@ -1,7 +1,7 @@
# Template file for 'cclive'
pkgname=cclive
version=0.7.16
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel"
diff --git a/srcpkgs/ccnet/template b/srcpkgs/ccnet/template
index 89a5fbeeda..d838c0b5e5 100644
--- a/srcpkgs/ccnet/template
+++ b/srcpkgs/ccnet/template
@@ -1,7 +1,7 @@
# Template file for 'ccnet'
pkgname=ccnet
version=6.0.4
-revision=1
+revision=3
build_style=gnu-configure
configure_args="--disable-static"
diff --git a/srcpkgs/cdm/template b/srcpkgs/cdm/template
index ed26364d58..231c33107f 100644
--- a/srcpkgs/cdm/template
+++ b/srcpkgs/cdm/template
@@ -6,7 +6,7 @@ _commit=7b6c395e91aa6c43b94a77994bffd4d9c9e2cffa
wrksrc="${pkgname}-${_commit}"
noarch=yes
short_desc="Console Display Manager"
-maintainer="Andrea Brancaleoni "
+maintainer="Andrea Brancaleoni "
depends="dialog xinit kbd xdpyinfo"
license="GPL-2"
homepage="https://github.com/ghost1227/cdm"
diff --git a/srcpkgs/cdogs-sdl/patches/use-system-yajl.patch b/srcpkgs/cdogs-sdl/patches/use-system-yajl.patch
deleted file mode 100644
index 93dde5f204..0000000000
--- a/srcpkgs/cdogs-sdl/patches/use-system-yajl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/cdogs/yajl_utils.h.orig 2016-03-15 08:17:24.508938965 +0100
-+++ src/cdogs/yajl_utils.h 2016-03-15 08:18:21.256934718 +0100
-@@ -28,7 +28,7 @@
- #include
-
- #include "vector.h"
--#include "yajl/api/yajl_tree.h"
-+#include