diff --git a/COPYING b/COPYING index eeef41a5ef2..fd049ce8682 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 449a5b2ce64..2712c04c5f4 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 111b1574a73..f179a0dbfff 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 bfa9a537326..795db9f870b 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 2e7fe408b6d..0c4cd3dafba 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 7dcb03e3a49..f58452e44d0 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 873be80a375..a08c589d891 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 107e2b6001b..a8fadb347a7 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 87bed5995df..bde53ea67ce 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 604347f79a3..abc0c3713fd 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 eff0c95ae7d..f3bf32cc506 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 45a9117413b..ea38e8fa6e5 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 7f06682ceb2..7dbb0f5c4bf 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 dee94e16947..ff9dd9902f2 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 b328431e55b..123eba57468 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 9b4f0ec4bdb..f09acd1ab35 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 abd4f92548c..1966b6c4b53 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 0c52195b6b7..9069084a80f 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 fda5ac09c63..d17a09b5ad2 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 42e0068d3b2..c4ab53f7884 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 a238957968a..cd3020ffab4 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 d654ad93620..cb1e28a4b06 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 ecb78479fbb..b03e7a8d548 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 9576d030d3e..8d52f97cd4a 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 bff5aba119c..3b88cd4bada 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 d9d439dec36..8e8a378f1fe 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 80a5e560d4f..e658725283c 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 c69e94448f4..9937694530a 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 c20a6ac592d..7867721c38e 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 359b4fe7b09..5866c1f92a3 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 c75451bc30b..5989669e949 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 3ef9244250c..58df5faa296 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 46c6b38b3e6..34e6cbf7706 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 d7dc8cd3b30..8c1db5679f5 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 40487d73a7c..81e45b9821f 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 e66d9b81331..3a4c1dc8686 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 5452ddd71ed..626c3050405 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 931f888a299..c7489accb73 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 f367fdb37b9..551674237c1 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 ab3a546ab1b..5a6b52379e3 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 701444500a4..2326184cfe3 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 65237ca857e..500370822cd 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 7b61af84a9b..0943ecdcf0b 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 040da4e1ea1..5901269bf50 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 5df1d45a499..538b9958dff 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 73efae0fafe..f26d7fe06d6 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 3f87822b2d5..44eb6f64eb8 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 51b4e38c61b..27f56da06e2 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 00000000000..4e380c886ec --- /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 1875d15e7d4..d0b837a9288 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 e4a67daa0c2..08f241cc75c 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 5469db02acf..531c71a2da8 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 6344917db5a..541da48ede8 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 965b822e924..bda69360f13 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 e5776eb4273..1298e5393b8 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 f379bc025db..a78be87624e 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 0b1053fb4e4..31d00aef7cb 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 e45958ae96b..0749a8d07c4 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 15e66e63900..65afe0ead7b 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 a28d09eb758..380995104f6 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 95e150434f9..9654c6dfb6e 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 3fdd7484bb8..b840532f584 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 bcfb705d573..eb6dc21d998 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 4e23189d765..f41eecf0072 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 ad7c8cba55c..8a39564185e 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 772f4b27e15..cbeca56af93 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 7ce5ddec8ae..01f8fab95cb 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 06dc554bed7..acd0bc7d863 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 58c3affc70b..cfd79ed4ff0 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 373ab95a200..7583581d4ad 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 1f6b70e3f05..97e864da2f3 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 23b60415fe4..4cf0a59c530 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 dad2d391a2a..5f5b433fda5 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 994bad5b273..6b152a1ceeb 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 236fb019c8a..6f0adf5f164 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 95ad40ba1f7..0fbc889aed6 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 e95f84428a8..8e6f411d615 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 8ecf20ad5c6..461aa202321 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 288aeb6b102..bd1179d6ec3 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 95181f181f8..2d4f0687d96 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 7bfbd3d5cb6..5eeccb70575 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 60f7d4f81dc..02d5ed5ae2f 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 aa65d4356f3..61b3c18e3fb 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 e74819d9e1f..b072a72195f 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 12d41258c90..eb6256f15d2 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 dd7cb65b473..6920a2348f5 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 66038877e07..52bc1a822bd 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 27f8a13f3ad..fd5c503f636 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 00000000000..3dfb15b77fd --- /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 f3b87359b82..1408975f0d4 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 00000000000..d175ce11795 --- /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 e932053b15d..a6d33bd209f 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 14e0a7d503e..b1edd23cb7b 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 2b0a66e26d1..24125c4df5d 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 b7e504ee1e0..4de0e97a923 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 bd27ae1bc9c..24371e4b46d 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 81770199946..21b7973b4a5 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 75e0e58a25e..4f995547692 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 376917ce3f9..5eb0da24e5d 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 b3473adce95..92ec2e71cc4 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 00000000000..4b117d1dba2 --- /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 059f90a3839..0b678ebd97b 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 120c473359d..8761a059609 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 94a5f5d688c..ef71c9e59ca 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 8ea595c8beb..29717760950 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 0e314248cfe..cdabe5a8559 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 75434951d93..57faf541ef6 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 d967423aac5..5173ba56f87 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 f59880b15d1..ae1cff09663 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 872a5e4755f..df84c0b0515 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 514adebad32..03d8c04e8ba 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 56b3812604a..40261e94fb7 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 6a6ef5602b5..7442e2a8aa5 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 8c5070e9aac..fa99ea30d50 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 b078de3d341..00000000000 --- 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 158117cd267..00000000000 --- 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 8bf946dbb04..00000000000 --- 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 3c613efc03e..9b812786763 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 d65795254cc..6fc58898a19 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 42d39f39f17..8ff68536b6f 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 00000000000..4d652af22c6 --- /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 9591603aebe..6e0e552ad29 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 7f094ef226e..6cfed1a135a 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 8a246ceba3a..33373ba0415 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 13adf2077ae..0b114ffa0c4 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 51801d6afe5..96933238a48 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 97660a0855d..650f84ceb84 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 ea954322a2b..50ee04f4d84 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 4ea9633b516..fcd56a055b8 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 1b9abb1ad28..0a743bd7391 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 409415dfc72..d3ae03e1f01 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 ea1c6b26533..00000000000 --- 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 735b7b81a16..00000000000 --- 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 0f32f410d30..00000000000 --- 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 010f04a2a8c..00000000000 --- 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 bcd40697cb7..00000000000 --- 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 24ff057a553..00000000000 --- 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 0d62c9ec6f0..00000000000 --- 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 0ae7c9522e6..00000000000 --- 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 015835cde56..00000000000 --- 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 835a96ead33..00000000000 --- 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 cdc1572eec4..00000000000 --- 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 176fa15bdbe..00000000000 --- 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 8f4006b489d..00000000000 --- 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 f8371967f47..00000000000 --- 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 9c4e5ea48fc..00000000000 --- 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 882d5939b0b..00000000000 --- 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 4016fb934e6..00000000000 --- 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 39499f66374..00000000000 --- 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 a93714bebc4..00000000000 --- 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 5f533ef8d93..00000000000 --- 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 fd1c945ec10..00000000000 --- 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 7ce39ec0a27..00000000000 --- 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 d1e4e9d7c74..00000000000 --- 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 a24b8fbbca9..00000000000 --- 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 721aca0307b..00000000000 --- 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 d5d5b1dd049..00000000000 --- 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 ef48bd82da7..00000000000 --- 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 7448cf814f1..00000000000 --- 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 93bd390a8e9..00000000000 --- 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 78984da2653..00000000000 --- 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 a6519560a83..00000000000 --- 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 0843719cb24..00000000000 --- 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 5f5147ffdc1..00000000000 --- 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 17372aa2ac9..00000000000 --- 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 f18bc602608..00000000000 --- 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 5b42c246c1c..00000000000 --- 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 f04012badad..00000000000 --- 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 e0de74e0813..00000000000 --- 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 e5e38870785..00000000000 --- 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 978ce1cd57a..00000000000 --- 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 a040a2ac5da..00000000000 --- 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 472c605abd6..00000000000 --- 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 ad82c29258b..00000000000 --- 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 d8f1ce07238..00000000000 --- 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 25dc3587ac9..00000000000 --- 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 bea3970a2a1..00000000000 --- 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 316e3afcdbc..00000000000 --- 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 6a8588ec020..00000000000 --- 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 00000000000..7b848feec7f --- /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 00000000000..6d8baef1407 --- /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 00000000000..01b6b6c9d3f --- /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 00000000000..1d8af26a912 --- /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 00000000000..bacd67aea7b --- /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 00000000000..f68c7ab476c --- /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 00000000000..5fb55ca4073 --- /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 00000000000..94c5d4aeb06 --- /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 00000000000..26a054af48c --- /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 00000000000..2346005c35b --- /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 00000000000..2eb9957ff22 --- /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 00000000000..182fd7cb137 --- /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 ced6536156a..4623be14bbd 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 c9bcc06f0fe..00000000000 --- 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 35c7382f097..00000000000 --- 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 00000000000..f45a2b0d2b7 --- /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 f8372ba5bb2..7fb3dfb4fdf 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 f3a718c21e9..ff974066ba7 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 00000000000..8a56f76b8e9 --- /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 00000000000..083674aa154 --- /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 b189b5004e7..9e6e5c50925 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 00000000000..0fcc137f929 --- /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 00000000000..b3dbcdc217b --- /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 aec4605fb74..ac0bc12a21e 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 4ba91de833e..2625a774da3 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 b74d3921414..e41d8434dd3 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 94d5f815d43..62cca9ab722 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 69acce63a94..dbab19b745d 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 c6e48c79f18..9c67ee4d6fa 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 ccaba941cd6..cd0bb8c2a94 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 208f8620360..fecd82eb637 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 1e4acc82a9a..9204101fd77 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 f94c855eaa5..1af7705331a 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 22690e48309..091c2569f19 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 00000000000..83ea3873487 --- /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 00000000000..1ffd09cd57d --- /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 a58bbfa85b4..b8f492bba78 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 6bc238462f3..fed8ccf362c 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 a9d361421b8..49e26c39b24 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 cf1397a1c6f..f459ae34f26 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 f741229087c..e6dbd88127a 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 00000000000..0138ceb214d --- /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 9b93e206102..00000000000 --- 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 2b38248b6b6..2468f52bd7c 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 7e7fbfd6433..cdfe1547ab6 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 ba6d38105c0..e91e6ca2796 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 00000000000..da3ee93a2b6 --- /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 ad535607ce7..27b94012276 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 00000000000..ac6cebc8203 --- /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 e67a15ed740..c67a985d1a4 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 d0fb4e438e4..e5cf98b8808 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 99b45ed4f24..00000000000 --- 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 53dec1663a0..f5e49db2ede 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 00000000000..d25b31a5bfc --- /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 00000000000..884c159fe2b --- /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 af0c26f1309..ff912ebc486 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 f67419d918f..3b348d1c11e 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 639347123a2..3a44213e678 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 00000000000..14643dd215e --- /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 11798281249..c3cdfe7744c 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 21c5922a0f2..c40ad31c2d6 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 37dd0865af4..ca2b843e48f 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 4b6fea643e2..d2d8f4a7fee 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 6b15cd9f2c3..4f5c454c7d5 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 00000000000..da2155621d4 --- /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 53dbdfb21d2..7818a6863a3 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 4d07b3ba6ee..837ad313656 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 2615a7d6e2f..ee824cfda86 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 b8e39e8f024..c98ed4256cb 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 50bf09bf0f8..924bf3f2e55 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 00000000000..0d048eb879c --- /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 31df9747408..da7e8a1ef0e 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 a9bf3ee7758..9a675bbfaaa 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 2ec821d3ad8..15733e79552 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 96a752b623e..c15e988c3d3 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 89a5fbeeda1..d838c0b5e51 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 ed26364d58c..231c33107f4 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 93dde5f204e..00000000000 --- 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 - - - yajl_val YAJLReadFile(const char *filename); ---- src/cdogs/CMakeLists.txt 2016-03-15 08:35:00.996859895 +0100 -+++ src/cdogs/CMakeLists.txt.orig 2016-03-15 08:34:55.824860282 +0100 -@@ -210,7 +210,7 @@ add_library(cdogs STATIC - target_link_libraries(cdogs - json - SDL_joystickbuttonnames -- yajl_s -+ yajl - ${SDL2_LIBRARY} - ${SDL2_IMAGE_LIBRARIES} - ${SDL2_MIXER_LIBRARIES} diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template index f699d14be5b..60b2608377d 100644 --- a/srcpkgs/cdogs-sdl/template +++ b/srcpkgs/cdogs-sdl/template @@ -1,26 +1,14 @@ # Template file for 'cdogs' pkgname=cdogs-sdl -version=0.6.3 +version=0.6.5 revision=1 build_style=cmake -makedepends="physfs-devel SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel yajl-devel" +hostmakedepends="pkg-config" +makedepends="SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel" short_desc="A classic overhead run-and-gun game" maintainer="Enno Boland " homepage="http://cxong.github.io/cdogs-sdl/" license="GPL2" distfiles="https://github.com/cxong/cdogs-sdl/archive/$version.tar.gz" -checksum=4497e88be7ef462e1839b4396fccdf880b612074c4091956e39cd86ea15fdd03 +checksum=73fcba62fe929dc52347c27f715dc3081ea995987d5eb9cf8028f29cdbcd949e configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/" - -CFLAGS="-Wno-error=deprecated-declarations" - -pre_configure() { - # Install data to /usr/share/cdogs/ instead of cwd. - sed -i '/^set(INSTALL_PREFIX/ s#.*#set(INSTALL_PREFIX "/usr/share/cdogs/")#' CMakeLists.txt - # Do not build shipped yajl. - sed -i '/add_subdirectory(yajl)/d' src/cdogs/CMakeLists.txt -} - -post_install() { - mv $DESTDIR/usr/share/cdogs/bin $DESTDIR/usr/bin -} diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template index b7e2f1f93f4..2ac9dba911e 100644 --- a/srcpkgs/cegui/template +++ b/srcpkgs/cegui/template @@ -1,7 +1,7 @@ # Template file for 'cegui' pkgname=cegui version=0.8.7 -revision=2 +revision=3 build_style=cmake hostmakedepends="graphviz doxygen dejavu-fonts-ttf gd glm perl pkg-config" makedepends="libxml2-devel boost-devel glu-devel glew-devel glfw-devel @@ -30,6 +30,8 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default+=" python" fi case "$XBPS_TARGET_MACHINE" in + aarch64*) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/2416/steps/shell_3/logs/stdio" + ;; arm*) # No ogre support for arm* (libogre for armv6l is broken) ;; *) build_options_default+=" ogre" diff --git a/srcpkgs/cgdb/template b/srcpkgs/cgdb/template index 075b3ca705f..7f4a3334110 100644 --- a/srcpkgs/cgdb/template +++ b/srcpkgs/cgdb/template @@ -1,7 +1,7 @@ # Template file for 'cgdb' pkgname=cgdb -version=0.6.8 -revision=3 +version=0.7.0 +revision=1 build_style=gnu-configure configure_args="--with-installed-readline=${XBPS_CROSS_BASE}/usr ac_cv_rl_version=6.3" hostmakedepends="flex help2man" @@ -12,4 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://cgdb.sourceforge.net" distfiles="http://cgdb.me/files/cgdb-${version}.tar.gz" -checksum=be203e29be295097439ab67efe3dc8261f742c55ff3647718d67d52891f4cf41 +checksum=bf7a9264668db3f9342591b08b2cc3bbb08e235ba2372877b4650b70c6fb5423 + +# checking for /proc/self/status... configure: error: cannot check for file existence when cross compiling +nocross="https://build.voidlinux.eu/builders/armv6l_builder/builds/2314/steps/shell_3/logs/stdio" diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template index 4dd89e1051e..211443d5012 100644 --- a/srcpkgs/cgit/template +++ b/srcpkgs/cgit/template @@ -3,7 +3,7 @@ _git_version=2.10.2 pkgname=cgit version=1.1 -revision=1 +revision=2 hostmakedepends="asciidoc" makedepends="libressl-devel zlib-devel" short_desc="A fast webinterface for git" diff --git a/srcpkgs/cgit/update b/srcpkgs/cgit/update new file mode 100644 index 00000000000..56ec4e538b0 --- /dev/null +++ b/srcpkgs/cgit/update @@ -0,0 +1 @@ +site="https://git.zx2c4.com/cgit/refs/tags" diff --git a/srcpkgs/checkbashisms/template b/srcpkgs/checkbashisms/template index ea94a690ca1..8c1ae7f0d6d 100644 --- a/srcpkgs/checkbashisms/template +++ b/srcpkgs/checkbashisms/template @@ -1,6 +1,6 @@ # Template file for 'checkbashisms' pkgname=checkbashisms -version=2.17.1 +version=2.17.5 revision=1 noarch=yes wrksrc="devscripts-${version}" @@ -10,7 +10,7 @@ maintainer="Alessio Sergi " homepage="https://tracker.debian.org/pkg/devscripts" license="GPL-2" distfiles="${DEBIAN_SITE}/main/d/devscripts/devscripts_${version}.tar.xz" -checksum=da1bbfaa88cc856bcd60993d96139b6af3301dd974c2d24c9cde4875fb991b93 +checksum=8b7f7c6f179918fa8137af746e64523a4a1f8815e3c3e5caeb1c298f718db326 pre_install() { sed -i "s|###VERSION###|${version}|" scripts/checkbashisms.pl diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index 449935de701..ba027168a70 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -1,6 +1,6 @@ # Template file for 'cheese' pkgname=cheese -version=3.22.1 +version=3.24.0 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile" @@ -22,7 +22,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org/projects/cheese/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=34353d19134da0041343b90ba737ec758bb5d1e23bd6e985c66b7e15f5313ae9 +checksum=26d0324c11d858a53a8a78f60babda63310a2b6f46c8fa3a4f6aa36ca9d0f372 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/chessx/template b/srcpkgs/chessx/template index 58a1b932581..f6edcece849 100644 --- a/srcpkgs/chessx/template +++ b/srcpkgs/chessx/template @@ -1,16 +1,16 @@ # Template file for 'chessx' pkgname=chessx -version=1.4.0 +version=1.4.4 revision=1 build_style=qmake hostmakedepends="qt5-qmake qt5-tools qt5-host-tools" -makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel" +makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel pulseaudio-devel" short_desc="An Open Source chess database" maintainer="cipr3s " license="GPL-2" homepage="http://chessx.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz" -checksum="e4287235904810a0a1b2cdec3dc33fbc30aa0657c7b7343bd2130bd9626220f4" +checksum=66f6cd9711d21b636caa213d8aeca06e13a13d225f2b163411535ae7956e3396 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-tools-devel qt5-multimedia-devel qt5-svg-devel" diff --git a/srcpkgs/chrome-gnome-shell/template b/srcpkgs/chrome-gnome-shell/template new file mode 100644 index 00000000000..7ede25c7cb9 --- /dev/null +++ b/srcpkgs/chrome-gnome-shell/template @@ -0,0 +1,14 @@ +# Template file for 'chrome-gnome-shell' +pkgname=chrome-gnome-shell +version=9 +revision=1 +build_style=cmake +configure_args=" -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXTENSION=OFF ../" +makedepends="python jq" +depends="python python-gobject python-requests dbus gnome-shell" +short_desc="GNOME Shell integration for Chrome" +maintainer="Stepan Usatiuk " +license="GPL-3" +homepage="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome/" +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=11fdfaa12208ec87ddbac27fc9652609c74e421d3e258de6b4776e392efdd448 diff --git a/srcpkgs/chromium/files/musl-patches/default-pthread-stacksize.patch b/srcpkgs/chromium/files/musl-patches/default-pthread-stacksize.patch index a316d84cad6..75b50479e55 100644 --- a/srcpkgs/chromium/files/musl-patches/default-pthread-stacksize.patch +++ b/srcpkgs/chromium/files/musl-patches/default-pthread-stacksize.patch @@ -1,6 +1,29 @@ ---- base/threading/platform_thread_linux.cc.orig 2016-08-30 21:36:06.809571185 +0200 -+++ base/threading/platform_thread_linux.cc 2016-08-30 21:36:14.582805286 +0200 +--- base/threading/platform_thread_linux.cc.orig ++++ base/threading/platform_thread_linux.cc @@ -99 +99,2 @@ size_t GetDefaultThreadStackSize(const p - return 0; + // use 8mb like glibc to avoid running out of space + return (1 << 23); +--- chrome/app/shutdown_signal_handlers_posix.cc.orig ++++ chrome/app/shutdown_signal_handlers_posix.cc +@@ -184,12 +184,20 @@ + g_shutdown_pipe_read_fd = pipefd[0]; + g_shutdown_pipe_write_fd = pipefd[1]; + #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS) ++# if defined(__GLIBC__) + const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; ++# else ++ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k ++# endif + #else + // ASan instrumentation and -finstrument-functions (used for keeping the + // shadow stacks) bloat the stack frames, so we need to increase the stack + // size to avoid hitting the guard page. ++# if defined(__GLIBC__) + const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; ++# else ++ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k ++# endif + #endif + ShutdownDetector* detector = new ShutdownDetector( + g_shutdown_pipe_read_fd, shutdown_callback, task_runner); diff --git a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch index 4282a17f338..8f0b116cd14 100644 --- a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch +++ b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch @@ -126,21 +126,21 @@ #endif #if HAVE_UNISTD_H #include ---- ./third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig -+++ ./third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -@@ -68,7 +68,7 @@ +--- ./third_party/WebKit/Source/wtf/StackUtil.cpp.orig ++++ ./third_party/WebKit/Source/wtf/StackUtil.cpp +@@ -28,7 +28,7 @@ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size // correctly for the main thread. - + -#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) // pthread_getattr_np() can fail if the thread is not invoked by // pthread_create() (e.g., the main thread of webkit_unit_tests). // If so, a conservative size estimate is returned. -@@ -135,7 +135,7 @@ +@@ -95,7 +95,7 @@ } - - void* StackFrameDepth::getStackStart() { + + void* getStackStart() { -#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) pthread_attr_t attr; diff --git a/srcpkgs/chromium/patches/fix-gn_bootstrap.patch b/srcpkgs/chromium/patches/fix-gn_bootstrap.patch new file mode 100644 index 00000000000..aa697295c8d --- /dev/null +++ b/srcpkgs/chromium/patches/fix-gn_bootstrap.patch @@ -0,0 +1,10 @@ +--- tools/gn/bootstrap/bootstrap.py.orig ++++ tools/gn/bootstrap/bootstrap.py +@@ -383,6 +383,7 @@ + 'base/base_switches.cc', + 'base/build_time.cc', + 'base/callback_internal.cc', ++ 'base/callback_helpers.cc', + 'base/command_line.cc', + 'base/debug/activity_tracker.cc', + 'base/debug/alias.cc', diff --git a/srcpkgs/chromium/patches/no-execinfo.patch b/srcpkgs/chromium/patches/no-execinfo.patch index 23adf39236e..e3899052dda 100644 --- a/srcpkgs/chromium/patches/no-execinfo.patch +++ b/srcpkgs/chromium/patches/no-execinfo.patch @@ -1,7 +1,7 @@ ---- base/debug/stack_trace_posix.cc.orig 2016-05-08 07:59:51.749087517 +0200 -+++ base/debug/stack_trace_posix.cc 2016-05-08 08:01:24.988950619 +0200 -@@ -24,7 +24,7 @@ - #if defined(__GLIBCXX__) +--- base/debug/stack_trace_posix.cc.orig ++++ base/debug/stack_trace_posix.cc +@@ -26,7 +26,7 @@ + #if !defined(USE_SYMBOLIZE) #include #endif -#if !defined(__UCLIBC__) @@ -9,25 +9,25 @@ #include #endif -@@ -75,7 +75,7 @@ void DemangleSymbols(std::string* text) +@@ -80,7 +80,7 @@ // Note: code in this function is NOT async-signal safe (std::string uses // malloc internally). --#if defined(__GLIBCXX__) && !defined(__UCLIBC__) -+#if defined(__GLIBCXX__) && defined(__GLIBC__) +-#if !defined(__UCLIBC__) ++#if defined(__GLIBC__) std::string::size_type search_from = 0; while (search_from < text->size()) { -@@ -112,7 +112,7 @@ void DemangleSymbols(std::string* text) +@@ -116,7 +116,7 @@ + search_from = mangled_start + 2; } } - --#endif // defined(__GLIBCXX__) && !defined(__UCLIBC__) -+#endif // defined(__GLIBCXX__) && defined(__GLIBC__) +-#endif // !defined(__UCLIBC__) ++#endif // defined(__GLIBC__) } #endif // !defined(USE_SYMBOLIZE) -@@ -124,7 +124,7 @@ class BacktraceOutputHandler { +@@ -128,7 +128,7 @@ virtual ~BacktraceOutputHandler() {} }; @@ -36,7 +36,7 @@ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) { // This should be more than enough to store a 64-bit number in hex: // 16 hex digits + 1 for null-terminator. -@@ -201,7 +201,7 @@ void ProcessBacktrace(void *const *trace +@@ -205,7 +205,7 @@ } #endif // defined(USE_SYMBOLIZE) } @@ -45,16 +45,16 @@ void PrintToStderr(const char* output) { // NOTE: This code MUST be async-signal safe (it's used by in-process -@@ -716,7 +716,7 @@ StackTrace::StackTrace() { - // NOTE: This code MUST be async-signal safe (it's used by in-process - // stack dumping signal handler). NO malloc or stdio is allowed here. +@@ -722,7 +722,7 @@ + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. -#if !defined(__UCLIBC__) +#if defined(__GLIBC__) + count = std::min(arraysize(trace_), count); + // Though the backtrace API man page does not list any possible negative - // return values, we take no chance. - count_ = base::saturated_cast(backtrace(trace_, arraysize(trace_))); -@@ -729,13 +729,13 @@ void StackTrace::Print() const { +@@ -737,13 +737,13 @@ // NOTE: This code MUST be async-signal safe (it's used by in-process // stack dumping signal handler). NO malloc or stdio is allowed here. @@ -81,15 +81,6 @@ #include #include #include -@@ -164,7 +164,7 @@ - } - - void WTFGetBacktrace(void** stack, int* size) { --#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__)) -+#if OS(MACOSX) || (OS(LINUX) && defined(__GLIBC__)) - *size = backtrace(stack, *size); - #elif OS(WIN) - // The CaptureStackBackTrace function is available in XP, but it is not @@ -215,7 +215,7 @@ }; diff --git a/srcpkgs/chromium/patches/no-mallinfo.patch b/srcpkgs/chromium/patches/no-mallinfo.patch index 3ea66e475d8..306c64b622a 100644 --- a/srcpkgs/chromium/patches/no-mallinfo.patch +++ b/srcpkgs/chromium/patches/no-mallinfo.patch @@ -1,16 +1,16 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2016-11-16 02:19:56.753320143 +0100 -+++ base/trace_event/malloc_dump_provider.cc 2016-11-16 02:13:58.286196506 +0100 -@@ -224,7 +224,7 @@ - resident_size = all_heap_info.committed_size; - allocated_objects_size = all_heap_info.allocated_size; - allocated_objects_count = all_heap_info.block_count; +--- base/trace_event/malloc_dump_provider.cc.orig ++++ base/trace_event/malloc_dump_provider.cc +@@ -187,7 +187,7 @@ + resident_size = main_heap_info.committed_size; + allocated_objects_size = main_heap_info.allocated_size; + allocated_objects_count = main_heap_info.block_count; -#else +#elif defined(OS_LINUX) && defined(__GLIBC__) struct mallinfo info = mallinfo(); DCHECK_GE(info.arena + info.hblkhd, info.uordblks); - ---- content/child/content_child_helpers.cc.orig 2016-05-08 08:05:37.415219394 +0200 -+++ content/child/content_child_helpers.cc 2016-05-08 08:06:27.110142484 +0200 + +--- content/child/content_child_helpers.cc.orig ++++ content/child/content_child_helpers.cc @@ -24,7 +24,7 @@ namespace content { // though, this provides only a partial and misleading value. // Unfortunately some telemetry benchmark rely on it and these need to @@ -20,3 +20,64 @@ size_t GetMemoryUsageKB() { struct mallinfo minfo = mallinfo(); uint64_t mem_usage = +--- content/renderer/render_thread_impl.cc.orig ++++ content/renderer/render_thread_impl.cc +@@ -1712,6 +1712,49 @@ + } + + } // namespace ++#elif defined(OS_LINUX) && !defined(__GLIBC__) ++namespace { ++ ++static size_t GetMallocUsage() { ++ char *line=NULL; ++ size_t n,usage=0; ++ FILE *f = fopen("/proc/self/maps", "r"); ++ char *path, *perm; ++ if (f == NULL) { ++ perror("/proc/self/maps"); ++ return 0; ++ } ++ path = (char *)malloc(PATH_MAX+16); ++ if (path == NULL) ++ goto out; ++ perm = path + PATH_MAX; ++ ++ while (getline(&line, &n, f) >=0) { ++ size_t start,end,offset,inode; ++ int devmaj, devmin, items; ++ ++ items = sscanf(line, "%zx-%zx %s %zx %x:%x %zu %s", ++ &start, &end, perm, &offset, ++ &devmaj, &devmin, &inode, path); ++ ++ if (items < 7) ++ continue; ++ ++ if (items < 8) ++ path[0] = '\0'; ++ ++ if ((strcmp(perm, "rw-p") == 0 && devmaj+devmin == 0) ++ && (path[0] == '\0' || strcmp(path, "[heap]") == 0)) ++ usage += end-start; ++ } ++ free(line); ++ free(path); ++out: ++ fclose(f); ++ return usage; ++} ++ ++} // namespace + #endif + + void RenderThreadImpl::GetRendererMemoryMetrics( +@@ -1722,7 +1765,7 @@ + memory_metrics->partition_alloc_kb = + blink_stats.partitionAllocTotalAllocatedBytes / 1024; + memory_metrics->blink_gc_kb = blink_stats.blinkGCTotalAllocatedBytes / 1024; +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID) + struct mallinfo minfo = mallinfo(); + #if defined(USE_TCMALLOC) + size_t malloc_usage = minfo.uordblks; diff --git a/srcpkgs/chromium/patches/unset-madv_free.patch b/srcpkgs/chromium/patches/unset-madv_free.patch index f748179fc90..613d37c5853 100644 --- a/srcpkgs/chromium/patches/unset-madv_free.patch +++ b/srcpkgs/chromium/patches/unset-madv_free.patch @@ -1,10 +1,10 @@ ---- third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp -+++ third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp -@@ -41,6 +41,11 @@ +--- base/allocator/partition_allocator/page_allocator.cc.orig ++++ base/allocator/partition_allocator/page_allocator.cc +@@ -17,6 +17,11 @@ #include #include -+#if OS(LINUX) && defined(MADV_FREE) ++#if defined(OS_LINUX) && defined(MADV_FREE) +// Added in Linux 4.5, but it breaks the sandbox. +#undef MADV_FREE +#endif diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index e7e74ad5f74..7a46b3f241a 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,14 +1,14 @@ # Template file for 'chromium' pkgname=chromium # See http://www.chromium.org/developers/calendar for the latest version -version=55.0.2883.87 +version=58.0.3029.81 revision=1 short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="Juan RP " homepage="http://www.chromium.org/" license="BSD" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=e81bd3140d9c84dfee04d9a94686dfe6a20ae79475d84f17154c5536dcb81a58 +checksum=5ab61b7025a5143fa1b21713479b316ec7a98e262e79e84f9c9a9656179217cb only_for_archs="i686 x86_64 x86_64-musl" lib32disabled=yes @@ -18,9 +18,9 @@ nopie=yes # contains tools that are not PIE, enables PIE itself build_options="nacl" desc_option_nacl="Enable NaCL support" -hostmakedepends="yasm python pkg-config perl gperf bison ninja hwids +hostmakedepends="yasm python pkg-config perl gperf bison ninja nodejs hwids libatomic-devel libevent-devel libglib-devel" -makedepends="libpng-devel gtk+-devel nss-devel pciutils-devel +makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel libXScrnSaver-devel alsa-lib-devel snappy-devel @@ -52,6 +52,11 @@ post_extract() { # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68853#c2 sed -i '/config("compiler")/ a cflags_cc = [ "-fno-delete-null-pointer-checks" ]' \ build/config/linux/BUILD.gn + + # use system nodejs + mkdir -p third_party/node/linux/node-linux-x64/bin + ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node + } do_configure() { local system="" bootstrap_conf="" conf="" @@ -119,9 +124,15 @@ do_configure() { gold_path="/usr/bin/ld.gold" use_gconf=false use_sysroot=false - use_gold=true use_allocator="none" use_experimental_allocator_shim=false' + + # XXX: gold broken with musl + case "${XBPS_TARGET_MACHINE}" in + *-musl) bootstrap_conf+=' use_gold=false' ;; + *) bootstrap_conf+=' use_gold=true' ;; + esac + AR="ar" CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD LD=$CXX_FOR_BUILD \ python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args "${bootstrap_conf// / }" @@ -171,8 +182,13 @@ do_configure() { # Never use bundled binutils/gold binary. conf+=" binutils_path=\"${XBPS_CROSS_BASE}/usr/bin\" - gold_path=\"${XBPS_CROSS_BASE}/usr/bin/ld.gold\" - use_gold=true" + gold_path=\"${XBPS_CROSS_BASE}/usr/bin/ld.gold\"" + + # XXX: gold broken with musl + case "${XBPS_TARGET_MACHINE}" in + *-musl) conf+=' use_gold=false' ;; + *) conf+=' use_gold=true' ;; + esac # Always support proprietary codecs. # Enable H.264 support in bundled ffmpeg. diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template index a1b415e31dd..a8ffbfd42c6 100644 --- a/srcpkgs/chroot-bash/template +++ b/srcpkgs/chroot-bash/template @@ -1,9 +1,9 @@ # Template build file for 'chroot-bash'. pkgname=chroot-bash _bash_distver=4.4 -_bash_patchlevel=0 +_bash_patchlevel=012 version=${_bash_distver}.${_bash_patchlevel} -revision=2 +revision=1 wrksrc="bash-${_bash_distver}" build_style=gnu-configure configure_args="--without-bash-malloc --without-curses --without-installed-readline --disable-nls" diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template index c3dd2e45519..a413c0f763d 100644 --- a/srcpkgs/chroot-util-linux/template +++ b/srcpkgs/chroot-util-linux/template @@ -1,7 +1,7 @@ # Template file for 'chroot-util-linux' pkgname=chroot-util-linux version=2.29.2 -revision=1 +revision=3 wrksrc="${pkgname/chroot-/}-${version}" bootstrap=yes conflicts="util-linux>=0" @@ -13,7 +13,7 @@ configure_args="--without-ncurses --without-udev --disable-libuuid --disable-fsck --disable-partx --disable-uuidd --disable-mountpoint --disable-fallocate --disable-unshare --disable-nls --disable-wall --disable-chfn-chsh-password --disable-su --disable-sulogin ---disable-login --disable-runuser --disable-setpriv +--disable-login --disable-runuser --disable-setpriv --disable-libsmartcols scanf_cv_alloc_modifier=as" short_desc="Miscellaneous linux utilities -- for xbps-src use" maintainer="Juan RP " @@ -33,5 +33,4 @@ post_install() { rm -rf ${DESTDIR}/sbin rm -rf ${DESTDIR}/usr/sbin rm -rf ${DESTDIR}/usr/share/man - rm -rf ${DESTDIR}/lib{,32} } diff --git a/srcpkgs/chuck/template b/srcpkgs/chuck/template index fb665943031..67a2ea406f3 100644 --- a/srcpkgs/chuck/template +++ b/srcpkgs/chuck/template @@ -6,7 +6,7 @@ build_wrksrc=src hostmakedepends="bison flex" makedepends="jack-devel libsndfile-devel liblo-devel" short_desc="Concurrent, on-the-fly audio programming language" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://chuck.cs.princeton.edu" distfiles="http://chuck.cs.princeton.edu/release/files/$pkgname-$version.tgz" diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template index cf13fb30fed..e2993febae5 100644 --- a/srcpkgs/cifs-utils/template +++ b/srcpkgs/cifs-utils/template @@ -1,20 +1,20 @@ # Template file for 'cifs-utils' pkgname=cifs-utils -version=6.6 +version=6.7 revision=1 build_style=gnu-configure -configure_args="--sbindir=/usr/bin" make_install_args="ROOTSBINDIR=/usr/bin" -hostmakedepends="pkg-config libcap-ng-devel" +hostmakedepends="automake pkg-config libcap-ng-devel" makedepends="mit-krb5-devel talloc-devel libcap-ng-devel samba-devel keyutils-devel pam-devel" short_desc="CIFS filesystem user-space tools" maintainer="Juan RP " license="GPL-2" homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils" distfiles="https://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$version.tar.bz2" -checksum=d07152a807de6840566bbcc69a97ff6fa17fca4e09ceb4641d74882a83e67125 +checksum=b2f21612474ab012e75accd167aab607a0614ff67efb56ea0f36789fa785cfab pre_configure() { + autoreconf -fi # Fix musl build sed -i ${wrksrc}/mtab.c \ -e "/#include /a #include " \ diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template index 2a135faebdb..e430f8f679e 100644 --- a/srcpkgs/clamav/template +++ b/srcpkgs/clamav/template @@ -1,11 +1,12 @@ # Template file for 'clamav' pkgname=clamav version=0.99.2 -revision=4 +revision=5 build_style=gnu-configure # XXX: system llvm is too new (< 3.7 required) # Shipped llvm does not build with gcc6 -configure_args="--sbindir=/usr/bin --libdir=/usr/lib --with-pcre=/usr --disable-llvm" +# --disable-zlib-vcheck because of broken zlib check +configure_args="--sbindir=/usr/bin --libdir=/usr/lib --with-pcre=/usr --disable-llvm --disable-zlib-vcheck" conf_files="/etc/clamd.conf /etc/freshclam.conf" system_accounts="clamav" clamav_homedir="/var/lib/${pkgname}" diff --git a/srcpkgs/clamz/template b/srcpkgs/clamz/template index 1d331f55c79..1df52748ebd 100644 --- a/srcpkgs/clamz/template +++ b/srcpkgs/clamz/template @@ -7,7 +7,7 @@ short_desc="downloads MP3 files from Amazon.com's music store" maintainer="Enno Boland " license="GPLv3" homepage="https://clamz.googlecode.com" -distfiles="$homepage/files/clamz-${version}.tar.gz" +distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/clamz/clamz-${version}.tar.gz" hostmakedepends="pkg-config" makedepends="expat-devel libcurl-devel libgcrypt-devel" checksum=5a63f23f15dfa6c2af00ff9531ae9bfcca0facfe5b1aa82790964f050a09832b diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index 1dd0afe61e8..892deb27471 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -11,7 +11,7 @@ makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel liblastfm-dev taglib-devel crypto++-devel libspotify-devel libechonest-devel" depends="desktop-file-utils" short_desc="A modern music player and library organizer" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://www.clementine-player.org/" wrksrc="Clementine-$version" diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template index 0ad994dea15..bb1fd3e6ff6 100644 --- a/srcpkgs/clipgrab/template +++ b/srcpkgs/clipgrab/template @@ -1,6 +1,6 @@ # Template file for 'clipgrab' pkgname=clipgrab -version=3.6.3 +version=3.6.4 revision=1 build_style=qmake configure_args=clipgrab.pro @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-3" homepage="https://www.clipgrab.org" distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz" -checksum=331218bd5ac2e6493f3d992996323f38362a8317af4ed20aae070b9da6027c71 +checksum=bda87df48861341a5eb70574ab8b4b8ae35319b678b4db864191cf0c5d345680 do_install() { vbin clipgrab diff --git a/srcpkgs/clutter-gst3/template b/srcpkgs/clutter-gst3/template index 18968900138..15a6c78bf4f 100644 --- a/srcpkgs/clutter-gst3/template +++ b/srcpkgs/clutter-gst3/template @@ -1,6 +1,6 @@ # Template file for 'clutter-gst3' pkgname=clutter-gst3 -version=3.0.22 +version=3.0.24 revision=1 wrksrc="clutter-gst-$version" build_options="gir" @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="http://www.gtk.org/" license="GPL-2" distfiles="${GNOME_SITE}/clutter-gst/${version%.*}/clutter-gst-${version}.tar.xz" -checksum=f1fc57fb32ea7e3d9234b58db35eb9ef3028cf0b266d85235f959edc0fe3dfd4 +checksum=e9f1c87d8f4c47062e952fb8008704f8942cf2d6f290688f3f7d13e83578cc6c if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index 942a82c2cc5..d9180621c9a 100644 --- a/srcpkgs/cmake-gui/template +++ b/srcpkgs/cmake-gui/template @@ -1,6 +1,6 @@ # Template file for 'cmake-gui' pkgname=cmake-gui -version=3.7.2 +version=3.8.0 revision=1 wrksrc="cmake-${version}" build_style=configure @@ -8,14 +8,14 @@ configure_args="--prefix=/usr --mandir=/share/man --docdir=/share/doc/cmake --system-libs --qt-gui ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}" hostmakedepends="qt5-devel" makedepends="expat-devel jsoncpp-devel libarchive-devel libcurl-devel - ncurses-devel qt5-devel zlib-devel libuv-devel" + ncurses-devel qt5-devel zlib-devel libuv-devel rhash-devel" depends="desktop-file-utils shared-mime-info" short_desc="Cross-platform, open-source build system - Qt GUI" maintainer="Juan RP " license="LGPL-2.1, 3-clause-BSD" homepage="http://www.cmake.org" distfiles="http://www.cmake.org/files/v${version%.*}/cmake-$version.tar.gz" -checksum=dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 +checksum=cab99162e648257343a20f61bcd0b287f5e88e36fcb2f1d77959da60b7f35969 nocross=yes do_install() { diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 0e3ba67ce0e..79fb442e81c 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,16 +1,16 @@ # Template file for 'cmake' pkgname=cmake -version=3.7.2 +version=3.8.0 revision=1 build_style=configure makedepends="zlib-devel bzip2-devel expat-devel libcurl-devel ncurses-devel libarchive-devel - libuv-devel" + libuv-devel rhash-devel" short_desc="Cross-platform, open-source build system" maintainer="Juan RP " license="LGPL-2.1, 3-clause-BSD" homepage="http://www.cmake.org" distfiles="http://www.cmake.org/files/v${version%.*}/$pkgname-$version.tar.gz" -checksum=dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 +checksum=cab99162e648257343a20f61bcd0b287f5e88e36fcb2f1d77959da60b7f35969 if [ "$CROSS_BUILD" ]; then # XXX ugly :-) diff --git a/srcpkgs/cmst/template b/srcpkgs/cmst/template index c1f6bba409e..22a779e5b30 100644 --- a/srcpkgs/cmst/template +++ b/srcpkgs/cmst/template @@ -1,6 +1,6 @@ # Template file for 'cmst' pkgname=cmst -version=2016.04.03 +version=2017.03.18 revision=1 wrksrc=${pkgname}-${pkgname}-${version} build_style=qmake @@ -12,7 +12,7 @@ maintainer="Jonathan Lee " license="MIT" homepage="https://github.com/andrew-bibb/cmst" distfiles="${homepage}/archive/${pkgname}-${version}.tar.gz" -checksum=c3d7ba9b3d06a3bdf8476224b7e30b4ea41005d719ae4f01897c188d56c716a1 +checksum=6b0071d464c33406a9ad6938b04a038ddf677a0a80a9dc82a05c04afd937fec7 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template index d754361cdfa..4070bfc020f 100644 --- a/srcpkgs/codelite/template +++ b/srcpkgs/codelite/template @@ -8,7 +8,7 @@ hostmakedepends="pkg-config clang" makedepends="wxWidgets-devel libmariadbclient-devel sqlite-devel libssh-devel gtk+-devel" short_desc="Open-source, cross platform IDE for the C/C++ programming languages" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://www.codelite.org" distfiles="https://github.com/eranif/${pkgname}/archive/${version}.tar.gz" diff --git a/srcpkgs/codesearch/template b/srcpkgs/codesearch/template index f4d3d346cf1..e6c2aa7aff1 100644 --- a/srcpkgs/codesearch/template +++ b/srcpkgs/codesearch/template @@ -1,7 +1,7 @@ # Template file for 'codesearch' pkgname=codesearch version=0.0.20150617 -revision=5 +revision=6 _githash=a45d81b686e85d01f2838439deaf72126ccd5a96 wrksrc="${pkgname}-${_githash}" build_style=go diff --git a/srcpkgs/cogl/template b/srcpkgs/cogl/template index 7f8a68e829e..aa60af25dc4 100644 --- a/srcpkgs/cogl/template +++ b/srcpkgs/cogl/template @@ -1,7 +1,7 @@ # Template file for 'cogl' pkgname=cogl version=1.22.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-cairo=yes --enable-cogl-pango=yes --enable-gdk-pixbuf=yes --enable-cogl-gst=yes --enable-kms-egl-platform @@ -10,7 +10,7 @@ configure_args="--enable-cairo=yes --enable-cogl-pango=yes hostmakedepends="automake libtool gettext-devel pkg-config intltool glib-devel gobject-introspection" makedepends="libXcomposite-devel libXrandr-devel MesaLib-devel pango-devel - gdk-pixbuf-devel gst-plugins-base1-devel wayland-devel" + gdk-pixbuf-devel gst-plugins-base1-devel wayland-devel libwayland-egl" short_desc="Library for using 3D graphics hardware for rendering" maintainer="Juan RP " homepage="http://www.clutter-project.org" diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template index 6bbb6ff1b44..f414110c3df 100644 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -1,7 +1,7 @@ # Template file for 'collectd' pkgname=collectd version=5.6.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl) $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt diff --git a/srcpkgs/compiz-reloaded/template b/srcpkgs/compiz-reloaded/template new file mode 100644 index 00000000000..a781742d228 --- /dev/null +++ b/srcpkgs/compiz-reloaded/template @@ -0,0 +1,32 @@ +# Template file for 'compiz-reloaded' +pkgname=compiz-reloaded +version=0.8.12 +revision=1 +build_style=meta +depends=" + compiz-core + compiz-bcop + libcompizconfig + compizconfig-python + ccsm + compiz-plugins-main + compiz-plugins-extra + compiz-plugins-experimental + emerald + emerald-themes" +short_desc="Compiz window manager meta-package" +homepage="https://github.com/compiz-reloaded" +license="MIT, LGPL-2, GPL-2" +maintainer="CoolOhm " + +post_install() { + $XBPS_FETCH_CMD https://raw.githubusercontent.com/compiz-reloaded/compiz/master/COPYING + $XBPS_FETCH_CMD https://raw.githubusercontent.com/compiz-reloaded/compiz/master/COPYING.GPL + $XBPS_FETCH_CMD https://raw.githubusercontent.com/compiz-reloaded/compiz/master/COPYING.LGPL + $XBPS_FETCH_CMD https://raw.githubusercontent.com/compiz-reloaded/compiz/master/COPYING.MIT + + vlicense COPYING + vlicense COPYING.GPL + vlicense COPYING.LGPL + vlicense COPYING.MIT +} diff --git a/srcpkgs/cool-retro-term/template b/srcpkgs/cool-retro-term/template new file mode 100644 index 00000000000..dffa8d11ff5 --- /dev/null +++ b/srcpkgs/cool-retro-term/template @@ -0,0 +1,18 @@ +# Template file for 'cool-retro-term' +pkgname=cool-retro-term +version=1.0.0 +revision=2 +build_style=qmake +makedepends="qt5-devel qt5-declarative-devel " +hostmakedepends="automake qt5-qmake $makedepends" +depends="qt5-graphicaleffects qt5-quickcontrols qmltermwidget" +short_desc="Good looking terminal emulator which mimics the old cathode display" +maintainer="Enno Boland " +license="GPL-3" +homepage="https://github.com/Swordfish90/cool-retro-term" +distfiles="$homepage/archive/v1.0.0.tar.gz" +checksum="db799084680545b6961e1b3d1bb7ff0cb8105e82279fe734c2c07c32525350d9" + +pre_configure() { + sed -i '/qmltermwidget/d' cool-retro-term.pro +} diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template index 1ff4f96608d..d1891b99e8a 100644 --- a/srcpkgs/coreutils/template +++ b/srcpkgs/coreutils/template @@ -1,7 +1,7 @@ # Template file for 'coreutils' pkgname=coreutils -version=8.26 -revision=2 +version=8.27 +revision=1 bootstrap=yes makedepends="gmp-devel acl-devel libcap-devel" replaces="chroot-coreutils>=0 coreutils-doc>=0 b2sum>=0" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://www.gnu.org/software/coreutils" license="GPL-3" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=155e94d748f8e2bc327c66e0cbebdb8d6ab265d2f37c3c928f7bf6c3beba9a8e +checksum=8891d349ee87b9ff7870f52b6d9312a9db672d2439d289bc57084771ca21656b if [ "$CHROOT_READY" ]; then hostmakedepends="perl" diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template index 880bef7dec8..690b4e9e261 100644 --- a/srcpkgs/couchdb/template +++ b/srcpkgs/couchdb/template @@ -1,7 +1,7 @@ # Template file for 'couchdb' pkgname=couchdb version=1.6.1 -revision=7 +revision=8 wrksrc="apache-couchdb-$version" build_style=gnu-configure conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini" diff --git a/srcpkgs/courier-unicode/update b/srcpkgs/courier-unicode/update new file mode 100644 index 00000000000..a046a810333 --- /dev/null +++ b/srcpkgs/courier-unicode/update @@ -0,0 +1 @@ +ignore='*.2017*' diff --git a/srcpkgs/cpanminus/template b/srcpkgs/cpanminus/template index a4302c96fda..99f4785bd15 100644 --- a/srcpkgs/cpanminus/template +++ b/srcpkgs/cpanminus/template @@ -1,6 +1,6 @@ # Template file for 'cpanminus' pkgname=cpanminus -version=1.7042 +version=1.7043 revision=1 wrksrc="App-${pkgname}-${version}" noarch=yes @@ -9,8 +9,8 @@ hostmakedepends="perl" makedepends="${hostmakedepends}" depends="${makedepends}" short_desc="Get, unpack, build and install modules from CPAN" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " homepage="https://metacpan.org/pod/App::cpanminus" license="GPL-1, Artistic" distfiles="${CPAN_SITE}/App/App-${pkgname}-${version}.tar.gz" -checksum=9da50e155df72bce55cb69f51f1dbb4b62d23740fb99f6178bb27f22ebdf8a46 +checksum=68a06f7da80882a95bc02c92c7ee305846fb6ab648cf83678ea945e44ad65c65 diff --git a/srcpkgs/cpp-hocon/template b/srcpkgs/cpp-hocon/template index 073aeb8e035..58dd4db62ca 100644 --- a/srcpkgs/cpp-hocon/template +++ b/srcpkgs/cpp-hocon/template @@ -1,7 +1,7 @@ # Template file for 'cpp-hocon' pkgname=cpp-hocon version=0.1.5 -revision=2 +revision=4 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel leatherman libcurl-devel" diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template index 1205e7217c5..7496ed0f097 100644 --- a/srcpkgs/cppcheck/template +++ b/srcpkgs/cppcheck/template @@ -1,6 +1,6 @@ # Template file for 'cppcheck' pkgname=cppcheck -version=1.77 +version=1.78 revision=1 hostmakedepends="libxslt docbook-xsl" short_desc="Static analysis of C/C++ code" @@ -8,7 +8,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://cppcheck.sourceforge.net" distfiles="https://github.com/danmar/cppcheck/archive/$version.tar.gz" -checksum=76ae0a9b556a93c79365cf8bd5f276c30e3327c4ca78283b5c2dbbddc135c2ba +checksum=31048901dd8744d12b3e6ac1bc904c08a72cad8118bd6a1f56ce489701ffd1b6 CXXFLAGS="-std=c++11" diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template index 09a189185ac..c323f2e3ab7 100644 --- a/srcpkgs/crane/template +++ b/srcpkgs/crane/template @@ -1,16 +1,16 @@ # Template file for 'crane' pkgname=crane -version=2.11.0 -revision=3 +version=3.0.0 +revision=1 build_style=go hostmakedepends="git-perl" short_desc="Lift containers with ease " -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="MIT" go_import_path="github.com/michaelsauter/crane" homepage="https://${go_import_path}" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=f3c25b25bb1e7954597a31836ea8719c69a1e176e96de808acce16409840af3e +checksum=10b6c70775aaf82f6605df831d8deb9eaadcec8f8f85cf45839214675ad6b275 post_install() { vlicense LICENSE diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template index 04d92d1d6a2..9eb13d752c1 100644 --- a/srcpkgs/crash/template +++ b/srcpkgs/crash/template @@ -1,6 +1,6 @@ # Template file for 'crash' pkgname=crash -version=7.1.8 +version=7.1.9 revision=1 build_style=gnu-makefile hostmakedepends="flex" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="GPL-3" homepage="http://people.redhat.com/anderson/" distfiles="http://people.redhat.com/anderson/${pkgname}-${version}.tar.gz" -checksum=de125e78cbf9b8db5309d205a5473967d562e1945347e465ff9bd94fd76e6263 +checksum=9649bb31cae849cf86c7aa9d48fc57847701caf4c74612ec553521555f774d20 only_for_archs="i686 x86_64" # broken on musl nocross=yes LDFLAGS=-llzo2 diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template index 74dfd98e49e..634c579ea16 100644 --- a/srcpkgs/crda/template +++ b/srcpkgs/crda/template @@ -9,7 +9,7 @@ hostmakedepends="libressl python python-M2Crypto pkg-config" makedepends="libnl-devel libgcrypt-devel" depends="iw" short_desc="Central Regulatory Domain Agent for wireless networks" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="ISC" homepage="http://wireless.kernel.org/en/developers/Regulatory/CRDA" distfiles="https://kernel.org/pub/software/network/crda/${pkgname}-${version}.tar.xz https://www.kernel.org/pub/software/network/wireless-regdb/${_dbname}-${_dbversion}.tar.xz" diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template index 3e8e9d969d6..feaa6f9032c 100644 --- a/srcpkgs/cronie/template +++ b/srcpkgs/cronie/template @@ -19,9 +19,9 @@ conf_files="/etc/anacrontab /etc/pam.d/crond /etc/cron.deny" provides="cron-daemon-0_1" short_desc="Runs specified programs at scheduled times" maintainer="Juan RP " -homepage="https://fedorahosted.org/cronie/" +homepage="https://github.com/cronie-crond/cronie" license="BSD" -distfiles="https://fedorahosted.org/releases/c/r/cronie/cronie-$version.tar.gz" +distfiles="${homepage}/releases/download/cronie-${version}/cronie-${version}.tar.gz" checksum=6c73666102a6b5d35e2eaf1bd06925f2d4b0cef8d3323c37286dda3089a85338 case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template index dc7ef992edf..4cacc0e5734 100644 --- a/srcpkgs/cross-aarch64-linux-gnu/template +++ b/srcpkgs/cross-aarch64-linux-gnu/template @@ -1,6 +1,6 @@ # Template build file for 'cross-aarch64-linux-gnu' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _glibc_version=2.25 _linux_version=4.9.8 @@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=2 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Christian Neukirchen " homepage="http://www.voidlinux.eu" @@ -22,7 +22,7 @@ distfiles=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45" diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template index 97c7ccf75ef..15b93db4d45 100644 --- a/srcpkgs/cross-aarch64-linux-musl/template +++ b/srcpkgs/cross-aarch64-linux-musl/template @@ -1,6 +1,6 @@ # Template build file for 'cross-aarch64-linux-musl' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _musl_version=1.1.16 _linux_version=4.9.8 @@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=3 short_desc="Cross toolchain for ARM64 LE target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -22,7 +22,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011" @@ -123,6 +123,10 @@ _linux_headers() { cd linux-${_linux_version} + for f in ${XBPS_SRCPKGDIR}/kernel-libc-headers/patches/*.patch; do + _apply_patch -p0 $f + done + make ARCH=arm64 headers_check make ARCH=arm64 INSTALL_HDR_PATH=${_sysroot}/usr headers_install diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template index 8136a6bdfd8..25d64eeb172 100644 --- a/srcpkgs/cross-arm-linux-gnueabi/template +++ b/srcpkgs/cross-arm-linux-gnueabi/template @@ -1,6 +1,6 @@ # Template build file for 'cross-arm-linux-gnueabi' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _glibc_version=2.25 _linux_version=4.9.8 @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=2 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -23,7 +23,7 @@ distfiles=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45" diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template index dc482abd8ad..f3b6bbd3604 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf/template @@ -1,6 +1,6 @@ # Template build file for 'cross-arm-linux-gnueabihf' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _glibc_version=2.25 _linux_version=4.9.8 @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=2 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -23,7 +23,7 @@ distfiles=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45" diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template index a409b20b89c..70bab49db45 100644 --- a/srcpkgs/cross-arm-linux-musleabi/template +++ b/srcpkgs/cross-arm-linux-musleabi/template @@ -1,6 +1,6 @@ # Template build file for 'cross-arm-linux-musleabi' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _musl_version=1.1.16 _linux_version=4.9.8 @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=2 short_desc="Cross toolchain for ARMv5 TE target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -23,7 +23,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011" diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template index 5753a0bf2cf..e49b30cb9f9 100644 --- a/srcpkgs/cross-arm-linux-musleabihf/template +++ b/srcpkgs/cross-arm-linux-musleabihf/template @@ -1,6 +1,6 @@ # Template build file for 'cross-arm-linux-musleabihf' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _musl_version=1.1.16 _linux_version=4.9.8 @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=2 short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -23,7 +23,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011" diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template index cdfb00c7bae..c3c1d6416a3 100644 --- a/srcpkgs/cross-armv7l-linux-gnueabihf/template +++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template @@ -1,6 +1,6 @@ # Template build file for 'cross-armv7l-linux-gnueabihf' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _glibc_version=2.25 _linux_version=4.9.8 @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=2 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -23,7 +23,7 @@ distfiles=" http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45" diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template index 37d7f8b8651..1bcd669ffc8 100644 --- a/srcpkgs/cross-armv7l-linux-musleabihf/template +++ b/srcpkgs/cross-armv7l-linux-musleabihf/template @@ -1,6 +1,6 @@ # Template build file for 'cross-armv7l-linux-musleabihf' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _musl_version=1.1.16 _linux_version=4.9.8 @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=2 short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -23,7 +23,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011" diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template index 439cbfab3fe..ec12d2c071f 100644 --- a/srcpkgs/cross-i686-linux-musl/template +++ b/srcpkgs/cross-i686-linux-musl/template @@ -1,6 +1,6 @@ # Template build file for 'cross-i686-linux-musl' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _musl_version=1.1.16 _linux_version=4.9.8 @@ -11,7 +11,7 @@ _archflags="-march=i686" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=2 short_desc="Cross toolchain for i686 target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -22,7 +22,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011" diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index a2d01f7a5da..c23704ac0cc 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -1,6 +1,6 @@ # Template build file for 'cross-i686-pc-linux-gnu' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _glibc_version=2.25 _linux_version=4.9.8 @@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=2 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -22,7 +22,7 @@ distfiles=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45" diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template index 8b60a5b1899..589251b169e 100644 --- a/srcpkgs/cross-mips-linux-musl/template +++ b/srcpkgs/cross-mips-linux-musl/template @@ -1,6 +1,6 @@ # Template build file for 'cross-mips-linux-musl' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _musl_version=1.1.16 _linux_version=4.9.8 @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=3 short_desc="Cross toolchain for MIPS32r2 BE softfloat target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -23,7 +23,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011" @@ -126,6 +126,10 @@ _linux_headers() { cd linux-${_linux_version} + for f in ${XBPS_SRCPKGDIR}/kernel-libc-headers/patches/*.patch; do + _apply_patch -p0 $f + done + make ARCH=mips headers_check make ARCH=mips INSTALL_HDR_PATH=${_sysroot}/usr headers_install diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template index d2b3be343c2..1f39e330dab 100644 --- a/srcpkgs/cross-mipsel-linux-musl/template +++ b/srcpkgs/cross-mipsel-linux-musl/template @@ -1,6 +1,6 @@ # Template build file for 'cross-mipsel-linux-musl' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _musl_version=1.1.16 _linux_version=4.9.8 @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=3 short_desc="Cross toolchain for MIPS32r2 LE softfloat target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -23,7 +23,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011" @@ -126,6 +126,10 @@ _linux_headers() { cd linux-${_linux_version} + for f in ${XBPS_SRCPKGDIR}/kernel-libc-headers/patches/*.patch; do + _apply_patch -p0 $f + done + make ARCH=mips headers_check make ARCH=mips INSTALL_HDR_PATH=${_sysroot}/usr headers_install diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template index 5624794ab30..18c310adbec 100644 --- a/srcpkgs/cross-mipsel-linux-muslhf/template +++ b/srcpkgs/cross-mipsel-linux-muslhf/template @@ -1,6 +1,6 @@ # Template build file for 'cross-mipsel-linux-muslhf' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _musl_version=1.1.16 _linux_version=4.9.8 @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=3 short_desc="Cross toolchain for MIPS32r2 LE hardfloat target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -23,7 +23,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011" @@ -126,6 +126,10 @@ _linux_headers() { cd linux-${_linux_version} + for f in ${XBPS_SRCPKGDIR}/kernel-libc-headers/patches/*.patch; do + _apply_patch -p0 $f + done + make ARCH=mips headers_check make ARCH=mips INSTALL_HDR_PATH=${_sysroot}/usr headers_install diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template index 14210427deb..87cd19742e2 100644 --- a/srcpkgs/cross-vpkg-dummy/template +++ b/srcpkgs/cross-vpkg-dummy/template @@ -1,7 +1,7 @@ # Template file for 'cross-vpkg-dummy' pkgname=cross-vpkg-dummy -version=0.22 -revision=1 +version=0.23 +revision=2 build_style=meta short_desc="Dummy meta-pkg for cross building packages with xbps-src" maintainer="Juan RP " @@ -20,6 +20,8 @@ provides=" libgcc-9999_1 libstdc++-9999_1 libstdc++-devel-9999_1 + libgfortran-9999_1 + libgfortran-devel-9999_1 libgomp-9999_1 libgomp-devel-9999_1 gcc-9999_1 @@ -33,6 +35,8 @@ conflicts=" libgcc>=0 libstdc++>=0 libstdc++-devel>=0 + libgfortran>=0 + libgfortran-devel>=0 libgomp>=0 libgomp-devel>=0 gcc>=0 @@ -53,6 +57,7 @@ shlib_provides=" libutil.so.1 libgcc_s.so.1 libstdc++.so.6 + libgfortran.so.3 libgomp.so.1 ld-linux.so.2 ld-linux.so.3 diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template index 617a310db03..b9c8c2a1d3e 100644 --- a/srcpkgs/cross-x86_64-linux-musl/template +++ b/srcpkgs/cross-x86_64-linux-musl/template @@ -1,6 +1,6 @@ # Template build file for 'cross-x86_64-linux-musl' # -_binutils_version=2.27 +_binutils_version=2.28 _gcc_version=6.3.0 _musl_version=1.1.16 _linux_version=4.9.8 @@ -10,7 +10,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.23 -revision=1 +revision=2 short_desc="Cross toolchain for x86_64 with musl" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -21,7 +21,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 + 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f 150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011" diff --git a/srcpkgs/cryptsetup/patches/libressl.patch b/srcpkgs/cryptsetup/patches/libressl.patch deleted file mode 100644 index 1766b3fb2a6..00000000000 --- a/srcpkgs/cryptsetup/patches/libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/crypto_backend/crypto_openssl.c.orig 2016-10-28 10:58:10.000000000 +0200 -+++ lib/crypto_backend/crypto_openssl.c 2016-10-31 02:17:52.154628201 +0100 -@@ -73,7 +73,7 @@ - /* - * Compatible wrappers for OpenSSL < 1.1.0 - */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - static EVP_MD_CTX *EVP_MD_CTX_new(void) - { - EVP_MD_CTX *md = malloc(sizeof(*md)); diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template index a123bb5eea6..9c436a12d04 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -1,17 +1,18 @@ # Template file for 'cryptsetup' pkgname=cryptsetup -version=1.7.3 +version=1.7.5 revision=1 build_style=gnu-configure configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)" hostmakedepends="pkg-config" -makedepends="popt-devel libuuid-devel device-mapper-devel libressl-devel $(vopt_if pwquality libpwquality-devel)" +makedepends="popt-devel libuuid-devel device-mapper-devel libressl-devel + $(vopt_if pwquality libpwquality-devel)" short_desc="Setup virtual encryption devices under Linux dm-crypt" maintainer="Juan RP " -license="GPL-3" +license="GPL-2" homepage="https://gitlab.com/cryptsetup/cryptsetup" distfiles="${KERNEL_SITE}/utils/cryptsetup/v${version%.*}/${pkgname}-${version}.tar.xz" -checksum=af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02 +checksum=2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd build_options="pwquality" desc_option_pwquality="Enable support for checking password quality via libpwquality" diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template index 3103911883a..7fef7265b8b 100644 --- a/srcpkgs/csound/template +++ b/srcpkgs/csound/template @@ -12,7 +12,7 @@ hostmakedepends="python flex" makedepends="pd-devel fltk-devel fluidsynth-devel liblo-devel portaudio-devel portmidi-devel tk-devel libcurl-devel LuaJIT-devel boost-devel libgomp-devel libsndfile-devel" depends="pd" short_desc="A programming language for sound rendering and signal processing" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="LGPL-3" homepage="http://csound.github.io" distfiles="https://github.com/$pkgname/$pkgname/archive/$version.tar.gz" diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template index 9663d893129..793fd42d626 100644 --- a/srcpkgs/cups-filters/template +++ b/srcpkgs/cups-filters/template @@ -1,6 +1,6 @@ # Template file for 'cups-filters' pkgname=cups-filters -version=1.13.4 +version=1.13.5 revision=1 build_style=gnu-configure configure_args="--disable-static --with-rcdir=no --enable-avahi @@ -16,7 +16,7 @@ maintainer="Juan RP " license="GPL-2, LGPL-2.1, MIT" homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" distfiles="http://www.openprinting.org/download/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=94c7d6624f16a8c11683c863e6457c5daa70e60f9a739c355349b45c3abc8dbd +checksum=35db1c5821c9ff0e0fedcf87b3ae68a424ad951bd8af421a2a1aac5613e17b8d lib32disabled=yes disable_parallel_build=yes diff --git a/srcpkgs/cups/patches/default-config-no-gssapi.patch b/srcpkgs/cups/patches/default-config-no-gssapi.patch deleted file mode 100644 index b12c55ddf81..00000000000 --- a/srcpkgs/cups/patches/default-config-no-gssapi.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/conf/cupsd.conf.in -+++ b/conf/cupsd.conf.in -@@ -145,12 +145,12 @@ - - # Job-related operations must be done by the owner or an administrator... - -- AuthType Negotiate -+ AuthType Default - Order deny,allow - - - -- AuthType Negotiate -+ AuthType Default - Require user @OWNER @SYSTEM - Order deny,allow - -@@ -171,7 +171,7 @@ - - # Only the owner or an administrator can cancel or authenticate a job... - -- AuthType Negotiate -+ AuthType Default - Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@ - Order deny,allow - diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index 1faf168359e..b3d7d54f332 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -1,14 +1,14 @@ # Template file for 'cups' pkgname=cups -version=2.2.2 -revision=2 +version=2.2.3 +revision=1 patch_args="-Np1" short_desc="Common Unix Printing System" maintainer="Juan RP " homepage="http://www.cups.org/" license="GPL-2" distfiles="https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz" -checksum=f589bb7d5d1dc3aa0915d7cf2b808571ef2e1530cd1a6ebe76ae8f9f4994e4f6 +checksum=66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f hostmakedepends="automake pkg-config poppler-utils gnutls-devel avahi-libs-devel" makedepends="acl-devel libjpeg-turbo-devel libpng-devel tiff-devel diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index cde3b04f058..e71ebffb758 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,7 +1,7 @@ # Template build file for 'curl'. pkgname=curl -version=7.53.1 -revision=2 +version=7.54.0 +revision=1 build_style=gnu-configure configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 $(vopt_with rtmp) @@ -21,7 +21,7 @@ maintainer="Juan RP " license="MIT" homepage="http://curl.haxx.se" distfiles="$homepage/download/$pkgname-$version.tar.bz2" -checksum=1c7207c06d75e9136a944a2e0528337ce76f15b9ec9ae4bb30d703b59bf530e8 +checksum=f50ebaf43c507fa7cc32be4b8108fa8bbd0f5022e90794388f3c7694a302ff06 build_options="gnutls gssapi ldap rtmp ssh ssl" build_options_default="ssh ssl" diff --git a/srcpkgs/curlpp/template b/srcpkgs/curlpp/template index 99175bc47e5..892b6eec1fd 100644 --- a/srcpkgs/curlpp/template +++ b/srcpkgs/curlpp/template @@ -1,24 +1,18 @@ # Template file for 'curlpp' pkgname=curlpp -version=0.7.4 +version=0.8.1 revision=1 -build_style=gnu-configure -hostmakedepends="automake libtool" -makedepends="libcurl-devel boost-devel" +build_style=cmake +makedepends="libcurl-devel" short_desc="C++ wrapper for libcURL" maintainer="Asaf Ohayon " license="MIT" homepage="http://www.curlpp.org/" distfiles="https://github.com/jpbarrette/curlpp/archive/v${version}.tar.gz" -checksum=3316741ec4c140f42c3d3f1ee421739ae4ae4266371aa9846edc4844da39c4df +checksum=97e3819bdcffc3e4047b6ac57ca14e04af85380bd93afe314bee9dd5c7f46a0a -CPPFLAGS="-Wno-error=unused-function -O2" - -pre_configure() { - ./autogen.sh -} post_install() { - vlicense COPYING + vlicense doc/LICENSE } curlpp-devel_package() { diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template index 2bf2cd1093f..f256a72969d 100644 --- a/srcpkgs/cyrus-sasl/template +++ b/srcpkgs/cyrus-sasl/template @@ -1,7 +1,7 @@ # Template file for 'cyrus-sasl' pkgname=cyrus-sasl version=2.1.26 -revision=10 +revision=11 patch_args="-Np1" hostmakedepends="automake libtool groff pkg-config" makedepends="libsasl-devel libressl-devel db-devel libldap-devel diff --git a/srcpkgs/daemonize/template b/srcpkgs/daemonize/template index a25c90b763a..9c6f5035f85 100644 --- a/srcpkgs/daemonize/template +++ b/srcpkgs/daemonize/template @@ -5,7 +5,7 @@ revision=2 build_style=gnu-configure make_install_args="INSTALL_SBIN=/usr/bin" short_desc="Run a program as a Unix daemon" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="BSD, MIT, Public Domain" homepage="http://software.clapper.org/daemonize/daemonize.html" distfiles="https://github.com/bmc/$pkgname/archive/release-$version.tar.gz" diff --git a/srcpkgs/dar/template b/srcpkgs/dar/template index 04673e75167..d9386d77404 100644 --- a/srcpkgs/dar/template +++ b/srcpkgs/dar/template @@ -1,6 +1,6 @@ # Template file for 'dar' pkgname=dar -version=2.5.9 +version=2.5.10 revision=1 build_style=gnu-configure configure_args="--disable-upx --disable-build-html" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://dar.linux.free.fr/" distfiles="${SOURCEFORGE_SITE}/dar/dar-${version}.tar.gz" -checksum=6973614afa970d095719bf43d91855c450d0fa5dcf0a45b580055625500ba92e +checksum=771c8462b9e65bf646699a14a4e156c75b5bda4301ebf6f5e03bd82c2486a4d8 if [ -n "$CROSS_BUILD" ]; then configure_args+=" --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr" diff --git a/srcpkgs/darkhttpd/template b/srcpkgs/darkhttpd/template index 812c36bb69b..756c3a6c1b5 100644 --- a/srcpkgs/darkhttpd/template +++ b/srcpkgs/darkhttpd/template @@ -3,7 +3,7 @@ pkgname=darkhttpd version=1.12 revision=1 short_desc="A small and secure static webserver" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="BSD" homepage="http://dmr.ath.cx/net/darkhttpd/" distfiles="$homepage/$pkgname-$version.tar.bz2" diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template index 865608820f1..503e0c7acbb 100644 --- a/srcpkgs/darktable/template +++ b/srcpkgs/darktable/template @@ -1,6 +1,6 @@ # Template file for 'darktable' pkgname=darktable -version=2.2.3 +version=2.2.4 revision=1 build_style=cmake # this makes sure to use -march=generic and -msse3 @@ -20,4 +20,4 @@ depends="adwaita-icon-theme" # upstream only supports these archs: only_for_archs="i686 i686-musl x86_64 x86_64-musl aarch64 aarch64-musl" distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz" -checksum=1b33859585bf283577680c61e3c0ea4e48214371453b9c17a86664d2fbda48a0 +checksum=bd5445d6b81fc3288fb07362870e24bb0b5378cacad2c6e6602e32de676bf9d8 diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template index 911781be176..08caf22a7ba 100644 --- a/srcpkgs/dbus/template +++ b/srcpkgs/dbus/template @@ -1,6 +1,6 @@ # Template file for 'dbus' pkgname=dbus -version=1.10.16 +version=1.10.18 revision=1 build_style=gnu-configure configure_args="--disable-selinux --enable-inotify --with-dbus-user=dbus @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://dbus.freedesktop.org/" distfiles="${homepage}/releases/dbus/dbus-${version}.tar.gz" -checksum=a7b0ba6ea3e8d0e08afec5e3030d0245614268276620c536726f8fa6e5c43388 +checksum=6049ddd5f3f3e2618f615f1faeda0a115104423a7996b7aa73e2f36e38cc514a hostmakedepends="pkg-config intltool gperf xmlto" makedepends="expat-devel libX11-devel libcap-devel" diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template index 2bbf8eadcbb..b0c646bd117 100644 --- a/srcpkgs/debootstrap/template +++ b/srcpkgs/debootstrap/template @@ -1,16 +1,16 @@ # Template file for 'debootstrap' pkgname=debootstrap -version=1.0.88 +version=1.0.90 revision=1 build_style=fetch depends="binutils bzip2 gnupg gzip tar wget xz" short_desc="Bootstrap a basic Debian system" maintainer="Leah Neukirchen " -license="custom" +license="MIT" homepage="http://packages.qa.debian.org/d/debootstrap.html" distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2014.3_all.deb" -checksum="4549c01f84a720bc01a31d89f7dd747ae3156de004fed3a6507af348458c1238 +checksum="6c4dc196835fa6569051976363fc3df5f0c51f910fc9b641dc03d24719c65484 017a2fba215cd64612891f5aa02546be5c0e30923a66672f889867cc6dd8d3a0" do_install() { diff --git a/srcpkgs/deluge-gtk b/srcpkgs/deluge-gtk new file mode 120000 index 00000000000..bd5ea246696 --- /dev/null +++ b/srcpkgs/deluge-gtk @@ -0,0 +1 @@ +deluge \ No newline at end of file diff --git a/srcpkgs/deluge-web b/srcpkgs/deluge-web new file mode 120000 index 00000000000..bd5ea246696 --- /dev/null +++ b/srcpkgs/deluge-web @@ -0,0 +1 @@ +deluge \ No newline at end of file diff --git a/srcpkgs/deluge/files/deluge-web/run b/srcpkgs/deluge/files/deluge-web/run index 666fb107837..44c75c99053 100644 --- a/srcpkgs/deluge/files/deluge-web/run +++ b/srcpkgs/deluge/files/deluge-web/run @@ -1,2 +1,3 @@ #!/bin/sh -exec chpst -u delugeweb:delugeweb deluge-web -d 2>&1 +sv check deluged >/dev/null || exit 1 +exec chpst -u deluge:deluge deluge-web 2>&1 diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run index ffb2c763965..089f6cbe92d 100644 --- a/srcpkgs/deluge/files/deluged/run +++ b/srcpkgs/deluge/files/deluged/run @@ -1,2 +1,5 @@ #!/bin/sh +set -e +mkdir -p /var/lib/deluge +chown deluge:deluge /var/lib/deluge exec chpst -u deluge:deluge deluged -d 2>&1 diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template index 1c2ef2670dc..78389daa54d 100644 --- a/srcpkgs/deluge/template +++ b/srcpkgs/deluge/template @@ -1,22 +1,51 @@ # Template file for 'deluge' pkgname=deluge -version=1.3.13 -revision=1 +version=1.3.14 +revision=3 noarch=yes build_style=python2-module -system_accounts="deluge delugeweb" pycompile_module="deluge" +system_accounts="deluge" +deluge_homedir="/var/lib/deluge" hostmakedepends="intltool python-setuptools" -makedepends="python-setuptools" -depends="pygtk python-setuptools python-chardet python-xdg Twisted libtorrent-rasterbar-python xdg-utils" -short_desc="BitTorrent client written in Python/PyGTK" +depends="python-setuptools python-chardet Twisted python-xdg libtorrent-rasterbar-python" +short_desc="Fully-featured cross-platform BitTorrent client" maintainer="Alexey Rochev " homepage="http://deluge-torrent.org/" license="GPL-3" distfiles="http://download.deluge-torrent.org/source/${pkgname}-${version}.tar.gz" -checksum=a3717f202e90f548cfcd233a94ca7df3656f58d75e6db0eb17b90d588c814a05 +checksum=2167376518ed888b7c8b0f2d81db175c688745692a97d872aad91df00c20991b post_install() { vsv deluged - vsv deluge-web +} + +deluge-gtk_package() { + noarch=yes + replaces="deluge<1.3.14_1" + short_desc+=" - GTK+ frontend" + pycompile_module="deluge" + depends="${sourcepkg}-${version}_${revision} pygtk" + pkg_install() { + vmove usr/bin/deluge + vmove usr/bin/deluge-gtk + vmove ${py2_sitelib}/deluge/ui/gtkui + vmove usr/share/applications + vmove usr/share/icons + vmove usr/share/man/man1/deluge.1 + vmove usr/share/man/man1/deluge-gtk.1 + } +} +deluge-web_package() { + noarch=yes + replaces="deluge<1.3.14_1" + short_desc+=" - Web frontend" + pycompile_module="deluge" + depends="${sourcepkg}-${version}_${revision} python-Mako" + pkg_install() { + vmove usr/bin/deluge-web + vmove ${py2_sitelib}/deluge/ui/web + vmove usr/share/man/man1/deluge-web.1 + vsv deluge-web + } } diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template index abbf3569c26..4e99c98c0cc 100644 --- a/srcpkgs/devhelp/template +++ b/srcpkgs/devhelp/template @@ -1,6 +1,6 @@ # Template file for 'devhelp' pkgname=devhelp -version=3.22.0 +version=3.24.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool glib-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://wiki.gnome.org/devhelp" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=59cae02e12d238cc5fc3f049d779895ba89701426d9173f5b534d4ab90c5ffb0 +checksum=4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430 devhelp-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template index a97ed9932ca..3c95aab6422 100644 --- a/srcpkgs/diff-pdf/template +++ b/srcpkgs/diff-pdf/template @@ -9,7 +9,7 @@ wrksrc="$pkgname-$_commit" hostmakedepends="automake pkg-config" makedepends="wxWidgets-devel cairo-devel poppler-devel poppler-glib-devel" short_desc="A simple tool for visually comparing two PDF files" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://vslavik.github.io/diff-pdf/" distfiles="https://github.com/vslavik/diff-pdf/archive/$_commit.tar.gz" diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template index 7c9d0895299..5d8634b2ee1 100644 --- a/srcpkgs/dillo/template +++ b/srcpkgs/dillo/template @@ -1,7 +1,7 @@ # Template file for 'dillo' pkgname=dillo version=3.0.5 -revision=5 +revision=6 build_style=gnu-configure configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns" conf_files="/etc/dillo/dillorc diff --git a/srcpkgs/ding-libs/template b/srcpkgs/ding-libs/template index 6faffd758ee..03c1254bae3 100644 --- a/srcpkgs/ding-libs/template +++ b/srcpkgs/ding-libs/template @@ -6,8 +6,8 @@ build_style=gnu-configure short_desc="'D is not GLib' utility libraries" maintainer="Michael Aldridge " license="GPL-3" -homepage="https://git.fedorahosted.org/git/ding-libs.git" -distfiles="https://fedorahosted.org/releases/d/i/ding-libs/ding-libs-${version}.tar.gz" +homepage="https://pagure.io/SSSD/sssd/" +distfiles="https://releases.pagure.org/SSSD/ding-libs/ding-libs-${version}.tar.gz" checksum=764a211f40cbcf2c9a613fc7ce0d77799d5ee469221b8b6739972e76f09e9fad ding-libs-devel_package() { diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template index 1d9f1edace3..d66136e57f2 100644 --- a/srcpkgs/direnv/template +++ b/srcpkgs/direnv/template @@ -1,7 +1,7 @@ # Template file for 'direnv' pkgname=direnv version=2.11.3 -revision=1 +revision=2 build_style=go go_import_path="github.com/direnv/direnv" short_desc="An environment switcher for the shell" diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template index 9ee433d7a3a..f09ec2f3469 100644 --- a/srcpkgs/dma/template +++ b/srcpkgs/dma/template @@ -1,7 +1,7 @@ # Template file for 'dma' pkgname=dma version=0.11 -revision=5 +revision=6 conf_files="/etc/dma/*.conf" make_dirs="/var/spool/dma 2775 root mail" hostmakedepends="flex" diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template index c68cdca0338..fb8165d4487 100644 --- a/srcpkgs/docker-compose/template +++ b/srcpkgs/docker-compose/template @@ -1,21 +1,21 @@ # Template file for 'docker-compose' pkgname=docker-compose -version=1.8.0 +version=1.12.0 revision=1 noarch=yes wrksrc="compose-${version}" -build_style=python2-module -hostmakedepends="python-setuptools" -depends="python-setuptools python-jsonschema python-docker-py python-dockerpty - python-websocket-client python-requests python-docopt python-yaml python-six - python-enum34 python-texttable python-cached-property" +build_style=python3-module pycompile_module="compose" +hostmakedepends="python3-setuptools" +depends="python3-setuptools python3-jsonschema python3-docker python3-dockerpty + python3-websocket-client python3-requests python3-docopt python3-yaml + python3-six python3-texttable python3-cached-property python3-colorama" short_desc="Tool to define and run multi-container Docker applications" maintainer="pancake " homepage="https://docs.docker.com/compose/" license="Apache-2.0" distfiles="https://github.com/docker/compose/archive/${version}.tar.gz" -checksum=a93d702086fdc95f79d20462ddaf7cd174e3d8053b79fe3c565f0ace76a16750 +checksum=7a51cf38feb6d62e63e124bd6ea5d0de3527a01b997a609ba8b516a829e39b33 pre_build() { # remove all upper bounds diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template index 3859e139fcc..458cf232ec7 100644 --- a/srcpkgs/docker-gen/template +++ b/srcpkgs/docker-gen/template @@ -1,13 +1,13 @@ # Template file for 'docker-gen' pkgname=docker-gen version=0.7.3 -revision=3 +revision=4 build_style=go hostmakedepends="git-perl glock" short_desc="Generate files from docker container meta-data" go_import_path="github.com/jwilder/docker-gen" go_package="${go_import_path}/cmd/docker-gen" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="MIT" homepage="https://$go_import_path" distfiles="$homepage/archive/$version.tar.gz" diff --git a/srcpkgs/docker-machine/template b/srcpkgs/docker-machine/template index af7d1a36b07..c2e65c0f933 100644 --- a/srcpkgs/docker-machine/template +++ b/srcpkgs/docker-machine/template @@ -1,7 +1,7 @@ # Template file for 'docker-machine' pkgname=docker-machine version=0.6.0 -revision=4 +revision=5 wrksrc="machine-${version}" build_style=go go_import_path="github.com/docker/machine" diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run index 3a384cffa1d..95018249001 100755 --- a/srcpkgs/docker/files/docker/run +++ b/srcpkgs/docker/files/docker/run @@ -1,4 +1,4 @@ #!/bin/sh [ -r conf ] && . ./conf modprobe -q loop || exit 1 -exec chpst -o 1048576 -p 1048576 docker daemon $OPTS 2>/dev/null +exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>/dev/null diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index 75ca91bb9b2..6ef13af0704 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,31 +1,46 @@ # Template file for 'docker' pkgname=docker -version=1.10.3 -revision=1 -hostmakedepends="git go" -makedepends="libbtrfs-devel sqlite-devel device-mapper-devel" +version=17.04.0 +revision=2 +_subversion='-ce' +_version="$version$_subversion" +wrksrc="$pkgname-$_version" +hostmakedepends="git go pkg-config cmake" +makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel" short_desc="Pack, ship and run any application as a lightweight container" -maintainer="Juan RP " +maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://www.docker.io" -distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" -checksum=6b72fafa4c068a95133f5c9fda9fb148c9412db7a932800689e259a1b1c7ef6d +distfiles="https://github.com/$pkgname/$pkgname/archive/v$_version.tar.gz" +checksum=b6ee0aa93ecea44e956d3627907e10557b3ec37d13ddfb40e436656e5037c640 # These are required at run-time. depends="iptables xz git" +nopie=yes nostrip=yes nocross=yes only_for_archs="x86_64 x86_64-musl" system_groups="docker" do_build() { - export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT=v$version - ./hack/make.sh dynbinary + export AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp' + export DOCKER_GITCOMMIT=v$_version + hack/make.sh dynbinary +} + +pre_build() { + export GOPATH=$PWD/gopath + mkdir -p $GOPATH + vmkdir usr/bin + sed -i "s|/usr/local|$DESTDIR/usr|g; s|apparmor||g" hack/dockerfile/install-binaries.sh + hack/dockerfile/install-binaries.sh runc-dynamic\ + containerd-dynamic\ + tini\ + proxy-dynamic } do_install() { - vbin bundles/${version}/dynbinary/docker-${version} docker - vinstall bundles/${version}/dynbinary/dockerinit-${version} 755 usr/lib/docker dockerinit + vbin bundles/${_version}/dynbinary-client/docker-${_version} docker + vbin bundles/${_version}/dynbinary-daemon/dockerd-${_version} dockerd vinstall contrib/completion/bash/docker 644 usr/share/bash-completion/completions vinstall contrib/completion/zsh/_docker 644 usr/share/zsh/site-functions vsv docker diff --git a/srcpkgs/docker2aci/template b/srcpkgs/docker2aci/template index 7daa0b3e933..c53501167fe 100644 --- a/srcpkgs/docker2aci/template +++ b/srcpkgs/docker2aci/template @@ -1,11 +1,11 @@ # Template file for 'docker2aci' pkgname=docker2aci version=0.16.0 -revision=2 +revision=3 hostmakedepends="git git-perl" build_style=go short_desc="Library and CLI tool to convert Docker images to ACIs" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="Apache-2.0" go_import_path="github.com/appc/docker2aci" homepage="https://$go_import_path" diff --git a/srcpkgs/dockstar-base/template b/srcpkgs/dockstar-base/template index 1748d357f1a..274552bfe26 100644 --- a/srcpkgs/dockstar-base/template +++ b/srcpkgs/dockstar-base/template @@ -5,7 +5,7 @@ revision=1 build_style=meta homepage="http://www.voidlinux.eu" short_desc="Void Linux Dockstar platform package" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="Public Domain" only_for_archs="armv5tel" diff --git a/srcpkgs/dockstar-uboot/template b/srcpkgs/dockstar-uboot/template index 7b96119b6fc..b7e957b9e36 100644 --- a/srcpkgs/dockstar-uboot/template +++ b/srcpkgs/dockstar-uboot/template @@ -5,7 +5,7 @@ revision=1 wrksrc="u-boot-R${version##*.}" only_for_archs="armv5tel" short_desc="(archlinuxarm) u-boot compiled for dockstar" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://github.com/archlinuxarm/u-boot" distfiles="https://github.com/archlinuxarm/u-boot/archive/R$version.tar.gz http://archlinuxarm.org/os/armv5te/boot/dockstar/uboot-dockstar.env" diff --git a/srcpkgs/dolphin-emu/patches/raster_font_cpp.patch b/srcpkgs/dolphin-emu/patches/raster_font_cpp.patch new file mode 100644 index 00000000000..a569ec7e1e6 --- /dev/null +++ b/srcpkgs/dolphin-emu/patches/raster_font_cpp.patch @@ -0,0 +1,112 @@ +--- Source/Core/VideoBackends/OGL/RasterFont.cpp.orig 2017-04-20 13:02:30.087390930 +0300 ++++ Source/Core/VideoBackends/OGL/RasterFont.cpp 2017-04-20 13:02:49.036390127 +0300 +@@ -15,12 +15,12 @@ + namespace OGL + { + +-static const int CHAR_WIDTH = 8; +-static const int CHAR_HEIGHT = 13; +-static const int CHAR_OFFSET = 32; +-static const int CHAR_COUNT = 95; ++static const int CHARACTER_WIDTH = 8; ++static const int CHARACTER_HEIGHT = 13; ++static const int CHARACTER_OFFSET = 32; ++static const int CHARACTER_COUNT = 95; + +-static const u8 rasters[CHAR_COUNT][CHAR_HEIGHT] = { ++static const u8 rasters[CHARACTER_COUNT][CHARACTER_HEIGHT] = { + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36}, +@@ -146,27 +146,27 @@ + glGenTextures(1, &texture); + glActiveTexture(GL_TEXTURE8); + glBindTexture(GL_TEXTURE_2D, texture); +- std::vector texture_data(CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT); +- for (int y = 0; y < CHAR_HEIGHT; y++) ++ std::vector texture_data(CHARACTER_WIDTH * CHARACTER_COUNT * CHARACTER_HEIGHT); ++ for (int y = 0; y < CHARACTER_HEIGHT; y++) + { +- for (int c = 0; c < CHAR_COUNT; c++) ++ for (int c = 0; c < CHARACTER_COUNT; c++) + { +- for (int x = 0; x < CHAR_WIDTH; x++) ++ for (int x = 0; x < CHARACTER_WIDTH; x++) + { +- bool pixel = (0 != (rasters[c][y] & (1 << (CHAR_WIDTH - x - 1)))); +- texture_data[CHAR_WIDTH * CHAR_COUNT * y + CHAR_WIDTH * c + x] = pixel ? -1 : 0; ++ bool pixel = (0 != (rasters[c][y] & (1 << (CHARACTER_WIDTH - x - 1)))); ++ texture_data[CHARACTER_WIDTH * CHARACTER_COUNT * y + CHARACTER_WIDTH * c + x] = pixel ? -1 : 0; + } + } + } + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); +- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data()); ++ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHARACTER_WIDTH * CHARACTER_COUNT, CHARACTER_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data()); + + // generate shader + ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, s_fragmentShaderSrc); + s_shader.Bind(); + + // bound uniforms +- glUniform2f(glGetUniformLocation(s_shader.glprogid,"charSize"), 1.0f / GLfloat(CHAR_COUNT), 1.0f); ++ glUniform2f(glGetUniformLocation(s_shader.glprogid,"charSize"), 1.0f / GLfloat(CHARACTER_COUNT), 1.0f); + uniform_color_id = glGetUniformLocation(s_shader.glprogid,"color"); + glUniform4f(uniform_color_id, 1.0f, 1.0f, 1.0f, 1.0f); + uniform_offset_id = glGetUniformLocation(s_shader.glprogid, "offset"); +@@ -196,8 +196,8 @@ + std::vector vertices(text.length() * 6 * 4); + + int usage = 0; +- GLfloat delta_x = GLfloat(2 * CHAR_WIDTH) / GLfloat(bbWidth); +- GLfloat delta_y = GLfloat(2 * CHAR_HEIGHT) / GLfloat(bbHeight); ++ GLfloat delta_x = GLfloat(2 * CHARACTER_WIDTH) / GLfloat(bbWidth); ++ GLfloat delta_y = GLfloat(2 * CHARACTER_HEIGHT) / GLfloat(bbHeight); + GLfloat border_x = 2.0f / GLfloat(bbWidth); + GLfloat border_y = 4.0f / GLfloat(bbHeight); + +@@ -220,37 +220,37 @@ + continue; + } + +- if (c < CHAR_OFFSET || c >= CHAR_COUNT + CHAR_OFFSET) ++ if (c < CHARACTER_OFFSET || c >= CHARACTER_COUNT + CHARACTER_OFFSET) + continue; + + vertices[usage++] = x; + vertices[usage++] = y; +- vertices[usage++] = GLfloat(c - CHAR_OFFSET); ++ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET); + vertices[usage++] = 0.0f; + + vertices[usage++] = x + delta_x; + vertices[usage++] = y; +- vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1); ++ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET + 1); + vertices[usage++] = 0.0f; + + vertices[usage++] = x + delta_x; + vertices[usage++] = y + delta_y; +- vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1); ++ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET + 1); + vertices[usage++] = 1.0f; + + vertices[usage++] = x; + vertices[usage++] = y; +- vertices[usage++] = GLfloat(c - CHAR_OFFSET); ++ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET); + vertices[usage++] = 0.0f; + + vertices[usage++] = x + delta_x; + vertices[usage++] = y + delta_y; +- vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1); ++ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET + 1); + vertices[usage++] = 1.0f; + + vertices[usage++] = x; + vertices[usage++] = y + delta_y; +- vertices[usage++] = GLfloat(c - CHAR_OFFSET); ++ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET); + vertices[usage++] = 1.0f; + + x += delta_x + border_x; diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 714bda3a5e2..8c48a9c8aa9 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -3,9 +3,10 @@ only_for_archs="x86_64 x86_64-musl" pkgname=dolphin-emu version=5.0 -revision=5 +revision=6 wrksrc="dolphin-${version}" build_style=cmake +nopie=yes configure_args="-DUSE_X11=1 -DUSE_EGL=0 -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0" hostmakedepends="pkg-config" diff --git a/srcpkgs/dos2unix/template b/srcpkgs/dos2unix/template index 8ca6e297764..2df7d45fa5e 100644 --- a/srcpkgs/dos2unix/template +++ b/srcpkgs/dos2unix/template @@ -3,7 +3,7 @@ pkgname=dos2unix version=7.3.4 revision=1 build_style=gnu-makefile -maintainer="Orphaned " +maintainer="Leah Neukirchen " license="2-clause-BSD" homepage="http://waterlan.home.xs4all.nl/dos2unix.html" short_desc="Text file format converter" diff --git a/srcpkgs/dotherside/template b/srcpkgs/dotherside/template index dc3ec323cf7..bbab2f170f6 100644 --- a/srcpkgs/dotherside/template +++ b/srcpkgs/dotherside/template @@ -1,15 +1,16 @@ # Template file for 'dotherside' pkgname=dotherside -version=0.5.2 +version=0.6.2 revision=1 build_style=cmake -hostmakedepends="qt5-host-tools qt5-declarative-devel" +hostmakedepends="qt5-host-tools qt5-declarative-devel doxygen" +makedepends="qt5-devel" short_desc="C language library for creating bindings for the Qt QML language" maintainer="gangstacat " license="LGPL-3.0" homepage="https://github.com/filcuc/DOtherSide" distfiles="https://github.com/filcuc/${pkgname}/archive/v${version}.tar.gz" -checksum=1f91c011b776fc6810662155e0408e40ca0cec50331d9501ca514a45fcce145f +checksum=2c364b0c6840441f5227ecad3478bd312f7af6c8aa10bff89e202dba3e6be0f5 wrksrc="DOtherSide-${version}" dotherside-devel_package() { @@ -19,4 +20,4 @@ dotherside-devel_package() { vmove usr/include/ vmove usr/lib/*.so } -} \ No newline at end of file +} diff --git a/srcpkgs/double-conversion-devel b/srcpkgs/double-conversion-devel new file mode 120000 index 00000000000..385bfc73f01 --- /dev/null +++ b/srcpkgs/double-conversion-devel @@ -0,0 +1 @@ +double-conversion \ No newline at end of file diff --git a/srcpkgs/double-conversion/template b/srcpkgs/double-conversion/template index cb66b2f31c7..3ce750eb4e0 100644 --- a/srcpkgs/double-conversion/template +++ b/srcpkgs/double-conversion/template @@ -1,7 +1,7 @@ # Template file for 'double-conversion' pkgname=double-conversion version=2.0.1 -revision=1 +revision=2 build_style=scons hostmakedepends="scons" short_desc="Provides binary-decimal and decimal-binary routines for IEEE doubles" @@ -15,3 +15,13 @@ post_install(){ vlicense LICENSE } +double-conversion-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmkdir usr/include/double-conversion + vcopy src/*.h usr/include/double-conversion/ + vmove usr/lib/*.a + vmove usr/lib/*.so + } +} diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template index c20150b85af..4052e99c9f4 100644 --- a/srcpkgs/dovecot-plugin-pigeonhole/template +++ b/srcpkgs/dovecot-plugin-pigeonhole/template @@ -1,6 +1,6 @@ # Template file for 'dovecot-plugin-pigeonhole' pkgname=dovecot-plugin-pigeonhole -version=0.4.17 +version=0.4.18 revision=1 wrksrc="dovecot-2.2-pigeonhole-${version}" build_style=gnu-configure @@ -19,7 +19,7 @@ maintainer="John Regan " license="LGPL-2.1" homepage="http://pigeonhole.dovecot.org" distfiles="${homepage}/releases/2.2/${wrksrc}.tar.gz" -checksum=74d869c7532cbf4fe41e3cc95a1aa6ce32e98f4d423f0d099da1e0fba022dae3 +checksum=dd871bb57fad22795460f613f3c9484a8bf229272ac00956d837a34444f1c3a9 dovecot-plugin-pigeonhole-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index ba82f72a21b..0d981145d3a 100644 --- a/srcpkgs/dovecot/template +++ b/srcpkgs/dovecot/template @@ -1,7 +1,7 @@ # Template file for 'dovecot' # revbump dovecot-plugin-pigeonhole when updating dovecot! pkgname=dovecot -version=2.2.28 +version=2.2.29.1 revision=1 build_style=gnu-configure configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin @@ -14,7 +14,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://dovecot.org" distfiles="${homepage}/releases/2.2/${pkgname}-${version}.tar.gz" -checksum=e0288f59e326ab87cb3881fdabadafe542f4dc7ab9996db13863a439ebbc1f25 +checksum=ccfa9ffb7eb91e9e87c21c108324b911250c9ffa838bffb64b1caafadcb0f388 keep_libtool_archives=yes makedepends=" diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index f7109f48a67..6b028275905 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,10 +1,11 @@ # Template file for 'dracut' pkgname=dracut -version=044 -revision=4 +version=045 +revision=1 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" -hostmakedepends="libxslt docbook-xsl asciidoc" +hostmakedepends="libxslt docbook-xsl asciidoc pkg-config" +makedepends="libkmod-devel" depends="bash psmisc cpio coreutils" conf_files="/etc/dracut.conf" make_dirs=" @@ -15,7 +16,19 @@ short_desc="A new initramfs infrastructure" maintainer="Juan RP " license="GPL-2" distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz" -checksum=84b97c9b0120e9fde06c3b9cf2ede1c4632cccd8e085e980b9ec9c788655af05 +checksum=ca9c7ea54d3efc8b57ac1427cc5fa4d66688f6cf9d3088f4c5e7ae7c7e84ebf8 + +case "$XBPS_TARGET_MACHINE" in +*-musl) # Add musl-fts implementation + makedepends+=" musl-fts-devel" + ;; +esac + +do_build() { + case "$XBPS_TARGET_MACHINE" in + *-musl) make ${makejobs} LDLIBS="${XBPS_CROSS_BASE}/usr/lib/libfts.a";; + esac +} post_install() { # kernel hooks. diff --git a/srcpkgs/drive/template b/srcpkgs/drive/template index 6f0dee2f3b1..f54ea4e8f9d 100644 --- a/srcpkgs/drive/template +++ b/srcpkgs/drive/template @@ -1,7 +1,7 @@ # Template file for 'drive' pkgname=drive version=0.3.9.1 -revision=2 +revision=3 build_style=go hostmakedepends="git" short_desc="Google Drive client for the commandline" diff --git a/srcpkgs/dtc/template b/srcpkgs/dtc/template index 99483a6eb88..91e1e9aa040 100644 --- a/srcpkgs/dtc/template +++ b/srcpkgs/dtc/template @@ -1,16 +1,16 @@ # Template file for 'dtc' pkgname=dtc -version=1.4.3 +version=1.4.4 revision=1 build_style=gnu-makefile hostmakedepends="git flex bison" short_desc="Device Tree Compiler" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://www.devicetree.org/Device_Tree_Compiler" CFLAGS="-fPIC" distfiles="https://www.kernel.org/pub/software/utils/dtc/dtc-$version.tar.xz" -checksum=0c3fbff85e85b980740c7b9c6f3cd1c5354aa318bfcadb5005776fdcf3ac5ec8 +checksum=470731d5c015b160d26a96645dbb1c7337d6e7b8c98244612002b66bedf6cffb dtc-devel_package() { depends="dtc>=${version}_${revision}" diff --git a/srcpkgs/dumpet/template b/srcpkgs/dumpet/template index 525d9a1f044..885c7d59382 100644 --- a/srcpkgs/dumpet/template +++ b/srcpkgs/dumpet/template @@ -8,8 +8,8 @@ makedepends="popt-devel libxml2-devel" short_desc="Tool to dump and debug bootable CD-like images" maintainer="Juan RP " license="GPL-2" -homepage="https://fedorahosted.org/dumpet/" -distfiles="https://fedorahosted.org/releases/d/u/dumpet/dumpet-$version.tar.bz2" +homepage="https://tracker.debian.org/pkg/dumpet" +distfiles="http://http.debian.net/debian/pool/main/d/dumpet/dumpet_${version}.orig.tar.bz2" checksum=2cc1fa3a1b06f885e4524d1be80bdacc5b6a55057d0577262f2f5186b49a4da3 do_build() { diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template index e347ddddd7c..c080c2287ea 100644 --- a/srcpkgs/duplicity/template +++ b/srcpkgs/duplicity/template @@ -1,6 +1,6 @@ # Template file for 'duplicity' pkgname=duplicity -version=0.7.11 +version=0.7.12 revision=1 build_style=python2-module hostmakedepends="python-setuptools" @@ -12,7 +12,7 @@ homepage="http://duplicity.nongnu.org/" license="GPL-2" maintainer="Leah Neukirchen " distfiles="http://code.launchpad.net/duplicity/${version%.*}-series/${version}/+download/duplicity-${version}.tar.gz" -checksum=b047a1590a1f5bb3974643ad2cc9dfdd32f61adbf2c1989191fb12cb59c2ec07 +checksum=11cbad44a90891af1bf9e294260ba7c21a1660ccd3ab2c6e736ba74ac5cf0fe6 post_extract() { chmod 0644 bin/*.1 diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template index aba88d4dd38..fe316a2252b 100644 --- a/srcpkgs/dwdiff/template +++ b/srcpkgs/dwdiff/template @@ -1,16 +1,16 @@ # Template file for 'dwdiff' pkgname=dwdiff -version=2.1.0 -revision=4 +version=2.1.1 +revision=1 build_style=gnu-configure makedepends="icu-devel" depends="diffutils" short_desc="Word-level diff(1)" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-3" homepage="http://os.ghalkes.nl/dwdiff.html" distfiles="http://os.ghalkes.nl/dist/${pkgname}-${version}.tar.bz2" -checksum=45308f2f07c08c75c6ebd1eae3e3dcf7f836e5af1467cefc1b4829777c07743a +checksum=9745860faad6cb58744c7c45d16c0c7e222896c80d0cd7208dd36126d1a98c8b post_install() { rm -rf ${DESTDIR}/usr/share/doc/dwdiff* diff --git a/srcpkgs/dynamips/template b/srcpkgs/dynamips/template new file mode 100644 index 00000000000..884666ea2bc --- /dev/null +++ b/srcpkgs/dynamips/template @@ -0,0 +1,18 @@ +# Template file for 'dynamips' +pkgname=dynamips +version=0.2.16 +revision=1 +build_style=cmake +makedepends="elfutils-devel" +depends="iouyap" +short_desc="Hardware emulation for Cisco IOS capable devices" +maintainer="Michael Aldridge " +license="GPL-2" +homepage="https://github.com/GNS3/dynamips" +distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" +checksum=0fcf18d701898a77cb589bd9bad16dde436ac1ccb87516fefe07d09de1a196c0 + +# Dynamips does processor instruction translation. This is already +# painfully slow on powerful x86 hardware and is unlikely to work +# reliably on arm processors. +only_for_archs="i686 i686-musl x86_64 x86_64-musl" diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template index d9435542bc9..767c990a4d1 100644 --- a/srcpkgs/ecryptfs-utils/template +++ b/srcpkgs/ecryptfs-utils/template @@ -1,7 +1,7 @@ # Template file for 'ecryptfs-utils' pkgname=ecryptfs-utils version=111 -revision=2 +revision=3 lib32disabled=yes build_style=gnu-configure configure_args="--sbindir=/usr/bin diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template index 789a5384ee5..0f7a3903149 100644 --- a/srcpkgs/edbrowse/template +++ b/srcpkgs/edbrowse/template @@ -1,17 +1,17 @@ # Template file for 'edbrowse' pkgname=edbrowse -version=3.6.2 +version=3.6.3 revision=1 hostmakedepends="pkg-config perl" build_style="cmake" makedepends="mozjs24-devel libressl-devel pcre-devel libcurl-devel readline-devel libtidy5-devel" short_desc="Line-oriented text editor, web browser and mail client similar to ed(1)" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-3" homepage="http://edbrowse.org/" distfiles="https://github.com/CMB/${pkgname}/archive/v${version}.tar.gz" -checksum=be80c92caa6e0925e54755ac8ac0a3929319f78f1757f345c537549156a3e5a6 +checksum=f1ab7a113ea9465ef19c3ffa10e0b0466032c42acb55875243f5b859779d3b64 do_install() { vbin build/edbrowse diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index bfa57ed7a69..b2010520999 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -1,7 +1,7 @@ # Template file for 'efl' pkgname=efl version=1.18.4 -revision=2 +revision=4 build_style=gnu-configure configure_args="CXX= --enable-multisense --enable-image-loader-webp --enable-liblz4 --disable-systemd $(vopt_enable framebuffer fb) $(vopt_enable pulseaudio) diff --git a/srcpkgs/eigen3.2/update b/srcpkgs/eigen3.2/update index 7a93539c9a2..52e574c12aa 100644 --- a/srcpkgs/eigen3.2/update +++ b/srcpkgs/eigen3.2/update @@ -1 +1,2 @@ pattern='eigen/get/\K[\d.]+(?=.tar.bz2)' +ignore="3.3.*" diff --git a/srcpkgs/elasticsearch/INSTALL b/srcpkgs/elasticsearch/INSTALL index 38f51065865..84b01fd64af 100644 --- a/srcpkgs/elasticsearch/INSTALL +++ b/srcpkgs/elasticsearch/INSTALL @@ -3,6 +3,7 @@ case "$ACTION" in post) if [ "$UPDATE" != "yes" ]; then # actions to execute if package is being installed. + install -d /usr/share/elasticsearch/plugins install -d -m0750 /var/log/elasticsearch install -d -m0750 /var/lib/elasticsearch/data chown -R elastic /etc/elasticsearch diff --git a/srcpkgs/elasticsearch/template b/srcpkgs/elasticsearch/template index cf524df372e..24d277cf78a 100644 --- a/srcpkgs/elasticsearch/template +++ b/srcpkgs/elasticsearch/template @@ -1,41 +1,48 @@ # Template file for 'elasticsearch' pkgname=elasticsearch -version=1.7.3 -revision=2 +version=5.1.2 +revision=1 +wrksrc="elasticsearch-${version}" only_for_archs="i686 x86_64" depends="virtual?java-runtime" short_desc="A distributed, open source search and analytics engine" -maintainer="bougyman " +maintainer="dota? =op " license="Apache-2.0" homepage="http://www.elastic.co" -distfiles="https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${version}.tar.gz" -checksum=af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca +distfiles="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${version}.tar.gz" +checksum=74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 system_accounts="elastic" -conf_files="/etc/elasticsearch/elasticsearch.yml /etc/elasticsearch/logging.yml" +conf_files="/etc/elasticsearch/elasticsearch.yml /etc/elasticsearch/jvm.options /etc/elasticsearch/log4j2.properties" do_install() { - vmkdir usr/bin - vmkdir usr/lib/$pkgname/bin - vmkdir usr/lib/$pkgname/lib/sigar - vmkdir etc/$pkgname + ES="usr/share/elasticsearch" + + rm -f bin/*.{bat,exe} + vmkdir $ES + + vcopy bin $ES + vcopy lib $ES + vcopy modules $ES + vcopy plugins $ES + + vmkdir usr/bin + + ln -sf /$ES/bin/elasticsearch "$DESTDIR/usr/bin" + + vmkdir etc/elasticsearch + vcopy config/* etc/elasticsearch + + ln -sf /etc/elasticsearch "$DESTDIR/$ES/config" + + vmkdir var/lib/elasticsearch/data + ln -sf /var/lib/elasticsearch/data "$DESTDIR/$ES/data" + + vmkdir var/log/elasticsearch + ln -sf /var/log/elasticsearch "$DESTDIR/$ES/logs" - vcopy bin/elasticsearch usr/lib/elasticsearch/bin - vcopy bin/elasticsearch.in.sh usr/lib/elasticsearch/bin - vcopy bin/plugin usr/lib/elasticsearch/bin - vcopy lib/*.jar usr/lib/elasticsearch/lib - vcopy lib/sigar/*.jar usr/lib/elasticsearch/lib/sigar - if [ "$XBPS_TARGET_MACHINE" = "i686" ];then - vcopy lib/sigar/libsigar-x86-linux.so usr/lib/elasticsearch/lib/sigar - else - vcopy lib/sigar/libsigar-amd64-linux.so usr/lib/elasticsearch/lib/sigar - fi - vcopy config/*.yml etc/elasticsearch - ln -s /usr/lib/elasticsearch/bin/elasticsearch ${DESTDIR}/usr/bin/elasticsearch - ln -s /etc/elasticsearch ${DESTDIR}/usr/lib/elasticsearch/config - ln -s /var/lib/elasticsearch/data ${DESTDIR}/usr/lib/elasticsearch/data - ln -s /var/log/elasticsearch ${DESTDIR}/usr/lib/elasticsearch/logs vlicense LICENSE.txt vlicense NOTICE.txt vdoc README.textile + vsv elasticsearch } diff --git a/srcpkgs/elfutils/patches/fix-aarch64_fregs.patch b/srcpkgs/elfutils/patches/fix-aarch64_fregs.patch index 27473317ca6..e9641542144 100644 --- a/srcpkgs/elfutils/patches/fix-aarch64_fregs.patch +++ b/srcpkgs/elfutils/patches/fix-aarch64_fregs.patch @@ -3,15 +3,7 @@ Casting to Dwarf_Word instead of & 0xFFFFFFF should do. --- backends/aarch64_initreg.c 2015-11-27 14:36:29.000000000 +0100 +++ backends/aarch64_initreg.c 2016-08-09 03:47:25.428560159 +0200 -@@ -33,7 +33,6 @@ - #include "system.h" - #include - #ifdef __aarch64__ --# include - # include - # include - /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ -@@ -82,7 +82,7 @@ +@@ -82,7 +83,7 @@ Dwarf_Word dwarf_fregs[32]; for (int r = 0; r < 32; r++) diff --git a/srcpkgs/elfutils/patches/fix-system_h.patch b/srcpkgs/elfutils/patches/fix-system_h.patch new file mode 100644 index 00000000000..e996c29ee5d --- /dev/null +++ b/srcpkgs/elfutils/patches/fix-system_h.patch @@ -0,0 +1,21 @@ +--- lib/crc32_file.c.orig ++++ lib/crc32_file.c +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include "system.h" + + int + crc32_file (int fd, uint32_t *resp) +--- lib/system.h.orig ++++ lib/system.h +@@ -81,7 +81,7 @@ + do \ + __res = expression; \ + while (__res == -1 && errno == EINTR); \ +- __res; }); ++ __res; }) + #endif + + static inline ssize_t __attribute__ ((unused)) diff --git a/srcpkgs/elfutils/patches/musl-cdefs.patch b/srcpkgs/elfutils/patches/musl-cdefs.patch index 042f5cb6ad7..439794df3b6 100644 --- a/srcpkgs/elfutils/patches/musl-cdefs.patch +++ b/srcpkgs/elfutils/patches/musl-cdefs.patch @@ -18,3 +18,13 @@ __BEGIN_DECLS /* Standard ELF types. */ +--- lib/fixedsizehash.h.orig ++++ lib/fixedsizehash.h +@@ -30,7 +30,6 @@ + #include + #include + #include +-#include + + #include + diff --git a/srcpkgs/elfutils/patches/musl-concat.patch b/srcpkgs/elfutils/patches/musl-concat.patch deleted file mode 100644 index b7309f17cf1..00000000000 --- a/srcpkgs/elfutils/patches/musl-concat.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- lib/fixedsizehash.h 2015-08-21 14:22:37.000000000 +0200 -+++ lib/fixedsizehash.h 2015-11-20 05:05:45.648028916 +0100 -@@ -30,12 +30,12 @@ - #include - #include - #include --#include - #include - - #include - --#define CONCAT(t1,t2) __CONCAT (t1,t2) -+#define CONCAT1(x,y) x##y -+#define CONCAT(x,y) CONCAT1(x,y) - - /* Before including this file the following macros must be defined: - diff --git a/srcpkgs/elfutils/patches/musl-fts-obstack.patch b/srcpkgs/elfutils/patches/musl-fts-obstack.patch index cf9c9e48dfa..02a84f1c89b 100644 --- a/srcpkgs/elfutils/patches/musl-fts-obstack.patch +++ b/srcpkgs/elfutils/patches/musl-fts-obstack.patch @@ -88,15 +88,15 @@ +size_LDADD = $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) +strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl +elflint_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl -+findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -+addr2line_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(demanglelib) -+elfcmp_LDADD = $(libebl) $(libelf) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl ++findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) ++addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(demanglelib) ++elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl -size_LDADD = $(libelf) $(libeu) $(argp_LDADD) -strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl -elflint_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl --findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD) --addr2line_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(demanglelib) --elfcmp_LDADD = $(libebl) $(libelf) $(argp_LDADD) -ldl +-findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) +-addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib) +-elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl +ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) +strings_LDADD = $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) diff --git a/srcpkgs/elfutils/patches/musl-rawmemchr.patch b/srcpkgs/elfutils/patches/musl-rawmemchr.patch deleted file mode 100644 index abb26fecdce..00000000000 --- a/srcpkgs/elfutils/patches/musl-rawmemchr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libelf/elf_getarsym.c 2015-10-12 12:22:58.000000000 +0200 -+++ libelf/elf_getarsym.c 2015-11-20 05:01:57.762046695 +0100 -@@ -297,7 +297,7 @@ - arsym[cnt].as_off = (*u32)[cnt]; - - arsym[cnt].as_hash = _dl_elf_hash (str_data); -- str_data = rawmemchr (str_data, '\0') + 1; -+ str_data = memchr (str_data, '\0', SIZE_MAX) + 1; - } - - /* At the end a special entry. */ diff --git a/srcpkgs/elfutils/patches/musl-ssize_t.patch b/srcpkgs/elfutils/patches/musl-ssize_t.patch deleted file mode 100644 index 2f4aecb13a0..00000000000 --- a/srcpkgs/elfutils/patches/musl-ssize_t.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- lib/system.h 2015-08-21 14:22:37.000000000 +0200 -+++ lib/system.h 2015-11-20 04:36:49.563164363 +0100 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #if __BYTE_ORDER == __LITTLE_ENDIAN - # define LE32(n) (n) -@@ -50,6 +50,20 @@ - # error "Unknown byte order" - #endif - -+#if !defined(__GLIBC__) -+ -+/* Evaluate EXPRESSION, and repeat as long as it returns -1 with `errno' -+ set to EINTR. */ -+ -+# define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+ -+#endif -+ - extern void *xmalloc (size_t) __attribute__ ((__malloc__)); - extern void *xcalloc (size_t, size_t) __attribute__ ((__malloc__)); - extern void *xrealloc (void *, size_t) __attribute__ ((__malloc__)); diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index 4a5f8e9c3d8..987935a53f4 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -1,7 +1,7 @@ # Template file for 'elfutils' pkgname=elfutils -version=0.167 -revision=2 +version=0.168 +revision=1 build_style=gnu-configure configure_args="--program-prefix=eu-" hostmakedepends="automake libtool" @@ -9,9 +9,9 @@ makedepends="zlib-devel bzip2-devel liblzma-devel" short_desc="Utilities to handle ELF object files" maintainer="Juan RP " license="GPL-3" -homepage="https://fedorahosted.org/elfutils/" -distfiles="https://fedorahosted.org/releases/e/l/${pkgname}/${version}/${pkgname}-${version}.tar.bz2" -checksum=3f300087c42b6f35591163b48246b4098ce39c4c6f5d55a83023c903c5776553 +homepage="https://sourceware.org/elfutils/" +distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2" +checksum=b88d07893ba1373c7dd69a7855974706d05377766568a7d9002706d5de72c276 # Suppress certain warnings to not fail for -Werror CFLAGS="-Wno-unused-result -Wno-format-nonliteral" diff --git a/srcpkgs/elfutils/update b/srcpkgs/elfutils/update index 607af4db27c..4808d3370c6 100644 --- a/srcpkgs/elfutils/update +++ b/srcpkgs/elfutils/update @@ -1,2 +1,2 @@ -site="https://fedorahosted.org/releases/e/l/${pkgname}" +site="https://sourceware.org/elfutils/ftp/" pattern='[\d.]+(?=/)' diff --git a/srcpkgs/elinks/patches/patch-src_network_ssl_socket.c b/srcpkgs/elinks/patches/patch-src_network_ssl_socket.c new file mode 100644 index 00000000000..66395cd74ed --- /dev/null +++ b/srcpkgs/elinks/patches/patch-src_network_ssl_socket.c @@ -0,0 +1,11 @@ +--- src/network/ssl/socket.c.orig 2017-02-08 12:49:43 UTC ++++ src/network/ssl/socket.c +@@ -67,7 +67,7 @@ static void + ssl_set_no_tls(struct socket *socket) + { + #ifdef CONFIG_OPENSSL +- ((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1; ++ SSL_set_options((ssl_t *) socket->ssl, SSL_OP_NO_TLSv1); + #elif defined(CONFIG_GNUTLS) + { + /* GnuTLS does not support SSLv2 because it is "insecure". diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template index ba47f434b31..cdb51ce842f 100644 --- a/srcpkgs/elinks/template +++ b/srcpkgs/elinks/template @@ -1,7 +1,7 @@ # Template file for 'elinks' pkgname=elinks version=0.12pre6 -revision=14 +revision=15 build_style=gnu-configure configure_args="--enable-true-color --enable-fastmem" hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/elogind/files/007-fix-non_portable_percent_m.patch b/srcpkgs/elogind/files/007-fix-non_portable_percent_m.patch deleted file mode 100644 index 6ce6b44986d..00000000000 --- a/srcpkgs/elogind/files/007-fix-non_portable_percent_m.patch +++ /dev/null @@ -1,1744 +0,0 @@ ---- src/cgroups-agent/cgroups-agent.c 2016-03-06 16:00:52.027398234 +0100 -+++ src/cgroups-agent/cgroups-agent.c 2017-03-04 16:53:10.369345842 +0100 -@@ -44,7 +44,7 @@ - system bus. */ - r = sd_bus_open_system(&bus); - if (r < 0) { -- log_debug_errno(r, "Failed to open system bus: %m"); -+ log_debug_errno(r, "Failed to open system bus: %s", error_str()); - return EXIT_FAILURE; - } - -@@ -54,7 +54,7 @@ - "Released", - "s", argv[1]); - if (r < 0) { -- log_debug_errno(r, "Failed to send signal message: %m"); -+ log_debug_errno(r, "Failed to send signal message: %s", error_str()); - return EXIT_FAILURE; - } - ---- src/libelogind/sd-bus/bus-kernel.c 2015-04-19 13:32:24.607347468 +0200 -+++ src/libelogind/sd-bus/bus-kernel.c 2017-03-04 16:53:10.410345905 +0100 -@@ -1161,7 +1161,7 @@ - - /* Anybody can send us invalid messages, let's just drop them. */ - if (r == -EBADMSG || r == -EPROTOTYPE) -- log_debug_errno(r, "Ignoring invalid synchronous reply: %m"); -+ log_debug_errno(r, "Ignoring invalid synchronous reply: %s", error_str()); - else - return r; - } -@@ -1369,7 +1369,7 @@ - - /* Anybody can send us invalid messages, let's just drop them. */ - if (r == -EBADMSG || r == -EPROTOTYPE) { -- log_debug_errno(r, "Ignoring invalid message: %m"); -+ log_debug_errno(r, "Ignoring invalid message: %s", error_str()); - r = 0; - } - -@@ -1765,14 +1765,14 @@ - - r = get_proc_cmdline_key("kdbus.attach_flags_mask=", &mask); - if (r < 0) -- return log_warning_errno(r, "Failed to read kernel command line: %m"); -+ return log_warning_errno(r, "Failed to read kernel command line: %s", error_str()); - - if (r == 0) { - sprintf(buf, "0x%" PRIx64 "\n", m); - r = write_string_file("/sys/module/kdbus/parameters/attach_flags_mask", buf); - if (r < 0) - return log_full_errno(IN_SET(r, -ENOENT, -EROFS) ? LOG_DEBUG : LOG_WARNING, r, -- "Failed to write kdbus attach mask: %m"); -+ "Failed to write kdbus attach mask: %s", error_str()); - } - - return 0; ---- src/libelogind/sd-bus/bus-track.c 2015-04-19 13:32:24.611347468 +0200 -+++ src/libelogind/sd-bus/bus-track.c 2017-03-04 16:53:10.415345912 +0100 -@@ -308,7 +308,7 @@ - - r = track->handler(track, track->userdata); - if (r < 0) -- log_debug_errno(r, "Failed to process track handler: %m"); -+ log_debug_errno(r, "Failed to process track handler: %s", error_str()); - else if (r == 0) - bus_track_add_to_queue(track); - ---- src/libelogind/sd-bus/bus-util.c 2017-03-04 16:54:39.916484983 +0100 -+++ src/libelogind/sd-bus/bus-util.c 2017-03-04 16:53:10.425345927 +0100 -@@ -1294,11 +1294,11 @@ - #endif - - int bus_log_parse_error(int r) { -- return log_error_errno(r, "Failed to parse bus message: %m"); -+ return log_error_errno(r, "Failed to parse bus message: %s", error_str()); - } - - int bus_log_create_error(int r) { -- return log_error_errno(r, "Failed to create bus message: %m"); -+ return log_error_errno(r, "Failed to create bus message: %s", error_str()); - } - - int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { -@@ -1782,7 +1782,7 @@ - - q = bus_process_wait(d->bus); - if (q < 0) -- return log_error_errno(q, "Failed to wait for response: %m"); -+ return log_error_errno(q, "Failed to wait for response: %s", error_str()); - - if (d->result) { - q = check_wait_response(d, quiet); -@@ -1791,7 +1791,7 @@ - if (q < 0 && r == 0) - r = q; - -- log_debug_errno(q, "Got result %s/%m for job %s", strna(d->result), strna(d->name)); -+ log_debug_errno(q, "Got result %s/%s for job %s", strna(d->result), error_str(), strna(d->name)); - } - - free(d->name); ---- src/libelogind/sd-device/device-private.c 2015-04-19 13:32:24.611347468 +0200 -+++ src/libelogind/sd-device/device-private.c 2017-03-04 16:53:10.363345832 +0100 -@@ -381,43 +381,43 @@ - /* the caller must verify or trust this data (e.g., if it comes from the kernel) */ - r = device_set_syspath(device, path, false); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not set syspath to '%s': %m", path); -+ return log_debug_errno(r, "sd-device: could not set syspath to '%s': %s", path, error_str()); - } else if (streq(key, "SUBSYSTEM")) { - r = device_set_subsystem(device, value); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not set subsystem to '%s': %m", value); -+ return log_debug_errno(r, "sd-device: could not set subsystem to '%s': %s", value, error_str()); - } else if (streq(key, "DEVTYPE")) { - r = device_set_devtype(device, value); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not set devtype to '%s': %m", value); -+ return log_debug_errno(r, "sd-device: could not set devtype to '%s': %s", value, error_str()); - } else if (streq(key, "DEVNAME")) { - r = device_set_devname(device, value); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not set devname to '%s': %m", value); -+ return log_debug_errno(r, "sd-device: could not set devname to '%s': %s", value, error_str()); - } else if (streq(key, "USEC_INITIALIZED")) { - r = device_set_usec_initialized(device, value); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not set usec-initialized to '%s': %m", value); -+ return log_debug_errno(r, "sd-device: could not set usec-initialized to '%s': %s", value, error_str()); - } else if (streq(key, "DRIVER")) { - r = device_set_driver(device, value); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not set driver to '%s': %m", value); -+ return log_debug_errno(r, "sd-device: could not set driver to '%s': %s", value, error_str()); - } else if (streq(key, "IFINDEX")) { - r = device_set_ifindex(device, value); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not set ifindex to '%s': %m", value); -+ return log_debug_errno(r, "sd-device: could not set ifindex to '%s': %s", value, error_str()); - } else if (streq(key, "DEVMODE")) { - r = device_set_devmode(device, value); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not set devmode to '%s': %m", value); -+ return log_debug_errno(r, "sd-device: could not set devmode to '%s': %s", value, error_str()); - } else if (streq(key, "DEVUID")) { - r = device_set_devuid(device, value); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not set devuid to '%s': %m", value); -+ return log_debug_errno(r, "sd-device: could not set devuid to '%s': %s", value, error_str()); - } else if (streq(key, "DEVGID")) { - r = device_set_devgid(device, value); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not set devgid to '%s': %m", value); -+ return log_debug_errno(r, "sd-device: could not set devgid to '%s': %s", value, error_str()); - } else if (streq(key, "DEVLINKS")) { - char *devlinks, *next; - -@@ -428,7 +428,7 @@ - - r = device_add_devlink(device, devlinks); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not add devlink '%s': %m", devlinks); -+ return log_debug_errno(r, "sd-device: could not add devlink '%s': %s", devlinks, error_str()); - - devlinks = next + 1; - } -@@ -442,14 +442,14 @@ - - r = device_add_tag(device, tags); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not add tag '%s': %m", tags); -+ return log_debug_errno(r, "sd-device: could not add tag '%s': %s", tags, error_str()); - - tags = next + 1; - } - } else { - r = device_add_property_internal(device, key, value); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not add property '%s=%s': %m", key, value); -+ return log_debug_errno(r, "sd-device: could not add property '%s=%s': %s", key, value, error_str()); - } - - return 0; -@@ -572,7 +572,7 @@ - if (major) { - r = device_set_devnum(device, major, minor); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not set devnum %s:%s: %m", major, minor); -+ return log_debug_errno(r, "sd-device: could not set devnum %s:%s: %s", major, minor, error_str()); - } - - r = device_verify(device, action, seqnum); -@@ -621,7 +621,7 @@ - if (major) { - r = device_set_devnum(device, major, minor); - if (r < 0) -- return log_debug_errno(r, "sd-device: could not set devnum %s:%s: %m", major, minor); -+ return log_debug_errno(r, "sd-device: could not set devnum %s:%s: %s", major, minor, error_str()); - } - - r = device_verify(device, action, seqnum); ---- src/libelogind/sd-device/sd-device.c 2017-03-04 16:54:39.917484985 +0100 -+++ src/libelogind/sd-device/sd-device.c 2017-03-04 16:53:10.435345943 +0100 -@@ -163,7 +163,7 @@ - /* not a symlink */ - syspath = canonicalize_file_name(_syspath); - if (!syspath) { -- log_debug("sd-device: could not canonicalize '%s': %m", _syspath); -+ log_debug("sd-device: could not canonicalize '%s': %s", _syspath, error_str()); - return -errno; - } - /* ignore errors due to the link not being a symlink */ -@@ -179,7 +179,7 @@ - path = strjoina(syspath, "/uevent"); - r = access(path, F_OK); - if (r < 0) { -- log_debug("sd-device: %s does not have an uevent file: %m", syspath); -+ log_debug("sd-device: %s does not have an uevent file: %s", syspath, error_str()); - return -errno; - } - } else { ---- src/libelogind/sd-event/sd-event.c 2015-04-19 13:32:24.611347468 +0200 -+++ src/libelogind/sd-event/sd-event.c 2017-03-04 16:53:10.448345963 +0100 -@@ -2164,9 +2164,9 @@ - - if (r < 0) { - if (s->description) -- log_debug_errno(r, "Event source '%s' returned error, disabling: %m", s->description); -+ log_debug_errno(r, "Event source '%s' returned error, disabling: %s", s->description, error_str()); - else -- log_debug_errno(r, "Event source %p returned error, disabling: %m", s); -+ log_debug_errno(r, "Event source %p returned error, disabling: %s", s, error_str()); - } - - if (s->n_ref == 0) -@@ -2202,9 +2202,9 @@ - - if (r < 0) { - if (s->description) -- log_debug_errno(r, "Prepare callback of event source '%s' returned error, disabling: %m", s->description); -+ log_debug_errno(r, "Prepare callback of event source '%s' returned error, disabling: %s", s->description, error_str()); - else -- log_debug_errno(r, "Prepare callback of event source %p returned error, disabling: %m", s); -+ log_debug_errno(r, "Prepare callback of event source %p returned error, disabling: %s", s, error_str()); - } - - if (s->n_ref == 0) ---- src/libelogind/sd-rtnl/rtnl-util.c 2015-04-19 13:32:24.615347468 +0200 -+++ src/libelogind/sd-rtnl/rtnl-util.c 2017-03-04 16:53:10.453345970 +0100 -@@ -165,9 +165,9 @@ - } - - int rtnl_log_parse_error(int r) { -- return log_error_errno(r, "Failed to parse netlink message: %m"); -+ return log_error_errno(r, "Failed to parse netlink message: %s", error_str()); - } - - int rtnl_log_create_error(int r) { -- return log_error_errno(r, "Failed to create netlink message: %m"); -+ return log_error_errno(r, "Failed to create netlink message: %s", error_str()); - } ---- src/libelogind/sd-rtnl/sd-rtnl.c 2015-04-19 13:32:24.615347468 +0200 -+++ src/libelogind/sd-rtnl/sd-rtnl.c 2017-03-04 16:53:10.460345981 +0100 -@@ -413,7 +413,7 @@ - - r = c->callback(rtnl, m, c->userdata); - if (r < 0) -- log_debug_errno(r, "sd-rtnl: timedout callback failed: %m"); -+ log_debug_errno(r, "sd-rtnl: timedout callback failed: %s", error_str()); - - free(c); - -@@ -446,7 +446,7 @@ - - r = c->callback(rtnl, m, c->userdata); - if (r < 0) -- log_debug_errno(r, "sd-rtnl: callback failed: %m"); -+ log_debug_errno(r, "sd-rtnl: callback failed: %s", error_str()); - - return 1; - } -@@ -468,7 +468,7 @@ - r = c->callback(rtnl, m, c->userdata); - if (r != 0) { - if (r < 0) -- log_debug_errno(r, "sd-rtnl: match callback failed: %m"); -+ log_debug_errno(r, "sd-rtnl: match callback failed: %s", error_str()); - - break; - } ---- src/login/inhibit.c 2017-03-04 16:54:39.925484998 +0100 -+++ src/login/inhibit.c 2017-03-04 16:53:10.430345935 +0100 -@@ -235,7 +235,7 @@ - - r = sd_bus_default_system(&bus); - if (r < 0) { -- log_error_errno(r, "Failed to connect to bus: %m"); -+ log_error_errno(r, "Failed to connect to bus: %s", error_str()); - return EXIT_FAILURE; - } - -@@ -266,7 +266,7 @@ - - pid = fork(); - if (pid < 0) { -- log_error_errno(errno, "Failed to fork: %m"); -+ log_error_errno(errno, "Failed to fork: %s", error_str()); - return EXIT_FAILURE; - } - -@@ -276,7 +276,7 @@ - close_all_fds(NULL, 0); - - execvp(argv[optind], argv + optind); -- log_error_errno(errno, "Failed to execute %s: %m", argv[optind]); -+ log_error_errno(errno, "Failed to execute %s: %s", argv[optind], error_str()); - _exit(EXIT_FAILURE); - } - ---- src/login/loginctl.c 2017-03-04 16:54:39.925484998 +0100 -+++ src/login/loginctl.c 2017-03-04 16:53:10.484346018 +0100 -@@ -408,7 +408,7 @@ - - r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i); - if (r < 0) -- return log_error_errno(r, "Could not get properties: %m"); -+ return log_error_errno(r, "Could not get properties: %s", error_str()); - - if (*new_line) - printf("\n"); -@@ -537,7 +537,7 @@ - - r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i); - if (r < 0) { -- log_error_errno(r, "Could not get properties: %m"); -+ log_error_errno(r, "Could not get properties: %s", error_str()); - goto finish; - } - -@@ -615,7 +615,7 @@ - - r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i); - if (r < 0) { -- log_error_errno(r, "Could not get properties: %m"); -+ log_error_errno(r, "Could not get properties: %s", error_str()); - goto finish; - } - -@@ -670,7 +670,7 @@ - - r = bus_print_all_properties(bus, "org.freedesktop.login1", path, arg_property, arg_all); - if (r < 0) -- log_error_errno(r, "Could not get properties: %m"); -+ log_error_errno(r, "Could not get properties: %s", error_str()); - - return r; - } -@@ -760,7 +760,7 @@ - - r = get_user_creds((const char**) (argv+i), &uid, NULL, NULL, NULL); - if (r < 0) -- return log_error_errno(r, "Failed to look up user %s: %m", argv[i]); -+ return log_error_errno(r, "Failed to look up user %s: %s", argv[i], error_str()); - - r = sd_bus_call_method( - bus, -@@ -954,7 +954,7 @@ - else { - r = get_user_creds((const char**) (argv+i), &uid, NULL, NULL, NULL); - if (r < 0) -- return log_error_errno(r, "Failed to look up user %s: %m", argv[i]); -+ return log_error_errno(r, "Failed to look up user %s: %s", argv[i], error_str()); - } - - r = sd_bus_call_method( -@@ -989,7 +989,7 @@ - - r = get_user_creds((const char**) (argv+i), &uid, NULL, NULL, NULL); - if (r < 0) -- return log_error_errno(r, "Failed to look up user %s: %m", argv[i]); -+ return log_error_errno(r, "Failed to look up user %s: %s", argv[i], error_str()); - - r = sd_bus_call_method( - bus, -@@ -1026,7 +1026,7 @@ - - r = get_user_creds((const char**) (argv+i), &uid, NULL, NULL, NULL); - if (r < 0) -- return log_error_errno(r, "Failed to look up user %s: %m", argv[i]); -+ return log_error_errno(r, "Failed to look up user %s: %s", argv[i], error_str()); - - r = sd_bus_call_method( - bus, -@@ -1638,7 +1638,7 @@ - - r = bus_open_transport(arg_transport, arg_host, false, &bus); - if (r < 0) { -- log_error_errno(r, "Failed to create bus connection: %m"); -+ log_error_errno(r, "Failed to create bus connection: %s", error_str()); - goto finish; - } - ---- src/login/logind-action.c 2017-03-04 16:54:39.909484972 +0100 -+++ src/login/logind-action.c 2017-03-04 16:53:10.496346036 +0100 -@@ -160,7 +160,7 @@ - static int run_helper(const char *helper) { - int pid = fork(); - if (pid < 0) { -- return log_error_errno(errno, "Failed to fork: %m"); -+ return log_error_errno(errno, "Failed to fork: %s", error_str()); - } - - if (pid == 0) { -@@ -169,7 +169,7 @@ - close_all_fds(NULL, 0); - - execlp(helper, helper, NULL); -- log_error_errno(errno, "Failed to execute %s: %m", helper); -+ log_error_errno(errno, "Failed to execute %s: %s", helper, error_str()); - _exit(EXIT_FAILURE); - } - -@@ -187,14 +187,14 @@ - if (k == 0) - return 0; - -- log_debug_errno(k, "Failed to write '%s' to /sys/power/disk: %m", -- *mode); -+ log_debug_errno(k, "Failed to write '%s' to /sys/power/disk: %s", -+ *mode, error_str()); - if (r == 0) - r = k; - } - - if (r < 0) -- log_error_errno(r, "Failed to write mode to /sys/power/disk: %m"); -+ log_error_errno(r, "Failed to write mode to /sys/power/disk: %s", error_str()); - - return r; - } -@@ -209,15 +209,15 @@ - k = write_string_stream(*f, *state); - if (k == 0) - return 0; -- log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", -- *state); -+ log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %s", -+ *state, error_str()); - if (r == 0) - r = k; - - fclose(*f); - *f = fopen("/sys/power/state", "we"); - if (!*f) -- return log_error_errno(errno, "Failed to open /sys/power/state: %m"); -+ return log_error_errno(errno, "Failed to open /sys/power/state: %s", error_str()); - } - - return r; -@@ -238,7 +238,7 @@ - * we can abort before modifying any state. */ - f = fopen("/sys/power/state", "we"); - if (!f) -- return log_error_errno(errno, "Failed to open /sys/power/state: %m"); -+ return log_error_errno(errno, "Failed to open /sys/power/state: %s", error_str()); - - /* Configure the hibernation mode */ - r = write_mode(modes); ---- src/login/logind-button.c 2015-04-19 13:32:24.639347469 +0200 -+++ src/login/logind-button.c 2017-03-04 16:53:10.490346027 +0100 -@@ -248,17 +248,17 @@ - - b->fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK); - if (b->fd < 0) -- return log_warning_errno(errno, "Failed to open %s: %m", b->name); -+ return log_warning_errno(errno, "Failed to open %s: %s", b->name, error_str()); - - if (ioctl(b->fd, EVIOCGNAME(sizeof(name)), name) < 0) { -- log_error_errno(errno, "Failed to get input name: %m"); -+ log_error_errno(errno, "Failed to get input name: %s", error_str()); - r = -errno; - goto fail; - } - - r = sd_event_add_io(b->manager->event, &b->io_event_source, b->fd, EPOLLIN, button_dispatch, b); - if (r < 0) { -- log_error_errno(r, "Failed to add button event: %m"); -+ log_error_errno(r, "Failed to add button event: %s", error_str()); - goto fail; - } - ---- src/login/logind-core.c 2016-03-06 16:00:52.027398234 +0100 -+++ src/login/logind-core.c 2017-03-04 16:53:10.502346045 +0100 -@@ -500,7 +500,7 @@ - * assume that we are docked. */ - n = manager_count_displays(m); - if (n < 0) -- log_warning_errno(n, "Display counting failed: %m"); -+ log_warning_errno(n, "Display counting failed: %s", error_str()); - else if (n > 1) { - log_debug("Multiple (%i) displays connected.", n); - return true; ---- src/login/logind-dbus.c 2016-03-17 09:22:03.403779113 +0100 -+++ src/login/logind-dbus.c 2017-03-04 16:53:10.510346058 +0100 -@@ -1217,7 +1217,7 @@ - d = opendir("/etc/udev/rules.d"); - if (!d) { - if (errno != ENOENT) -- log_warning_errno(errno, "Failed to open /etc/udev/rules.d: %m"); -+ log_warning_errno(errno, "Failed to open /etc/udev/rules.d: %s", error_str()); - } else { - struct dirent *de; - -@@ -1233,7 +1233,7 @@ - continue; - - if (unlinkat(dirfd(d), de->d_name, 0) < 0) -- log_warning_errno(errno, "Failed to unlink %s: %m", de->d_name); -+ log_warning_errno(errno, "Failed to unlink %s: %s", de->d_name, error_str()); - } - } - ---- src/login/logind-inhibit.c 2015-04-19 13:32:24.643347470 +0200 -+++ src/login/logind-inhibit.c 2017-03-04 16:53:10.466345990 +0100 -@@ -137,7 +137,7 @@ - - finish: - if (r < 0) -- log_error_errno(r, "Failed to save inhibit data %s: %m", i->state_file); -+ log_error_errno(r, "Failed to save inhibit data %s: %s", i->state_file, error_str()); - - return r; - } ---- src/login/logind-seat.c 2015-08-23 11:10:58.890333172 +0200 -+++ src/login/logind-seat.c 2017-03-04 16:53:10.515346065 +0100 -@@ -149,7 +149,7 @@ - - finish: - if (r < 0) -- log_error_errno(r, "Failed to save seat data %s: %m", s->state_file); -+ log_error_errno(r, "Failed to save seat data %s: %s", s->state_file, error_str()); - - return r; - } -@@ -188,7 +188,7 @@ - !!s->active, s->active ? s->active->user->uid : 0); - - if (r < 0) -- log_error_errno(r, "Failed to apply ACLs: %m"); -+ log_error_errno(r, "Failed to apply ACLs: %s", error_str()); - - return r; - } ---- src/login/logind-session.c 2016-03-06 16:00:52.103398185 +0100 -+++ src/login/logind-session.c 2017-03-04 16:53:10.474346002 +0100 -@@ -278,7 +278,7 @@ - - finish: - if (r < 0) -- log_error_errno(r, "Failed to save session data %s: %m", s->state_file); -+ log_error_errno(r, "Failed to save session data %s: %s", s->state_file, error_str()); - - return r; - } -@@ -324,7 +324,7 @@ - NULL); - - if (r < 0) -- return log_error_errno(r, "Failed to read %s: %m", s->state_file); -+ return log_error_errno(r, "Failed to read %s: %s", s->state_file, error_str()); - - if (!s->user) { - uid_t u; -@@ -487,11 +487,11 @@ - /* First, create our own group */ - r = cg_create(SYSTEMD_CGROUP_CONTROLLER, s->id); - if (r < 0) -- return log_error_errno(r, "Failed to create cgroup %s: %m", s->id); -+ return log_error_errno(r, "Failed to create cgroup %s: %s", s->id, error_str()); - - r = cg_attach(SYSTEMD_CGROUP_CONTROLLER, s->id, s->leader); - if (r < 0) -- log_warning_errno(r, "Failed to attach PID %d to cgroup %s: %m", s->leader, s->id); -+ log_warning_errno(r, "Failed to attach PID %d to cgroup %s: %s", s->leader, s->id, error_str()); - - return 0; - } -@@ -899,7 +899,7 @@ - /* FIXME: verify that leader is in cgroup? */ - - if (kill(s->leader, signo) < 0) { -- return log_error_errno(errno, "Failed to kill process leader %d for session %s: %m", s->leader, s->id); -+ return log_error_errno(errno, "Failed to kill process leader %d for session %s: %s", s->leader, s->id, error_str()); - } - return 0; - } else { -@@ -923,7 +923,7 @@ - sprintf(path, "/dev/tty%u", s->vtnr); - s->vtfd = open(path, O_RDWR | O_CLOEXEC | O_NONBLOCK | O_NOCTTY); - if (s->vtfd < 0) -- return log_error_errno(errno, "cannot open VT %s of session %s: %m", path, s->id); -+ return log_error_errno(errno, "cannot open VT %s of session %s: %s", path, s->id, error_str()); - - return s->vtfd; - } -@@ -942,21 +942,21 @@ - r = fchown(vt, s->user->uid, -1); - if (r < 0) { - r = -errno; -- log_error_errno(errno, "Cannot change owner of /dev/tty%u: %m", s->vtnr); -+ log_error_errno(errno, "Cannot change owner of /dev/tty%u: %s", s->vtnr, error_str()); - goto error; - } - - r = ioctl(vt, KDSKBMODE, K_OFF); - if (r < 0) { - r = -errno; -- log_error_errno(errno, "Cannot set K_OFF on /dev/tty%u: %m", s->vtnr); -+ log_error_errno(errno, "Cannot set K_OFF on /dev/tty%u: %s", s->vtnr, error_str()); - goto error; - } - - r = ioctl(vt, KDSETMODE, KD_GRAPHICS); - if (r < 0) { - r = -errno; -- log_error_errno(errno, "Cannot set KD_GRAPHICS on /dev/tty%u: %m", s->vtnr); -+ log_error_errno(errno, "Cannot set KD_GRAPHICS on /dev/tty%u: %s", s->vtnr, error_str()); - goto error; - } - -@@ -969,7 +969,7 @@ - r = ioctl(vt, VT_SETMODE, &mode); - if (r < 0) { - r = -errno; -- log_error_errno(errno, "Cannot set VT_PROCESS on /dev/tty%u: %m", s->vtnr); -+ log_error_errno(errno, "Cannot set VT_PROCESS on /dev/tty%u: %s", s->vtnr, error_str()); - goto error; - } - -@@ -1026,7 +1026,7 @@ - session_device_pause_all(s); - r = ioctl(s->vtfd, VT_RELDISP, 1); - if (r < 0) -- log_debug_errno(errno, "Cannot release VT of session %s: %m", s->id); -+ log_debug_errno(errno, "Cannot release VT of session %s: %s", s->id, error_str()); - } - - bool session_is_controller(Session *s, const char *sender) { ---- src/login/logind-user.c 2016-03-06 16:00:52.031398232 +0100 -+++ src/login/logind-user.c 2017-03-04 16:53:10.529346087 +0100 -@@ -228,7 +228,7 @@ - - finish: - if (r < 0) -- log_error_errno(r, "Failed to save user data %s: %m", u->state_file); -+ log_error_errno(r, "Failed to save user data %s: %s", u->state_file, error_str()); - - return r; - } -@@ -250,7 +250,7 @@ - if (r == -ENOENT) - return 0; - -- log_error_errno(r, "Failed to read %s: %m", u->state_file); -+ log_error_errno(r, "Failed to read %s: %s", u->state_file, error_str()); - return r; - } - -@@ -283,7 +283,7 @@ - - r = mkdir_safe_label("/run/user", 0755, 0, 0); - if (r < 0) -- return log_error_errno(r, "Failed to create /run/user: %m"); -+ return log_error_errno(r, "Failed to create /run/user: %s", error_str()); - - if (!u->runtime_path) { - if (asprintf(&p, "/run/user/" UID_FMT, u->uid) < 0) -@@ -308,7 +308,7 @@ - r = mount("tmpfs", p, "tmpfs", MS_NODEV|MS_NOSUID, t); - if (r < 0) { - if (errno != EPERM) { -- r = log_error_errno(errno, "Failed to mount per-user tmpfs directory %s: %m", p); -+ r = log_error_errno(errno, "Failed to mount per-user tmpfs directory %s: %s", p, error_str()); - goto fail; - } - -@@ -318,7 +318,7 @@ - - r = chmod_and_chown(p, 0700, u->uid, u->gid); - if (r < 0) { -- log_error_errno(r, "Failed to change runtime directory ownership and mode: %m"); -+ log_error_errno(r, "Failed to change runtime directory ownership and mode: %s", error_str()); - goto fail; - } - } -@@ -376,18 +376,18 @@ - - r = rm_rf(u->runtime_path, false, false, false); - if (r < 0) -- log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path); -+ log_error_errno(r, "Failed to remove runtime directory %s: %s", u->runtime_path, error_str()); - - /* Ignore cases where the directory isn't mounted, as that's - * quite possible, if we lacked the permissions to mount - * something */ - r = umount2(u->runtime_path, MNT_DETACH); - if (r < 0 && errno != EINVAL && errno != ENOENT) -- log_error_errno(errno, "Failed to unmount user runtime directory %s: %m", u->runtime_path); -+ log_error_errno(errno, "Failed to unmount user runtime directory %s: %s", u->runtime_path, error_str()); - - r = rm_rf(u->runtime_path, false, true, false); - if (r < 0) -- log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path); -+ log_error_errno(r, "Failed to remove runtime directory %s: %s", u->runtime_path, error_str()); - - free(u->runtime_path); - u->runtime_path = NULL; ---- src/login/logind.c 2016-03-06 16:00:52.031398232 +0100 -+++ src/login/logind.c 2017-03-04 16:53:10.399345888 +0100 -@@ -302,7 +302,7 @@ - if (errno == ENOENT) - return 0; - -- log_error_errno(errno, "Failed to open /run/systemd/seats: %m"); -+ log_error_errno(errno, "Failed to open /run/systemd/seats: %s", error_str()); - return -errno; - } - -@@ -339,7 +339,7 @@ - if (errno == ENOENT) - return 0; - -- log_error_errno(errno, "Failed to open /var/lib/systemd/linger/: %m"); -+ log_error_errno(errno, "Failed to open /var/lib/systemd/linger/: %s", error_str()); - return -errno; - } - -@@ -351,7 +351,7 @@ - - k = manager_add_user_by_name(m, de->d_name, NULL); - if (k < 0) { -- log_notice_errno(k, "Couldn't add lingering user %s: %m", de->d_name); -+ log_notice_errno(k, "Couldn't add lingering user %s: %s", de->d_name, error_str()); - r = k; - } - } -@@ -375,7 +375,7 @@ - if (errno == ENOENT) - return 0; - -- log_error_errno(errno, "Failed to open /run/systemd/users: %m"); -+ log_error_errno(errno, "Failed to open /run/systemd/users: %s", error_str()); - return -errno; - } - -@@ -387,7 +387,7 @@ - - k = manager_add_user_by_name(m, de->d_name, &u); - if (k < 0) { -- log_error_errno(k, "Failed to add user by file name %s: %m", de->d_name); -+ log_error_errno(k, "Failed to add user by file name %s: %s", de->d_name, error_str()); - - r = k; - continue; -@@ -416,7 +416,7 @@ - if (errno == ENOENT) - return 0; - -- log_error_errno(errno, "Failed to open /run/systemd/sessions: %m"); -+ log_error_errno(errno, "Failed to open /run/systemd/sessions: %s", error_str()); - return -errno; - } - -@@ -435,7 +435,7 @@ - - k = manager_add_session(m, de->d_name, &s); - if (k < 0) { -- log_error_errno(k, "Failed to add session by file name %s: %m", de->d_name); -+ log_error_errno(k, "Failed to add session by file name %s: %s", de->d_name, error_str()); - - r = k; - continue; -@@ -463,7 +463,7 @@ - if (errno == ENOENT) - return 0; - -- log_error_errno(errno, "Failed to open /run/systemd/inhibit: %m"); -+ log_error_errno(errno, "Failed to open /run/systemd/inhibit: %s", error_str()); - return -errno; - } - -@@ -476,7 +476,7 @@ - - k = manager_add_inhibitor(m, de->d_name, &i); - if (k < 0) { -- log_notice_errno(k, "Couldn't add inhibitor %s: %m", de->d_name); -+ log_notice_errno(k, "Couldn't add inhibitor %s: %s", de->d_name, error_str()); - r = k; - continue; - } -@@ -580,11 +580,11 @@ - - r = sd_bus_default_system(&m->bus); - if (r < 0) -- return log_error_errno(r, "Failed to connect to system bus: %m"); -+ return log_error_errno(r, "Failed to connect to system bus: %s", error_str()); - - r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/login1", "org.freedesktop.login1.Manager", manager_vtable, m); - if (r < 0) -- return log_error_errno(r, "Failed to add manager object vtable: %m"); -+ return log_error_errno(r, "Failed to add manager object vtable: %s", error_str()); - - r = sd_bus_add_match(m->bus, NULL, - "type='signal'," -@@ -595,35 +595,35 @@ - - r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/seat", "org.freedesktop.login1.Seat", seat_vtable, seat_object_find, m); - if (r < 0) -- return log_error_errno(r, "Failed to add seat object vtable: %m"); -+ return log_error_errno(r, "Failed to add seat object vtable: %s", error_str()); - - r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/seat", seat_node_enumerator, m); - if (r < 0) -- return log_error_errno(r, "Failed to add seat enumerator: %m"); -+ return log_error_errno(r, "Failed to add seat enumerator: %s", error_str()); - - r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/session", "org.freedesktop.login1.Session", session_vtable, session_object_find, m); - if (r < 0) -- return log_error_errno(r, "Failed to add session object vtable: %m"); -+ return log_error_errno(r, "Failed to add session object vtable: %s", error_str()); - - r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/session", session_node_enumerator, m); - if (r < 0) -- return log_error_errno(r, "Failed to add session enumerator: %m"); -+ return log_error_errno(r, "Failed to add session enumerator: %s", error_str()); - - r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/user", "org.freedesktop.login1.User", user_vtable, user_object_find, m); - if (r < 0) -- return log_error_errno(r, "Failed to add user object vtable: %m"); -+ return log_error_errno(r, "Failed to add user object vtable: %s", error_str()); - - r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/user", user_node_enumerator, m); - if (r < 0) -- return log_error_errno(r, "Failed to add user enumerator: %m"); -+ return log_error_errno(r, "Failed to add user enumerator: %s", error_str()); - - r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0); - if (r < 0) -- return log_error_errno(r, "Failed to register name: %m"); -+ return log_error_errno(r, "Failed to register name: %s", error_str()); - - r = sd_bus_attach_event(m->bus, m->event, 0); - if (r < 0) -- return log_error_errno(r, "Failed to attach bus to event loop: %m"); -+ return log_error_errno(r, "Failed to attach bus to event loop: %s", error_str()); - - return 0; - } -@@ -681,7 +681,7 @@ - - r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 0, &m->cgroup_root); - if (r < 0) -- return log_error_errno(r, "Cannot determine cgroup we are running in: %m"); -+ return log_error_errno(r, "Cannot determine cgroup we are running in: %s", error_str()); - - /* Make sure to store away the root value without trailing - * slash, even for the root dir, so that we can easily prepend -@@ -692,14 +692,14 @@ - /* 2. Show data */ - r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, NULL, &path); - if (r < 0) -- return log_error_errno(r, "Cannot find cgroup mount point: %m"); -+ return log_error_errno(r, "Cannot find cgroup mount point: %s", error_str()); - - log_debug("Using cgroup controller " SYSTEMD_CGROUP_CONTROLLER ". File system hierarchy is at %s.", path); - - /* 3. Install agent */ - r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUP_AGENT_PATH); - if (r < 0) -- log_warning_errno(r, "Failed to install release agent, ignoring: %m"); -+ log_warning_errno(r, "Failed to install release agent, ignoring: %s", error_str()); - else if (r > 0) - log_debug("Installed release agent."); - else -@@ -708,14 +708,14 @@ - /* 4. Make sure we are in the root cgroup */ - r = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, 0); - if (r < 0) -- return log_error_errno(r, "Failed to create root cgroup hierarchy: %m"); -+ return log_error_errno(r, "Failed to create root cgroup hierarchy: %s", error_str()); - - /* 5. And pin it, so that it cannot be unmounted */ - safe_close(m->pin_cgroupfs_fd); - - m->pin_cgroupfs_fd = open(path, O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY|O_NONBLOCK); - if (m->pin_cgroupfs_fd < 0) -- return log_error_errno(errno, "Failed to open pin file: %m"); -+ return log_error_errno(errno, "Failed to open pin file: %s", error_str()); - - return 0; - } -@@ -740,7 +740,7 @@ - if (errno == ENOENT) - return 0; - -- log_error_errno(errno, "Failed to open /sys/class/tty/tty0/active: %m"); -+ log_error_errno(errno, "Failed to open /sys/class/tty/tty0/active: %s", error_str()); - return -errno; - } - -@@ -764,11 +764,11 @@ - - r = ignore_signals(SIGRTMIN + 1, -1); - if (r < 0) -- return log_error_errno(r, "Cannot ignore SIGRTMIN + 1: %m"); -+ return log_error_errno(r, "Cannot ignore SIGRTMIN + 1: %s", error_str()); - - r = sigprocmask_many(SIG_BLOCK, SIGRTMIN, -1); - if (r < 0) -- return log_error_errno(r, "Cannot block SIGRTMIN: %m"); -+ return log_error_errno(r, "Cannot block SIGRTMIN: %s", error_str()); - - r = sd_event_add_signal(m->event, NULL, SIGRTMIN, manager_vt_switch, m); - if (r < 0) -@@ -950,19 +950,19 @@ - elapse, USEC_PER_SEC*30, - manager_dispatch_idle_action, m); - if (r < 0) -- return log_error_errno(r, "Failed to add idle event source: %m"); -+ return log_error_errno(r, "Failed to add idle event source: %s", error_str()); - - r = sd_event_source_set_priority(m->idle_action_event_source, SD_EVENT_PRIORITY_IDLE+10); - if (r < 0) -- return log_error_errno(r, "Failed to set idle event source priority: %m"); -+ return log_error_errno(r, "Failed to set idle event source priority: %s", error_str()); - } else { - r = sd_event_source_set_time(m->idle_action_event_source, elapse); - if (r < 0) -- return log_error_errno(r, "Failed to set idle event timer: %m"); -+ return log_error_errno(r, "Failed to set idle event timer: %s", error_str()); - - r = sd_event_source_set_enabled(m->idle_action_event_source, SD_EVENT_ONESHOT); - if (r < 0) -- return log_error_errno(r, "Failed to enable idle event timer: %m"); -+ return log_error_errno(r, "Failed to enable idle event timer: %s", error_str()); - } - - return 0; -@@ -992,7 +992,7 @@ - /* Connect to udev */ - r = manager_connect_udev(m); - if (r < 0) -- return log_error_errno(r, "Failed to create udev watchers: %m"); -+ return log_error_errno(r, "Failed to create udev watchers: %s", error_str()); - - /* Connect to the bus */ - r = manager_connect_bus(m); -@@ -1002,36 +1002,36 @@ - /* Instantiate magic seat 0 */ - r = manager_add_seat(m, "seat0", &m->seat0); - if (r < 0) -- return log_error_errno(r, "Failed to add seat0: %m"); -+ return log_error_errno(r, "Failed to add seat0: %s", error_str()); - - r = manager_set_lid_switch_ignore(m, 0 + m->holdoff_timeout_usec); - if (r < 0) -- log_warning_errno(r, "Failed to set up lid switch ignore event source: %m"); -+ log_warning_errno(r, "Failed to set up lid switch ignore event source: %s", error_str()); - - /* Deserialize state */ - r = manager_enumerate_devices(m); - if (r < 0) -- log_warning_errno(r, "Device enumeration failed: %m"); -+ log_warning_errno(r, "Device enumeration failed: %s", error_str()); - - r = manager_enumerate_seats(m); - if (r < 0) -- log_warning_errno(r, "Seat enumeration failed: %m"); -+ log_warning_errno(r, "Seat enumeration failed: %s", error_str()); - - r = manager_enumerate_users(m); - if (r < 0) -- log_warning_errno(r, "User enumeration failed: %m"); -+ log_warning_errno(r, "User enumeration failed: %s", error_str()); - - r = manager_enumerate_sessions(m); - if (r < 0) -- log_warning_errno(r, "Session enumeration failed: %m"); -+ log_warning_errno(r, "Session enumeration failed: %s", error_str()); - - r = manager_enumerate_inhibitors(m); - if (r < 0) -- log_warning_errno(r, "Inhibitor enumeration failed: %m"); -+ log_warning_errno(r, "Inhibitor enumeration failed: %s", error_str()); - - r = manager_enumerate_buttons(m); - if (r < 0) -- log_warning_errno(r, "Button enumeration failed: %m"); -+ log_warning_errno(r, "Button enumeration failed: %s", error_str()); - - /* Remove stale objects before we start them */ - manager_gc(m, false); -@@ -1150,7 +1150,7 @@ - - r = manager_startup(m); - if (r < 0) { -- log_error_errno(r, "Failed to fully start up daemon: %m"); -+ log_error_errno(r, "Failed to fully start up daemon: %s", error_str()); - goto finish; - } - ---- src/login/pam_elogind.c 2015-08-15 22:14:07.531421465 +0200 -+++ src/login/pam_elogind.c 2017-03-04 16:53:10.534346094 +0100 -@@ -473,7 +473,7 @@ - if (session_fd >= 0) { - session_fd = fcntl(session_fd, F_DUPFD_CLOEXEC, 3); - if (session_fd < 0) { -- pam_syslog(handle, LOG_ERR, "Failed to dup session fd: %m"); -+ pam_syslog(handle, LOG_ERR, "Failed to dup session fd: %s", error_str()); - return PAM_SESSION_ERR; - } - ---- src/shared/base-filesystem.c 2015-04-19 13:32:24.655347470 +0200 -+++ src/shared/base-filesystem.c 2017-03-04 16:53:10.541346105 +0100 -@@ -54,7 +54,7 @@ - - fd = open(root, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW); - if (fd < 0) -- return log_error_errno(errno, "Failed to open root file system: %m"); -+ return log_error_errno(errno, "Failed to open root file system: %s", error_str()); - - for (i = 0; i < ELEMENTSOF(table); i ++) { - if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0) -@@ -89,14 +89,14 @@ - - r = symlinkat(target, fd, table[i].dir); - if (r < 0 && errno != EEXIST) -- return log_error_errno(errno, "Failed to create symlink at %s/%s: %m", root, table[i].dir); -+ return log_error_errno(errno, "Failed to create symlink at %s/%s: %s", root, table[i].dir, error_str()); - continue; - } - - RUN_WITH_UMASK(0000) - r = mkdirat(fd, table[i].dir, table[i].mode); - if (r < 0 && errno != EEXIST) -- return log_error_errno(errno, "Failed to create directory at %s/%s: %m", root, table[i].dir); -+ return log_error_errno(errno, "Failed to create directory at %s/%s: %s", root, table[i].dir, error_str()); - } - - return 0; ---- src/shared/capability.c 2015-04-19 13:32:24.655347470 +0200 -+++ src/shared/capability.c 2017-03-04 16:53:10.525346081 +0100 -@@ -237,26 +237,26 @@ - * which we want to avoid. */ - - if (setresgid(gid, gid, gid) < 0) -- return log_error_errno(errno, "Failed to change group ID: %m"); -+ return log_error_errno(errno, "Failed to change group ID: %s", error_str()); - - if (setgroups(0, NULL) < 0) -- return log_error_errno(errno, "Failed to drop auxiliary groups list: %m"); -+ return log_error_errno(errno, "Failed to drop auxiliary groups list: %s", error_str()); - - /* Ensure we keep the permitted caps across the setresuid() */ - if (prctl(PR_SET_KEEPCAPS, 1) < 0) -- return log_error_errno(errno, "Failed to enable keep capabilities flag: %m"); -+ return log_error_errno(errno, "Failed to enable keep capabilities flag: %s", error_str()); - - r = setresuid(uid, uid, uid); - if (r < 0) -- return log_error_errno(errno, "Failed to change user ID: %m"); -+ return log_error_errno(errno, "Failed to change user ID: %s", error_str()); - - if (prctl(PR_SET_KEEPCAPS, 0) < 0) -- return log_error_errno(errno, "Failed to disable keep capabilities flag: %m"); -+ return log_error_errno(errno, "Failed to disable keep capabilities flag: %s", error_str()); - - /* Drop all caps from the bounding set, except the ones we want */ - r = capability_bounding_set_drop(~keep_capabilities, true); - if (r < 0) -- return log_error_errno(r, "Failed to drop capabilities: %m"); -+ return log_error_errno(r, "Failed to drop capabilities: %s", error_str()); - - /* Now upgrade the permitted caps we still kept to effective caps */ - d = cap_init(); -@@ -277,12 +277,12 @@ - - if (cap_set_flag(d, CAP_EFFECTIVE, j, bits, CAP_SET) < 0 || - cap_set_flag(d, CAP_PERMITTED, j, bits, CAP_SET) < 0) { -- log_error_errno(errno, "Failed to enable capabilities bits: %m"); -+ log_error_errno(errno, "Failed to enable capabilities bits: %s", error_str()); - return -errno; - } - - if (cap_set_proc(d) < 0) -- return log_error_errno(errno, "Failed to increase capabilities: %m"); -+ return log_error_errno(errno, "Failed to increase capabilities: %s", error_str()); - } - - return 0; ---- src/shared/clean-ipc.c 2015-04-19 13:32:24.655347470 +0200 -+++ src/shared/clean-ipc.c 2017-03-04 16:53:10.545346111 +0100 -@@ -43,7 +43,7 @@ - if (errno == ENOENT) - return 0; - -- log_warning_errno(errno, "Failed to open /proc/sysvipc/shm: %m"); -+ log_warning_errno(errno, "Failed to open /proc/sysvipc/shm: %s", error_str()); - return -errno; - } - -@@ -77,7 +77,7 @@ - if (errno == EIDRM || errno == EINVAL) - continue; - -- log_warning_errno(errno, "Failed to remove SysV shared memory segment %i: %m", shmid); -+ log_warning_errno(errno, "Failed to remove SysV shared memory segment %i: %s", shmid, error_str()); - ret = -errno; - } - } -@@ -85,7 +85,7 @@ - return ret; - - fail: -- log_warning_errno(errno, "Failed to read /proc/sysvipc/shm: %m"); -+ log_warning_errno(errno, "Failed to read /proc/sysvipc/shm: %s", error_str()); - return -errno; - } - -@@ -100,7 +100,7 @@ - if (errno == ENOENT) - return 0; - -- log_warning_errno(errno, "Failed to open /proc/sysvipc/sem: %m"); -+ log_warning_errno(errno, "Failed to open /proc/sysvipc/sem: %s", error_str()); - return -errno; - } - -@@ -129,7 +129,7 @@ - if (errno == EIDRM || errno == EINVAL) - continue; - -- log_warning_errno(errno, "Failed to remove SysV semaphores object %i: %m", semid); -+ log_warning_errno(errno, "Failed to remove SysV semaphores object %i: %s", semid, error_str()); - ret = -errno; - } - } -@@ -137,7 +137,7 @@ - return ret; - - fail: -- log_warning_errno(errno, "Failed to read /proc/sysvipc/sem: %m"); -+ log_warning_errno(errno, "Failed to read /proc/sysvipc/sem: %s", error_str()); - return -errno; - } - -@@ -152,7 +152,7 @@ - if (errno == ENOENT) - return 0; - -- log_warning_errno(errno, "Failed to open /proc/sysvipc/msg: %m"); -+ log_warning_errno(errno, "Failed to open /proc/sysvipc/msg: %s", error_str()); - return -errno; - } - -@@ -182,7 +182,7 @@ - if (errno == EIDRM || errno == EINVAL) - continue; - -- log_warning_errno(errno, "Failed to remove SysV message queue %i: %m", msgid); -+ log_warning_errno(errno, "Failed to remove SysV message queue %i: %s", msgid, error_str()); - ret = -errno; - } - } -@@ -190,7 +190,7 @@ - return ret; - - fail: -- log_warning_errno(errno, "Failed to read /proc/sysvipc/msg: %m"); -+ log_warning_errno(errno, "Failed to read /proc/sysvipc/msg: %s", error_str()); - return -errno; - } - -@@ -210,7 +210,7 @@ - if (errno == ENOENT) - continue; - -- log_warning_errno(errno, "Failed to stat() POSIX shared memory segment %s: %m", de->d_name); -+ log_warning_errno(errno, "Failed to stat() POSIX shared memory segment %s: %s", de->d_name, error_str()); - ret = -errno; - continue; - } -@@ -224,7 +224,7 @@ - kid = xopendirat(dirfd(dir), de->d_name, O_NOFOLLOW|O_NOATIME); - if (!kid) { - if (errno != ENOENT) { -- log_warning_errno(errno, "Failed to enter shared memory directory %s: %m", de->d_name); -+ log_warning_errno(errno, "Failed to enter shared memory directory %s: %s", de->d_name, error_str()); - ret = -errno; - } - } else { -@@ -238,7 +238,7 @@ - if (errno == ENOENT) - continue; - -- log_warning_errno(errno, "Failed to remove POSIX shared memory directory %s: %m", de->d_name); -+ log_warning_errno(errno, "Failed to remove POSIX shared memory directory %s: %s", de->d_name, error_str()); - ret = -errno; - } - } else { -@@ -248,7 +248,7 @@ - if (errno == ENOENT) - continue; - -- log_warning_errno(errno, "Failed to remove POSIX shared memory segment %s: %m", de->d_name); -+ log_warning_errno(errno, "Failed to remove POSIX shared memory segment %s: %s", de->d_name, error_str()); - ret = -errno; - } - } -@@ -257,7 +257,7 @@ - return ret; - - fail: -- log_warning_errno(errno, "Failed to read /dev/shm: %m"); -+ log_warning_errno(errno, "Failed to read /dev/shm: %s", error_str()); - return -errno; - } - -@@ -269,7 +269,7 @@ - if (errno == ENOENT) - return 0; - -- log_warning_errno(errno, "Failed to open /dev/shm: %m"); -+ log_warning_errno(errno, "Failed to open /dev/shm: %s", error_str()); - return -errno; - } - -@@ -286,7 +286,7 @@ - if (errno == ENOENT) - return 0; - -- log_warning_errno(errno, "Failed to open /dev/mqueue: %m"); -+ log_warning_errno(errno, "Failed to open /dev/mqueue: %s", error_str()); - return -errno; - } - -@@ -301,7 +301,7 @@ - if (errno == ENOENT) - continue; - -- log_warning_errno(errno, "Failed to stat() MQ segment %s: %m", de->d_name); -+ log_warning_errno(errno, "Failed to stat() MQ segment %s: %s", de->d_name, error_str()); - ret = -errno; - continue; - } -@@ -316,7 +316,7 @@ - if (errno == ENOENT) - continue; - -- log_warning_errno(errno, "Failed to unlink POSIX message queue %s: %m", fn); -+ log_warning_errno(errno, "Failed to unlink POSIX message queue %s: %s", fn, error_str()); - ret = -errno; - } - } -@@ -324,7 +324,7 @@ - return ret; - - fail: -- log_warning_errno(errno, "Failed to read /dev/mqueue: %m"); -+ log_warning_errno(errno, "Failed to read /dev/mqueue: %s", error_str()); - return -errno; - } - ---- src/shared/conf-files.c 2015-04-19 13:32:24.655347470 +0200 -+++ src/shared/conf-files.c 2017-03-04 16:53:10.551346120 +0100 -@@ -115,8 +115,8 @@ - if (r == -ENOMEM) { - return r; - } else if (r < 0) -- log_debug_errno(r, "Failed to search for files in %s: %m", -- *p); -+ log_debug_errno(r, "Failed to search for files in %s: %s", -+ *p, error_str()); - } - - files = hashmap_get_strv(fh); ---- src/shared/conf-parser.c 2015-04-19 13:32:24.655347470 +0200 -+++ src/shared/conf-parser.c 2017-03-04 16:53:10.557346130 +0100 -@@ -348,7 +348,7 @@ - * since we return 0 to the caller. */ - if (warn || errno == ENOENT) - log_full(errno == ENOENT ? LOG_DEBUG : LOG_ERR, -- "Failed to open configuration file '%s': %m", filename); -+ "Failed to open configuration file '%s': %s", filename, error_str()); - return errno == ENOENT ? 0 : -errno; - } - } -@@ -363,7 +363,7 @@ - if (feof(f)) - break; - -- log_error_errno(errno, "Failed to read configuration file '%s': %m", filename); -+ log_error_errno(errno, "Failed to read configuration file '%s': %s", filename, error_str()); - return -errno; - } - -@@ -424,8 +424,8 @@ - - if (r < 0) { - if (warn) -- log_warning_errno(r, "Failed to parse file '%s': %m", -- filename); -+ log_warning_errno(r, "Failed to parse file '%s': %s", -+ filename, error_str()); - return r; - } - } ---- src/shared/log.c 2017-03-04 16:54:39.918484986 +0100 -+++ src/shared/log.c 2017-03-04 16:53:39.829390976 +0100 -@@ -1066,3 +1066,15 @@ - void log_set_upgrade_syslog_to_journal(bool b) { - upgrade_syslog_to_journal = b; - } -+ -+const char* error_str(void) { -+ static __thread char msg[512]; -+ int error = errno; -+ int res = strerror_r(error, msg, sizeof(msg)); -+ if (res < 0) -+ snprintf(msg, sizeof(msg), "strerror_r(%d,%p,%d) failed", error, msg, (int)sizeof(msg)); -+ /* Make sure to restore the previous error */ -+ if (error != 0) -+ errno = error; -+ return msg; -+} ---- src/shared/log.h 2015-04-19 13:32:24.659347470 +0200 -+++ src/shared/log.h 2017-03-04 16:53:16.547355307 +0100 -@@ -209,3 +209,5 @@ - void log_received_signal(int level, const struct signalfd_siginfo *si); - - void log_set_upgrade_syslog_to_journal(bool b); -+ -+const char* error_str(void); ---- src/shared/pager.c 2017-03-04 16:54:39.918484986 +0100 -+++ src/shared/pager.c 2017-03-04 16:53:10.375345851 +0100 -@@ -40,7 +40,7 @@ - } while (n > 0); - - if (n < 0) { -- log_error_errno(errno, "Internal pager failed: %m"); -+ log_error_errno(errno, "Internal pager failed: %s", error_str()); - _exit(EXIT_FAILURE); - } - -@@ -68,14 +68,14 @@ - columns(); - - if (pipe(fd) < 0) -- return log_error_errno(errno, "Failed to create pager pipe: %m"); -+ return log_error_errno(errno, "Failed to create pager pipe: %s", error_str()); - - parent_pid = getpid(); - - pager_pid = fork(); - if (pager_pid < 0) { - r = -errno; -- log_error_errno(errno, "Failed to fork pager: %m"); -+ log_error_errno(errno, "Failed to fork pager: %s", error_str()); - safe_close_pair(fd); - return r; - } -@@ -125,7 +125,7 @@ - - /* Return in the parent */ - if (dup2(fd[1], STDOUT_FILENO) < 0) -- return log_error_errno(errno, "Failed to duplicate pager pipe: %m"); -+ return log_error_errno(errno, "Failed to duplicate pager pipe: %s", error_str()); - - safe_close_pair(fd); - return 1; -@@ -173,20 +173,20 @@ - - pid = fork(); - if (pid < 0) -- return log_error_errno(errno, "Failed to fork: %m"); -+ return log_error_errno(errno, "Failed to fork: %s", error_str()); - - if (pid == 0) { - /* Child */ - if (null_stdio) { - r = make_null_stdio(); - if (r < 0) { -- log_error_errno(r, "Failed to kill stdio: %m"); -+ log_error_errno(r, "Failed to kill stdio: %s", error_str()); - _exit(EXIT_FAILURE); - } - } - - execvp(args[0], (char**) args); -- log_error_errno(errno, "Failed to execute man: %m"); -+ log_error_errno(errno, "Failed to execute man: %s", error_str()); - _exit(EXIT_FAILURE); - } - ---- src/shared/ptyfwd.c 2015-04-19 13:32:24.663347471 +0200 -+++ src/shared/ptyfwd.c 2017-03-04 16:53:10.538346100 +0100 -@@ -123,7 +123,7 @@ - - f->stdin_event_source = sd_event_source_unref(f->stdin_event_source); - } else { -- log_error_errno(errno, "read(): %m"); -+ log_error_errno(errno, "read(): %s", error_str()); - return sd_event_exit(f->event, EXIT_FAILURE); - } - } else if (k == 0) { -@@ -157,7 +157,7 @@ - - f->master_event_source = sd_event_source_unref(f->master_event_source); - } else { -- log_error_errno(errno, "write(): %m"); -+ log_error_errno(errno, "write(): %s", error_str()); - return sd_event_exit(f->event, EXIT_FAILURE); - } - } else { -@@ -187,7 +187,7 @@ - - f->master_event_source = sd_event_source_unref(f->master_event_source); - } else { -- log_error_errno(errno, "read(): %m"); -+ log_error_errno(errno, "read(): %s", error_str()); - return sd_event_exit(f->event, EXIT_FAILURE); - } - } else -@@ -206,7 +206,7 @@ - f->stdout_hangup = true; - f->stdout_event_source = sd_event_source_unref(f->stdout_event_source); - } else { -- log_error_errno(errno, "write(): %m"); -+ log_error_errno(errno, "write(): %s", error_str()); - return sd_event_exit(f->event, EXIT_FAILURE); - } - ---- src/shared/selinux-util.c 2015-04-19 13:32:24.663347471 +0200 -+++ src/shared/selinux-util.c 2017-03-04 16:53:10.519346071 +0100 -@@ -89,7 +89,7 @@ - label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0); - - if (!label_hnd) { -- log_enforcing("Failed to initialize SELinux context: %m"); -+ log_enforcing("Failed to initialize SELinux context: %s", error_str()); - r = security_getenforce() == 1 ? -errno : 0; - } else { - char timespan[FORMAT_TIMESPAN_MAX]; -@@ -159,7 +159,7 @@ - if (ignore_erofs && errno == EROFS) - return 0; - -- log_enforcing("Unable to fix SELinux security context of %s: %m", path); -+ log_enforcing("Unable to fix SELinux security context of %s: %s", path, error_str()); - if (security_getenforce() == 1) - return -errno; - } -@@ -178,7 +178,7 @@ - return 0; - - if (setfilecon(path, (security_context_t) label) < 0) { -- log_enforcing("Failed to set SELinux security context %s on path %s: %m", label, path); -+ log_enforcing("Failed to set SELinux security context %s on path %s: %s", label, path, error_str()); - if (security_getenforce() == 1) - return -errno; - } -@@ -337,7 +337,7 @@ - else { - r = setfscreatecon(filecon); - if (r < 0) { -- log_enforcing("Failed to set SELinux security context %s for %s: %m", filecon, path); -+ log_enforcing("Failed to set SELinux security context %s for %s: %s", filecon, path, error_str()); - r = -errno; - } - } -@@ -370,7 +370,7 @@ - assert(label); - - if (setsockcreatecon((security_context_t) label) < 0) { -- log_enforcing("Failed to set SELinux security context %s for sockets: %m", label); -+ log_enforcing("Failed to set SELinux security context %s for sockets: %s", label, error_str()); - - if (security_getenforce() == 1) - return -errno; -@@ -440,7 +440,7 @@ - r = setfscreatecon(fcon); - - if (r < 0 && errno != ENOENT) { -- log_enforcing("Failed to set SELinux security context %s for %s: %m", fcon, path); -+ log_enforcing("Failed to set SELinux security context %s for %s: %s", fcon, path, error_str()); - - if (security_getenforce() == 1) { - r = -errno; ---- src/shared/sleep-config.c 2015-04-19 13:32:24.663347471 +0200 -+++ src/shared/sleep-config.c 2017-03-04 16:53:10.574346156 +0100 -@@ -175,7 +175,7 @@ - f = fopen("/proc/swaps", "re"); - if (!f) { - log_full(errno == ENOENT ? LOG_DEBUG : LOG_WARNING, -- "Failed to retrieve open /proc/swaps: %m"); -+ "Failed to retrieve open /proc/swaps: %s", error_str()); - assert(errno > 0); - return -errno; - } -@@ -228,14 +228,14 @@ - - r = get_status_field("/proc/meminfo", "\nActive(anon):", &active); - if (r < 0) { -- log_error_errno(r, "Failed to retrieve Active(anon) from /proc/meminfo: %m"); -+ log_error_errno(r, "Failed to retrieve Active(anon) from /proc/meminfo: %s", error_str()); - return false; - } - - r = safe_atollu(active, &act); - if (r < 0) { -- log_error_errno(r, "Failed to parse Active(anon) from /proc/meminfo: %s: %m", -- active); -+ log_error_errno(r, "Failed to parse Active(anon) from /proc/meminfo: %s: %s", -+ active, error_str()); - return false; - } - ---- src/shared/smack-util.c 2015-04-19 13:32:24.663347471 +0200 -+++ src/shared/smack-util.c 2017-03-04 16:53:10.568346146 +0100 -@@ -199,7 +199,7 @@ - if (ignore_erofs && errno == EROFS) - return 0; - -- r = log_debug_errno(errno, "Unable to fix SMACK label of %s: %m", path); -+ r = log_debug_errno(errno, "Unable to fix SMACK label of %s: %s", path, error_str()); - } - #endif - ---- src/shared/socket-label.c 2015-04-19 13:32:24.663347471 +0200 -+++ src/shared/socket-label.c 2017-03-04 16:53:10.563346139 +0100 -@@ -86,13 +86,13 @@ - if (free_bind) { - one = 1; - if (setsockopt(fd, IPPROTO_IP, IP_FREEBIND, &one, sizeof(one)) < 0) -- log_warning_errno(errno, "IP_FREEBIND failed: %m"); -+ log_warning_errno(errno, "IP_FREEBIND failed: %s", error_str()); - } - - if (transparent) { - one = 1; - if (setsockopt(fd, IPPROTO_IP, IP_TRANSPARENT, &one, sizeof(one)) < 0) -- log_warning_errno(errno, "IP_TRANSPARENT failed: %m"); -+ log_warning_errno(errno, "IP_TRANSPARENT failed: %s", error_str()); - } - } - -@@ -155,10 +155,10 @@ - - r = socket_address_print(&a, &p); - if (r < 0) -- return log_error_errno(r, "socket_address_print(): %m"); -+ return log_error_errno(r, "socket_address_print(): %s", error_str()); - - if (fd < 0) -- log_error_errno(fd, "Failed to listen on %s: %m", p); -+ log_error_errno(fd, "Failed to listen on %s: %s", p, error_str()); - else - log_full(log_level, "Listening on %s", p); - } ---- src/shared/socket-util.c 2017-03-04 16:54:39.919484988 +0100 -+++ src/shared/socket-util.c 2017-03-04 16:53:10.580346165 +0100 -@@ -653,9 +653,9 @@ - - r = sockaddr_pretty(&sa->sa, salen, true, true, &ret); - if (r < 0) -- return log_error_errno(r, "sockadd_pretty() failed: %m"); -+ return log_error_errno(r, "sockadd_pretty() failed: %s", error_str()); - -- log_debug_errno(saved_errno, "getnameinfo(%s) failed: %m", ret); -+ log_debug_errno(saved_errno, "getnameinfo(%s) failed: %s", ret, error_str()); - } else { - ret = strdup(host); - if (!ret) -@@ -674,7 +674,7 @@ - assert(ret); - - if (getsockname(fd, &sa.sa, &salen) < 0) -- return log_error_errno(errno, "getsockname(%d) failed: %m", fd); -+ return log_error_errno(errno, "getsockname(%d) failed: %s", fd, error_str()); - - return socknameinfo_pretty(&sa, salen, ret); - } ---- src/shared/spawn-polkit-agent.c 2015-09-01 11:25:35.671430453 +0200 -+++ src/shared/spawn-polkit-agent.c 2017-03-04 16:53:10.585346173 +0100 -@@ -59,7 +59,7 @@ - safe_close(pipe_fd[1]); - - if (r < 0) -- log_error_errno(r, "Failed to fork TTY ask password agent: %m"); -+ log_error_errno(r, "Failed to fork TTY ask password agent: %s", error_str()); - else - /* Wait until the agent closes the fd */ - fd_wait_for_event(pipe_fd[0], POLLHUP, USEC_INFINITY); ---- src/shared/util.c 2017-03-04 16:54:39.921484991 +0100 -+++ src/shared/util.c 2017-03-04 16:53:10.607346206 +0100 -@@ -2218,7 +2218,7 @@ - - r = reset_terminal_fd(fd, true); - if (r < 0) -- log_warning_errno(r, "Failed to reset terminal: %m"); -+ log_warning_errno(r, "Failed to reset terminal: %s", error_str()); - - return fd; - -@@ -3839,7 +3839,7 @@ - - r = wait_for_terminate(pid, &status); - if (r < 0) -- return log_warning_errno(r, "Failed to wait for %s: %m", name); -+ return log_warning_errno(r, "Failed to wait for %s: %s", name, error_str()); - - if (status.si_code == CLD_EXITED) { - if (status.si_status != 0) -@@ -4126,7 +4126,7 @@ - if (errno == ENOENT) - continue; - -- return log_error_errno(errno, "Failed to open directory %s: %m", *directory); -+ return log_error_errno(errno, "Failed to open directory %s: %s", *directory, error_str()); - } - - FOREACH_DIRENT(de, d, break) { -@@ -4157,7 +4157,7 @@ - - pid = fork(); - if (pid < 0) { -- log_error_errno(errno, "Failed to fork: %m"); -+ log_error_errno(errno, "Failed to fork: %s", error_str()); - continue; - } else if (pid == 0) { - char *_argv[2]; -@@ -4172,7 +4172,7 @@ - argv[0] = path; - - execv(path, argv); -- return log_error_errno(errno, "Failed to execute %s: %m", path); -+ return log_error_errno(errno, "Failed to execute %s: %s", path, error_str()); - } - - log_debug("Spawned %s as " PID_FMT ".", path, pid); -@@ -4225,7 +4225,7 @@ - - executor_pid = fork(); - if (executor_pid < 0) { -- log_error_errno(errno, "Failed to fork: %m"); -+ log_error_errno(errno, "Failed to fork: %s", error_str()); - return; - - } else if (executor_pid == 0) { -@@ -5398,7 +5398,7 @@ - * keep an unused copy of stdin around. */ - fd = open("/dev/tty", O_WRONLY); - if (fd < 0) { -- log_error_errno(errno, "Failed to open /dev/tty: %m"); -+ log_error_errno(errno, "Failed to open /dev/tty: %s", error_str()); - _exit(EXIT_FAILURE); - } - -@@ -5613,11 +5613,11 @@ - - fd = acquire_terminal("/dev/console", false, true, true, USEC_INFINITY); - if (fd < 0) -- return log_error_errno(fd, "Failed to acquire terminal: %m"); -+ return log_error_errno(fd, "Failed to acquire terminal: %s", error_str()); - - r = make_stdio(fd); - if (r < 0) -- return log_error_errno(r, "Failed to duplicate terminal fd: %m"); -+ return log_error_errno(r, "Failed to duplicate terminal fd: %s", error_str()); - - return 0; - } ---- src/shared/watchdog.c 2015-04-19 13:32:24.667347471 +0200 -+++ src/shared/watchdog.c 2017-03-04 16:53:10.590346180 +0100 -@@ -45,7 +45,7 @@ - flags = WDIOS_DISABLECARD; - r = ioctl(watchdog_fd, WDIOC_SETOPTIONS, &flags); - if (r < 0) -- return log_warning_errno(errno, "Failed to disable hardware watchdog: %m"); -+ return log_warning_errno(errno, "Failed to disable hardware watchdog: %s", error_str()); - } else { - int sec, flags; - char buf[FORMAT_TIMESPAN_MAX]; -@@ -53,7 +53,7 @@ - sec = (int) ((watchdog_timeout + USEC_PER_SEC - 1) / USEC_PER_SEC); - r = ioctl(watchdog_fd, WDIOC_SETTIMEOUT, &sec); - if (r < 0) -- return log_warning_errno(errno, "Failed to set timeout to %is: %m", sec); -+ return log_warning_errno(errno, "Failed to set timeout to %is: %s", sec, error_str()); - - watchdog_timeout = (usec_t) sec * USEC_PER_SEC; - log_info("Set hardware watchdog to %s.", format_timespan(buf, sizeof(buf), watchdog_timeout, 0)); -@@ -61,11 +61,11 @@ - flags = WDIOS_ENABLECARD; - r = ioctl(watchdog_fd, WDIOC_SETOPTIONS, &flags); - if (r < 0) -- return log_warning_errno(errno, "Failed to enable hardware watchdog: %m"); -+ return log_warning_errno(errno, "Failed to enable hardware watchdog: %s", error_str()); - - r = ioctl(watchdog_fd, WDIOC_KEEPALIVE, 0); - if (r < 0) -- return log_warning_errno(errno, "Failed to ping hardware watchdog: %m"); -+ return log_warning_errno(errno, "Failed to ping hardware watchdog: %s", error_str()); - } - - return 0; -@@ -120,7 +120,7 @@ - - r = ioctl(watchdog_fd, WDIOC_KEEPALIVE, 0); - if (r < 0) -- return log_warning_errno(errno, "Failed to ping hardware watchdog: %m"); -+ return log_warning_errno(errno, "Failed to ping hardware watchdog: %s", error_str()); - - return 0; - } -@@ -138,7 +138,7 @@ - flags = WDIOS_DISABLECARD; - r = ioctl(watchdog_fd, WDIOC_SETOPTIONS, &flags); - if (r < 0) -- log_warning_errno(errno, "Failed to disable hardware watchdog: %m"); -+ log_warning_errno(errno, "Failed to disable hardware watchdog: %s", error_str()); - - /* To be sure, use magic close logic, too */ - for (;;) { -@@ -148,7 +148,7 @@ - break; - - if (errno != EINTR) { -- log_error_errno(errno, "Failed to disarm watchdog timer: %m"); -+ log_error_errno(errno, "Failed to disarm watchdog timer: %s", error_str()); - break; - } - } diff --git a/srcpkgs/elogind/files/parse-printf-format.c b/srcpkgs/elogind/files/parse-printf-format.c deleted file mode 100644 index 4e6e1459029..00000000000 --- a/srcpkgs/elogind/files/parse-printf-format.c +++ /dev/null @@ -1,273 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2014 Emil Renner Berthing - - With parts from the musl C library - Copyright 2005-2014 Rich Felker, et al. - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include -#include - -#include "parse-printf-format.h" - -static const char *consume_nonarg(const char *fmt) -{ - do { - if (*fmt == '\0') - return fmt; - } while (*fmt++ != '%'); - return fmt; -} - -static const char *consume_num(const char *fmt) -{ - for (;*fmt >= '0' && *fmt <= '9'; fmt++) - /* do nothing */; - return fmt; -} - -static const char *consume_argn(const char *fmt, size_t *arg) -{ - const char *p = fmt; - size_t val = 0; - - if (*p < '1' || *p > '9') - return fmt; - do { - val = 10*val + (*p++ - '0'); - } while (*p >= '0' && *p <= '9'); - - if (*p != '$') - return fmt; - *arg = val; - return p+1; -} - -static const char *consume_flags(const char *fmt) -{ - while (1) { - switch (*fmt) { - case '#': - case '0': - case '-': - case ' ': - case '+': - case '\'': - case 'I': - fmt++; - continue; - } - return fmt; - } -} - -enum state { - BARE, - LPRE, - LLPRE, - HPRE, - HHPRE, - BIGLPRE, - ZTPRE, - JPRE, - STOP -}; - -enum type { - NONE, - PTR, - INT, - UINT, - ULLONG, - LONG, - ULONG, - SHORT, - USHORT, - CHAR, - UCHAR, - LLONG, - SIZET, - IMAX, - UMAX, - PDIFF, - UIPTR, - DBL, - LDBL, - MAXTYPE -}; - -static const short pa_types[MAXTYPE] = { - [NONE] = PA_INT, - [PTR] = PA_POINTER, - [INT] = PA_INT, - [UINT] = PA_INT, - [ULLONG] = PA_INT | PA_FLAG_LONG_LONG, - [LONG] = PA_INT | PA_FLAG_LONG, - [ULONG] = PA_INT | PA_FLAG_LONG, - [SHORT] = PA_INT | PA_FLAG_SHORT, - [USHORT] = PA_INT | PA_FLAG_SHORT, - [CHAR] = PA_CHAR, - [UCHAR] = PA_CHAR, - [LLONG] = PA_INT | PA_FLAG_LONG_LONG, - [SIZET] = PA_INT | PA_FLAG_LONG, - [IMAX] = PA_INT | PA_FLAG_LONG_LONG, - [UMAX] = PA_INT | PA_FLAG_LONG_LONG, - [PDIFF] = PA_INT | PA_FLAG_LONG_LONG, - [UIPTR] = PA_INT | PA_FLAG_LONG, - [DBL] = PA_DOUBLE, - [LDBL] = PA_DOUBLE | PA_FLAG_LONG_DOUBLE -}; - -#define S(x) [(x)-'A'] -#define E(x) (STOP + (x)) - -static const unsigned char states[]['z'-'A'+1] = { - { /* 0: bare types */ - S('d') = E(INT), S('i') = E(INT), - S('o') = E(UINT),S('u') = E(UINT),S('x') = E(UINT), S('X') = E(UINT), - S('e') = E(DBL), S('f') = E(DBL), S('g') = E(DBL), S('a') = E(DBL), - S('E') = E(DBL), S('F') = E(DBL), S('G') = E(DBL), S('A') = E(DBL), - S('c') = E(CHAR),S('C') = E(INT), - S('s') = E(PTR), S('S') = E(PTR), S('p') = E(UIPTR),S('n') = E(PTR), - S('m') = E(NONE), - S('l') = LPRE, S('h') = HPRE, S('L') = BIGLPRE, - S('z') = ZTPRE, S('j') = JPRE, S('t') = ZTPRE - }, { /* 1: l-prefixed */ - S('d') = E(LONG), S('i') = E(LONG), - S('o') = E(ULONG),S('u') = E(ULONG),S('x') = E(ULONG),S('X') = E(ULONG), - S('e') = E(DBL), S('f') = E(DBL), S('g') = E(DBL), S('a') = E(DBL), - S('E') = E(DBL), S('F') = E(DBL), S('G') = E(DBL), S('A') = E(DBL), - S('c') = E(INT), S('s') = E(PTR), S('n') = E(PTR), - S('l') = LLPRE - }, { /* 2: ll-prefixed */ - S('d') = E(LLONG), S('i') = E(LLONG), - S('o') = E(ULLONG),S('u') = E(ULLONG), - S('x') = E(ULLONG),S('X') = E(ULLONG), - S('n') = E(PTR) - }, { /* 3: h-prefixed */ - S('d') = E(SHORT), S('i') = E(SHORT), - S('o') = E(USHORT),S('u') = E(USHORT), - S('x') = E(USHORT),S('X') = E(USHORT), - S('n') = E(PTR), - S('h') = HHPRE - }, { /* 4: hh-prefixed */ - S('d') = E(CHAR), S('i') = E(CHAR), - S('o') = E(UCHAR),S('u') = E(UCHAR), - S('x') = E(UCHAR),S('X') = E(UCHAR), - S('n') = E(PTR) - }, { /* 5: L-prefixed */ - S('e') = E(LDBL),S('f') = E(LDBL),S('g') = E(LDBL), S('a') = E(LDBL), - S('E') = E(LDBL),S('F') = E(LDBL),S('G') = E(LDBL), S('A') = E(LDBL), - S('n') = E(PTR) - }, { /* 6: z- or t-prefixed (assumed to be same size) */ - S('d') = E(PDIFF),S('i') = E(PDIFF), - S('o') = E(SIZET),S('u') = E(SIZET), - S('x') = E(SIZET),S('X') = E(SIZET), - S('n') = E(PTR) - }, { /* 7: j-prefixed */ - S('d') = E(IMAX), S('i') = E(IMAX), - S('o') = E(UMAX), S('u') = E(UMAX), - S('x') = E(UMAX), S('X') = E(UMAX), - S('n') = E(PTR) - } -}; - -size_t parse_printf_format(const char *fmt, size_t n, int *types) -{ - size_t i = 0; - size_t last = 0; - - memset(types, 0, n); - - while (1) { - size_t arg; - unsigned int state; - - fmt = consume_nonarg(fmt); - if (*fmt == '\0') - break; - if (*fmt == '%') { - fmt++; - continue; - } - arg = 0; - fmt = consume_argn(fmt, &arg); - /* flags */ - fmt = consume_flags(fmt); - /* width */ - if (*fmt == '*') { - size_t warg = 0; - fmt = consume_argn(fmt+1, &warg); - if (warg == 0) - warg = ++i; - if (warg > last) - last = warg; - if (warg <= n && types[warg-1] == NONE) - types[warg-1] = INT; - } else - fmt = consume_num(fmt); - /* precision */ - if (*fmt == '.') { - fmt++; - if (*fmt == '*') { - size_t parg = 0; - fmt = consume_argn(fmt+1, &parg); - if (parg == 0) - parg = ++i; - if (parg > last) - last = parg; - if (parg <= n && types[parg-1] == NONE) - types[parg-1] = INT; - } else { - if (*fmt == '-') - fmt++; - fmt = consume_num(fmt); - } - } - /* length modifier and conversion specifier */ - state = BARE; - do { - unsigned char c = *fmt++; - - if (c < 'A' || c > 'z') - continue; - state = states[state]S(c); - if (state == 0) - continue; - } while (state < STOP); - - if (state == E(NONE)) - continue; - - if (arg == 0) - arg = ++i; - if (arg > last) - last = arg; - if (arg <= n) - types[arg-1] = state - STOP; - } - - if (last > n) - last = n; - for (i = 0; i < last; i++) - types[i] = pa_types[types[i]]; - - return last; -} diff --git a/srcpkgs/elogind/files/parse-printf-format.h b/srcpkgs/elogind/files/parse-printf-format.h deleted file mode 100644 index e66b86c4422..00000000000 --- a/srcpkgs/elogind/files/parse-printf-format.h +++ /dev/null @@ -1,58 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2014 Emil Renner Berthing - - With parts from the GNU C Library - Copyright 1991-2014 Free Software Foundation, Inc. - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#pragma once - -#include "config.h" - -#ifdef HAVE_PRINTF_H -#include -#else - -#include - -enum { /* C type: */ - PA_INT, /* int */ - PA_CHAR, /* int, cast to char */ - PA_WCHAR, /* wide char */ - PA_STRING, /* const char *, a '\0'-terminated string */ - PA_WSTRING, /* const wchar_t *, wide character string */ - PA_POINTER, /* void * */ - PA_FLOAT, /* float */ - PA_DOUBLE, /* double */ - PA_LAST -}; - -/* Flag bits that can be set in a type returned by `parse_printf_format'. */ -#define PA_FLAG_MASK 0xff00 -#define PA_FLAG_LONG_LONG (1 << 8) -#define PA_FLAG_LONG_DOUBLE PA_FLAG_LONG_LONG -#define PA_FLAG_LONG (1 << 9) -#define PA_FLAG_SHORT (1 << 10) -#define PA_FLAG_PTR (1 << 11) - -size_t parse_printf_format(const char *fmt, size_t n, int *types); - -#endif /* HAVE_PRINTF_H */ - diff --git a/srcpkgs/elogind/patches/001-fix-label-selinux.patch b/srcpkgs/elogind/patches/001-fix-label-selinux.patch deleted file mode 100644 index 21250078478..00000000000 --- a/srcpkgs/elogind/patches/001-fix-label-selinux.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- src/shared/label.c 2015-04-19 13:32:24.659347470 +0200 -+++ src/shared/label.c 2017-03-04 13:41:05.953585324 +0100 -@@ -25,9 +25,11 @@ - #include "label.h" - - int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) { -- int r, q; -+ int r = 0, q = 0; - -+#ifdef HAVE_SELINUX - r = mac_selinux_fix(path, ignore_enoent, ignore_erofs); -+#endif - q = mac_smack_fix(path, ignore_enoent, ignore_erofs); - - if (r < 0) -@@ -39,18 +41,22 @@ - } - - int mkdir_label(const char *path, mode_t mode) { -- int r; -+ int r = 0; - - assert(path); - -+#ifdef HAVE_SELINUX - r = mac_selinux_create_file_prepare(path, S_IFDIR); - if (r < 0) - return r; -+#endif - - if (mkdir(path, mode) < 0) - r = -errno; - -+#ifdef HAVE_SELINUX - mac_selinux_create_file_clear(); -+#endif - - if (r < 0) - return r; -@@ -59,19 +65,23 @@ - } - - int symlink_label(const char *old_path, const char *new_path) { -- int r; -+ int r = 0; - - assert(old_path); - assert(new_path); - -+#ifdef HAVE_SELINUX - r = mac_selinux_create_file_prepare(new_path, S_IFLNK); - if (r < 0) - return r; -+#endif - - if (symlink(old_path, new_path) < 0) - r = -errno; - -+#ifdef HAVE_SELINUX - mac_selinux_create_file_clear(); -+#endif - - if (r < 0) - return r; diff --git a/srcpkgs/elogind/patches/002-fix-logind-action-constify_args.patch b/srcpkgs/elogind/patches/002-fix-logind-action-constify_args.patch deleted file mode 100644 index 0f417f7a89a..00000000000 --- a/srcpkgs/elogind/patches/002-fix-logind-action-constify_args.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- src/login/logind-action.c 2015-08-29 11:16:20.584190227 +0200 -+++ src/login/logind-action.c 2017-03-04 13:55:29.722627380 +0100 -@@ -176,9 +176,9 @@ - return wait_for_terminate_and_warn(helper, pid, true); - } - --static int write_mode(char **modes) { -+static int write_mode(const char **modes) { - int r = 0; -- char **mode; -+ const char **mode; - - STRV_FOREACH(mode, modes) { - int k; -@@ -199,8 +199,8 @@ - return r; - } - --static int write_state(FILE **f, char **states) { -- char **state; -+static int write_state(FILE **f, const char **states) { -+ const char **state; - int r = 0; - - STRV_FOREACH(state, states) { diff --git a/srcpkgs/elogind/patches/003-musl-missing.patch b/srcpkgs/elogind/patches/003-musl-missing.patch deleted file mode 100644 index a7d8f900f8a..00000000000 --- a/srcpkgs/elogind/patches/003-musl-missing.patch +++ /dev/null @@ -1,253 +0,0 @@ -This library is a masterpiece of writing non-portable code. -The patches are trying to be minimally invasive and are, for -the most part, just simple macros replacing glibc extensions -with their POSIX counterparts. - -The file src/musl_missing.h is included whereever the code -expects functions and constants which are specific to glibc. - ---- src/libelogind/sd-bus/bus-message.c 2015-04-19 13:32:24.607347468 +0200 -+++ src/libelogind/sd-bus/bus-message.c 2017-03-04 12:12:45.277329646 +0100 -@@ -23,6 +23,7 @@ - #include - #include - -+#include "musl_missing.h" - #include "util.h" - #include "utf8.h" - #include "strv.h" ---- src/libelogind/sd-bus/bus-objects.c 2015-04-19 13:32:24.611347468 +0200 -+++ src/libelogind/sd-bus/bus-objects.c 2017-03-04 12:12:52.469343136 +0100 -@@ -19,6 +19,7 @@ - along with systemd; If not, see . - ***/ - -+#include "musl_missing.h" - #include "strv.h" - #include "set.h" - #include "bus-internal.h" ---- src/libelogind/sd-bus/bus-util.c 2015-04-19 13:32:24.611347468 +0200 -+++ src/libelogind/sd-bus/bus-util.c 2017-03-04 12:13:00.357357928 +0100 -@@ -21,6 +21,7 @@ - - #include - -+#include "musl_missing.h" - #include "sd-daemon.h" - #include "sd-event.h" - #include "util.h" ---- src/libelogind/sd-bus/sd-bus.c 2016-03-06 16:00:52.027398234 +0100 -+++ src/libelogind/sd-bus/sd-bus.c 2017-03-04 12:13:08.163372562 +0100 -@@ -27,6 +27,7 @@ - #include - #include - -+#include "musl_missing.h" - #include "util.h" - #include "macro.h" - #include "strv.h" ---- src/libelogind/sd-device/sd-device.c 2015-04-19 13:32:24.611347468 +0200 -+++ src/libelogind/sd-device/sd-device.c 2017-03-04 12:35:03.255797997 +0100 -@@ -22,6 +22,7 @@ - #include - #include - -+#include "musl_missing.h" - #include "util.h" - #include "macro.h" - #include "path-util.h" ---- src/shared/arphrd-list.c 2017-03-04 15:31:15.633884536 +0100 -+++ src/shared/arphrd-list.c 2017-03-04 15:32:05.646967582 +0100 -@@ -22,6 +22,7 @@ - #include - #include - -+#include "musl_missing.h" - #include "util.h" - #include "arphrd-list.h" - ---- src/shared/cgroup-util.c 2016-03-06 16:00:52.183398132 +0100 -+++ src/shared/cgroup-util.c 2017-03-04 13:22:38.379366996 +0100 -@@ -29,6 +29,7 @@ - #include - #include - -+#include "musl_missing.h" - #include "cgroup-util.h" - #include "set.h" - #include "macro.h" ---- src/shared/import-util.c 2015-04-19 13:32:24.659347470 +0200 -+++ src/shared/import-util.c 2017-03-04 13:50:12.978234609 +0100 -@@ -19,6 +19,7 @@ - along with systemd; If not, see . - ***/ - -+#include "musl_missing.h" - #include "util.h" - #include "import-util.h" - ---- src/shared/log.c 2015-04-19 13:32:24.659347470 +0200 -+++ src/shared/log.c 2017-03-04 12:13:13.650382848 +0100 -@@ -29,6 +29,11 @@ - #include -+#if defined(__GLIBC__) - #include -+#else -+#include "musl_missing.h" -+#include "parse-printf-format.h" -+#endif - - #include "log.h" - #include "util.h" - #include "missing.h" ---- src/shared/mkdir.c 2015-04-19 13:32:24.663347471 +0200 -+++ src/shared/mkdir.c 2017-03-04 13:24:40.815495150 +0100 -@@ -22,6 +22,7 @@ - #include - #include - -+#include "musl_missing.h" - #include "util.h" - #include "path-util.h" - #include "mkdir.h" ---- src/shared/pager.c 2015-04-19 13:32:24.663347471 +0200 -+++ src/shared/pager.c 2017-03-04 13:10:55.917202529 +0100 -@@ -25,6 +25,7 @@ - #include - #include - -+#include "musl_missing.h" - #include "pager.h" - #include "util.h" - #include "macro.h" ---- src/shared/path-util.c 2015-04-19 13:32:24.663347471 +0200 -+++ src/shared/path-util.c 2017-03-04 12:13:29.919413335 +0100 -@@ -27,6 +27,7 @@ - #include - #include - -+#include "musl_missing.h" - #include "macro.h" - #include "util.h" - #include "log.h" ---- src/shared/socket-util.c 2015-04-19 13:32:24.663347471 +0200 -+++ src/shared/socket-util.c 2017-03-04 13:13:24.833441863 +0100 -@@ -29,6 +29,7 @@ - #include - #include - -+#include "musl_missing.h" - #include "macro.h" - #include "path-util.h" - #include "util.h" ---- src/shared/strbuf.c 2015-04-19 13:32:24.663347471 +0200 -+++ src/shared/strbuf.c 2017-03-04 12:44:52.010758521 +0100 -@@ -22,6 +22,7 @@ - #include - #include - -+#include "musl_missing.h" - #include "util.h" - #include "strbuf.h" - ---- src/shared/uid-range.c 2015-04-19 13:32:24.667347471 +0200 -+++ src/shared/uid-range.c 2017-03-04 13:46:38.443975396 +0100 -@@ -19,6 +19,7 @@ - along with systemd; If not, see . - ***/ - -+#include "musl_missing.h" - #include "util.h" - #include "uid-range.h" - ---- src/shared/util.c 2015-04-19 13:32:24.667347471 +0200 -+++ src/shared/util.c 2017-03-04 12:13:25.146404392 +0100 -@@ -74,6 +74,7 @@ - #include - #endif - -+#include "musl_missing.h" - #include "config.h" - #include "macro.h" - #include "util.h" ---- /dev/null 2017-02-27 11:29:25.507373858 +0100 -+++ src/musl_missing.h 2017-03-04 12:07:03.302685073 +0100 -@@ -0,0 +1,65 @@ -+/**************************************************************** -+ * musl_missing.h - work around glibc extensions for musl libc. -+ * -+ * Implements glibc functions missing in musl libc as macros. -+ * Is to be included where these functions are used. -+ * Also defines some glibc only constants as either 0 or -+ * as found in the corresponding glibc header file. -+ * -+ * Juergen Buchmueller for Void Linux -+ * Public Domain; no warranties whatsoever. Thank you Mr. P. -+ * -+ ****************************************************************/ -+ -+#if !defined(__GLIBC__) -+#include "config.h" -+#include -+#include -+#include -+ -+/* -+ * Possibly TODO according to http://man7.org/linux/man-pages/man3/getenv.3.html -+ * + test if the process's effective user ID does not match its real user ID or -+ * the process's effective group ID does not match its real group ID; -+ * typically this is the result of executing a set-user-ID or set- -+ * group-ID program. Is calling issetugid() sufficient here? -+ * + test if the effective capability bit was set on the executable file -+ * + test if the process has a nonempty permitted capability set -+ */ -+#define secure_getenv(name) \ -+ (issetugid() ? NULL : getenv(name)) -+ -+/* Poor man's basename */ -+#define basename(path) \ -+ (strrchr(path, '/') ? strrchr(path, '/')+1 : path) -+ -+/* strndupa may already be defined in another compatibility header */ -+#if !defined(strndupa) -+#define strndupa(src, n) \ -+ (__extension__ ({const char *in = (src); \ -+ size_t len = strnlen(in, (n)) + 1; \ -+ char *out = (char *) alloca(len); \ -+ out[len-1] = '\0'; \ -+ (char *) memcpy(out, in, len-1);}) \ -+ ) -+#endif -+ -+/* See http://man7.org/linux/man-pages/man3/canonicalize_file_name.3.html */ -+#define canonicalize_file_name(path) \ -+ realpath(path, NULL) -+ -+typedef int (*__compar_fn_t)(const void *, const void *); -+ -+/* GLOB_BRACE is another glibc extension - ignore it for musl libc */ -+#define GLOB_BRACE 0 -+ -+/* getnameinfo(3) glibc extensions are undefined in musl libc */ -+#define NI_IDN 0 -+#define NI_IDN_USE_STD3_ASCII_RULES 0 -+ -+/* Taken from glibc's net/if_arp.h */ -+#if !defined(ARPHRD_IEEE802154_PHY) -+#define ARPHRD_IEEE802154_PHY 805 /* IEEE 802.15.4 PHY header. */ -+#endif -+ -+#endif /* !defined(__GLIBC__) */ ---- Makefile.am 2016-03-06 16:00:51.919398304 +0100 -+++ Makefile.am 2017-03-04 13:06:34.982792357 +0100 -@@ -482,7 +482,9 @@ - src/shared/import-util.c \ - src/shared/import-util.h \ - src/shared/sysctl-util.c \ -- src/shared/sysctl-util.h -+ src/shared/sysctl-util.h \ -+ src/shared/parse-printf-format.c \ -+ src/shared/parse-printf-format.h - - nodist_libelogind_shared_la_SOURCES = \ - src/shared/errno-from-name.h \ diff --git a/srcpkgs/elogind/patches/004-musl-program_invocation_short_name.patch b/srcpkgs/elogind/patches/004-musl-program_invocation_short_name.patch deleted file mode 100644 index 2334c12a8bf..00000000000 --- a/srcpkgs/elogind/patches/004-musl-program_invocation_short_name.patch +++ /dev/null @@ -1,55 +0,0 @@ -Using the libc program_invocation_short_name results in a linker error: - /usr/bin/ld.gold: error: src/login/loginctl.o: cannot make copy relocation - for protected symbol 'program_invocation_short_name', defined in - /usr/lib/gcc/x86_64-linux-musl/6.3.0/../../../../lib/libc.so -Replace it with basename(argv[0]) which gives the same result. - ---- src/login/inhibit.c 2015-04-19 13:32:24.639347469 +0200 -+++ src/login/inhibit.c 2017-03-04 14:13:27.885132151 +0100 -@@ -124,7 +125,8 @@ - return 0; - } - --static void help(void) { -+static void help(int argc, char* argv[]) { -+ char* short_name = basename(argv[0]); - printf("%s [OPTIONS...] {COMMAND} ...\n\n" - "Execute a process while inhibiting shutdown/sleep/idle.\n\n" - " -h --help Show this help\n" -@@ -137,7 +139,7 @@ - " --why=STRING A descriptive string why is being inhibited\n" - " --mode=MODE One of block or delay\n" - " --list List active inhibitors\n" -- , program_invocation_short_name); -+ , short_name); - } - - static int parse_argv(int argc, char *argv[]) { -@@ -172,7 +174,7 @@ - switch (c) { - - case 'h': -- help(); -+ help(argc, argv); - return 0; - - case ARG_VERSION: ---- src/login/loginctl.c 2015-09-01 13:12:13.079341932 +0200 -+++ src/login/loginctl.c 2017-03-04 14:07:33.971586311 +0100 -@@ -1395,6 +1394,7 @@ - } - - static int help(int argc, char *argv[], void *userdata) { -+ char* short_name = basename(argv[0]); - - printf("%s [OPTIONS...] {COMMAND} ...\n\n" - "Send control commands to or query the login manager.\n\n" -@@ -1446,7 +1446,7 @@ - " suspend Suspend the machine to memory\n" - " hibernate Suspend the machine to disk\n" - " hybrid-sleep Suspend the machine to memory and disk\n" -- , program_invocation_short_name); -+ , short_name); - - return 0; - } diff --git a/srcpkgs/elogind/patches/005-musl-selinux-util-sys_types_h.patch b/srcpkgs/elogind/patches/005-musl-selinux-util-sys_types_h.patch deleted file mode 100644 index 3c738572e97..00000000000 --- a/srcpkgs/elogind/patches/005-musl-selinux-util-sys_types_h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/shared/selinux-util.h 2015-04-19 13:32:24.663347471 +0200 -+++ src/shared/selinux-util.h 2017-03-04 13:44:22.577814237 +0100 -@@ -21,6 +21,7 @@ - along with systemd; If not, see . - ***/ - -+#include - #include - #include - diff --git a/srcpkgs/elogind/patches/006-musl-strerror_r.patch b/srcpkgs/elogind/patches/006-musl-strerror_r.patch deleted file mode 100644 index be74cd5219d..00000000000 --- a/srcpkgs/elogind/patches/006-musl-strerror_r.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/libelogind/sd-bus/bus-error.c 2015-04-20 21:59:54.600440290 +0200 -+++ src/libelogind/sd-bus/bus-error.c 2017-03-04 12:29:27.793186294 +0100 -@@ -378,7 +378,12 @@ - return; - - errno = 0; -+#if defined(__GLIBC__) - x = strerror_r(error, m, k); -+#else -+ /* int strerror_r (int, char *, size_t); */ -+ x = strerror_r(error, m, k) < 0 ? strdup("strerror_r() failed") : m; -+#endif - if (errno == ERANGE || strlen(x) >= k - 1) { - free(m); - k *= 2; diff --git a/srcpkgs/elogind/patches/008-fix-loginctl_help.patch b/srcpkgs/elogind/patches/008-fix-loginctl_help.patch deleted file mode 100644 index fdd066ce5be..00000000000 --- a/srcpkgs/elogind/patches/008-fix-loginctl_help.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/login/loginctl.c 2017-03-05 12:42:33.677495884 +0100 -+++ src/login/loginctl.c 2017-03-05 12:43:52.330545359 +0100 -@@ -1491,7 +1491,7 @@ - switch (c) { - - case 'h': -- help(0, NULL, NULL); -+ help(argc, argv, NULL); - return 0; - - case ARG_VERSION: diff --git a/srcpkgs/elogind/patches/009-fix-faccessat-flags.patch b/srcpkgs/elogind/patches/009-fix-faccessat-flags.patch deleted file mode 100644 index 45d439d0661..00000000000 --- a/srcpkgs/elogind/patches/009-fix-faccessat-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/shared/util.h.orig 2017-03-05 17:12:46.654974564 +0100 -+++ src/shared/util.h 2017-03-05 17:14:11.998704156 +0100 -@@ -1041,7 +1041,11 @@ union inotify_event_buffer { - uint8_t raw[INOTIFY_EVENT_MAX]; - }; - -+#ifdef __GLIBC__ - #define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW) -+#else -+#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), 0) -+#endif - - int ptsname_malloc(int fd, char **ret); diff --git a/srcpkgs/elogind/patches/allow-unprivileged-calls.patch b/srcpkgs/elogind/patches/allow-unprivileged-calls.patch deleted file mode 100644 index 0fe97cd7001..00000000000 --- a/srcpkgs/elogind/patches/allow-unprivileged-calls.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 1ca40c077cd9a08f96a559ba51e8dba230298c4d Mon Sep 17 00:00:00 2001 -From: Michael Palimaka -Date: Sun, 19 Jun 2016 01:56:56 +1000 -Subject: [PATCH] Update org.freedesktop.login1.conf - -This mirrors an upstream change opening up all of logind's bus calls to -unprivileged users via polkit. - -See systemd/systemd/issues/471. -Closes #3. ---- - src/login/org.freedesktop.login1.conf | 68 +++++++++++++++++++++++++++++++++++ - 1 file changed, 68 insertions(+) - -diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf -index 1318328..2e67e3d 100644 ---- src/login/org.freedesktop.login1.conf -+++ src/login/org.freedesktop.login1.conf -@@ -90,6 +90,42 @@ - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - -+ -+ - - -+ -+ - - -+ -+ - - -+ -+ -+ -+ - - -+ -+ - - - -+ -+ -+ -+ - - - diff --git a/srcpkgs/elogind/patches/fix-gcc6.patch b/srcpkgs/elogind/patches/fix-gcc6.patch deleted file mode 100644 index b7c89e8cdf3..00000000000 --- a/srcpkgs/elogind/patches/fix-gcc6.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- src/shared/errno-list.c.orig 2017-01-13 21:53:06.171441950 +0100 -+++ src/shared/errno-list.c 2017-01-13 21:53:44.491417473 +0100 -@@ -25,7 +25,7 @@ - #include "errno-list.h" - - static const struct errno_name* lookup_errno(register const char *str, -- register unsigned int len); -+ register size_t len); - - #include "errno-to-name.h" - #include "errno-from-name.h" ---- src/shared/af-list.c.orig 2017-01-13 21:55:14.941359697 +0100 -+++ src/shared/af-list.c 2017-01-13 21:56:15.967320716 +0100 -@@ -25,7 +25,7 @@ - #include "util.h" - #include "af-list.h" - --static const struct af_name* lookup_af(register const char *str, register unsigned int len); -+static const struct af_name* lookup_af(register const char *str, register size_t len); - - #include "af-to-name.h" - #include "af-from-name.h" ---- src/shared/cap-list.c.orig 2017-01-13 21:59:05.416212480 +0100 -+++ src/shared/cap-list.c 2017-01-13 21:59:22.154201788 +0100 -@@ -25,7 +25,7 @@ - #include "cap-list.h" - #include "missing.h" - --static const struct capability_name* lookup_capability(register const char *str, register unsigned int len); -+static const struct capability_name* lookup_capability(register const char *str, register size_t len); - - #include "cap-to-name.h" - #include "cap-from-name.h" ---- src/shared/arphrd-list.c.orig 2017-01-13 22:01:38.040114990 +0100 -+++ src/shared/arphrd-list.c 2017-01-13 22:01:53.482105126 +0100 -@@ -25,7 +25,7 @@ - #include "util.h" - #include "arphrd-list.h" - --static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len); -+static const struct arphrd_name* lookup_arphrd(register const char *str, register size_t len); - - #include "arphrd-to-name.h" - #include "arphrd-from-name.h" ---- src/login/logind.h.orig 2017-01-13 22:11:22.760741496 +0100 -+++ src/login/logind.h 2017-01-13 22:11:32.259735429 +0100 -@@ -163,7 +163,7 @@ int manager_send_changed(Manager *manage - int manager_dispatch_delayed(Manager *manager); - - /* gperf lookup function */ --const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length); -+const struct ConfigPerfItem* logind_gperf_lookup(const char *key, size_t length); - - int manager_watch_busname(Manager *manager, const char *name); - void manager_drop_busname(Manager *manager, const char *name); diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index 5292f43237d..4213edf2f65 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -1,35 +1,26 @@ # Template file for 'elogind' pkgname=elogind -version=219.14 -revision=2 +version=227.4 +revision=1 build_style=gnu-configure -hostmakedepends="automake libxslt intltool libtool pkg-config gperf" -makedepends="libcap-devel libmount-devel libseccomp-devel libblkid-devel pam-devel gettext-devel eudev-libudev-devel glib-devel" +hostmakedepends="automake libxslt intltool libtool pkg-config gperf docbook-xsl gettext-devel" +makedepends="libcap-devel libmount-devel libseccomp-devel libblkid-devel pam-devel gettext-devel eudev-libudev-devel glib-devel acl-devel" depends="dbus" short_desc="Standalone logind fork" maintainer="Enno Boland " license="GPL-2, LGPL-2, MIT" -homepage="https://github.com/andywingo/elogind" -distfiles="https://wingolog.org/pub/elogind/elogind-$version.tar.xz" -checksum=9dc150071a3f4c1ad1c989a7a143c2d41a2d571c643b92090e36a5d0396193c9 -LDFLAGS="-lrt" +homepage="https://github.com/elogind/elogind" +distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" +checksum=44c26086b91a269de1457afd04416c874dd443ad5c3065ab974c2d9daf541892 conf_files="/etc/elogind/logind.conf" +configure_args+=" --disable-kdbus --disable-lto" pre_configure() { - vinstall $FILESDIR/elogind.wrapper 755 usr/libexec/elogind + autoreconf -fi + intltoolize + sed -i -e "s#^Exec=/bin/false#Exec=/usr/libexec/elogind/elogind.wrapper#" \ src/login/org.freedesktop.login1.service - # Copy an implementation of glibc printf.h for use with musl libc - cp -p ${FILESDIR}/parse-printf-format.{c,h} src/shared/ -} - -post_configure() { - case "$XBPS_TARGET_MACHINE" in - *-musl) # We do have an implementation of secure_getenv(3) through a macro... - sed -i config.h \ - -e 's;/\* #undef HAVE_SECURE_GETENV \*/;#define HAVE_SECURE_GETENV 1;' - ;; - esac } post_install() { @@ -38,6 +29,7 @@ post_install() { ln -sr $DESTDIR/usr/include/elogind $DESTDIR/usr/include/systemd vinstall ./src/systemd/sd-id128.h 644 usr/include vinstall ./src/systemd/_sd-common.h 644 usr/include + vinstall $FILESDIR/elogind.wrapper 755 usr/libexec/elogind vlicense LICENSE.MIT } diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template index c307d091fcf..e2e7bdcf420 100644 --- a/srcpkgs/elvish/template +++ b/srcpkgs/elvish/template @@ -1,7 +1,7 @@ # Template file for 'elvish' pkgname=elvish version=0.7 -revision=1 +revision=2 build_style=go go_import_path="github.com/elves/elvish" short_desc="A novel Unix shell" diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template index e3dc2581bac..82b14128664 100644 --- a/srcpkgs/emacs/template +++ b/srcpkgs/emacs/template @@ -1,7 +1,7 @@ # Template file for 'emacs' pkgname=emacs -version=25.1 -revision=6 +version=25.2 +revision=1 nocross=yes nopie=yes hostmakedepends="pkg-config" @@ -20,11 +20,11 @@ configure_args="--with-file-notification=inotify --with-modules $(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick) $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound)" short_desc="GNU Emacs editor" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-3" -homepage="http://www.gnu.org/software/${pkgname}/" +homepage="http://www.gnu.org/software/emacs/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33 +checksum=59b55194c9979987c5e9f1a1a4ab5406714e80ffcfd415cc6b9222413bc073fa # Package build options build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound" diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template index 21e6d88c541..c986bba09b7 100644 --- a/srcpkgs/embree/template +++ b/srcpkgs/embree/template @@ -1,17 +1,17 @@ # Template file for 'embree' pkgname=embree -version=2.14.0 +version=2.15.1 revision=1 only_for_archs="x86_64" build_style=cmake hostmakedepends="ispc" makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel libopenexr-devel libjpeg-turbo-devel libmagick-devel" short_desc="High Performance Ray Tracing Kernels" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://embree.github.io/" distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" -checksum=ace13512fb438210fb04962cc06a56920f709b084e27789594bd93326582a7ad +checksum=bb05001c5449a73dbf0873aea6a0f862080a0625842e9bd5e00b8e4e52e3c8c0 nopie=y diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template index 07ab79ef89d..c80907dc0d1 100644 --- a/srcpkgs/empathy/template +++ b/srcpkgs/empathy/template @@ -1,7 +1,7 @@ # Template file for 'empathy' pkgname=empathy -version=3.12.12 -revision=2 +version=3.12.13 +revision=1 disable_parallel_build=yes build_style=gnu-configure configure_args=" @@ -17,11 +17,11 @@ makedepends=" evolution-data-server-devel geocode-glib-devel folks-devel webkitgtk-devel libgudev-devel pulseaudio-devel cheese-devel enchant-devel NetworkManager-devel libchamplain-devel - gnutls-devel gsettings-desktop-schemas-devel geoclue2 iso-codes" -depends="gsettings-desktop-schemas>=3.12 geoclue2>=2.1 iso-codes" + gnutls-devel gsettings-desktop-schemas-devel geoclue2-devel iso-codes" +depends="gsettings-desktop-schemas>=3.12 iso-codes" short_desc="GNOME instant messaging client using the Telepathy framework" maintainer="Juan RP " homepage="http://live.gnome.org/Empathy" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=dda22adf38772d85cd7ff611bcc1a036a6b8625bc7d146c95d4bfcdbc3ecf7cb +checksum=b18c5e28cee570919ddd0e6aed7c138123a53a185fb569da9fbcc6bbc03b70a4 diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template index a66d0a4db74..0eac068494b 100644 --- a/srcpkgs/encfs/template +++ b/srcpkgs/encfs/template @@ -1,19 +1,18 @@ # Template file for 'encfs' pkgname=encfs -version=1.8.1 -revision=4 -build_style=gnu-configure -hostmakedepends="pkg-config perl automake gettext-devel libtool" -makedepends="fuse-devel libressl-devel librlog-devel boost-devel" +version=1.9.1 +revision=2 +build_style=cmake +hostmakedepends="pkg-config perl" +makedepends="fuse-devel libressl-devel gettext-devel" +depends="perl" # for encfssh short_desc="Encrypted filesystem in user-space" maintainer="Juan RP " license="GPL-3" homepage="http://www.arg0.net/encfs" distfiles="https://github.com/vgough/encfs/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=8a0257ff500c14244ee99acdd472696966796e2a0931e4a132191f14a666d5d1 -# AC_TRY_RUN prevents cross compile -nocross=yes +checksum=67203aeff7a06ce7be83df4948db296be89a00cffe1108a0a41c96d7481106a4 -pre_configure() { - autoreconf -fi +post_install() { + chmod +x ${DESTDIR}/usr/bin/encfssh } diff --git a/srcpkgs/engrampa/template b/srcpkgs/engrampa/template index 1a9be1b7e30..81098dc3ce8 100644 --- a/srcpkgs/engrampa/template +++ b/srcpkgs/engrampa/template @@ -1,15 +1,15 @@ # Template file for 'engrampa' pkgname=engrampa -version=1.16.0 +version=1.18.1 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0" +configure_args="--enable-magic --disable-schemas-compile --disable-packagekit" hostmakedepends="pkg-config intltool itstool glib-devel" makedepends="file-devel gtk+3-devel libcaja-devel libarchive-devel libSM-devel json-glib-devel" depends="desktop-file-utils" short_desc="Archive manipulator for MATE" maintainer="Juan RP " -license="LGPL-2" -homepage="http://mate-desktop.org" -distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=dd7f11d60693cb77691a589551bcaf4050d4921d996fbbbe3a61ed7fc4072efc +license="GPL-2" +homepage="https://mate-desktop.org" +distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=be7218078f13d715e35580d231c0b5090fac1210b9de83f93311079f39b8aabc diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template index f380804be05..4fc9f7891cd 100644 --- a/srcpkgs/enlightenment/template +++ b/srcpkgs/enlightenment/template @@ -1,6 +1,6 @@ # Template file for 'enlightenment' pkgname=enlightenment -version=0.21.6 +version=0.21.7 revision=1 nopie=yes lib32disabled=yes @@ -18,7 +18,7 @@ short_desc="Enlightenment desktop" maintainer="Juan RP " license="2-clause-BSD" distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=ed0714b54d692cbcec412bdb169e5360355347ce775d27d6ae0cee25111b563d +checksum=7643f7fd4aadaca44c886f21063987624c50d4c50266e87600e902a59b7c76f7 post_install() { # Use our native tools to shutdown/suspend. diff --git a/srcpkgs/entr/template b/srcpkgs/entr/template index 12230cf283c..bb3a9a84c9e 100644 --- a/srcpkgs/entr/template +++ b/srcpkgs/entr/template @@ -4,7 +4,7 @@ version=3.7 revision=1 build_style=gnu-makefile short_desc="A utility for running arbitrary commands when files change" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="ISC" homepage="http://entrproject.org" distfiles="$homepage/code/$pkgname-$version.tar.gz" diff --git a/srcpkgs/enventor/template b/srcpkgs/enventor/template index e05d3b3c57f..e30fba7e412 100644 --- a/srcpkgs/enventor/template +++ b/srcpkgs/enventor/template @@ -1,7 +1,7 @@ # Template file for 'enventor' pkgname=enventor -version=0.8.1 -revision=2 +version=1.0.0 +revision=1 lib32disabled=yes wrksrc="${pkgname}-${version}" hostmakedepends="pkg-config efl-devel" @@ -14,6 +14,4 @@ short_desc="Enlightenment's EDC editor with some convenient functions" maintainer="Juan RP " license="BSD" distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=973147c485a6bf31914f2845579e05f9f58a7a305baf5d9cad8ae506c01b6c02 - -broken="https://build.voidlinux.eu/builders/x86_64_builder/builds/25174/steps/shell_3/logs/stdio" +checksum=3d4e5dff4272cb5150b7219d8df66d29e3cda1d5129201abe5a4c392293fd23c diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template index b13f981c4f6..fa288536f08 100644 --- a/srcpkgs/eog-plugins/template +++ b/srcpkgs/eog-plugins/template @@ -1,6 +1,6 @@ # Template file for 'eog-plugins' pkgname=eog-plugins -version=3.16.5 +version=3.16.6 revision=1 lib32disabled=yes build_style=gnu-configure @@ -15,4 +15,4 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=9de42235cc7dabc4e4b228c1a27ead4ee386cf5a3cc75fdb7ea12355d408108a +checksum=51ca356a29bbedfc48ce3fd1de1efe9339af38020c301df79dae6b67cd34ed96 diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index 6304b5a78f2..0e1339f08e9 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,6 +1,6 @@ # Template file for 'eog' pkgname=eog -version=3.20.5 +version=3.24.1 revision=1 lib32disabled=yes build_style=gnu-configure @@ -17,7 +17,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/eog/${version%.*}/eog-$version.tar.xz" -checksum=e6e7c5a1aaf2508065e19f0669eb6c1028e8e04c7d3504b9027bd1e009731b3b +checksum=f51ee116e2c159fac1719e003a32e1cb6cbff51914fd1f6409f461a790ff27e7 if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" diff --git a/srcpkgs/eom/template b/srcpkgs/eom/template index 139eda946bd..84add018412 100644 --- a/srcpkgs/eom/template +++ b/srcpkgs/eom/template @@ -1,22 +1,22 @@ # Template file for 'eom' pkgname=eom -version=1.16.1 +version=1.18.1 revision=1 build_options="gir" build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-python $(vopt_enable gir introspection)" +configure_args="--disable-schemas-compile $(vopt_enable gir introspection)" hostmakedepends="pkg-config intltool itstool mate-common dbus-glib-devel $(vopt_if gir gobject-introspection)" makedepends="gtk+3-devel dbus-glib-devel exempi-devel lcms2-devel libexif-devel libjpeg-turbo-devel librsvg-devel mate-desktop-devel startup-notification-devel - mate-icon-theme" + libpeas-devel mate-icon-theme" depends="dbus mate-icon-theme" -short_desc="An image viewing and cataloging program for MATE" +short_desc="The MATE image viewer" maintainer="Juan RP " -license="LGPL-2" -homepage="http://mate-desktop.org" -distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ff6b2af557dec88e73e654f3a150f6dbe0123fe5ed28ad552dc83da96cb0d42f +license="GPL-2" +homepage="https://mate-desktop.org" +distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=3bc3ece3f1114faf39bd9896f73a4eb48a40a40ddcdd48503838f13d007c744a eom-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 75301132edd..f6455540002 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,6 +1,6 @@ # Template file for 'epiphany' pkgname=epiphany -version=3.22.6 +version=3.24.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-tests" @@ -9,7 +9,8 @@ hostmakedepends="which pkg-config intltool itstool gnome-doc-utils makedepends="nss-devel libsoup-gnome-devel libnotify-devel webkit2gtk-devel sqlite-devel libxslt-devel avahi-glib-libs-devel startup-notification-devel NetworkManager-devel gcr-devel - gnome-desktop-devel libsecret-devel libwnck-devel iso-codes" + gnome-desktop-devel libsecret-devel libwnck-devel iso-codes + json-glib-devel" depends="webkit2gtk>=2.6 gsettings-desktop-schemas>=3.14 ca-certificates hicolor-icon-theme desktop-file-utils iso-codes" short_desc="Intuitive GNOME web browser" @@ -17,4 +18,4 @@ maintainer="Juan RP " homepage="http://www.gnome.org/projects/epiphany/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=de7ea87dc450702bde620033f9e2ce807859727d007396d86b09f2b82397fcc2 +checksum=21255f8459eb80fc6e011fc6cac8fa61bb939d626117989495eeaeac994d89dc diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index a71c5c7abdb..6410c0628ab 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -1,7 +1,7 @@ # Template file for 'erlang' pkgname=erlang -version=19.2 -revision=1 +version=19.3 +revision=2 wrksrc=otp_src_${version} build_style=gnu-configure configure_args="--enable-smp-support @@ -10,13 +10,13 @@ hostmakedepends="perl libxslt" makedepends="ncurses-devel unixodbc-devel libressl-devel zlib-devel $(vopt_if x11 'wxWidgets-devel glu-devel')" short_desc="Concurrent functional programming language developed by Ericsson" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="Apache-2.0" homepage="http://www.erlang.org/" distfiles="http://www.erlang.org/download/otp_src_${version}.tar.gz http://www.erlang.org/download/otp_doc_man_${version}.tar.gz" -checksum="a016b3ef5dac1e532972617b2715ef187ecb616f7cd7ddcfe0f1d502f5d24870 - 8a76ff3bb40a6d6a1552fa5a4204c8a3c7d99d2ea6f12684f02d038b23ad25cb" +checksum="fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 + f8192ffdd7367083c055695eeddf198155da43dcc221aed1d870d1e3871dd95c" build_options="x11" diff --git a/srcpkgs/espeakup/files/espeakup/log/run b/srcpkgs/espeakup/files/espeakup/log/run new file mode 100755 index 00000000000..6d6f481c379 --- /dev/null +++ b/srcpkgs/espeakup/files/espeakup/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec logger -p daemon.debug -t espeakup diff --git a/srcpkgs/espeakup/files/espeakup/run b/srcpkgs/espeakup/files/espeakup/run new file mode 100644 index 00000000000..e758d4b7b9b --- /dev/null +++ b/srcpkgs/espeakup/files/espeakup/run @@ -0,0 +1,5 @@ +#!/bin/sh +exec 2>&1 +[ -r conf ] && . ./conf +modprobe speakup_soft start=1 || exit 1 +exec espeakup -d ${OPTS} diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template new file mode 100644 index 00000000000..aa5e2036295 --- /dev/null +++ b/srcpkgs/espeakup/template @@ -0,0 +1,16 @@ +# Template file for 'espeakup' +pkgname=espeakup +version=0.80 +revision=1 +short_desc="A lightweight connector for espeak and speakup" +maintainer="Rui Abreu Ferreira " +license="GPL-3" +homepage="https://github.com/williamh/espeakup" +distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz" +makedepends="libespeak-devel" +checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4" +build_style="gnu-makefile" + +post_install() { + vsv espeakup +} diff --git a/srcpkgs/etcd/patches/libs.patch b/srcpkgs/etcd/patches/libs.patch deleted file mode 100644 index 4e1ade8497c..00000000000 --- a/srcpkgs/etcd/patches/libs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- clientv3/balancer.go 2016-09-23 13:49:03.000000000 -0400 -+++ clientv3/balancer.go~ 2016-10-26 16:08:39.554660000 -0400 -@@ -66,7 +66,9 @@ - return sb - } - --func (b *simpleBalancer) Start(target string) error { return nil } -+//func (b *simpleBalancer) Start(target string) error { return nil } -+ -+func (b *simpleBalancer) Start(target string, cfg grpc.BalancerConfig) error { return nil } - - func (b *simpleBalancer) ConnectNotify() <-chan struct{} { - b.mu.Lock() diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template index f6e45662c38..2ca944e1278 100644 --- a/srcpkgs/etcd/template +++ b/srcpkgs/etcd/template @@ -1,23 +1,20 @@ # Template file for 'etcd' pkgname=etcd -version=3.0.15 -revision=3 +version=3.1.5 +revision=1 build_style=go short_desc="Distributed reliable key-value store" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="Apache-2.0" hostmakedepends="git" go_import_path="github.com/coreos/etcd" homepage="https://coreos.com/etcd/docs/latest/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=c21871f7e1454b1698ff29601a296f4b09365fac25bea45c0af21542d486c307 +checksum=d9019b45df696f1dae286a511bd28b03751e37343c752380318e2a13ac994318 conf_files="/etc/sv/etcd/conf" system_accounts="etcd" make_dirs="/var/lib/etcd 0755 etcd etcd" -# etcd/etcdmain/etcd.go:182: not enough arguments in call to daemon.SdNotify -broken="https://build.voidlinux.eu/builders/aarch64_builder/builds/2400/steps/shell_3/logs/stdio" - pre_build() { sed -i '/SupportPackageIsVersion3/d' etcdserver/etcdserverpb/rpc.pb.go } diff --git a/srcpkgs/etckeeper/template b/srcpkgs/etckeeper/template new file mode 100644 index 00000000000..cebc803fb0a --- /dev/null +++ b/srcpkgs/etckeeper/template @@ -0,0 +1,21 @@ +# Template file for 'etckeeper' +pkgname=etckeeper +version=1.18.6 +revision=1 +depends="git" +conf_files="/etc/etckeeper/etckeeper.conf" +build_style='gnu-makefile' +hostmakedepends="python bzrtools" +depends="git" +short_desc="Tools to store /etc in a git, mercurial, bazaar or darcs repository" +maintainer="Diogo Leal " +license="GPL-2" +homepage="https://etckeeper.branchable.com" +distfiles="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${pkgname}-${version}.tar.gz" +checksum=7db1a2b48c011b5e04ec95af559de8d1d243bdcdf6cd591b3b0b46d1f21e9602 +noarch=yes + +pre_install() { + sed -ni '/systemddir/!p' Makefile + sed -ni '/apt.conf/!p' Makefile +} diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template index c27c83956bd..7cbf3405693 100644 --- a/srcpkgs/ethtool/template +++ b/srcpkgs/ethtool/template @@ -1,6 +1,6 @@ # Template file for 'ethtool' pkgname=ethtool -version=4.8 +version=4.10 revision=1 build_style=gnu-configure short_desc="Utility for controlling network drivers and hardware" @@ -8,4 +8,4 @@ maintainer="Juan RP " homepage="http://www.kernel.org/pub/software/network/ethtool/" license="GPL-2" distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=403dfe288e2d8031eab0be3f5d0ca9128e120d61c52c3dc434474fa026eb4a43 +checksum=f0009726ecf34128b9a8238b71a652847dbc06bd1b877656699b0592b95c74ba diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template index aea0bd4b70c..3dd1a6caffd 100644 --- a/srcpkgs/ettercap/template +++ b/srcpkgs/ettercap/template @@ -1,7 +1,7 @@ # Template file for 'ettercap' pkgname=ettercap version=0.8.2 -revision=6 +revision=7 lib32disabled=yes build_style=cmake configure_args="-DENABLE_GTK=OFF" diff --git a/srcpkgs/eudev/patches/fix-remove_keyboard_lookup_key_def.patch b/srcpkgs/eudev/patches/fix-remove_keyboard_lookup_key_def.patch deleted file mode 100644 index f3257093c48..00000000000 --- a/srcpkgs/eudev/patches/fix-remove_keyboard_lookup_key_def.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/udev/udev-builtin-keyboard.c 2016-11-17 22:14:19.000000000 +0100 -+++ src/udev/udev-builtin-keyboard.c 2017-01-18 00:29:56.667779140 +0100 -@@ -28,7 +28,6 @@ - - #include "udev.h" - --static const struct key *keyboard_lookup_key(const char *str, unsigned len); - #include "keyboard-keys-from-name.h" - #include "keyboard-keys-to-name.h" - diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template index 284885b0d12..fe7033da0b6 100644 --- a/srcpkgs/eudev/template +++ b/srcpkgs/eudev/template @@ -3,8 +3,8 @@ _UDEV_VERSION="220" # compatible udev version provided pkgname=eudev -version=3.2.1 -revision=2 +version=3.2.2 +revision=1 conf_files="/etc/udev/udev.conf" build_style=gnu-configure configure_args="--enable-hwdb --enable-manpages --disable-introspection" @@ -15,7 +15,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://github.com/gentoo/eudev" distfiles="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz" -checksum=57e3d9e51cfefbdad431848ea0ad8ae1cde04928da42474f44bd200b12f5fe19 +checksum=3e4c56ec2fc1854afd0a31f3affa48f922c62d40ee12a0c1a4b4f152ef5b0f63 pre_configure() { autoreconf -fi diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index f1fad936692..d2544768937 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,13 +1,13 @@ # Template file for 'evince' pkgname=evince -version=3.22.1 +version=3.24.0 revision=1 short_desc="GNOME Document viewer for multiple document formats" maintainer="Juan RP " homepage="http://projects.gnome.org/evince/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=f3d439db3b5a5745d26175d615a71dffa1535235b1e3aa0b85d397ea33ab231c +checksum=043895af7bbd6f1b57f9ab8778e78cf9c0af5dfcc347eaa94a17bf864c04dc8f build_style=gnu-configure build_options="gir" diff --git a/srcpkgs/evolution-data-server/patches/cmake.patch b/srcpkgs/evolution-data-server/patches/cmake.patch new file mode 100644 index 00000000000..b97690d7e22 --- /dev/null +++ b/srcpkgs/evolution-data-server/patches/cmake.patch @@ -0,0 +1,13 @@ +--- CMakeLists.txt 2017-03-20 02:47:25.000000000 -0600 ++++ CMakeLists.txt 2017-04-05 18:02:54.871910269 -0600 +@@ -524,10 +524,6 @@ + CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv) + unset(CMAKE_REQUIRED_LIBRARIES) + +-if(NOT _correct_iconv) +- message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv") +-endif(NOT _correct_iconv) +- + # ****************************** + # Backtraces for debugging + # ****************************** diff --git a/srcpkgs/evolution-data-server/patches/iconv_10646.patch b/srcpkgs/evolution-data-server/patches/iconv_10646.patch deleted file mode 100644 index 1f42bdf5f3d..00000000000 --- a/srcpkgs/evolution-data-server/patches/iconv_10646.patch +++ /dev/null @@ -1,14 +0,0 @@ -Add a definition for ICONV_10646 in case it's missing - ---- camel/camel-iconv.h 2014-03-24 10:07:52.000000000 +0100 -+++ camel/camel-iconv.h 2015-06-01 08:41:44.271620227 +0200 -@@ -28,6 +28,9 @@ - #include - #include - #include -+#ifndef ICONV_10646 -+#define ICONV_10646 "iso-10646" -+#endif - - G_BEGIN_DECLS - diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 1e72d4fec88..60d55b92023 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,13 +1,9 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.22.5 +version=3.24.1 revision=1 -build_style=gnu-configure -configure_args="--with-openldap --disable-uoa - --with-krb5=${XBPS_CROSS_BASE}/usr - --with-nspr-includes=${XBPS_CROSS_BASE}/usr/include/nspr - --with-nss-includes=${XBPS_CROSS_BASE}/usr/include/nss - --disable-google-auth $(vopt_enable gir vala-bindings)" +build_style=cmake +configure_args="-DENABLE_GOOGLE_AUTH=OFF -DENABLE_UOA=OFF" hostmakedepends="pkg-config intltool flex glib-devel gperf $(vopt_if gir gobject-introspection)" makedepends="db-devel sqlite-devel mit-krb5-devel nss-devel libical-devel libsecret-devel libsoup-gnome-devel gcr-devel libldap-devel @@ -16,23 +12,33 @@ depends="libsoup-gnome>=2.46 libgweather>=3.12" short_desc="Centralized access to appointments and contacts" maintainer="Juan RP " license="GPL-2" -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Apps/Evolution" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=53d53b3618c238ec9d77f3866743a4b8db7e4153c5f14c5cf3eca2b21e91d392 +checksum=6344b8035e2bcc5cd404bc86e6d874cdf54102a8948aa0ab7b4e717d328881b0 +nocross=yes + +case "$XBPS_TARGET_MACHINE" in + aarch64*) broken="webkit2gtk broken for now";; +esac build_options="gir" if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi +if [ ! -z "$build_option_gir" ]; then + configure_args+=" -DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON" +fi + pre_configure() { - if [ "$CROSS_BUILD" ]; then - # Create iconv-detect.h for cross builds - echo '/* This is an auto-generated header, DO NOT EDIT! */' > iconv-detect.h - echo >>iconv-detect.h - echo '#define ICONV_ISO_D_FORMAT "iso-%d-%d"' >>iconv-detect.h - echo '#define ICONV_ISO_S_FORMAT "iso-%d-%s"' >>iconv-detect.h + if [ ! -d "build" ]; then + mkdir build fi + echo '/* This is an auto-generated header, DO NOT EDIT! */' > build/iconv-detect.h + echo >> build/iconv-detect.h + echo '#define ICONV_ISO_D_FORMAT "iso-%d-%d"' >> build/iconv-detect.h + echo '#define ICONV_ISO_S_FORMAT "iso-%d-%s"' >> build/iconv-detect.h + echo '#define ICONV_10646 "iso-10646"' >> build/iconv-detect.h } post_install() { # Fix broken pkg-config diff --git a/srcpkgs/evolution/patches/cmake.patch b/srcpkgs/evolution/patches/cmake.patch new file mode 100644 index 00000000000..dfb77111785 --- /dev/null +++ b/srcpkgs/evolution/patches/cmake.patch @@ -0,0 +1,13 @@ +--- CMakeLists.txt 2017-03-20 03:14:35.000000000 -0600 ++++ CMakeLists.txt 2017-04-06 15:05:22.473504016 -0600 +@@ -350,10 +350,6 @@ + CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv) + unset(CMAKE_REQUIRED_LIBRARIES) + +-if(NOT _correct_iconv) +- message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv") +-endif(NOT _correct_iconv) +- + # ****************************** + # Timezone checks + # ****************************** diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index aa4bdb4f4d8..9be60af6fd9 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,11 +1,10 @@ # Template file for 'evolution' pkgname=evolution -version=3.22.5 +version=3.24.1 revision=1 -build_style=gnu-configure -configure_args="--disable-pst-import --with-openldap --disable-bogofilter - --with-krb5=/usr --disable-schemas-compile --disable-static --disable-spamassassin - --disable-text-highlight --disable-gtkspell --disable-autoar --disable-libcryptui" +build_style=cmake +configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF + -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF" hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection" makedepends=" libgdata-devel webkit2gtk-devel evolution-data-server-devel @@ -17,9 +16,9 @@ depends="gtkhtml>=4.6 gnome-keyring gnome-icon-theme hicolor-icon-theme desktop- short_desc="Integrated mail, addressbook and calendaring for GNOME" maintainer="Juan RP " license="GPL-2" -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Apps/Evolution" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=e2f111f6c59fdd1fd2e5ea43aa7e081327285c336fadb1c0f6a912487001b1f0 +checksum=d2da4996285a3fe2eb48edf604772677e19ac91a44d2b776698141013c4c610f evolution-devel_package() { depends="GConf-devel gtkhtml-devel>=4.6.0 evolution-data-server-devel @@ -28,6 +27,5 @@ evolution-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/share/gtk-doc } } diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template index fb2c9f72c2c..a6583e7c323 100644 --- a/srcpkgs/execline/template +++ b/srcpkgs/execline/template @@ -1,6 +1,6 @@ # Template file for 'execline' pkgname=execline -version=2.2.0.0 +version=2.3.0.0 revision=1 build_style=gnu-configure makedepends="skalibs-devel" @@ -10,7 +10,7 @@ maintainer="bougyman " license="ISC" homepage="http://skarnet.org/software/execline/" distfiles="http://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=93bd744f2e3ad204cb89f147efdc6ca4e622f9c6bfc9895e0b2cb8b0480029de +checksum=a0ec43b8feba299cc1e5c65b1978ed76571afa595bc53165373e29a57468f425 conflicts="ImageMagick" # /usr/bin/import CFLAGS="-fPIC" diff --git a/srcpkgs/exfat-dkms/template b/srcpkgs/exfat-dkms/template index cc10c0c8e95..7d9c33ff913 100644 --- a/srcpkgs/exfat-dkms/template +++ b/srcpkgs/exfat-dkms/template @@ -5,7 +5,7 @@ revision=1 _commit=69713f6d20df08608111ea78742c6d37c1c9c81f wrksrc=exfat-nofuse-${_commit} short_desc="Exfat kernel driver (nofuse)" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://github.com/dorimanx/exfat-nofuse" distfiles="$homepage/archive/$_commit.tar.gz" diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index 367f3c3fe46..5a650cde7fa 100644 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -1,6 +1,6 @@ # Template file for 'exiftool' pkgname=exiftool -version=10.45 +version=10.50 revision=1 noarch=yes wrksrc="Image-ExifTool-${version}" @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://www.sno.phy.queensu.ca/~phil/exiftool/" license="Artistic, GPL-1" distfiles="http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz" -checksum=6259887eb3ee3efb50516462f26e4cbf8e1a26e3181cbf6d05da2bc868610665 +checksum=339dd8f771f673fd6c448f4a4b36cf50fe8e3bf884da95aef6cec1d182c0885b diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template index 6453a79f003..fa62a4de6d7 100644 --- a/srcpkgs/extrace/template +++ b/srcpkgs/extrace/template @@ -1,16 +1,15 @@ # Template file for 'extrace' pkgname=extrace -version=0.3 +version=0.3.1 revision=1 build_style=gnu-makefile short_desc="Trace exec(2) calls system-wide" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-2,BSD" homepage="https://github.com/chneukirchen/extrace" distfiles="https://github.com/chneukirchen/extrace/archive/v${version}.tar.gz" -checksum=d76ec065d6e928aa3dfe6ade05a74fe7153010ef732629fb9d72f03a32cb855a +checksum=cb8be256571dae29eaaf45715463c793e19c5dc6df2d3199ecaa61c2ca6c83ed post_install() { - sed '/^$/q' pwait.c >LICENSE vlicense LICENSE } diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index f4eefaec184..443877830f1 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,7 +1,7 @@ # Template file for 'facter' pkgname=facter -version=3.6.1 -revision=1 +version=3.6.2 +revision=4 build_style=cmake configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include" hostmakedepends="ruby-devel" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="Apache-2.0" homepage="http://puppetlabs.com/facter" distfiles="http://downloads.puppetlabs.com/$pkgname/$pkgname-$version.tar.gz" -checksum=cdd2c2dcd388870d76d9d215223eb0624264486c05d0429c74c082b5cc92d847 +checksum=2aee3575162df98f94d85091e409205bbf70077ddaef031d3653e77040b752fd pre_configure() { # Subdirectory does not exist (in distfile). diff --git a/srcpkgs/farbfeld/template b/srcpkgs/farbfeld/template index 6ec0c6d5e80..7486e8a160d 100644 --- a/srcpkgs/farbfeld/template +++ b/srcpkgs/farbfeld/template @@ -1,17 +1,24 @@ # Template file for 'farbfeld' pkgname=farbfeld -version=2 +version=3 revision=1 -build_style=gnu-makefile -make_install_args="MANPREFIX=/usr/share/man" makedepends="libpng-devel libjpeg-turbo-devel" short_desc="Suckless image format and conversion tools" maintainer="Duncaen " license="ISC" -homepage="http://git.suckless.org/farbfeld" +homepage="http://tools.suckless.org/farbfeld/" distfiles="http://dl.suckless.org/farbfeld/farbfeld-${version}.tar.gz" -checksum=a366e7628274fb9b4dc9508a7340a32b5e7557d99895b7ed7b5165241d613f58 +checksum=5b953b86a72d3feaedf62698532c8888e5f6e2f6363193a4cc8cee0e38c378ad -post_install() { +do_configure() { + sed -i "/CFLAGS/s|\-Os\$|$CFLAGS|" config.mk + sed -i "/LDFLAGS/s|\-s\$|$LDFLAGS|" config.mk + sed -i 's|$(LDFLAGS) $($\*\-LDFLAGS)|$($*-LDFLAGS) $(LDFLAGS)|' Makefile +} +do_build() { + make CC=$CC +} +do_install() { + make PREFIX=/usr MANPREFIX=/usr/share/man DESTDIR=$DESTDIR install vlicense LICENSE } diff --git a/srcpkgs/fbpdf/patches/mupdf-1.10.patch b/srcpkgs/fbpdf/patches/mupdf-1.10.patch deleted file mode 100644 index 298b37f3a79..00000000000 --- a/srcpkgs/fbpdf/patches/mupdf-1.10.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- mupdf.c.orig -+++ mupdf.c -@@ -33,10 +33,10 @@ - w = rect.x1 - rect.x0; - h = rect.y1 - rect.y0; - -- pix = fz_new_pixmap_with_bbox(doc->ctx, fz_device_rgb(doc->ctx), &bbox); -+ pix = fz_new_pixmap_with_bbox(doc->ctx, fz_device_rgb(doc->ctx), &bbox, 1); - fz_clear_pixmap_with_value(doc->ctx, pix, 0xff); - -- dev = fz_new_draw_device(doc->ctx, pix); -+ dev = fz_new_draw_device(doc->ctx, NULL, pix); - fz_run_page(doc->ctx, page, dev, &ctm, NULL); - fz_drop_device(doc->ctx, dev); - diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template index ee7b52d4cb1..a421fa60b93 100644 --- a/srcpkgs/fbpdf/template +++ b/srcpkgs/fbpdf/template @@ -1,20 +1,18 @@ # Template file for 'fbpdf' pkgname=fbpdf -version=0.0.20160408 -revision=2 -wrksrc="fbpdf-43ca240" +version=0.0.20161202 +revision=1 +wrksrc="fbpdf-e31a61b" build_style=gnu-makefile -makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel mupdf-devel" +makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel + mupdf-devel" short_desc="Small framebuffer PDF/DJVU viewer" -maintainer="Christian Neukirchen " -license="BSD" +maintainer="Leah Neukirchen " +license="ISC" homepage="http://repo.or.cz/w/fbpdf.git" -distfiles="http://repo.or.cz/fbpdf.git/snapshot/43ca240b0b92a160f724441278e969aef226b31c.tar.gz" -checksum=75ba53a14f132b42ce6020315c0af20293aa8e5327eecf110afadc6f1767c1a2 - -post_extract() { - sed -i 's/lopenjpeg/lopenjp2 -lharfbuzz/g' Makefile -} +distfiles="http://repo.or.cz/fbpdf.git/snapshot/e31a61bb7c00395817fc8b06c907398cf97e73f8.tar.gz" +checksum=4ba342d63e49558a19810fb905b67aa9dee5372c9f223b30fef35c2d6a67802b +LDFLAGS="-lmupdf -lfreetype -lopenjp2 -lharfbuzz -ljbig2dec -lz" do_install() { vbin fbpdf diff --git a/srcpkgs/fcron/template b/srcpkgs/fcron/template index 275737d4e58..16ae2784705 100644 --- a/srcpkgs/fcron/template +++ b/srcpkgs/fcron/template @@ -26,7 +26,7 @@ hostmakedepends="autoconf perl" makedepends="pam-devel readline-devel" depends="run-parts" short_desc="Feature-rich cron implementation" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://fcron.free.fr" distfiles="$homepage/archives/$pkgname-$version.src.tar.gz" diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template index 8f6b76f574c..180db1fb2d4 100644 --- a/srcpkgs/fdm/template +++ b/srcpkgs/fdm/template @@ -1,7 +1,7 @@ # Template file for 'fdm' pkgname=fdm version=1.9 -revision=4 +revision=5 build_style=gnu-configure CFLAGS="-DPCRE" configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no LIBS=-lpcre" diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template index 34de8c48234..81cc84a787f 100644 --- a/srcpkgs/feh/template +++ b/srcpkgs/feh/template @@ -1,6 +1,6 @@ # Template file for 'feh' pkgname=feh -version=2.18.2 +version=2.18.3 revision=1 hostmakedepends="pkg-config" makedepends="giblib-devel libcurl-devel libexif-devel @@ -11,7 +11,7 @@ maintainer="Juan RP " license="MIT" homepage="http://feh.finalrewind.org/" distfiles="${homepage}/feh-${version}.tar.bz2" -checksum=34be64648f8ada0bb666e226beac601f972b695c9cfa73339305124dbfcbc525 +checksum=d82f68c7a96e1860dab3584ed58bda69446b692ae79a4ca999018507da310563 do_build() { make ${makejobs} CC=$CC PREFIX=/usr exif=1 help=1 diff --git a/srcpkgs/ferm/template b/srcpkgs/ferm/template index 12d46257046..262bff90d1f 100644 --- a/srcpkgs/ferm/template +++ b/srcpkgs/ferm/template @@ -1,6 +1,6 @@ # Template file for 'ferm' pkgname=ferm -version=2.3.1 +version=2.4 revision=1 hostmakedepends="perl" depends="perl iptables" @@ -9,8 +9,8 @@ short_desc="Frontend for iptables" maintainer="johannes " license="GPL-2" homepage="http://ferm.foo-projects.org/" -distfiles="http://ferm.foo-projects.org/download/2.3/ferm-${version}.tar.gz" -checksum=8a5444e2844023798e5c681516253c1d3c948ad8aa3b93bd3ce8902945b38de9 +distfiles="http://ferm.foo-projects.org/download/2.4/ferm-${version}.tar.gz" +checksum=1293d56d6e9d3e3a389c54919fee5a4323ce81fc8b25eee8f3296a858410d470 do_install() { make install PREFIX=${DESTDIR}/usr diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template index 4c016a1ac6c..2d2f5fb3cbd 100644 --- a/srcpkgs/fetchmail/template +++ b/srcpkgs/fetchmail/template @@ -1,7 +1,7 @@ # Template file for 'fetchmail' pkgname=fetchmail version=6.3.26 -revision=10 +revision=11 build_style=gnu-configure configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="python-devel" diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 91ac9175388..fdbcf81e98e 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,17 +1,17 @@ # Template file for 'ffmpeg' pkgname=ffmpeg -version=3.2.4 -revision=2 +version=3.3 +revision=1 short_desc="Decoding, encoding and streaming software" maintainer="Juan RP " license="GPL-3" homepage="https://www.ffmpeg.org" distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz" -checksum=6e38ff14f080c98b58cf5967573501b8cb586e3a173b591f3807d8f0660daf7a +checksum=599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel - libXext-devel libXvMC-devel faad2-devel lame-devel libtheora-devel + libXext-devel libXvMC-devel libxcb-devel faad2-devel lame-devel libtheora-devel gnutls-devel libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel libcdio-paranoia-devel librtmp-devel freetype-devel libmodplug-devel speex-devel celt-devel harfbuzz-devel libass-devel opus-devel pulseaudio-devel @@ -25,7 +25,7 @@ build_options_default="v4l2" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) build_options_default+=" x265 vaapi vdpau vpx";; - armv7*|aarch64*) build_options_default+=" vpx" + arm*|aarch64*) build_options_default+=" vpx" esac do_configure() { @@ -52,7 +52,7 @@ do_configure() { --enable-libcdio --enable-version3 --enable-runtime-cpudetect \ --enable-libmp3lame --enable-libvorbis --enable-libxvid \ --enable-libx264 $(vopt_if vpx --enable-libvpx) --enable-libtheora \ - --enable-shared --enable-static --enable-x11grab \ + --enable-shared --enable-static --enable-libxcb \ --enable-libpulse --enable-libfreetype --enable-libmodplug \ --enable-libspeex --enable-libcelt --enable-libass \ --enable-libopus --enable-librtmp \ diff --git a/srcpkgs/fftw/template b/srcpkgs/fftw/template index 83606809ba1..3d22ab9f70b 100644 --- a/srcpkgs/fftw/template +++ b/srcpkgs/fftw/template @@ -1,16 +1,16 @@ # Template file for 'fftw' pkgname=fftw version=3.3.6 -revision=1 -wrksrc="${pkgname}-${version}-pl1" +revision=2 +wrksrc="${pkgname}-${version}-pl2" hostmakedepends="libtool automake" makedepends="libgomp-devel" short_desc="Library for computing the discrete Fourier transform (DFT)" maintainer="Juan RP " license="GPL-2" homepage="http://www.fftw.org/" -distfiles="${homepage}/fftw-${version}-pl1.tar.gz" -checksum=1ef4aa8427d9785839bc767f3eb6a84fcb5e9a37c31ed77a04e7e047519a183d +distfiles="${homepage}/fftw-${version}-pl2.tar.gz" +checksum=a5de35c5c824a78a058ca54278c706cdf3d4abba1c56b63531c2cb05f5d57da2 pre_configure() { sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac diff --git a/srcpkgs/figlet/template b/srcpkgs/figlet/template index 08ffc70870a..1c206ed8b21 100644 --- a/srcpkgs/figlet/template +++ b/srcpkgs/figlet/template @@ -1,7 +1,7 @@ # Template file for 'figlet' pkgname=figlet version=2.2.5 -revision=3 +revision=5 build_style=gnu-makefile make_install_args="prefix=/usr MANDIR=/usr/share/man" short_desc="Program for making large letters out of ordinary text" diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template index 1817b52f89e..518ffc796e1 100644 --- a/srcpkgs/file-roller/template +++ b/srcpkgs/file-roller/template @@ -1,6 +1,6 @@ # Template file for 'file-roller' pkgname=file-roller -version=3.22.3 +version=3.24.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-magic --disable-static" @@ -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=de858640632a0e22769b6b73d5b98527f3cfc2c83f99692063e352e41d533505 +checksum=f4b72dba69b1984d96a1a9a6c544a9f94e54a531612b299251ef2702e0b0ad21 diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template index 83740671ae9..30dbc69abe7 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -1,6 +1,6 @@ # Template file for 'filezilla' pkgname=filezilla -version=3.24.1 +version=3.25.2 revision=1 nocross=yes build_style=gnu-configure @@ -15,4 +15,4 @@ maintainer="Juan RP " license="GPL-2" homepage="http://filezilla-project.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/FileZilla_${version}_src.tar.bz2" -checksum=e6dd748c7ec067c1165683ebe81325ce6c561f4725963a9515494af346a30c2a +checksum=559b0adbc1aff862dddbce95ed8a4a854c7a255b1de79efba9eabe459381aacd diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template index c6da1dd4b17..1feac556d6f 100644 --- a/srcpkgs/fio/template +++ b/srcpkgs/fio/template @@ -1,6 +1,6 @@ # Template file for 'fio' pkgname=fio -version=2.18 +version=2.19 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=configure @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="GPL-2" homepage="https://github.com/axboe/fio" distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz" -checksum=f5ee5063254550a6b4fb14edf4bc44d905339568d327fedda06815247d84793e +checksum=61fb03a18703269b781aaf195cb0d7931493bbb5bfcc8eb746d5d66d04ed77f7 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) makedepends+=" libnuma-devel" diff --git a/srcpkgs/firebird/template b/srcpkgs/firebird/template index 3257704c8d6..636ab08072f 100644 --- a/srcpkgs/firebird/template +++ b/srcpkgs/firebird/template @@ -1,7 +1,7 @@ # Template file for 'firebird' pkgname=firebird version=2.5.6.27020 -revision=1 +revision=2 _build=0 wrksrc="${pkgname^}-${version}-${_build}" build_style=gnu-configure diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 04a14d7a3e3..57ae6a66bdf 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -1,6 +1,6 @@ # Template build file for 'firefox-esr'. pkgname=firefox-esr -version=45.7.0 +version=45.9.0 revision=1 wrksrc="firefox-${version}esr" short_desc="Lightweight gecko-based web browser" @@ -8,7 +8,7 @@ maintainer="Eivind Uggedal " homepage="https://www.mozilla.org/en-US/firefox/organizations/" license="MPL-1.1, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" -checksum=4b5610691d32b77dd0dec25902f0d19e530c184cedc11babb530621cbdd33143 +checksum=2afb02029e115fae65dbe1d9c562cbfeb761a6807338bbd30dbffba616cb2d20 only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes @@ -23,7 +23,7 @@ makedepends=" libevent-devel libnotify-devel libvpx-devel libXrender-devel startup-notification-devel dbus-glib-devel alsa-lib-devel hunspell-devel libXcomposite-devel libSM-devel libXScrnSaver-devel - libXt-devel libXdamage-devel $(vopt_if gtk3 gtk+3-devel)" + libXt-devel libXdamage-devel $(vopt_if gtk3 gtk+3-devel)" depends="nss>=3.21 desktop-file-utils hicolor-icon-theme" conflicts="firefox>=0" diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template index 8ddece3fa98..1bbeaec74ca 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-i18n' pkgname=firefox-i18n -version=51.0 +version=52.0.2 revision=1 build_style=meta homepage="https://www.mozilla.org/firefox/" @@ -132,93 +132,93 @@ _pkgtmpl() { } checksum=" -2db50aa5fe8866e0835316817a8f605dd517711fc59ac87eb1c27d259e1dcdb7 -b4ee7ec17f3b9334630ff35e01c1aad47a0f493306eefd21b7dceccb274053d5 -3d3a2396ab5083853e20b2cd3fa519642e6f4cd2b66cf446e80c7a794987c64a -3d93c078f8f89dd4993069fa673ceba70b3cc5be7c452afd37063b11e8f5dcbe -2ba58525cc4f1393015ddcecc286df6c1c1fbab69fc38e697a694625dc325e71 -267db3935e315e28c8fcfd3971b7885f7901294b90172e808fbcd28c2c26ae55 -7fc38d646f814b286c0ef2c8bbfd1a7b17c88d3c628c22c559cce018ab1ca461 -ced3d6568e3421dafe0b8cda07f7d29c5421e038d42bcac759458133a1f3b272 -94f1f7a8decc0cb8c4accd1826b8f335b16abbb259359566be5e25529998d349 -c02c9b776479800c2815811921d5c334d3079fad1b10b5668f1cad2883d40951 -ad0f3653a2f98487de066e7f2bfc5a3cb164e5a813863c0fda921ec496fa0363 -cfdcf39092ef00377d7beab3859b7de11174bf7c3654cca7b9734ac4b255e6c3 -1115b657c3899829009f4c8e553d2cba22fba271c5750a596920d81065d6dd77 -326ae3e466139567ed2877dbfb01fb696c7a02b3818c48e65923eb64df13c358 -bb4b595d981bbbc56058d41ce73e9f6666ab410d43b8bd49f899fcc941a2af80 -96b50da1eb50b38a83dd6e0065a79c069dce2c762ea4dbb87a47282bab68ebda -7206aa12af4f69d70f598438fb4c8ee528517f7595db5d1d1b51055e851f3a88 -4e10974ed2d4e260c9eb1205d131cdb1fdf9672584d330396e5f53a28b977cf0 -53a4d8c6175091a724a5c5d94d552ad761ae6aad2643d8f3a2d068a3661dc117 -011e683dfca482754bcf7a722ad46ec17a920aa012d8f238012c42f05687e5a9 -7f7a3fbb98c0b0411c81d8fb04f300f0548ddbdeb99a225a775c35742b372134 -91c8fdb94a50aaf34cbed5e319850ee6df09c9d2c1bb7d98ec3fbc575527938f -eb92618d4ce84735671bec8c9e7d8a1a310d1ce0648e259d8b547cb73ed31c5d -0f38d937e8d6e6560b1907ac8fc21e72c1daef9d87b244d9dfaf7e3ccdf1dc19 -bd828cdeed17fe2a606ed6bda40852b46537ea320741619dcfefc0c29878d40c -a14285e925cfcf01cde25cec6dd6fd2f7d90c78abc0f0734949a02a48f981e76 -dc3a1b1a50dae2885b24e8bdd58e17c67a108dfad4712f291007af4ddc5fe8cb -77f11998e4e5dae7b1e42a3d4601bd32c720df72496bb5b526ff05cd90a65301 -24b4d7ab975f624618ec524e0fee5a64b943d90cc339ab37af671efd9448f0c6 -5cf55b5a15eb77b13557646cb7db1963ebfe717e9ce291fea868005dac7d7174 -f461c631c33b90a738b7e158556408966f1a429f4bac27d01f14e6b823385f75 -eecfff13c273289228c20fb710847f74236e60088afbfd62368b9cb66f3b2b7c -1a43ec5bdc3355486d2db56ce77c21d8361a4745ddaaab82e3a13349d4f801aa -2fe646ccaa1cf4e5e2601459452e364f9bfccc0bb8ff37d5105505576d338e0a -b03faae59547ccea4b55a12ed67874eb86af4d9b6aa3c7b9a2f2c6a74194b6e7 -8be3e3530480fb9fa2b892dc027a78048d947b655c0b6db0e45b83de1288a068 -26b53d668cab518e1d350b875a0221148ce09c1fa7c0e5cd106b058532df925c -e1295088a34bc6d0c569c79cd2c7beb8f3f0574ff6f315b8825c060ba1bba3cb -92c52452dbcfbf1b5f65ab0f837441bc44c1170aca1bc686e5e64bbd6c5c8d36 -d50f96985e4a81f85ddc876359d1afc2dd1038ceffd95c2eddf3ffd704586951 -6a3db03de54e4e10bbf980081bac1e980327c8dcd43b2bb40f0bb38d20418b03 -97376eef6cfa37909206f3eec1546b61757762a6c3f9c8a1e936cb7e3654ec0c -3b4da4a9088352c30772d7dff4e4b723279b56883f43f046de9419574edf4b39 -bfd26d94fba685df3df36ec2e729cf9e24f4c4ff7d12731fc98a4aea48bcc944 -7373e4aa1bdc2a39518266db0b117c71b5438a0a72ef60eb50c84942942b2160 -5b4f91353db0c74e9af94ba74d0d31b0317b4af55c44a7d33ccc3ffea17e49ad -3a0f000fac7f542811b24b34d2aee0ed4749f1f7337afcd4fa2a9fd57b1e2660 -a9a4fdb1b2e153773d9bbef9fce05947d2313caaa608561b73932257704d953b -8da1fec9e5f5db030c17590c875aff0a100afd77db1aad7067fa3d931ed03b68 -b4ff63d51449460b758948bd8e73bc932d24b2e14501ee076bcae5b70892be3e -000ed1c4d96b3a8807ece3f502a900bcf3d8ba3889200d6d922e37bba8e135c4 -bf312dccb93b24038cbdff0941276c2704f54ea4588a80b9d7a337ed894cf5b7 -a8b4024791d910285dc9d763b3d6ec3cdf5289683beacd000fde122d79af3810 -2aa83c07862474156bee35da55ad1eefac9ff63624b65ef7543276a8d3f568f3 -34cc82b5ea5a5b16e87f70716dc32a37cac72cbb163e804b6c574035f299d67f -c1cbcebf3954409cab56825a020ad23c53f8814674d94e4b12dca6f361c13ac4 -ded68e952783c8048ba3d190fc97ef49675828b2de0ffbb92bd7e450c2e82ee3 -58466c629a402d0e5f050fceaa7a806605dabca3604f8cf8c0e335022370ebe4 -8558a01bbcd28a679b8808b579a73aeb95f27403b9aa19bcdd4f7d0188d077d8 -db1b8d37d3d77fc3ca0317b10db8e74255567b6c8f9026ab34cd866ce523489d -4915727a4314058a96d6ebb229112dceee9ddeea2968aacbe6420b905b2be1d6 -312cf883fa61415601ae510df828aad123db1f8d227f0f4612ecea4582d87ee3 -07b5f1fb9cdeaa232d00dfa37700b5553b18ed1d6a03d28fc91b188e5f350c66 -11c844e878c0ab1ccd7f7b8ba317702beb75bca7b64041d8a3694ba66ad92368 -7cc499b354635a0413bed4709530383c0f63529ad3e078dda11b4d550d186ceb -c7b5f436bafff1e062194f04036baff0737731775ec27fb1b7498ed69a8490bd -15e2743d9b401b119eb8f082be18e6b29f7002ab21f7e316d0738731917d556a -ab72ad3b2bbfa2303058cb889130141ab7c8c08aeb9a5b3fe1252d7426037452 -a6f5c484cb225ea7020f7480415b1f72853a971ba8c49c211b0678126b55ac61 -6cdf475cc23904f2c24de602c58a0f9bfdd08961b8b5dd6f1f9de91f83eb0190 -74792c022c5cbdeeb99d0588de585573c303acdab7d99837138ffaf588d234f5 -9c2516ef38104fbf62279bae439cdbbc15f79f8071f39dd1f59d5c67e949eaeb -6d0e717fed5f2d17ee75922d38b1f743b4618427e9eb157e0237972abc69b244 -8bdab7ebe72e9c03d740c1b8769f06e9cec48a6071c8af2588ccb52b59a280de -b6290e686bbe6680dea580fb13e2f49f05bd99a5f86c3ec23075a570684c7811 -7eb86699ca252c33cd8b0480e9430272b30496074b6d1ad85cb69dfb0aa3a4e4 -882c537350f8b715616619f016c9b83dce584e447e81841259153613791587d1 -56d8da862d4d06045b80a6922c53b7a65045ff01cb550a7ebd9a7d744b407808 -c165029f40839c68caa2d28f21991033e198ab83829383127a37aeacfd190aca -24774105439f44489ca6b474237958e0854b1990ea39b281c963e6f3931e7c3a -34a51884ba2a8dc8873cb92a79f9337ed4c689f7aafe9d5de759ca401f358091 -2b5a18643ce387ee7c5b9e94eb34a842c7c94f247109e2206dbbddd3fee92d9e -485d05b53d78f0d9cdab9ab85f008e64e03ee95744b233527d813fb233f9feaa -44a2655b3967c7806f490e98516102568b46f209e97c8598949e2ac37c10f39c -745c07248cd06abb4e5b991359e4709752116ecae312dd2f20e74abfe78a721d -bb08a8d7dc74ac27410023b64a68e4ca278f6c5e08a921d6fde03e83349992d6 -f8115f22024219571e56dfd14eb750b6f95cb7e9703cf4c2cacd0d179b78c966 -a27521d0f47d58cf075f75e24a63e1db7c7e26064a8f3a89549c504137210503 -4a520e048ae526c7728590d0babd73d63fc6948b5577325222454491e57b4ffd -9ec030d762c6d574a34ac141006e3a124e7b9b20005f5e9c08eda25e3864406a" +46a28dec74c400b26b894ff50e386bc4cd657d09450b0b2daa643fed234a49fe +c63b3bc898c1d05acfbc69cd98192568e8e69e66e54590a418ba5de9b05d2fd4 +d341e02116d166a57451a043eb8c1a33f528050483a54129c1a42b5a3257a205 +b20d225e90ae1d7641faafd80e7d0e53b811473410d45a21dd2fc2dd2b3b9a77 +ad300a4a43e6961a75bb50089427b292b53e90a02d5d4420aae364192e952d02 +bb39846af23b0e422be4727359233cc2df3f80751a24f0ff933b094300263a62 +238b8948b8dd429b96a25dced6968d4154749ade71ff2ccfdcda3ed15d694b69 +98adcbaf6f62e3dc8533ba9ad304f4e2183ab6cf93434522fe748b7bd28a5b50 +796e8ec22cf717829f59c697fa26d4ac22ad0f911f080a16d5fdf87774ee35cf +b90a849d2d23a223aa19f237861c793c50b0978a5129c89fd201270cf01fad6f +57c2d2b6b7a2ee58ac7955c3e3d1085cd8cfc8b308812907c8e2507ad5065501 +a41b344e55c7bff518188dace17be215cdb3ed003f7373b3ed5792ed3ad9aa93 +07a394409d6092353e621f526843c4dcf786375c022a46a074860d9d1bfaf974 +ea03a36c7717f33be663222fb8c6e9e4f0fb088b9383ec8a43c3262b6c7959d6 +63765555f13a30b00076139d9ae83666075c6ab82c2c3dd9c7cb03bf4bd30b83 +5ed4f0cd18880dad59be7bfa0231c9b6c09328de8299d955ca495558ad5d3ec3 +496b38aaffb4014fbc85052027c3c5fb91222264ec289c49f11b59b36b03097d +49b7a797e31288de30ec2b659940a96735bb658a7c5aa1a81e15d2708d117388 +84f3d361fbb320ecc6a19d2bc6b2ed0b6fafc28527a26cea8481f1e31e6f7873 +d7068492c5fe5fece28c6b02416c22ed77e33bc2bf62cf9a391fc0872b81a1ce +66001390175d8983abc372e5092fd03ce452b0eab00419cbcde263eccf372f1b +457b7309200df9d7850412740f9ca093eb84a1222792aaa87681ae2fab6e6d03 +4507c1d5fc872e8f7ece588811046e4a994de4f64590771d98287c2d4eeba1af +983b6af6b5576ae92305c9f3c3e59f361256535aff167f13c494b8e9baf36bae +4e001c2ca079d338fb113c8ac173094a6b94428c18f2a987cdc2b40b015bd2e1 +dc7e749e4f2ca9c6960b426b9e2f636202ac3a2cc3f1b1b06df0f03bb531e1aa +dd1d6fbea50903fd37f7f122b94b857d8d3c1ea45ad0f18735586294ef651273 +06b6fbf5bf090ca988ac646f7b7ad173f81fee4cbc06efa8aff60efd0f028b2d +e58153f1cd3110d1d3a165ce7301fb618782b17454e481bc222fe231bf58ed60 +19d9fbf829a8ecc937c505240be92ec8a0324f19d05bcabe5a56a3e1fefefb6a +4fa4505571ae92264ca42ca0a55cc59d137b37e77cdbb0b24fb21c56b9cce8c0 +698a02e232bcbc5c67a566f666f5e462bfa66c104015cbf6a6938185fdef85f0 +79f369ed2c47676fb8d13dae59499ca22bd33eb52a51ec661522070ab33c7f6e +0f3aa5e2f940c9d58a73e6388db14776f857cbd6fdaa84c2b6078f9fa2dba8fb +397c97d97183730701ed3295d7aebddf32b81207ade87c14018ffaeaad81337c +2a4ec23a859ed66eeac2da30a33333d53b69e995d5733e7ff8d4703d73a7f12d +9471b63f068a154896946d205062688b1f79646263431bbfa79d0e44c64fbe53 +9b92c412edcecee43756ac709c0cd382561485ba9b2fb6c2c5e84878ed274087 +cb9fe1f0eb9f08046c96a0a60781a5f87b9d3116b6b87b1a8cc131328b413ae4 +b27f5139ded670a4f58c7e2f55ee413758c9f46f9190e3398bffa8137588ae53 +3975a4028cf4137fbe23f8d3daab92ba0116deabccfe9feb00be9f8bb10e9cd7 +8039d71d12d43f98315d734f374461d17059b5f6d84c144f42e0e39c58bec2fd +e3c7e75bc1d445a110e31aa823f2d60ba8283ceb9f1a0fb381d635a8d653c479 +df1a7df836781b9d32ae33ebb3c01fd95b58ae75acf9e87655c7eb7114e4b08c +4ddcef44310b790c314e069556abb34fec9cc47fe25e0f89acfbdf2ae7c62725 +9d8227c27bee38324727681f4a6a58c2d111e38998b5c2e2be645d8a81ac5acb +aeb3aee8ff4066b8f5b6947c90b50daf49a42722b64ff219be7f050fbac500fa +392d2e44f60ed162a0c1c662549d796d907529a7f48468c064f02daef4843300 +9c61bfc7b21987c497941db6d8a7a8551e1af71deacd24b63971e000ecab3661 +631f3391dc3918369a5ef73982c020ed77566f06fef22a633828ae81b0f591c7 +34530b6a9d15c22a9edbe43ac4d4f76e8c2a352355646ecfa3acfad236f0f1af +61fc53a527bc4c5723c71dffffc2564e413f6cc8b7ad9ba1208474e7b26ded7c +b8b635b6d857a145d258fc7ef67609b4842c09de3857d3acb65058b1a9331dfa +7b951abdbff6b3f2b1b2f074e9c2ac8c23f222a3379a40f278c7a218d1b07f32 +aa25a8a6b7bbf585199c655aabbd017e4dc11c05389e180d9e7d0df6245b7384 +a255238cff530ffaef75dcfe45bf8a22b59fae6be781da5fac3302af8c509dd1 +ca6828ae04899e618e576288bd2a45582347e31d4b1d3e3e9e27ec479cf1e280 +02338b36d11863f61b1208a476b69dc0d1b4569500692a6041bce271d73ec488 +cccd132a530a4a0bd20e573a5b9eb01e20a6b214b4dcb4b0b5172d438ad09098 +8a06f9959060884b660b7e0c7d8ac5bca3af2cbede25fabcada56c450147cfe9 +cdd57ca6da4964c3d85db9ae5b66344ea37b462e5c6a8d67cab9c5984942b9b8 +575abeeaa27eadb22bb7db64455d2ea3a0e1e1489e4649084b5da888dd6a3ef5 +0eb0571fe1f2ce42b531e872a75e144905feb9df3a5222539cb57625c732b1c1 +f087cb5cfc1ca8a8099f1780eb4af54d45634f3b29413007cc43054c8ac0312b +36f8c050f21d068f1af7305258273257c66087849d1bb28970075057f6636434 +1da04e28aa10b9af5e4f964674116a14905480d346f054f0dbf6ee69d5543a7b +f1ffa9dbfef26c65187a76d85c88cdea8fd4351fa0a7deda8d53c9af5aa3b78a +e80cc845cd383cda82fdc2bb0e4e0ddeb4029558546d2bc03e3d8239eacb8463 +9e452c0562f4241302ffe682967d8635805c9733e2b7cbde2a57bca1df4d6e52 +914ad44b853ef8eb25c8c255619b467dba4329be5e76ece189de72c43d5e39b5 +07c385a14377d8eeba68406ab1dd40b8506147c55133bb604b048e1543bf1821 +60198c04cdab52fd275abe62f56e04289ae7a22f7d84cdf61a06589431557168 +619efb022f7eedefb5c3e3e9038bf6dd3e95fc73f1de8049b97631110560c93f +4e90ee6fba5bebd359541af331a0728131476e41e2b02d774f9da6b7e3e808df +21e46ea68503a8058188822dc774a9463ae60a60642bfa0b750c39c7f356aa19 +d7960ff34578f09f4d9caa5630d7550b22235f36ab2b4ac876dcdd0192a444a7 +bdc20ab4dacf72d375dc22677134e0b57cd79705e8a86dfcc9376e33b2fde193 +42769c0e78ae845c439a606480bfe38cf7a0f0428e692f1ccb54ae9490619a1d +91eaa2f539233af915e816d2d0c165828e1b877b7ada63e86b43207900e30473 +ebdfc72bec47311ccc4fb3c8d89de3ee82d6eba28a1e93a0864512f8a9df50fc +a7c06a0a0275ea9df6a496b158ae13f58943811e29ceeec98697ba3c3a1a2f51 +8b91189605191a3704754f6421f7c2fb0dabc1237d44ec18b222b197b069be43 +1309494d11a907096e04251978e090d85faa01af0672935cbef69e07ef513e83 +0e3b4defe3da096b0592fe2140bfa1a2f1d3471c6197f7c3fc3944f5a98c63ca +ce9e641feac457f804eb3654f8bbfbf57c8a5574185f09e13ed636b3b4b6cfe2 +649a1bd017a6230868ce99eb55dab3ad6e27e443ba96f0fd6382e095006aaa4a +7a8bc3e7c68853b2a32321a180d431522528bc2574cff6d37f565f58a32e2773 +bb5b38a0c4edf7b777efbff8c2f832ee9422247257d0cc25c5257122e76cdfb9 +b09d4dc5567d0e147c4d1ed623a65f44f60ad67601b7d285f5d5658901c594db +26061af5b560a3df1657f589741fd551c607142cb775981492bdfad888fc4cb8" diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig new file mode 100644 index 00000000000..ac3ab4f26d9 --- /dev/null +++ b/srcpkgs/firefox/files/mozconfig @@ -0,0 +1,48 @@ +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +ac_add_options --with-pthreads +# XXX build without system cairo see: +# - https://github.com/voidlinux/void-packages/issues/2308#issuecomment-135426813 +# - https://bugs.gentoo.org/show_bug.cgi?id=558150 +# ac_add_options --with-system-cairo +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-bz2 +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --with-system-icu +# XXX: the system's libpng doesn't have APNG support +ac_add_options --without-system-png +ac_add_options --enable-system-pixman +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi + +ac_add_options --with-nspr-prefix=${XBPS_CROSS_BASE}/usr +ac_add_options --with-nss-prefix=${XBPS_CROSS_BASE}/usr + +nspr_config_args=" + --libdir=${XBPS_CROSS_BASE}/usr/lib + --includedir=${XBPS_CROSS_BASE}/usr/include/nspr" + +nss_config_args=" + --libdir=${XBPS_CROSS_BASE}/usr/lib + --includedir=${XBPS_CROSS_BASE}/usr/include/nss" + +ac_add_options --disable-gconf +ac_add_options --disable-tests +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-elf-hack +ac_add_options --disable-install-strip +ac_add_options --disable-strip +ac_add_options --disable-profiling +ac_add_options --enable-optimize="$CFLAGS" +ac_add_options --enable-pie + +ac_add_options --enable-official-branding +ac_add_options --enable-safe-browsing +ac_add_options --enable-application=browser diff --git a/srcpkgs/firefox/files/stab.h b/srcpkgs/firefox/files/stab.h new file mode 100644 index 00000000000..6f70af39897 --- /dev/null +++ b/srcpkgs/firefox/files/stab.h @@ -0,0 +1,71 @@ +/* $OpenBSD: stab.h,v 1.3 2003/06/02 19:34:12 millert Exp $ */ +/* $NetBSD: stab.h,v 1.4 1994/10/26 00:56:25 cgd Exp $ */ + +/*- + * Copyright (c) 1991 The Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)stab.h 5.2 (Berkeley) 4/4/91 + */ + +#ifndef _STAB_H_ +#define _STAB_H_ + +/* + * The following are symbols used by various debuggers and by the Pascal + * compiler. Each of them must have one (or more) of the bits defined by + * the N_STAB mask set. + */ + +#define N_GSYM 0x20 /* global symbol */ +#define N_FNAME 0x22 /* F77 function name */ +#define N_FUN 0x24 /* procedure name */ +#define N_STSYM 0x26 /* data segment variable */ +#define N_LCSYM 0x28 /* bss segment variable */ +#define N_MAIN 0x2a /* main function name */ +#define N_PC 0x30 /* global Pascal symbol */ +#define N_RSYM 0x40 /* register variable */ +#define N_SLINE 0x44 /* text segment line number */ +#define N_DSLINE 0x46 /* data segment line number */ +#define N_BSLINE 0x48 /* bss segment line number */ +#define N_SSYM 0x60 /* structure/union element */ +#define N_SO 0x64 /* main source file name */ +#define N_LSYM 0x80 /* stack variable */ +#define N_BINCL 0x82 /* include file beginning */ +#define N_SOL 0x84 /* included source file name */ +#define N_PSYM 0xa0 /* parameter variable */ +#define N_EINCL 0xa2 /* include file end */ +#define N_ENTRY 0xa4 /* alternate entry point */ +#define N_LBRAC 0xc0 /* left bracket */ +#define N_EXCL 0xc2 /* deleted include file */ +#define N_RBRAC 0xe0 /* right bracket */ +#define N_BCOMM 0xe2 /* begin common */ +#define N_ECOMM 0xe4 /* end common */ +#define N_ECOML 0xe8 /* end common (local name) */ +#define N_LENG 0xfe /* length of preceding entry */ + +#endif /* !_STAB_H_ */ diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox/patches/fix-musl.patch new file mode 100644 index 00000000000..c32921d39e1 --- /dev/null +++ b/srcpkgs/firefox/patches/fix-musl.patch @@ -0,0 +1,11 @@ +--- tools/profiler/core/platform.h.orig ++++ tools/profiler/core/platform.h +@@ -56,7 +56,7 @@ + + // We need a definition of gettid(), but glibc doesn't provide a + // wrapper for it. +-#if defined(__GLIBC__) ++#if defined(__linux__) + #include + #include + static inline pid_t gettid() diff --git a/srcpkgs/firefox/patches/musl-pthread-setname.patch b/srcpkgs/firefox/patches/musl-pthread-setname.patch deleted file mode 100644 index 70f8d5fa422..00000000000 --- a/srcpkgs/firefox/patches/musl-pthread-setname.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- js/src/threading/posix/Thread.cpp.orig 2016-09-20 22:19:46.368622126 +0200 -+++ js/src/threading/posix/Thread.cpp 2016-09-20 22:23:35.495823534 +0200 -@@ -153,8 +153,10 @@ - rv = 0; - #elif defined(__NetBSD__) - rv = pthread_setname_np(pthread_self(), "%s", (void*)name); --#else -+#elif defined(__GLIBC__) - rv = pthread_setname_np(pthread_self(), name); -+#else -+ rv = 0; - #endif - MOZ_RELEASE_ASSERT(!rv); - } diff --git a/srcpkgs/firefox/patches/patch-xpcom_components_Module.h b/srcpkgs/firefox/patches/patch-xpcom_components_Module.h deleted file mode 100644 index 866c7b4a585..00000000000 --- a/srcpkgs/firefox/patches/patch-xpcom_components_Module.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-xpcom_components_Module.h,v 1.1 2016/02/06 22:13:22 ryoon Exp $ - -* Workaround for binutils/GNU ld 2.26 from NetBSD/amd64 7.99.26 - ---- xpcom/components/Module.h.orig 2016-01-23 23:23:51.000000000 +0000 -+++ xpcom/components/Module.h -@@ -125,7 +125,7 @@ struct Module - # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport) - # elif defined(__GNUC__) - # if defined(__ELF__) --# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("protected"))) -+# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("default"))) - # elif defined(__MACH__) - # define NSMODULE_SECTION __attribute__((section("__DATA, .kPStaticModules"), visibility("default"))) - # elif defined (_WIN32) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 02e1926ea21..f7b3b08363a 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,134 +1,107 @@ # Template build file for 'firefox'. pkgname=firefox -version=51.0.1 +version=53.0 revision=1 short_desc="Mozilla Firefox web browser" maintainer="Juan RP " homepage="https://www.mozilla.org/firefox/" license="MPL-2.0, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=30ba00ba716ea1eeda526e2ccc8642f8d18a836793fde50e87a4fcb9d9fccca9 +checksum=4ed1b23ea7c08f81a08817ddf3b4f06849e01420ee074008b6f390366e95b7d0 only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes lib32disabled=yes -build_options="gtk3 rust" -desc_option_gtk3="Build the GTK+3 toolkit UI" -desc_option_rust="Build rust components" - hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm $(vopt_if rust 'rust cargo')" makedepends=" - nss-devel libjpeg-turbo-devel libpng-devel gtk+-devel - icu-devel pixman-devel sqlite-devel pulseaudio-devel - libevent-devel libnotify-devel libvpx-devel libXrender-devel - startup-notification-devel dbus-glib-devel alsa-lib-devel - hunspell-devel libXcomposite-devel libSM-devel libXScrnSaver-devel - libXt-devel libXdamage-devel $(vopt_if gtk3 gtk+3-devel)" + nss-devel libjpeg-turbo-devel gtk+-devel icu-devel pixman-devel + sqlite-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel + hunspell-devel libXcomposite-devel libSM-devel libXt-devel libXdamage-devel + $(vopt_if alsa alsa-lib-devel) $(vopt_if dbus dbus-glib-devel) + $(vopt_if gtk3 gtk+3-devel) $(vopt_if pulseaudio pulseaudio-devel) + $(vopt_if startup_notification startup-notification-devel) + $(vopt_if xscreensaver libXScrnSaver-devel)" depends="nss>=3.27 desktop-file-utils hicolor-icon-theme" conflicts="firefox-esr>=0" -build_options_default="gtk3" +build_options="alsa dbus gtk3 rust pulseaudio startup_notification xscreensaver" +build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensaver" + +desc_option_gtk3="Build the GTK+3 toolkit UI" +desc_option_rust="Build rust components" + case "$XBPS_TARGET_MACHINE" in x86_64*) build_options_default+=" rust" ;; esac -if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then - # Append CFLAGS and CXXFLAGS to set work around code which gcc6 would - # otherwise regard as out-of-specification and allow it to produce a - # working program. - CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" - CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" -fi - post_extract() { - [ ! -d "${wrkdrc}/xbps-build" ] && mkdir -p "${wrksrc}/xbps-build" -} -pre_configure() { case "$XBPS_TARGET_MACHINE" in *-musl) - $XBPS_FETCH_CMD http://git.alpinelinux.org/cgit/aports/plain/community/firefox-esr/stab.h - mv stab.h toolkit/crashreporter/google-breakpad/src/ + # fix musl rust triplet sed -i "s/\(x86_64-unknown-linux\)-gnu/\1-musl/" build/moz.configure/rust.configure + cp "${FILESDIR}/stab.h" toolkit/crashreporter/google-breakpad/src/ ;; esac - # configure script misdetects the preprocessor without an optimization level - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' old-configure - # Google API key (see http://www.chromium.org/developers/how-tos/api-keys) # Note: This is for Void Linux use ONLY. - _google_api_key="AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" - echo -n "$_google_api_key" > google-api-key + echo -n "AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" >google-api-key } -do_configure() { - local _args +do_build() { + cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig" case "$XBPS_TARGET_MACHINE" in - *-musl) # XXX gold linking with --hash-style=sysv results in unhidden symbols - # XXX see https://sourceware.org/ml/binutils/2014-09/msg00230.html - # XXX disable jemalloc. - _args+=" --disable-jemalloc --enable-gold=no" + *-musl) + echo "ac_add_options --disable-jemalloc" >>.mozconfig + echo "ac_add_options --enable-gold=no" >>.mozconfig ;; esac if [ "$CROSS_BUILD" ]; then - _args+=" --target=$XBPS_CROSS_TRIPLET --disable-jemalloc" - - # Make config/system_wrappers/alsa/alsalib.h and pulse/pulse.h find - # the required includes. Set system nspr and nss include paths. export HOST_CFLAGS="${XBPS_CFLAGS}" export HOST_CXXFLAGS="${XBPS_CXXFLAGS}" - export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/alsa \ - -I${XBPS_CROSS_BASE}/usr/include/pulse \ - -I${XBPS_CROSS_BASE}/usr/include/nspr \ - -I${XBPS_CROSS_BASE}/usr/include/nss" - export CXXFLAGS+=" ${CFLAGS}" - export LDFLAGS+=" -L${XBPS_CROSS_BASE}/usr/lib" - export ac_cv_sqlite_secure_delete=yes \ ac_cv_sqlite_threadsafe=yes \ ac_cv_sqlite_enable_fts3=yes \ ac_cv_sqlite_dbstat_vtab=yes \ ac_cv_sqlite_enable_unlock_notify=yes \ ac_cv_prog_hostcxx_works=1 + echo "ac_add_options --target=$XBPS_CROSS_TRIPLET" >>.mozconfig + fi + + if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then + # Append CFLAGS and CXXFLAGS to set work around code which gcc6 would + # otherwise regard as out-of-specification and allow it to produce a + # working program. + export CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" + export CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" fi - mkdir -p /usr/lib/firefox export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox" - cd xbps-build - # XXX build without --system-cairo. See: - # - https://github.com/voidlinux/void-packages/issues/2308#issuecomment-135426813 - # - https://bugs.gentoo.org/show_bug.cgi?id=558150 - SHELL=/bin/bash ../configure --prefix=/usr \ - --with-system-nspr --with-system-nss --with-system-bz2 \ - --with-system-jpeg --with-system-zlib --without-system-png \ - --with-system-libevent --with-system-libvpx \ - --enable-system-pixman --enable-system-hunspell --enable-system-sqlite \ - --enable-system-ffi --enable-startup-notification --enable-gio \ - --with-pthreads --enable-official-branding --enable-safe-browsing \ - --disable-debug --disable-gconf --disable-crashreporter --disable-updater \ - --disable-tests --disable-elf-hack --with-system-icu --enable-pulseaudio \ - --with-nspr-prefix=${XBPS_CROSS_BASE}/usr \ - --with-nss-prefix=${XBPS_CROSS_BASE}/usr \ - --with-google-api-keyfile="${wrksrc}/google-api-key" \ - --enable-optimize="$CFLAGS" --disable-strip --disable-install-strip \ - --enable-pie --disable-profiling $(vopt_enable rust) \ - --enable-application=browser \ - --enable-default-toolkit=$(vopt_if gtk3 'cairo-gtk3' 'cairo-gtk2') ${_args} -} -do_build() { if [ "$SOURCE_DATE_EPOCH" ]; then - mozdate="MOZ_BUILD_DATE=$(date --date "@$SOURCE_DATE_EPOCH" "+%Y%m%d%H%M%S")" + export MOZ_BUILD_DATE=$(date --date "@$SOURCE_DATE_EPOCH" "+%Y%m%d%H%M%S") fi - cd xbps-build - SHELL=/bin/bash make ${mozdate} ${makejobs} + + export MOZ_MAKE_FLAGS="${makejobs}" + + cat <>.mozconfig +ac_add_options --with-google-api-keyfile="${wrksrc}/google-api-key" +ac_add_options --enable-default-toolkit=cairo-gtk$(vopt_if gtk3 '3' '2') +ac_add_options $(vopt_enable alsa) +ac_add_options $(vopt_enable dbus) +ac_add_options $(vopt_enable dbus necko-wifi) +ac_add_options $(vopt_enable pulseaudio) +ac_add_options $(vopt_enable rust) +ac_add_options $(vopt_enable startup_notification startup-notification) +! + + make -f client.mk build } do_install() { - cd xbps-build - make DESTDIR=${DESTDIR} install + make -f client.mk DESTDIR="$DESTDIR" install vinstall ${FILESDIR}/vendor.js 644 usr/lib/firefox/browser/defaults/preferences vinstall ${FILESDIR}/firefox.desktop 644 usr/share/applications diff --git a/srcpkgs/firejail/template b/srcpkgs/firejail/template index e63ebf9e1ba..2e5284b82e8 100644 --- a/srcpkgs/firejail/template +++ b/srcpkgs/firejail/template @@ -1,6 +1,6 @@ # Template file for 'firejail' pkgname=firejail -version=0.9.44.8 +version=0.9.44.10 revision=1 build_style=gnu-configure conf_files="/etc/firejail/*" @@ -9,10 +9,8 @@ maintainer="Duncaen " license="GPL-2" homepage="https://firejail.wordpress.com" distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz" -checksum=4ca0bc08bb2fdb2ee29f9f086bddbe37f7e62a4325f3facbe1b947bb6c24ee62 +checksum=eccb6f8ace71142253a1ed0e6902bbb3dd560d34bb4785ff1e7d01f0263ade34 case "$XBPS_TARGET_MACHINE" in - arm*) - configure_args+=" --disable-seccomp" - ;; +arm*) configure_args+=" --disable-seccomp" ;; esac diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template index fa37030b63b..54d05a08d78 100644 --- a/srcpkgs/flannel/template +++ b/srcpkgs/flannel/template @@ -1,16 +1,16 @@ # Template file for 'flannel' pkgname=flannel -version=0.7.0 -revision=3 +version=0.7.1 +revision=1 build_style=go short_desc="Etcd backed network fabric for containers" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " depends="etcd" license="Apache-2.0" go_import_path="github.com/coreos/flannel" homepage="https://$go_import_path" distfiles="$homepage/archive/v${version}.tar.gz" -checksum=16764a5bdceb46ca2cdce4a88c4974fba6f1ed3e58003f5d71447f0f3f2b631a +checksum=f8b837bc042c917cd37cfe131132ba1fde5268fadb7632da9c16f57d0905161b pre_build() { CGO_CFLAGS="${CGO_CFLAGS/-O2/}" # Disable optimizations because of a cgo bug in Go 1.6 diff --git a/srcpkgs/flatpak/INSTALL b/srcpkgs/flatpak/INSTALL new file mode 100644 index 00000000000..11be0c9bf53 --- /dev/null +++ b/srcpkgs/flatpak/INSTALL @@ -0,0 +1,8 @@ +#!/bin/sh +# +# This scripts setups directories in /var/lib/flatpak. +# + +case "${ACTION}" in +post) flatpak remote-list >/dev/null ;; +esac diff --git a/srcpkgs/flatpak/patches/musl-macros.patch b/srcpkgs/flatpak/patches/musl-macros.patch new file mode 100644 index 00000000000..a810d49d334 --- /dev/null +++ b/srcpkgs/flatpak/patches/musl-macros.patch @@ -0,0 +1,15 @@ +--- config.h.in.orig ++++ config.h.in +@@ -151,3 +151,12 @@ + + /* Define to 1 if you need to in order for `stat' and other things to work. */ + #undef _POSIX_SOURCE ++ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template new file mode 100644 index 00000000000..e00d44b7d70 --- /dev/null +++ b/srcpkgs/flatpak/template @@ -0,0 +1,21 @@ +# Template file for 'flatpak' +pkgname=flatpak +version=0.9.3 +revision=1 +build_style=gnu-configure +configure_args="--disable-documentation --with-system-bubblewrap" +hostmakedepends="bubblewrap libxslt pkg-config" +makedepends="elfutils-devel fuse-devel glib-devel gpgme-devel json-glib-devel + libarchive-devel libcap-devel libostree-devel libseccomp-devel libsoup-devel + libXau-devel polkit-devel" +depends="bubblewrap" +short_desc="Application sandboxing and distribution framework" +maintainer="Duncaen " +license="LGPL-2.1" +homepage="http://flatpak.org/" +distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz" +checksum=a842e1ee03178a5f4236c39786433f6f822d22595a9ef4525004a6c72b4b3846 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" glib-devel" +fi diff --git a/srcpkgs/flightgear/patches/musl-fix_execinfo_h.patch b/srcpkgs/flightgear/patches/musl-fix_execinfo_h.patch new file mode 100644 index 00000000000..d6fc140d42e --- /dev/null +++ b/srcpkgs/flightgear/patches/musl-fix_execinfo_h.patch @@ -0,0 +1,22 @@ +--- src/Main/bootstrap.cxx 2017-03-17 09:52:07.474706542 +0100 ++++ src/Main/bootstrap.cxx 2017-03-17 09:53:40.361793507 +0100 +@@ -141,7 +141,7 @@ + } + #endif + +-#if defined(__GNUC__) ++#if defined(__GNUC__) && defined(__GLIBC__) + #include + #include + void segfault_handler(int signo) { +@@ -244,8 +244,10 @@ + + signal(SIGPIPE, SIG_IGN); + # ifndef NDEBUG ++# ifdef __GLIBC__ + signal(SIGSEGV, segfault_handler); + # endif ++# endif + #endif + + _bootstrap_OSInit = 0; diff --git a/srcpkgs/flightgear/patches/musl-fix_feenableexcept.patch b/srcpkgs/flightgear/patches/musl-fix_feenableexcept.patch new file mode 100644 index 00000000000..2b967478e4b --- /dev/null +++ b/srcpkgs/flightgear/patches/musl-fix_feenableexcept.patch @@ -0,0 +1,11 @@ +--- src/FDM/JSBSim/JSBSim.cpp 2017-03-01 21:06:31.000000000 +0100 ++++ src/FDM/JSBSim/JSBSim.cpp 2017-03-17 09:49:13.115544107 +0100 +@@ -287,7 +287,7 @@ + _clearfp(); + _controlfp(_controlfp(0, 0) & ~(_EM_INVALID | _EM_ZERODIVIDE | _EM_OVERFLOW), + _MCW_EM); +-#elif defined(__GNUC__) && !defined(sgi) && !defined(__APPLE__) ++#elif defined(__GNUC__) && !defined(sgi) && !defined(__APPLE__) && defined(__GLIBC__) + feenableexcept(FE_DIVBYZERO | FE_INVALID); + #endif + diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index 2b154d4796d..1d96a715d9e 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -1,13 +1,13 @@ # Template file for 'flightgear' pkgname=flightgear -version=2016.4.4 +version=2017.1.3 revision=1 build_style=cmake configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata" hostmakedepends="fltk pkg-config" makedepends="MesaLib-devel boost-devel freealut-devel libfreeglut-devel fltk-devel - libgsm-devel speex-devel sqlite-devel osg-devel plib-devel libcurl-devel simgear - $(vopt_if qt qt5-devel)" + libgsm-devel glew-devel speex-devel sqlite-devel osg-devel plib-devel libcurl-devel + simgear $(vopt_if qt qt5-devel)" depends="flightgear-data>=${version}" short_desc="Sophisticated flight wimulator" maintainer="Jürgen Buchmüller " @@ -16,9 +16,10 @@ homepage="http://www.flightgear.org/" distfiles=" $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2 $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/FlightGear-${version}-data.tar.bz2" +_mirror=http://mirror.netcologne.de/gentoo/distfiles checksum=" - d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815f4444dfafc - 3dfd4b82c99a8bf4b81dd31846efce52ed417be180eaa71020ccc914f9a49668" + 3d7cb2b4b1d60b80b0613222b1fc7b6db665eddaf68d7080c07cdedcb544b0ad + bf35d9a15be9e7bd1c286eee879251e0907a3fb5cca4e7d1fdfbe67690345365" case "$XBPS_TARGET_MACHINE" in aarch64-musl) diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template index 2add1d04bfa..0f835c03daf 100644 --- a/srcpkgs/flint/template +++ b/srcpkgs/flint/template @@ -1,13 +1,13 @@ # Template file for 'flint' pkgname=flint version=0.0.4.20160114 -revision=4 +revision=5 _commit=0a4fec3268ca19c5f8ed2f4904b878934a92a060 wrksrc="$pkgname-$_commit" build_style=go hostmakedepends="git-perl" short_desc="Check your project for common sources of contributor friction" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="MIT" go_import_path="github.com/pengwynn/flint" homepage="https://${go_import_path}" diff --git a/srcpkgs/flow/template b/srcpkgs/flow/template index ee41897f259..8402e9c8ce3 100644 --- a/srcpkgs/flow/template +++ b/srcpkgs/flow/template @@ -1,6 +1,6 @@ # Template file for 'flow' pkgname=flow -version=0.41.0 +version=0.44.1 revision=1 only_for_archs="x86_64" build_style=gnu-makefile @@ -11,7 +11,7 @@ license="3-clause-BSD" homepage="http://flowtype.org/" _changelog="https://github.com/facebook/flow/releases" distfiles="https://github.com/facebook/${pkgname}/archive/v${version}.tar.gz" -checksum=e9169195126313e4576a7833eb1cdce50d94558b01fd92a0679c9f1dc5cbb3f1 +checksum=2dbe1c863ea8c594dfde8e2924b32033336f31f039d61ab07e276467195c2028 nopie=yes do_install() { diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template index 87290a47144..2c72af51c30 100644 --- a/srcpkgs/folks/template +++ b/srcpkgs/folks/template @@ -1,7 +1,7 @@ # Template file for 'folks' pkgname=folks version=0.11.3 -revision=1 +revision=2 build_style=gnu-configure build_options="gir" configure_args=" diff --git a/srcpkgs/font-fontin/template b/srcpkgs/font-fontin/template index 043dbe1df3c..902ad1597b8 100644 --- a/srcpkgs/font-fontin/template +++ b/srcpkgs/font-fontin/template @@ -9,7 +9,7 @@ font_dirs="/usr/share/fonts/OTF/" short_desc="A font designed to be used at small sizes" homepage="http://www.exljbris.com" license="EULA:$homepage/eula.html" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " distfiles="$homepage/dl/fontin_pc.zip $homepage/dl/FontinSans_49.zip" checksum="ddbb4ba57d0ab7d1af9d511de8e68d0fab9beec0c03eaf9c968f180b96100aa7 diff --git a/srcpkgs/font-go-ttf/template b/srcpkgs/font-go-ttf/template index ff172235871..5dbf918817a 100644 --- a/srcpkgs/font-go-ttf/template +++ b/srcpkgs/font-go-ttf/template @@ -1,15 +1,15 @@ # Template file for 'font-go-ttf' pkgname=font-go-ttf -version=0.0.20161117 -revision=2 -_gitrev=b7f8df6bc082334698d4505fb85fa05e99156b72 +version=0.0.20170330 +revision=1 +_gitrev=f03a046406d4d7fbfd4ed29f554da8f6114049fc wrksrc="image-${_gitrev}" short_desc="A typeface designed for go source code" maintainer="Michael Gehring " license="BSD" homepage="https://blog.golang.org/go-fonts" distfiles="https://github.com/golang/image/archive/${_gitrev}.tar.gz" -checksum=41c620e40e47c3912ca87b4488b8936b6773761bc2388f0797b39cf5a6ad77e1 +checksum=0bf07c87451c69540f2ebf85d0602393cff5b0c18e91b4d0104d1095070dcc71 do_install() { cd font/gofont/ttfs diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template index 8324b37d5a1..1880ec57344 100644 --- a/srcpkgs/font-iosevka/template +++ b/srcpkgs/font-iosevka/template @@ -1,6 +1,6 @@ # Template file for 'font-iosevka' pkgname=font-iosevka -version=1.10.5 +version=1.12.5 revision=1 create_wrksrc=yes noarch="yes" @@ -11,12 +11,12 @@ short_desc="A slender monospace sans-serif and slab-serif typeface" maintainer="Diogo Leal " license="SIL Open Font License" homepage="https://be5invis.github.io/Iosevka/" -distfiles="https://github.com/be5invis/Iosevka/releases/download/v${version}/01.iosevka-${version}.zip" -checksum=ec7971c7acdb99a9ea71fa5e1458830d4be720b2eee30a269b09d62b410f68db +distfiles="https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip" +checksum=d173e70f6ac479e84682b5b286e147313506cab211b70413cf9a3f0b66356f68 do_install() { vmkdir usr/share/fonts/TTF - vcopy *.ttf usr/share/fonts/TTF + vcopy *.ttc usr/share/fonts/TTF $XBPS_FETCH_CMD https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENSE.md vlicense LICENSE.md } diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template index af0323f3e17..0d0746bb20e 100644 --- a/srcpkgs/forego/template +++ b/srcpkgs/forego/template @@ -1,13 +1,13 @@ # Template file for 'forego' pkgname=forego -version=20170111202937 -revision=3 +version=20170327195458 +revision=2 build_style=go hostmakedepends="git mercurial" short_desc="A process supervisor in Go" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="Apache-2.0" go_import_path="github.com/ddollar/forego" homepage="https://$go_import_path" distfiles="$homepage/archive/$version.tar.gz" -checksum=ceac6c3c5b1a12c37979e883843a324b07e05ec0960198c1a32980fdb79d7d25 +checksum=8a9bdff7f3d62ba64e9a8bb7fe619223e2fb20af6aff18f618ff2703a5bf1860 diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template index 78ade2d89a4..2484aa9632b 100644 --- a/srcpkgs/fossil/template +++ b/srcpkgs/fossil/template @@ -1,8 +1,7 @@ # Template file for 'fossil' pkgname=fossil -version=1.37 +version=2.2 revision=1 -wrksrc="Fossil_2017-01-16_205854_1669115ab9" build_style=configure hostmakedepends="tcl" makedepends="zlib-devel libressl-devel readline-devel sqlite-devel" @@ -10,8 +9,8 @@ short_desc="Simple, high-reliability, distributed software configuration managem maintainer="Juan RP " license="2-clause-BSD" homepage="https://www.fossil-scm.org" -distfiles="https://www.fossil-scm.org/index.html/uv/download/fossil-src-${version}.tar.gz" -checksum=81c19e81c4b2b60930bab3f2147b516525c855924ccc6d089748b0f5611be492 +distfiles="https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" +checksum=9b8f82196eb89e4a2e82b4bcc51e314ae509a22c37073a18a0b325f11c53cf71 do_configure() { ./configure --prefix=/usr --disable-internal-sqlite diff --git a/srcpkgs/fox/patches/fix-cross-musl.patch b/srcpkgs/fox/patches/fix-cross-musl.patch deleted file mode 100644 index 27d938e45de..00000000000 --- a/srcpkgs/fox/patches/fix-cross-musl.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix an obvious typo. - ---- src/FXString.cpp 2016-06-16 06:16:00.000000000 +0200 -+++ src/FXString.cpp 2016-11-01 18:16:42.717595139 +0100 -@@ -2365,7 +2365,7 @@ - #else - va_list ag; - x: va_copy(ag,args); -- result=vsnprintf(str,length()+1,fmt,a); -+ result=vsnprintf(str,length()+1,fmt,ag); - va_end(ag); - if(result<0){ length(FXMAX(64,length()*2)); goto x; } - if(length()" homepage="http://www.fox-toolkit.org/" license="LGPL-2.1, MIT" distfiles="http://ftp.fox-toolkit.org/pub/fox-$version.tar.gz" -checksum=8e57af9801a3400dbecf34927e871896ff4198ab72c1a3a5e4e27258a3a47d1b +checksum=960f16a8a69d41468f841039e83c2f58f3cb32622fc283a69f20381abb355219 CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2" diff --git a/srcpkgs/fpc/template b/srcpkgs/fpc/template index a05d2d0a747..84270d914f6 100644 --- a/srcpkgs/fpc/template +++ b/srcpkgs/fpc/template @@ -1,6 +1,6 @@ # Template file for 'fpc' pkgname=fpc -version=3.0.0 +version=3.0.2 revision=1 create_wrksrc=yes build_wrksrc="${pkgname}build-${version}" @@ -8,19 +8,22 @@ conf_files="/etc/fpc.cfg /etc/fppkg.cfg" hostmakedepends="rpmextract" makedepends="ncurses-devel zlib-devel expat-devel" short_desc="Free Pascal Compiler" -maintainer="Jakub Skrzypnik " +maintainer="Leah Neukirchen " license="GPL-2, LGPL-2.1, FPC-FPR" homepage="http://freepascal.org/" distfiles="http://gd.tuwien.ac.at/languages/pascal/${pkgname}/dist/${version}/source/${pkgname}build-${version}.tar.gz" -checksum=d5913b1d5d3d13190ae7ee72c305d5da49ac2ddc1b375b814751ef09ae5c80ec +checksum=f261ed0a361f190169fff428d65b707df1507df317fc0ed101b0e63596541b75 case "$XBPS_TARGET_MACHINE" in +*-musl*) + broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/1375/steps/shell_3/logs/stdio" + ;; x86_64*) - distfiles+=" http://gd.tuwien.ac.at/languages/pascal/${pkgname}/dist/${version}/x86_64-linux/rpm/${pkgname}-${version}-1.x86_64.rpm" - checksum+=" 991495008a73f6ff92502a5172f580e887627626dfe146335eb037638dabdc76" + distfiles+=" http://gd.tuwien.ac.at/languages/pascal/${pkgname}/dist/${version}/x86_64-linux/${pkgname}-${version}-1.x86_64.rpm" + checksum+=" 85ad192927b2129022c27afbd6a6fc657a569ccfb43120e4868fea7812c10c52" ;; i686) - distfiles+=" http://gd.tuwien.ac.at/languages/pascal/${pkgname}/dist/${version}/i386-linux/rpm/${pkgname}-${version}-1.i686.rpm" - checksum+=" 7b4569fb80cd6b7387344023d23c83312e99dc8ff19915e33f87d7cf73c6ff61" + distfiles+=" http://gd.tuwien.ac.at/languages/pascal/${pkgname}/dist/${version}/i386-linux/${pkgname}-${version}-1.i686.rpm" + checksum+=" 0f049ff901305c315f90ec4c80fd3b054b97b1d8fca1552bcb036299aa64338f" ;; esac # TODO: figure out cross-build and how to unwrap the ARM .tar. diff --git a/srcpkgs/fping/template b/srcpkgs/fping/template index cd040dd653b..b513c79247d 100644 --- a/srcpkgs/fping/template +++ b/srcpkgs/fping/template @@ -1,6 +1,6 @@ # Template file for 'fping' pkgname=fping -version=3.16 +version=4.0 revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin --enable-ipv4 --enable-ipv6" @@ -9,11 +9,10 @@ maintainer="Juan RP " homepage="http://fping.org" license="MIT-alike" distfiles="${homepage}/dist/${pkgname}-${version}.tar.gz" -checksum=2f753094e4df3cdb1d99be1687c0fb7d2f14c0d526ebf03158c8c5519bc78f54 +checksum=67eb4152b98ad34f99d2eec4e1098a0bb52caf13c0c89cd147349d08190fe8ce post_install() { vlicense COPYING - # make fping{,6} setuid. + # make fping setuid. chmod 4555 ${DESTDIR}/usr/bin/fping - chmod 4555 ${DESTDIR}/usr/bin/fping6 } diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index 8166a447aaa..4161b811e8c 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad version=0.16 -revision=4 +revision=5 wrksrc="FreeCAD-${version}" build_style=cmake diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template index 1e7ddfa3251..210557a9a2e 100644 --- a/srcpkgs/freeplane/template +++ b/srcpkgs/freeplane/template @@ -1,16 +1,16 @@ # Template file for 'freeplane' pkgname=freeplane -version=1.5.18 +version=1.5.20 revision=1 noarch=yes hostmakedepends="apache-ant openjdk unzip gradle" depends="virtual?java-runtime" short_desc="Application for Mind Mapping, Knowledge Management, Project Management" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://freeplane.sourceforge.net/" distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz" -checksum=539fb7114ecaca0d4f01ae5910e84376ce18ba7fb25ff28359b19d34e4325e13 +checksum=00595bc6aea6f639fd10f89a32939775b1cac2474de4af182c234ce3b4265ab2 make_dirs=" /usr/share/freeplane/fwdir/condperm/ 755 root root diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template index 5c752f55633..684c18683c7 100644 --- a/srcpkgs/freerdp/template +++ b/srcpkgs/freerdp/template @@ -1,7 +1,7 @@ # Template file for 'freerdp' pkgname=freerdp version=1.0.2 -revision=13 +revision=14 wrksrc="FreeRDP-${version}" build_style=cmake configure_args="-DWITH_JPEG=ON -DWITH_PULSE=ON -DWITH_XINERAMA=ON diff --git a/srcpkgs/freetds/template b/srcpkgs/freetds/template index 929ff0c1784..68cd594ae2d 100644 --- a/srcpkgs/freetds/template +++ b/srcpkgs/freetds/template @@ -1,6 +1,6 @@ # Template file for 'freetds' pkgname=freetds -version=1.00.27 +version=1.00.33 revision=1 build_style=gnu-configure configure_args="--sysconfdir=/etc/$pkgname" @@ -12,7 +12,7 @@ maintainer="Diogo Leal " license="LGPL-3" homepage="http://www.freetds.org/" distfiles="ftp://ftp.freetds.org/pub/freetds/stable/${pkgname}-${version}.tar.gz" -checksum=c30f170219cbbaa2651dcbce85b5b6959dd169f57f7ca0b88815c5874f2552cf +checksum=10937f04a36dc43c00a1c3cda6769646a7fe54f9a135722b9eba3551820582c9 freetds-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template index e84426595f9..862f896a281 100644 --- a/srcpkgs/freshplayerplugin/template +++ b/srcpkgs/freshplayerplugin/template @@ -1,7 +1,7 @@ # Template file for 'freshplayerplugin' pkgname=freshplayerplugin version=0.3.6 -revision=1 +revision=3 build_style=cmake hostmakedepends="pkg-config ragel" makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel diff --git a/srcpkgs/fs-repo-migrations/template b/srcpkgs/fs-repo-migrations/template index 2dfdae8f990..4e04f42dae2 100644 --- a/srcpkgs/fs-repo-migrations/template +++ b/srcpkgs/fs-repo-migrations/template @@ -1,7 +1,7 @@ # Template file for 'fs-repo-migrations' pkgname=fs-repo-migrations version=1.2.2 -revision=1 +revision=2 build_style=go go_import_path="github.com/ipfs/fs-repo-migrations" short_desc="Tool to upgrade the IPFS filesystem repository" diff --git a/srcpkgs/fsharp/template b/srcpkgs/fsharp/template new file mode 100644 index 00000000000..d9c131724ea --- /dev/null +++ b/srcpkgs/fsharp/template @@ -0,0 +1,24 @@ +# Template file for 'fsharp' +pkgname=fsharp +version=4.1.0.2 +revision=1 +lib32disabled=yes +build_style=gnu-configure +configure_args="--with-gacdir=/usr/lib/mono/gac" +hostmakedepends="automake pkg-config mono-devel" +makedepends="mono-devel" +depends="mono" +short_desc="F# compiler, core library and tools" +maintainer="Wojciech Nawrocki " +license="Apache-2.0" +homepage="http://fsharp.org" +distfiles="https://github.com/fsharp/fsharp/archive/$version.tar.gz" +checksum=7633bb37846197638c563f65d184fc2fbb6b4b447afbd2251fac401fe7a7c636 + +case "$XBPS_TARGET_MACHINE" in + *-musl) broken="https://s3.amazonaws.com/archive.travis-ci.org/jobs/211856891/log.txt" +esac + +pre_configure() { + autoreconf -fi +} diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template index dedb1d7bb78..8d35b763e02 100644 --- a/srcpkgs/fstrm/template +++ b/srcpkgs/fstrm/template @@ -1,7 +1,7 @@ # Template file for 'fstrm' pkgname=fstrm version=0.3.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libevent-devel" diff --git a/srcpkgs/fuse-emulator/template b/srcpkgs/fuse-emulator/template new file mode 100644 index 00000000000..466a319bf6c --- /dev/null +++ b/srcpkgs/fuse-emulator/template @@ -0,0 +1,15 @@ +# Template file for 'fuse-emulator' +pkgname=fuse-emulator +version=1.3.4 +revision=1 +wrksrc="fuse-${version}" +build_style=gnu-configure +configure_args="--verbose --with-gtk --with-libspectrum-prefix=/usr --enable-desktop-integration" +hostmakedepends="pkg-config perl" +makedepends="gtk+-devel alsa-lib-devel glib-devel libao-devel libgcrypt-devel libspectrum-devel zlib-devel libpng-devel" +short_desc="Free Unix Spectrum Emulator" +maintainer="Jakub Skrzypnik " +license="GPL-2" +homepage="http://fuse-emulator.sourceforge.net" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/fuse-${version}.tar.gz" +checksum=3089d2c3e08c72055ccbcbd5bcc69fd6cc492b8ac649ee15fc93703f0d3d9486 diff --git a/srcpkgs/fuse-sshfs/template b/srcpkgs/fuse-sshfs/template index 2db84843298..7edf36afefb 100644 --- a/srcpkgs/fuse-sshfs/template +++ b/srcpkgs/fuse-sshfs/template @@ -1,6 +1,6 @@ # Template file for 'fuse-sshfs' pkgname=fuse-sshfs -version=2.8 +version=2.9 revision=1 wrksrc="sshfs-${version}" build_style=gnu-configure @@ -11,8 +11,8 @@ short_desc="FUSE client based on the SSH File Transfer Protocol" maintainer="Juan RP " license="GPL-2" homepage="https://github.com/libfuse/sshfs" -distfiles="https://github.com/libfuse/sshfs/releases/download/sshfs_${version}/sshfs-${version}.tar.gz" -checksum=7f689174d02e6b7e2631306fda4fb8e6b4483102d1bce82b3cdafba33369ad22 +distfiles="https://github.com/libfuse/sshfs/releases/download/sshfs-${version}/sshfs-${version}.tar.gz" +checksum=46d1e1287ce97255fcb50010355184d8c5585329f73ab1e755217419a8e6e5de pre_configure() { autoreconf -fi diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template index 844c8138c4a..90505ea5f71 100644 --- a/srcpkgs/fzf/template +++ b/srcpkgs/fzf/template @@ -1,6 +1,7 @@ # Template file for 'fzf' pkgname=fzf -version=0.16.5 +version=0.16.7 +revision=1 build_style=go go_import_path="github.com/junegunn/fzf/src" go_package="github.com/junegunn/fzf/src/fzf" @@ -11,7 +12,7 @@ license="MIT" homepage="https://github.com/junegunn/fzf" short_desc="Command-line fuzzy finder" distfiles="https://github.com/junegunn/fzf/archive/${version}.tar.gz" -checksum=7add1b5290af779fc1c6a3e306d696fb0e833d4efb5b60d94f9c424ac1b6f9fe +checksum=9676664e02393d19dd0f0a1ae4cf5d20e3fffcba666a0cffc40ff6c590c67760 pre_build() { cd src diff --git a/srcpkgs/fzy/template b/srcpkgs/fzy/template index 9640abfc531..f0afbb6ebed 100644 --- a/srcpkgs/fzy/template +++ b/srcpkgs/fzy/template @@ -1,6 +1,6 @@ # Template file for 'fzy' pkgname=fzy -version=0.8 +version=0.9 revision=1 build_style=gnu-makefile short_desc="A fuzzy text selector menu for the terminal" @@ -8,7 +8,7 @@ maintainer="Diogo Leal " license="MIT" homepage="https://github.com/jhawthorn/fzy" distfiles="https://github.com/jhawthorn/fzy/archive/${version}.tar.gz" -checksum=44293ef6a33ef5c9400b9546c580170a2df0ac4342b8fe447cee2af35e241b89 +checksum=72182686806ddce7807d85c27efc321a1b01087643ce8006b1225e3617eecff5 CFLAGS="-std=c99" post_extract() { diff --git a/srcpkgs/gajim-otr/template b/srcpkgs/gajim-otr/template new file mode 100644 index 00000000000..284c167ee49 --- /dev/null +++ b/srcpkgs/gajim-otr/template @@ -0,0 +1,20 @@ +# Template file for 'gajim-otr' +pkgname=gajim-otr +version=1.9.8 +revision=2 +noarch=yes +wrksrc="gotr" +pycompile_dirs="usr/share/gajim/plugins/gotr" +hostmakedepends="unzip" +depends="python-crypto" +short_desc="OTR Plugin for Gajim" +homepage="https://dev.gajim.org/gajim/gajim-plugins/wikis/OffTheRecordPlugin" +maintainer="Helmut Pozimski " +license="GPL-3" +distfiles="https://ftp.gajim.org/plugins_0.16_zip/gotr.zip" +checksum="00ba5bf027b82d5f6a9867af5295b6518835b138c5ac22a891102bfb26b32a1d" + +do_install() { + vmkdir usr/share/gajim/plugins/gotr + vcopy * usr/share/gajim/plugins/gotr +} diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template index 3297809aa52..017ac0e4c49 100644 --- a/srcpkgs/gajim/template +++ b/srcpkgs/gajim/template @@ -1,10 +1,10 @@ # Template file for 'gajim' pkgname=gajim version=0.16.7 -revision=1 +revision=2 noarch=yes build_style=gnu-configure -configure_args="--enable-site-packages" +configure_args="--enable-site-packages PYTHON=python2" hostmakedepends="intltool python" makedepends="python-dbus pygtk-devel python-openssl python-sqlite python-nbxmpp" depends="${makedepends/-devel/}" @@ -14,4 +14,4 @@ maintainer="Juan RP " homepage="https://www.gajim.org" license="GPL-3" distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.bz2" -checksum=36a956145c914a1336c88048ddf50f2d5c08ac4f183bbdd8f642fa7d21f85d8f +checksum=b2071bbf499a2ad13ee484ad3d9b967c9c281db865b28c2016bb199146367047 diff --git a/srcpkgs/ganeti/patches/Makefile.am-use-C.UTF-8.patch b/srcpkgs/ganeti/patches/Makefile.am-use-C.UTF-8.patch deleted file mode 100644 index eb9152442a2..00000000000 --- a/srcpkgs/ganeti/patches/Makefile.am-use-C.UTF-8.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit b80982fe6035739c1aae7e86a5b1e6de0414a9a6 -Author: Apollon Oikonomopoulos -Date: Tue Apr 21 18:29:47 2015 +0300 - - Makefile.am: use C.UTF-8 - - There is no need to use en_US.UTF-8 with newer libc versions. Use - C.UTF-8 to avoid an extra B-D on locales-all. - -diff --git a/Makefile.am b/Makefile.am -index 364b26b..3f64939 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2179,7 +2179,7 @@ man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.rst - trap 'echo auto-removing $@; rm $@' EXIT; \ - $(PANDOC) -s -f rst -t man $< man/footer.rst | \ - sed -e 's/\\@/@/g' > $@; \ -- if test -n "$(MAN_HAS_WARNINGS)"; then LC_ALL=en_US.UTF-8 $(CHECK_MAN_WARNINGS) $@; fi; \ -+ if test -n "$(MAN_HAS_WARNINGS)"; then LC_ALL=C.UTF-8 $(CHECK_MAN_WARNINGS) $@; fi; \ - $(CHECK_MAN_DASHES) $@; \ - trap - EXIT - -@@ -2816,7 +2816,7 @@ $(APIDOC_HS_DIR)/index.html: $(HS_LIBTESTBUILT_SRCS) Makefile - $(HSCOLOUR) -print-css > $$i/hscolour.css; \ - done - set -e ; \ -- export LC_ALL=en_US.UTF-8; \ -+ export LC_ALL=C.UTF-8; \ - OPTGHC="--optghc=-isrc --optghc=-itest/hs"; \ - OPTGHC="$$OPTGHC --optghc=-optP-include --optghc=-optP$(HASKELL_PACKAGE_VERSIONS_FILE)"; \ - for file in $(HS_LIBTESTBUILT_SRCS); do \ diff --git a/srcpkgs/ganeti/patches/ghc-7.10-compatibility.patch b/srcpkgs/ganeti/patches/ghc-7.10-compatibility.patch deleted file mode 100644 index 557d65f4ec6..00000000000 --- a/srcpkgs/ganeti/patches/ghc-7.10-compatibility.patch +++ /dev/null @@ -1,216 +0,0 @@ -commit 3aaf10bfa95efec2f2a667cae34caf76b0a0370b -Author: Bhimanavajjula Aditya -Date: Wed Sep 9 12:10:22 2015 +0200 - - Define MonadPlus instance definitions using Alternative - - This is a compatibility fix for base-4.8. All MonadPlus definitions - have Alternative as a prerequisite. Hence, instead of defining - Alternative in terms of MonadPlus, we define MonadPlus in terms of - Alternative. - - Signed-off-by: Bhimanavajjula Aditya - Signed-off-by: Petr Pudlak - Reviewed-by: Petr Pudlak - ---- a/src/Ganeti/BasicTypes.hs -+++ b/src/Ganeti/BasicTypes.hs -@@ -123,13 +123,17 @@ - fmap _ (Bad msg) = Bad msg - fmap fn (Ok val) = Ok (fn val) - --instance (Error a, Monoid a) => MonadPlus (GenericResult a) where -- mzero = Bad $ strMsg "zero Result when used as MonadPlus" -+instance (Error a, Monoid a) => Alternative (GenericResult a) where -+ empty = Bad $ strMsg "zero Result when used as empty" - -- for mplus, when we 'add' two Bad values, we concatenate their - -- error descriptions -- (Bad x) `mplus` (Bad y) = Bad (x `mappend` strMsg "; " `mappend` y) -- (Bad _) `mplus` x = x -- x@(Ok _) `mplus` _ = x -+ (Bad x) <|> (Bad y) = Bad (x `mappend` strMsg "; " `mappend` y) -+ (Bad _) <|> x = x -+ x@(Ok _) <|> _ = x -+ -+instance (Error a, Monoid a) => MonadPlus (GenericResult a) where -+ mzero = empty -+ mplus = (<|>) - - instance (Error a) => MonadError a (GenericResult a) where - throwError = Bad -@@ -143,10 +147,6 @@ - _ <*> (Bad x) = Bad x - (Ok f) <*> (Ok x) = Ok $ f x - --instance (Error a, Monoid a) => Alternative (GenericResult a) where -- empty = mzero -- (<|>) = mplus -- - -- | This is a monad transformation for Result. It's implementation is - -- based on the implementations of MaybeT and ErrorT. - -- -@@ -233,17 +233,18 @@ - {-# INLINE liftBaseWith #-} - {-# INLINE restoreM #-} - --instance (Monad m, Error a, Monoid a) => MonadPlus (ResultT a m) where -- mzero = ResultT $ return mzero -+instance (Monad m, Error a, Monoid a) -+ => Alternative (ResultT a m) where -+ empty = ResultT $ return mzero - -- Ensure that 'y' isn't run if 'x' contains a value. This makes it a bit - -- more complicated than 'mplus' of 'GenericResult'. -- mplus x y = elimResultT combine return x -+ x <|> y = elimResultT combine return x - where combine x' = ResultT $ liftM (mplus (Bad x')) (runResultT y) - --instance (Alternative m, Monad m, Error a, Monoid a) -- => Alternative (ResultT a m) where -- empty = mzero -- (<|>) = mplus -+instance (Monad m, Error a, Monoid a) -+ => MonadPlus (ResultT a m) where -+ mzero = empty -+ mplus = (<|>) - - -- | Changes the error message of a result value, if present. - -- Note that since 'GenericResult' is also a 'MonadError', this function ---- a/src/Ganeti/Utils.hs -+++ b/src/Ganeti/Utils.hs -@@ -1,4 +1,4 @@ --{-# LANGUAGE FlexibleContexts, ScopedTypeVariables #-} -+{-# LANGUAGE FlexibleContexts, ScopedTypeVariables, CPP #-} - - {-| Utility functions. -} - -@@ -109,7 +109,11 @@ - import qualified Data.Either as E - import Data.Function (on) - import Data.IORef -+#if MIN_VERSION_base(4,8,0) -+import Data.List hiding (isSubsequenceOf) -+#else - import Data.List -+#endif - import qualified Data.Map as M - import Data.Maybe (fromMaybe) - import qualified Data.Set as S ---- a/test/hs/Test/Ganeti/Utils.hs -+++ b/test/hs/Test/Ganeti/Utils.hs -@@ -43,7 +43,11 @@ - import Control.Applicative ((<$>), (<*>)) - import Data.Char (isSpace) - import qualified Data.Either as Either -+#if MIN_VERSION_base(4,8,0) -+import Data.List hiding (isSubsequenceOf) -+#else - import Data.List -+#endif - import Data.Maybe (listToMaybe) - import qualified Data.Set as S - import System.Time ---- a/src/Ganeti/Hypervisor/Xen/XmParser.hs -+++ b/src/Ganeti/Hypervisor/Xen/XmParser.hs -@@ -71,7 +71,7 @@ - doubleP = LCDouble <$> A.rational <* A.skipSpace <* A.endOfInput - innerDoubleP = LCDouble <$> A.rational - stringP = LCString . unpack <$> A.takeWhile1 (not . (\c -> isSpace c -- || c `elem` "()")) -+ || c `elem` ("()" :: String))) - wspace = AC.many1 A.space - rparen = A.skipSpace *> A.char ')' - finalP = listConfigP <* rparen -@@ -163,5 +163,5 @@ - uptimeLineParser = do - name <- A.takeTill isSpace <* A.skipSpace - idNum <- A.decimal <* A.skipSpace -- uptime <- A.takeTill (`elem` "\n\r") <* A.skipSpace -+ uptime <- A.takeTill (`elem` ("\n\r" :: String)) <* A.skipSpace - return . UptimeInfo (unpack name) idNum $ unpack uptime ---- a/src/Ganeti/Query/Filter.hs -+++ b/src/Ganeti/Query/Filter.hs -@@ -183,10 +183,10 @@ - -- note: the next two implementations are the same, but we have to - -- repeat them due to the encapsulation done by FilterValue - containsFilter (QuotedString val) lst = do -- lst' <- fromJVal lst -+ lst' <- fromJVal lst :: ErrorResult [String] - return $! val `elem` lst' - containsFilter (NumericValue val) lst = do -- lst' <- fromJVal lst -+ lst' <- fromJVal lst :: ErrorResult [Integer] - return $! val `elem` lst' - - ---- a/src/Ganeti/THH.hs -+++ b/src/Ganeti/THH.hs -@@ -1164,8 +1164,13 @@ - -> Q [Dec] - genDictObject save_fn load_fn sname fields = do - let name = mkName sname -+ -- newName fails in ghc 7.10 when used on keywords -+ newName' "data" = newName "data_ghcBug10599" -+ newName' "instance" = newName "instance_ghcBug10599" -+ newName' "type" = newName "type_ghcBug10599" -+ newName' s = newName s - -- toDict -- fnames <- mapM (newName . fieldVariable) fields -+ fnames <- mapM (newName' . fieldVariable) fields - let pat = conP name (map varP fnames) - tdexp = [| concat $(listE $ zipWith save_fn fnames fields) |] - tdclause <- clause [pat] (normalB tdexp) [] ---- a/src/Ganeti/Query/Language.hs -+++ b/src/Ganeti/Query/Language.hs -@@ -94,7 +94,8 @@ - - -- | No-op 'NFData' instance for 'ResultStatus', since it's a single - -- constructor data-type. --instance NFData ResultStatus -+instance NFData ResultStatus where -+ rnf x = seq x () - - -- | Check that ResultStatus is success or fail with descriptive - -- message. ---- a/src/Ganeti/OpParams.hs -+++ b/src/Ganeti/OpParams.hs -@@ -903,12 +903,12 @@ - pRequiredNodes :: Field - pRequiredNodes = - withDoc "Required list of node names" . -- renameField "ReqNodes " $ simpleField "nodes" [t| [NonEmptyString] |] -+ renameField "ReqNodes" $ simpleField "nodes" [t| [NonEmptyString] |] - - pRequiredNodeUuids :: Field - pRequiredNodeUuids = - withDoc "Required list of node UUIDs" . -- renameField "ReqNodeUuids " . optionalField $ -+ renameField "ReqNodeUuids" . optionalField $ - simpleField "node_uuids" [t| [NonEmptyString] |] - - pRestrictedCommand :: Field -@@ -1519,7 +1519,7 @@ - pDiskIndex :: Field - pDiskIndex = - withDoc "Disk index for e.g. grow disk" . -- renameField "DiskIndex " $ simpleField "disk" [t| DiskIndex |] -+ renameField "DiskIndex" $ simpleField "disk" [t| DiskIndex |] - - pDiskChgAmount :: Field - pDiskChgAmount = -@@ -1740,7 +1740,7 @@ - pIAllocatorInstances :: Field - pIAllocatorInstances = - withDoc "IAllocator instances field" . -- renameField "IAllocatorInstances " . -+ renameField "IAllocatorInstances" . - optionalField $ - simpleField "instances" [t| [NonEmptyString] |] - ---- a/src/Ganeti/WConfd/ConfigModifications.hs -+++ b/src/Ganeti/WConfd/ConfigModifications.hs -@@ -1,4 +1,4 @@ --{-# LANGUAGE TemplateHaskell #-} -+{-# LANGUAGE TemplateHaskell, FlexibleContexts #-} - - {-| The WConfd functions for direct configuration manipulation - diff --git a/srcpkgs/ganeti/patches/relax-deps.patch b/srcpkgs/ganeti/patches/relax-deps.patch deleted file mode 100644 index 8ad0e284b40..00000000000 --- a/srcpkgs/ganeti/patches/relax-deps.patch +++ /dev/null @@ -1,41 +0,0 @@ -Author: Apollon Oikonomopoulos -Description: Relax cabal build-dependencies - Drop upper version limits for json and utf8-string. Upstream uses known-good - version limits and sid currently has newer versions of json (0.9.1) and - utf8-string (1). Since ganeti builds successfully with sid's versions, we - remove the upper version limit. - -Last-Update: 2015-07-21 - ---- a/cabal/ganeti.template.cabal -+++ b/cabal/ganeti.template.cabal -@@ -54,15 +54,15 @@ - , transformers >= 0.3.0.0 - , unix >= 2.5.1.0 - -- , attoparsec >= 0.10.1.1 && < 0.13 -+ , attoparsec >= 0.10.1.1 && < 0.14 - , base64-bytestring >= 1.0.0.1 && < 1.1 - , case-insensitive >= 0.4.0.1 && < 1.3 - , Crypto >= 4.2.4 && < 4.3 - , curl >= 1.3.7 && < 1.4 - , hinotify >= 0.3.2 && < 0.4 - , hslogger >= 1.1.4 && < 1.3 -- , json >= 0.5 && < 0.9 -- , lens >= 3.10 && < 4.8 -+ , json >= 0.5 -+ , lens >= 3.10 - , lifted-base >= 0.2.0.3 && < 0.3 - , monad-control >= 0.3.1.3 && < 1.1 - , MonadCatchIO-transformers >= 0.3.0.0 && < 0.4 -@@ -71,8 +71,8 @@ - , regex-pcre >= 0.94.2 && < 0.95 - , temporary >= 1.1.2.3 && < 1.3 - , transformers-base >= 0.4.1 && < 0.5 -- , utf8-string >= 0.3.7 && < 0.4 -- , zlib >= 0.5.3.3 && < 0.6 -+ , utf8-string >= 0.3.7 -+ , zlib >= 0.5.3.3 && < 0.7 - - -- Executables: - -- , happy diff --git a/srcpkgs/ganeti/patches/zlib-0.6-compatibility.patch b/srcpkgs/ganeti/patches/zlib-0.6-compatibility.patch deleted file mode 100644 index f8c847d1812..00000000000 --- a/srcpkgs/ganeti/patches/zlib-0.6-compatibility.patch +++ /dev/null @@ -1,34 +0,0 @@ -Author: Apollon Oikonomopoulos -Description: haskell-zlib 0.6 compatibility - Based on a patch by Klaus Aehlig submitted to ganeti-devel, Message-Id: - <052c6c02393324a9403f4291c112c4689dc1c507.1453302634.git.aehlig@google.com> - -Last-Update: 2016-01-21 -Forwarded: not-needed ---- a/src/Ganeti/Codec.hs -+++ b/src/Ganeti/Codec.hs -@@ -1,3 +1,5 @@ -+{-# LANGUAGE CPP #-} -+ - {-| Provides interface to the 'zlib' library. - - -} -@@ -51,6 +53,13 @@ - -- | Decompresses a lazy bytestring, throwing decoding errors using - -- 'throwError'. - decompressZlib :: (MonadError e m, Error e) => BL.ByteString -> m BL.ByteString -+#if MIN_VERSION_zlib(0, 6, 0) -+decompressZlib = I.foldDecompressStreamWithInput -+ (liftM . BL.chunk) -+ return -+ (throwError . strMsg . (++)"Zlib: " . show) -+ $ I.decompressST I.zlibFormat I.defaultDecompressParams -+#else - decompressZlib = I.foldDecompressStream - (liftM . BL.chunk) - (return mempty) -@@ -58,3 +67,4 @@ - . I.decompressWithErrors - I.zlibFormat - I.defaultDecompressParams -+#endif diff --git a/srcpkgs/ganeti/template b/srcpkgs/ganeti/template deleted file mode 100644 index d3ba4283077..00000000000 --- a/srcpkgs/ganeti/template +++ /dev/null @@ -1,41 +0,0 @@ -# Template file for 'ganeti' -broken="https://build.voidlinux.eu/builders/x86_64_builder/builds/23249/steps/shell_3/logs/stdio" - -pkgname=ganeti -version=2.15.2 -revision=1 -build_style=gnu-configure -nopie=yes -nocross="The cabal installs don't realize they are cross compiling" -patch_args="-Np1" # Thanks to the Debian project for the patches -configure_args="--enable-symlinks" -hostmakedepends="iproute2 pandoc graphviz pylint pep8 socat cabal-install curl - python-openssl python-simplejson python-parsing python-inotify qemu - python-bitarray python-ipaddr m4 fakeroot python-curl python-Sphinx" -makedepends="libcurl-devel ncurses-libs python-gobject2-devel" -depends="python-bitarray python-simplejson python-inotify qemu" -short_desc="Cluster virtual server management tool" -maintainer="Toyam Cox " -license="BSD" -homepage="http://www.ganeti.org/" -distfiles="http://downloads.ganeti.org/releases/${version%.*}/${pkgname}-${version}.tar.gz - https://www.stackage.org/lts-5.5/cabal.config" -checksum="1e09d29cae5020142d20a96165b23f3b62b5511b875051b6374d09c4c13c0b83 - 9974e9cff7825eb240d2251c95f59396c949dd5932c30cc244faf465cac66080" -skip_extraction="cabal.config" - -build_options="syslog monitoring" -build_options_default="syslog monitoring" -desc_option_monitoring="Enable the monitoring daemon" -configure_args+=" $(vopt_enable monitoring) $(vopt_enable syslog)" - -pre_configure() { - cabal update - cabal --config-file="${XBPS_SRCDISTDIR}/cabal.config" install \ - --only-dependencies cabal/ganeti.template.cabal - ghc-pkg recache -} - -post_install() { - vlicense COPYING -} diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template index ca98ef33e32..57cffda2394 100644 --- a/srcpkgs/gatling/template +++ b/srcpkgs/gatling/template @@ -1,7 +1,7 @@ # Template file for 'gatling' pkgname=gatling version=0.15 -revision=3 +revision=4 build_style=gnu-makefile makedepends="libowfat libressl-devel zlib-devel" short_desc="High performance web server" diff --git a/srcpkgs/gcc/c18caf6dbf178664c7b31174e08f2366be40e13b.patch b/srcpkgs/gcc/c18caf6dbf178664c7b31174e08f2366be40e13b.patch deleted file mode 100644 index d141f465fff..00000000000 --- a/srcpkgs/gcc/c18caf6dbf178664c7b31174e08f2366be40e13b.patch +++ /dev/null @@ -1,5414 +0,0 @@ -From c18caf6dbf178664c7b31174e08f2366be40e13b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= -Date: Fri, 23 Sep 2016 17:16:17 +0200 -Subject: [PATCH] gcc: update to 6.2.1 - ---- - common/shlibs | 14 +- - srcpkgs/base-chroot-musl/template | 2 +- - srcpkgs/base-chroot/template | 2 +- - srcpkgs/base-devel/template | 2 +- - srcpkgs/chromium/template | 3 +- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-aarch64-linux-gnu/template | 142 ++-- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-4.9.2-musl.diff | 1 - - .../files/gcc-6.2.1-musl.diff | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-aarch64-linux-musl/template | 89 ++- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-arm-linux-gnueabi/template | 147 +++-- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-arm-linux-gnueabihf/template | 149 +++-- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-4.9.2-musl.diff | 1 - - .../files/gcc-6.2.1-musl.diff | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-arm-linux-musleabi/template | 95 ++- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-4.9.2-musl.diff | 1 - - .../files/gcc-6.2.1-musl.diff | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-arm-linux-musleabihf/template | 94 ++- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-armv7l-linux-gnueabihf/template | 150 +++-- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-4.9.2-musl.diff | 1 - - .../files/gcc-6.2.1-musl.diff | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-armv7l-linux-musleabihf/template | 95 ++- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-4.9.2-musl.diff | 1 - - .../files/gcc-6.2.1-musl.diff | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-i686-linux-musl/template | 88 ++- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-i686-pc-linux-gnu/template | 132 ++-- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-4.9.2-musl.diff | 1 - - .../files/gcc-6.2.1-musl.diff | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-mips-linux-musl/template | 91 ++- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-4.9.2-musl.diff | 1 - - .../files/gcc-6.2.1-musl.diff | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-mipsel-linux-musl/template | 91 ++- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-4.9.2-musl.diff | 1 - - .../files/gcc-6.2.1-musl.diff | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-mipsel-linux-muslhf/template | 91 ++- - srcpkgs/cross-vpkg-dummy/template | 4 +- - .../files/fix-cxxflags-passing.patch | 1 + - .../files/gcc-4.9.2-musl.diff | 1 - - .../files/gcc-6.2.1-musl.diff | 1 + - .../files/gcc-spec-env-r1.patch | 1 - - srcpkgs/cross-x86_64-linux-musl/template | 91 ++- - srcpkgs/efivar/template | 3 +- - srcpkgs/gcc-c++ | 1 - - .../gcc-multilib/patches/fix-libiberty_pic.patch | 8 +- - srcpkgs/gcc-multilib/template | 17 +- - srcpkgs/gcc/files/gcc-4.9.2-musl.diff | 730 --------------------- - srcpkgs/gcc/files/gcc-6.2.1-musl.diff | 556 ++++++++++++++++ - srcpkgs/gcc/patches/fix-cxxflags-passing.patch | 10 + - srcpkgs/gcc/patches/fix-musl-execinfo.patch | 33 + - srcpkgs/gcc/patches/gcc-spec-env-r1.patch | 87 --- - srcpkgs/gcc/patches/libcpp-source_date_epoch.patch | 2 +- - srcpkgs/gcc/patches/musl-posix_memalign-c++.patch | 30 - - srcpkgs/gcc/template | 147 +++-- - srcpkgs/isl15-devel | 1 + - srcpkgs/isl15/template | 31 + - srcpkgs/kernel-libc-headers/template | 4 +- - srcpkgs/libmpx | 1 + - srcpkgs/libmpx-devel | 1 + - srcpkgs/rr/template | 2 +- - srcpkgs/virtualbox-ose/template | 3 +- - xbps-src | 6 +- - 86 files changed, 1850 insertions(+), 1441 deletions(-) - create mode 120000 srcpkgs/cross-aarch64-linux-gnu/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-aarch64-linux-gnu/files/gcc-spec-env-r1.patch - create mode 120000 srcpkgs/cross-aarch64-linux-musl/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-aarch64-linux-musl/files/gcc-4.9.2-musl.diff - create mode 120000 srcpkgs/cross-aarch64-linux-musl/files/gcc-6.2.1-musl.diff - delete mode 120000 srcpkgs/cross-aarch64-linux-musl/files/gcc-spec-env-r1.patch - create mode 120000 srcpkgs/cross-arm-linux-gnueabi/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-arm-linux-gnueabi/files/gcc-spec-env-r1.patch - create mode 120000 srcpkgs/cross-arm-linux-gnueabihf/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-arm-linux-gnueabihf/files/gcc-spec-env-r1.patch - create mode 120000 srcpkgs/cross-arm-linux-musleabi/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-arm-linux-musleabi/files/gcc-4.9.2-musl.diff - create mode 120000 srcpkgs/cross-arm-linux-musleabi/files/gcc-6.2.1-musl.diff - delete mode 120000 srcpkgs/cross-arm-linux-musleabi/files/gcc-spec-env-r1.patch - create mode 120000 srcpkgs/cross-arm-linux-musleabihf/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-arm-linux-musleabihf/files/gcc-4.9.2-musl.diff - create mode 120000 srcpkgs/cross-arm-linux-musleabihf/files/gcc-6.2.1-musl.diff - delete mode 120000 srcpkgs/cross-arm-linux-musleabihf/files/gcc-spec-env-r1.patch - create mode 120000 srcpkgs/cross-armv7l-linux-gnueabihf/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-armv7l-linux-gnueabihf/files/gcc-spec-env-r1.patch - create mode 120000 srcpkgs/cross-armv7l-linux-musleabihf/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-armv7l-linux-musleabihf/files/gcc-4.9.2-musl.diff - create mode 120000 srcpkgs/cross-armv7l-linux-musleabihf/files/gcc-6.2.1-musl.diff - delete mode 120000 srcpkgs/cross-armv7l-linux-musleabihf/files/gcc-spec-env-r1.patch - create mode 120000 srcpkgs/cross-i686-linux-musl/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-i686-linux-musl/files/gcc-4.9.2-musl.diff - create mode 120000 srcpkgs/cross-i686-linux-musl/files/gcc-6.2.1-musl.diff - delete mode 120000 srcpkgs/cross-i686-linux-musl/files/gcc-spec-env-r1.patch - create mode 120000 srcpkgs/cross-i686-pc-linux-gnu/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-i686-pc-linux-gnu/files/gcc-spec-env-r1.patch - create mode 120000 srcpkgs/cross-mips-linux-musl/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-mips-linux-musl/files/gcc-4.9.2-musl.diff - create mode 120000 srcpkgs/cross-mips-linux-musl/files/gcc-6.2.1-musl.diff - delete mode 120000 srcpkgs/cross-mips-linux-musl/files/gcc-spec-env-r1.patch - create mode 120000 srcpkgs/cross-mipsel-linux-musl/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-mipsel-linux-musl/files/gcc-4.9.2-musl.diff - create mode 120000 srcpkgs/cross-mipsel-linux-musl/files/gcc-6.2.1-musl.diff - delete mode 120000 srcpkgs/cross-mipsel-linux-musl/files/gcc-spec-env-r1.patch - create mode 120000 srcpkgs/cross-mipsel-linux-muslhf/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-mipsel-linux-muslhf/files/gcc-4.9.2-musl.diff - create mode 120000 srcpkgs/cross-mipsel-linux-muslhf/files/gcc-6.2.1-musl.diff - delete mode 120000 srcpkgs/cross-mipsel-linux-muslhf/files/gcc-spec-env-r1.patch - create mode 120000 srcpkgs/cross-x86_64-linux-musl/files/fix-cxxflags-passing.patch - delete mode 120000 srcpkgs/cross-x86_64-linux-musl/files/gcc-4.9.2-musl.diff - create mode 120000 srcpkgs/cross-x86_64-linux-musl/files/gcc-6.2.1-musl.diff - delete mode 120000 srcpkgs/cross-x86_64-linux-musl/files/gcc-spec-env-r1.patch - delete mode 120000 srcpkgs/gcc-c++ - delete mode 100644 srcpkgs/gcc/files/gcc-4.9.2-musl.diff - create mode 100644 srcpkgs/gcc/files/gcc-6.2.1-musl.diff - create mode 100644 srcpkgs/gcc/patches/fix-cxxflags-passing.patch - create mode 100644 srcpkgs/gcc/patches/fix-musl-execinfo.patch - delete mode 100644 srcpkgs/gcc/patches/gcc-spec-env-r1.patch - delete mode 100644 srcpkgs/gcc/patches/musl-posix_memalign-c++.patch - create mode 120000 srcpkgs/isl15-devel - create mode 100644 srcpkgs/isl15/template - create mode 120000 srcpkgs/libmpx - create mode 120000 srcpkgs/libmpx-devel - -diff --git a/common/shlibs b/common/shlibs -index e43ee26..0b559c6 100644 ---- a/common/shlibs -+++ b/common/shlibs -@@ -50,13 +50,18 @@ libmvec.so.1 glibc-2.22_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 -+libcc1.so.0 gcc-6.2.1_1 -+libcc1plugin.so.0 gcc-6.2.1_1 - libitm.so.1 libitm-4.7.3_1 - libgcj_bc.so.1 libgcj-4.7.3_1 - liblto_plugin.so.0 gcc-4.7.3_1 - libgcc_s.so.1 libgcc-4.4.0_1 --libgcj.so.15 libgcj-4.9.0_1 --libgcj-tools.so.15 libgcj-4.9.0_1 --libgij.so.15 libgcj-4.9.0_1 -+libgcj.so.17 libgcj-6.2.0_1 -+libgcj-tools.so.17 libgcj-6.2.1_1 -+libgij.so.17 libgcj-6.2.1_1 -+libgo.so.9 libgo-6.2.1_1 -+libmpx.so.2 libmpx-6.2.1_1 -+libmpxwrappers.so.2 libmpx-6.2.1_1 - libperl.so.5.24 perl-5.24.0_1 - libmp.so.3 gmp-5.0.1_1 - libgmp.so.10 gmp-5.0.1_1 -@@ -1048,6 +1053,7 @@ libsratom-0.so.0 sratom-0.4.0_1 - libmongoose.so.0 libmongoose-3.1_1 - libpwquality.so.1 libpwquality-1.1.1_1 - libisl.so.10 isl-0.10_1 -+libisl.so.15 isl15-0.16.1_1 - libcloog-isl.so.4 cloog-0.18.1_1 - librtmp.so.0 librtmp-2.4_1 - libORBit-2.so.0 libORBit2-2.14.19_1 -@@ -1652,7 +1658,7 @@ libextractor_common.so.1 libextractor-1.1_1 - libpano13.so.3 libpano13-2.9.19_1 - libubsan.so.0 libsanitizer-4.9.0_1 - libtsan.so.0 libsanitizer-4.9.0_1 --libasan.so.1 libsanitizer-4.9.0_1 -+libasan.so.3 libsanitizer-6.2.0_1 - liblsan.so.0 libsanitizer-4.9.0_1 - libcilkrts.so.5 libcilkrts-4.9.0_1 - libvtv.so.0 libvtv-4.9.0_1 -diff --git a/srcpkgs/base-chroot-musl/template b/srcpkgs/base-chroot-musl/template -index 3271bb6..9aaa2ff 100644 ---- a/srcpkgs/base-chroot-musl/template -+++ b/srcpkgs/base-chroot-musl/template -@@ -16,7 +16,7 @@ only_for_archs="i686-musl x86_64-musl armv6l-musl armv7l-musl aarch64-musl mips- - - depends=" - base-files musl-devel musl-legacy-compat -- gcc gcc-c++ patch chroot-bash chroot-grep coreutils findutils -+ gcc patch chroot-bash chroot-grep coreutils findutils - gettext chroot-texinfo sed chroot-gawk diffutils - make gzip file tar chroot-util-linux chroot-distcc - chroot-git ccache xbps xz which" -diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template -index 074fd21..9c9d09e 100644 ---- a/srcpkgs/base-chroot/template -+++ b/srcpkgs/base-chroot/template -@@ -12,6 +12,6 @@ license="Public domain" - - depends=" - base-files>=0.127 kernel-libc-headers glibc-devel glibc-locales binutils gcc -- gcc-c++ patch chroot-bash chroot-grep coreutils gettext -+ patch chroot-bash chroot-grep coreutils gettext - chroot-texinfo sed chroot-gawk findutils diffutils make gzip file tar - chroot-util-linux chroot-distcc chroot-git ccache xbps xz which" -diff --git a/srcpkgs/base-devel/template b/srcpkgs/base-devel/template -index 1fcdf72..d828744 100644 ---- a/srcpkgs/base-devel/template -+++ b/srcpkgs/base-devel/template -@@ -4,7 +4,7 @@ version=20150820 - revision=2 - build_style=meta - noarch=yes --depends="autoconf automake bc binutils bison ed flex gcc gcc-c++ gettext -+depends="autoconf automake bc binutils bison ed flex gcc gettext - groff libtool m4 make patch pkg-config texinfo unzip xz" - case "$XBPS_TARGET_MACHINE" in - *-musl) depends+=" musl";; -diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template -index 0b49bbc..0a90c97 100644 ---- a/srcpkgs/chromium/template -+++ b/srcpkgs/chromium/template -@@ -30,7 +30,8 @@ depends="libexif hwids desktop-file-utils hicolor-icon-theme" - nostrip_files="nacl_irt_x86_64.nexe nacl_irt_x86_32.nexe" - - if [ -z "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then -- hostmakedepends+=" gcc-c++-multilib" -+ # Is this required? -+ hostmakedepends+=" gcc-multilib" - fi - - post_extract() { -diff --git a/srcpkgs/cross-aarch64-linux-gnu/files/fix-cxxflags-passing.patch b/srcpkgs/cross-aarch64-linux-gnu/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-aarch64-linux-gnu/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-aarch64-linux-gnu/files/gcc-spec-env-r1.patch b/srcpkgs/cross-aarch64-linux-gnu/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-aarch64-linux-gnu/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template -index fecccec..5979ee9 100644 ---- a/srcpkgs/cross-aarch64-linux-gnu/template -+++ b/srcpkgs/cross-aarch64-linux-gnu/template -@@ -1,31 +1,31 @@ - # Template build file for 'cross-aarch64-linux-gnu' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _glibc_version=2.24 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=aarch64-linux-gnu - _archflags="-march=armv8-a" - _sysroot="/usr/${_triplet}" - - pkgname=cross-${_triplet} --version=0.21 --revision=6 -+version=0.22 -+revision=1 - short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" - maintainer="Christian Neukirchen " - homepage="http://www.voidlinux.eu" - license="GPL-3, GPL-2, LGPL-2.1" - distfiles=" - ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz - ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz -- ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz" -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 - 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92" -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af" - - lib32disabled=yes - nocross=yes -@@ -61,6 +61,8 @@ _linux_headers() { - } - - _binutils_build() { -+ local _args -+ - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc} -@@ -68,10 +70,15 @@ _binutils_build() { - [ ! -d binutils-build ] && mkdir binutils-build - cd binutils-build - -- ../binutils-${_binutils_version}/configure \ -- --prefix=/usr --target=${_triplet} \ -- --with-sysroot=${_sysroot} --disable-nls --disable-shared \ -- --disable-multilib --disable-werror --enable-gold -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --disable-nls" -+ _args+=" --disable-shared" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ _args+=" --enable-gold" -+ ../binutils-${_binutils_version}/configure ${_args} - - make configure-host && make ${makejobs} - make install -@@ -80,25 +87,40 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap - -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --without-headers \ -- --disable-nls --disable-shared --disable-libquadmath \ -- --disable-decimal-float --disable-libgomp --disable-libmudflap \ -- --disable-libssp --disable-libitm --disable-libatomic \ -- --disable-threads --enable-languages=c \ -- --disable-sjlj-exceptions --disable-multilib \ -- --with-gnu-ld --with-gnu-as -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --without-headers" -+ _args+=" --disable-nls" -+ _args+=" --disable-shared" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libssp" -+ _args+=" --disable-libitm" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-threads" -+ _args+=" --enable-languages=c" -+ _args+=" --disable-sjlj-exceptions" -+ _args+=" --disable-multilib" -+ _args+=" --with-gnu-ld" -+ _args+=" --with-gnu-as" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -107,6 +129,8 @@ _gcc_bootstrap() { - } - - _glibc_headers() { -+ local _args -+ - [ -f ${wrksrc}/.glibc_headers_done ] && return 0 - - cd ${wrksrc} -@@ -122,12 +146,14 @@ _glibc_headers() { - AS="${_triplet}-as" CPP="${_triplet}-cpp" \ - NM="${_triplet}-nm" - -- ../glibc-${_glibc_version}/configure \ -- --host=${_triplet} --prefix=/usr \ -- --with-headers=${_sysroot}/usr/include \ -- --config-cache \ -- --enable-obsolete-rpc \ -- --enable-kernel=2.6.27 -+ _args="--prefix=/usr" -+ _args+=" --host=${_triplet}" -+ _args+=" --with-headers=${_sysroot}/usr/include" -+ _args+=" --config-cache" -+ _args+=" --enable-obsolete-rpc" -+ _args+=" --enable-kernel=2.6.27" -+ -+ ../glibc-${_glibc_version}/configure ${_args} - - make -k install-headers cross_compiling=yes \ - install_root=${_sysroot} -@@ -136,6 +162,8 @@ _glibc_headers() { - } - - _glibc_build() { -+ local _args -+ - [ -f ${wrksrc}/.glibc_build_done ] && return 0 - - cd ${wrksrc} -@@ -152,12 +180,16 @@ _glibc_build() { - NM="${_triplet}-nm" - export CFLAGS="-Os -pipe -Wno-error ${_archflags}" - -- ../glibc-${_glibc_version}/configure \ -- --host=${_triplet} --prefix=/usr --libdir=/usr/lib \ -- --with-headers=${_sysroot}/usr/include \ -- --config-cache \ -- --enable-obsolete-rpc --disable-profile \ -- --enable-kernel=2.6.27 -+ _args="--prefix=/usr" -+ _args+=" --libdir=/usr/lib" -+ _args+=" --host=${_triplet}" -+ _args+=" --with-headers=${_sysroot}/usr/include" -+ _args+=" --config-cache" -+ _args+=" --enable-obsolete-rpc" -+ _args+=" --disable-profile" -+ _args+=" --enable-kernel=2.6.27" -+ -+ ../glibc-${_glibc_version}/configure ${_args} - - make ${makejobs} - make install_root=${_sysroot} install -@@ -166,6 +198,8 @@ _glibc_build() { - } - - _gcc_build() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -186,19 +220,35 @@ _gcc_build() { - touch .sed_subst_done - fi - -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --prefix=/usr --libdir=/usr/lib \ -- --with-sysroot=${_sysroot} --enable-languages=c,c++,lto \ -- --with-gnu-as --with-gnu-ld --disable-multilib \ -- --disable-nls --disable-sjlj-exceptions \ -- --enable-threads=posix --enable-long-longx \ -- --enable-shared --enable-linker-build-id \ -- --enable-gnu-unique-object --enable-lto \ -- --disable-libquadmath --disable-libatomic \ -- --disable-libssp --disable-libmudflap \ -- --disable-libsanitizer --disable-libcilkrts \ -- --disable-libitm --disable-libvtv --disable-libstdcxx-pch \ -- --enable-libstdcxx-time --with-linker-hash-style=gnu -+ _args="--prefix=/usr" -+ _args+=" --libdir=/usr/lib" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --with-gnu-as" -+ _args+=" --with-gnu-ld" -+ _args+=" --disable-multilib" -+ _args+=" --disable-nls" -+ _args+=" --disable-sjlj-exceptions" -+ _args+=" --enable-threads=posix" -+ _args+=" --enable-long-longx" -+ _args+=" --enable-shared" -+ _args+=" --enable-linker-build-id" -+ _args+=" --enable-gnu-unique-object" -+ _args+=" --enable-lto" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-libssp" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-libcilkrts" -+ _args+=" --disable-libitm" -+ _args+=" --disable-libvtv" -+ _args+=" --disable-libstdcxx-pch" -+ _args+=" --enable-libstdcxx-time" -+ _args+=" --with-linker-hash-style=gnu" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/cross-aarch64-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-aarch64-linux-musl/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-aarch64-linux-musl/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-aarch64-linux-musl/files/gcc-4.9.2-musl.diff b/srcpkgs/cross-aarch64-linux-musl/files/gcc-4.9.2-musl.diff -deleted file mode 120000 -index 3d53eb4..0000000 ---- a/srcpkgs/cross-aarch64-linux-musl/files/gcc-4.9.2-musl.diff -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/files/gcc-4.9.2-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-aarch64-linux-musl/files/gcc-6.2.1-musl.diff b/srcpkgs/cross-aarch64-linux-musl/files/gcc-6.2.1-musl.diff -new file mode 120000 -index 0000000..9081d12 ---- /dev/null -+++ b/srcpkgs/cross-aarch64-linux-musl/files/gcc-6.2.1-musl.diff -@@ -0,0 +1 @@ -+../../gcc/files/gcc-6.2.1-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-aarch64-linux-musl/files/gcc-spec-env-r1.patch b/srcpkgs/cross-aarch64-linux-musl/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-aarch64-linux-musl/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template -index 96b7746..4463a29 100644 ---- a/srcpkgs/cross-aarch64-linux-musl/template -+++ b/srcpkgs/cross-aarch64-linux-musl/template -@@ -1,30 +1,30 @@ - # Template build file for 'cross-aarch64-linux-musl' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _musl_version=1.1.15 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=aarch64-linux-musl - _archflags="-march=armv8-a" - _sysroot="/usr/${_triplet}" - - pkgname=cross-${_triplet} --version=0.21 --revision=7 -+version=0.22 -+revision=1 - short_desc="Cross toolchain for ARM64 LE target (musl)" - maintainer="Juan RP " - homepage="http://www.voidlinux.eu" - license="GPL-3, GPL-2, MIT" - distfiles=" -- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 -- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz -+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af - 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa" - - lib32disabled=yes -@@ -49,6 +49,8 @@ _apply_patch() { - } - - _binutils_build() { -+ local _args -+ - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc} -@@ -56,11 +58,15 @@ _binutils_build() { - - [ ! -d binutils-build ] && mkdir binutils-build - cd binutils-build -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --disable-nls" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ _args+=" --disable-shared" - -- ../binutils-${_binutils_version}/configure \ -- --prefix=/usr --target=${_triplet} --with-sysroot=${_sysroot} \ -- --disable-nls --disable-multilib --disable-werror \ -- --disable-shared -+ ../binutils-${_binutils_version}/configure ${_args} - - make configure-host && make ${makejobs} - make install -@@ -69,25 +75,39 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} -- _apply_patch -p1 ${FILESDIR}/gcc-4.9.2-musl.diff -+ _apply_patch -p1 ${FILESDIR}/gcc-6.2.1-musl.diff - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap - -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --with-newlib" -+ _args+=" --enable-languages=c" -+ _args+=" --with-newlib" -+ _args+=" --disable-libssp" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-threads" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-shared" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-symvers" -+ _args+=" libat_cv_have_ifunc=no" -+ - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --with-sysroot=${_sysroot} --with-newlib \ -- --enable-languages=c --with-newlib --disable-libssp --disable-nls \ -- --disable-libquadmath --disable-threads --disable-decimal-float \ -- --disable-shared --disable-libmudflap --disable-libgomp \ -- --disable-libatomic --disable-symvers libat_cv_have_ifunc=no -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -118,7 +138,7 @@ _musl_build() { - CC="${_triplet}-gcc" LD="${_triplet}-ld" AR="${_triplet}-ar" \ - AS="${_triplet}-as" RANLIB="${_triplet}-ranlib" \ - CFLAGS="-Os -pipe ${_archflags}" \ -- ./configure --prefix=/usr \ -+ ./configure --prefix=/usr - - make ${makejobs} - make DESTDIR=${_sysroot} install -@@ -127,6 +147,8 @@ _musl_build() { - } - - _gcc_build() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -135,13 +157,22 @@ _gcc_build() { - [ ! -d gcc-build ] && mkdir gcc-build - cd gcc-build - -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \ -- --libexecdir=/usr/lib --enable-languages=c,c++,lto \ -- --enable-lto --disable-libsanitizer \ -- --disable-multilib --disable-nls --disable-libquadmath \ -- --disable-libmudflap --enable-shared \ -- --disable-symvers libat_cv_have_ifunc=no -+ _args="--prefix=/usr" -+ _args+=" --libexecdir=/usr/lib" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --enable-lto" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-multilib" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-libmudflap" -+ _args+=" --enable-shared" -+ _args+=" --disable-symvers" -+ _args+=" libat_cv_have_ifunc=no" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/cross-arm-linux-gnueabi/files/fix-cxxflags-passing.patch b/srcpkgs/cross-arm-linux-gnueabi/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-arm-linux-gnueabi/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-arm-linux-gnueabi/files/gcc-spec-env-r1.patch b/srcpkgs/cross-arm-linux-gnueabi/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-arm-linux-gnueabi/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template -index af76069..a51d7ea 100644 ---- a/srcpkgs/cross-arm-linux-gnueabi/template -+++ b/srcpkgs/cross-arm-linux-gnueabi/template -@@ -1,9 +1,9 @@ - # Template build file for 'cross-arm-linux-gnueabi' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _glibc_version=2.24 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=arm-linux-gnueabi - _fpuflags="--with-arch=armv5te --without-fp --with-float=soft" -@@ -11,22 +11,22 @@ _archflags="-march=armv5te -msoft-float -mfloat-abi=soft" - _sysroot="/usr/${_triplet}" - - pkgname=cross-${_triplet} --version=0.21 --revision=4 -+version=0.22 -+revision=1 - short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" - maintainer="Juan RP " - homepage="http://www.voidlinux.eu" - license="GPL-3, GPL-2, LGPL-2.1" - distfiles=" - ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz - ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz -- ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz" -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 - 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92" -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af" - - lib32disabled=yes - nocross=yes -@@ -64,17 +64,23 @@ _linux_headers() { - } - - _binutils_build() { -+ local _args -+ - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc} - msg_normal "Building cross binutils\n" - [ ! -d binutils-build ] && mkdir binutils-build - cd binutils-build -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --disable-nls" -+ _args+=" --disable-shared" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" - -- ../binutils-${_binutils_version}/configure \ -- --prefix=/usr --target=${_triplet} \ -- --with-sysroot=${_sysroot} --disable-nls --disable-shared \ -- --disable-multilib --disable-werror -+ ../binutils-${_binutils_version}/configure ${_args} - - make configure-host - make ${makejobs} -@@ -84,26 +90,42 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap - -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --without-headers" -+ _args+=" --disable-nls" -+ _args+=" --disable-shared" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libssp" -+ _args+=" --disable-libitm" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-threads" -+ _args+=" --enable-languages=c" -+ _args+=" --disable-sjlj-exceptions" -+ _args+=" --disable-multilib" -+ _args+=" --with-gnu-ld" -+ _args+=" --with-gnu-as" -+ _args+=" ${_fpuflags}" -+ - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --without-headers \ -- --disable-nls --disable-shared --disable-libquadmath \ -- --disable-decimal-float --disable-libgomp --disable-libmudflap \ -- --disable-libssp --disable-libitm --disable-libatomic \ -- --disable-threads --enable-languages=c \ -- --disable-sjlj-exceptions --disable-multilib \ -- --with-gnu-ld --with-gnu-as ${_fpuflags} -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -112,6 +134,8 @@ _gcc_bootstrap() { - } - - _glibc_headers() { -+ local _args -+ - [ -f ${wrksrc}/.glibc_headers_done ] && return 0 - - cd ${wrksrc} -@@ -126,11 +150,15 @@ _glibc_headers() { - export CC="${_triplet}-gcc" LD="${_triplet}-ld" \ - AS="${_triplet}-as" CPP="${_triplet}-cpp" - -- ../glibc-${_glibc_version}/configure \ -- --host=${_triplet} --prefix=/usr \ -- --with-headers=${_sysroot}/usr/include \ -- --config-cache --enable-obsolete-rpc \ -- --enable-kernel=2.6.27 ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --host=${_triplet}" -+ _args+=" --with-headers=${_sysroot}/usr/include" -+ _args+=" --config-cache" -+ _args+=" --enable-obsolete-rpc" -+ _args+=" --enable-kernel=2.6.27" -+ _args+=" ${_fpuflags}" -+ -+ ../glibc-${_glibc_version}/configure ${_args} - - make -k install-headers cross_compiling=yes \ - install_root=${_sysroot} -@@ -139,6 +167,8 @@ _glibc_headers() { - } - - _glibc_build() { -+ local _args -+ - [ -f ${wrksrc}/.glibc_build_done ] && return 0 - - cd ${wrksrc} -@@ -154,11 +184,17 @@ _glibc_build() { - AS="${_triplet}-as" CPP="${_triplet}-cpp" - export CFLAGS="-Os -pipe ${_archflags}" - -- ../glibc-${_glibc_version}/configure \ -- --host=${_triplet} --prefix=/usr \ -- --with-headers=${_sysroot}/usr/include \ -- --config-cache --disable-profile --enable-obsolete-rpc \ -- --disable-werror --enable-kernel=2.6.27 ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --host=${_triplet}" -+ _args+=" --with-headers=${_sysroot}/usr/include" -+ _args+=" --config-cache" -+ _args+=" --disable-profile" -+ _args+=" --enable-obsolete-rpc" -+ _args+=" --disable-werror" -+ _args+=" --enable-kernel=2.6.27" -+ _args+=" ${_fpuflags}" -+ -+ ../glibc-${_glibc_version}/configure ${_args} - - make ${makejobs} - make install_root=${_sysroot} install -@@ -167,6 +203,8 @@ _glibc_build() { - } - - _gcc_build() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -185,20 +223,39 @@ _gcc_build() { - touch .sed_subst_done - fi - -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --prefix=/usr --libdir=/usr/lib \ -- --libexecdir=/usr/lib --with-sysroot=${_sysroot} \ -- --enable-languages=c,c++,lto \ -- --with-gnu-as --with-gnu-ld --disable-multilib \ -- --disable-werror --disable-nls --disable-sjlj-exceptions \ -- --enable-threads=posix --enable-long-longx \ -- --enable-shared --enable-linker-build-id \ -- --enable-gnu-unique-object --enable-lto \ -- --disable-libquadmath --disable-libatomic \ -- --disable-libssp --disable-libmudflap \ -- --disable-libsanitizer --disable-libcilkrts \ -- --disable-libitm --disable-libvtv --disable-libstdcxx-pch \ -- --enable-libstdcxx-time --with-linker-hash-style=gnu ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --libdir=/usr/lib" -+ _args+=" --libexecdir=/usr/lib" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --with-gnu-as" -+ _args+=" --with-gnu-ld" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ _args+=" --disable-nls" -+ _args+=" --disable-sjlj-exceptions" -+ _args+=" --enable-threads=posix" -+ _args+=" --enable-long-longx" -+ _args+=" --enable-shared" -+ _args+=" --enable-linker-build-id" -+ _args+=" --enable-gnu-unique-object" -+ _args+=" --enable-lto" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-libssp" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-libcilkrts" -+ _args+=" --disable-libitm" -+ _args+=" --disable-libvtv" -+ _args+=" --disable-libstdcxx-pch" -+ _args+=" --enable-libstdcxx-time" -+ _args+=" --with-linker-hash-style=gnu" -+ _args+=" ${_fpuflags}" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/cross-arm-linux-gnueabihf/files/fix-cxxflags-passing.patch b/srcpkgs/cross-arm-linux-gnueabihf/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-arm-linux-gnueabihf/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-arm-linux-gnueabihf/files/gcc-spec-env-r1.patch b/srcpkgs/cross-arm-linux-gnueabihf/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-arm-linux-gnueabihf/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template -index 0c4b879..8e57daa 100644 ---- a/srcpkgs/cross-arm-linux-gnueabihf/template -+++ b/srcpkgs/cross-arm-linux-gnueabihf/template -@@ -1,9 +1,9 @@ - # Template build file for 'cross-arm-linux-gnueabihf' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _glibc_version=2.24 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=arm-linux-gnueabihf - _fpuflags="--with-arch=armv6 --with-fpu=vfp --with-float=hard" -@@ -11,22 +11,22 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard" - _sysroot="/usr/${_triplet}" - - pkgname=cross-${_triplet} --version=0.21 --revision=5 -+version=0.22 -+revision=1 - short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" - maintainer="Juan RP " - homepage="http://www.voidlinux.eu" - license="Public Domain" - distfiles=" - ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz - ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz -- ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz" -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 - 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92" -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af" - - lib32disabled=yes - nocross=yes -@@ -64,6 +64,8 @@ _linux_headers() { - } - - _binutils_build() { -+ local _args -+ - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc} -@@ -71,10 +73,15 @@ _binutils_build() { - [ ! -d binutils-build ] && mkdir binutils-build - cd binutils-build - -- ../binutils-${_binutils_version}/configure \ -- --prefix=/usr --target=${_triplet} \ -- --with-sysroot=${_sysroot} --disable-nls --disable-shared \ -- --disable-multilib --disable-werror -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --disable-nls" -+ _args+=" --disable-shared" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ -+ ../binutils-${_binutils_version}/configure ${_args} - - make configure-host - make ${makejobs} -@@ -84,26 +91,42 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap - -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --without-headers" -+ _args+=" --disable-nls" -+ _args+=" --disable-shared" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libssp" -+ _args+=" --disable-libitm" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-threads" -+ _args+=" --enable-languages=c" -+ _args+=" --disable-sjlj-exceptions" -+ _args+=" --disable-multilib" -+ _args+=" --with-gnu-ld" -+ _args+=" --with-gnu-as" -+ _args+=" ${_fpuflags}" -+ - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --without-headers \ -- --disable-nls --disable-shared --disable-libquadmath \ -- --disable-decimal-float --disable-libgomp --disable-libmudflap \ -- --disable-libssp --disable-libitm --disable-libatomic \ -- --disable-threads --enable-languages=c \ -- --disable-sjlj-exceptions --disable-multilib \ -- --with-gnu-ld --with-gnu-as ${_fpuflags} -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -112,6 +135,8 @@ _gcc_bootstrap() { - } - - _glibc_headers() { -+ local _args -+ - [ -f ${wrksrc}/.glibc_headers_done ] && return 0 - - cd ${wrksrc} -@@ -126,11 +151,15 @@ _glibc_headers() { - export CC="${_triplet}-gcc" LD="${_triplet}-ld" \ - AS="${_triplet}-as" CPP="${_triplet}-cpp" - -- ../glibc-${_glibc_version}/configure \ -- --host=${_triplet} --prefix=/usr \ -- --with-headers=${_sysroot}/usr/include \ -- --config-cache --enable-obsolete-rpc \ -- --enable-kernel=2.6.27 ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --host=${_triplet}" -+ _args+=" --with-headers=${_sysroot}/usr/include" -+ _args+=" --config-cache" -+ _args+=" --enable-obsolete-rpc" -+ _args+=" --enable-kernel=2.6.27" -+ _args+=" ${_fpuflags}" -+ -+ ../glibc-${_glibc_version}/configure ${_args} - - make -k install-headers cross_compiling=yes \ - install_root=${_sysroot} -@@ -139,6 +168,8 @@ _glibc_headers() { - } - - _glibc_build() { -+ local _args -+ - [ -f ${wrksrc}/.glibc_build_done ] && return 0 - - cd ${wrksrc} -@@ -154,11 +185,17 @@ _glibc_build() { - AS="${_triplet}-as" CPP="${_triplet}-cpp" - export CFLAGS="-Os -pipe ${_archflags}" - -- ../glibc-${_glibc_version}/configure \ -- --host=${_triplet} --prefix=/usr \ -- --with-headers=${_sysroot}/usr/include \ -- --config-cache --disable-profile --enable-obsolete-rpc \ -- --disable-werror --enable-kernel=2.6.27 ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --host=${_triplet}" -+ _args+=" --with-headers=${_sysroot}/usr/include" -+ _args+=" --config-cache" -+ _args+=" --disable-profile" -+ _args+=" --enable-obsolete-rpc" -+ _args+=" --disable-werror" -+ _args+=" --enable-kernel=2.6.27" -+ _args+=" ${_fpuflags}" -+ -+ ../glibc-${_glibc_version}/configure ${_args} - - make ${makejobs} - make install_root=${_sysroot} install -@@ -167,6 +204,8 @@ _glibc_build() { - } - - _gcc_build() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -184,21 +223,39 @@ _gcc_build() { - -i ${_sysroot}/lib/libc.so ${_sysroot}/lib/libpthread.so - touch .sed_subst_done - fi -- -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --prefix=/usr --libdir=/usr/lib \ -- --libexecdir=/usr/lib --with-sysroot=${_sysroot} \ -- --enable-languages=c,c++,lto \ -- --with-gnu-as --with-gnu-ld --disable-multilib \ -- --disable-werror --disable-nls --disable-sjlj-exceptions \ -- --enable-threads=posix --enable-long-longx \ -- --enable-shared --enable-linker-build-id \ -- --enable-gnu-unique-object --enable-lto \ -- --disable-libquadmath --disable-libatomic \ -- --disable-libssp --disable-libmudflap \ -- --disable-libsanitizer --disable-libcilkrts \ -- --disable-libitm --disable-libvtv --disable-libstdcxx-pch \ -- --enable-libstdcxx-time --with-linker-hash-style=gnu ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --libdir=/usr/lib" -+ _args+=" --libexecdir=/usr/lib" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --with-gnu-as" -+ _args+=" --with-gnu-ld" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ _args+=" --disable-nls" -+ _args+=" --disable-sjlj-exceptions" -+ _args+=" --enable-threads=posix" -+ _args+=" --enable-long-longx" -+ _args+=" --enable-shared" -+ _args+=" --enable-linker-build-id" -+ _args+=" --enable-gnu-unique-object" -+ _args+=" --enable-lto" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-libssp" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-libcilkrts" -+ _args+=" --disable-libitm" -+ _args+=" --disable-libvtv" -+ _args+=" --disable-libstdcxx-pch" -+ _args+=" --enable-libstdcxx-time" -+ _args+=" --with-linker-hash-style=gnu" -+ _args+=" ${_fpuflags}" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/cross-arm-linux-musleabi/files/fix-cxxflags-passing.patch b/srcpkgs/cross-arm-linux-musleabi/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-arm-linux-musleabi/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-arm-linux-musleabi/files/gcc-4.9.2-musl.diff b/srcpkgs/cross-arm-linux-musleabi/files/gcc-4.9.2-musl.diff -deleted file mode 120000 -index 3d53eb4..0000000 ---- a/srcpkgs/cross-arm-linux-musleabi/files/gcc-4.9.2-musl.diff -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/files/gcc-4.9.2-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-arm-linux-musleabi/files/gcc-6.2.1-musl.diff b/srcpkgs/cross-arm-linux-musleabi/files/gcc-6.2.1-musl.diff -new file mode 120000 -index 0000000..9081d12 ---- /dev/null -+++ b/srcpkgs/cross-arm-linux-musleabi/files/gcc-6.2.1-musl.diff -@@ -0,0 +1 @@ -+../../gcc/files/gcc-6.2.1-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-arm-linux-musleabi/files/gcc-spec-env-r1.patch b/srcpkgs/cross-arm-linux-musleabi/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-arm-linux-musleabi/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template -index 529d084..da60012 100644 ---- a/srcpkgs/cross-arm-linux-musleabi/template -+++ b/srcpkgs/cross-arm-linux-musleabi/template -@@ -1,9 +1,9 @@ - # Template build file for 'cross-arm-linux-musleabi' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _musl_version=1.1.15 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=arm-linux-musleabi - _fpuflags="--with-arch=armv5te --without-fp --with-float=soft" -@@ -11,21 +11,21 @@ _archflags="-march=armv5te -msoft-float -mfloat-abi=soft" - _sysroot="/usr/${_triplet}" - - pkgname=cross-${_triplet} --version=0.21 --revision=5 -+version=0.22 -+revision=1 - short_desc="Cross toolchain for ARMv5 TE target (musl)" - maintainer="Juan RP " - homepage="http://www.voidlinux.eu" - license="GPL-3, GPL-2, MIT" - distfiles=" -- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 -- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz -+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af - 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa" - - lib32disabled=yes -@@ -49,6 +49,8 @@ _apply_patch() { - } - - _binutils_build() { -+ local _args -+ - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc} -@@ -57,10 +59,16 @@ _binutils_build() { - [ ! -d binutils-build ] && mkdir binutils-build - cd binutils-build - -- ../binutils-${_binutils_version}/configure \ -- --prefix=/usr --target=${_triplet} --with-sysroot=${_sysroot} \ -- --disable-nls --disable-multilib --disable-werror \ -- --disable-shared ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --disable-nls" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ _args+=" --disable-shared" -+ _args+=" ${_fpuflags}" -+ -+ ../binutils-${_binutils_version}/configure ${_args} - - make configure-host && make ${makejobs} - make install -@@ -69,26 +77,42 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} -- _apply_patch -p1 ${FILESDIR}/gcc-4.9.2-musl.diff -+ _apply_patch -p1 ${FILESDIR}/gcc-6.2.1-musl.diff - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap - -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --with-newlib" -+ _args+=" --enable-languages=c" -+ _args+=" --with-newlib" -+ _args+=" --disable-libssp" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-threads" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-shared" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-symvers" -+ _args+=" libat_cv_have_ifunc=no" -+ _args+=" ${_fpuflags}" -+ - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --with-sysroot=${_sysroot} --with-newlib \ -- --enable-languages=c --with-newlib --disable-libssp --disable-nls \ -- --disable-libquadmath --disable-threads --disable-decimal-float \ -- --disable-shared --disable-libmudflap --disable-libgomp \ -- --disable-libatomic --disable-symvers \ -- libat_cv_have_ifunc=no ${_fpuflags} -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -120,7 +144,7 @@ _musl_build() { - msg_normal "Building cross musl libc\n" - - CC="${_triplet}-gcc" CFLAGS="-Os -pipe ${_archflags}" \ -- ./configure --prefix=/usr \ -+ ./configure --prefix=/usr - - make ${makejobs} - make DESTDIR=${_sysroot} install -@@ -129,6 +153,8 @@ _musl_build() { - } - - _gcc_build() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -137,12 +163,23 @@ _gcc_build() { - [ ! -d gcc-build ] && mkdir gcc-build - cd gcc-build - -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \ -- --enable-languages=c,c++,lto --enable-lto --disable-libsanitizer \ -- --disable-multilib --disable-nls --disable-libquadmath \ -- --disable-libmudflap --enable-shared \ -- --disable-symvers libat_cv_have_ifunc=no ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --enable-lto" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-multilib" -+ _args+=" --disable-nls" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libquadmath" -+ _args+=" --enable-shared" -+ _args+=" --disable-symvers" -+ _args+=" libat_cv_have_ifunc=no" -+ _args+=" ${_fpuflags}" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/fix-cxxflags-passing.patch b/srcpkgs/cross-arm-linux-musleabihf/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-arm-linux-musleabihf/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/gcc-4.9.2-musl.diff b/srcpkgs/cross-arm-linux-musleabihf/files/gcc-4.9.2-musl.diff -deleted file mode 120000 -index 3d53eb4..0000000 ---- a/srcpkgs/cross-arm-linux-musleabihf/files/gcc-4.9.2-musl.diff -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/files/gcc-4.9.2-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/gcc-6.2.1-musl.diff b/srcpkgs/cross-arm-linux-musleabihf/files/gcc-6.2.1-musl.diff -new file mode 120000 -index 0000000..9081d12 ---- /dev/null -+++ b/srcpkgs/cross-arm-linux-musleabihf/files/gcc-6.2.1-musl.diff -@@ -0,0 +1 @@ -+../../gcc/files/gcc-6.2.1-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/gcc-spec-env-r1.patch b/srcpkgs/cross-arm-linux-musleabihf/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-arm-linux-musleabihf/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template -index 8da3773..60da6af 100644 ---- a/srcpkgs/cross-arm-linux-musleabihf/template -+++ b/srcpkgs/cross-arm-linux-musleabihf/template -@@ -1,9 +1,9 @@ - # Template build file for 'cross-arm-linux-musleabihf' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _musl_version=1.1.15 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=arm-linux-musleabihf - _fpuflags="--with-arch=armv6 --with-fpu=vfp --with-float=hard" -@@ -11,21 +11,21 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard" - _sysroot="/usr/${_triplet}" - - pkgname=cross-${_triplet} --version=0.21 --revision=5 -+version=0.22 -+revision=1 - short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)" - maintainer="Juan RP " - homepage="http://www.voidlinux.eu" - license="GPL-3, GPL-2, MIT" - distfiles=" -- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 -- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz -+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af - 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa" - - lib32disabled=yes -@@ -49,6 +49,8 @@ _apply_patch() { - } - - _binutils_build() { -+ local _args -+ - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc} -@@ -57,10 +59,16 @@ _binutils_build() { - [ ! -d binutils-build ] && mkdir binutils-build - cd binutils-build - -- ../binutils-${_binutils_version}/configure \ -- --prefix=/usr --target=${_triplet} --with-sysroot=${_sysroot} \ -- --disable-nls --disable-multilib --disable-werror \ -- --disable-shared ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --disable-nls" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ _args+=" --disable-shared" -+ _args+=" ${_fpuflags}" -+ -+ ../binutils-${_binutils_version}/configure ${_args} - - make configure-host && make ${makejobs} - make install -@@ -69,26 +77,42 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} -- _apply_patch -p1 ${FILESDIR}/gcc-4.9.2-musl.diff -+ _apply_patch -p1 ${FILESDIR}/gcc-6.2.1-musl.diff - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap - -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --with-newlib" -+ _args+=" --enable-languages=c" -+ _args+=" --with-newlib" -+ _args+=" --disable-libssp" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-threads" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-shared" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-symvers" -+ _args+=" libat_cv_have_ifunc=no" -+ _args+=" ${_fpuflags}" -+ - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --with-sysroot=${_sysroot} --with-newlib \ -- --enable-languages=c --with-newlib --disable-libssp --disable-nls \ -- --disable-libquadmath --disable-threads --disable-decimal-float \ -- --disable-shared --disable-libmudflap --disable-libgomp \ -- --disable-libatomic --disable-symvers \ -- libat_cv_have_ifunc=no ${_fpuflags} -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -120,7 +144,7 @@ _musl_build() { - msg_normal "Building cross musl libc\n" - - CC="${_triplet}-gcc" CFLAGS="-Os -pipe ${_archflags}" \ -- ./configure --prefix=/usr \ -+ ./configure --prefix=/usr - - make ${makejobs} - make DESTDIR=${_sysroot} install -@@ -129,6 +153,7 @@ _musl_build() { - } - - _gcc_build() { -+ local _args - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -137,12 +162,23 @@ _gcc_build() { - [ ! -d gcc-build ] && mkdir gcc-build - cd gcc-build - -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \ -- --enable-languages=c,c++,lto --enable-lto --disable-libsanitizer \ -- --disable-multilib --disable-nls --disable-libquadmath \ -- --disable-libmudflap --enable-shared --disable-symvers \ -- libat_cv_have_ifunc=no ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --enable-lto" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-multilib" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --enable-shared" -+ _args+=" --disable-symvers" -+ _args+=" libat_cv_have_ifunc=no" -+ _args+=" ${_fpuflags}" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/files/fix-cxxflags-passing.patch b/srcpkgs/cross-armv7l-linux-gnueabihf/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/files/gcc-spec-env-r1.patch b/srcpkgs/cross-armv7l-linux-gnueabihf/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-armv7l-linux-gnueabihf/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template -index f183be2..aee5812 100644 ---- a/srcpkgs/cross-armv7l-linux-gnueabihf/template -+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template -@@ -1,9 +1,9 @@ - # Template build file for 'cross-armv7l-linux-gnueabihf' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _glibc_version=2.24 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=armv7l-linux-gnueabihf - _fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" -@@ -11,22 +11,22 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" - _sysroot="/usr/${_triplet}" - - pkgname=cross-${_triplet} --version=0.21 --revision=4 -+version=0.22 -+revision=1 - short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" - maintainer="Juan RP " - homepage="http://www.voidlinux.eu" - license="GPL-3,GPL-2,LGPL-2.1" - distfiles=" -- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 -- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz - http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz -- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz" -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 - 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92" -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af" - - lib32disabled=yes - nocross=yes -@@ -64,6 +64,8 @@ _linux_headers() { - } - - _binutils_build() { -+ local _args -+ - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc} -@@ -71,10 +73,15 @@ _binutils_build() { - [ ! -d binutils-build ] && mkdir binutils-build - cd binutils-build - -- ../binutils-${_binutils_version}/configure \ -- --prefix=/usr --target=${_triplet} \ -- --with-sysroot=${_sysroot} --disable-nls --disable-shared \ -- --disable-multilib --disable-werror -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --disable-nls" -+ _args+=" --disable-shared" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ -+ ../binutils-${_binutils_version}/configure ${_args} - - make configure-host - make ${makejobs} -@@ -84,26 +91,42 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap - -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --without-headers" -+ _args+=" --disable-nls" -+ _args+=" --disable-shared" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libssp" -+ _args+=" --disable-libitm" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-threads" -+ _args+=" --enable-languages=c" -+ _args+=" --disable-sjlj-exceptions" -+ _args+=" --disable-multilib" -+ _args+=" --with-gnu-ld" -+ _args+=" --with-gnu-as" -+ _args+=" ${_fpuflags}" -+ - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --without-headers \ -- --disable-nls --disable-shared --disable-libquadmath \ -- --disable-decimal-float --disable-libgomp --disable-libmudflap \ -- --disable-libssp --disable-libitm --disable-libatomic \ -- --disable-threads --enable-languages=c \ -- --disable-sjlj-exceptions --disable-multilib \ -- --with-gnu-ld --with-gnu-as ${_fpuflags} -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -112,6 +135,8 @@ _gcc_bootstrap() { - } - - _glibc_headers() { -+ local _args -+ - [ -f ${wrksrc}/.glibc_headers_done ] && return 0 - - cd ${wrksrc} -@@ -126,11 +151,15 @@ _glibc_headers() { - export CC="${_triplet}-gcc" LD="${_triplet}-ld" \ - AS="${_triplet}-as" CPP="${_triplet}-cpp" - -- ../glibc-${_glibc_version}/configure \ -- --host=${_triplet} --prefix=/usr \ -- --with-headers=${_sysroot}/usr/include \ -- --config-cache --enable-obsolete-rpc \ -- --enable-kernel=2.6.27 ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --host=${_triplet}" -+ _args+=" --with-headers=${_sysroot}/usr/include" -+ _args+=" --config-cache" -+ _args+=" --enable-obsolete-rpc" -+ _args+=" --enable-kernel=2.6.27" -+ _args+=" ${_fpuflags}" -+ -+ ../glibc-${_glibc_version}/configure ${_args} - - make -k install-headers cross_compiling=yes \ - install_root=${_sysroot} -@@ -139,6 +168,8 @@ _glibc_headers() { - } - - _glibc_build() { -+ local _args -+ - [ -f ${wrksrc}/.glibc_build_done ] && return 0 - - cd ${wrksrc} -@@ -154,11 +185,17 @@ _glibc_build() { - AS="${_triplet}-as" CPP="${_triplet}-cpp" - export CFLAGS="-Os -pipe ${_archflags}" - -- ../glibc-${_glibc_version}/configure \ -- --host=${_triplet} --prefix=/usr \ -- --with-headers=${_sysroot}/usr/include \ -- --config-cache --disable-profile --enable-obsolete-rpc \ -- --disable-werror --enable-kernel=2.6.27 ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --host=${_triplet}" -+ _args+=" --with-headers=${_sysroot}/usr/include" -+ _args+=" --config-cache" -+ _args+=" --disable-profile" -+ _args+=" --enable-obsolete-rpc" -+ _args+=" --disable-werror" -+ _args+=" --enable-kernel=2.6.27" -+ _args+=" ${_fpuflags}" -+ -+ ../glibc-${_glibc_version}/configure ${_args} - - make ${makejobs} - make install_root=${_sysroot} install -@@ -167,6 +204,8 @@ _glibc_build() { - } - - _gcc_build() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -185,20 +224,39 @@ _gcc_build() { - touch .sed_subst_done - fi - -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --prefix=/usr --libdir=/usr/lib \ -- --libexecdir=/usr/lib --with-sysroot=${_sysroot} \ -- --enable-languages=c,c++,lto \ -- --with-gnu-as --with-gnu-ld --disable-multilib \ -- --disable-werror --disable-nls --disable-sjlj-exceptions \ -- --enable-threads=posix --enable-long-longx \ -- --enable-shared --enable-linker-build-id \ -- --enable-gnu-unique-object --enable-lto \ -- --disable-libquadmath --disable-libatomic \ -- --disable-libssp --disable-libmudflap \ -- --disable-libsanitizer --disable-libcilkrts \ -- --disable-libitm --disable-libvtv --disable-libstdcxx-pch \ -- --enable-libstdcxx-time --with-linker-hash-style=gnu ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --libdir=/usr/lib" -+ _args+=" --libexecdir=/usr/lib" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --with-gnu-as" -+ _args+=" --with-gnu-ld" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ _args+=" --disable-nls" -+ _args+=" --disable-sjlj-exceptions" -+ _args+=" --enable-threads=posix" -+ _args+=" --enable-long-longx" -+ _args+=" --enable-shared" -+ _args+=" --enable-linker-build-id" -+ _args+=" --enable-gnu-unique-object" -+ _args+=" --enable-lto" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-libssp" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-libcilkrts" -+ _args+=" --disable-libitm" -+ _args+=" --disable-libvtv" -+ _args+=" --disable-libstdcxx-pch" -+ _args+=" --enable-libstdcxx-time" -+ _args+=" --with-linker-hash-style=gnu" -+ _args+=" ${_fpuflags}" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/fix-cxxflags-passing.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-armv7l-linux-musleabihf/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/gcc-4.9.2-musl.diff b/srcpkgs/cross-armv7l-linux-musleabihf/files/gcc-4.9.2-musl.diff -deleted file mode 120000 -index 3d53eb4..0000000 ---- a/srcpkgs/cross-armv7l-linux-musleabihf/files/gcc-4.9.2-musl.diff -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/files/gcc-4.9.2-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/gcc-6.2.1-musl.diff b/srcpkgs/cross-armv7l-linux-musleabihf/files/gcc-6.2.1-musl.diff -new file mode 120000 -index 0000000..9081d12 ---- /dev/null -+++ b/srcpkgs/cross-armv7l-linux-musleabihf/files/gcc-6.2.1-musl.diff -@@ -0,0 +1 @@ -+../../gcc/files/gcc-6.2.1-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/gcc-spec-env-r1.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-armv7l-linux-musleabihf/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template -index 14f2db4..c4c885f 100644 ---- a/srcpkgs/cross-armv7l-linux-musleabihf/template -+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template -@@ -1,9 +1,9 @@ - # Template build file for 'cross-armv7l-linux-musleabihf' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _musl_version=1.1.15 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=armv7l-linux-musleabihf - _fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" -@@ -11,21 +11,21 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" - _sysroot="/usr/${_triplet}" - - pkgname=cross-${_triplet} --version=0.21 --revision=5 -+version=0.22 -+revision=1 - short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)" - maintainer="Juan RP " - homepage="http://www.voidlinux.eu" - license="GPL-3, GPL-2, MIT" - distfiles=" -- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 -- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz -+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af - 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa" - - lib32disabled=yes -@@ -49,6 +49,8 @@ _apply_patch() { - } - - _binutils_build() { -+ local _args -+ - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc} -@@ -57,10 +59,16 @@ _binutils_build() { - [ ! -d binutils-build ] && mkdir binutils-build - cd binutils-build - -- ../binutils-${_binutils_version}/configure \ -- --prefix=/usr --target=${_triplet} --with-sysroot=${_sysroot} \ -- --disable-nls --disable-multilib --disable-werror \ -- --disable-shared ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --disable-nls" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ _args+=" --disable-shared" -+ _args+=" ${_fpuflags}" -+ -+ ../binutils-${_binutils_version}/configure ${_args} - - make configure-host && make ${makejobs} - make install -@@ -69,26 +77,42 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} -- _apply_patch -p1 ${FILESDIR}/gcc-4.9.2-musl.diff -+ _apply_patch -p1 ${FILESDIR}/gcc-6.2.1-musl.diff - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap - -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --with-newlib" -+ _args+=" --enable-languages=c" -+ _args+=" --with-newlib" -+ _args+=" --disable-libssp" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-threads" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-shared" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-symvers" -+ _args+=" libat_cv_have_ifunc=no" -+ _args+=" ${_fpuflags}" -+ - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --with-sysroot=${_sysroot} --with-newlib \ -- --enable-languages=c --with-newlib --disable-libssp --disable-nls \ -- --disable-libquadmath --disable-threads --disable-decimal-float \ -- --disable-shared --disable-libmudflap --disable-libgomp \ -- --disable-libatomic --disable-symvers \ -- libat_cv_have_ifunc=no ${_fpuflags} -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -121,7 +145,7 @@ _musl_build() { - msg_normal "Building cross musl libc\n" - - CC="${_triplet}-gcc" CFLAGS="-Os -pipe ${_archflags}" \ -- ./configure --prefix=/usr \ -+ ./configure --prefix=/usr - - make ${makejobs} - make DESTDIR=${_sysroot} install -@@ -130,6 +154,8 @@ _musl_build() { - } - - _gcc_build() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -138,12 +164,23 @@ _gcc_build() { - [ ! -d gcc-build ] && mkdir gcc-build - cd gcc-build - -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \ -- --enable-languages=c,c++,lto --enable-lto --disable-libsanitizer \ -- --disable-multilib --disable-nls --disable-libquadmath \ -- --disable-libmudflap --enable-shared --disable-symvers \ -- libat_cv_have_ifunc=no ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --enable-lto" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-multilib" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --enable-shared" -+ _args+=" --disable-symvers" -+ _args+=" libat_cv_have_ifunc=no" -+ _args+=" ${_fpuflags}" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/cross-i686-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-i686-linux-musl/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-i686-linux-musl/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-i686-linux-musl/files/gcc-4.9.2-musl.diff b/srcpkgs/cross-i686-linux-musl/files/gcc-4.9.2-musl.diff -deleted file mode 120000 -index 3d53eb4..0000000 ---- a/srcpkgs/cross-i686-linux-musl/files/gcc-4.9.2-musl.diff -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/files/gcc-4.9.2-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-i686-linux-musl/files/gcc-6.2.1-musl.diff b/srcpkgs/cross-i686-linux-musl/files/gcc-6.2.1-musl.diff -new file mode 120000 -index 0000000..9081d12 ---- /dev/null -+++ b/srcpkgs/cross-i686-linux-musl/files/gcc-6.2.1-musl.diff -@@ -0,0 +1 @@ -+../../gcc/files/gcc-6.2.1-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-i686-linux-musl/files/gcc-spec-env-r1.patch b/srcpkgs/cross-i686-linux-musl/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-i686-linux-musl/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template -index ae8b102..83311c5 100644 ---- a/srcpkgs/cross-i686-linux-musl/template -+++ b/srcpkgs/cross-i686-linux-musl/template -@@ -1,30 +1,30 @@ - # Template build file for 'cross-i686-linux-musl' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _musl_version=1.1.15 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=i686-linux-musl - _sysroot="/usr/${_triplet}" - _archflags="-march=i686" - - pkgname=cross-${_triplet} --version=0.21 --revision=5 -+version=0.22 -+revision=1 - short_desc="Cross toolchain for i686 target (musl)" - maintainer="Juan RP " - homepage="http://www.voidlinux.eu" - license="GPL-3, GPL-2, MIT" - distfiles=" -- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 -- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz -+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af - 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa" - - lib32disabled=yes -@@ -48,6 +48,8 @@ _apply_patch() { - } - - _binutils_build() { -+ local _args -+ - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc} -@@ -55,11 +57,16 @@ _binutils_build() { - - [ ! -d binutils-build ] && mkdir binutils-build - cd binutils-build -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --disable-nls" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ _args+=" --disable-shared" -+ _args+=" ${_fpuflags}" - -- ../binutils-${_binutils_version}/configure \ -- --prefix=/usr --target=${_triplet} --with-sysroot=${_sysroot} \ -- --disable-nls --disable-multilib --disable-werror \ -- --disable-shared ${_fpuflags} -+ ../binutils-${_binutils_version}/configure ${_args} - - make configure-host - make ${makejobs} -@@ -69,26 +76,40 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} -- _apply_patch -p1 ${FILESDIR}/gcc-4.9.2-musl.diff -+ _apply_patch -p1 ${FILESDIR}/gcc-6.2.1-musl.diff - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap - -+ _args=--prefix=/usr \ -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c" -+ _args+=" --with-newlib" -+ _args+=" --disable-libssp" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-threads" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-shared" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-symvers" -+ _args+=" libat_cv_have_ifunc=no" -+ _args+=" ${_fpuflags}" - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --with-sysroot=${_sysroot} \ -- --enable-languages=c --with-newlib --disable-libssp --disable-nls \ -- --disable-libquadmath --disable-threads --disable-decimal-float \ -- --disable-shared --disable-libmudflap --disable-libgomp \ -- --disable-libatomic --disable-symvers \ -- libat_cv_have_ifunc=no ${_fpuflags} -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -121,7 +142,7 @@ _musl_build() { - msg_normal "Building cross musl libc\n" - - CC="${_triplet}-gcc" CFLAGS="-Os -pipe ${_archflags}" \ -- ./configure --prefix=/usr \ -+ ./configure --prefix=/usr - - make ${makejobs} - make DESTDIR=${_sysroot} install -@@ -130,6 +151,7 @@ _musl_build() { - } - - _gcc_build() { -+ local _args - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -138,11 +160,21 @@ _gcc_build() { - [ ! -d gcc-build ] && mkdir gcc-build - cd gcc-build - -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \ -- --enable-languages=c,c++,lto --enable-lto --disable-libsanitizer \ -- --disable-multilib --disable-libmudflap --enable-shared \ -- --disable-symvers libat_cv_have_ifunc=no ${_fpuflags} -+ _args="--target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --prefix=/usr" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --enable-lto" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-multilib" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --enable-shared" -+ _args+=" --disable-symvers" -+ _args+=" libat_cv_have_ifunc=no" -+ _args+=" ${_fpuflags}" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/fix-cxxflags-passing.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-i686-pc-linux-gnu/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/gcc-spec-env-r1.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-i686-pc-linux-gnu/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template -index bb4e0f2..6047c2b 100644 ---- a/srcpkgs/cross-i686-pc-linux-gnu/template -+++ b/srcpkgs/cross-i686-pc-linux-gnu/template -@@ -1,31 +1,31 @@ - # Template build file for 'cross-i686-pc-linux-gnu' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _glibc_version=2.24 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=i686-pc-linux-gnu - _archflags="-march=i686 -mtune=generic" - _sysroot="/usr/${_triplet}" - - pkgname=cross-${_triplet} --version=0.21 --revision=4 -+version=0.22 -+revision=1 - short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)" - maintainer="Juan RP " - homepage="http://www.voidlinux.eu" - license="GPL-3, GPL-2, LGPL-2.1" - distfiles=" - ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -- ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz - ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz -- ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz" -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 - 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92" -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af" - - only_for_archs="armv6l armv7l x86_64" - nocross=yes -@@ -34,7 +34,7 @@ nodebug=yes - lib32disabled=yes - create_wrksrc=yes - hostmakedepends="perl flex" --makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel" -+makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" - depends="${pkgname}-libc-${version}_${revision}" - nostrip_files="libgcc.a libgcov.a libgcc_eh.a" - -@@ -69,11 +69,12 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - -@@ -82,16 +83,29 @@ _gcc_bootstrap() { - - # Fix https://build.voidlinux.eu/builders/x86_64_builder/builds/24895/steps/shell_3/logs/stdio - export gcc_cv_libc_provides_ssp=yes -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --without-headers" -+ _args+=" --disable-nls" -+ _args+=" --disable-shared" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libssp" -+ _args+=" --disable-libitm" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-threads" -+ _args+=" --enable-languages=c" -+ _args+=" --disable-sjlj-exceptions" -+ _args+=" --disable-multilib" -+ _args+=" --with-gnu-ld" -+ _args+=" --with-gnu-as" -+ _args+=" ${_fpuflags}" - - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --without-headers \ -- --disable-nls --disable-shared --disable-libquadmath \ -- --disable-decimal-float --disable-libgomp --disable-libmudflap \ -- --disable-libssp --disable-libitm --disable-libatomic \ -- --disable-threads --enable-languages=c \ -- --disable-sjlj-exceptions --disable-multilib \ -- --with-gnu-ld --with-gnu-as ${_fpuflags} -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -114,6 +128,7 @@ _linux_headers() { - } - - _glibc_headers() { -+ local _args - [ -f ${wrksrc}/.glibc_headers_done ] && return 0 - - cd ${wrksrc} -@@ -129,11 +144,15 @@ _glibc_headers() { - export CC="${_triplet}-gcc" LD="${_triplet}-ld" \ - AS="${_triplet}-as" CPP="${_triplet}-cpp" - -- ../glibc-${_glibc_version}/configure \ -- --host=${_triplet} --prefix=/usr \ -- --with-headers=${_sysroot}/usr/include \ -- --config-cache --enable-obsolete-rpc \ -- --enable-kernel=2.6.27 ${_fpuflags} -+ _args="--target=${_triplet}" -+ _args+=" --prefix=/usr" -+ _args+=" --with-headers=${_sysroot}/usr/include" -+ _args+=" --config-cache" -+ _args+=" --enable-obsolete-rpc" -+ _args+=" --enable-kernel=2.6.27" -+ _args+=" ${_fpuflags}" -+ -+ ../glibc-${_glibc_version}/configure ${_args} - - make -k install-headers cross_compiling=yes \ - install_root=${_sysroot} -@@ -142,6 +161,7 @@ _glibc_headers() { - } - - _glibc_build() { -+ local _args - [ -f ${wrksrc}/.glibc_build_done ] && return 0 - - cd ${wrksrc} -@@ -156,13 +176,16 @@ _glibc_build() { - - export CC="${_triplet}-gcc" LD="${_triplet}-ld" \ - AS="${_triplet}-as" CPP="${_triplet}-cpp" -- export CFLAGS="-Os -pipe -Wno-error ${_archflags}" -+ export CFLAGS="-O2 -pipe -Wno-error ${_archflags}" -+ _args="--host=${_triplet}" -+ _args+=" --prefix=/usr" -+ _args+=" --with-headers=${_sysroot}/usr/include" -+ _args+=" --config-cache" -+ _args+=" --enable-obsolete-rpc" -+ _args+=" --enable-kernel=2.6.27" -+ _args+=" ${_fpuflags}" - -- ../glibc-${_glibc_version}/configure \ -- --host=${_triplet} --prefix=/usr \ -- --with-headers=${_sysroot}/usr/include \ -- --config-cache --enable-obsolete-rpc \ -- --enable-kernel=2.6.27 ${_fpuflags} -+ ../glibc-${_glibc_version}/configure ${_args} - - make ${makejobs} - make install_root=${_sysroot} install -@@ -171,6 +194,8 @@ _glibc_build() { - } - - _gcc_build() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -180,7 +205,6 @@ _gcc_build() { - cd gcc-build - - unset LD AS CPP -- export CC="gcc" CFLAGS="-Os -pipe" - - # Make this link to target libs. - if [ ! -f .sed_subst_done ]; then -@@ -188,20 +212,40 @@ _gcc_build() { - -i ${_sysroot}/lib/libc.so ${_sysroot}/lib/libpthread.so - touch .sed_subst_done - fi -- -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --prefix=/usr --libdir=/usr/lib \ -- --with-sysroot=${_sysroot} --enable-languages=c,c++,lto \ -- --with-gnu-as --with-gnu-ld --disable-multilib \ -- --disable-nls --disable-sjlj-exceptions \ -- --enable-threads=posix --enable-long-longx \ -- --enable-shared --enable-linker-build-id \ -- --enable-gnu-unique-object --enable-lto \ -- --disable-libquadmath --disable-libatomic \ -- --disable-libssp --disable-libmudflap \ -- --disable-libsanitizer --disable-libcilkrts \ -- --disable-libitm --disable-libvtv --disable-libstdcxx-pch \ -- --enable-libstdcxx-time --with-linker-hash-style=gnu ${_fpuflags} -+ _args="--target=${_triplet}" -+ _args+=" --target=${_triplet}" -+ _args+=" --prefix=/usr" -+ _args+=" --libdir=/usr/lib" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --with-gnu-as" -+ _args+=" --with-gnu-ld" -+ _args+=" --disable-multilib" -+ _args+=" --disable-nls" -+ _args+=" --disable-sjlj-exceptions" -+ _args+=" --enable-threads=posix" -+ _args+=" --enable-long-longx" -+ _args+=" --enable-shared" -+ _args+=" --enable-linker-build-id" -+ _args+=" --enable-gnu-unique-object" -+ _args+=" --enable-lto" -+ _args+=" --enable-gnu-indirect-function" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-libssp" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-libcilkrts" -+ _args+=" --disable-libitm" -+ _args+=" --disable-libvtv" -+ _args+=" --disable-libstdcxx-pch" -+ _args+=" --enable-libstdcxx-time" -+ _args+=" --with-linker-hash-style=gnu" -+ _args+=" ${_fpuflags}" -+ -+ CC="gcc" CFLAGS="-O2 -pipe" \ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/cross-mips-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-mips-linux-musl/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-mips-linux-musl/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-mips-linux-musl/files/gcc-4.9.2-musl.diff b/srcpkgs/cross-mips-linux-musl/files/gcc-4.9.2-musl.diff -deleted file mode 120000 -index 3d53eb4..0000000 ---- a/srcpkgs/cross-mips-linux-musl/files/gcc-4.9.2-musl.diff -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/files/gcc-4.9.2-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-mips-linux-musl/files/gcc-6.2.1-musl.diff b/srcpkgs/cross-mips-linux-musl/files/gcc-6.2.1-musl.diff -new file mode 120000 -index 0000000..9081d12 ---- /dev/null -+++ b/srcpkgs/cross-mips-linux-musl/files/gcc-6.2.1-musl.diff -@@ -0,0 +1 @@ -+../../gcc/files/gcc-6.2.1-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-mips-linux-musl/files/gcc-spec-env-r1.patch b/srcpkgs/cross-mips-linux-musl/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-mips-linux-musl/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template -index a3ffca6..a6a16ed 100644 ---- a/srcpkgs/cross-mips-linux-musl/template -+++ b/srcpkgs/cross-mips-linux-musl/template -@@ -1,9 +1,9 @@ - # Template build file for 'cross-mips-linux-musl' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _musl_version=1.1.15 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=mips-linux-musl - _fpuflags="--with-float=soft --without-fp" -@@ -11,21 +11,21 @@ _archflags="-march=mips32r2 -msoft-float" - _sysroot="/usr/${_triplet}" - - pkgname=cross-${_triplet} --version=0.21 --revision=6 -+version=0.22 -+revision=1 - short_desc="Cross toolchain for MIPS32r2 BE softfloat target (musl)" - maintainer="Juan RP " - homepage="http://www.voidlinux.eu" - license="GPL-3, GPL-2, MIT" - distfiles=" -- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 -- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz -+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af - 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa" - - lib32disabled=yes -@@ -49,6 +49,8 @@ _apply_patch() { - } - - _binutils_build() { -+ local _args -+ - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc} -@@ -57,10 +59,16 @@ _binutils_build() { - [ ! -d binutils-build ] && mkdir binutils-build - cd binutils-build - -- ../binutils-${_binutils_version}/configure \ -- --prefix=/usr --target=${_triplet} --with-sysroot=${_sysroot} \ -- --disable-nls --disable-multilib --disable-werror \ -- --disable-shared ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --disable-nls" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ _args+=" --disable-shared" -+ _args+=" ${_fpuflags}" -+ -+ ../binutils-${_binutils_version}/configure ${_args} - - make configure-host && make ${makejobs} - make install -@@ -69,25 +77,40 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} -- _apply_patch -p1 ${FILESDIR}/gcc-4.9.2-musl.diff -+ _apply_patch -p1 ${FILESDIR}/gcc-6.2.1-musl.diff - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap - -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --with-newlib" -+ _args+=" --enable-languages=c" -+ _args+=" --with-newlib" -+ _args+=" --disable-libssp" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-threads" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-shared" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libatomic" -+ _args+=" ${_fpuflags}" -+ - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --with-sysroot=${_sysroot} --with-newlib \ -- --enable-languages=c --with-newlib --disable-libssp --disable-nls \ -- --disable-libquadmath --disable-threads --disable-decimal-float \ -- --disable-shared --disable-libmudflap --disable-libgomp \ -- --disable-libatomic ${_fpuflags} -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -116,7 +139,7 @@ _musl_build() { - msg_normal "Building cross musl libc\n" - - CC="${_triplet}-gcc" CFLAGS="-Os -pipe ${_archflags}" \ -- ./configure --prefix=/usr \ -+ ./configure --prefix=/usr - - make ${makejobs} - make DESTDIR=${_sysroot} install -@@ -125,6 +148,8 @@ _musl_build() { - } - - _gcc_build() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -133,12 +158,22 @@ _gcc_build() { - [ ! -d gcc-build ] && mkdir gcc-build - cd gcc-build - -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \ -- --libexecdir=/usr/lib --enable-languages=c,c++,lto \ -- --enable-lto --disable-libsanitizer \ -- --disable-multilib --disable-nls --disable-libquadmath \ -- --disable-libmudflap --enable-shared ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --libexecdir=/usr/lib" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --enable-lto" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-multilib" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --enable-shared" -+ _args+=" ${_fpuflags}" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/cross-mipsel-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-mipsel-linux-musl/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-mipsel-linux-musl/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-mipsel-linux-musl/files/gcc-4.9.2-musl.diff b/srcpkgs/cross-mipsel-linux-musl/files/gcc-4.9.2-musl.diff -deleted file mode 120000 -index 3d53eb4..0000000 ---- a/srcpkgs/cross-mipsel-linux-musl/files/gcc-4.9.2-musl.diff -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/files/gcc-4.9.2-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-mipsel-linux-musl/files/gcc-6.2.1-musl.diff b/srcpkgs/cross-mipsel-linux-musl/files/gcc-6.2.1-musl.diff -new file mode 120000 -index 0000000..9081d12 ---- /dev/null -+++ b/srcpkgs/cross-mipsel-linux-musl/files/gcc-6.2.1-musl.diff -@@ -0,0 +1 @@ -+../../gcc/files/gcc-6.2.1-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-mipsel-linux-musl/files/gcc-spec-env-r1.patch b/srcpkgs/cross-mipsel-linux-musl/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-mipsel-linux-musl/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template -index 970d595..d0c6fa5 100644 ---- a/srcpkgs/cross-mipsel-linux-musl/template -+++ b/srcpkgs/cross-mipsel-linux-musl/template -@@ -1,9 +1,9 @@ - # Template build file for 'cross-mipsel-linux-musl' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _musl_version=1.1.15 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=mipsel-linux-musl - _fpuflags="--with-float=soft --without-fp" -@@ -11,21 +11,21 @@ _archflags="-march=mips32r2 -msoft-float" - _sysroot="/usr/${_triplet}" - - pkgname=cross-${_triplet} --version=0.21 --revision=6 -+version=0.22 -+revision=1 - short_desc="Cross toolchain for MIPS32r2 LE softfloat target (musl)" - maintainer="Juan RP " - homepage="http://www.voidlinux.eu" - license="GPL-3, GPL-2, MIT" - distfiles=" -- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 -- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz -+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af - 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa" - - lib32disabled=yes -@@ -49,6 +49,8 @@ _apply_patch() { - } - - _binutils_build() { -+ local _args -+ - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc} -@@ -57,10 +59,16 @@ _binutils_build() { - [ ! -d binutils-build ] && mkdir binutils-build - cd binutils-build - -- ../binutils-${_binutils_version}/configure \ -- --prefix=/usr --target=${_triplet} --with-sysroot=${_sysroot} \ -- --disable-nls --disable-multilib --disable-werror \ -- --disable-shared ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --disable-nls" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ _args+=" --disable-shared" -+ _args+=" ${_fpuflags}" -+ -+ ../binutils-${_binutils_version}/configure ${_args} - - make configure-host && make ${makejobs} - make install -@@ -69,25 +77,40 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} -- _apply_patch -p1 ${FILESDIR}/gcc-4.9.2-musl.diff -+ _apply_patch -p1 ${FILESDIR}/gcc-6.2.1-musl.diff - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap - -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --with-newlib" -+ _args+=" --enable-languages=c" -+ _args+=" --with-newlib" -+ _args+=" --disable-libssp" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-threads" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-shared" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libatomic" -+ _args+=" ${_fpuflags}" -+ - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --with-sysroot=${_sysroot} --with-newlib \ -- --enable-languages=c --with-newlib --disable-libssp --disable-nls \ -- --disable-libquadmath --disable-threads --disable-decimal-float \ -- --disable-shared --disable-libmudflap --disable-libgomp \ -- --disable-libatomic ${_fpuflags} -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -116,7 +139,7 @@ _musl_build() { - msg_normal "Building cross musl libc\n" - - CC="${_triplet}-gcc" CFLAGS="-Os -pipe ${_archflags}" \ -- ./configure --prefix=/usr \ -+ ./configure --prefix=/usr - - make ${makejobs} - make DESTDIR=${_sysroot} install -@@ -125,6 +148,8 @@ _musl_build() { - } - - _gcc_build() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -133,12 +158,22 @@ _gcc_build() { - [ ! -d gcc-build ] && mkdir gcc-build - cd gcc-build - -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \ -- --libexecdir=/usr/lib --enable-languages=c,c++,lto \ -- --enable-lto --disable-libsanitizer \ -- --disable-multilib --disable-nls --disable-libquadmath \ -- --disable-libmudflap --enable-shared ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --libexecdir=/usr/lib" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --enable-lto" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-multilib" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --enable-shared" -+ _args+=" ${_fpuflags}" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/cross-mipsel-linux-muslhf/files/fix-cxxflags-passing.patch b/srcpkgs/cross-mipsel-linux-muslhf/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-mipsel-linux-muslhf/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-mipsel-linux-muslhf/files/gcc-4.9.2-musl.diff b/srcpkgs/cross-mipsel-linux-muslhf/files/gcc-4.9.2-musl.diff -deleted file mode 120000 -index 3d53eb4..0000000 ---- a/srcpkgs/cross-mipsel-linux-muslhf/files/gcc-4.9.2-musl.diff -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/files/gcc-4.9.2-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-mipsel-linux-muslhf/files/gcc-6.2.1-musl.diff b/srcpkgs/cross-mipsel-linux-muslhf/files/gcc-6.2.1-musl.diff -new file mode 120000 -index 0000000..9081d12 ---- /dev/null -+++ b/srcpkgs/cross-mipsel-linux-muslhf/files/gcc-6.2.1-musl.diff -@@ -0,0 +1 @@ -+../../gcc/files/gcc-6.2.1-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-mipsel-linux-muslhf/files/gcc-spec-env-r1.patch b/srcpkgs/cross-mipsel-linux-muslhf/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-mipsel-linux-muslhf/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template -index 347ea85..1200232 100644 ---- a/srcpkgs/cross-mipsel-linux-muslhf/template -+++ b/srcpkgs/cross-mipsel-linux-muslhf/template -@@ -1,9 +1,9 @@ - # Template build file for 'cross-mipsel-linux-muslhf' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _musl_version=1.1.15 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=mipsel-linux-muslhf - _fpuflags="--with-float=hard --with-fp" -@@ -11,21 +11,21 @@ _archflags="-march=mips32r2 -mhard-float" - _sysroot="/usr/${_triplet}" - - pkgname=cross-${_triplet} --version=0.21 --revision=6 -+version=0.22 -+revision=1 - short_desc="Cross toolchain for MIPS32r2 LE hardfloat target (musl)" - maintainer="Juan RP " - homepage="http://www.voidlinux.eu" - license="GPL-3, GPL-2, MIT" - distfiles=" -- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 -- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz -+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af - 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa" - - lib32disabled=yes -@@ -49,6 +49,8 @@ _apply_patch() { - } - - _binutils_build() { -+ local _args -+ - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc} -@@ -57,10 +59,16 @@ _binutils_build() { - [ ! -d binutils-build ] && mkdir binutils-build - cd binutils-build - -- ../binutils-${_binutils_version}/configure \ -- --prefix=/usr --target=${_triplet} --with-sysroot=${_sysroot} \ -- --disable-nls --disable-multilib --disable-werror \ -- --disable-shared ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --disable-nls" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ _args+=" --disable-shared" -+ _args+=" ${_fpuflags}" -+ -+ ../binutils-${_binutils_version}/configure ${_args} - - make configure-host && make ${makejobs} - make install -@@ -69,25 +77,40 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} -- _apply_patch -p1 ${FILESDIR}/gcc-4.9.2-musl.diff -+ _apply_patch -p1 ${FILESDIR}/gcc-6.2.1-musl.diff - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap - -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --with-newlib" -+ _args+=" --enable-languages=c" -+ _args+=" --with-newlib" -+ _args+=" --disable-libssp" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-threads" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-shared" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libatomic" -+ _args+=" ${_fpuflags}" -+ - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --with-sysroot=${_sysroot} --with-newlib \ -- --enable-languages=c --with-newlib --disable-libssp --disable-nls \ -- --disable-libquadmath --disable-threads --disable-decimal-float \ -- --disable-shared --disable-libmudflap --disable-libgomp \ -- --disable-libatomic ${_fpuflags} -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -116,7 +139,7 @@ _musl_build() { - msg_normal "Building cross musl libc\n" - - CC="${_triplet}-gcc" CFLAGS="-Os -pipe ${_archflags}" \ -- ./configure --prefix=/usr \ -+ ./configure --prefix=/usr - - make ${makejobs} - make DESTDIR=${_sysroot} install -@@ -125,6 +148,8 @@ _musl_build() { - } - - _gcc_build() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -133,12 +158,22 @@ _gcc_build() { - [ ! -d gcc-build ] && mkdir gcc-build - cd gcc-build - -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \ -- --libexecdir=/usr/lib --enable-languages=c,c++,lto \ -- --enable-lto --disable-libsanitizer \ -- --disable-multilib --disable-nls --disable-libquadmath \ -- --disable-libmudflap --enable-shared ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --libexecdir=/usr/lib" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --enable-lto" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-multilib" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --enable-shared" -+ _args+=" ${_fpuflags}" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template -index 0bfd58a..2b4c849 100644 ---- a/srcpkgs/cross-vpkg-dummy/template -+++ b/srcpkgs/cross-vpkg-dummy/template -@@ -1,6 +1,6 @@ - # Template file for 'cross-vpkg-dummy' - pkgname=cross-vpkg-dummy --version=0.21 -+version=0.22 - revision=1 - build_style=meta - short_desc="Dummy meta-pkg for cross building packages with xbps-src" -@@ -23,7 +23,6 @@ provides=" - libgomp-9999_1 - libgomp-devel-9999_1 - gcc-9999_1 -- gcc-c++-9999_1 - glibc-9999_1 - glibc-devel-9999_1 - musl-9999_1" -@@ -36,7 +35,6 @@ conflicts=" - libgomp>=0 - libgomp-devel>=0 - gcc>=0 -- gcc-c++>=0 - glibc>=0 - glibc-devel>=0 - musl>=0" -diff --git a/srcpkgs/cross-x86_64-linux-musl/files/fix-cxxflags-passing.patch b/srcpkgs/cross-x86_64-linux-musl/files/fix-cxxflags-passing.patch -new file mode 120000 -index 0000000..4a8c831 ---- /dev/null -+++ b/srcpkgs/cross-x86_64-linux-musl/files/fix-cxxflags-passing.patch -@@ -0,0 +1 @@ -+../../gcc/patches/fix-cxxflags-passing.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-x86_64-linux-musl/files/gcc-4.9.2-musl.diff b/srcpkgs/cross-x86_64-linux-musl/files/gcc-4.9.2-musl.diff -deleted file mode 120000 -index 3d53eb4..0000000 ---- a/srcpkgs/cross-x86_64-linux-musl/files/gcc-4.9.2-musl.diff -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/files/gcc-4.9.2-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-x86_64-linux-musl/files/gcc-6.2.1-musl.diff b/srcpkgs/cross-x86_64-linux-musl/files/gcc-6.2.1-musl.diff -new file mode 120000 -index 0000000..9081d12 ---- /dev/null -+++ b/srcpkgs/cross-x86_64-linux-musl/files/gcc-6.2.1-musl.diff -@@ -0,0 +1 @@ -+../../gcc/files/gcc-6.2.1-musl.diff -\ No newline at end of file -diff --git a/srcpkgs/cross-x86_64-linux-musl/files/gcc-spec-env-r1.patch b/srcpkgs/cross-x86_64-linux-musl/files/gcc-spec-env-r1.patch -deleted file mode 120000 -index 8dd1493..0000000 ---- a/srcpkgs/cross-x86_64-linux-musl/files/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1 +0,0 @@ --../../gcc/patches/gcc-spec-env-r1.patch -\ No newline at end of file -diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template -index f63adfc..74da0ea 100644 ---- a/srcpkgs/cross-x86_64-linux-musl/template -+++ b/srcpkgs/cross-x86_64-linux-musl/template -@@ -1,29 +1,29 @@ - # Template build file for 'cross-x86_64-linux-musl' - # - _binutils_version=2.27 --_gcc_version=4.9.4 -+_gcc_version=6.2.1 - _musl_version=1.1.15 --_linux_version=3.18.25 -+_linux_version=4.1.34 - - _triplet=x86_64-linux-musl - _sysroot="/usr/${_triplet}" - - pkgname=cross-${_triplet} --version=0.21 --revision=6 -+version=0.22 -+revision=1 - short_desc="Cross toolchain for x86_64 with musl" - maintainer="Juan RP " - homepage="http://www.voidlinux.eu" - license="GPL-3, GPL-2, MIT" - distfiles=" -- http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 -- http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 -- http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz -+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 -+ http://distfiles.voidlinux.de/gcc-$version/gcc-${_gcc_version}.tar.xz -+ ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz" - checksum=" - 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 -- 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -- c649874e2856101df7cefe5fdad313ebb2282a939fc1e95cf02222327745ff92 -+ 6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 -+ 412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af - 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa" - - lib32disabled=yes -@@ -47,6 +47,8 @@ _apply_patch() { - } - - _binutils_build() { -+ local _args -+ - [ -f ${wrksrc}/.binutils_build_done ] && return 0 - - cd ${wrksrc} -@@ -55,10 +57,16 @@ _binutils_build() { - [ ! -d binutils-build ] && mkdir binutils-build - cd binutils-build - -- ../binutils-${_binutils_version}/configure \ -- --prefix=/usr --target=${_triplet} --with-sysroot=${_sysroot} \ -- --disable-nls --disable-multilib --disable-werror \ -- --disable-shared ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --disable-nls" -+ _args+=" --disable-multilib" -+ _args+=" --disable-werror" -+ _args+=" --disable-shared" -+ _args+=" ${_fpuflags}" -+ -+ ../binutils-${_binutils_version}/configure ${_args} - - make configure-host - make ${makejobs} -@@ -68,26 +76,42 @@ _binutils_build() { - } - - _gcc_bootstrap() { -+ local _args -+ - [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 - - cd ${wrksrc}/gcc-${_gcc_version} -- _apply_patch -p1 ${FILESDIR}/gcc-4.9.2-musl.diff -+ _apply_patch -p1 ${FILESDIR}/gcc-6.2.1-musl.diff - _apply_patch -p0 ${FILESDIR}/libcpp-source_date_epoch.patch -- _apply_patch -p0 ${FILESDIR}/gcc-spec-env-r1.patch -+ _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - - msg_normal "Building cross gcc bootstrap\n" - - [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap - cd ../gcc-bootstrap -+ export ac_cv_c_compiler_gnu=yes -+ -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c" -+ _args+=" --with-newlib" -+ _args+=" --disable-libssp" -+ _args+=" --disable-nls" -+ _args+=" --disable-libquadmath" -+ _args+=" --disable-threads" -+ _args+=" --disable-decimal-float" -+ _args+=" --disable-shared" -+ _args+=" --disable-libmudflap" -+ _args+=" --disable-libgomp" -+ _args+=" --disable-libatomic" -+ _args+=" --disable-symvers" -+ _args+=" --disable-libmpx" -+ _args+=" libat_cv_have_ifunc=no" -+ _args+=" ${_fpuflags}" - - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ -- ../gcc-${_gcc_version}/configure --prefix=/usr \ -- --target=${_triplet} --with-sysroot=${_sysroot} \ -- --enable-languages=c --with-newlib --disable-libssp --disable-nls \ -- --disable-libquadmath --disable-threads --disable-decimal-float \ -- --disable-shared --disable-libmudflap --disable-libgomp \ -- --disable-libatomic --disable-symvers \ -- libat_cv_have_ifunc=no ${_fpuflags} -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - make install -@@ -120,7 +144,7 @@ _musl_build() { - msg_normal "Building cross musl libc\n" - - CC="${_triplet}-gcc" CFLAGS="-Os -pipe ${_archflags}" \ -- ./configure --prefix=/usr \ -+ ./configure --prefix=/usr - - make ${makejobs} - make DESTDIR=${_sysroot} install -@@ -129,6 +153,7 @@ _musl_build() { - } - - _gcc_build() { -+ local _args - [ -f ${wrksrc}/.gcc_build_done ] && return 0 - - cd ${wrksrc} -@@ -137,11 +162,21 @@ _gcc_build() { - [ ! -d gcc-build ] && mkdir gcc-build - cd gcc-build - -- ../gcc-${_gcc_version}/configure \ -- --target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \ -- --enable-languages=c,c++,lto --enable-lto --disable-libsanitizer \ -- --disable-multilib --disable-libmudflap --enable-shared \ -- --disable-symvers libat_cv_have_ifunc=no ${_fpuflags} -+ _args="--prefix=/usr" -+ _args+=" --target=${_triplet}" -+ _args+=" --with-sysroot=${_sysroot}" -+ _args+=" --enable-languages=c,c++,lto" -+ _args+=" --enable-lto" -+ _args+=" --disable-libsanitizer" -+ _args+=" --disable-multilib" -+ _args+=" --disable-libmpx" -+ _args+=" --disable-libmudflap" -+ _args+=" --enable-shared" -+ _args+=" --disable-symvers" -+ _args+=" libat_cv_have_ifunc=no" -+ _args+=" ${_fpuflags}" -+ -+ ../gcc-${_gcc_version}/configure ${_args} - - make ${makejobs} - -diff --git a/srcpkgs/efivar/template b/srcpkgs/efivar/template -index 390aa8a..63dbc9b 100644 ---- a/srcpkgs/efivar/template -+++ b/srcpkgs/efivar/template -@@ -11,7 +11,8 @@ only_for_archs="i686 i686-musl x86_64 x86_64-musl" - distfiles="https://github.com/rhinstaller/efivar/releases/download/${version}/efivar-${version}.tar.bz2" - checksum=04b9b9de9d9a1a013395400438a033daf4a4290f497ec5be04a120e2ac535094 - --CFLAGS="-Wno-error=deprecated-declarations" -+CFLAGS="-Wno-error -Wno-error=nonnull-compare -Wno-error=unused-const-variable=\ -+ -Wno-error=deprecated-declarations -Wno-error=strict-aliasing" - - do_build() { - sed 's|-rpath=$(TOPDIR)/src/|-rpath=$(libdir)|g' -i src/test/Makefile -diff --git a/srcpkgs/gcc-c++ b/srcpkgs/gcc-c++ -deleted file mode 120000 -index b08d5af..0000000 ---- a/srcpkgs/gcc-c++ -+++ /dev/null -@@ -1 +0,0 @@ --gcc -\ No newline at end of file -diff --git a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch -index 1707d41..134846c 100644 ---- a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch -+++ b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch -@@ -1,11 +1,13 @@ - --- libiberty/Makefile.in 2016-08-05 17:07:27.540554328 +0200 - +++ libiberty/Makefile.in 2016-08-05 17:18:39.727540789 +0200 --@@ -112,7 +112,7 @@ -+@@ -112,8 +112,8 @@ - - INCDIR=$(srcdir)/$(MULTISRCTOP)../include - ---COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) $(HDEFINES) @ac_libiberty_warn_cflags@ --+COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -fPIC -I. -I$(INCDIR) $(HDEFINES) @ac_libiberty_warn_cflags@ -+-COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) \ -+- $(HDEFINES) @ac_libiberty_warn_cflags@ -D_GNU_SOURCE -++COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -fPIC -I. -I$(INCDIR) \ -++ $(HDEFINES) @ac_libiberty_warn_cflags@ -D_DEFAULT_SOURCE - - # Just to make sure we don't use a built-in rule with VPATH - .c.$(objext): -diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template -index 7b6a119..c1b9d60 100644 ---- a/srcpkgs/gcc-multilib/template -+++ b/srcpkgs/gcc-multilib/template -@@ -1,18 +1,18 @@ - # Template build file for 'gcc-multilib' - only_for_archs="x86_64" - _triplet="x86_64-unknown-linux-gnu" --_majorver=4.9 -+_majorver=6.2 - - pkgname=gcc-multilib --version=${_majorver}.4 -+version=${_majorver}.1 - revision=2 - wrksrc="gcc-${version}" - short_desc="The GNU C Compiler (multilib files)" - maintainer="Juan RP " - homepage="http://gcc.gnu.org" - license="GFDL-1.2, GPL-3, LGPL-2.1" --distfiles="${GNU_SITE}/gcc/gcc-$version/gcc-$version.tar.bz2" --checksum=6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 -+distfiles="http://distfiles.voidlinux.de/gcc-${version}/gcc-${version}.tar.xz" -+checksum=6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 - - hostmakedepends="perl flex zip unzip" - makedepends="zlib-devel libmpc-devel ppl-devel cloog-devel -@@ -40,6 +40,8 @@ do_configure() { - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in -+ # hack! some configure tests for header files using "$CPP $CPPFLAGS" -+ sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure - - ./configure --prefix=/usr --mandir=/usr/share/man \ - --infodir=/usr/share/info --libexecdir=/usr/lib \ -@@ -81,13 +83,6 @@ do_install() { - rm -f ${DESTDIR}/usr/lib64 - } - --gcc-c++-multilib_package() { -- depends="gcc-c++>=${_majorver} gcc-multilib>=${_majorver} libstdc++-devel-32bit>=${_majorver}" -- short_desc="GCC C++ compiler (multilib files)" -- pkg_install() { -- vmove usr/include/c++ -- } --} - gcc-objc-multilib_package() { - depends="gcc-multilib>=${_majorver} gcc-objc>=${_majorver} libobjc-devel-32bit>=${_majorver}" - short_desc="The GNU Objective-C compiler (multilib files)" -diff --git a/srcpkgs/gcc/files/gcc-4.9.2-musl.diff b/srcpkgs/gcc/files/gcc-4.9.2-musl.diff -deleted file mode 100644 -index 8baafd0..0000000 ---- a/srcpkgs/gcc/files/gcc-4.9.2-musl.diff -+++ /dev/null -@@ -1,730 +0,0 @@ --820c77b17a4a --# HG changeset patch --# Parent 1f830bec5a3f04b2718ce1395743d8e35c26341c --Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one. -- --diff -r 1f830bec5a3f libstdc++-v3/configure.host ----- a/libstdc++-v3/configure.host Thu Jan 29 14:04:56 2015 -0500 --+++ b/libstdc++-v3/configure.host Thu Jan 29 14:06:11 2015 -0500 --@@ -264,6 +264,13 @@ -- os_include_dir="os/bsd/freebsd" -- ;; -- gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) --+ # check for musl by target --+ case "${host_os}" in --+ *-musl*) --+ os_include_dir="os/generic" --+ ;; --+ *) --+ -- if [ "$uclibc" = "yes" ]; then -- os_include_dir="os/uclibc" -- elif [ "$bionic" = "yes" ]; then --@@ -272,6 +279,9 @@ -- os_include_dir="os/gnu-linux" -- fi -- ;; --+ --+ esac --+ ;; -- hpux*) -- os_include_dir="os/hpux" -- ;; --# HG changeset patch --# Parent fc7bb9343dcd071463a63dfc1b356d579eb0872f --Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker. -- --diff -r fc7bb9343dcd gcc/config.gcc ----- a/gcc/config.gcc Thu Jan 29 14:06:11 2015 -0500 --+++ b/gcc/config.gcc Thu Jan 29 14:06:13 2015 -0500 --@@ -594,7 +594,7 @@ -- esac -- -- # Common C libraries. ---tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" --+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" -- -- # 32-bit x86 processors supported by --with-arch=. Each processor -- # MUST be separated by exactly one space. --@@ -719,6 +719,9 @@ -- *-*-*uclibc*) -- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" -- ;; --+ *-*-*musl*) --+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" --+ ;; -- *) -- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" -- ;; --diff -r fc7bb9343dcd gcc/config/linux.h ----- a/gcc/config/linux.h Thu Jan 29 14:06:11 2015 -0500 --+++ b/gcc/config/linux.h Thu Jan 29 14:06:13 2015 -0500 --@@ -32,10 +32,12 @@ -- #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) -- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) -- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) --+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) -- #else -- #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) -- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) -- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) --+#define OPTION_MUSL (linux_libc == LIBC_MUSL) -- #endif -- -- #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ --@@ -53,18 +55,21 @@ -- uClibc or Bionic is the default C library and whether -- -muclibc or -mglibc or -mbionic has been passed to change the default. */ -- ---#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ --- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" --+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ --+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" -- -- #if DEFAULT_LIBC == LIBC_GLIBC ---#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ --- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) --+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ --+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) -- #elif DEFAULT_LIBC == LIBC_UCLIBC ---#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ --- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) --+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ --+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) -- #elif DEFAULT_LIBC == LIBC_BIONIC ---#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ --- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) --+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ --+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) --+#elif DEFAULT_LIBC == LIBC_MUSL --+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ --+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) -- #else -- #error "Unsupported DEFAULT_LIBC" -- #endif /* DEFAULT_LIBC */ --@@ -84,21 +89,92 @@ -- -- #define GNU_USER_DYNAMIC_LINKER \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ --- BIONIC_DYNAMIC_LINKER) --+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) -- #define GNU_USER_DYNAMIC_LINKER32 \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ --- BIONIC_DYNAMIC_LINKER32) --+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) -- #define GNU_USER_DYNAMIC_LINKER64 \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ --- BIONIC_DYNAMIC_LINKER64) --+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) -- #define GNU_USER_DYNAMIC_LINKERX32 \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ --- BIONIC_DYNAMIC_LINKERX32) --+ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) -- -- /* Whether we have Bionic libc runtime */ -- #undef TARGET_HAS_BIONIC -- #define TARGET_HAS_BIONIC (OPTION_BIONIC) -- --+/* musl avoids problematic includes by rearranging the include directories. --+ * Unfortunately, this is mostly duplicated from cppdefault.c */ --+#if DEFAULT_LIBC == LIBC_MUSL --+#define INCLUDE_DEFAULTS_MUSL_GPP \ --+ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ --+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ --+ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ --+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ --+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ --+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, --+ --+#ifdef LOCAL_INCLUDE_DIR --+#define INCLUDE_DEFAULTS_MUSL_LOCAL \ --+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ --+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, --+#else --+#define INCLUDE_DEFAULTS_MUSL_LOCAL --+#endif --+ --+#ifdef PREFIX_INCLUDE_DIR --+#define INCLUDE_DEFAULTS_MUSL_PREFIX \ --+ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, --+#else --+#define INCLUDE_DEFAULTS_MUSL_PREFIX --+#endif --+ --+#ifdef CROSS_INCLUDE_DIR --+#define INCLUDE_DEFAULTS_MUSL_CROSS \ --+ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, --+#else --+#define INCLUDE_DEFAULTS_MUSL_CROSS --+#endif --+ --+#ifdef TOOL_INCLUDE_DIR --+#define INCLUDE_DEFAULTS_MUSL_TOOL \ --+ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, --+#else --+#define INCLUDE_DEFAULTS_MUSL_TOOL --+#endif --+ --+#ifdef NATIVE_SYSTEM_HEADER_DIR --+#define INCLUDE_DEFAULTS_MUSL_NATIVE \ --+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ --+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, --+#else --+#define INCLUDE_DEFAULTS_MUSL_NATIVE --+#endif --+ --+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) --+# undef INCLUDE_DEFAULTS_MUSL_LOCAL --+# define INCLUDE_DEFAULTS_MUSL_LOCAL --+# undef INCLUDE_DEFAULTS_MUSL_NATIVE --+# define INCLUDE_DEFAULTS_MUSL_NATIVE --+#else --+# undef INCLUDE_DEFAULTS_MUSL_CROSS --+# define INCLUDE_DEFAULTS_MUSL_CROSS --+#endif --+ --+#undef INCLUDE_DEFAULTS --+#define INCLUDE_DEFAULTS \ --+ { \ --+ INCLUDE_DEFAULTS_MUSL_GPP \ --+ INCLUDE_DEFAULTS_MUSL_PREFIX \ --+ INCLUDE_DEFAULTS_MUSL_CROSS \ --+ INCLUDE_DEFAULTS_MUSL_TOOL \ --+ INCLUDE_DEFAULTS_MUSL_NATIVE \ --+ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ --+ { 0, 0, 0, 0, 0, 0 } \ --+ } --+#endif --+ -- #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ -- /* This is a *uclinux* target. We don't define below macros to normal linux -- versions, because doing so would require *uclinux* targets to include --diff -r fc7bb9343dcd gcc/config/linux.opt ----- a/gcc/config/linux.opt Thu Jan 29 14:06:11 2015 -0500 --+++ b/gcc/config/linux.opt Thu Jan 29 14:06:13 2015 -0500 --@@ -30,3 +30,7 @@ -- muclibc -- Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) -- Use uClibc C library --+ --+mmusl --+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) --+Use musl C library --diff -r fc7bb9343dcd gcc/ginclude/stddef.h ----- a/gcc/ginclude/stddef.h Thu Jan 29 14:06:11 2015 -0500 --+++ b/gcc/ginclude/stddef.h Thu Jan 29 14:06:13 2015 -0500 --@@ -181,6 +181,7 @@ -- #ifndef _GCC_SIZE_T -- #ifndef _SIZET_ -- #ifndef __size_t --+#ifndef __DEFINED_size_t /* musl */ -- #define __size_t__ /* BeOS */ -- #define __SIZE_T__ /* Cray Unicos/Mk */ -- #define _SIZE_T --@@ -197,6 +198,7 @@ -- #define ___int_size_t_h -- #define _GCC_SIZE_T -- #define _SIZET_ --+#define __DEFINED_size_t /* musl */ -- #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ -- || defined(__FreeBSD_kernel__) -- /* __size_t is a typedef on FreeBSD 5, must not trash it. */ --@@ -214,6 +216,7 @@ -- typedef long ssize_t; -- #endif /* __BEOS__ */ -- #endif /* !(defined (__GNUG__) && defined (size_t)) */ --+#endif /* __DEFINED_size_t */ -- #endif /* __size_t */ -- #endif /* _SIZET_ */ -- #endif /* _GCC_SIZE_T */ --# HG changeset patch --# Parent ad6952ac547606025a6fb8496584cbfe1b73a8b7 --A fix for libgomp to correctly request a POSIX version for time support. -- --diff -r ad6952ac5476 libgomp/config/posix/time.c ----- a/libgomp/config/posix/time.c Thu Jan 29 14:06:13 2015 -0500 --+++ b/libgomp/config/posix/time.c Thu Jan 29 14:06:16 2015 -0500 --@@ -28,6 +28,8 @@ -- The following implementation uses the most simple POSIX routines. -- If present, POSIX 4 clocks should be used instead. */ -- --+#define _POSIX_C_SOURCE 199309L /* for clocks */ --+ -- #include "libgomp.h" -- #include -- #if TIME_WITH_SYS_TIME --diff -r ffa879f29d52 libgcc/unwind-dw2-fde-dip.c ----- a/libgcc/unwind-dw2-fde-dip.c Thu Jan 29 14:06:15 2015 -0500 --+++ b/libgcc/unwind-dw2-fde-dip.c Thu Jan 29 14:06:18 2015 -0500 --@@ -46,33 +46,13 @@ -- #include "unwind-compat.h" -- #include "gthr.h" -- ---#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ --- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ --- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) --+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) -- # define USE_PT_GNU_EH_FRAME ---#endif --- ---#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ --- && defined(__BIONIC__) ---# define USE_PT_GNU_EH_FRAME ---#endif --- ---#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ --- && defined(__FreeBSD__) && __FreeBSD__ >= 7 ---# define ElfW __ElfN ---# define USE_PT_GNU_EH_FRAME ---#endif --- ---#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ --- && defined(__OpenBSD__) ---# define ElfW(type) Elf_##type ---# define USE_PT_GNU_EH_FRAME ---#endif --- ---#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ --- && defined(TARGET_DL_ITERATE_PHDR) \ --- && defined(__sun__) && defined(__svr4__) ---# define USE_PT_GNU_EH_FRAME --+# ifdef __OpenBSD__ --+# define ElfW(type) Elf_##type --+# elif defined(__FreeBSD__) && __FreeBSD__ >= 7 --+# define ElfW __ElfN --+# endif -- #endif -- -- #if defined(USE_PT_GNU_EH_FRAME) --diff -r b35df09b819f gcc/configure ----- a/gcc/configure Thu Jan 29 14:06:18 2015 -0500 --+++ b/gcc/configure Thu Jan 29 14:06:20 2015 -0500 --@@ -27356,6 +27356,9 @@ -- else -- gcc_cv_libc_provides_ssp=no -- case "$target" in --+ *-*-musl*) --+ # All versions of musl provide stack protector --+ gcc_cv_libc_provides_ssp=yes;; -- *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) -- # glibc 2.4 and later provides __stack_chk_fail and -- # either __stack_chk_guard, or TLS access to stack guard canary. --@@ -27388,6 +27391,7 @@ -- # ) and for now -- # simply assert that glibc does provide this, which is true for all -- # realistically usable GNU/Hurd configurations. --+ # All supported versions of musl provide it as well -- gcc_cv_libc_provides_ssp=yes;; -- *-*-darwin* | *-*-freebsd*) -- ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail" --@@ -27477,6 +27481,9 @@ -- gcc_cv_target_dl_iterate_phdr=no -- fi -- ;; --+ *-linux-musl*) --+ gcc_cv_target_dl_iterate_phdr=yes --+ ;; -- esac -- -- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then --diff -r b35df09b819f gcc/configure.ac ----- a/gcc/configure.ac Thu Jan 29 14:06:18 2015 -0500 --+++ b/gcc/configure.ac Thu Jan 29 14:06:20 2015 -0500 --@@ -5039,6 +5039,9 @@ -- gcc_cv_libc_provides_ssp, -- [gcc_cv_libc_provides_ssp=no -- case "$target" in --+ *-*-musl*) --+ # All versions of musl provide stack protector --+ gcc_cv_libc_provides_ssp=yes;; -- *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) -- # glibc 2.4 and later provides __stack_chk_fail and -- # either __stack_chk_guard, or TLS access to stack guard canary. --@@ -5065,6 +5068,7 @@ -- # ) and for now -- # simply assert that glibc does provide this, which is true for all -- # realistically usable GNU/Hurd configurations. --+ # All supported versions of musl provide it as well -- gcc_cv_libc_provides_ssp=yes;; -- *-*-darwin* | *-*-freebsd*) -- AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes], --@@ -5131,6 +5135,9 @@ -- gcc_cv_target_dl_iterate_phdr=no -- fi -- ;; --+ *-linux-musl*) --+ gcc_cv_target_dl_iterate_phdr=yes --+ ;; -- esac -- GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR]) -- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then --# HG changeset patch --# Parent b6a339cae9f0607a291a2fe8de80caecd48f1ebd --Get rid of ever-broken fixincludes on musl. -- --diff -r b6a339cae9f0 fixincludes/mkfixinc.sh ----- a/fixincludes/mkfixinc.sh Thu Jan 29 14:06:20 2015 -0500 --+++ b/fixincludes/mkfixinc.sh Thu Jan 29 14:06:22 2015 -0500 --@@ -19,7 +19,8 @@ -- powerpc-*-eabi* | \ -- powerpc-*-rtems* | \ -- powerpcle-*-eabisim* | \ --- powerpcle-*-eabi* ) --+ powerpcle-*-eabi* | \ --+ *-musl* ) -- # IF there is no include fixing, -- # THEN create a no-op fixer and exit -- (echo "#! /bin/sh" ; echo "exit 0" ) > ${target} --# HG changeset patch --# Parent 6c0bb7083dd2eba825f2693dc30d0e39359c1a66 --Support for i386-linux-musl and x86_64-linux-musl. -- --diff -r 6c0bb7083dd2 gcc/config/i386/linux.h ----- a/gcc/config/i386/linux.h Thu Jan 29 14:06:22 2015 -0500 --+++ b/gcc/config/i386/linux.h Thu Jan 29 14:06:25 2015 -0500 --@@ -21,3 +21,4 @@ -- -- #define GNU_USER_LINK_EMULATION "elf_i386" -- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" --+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" --diff -r 6c0bb7083dd2 gcc/config/i386/linux64.h ----- a/gcc/config/i386/linux64.h Thu Jan 29 14:06:22 2015 -0500 --+++ b/gcc/config/i386/linux64.h Thu Jan 29 14:06:25 2015 -0500 --@@ -30,3 +30,7 @@ -- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" -- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" --+ --+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" --+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" --+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" --diff -r 6c0bb7083dd2 libitm/config/linux/x86/tls.h ----- a/libitm/config/linux/x86/tls.h Thu Jan 29 14:06:22 2015 -0500 --+++ b/libitm/config/linux/x86/tls.h Thu Jan 29 14:06:25 2015 -0500 --@@ -25,16 +25,19 @@ -- #ifndef LIBITM_X86_TLS_H -- #define LIBITM_X86_TLS_H 1 -- ---#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) --+#if defined(__GLIBC_PREREQ) --+#if __GLIBC_PREREQ(2, 10) -- /* Use slots in the TCB head rather than __thread lookups. -- GLIBC has reserved words 10 through 13 for TM. */ -- #define HAVE_ARCH_GTM_THREAD 1 -- #define HAVE_ARCH_GTM_THREAD_DISP 1 -- #endif --+#endif -- -- #include "config/generic/tls.h" -- ---#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) --+#if defined(__GLIBC_PREREQ) --+#if __GLIBC_PREREQ(2, 10) -- namespace GTM HIDDEN { -- -- #ifdef __x86_64__ --@@ -101,5 +104,6 @@ -- -- } // namespace GTM -- #endif /* >= GLIBC 2.10 */ --+#endif -- -- #endif // LIBITM_X86_TLS_H --# HG changeset patch --# Parent 4802c181abe099c2f903184ace267c6a527ca91c --Support for arm-linux-musl. -- --diff -r 4802c181abe0 gcc/config/arm/linux-eabi.h ----- a/gcc/config/arm/linux-eabi.h Thu Jan 29 14:06:25 2015 -0500 --+++ b/gcc/config/arm/linux-eabi.h Thu Jan 29 14:06:27 2015 -0500 --@@ -77,6 +77,23 @@ -- %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ -- %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" -- --+/* For ARM musl currently supports four dynamic linkers: --+ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI --+ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI --+ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB --+ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB --+ musl does not support the legacy OABI mode. --+ All the dynamic linkers live in /lib. --+ We default to soft-float, EL. */ --+#undef MUSL_DYNAMIC_LINKER --+#if TARGET_BIG_ENDIAN_DEFAULT --+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}" --+#else --+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" --+#endif --+#define MUSL_DYNAMIC_LINKER \ --+ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" --+ -- /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to -- use the GNU/Linux version, not the generic BPABI version. */ -- #undef LINK_SPEC --diff -r 4802c181abe0 libitm/config/arm/hwcap.cc ----- a/libitm/config/arm/hwcap.cc Thu Jan 29 14:06:25 2015 -0500 --+++ b/libitm/config/arm/hwcap.cc Thu Jan 29 14:06:27 2015 -0500 --@@ -40,7 +40,11 @@ -- -- #ifdef __linux__ -- #include --+#ifdef __GLIBC__ -- #include --+#else --+#include --+#endif -- #include -- -- static void __attribute__((constructor)) --# HG changeset patch --# Parent f34ce414667f8513979b8a0507f3d6b934f1ebeb --Support for mips-linux-musl. -- --diff -r f34ce414667f gcc/config/mips/linux.h ----- a/gcc/config/mips/linux.h Thu Jan 29 14:06:27 2015 -0500 --+++ b/gcc/config/mips/linux.h Thu Jan 29 14:06:29 2015 -0500 --@@ -23,3 +23,10 @@ -- #undef UCLIBC_DYNAMIC_LINKER -- #define UCLIBC_DYNAMIC_LINKER \ -- "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}" --+ --+#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ --+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" --+#else --+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" --+#endif --+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1" --# HG changeset patch --# Parent d4bad9a6572b0e8eacc08d2b1c40d03a6608bee5 --Support for powerpc-linux-musl. -- --diff -r d4bad9a6572b gcc/config.gcc ----- a/gcc/config.gcc Thu Jan 29 14:06:29 2015 -0500 --+++ b/gcc/config.gcc Thu Jan 29 14:06:32 2015 -0500 --@@ -2334,6 +2334,10 @@ -- powerpc*-*-linux*paired*) -- tm_file="${tm_file} rs6000/750cl.h" ;; -- esac --+ case ${target} in --+ *-linux*-musl*) --+ enable_secureplt=yes ;; --+ esac -- if test x${enable_secureplt} = xyes; then -- tm_file="rs6000/secureplt.h ${tm_file}" -- fi --diff -r d4bad9a6572b gcc/config/rs6000/linux64.h ----- a/gcc/config/rs6000/linux64.h Thu Jan 29 14:06:29 2015 -0500 --+++ b/gcc/config/rs6000/linux64.h Thu Jan 29 14:06:32 2015 -0500 --@@ -375,17 +375,21 @@ -- #endif -- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" -- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" --+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" --+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" -- #if DEFAULT_LIBC == LIBC_UCLIBC ---#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" --+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" -- #elif DEFAULT_LIBC == LIBC_GLIBC ---#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" --+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" --+#elif DEFAULT_LIBC == LIBC_MUSL --+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" -- #else -- #error "Unsupported DEFAULT_LIBC" -- #endif -- #define GNU_USER_DYNAMIC_LINKER32 \ --- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) --+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) -- #define GNU_USER_DYNAMIC_LINKER64 \ --- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) --+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) -- -- #undef DEFAULT_ASM_ENDIAN -- #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) --diff -r d4bad9a6572b gcc/config/rs6000/secureplt.h ----- a/gcc/config/rs6000/secureplt.h Thu Jan 29 14:06:29 2015 -0500 --+++ b/gcc/config/rs6000/secureplt.h Thu Jan 29 14:06:32 2015 -0500 --@@ -18,3 +18,4 @@ -- . */ -- -- #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" --+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" --diff -r d4bad9a6572b gcc/config/rs6000/sysv4.h ----- a/gcc/config/rs6000/sysv4.h Thu Jan 29 14:06:29 2015 -0500 --+++ b/gcc/config/rs6000/sysv4.h Thu Jan 29 14:06:32 2015 -0500 --@@ -537,6 +537,9 @@ -- #ifndef CC1_SECURE_PLT_DEFAULT_SPEC -- #define CC1_SECURE_PLT_DEFAULT_SPEC "" -- #endif --+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC --+#define LINK_SECURE_PLT_DEFAULT_SPEC "" --+#endif -- -- /* Pass -G xxx to the compiler. */ -- #define CC1_SPEC "%{G*} %(cc1_cpu)" \ --@@ -585,7 +588,8 @@ -- -- /* Override the default target of the linker. */ -- #define LINK_TARGET_SPEC \ --- ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") --+ ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \ --+ "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}" -- -- /* Any specific OS flags. */ -- #define LINK_OS_SPEC "\ --@@ -763,15 +767,18 @@ -- -- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" --+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1" -- #if DEFAULT_LIBC == LIBC_UCLIBC ---#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" --+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" --+#elif DEFAULT_LIBC == LIBC_MUSL --+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" -- #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC ---#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" --+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" -- #else -- #error "Unsupported DEFAULT_LIBC" -- #endif -- #define GNU_USER_DYNAMIC_LINKER \ --- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) --+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) -- -- #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -- %{rdynamic:-export-dynamic} \ --@@ -894,6 +901,7 @@ -- { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ -- { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ -- { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ --+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ -- { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ -- { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ -- { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ --diff -r 47a8492e5aa7 gcc/config/aarch64/aarch64-linux.h ----- a/gcc/config/aarch64/aarch64-linux.h Thu Jan 29 14:06:31 2015 -0500 --+++ b/gcc/config/aarch64/aarch64-linux.h Thu Jan 29 14:06:34 2015 -0500 --@@ -23,6 +23,8 @@ -- -- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1" -- --+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" --+ -- #define CPP_SPEC "%{pthread:-D_REENTRANT}" -- -- #define LINUX_TARGET_LINK_SPEC "%{h*} \ --# HG changeset patch --# Parent 9f4208089e8987637569ce7b294256c536396299 --Microblaze support (again). -- --diff -r 9f4208089e89 gcc/config/microblaze/linux.h ----- a/gcc/config/microblaze/linux.h Thu Jan 29 14:06:34 2015 -0500 --+++ b/gcc/config/microblaze/linux.h Thu Jan 29 14:06:36 2015 -0500 --@@ -25,7 +25,22 @@ -- #undef TLS_NEEDS_GOT -- #define TLS_NEEDS_GOT 1 -- ---#define DYNAMIC_LINKER "/lib/ld.so.1" --+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ --+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" --+#else --+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" --+#endif --+ --+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" --+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" --+ --+#if DEFAULT_LIBC == LIBC_MUSL --+#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER --+#else --+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER --+#endif --+ --+ -- #undef SUBTARGET_EXTRA_SPECS -- #define SUBTARGET_EXTRA_SPECS \ -- { "dynamic_linker", DYNAMIC_LINKER } --From 478ee0c03a08e2ef9371fd88d516738936943e78 Mon Sep 17 00:00:00 2001 --From: David Holsgrove --Date: Fri, 28 Sep 2012 16:32:03 +1000 --Subject: [PATCH 06/11] [Patch, microblaze]: Add SIZE_TYPE and PTRDIFF_TYPE to -- microblaze.h -- --Fixes warnings like; -- --warning: format '%zX' expects argument of type 'size_t', --but argument 3 has type 'unsigned int' [-Wformat] -- --Changelog -- --2013-03-18 David Holsgrove -- -- * gcc/config/microblaze/microblaze.h: Define SIZE_TYPE -- and PTRDIFF_TYPE. -- --Signed-off-by: David Holsgrove ----- -- gcc/config/microblaze/microblaze.h | 6 ++++++ -- 1 file changed, 6 insertions(+) -- --diff -r 0dbe9a3f7670 gcc/config/microblaze/microblaze.h ----- a/gcc/config/microblaze/microblaze.h Thu Jan 29 14:06:36 2015 -0500 --+++ b/gcc/config/microblaze/microblaze.h Thu Jan 29 14:06:38 2015 -0500 --@@ -218,6 +218,12 @@ -- #undef PTRDIFF_TYPE -- #define PTRDIFF_TYPE "int" -- --+#undef SIZE_TYPE --+#define SIZE_TYPE "unsigned int" --+ --+#undef PTRDIFF_TYPE --+#define PTRDIFF_TYPE "int" --+ -- #define CONSTANT_ALIGNMENT(EXP, ALIGN) \ -- ((TREE_CODE (EXP) == STRING_CST || TREE_CODE (EXP) == CONSTRUCTOR) \ -- && (ALIGN) < BITS_PER_WORD \ --diff -r 94ebb0799454 gcc/config/sh/linux.h ----- a/gcc/config/sh/linux.h Fri Sep 28 16:32:03 2012 +1000 --+++ b/gcc/config/sh/linux.h Thu Jan 29 14:06:41 2015 -0500 --@@ -43,7 +43,14 @@ -- -- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack -- --+#if TARGET_BIG_ENDIAN_DEFAULT /* BE */ --+#define MUSL_DYNAMIC_LINKER_E "eb" --+#else --+#define MUSL_DYNAMIC_LINKER_E --+#endif --+ -- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" --+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1" -- -- #undef SUBTARGET_LINK_EMUL_SUFFIX -- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" -- --Use libc write(2) instead of undefined __write() to get rid --of an error when later linking against libgcc.a --This should fix the webkitgtk build, see: --http://build.voidlinux.eu/builders/armv6l-musl_builder/builds/2991/steps/shell_3/logs/stdio -- ----- a/libgcc/config/arm/linux-atomic-64bit.c 2014-01-02 23:25:22.000000000 +0100 --+++ b/libgcc/config/arm/linux-atomic-64bit.c 2015-08-14 10:56:03.383219614 +0200 --@@ -33,7 +33,7 @@ -- kernels; we check for that in an init section and bail out rather -- unceremoneously. */ -- ---extern unsigned int __write (int fd, const void *buf, unsigned int count); --+extern unsigned int write (int fd, const void *buf, unsigned int count); -- extern void abort (void); -- -- /* Kernel helper for compare-and-exchange. */ --@@ -56,7 +56,7 @@ -- for the user - I'm not sure I can rely on much else being -- available at this point, so do the same as generic-morestack.c -- write () and abort (). */ --- __write (2 /* stderr. */, err, sizeof (err)); --+ write (2 /* stderr. */, err, sizeof (err)); -- abort (); -- } -- }; -diff --git a/srcpkgs/gcc/files/gcc-6.2.1-musl.diff b/srcpkgs/gcc/files/gcc-6.2.1-musl.diff -new file mode 100644 -index 0000000..053d1ea ---- /dev/null -+++ b/srcpkgs/gcc/files/gcc-6.2.1-musl.diff -@@ -0,0 +1,556 @@ -+# HG changeset patch -+# Parent 90a7a3809a7ccb60e357b5e88382260877f82257 -+Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one. -+ -+diff -r 90a7a3809a7c libstdc++-v3/configure.host -+--- a/libstdc++-v3/configure.host Thu Dec 24 11:22:15 2015 -0500 -++++ b/libstdc++-v3/configure.host Thu Dec 24 11:24:45 2015 -0500 -+@@ -266,6 +266,13 @@ -+ os_include_dir="os/bsd/freebsd" -+ ;; -+ gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) -++ # check for musl by target -++ case "${host_os}" in -++ *-musl*) -++ os_include_dir="os/generic" -++ ;; -++ *) -++ -+ if [ "$uclibc" = "yes" ]; then -+ os_include_dir="os/uclibc" -+ elif [ "$bionic" = "yes" ]; then -+@@ -281,6 +281,9 @@ -+ os_include_dir="os/gnu-linux" -+ fi -+ ;; -++ -++ esac -++ ;; -+ hpux*) -+ os_include_dir="os/hpux" -+ ;; -+diff -r 30a957f60ddb gcc/ginclude/stddef.h -+--- a/gcc/ginclude/stddef.h Thu Dec 24 11:24:45 2015 -0500 -++++ b/gcc/ginclude/stddef.h Thu Dec 24 11:24:47 2015 -0500 -+@@ -184,6 +184,7 @@ -+ #ifndef _GCC_SIZE_T -+ #ifndef _SIZET_ -+ #ifndef __size_t -++#ifndef __DEFINED_size_t /* musl */ -+ #define __size_t__ /* BeOS */ -+ #define __SIZE_T__ /* Cray Unicos/Mk */ -+ #define _SIZE_T -+@@ -200,6 +201,7 @@ -+ #define ___int_size_t_h -+ #define _GCC_SIZE_T -+ #define _SIZET_ -++#define __DEFINED_size_t /* musl */ -+ #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ -+ || defined(__DragonFly__) \ -+ || defined(__FreeBSD_kernel__) -+@@ -218,6 +220,7 @@ -+ typedef long ssize_t; -+ #endif /* __BEOS__ */ -+ #endif /* !(defined (__GNUG__) && defined (size_t)) */ -++#endif /* __DEFINED_size_t */ -+ #endif /* __size_t */ -+ #endif /* _SIZET_ */ -+ #endif /* _GCC_SIZE_T */ -+# HG changeset patch -+# Parent 90228af47e55eb338c7f672e4aca5ac81cf5f14c -+A fix for libgomp to correctly request a POSIX version for time support. -+ -+diff -r 90228af47e55 libgomp/config/posix/time.c -+--- a/libgomp/config/posix/time.c Thu Dec 24 11:24:47 2015 -0500 -++++ b/libgomp/config/posix/time.c Thu Dec 24 11:24:49 2015 -0500 -+@@ -29,6 +29,8 @@ -+ The following implementation uses the most simple POSIX routines. -+ If present, POSIX 4 clocks should be used instead. */ -+ -++#define _POSIX_C_SOURCE 199309L /* for clocks */ -++ -+ #include "libgomp.h" -+ #include -+ #if TIME_WITH_SYS_TIME -+diff -r b08d4bc3d2ba libgcc/unwind-dw2-fde-dip.c -+--- a/libgcc/unwind-dw2-fde-dip.c Thu Dec 24 11:24:49 2015 -0500 -++++ b/libgcc/unwind-dw2-fde-dip.c Thu Dec 24 11:24:51 2015 -0500 -+@@ -46,6 +46,10 @@ -+ #include "unwind-compat.h" -+ #include "gthr.h" -+ -++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) -++# define USE_PT_GNU_EH_FRAME -++#endif -++ -+ #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ -+ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ -+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) -+diff -r 1f375ed3689f gcc/gcc.c -+--- a/gcc/gcc.c Thu Dec 24 11:24:53 2015 -0500 -++++ b/gcc/gcc.c Thu Dec 24 11:24:56 2015 -0500 -+@@ -860,7 +860,7 @@ -+ #ifndef LINK_SSP_SPEC -+ #ifdef TARGET_LIBC_PROVIDES_SSP -+ #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ -+- "|fstack-protector-strong|fstack-protector-explicit:}" -++ "|fstack-protector-strong|fstack-protector-explicit:-lssp_nonshared}" -+ #else -+ #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ -+ "|fstack-protector-strong|fstack-protector-explicit" \ -+# HG changeset patch -+# Parent 76b553fabcf19eec5df2df7f05ce15a4bf8c3996 -+Support for mips-linux-musl. -+ -+diff -r 76b553fabcf1 gcc/config/mips/linux.h -+--- a/gcc/config/mips/linux.h Thu Dec 24 11:25:02 2015 -0500 -++++ b/gcc/config/mips/linux.h Thu Dec 24 11:25:04 2015 -0500 -+@@ -31,6 +31,13 @@ -+ #undef UCLIBC_DYNAMIC_LINKER32 -+ #define UCLIBC_DYNAMIC_LINKER32 \ -+ "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}" -++ -++#undef MUSL_DYNAMIC_LINKER32 -++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1" -++#undef MUSL_DYNAMIC_LINKER64 -++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1" -++#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1" -++ -+ #undef UCLIBC_DYNAMIC_LINKER64 -+ #define UCLIBC_DYNAMIC_LINKER64 \ -+ "%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}" -+# HG changeset patch -+# Parent 971d410411735f0b04eb07236659097986926213 -+Support for powerpc-linux-musl. -+ -+diff -r 971d41041173 gcc/config.gcc -+--- a/gcc/config.gcc Fri Dec 25 08:44:09 2015 -0500 -++++ b/gcc/config.gcc Fri Dec 25 09:42:16 2015 -0500 -+@@ -2464,6 +2464,10 @@ -+ powerpc*-*-linux*paired*) -+ tm_file="${tm_file} rs6000/750cl.h" ;; -+ esac -++ case ${target} in -++ *-linux*-musl*) -++ enable_secureplt=yes ;; -++ esac -+ if test x${enable_secureplt} = xyes; then -+ tm_file="rs6000/secureplt.h ${tm_file}" -+ fi -+diff -r 9555ffb5873b gcc/config/aarch64/aarch64-linux.h -+--- a/gcc/config/aarch64/aarch64-linux.h Thu Dec 24 11:25:06 2015 -0500 -++++ b/gcc/config/aarch64/aarch64-linux.h Thu Dec 24 11:25:09 2015 -0500 -+@@ -32,6 +32,8 @@ -+ #undef CC1_SPEC -+ #define CC1_SPEC GNU_USER_TARGET_CC1_SPEC ASAN_CC1_SPEC -+ -++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" -++ -+ #define CPP_SPEC "%{pthread:-D_REENTRANT}" -+ -+ #define LINUX_TARGET_LINK_SPEC "%{h*} \ -+diff -r a522e4b04c77 gcc/config/microblaze/microblaze.h -+--- a/gcc/config/microblaze/microblaze.h Thu Dec 24 11:25:11 2015 -0500 -++++ b/gcc/config/microblaze/microblaze.h Thu Dec 24 11:25:13 2015 -0500 -+@@ -218,6 +218,12 @@ -+ #undef PTRDIFF_TYPE -+ #define PTRDIFF_TYPE "int" -+ -++#undef SIZE_TYPE -++#define SIZE_TYPE "unsigned int" -++ -++#undef PTRDIFF_TYPE -++#define PTRDIFF_TYPE "int" -++ -+ #define CONSTANT_ALIGNMENT(EXP, ALIGN) \ -+ ((TREE_CODE (EXP) == STRING_CST || TREE_CODE (EXP) == CONSTRUCTOR) \ -+ && (ALIGN) < BITS_PER_WORD \ -+diff -r f2936ad874dd gcc/config/sh/linux.h -+--- a/gcc/config/sh/linux.h Fri Sep 28 16:32:03 2012 +1000 -++++ b/gcc/config/sh/linux.h Thu Dec 24 11:25:15 2015 -0500 -+@@ -64,7 +64,14 @@ -+ -+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack -+ -++#if TARGET_BIG_ENDIAN_DEFAULT /* BE */ -++#define MUSL_DYNAMIC_LINKER_E "eb" -++#else -++#define MUSL_DYNAMIC_LINKER_E -++#endif -++ -+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1" -+ -+ #undef SUBTARGET_LINK_EMUL_SUFFIX -+ #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" -+Do not use weak references on any targets for gthread. Necessary on musl, safe elsewhere. -+ -+diff -r e180e4cfc879 libgcc/gthr.h -+--- a/libgcc/gthr.h Thu Dec 24 11:25:15 2015 -0500 -++++ b/libgcc/gthr.h Thu Dec 24 11:25:17 2015 -0500 -+@@ -136,10 +136,8 @@ -+ /* The pe-coff weak support isn't fully compatible to ELF's weak. -+ For static libraries it might would work, but as we need to deal -+ with shared versions too, we disable it for mingw-targets. */ -+-#ifdef __MINGW32__ -+ #undef GTHREAD_USE_WEAK -+ #define GTHREAD_USE_WEAK 0 -+-#endif -+ -+ #ifndef GTHREAD_USE_WEAK -+ #define GTHREAD_USE_WEAK 1 -+From 0a9ed0479203cb7e69c3745b0c259007410f39ba Mon Sep 17 00:00:00 2001 -+From: Szabolcs Nagy -+Date: Sat, 24 Oct 2015 20:09:53 +0000 -+Subject: [PATCH 47/47] libgcc_s: Use alias for __cpu_indicator_init instead of -+ symver -+ -+Adapter from -+ -+https://gcc.gnu.org/ml/gcc-patches/2015-05/msg00899.html -+ -+This fix was debated but hasnt been applied gcc upstream since -+they expect musl to support '@' in symbol versioning which is -+a sun/gnu versioning extention. This patch however avoids the -+need for the '@' symbols at all -+ -+libgcc/Changelog: -+ -+2015-05-11 Szabolcs Nagy -+ -+ * config/i386/cpuinfo.c (__cpu_indicator_init_local): Add. -+ (__cpu_indicator_init@GCC_4.8.0, __cpu_model@GCC_4.8.0): Remove. -+ -+ * config/i386/t-linux (HOST_LIBGCC2_CFLAGS): Remove -DUSE_ELF_SYMVER. -+ -+gcc/Changelog: -+ -+2015-05-11 Szabolcs Nagy -+ -+ * config/i386/i386.c (ix86_expand_builtin): Make __builtin_cpu_init -+ call __cpu_indicator_init_local instead of __cpu_indicator_init. -+ -+Signed-off-by: Khem Raj -+--- -+Upstream-Status: Rejected -+ -+ gcc/config/i386/i386.c | 4 ++-- -+ libgcc/config/i386/cpuinfo.c | 6 +++--- -+ libgcc/config/i386/t-linux | 2 +- -+ 3 files changed, 6 insertions(+), 6 deletions(-) -+ -+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c -+index 861a029..1c97d72 100644 -+--- a/gcc/config/i386/i386.c -++++ b/gcc/config/i386/i386.c -+@@ -40323,10 +40323,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, -+ { -+ case IX86_BUILTIN_CPU_INIT: -+ { -+- /* Make it call __cpu_indicator_init in libgcc. */ -++ /* Make it call __cpu_indicator_init_local in libgcc.a. */ -+ tree call_expr, fndecl, type; -+ type = build_function_type_list (integer_type_node, NULL_TREE); -+- fndecl = build_fn_decl ("__cpu_indicator_init", type); -++ fndecl = build_fn_decl ("__cpu_indicator_init_local", type); -+ call_expr = build_call_expr (fndecl, 0); -+ return expand_expr (call_expr, target, mode, EXPAND_NORMAL); -+ } -+diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c -+index 8c2248d..6c82f15 100644 -+--- a/libgcc/config/i386/cpuinfo.c -++++ b/libgcc/config/i386/cpuinfo.c -+@@ -485,7 +485,7 @@ __cpu_indicator_init (void) -+ return 0; -+ } -+ -+-#if defined SHARED && defined USE_ELF_SYMVER -+-__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0"); -+-__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0"); -++#ifndef SHARED -++int __cpu_indicator_init_local (void) -++ __attribute__ ((weak, alias ("__cpu_indicator_init"))); -+ #endif -+diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux -+index 11bb46e..4f47f7b 100644 -+--- a/libgcc/config/i386/t-linux -++++ b/libgcc/config/i386/t-linux -+@@ -3,4 +3,4 @@ -+ # t-slibgcc-elf-ver and t-linux -+ SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver -+ -+-HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER -++HOST_LIBGCC2_CFLAGS += -mlong-double-80 -+-- -+2.9.0 -+ -+--- a/boehm-gc/os_dep.c 2013-09-17 07:46:00.969884340 +0000 -++++ b/boehm-gc/os_dep.c 2013-09-17 06:53:53.629884946 +0000 -+@@ -26,7 +26,7 @@ -+ # define __KERNEL__ -+ # include -+ # undef __KERNEL__ -+-# else -++# elif defined(__GLIBC__) -+ /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */ -+ /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */ -+ /* prototypes, so we have to include the top-level sigcontext.h to */ -+--- a/boehm-gc/dyn_load.c -++++ b/boehm-gc/dyn_load.c -+@@ -459,9 +459,7 @@ -+ /* For glibc 2.2.4+. Unfortunately, it doesn't work for older */ -+ /* versions. Thanks to Jakub Jelinek for most of the code. */ -+ -+-# if (defined(LINUX) || defined (__GLIBC__)) /* Are others OK here, too? */ \ -+- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ -+- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) -++# if (defined(LINUX) || defined (__GLIBC__)) -+ -+ /* We have the header files for a glibc that includes dl_iterate_phdr. */ -+ /* It may still not be available in the library on the target system. */ -+--- a/boehm-gc/include/private/gcconfig.h -++++ b/boehm-gc/include/private/gcconfig.h -+@@ -684,7 +684,7 @@ -+ # ifdef __ELF__ -+ # define DYNAMIC_LOADING -+ # include -+-# if defined(__GLIBC__)&& __GLIBC__>=2 -++# if 1 -+ # define SEARCH_FOR_DATA_START -+ # else /* !GLIBC2 */ -+ extern char **__environ; -+@@ -1147,7 +1147,7 @@ -+ # define DATASTART ((ptr_t)((((word) (_etext)) + 0xfff) & ~0xfff)) -+ # endif -+ # include -+-# if defined(__GLIBC__) && __GLIBC__ >= 2 -++# if 1 -+ # define SEARCH_FOR_DATA_START -+ # else -+ extern char **__environ; -+@@ -1367,7 +1367,7 @@ -+ # define HBLKSIZE 4096 -+ # endif -+ # define USE_GENERIC_PUSH_REGS -+-# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2 || __GLIBC__ > 2 -++# if 1 -+ # define LINUX_STACKBOTTOM -+ # else -+ # define STACKBOTTOM 0x80000000 -+@@ -1858,7 +1858,7 @@ -+ # ifdef __ELF__ -+ # define DYNAMIC_LOADING -+ # include -+-# if defined(__GLIBC__) && __GLIBC__ >= 2 -++# if 1 -+ # define SEARCH_FOR_DATA_START -+ # else -+ extern char **__environ; -+--- a/libjava/gnu/gcj/convert/natIconv.cc -++++ b/libjava/gnu/gcj/convert/natIconv.cc -+@@ -24,6 +24,13 @@ -+ -+ #ifdef HAVE_ICONV -+ #include -++#include -++ -++#if __BYTE_ORDER == __BIG_ENDIAN -++#define UCS2_CHARSET "UCS-2BE" -++#else -++#define UCS2_CHARSET "UCS-2LE" -++#endif -+ -+ template -+ static inline size_t -+@@ -45,7 +52,7 @@ -+ _Jv_GetStringUTFRegion (encoding, 0, encoding->length(), buffer); -+ buffer[len] = '\0'; -+ -+- iconv_t h = iconv_open ("UCS-2", buffer); -++ iconv_t h = iconv_open (UCS2_CHARSET, buffer); -+ if (h == (iconv_t) -1) -+ throw new ::java::io::UnsupportedEncodingException (encoding); -+ -+@@ -99,18 +106,6 @@ -+ throw new ::java::io::CharConversionException (); -+ } -+ -+- if (iconv_byte_swap) -+- { -+- size_t max = (old_out - outavail) / sizeof (jchar); -+- for (size_t i = 0; i < max; ++i) -+- { -+- // Byte swap. -+- jchar c = (((out[outpos + i] & 0xff) << 8) -+- | ((out[outpos + i] >> 8) & 0xff)); -+- outbuf[i] = c; -+- } -+- } -+- -+ inpos += old_in - inavail; -+ return (old_out - outavail) / sizeof (jchar); -+ #else /* HAVE_ICONV */ -+@@ -145,7 +140,7 @@ -+ _Jv_GetStringUTFRegion (encoding, 0, encoding->length(), buffer); -+ buffer[len] = '\0'; -+ -+- iconv_t h = iconv_open (buffer, "UCS-2"); -++ iconv_t h = iconv_open (buffer, UCS2_CHARSET); -+ if (h == (iconv_t) -1) -+ throw new ::java::io::UnsupportedEncodingException (encoding); -+ -+@@ -187,20 +182,6 @@ -+ char *inbuf = (char *) &chars[inpos]; -+ char *outbuf = (char *) &out[count]; -+ -+- if (iconv_byte_swap) -+- { -+- // Ugly performance penalty -- don't use losing systems! -+- temp_buffer = (jchar *) _Jv_Malloc (inlength * sizeof (jchar)); -+- for (int i = 0; i < inlength; ++i) -+- { -+- // Byte swap. -+- jchar c = (((chars[inpos + i] & 0xff) << 8) -+- | ((chars[inpos + i] >> 8) & 0xff)); -+- temp_buffer[i] = c; -+- } -+- inbuf = (char *) temp_buffer; -+- } -+- -+ size_t loop_old_in = old_in; -+ while (1) -+ { -+@@ -252,44 +233,7 @@ -+ jboolean -+ gnu::gcj::convert::IOConverter::iconv_init (void) -+ { -+- // Some versions of iconv() always return their UCS-2 results in -+- // big-endian order, and they also require UCS-2 inputs to be in -+- // big-endian order. For instance, glibc 2.1.3 does this. If the -+- // UTF-8=>UCS-2 iconv converter has this feature, then we assume -+- // that all UCS-2 converters do. (This might not be the best -+- // heuristic, but is is all we've got.) -+- jboolean result = false; -+-#ifdef HAVE_ICONV -+- iconv_t handle = iconv_open ("UCS-2", "UTF-8"); -+- if (handle != (iconv_t) -1) -+- { -+- jchar c; -+- unsigned char in[4]; -+- char *inp, *outp; -+- size_t inc, outc, r; -+- -+- // This is the UTF-8 encoding of \ufeff. At least Tru64 UNIX libiconv -+- // needs the trailing NUL byte, otherwise iconv fails with EINVAL. -+- in[0] = 0xef; -+- in[1] = 0xbb; -+- in[2] = 0xbf; -+- in[3] = 0x00; -+- -+- inp = (char *) in; -+- inc = 4; -+- outp = (char *) &c; -+- outc = 2; -+- -+- r = iconv_adapter (iconv, handle, &inp, &inc, &outp, &outc); -+- // Conversion must be complete for us to use the result. -+- if (r != (size_t) -1 && inc == 0 && outc == 0) -+- result = (c != 0xfeff); -+- -+- // Release iconv handle. -+- iconv_close (handle); -+- } -+-#endif /* HAVE_ICONV */ -+- return result; -++ return false; -+ } -+ -+ void -+--- a/libjava/gnu/classpath/natSystemProperties.cc -++++ b/libjava/gnu/classpath/natSystemProperties.cc -+@@ -289,7 +289,7 @@ -+ // just default to `en_US'. -+ setlocale (LC_ALL, ""); -+ char *locale = setlocale (LC_MESSAGES, ""); -+- if (locale && strlen (locale) >= 2) -++ if (locale && strlen (locale) >= 2 && (locale[2] == '\0' || locale[2] == '_')) -+ { -+ char buf[3]; -+ buf[2] = '\0'; -+--- a/libjava/posix-threads.cc -++++ b/libjava/posix-threads.cc -+@@ -657,6 +657,7 @@ -+ struct sched_param param; -+ pthread_attr_t attr; -+ struct starter *info; -++ size_t ss; -+ -+ if (data->flags & FLAG_START) -+ return; -+@@ -675,8 +676,25 @@ -+ // Set stack size if -Xss option was given. -+ if (gcj::stack_size > 0) -+ { -+- int e = pthread_attr_setstacksize (&attr, gcj::stack_size); -++ ss = gcj::stack_size; -++ } -++ else -++ { -++ int e = pthread_attr_getstacksize (&attr, &ss); -++ if (e != 0) -++ JvFail (strerror (e)); -++ -++ // Request at least 1meg of stack -++ if (ss >= 1024 * 1024) -++ ss = 0; -++ else -++ ss = 1024 * 1024; -++ } -++ -++ if (ss) -++ { -++ int e = pthread_attr_setstacksize (&attr, ss); -+ if (e != 0) -+ JvFail (strerror (e)); -+ } -+ -+ info = (struct starter *) _Jv_AllocBytes (sizeof (struct starter)); -+--- a/libgo/mksysinfo.sh -++++ b/libgo/mksysinfo.sh -+@@ -166,6 +166,13 @@ cat > sysinfo.c < -+ #endif -++#if !defined(__GLIBC__) -++#include -++#undef off64_t -++#undef loff_t -++typedef off_t loff_t; -++typedef off_t off64_t; -++#endif -+ -+ /* Constants that may only be defined as expressions on some systems, -+ expressions too complex for -fdump-go-spec to handle. These are -+--- a/libgo/runtime/proc.c 2016-09-23 16:17:22.000000000 +0200 -++++ b/libgo/runtime/proc.c 2016-10-03 07:33:42.186000000 +0200 -+@@ -150,6 +150,20 @@ -+ asm ("st %%g7, %0" : "=m"(c->uc_mcontext.gregs[REG_G7])); -+ } -+ -++# elif !defined(__GLIBC__) -++ -++static inline void -++initcontext(void) -++{ -++ // FIXME: Do we need to save (part of) the current context? -++} -++ -++static inline void -++fixcontext(ucontext_t *c __attribute__ ((unused))) -++{ -++ // FIXME: Do we need to restore (part of) the current context? -++} -++ -+ # else -+ -+ # error unknown case for SETCONTEXT_CLOBBERS_TLS -diff --git a/srcpkgs/gcc/patches/fix-cxxflags-passing.patch b/srcpkgs/gcc/patches/fix-cxxflags-passing.patch -new file mode 100644 -index 0000000..dda2a50 ---- /dev/null -+++ b/srcpkgs/gcc/patches/fix-cxxflags-passing.patch -@@ -0,0 +1,10 @@ -+--- Makefile.in.orig -++++ Makefile.in -+@@ -169,6 +169,7 @@ -+ # built for the build system to override those in BASE_FLAGS_TO_PASSS. -+ EXTRA_BUILD_FLAGS = \ -+ CFLAGS="$(CFLAGS_FOR_BUILD)" \ -++ CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \ -+ LDFLAGS="$(LDFLAGS_FOR_BUILD)" -+ -+ # This is the list of directories to built for the host system. -diff --git a/srcpkgs/gcc/patches/fix-musl-execinfo.patch b/srcpkgs/gcc/patches/fix-musl-execinfo.patch -new file mode 100644 -index 0000000..583eac7 ---- /dev/null -+++ b/srcpkgs/gcc/patches/fix-musl-execinfo.patch -@@ -0,0 +1,33 @@ -+There is no in musl libc -+ -+--- libvtv/vtv_rts.cc 2016-09-23 16:17:11.000000000 +0200 -++++ libvtc/vtv_rts.cc 2016-09-25 15:08:57.896000000 +0200 -+@@ -124,7 +124,7 @@ -+ #include -+ #include -+ #include -+-#else -++#elif defined (__GLIBC__) -+ #include -+ #endif -+ -+--- libvtv/vtv_utils.cc 2016-09-23 16:17:11.000000000 +0200 -++++ libvtv/vtv_utils.cc 2016-09-25 15:15:35.529000000 +0200 -+@@ -34,7 +34,7 @@ -+ #include -+ #if defined (__CYGWIN__) || defined (__MINGW32__) -+ #include -+-#else -++#elif defined (__GLIBC__) -+ #include -+ #endif -+ -+@@ -178,7 +178,7 @@ -+ -+ __vtv_add_to_log (vtv_failures_log_fd, "%s", log_msg); -+ -+-#if !defined (__CYGWIN__) && !defined (__MINGW32__) -++#if !defined (__CYGWIN__) && !defined (__MINGW32__) && defined(__GLIBC__) -+ if (generate_backtrace) -+ { -+ #define STACK_DEPTH 20 -diff --git a/srcpkgs/gcc/patches/gcc-spec-env-r1.patch b/srcpkgs/gcc/patches/gcc-spec-env-r1.patch -deleted file mode 100644 -index 3eb0141..0000000 ---- a/srcpkgs/gcc/patches/gcc-spec-env-r1.patch -+++ /dev/null -@@ -1,87 +0,0 @@ --2013-08-22 Magnus Granberg -- -- * gcc/gcc.c (main): Add support for external spec file via the GCC_SPECS env var -- and move the process of the user specifed specs. -- -- This allows us to easily control pie/ssp defaults with gcc-config profiles. -- Original patch by Rob Holland -- Extended to support multiple entries separated by ':' by Kevin F. Quinn -- Modified to use getenv instead of poisoned GET_ENVIRONMENT by Ryan Hill -- Modified to process the GCC_SPECS env var befor DRIVER_SELF_SPECS by Magnus Granberg -- ----- gcc/gcc.c 2013-02-05 16:55:31.000000000 +0100 --+++ gcc/gcc.c 2013-07-26 02:32:14.625089864 +0200 --@@ -6427,6 +6428,48 @@ main (int argc, char **argv) -- do_option_spec (option_default_specs[i].name, -- option_default_specs[i].spec); -- --+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32)) --+ /* Add specs listed in GCC_SPECS. Note; in the process of separating --+ * each spec listed, the string is overwritten at token boundaries --+ * (':') with '\0', an effect of strtok_r(). --+ */ --+ specs_file = getenv ("GCC_SPECS"); --+ if (specs_file && (strlen(specs_file) > 0)) --+ { --+ char *spec, *saveptr; --+ for (spec=strtok_r(specs_file,":",&saveptr); --+ spec!=NULL; --+ spec=strtok_r(NULL,":",&saveptr)) --+ { --+ struct user_specs *user = (struct user_specs *) --+ xmalloc (sizeof (struct user_specs)); --+ user->next = (struct user_specs *) 0; --+ user->filename = spec; --+ if (user_specs_tail) --+ user_specs_tail->next = user; --+ else --+ user_specs_head = user; --+ user_specs_tail = user; --+ } --+ } --+#endif --+ /* Process any user specified specs in the order given on the command --+ * line. */ --+ for (uptr = user_specs_head; uptr; uptr = uptr->next) --+ { --+ char *filename = find_a_file (&startfile_prefixes, uptr->filename, --+ R_OK, true); --+ read_specs (filename ? filename : uptr->filename, false, true); --+ } --+ /* Process any user self specs. */ --+ { --+ struct spec_list *sl; --+ for (sl = specs; sl; sl = sl->next) --+ if (sl->name_len == sizeof "self_spec" - 1 --+ && !strcmp (sl->name, "self_spec")) --+ do_self_spec (*sl->ptr_spec); --+ } --+ -- /* Process DRIVER_SELF_SPECS, adding any new options to the end -- of the command line. */ -- --@@ -6535,24 +6578,6 @@ main (int argc, char **argv) -- PREFIX_PRIORITY_LAST, 0, 1); -- } -- --- /* Process any user specified specs in the order given on the command --- line. */ --- for (uptr = user_specs_head; uptr; uptr = uptr->next) --- { --- char *filename = find_a_file (&startfile_prefixes, uptr->filename, --- R_OK, true); --- read_specs (filename ? filename : uptr->filename, false, true); --- } --- --- /* Process any user self specs. */ --- { --- struct spec_list *sl; --- for (sl = specs; sl; sl = sl->next) --- if (sl->name_len == sizeof "self_spec" - 1 --- && !strcmp (sl->name, "self_spec")) --- do_self_spec (*sl->ptr_spec); --- } --- -- if (compare_debug) -- { -- enum save_temps save; -diff --git a/srcpkgs/gcc/patches/libcpp-source_date_epoch.patch b/srcpkgs/gcc/patches/libcpp-source_date_epoch.patch -index 7265900..e42f4d6 100644 ---- a/srcpkgs/gcc/patches/libcpp-source_date_epoch.patch -+++ b/srcpkgs/gcc/patches/libcpp-source_date_epoch.patch -@@ -12,7 +12,7 @@ time_t is some day promoted to a 64 bit value. - - --- libcpp/macro.c - +++ libcpp/macro.c --@@ -349,14 +349,38 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node) -+@@ -356,14 +356,38 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node) - slow on some systems. */ - time_t tt; - struct tm *tb = NULL; -diff --git a/srcpkgs/gcc/patches/musl-posix_memalign-c++.patch b/srcpkgs/gcc/patches/musl-posix_memalign-c++.patch -deleted file mode 100644 -index f285f73..0000000 ---- a/srcpkgs/gcc/patches/musl-posix_memalign-c++.patch -+++ /dev/null -@@ -1,30 +0,0 @@ --diff --git gcc/config/i386/pmm_malloc.h gcc/config/i386/pmm_malloc.h --index 901001b..321fcd3 100644 ----- gcc/config/i386/pmm_malloc.h --+++ gcc/config/i386/pmm_malloc.h --@@ -27,12 +27,13 @@ -- #include -- -- /* We can't depend on since the prototype of posix_memalign --- may not be visible. */ --+ may not be visible and we can't pollute the namespace either. */ -- #ifndef __cplusplus ---extern int posix_memalign (void **, size_t, size_t); --+extern int __gcc_posix_memalign (void **, size_t, size_t) -- #else ---extern "C" int posix_memalign (void **, size_t, size_t) throw (); --+extern "C" int __gcc_posix_memalign (void **, size_t, size_t) throw () -- #endif --+__asm__("posix_memalign"); -- -- static __inline void * -- _mm_malloc (size_t size, size_t alignment) --@@ -42,7 +43,7 @@ _mm_malloc (size_t size, size_t alignment) -- return malloc (size); -- if (alignment == 2 || (sizeof (void *) == 8 && alignment == 4)) -- alignment = sizeof (void *); --- if (posix_memalign (&ptr, alignment, size) == 0) --+ if (__gcc_posix_memalign (&ptr, alignment, size) == 0) -- return ptr; -- else -- return NULL; -diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template -index 6215817..e89394e 100644 ---- a/srcpkgs/gcc/template -+++ b/srcpkgs/gcc/template -@@ -1,15 +1,16 @@ - # Template build file for 'gcc' -+_majorver=6.2 -+_gcjrel=17 -+ - pkgname=gcc --_majorver=4.9 --version=${_majorver}.4 -+version=${_majorver}.1 - revision=1 - short_desc="The GNU C Compiler" - maintainer="Juan RP " - homepage="http://gcc.gnu.org" - license="GFDL-1.2, GPL-3, LGPL-2.1" --distfiles="${GNU_SITE}/gcc/gcc-$version/gcc-$version.tar.bz2" --checksum=6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 --_gcjrel=15 -+distfiles="http://distfiles.voidlinux.de/gcc-$version/gcc-$version.tar.xz" -+checksum=6bc5af0d2138bb8492c62ced00776b76bbc98b7297287aaa55adbe7d07786ac8 - - nopie=yes - lib32disabled=yes -@@ -18,25 +19,24 @@ bootstrap=yes - if [ "$CHROOT_READY" ]; then - hostmakedepends="perl flex" - fi --makedepends="zlib-devel libmpc-devel cloog-devel" --depends="binutils libgcc-devel-${version}_${revision}" -+makedepends="zlib-devel libmpc-devel isl15-devel" -+depends="binutils libgcc-devel-${version}_${revision} -+ libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}" - - subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel" --subpackages+=" libssp libssp-devel gcc-c++" -+subpackages+=" libssp libssp-devel" - - if [ -n "$CHROOT_READY" -a -z "$CROSS_BUILD" ]; then -+ # Required by gcj -+ hostmakedepends+=" zip unzip" - subpackages+=" gcc-fortran gcc-objc gcc-objc++" - subpackages+=" libgfortran-devel libgfortran" - subpackages+=" libobjc-devel libobjc" -- -+ subpackages+=" gcc-gcj libgcj-devel libgcj gcc-gcj-jdk-compat" - case "$XBPS_TARGET_MACHINE" in -- *-musl) -- # XXX disable go and java with musl -+ *-musl) # Go won't link for musl libc - ;; -- *) -- # Required by gcj -- hostmakedepends+=" zip unzip" -- subpackages+=" gcc-go libgo-devel libgo gcc-gcj libgcj-devel libgcj gcc-gcj-jdk-compat" -+ *) subpackages+=" gcc-go libgo-devel libgo" - ;; - esac - fi -@@ -74,19 +74,20 @@ case "$XBPS_TARGET_MACHINE" in - esac - case "$XBPS_TARGET_MACHINE" in - mips*) ;; -+ x86_64*|i686*) subpackages+=" libitm libitm-devel libmpx libmpx-devel";; - *) subpackages+=" libitm libitm-devel";; - esac - -+# gcc-c++ merged in main pkg -+replaces="gcc-c++>=0" -+ - pre_configure() { - case "$XBPS_TARGET_MACHINE" in -- *-musl) patch -Np1 -i ${FILESDIR}/gcc-4.9.2-musl.diff;; -+ *-musl) patch -Np1 -i ${FILESDIR}/gcc-${version}-musl.diff;; - esac - # _FORTIFY_SOURCE needs an optimization level. - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {gcc,libiberty}/configure -- # As specified in the LFS book, disable installing libiberty. -- sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in -- # Do not run fixincludes -- sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in -+ mkdir gcc_build - } - do_configure() { - local _langs _args _hash -@@ -118,7 +119,9 @@ do_configure() { - export GCC_FOR_TARGET="$CC" - export CXX_FOR_TARGET="$CXX" - -- _args+=" --disable-multilib --host=$XBPS_CROSS_TRIPLET --with-build-sysroot=${XBPS_CROSS_BASE}" -+ _args+=" --disable-multilib" -+ _args+=" --host=$XBPS_CROSS_TRIPLET" -+ _args+=" --with-build-sysroot=${XBPS_CROSS_BASE}" - _args+=" --enable-sjlj-exceptions=no" - else - if [ -z "$CHROOT_READY" ]; then -@@ -127,15 +130,18 @@ do_configure() { - _args+=" --with-mpfr=${XBPS_MASTERDIR}/usr" - _args+=" --with-isl=${XBPS_MASTERDIR}/usr" - _args+=" --with-mpc=${XBPS_MASTERDIR}/usr" -- _args+=" --with-cloog=${XBPS_MASTERDIR}/usr" - _args+=" --build=${_triplet}" - else -+ _langs="c,c++,objc,obj-c++,fortran,lto,java" - case "$XBPS_TARGET_MACHINE" in -- # XXX disable go and java with musl -- *-musl) _langs="c,c++,objc,obj-c++,fortran,lto";; -- *) _langs="c,c++,objc,obj-c++,fortran,lto,go,java";; -+ *-musl) # Linking libgo.so is broken for musl libc -+ ;; -+ *) _langs+=",go" -+ ;; - esac -- _args+=" --build=${_triplet} --enable-java-gc=boehm --enable-fast-character" -+ _args+=" --build=${_triplet}" -+ _args+=" --enable-java-gc=boehm" -+ _args+=" --enable-fast-character" - fi - fi - -@@ -143,34 +149,60 @@ do_configure() { - aarch64*|*-musl) _args+=" --disable-libsanitizer";; - esac - case "$XBPS_TARGET_MACHINE" in -- *-musl) _args+=" --disable-symvers libat_cv_have_ifunc=no";; -+ *-musl) _args+=" --disable-symvers" -+ _args+=" libat_cv_have_ifunc=no" -+ ;; - esac - - export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" - export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" - -- CONFIG_SHELL=/bin/bash \ -- ./configure --prefix=/usr --mandir=/usr/share/man \ -- --infodir=/usr/share/info --libexecdir=/usr/lib --libdir=/usr/lib \ -- --enable-threads=posix --enable-__cxa_atexit --disable-multilib \ -- --with-system-zlib --enable-shared --enable-lto \ -- --enable-linker-build-id --disable-werror --disable-nls \ -- --enable-checking=release --disable-libstdcxx-pch \ -- --enable-cloog-backend=isl --with-linker-hash-style=$_hash \ -- --enable-languages=${_langs} ${_args} -+ _args+=" --prefix=/usr" -+ _args+=" --mandir=/usr/share/man" -+ _args+=" --infodir=/usr/share/info" -+ _args+=" --libexecdir=/usr/lib" -+ _args+=" --libdir=/usr/lib" -+ _args+=" --enable-threads=posix" -+ _args+=" --enable-__cxa_atexit" -+ _args+=" --disable-multilib" -+ _args+=" --with-system-zlib" -+ _args+=" --enable-shared" -+ _args+=" --enable-lto" -+ _args+=" --enable-vtable-verify" -+ _args+=" --enable-linker-build-id" -+ _args+=" --enable-serial-configure" -+ _args+=" --disable-werror" -+ _args+=" --disable-nls" -+ _args+=" --enable-checking=release" -+ _args+=" --disable-libstdcxx-pch" -+ _args+=" --with-isl" -+ _args+=" --with-linker-hash-style=$_hash" -+ _args+=" --disable-libunwind-exceptions" -+ _args+=" --disable-target-libiberty" -+ _args+=" --with-default-libstdcxx-abi=gcc4-compatible" -+ _args+=" --enable-languages=${_langs}" -+ -+ mkdir -p build -+ cd build -+ CONFIG_SHELL=/bin/bash ${wrksrc}/configure ${_args} - } - do_build() { -+ if [ -z "$CHROOT_READY" ]; then -+ export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib" -+ fi -+ cd build - make ${makejobs} - } - pre_install() { - if [ "$CROSS_BUILD" ]; then - # XXX otherwise links to host libpthread -- for f in $(find ${wrksrc}/${XBPS_CROSS_TRIPLET} -type f -name libtool); do -+ for f in $(find ${wrksrc}/build/${XBPS_CROSS_TRIPLET} -type f -name libtool); do - sed -e "s,add_dir=\"-L\$libdir\",add_dir=\"-L${XBPS_CROSS_BASE}\$libdir\",g" -i $f - done - fi - } - do_install() { -+ cd build - case "$XBPS_TARGET_MACHINE" in - x86_64*|aarch64*) - vmkdir usr/lib -@@ -325,7 +357,7 @@ gcc-fortran_package() { - } - gcc-objc++_package() { - lib32disabled=yes -- depends="gcc-c++>=${_majorver} gcc-objc>=${_majorver}" -+ depends="gcc-objc>=${_majorver}" - short_desc+=" - Objective-C++ support" - pkg_install() { - vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1objplus -@@ -354,7 +386,7 @@ libgcj-devel_package() { - vmove "usr/lib/gcc/${_triplet}/${_majorver}/include/gcj*" - vmove "usr/lib/gcc/${_triplet}/${_majorver}/include/jvm*" - vmove "usr/lib/gcc/${_triplet}/${_majorver}/include/jawt*" -- vmove usr/lib/pkgconfig/libgcj-${_majorver}.pc -+ vmove usr/lib/pkgconfig/libgcj-${_majorver%.*}.pc - } - } - libgcj_package() { -@@ -374,7 +406,10 @@ libgfortran-devel_package() { - short_desc+=" - Fortran library - development files" - pkg_install() { - vmove usr/lib/libgfortran.a -- vmove usr/lib/gcc/${_triplet}/${_majorver}/libgfortranbegin.a -+ # This does not seem to exist anymore? -+ if [ -f usr/lib/gcc/${_triplet}/${_majorver}/libgfortranbegin.a ]; then -+ vmove usr/lib/gcc/${_triplet}/${_majorver}/libgfortranbegin.a -+ fi - } - } - libgfortran_package() { -@@ -391,6 +426,7 @@ libgo-devel_package() { - pkg_install() { - vmove usr/lib/libgo.a - vmove usr/lib/libgobegin.a -+ vmove usr/lib/libgo.so - } - } - libgo_package() { -@@ -529,6 +565,23 @@ libitm_package() { - vmove "usr/lib/libitm.so.*" - } - } -+libmpx-devel_package() { -+ depends="libmpx>=${_majorver}" -+ short_desc+=" - Intel MPX support - development files" -+ pkg_install() { -+ vmove usr/lib/libmpx.a -+ vmove usr/lib/libmpx.so -+ vmove usr/lib/libmpxwrappers.so -+ vmove usr/lib/libmpxwrappers.a -+ } -+} -+libmpx_package() { -+ short_desc+=" - Intel MPX support" -+ pkg_install() { -+ vmove usr/lib/libmpx.so.* -+ vmove usr/lib/libmpxwrappers.so.* -+ } -+} - libsanitizer-devel_package() { - depends="libsanitizer>=${_majorver}" - short_desc+=" - Sanitizer libraries - development files" -@@ -546,7 +599,7 @@ libsanitizer_package() { - } - } - libssp-devel_package() { -- depends="glibc-devel libssp>=${_majorver}" -+ depends="libssp>=${_majorver}" - short_desc+=" - SSP (StackSmashingProtection) library - development files" - pkg_install() { - vmove "usr/lib/libssp*.a" -@@ -576,15 +629,3 @@ libstdc++_package() { - vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION - } - } --gcc-c++_package() { -- lib32disabled=yes -- depends="gcc>=${_majorver} libstdc++-devel>=${_majorver}" -- short_desc+=" - C++ support" -- pkg_install() { -- for f in g++ c++ ${_triplet}-g++ ${_triplet}-c++; do -- vmove usr/bin/${f} -- done -- vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1plus -- vmove usr/share/man/man1/g++.1 -- } --} -diff --git a/srcpkgs/isl15-devel b/srcpkgs/isl15-devel -new file mode 120000 -index 0000000..ff1d954 ---- /dev/null -+++ b/srcpkgs/isl15-devel -@@ -0,0 +1 @@ -+isl15 -\ No newline at end of file -diff --git a/srcpkgs/isl15/template b/srcpkgs/isl15/template -new file mode 100644 -index 0000000..bc2c349 ---- /dev/null -+++ b/srcpkgs/isl15/template -@@ -0,0 +1,31 @@ -+# Template file for 'isl15' -+pkgname=isl15 -+version=0.16.1 -+revision=1 -+wrksrc="isl-${version}" -+bootstrap=yes -+build_style=gnu-configure -+makedepends="gmp-devel" -+short_desc="Integer Set Library" -+maintainer="Juan RP " -+homepage="http://freecode.com/projects/isl" -+license="LGPL-2.1" -+distfiles="http://isl.gforge.inria.fr/isl-${version}.tar.bz2" -+checksum=412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2 -+ -+post_install() { -+ # Remove gdb python files. -+ rm -f ${DESTDIR}/usr/lib/*.py -+} -+ -+isl15-devel_package() { -+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}" -+ short_desc+=" - development files" -+ conflicts="isl-devel>=0" -+ pkg_install() { -+ vmove usr/include -+ vmove usr/lib/pkgconfig -+ vmove "usr/lib/*.a" -+ vmove "usr/lib/*.so" -+ } -+} -diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template -index 8e8a7f3..1c39f88 100644 ---- a/srcpkgs/kernel-libc-headers/template -+++ b/srcpkgs/kernel-libc-headers/template -@@ -1,6 +1,6 @@ - # Template file for 'kernel-libc-headers' - pkgname=kernel-libc-headers --version=4.1.15 -+version=4.1.34 - revision=1 - bootstrap=yes - nostrip=yes -@@ -11,7 +11,7 @@ short_desc="The Linux API headers for userland development" - license="GPL-2" - homepage="http://www.kernel.org" - distfiles="http://www.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" --checksum=472288cc966188c5d7c511c6be0f78682843c9ca2d5d6c4d67d77455680359a3 -+checksum=412316b32b5c7a513ba3ab8e68fc443db4d9423f07b577473089def0ee7406af - - if [ "$CHROOT_READY" ]; then - hostmakedepends="perl" -diff --git a/srcpkgs/libmpx b/srcpkgs/libmpx -new file mode 120000 -index 0000000..b08d5af ---- /dev/null -+++ b/srcpkgs/libmpx -@@ -0,0 +1 @@ -+gcc -\ No newline at end of file -diff --git a/srcpkgs/libmpx-devel b/srcpkgs/libmpx-devel -new file mode 120000 -index 0000000..b08d5af ---- /dev/null -+++ b/srcpkgs/libmpx-devel -@@ -0,0 +1 @@ -+gcc -\ No newline at end of file -diff --git a/srcpkgs/rr/template b/srcpkgs/rr/template -index 1fa6abf..4b8c989 100644 ---- a/srcpkgs/rr/template -+++ b/srcpkgs/rr/template -@@ -16,7 +16,7 @@ checksum=b2b24a3f67df47576126421746cd2942a458d2825faa76e8bb3ca43edffa03d3 - nopie=yes - - case "$XBPS_MACHINE" in -- x86_64*) hostmakedepends+=" gcc-multilib gcc-c++-multilib" ;; -+ x86_64*) hostmakedepends+=" gcc-multilib" ;; - esac - - pre_configure() { -diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template -index 1908c5d..b8e52cf 100644 ---- a/srcpkgs/virtualbox-ose/template -+++ b/srcpkgs/virtualbox-ose/template -@@ -22,7 +22,8 @@ makedepends="libressl-devel libcurl-devel libpng-devel libvpx-devel - xorg-server-devel device-mapper-devel docbook-xsl gsoap-devel" - - if [ "$XBPS_MACHINE" = "x86_64" ]; then -- makedepends+=" gcc-c++-multilib" -+ # Is this required? -+ makedepends+=" gcc-multilib" - fi - - depends="virtualbox-ose-dkms-${version}_${revision} hicolor-icon-theme desktop-file-utils dbus" -diff --git a/xbps-src b/xbps-src -index 03ac79d..87f3132 100755 ---- a/xbps-src -+++ b/xbps-src -@@ -403,9 +403,9 @@ readonly XBPS_VERSION_REQ="0.46" - readonly XBPS_VERSION=$(xbps-uhelper -V|awk '{print $2}') - readonly XBPS_SRC_VERSION="113" - export XBPS_MACHINE=$(xbps-uhelper arch) --readonly XBPS_GCC_VERSION_MAJOR=4 --readonly XBPS_GCC_VERSION_MINOR=9 --readonly XBPS_GCC_VERSION_BUILD=4 -+readonly XBPS_GCC_VERSION_MAJOR=6 -+readonly XBPS_GCC_VERSION_MINOR=2 -+readonly XBPS_GCC_VERSION_BUILD=1 - readonly XBPS_GCC_VERSION=${XBPS_GCC_VERSION_MAJOR}.${XBPS_GCC_VERSION_MINOR}.${XBPS_GCC_VERSION_BUILD} - - # diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template index 7b5b03d29a6..c374f755b9b 100644 --- a/srcpkgs/gd/template +++ b/srcpkgs/gd/template @@ -1,7 +1,7 @@ # Template file for 'gd' pkgname=gd version=2.2.4 -revision=1 +revision=2 wrksrc="libgd-${version}" build_style=gnu-configure configure_args="--without-xpm" diff --git a/srcpkgs/gdbm/patches/gdbm-1.10-zeroheaders.patch b/srcpkgs/gdbm/patches/gdbm-1.10-zeroheaders.patch index 5d3b8674b48..c44e33dad7b 100644 --- a/srcpkgs/gdbm/patches/gdbm-1.10-zeroheaders.patch +++ b/srcpkgs/gdbm/patches/gdbm-1.10-zeroheaders.patch @@ -5,34 +5,25 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=4457 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927 ---- src/falloc.c.zeroheaders 2011-11-11 11:59:11.000000000 +0100 -+++ src/falloc.c 2011-11-14 17:34:32.487604027 +0100 -@@ -255,7 +255,7 @@ push_avail_block (GDBM_FILE dbf) - - +--- src/falloc.c.orig 2017-03-14 07:13:25.976990206 +0000 ++++ src/falloc.c 2017-03-14 07:17:27.833002683 +0000 +@@ -278,7 +278,7 @@ + /* Split the header block. */ -- temp = (avail_block *) malloc (av_size); -+ temp = (avail_block *) calloc (1, av_size); - if (temp == NULL) _gdbm_fatal (dbf, _("malloc error")); - /* Set the size to be correct AFTER the pop_avail_block. */ - temp->size = dbf->header->avail.size; ---- src/gdbmopen.c.zeroheaders 2011-11-11 19:39:42.000000000 +0100 -+++ src/gdbmopen.c 2011-11-14 17:33:24.867608650 +0100 -@@ -264,7 +264,7 @@ gdbm_open (const char *file, int block_s - (dbf->header->block_size - sizeof (hash_bucket)) - / sizeof (bucket_element) + 1; - dbf->header->bucket_size = dbf->header->block_size; -- dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size); -+ dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size); - if (dbf->bucket == NULL) - { - gdbm_close (dbf); -@@ -456,7 +456,7 @@ _gdbm_init_cache(GDBM_FILE dbf, size_t s - for(index = 0; index < size; index++) + temp = GDBM_DEBUG_ALLOC ("push_avail_block:malloc-failure", +- malloc (av_size)); ++ calloc (1, av_size)); + if (temp == NULL) + { + GDBM_SET_ERRNO (dbf, GDBM_MALLOC_ERROR, TRUE); +--- src/gdbmopen.c.orig 2017-03-14 07:23:52.954022551 +0000 ++++ src/gdbmopen.c 2017-03-14 07:26:31.950030754 +0000 +@@ -529,7 +529,7 @@ { - (dbf->bucket_cache[index]).ca_bucket -- = (hash_bucket *) malloc (dbf->header->bucket_size); -+ = (hash_bucket *) calloc (1, dbf->header->bucket_size); + (dbf->bucket_cache[index]).ca_bucket = + GDBM_DEBUG_ALLOC ("_gdbm_init_cache:bucket-malloc-failure", +- malloc (dbf->header->bucket_size)); ++ calloc (1, dbf->header->bucket_size)); if ((dbf->bucket_cache[index]).ca_bucket == NULL) - { - gdbm_errno = GDBM_MALLOC_ERROR; + { + GDBM_SET_ERRNO (dbf, GDBM_MALLOC_ERROR, TRUE); diff --git a/srcpkgs/gdbm/template b/srcpkgs/gdbm/template index d52d302186e..8cafe9612d3 100644 --- a/srcpkgs/gdbm/template +++ b/srcpkgs/gdbm/template @@ -1,6 +1,6 @@ # Template file for 'gdbm' pkgname=gdbm -version=1.12 +version=1.13 revision=1 build_style=gnu-configure configure_args="--enable-libgdbm-compat --disable-rpath" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org.ua/software/gdbm/" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=d97b2166ee867fd6ca5c022efee80702d6f30dd66af0e03ed092285c3af9bcea +checksum=9d252cbd7d793f7b12bcceaddda98d257c14f4d1890d851c386c37207000a253 if [ "$CROSS_BUILD" ]; then hostmakedepends="libtool automake gettext-devel" diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template index 809648044bc..b5a05ecbc6e 100644 --- a/srcpkgs/gdk-pixbuf/template +++ b/srcpkgs/gdk-pixbuf/template @@ -1,6 +1,6 @@ # Template build file for 'gdk-pixbuf'. pkgname=gdk-pixbuf -version=2.36.5 +version=2.36.6 revision=1 build_style=gnu-configure configure_args="$(vopt_enable gir introspection) --without-libjasper @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="http://www.gtk.org/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=7ace06170291a1f21771552768bace072ecdea9bd4a02f7658939b9a314c40fc +checksum=455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c # Package build options build_options="gir" diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 664969b8aaf..9ad56b62f63 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,15 +1,14 @@ # Template file for 'gdm' pkgname=gdm -version=3.22.1 -revision=1 -patch_args="-Np1" +version=3.24.1 +revision=2 build_style=gnu-configure configure_args="$(vopt_enable gir introspection) --disable-schemas-compile --disable-static --with-default-pam-config=arch --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers --with-screenshot-dir=/var/lib/gdm/greeter --sbindir=/usr/bin --without-plymouth --with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid - --disable-systemd-journal --with-initial-vt=7" + --disable-systemd-journal --with-initial-vt=7 --enable-wayland-support" hostmakedepends="automake libtool pkg-config itstool intltool gnome-doc-utils $(vopt_if gir gobject-introspection)" makedepends="glib-devel iso-codes gettext-devel @@ -26,14 +25,14 @@ conf_files=" # Create the 'gdm' system user/group. system_accounts="gdm" gdm_homedir="/var/lib/gdm" -depends="iso-codes xrdb xorg-server hicolor-icon-theme +depends="iso-codes xrdb xorg-server xorg-server-xwayland hicolor-icon-theme dconf>=0.20 gnome-session>=3.22 gnome-settings-daemon>=3.14 gnome-shell>=3.14" short_desc="GNOME Display Manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=6a43e623f563c2e366297c2ee8d160526a285e102c73936e27a1d79076d6969f +checksum=1ee22139fe0a3fc1ff897ca1c626b28b4e997275ca8dd4d7e48e019a2f2c2179 # Package build options build_options="gir" diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template index 6e7f4d36d10..284e86de4b5 100644 --- a/srcpkgs/geany-plugins/template +++ b/srcpkgs/geany-plugins/template @@ -1,7 +1,7 @@ # Template file for 'geany-plugins' pkgname=geany-plugins -version=1.29.0 -revision=2 +version=1.30.0 +revision=1 build_style=gnu-configure configure_args="--enable-all-plugins" hostmakedepends="automake gettext-devel intltool libtool pkg-config vala @@ -14,7 +14,7 @@ maintainer="Steve Prybylski " license="GPL-2" homepage="http://plugins.geany.org" distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=ef75127d09d2173fb17943e21f187d57abdc34324f59582c3df2bae0b9e6d8e4 +checksum=3d19bf4f454910f3eb5571e40c1d2b4a5c6c7beb1eaa0d9da3d1221cabede0cd pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template index 5e53ea18159..1a6d8b4367e 100644 --- a/srcpkgs/geany/template +++ b/srcpkgs/geany/template @@ -1,6 +1,6 @@ # Template file for 'geany' pkgname=geany -version=1.30 +version=1.30.1 revision=1 build_style=gnu-configure hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool python" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.geany.org" distfiles="http://download.${pkgname}.org/${pkgname}-${version}.tar.bz2" -checksum=b2dec920c77bc3e88d5f7b0f1dbe4f5200f36df3b346d1aba39323bc30afae6d +checksum=0ac360f1f3d6c28790a81d570252a7d40421f6e1d8e5a8d653756bd041d88491 pre_configure() { autoreconf -fi diff --git a/srcpkgs/gede/template b/srcpkgs/gede/template index 8d1c92811f4..151bdc58283 100644 --- a/srcpkgs/gede/template +++ b/srcpkgs/gede/template @@ -8,7 +8,7 @@ hostmakedepends="python qt-qmake" makedepends="qt-devel" depends="gdb ctags" short_desc="Graphical frontend (GUI) to GDB written in Qt" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="BSD" homepage="http://acidron.com/gede" distfiles="http://gede.acidron.com/uploads/source/${pkgname}-${version}.tar.xz" diff --git a/srcpkgs/gegl3/template b/srcpkgs/gegl3/template index 3753316ef54..7c6e2267ac8 100644 --- a/srcpkgs/gegl3/template +++ b/srcpkgs/gegl3/template @@ -1,20 +1,21 @@ # Template build file for 'gegl3'. pkgname=gegl3 -version=0.3.8 -revision=2 +version=0.3.14 +revision=3 build_style=gnu-configure -configure_args="--disable-docs --without-sdl --without-libopenraw +configure_args="--disable-docs --without-sdl --without-libavformat --without-graphviz --without-lua --without-libspiro --without-umfpack --with-exiv2 --without-libv4l --disable-introspection" hostmakedepends="pkg-config intltool" makedepends="libglib-devel libpng-devel babl-devel jasper-devel - libjpeg-turbo-devel librsvg-devel gtk+-devel exiv2-devel json-glib-devel" + libjpeg-turbo-devel librsvg-devel gtk+-devel exiv2-devel json-glib-devel + libraw-devel" short_desc="Graph based image processing framework (v0.3)" maintainer="Juan RP " license="GPL-3, LGPL-3" homepage="http://www.gimp.org" distfiles="http://ftp.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.bz2" -checksum=06ca9e67a59da026eb941b9d323269d7c19a922f1e478acdd3791a0eef8b229b +checksum=09f5e2e6899697641d4660e3e274aed696f5bacc96ba389ac77674ee1156590a wrksrc=gegl-$version post_install() { @@ -28,6 +29,6 @@ gegl3-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.so + vmove usr/lib/libgegl-0.3.so } } diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template index 9db17c84b90..3c16c8019b5 100644 --- a/srcpkgs/gendesk/template +++ b/srcpkgs/gendesk/template @@ -1,7 +1,7 @@ # Template file for 'gendesk' pkgname=gendesk version=0.6.4 -revision=4 +revision=5 build_style=go hostmakedepends="git-perl mercurial" go_import_path="github.com/xyproto/gendesk" diff --git a/srcpkgs/geoclue-devel b/srcpkgs/geoclue-devel deleted file mode 120000 index 40487d3141f..00000000000 --- a/srcpkgs/geoclue-devel +++ /dev/null @@ -1 +0,0 @@ -geoclue \ No newline at end of file diff --git a/srcpkgs/geoclue/template b/srcpkgs/geoclue/template deleted file mode 100644 index 5194a82b3ec..00000000000 --- a/srcpkgs/geoclue/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'geoclue' -pkgname=geoclue -version=0.12.99 -revision=3 -build_style=gnu-configure -configure_args="--disable-static --disable-schemas-compile" -hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel libxslt" -makedepends="dbus-glib-devel GConf-devel gtk+-devel libsoup-gnome-devel NetworkManager-devel" -short_desc="The Geoinformation Service" -homepage="http://www.freedesktop.org/wiki/Software/GeoClue" -license="LGPL-2.1" -maintainer="Juan RP " -distfiles="http://freedesktop.org/~hadess/$pkgname-$version.tar.gz" -checksum=fe396c91cb52de4219281f4d9223156338fc03670d34700281e86d1399b80a72 - -geoclue-devel_package() { - depends="dbus-glib-devel libxml2-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/share/gtk-doc - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/geoclue2/template b/srcpkgs/geoclue2/template index bc9f782eaf0..685f7399fe9 100644 --- a/srcpkgs/geoclue2/template +++ b/srcpkgs/geoclue2/template @@ -1,12 +1,12 @@ # Template file for 'geoclue2' pkgname=geoclue2 -version=2.4.5 +version=2.4.6 revision=1 lib32disabled=yes wrksrc="geoclue-${version}" build_style=gnu-configure configure_args="--disable-static --with-dbus-service-user=geoclue2" -hostmakedepends="pkg-config intltool glib-devel" +hostmakedepends="pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)" makedepends="eudev-libudev-devel json-glib-devel libsoup-gnome-devel ModemManager-devel avahi-glib-libs-devel" depends="libsoup>=2.44" @@ -18,7 +18,12 @@ homepage="http://www.freedesktop.org/wiki/Software/GeoClue" license="LGPL-2.1" maintainer="Juan RP " distfiles="http://www.freedesktop.org/software/geoclue/releases/${version%.*}/geoclue-${version}.tar.xz" -checksum=78162d33a2d42477ec241db7fc082439b0e0f9a791eb3a41e5a2aa1eae9145a1 +checksum=c57df7455c9b4b2f43b0f5d9be14d52f5ff9897236df768f6ca9044b79b6d3b6 + +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gir" +fi geoclue2-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/geoip-data/template b/srcpkgs/geoip-data/template new file mode 100644 index 00000000000..6f5cb5699f1 --- /dev/null +++ b/srcpkgs/geoip-data/template @@ -0,0 +1,31 @@ +# Template file for 'geoip-data' +pkgname=geoip-data +version=20170416 +revision=2 +create_wrksrc=yes +short_desc="Non-DNS IP-to-country resolver C library and utilities (data files)" +maintainer="Enno Boland " +license="CC BY-SA 4.0" +homepage="https://dev.maxmind.com/geoip/legacy/geolite/" +distfiles=" + http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz + http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz + http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz + http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz + http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz + http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz" +checksum="0fff4856664bec9d6feda3467fc5273dbcd3c0a9dc1a2ad90a75bee505ad88a9 + b0561561be6ad5fda16b8ccd903c76bfcea25a6789bf26104445c432d17a6b76 + b4464f8695a72a011a51da910a4d2a7e3c2440d7d988fd4f19a7976072a4cb61 + f22f36d9edb92a46003d6036f80c4e7ac955305ee73b6e875f01ec2164290d1e + c25bb12c2c8d9c3caca355aaf82994a83d9129d63dfbe2810be3d5ab842e5683 + 35b77995e04f415fbfee6c24d4dafafe6c8af4bc51452bcb744b1797e53f8625" +noarch=yes + +do_install() { + vmkdir usr/share/GeoIP + for i in $distfiles; do + local n=$(basename "$i" .gz) + vinstall $n 644 usr/share/GeoIP + done +} diff --git a/srcpkgs/geoip/template b/srcpkgs/geoip/template index 10f3180e81b..57f61b13349 100644 --- a/srcpkgs/geoip/template +++ b/srcpkgs/geoip/template @@ -1,19 +1,18 @@ # Template file for 'geoip' pkgname=geoip -version=1.4.8 -revision=3 +version=1.6.10 +revision=1 wrksrc="GeoIP-${version}" build_style=gnu-configure configure_args="--mandir=/usr/share/man --sysconfdir=/etc/geoip" hostmakedepends="automake libtool" makedepends="zlib-devel" -conf_files="/etc/geoip/GeoIP.conf" short_desc="Non-DNS IP-to-country resolver C library and utilities" maintainer="Juan RP " homepage="http://www.maxmind.com/app/c" license="GPL-2" -distfiles="http://geolite.maxmind.com/download/${pkgname}/api/c/GeoIP-${version}.tar.gz" -checksum=cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4 +distfiles="https://github.com/maxmind/geoip-api-c/releases/download/v$version/GeoIP-$version.tar.gz" +checksum=cb44e0d0dbc45efe2e399e695864e58237ce00026fba8a74b31d85888c89c67a pre_configure() { autoreconf -fi @@ -21,9 +20,9 @@ pre_configure() { libgeoip_package() { short_desc+=" - Runtime library" + depends="geoip-data" pkg_install() { vmove "usr/lib/*.so.*" - vmove usr/share/GeoIP } } @@ -31,8 +30,8 @@ geoip-devel_package() { short_desc+=" - development files" depends="zlib-devel libgeoip>=${version}_${revision}" pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" } } diff --git a/srcpkgs/geoipupdate/template b/srcpkgs/geoipupdate/template new file mode 100644 index 00000000000..787abb15cb5 --- /dev/null +++ b/srcpkgs/geoipupdate/template @@ -0,0 +1,19 @@ +# Template file for 'geoipupdate' +pkgname=geoipupdate +version=2.3.1 +revision=1 +build_style=gnu-configure +configure_args="--mandir=/usr/share/man --sysconfdir=/etc/geoip" +hostmakedepends="automake libtool" +makedepends="zlib-devel libcurl-devel" +short_desc="GeoIP update client code " +maintainer="Enno Boland " +homepage="https://github.com/maxmind/geoipupdate" +license="GPL-2" +distfiles="https://github.com/maxmind/geoipupdate/releases/download/v$version/geoipupdate-$version.tar.gz" +checksum=4f71e911774c4fd32e217889c242d2c311fa5ffd3df56be48a2d1aedfe2e671c +conf_files="/etc/geoip/GeoIP.conf" + +pre_configure() { + autoreconf -fi +} diff --git a/srcpkgs/gettext-stub/template b/srcpkgs/gettext-stub/template index 56fb7d6320a..fe97898d11e 100644 --- a/srcpkgs/gettext-stub/template +++ b/srcpkgs/gettext-stub/template @@ -4,7 +4,7 @@ version=1 revision=1 wrksrc=${pkgname} short_desc="Gettext little stub" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="WTFPL" homepage="http://penma.de/code/${pkgname}/" distfiles="${homepage}/${pkgname}-${version}.tar.gz" diff --git a/srcpkgs/gettext-tiny/template b/srcpkgs/gettext-tiny/template index cabb00ca088..0560f90a948 100644 --- a/srcpkgs/gettext-tiny/template +++ b/srcpkgs/gettext-tiny/template @@ -1,13 +1,13 @@ # Template build file for 'gettext-tiny'. pkgname=gettext-tiny -version=0.0.5 +version=0.1.0 revision=1 short_desc="Tiny Internationalized Message Handling Library and tools" maintainer="Juan RP " homepage="https://github.com/rofl0r/gettext-tiny" license="MIT" distfiles="https://github.com/rofl0r/${pkgname}/archive/v${version}.tar.gz" -checksum=b351cb7a27cb301a777bd71195b5d24e5cbd832e59a53d45360fb009ae265886 +checksum=59069ce0762e1a1b9b59e762722c6dc22e2d7ea901c87f2fb2b2fd530da5fd9e conflicts="gettext>=0" diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template index fe224b867c1..c232bd72ef9 100644 --- a/srcpkgs/ghq/template +++ b/srcpkgs/ghq/template @@ -1,7 +1,7 @@ # Template file for 'ghq' pkgname=ghq version=0.7.4 -revision=3 +revision=4 build_style=go go_import_path="github.com/motemen/ghq" go_package="${go_import_path}" diff --git a/srcpkgs/git-cola/template b/srcpkgs/git-cola/template index 2164f91a83b..8b1cccac3c0 100644 --- a/srcpkgs/git-cola/template +++ b/srcpkgs/git-cola/template @@ -1,15 +1,15 @@ # Template file for 'git-cola' pkgname=git-cola -version=2.10 +version=2.11 revision=1 build_style=python2-module noarch=yes hostmakedepends="python" depends="git-perl python-PyQt4" short_desc="Highly caffeinated Git GUI" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://github.com/$pkgname/$pkgname" distfiles="$homepage/archive/v$version.tar.gz" pycompile_dirs="usr/share/git-cola/lib/cola" -checksum=fd310087ad4c4ccd22829ae319d9409ea3ff872f5391b999de130faaf77f4e1c +checksum=bc4007e0d9c80763ef58d630b033bfdbd8406af77bbd292a6c647ed3ca655b5b diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg new file mode 100644 index 00000000000..92448b0f485 --- /dev/null +++ b/srcpkgs/git-lfs/INSTALL.msg @@ -0,0 +1 @@ +Run 'git-lfs install' to configure git to use git-lfs diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template new file mode 100644 index 00000000000..3d0448279a8 --- /dev/null +++ b/srcpkgs/git-lfs/template @@ -0,0 +1,30 @@ +# Template file for 'git-lfs' +pkgname=git-lfs +version=2.0.2 +revision=1 +nocross=1 +build_style=go +go_import_path="github.com/git-lfs/git-lfs" +hostmakedepends="go" +depends="git" +short_desc="Git extension for versioning large files" +maintainer="Nicklaus McClendon " +license="MIT" +homepage="https://git-lfs.github.com/" +distfiles="https://github.com/git-lfs/${pkgname}/archive/${version}.tar.gz" +checksum=e266bdffa53e947ba1d0bf8944d73029384bad2ed05af92bc10918d07eec6b63 + +pre_build() { + chmod +x script/bootstrap + mkdir -p src/github.com/git-lfs + ln -s $(pwd) src/github.com/git-lfs/${pkgname} +} + +do_build() { + GOPATH=$(pwd) ./script/bootstrap +} + +do_install() { + vbin bin/git-lfs + vlicense LICENSE.md +} diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template index 6ddff6ca859..df1054d2bf2 100644 --- a/srcpkgs/git-series/template +++ b/srcpkgs/git-series/template @@ -1,7 +1,7 @@ # Template file for 'git-series' pkgname=git-series version=0.9.1 -revision=2 +revision=3 hostmakedepends="cargo cmake pkg-config rust perl" makedepends="libgit2-devel" depends="git" diff --git a/srcpkgs/git/template b/srcpkgs/git/template index a40ee8d7730..0bd6ad178c8 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,7 +1,7 @@ # Template file for "git" pkgname=git -version=2.12.0 -revision=1 +version=2.12.2 +revision=2 build_style=gnu-configure configure_args="--with-curl --with-expat --with-tcltk --with-libpcre ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" @@ -15,7 +15,7 @@ maintainer="Juan RP " homepage="http://git-scm.com/" license="GPL-2" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=1821766479062d052cc1897d0ded95212e81e5c7f1039786bc4aec2225a32027 +checksum=d21a9e23506e618d561fb25a8a7bd6134f927b86147930103487117a7a678c4a subpackages="git-cvs git-svn git-perl gitk git-gui git-all" diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index decf914d1c6..7b479ae215f 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,20 +1,20 @@ # Template file for 'gjs' pkgname=gjs -version=1.46.0 -revision=2 +version=1.48.2 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool glib-devel gobject-introspection" makedepends="libffi-devel libgirepository-devel dbus-glib-devel - cairo-devel readline-devel mozjs24-devel" + cairo-devel readline-devel mozjs38-devel" short_desc="Mozilla-based javascript bindings for the GNOME platform" maintainer="Juan RP " license="MPL-1.1, LGPL-2.1, GPL-2" homepage="http://live.gnome.org/Gjs" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=2283591fa70785443793e1d7db66071b36052d707075f229baeb468d8dd25ad4 +checksum=99c225ab2149bd31f7ac84d6ee1ea9ae843bf9a806ca853786d90e3182c4f4a1 gjs-devel_package() { - depends="libgirepository-devel mozjs24-devel gjs>=${version}_${revision}" + depends="libgirepository-devel mozjs38-devel gjs>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template new file mode 100644 index 00000000000..0c7bb7703df --- /dev/null +++ b/srcpkgs/gkill/template @@ -0,0 +1,17 @@ +# Template file for 'gkill' +pkgname=gkill +version=1.0.2 +revision=1 +build_style=go +hostmakedepends="git" +short_desc="Easy Process Killer" +maintainer="Andrea Brancaleoni " +license="MIT" +go_import_path="github.com/heppu/gkill" +homepage="https://$go_import_path" +distfiles="$homepage/archive/v$version.tar.gz" +checksum=aee86f1e18a88ecd3024c6deb3dbd6a2e385961ad8365046dc2b64596bdbb84b + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template index 97550765e00..df2adaeda73 100644 --- a/srcpkgs/gkrellm/template +++ b/srcpkgs/gkrellm/template @@ -1,7 +1,7 @@ # Template build file for 'gkrellm'. pkgname=gkrellm version=2.3.10 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel" diff --git a/srcpkgs/gl2ps/template b/srcpkgs/gl2ps/template index 719e7e08370..302f5169f75 100644 --- a/srcpkgs/gl2ps/template +++ b/srcpkgs/gl2ps/template @@ -1,6 +1,6 @@ # Template file for 'gl2ps' pkgname=gl2ps -version=1.3.9 +version=1.4.0 revision=1 wrksrc="${pkgname}-${version}-source" build_style=cmake @@ -10,7 +10,7 @@ maintainer="yopito " license="LGPL-2, GL2PS" homepage="http://www.geuz.org/gl2ps/" distfiles="http://geuz.org/${pkgname}/src/${pkgname}-${version}.tgz" -checksum=8a680bff120df8bcd78afac276cdc38041fed617f2721bade01213362bcc3640 +checksum=03cb5e6dfcd87183f3b9ba3b22f04cd155096af81e52988cc37d8d8efe6cf1e2 post_install() { vlicense COPYING.GL2PS diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template index fbdab3116be..c25f6c50f13 100644 --- a/srcpkgs/glances/template +++ b/srcpkgs/glances/template @@ -1,6 +1,6 @@ # Template file for 'glances' pkgname=glances -version=2.8.2 +version=2.9.1 revision=1 noarch=yes wrksrc="Glances-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/nicolargo/glances" license="LGPL-3" distfiles="${PYPI_SITE}/G/Glances/Glances-${version}.tar.gz" -checksum=6095dcdf0b7a6b6819cc647ee9733ddce309c0745107258850d601109e3411d0 +checksum=03ce730566e183372ee73e45729485396bb62d1c0f108a00f27feff43206fc52 post_install() { vsconf conf/glances.conf diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 0335b9114f2..a976791fa24 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,6 +1,6 @@ # Template build file for 'glib' pkgname=glib -version=2.50.3 +version=2.52.1 revision=1 build_style=gnu-configure configure_args="--enable-libelf --disable-fam --with-pcre=system --enable-static" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.gtk.org/" license="LGPL-2.1" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-$version.tar.xz" -checksum=82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999 +checksum=948c26b817f2d77e2a6cdd5082c60a51bf5dea854890286a1d5d4ccde5ce586f if [ "$CROSS_BUILD" ]; then hostmakedepends+=" glib-devel" diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template index 3b4f3422ffb..4739d4fd8aa 100644 --- a/srcpkgs/glibmm/template +++ b/srcpkgs/glibmm/template @@ -1,7 +1,7 @@ # Template build file for 'glibmm' pkgname=glibmm -version=2.50.0 -revision=2 +version=2.50.1 +revision=1 build_style=gnu-configure hostmakedepends="automake pkg-config intltool libtool glib-devel mm-common gtk-doc" makedepends="libglib-devel libsigc++-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://gtkmm.sourceforge.net/" license="LGPL-2.1" distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-$version.tar.xz" -checksum=df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94 +checksum=1fd85051da9cb402cc8348cec72dfe4d79f9345df4a1dbf68703a4ded45846a4 pre_configure() { autoreconf -if diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template index f48defbc290..89111da028c 100644 --- a/srcpkgs/glide/template +++ b/srcpkgs/glide/template @@ -1,7 +1,7 @@ # Template file for 'glide' pkgname=glide version=0.12.3 -revision=3 +revision=4 build_style=go hostmakedepends="git" depends="go" diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template index d40ec838688..97f7341769a 100644 --- a/srcpkgs/glock/template +++ b/srcpkgs/glock/template @@ -1,7 +1,7 @@ # Template file for 'docker-gen' pkgname=glock version=0.0.0.20150512 -revision=3 +revision=4 _commit=30723574b54030cef8a13e672ce287f29c59f369 wrksrc="glock-$_commit" build_style=go @@ -9,7 +9,7 @@ hostmakedepends="git-perl" short_desc="Lock Go dependencies to specific revisions" go_import_path="github.com/robfig/glock" go_package="${go_import_path}" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="Public Domain" homepage="https://$go_import_path" distfiles="$homepage/archive/$_commit.tar.gz" diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template index de466320a39..3971f1cbe35 100644 --- a/srcpkgs/glusterfs/template +++ b/srcpkgs/glusterfs/template @@ -1,7 +1,7 @@ # Template file for 'glusterfs' pkgname=glusterfs version=3.8.5 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-glupy --enable-crypt-xlator --sbindir=/usr/bin --with-mountutildir=/usr/bin diff --git a/srcpkgs/glyr-devel b/srcpkgs/glyr-devel new file mode 120000 index 00000000000..906519c094d --- /dev/null +++ b/srcpkgs/glyr-devel @@ -0,0 +1 @@ +glyr \ No newline at end of file diff --git a/srcpkgs/glyr/patches/musl-execinfo.patch b/srcpkgs/glyr/patches/musl-execinfo.patch new file mode 100644 index 00000000000..67f62674566 --- /dev/null +++ b/srcpkgs/glyr/patches/musl-execinfo.patch @@ -0,0 +1,29 @@ +--- src/glyrc/glyrc.c.original ++++ src/glyrc/glyrc.c +@@ -24,7 +24,7 @@ + #include + #include + +-#ifdef __linux__ ++#ifdef __GLIBC__ + /* Backtrace*/ + #include + #endif +@@ -102,7 +102,7 @@ + + //////////////////////////////////////////////////////////////// + +-#ifdef __linux__ ++#ifdef __GLIBC__ + #define STACK_FRAME_SIZE 20 + + /* Obtain a backtrace and print it to stdout. */ +@@ -141,7 +141,7 @@ + cvprint (DEFAULT," It would be just natural to blame us now, so just visit \n"); + cvprint (DEFAULT," and throw hard words like 'backtrace', 'bug report' or even the '$(command I issued' at them).\n"); + cvprint (DEFAULT," The libglyr developers will try to fix it as soon as possible so please stop pulling their hair.\n"); +-#ifdef __linux__ ++#ifdef __GLIBC__ + cvprint (DEFAULT,"\nA list of the last called functions follows, please add this to your report:\n"); + print_trace(); + #endif diff --git a/srcpkgs/glyr/template b/srcpkgs/glyr/template new file mode 100644 index 00000000000..eb59ece2e9c --- /dev/null +++ b/srcpkgs/glyr/template @@ -0,0 +1,23 @@ +# Template file for 'glyr' +pkgname=glyr +version="1.0.10" +revision=1 +build_style=cmake +hostmakedepends="pkg-config" +makedepends="libcurl-devel glib-devel sqlite-devel" +short_desc="A music metadata searchengine utility and library" +maintainer="Michal Koutenský " +license="LGPL-3" +homepage="https://github.com/sahib/glyr" +distfiles="https://github.com/sahib/glyr/archive/${version}.tar.gz" +checksum=77e8da60221c8d27612e4a36482069f26f8ed74a1b2768ebc373c8144ca806e8 + +glyr-devel_package() { + depends="glyr>=${version}_${revision}" + short_desc="A music metadata searchengine utility and library - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template index c2443d52771..b3cb9c3678b 100644 --- a/srcpkgs/gnome-autoar/template +++ b/srcpkgs/gnome-autoar/template @@ -1,18 +1,18 @@ -# Template file for 'gnome-disk-utility' +# Template file for 'gnome-autoar' pkgname=gnome-autoar -version=0.2.0 +version=0.2.2 revision=1 lib32disabled=yes build_style=gnu-configure -configure_args="" +configure_args="--disable-schemas-compile" hostmakedepends="pkg-config glib-devel $(vopt_if gir gobject-introspection)" makedepends="libarchive-devel gtk+3-devel glib-devel" short_desc="Automatic archives creating and extracting library" maintainer="Juan RP " -homepage="http://www.gnome.org" -license="GPL-2" +homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final" +license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=08afa3a3b86f16bfd23e7343feab854610de67af7675dac37be4e5507a20bc6c +checksum=e1fe2c06eed30305c38bf0939c72b0e51b4716658e2663a0cf4a4bf57874ca62 # Package build options build_options="gir" diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template index ca12f91e792..7db23aff7f6 100644 --- a/srcpkgs/gnome-backgrounds/template +++ b/srcpkgs/gnome-backgrounds/template @@ -1,6 +1,6 @@ # Template file for 'gnome-backgrounds' pkgname=gnome-backgrounds -version=3.22.1 +version=3.24.0 revision=1 noarch="yes" build_style=gnu-configure @@ -10,4 +10,4 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=bfc89812b26383b74062c43f6c175b8fce19d4044b42f8bc9de2ab196a6eee25 +checksum=cbda4c2159292940fa4b972df77379be716590c7b62bb4b2b9fa8e99749c71ca diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template index b06a5fd92cd..474c876847f 100644 --- a/srcpkgs/gnome-boxes/template +++ b/srcpkgs/gnome-boxes/template @@ -1,6 +1,6 @@ # Template file for 'gnome-boxes' pkgname=gnome-boxes -version=3.22.4 +version=3.24.0 revision=1 # XXX ovirt support. build_style=gnu-configure @@ -17,7 +17,7 @@ maintainer="Juan RP " homepage="https://live.gnome.org/Boxes" license="LGPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=585a1c292010ebb479cb60e02621d01d450f84cdad82a61b7ce58a0218e1cff2 +checksum=7495ea7184b6ef650033daf6941328b785b22e522e8142b9d190575d215dec49 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template new file mode 100644 index 00000000000..c1f6ab7ef08 --- /dev/null +++ b/srcpkgs/gnome-builder/template @@ -0,0 +1,18 @@ +# Template file for 'gnome-builder' +pkgname=gnome-builder +version=3.24.1 +revision=1 +build_style=gnu-configure +configure_args="--disable-schemas-compile" +hostmakedepends="pkg-config intltool itstool gnome-doc-utils appdata-tools + glib-devel desktop-file-utils mm-common vala llvm gobject-introspection + gspell-devel" +makedepends="gtk+3-devel gtksourceview-devel json-glib-devel libpeas-devel + libsoup-devel libgit2-glib-devel clang" +depends="desktop-file-utils" +short_desc="IDE for GNOME" +maintainer="Enno Boland " +homepage="https://wiki.gnome.org/Apps/Builder" +license="GPL-2" +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=d0630dceeaf09285640ecec79545baf811321636a441824a9243e7f3a4467583 diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template index bc6cf1c0ab1..5f3d8f311d0 100644 --- a/srcpkgs/gnome-calculator/template +++ b/srcpkgs/gnome-calculator/template @@ -1,16 +1,16 @@ # Template file for 'gnome-calculator' pkgname=gnome-calculator -version=3.22.3 +version=3.24.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool glib-devel gnome-doc-utils" makedepends=" libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel - gtksourceview-devel mpfr-devel libsoup-devel" + gtksourceview-devel mpfr-devel libsoup-devel libmpc-devel" depends="gsettings-desktop-schemas>=3.12 hicolor-icon-theme desktop-file-utils" short_desc="The GNOME calculator" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=8dba14b449a6a141aaf86b2ce8d8722bd03b3c398892ba583127d2a2995e52ca +checksum=44758ac719edd20067381073de3c643f842308f26da039412b1978a415202d10 diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template new file mode 100644 index 00000000000..2d7a1a5e041 --- /dev/null +++ b/srcpkgs/gnome-calendar/template @@ -0,0 +1,20 @@ +# Template file for 'gnome-calendar' +pkgname=gnome-calendar +version=3.24.1 +revision=1 +build_style=gnu-configure +configure_args="--disable-schemas-compile" +hostmakedepends="pkg-config intltool itstool glib-devel $(vopt_if gir gobject-introspection)" +makedepends="gtk+3-devel gnome-online-accounts-devel evolution-data-server-devel + libical-devel libpeas-devel gsettings-desktop-schemas-devel" +short_desc="Calendar application designed to perfectly fit the GNOME desktop" +maintainer="Enno Boland " +license="GPL-2" +homepage="https://wiki.gnome.org/Apps/Calendar" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=139d00fa0fa13a4fea4263527a22e5ccebd79b08d1f8d56fe01fc0f6059b0f67 + +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gir" +fi diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template index 0238e64b501..30942ce5648 100644 --- a/srcpkgs/gnome-chess/template +++ b/srcpkgs/gnome-chess/template @@ -1,6 +1,6 @@ # Template file for 'gnome-chess' pkgname=gnome-chess -version=3.22.2 +version=3.24.1 revision=1 build_style=gnu-configure hostmakedepends="gnuchess glib intltool itstool pkg-config" @@ -11,4 +11,4 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Chess" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=dffdf7f5c5f4ea6bba7ff88b457a75ee5e4c5d9d522d27e1ea4a3d4bb3927792 +checksum=6c9647beb7579b0a8de4e73698d931b1d9ac2efab4e7d3649f482d2c68ebf8a3 diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index a75fedfc842..24bdf488dd7 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -1,6 +1,6 @@ # Template file for 'gnome-clocks' pkgname=gnome-clocks -version=3.22.1 +version=3.24.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool glib $(vopt_if gir gobject-introspection)" @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="https://live.gnome.org/GnomeClocks" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bee05dd8e7b7c79a3ff6d8505c0ecc3bae16002128ec0e2065dd25aa5e5416af +checksum=9d5ae0e972ad92d0a0873af9e0f9b00b8378b3cd50b7830e6fb9a227c6107f36 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-color-manager/template b/srcpkgs/gnome-color-manager/template index 214b9be8bf2..095e52ae259 100644 --- a/srcpkgs/gnome-color-manager/template +++ b/srcpkgs/gnome-color-manager/template @@ -1,6 +1,6 @@ # Template file for 'gnome-color-manager' pkgname=gnome-color-manager -version=3.18.0 +version=3.24.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-packagekit --enable-exiv" @@ -14,4 +14,4 @@ maintainer="Juan RP " homepage="http://projects.gnome.org/gnome-color-manager/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=83d06f3b76b89b6c56bd6e4f792e15c67b561682fa9d59b60cbf716f6130a435 +checksum=a1009e6287d97b8d1fdd6e44a4c8668bcf05f1bb7f2186243318e54c6d061dd2 diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 7a1c0a9f912..58dc206548f 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,6 +1,6 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=3.22.1 +version=3.24.1 revision=1 build_style=gnu-configure configure_args="--disable-static --with-cheese" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=5d69295bc43176392d65b3bdbe60eb85cdcac95b1ef76b86933f3ba9cf48091a +checksum=30cc8e19fdddf4bde7607fa3897bbba837659e1df9db0de8741723053889a53c hostmakedepends="pkg-config intltool glib-devel gnome-doc-utils gobject-introspection" makedepends=" diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index d00684cdd79..bf5017598f5 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,9 +1,9 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=3.22.2 +version=3.24.1 revision=1 build_style=gnu-configure -configure_args="--with-gnome-distributor=void" +configure_args="--with-gnome-distributor=VoidLinux" hostmakedepends="pkg-config intltool itstool gnome-doc-utils $(vopt_if gir gobject-introspection)" makedepends="libxkbfile-devel gtk+3-devel gsettings-desktop-schemas-devel xkeyboard-config iso-codes" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=51d7ebf7a6c359be14c3dd7a022213e931484653815eb10b0131bef4c8979e1c +checksum=de09b7d38b4baccae48c527778480731cb12f00848758be186971b2b4acc45ab build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template index e22086455d1..1abdfd02374 100644 --- a/srcpkgs/gnome-dictionary/template +++ b/srcpkgs/gnome-dictionary/template @@ -1,6 +1,6 @@ # Template file for 'gnome-dictionary' pkgname=gnome-dictionary -version=3.18.1 +version=3.24.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-scrollkeeper" @@ -10,10 +10,10 @@ depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14" replaces="gnome-utils>=3.0" short_desc="Look up words in dictionary sources" maintainer="Juan RP " -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Apps/Dictionary" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=92cf2d519335b125018468c22405499fdb320e4446201c7b0f55f1a441bf05cc +checksum=41e7064a0cfab18e881a95ce9f1712ee5c9f426904b16f3bc04c35ebd1bbd9f2 post_install() { # Remove -devel stuff. diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index 65d5aa759d0..ceaa35f4dde 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,11 +1,11 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility -version=3.18.3.1 -revision=2 +version=3.24.0 +revision=1 lib32disabled=yes build_style=gnu-configure configure_args="--disable-static --enable-compile-warnings=no $(vopt_enable gir introspection) - --disable-libsystemd-login" + --disable-libsystemd" hostmakedepends="pkg-config intltool gnome-doc-utils glib-devel $(vopt_if gir gobject-introspection)" makedepends="liblzma-devel gtk+3-devel libcanberra-devel udisks2-devel @@ -16,8 +16,8 @@ short_desc="GNOME libraries and applications for dealing with storage devices" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/${version%.*.*}/$pkgname-$version.tar.xz" -checksum=652e6332bcf987b15621ebcefc2c14f360b21b7295f94fded6ecfc40c45ae4e8 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=c5f8b1d8aad3136353e4ad4f33c7635bcb563b1adce59d3338202e260a7f3cf3 # Package build options build_options="gir" diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template index f2e05387994..d2d654d2b01 100644 --- a/srcpkgs/gnome-documents/template +++ b/srcpkgs/gnome-documents/template @@ -1,6 +1,6 @@ # Template file for 'gnome-documents' pkgname=gnome-documents -version=3.22.0 +version=3.24.1 revision=1 lib32disabled=yes build_style=gnu-configure @@ -10,13 +10,13 @@ makedepends=" gnome-online-accounts-devel libgdata-devel tracker-devel evince-devel gjs-devel libsoup-gnome-devel vala-devel webkit2gtk-devel librsvg-devel libgepub-devel" -depends="desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme libgepub" short_desc="Documents Manager for GNOME" maintainer="Juan RP " -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Apps/Documents" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=edf5cd6b7b7f5847217b60885358030598e551010087d2a9d1765ae6777041ad +checksum=a34d1366a7fa86458ca8a9fb76adcbb6ad0f609fa2458adab60b066f1b03c57e build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template index 7bedb8abe5c..7f066923340 100644 --- a/srcpkgs/gnome-getting-started-docs/template +++ b/srcpkgs/gnome-getting-started-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-gettings-stated-docs' pkgname=gnome-getting-started-docs -version=3.22.0 +version=3.24.0 revision=1 noarch="yes" build_style=gnu-configure @@ -10,4 +10,4 @@ short_desc="Getting Started documentation for GNOME" maintainer="Juan RP " license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=22b11fb4f6fd9f6d595dc01d5989fb1652c9a63732a4d1c997f3f5f82da75722 +checksum=07d2461602e78f8747826a1592f72f072df620d5abc28470f7e5eeaaa5bca099 diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index abfb0f4ae34..c3d03df7012 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,6 +1,6 @@ # Template file for 'gnome-initial-setup'. pkgname=gnome-initial-setup -version=3.22.1 +version=3.24.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)" @@ -15,7 +15,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=56a663d84ab16854afbdd5ea852f0b76bb5e30829f14f3a224ea130c14825468 +checksum=c66fadfb5ec8febaecbd81d6bf976cbf9557e9f65efd4d8e59ef712700bae554 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 42183ff41e3..85948c5c6d4 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,6 +1,6 @@ # Template file for 'gnome-maps' pkgname=gnome-maps -version=3.22.2 +version=3.24.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)" @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://live.gnome.org/Design/Apps/Maps" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=1cc5c3a82fbb47435925c6268df220c0a788c9f6aa9054ae019e61c992d93948 +checksum=eec390d56410d9cda9b1aed85016bbe24f5eaf7e1e0db7c45d5716c2112a4a0d build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-mines/template b/srcpkgs/gnome-mines/template index 410d30893b6..d85488fe5e9 100644 --- a/srcpkgs/gnome-mines/template +++ b/srcpkgs/gnome-mines/template @@ -1,6 +1,6 @@ # Template file for 'gnome-mines' pkgname=gnome-mines -version=3.22.2 +version=3.24.0 revision=1 build_style=gnu-configure hostmakedepends="glib intltool itstool pkg-config" @@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Mines" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ea7b5b4b0827b5a9b50d22d1a4f48d3ef53de66e31d381afa9848858a4052af2 +checksum=e663af29235a5c3f03d90f135487f57e5fd9137480dafb0ae9efc0da855602f6 diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template index 5b0421ae6bb..60256ee4974 100644 --- a/srcpkgs/gnome-mplayer/template +++ b/srcpkgs/gnome-mplayer/template @@ -1,7 +1,7 @@ # Template file for 'gnome-mplayer' pkgname=gnome-mplayer version=1.0.9 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-schemas-install" hostmakedepends="pkg-config intltool glib-devel" @@ -14,7 +14,6 @@ depends="mplayer desktop-file-utils hicolor-icon-theme" short_desc="A simple MPlayer GUI for GNOME" maintainer="Juan RP " license="GPL-2" -homepage="http://gnome-mplayer.googlecode.com/" -#distfiles="https://gnome-mplayer.googlecode.com/svn/packages/gnome-mplayer-${version}.tar.gz" -distfiles="https://launchpad.net/ubuntu/+archive/primary/+files/gnome-mplayer_${version}.orig.tar.gz" -checksum=e43ca4929e7dc591256a16a793c7cce2678e07e948ee8ef11ed46cce2b3d81db +homepage="https://github.com/kdekorte/gnome-mplayer" +distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz" +checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template index 5ec37d1d869..6adde7c067e 100644 --- a/srcpkgs/gnome-music/template +++ b/srcpkgs/gnome-music/template @@ -1,22 +1,22 @@ # Template file for 'gnome-music' pkgname=gnome-music -version=3.22.2 +version=3.24.1.1 revision=1 lib32disabled=yes build_style=gnu-configure pycompile_module="gnomemusic" hostmakedepends="pkg-config intltool itstool glib-devel $(vopt_if gir gobject-introspection)" makedepends="python3-devel python-gobject-devel python3-dbus - grilo-devel gnome-desktop-devel libmediaart2-devel tracker-devel" -depends="python3-gobject python3-dbus desktop-file-utils" + grilo-devel gnome-desktop-devel libmediaart-devel tracker-devel" +depends="python3-gobject python3-dbus desktop-file-utils python3-requests" short_desc="GNOME music playing application" maintainer="Juan RP " -homepage="http://live.gnome.org/Apps/Music" +homepage="https://wiki.gnome.org/Apps/Music" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=88dc8b6a1d68f07d690ba22d251ac21ba32e7ed948aa3e9f68e9bdc6dfe9674a +distfiles="${GNOME_SITE}/$pkgname/${version%.*.*}/$pkgname-$version.tar.xz" +checksum=8d3dfd5862553f9cb7fa2514afd6b1812f56e4bba58a14f93579de045d318616 build_options="gir" if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" gir" + build_options_default="gir" fi diff --git a/srcpkgs/gnome-nibbles/template b/srcpkgs/gnome-nibbles/template index 68480ba12c2..014f3c13b01 100644 --- a/srcpkgs/gnome-nibbles/template +++ b/srcpkgs/gnome-nibbles/template @@ -1,6 +1,6 @@ # Template file for 'gnome-nibbles' pkgname=gnome-nibbles -version=3.22.2.2 +version=3.24.0 revision=1 build_style=gnu-configure hostmakedepends="glib intltool itstool pkg-config glib-devel" @@ -9,5 +9,5 @@ short_desc="GNOME snake eats diamonds game" maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Nibbles" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" -checksum=881d5ff7e10dbe7c4b27fa11a43dbf532233ce021fc5d3b1455645a2807f459c +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index 6fb1d1b1497..e1cb18290fe 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,6 +1,6 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts -version=3.22.4 +version=3.24.0 revision=1 build_style=gnu-configure configure_args="$(vopt_enable gir introspection) @@ -8,7 +8,7 @@ configure_args="$(vopt_enable gir introspection) --enable-facebook --disable-static --enable-exchange --enable-imap-smtp --enable-owncloud --enable-windows-live --disable-twitter --enable-yahoo" hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel - gobject-introspection gnome-common gettext-devel libtool" + gobject-introspection gnome-common gettext-devel libtool vala-devel" makedepends="libsoup-gnome-devel webkit2gtk-devel json-glib-devel libnotify-devel rest-devel gcr-devel libsecret-devel mit-krb5-devel dbus-glib-devel telepathy-glib-devel" depends="hicolor-icon-theme" @@ -17,7 +17,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=5415d6dd7babf1371f79ba4f6c031003c7d991aaaa784d58f42fd9b4792b09b9 +checksum=9e2f780e061641dfd692cc82269b0cac6cce73c74ce2d8a0a5e80889ed07c17b build_options="gir" if [ -z "$CROSS_BUILD" ]; then @@ -43,6 +43,7 @@ gnome-online-accounts-devel_package() { vmove "usr/lib/*.so" vmove usr/lib/goa-1.0 if [ -n "$build_option_gir" ]; then + vmove usr/share/vala vmove usr/share/gir-1.0 fi } diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template index fd32a6198f2..c00b986bf5c 100644 --- a/srcpkgs/gnome-online-miners/template +++ b/srcpkgs/gnome-online-miners/template @@ -5,9 +5,10 @@ revision=1 lib32disabled=yes build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="pkg-config intltool libxslt docbook-xsl $(vopt_if gir gobject-introspection)" +hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel + $(vopt_if gir gobject-introspection)" makedepends="libzapojit-devel libgdata-devel grilo-devel - tracker-devel gfbgraph-devel libmediaart-devel gnome-online-accounts-devel" + tracker-devel gfbgraph-devel gnome-online-accounts-devel" depends="libzapojit>=0.0.3_3" short_desc="GNOME service that crawls through your online content" maintainer="Juan RP " @@ -18,5 +19,5 @@ checksum=bf51666866527b236d980fa3a0d036581a85987c59d604566ccb3ad685dd8bb8 build_options="gir" if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" gir" + build_options_default="gir" fi diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template index 74ed5cf1588..03603686acd 100644 --- a/srcpkgs/gnome-photos/template +++ b/srcpkgs/gnome-photos/template @@ -1,6 +1,6 @@ # Template file for 'gnome-photos' pkgname=gnome-photos -version=3.22.4 +version=3.24.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -8,14 +8,16 @@ hostmakedepends="pkg-config intltool itstool gnome-doc-utils $(vopt_if gir gobje makedepends=" gtk+3-devel babl-devel gegl3-devel exempi-devel lcms2-devel gfbgraph-devel tracker-devel libexif-devel librsvg-devel grilo-devel libgexiv2-devel - gnome-online-accounts-devel gnome-desktop-devel libgdata-devel" + gnome-online-accounts-devel gnome-desktop-devel libgdata-devel + geocode-glib-devel" depends="desktop-file-utils" short_desc="Access, organize, and share your photos on GNOME" maintainer="Juan RP " -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Apps/Photos" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=583aaec1c43493bd2bb3846dd29e34adde102cc9825f402d4a07cc04e572528d +checksum=5937dd44feb370c772f9f710da21a5a24e52c9e49d789db1ec86bda6f631482b +nocross="https://s3.amazonaws.com/archive.travis-ci.org/jobs/219873990/log.txt" build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-power-manager/template b/srcpkgs/gnome-power-manager/template index 7c25f4689c7..f6fc679cd29 100644 --- a/srcpkgs/gnome-power-manager/template +++ b/srcpkgs/gnome-power-manager/template @@ -1,6 +1,6 @@ # Template file for 'gnome-power-manager' pkgname=gnome-power-manager -version=3.22.2 +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/projects/gnome-power-manager/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=4f02d101d768fc4da52b7a294b233f7e4e1fbc09515d144bf2040bab9e0724e0 +checksum=135ec3cd01f02e9cc006a2944cb8bd53382b01bb39c871131ee706417c9f0ab7 diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template new file mode 100644 index 00000000000..6d20ddd4125 --- /dev/null +++ b/srcpkgs/gnome-recipes/template @@ -0,0 +1,34 @@ +# Template file for 'gnome-recipes' +pkgname=gnome-recipes +version=1.2.0 +revision=1 +_libgd_hash=97a852cdf3d37776f9c98f730d7dcbbe995bdeb7 +hostmakedepends="glib intltool itstool pkg-config meson git" +makedepends="gtk+3-devel gnome-autoar-devel gspell-devel libcanberra-devel + libsoup-devel" +short_desc="GNOME puzzle game where you locate mines in the ocean" +maintainer="Enno Boland " +license="GPL-2" +homepage="https://wiki.gnome.org/Apps/Recipes" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz + https://github.com/GNOME/libgd/archive/$_libgd_hash.tar.gz" +checksum="ef9f12de50b6a4cbb9da5fe9300128b9cb4b57b490ba432ce0acefa70150c353 + 02c9ec9192a0f732390292a21f4d123b7595957301608288125ae79451cf4b40" +nocross=https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/2155/steps/shell_3/logs/stdio + +do_configure() { + # meson_post_install.py updates icon cache, desktop database etc. + # nothing that we need. It fails in this setup, so make it a nop + ln -sf /bin/true meson_post_install.py + rm -r subprojects/libgd + ln -sr ../libgd-$_libgd_hash subprojects/libgd + meson --prefix=/usr --buildtype=plain build +} + +do_build() { + ninja -C build +} + +do_install() { + DESTDIR="$DESTDIR" ninja -C build install +} diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index 21b00bebf5d..da2841db2ca 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,6 +1,6 @@ # Template file for 'gnome-session' pkgname=gnome-session -version=3.22.2 +version=3.24.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -15,7 +15,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2, LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=361a31edb4f8c6d410f1029eee089422e25a2da6c287ead40fccdea5bda450f5 +checksum=3b4449238e396b95f9616dfd6f99d8345afaf30c7e3cb6a3549f253d9f966eee pre_configure() { sed -i "s/^#ifdef HAVE_SYSTEMD/#if 0/" \ diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index 201d17a61da..c79bd9a4157 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,6 +1,6 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=3.22.1 +version=3.24.1 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --enable-cups" @@ -10,14 +10,15 @@ makedepends="colord-devel libxklavier-devel startup-notification-devel gnome-desktop-devel libgnomekbd-devel xf86-input-wacom-devel libwacom-devel librsvg-devel ibus-devel cups-devel libgudev-devel upower-devel polkit-devel - libgweather-devel geoclue2-devel NetworkManager-devel" + libgweather-devel geoclue2-devel NetworkManager-devel + gsettings-desktop-schemas-devel" depends="pulseaudio hicolor-icon-theme $(vopt_if systemd upower)" short_desc="GNOME settings daemon" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-3" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=b57d97cdd992263baffa78ccecbbf9f5a9771dd994f19687353d6eec4fd636ba +checksum=1b14ddc63e4cee616b73d048112878f6f4ac606f877778db882d270db904750b pre_configure() { # XXX workaround wrong paths for build diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 58f9e3825ad..31944384609 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=3.22.2 +version=3.24.1 revision=1 noarch="yes" build_style=gnu-configure @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://live.gnome.org/GnomeShell/Extensions" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=df7c22c69e29162bc1a7018b25b9a2fc37546451746b8b3c5109e5ac92238a87 +checksum=f8008064e732f1b29d8343c43b2b5ca029411af33e47b32a4daed2cae5b9aa60 diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 320c9cb8d22..7469ddafab3 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=3.22.3 +version=3.24.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-systemd" @@ -13,7 +13,7 @@ makedepends=" gjs-devel telepathy-logger-devel libcanberra-devel polkit-devel libcroco-devel pulseaudio-devel libgudev-devel gst-plugins-base1-devel caribou-devel gir-freedesktop gnome-control-center-devel - folks-devel gnome-menus-devel" + folks-devel gnome-menus-devel mozjs38-devel" depends="caribou>=0.4.12 pulseaudio glxinfo desktop-file-utils gir-freedesktop gnome-control-center>=3.16 elogind upower" short_desc="GNOME core user interface" @@ -21,7 +21,7 @@ maintainer="Juan RP " homepage="http://live.gnome.org/GnomeShell" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=d1e6bd80ddd1fef92d80b518d4dbeffa296e8f003402551b8c37c42744b7d42f +checksum=53f93d64307a3c74dd9854a311a82d9ea9671dd424560f5a6f61dbf9474f423f build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template index b0f849cefb2..ad5228ae2a1 100644 --- a/srcpkgs/gnome-sound-recorder/template +++ b/srcpkgs/gnome-sound-recorder/template @@ -1,19 +1,20 @@ # Template file for 'gnome-sound-recorder' pkgname=gnome-sound-recorder -version=3.20.2 +version=3.24.0.1 revision=1 lib32disabled=yes build_style=gnu-configure configure_args="--disable-schemas-compile" -hostmakedepends="pkg-config intltool itstool glib-devel $(vopt_if gir gobject-introspection)" +hostmakedepends="pkg-config intltool itstool glib-devel $(vopt_if gir gobject-introspection) + gstreamer1-devel gst-plugins-good1 gst-plugins-bad1-devel" makedepends="gtk+3-devel gsettings-desktop-schemas-devel gjs-devel gst-plugins-base1" depends="desktop-file-utils gjs>=1.40 gsettings-desktop-schemas>=3.14 gst-plugins-base1" short_desc="GNOME sound recorder application" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=25b2b452cb59851205164426a942121964f0bf49091c3789fb6bce9b9c6de3f2 +distfiles="${GNOME_SITE}/$pkgname/${version%.*.*}/$pkgname-$version.tar.xz" +checksum=b8c6953c2eaf13c7d9c6c4e5a5c6ecfa87a160aa7bba0e40dbf7263afce54600 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template index fefa4c31fa0..5559f73d344 100644 --- a/srcpkgs/gnome-sudoku/template +++ b/srcpkgs/gnome-sudoku/template @@ -1,6 +1,6 @@ # Template file for 'gnome-sudoku' pkgname=gnome-sudoku -version=3.22.2 +version=3.24.0 revision=1 build_style=gnu-configure hostmakedepends="glib intltool itstool pkg-config" @@ -10,4 +10,5 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Sudoku" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=08c48ba0ce3497727e5e19b086d28258e4bab61834c2f7e23fce256685a5e2eb +checksum=04a29447889448ee5d5840cb5b2fd05ce6031c38a24809ce4919647ee6f485d7 +nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/1883/steps/shell_3/logs/stdio" diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template index 8dc9dbd60f7..3fc6bd3333a 100644 --- a/srcpkgs/gnome-system-monitor/template +++ b/srcpkgs/gnome-system-monitor/template @@ -1,14 +1,14 @@ # Template file for 'gnome-system-monitor' pkgname=gnome-system-monitor -version=3.22.2 +version=3.24.0 revision=1 build_style=gnu-configure -configure_args="--disable-schemas-compile --enable-wnck --disable-systemd" +configure_args="--disable-schemas-compile --disable-systemd" hostmakedepends="which pkg-config intltool itstool glib-devel gnome-doc-utils" -makedepends="libwnck-devel gtkmm-devel librsvg-devel libgtop-devel" +makedepends="gtkmm-devel librsvg-devel libgtop-devel" short_desc="Process viewer and system resource monitor for GNOME" maintainer="Juan RP " -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Apps/SystemMonitor" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=68a5b097157a6e445fc2467cbaecfede77d00b774c93e8aa69b6f784055dc982 +checksum=c32b45062411aaef06681e5e28fd2c24ea8b362168bae83992944ec8e02063f4 diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index bce286cc450..171c9cd2d9c 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,6 +1,6 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.22.1 +version=3.24.1 revision=1 lib32disabled=yes build_style=gnu-configure @@ -16,4 +16,4 @@ maintainer="Juan RP " homepage="https://wiki.gnome.org/Apps/Terminal" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=b00752336eb22d6d9f10c863c166ac73dcbb2ce4b280abdc0c78337e261bb0d4 +checksum=a7bf26e6fcc335ca7b8fb94e13262f44357961c0f38ca3f2e0066426e91a60e0 diff --git a/srcpkgs/gnome-themes-standard/template b/srcpkgs/gnome-themes-standard/template index d4adc291fd3..7e741b01d26 100644 --- a/srcpkgs/gnome-themes-standard/template +++ b/srcpkgs/gnome-themes-standard/template @@ -1,6 +1,6 @@ # Template build file for 'gnome-themes-standard'. pkgname=gnome-themes-standard -version=3.22.2 +version=3.22.3 revision=1 lib32disabled=yes build_style=gnu-configure @@ -12,4 +12,4 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=b34516cd59b873c187c1897c25bac3b9ce2d30a472f1fd7ae9d7105d93e17da5 +checksum=61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template new file mode 100644 index 00000000000..193e70ccbcf --- /dev/null +++ b/srcpkgs/gnome-todo/template @@ -0,0 +1,21 @@ +# Template file for 'gnome-todo' +pkgname=gnome-todo +version=3.24.0.1 +revision=1 +build_style=gnu-configure +configure_args="--disable-schemas-compile" +hostmakedepends="pkg-config intltool itstool glib-devel $(vopt_if gir gobject-introspection)" +makedepends="gtk+3-devel gnome-online-accounts-devel evolution-data-server-devel + libical-devel libpeas-devel" +short_desc="Task manager designed to perfectly fit the GNOME desktop" +maintainer="Enno Boland " +license="GPL-2" +homepage="https://wiki.gnome.org/Apps/Todo" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" +checksum=65311020613322c03b05dc6e7fac32c7d5ee3529f1a76ba2533a2fb998ed35cb +LDFLAGS="-ledataserver-1.2 -lgoa-1.0 -ledataserverui-1.2" + +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gir" +fi diff --git a/srcpkgs/gnome-tweak-tool/template b/srcpkgs/gnome-tweak-tool/template index 345ac327df8..27fbdb7e20a 100644 --- a/srcpkgs/gnome-tweak-tool/template +++ b/srcpkgs/gnome-tweak-tool/template @@ -1,6 +1,6 @@ # Template file for 'gnome-tweak-tool' pkgname=gnome-tweak-tool -version=3.22.0 +version=3.24.0 revision=1 noarch=yes nocross=yes @@ -14,4 +14,4 @@ maintainer="Juan RP " license="GPL-2" homepage="http://live.gnome.org/GnomeTweakTool" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3d6ae11e13f6169ee543e573135e1e5697cf92ab8d86570c6f952021ae093abb +checksum=930b248e40db4c10991978f28b46207d6d11aa938b67b36abc68dbc7d37f1e00 diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template index d2e8f2ad471..b509a49e0dd 100644 --- a/srcpkgs/gnome-user-docs/template +++ b/srcpkgs/gnome-user-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-user-docs' pkgname=gnome-user-docs -version=3.22.0 +version=3.24.0 revision=1 noarch="yes" build_style=gnu-configure @@ -12,4 +12,4 @@ short_desc="User documentation for GNOME" maintainer="Juan RP " license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=7467825a1c56ae2522fe9e36622a84b8887c731bb5f24cecfbf49acc66f6e3fc +checksum=a7fc31b9d7156ef8d617c30641025644fedecf6c8934eaa1468d9a349056379b diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template index e40eae1f96b..24f811f9f93 100644 --- a/srcpkgs/gnome-weather/template +++ b/srcpkgs/gnome-weather/template @@ -1,6 +1,6 @@ # Template file for 'gnome-weather' pkgname=gnome-weather -version=3.20.2 +version=3.24.0 revision=1 lib32disabled=yes build_style=gnu-configure @@ -11,10 +11,10 @@ makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel" depends="desktop-file-utils" short_desc="Access current weather conditions and forecasts for GNOME" maintainer="Juan RP " -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Apps/Weather" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=7823ca7c08fa852232b98c2517830e3bd9b0ab80c9ac83f182c18ec140a5c18b +checksum=e36847884670e59a71ac70ed982fc8f2fb70f1766c3a24f10a0cd38c9b66d574 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index b6bec3bd511..a49dff69196 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,67 +1,67 @@ # Template file for 'gnome' pkgname=gnome -version=3.22.0 -revision=1 +version=3.24.0 +revision=2 build_style=meta depends=" baobab>=${version} - bijiben>=3.20.2 - brasero>=3.12.0 - cantarell-fonts>=0.0.16 + bijiben>=3.21.2 + brasero>=3.12.1 + cantarell-fonts>=0.0.25 cheese>=${version} - empathy>=3.12.10 - eog>=3.16.0 + empathy>=3.12.13 + eog>=${version} epiphany>=${version} evince>=${version} evolution>=${version} - file-roller>=3.16.0 - gdm>=3.16.0 - gedit>=${version} - glib>=2.46.0 + file-roller>=${version} + gdm>=${version} + gedit>=3.22.0 + glib>=2.52.0 gnome-backgrounds>=${version} gnome-bluetooth>=3.20.1 gnome-calculator>=${version} gnome-clocks>=${version} - gnome-color-manager>=3.18.0 - gnome-contacts>=${version} + gnome-color-manager>=${version} + gnome-contacts>=3.22.1 gnome-desktop>=${version} - gnome-dictionary>=3.18.1 - gnome-disk-utility>=3.18.3 - gnome-documents>=3.18.0.0 - gnome-font-viewer>=3.16.0 + gnome-dictionary>=${version} + gnome-disk-utility>=${version} + gnome-documents>=${version} + gnome-font-viewer>=3.22.0 gnome-initial-setup>=${version} gnome-keyring>=3.20.0 gnome-maps>=${version} - gnome-menus>=3.10.0 + gnome-menus>=3.13.3 gnome-music>=${version} - gnome-online-miners>=3.14.0 + gnome-online-miners>=3.22.0 gnome-photos>=${version} - gnome-screenshot>=${version} + gnome-screenshot>=3.22.0 gnome-session>=${version} gnome-settings-daemon>=${version} gnome-shell>=${version} gnome-shell-extensions>=${version} - gnome-sound-recorder>=3.16.0 + gnome-sound-recorder>=${version} gnome-system-monitor>=${version} gnome-terminal>=${version} - gnome-themes-standard>=${version} - gnome-user-docs>=${version} - gnome-weather>=3.20.2 - gtk+3>=${version} - gucharmap>=${version} + gnome-themes-standard>=3.22.0 + gnome-user-docs>=3.22.0 + gnome-weather>=${version} + gtk+3>=3.22.11 + gucharmap>=9.0.3 mousetweaks>=3.12.0 nautilus>=${version} - nautilus-sendto>=3.8.0 - network-manager-applet>=1.0.4 - rygel>=0.28.0 + nautilus-sendto>=3.8.4 + network-manager-applet>=1.4.6 + rygel>=0.34.0 seahorse>=3.20.0 sushi>=3.20.0 totem>=${version} - tracker>=1.6.0 - vinagre>=${version} - vino>=${version} + tracker>=1.12.0 + vinagre>=3.22.0 + vino>=3.22.0 xdg-user-dirs-gtk>=0.10 - yelp>=${version}" + yelp>=3.22.0" short_desc="The GNOME meta-package for Void Linux" maintainer="Juan RP " homepage="http://www.gnome.org" diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template index a15dc8a75ac..e233cf85383 100644 --- a/srcpkgs/gnote/template +++ b/srcpkgs/gnote/template @@ -1,6 +1,6 @@ # Template file for 'gnote' pkgname=gnote -version=3.22.1 +version=3.24.0 revision=1 lib32disabled=yes build_style=gnu-configure @@ -13,4 +13,4 @@ maintainer="Juan RP " license="GPL-3" homepage="http://live.gnome.org/Gnote" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fa9434c2ba11bea73bd63436e5fd76949aca4f66dfd902295629c66ef27cd5eb +checksum=62e38c19ce7dfcd895729adabd72f654f31e03f28dbf4cbca68279e745c79cd4 diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template new file mode 100644 index 00000000000..79e7895af9c --- /dev/null +++ b/srcpkgs/gns3-gui/template @@ -0,0 +1,13 @@ +# Template file for 'gns3-gui' +pkgname=gns3-gui +version=1.5.3 +revision=1 +build_style=python3-module +hostmakedepends="python3 python3-setuptools" +depends="python3 python3-setuptools python3-psutil python3-jsonschema python3-configobj python3-sip python3-PyQt5 python3-PyQt5-svg xterm inetutils-telnet gns3-net-converter" +short_desc="Graphical Network Simulator 3 - GUI" +maintainer="Michael Aldridge " +license="GPL-3" +homepage="https://gns3.com" +distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" +checksum=446fdc87d884fb24f879b8bba862dc43b92b6f859edefcd22f8682bdac61bec4 diff --git a/srcpkgs/gns3-net-converter/template b/srcpkgs/gns3-net-converter/template new file mode 100644 index 00000000000..522732a7a5c --- /dev/null +++ b/srcpkgs/gns3-net-converter/template @@ -0,0 +1,13 @@ +# Template file for 'gns3-net-converter' +pkgname=gns3-net-converter +version=1.3.0 +revision=1 +build_style=python3-module +hostmakedepends="python3 python3-setuptools" +depends="python3" +short_desc="Convert old ini-style GNS3 topologies to the newer version" +maintainer="Michael Aldridge " +license="GPL-3" +homepage="http://gns3-converter.readthedocs.io/en/latest/" +distfiles="${PYPI_SITE}/g/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=0d189874a299af3853e97e88e41f089cad2949251ef0a68c9b217485ccc76ac6 diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template new file mode 100644 index 00000000000..a9886a68115 --- /dev/null +++ b/srcpkgs/gns3-server/template @@ -0,0 +1,21 @@ +# Template file for 'gns3-server' +pkgname=gns3-server +version=1.5.3 +revision=1 +build_style=python3-module +hostmakedepends="python3 python3-setuptools" +depends="python3 python3-zipstream python3-Jinja2 python3-yarl python3-aiohttp-cors raven-python dynamips" +short_desc="Graphical Network Simulator 3 - Server" +maintainer="Michael Aldridge " +license="GPL-3" +homepage="https://gns3.com" +distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" +checksum=2f42dd1bc1304bed04a83ce3e7fe158cc126a1aad4e044d541af0726ed8693fb + +# The source archive contains statically linked artifacts for x86_64 +# glibc, since this is the only architecture supported by upstream, we +# mirror that requirement here. The artifacts in questions are the C +# modules that are used to drive additional virtualization backends +# for gns3. For more information, see this ticket: +# https://github.com/GNS3/gns3-server/issues/970 +only_for_archs="x86_64" diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index 74d642875a0..199a1b84beb 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -1,10 +1,12 @@ # Template file for 'gnucash' pkgname=gnucash -version=2.6.15 +version=2.6.16 revision=1 conf_files=" /etc/gnucash/config /etc/gnucash/environment" +pycompile_module="gnucash" +pycompile_dirs="usr/share/gnucash/python" hostmakedepends="pkg-config intltool guile" makedepends="GConf-devel aqbanking aqbanking-devel gc-devel gmp-devel goffice0.8-devel gtk+-devel guile-devel gwenhywfar-devel gwenhywfar-gtk @@ -18,7 +20,7 @@ license="GPL-3" homepage="http://www.gnucash.org/" short_desc="Financial-accounting software" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=1619eb8263439f547dd12afdc0b05b9a50593d5cd3d3e9ee5b05edaec3b6dbae +checksum=2c556299a6a610fc93dd2ea8d432357e3d43d4630d66d7f888fcf5f4b4ce0881 nocross=yes diff --git a/srcpkgs/gnugo/template b/srcpkgs/gnugo/template new file mode 100644 index 00000000000..290b9d3c68a --- /dev/null +++ b/srcpkgs/gnugo/template @@ -0,0 +1,12 @@ +# Template file for 'gnugo' +pkgname=gnugo +version=3.8 +revision=1 +nocross=yes +build_style=gnu-configure +short_desc="Free program that plays the game Go" +maintainer="Brandon Wilson " +license="GPL-3" +homepage="https://www.gnu.org/software/gnugo/" +distfiles="${GNU_SITE}/gnugo/${pkgname}-${version}.tar.gz" +checksum=da68d7a65f44dcf6ce6e4e630b6f6dd9897249d34425920bfdd4e07ff1866a72 diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template index 59e71a4a55f..524960794fc 100644 --- a/srcpkgs/gnumeric/template +++ b/srcpkgs/gnumeric/template @@ -1,6 +1,6 @@ # Template file for 'gnumeric' pkgname=gnumeric -version=1.12.33 +version=1.12.34 revision=1 build_style=gnu-configure hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config " @@ -10,7 +10,7 @@ maintainer="Duncaen " license="GPL-3" homepage="http://gnumeric.org/" distfiles="${GNOME_SITE}/gnumeric/${version%.*}/gnumeric-${version}.tar.xz" -checksum=7eade408b6c20d2e8ad557d539e5e2f29705845a2eaa181b38934bb0cad49c0b +checksum=0b4920812d82ec4c25204543dff9dd3bdbac17bfaaabd1aa02d47fbe2981c725 if [ "$CROSS_BUILD" ]; then CFLAGS="-I${XBPS_CROSS_BASE}/usr/include" diff --git a/srcpkgs/gnupg2/template b/srcpkgs/gnupg2/template index 4008689aaa7..0d83b6d9082 100644 --- a/srcpkgs/gnupg2/template +++ b/srcpkgs/gnupg2/template @@ -1,10 +1,10 @@ # Template file for 'gnupg2' pkgname=gnupg2 -version=2.1.19 -revision=1 +version=2.1.20 +revision=2 wrksrc="gnupg-${version}" build_style=gnu-configure -configure_args="--sbindir=/usr/bin +configure_args=" --with-libgcrypt-prefix=${XBPS_CROSS_BASE} --with-ksba-prefix=${XBPS_CROSS_BASE} --with-npth-prefix=${XBPS_CROSS_BASE} @@ -20,10 +20,11 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.gnupg.org/" distfiles="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${version}.tar.bz2" -checksum=46cced1f5641ce29cc28250f52fadf6e417e649b3bfdec49a5a0d0b22a639bf0 +checksum=24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d pre_configure() { sed -i '/^CFLAGS_orig=/d;/^CFLAGS=$/d' configure + sed -i '/examples\/systemd-user/d' doc/Makefile.in } post_install() { # remove conflicts with gnupg 1. diff --git a/srcpkgs/gnuplot/template b/srcpkgs/gnuplot/template index 8c2c35d028f..e3913dff256 100644 --- a/srcpkgs/gnuplot/template +++ b/srcpkgs/gnuplot/template @@ -1,7 +1,7 @@ # Template file for 'gnuplot' pkgname=gnuplot -version=5.0.5 -revision=2 +version=5.0.6 +revision=1 configure_args="--with-readline=builtin" hostmakedepends="pkg-config lua52" makedepends="zlib-devel libX11-devel gd-devel lua52-devel" @@ -11,7 +11,7 @@ maintainer="Eivind Uggedal " homepage="http://www.gnuplot.info/" license="gnuplot" distfiles="${SOURCEFORGE_SITE}/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz" -checksum=25f3e0bf192e01115c580f278c3725d7a569eb848786e12b455a3fda70312053 +checksum=5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460 subpackages="gnuplot-common" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template index 0f45ff08457..e5fb6b21076 100644 --- a/srcpkgs/gnutls/template +++ b/srcpkgs/gnutls/template @@ -1,6 +1,6 @@ # Template file for 'gnutls' pkgname=gnutls -version=3.5.10 +version=3.5.11 revision=1 build_style=gnu-configure configure_args="--with-zlib --disable-guile --disable-static @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="https://gnutls.org" license="GPL-3, LGPL-2.1" distfiles="ftp://ftp.gnutls.org/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz" -checksum=af443e86ba538d4d3e37c4732c00101a492fe4b56a55f4112ff0ab39dbe6579d +checksum=51765cc5579e250da77fbd7871507c517d01b15353cc40af7b67e9ec7b6fe28f pre_configure() { autoreconf -fi diff --git a/srcpkgs/go-bindata/template b/srcpkgs/go-bindata/template index 6a926429116..4175ba25c2c 100644 --- a/srcpkgs/go-bindata/template +++ b/srcpkgs/go-bindata/template @@ -1,12 +1,12 @@ # Template file for 'go-bindata' pkgname=go-bindata version=3.0.7.20151023 -revision=3 +revision=4 _commit=a0ff2567cfb70903282db057e799fd826784d41d wrksrc="$pkgname-$_commit" build_style=go short_desc="A small utility which generates Go code from any file" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="Public Domain" go_import_path="github.com/jteeuwen/go-bindata" go_package="${go_import_path}/go-bindata" diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template index ff0f9cc7e29..c7168501f86 100644 --- a/srcpkgs/go-ipfs/template +++ b/srcpkgs/go-ipfs/template @@ -1,7 +1,7 @@ # Template file for 'go-ipfs' pkgname=go-ipfs -version=0.4.6 -revision=1 +version=0.4.8 +revision=2 create_wrksrc=yes build_wrksrc=${pkgname}-${version} build_style=go @@ -14,8 +14,8 @@ license="MIT" homepage="https://ipfs.io" distfiles="https://${go_import_path}/archive/v${version}.tar.gz http://the-brannons.com/ipfs-gx-deps-${version}.tar.xz" -checksum="92d1d2d5e840a083d5051921f1608ab62e5bea0cc2c90229674f5695d417c3b8 - 3e9d6b32cf6b9a61d03865f9628a23b9dda55b03bb4330916a4102ec3fb112dc" +checksum="a5b5556374b30d162e79858f8ead475d7d073a6f862d6fb85afa6148c62541fa + 19ba225a56c7238ea8b304222f623db14f0b6294cd86e4eb23baf43e54d7cb12" do_build() { local path="${GOPATH}/src/${go_import_path}" diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template index 234c73e42f1..ed39874498f 100644 --- a/srcpkgs/go-jira/template +++ b/srcpkgs/go-jira/template @@ -1,17 +1,17 @@ # Template file for 'go-jira' pkgname=go-jira -version=0.1.11 +version=0.1.13 revision=1 build_style=go hostmakedepends="git-perl" short_desc="Simple jira command line client in Go" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="Apache" go_import_path="github.com/Netflix-Skunkworks/go-jira" go_package="$go_import_path/main" homepage="https://$go_import_path" distfiles="$homepage/archive/v$version.tar.gz" -checksum=40287dae1e542426352661e4fbf4f675f339a7d5d60a26a25fa5d6ac3378ea62 +checksum=da80d2f8d2eeea411c191e9767d5b9d3eb87ad7e9710703a07aee75a1cb78824 pre_build() { git config --global http.https://gopkg.in.followRedirects true diff --git a/srcpkgs/go/template b/srcpkgs/go/template index d7ca9a54d45..4a86e6a113f 100644 --- a/srcpkgs/go/template +++ b/srcpkgs/go/template @@ -1,7 +1,7 @@ # Template file for 'go' pkgname=go _bootstrap_version=1.4.2 -version=1.8 +version=1.8.1 revision=1 wrksrc=go hostmakedepends="git ca-certificates" @@ -12,7 +12,7 @@ license="BSD" distfiles="http://golang.org/dl/go${_bootstrap_version}.src.tar.gz http://golang.org/dl/go${version}.src.tar.gz" checksum="299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b - 406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596" + 33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57" nostrip=yes noverifyrdeps=yes @@ -129,6 +129,10 @@ do_install() { # ln -sf /usr/bin ${DESTDIR}/usr/lib/go/bin + # sigh. well, someone fix the template and add + # a symlink, usr/lib/go/misc -> /usr/share/go/misc + ln -sfr ${DESTDIR}/usr/share/go/misc ${DESTDIR}/usr/lib/go/misc + # For godoc vinstall favicon.ico 644 usr/lib/go diff --git a/srcpkgs/goat/template b/srcpkgs/goat/template new file mode 100644 index 00000000000..655150434ac --- /dev/null +++ b/srcpkgs/goat/template @@ -0,0 +1,15 @@ +# Template file for 'goat' +pkgname=goat +version=0.0.0.28022016 +revision=2 +build_style=go +_commit=2184ebe13497ec587e6f48b9381883285fa0071c +hostmakedepends="git" +wrksrc="$pkgname-$_commit" +short_desc="Render ASCII art as SVG diagrams" +maintainer="Andrea Brancaleoni " +license="MIT" +go_import_path="github.com/blampe/goat" +homepage="http://$go_import_path" +distfiles="$homepage/archive/$_commit.tar.gz" +checksum=f87e66db8423a4113be414501091a8cb00f3775fcc5047ca038e6d15f0420244 diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template index d38d412f691..e9fd8c7ccae 100644 --- a/srcpkgs/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -1,6 +1,6 @@ # Template file for 'gobject-introspection' pkgname=gobject-introspection -version=1.50.0 +version=1.52.1 revision=1 build_style=gnu-configure configure_args="--disable-tests --disable-static" @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://live.gnome.org/GObjectInstrospection" license="GPL-2, LGPL-2.1" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5 +checksum=2ed0c38d52fe1aa6fc4def0c868fe481cb87b532fc694756b26d6cfab29faff4 nocross=yes gir-freedesktop_package() { diff --git a/srcpkgs/goffice/template b/srcpkgs/goffice/template index afd634678ff..3e9d441d46d 100644 --- a/srcpkgs/goffice/template +++ b/srcpkgs/goffice/template @@ -1,6 +1,6 @@ # Template file for 'goffice' pkgname=goffice -version=0.10.32 +version=0.10.34 revision=1 hostmakedepends="automake pkg-config pcre gettext-devel intltool libtool glib-devel gtk-doc" makedepends="GConf-devel gtk+3-devel librsvg-devel libgsf-devel libxml2-devel pcre-devel libxslt-devel" @@ -10,7 +10,7 @@ license="GPL-2" short_desc="Document-centric objects and utilities for GLib and Gtk+" homepage="https://github.com/GNOME/goffice" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=02b37da9f54fb92725b973875d1d2da49b54f6486eb03648fd1ea58e4a297ac3 +checksum=554a75a22b5863b3b17595148bee6462122f2dbf031dfa78b61e941e3c2dd603 pre_configure() { autoreconf -if diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template index 1c69ec97c31..4fe5736e34b 100644 --- a/srcpkgs/gogs/template +++ b/srcpkgs/gogs/template @@ -1,7 +1,7 @@ # Template build file for 'gogs' pkgname=gogs version=0.9.113 -revision=3 +revision=4 build_style=go go_import_path="github.com/gogits/gogs" short_desc="Self-hosted Git Service in Go" diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template index eb92045d798..e87c66ccd28 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,5 +1,5 @@ # Template file for 'google-chrome' -_chromeVersion=56.0.2924.87 +_chromeVersion=58.0.3029.81 _chromeRevision=1 _channel=stable @@ -20,7 +20,7 @@ _filename="google-chrome-${_channel}_${_chromeVersion}-${_chromeRevision}_amd64. _chromeUrl="${_baseUrl}/${_filename}" distfiles="${_chromeUrl}" -checksum=7c34adf8f613a0c8dee406535bb77afaa9cbe878639350fde1d4567967d5c4e8 +checksum=baf2e0aa0727635ab086d3912a8974557d2fad8713870ac94f8deeccb292fbdc do_extract() { mkdir -p ${DESTDIR} diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template index 5556525d75e..a20f2a17c93 100644 --- a/srcpkgs/gopass/template +++ b/srcpkgs/gopass/template @@ -1,7 +1,7 @@ # Template file for 'gopass' pkgname=gopass -version=1.0.1 -revision=1 +version=1.0.2 +revision=2 build_style=go go_import_path="github.com/justwatchcom/gopass" depends="gnupg2 git" @@ -10,7 +10,7 @@ maintainer="Dominic Monroe " license="MIT" homepage="https://www.justwatch.com/gopass/" distfiles="https://github.com/justwatchcom/gopass/archive/v${version}.tar.gz" -checksum=729e3545a0582b5ff060c6b292dc11d894ef1cf9e02c4af401af1ed8c378c68c +checksum=aeab11850dd6956e5680150c070fc142f043631738d66f3e3c1bdcbf03682bda post_install() { vlicense LICENSE diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template index 3209445d6c7..221887eee84 100644 --- a/srcpkgs/gopm/template +++ b/srcpkgs/gopm/template @@ -1,7 +1,7 @@ # Template build file for 'gopm' pkgname=gopm version=0.7.2.20150801 -revision=5 +revision=6 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d wrksrc="${pkgname}-${_commit}" build_style=go diff --git a/srcpkgs/gosh/template b/srcpkgs/gosh/template index 3afdcadc8af..ad9b447d2a7 100644 --- a/srcpkgs/gosh/template +++ b/srcpkgs/gosh/template @@ -1,7 +1,7 @@ # Template file for 'gosh' pkgname=gosh version=0.2.3 -revision=3 +revision=4 build_style=go go_import_path="github.com/mkouhei/gosh" short_desc="Interactive shell for Golang" diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template index d9f30102d7d..02b94e5319a 100644 --- a/srcpkgs/gotty/template +++ b/srcpkgs/gotty/template @@ -1,7 +1,7 @@ # Template file for 'gotty' pkgname=gotty version=0.0.13 -revision=3 +revision=4 build_style=go go_import_path="github.com/yudai/gotty" hostmakedepends="git-perl" diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template index 6dbae87f527..0c8d8a752d3 100644 --- a/srcpkgs/gource/template +++ b/srcpkgs/gource/template @@ -1,7 +1,7 @@ # Template file for 'gource' pkgname=gource version=0.44 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF" hostmakedepends="pkg-config" diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template index 8e7344327fd..c3537ed13d9 100644 --- a/srcpkgs/grilo-plugins/template +++ b/srcpkgs/grilo-plugins/template @@ -1,14 +1,14 @@ # Template file for 'grilo-plugins' pkgname=grilo-plugins version=0.3.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --enable-shoutcast --enable-compile-warnings=no" hostmakedepends="pkg-config intltool itstool glib-devel gnome-doc-utils" # XXX missing plugins: fakemetadata. makedepends="grilo-devel gom-devel gupnp-av-devel json-glib-devel libquvi-devel rest-devel sqlite-devel libgcrypt-devel gmime-devel - tracker-devel totem-pl-parser-devel libgdata-devel libmediaart2-devel + tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel gstreamer1-devel libdmapsharing-devel lua-devel gnome-online-accounts-devel avahi-glib-libs-devel" short_desc="Plugins for Grilo" diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template index 36721e5b04f..6a748d11e90 100644 --- a/srcpkgs/grilo/template +++ b/srcpkgs/grilo/template @@ -1,6 +1,6 @@ # Template file for 'grilo' pkgname=grilo -version=0.3.2 +version=0.3.3 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-vala $(vopt_enable gir introspection)" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://live.gnome.org/Grilo" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=f26f684a5d76aea8dbce136750bc67d2170b36575f109292fbb78ae99ec87f5b +checksum=5c874222c7bdf42490cd56765a593c41407247706bb1f24a1bd5d007aa38a0e3 # Package build options build_options="gir" diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template index 0e910cb5741..998a3e84d1b 100644 --- a/srcpkgs/grive2/template +++ b/srcpkgs/grive2/template @@ -1,7 +1,7 @@ # Template file for 'grive' pkgname=grive2 version=0.5.0 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel" diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index 1017832b2a6..eb69690769b 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -1,7 +1,7 @@ # Template file for 'grub' pkgname=grub -version=2.02~rc1 -revision=1 +version=2.02~rc2 +revision=3 hostmakedepends="flex" makedepends="libusb-compat-devel ncurses-devel freetype-devel liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/grub/" distfiles="http://alpha.gnu.org/gnu/grub/grub-${version}.tar.xz" -checksum=445239e9b96d1143c194c1d37851cf4196b83701c60172e49665e9d453d80278 +checksum=053bfcbe366733e4f5a1baf4eb15e1efd977225bdd323b78087ce5fa172fc246 only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template index a72c7ea3634..228b13249a0 100644 --- a/srcpkgs/gscan2pdf/template +++ b/srcpkgs/gscan2pdf/template @@ -1,7 +1,7 @@ # Template file for 'gscan2pdf' pkgname=gscan2pdf -version=1.4.0 -revision=2 +version=1.7.3 +revision=1 build_style=perl-module maintainer="Orphaned " hostmakedepends="perl" @@ -11,10 +11,10 @@ depends="perl ImageMagick perl-Try-Tiny libmagick-perl perl-Gtk2 perl-Readonly perl-Sane perl-Goo-Canvas perl-HTML-Parser perl-Proc-ProcessTable perl-Set-IntSpan perl-Gtk2-Ex-Simple-List perl-Exporter-Tiny perl-Gtk2-ImageView perl-Log-Log4perl perl-Filesys-Df djvulibre unpaper perl-Font-TTF perl-IO-String - perl-Data-UUID xdg-utils perl-Locale-gettext" + perl-Data-UUID xdg-utils perl-Locale-gettext perl-Date-Calc" license="GPL-3" homepage="http://gscan2pdf.sourceforge.net/" short_desc="A GUI to produce PDFs or DjVus from scanned documents" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=c98b77a05d9dccf49208fae6fa2a4123f1c027a07fa70072904e894fb015a802 +checksum=d8264bdae812a7629c763441223dd90fe932045b351f1ab01f3da39e52a40ffd nocross=yes diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template index 4e403d634f7..785b094a7e7 100644 --- a/srcpkgs/gsettings-desktop-schemas/template +++ b/srcpkgs/gsettings-desktop-schemas/template @@ -1,6 +1,6 @@ # Template file for 'gsettings-desktop-schemas' pkgname=gsettings-desktop-schemas -version=3.22.0 +version=3.24.0 revision=1 build_style=gnu-configure configure_args="$(vopt_enable gir introspection)" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=0f06c7ba34c3a99e4d58b10889496133c9aaad6698ea2d8405d481c7f1a7eae1 +checksum=f6573a3f661d22ff8a001cc2421d8647717f1c0e697e342d03c6102f29bbbb90 # Package build options build_options="gir" diff --git a/srcpkgs/gsl-ucg/patches/detect_gcc_better.patch b/srcpkgs/gsl-ucg/patches/detect_gcc_better.patch new file mode 100644 index 00000000000..e482c0e59ca --- /dev/null +++ b/srcpkgs/gsl-ucg/patches/detect_gcc_better.patch @@ -0,0 +1,11 @@ +--- src/c.fix 2017-02-10 21:50:13.882583271 -0500 ++++ src/c 2017-02-10 21:55:55.064681445 -0500 +@@ -154,7 +154,7 @@ + # + # Generic modern GCC system + # +-if [ "$CCNAME" = "gcc" ]; then ++if [ "$(${CCNAME} --version | grep -c \(GCC\))" -gt 0 ]; then + [ -z "$BOOM_MODEL_NOOPT" ] && CCDEBUG="-O2" + [ -z "$BOOM_MODEL_NOOPT" ] && CCNODEBUG="$CCNODEBUG -O2" + CCOPTS="-D_REENTRANT -D_GNU_SOURCE -Wall -Wno-unused -fno-strict-aliasing" diff --git a/srcpkgs/gsl-ucg/template b/srcpkgs/gsl-ucg/template new file mode 100644 index 00000000000..2646e84a89a --- /dev/null +++ b/srcpkgs/gsl-ucg/template @@ -0,0 +1,23 @@ +# Template file for 'gsl-ucg' +pkgname=gsl-ucg +version=4.1.3 +revision=1 +wrksrc="gsl-${version}" +build_wrksrc="src" +build_style=gnu-makefile +makedepends="pcre-devel" +short_desc="Generator Scripting Language - Universal Code Generator" +maintainer="Toyam Cox " +license="GPL-3" +homepage="https://github.com/imatix/gsl" +distfiles="https://github.com/imatix/gsl/archive/v${version}.tar.gz" +checksum=7e6e503997d576751e7c06dd3dd2b31b7e1d0ee5929512c997746ef70c6ed111 +nocross="Tries to execute built binary to confirm it works" + +pre_build() { + export CC="CCNAME='$CC' ./c -q" +} + +pre_install() { + export DESTDIR="${DESTDIR}/usr" +} diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template index 4c6ccc834d2..5855363ec8b 100644 --- a/srcpkgs/gsoap/template +++ b/srcpkgs/gsoap/template @@ -1,6 +1,6 @@ # Template file for 'gsoap' pkgname=gsoap -version=2.8.41 +version=2.8.45 revision=1 build_style=gnu-configure hostmakedepends="unzip flex autoconf" @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-3" homepage="http://www.cs.fsu.edu/~engelen/soap.html" distfiles="${SOURCEFORGE_SITE}/gsoap2/gsoap_${version}.zip" -checksum=72336c1d9a7989d05dba94d1f88753242705027ebcfc5dcea72fd094cefe4c80 +checksum=81946d1ecd99ea414383d5f090e6b292908ff3ac0211cb097a1d1d54e9808bce wrksrc="${pkgname}-${version%.*}" disable_parallel_build=yes diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template index b38d0252bda..9aa8d9998a4 100644 --- a/srcpkgs/gspell/template +++ b/srcpkgs/gspell/template @@ -1,6 +1,6 @@ # Template file for 'gspell' pkgname=gspell -version=1.2.3 +version=1.4.1 revision=1 build_style=gnu-configure configure_args="--disable-static @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="GPL-2" homepage="http://www.gnome.org" distfiles="http://ftp.gnome.org/pub/GNOME/sources//gspell/${version%.*}/gspell-$version.tar.xz" -checksum=a64e158e47a6e2b8ec9a3a1fea98a416f78a13e275c909b2ed488494ff835f82 +checksum=442f88fecd7f9e00a6a9d0af2d762744dd3c119217ff11d6739500f75b0f10be # Package build options diff --git a/srcpkgs/gssdp/template b/srcpkgs/gssdp/template index 5b6c5b62186..6b43a9339b6 100644 --- a/srcpkgs/gssdp/template +++ b/srcpkgs/gssdp/template @@ -1,6 +1,6 @@ # Template file for 'gssdp' pkgname=gssdp -version=1.0.1 +version=1.0.2 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://gupnp.org" distfiles="${GNOME_SITE}/gssdp/${version%.*}/gssdp-$version.tar.xz" -checksum=601d67f40bc28c067742b7c46f3018da96b364fd3e83f30ddac6e190e323d2e1 +checksum=a1e17c09c7e1a185b0bd84fd6ff3794045a3cd729b707c23e422ff66471535dc # Package build options build_options="gir" diff --git a/srcpkgs/gst-plugins-bad/template b/srcpkgs/gst-plugins-bad/template index 307ac3692a5..7cacccca153 100644 --- a/srcpkgs/gst-plugins-bad/template +++ b/srcpkgs/gst-plugins-bad/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad'. pkgname=gst-plugins-bad version=0.10.23 -revision=21 +revision=23 lib32disabled=yes build_style=gnu-configure configure_args="--enable-experimental --disable-static --disable-nsf" @@ -11,7 +11,7 @@ makedepends="gettext-devel libpng-devel alsa-lib-devel celt-devel libressl-devel libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel xvidcore-devel jasper-devel libmodplug-devel neon-devel libcurl-devel - $(vopt_if vpx libvpx-devel) libvdpau-devel libgsm-devel librtmp-devel" + libvpx-devel libvdpau-devel libgsm-devel librtmp-devel" # Requires libgstfft-0.10.so.0 from gst-plugins-base-0.10.36. depends="gst-plugins-base>=0.10.36" short_desc="GStreamer plugins from the bad set" @@ -21,13 +21,6 @@ homepage="http://gstreamer.freedesktop.org" distfiles="$homepage/src/$pkgname/$pkgname-$version.tar.xz" checksum=03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 -build_options="vpx" - -case "$XBPS_TARGET_MACHINE" in - armv6*) ;; - *) build_options_default+=" vpx" ;; -esac - pre_configure() { NOCONFIGURE=1 ./autogen.sh } diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index cfa39901635..2767f24af5d 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -2,7 +2,7 @@ pkgname=gst-plugins-bad1 reverts="1:1.4.5_6" version=1.10.4 -revision=2 +revision=5 wrksrc="${pkgname/1/}-${version}" lib32disabled=yes build_style=gnu-configure @@ -14,8 +14,8 @@ makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel xvidcore-devel jasper-devel libmodplug-devel neon-devel libcurl-devel libvdpau-devel libgsm-devel librtmp-devel libass-devel mpg123-devel - soundtouch-devel opus-devel libwebp-devel wayland-devel libsrtp-devel - libopenal-devel" + soundtouch-devel opus-devel libwebp-devel wayland-devel libwayland-egl + libsrtp-devel libopenal-devel" depends="gst-plugins-base1>=${version}" short_desc="GStreamer plugins from the bad set (v1.x)" maintainer="Juan RP " diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template index e5015abe2df..7981f114fdc 100644 --- a/srcpkgs/gst-plugins-good1/template +++ b/srcpkgs/gst-plugins-good1/template @@ -2,7 +2,7 @@ pkgname=gst-plugins-good1 reverts="1:1.4.5_3" version=1.10.4 -revision=1 +revision=2 wrksrc="${pkgname/1/}-${version}" lib32disabled=yes build_style=gnu-configure @@ -16,8 +16,7 @@ makedepends=" libXdamage-devel gtk+-devel aalib-devel libcaca-devel taglib-devel libsoup-gnome-devel gst-plugins-base1-devel GConf-devel pulseaudio-devel orc-devel libXv-devel wavpack-devel - v4l-utils-devel jack-devel speex-devel - $(vopt_if vpx libvpx-devel)" + v4l-utils-devel jack-devel speex-devel libvpx-devel" depends="gst-plugins-base1>=${version}" short_desc="GStreamer set of well-maintained good plug-ins (1.x)" maintainer="Juan RP " @@ -25,10 +24,3 @@ homepage="https://gstreamer.freedesktop.org" license="LGPL-2.1" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" checksum=8a86c61434a8c44665365bd0b3557a040937d1f44bf69caee4e9ea816ce74d7e - -build_options="vpx" - -case "$XBPS_TARGET_MACHINE" in - armv6*) ;; - *) build_options_default+=" vpx" ;; -esac diff --git a/srcpkgs/gtest/template b/srcpkgs/gtest/template index 556328d992e..e49179e57d3 100644 --- a/srcpkgs/gtest/template +++ b/srcpkgs/gtest/template @@ -1,7 +1,7 @@ # Template build file for 'gtest' pkgname=gtest version=1.8.0 -revision=2 +revision=3 wrksrc="googletest-release-${version}" build_style=cmake short_desc="Google's framework for writing C++ tests" diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template index aa077728571..4b7e8f0b0df 100644 --- a/srcpkgs/gthumb/template +++ b/srcpkgs/gthumb/template @@ -1,7 +1,7 @@ # Template build file for 'GThumb'. pkgname=gthumb -version=3.4.4.1 -revision=4 +version=3.4.5 +revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static $(vopt_enable tiff) $(vopt_enable clutter) @@ -19,7 +19,7 @@ homepage="http://live.gnome.org/gthumb" license="GPL-3" version_dir="$(echo $version | grep -o '^[1-9]\.[0-9]\+')" distfiles="$GNOME_SITE/${pkgname}/${version_dir}/${pkgname}-${version}.tar.xz" -checksum=4dc63bb1cc1f139259bba7f9fd1735182f16ba37254119a9f9c3e13a898a9533 +checksum=816fc63ba9cfc397ea8c9a4d21870051813aa4d97383f3d3ae74cb3ea8235746 ## Package build options build_options="brasero clutter gstreamer soup tiff" diff --git a/srcpkgs/gtick/template b/srcpkgs/gtick/template index 8d86239465c..337244293c0 100644 --- a/srcpkgs/gtick/template +++ b/srcpkgs/gtick/template @@ -6,7 +6,7 @@ build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gtk+-devel pulseaudio-devel" short_desc="A Gtk metronome application supporting different meters and speeds" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://www.antcom.de/gtick/" distfiles="http://www.antcom.de/gtick/download/$pkgname-$version.tar.gz" diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template index c46fc7e274e..fc734f5827b 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -1,10 +1,10 @@ # Template build file for 'gtk+3'. pkgname=gtk+3 -version=3.22.9 +version=3.22.12 revision=1 wrksrc="gtk+-${version}" build_style=gnu-configure -configure_args="--disable-schemas-compile --enable-gtk2-dependency +configure_args="--disable-schemas-compile $(vopt_enable broadway broadway-backend) $(vopt_enable colord) $(vopt_enable cups) $(vopt_enable gir introspection) $(vopt_enable wayland wayland-backend) $(vopt_enable x11 x11-backend)" @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.gtk.org/" license="LGPL-2.1" distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz" -checksum=e414542c96dc9966d40774451331bd8f73f77b6670226a5bbd057973a0c6a3e1 +checksum=84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c hostmakedepends="automake gettext-devel libtool pkg-config glib-devel gtk-doc gobject-introspection gtk-update-icon-cache @@ -21,7 +21,7 @@ hostmakedepends="automake gettext-devel libtool pkg-config makedepends="libglib-devel atk-devel at-spi2-atk-devel libepoxy-devel libpng-devel fontconfig-devel cairo-devel pango-devel gdk-pixbuf-devel $(vopt_if colord colord-devel) $(vopt_if cups cups-devel) - $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel') + $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols libwayland-egl MesaLib-devel') $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')" depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 dbus-x11)" triggers="gtk3-immodules" diff --git a/srcpkgs/gtkglextmm/template b/srcpkgs/gtkglextmm/template index d9aa9e8cc39..169a04ce0fc 100644 --- a/srcpkgs/gtkglextmm/template +++ b/srcpkgs/gtkglextmm/template @@ -6,7 +6,7 @@ build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gtkglext-devel gtkmm2-devel pangomm-devel" short_desc="C++ bindings for gtkglext" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="LGPL-2.1" homepage="https://projects.gnome.org/gtkglext/" distfiles="${SOURCEFORGE_SITE}/gtkglext/${pkgname}-${version}.tar.bz2" diff --git a/srcpkgs/gtksourceview/template b/srcpkgs/gtksourceview/template index 544fd1ae301..32580c8cd5b 100644 --- a/srcpkgs/gtksourceview/template +++ b/srcpkgs/gtksourceview/template @@ -1,6 +1,6 @@ # Template file for 'gtksourceview' pkgname=gtksourceview -version=3.22.2 +version=3.24.1 revision=1 build_style=gnu-configure configure_args="--disable-static $(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=6ce84231dd0931cc747708434ca2f344c65a092dd6e1a800283fe0748773af5e +checksum=717b6fe884ff9f25158bdc36f463790c608ada9f5e2e6f4dc7f1467c83711c25 # Package build options build_options="gir" diff --git a/srcpkgs/gtkwave/template b/srcpkgs/gtkwave/template index 91710dea870..8fcfd19c631 100644 --- a/srcpkgs/gtkwave/template +++ b/srcpkgs/gtkwave/template @@ -1,6 +1,6 @@ # Template file for 'gtkwave' pkgname=gtkwave -version=3.3.79 +version=3.3.80 revision=1 build_style=gnu-configure hostmakedepends="pkg-config gperf" @@ -10,6 +10,6 @@ maintainer="allan " license="GPL-2" homepage="http://gtkwave.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=796538e92fd33ee65f315c314e33efb71abd4fe90d7cb1dd5e60382474a79de2 +checksum=6a4c7d1f671551b1b9351fc90f97b0a60cf75ae5759d006f993c173c562588dc nocross="http://build.voidlinux.eu/builders/armv7l_builder/builds/21190/steps/shell_3/logs/stdio" diff --git a/srcpkgs/gucharmap/template b/srcpkgs/gucharmap/template index d7ca0c0f2fc..1b3cc3c35fe 100644 --- a/srcpkgs/gucharmap/template +++ b/srcpkgs/gucharmap/template @@ -1,6 +1,6 @@ # Template file for 'gucharmap' pkgname=gucharmap -version=9.0.2 +version=9.0.3 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile $(vopt_enable gir introspection) @@ -21,7 +21,7 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt http://www.unicode.org/Public/9.0.0/ucd/Unihan.zip" skip_extraction="Blocks.txt DerivedAge.txt NamesList.txt Scripts.txt UnicodeData.txt Unihan.zip" -checksum="723ea92c8e877beae3986432b8e002807c6c2d1140590dff1c5bff34bb6ed265 +checksum="badb002c4d15dca7f3e42b9995ac41dba51490a28709bfefb5a8523fd948f918 612127d4889032e55d82522e4a0c19793bda8aa8da14ecb3c696d17c83e6be13 5cb15b04693c43df16e0d304deca049e93b001445d163184e0ff1b7c8c852146 eb15aa335aad1c65b9435a8bbbae28461ab641a2243bc41706da5f866e633e46 diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template index 562a0b26229..fa90e225f13 100644 --- a/srcpkgs/gupnp/template +++ b/srcpkgs/gupnp/template @@ -1,6 +1,6 @@ # Template file for 'gupnp' pkgname=gupnp -version=1.0.1 +version=1.0.2 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://gupnp.org/" distfiles="${GNOME_SITE}/gupnp/${version%.*}/gupnp-${version}.tar.xz" -checksum=934584cc1b361bf251a5ac271ffb1995a3c6426ce44cb64f9c6d779f2af9a6d9 +checksum=5173fda779111c6b01cd4a5e41b594322be9d04f8c74d3361f0a0c2069c77610 # Package build options build_options="gir" diff --git a/srcpkgs/gvfs/patches/gvfs-deprecated_remove_bashism.patch b/srcpkgs/gvfs/patches/gvfs-deprecated_remove_bashism.patch new file mode 100644 index 00000000000..e3bea33c86f --- /dev/null +++ b/srcpkgs/gvfs/patches/gvfs-deprecated_remove_bashism.patch @@ -0,0 +1,11 @@ +--- programs/deprecated.in 2017-04-17 14:01:00.783094604 -0700 ++++ programs/deprecated.in 2017-04-17 14:02:43.644606806 -0700 +@@ -7,7 +7,7 @@ + >&2 echo "See '$help' for more info." + >&2 echo + +-if [ "$1" == "--help" ] || [ "$1" == "-h" ]; then ++if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then + exec $help "$@:2" + else + exec $replacement "$@" diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index 26f8fd716f1..d652f15a346 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,6 +1,6 @@ # Template file for 'gvfs' pkgname=gvfs -version=1.30.3 +version=1.32.1 revision=2 build_style=gnu-configure configure_args="--disable-hal --disable-libsystemd-login @@ -22,7 +22,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=b824a29489cae7f39e1a0fc0d154ac7b7bf43d8edd98ba83ffcad2f766d0f175 +checksum=d0b6c9edab09d52472355657a2f0a14831b2e6c58caba395f721ab683f836ade # Manually declare shlibs used by the subpkgs. shlib_provides="libgvfscommon.so libgvfsdaemon.so" diff --git a/srcpkgs/gvim-huge b/srcpkgs/gvim-huge new file mode 120000 index 00000000000..7923f59d710 --- /dev/null +++ b/srcpkgs/gvim-huge @@ -0,0 +1 @@ +vim \ No newline at end of file diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template index b37953347f0..c44abc81370 100644 --- a/srcpkgs/gwenhywfar/template +++ b/srcpkgs/gwenhywfar/template @@ -1,8 +1,8 @@ # Template file for 'gwenhywfar' pkgname=gwenhywfar -version=4.15.3 -revision=3 -_dnrel=201 +version=4.17.0 +revision=1 +_dnrel=205 hostmakedepends="automake pkg-config libgcrypt-devel libtool" makedepends="libgcrypt-devel gnutls-devel gtk+-devel qt-devel qt5-devel" build_style="gnu-configure" @@ -16,7 +16,7 @@ license="LGPL" homepage="http://www.aquamaniac.de" short_desc="OS abstraction functions for various projects" distfiles="http://www2.aquamaniac.de/sites/download/download.php?package=01&release=${_dnrel}&file=01&dummy=gwenhywfar-$version.tar.gz" -checksum=6a0e8787c99620414da6140e567c616b55856c5edf8825a9ebc67431923ee63a +checksum=11fdffaa2970c937251587fc62a41893c20f7ab3d74c2b66dfa81f40b2a82bfd if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt-host-tools qt-devel qt5-host-tools qt5-devel" diff --git a/srcpkgs/gzip/template b/srcpkgs/gzip/template index 51d773f7e9d..57e541e9c0b 100644 --- a/srcpkgs/gzip/template +++ b/srcpkgs/gzip/template @@ -1,7 +1,7 @@ # Template file for 'gzip' pkgname=gzip version=1.8 -revision=2 +revision=4 bootstrap=yes build_style=gnu-configure short_desc="GNU compression utility (replacement for compress)" @@ -10,3 +10,7 @@ homepage="http://www.gnu.org/software/gzip/" license="GPL-3" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" checksum=ff1767ec444f71e5daf8972f6f8bf68cfcca1d2f76c248eb18e8741fc91dbbd3 + +case "$XBPS_TARGET_MACHINE" in + *-musl) configure_args+=" DEFS=NO_ASM gl_cv_func_fflush_stdin=yes" ;; +esac diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template index 8c9b298178f..8a8db021dd1 100644 --- a/srcpkgs/h2o/template +++ b/srcpkgs/h2o/template @@ -1,7 +1,7 @@ # Template file for 'h2o' pkgname=h2o version=2.0.6 -revision=1 +revision=2 build_style=cmake conf_files="/etc/h2o.conf" system_accounts="h2o" diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template index bdf47b5805e..ce9ca6398a0 100644 --- a/srcpkgs/handbrake/template +++ b/srcpkgs/handbrake/template @@ -2,7 +2,7 @@ only_for_archs="i686 i686-musl x86_64 x86_64-musl" pkgname=handbrake -version=1.0.3 +version=1.0.7 revision=1 wrksrc="HandBrake-${version}" build_options="fdk_aac" @@ -20,7 +20,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://handbrake.fr/" distfiles="https://handbrake.fr/rotation.php?file=HandBrake-${version}.tar.bz2>HandBrake-${version}.tar.bz2" -checksum=591fb489edd6146136f0a92f895c2098365f612ad308d5ff9dc83223ad73ed27 +checksum=ffdee112f0288f0146b965107956cd718408406b75db71c44d2188f5296e677f CFLAGS="-msse" diff --git a/srcpkgs/hans/template b/srcpkgs/hans/template index ce27b7b9f2c..58624c9802c 100644 --- a/srcpkgs/hans/template +++ b/srcpkgs/hans/template @@ -3,7 +3,7 @@ pkgname=hans version=1.0 revision=1 short_desc="ICMP tunneling software" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://code.gerade.org/hans/" distfiles="https://github.com/friedrich/$pkgname/archive/v$version.tar.gz" diff --git a/srcpkgs/haproxy/patches/fix-libressl-2.5.patch b/srcpkgs/haproxy/patches/fix-libressl-2.5.patch new file mode 100644 index 00000000000..578d64e3bcb --- /dev/null +++ b/srcpkgs/haproxy/patches/fix-libressl-2.5.patch @@ -0,0 +1,46 @@ +--- src/ssl_sock.c.orig 2017-01-13 09:03:00 UTC ++++ src/ssl_sock.c +@@ -792,8 +792,11 @@ static int ssl_sock_load_ocsp(SSL_CTX *c + ocsp = NULL; + + #ifndef SSL_CTX_get_tlsext_status_cb +-# define SSL_CTX_get_tlsext_status_cb(ctx, cb) \ +- *cb = (void (*) (void))ctx->tlsext_status_cb; ++#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB ++#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB 128 ++#endif ++#define SSL_CTX_get_tlsext_status_cb(ctx, cb) \ ++ *cb = SSL_CTX_ctrl(ctx,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB,0, (void (**)(void))cb) + #endif + SSL_CTX_get_tlsext_status_cb(ctx, &callback); + +@@ -821,7 +824,10 @@ static int ssl_sock_load_ocsp(SSL_CTX *c + int key_type; + EVP_PKEY *pkey; + +-#ifdef SSL_CTX_get_tlsext_status_arg ++#if defined(SSL_CTX_get_tlsext_status_arg) || defined(LIBRESSL_VERSION_NUMBER) ++#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG ++#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG 129 ++#endif + SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG, 0, &cb_arg); + #else + cb_arg = ctx->tlsext_status_arg; +@@ -3537,7 +3543,7 @@ int ssl_sock_handshake(struct connection + OSSL_HANDSHAKE_STATE state = SSL_get_state((SSL *)conn->xprt_ctx); + empty_handshake = state == TLS_ST_BEFORE; + #else +- empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length; ++ empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE; + #endif + + if (empty_handshake) { +@@ -3615,7 +3621,7 @@ int ssl_sock_handshake(struct connection + state = SSL_get_state((SSL *)conn->xprt_ctx); + empty_handshake = state == TLS_ST_BEFORE; + #else +- empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length; ++ empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE; + #endif + if (empty_handshake) { + if (!errno) { diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index 2e8c3652cdb..6365970e2fe 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -1,7 +1,7 @@ # Template file for 'haproxy' pkgname=haproxy -version=1.7.3 -revision=1 +version=1.7.5 +revision=3 build_style=gnu-makefile make_build_args="TARGET=linux2628 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1" @@ -16,7 +16,11 @@ maintainer="Eivind Uggedal " license="GPL-2, LGPL-2.1" homepage="http://www.haproxy.org" distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz" -checksum=ebb31550a5261091034f1b6ac7f4a8b9d79a8ce2a3ddcd7be5b5eb355c35ba65 +checksum=b04d7db6383c662eb0a421a95af7becac6d9744a1abf0df6b0280c1e61416121 +case "$XBPS_TARGET_MACHINE" in + *-musl) CFLAGS="-D__LINUX_NETFILTER_H";; +esac + do_build() { make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \ diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template index cd67a1f80de..3aa421b8561 100644 --- a/srcpkgs/harfbuzz/template +++ b/srcpkgs/harfbuzz/template @@ -1,6 +1,6 @@ # Template file for 'harfbuzz' pkgname=harfbuzz -version=1.4.4 +version=1.4.6 revision=1 build_style=gnu-configure configure_args="--with-glib --with-freetype --with-cairo --with-icu --with-graphite2" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/" license="MIT" distfiles="${FREEDESKTOP_SITE}/harfbuzz/release/${pkgname}-${version}.tar.bz2" -checksum=35d2f8ca476cbbec64ee824eca6b0209ff8db0334990b9f5af893b94f119d255 +checksum=21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293 pre_configure() { autoreconf -fi diff --git a/srcpkgs/hashcat/template b/srcpkgs/hashcat/template index d4af6ecbf51..6dcf85f8d4a 100644 --- a/srcpkgs/hashcat/template +++ b/srcpkgs/hashcat/template @@ -1,6 +1,7 @@ # Template file for 'hashcat' pkgname=hashcat -version=3.40 +reverts="3.10_1 3.20_1 3.30_1 3.40_1" +version=3.5.0 revision=1 build_style=gnu-makefile make_build_args="LFLAGS=$LDFLAGS PREFIX=/usr" @@ -10,7 +11,7 @@ maintainer="Duncaen " license="MIT" homepage="https://hashcat.net/hashcat/" distfiles="https://github.com/hashcat/hashcat/archive/v${version}.tar.gz" -checksum=d9d74a8fc4860e83c5bc006abcc54ee995c58654afacaf51294e1a6929980d48 +checksum=af764698f48145ac96cf01c65cf76bcb88e205aeb4614025ae32d847571c4390 CFLAGS="-W -Wall -std=c99 -Iinclude/ -Iinclude/lzma_sdk/ -IOpenCL/" diff --git a/srcpkgs/hashcat/update b/srcpkgs/hashcat/update new file mode 100644 index 00000000000..4b95abc8458 --- /dev/null +++ b/srcpkgs/hashcat/update @@ -0,0 +1 @@ +ignore="3.[1234]0" diff --git a/srcpkgs/hatari/patches/aarch64.patch b/srcpkgs/hatari/patches/aarch64.patch new file mode 100644 index 00000000000..765c1b3a179 --- /dev/null +++ b/srcpkgs/hatari/patches/aarch64.patch @@ -0,0 +1,11 @@ +--- src/cpu/sysdeps.h.orig 2016-11-03 22:25:43.000000000 +0100 ++++ src/cpu/sysdeps.h 2017-03-20 09:43:25.919910461 +0100 +@@ -52,7 +52,7 @@ + #define CPU_64_BIT 1 + #elif defined(__i386__) || defined(_M_IX86) + #define CPU_i386 1 +-#elif defined(__arm__) || defined(_M_ARM) ++#elif defined(__arm__) || defined(_M_ARM) || defined(__aarch64__) + #define CPU_arm 1 + #elif defined(__powerpc__) || defined(_M_PPC) || defined(__ppc__) || defined(__ppc64__) + #define CPU_powerpc 1 diff --git a/srcpkgs/hatari/template b/srcpkgs/hatari/template index a8bbdba1f96..fe363e98782 100644 --- a/srcpkgs/hatari/template +++ b/srcpkgs/hatari/template @@ -1,13 +1,13 @@ # Template file for 'hatari' pkgname=hatari -version=1.9.0 +version=2.0.0 revision=1 build_style=cmake hostmakedepends="pkg-config" -makedepends="SDL-devel zlib-devel libpng-devel portaudio-devel" +makedepends="SDL2-devel zlib-devel libpng-devel portaudio-devel hicolor-icon-theme" short_desc="An Atari ST and STE emulator" -maintainer="Jarbowski " +maintainer="Jarbowski " license="GPL-2" homepage="http://hatari.tuxfamily.org/" distfiles="http://download.tuxfamily.org/${pkgname}/${version}/${pkgname}-${version}.tar.bz2" -checksum=b2b56e6cbe7f8769a5e8b1d96599f392d9351b44cacf959da6905da06d30e992 +checksum=52a447a59b6979d55d1525f3c4a21ec013e4371354d6683ede71546c5e6da577 diff --git a/srcpkgs/hdf5/template b/srcpkgs/hdf5/template index 09c2ce1e98c..5d4b3cf4daa 100644 --- a/srcpkgs/hdf5/template +++ b/srcpkgs/hdf5/template @@ -1,7 +1,7 @@ # Template file for 'hdf5' pkgname=hdf5 -version=1.8.17 -revision=2 +version=1.8.18 +revision=1 build_style=gnu-configure nocross=yes makedepends="zlib-devel" @@ -9,8 +9,8 @@ short_desc="A data model, library, and file format for storing and managing data maintainer="pulux " license="BSD" homepage="http://hdfgroup.org" -distfiles="http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-${version}.tar.gz" -checksum=d9cda297ee76ade9881c4208987939250d397bae6252d0ccb66fa7d24d67e263 +distfiles="http://www.hdfgroup.org/ftp/HDF5/current18/src/hdf5-${version}.tar.gz" +checksum=cdb195ad8d9e6782acf24b2488061289f615628c2ccda8457b0a0c3fb7a8a063 configure_args="--enable-cxx" diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template index c703dcff101..32c26bc5cc6 100644 --- a/srcpkgs/hexchat/template +++ b/srcpkgs/hexchat/template @@ -1,7 +1,7 @@ # Template file for 'hexchat' pkgname=hexchat version=2.12.4 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure hostmakedepends="automake libtool gettext-devel pkg-config intltool glib-devel diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template index e70e92bc9b9..35f5a5e4065 100644 --- a/srcpkgs/hfsprogs/template +++ b/srcpkgs/hfsprogs/template @@ -3,7 +3,7 @@ pkgname=hfsprogs _distver=332.25 _patchver=11 version=${_distver}debian${_patchver} -revision=8 +revision=9 create_wrksrc=yes makedepends="libbsd-devel libressl-devel" short_desc="mkfs and fsck for HFS and HFS+ file systems" diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template index dbceea2d74d..99f677517ee 100644 --- a/srcpkgs/hiawatha/template +++ b/srcpkgs/hiawatha/template @@ -1,6 +1,6 @@ # Template file for 'hiawatha' pkgname=hiawatha -version=10.5 +version=10.6 revision=1 build_style=cmake makedepends="libxslt-devel mbedtls-devel" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="GPL-2" homepage="https://hiawatha-webserver.org" distfiles="$homepage/files/$pkgname-$version.tar.gz" -checksum=d76155430dc9100de412088bd68978a2a9052832609c7ac961dccaf2550c618a +checksum=0cf014ae214be1bf6244c46c25e66805987c948837a4e37f9dede570de49bdeb configure_args=" -DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run diff --git a/srcpkgs/highlight/template b/srcpkgs/highlight/template index 8ed6fa6c5cd..59eb30bec62 100644 --- a/srcpkgs/highlight/template +++ b/srcpkgs/highlight/template @@ -1,6 +1,6 @@ # Template file for 'highlight' pkgname=highlight -version=3.33 +version=3.36 revision=1 build_style=gnu-makefile make_cmd="make QMAKE=qmake" @@ -12,5 +12,5 @@ maintainer="Steve Prybylski " license="GPL-3" homepage="http://www.andre-simon.de/doku/highlight/en/highlight.php" distfiles="http://www.andre-simon.de/zip/${pkgname}-${version}.tar.bz2" -checksum=64b530354feccabc3e8eeec02a0341be0625509db1fa5dd201c4d07e4d845c3c +checksum=34cd5bcf52714f83364460c0c3551320564c56ff4e117353034e532275792171 CFLAGS="-std=c++11" diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template index 420694c4051..f8c50c80d8b 100644 --- a/srcpkgs/hitch/template +++ b/srcpkgs/hitch/template @@ -1,7 +1,7 @@ # Template file for 'hitch' pkgname=hitch version=1.4.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="ac_cv_so_reuseport_works=yes" hostmakedepends="pkg-config" diff --git a/srcpkgs/hitori/template b/srcpkgs/hitori/template index cd248742042..2a474e132e5 100644 --- a/srcpkgs/hitori/template +++ b/srcpkgs/hitori/template @@ -1,6 +1,6 @@ # Template file for 'hitori' pkgname=hitori -version=3.22.2 +version=3.22.3 revision=1 build_style=gnu-configure hostmakedepends="glib-devel intltool itstool pkg-config" @@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Hitori" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3d4c11efaf55885d30cf05b9717dcf2d86e437f23ff423f9f55a4b3abe398341 +checksum=ba21368d6d8475ae8cf0d39b62dab5eaec26ce82b3f067af50f1eded3a43b360 diff --git a/srcpkgs/hledger-api b/srcpkgs/hledger-api new file mode 120000 index 00000000000..a4387358df9 --- /dev/null +++ b/srcpkgs/hledger-api @@ -0,0 +1 @@ +hledger \ No newline at end of file diff --git a/srcpkgs/hledger-ui b/srcpkgs/hledger-ui new file mode 120000 index 00000000000..a4387358df9 --- /dev/null +++ b/srcpkgs/hledger-ui @@ -0,0 +1 @@ +hledger \ No newline at end of file diff --git a/srcpkgs/hledger-web b/srcpkgs/hledger-web new file mode 120000 index 00000000000..a4387358df9 --- /dev/null +++ b/srcpkgs/hledger-web @@ -0,0 +1 @@ +hledger \ No newline at end of file diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template new file mode 100644 index 00000000000..1c55827752f --- /dev/null +++ b/srcpkgs/hledger/template @@ -0,0 +1,47 @@ +# Template file for 'hledger' +pkgname=hledger +version=1.2 +revision=1 +build_style=haskell-stack +nocross=yes # Can't yet cross compile Haskell +short_desc="Simple, precise, plain text accounting" +maintainer="Inokentiy Babushkin " +license="GPL-3" +homepage="http://hledger.org/" +makedepends="zlib-devel ncurses-devel" +wrksrc="${pkgname}-${pkgname}-${version}" +stackage="lts-8.6" +distfiles="https://github.com/simonmichael/${pkgname}/archive/${pkgname}-${version}.tar.gz" +checksum="bd00115272feada9e388b1aafe6f105369f0d0f0286f65b4ed35fb4ffcd3ad54" +nopie=yes # network-2.6.3.1 build fails with a relocation + +post_install() { + vman hledger/doc/hledger.1 + for manpage in hledger/doc/other/*.5; do + vman $manpage + done +} + +hledger-ui_package() { + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/bin/hledger-ui + vman hledger/doc/other/hledger-ui.1 + } +} + +hledger-web_package() { + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/bin/hledger-web + vman hledger/doc/other/hledger-web.1 + } +} + +hledger-api_package() { + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/bin/hledger-api + vman hledger/doc/other/hledger-api.1 + } +} diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template index 13c4af82e5a..0b7b6ac8841 100644 --- a/srcpkgs/homebank/template +++ b/srcpkgs/homebank/template @@ -1,6 +1,6 @@ # Template file for 'homebank' pkgname=homebank -version=5.1.3 +version=5.1.4 revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config" @@ -11,4 +11,4 @@ maintainer="Juan RP " license="GPL-2" homepage="http://homebank.free.fr/" distfiles="http://homebank.free.fr/public/${pkgname}-${version}.tar.gz" -checksum=22b2baf2e66fee2f97c7a6050298aa6d2502d75f02f046259e4181512714fb73 +checksum=0af35f848c9be864db838868c14977e3f873b54b20be24b6b30189766c5afd1f diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template new file mode 100644 index 00000000000..043d822aec7 --- /dev/null +++ b/srcpkgs/hoogle/template @@ -0,0 +1,19 @@ +# Template file for 'hoogle' +pkgname=hoogle +version=5.0.9 +revision=1 +build_style=haskell-stack +nocross=yes # Can't yet cross compile Haskell +stackage="lts-8.8" +makedepends="zlib-devel" +short_desc="Haskell API search engine" +maintainer="Inokentiy Babushkin " +license="BSD-3" +homepage="http://hoogle.haskell.org/" +distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz" +checksum="6f181b5d8f061a7679c8d394676201d23be363f4612fd0c93f908e7792591ed3" +nopie=yes # network-2.6.3.1 build fails with a relocation + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template index ea3c29e8e20..bb0f5e214f4 100644 --- a/srcpkgs/hooktftp/template +++ b/srcpkgs/hooktftp/template @@ -6,7 +6,7 @@ _gitcommit="a7258310669522806b903c9ffc98ad7c62b02d56" wrksrc="${pkgname}-${_gitcommit}" hostmakedepends="go bzr git" short_desc="Hook based tftp server" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/tftp-go-team/hooktftp" distfiles="${homepage}/archive/${_gitcommit}.tar.gz" diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template index 5446b9d5dd3..954d316c595 100644 --- a/srcpkgs/hopper/template +++ b/srcpkgs/hopper/template @@ -5,7 +5,7 @@ revision=1 _build=1 create_wrksrc=yes short_desc="Full featured disassembler" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="EULA" homepage="https://www.hopperapp.com" distfiles="https://d1f8bh81yd16yv.cloudfront.net/$pkgname-$version-$_build-x86_64.pkg.tar.xz" diff --git a/srcpkgs/hostaliases/template b/srcpkgs/hostaliases/template index c9f72333021..be120d66670 100644 --- a/srcpkgs/hostaliases/template +++ b/srcpkgs/hostaliases/template @@ -4,7 +4,7 @@ version=2 revision=1 build_style=gnu-makefile short_desc="HOSTALIASES libc independent support" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/thypon/hostaliases" distfiles="https://github.com/thypon/hostaliases/archive/v${version}.tar.gz" diff --git a/srcpkgs/hostapd/files/config b/srcpkgs/hostapd/files/config index 2d58183f8a5..e26ae344e96 100644 --- a/srcpkgs/hostapd/files/config +++ b/srcpkgs/hostapd/files/config @@ -94,3 +94,6 @@ CONFIG_IEEE80211AC=y CONFIG_LIBNL32=y CONFIG_ACS=y + +# Support debug logging to syslog +CONFIG_DEBUG_SYSLOG=y diff --git a/srcpkgs/hostapd/files/hostapd/run b/srcpkgs/hostapd/files/hostapd/run index c010d1baf99..0d17269e5d5 100644 --- a/srcpkgs/hostapd/files/hostapd/run +++ b/srcpkgs/hostapd/files/hostapd/run @@ -1,2 +1,2 @@ #!/bin/sh -exec hostapd -d /etc/hostapd/hostapd.conf 2>&1 +exec hostapd -s /etc/hostapd/hostapd.conf 2>&1 diff --git a/srcpkgs/hostapd/patches/hostapd-syslog.patch b/srcpkgs/hostapd/patches/hostapd-syslog.patch new file mode 100644 index 00000000000..3535b079bee --- /dev/null +++ b/srcpkgs/hostapd/patches/hostapd-syslog.patch @@ -0,0 +1,160 @@ +From cc3dae85bd694506cdea66ae532d452fb8716297 Mon Sep 17 00:00:00 2001 +From: Wojciech Dubowik +Date: Mon, 23 Jan 2017 13:55:04 +0100 +Subject: [PATCH] hostapd: Add possibility to send debug messages to syslog + +We can only send module specific messages to syslog and not debug +messages printed with wpa_printf. Add an extra command line parameter +'-s' to allow it. The feature is enabled with compile flag +CONFIG_DEBUG_SYSLOG as for wpa_supplicant and behaves in the same manner +as the wpa_supplicant -s command line argument. + +Signed-off-by: Wojciech Dubowik +--- + hostapd/Android.mk | 4 ++++ + hostapd/Makefile | 4 ++++ + hostapd/defconfig | 3 +++ + hostapd/main.c | 19 ++++++++++++++++++- + src/utils/wpa_debug.c | 2 +- + src/utils/wpa_debug.h | 3 +++ + 6 files changed, 33 insertions(+), 2 deletions(-) + +diff --git hostapd/Android.mk hostapd/Android.mk +index 9a14be4b9..ec2d55a9f 100644 +--- hostapd/Android.mk ++++ hostapd/Android.mk +@@ -952,6 +952,10 @@ ifdef CONFIG_NO_STDOUT_DEBUG + L_CFLAGS += -DCONFIG_NO_STDOUT_DEBUG + endif + ++ifdef CONFIG_DEBUG_SYSLOG ++L_CFLAGS += -DCONFIG_DEBUG_SYSLOG ++endif ++ + ifdef CONFIG_DEBUG_LINUX_TRACING + L_CFLAGS += -DCONFIG_DEBUG_LINUX_TRACING + endif +diff --git hostapd/Makefile hostapd/Makefile +index 52c72dc45..d9bb72a0a 100644 +--- hostapd/Makefile ++++ hostapd/Makefile +@@ -997,6 +997,10 @@ ifdef CONFIG_NO_STDOUT_DEBUG + CFLAGS += -DCONFIG_NO_STDOUT_DEBUG + endif + ++ifdef CONFIG_DEBUG_SYSLOG ++CFLAGS += -DCONFIG_DEBUG_SYSLOG ++endif ++ + ifdef CONFIG_DEBUG_LINUX_TRACING + CFLAGS += -DCONFIG_DEBUG_LINUX_TRACING + endif +diff --git hostapd/defconfig hostapd/defconfig +index e25ec320f..bf6e64663 100644 +--- hostapd/defconfig ++++ hostapd/defconfig +@@ -166,6 +166,9 @@ CONFIG_IPV6=y + # Disabled by default. + #CONFIG_DEBUG_FILE=y + ++# Send debug messages to syslog instead of stdout ++#CONFIG_DEBUG_SYSLOG=y ++ + # Add support for sending all debug messages (regardless of debug verbosity) + # to the Linux kernel tracing facility. This helps debug the entire stack by + # making it easy to record everything happening from the driver up into the +diff --git hostapd/main.c hostapd/main.c +index 6911232eb..593267c96 100644 +--- hostapd/main.c ++++ hostapd/main.c +@@ -108,6 +108,10 @@ static void hostapd_logger_cb(void *ctx, const u8 *addr, unsigned int module, + module_str ? module_str : "", + module_str ? ": " : "", txt); + ++#ifdef CONFIG_DEBUG_SYSLOG ++ if (wpa_debug_syslog) ++ conf_stdout = 0; ++#endif /* CONFIG_DEBUG_SYSLOG */ + if ((conf_stdout & module) && level >= conf_stdout_level) { + wpa_debug_print_timestamp(); + wpa_printf(MSG_INFO, "%s", format); +@@ -484,6 +488,9 @@ static void usage(void) + " (records all messages regardless of debug verbosity)\n" + #endif /* CONFIG_DEBUG_LINUX_TRACING */ + " -i list of interface names to use\n" ++#ifdef CONFIG_DEBUG_SYSLOG ++ " -s log output to syslog instead of stdout\n" ++#endif /* CONFIG_DEBUG_SYSLOG */ + " -S start all the interfaces synchronously\n" + " -t include timestamps in some debug messages\n" + " -v show hostapd version\n"); +@@ -661,7 +668,7 @@ int main(int argc, char *argv[]) + dl_list_init(&interfaces.global_ctrl_dst); + + for (;;) { +- c = getopt(argc, argv, "b:Bde:f:hi:KP:STtu:vg:G:"); ++ c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:vg:G:"); + if (c < 0) + break; + switch (c) { +@@ -718,6 +725,11 @@ int main(int argc, char *argv[]) + bss_config = tmp_bss; + bss_config[num_bss_configs++] = optarg; + break; ++#ifdef CONFIG_DEBUG_SYSLOG ++ case 's': ++ wpa_debug_syslog = 1; ++ break; ++#endif /* CONFIG_DEBUG_SYSLOG */ + case 'S': + start_ifaces_in_sync = 1; + break; +@@ -746,6 +758,10 @@ int main(int argc, char *argv[]) + wpa_debug_open_file(log_file); + else + wpa_debug_setup_stdout(); ++#ifdef CONFIG_DEBUG_SYSLOG ++ if (wpa_debug_syslog) ++ wpa_debug_open_syslog(); ++#endif /* CONFIG_DEBUG_SYSLOG */ + #ifdef CONFIG_DEBUG_LINUX_TRACING + if (enable_trace_dbg) { + int tret = wpa_debug_open_linux_tracing(); +@@ -882,6 +898,7 @@ int main(int argc, char *argv[]) + hostapd_global_deinit(pid_file, interfaces.eloop_initialized); + os_free(pid_file); + ++ wpa_debug_close_syslog(); + if (log_file) + wpa_debug_close_file(); + wpa_debug_close_linux_tracing(); +diff --git src/utils/wpa_debug.c src/utils/wpa_debug.c +index f7acf6b9f..62758d864 100644 +--- src/utils/wpa_debug.c ++++ src/utils/wpa_debug.c +@@ -13,7 +13,7 @@ + #ifdef CONFIG_DEBUG_SYSLOG + #include + +-static int wpa_debug_syslog = 0; ++int wpa_debug_syslog = 0; + #endif /* CONFIG_DEBUG_SYSLOG */ + + #ifdef CONFIG_DEBUG_LINUX_TRACING +diff --git src/utils/wpa_debug.h src/utils/wpa_debug.h +index 17d8f9638..1fe0b7db7 100644 +--- src/utils/wpa_debug.h ++++ src/utils/wpa_debug.h +@@ -14,6 +14,9 @@ + extern int wpa_debug_level; + extern int wpa_debug_show_keys; + extern int wpa_debug_timestamp; ++#ifdef CONFIG_DEBUG_SYSLOG ++extern int wpa_debug_syslog; ++#endif /* CONFIG_DEBUG_SYSLOG */ + + /* Debugging function - conditional printf and hex dump. Driver wrappers can + * use these for debugging purposes. */ +-- +2.12.2 + diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template index 99af7e4062d..1cf9476f3c7 100644 --- a/srcpkgs/hostapd/template +++ b/srcpkgs/hostapd/template @@ -1,7 +1,7 @@ # Template file for 'hostapd' pkgname=hostapd version=2.6 -revision=1 +revision=3 build_wrksrc=${pkgname} conf_files="/etc/hostapd/hostapd.conf" hostmakedepends="pkg-config" diff --git a/srcpkgs/hostmux/template b/srcpkgs/hostmux/template index 5e20fedb0c2..3ea5e78a879 100644 --- a/srcpkgs/hostmux/template +++ b/srcpkgs/hostmux/template @@ -1,6 +1,6 @@ # Template file for 'hostmux' pkgname=hostmux -version=1.1.1 +version=1.3.0 revision=1 noarch=yes depends="tmux" @@ -9,7 +9,7 @@ maintainer="Michael Gehring " license="MIT" homepage="https://github.com/hukl/hostmux" distfiles="https://github.com/hukl/hostmux/archive/${version}.tar.gz" -checksum=5dfccf25826217713a1739186dad90936a328b3b22220e0a55956ef8f656eb1c +checksum=044e6a2adebbd9d8bddaeae8cc95263cbd0fbda5591d34a38c673829bbe47295 do_install() { vbin hostmux diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index a8b9405a7e7..208392b21f0 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -1,7 +1,7 @@ # Template file for 'hplip' pkgname=hplip version=3.16.11 -revision=1 +revision=2 #XXX: pyqt pkgs for python gui hostmakedepends="pkg-config automake libtool python" makedepends="libressl-devel python-devel libxml2-python cups-devel sane-devel diff --git a/srcpkgs/httperf/template b/srcpkgs/httperf/template index f57f38972ac..84bec0d1795 100644 --- a/srcpkgs/httperf/template +++ b/srcpkgs/httperf/template @@ -1,7 +1,7 @@ # Template file for 'httperf' pkgname=httperf version=0.9.0 -revision=3 +revision=4 build_style=gnu-configure makedepends="libressl-devel" short_desc="A tool for measuring web server performance" diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template index 640747693aa..308f1de29e0 100644 --- a/srcpkgs/httpstat/template +++ b/srcpkgs/httpstat/template @@ -1,7 +1,7 @@ # Template file for 'httpstat' pkgname=httpstat version=1.0.0 -revision=3 +revision=4 build_style=go go_import_path="github.com/davecheney/httpstat" hostmakedepends="git" diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template index 8d6e6fd25bf..eace2a6bbb3 100644 --- a/srcpkgs/httrack/template +++ b/srcpkgs/httrack/template @@ -1,6 +1,6 @@ # Template file for 'httrack' pkgname="httrack" -version="3.48.22" +version=3.49.1 revision=2 build_style=gnu-configure configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr" @@ -9,7 +9,7 @@ maintainer="mid-kid " license="GPL-3" homepage="http://www.httrack.com" distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz" -checksum=b2831ad7b48e933959f83a9de8a72bcaa0f8eb87e9453ad85debd50d33a9c48f +checksum=8640ab00cabc9189667cc88829620ce08ac796688f0ef94876350d14fbe7a842 makedepends="zlib-devel libressl-devel" httrack-devel_package() { diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template index 0b9b73547f1..aa3513a2a38 100644 --- a/srcpkgs/hub/template +++ b/srcpkgs/hub/template @@ -1,7 +1,7 @@ # Template file for 'hub' pkgname=hub version=2.2.9 -revision=3 +revision=4 build_style=go go_import_path="github.com/github/hub" hostmakedepends="git" diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index a82988c962e..c128e33d048 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,7 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2016.2.0 -revision=3 +revision=4 build_style=cmake configure_args="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0" pycompile_module="hpi.py hsi.py" diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index 2d7797fdedf..14516cc3d9d 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,19 +1,17 @@ # Template file for 'hugo' pkgname=hugo -version=0.18.1 -revision=3 +version=0.20.6 +revision=1 build_style=go hostmakedepends="git-perl mercurial" depends="python-Pygments" go_import_path="github.com/spf13/${pkgname}" short_desc="A Fast & Modern Static Website Engine" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="SimPL-2" homepage="http://gohugo.io" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=29db2524a3042f507162164ec3ce9071277a7608547f4ea4f739d63cac4b39e4 - -broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/511/steps/shell_3/logs/stdio" +checksum=692e08b009430d27064821d498f1454152cbfd5f26d019c29002e6fbff8fc387 post_install() { vlicense LICENSE.md diff --git a/srcpkgs/hunspell/template b/srcpkgs/hunspell/template index b0c6855e6c4..635ada39998 100644 --- a/srcpkgs/hunspell/template +++ b/srcpkgs/hunspell/template @@ -1,6 +1,6 @@ # Template file for 'hunspell' pkgname=hunspell -version=1.6.0 +version=1.6.1 revision=1 build_style=gnu-configure configure_args="--with-ui" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="https://hunspell.github.io/" license="GPL-2, LGPL-2.1, MPL-1.1" distfiles="https://github.com/hunspell/hunspell/archive/v${version}.tar.gz" -checksum=512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2 +checksum=30f593733c50b794016bb03d31fd2a2071e4610c6fa4708e33edad2335102c49 pre_configure() { autoreconf -fi diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template index 589189ce76d..1e47e9a0220 100644 --- a/srcpkgs/hwids/template +++ b/srcpkgs/hwids/template @@ -1,6 +1,6 @@ # Template file for 'hwids' pkgname=hwids -version=20161103 +version=20170328 revision=1 noarch=yes wrksrc="hwids-hwids-${version}" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="https://github.com/gentoo/hwids" license="GPL-2" distfiles="https://github.com/gentoo/hwids/archive/hwids-${version}.tar.gz" -checksum=3353680623b97ffb3e73486dac7e9d61cb58889544aeefd6bbe12d51189e4313 +checksum=e46abb9ccb54aff728bb0502405aa700974a2a7366d3bb257967ce60d847cfb3 do_install() { vmkdir usr/share/hwdata diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template index 2814df79be5..b25d4fa8ae7 100644 --- a/srcpkgs/hwloc/template +++ b/srcpkgs/hwloc/template @@ -1,6 +1,6 @@ # Template file for 'hwloc' pkgname=hwloc -version=1.11.6 +version=1.11.7 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="3-clause-BSD" homepage="http://www.open-mpi.org/projects/hwloc/" distfiles="http://www.open-mpi.org/software/hwloc/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2" -checksum=7685f7b96c7c79412c494633862612b36f8745f05f84d35ab495d38b456d87fa +checksum=ab6910e248eed8c85d08b529917a6aae706b32b346e886ba830895e36a809729 post_install() { rm -rf ${DESTDIR}/usr/share/doc diff --git a/srcpkgs/i2pd/files/i2pd/run b/srcpkgs/i2pd/files/i2pd/run new file mode 100755 index 00000000000..ed33e086800 --- /dev/null +++ b/srcpkgs/i2pd/files/i2pd/run @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ ! -d /var/lib/i2pd ]; then + mkdir -p /var/lib/i2pd + chown -R _i2pd:_i2pd /var/lib/i2pd +fi +exec chpst -u _i2pd:_i2pd i2pd --service 2>&1 diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template index f2da8be0bb4..8f4bbda3260 100644 --- a/srcpkgs/i2pd/template +++ b/srcpkgs/i2pd/template @@ -1,7 +1,7 @@ # Template file for 'i2pd' pkgname=i2pd version=2.11.0 -revision=2 +revision=4 short_desc="I2P Daemon - a full-featured C++ implementation of I2P client" homepage="http://i2pd.website/" license="BSD" @@ -11,6 +11,7 @@ maintainer="Obosob " makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel" distfiles="https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz" checksum=4d7946e33a6a1dd4439590ea23b494f36e6fbcb81f7b36857bf264413a19e9db +system_accounts="_i2pd" case "${XBPS_TARGET_MACHINE}" in aarch64*) make_build_args+=" USE_AESNI=no USE_AVX=no" ;; @@ -25,3 +26,6 @@ do_install() { vsconf docs/subscriptions.txt vlicense LICENSE } +post_install() { + vsv i2pd +} diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template index 8df327fd1f7..f39b6258710 100644 --- a/srcpkgs/ibus/template +++ b/srcpkgs/ibus/template @@ -17,7 +17,7 @@ depends="hicolor-icon-theme iso-codes dbus-x11 python-xdg triggers="gtk-immodules gtk3-immodules" short_desc="Intelligent Input Bus" maintainer="Juan RP " -homepage="http://ibus.googlecode.com" +homepage="https://github.com/ibus/ibus" license="LGPL-2.1" distfiles="https://github.com/ibus/ibus/releases/download/${version}/ibus-${version}.tar.gz" checksum=a42b40fe4642f36bf2a6f0b4649f54f4043812d6bfee4faca38117799a009d3c diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template index 71350501c59..4ac48583489 100644 --- a/srcpkgs/icdiff/template +++ b/srcpkgs/icdiff/template @@ -1,15 +1,35 @@ # Template file for 'icdiff' pkgname=icdiff -version=1.7.3 -revision=3 +version=1.9.0 +revision=1 wrksrc=${pkgname}-release-${version} noarch=yes -build_style=python2-module -hostmakedepends="python-setuptools" +build_style=python-module +pycompile_module="icdiff.py" +hostmakedepends="python-setuptools python3-setuptools" depends="python" -short_desc="Improved colored diff" -maintainer="Duncaen " +short_desc="Improved colored diff (Python2)" +maintainer="Duncaen " license="PSF" homepage="http://www.jefftk.com/icdiff" distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz" -checksum=5161265f72a7c9c1d2d7b0780a381743ef3d3127944a96786422802a6bc14ca5 +checksum=ef64fda913c21be229e1ed967c577edcfc917543293c3bbd6d1a5775a84471cb + +alternatives=" + icdiff:icdiff:/usr/bin/icdiff2 + icdiff:git-icdiff:/usr/bin/git-icdiff2" + +python3-icdiff_package() { + noarch=yes + depends="python3" + pycompile_module="icdiff.py" + alternatives=" + icdiff:icdiff:/usr/bin/icdiff3 + icdiff:git-icdiff:/usr/bin/git-icdiff3" + short_desc="${short_desc/2/3}" + pkg_install() { + vmove usr/bin/icdiff3 + vmove usr/bin/git-icdiff3 + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template index 78254b90314..757b22da9b3 100644 --- a/srcpkgs/icecast/template +++ b/srcpkgs/icecast/template @@ -1,7 +1,7 @@ # Template file for 'icecast' pkgname=icecast version=2.4.3 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config libxml2-devel" makedepends="libressl-devel libcurl-devel speex-devel diff --git a/srcpkgs/icecat-i18n-be b/srcpkgs/icecat-i18n-cak similarity index 100% rename from srcpkgs/icecat-i18n-be rename to srcpkgs/icecat-i18n-cak diff --git a/srcpkgs/icecat-i18n-gn b/srcpkgs/icecat-i18n-gn new file mode 120000 index 00000000000..955bfa53bec --- /dev/null +++ b/srcpkgs/icecat-i18n-gn @@ -0,0 +1 @@ +icecat-i18n \ No newline at end of file diff --git a/srcpkgs/icecat-i18n/template b/srcpkgs/icecat-i18n/template index afb6ad93dc5..81d56476dab 100644 --- a/srcpkgs/icecat-i18n/template +++ b/srcpkgs/icecat-i18n/template @@ -1,6 +1,6 @@ # Template file for 'icecat-i18n' pkgname=icecat-i18n -version=45.7.0 +version=52.0.2 revision=1 build_style=meta homepage="https://directory.fsf.org/wiki/IceCat" @@ -19,96 +19,96 @@ do_install() { } _languages=( - 'ach "Acholi"' - 'af "Afrikaans"' - 'an "Aragonese"' - 'ar "Arabic"' - 'as "Assamese"' - 'ast "Asturian"' - 'az "Azerbaijani"' - 'be "Belarusian"' - 'bg "Bulgarian"' - 'bn-BD "Bengali (Bangladesh)"' - 'bn-IN "Bengali (India)"' - 'br "Breton"' - 'bs "Bosnian"' - 'ca "Catalan"' - 'cs "Czech"' - 'cy "Welsh"' - 'da "Danish"' - 'de "German"' - 'dsb "Lower Sorbian"' - 'el "Greek"' - 'en-GB "English (British)"' - 'en-US "English (US)"' - 'en-ZA "English (South African)"' - 'eo "Esperanto"' - 'es-AR "Spanish (Argentina)"' - 'es-CL "Spanish (Chile)"' - 'es-ES "Spanish (Spain)"' - 'es-MX "Spanish (Mexico)"' - 'et "Estonian"' - 'eu "Basque"' - 'fa "Persian"' - 'ff "Fulah"' - 'fi "Finnish"' - 'fr "French"' - 'fy-NL "Frisian"' - 'ga-IE "Irish"' - 'gd "Gaelic (Scotland)"' - 'gl "Galician"' - 'gu-IN "Gujarati"' - 'he "Hebrew"' - 'hi-IN "Hindi (India)"' - 'hr "Croatian"' - 'hsb "Upper Sorbian"' - 'hu "Hungarian"' - 'hy-AM "Armenian"' - 'id "Indonesian"' - 'is "Icelandic"' - 'it "Italian"' - 'ja-JP-mac "Japanese (Mac)"' - 'ja "Japanese"' - 'kk "Kazakh"' - 'km "Khmer"' - 'kn "Kannada"' - 'ko "Korean"' - 'lij "Ligurian"' - 'lt "Lithuanian"' - 'lv "Latvian"' - 'mai "Maithili"' - 'mk "Macedonian"' - 'ml "Malayalam"' - 'mr "Marathi"' - 'ms "Malay"' - 'nb-NO "Norwegian (Bokmål)"' - 'nl "Dutch"' - 'nn-NO "Norwegian (Nynorsk)"' - 'or "Oriya"' - 'pa-IN "Punjabi"' - 'pl "Polish"' - 'pt-BR "Portuguese (Brazilian)"' - 'pt-PT "Portuguese (Portugal)"' - 'rm "Romansh"' - 'ro "Romanian"' - 'ru "Russian"' - 'si "Sinhala"' - 'sk "Slovak"' - 'sl "Slovenian"' - 'son "Songhai"' - 'sq "Albanian"' - 'sr "Serbian"' - 'sv-SE "Swedish"' - 'ta "Tamil"' - 'te "Telugu"' - 'th "Thai"' - 'tr "Turkish"' - 'uk "Ukrainian"' - 'uz "Uzbek"' - 'vi "Vietnamese"' - 'xh "Xhosa"' - 'zh-CN "Chinese (Simplified)"' - 'zh-TW "Chinese (Traditional)"' + 'ach "Acholi"' + 'af "Afrikaans"' + 'an "Aragonese"' + 'ar "Arabic"' + 'as "Assamese"' + 'ast "Asturian"' + 'az "Azerbaijani"' + 'bg "Bulgarian"' + 'bn-BD "Bengali (Bangladesh)"' + 'bn-IN "Bengali (India)"' + 'br "Breton"' + 'bs "Bosnian"' + 'ca "Catalan"' + 'cak "Kaqchikel"' + 'cs "Czech"' + 'cy "Welsh"' + 'da "Danish"' + 'de "German"' + 'dsb "Lower Sorbian"' + 'el "Greek"' + 'en-GB "English (British)"' + 'en-US "English (US)"' + 'en-ZA "English (South African)"' + 'eo "Esperanto"' + 'es-AR "Spanish (Argentina)"' + 'es-CL "Spanish (Chile)"' + 'es-ES "Spanish (Spain)"' + 'es-MX "Spanish (Mexico)"' + 'et "Estonian"' + 'eu "Basque"' + 'fa "Persian"' + 'ff "Fulah"' + 'fi "Finnish"' + 'fr "French"' + 'fy-NL "Frisian"' + 'ga-IE "Irish"' + 'gd "Gaelic (Scotland)"' + 'gl "Galician"' + 'gn "Guarani"' + 'gu-IN "Gujarati (India)"' + 'he "Hebrew"' + 'hi-IN "Hindi (India)"' + 'hr "Croatian"' + 'hsb "Upper Sorbian"' + 'hu "Hungarian"' + 'hy-AM "Armenian"' + 'id "Indonesian"' + 'is "Icelandic"' + 'it "Italian"' + 'ja "Japanese"' + 'kk "Kazakh"' + 'km "Khmer"' + 'kn "Kannada"' + 'ko "Korean"' + 'lij "Ligurian"' + 'lt "Lithuanian"' + 'lv "Latvian"' + 'mai "Maithili"' + 'mk "Macedonian"' + 'ml "Malayalam"' + 'mr "Marathi"' + 'ms "Malay"' + 'nb-NO "Norwegian (Bokmål)"' + 'nl "Dutch"' + 'nn-NO "Norwegian (Nynorsk)"' + 'or "Oriya"' + 'pa-IN "Punjabi"' + 'pl "Polish"' + 'pt-BR "Portuguese (Brazilian)"' + 'pt-PT "Portuguese (Portugal)"' + 'rm "Romansh"' + 'ro "Romanian"' + 'ru "Russian"' + 'si "Sinhala"' + 'sk "Slovak"' + 'sl "Slovenian"' + 'son "Songhai"' + 'sq "Albanian"' + 'sr "Serbian"' + 'sv-SE "Swedish"' + 'ta "Tamil"' + 'te "Telugu"' + 'th "Thai"' + 'tr "Turkish"' + 'uk "Ukrainian"' + 'uz "Uzbek"' + 'vi "Vietnamese"' + 'xh "Xhosa"' + 'zh-CN "Chinese (Simplified)"' + 'zh-TW "Chinese (Traditional)"' ) depends="icecat>=${version}" @@ -140,184 +140,184 @@ _pkgtmpl() { } checksum=" -cdb1fb725906124e0d5cf46101797087b1352cdc99a9b9f00c9d18732850ca3e -1dac247b22ee59c9e89a19ccfd382725f93b75b4692887c5975bee001ae4d041 -05c3da877cb9605890fd2b2781ff178f67896cfb77a725f8a09190ea7fda5cb8 -801f2be88b276f8420ed3778f939f4a33eefb36f2dc91d516707cd806222d926 -f22cb62d24fa7dbe17e394719dc73a69beaeafb32f1e1c4007e140bb36f20fc1 -72545cbe2adcaec6770863d77dce91b4f3e893b060bbc11f35e502caceb1eadc -92282ae6b02301426ebf95a5007980535f377922367efb42389c302d8224c340 -00e0023345a2c7305fd6c94b04d938cd0455878998d92401f2a44242506a4567 -9c96083f0ff3d3aa81ab8a42327aa6c9d8358a8a1b50e5cbc304fd0628bf47d1 -9c52a6538f5a95bbac766ff639aea74ca3ba488193e31ceae87c8b233c6b9aa8 -27b04167df799c6f778be0ee1fe7d752d62a6d5a1857691b1909fff0b7423cf5 -5f5330e9f58256b8cda492bcfad5f85d8600e01288dc9b59e59ead977d286143 -ee168a5171b0ea13c53a7f40d746fdc49f13818fc0234805404c929adca0e58d -b36374e3d48a75e0929ebe862842f569d3c08e5008dc5e8746836bbec2ba8bb8 -cedd40db14018188654fb6a3939750665cba679278c4915ab96d58cd2d959f19 -047ce5ad3a57ec6930d47f4cfcc967c57892b484cdf1ebd31ff7f83fc1687dfd -e4268e1c75f40ebcc645f571a1cfbadaa9d914a57e7886828d584e89eed8ff32 -0d5437333a2b928ce5961199bd4f175447dfc276f31be9269d1e738f5df71085 -eeb23e663a4faba67064286ef168c42a70a8d6e573a176b95851a01b8215b32a -f207053f8985e7701fc3047cd8230a4c4fb5a7e787f7e2b7e3858ee8e89fee6f -5ea0375c29e149a8237ef847e5cf8f6f29579078ad733de8373649fa67e022d5 -26f85d7690bd7dc9c0f7b534ef7beca44776bcb433a5f1493de8fbab155db4a5 -5ed2905bb79b8ec34a172ee65182990122d5949a02a1da2f773910a3cf5ab409 -6815ff32bc50de7e4ea5eef36fb0c913ce499e45e0e55b9784a0408e96f11e2d -9394eabc9c2b4ce59b652ce5d71fb03c62c69669c3eee8464ef7f55fe652f792 -ffcfe796ffdb085e1c477bd3a6f6fa14a62a760a1e8e5fa41863677c8e850a25 -d4a7ecc325c642acba06921ba4be9c2a6ed12c3f4c59e00415fb5a2a9a00a495 -c471f694085a119dabac9a20398f00cd254aabfba0fa5ea66b70a0feb4dd071d -a7bc0a31dff2a4ef22ec060313d74c232fb978b689368c42825434bd05a97e96 -e3c9e8ed1a0758225bd251730021663c8c00085f9abc25996da11b4f7b37869c -93190ca45b560928fd02fb4eb515138c7961e0e80f1cbf48af7ed947c8b3b31b -477d44ef4cf41608d9ec11ad6644d73ca6f33db7aaf357dc2fe8c5bbaca3819a -c4a2db87ef24182a484764c5d3daaba3bed161b98b311112e4249c839e2a5394 -befa8c7dfaa05502c9efeedeebc20925fb8dd40f442eea515c1507bfb05c4794 -0fa269a4edf17dff3df1a9da62ca58d285f5c5cf3c255900b3e93b8edfbaad29 -fb4ca1c21f28bc0d477939c14e22ecb582a355d4a7ce3ba451bf029f255b4997 -c5b3a6a09b755ecb04c888c9a04a73bc3e5a794d6ce7de9897d6e2c2202ca42b -c1b141242c259c35c829f2bb2c6d945c57a26371ee13eec39516bdf167858beb -b867e74099a08ac3425b7f00208f6d63598e60ecb8cdae51e0fb6c44ad782b23 -4b52ed0fa92438785711c37b54b853100d3f2fc4ee3937c5f732d9802fe0744a -56490af1bed03763985ed12f65a57b3bc937ec982215a78b652ef054bb8d980a -44978951361cd612cbc8db6834bee6ea703ddcda86042021ddd9390c8b74a67a -6c56e1735309f7ff04c679c8922be185f260ee9020671e8df03a88b9b1aa71fb -0e6459326e2d60c9949a367f413f78cb94887fc5d17480fac705d89f57410f13 -ef401af38b0fdeb45a10966b21c7030787e68870c523403d01ea9a4d41d62e62 -daf879801d87a819c22ba0626f12f50246c6046cf1ba977f6cf63ed48fcdc97f -3cebe61c0992cd8cf92494cb9eeea8226e87aead3e6d9753b7d7fd024cbc018a -2c04ece3095f07dde55b4e2cdae70bf46a8e8ea64b435200962595bf9f3d514e -4aa43b4129c0b6e5f24bc417405eebda546178c226d953bd259fb8b1583d9c3f -0651c9e7bb1f03d26b6723e29603d6d01ddb40b0a699a68323c80a5f8d73bb68 -dc150501f59d042235152f7f2d83fe898483c43413a0a0109ccb8fc5b3019a90 -3ab573542ad5c1f82d5f9a043adcccdbf52f7c4436365f874f7a7d3177e4634c -8ccabdf4e207179ca06e3ec90ce9db164bb5ba9a01e8561e5db8e823e3176b01 -eb12ec41bb553beee58a4508b2ca8505c23ecfd91e87d21f499efeae83105c1e -f3ddabb7162807f286edd0a39cf7d5e0efc5f48aadeb4d7fe73f32f67bf347ec -60c04ed6586706417086e4728cd7b429bf2f4200293b9aa6d5c906969c564be7 -4853956441b0e75be036c4feafae7355984671769a9a9b81a34599b98b35dc8a -0197b668b5aa776ccc3c0668e5039de5309de98a427756595df871db7c0b1249 -4d57221839d29cf465388ddf1c5bb1613a064e66110da0c36af1e20636368a50 -7a6594250f48d11dc06b65b0deb22ea26287dd7a1fab0c8eaa599016fd5df6a2 -e2cc8e1eb2770a5549eecbf69079c1de060ee480b1826bb55edb88d4e173e378 -8ccaefac232a5dc820c131549676533c7276c9cb6f04f38e82ea32e8b454c0f9 -7b845c4004464ed466c0d2363575c5514972f8d27f5dfee020574b794a27d2c3 -f16b471f086d2e46bcb9d00e7f0aa06078a53fc3f1284a2e8e8edd34cbbc7344 -df1daefead20a51388144c8fc8ebb6896d203fc9696eac82de684187618d586b -2528a2fac728bfd8cfdfca860119b7692c6bdd92677d40df582d1235f9d7bbfd -6aeb56f7a6686937772362a8fb70e66a585b2f63841120377b43262a5f56f1be -1f235e2a2cc27ac995302c1a0526f5de0c2083686a396448e72542ed74a89593 -3e55a6f98f8780abf09dc584ac5c9afb011c28f1500fd648bdb49d3a43f4902a -8eedbee3c03ee50675f80189462972218e1b838a6d5d1de0ae43aa8dfd4821b2 -261c11eb4dbb5389c4645881db1ef395b17ac7ff32861c02cfb379fe3e3cd1e7 -22eacaf56fa446452025fefc8ab0ba3b75d42f8ce47eca5af29903f3bd15f444 -65d72740e6797576cc6384032605c65bf3b11c22a72475e0add33d3123871293 -d9def41f7d9c979d07def0126b3e02b783767d959f6504380d27ce1c8be48906 -c12ddc87363df555ab1918bbcae7187240542b4eff4476f7ac3b199ea31536fe -15e7403d4cc356bfdec5ea5aff24427232c8303740ff026c86328751439dde72 -217eed04bd57b2677e8330bc13eec33651c851320c5c82dc76bcfbda874fb27e -c6ac62b3b9b5a22a40f103283ec0a4e5086191b95dfa370aabf4c6e508befbdd -9b2559aec0d816eeb78eb07617a77671448c1350367ff38c2079b96072dac3d8 -530e20ba6f0f044213726caa47866b44e38af3dae91d1814e624238241fe742e -75155e3b77ef00ef85346c1e511ae3adc46b8526cfa8cae0365b269fc5e1ce8a -acecba32f473cb24e26cf8758e61962b8baee996803d4b5090c7ec2171cc55f4 -fc87ff7a5a1d6590f067f91e9b904857bc85fec5dbf392deed13ee89550df7cb -74e013e678e1bfbe1daa020d786397555222d99c009f77aaa1cce3b6ab6d1693 -a38c9341a9b23266507ae2faeff492783e907731164a2fe84f9076440c7203c8 -2ab460c1764a9e5537a1908e8d310bc061b24014e3af5ad51decbdbe10c612a9 -4723314f3d81f552fb03924da374f061397cd8c3d8f6db2290eab4868f8e5bd3 -a91dbadb2cbd3b3a3eaa56583cb407ecbf41021419e62a68e81838b0ac6ab95f -72e8bca1f5e0b0f17bf94641338aed4f89700adb7f5f16a712d5f78bc6fbca76 -8379dcec9c2eeb2a50d14365d412b7c7ca4bc9e4e9f02344b7d2157481a0e618 -ee13d71eff5034bf717ce599f2e379507b6dce4f06ac65de867e85f8707cc5b5 -5744e39ec3496dbeab960849fbfe195c67c08308b209f40d2e8df04809a8c9f2 -b0345eb645521120b9222c2f385d90cabf8a967e35dfb62775ba69cd81e4adaf -ddc8bfea2cffbf58e674d217e623a70538f480f9b8e17604f94547aed6f14d0a -10d93931d15616a719224de36e231fd944b962e80fdc74921dd1996a1e9a68e5 -076107b63a931f07d5368318999bbd804e0734f17074f1ed34ec657b2affe132 -13d5594c462d085ae2d84d0c28a51494323c2bb6aaee2a012857227876c4eee1 -f0c701dca308004c4807efb46888eb80d0600abc122a067e219162b677391f56 -2ac723f090001fd3fab0ac14afc1357b5c853186173247cd51bdc3c4be0c15db -a36f6e35236564646c23f8a09fcd7e1fab365e6ae79077e097c30bd86103250d -60d25d72a8d7984c0db2a7688e284ca63496b24dfe97ffbf58dd57f22a542bbe -f98875c1215507554d59f1fea5629508096e138493ebcd984a0fdf4e51806712 -45287e56e1574a7e712fb3a5d44603eef1fd574b865801cfbbe086125df27fc4 -46d0c18199c37adbe0fb5fcc1991e459a6e7b2289dc56b546ae33b683c9c1fc1 -70604abadfcf9d41aea887b4234e1d4fa6b1d7b7fea4d64438a838c6288d1043 -cb14dc1e690e37a230a77ba54a258122c293378029e678e7c9029424297faaeb -c73339db00eb37727821336b08b5951f5ad17826324c3aca5716d56a6382f9da -3e599dd31f7baa7e3a6d5adff5510ed6ff43cc50f2267c93392622f1c5861e8d -e79d5112799d8cd076134a1c10497d1ad45e37c82c0902907bbfa4e9919464fd -93931cd7da76802b1d40571e7aec2d63e3e73af7fa5b87168159c2821997a7b3 -7ef3d947bd0ce71f0e32b214f26286f053983a6af40fa05ecfccba6f5dab251d -2ea4e15b84a1fa73167611dccf1f13bb1a49dde8f2b1ccbd09514c27a885731f -76e28136c96ab04340efbab2c98a41f3d477fdc56e9bd35fc7ac39ddeacff767 -8d93286fa8c92f5113bc091605a93d54454e976bde9f948d7d8f74de9e970c87 -dcc7e04adfe126a4964205586ac9d377e2e448f0849cdf74585f5b62e5ae21a9 -8a050bfd1bff2d91f34a99e030f950eca76c31ee80544b5a464d84b8968702b2 -8230c5a34aaa9adac99dc48f7acb863c49f4dfe153f4e9fa162563e70248f8d2 -dfd74c18a320a5502f701c7121db76627ec137f01263e35595663dcf63436851 -ff876d8eb6ac72ebbc12909e4b57f5d8138b167a528ecba9597da44ebed785dc -9caf21efc66839e50b12932f80286dc29595a2f5a3a50582c41f55b564f7e7a7 -deaed823170639db235c463f1c43ea59b12395257dad11c7225c6bc560b401d7 -7dc86116c82b0e21fce758d2ee8057a5dcab52a9f06dbeba2e6225e8b25712cd -0cd7221699d1aff3d230d44572fd28997c7b90eb39cdaf6e53b9fb3400d05092 -37e20915196b11da7bcf96ec0402a59e7532511f8f4783a8136d689d0f406091 -f8a8ff31a0ff751ca46f177de3adf5fd3f29b46436bdf00959943cc36a22551a -97358915f501b10166099adb5f5aa4ece59a9c4413c71b4cd96c5b4ccb6645f2 -3744f06d3693b65892b210642459699903e55ce86f4ca9ef6171f92a8d992fff -95d31d7ae38f1ffed8d1f4526366d81ad57e89d91fc292630a5b6727616f359d -9502640c4d803c1cb0f8de0592c95d61f1251b5baa79c8d41824148345385beb -0d6c5983a5728af0d3eedafbd1a70dfac367024a3f9a606b0e001fd6836644f0 -39f026002662d17fab116aaf4d4d370b5b7782ff11ddb57fdde79017bae3add7 -cff9f535a35357f45e83311f7b0d3f5ca5aa1390b76298b7c724f7375ba567a9 -25b1da2811c2486e1f10808cc50481c51f2b0ad533f835332c29bd82b7504a22 -984549855a4b7d74358138b9fb4a82e8dcc1a823952a44b59d8be1abb529e2d3 -a7cf59c1a95d861ab47827bbab0ec802410aaa622230fdd8131ed4683b56b5cf -2676c664983b88dc1488895e791c3a5f14a4ccb6af3db4e7f0ca153535ebc5ca -11c929ecbf1d44682482c159e9cd5b57a6513078c835a567f2b987a495ef3baa -3738c9fb6876267359546bbc6107112a6ef78a77a4cbc311438d9906c99c6190 -10c0d7cd863cbf4e051217b121488a1b27fac134f498cc74d4eb90d2ada26a45 -80aca331393819665cd949794d1ebe14aba1e4e34cd4a63af718b912c21bbba4 -f5072537fd37f401b22379fc758e5f910f02ae9497a238319aeb078845713275 -5104576cd5d0c727337f417d01b4aea8e2d563c969c9a140a922a7c5ead23c92 -70b7903f5d84c91cb6b7ddede75757bf90f3837c052cc15a0d0dc6d2134420b5 -8957f668127e7807fb18880fa4ba0cce282b7c9ea73e2ec33108504d85a6ce3e -ffe23597c8214ebea70cba28ca710b68294eb46d4bef6f388419ab83f6a6490a -3c35bbb7bf0f6d4d323cab5e9faeab392b6bf2476f08d1d7958d03b4901596cf -bad87cc6bbdcfdde2c7a1229f63ad2692e2e228d9959e5db42d5dea972a148a4 -5f31997746b60d3b6922c7911f681408d479ecfd2f160475997cb167915a08b1 -ecdf801a4af75661579ef9195a24980828152f1368fb220c070ac74fe4024f32 -ba8e935901d103286d4d6782b46ef903f13cdb887cc6dedaa316c2099392297d -d5e8085fe85b57a695f94617e46d5bab1f6107e76a7733b859135b04acf82920 -bf4d4da5bd13fc5f7330b58bd5c039bfcbb831c0085d6e16fcd2559c7e3a81a7 -d69c5c2cf7d700aa6dedf5f388a008aaa3629345d88b224223c6bb0d91731282 -6c17185c46446f19367378988bb34f565171a45e3bf37d5bb5a9f94cfb1f5517 -cd16857189ddbbed65a432439f8002cbf54b8c16b342e62b2a23c14cd23af630 -1bb2b0f13fa08d89a84b35198bce0b4dcb1591a2607521205f9368fc8f108584 -52fb7c4fe302b50ae79fdf8f8b15e3a20367c5d7a78ca76bc46e2a308f85a0af -e6d8a319f73da54c1d779d3116c2c7fafc33c235ccb4940fbaca5062bc66ccbc -091cad06fba2793a9ccef92fe82f9366224e84cec5e1422cedeb15b7c3720975 -db591c73836194c08c00b9537c61704f00f057d5fb288bc47a0735ab549d022c -d1d45af90512ca79d359d8d5aa1f2ba76a24ad7f0c715d4ff6f0383b0f447221 -a5a41c617fed33223b090817eee9c54ad56e3329e501957cae36b5abf7031730 -91a7145278b65604dcaee92ac829a492f5892d7280e36036db5e8e03030214e0 -d92261ca8c0d1a4d4f3f0942018c6add85fb30a18cdce2f51bc4a16371c23985 -ba8a1ea737f87e0dfe638e621a9843ff23cfa7de7aa28b406a104135c281a27b -21fb766a3afaa5242ff910c6bf511c8dbc815dfbb5a8c43d42a85c941fba0435 -b47d47c39a504e4e368a597ab0dee600911cbb8fca0de2e08324bcc99ae595f6 -75d3fcffae0ee7aba0c4b32c55cf3532bc210db2bb81713d7067ee5ff7ca81f5 -2d61068df7f9e88e2e920f56aea093c1661bd652124cd584c8666a95b0de08fd -d34085a553a1872ee6fdc064d5b5f88ea43b5687ecc3f18acae92724bdbdf1ef -e87b4e20b9b5a6764bc1fd4bc2968353422d922953f31d68166d512c3577d4b4 -605c5fe17e4ab223574250688854b9a2a6d9cc10b93a7f70d0633115a0c8dff4 -7e26680d9db93c08a6f7e7b48cf15d6d10259edc7d90158cbdffb8d6e280e774 -37bfdc8b5f4a14ddf51aeaec78499227fb0d72abac6bdecd6e612e65119e543b -a6058832776544c4e60e3dd6c06a49326bc289194eec486be2e5c257daac467c -84dad0a6ffead84291eae11165afbf145e69b0aa3749255cecc4ab1f3a658c4c -002922ea1ef70647d79882689104348acb364e01737ab09da32f8ecce8908eb3 -e1023340abff235cafe24e14f514fe02e2f0f8276b0a003fe88ebf85a403dc8f -6aeae4f6ccdedb2dc4efbde3bad0f8f3cfd2fdfc8ed97809ce720256288f268c -3562ec58b72d5ab835c3f133ed8315b489113949748c6c6381a4063e7f1f2b98 +d03bb51046307005bb5542f81bcdc9c892d4abbc0ad041c4b62dc97254e78cb2 +e2004c7dc028b77565e23cfaa80856df957ec04194d4fce6a276a5a05e720692 +2525dce2a87d3ad22f5840fcecdf763758e6ddbce0937a6e4ca1cfb2336ecab7 +d6dc93788198d72e01bca1857c3b25665fa6fefbc85c4907e5f30d3e90217938 +9b2a2439c38319fe910b54809c16898a55bc975836f4d527cb1a1c0be528c98d +d2a8c135009d4df402986955eac7ee6d980f32373496929979bd5e2a3ffbcc94 +4339243ab1fb9cab1d55f7afd013d2697819f450ad2f1c245041b78b8c937834 +04aa30d02dce39cdf5e4761c0c160066eb3bf0896468bbaaf0a5638aaf31ffa9 +d0e0e9c005fcce2746425224a748433092af0f57c986dad476ef321880299398 +0df25bc39b23d7d3b8aa0a4dfaeae2f82f8ea0037a462d0b2b8a0131a8738ff3 +d5d23977b3f629136343d5e35f5e6e308a3b5dae36148b5f3fafb0725bf7e09a +6ecaf9886700a6c2b1adccdde151489c64fbeb79108269fe64ecb8294f27b264 +d345bae1e68f94095cab1d0c9010cc833fac501d18cfd29ecc46ce1bc9da9552 +ad0a130eb88c09f62b7dd9bcbcd2b2547fe05afea2d3e6a90ae0bae1e71d9c8c +dfc2c55d7d7bdc0a7f2bdbfea353647bc1a76ad6a319f7165bcabedaf7525450 +b318adb74e609632ef7c3dc33afb00496dc48d75b22b99b53153b90e1f22ea0e +6769ceebb6ded7a6ce4bb88d056cfbebb17f307903bdc2b6d1b9725a0afa9d2b +5e8e1d1993ab0dc1e915b6fe33bf281356c33bd2d7f789f4255a1717f6bf669f +78f8e333513595c387b01be3f1f4e2ad90dd2dec20ddfef7bb65233fabb57eba +5e7697d6dc9621af27057c0289b74c87d555e5b96316dd8181b57b18baafb63a +49652eedf3022324fa873a5db083ae9acaabb196e61072fadc30297cc5e2514c +58dcaaa356c286491b2bc5b38b13ad984da77de83f10cc8908f876dd75afb6a1 +32cae5e29fe82582c1caf02820823711e6a86bf93711f6eb0c1a50119a49fb2c +dff710b00e7dd1c60d9f8f6ce9a4ace69e8128d578c598addf83c074dafa57e4 +2ff9eeebf9d15580a38c6e3334b935813520b13a7a01bdd9d8ce721203a1b186 +84291f5c648452aa0c08a59b5704d64591b8675f89c996f5185bc11530c2d886 +f756e8c7db6e46599fb6e2138f29755d8b3add4f2800b0f94d1be440651b6c7d +9f031c4666a76038779d33e8b3f62d766c23ca2de6bba488acb257fed4dfa7df +95e177a54f941807d73b8ce62bffa2fe0b82c2b906a6050b64dc66be3d1d1c13 +fec8c2dd51bddfdc27aca2f22bb6ea43de83f0bf2af2444a2f000724310ccf2b +656ac6827a270dcac3e5666183fc5612c59d3f9ddd52308abb188e2e6bd84198 +c8c7106cc8511c6fddc2c10926866ab62a8e3b6cfc4df4a5c5020413f9c67770 +d4df0fe6b929b476458b48fae3e014adfd3b1313bf575c0502f24f9b37595b20 +00fe6c28e12e64e450fdad1b11af1ab13489e1ef6df1f73f3ec23072a81110a2 +56f08a62b26ebbac9db45b96226e7568d5b5f487966f0e413c0b11023b778a5d +1bdef50ba7e4231aa011b0f49c3de045f56464e0816648a63ee496a5609f6b5a +adcd50f6a6a34950429f10888b05a2a4bd6adf0b105db2a2823394e025eb81e9 +6ff719e2c572d373f1383123396a28e281679d57888cc77568a452041c7693a9 +bdadcf0fbc5299ea6da16b08178949295811ad2fd804b277d683876eca276431 +408675dfa38fcf922f83313f4ca56982f0c5836a82555fdde257c4c31f671848 +a1e4c2a39e072219f7a2ab98030ab5d72b2079af9372281e56efe2890bbad650 +a58dfa2e1a7512560a3e247aa150b134adb1195a912e4c4b841d262d6eadb9f2 +2d268c2a67263777ed273673578ded07d16d23f0ab839514e2da3fc9bd2d0a4a +d8119a009d095ea55e020f14fec0273b8ff68f00ebadf3f2926051432e140295 +d265fcca58332799b65fbf1dafcfc3bb57ab584ef74ea4377080d4956e01e549 +1aa63c0626993a5a4f5d01c45c86f84c934284408151c059482b056eba1936c6 +c5fe46e60f21c2b9ee08909fa71f16bff7e475c297864e6114c67a5a88c10791 +127d3f4a56f9fad8d626c45d62a1f339ef7dd8885b2430343a9626a7913a864b +1ccfa49500f0339ec897ef4be4f6fa1c7c46aa6197ef7ce0508d0b1199d7bf36 +0d651dbce3317aba69ad7f72dd542284df7fb71e601b0c0fae89ac7a3975cd97 +c6f28c1d02f135b65a27ca1e849a5cdc7bc17b33f362eea081b0df35d400935a +43c03863279a51253b5ad4d5403469b964225fdfcedd080d556b5573c959207c +3f4141aa8ecde4774a1be3972f9ac5c67ad117e626f694a256277d03cef2877c +9819973cd3227ea3ba446716207d787cbe5663b99efe2d12331426d67ad44742 +13f02be76871ccd59e2b112a4e47ae27d532df2688d348596a1f415f3faaa4ec +869c82b3ec331d38abc11665be7aedfda3f44e0f58ad484eea2803052cfe7abd +c5f8b52d3f84e7426e61a118e37e10cd2ea74671f23917a537e161d7a190e152 +9f6e04728eafdb4022910786f93ee69d369aa5706f5cad5796c99042fe02f45c +ac0b2cd7b1a36a743947c2d26f219107cf08056c2299509012735404b0458d22 +794f49a44d31e5bee48e68af3d6d052ae7e70b830cd9b7ea9d3fe4470fcb4208 +9fe56b9cbcc7eaf3d6b8917ad44ca6826f98aa1dc87906b9f96fa538bcb19612 +2f48b305ea93051a9b79f00213ee5c001ff12662d7a598e13027508e3407dd4d +85bebed425abbbcbe03b962e3ec1bcf23d1bbede21946cbda7be47a26f55610e +af9ea51befc406e0e5f1439f7ef796da124a5391b88a77acceeed285ba36d15d +c5725995b82582a3c12823898fbc28d8561aad9ba9c2b3c1b56749c1d00543c6 +4b5d9790a75e2cea8314d83120fc63d37b00bac176445cd9a1613f0ab4b10f8d +f48cd940d466a1da6fcb89952dffa2ec33b511e1abd73b05da5bc87512560387 +990ec9849c22eb75f94b5c2c1648b9a9ee7596e28f94410a85ac828e724afe7c +e4b0cd58b9ed68574f6354eff6c4e95d16d5e2e9d231fda82cce3ea418697c2d +7122e436686a15fbf5a474362eb5b13484fd54d8c3875ff4159ae2df1eae725c +bfd542f0a138531a12c4fe9565c6a4515e16b4baaf94eb5c3d66e5788f8ce136 +8b910131d090a04e996659f080fd8d1d31c54d2cb535c578da9485e0ffc551c2 +56ead824b87a482c00358928306a86467abad083c86f704912cc60a7495857ac +53c6bf5bc845e2dd9faf0a57008b2faee20a21e43319460ade45fcbe55126faa +c498b47cdf2a50d4bcf2c09cc1c643b0d7a68368a7d65b617bde1fb45e76f7c7 +4594b08f9593db2a760d679a262af4860ced76f6581a301e5440198addcbabb0 +512248ef422e85771c511b15668f28d7806b9076eff996bdced8b02e93b8e982 +6fa531e221b68a8dcff1336b3dc5121678a63976c7e39b6f4aecb2ea385b8e81 +d70d373ce99c6a6f0ffa907659be5984d7295e4de73f508ad6f1cab8c898fbe3 +58a226c3806b0fb0e4c0a8dc1dd0fd383568b82aeb2ffd5650ae9095b5b772b0 +71cb7c92c629edeff69d25445b7f5ad12a4248b3e538b280aab1fd4633bd7f9f +94509030700b1e37de67258cd272c5b86beae212ab830af03eefa0f050c42195 +d1c3d02f4ecc0f5999d56f42e240acccc97acbc10d8873035ac6f8a5434f55cf +950ef90202b7e3d21afe7fdeae9d528ce9b7bb392a868917401cc04fb81a5158 +1e5cdb681b0369177cc5c256c4c7460ccd9299e8af674924eaeadcfaabc43974 +0423ce88fa80c24c38bd6d031c157e3e82df872a43c5478d373c9e332d0c15eb +e2bf6d3bc2fd7efaf7826b02df1663975e983e8f93c81c4f4cd4152dae7cbe1b +e8be4e5bee80dc994b663bf24591fb8cb99871a75fb6082ee17d225932046c94 +e62e3eb0f5db2bc9b292009fb731b43b17b61368b595a92e4caaf049b67d9b44 +778c235ce57b412dc24ad6fe882f1d731a8e480896f805a44c53eaf1f1ffb841 +56695e83a8899eb283d7c1fea4caad45592974ee726ce924f431a95288f35ba6 +4590cae8e79311563865d92a543294a6c5eb41d408b8ed4dcb3d5add598bb7ff +c81b004e3f92cdbf1c6f83aad36a0e6fa01a512b07602e12c8b71a99c1b65d18 +064b5a2a68a4b5c6fdde5b05627eefd48407f48c65067b6ed99065eb7aadcbab +39d3ceb623a838281fa2ce80eb2b4d8a83114a273dc156c234e8e0b5448276b7 +645afef5e688738ba34fbdb77b7de4446c49e1de7359fbb3e994d23ca1f69782 +56d9849d7f90dcf542fd4899388090857629a3e192a137b360bda0a333481800 +1cbdfd1d1bca3a3d19f5b5de00d8d2f4f59964dfebd56373600c2cb1992266ac +0aa2257f4785c370491bff4b4fac9bd537682ec55c9b91407f9dac7b1e34674f +1c5c49b147841884c8fcfa3c62a630e088fedbddb0ae589a1c827ecc54657e35 +f38b67b09dd700dfa571ff0239d82c33c32c8ba09e6ef10f2badd94832e4eea2 +76bb8ccd91ee4bca2d179664fff25b2d971af5de3575c3a2baab827ae4da1f6f +3089c6a12e65445f19330219afe64c078e310833703f813a42eda723dd340fce +5e4a21a0d12011f26a33824c18d1fdd8dc5dd5d19daa81001389837ffee8c542 +d43a86163c849eed4cb64ba624dc9e247df8161792df252823170a5d4fa70695 +7a94fc7eb369db5b965d55238bbc09e3480173b8ecdc0ed7f29aa34f7a7fff1f +8cfb025dbb2324f4cb1ff2d102d7a7f85c0cc863e97835134a658a568ad6182b +812a5beacf9ec040a8f83e43d52c5aa5a201410f544747baa735dd6ac1198a14 +2f047822e3ee78c3e92fcd10eecf511f0bf5cf31910dd16347efe689707867ec +03f8bc020a6b9c6b16bbbac57612d5b868f961b9871b120ec6c3548b194ec26d +865eeb32f1f277f067722fd05ec65a1bc5b28ebc4284dcf784fc782c7767fdcc +1e19f79183d530785c00a50d7e4711749f03516f440d0305400616f0de6c1c47 +4ec45c6f3f56d7af07dbd3a16af9af8c817af287487b157c422d4d3ddd18a54c +be93d215769315ff8ff80ce85937721256e169c82b5cec6f321519b3147da8e5 +6374f079d4bfa6deed0afb1893f2f52186419d0da62ff6c33a002973997f49a0 +1d0969efcecedbb9ff59894410a3d8b4fcc357024070f5573b55c274ca3815af +784f0244d23cddb2aeb140b2fc8cfd6c23a166b7cf3e75e08b4c56762b5babe8 +54ccf2466bf5058060a893dec9547e6ce308f055ba73f58b71eae1af5e5d18cd +4fcb1b9873caf3f7a8b30d618f6b6e64b32158a5516c3854d8bfc8a7965db3ee +795a5a1f959c2cddbc15e89938fa807b9b436d7342c7cb048253357871dfb22a +412aa1fbbd91ccfabb390e3af9147d6003e63c79a83e3e4964b6c5cfba58f1b5 +5e164b5c1b258278e3b5cf9b359eb6e9b7ac2ac490d682d7a8354077beaf3428 +2aa2f7f73dc0ddefb3edf86463cbf15355f210b1764f888f17a0aaa59c1143b8 +8977d786ad76177b16878fd6daa7a086723df7c6fa4189f5aa2eb86beda66430 +2e17d73f58fde4edffe82f5359f0c384459c4d3d29c27e7a3b563ba6ad7ace90 +5bbea1f7cfac10ff7c92960c5ad976a6a8758c8bd1e9084a3895ce8088241eaf +5e345813b61130b4eb987545b6ce254e3778714bb022ff1f26e50f261bfb0890 +b6ef893fcbc87b231bad4274a57d6d06d6720df791561d19b82990d85bed93bb +4514569542812550e1c55c0800e39d038bdd6d62d6d2659e354768bc68a1633a +6ec2988cbab0883a3a8e751d7208248955a6b4b3a15bb6e94b00f5b3deec8017 +7c826b520cc01fdc60e6f08cd48cbfc350b7d4ddd410ec530fa4001ad86005d7 +b10de431aecec597093488ea8dec6396bc60fb97df51846f6db935daa4d5be16 +d0d4f518332b58fee476f18860b8a513f36ea7b2d0e86a69aeb92ae05499e10a +0e95e07079fc55761cfcb45caf0e94dd40cb5d6c79e9fdd72447e34403877fc6 +5f9caff48a32a3a8cd19d89b80b5147522f3a0e5dc949422a7133e0376e62c88 +48f820f9f949e0d728f5f16a520e449ec708f610c7d982fa65591bb2a0f91560 +af7c8fc3d87f58ce5102beeec6f930c89c2925ff96265d06174ba32a6d835585 +2ab6da58a61d7dc891970abae135e4dee2b0c81790e4b265c7c9feb103819d03 +045d6293592b290d1e694b329f53142228df17d0fac212ce8fd2c1051f3b44f6 +4a5756f6efb4ffb19265b406da8bec702740de56eaa2df85c93fb43ebed810e5 +502c13d649335070c599f455ce628ae503c3dd4814779bebe4b3990edde868c8 +b0d36fc15622166a8803ea7b98bad0bdc4d2789cfada660cbdd9a7da89dbad6a +b1eb6b0792cc82c0df37f9f9e71b5b2b5fe7b87eb2478871bb90d8b6519909da +d4d9a46901c753ddca2201117f41dcc1311f477e1ce9f913cea74e9d2673d347 +fad15440eac92ed0aae5836c095bfa8d3df748dcd7abce3c4a2cc7d936cf811c +64d504f675081151bb3e85242f688fd91ba88a1084f68ddee05e51bb8e7dc00c +ead9dde21ba05c8d3533d37be0c99d80e9f7e0a78331a1a2004cbf60f205515c +53b37fe7b882678cc0a2e5c847c3de6c91a594a3c0c1bcbef8994f98ce5afca4 +e8fb25ad3ce83c913e424ca15e4039ae1d37a7548db145f6aa092ed868c922b4 +41d89372919fdfbf456e499dbf74c48828dff8c85c7104c80e26c65201bbaaf1 +f36c9add2e205d58eb7a881dbb0da6b1d9ec8b2fd91f976a2e0a38985aaaf243 +7c19d95fa286dadf58ccca4505120119c2a8fb83176668bf8650f006d92dbf24 +fe8eb02072b7a0a2000f083d93d70559905a9d37d0f95b005a81fe5a3df372e2 +831c5cbd3fc49e7fcffc8af572c8b4c9b3a630b2e8f2ab9bb2e4ade9dff42949 +4a079a3f1e53787ad104db3b1510877659871c4e8a555342171ad71d554c6cb7 +6d9ac6c5b0aff7781fa9aecc8a0574f2ed9ba25cda2191359f02e977f1bdd8ef +c86188aa1b3929b6dc51ec58a92cfecd276c4f415b7f288e454b86dc14303d79 +14ffad9e1c1aeb4b4f9b95da77ea6d32279150da5acf0b414e5b1c90a7524546 +f3560e00c97c1700ccc100095d78f9a4821f53750bf24aa758809e0888980d95 +547e48fcfc6150ecf307847fb8e6ae384f73ae78928932c10e81690bda1a2ecb +79cf13da0fffad3e7f7616818f681eb2a606daefba43300029dcb79d68add03a +3273d66e0750760f6313ae5c9b7177d9c2bcd3399d0bf7405d26ae5e1d63b5d1 +c01b1b61debecd7961b2477f6f8c4e5adfb2f303d6aa6fc94366482245bd65c3 +7252976d0142f09d8253caafca4ed68557e4c565890e223e2601d6099f8d1c6e +4d9a2150c7487712153290d029ac4aa9b1a94d2cf08d2a2bf0fe273f139894e9 +953e1f95a08df8c5ac950988264f75066085a33c2ca819d0d8162d81dd862a0a +d18838fbefc1e263b72addcd1a0fd09dc6da8f8a7a2241953cba183a22eb3ac4 +080601fb9ea7cfa863c10be83c158f94c61dc753c046b0a9f2ab1c488678e3f0 +9b91621fb4fe03c9257764194f860d2aa2cf3edb82b753f5b642c2067002e94f +2aab7962e69c7e57961174fb82a03ae7747e90554ce90e0128f5a6c8cb5da562 +b2575a4112f3bafd31725f5bb6d46d55b020c709275de87479c9741066c856bf +4a19948fa192c96577877ba45807d87ef9b989238133b990f5003f85dc74af42 +1bb56828b1344b4929d79307aad2fa58076ba8e856b6fb0f9be9bfcd63265a2c +8ae7f792d55d3e6766698bccb3f9cdd73701334187248425973cab9b7ffe12a8 +e3da1892c9df8ee4eec98dc10141f38d90a64028d7b5b7e6786ccfa296566453 +2acb0a1c1f6b0a767c08a6aa4739beba67178e056e0457db9c43ebf60b3b0757 +23e6168131af6d5526a1d4b5d67853f343192a62c7248c6bd699f69e4de92f3e +141f61b921c62799b54d6fd0b84ffd3417567f3363ae486283347e059bd8470f +75543c0ecca7d877d3a5f80d565d28fe7963973a96e0b6ca6b3df9c31a899132 +966681a1f205214562f9a54f50942b2312619bb04f90d986841ef184d88822d6 " diff --git a/srcpkgs/icecat/files/mozconfig b/srcpkgs/icecat/files/mozconfig new file mode 100644 index 00000000000..ac3ab4f26d9 --- /dev/null +++ b/srcpkgs/icecat/files/mozconfig @@ -0,0 +1,48 @@ +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +ac_add_options --with-pthreads +# XXX build without system cairo see: +# - https://github.com/voidlinux/void-packages/issues/2308#issuecomment-135426813 +# - https://bugs.gentoo.org/show_bug.cgi?id=558150 +# ac_add_options --with-system-cairo +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-bz2 +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --with-system-icu +# XXX: the system's libpng doesn't have APNG support +ac_add_options --without-system-png +ac_add_options --enable-system-pixman +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi + +ac_add_options --with-nspr-prefix=${XBPS_CROSS_BASE}/usr +ac_add_options --with-nss-prefix=${XBPS_CROSS_BASE}/usr + +nspr_config_args=" + --libdir=${XBPS_CROSS_BASE}/usr/lib + --includedir=${XBPS_CROSS_BASE}/usr/include/nspr" + +nss_config_args=" + --libdir=${XBPS_CROSS_BASE}/usr/lib + --includedir=${XBPS_CROSS_BASE}/usr/include/nss" + +ac_add_options --disable-gconf +ac_add_options --disable-tests +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-elf-hack +ac_add_options --disable-install-strip +ac_add_options --disable-strip +ac_add_options --disable-profiling +ac_add_options --enable-optimize="$CFLAGS" +ac_add_options --enable-pie + +ac_add_options --enable-official-branding +ac_add_options --enable-safe-browsing +ac_add_options --enable-application=browser diff --git a/srcpkgs/icecat/patches/disable-hunspell_hooks.patch b/srcpkgs/icecat/patches/disable-hunspell_hooks.patch new file mode 100644 index 00000000000..a5f7c29f2bd --- /dev/null +++ b/srcpkgs/icecat/patches/disable-hunspell_hooks.patch @@ -0,0 +1,11 @@ +--- mozilla-config.h.in 2016-07-06 15:16:06.621880293 +0200 ++++ mozilla-config.h.in 2016-07-06 15:16:42.958428126 +0200 +@@ -54,7 +54,7 @@ + * HUNSPELL_STATIC is defined in extensions/spellcheck/hunspell/src/Makefile.in, + * unless --enable-system-hunspell is defined. + */ +-#if defined(HUNSPELL_STATIC) ++#if 0 + #include "hunspell_alloc_hooks.h" + #include "hunspell_fopen_hooks.h" + #endif diff --git a/srcpkgs/icecat/patches/fix-gcc-tests.patch b/srcpkgs/icecat/patches/fix-gcc-tests.patch deleted file mode 100644 index 90856346bea..00000000000 --- a/srcpkgs/icecat/patches/fix-gcc-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.orig 2015-05-29 18:30:41.474423097 +0200 -+++ configure 2015-05-29 18:30:53.451550589 +0200 -@@ -10966,8 +10966,8 @@ ac_have_llvm_pr8927="no" - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' --ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+ac_compile='${CC-cc} -c conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross - - ---- js/src/configure.orig 2015-05-29 18:31:25.049874012 +0200 -+++ js/src/configure 2015-05-29 18:31:36.898995291 +0200 -@@ -9820,8 +9820,8 @@ ac_have_llvm_pr8927="no" - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' --ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+ac_compile='${CC-cc} -c conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross - - diff --git a/srcpkgs/icecat/patches/fix-gcc6-cpluplus_scope.patch b/srcpkgs/icecat/patches/fix-gcc6-cpluplus_scope.patch deleted file mode 100644 index f472be6e1eb..00000000000 --- a/srcpkgs/icecat/patches/fix-gcc6-cpluplus_scope.patch +++ /dev/null @@ -1,15 +0,0 @@ -Add patch to to correct the source to be compatible with gcc6 by -preventing c++ scope errors. - ---- nsprpub/config/make-system-wrappers.pl 2016-05-12 19:10:05.000000000 +0200 -+++ nsprpub/config/make-system-wrappers.pl 2016-09-17 15:03:53.901400739 +0200 -@@ -19,7 +19,9 @@ - open OUT, ">$output_dir/$_"; - print OUT "#pragma GCC system_header\n"; # suppress include_next warning - print OUT "#pragma GCC visibility push(default)\n"; -+ print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n"; - print OUT "#include_next \<$_\>\n"; -+ print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n"; - print OUT "#pragma GCC visibility pop\n"; - close OUT; - } diff --git a/srcpkgs/firefox/patches/fix-python-foo.patch b/srcpkgs/icecat/patches/fix-python-foo.patch similarity index 100% rename from srcpkgs/firefox/patches/fix-python-foo.patch rename to srcpkgs/icecat/patches/fix-python-foo.patch diff --git a/srcpkgs/icecat/patches/fix-toolkit.patch b/srcpkgs/icecat/patches/fix-toolkit.patch index b5575335374..7d79879862d 100644 --- a/srcpkgs/icecat/patches/fix-toolkit.patch +++ b/srcpkgs/icecat/patches/fix-toolkit.patch @@ -1,3 +1,18 @@ +--- toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig 2016-07-05 21:00:03.672000517 +0200 ++++ toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2016-07-05 21:05:37.347806230 +0200 +@@ -1134,6 +1134,12 @@ + #ifndef __NR_fallocate + #define __NR_fallocate 285 + #endif ++ ++#undef __NR_pread ++#define __NR_pread __NR_pread64 ++#undef __NR_pwrite ++#define __NR_pwrite __NR_pwrite64 ++ + /* End of x86-64 definitions */ + #elif defined(__mips__) + #if _MIPS_SIM == _MIPS_SIM_ABI32 --- toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-03-15 05:19:36.000000000 +0000 +++ toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-04-17 10:24:33.793431933 +0000 @@ -45,6 +45,7 @@ @@ -23,29 +38,16 @@ namespace google_breakpad { --- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-03-15 05:19:36.000000000 +0000 +++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-04-17 10:24:33.793431933 +0000 -@@ -53,9 +53,10 @@ - #include - #endif - --#ifdef HAVE_A_OUT_H -+#if 0 - #include - #endif -+ +@@ -55,7 +55,7 @@ + #ifdef HAVE_MACH_O_NLIST_H #include +-#elif defined(HAVE_A_OUT_H) ++#elif 0 + #include #endif ---- toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-03-15 05:19:37.000000000 +0000 -+++ toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-04-17 10:24:33.793431933 +0000 -@@ -2813,7 +2813,7 @@ - LSS_INLINE _syscall6(void*, mmap, void*, s, - size_t, l, int, p, - int, f, int, d, -- __off64_t, o) -+ off_t, o) - - LSS_INLINE _syscall4(int, newfstatat, int, d, - const char *, p, + + --- toolkit.orig/mozapps/update/common/updatedefines.h 2014-03-15 05:19:37.000000000 +0000 +++ toolkit/mozapps/update/common/updatedefines.h 2014-04-17 10:24:33.793431933 +0000 @@ -105,7 +105,7 @@ diff --git a/srcpkgs/icecat/patches/fix-tools.patch b/srcpkgs/icecat/patches/fix-tools.patch index a44f4068afe..1f6df6d9214 100644 --- a/srcpkgs/icecat/patches/fix-tools.patch +++ b/srcpkgs/icecat/patches/fix-tools.patch @@ -1,13 +1,3 @@ ---- tools/profiler/gecko/local_debug_info_symbolizer.cc -+++ tools/profiler/gecko/local_debug_info_symbolizer.cc -@@ -3,6 +3,7 @@ - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -+#include - #include "PlatformMacros.h" - #include "nsAutoPtr.h" - --- tools/profiler/core/platform.h +++ tools/profiler/core/platform.h @@ -29,6 +29,8 @@ @@ -52,31 +42,3 @@ } void OS::SleepMicro(int microseconds) ---- tools/profiler/core/platform.h.orig 2015-11-04 18:27:58.170732586 +0100 -+++ tools/profiler/core/platform.h 2015-11-04 18:29:11.898478051 +0100 -@@ -60,9 +60,9 @@ - #include "v8-support.h" - #include - --// We need a definition of gettid(), but glibc doesn't provide a -+// We need a definition of gettid(), but glibc nor musl don't provide a - // wrapper for it. --#if defined(__GLIBC__) -+#if defined(__linux__) - #include - #include - static inline pid_t gettid() ---- media/libav/config_unix.h.orig 2015-11-04 18:38:46.660289503 +0100 -+++ media/libav/config_unix.h 2015-11-04 18:39:38.620814879 +0100 -@@ -223,7 +223,11 @@ - #define HAVE_STRERROR_R 1 - #define HAVE_STRPTIME 1 - #define HAVE_SYSCONF 1 -+#if !defined(__linux__) || defined(__GLIBC__) - #define HAVE_SYSCTL 1 -+#else -+#define HAVE_SYSCTL 0 -+#endif - #define HAVE_USLEEP 1 - #define HAVE_VIRTUALALLOC 0 - #define HAVE_PTHREADS 0 diff --git a/srcpkgs/icecat/patches/mallinfo.patch b/srcpkgs/icecat/patches/mallinfo.patch new file mode 100644 index 00000000000..c9a38d45bdf --- /dev/null +++ b/srcpkgs/icecat/patches/mallinfo.patch @@ -0,0 +1,18 @@ +--- xpcom/base/nsMemoryReporterManager.cpp ++++ xpcom/base/nsMemoryReporterManager.cpp +@@ -153,6 +153,7 @@ ResidentUniqueDistinguishedAmount(int64_t* aN) + return GetProcSelfSmapsPrivate(aN); + } + ++#ifdef __GLIBC__ + #define HAVE_SYSTEM_HEAP_REPORTER 1 + nsresult + SystemHeapSize(int64_t* aSizeOut) +@@ -172,6 +173,7 @@ SystemHeapSize(int64_t* aSizeOut) + *aSizeOut = size_t(info.hblkhd) + size_t(info.uordblks); + return NS_OK; + } ++#endif + + #elif defined(__DragonFly__) || defined(__FreeBSD__) \ + || defined(__NetBSD__) || defined(__OpenBSD__) \ diff --git a/srcpkgs/icecat/patches/patch-xpcom_components_Module.h b/srcpkgs/icecat/patches/patch-xpcom_components_Module.h deleted file mode 100644 index 866c7b4a585..00000000000 --- a/srcpkgs/icecat/patches/patch-xpcom_components_Module.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-xpcom_components_Module.h,v 1.1 2016/02/06 22:13:22 ryoon Exp $ - -* Workaround for binutils/GNU ld 2.26 from NetBSD/amd64 7.99.26 - ---- xpcom/components/Module.h.orig 2016-01-23 23:23:51.000000000 +0000 -+++ xpcom/components/Module.h -@@ -125,7 +125,7 @@ struct Module - # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport) - # elif defined(__GNUC__) - # if defined(__ELF__) --# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("protected"))) -+# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("default"))) - # elif defined(__MACH__) - # define NSMODULE_SECTION __attribute__((section("__DATA, .kPStaticModules"), visibility("default"))) - # elif defined (_WIN32) diff --git a/srcpkgs/icecat/patches/stat.patch b/srcpkgs/icecat/patches/stat.patch deleted file mode 100644 index 34672a21012..00000000000 --- a/srcpkgs/icecat/patches/stat.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- dom/system/OSFileConstants.cpp.orig 2013-04-17 06:17:29.798371189 +0000 -+++ dom/system/OSFileConstants.cpp 2013-04-17 06:30:30.032285977 +0000 -@@ -509,6 +509,11 @@ - INT_CONSTANT(_STAT_VER), - #endif // defined(_STAT_VER) - -+ // glibc's stat/lstat/fstat are macros while uclibc's are not -+#if defined(__GLIBC__) && !defined(__UCLIBC__) -+ { "OSFILE_STAT_MACROS", JS::Int32Value(1) }, -+#endif // defined(stat) -+ - PROP_END - }; - ---- toolkit/components/osfile/modules/osfile_unix_back.jsm.orig 2014-04-03 13:08:26.686409787 +0000 -+++ toolkit/components/osfile/modules/osfile_unix_back.jsm 2014-04-03 13:34:14.101716259 +0000 -@@ -512,7 +512,7 @@ - /*path*/ Type.fd, - /*buf*/ Type.stat.out_ptr - ); -- } else if (Const._STAT_VER != undefined) { -+ } else if (Const.OSFILE_STAT_MACROS != undefined) { - const ver = Const._STAT_VER; - let xstat_name, lxstat_name, fxstat_name; - if (OS.Constants.Sys.Name == "SunOS") { diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index 3014001da4b..4fe00efd17b 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -1,166 +1,92 @@ # Template build file for 'icecat'. pkgname=icecat -version=45.7.0 +version=52.0.2 revision=1 short_desc="GNU version of the Firefox browser" maintainer="Jürgen Buchmüller " homepage="https://www.gnu.org/software/${pkgname}/" license="MPL-1.1, GPL-2, LGPL-2.1" distfiles="${GNU_SITE}/${pkgname}/${version}/${pkgname}-${version}-gnu1.tar.bz2" -checksum=635b2d458b22221dcaff4463ce3ed2983e6fc4981c09170899fd63ea231dc7d6 +checksum=8901a4ab7f2b87d5516c77cbdec6d276cdde64421725d4ed613c1b4f805a4a2b +only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes lib32disabled=yes -hostmakedepends="unzip zip pkg-config perl python yasm" -makedepends="nss-devel libjpeg-turbo-devel icu-devel - pixman-devel sqlite-devel gst-plugins-base1-devel gtk+-devel - libevent-devel libnotify-devel libvpx-devel libXrender-devel - startup-notification-devel dbus-glib-devel alsa-lib-devel pulseaudio-devel - hunspell-devel libXcomposite-devel libSM-devel libXScrnSaver-devel - libXt-devel libXdamage-devel" -depends="desktop-file-utils hicolor-icon-theme" +hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm" +makedepends=" + nss-devel libjpeg-turbo-devel gtk+-devel icu-devel pixman-devel + sqlite-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel + hunspell-devel libXcomposite-devel libSM-devel libXt-devel libXdamage-devel + $(vopt_if alsa alsa-lib-devel) $(vopt_if dbus dbus-glib-devel) + $(vopt_if gtk3 gtk+3-devel) $(vopt_if pulseaudio pulseaudio-devel) + $(vopt_if startup_notification startup-notification-devel) + $(vopt_if xscreensaver libXScrnSaver-devel)" +depends="nss>=3.27 desktop-file-utils hicolor-icon-theme" -nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/29602/steps/shell_3/logs/stdio" +build_options="alsa dbus gtk3 pulseaudio startup_notification xscreensaver" +build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensaver" -# Make config/system_wrappers/alsa/alsalib.h and pulse/pulse.h find -# the required includes -CFLAGS+="\ - -I${XBPS_CROSS_BASE}/usr/include/alsa \ - -I${XBPS_CROSS_BASE}/usr/include/pulse \ - -I${XBPS_CROSS_BASE}/usr/include/nspr \ - -I${XBPS_CROSS_BASE}/usr/include/nss" -CXXFLAGS="${CFLAGS}" +desc_option_gtk3="Build the GTK+3 toolkit UI" -if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then - # Append CFLAGS and CXXFLAGS to set work around code which gcc6 would - # otherwise regard as out-of-specification and allow it to produce a - # working program. - CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" - CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" -fi +# CFLAGS and CXXFLAGS to set work around code which gcc6 would +# otherwise regard as out-of-specification and allow it to produce a +# working program. +CFLAGS="-fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" +CXXFLAGS="-fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" -if [ -n "$CROSS_BUILD" ]; then - # Void's system-sqlite is compiled with SQLITE_ENABLE_DBSTAT_VTAB, - # but the test fails when cross compiling - export ac_cv_sqlite_dbstat_vtab=yes -fi - -pre_configure() { +post_extract() { case "$XBPS_TARGET_MACHINE" in *-musl) - $XBPS_FETCH_CMD http://git.alpinelinux.org/cgit/aports/plain/community/firefox-esr/stab.h - mv stab.h toolkit/crashreporter/google-breakpad/src/ + # fix musl rust triplet + sed -i "s/\(x86_64-unknown-linux\)-gnu/\1-musl/" build/moz.configure/rust.configure + cp "${FILESDIR}/stab.h" toolkit/crashreporter/google-breakpad/src/ + ;; + esac + # Google API key (see http://www.chromium.org/developers/how-tos/api-keys) + # Note: This is for Void Linux use ONLY. + echo -n "AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" > google-api-key +} +do_build() { + cp ${FILESDIR}/mozconfig .mozconfig + + case "$XBPS_TARGET_MACHINE" in + *-musl) + echo "ac_cv_header_execinfo_h=no" >> .mozconfig + echo "ac_add_options --disable-jemalloc" >> .mozconfig + echo "ac_add_options --enable-gold=no" >> .mozconfig ;; esac - # configure script misdetects the preprocessor without an optimization level - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure - - # Google API key (see http://www.chromium.org/developers/how-tos/api-keys) - # Note: This is for Void Linux use ONLY. - _google_api_key="AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" - echo -n "$_google_api_key" > google-api-key - [ ! -d xbps-build ] && mkdir -p xbps-build -} -do_configure() { - local _args - if [ "$CROSS_BUILD" ]; then - export HOST_CFLAGS="${XBPS_CFLAGS}" - export HOST_CXXFLAGS="${XBPS_CXXFLAGS}" - - cross_args+=" --target=$XBPS_CROSS_TRIPLET" - export ac_cv_sqlite_secure_delete=yes - export ac_cv_sqlite_threadsafe=yes - export ac_cv_sqlite_enable_fts3=yes - export ac_cv_sqlite_enable_unlock_notify=yes - # Fix wrong assignment of (modified) $HOST_CXXFLAGS in js/src/configure - sed -i js/src/configure \ - -e "s;CFLAGS=\"\$HOST_CXXFLAGS\";CFLAGS=\"${XBPS_CXXFLAGS}\";" - fi - case "$XBPS_TARGET_MACHINE" in - *-musl) export ac_cv_header_execinfo_h=no; _args="--disable-gold";; - *) _args="--enable-gold";; - esac - - export ac_cv_sqlite_secure_delete=yes - export ac_cv_sqlite_threadsafe=yes - export ac_cv_sqlite_enable_fts3=yes - export ac_cv_sqlite_enable_unlock_notify=yes - export ac_cv_prog_hostcxx_works=1 + # echo "ac_cv_sqlite_threadsafe=yes" >> .mozconfig + # echo "ac_cv_sqlite_enable_fts3=yes" >> .mozconfig + # echo "ac_cv_sqlite_enable_unlock_notify=yes" >> .mozconfig + # echo "ac_cv_prog_hostcxx_works=1" >> .mozconfig mkdir -p /usr/lib/icecat export LDFLAGS+=" -Wl,-rpath=/usr/lib/icecat" - # Patch to use /usr/lib/icecat instead of /usr/lib/icecat-${version} - sed -i config/baseconfig.mk \ - -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' \ - -e 's;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g' + if [ -n "$SOURCE_DATE_EPOCH" ]; then + export MOZ_BUILD_DATE=$(date --date "@$SOURCE_DATE_EPOCH" "+%Y%m%d%H%M%S") + fi + + cat >>.mozconfig <p; // the current buffer + mapIndex = ix - u8b->toUCharsMapStart; ++ U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars)); + ut->chunkOffset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx; + return TRUE; +@@ -1299,4 +1306,8 @@ + // If index is at the end, there is no character there to look at. + if (ix != ut->b) { ++ // Note: this function will only move the index back if it is on a trail byte ++ // and there is a preceding lead byte and the sequence from the lead ++ // through this trail could be part of a valid UTF-8 sequence ++ // Otherwise the index remains unchanged. + U8_SET_CP_START(s8, 0, ix); + } +@@ -1312,5 +1323,8 @@ + uint8_t *mapToNative = u8b->mapToNative; + uint8_t *mapToUChars = u8b->mapToUChars; +- int32_t toUCharsMapStart = ix - (UTF8_TEXT_CHUNK_SIZE*3 + 1); ++ int32_t toUCharsMapStart = ix - sizeof(UTF8Buf::mapToUChars) + 1; ++ // Note that toUCharsMapStart can be negative. Happens when the remaining ++ // text from current position to the beginning is less than the buffer size. ++ // + 1 because mapToUChars must have a slot at the end for the bufNativeLimit entry. + int32_t destIx = UTF8_TEXT_CHUNK_SIZE+2; // Start in the overflow region + // at end of buffer to leave room +@@ -1339,4 +1353,5 @@ + // Special case ASCII range for speed. + buf[destIx] = (UChar)c; ++ U_ASSERT(toUCharsMapStart <= srcIx); + mapToUChars[srcIx - toUCharsMapStart] = (uint8_t)destIx; + mapToNative[destIx] = (uint8_t)(srcIx - toUCharsMapStart); +@@ -1368,4 +1383,5 @@ + mapToUChars[sIx-- - toUCharsMapStart] = (uint8_t)destIx; + } while (sIx >= srcIx); ++ U_ASSERT(toUCharsMapStart <= (srcIx+1)); + + // Set native indexing limit to be the current position. +@@ -1542,4 +1558,5 @@ + U_ASSERT(index<=ut->chunkNativeLimit); + int32_t mapIndex = index - u8b->toUCharsMapStart; ++ U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars)); + int32_t offset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx; + U_ASSERT(offset>=0 && offset<=ut->chunkLength); +Index: /trunk/icu4c/source/test/intltest/utxttest.cpp +=================================================================== +--- source/test/intltest/utxttest.cpp (revision 39670) ++++ source/test/intltest/utxttest.cpp (revision 39671) +@@ -68,4 +68,6 @@ + case 7: name = "Ticket12130"; + if (exec) Ticket12130(); break; ++ case 8: name = "Ticket12888"; ++ if (exec) Ticket12888(); break; + default: name = ""; break; + } +@@ -1584,2 +1586,62 @@ + utext_close(&ut); + } ++ ++// Ticket 12888: bad handling of illegal utf-8 containing many instances of the archaic, now illegal, ++// six byte utf-8 forms. Original implementation had an assumption that ++// there would be at most three utf-8 bytes per UTF-16 code unit. ++// The five and six byte sequences map to a single replacement character. ++ ++void UTextTest::Ticket12888() { ++ const char *badString = ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"; ++ ++ UErrorCode status = U_ZERO_ERROR; ++ LocalUTextPointer ut(utext_openUTF8(NULL, badString, -1, &status)); ++ TEST_SUCCESS(status); ++ for (;;) { ++ UChar32 c = utext_next32(ut.getAlias()); ++ if (c == U_SENTINEL) { ++ break; ++ } ++ } ++ int32_t endIdx = utext_getNativeIndex(ut.getAlias()); ++ if (endIdx != (int32_t)strlen(badString)) { ++ errln("%s:%d expected=%d, actual=%d", __FILE__, __LINE__, strlen(badString), endIdx); ++ return; ++ } ++ ++ for (int32_t prevIndex = endIdx; prevIndex>0;) { ++ UChar32 c = utext_previous32(ut.getAlias()); ++ int32_t currentIndex = utext_getNativeIndex(ut.getAlias()); ++ if (c != 0xfffd) { ++ errln("%s:%d (expected, actual, index) = (%d, %d, %d)\n", ++ __FILE__, __LINE__, 0xfffd, c, currentIndex); ++ break; ++ } ++ if (currentIndex != prevIndex - 6) { ++ errln("%s:%d: wrong index. Expected, actual = %d, %d", ++ __FILE__, __LINE__, prevIndex - 6, currentIndex); ++ break; ++ } ++ prevIndex = currentIndex; ++ } ++} +Index: /trunk/icu4c/source/test/intltest/utxttest.h +=================================================================== +--- source/test/intltest/utxttest.h (revision 39670) ++++ source/test/intltest/utxttest.h (revision 39671) +@@ -39,4 +39,5 @@ + void Ticket10983(); + void Ticket12130(); ++ void Ticket12888(); + + private: diff --git a/srcpkgs/icu/patches/icu-58.1-iterator-reset.patch b/srcpkgs/icu/patches/icu-58.1-iterator-reset.patch new file mode 100644 index 00000000000..da4b0d589b4 --- /dev/null +++ b/srcpkgs/icu/patches/icu-58.1-iterator-reset.patch @@ -0,0 +1,116 @@ +--- source/common/ulist.c ++++ source/common/ulist.c +@@ -30,5 +30,4 @@ + + int32_t size; +- int32_t currentIndex; + }; + +@@ -52,5 +51,4 @@ + newList->tail = NULL; + newList->size = 0; +- newList->currentIndex = -1; + + return newList; +@@ -81,6 +79,7 @@ + p->next->previous = p->previous; + } +- list->curr = NULL; +- list->currentIndex = 0; ++ if (p == list->curr) { ++ list->curr = p->next; ++ } + --list->size; + if (p->forceDelete) { +@@ -151,5 +150,4 @@ + list->head->previous = newItem; + list->head = newItem; +- list->currentIndex++; + } + +@@ -194,5 +192,4 @@ + curr = list->curr; + list->curr = curr->next; +- list->currentIndex++; + + return curr->data; +@@ -210,5 +207,4 @@ + if (list != NULL) { + list->curr = list->head; +- list->currentIndex = 0; + } + } +@@ -273,3 +269,2 @@ + return (UList *)(en->context); + } +- +--- source/i18n/ucol_res.cpp ++++ source/i18n/ucol_res.cpp +@@ -681,4 +681,5 @@ + } + memcpy(en, &defaultKeywordValues, sizeof(UEnumeration)); ++ ulist_resetList(sink.values); // Initialize the iterator. + en->context = sink.values; + sink.values = NULL; // Avoid deletion in the sink destructor. +--- source/test/intltest/apicoll.cpp ++++ source/test/intltest/apicoll.cpp +@@ -82,14 +82,7 @@ + col = Collator::createInstance(Locale::getEnglish(), success); + if (U_FAILURE(success)){ +- errcheckln(success, "Default Collator creation failed. - %s", u_errorName(success)); +- return; +- } +- +- StringEnumeration* kwEnum = col->getKeywordValuesForLocale("", Locale::getEnglish(),true,success); +- if (U_FAILURE(success)){ +- errcheckln(success, "Get Keyword Values for Locale failed. - %s", u_errorName(success)); +- return; +- } +- delete kwEnum; ++ errcheckln(success, "English Collator creation failed. - %s", u_errorName(success)); ++ return; ++ } + + col->getVersion(versionArray); +@@ -230,4 +223,27 @@ + delete aFrCol; + delete junk; ++} ++ ++void CollationAPITest::TestKeywordValues() { ++ IcuTestErrorCode errorCode(*this, "TestKeywordValues"); ++ LocalPointer col(Collator::createInstance(Locale::getEnglish(), errorCode)); ++ if (errorCode.logIfFailureAndReset("English Collator creation failed")) { ++ return; ++ } ++ ++ LocalPointer kwEnum( ++ col->getKeywordValuesForLocale("collation", Locale::getEnglish(), TRUE, errorCode)); ++ if (errorCode.logIfFailureAndReset("Get Keyword Values for English Collator failed")) { ++ return; ++ } ++ assertTrue("expect at least one collation tailoring for English", kwEnum->count(errorCode) > 0); ++ const char *kw; ++ UBool hasStandard = FALSE; ++ while ((kw = kwEnum->next(NULL, errorCode)) != NULL) { ++ if (strcmp(kw, "standard") == 0) { ++ hasStandard = TRUE; ++ } ++ } ++ assertTrue("expect at least the 'standard' collation tailoring for English", hasStandard); + } + +@@ -2467,4 +2483,5 @@ + TESTCASE_AUTO_BEGIN; + TESTCASE_AUTO(TestProperty); ++ TESTCASE_AUTO(TestKeywordValues); + TESTCASE_AUTO(TestOperators); + TESTCASE_AUTO(TestDuplicate); +--- source/test/intltest/apicoll.h ++++ source/test/intltest/apicoll.h +@@ -36,4 +36,5 @@ + */ + void TestProperty(/* char* par */); ++ void TestKeywordValues(); + + /** diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template index ce071481372..363aab86b79 100644 --- a/srcpkgs/icu/template +++ b/srcpkgs/icu/template @@ -1,7 +1,7 @@ # Template build file for 'icu'. pkgname=icu -version=57.1 -revision=1 +version=58.2 +revision=2 wrksrc=icu build_wrksrc=source build_style=gnu-configure @@ -11,13 +11,23 @@ maintainer="Juan RP " homepage="http://www.icu-project.org/" license="ICU License /usr/share/licenses/icu/license.html" distfiles="http://download.icu-project.org/files/icu4c/${version}/icu4c-${version//./_}-src.tgz" -checksum=ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581 +checksum=2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c if [ "$CROSS_BUILD" ]; then configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu" fi pre_configure() { + + # strtod_l() is not supported by musl; also xlocale.h is missing + # It is not possible to disable its use via configure switches or env vars + # so monkey patching is needed. Idea was stollen from openembedded + # https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-support/icu/icu.inc#L30 + # http://git.alpinelinux.org/cgit/aports/tree/main/icu/APKBUILD?id=46736e7b8040becc9f69ad6d2c2d317a52d5485b#n34 + case "${XBPS_TARGET_MACHINE}" in + *-musl) sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' configure ;; + esac + if [ "$CROSS_BUILD" ]; then # Configure and build for host. mkdir host-build diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template index 678ed4d7fd0..5375964766f 100644 --- a/srcpkgs/icu4lua/template +++ b/srcpkgs/icu4lua/template @@ -1,7 +1,7 @@ # Template file for 'icu4lua' pkgname=icu4lua version=0.2B -revision=3 +revision=4 create_wrksrc=yes build_style=gnu-makefile hostmakedepends="pkg-config unzip" diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template index a23266fedd1..5048601e2c7 100644 --- a/srcpkgs/iio-sensor-proxy/template +++ b/srcpkgs/iio-sensor-proxy/template @@ -6,7 +6,7 @@ build_style=gnu-configure hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool" makedepends="libgudev-devel gtk+3-devel" short_desc="IIO accelerometer sensor to input device proxy" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://github.com/hadess/iio-sensor-proxy" distfiles="$homepage/archive/$version.tar.gz" diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template index 3a50db9395d..7e7eedcc95d 100644 --- a/srcpkgs/imapfilter/template +++ b/srcpkgs/imapfilter/template @@ -1,7 +1,7 @@ # Template file for 'imapfilter' pkgname=imapfilter version=2.6.7 -revision=2 +revision=3 build_style=gnu-makefile make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr" hostmakedepends="lua-devel" diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template index 0bd062ff5fc..eefcc67d6f2 100644 --- a/srcpkgs/imlib2/template +++ b/srcpkgs/imlib2/template @@ -1,6 +1,6 @@ # Template build file for 'imlib2'. pkgname=imlib2 -version=1.4.9 +version=1.4.10 revision=1 build_style=gnu-configure configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding" @@ -12,7 +12,7 @@ maintainer="Juan RP " distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-$version.tar.gz" homepage="http://sourceforge.net/projects/enlightenment/" license="BSD" -checksum=2bbe4d6eb90559e8ccbb85b442962dd195fd713041a36761a8cf45ad4686cd7b +checksum=39907c9a62814e8bff05bafe3760db6b7993bb3803832bcaad54e79b75423e5e pre_configure() { autoreconf -fi diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template index 99f949658cb..b6f136e3166 100644 --- a/srcpkgs/inadyn/template +++ b/srcpkgs/inadyn/template @@ -1,7 +1,7 @@ # Template file for 'inadyn' pkgname=inadyn -version=2.0 -revision=1 +version=2.1 +revision=2 build_style=gnu-configure configure_args="--enable-openssl" hostmakedepends="automake libtool pkg-config" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="GPL-2" homepage="http://troglobit.com/inadyn.html" distfiles="ftp://ftp.troglobit.com/inadyn/inadyn-${version}.tar.xz" -checksum=f057e00d2270086682ef6af9419bd9f2b38a943b7d1f67e6c4739f31645fd59a +checksum=87639a7c1ddc047074601ad60188279a2a0d9393367f046c153de0e24586b3ac system_accounts="inadyn" inadyn_homedir="/run/inadyn" diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template new file mode 100644 index 00000000000..c3785e885b4 --- /dev/null +++ b/srcpkgs/indicator-doom-cpu/template @@ -0,0 +1,20 @@ +# Template file for 'indicator-doom-cpu' +pkgname=indicator-doom-cpu +version=1.0.0 +revision=2 +noarch=yes +_commit=d40a3db96be2e524009c64e97c805653c359a45b +wrksrc="$pkgname-$_commit" +depends="python-gobject" +short_desc="CPU load indicator showing the dying face from the video game DOOM" +maintainer="Andrea Brancaleoni " +license="GPL-3" +homepage="https://github.com/thypon/indicator-doom-cpu" +distfiles="$homepage/archive/$_commit.tar.gz" +checksum=ab65de548c42b29830bb57d254834c3d5a909b851fc4ace909a25085ba7b277c + +do_install() { + vinstall $pkgname 755 usr/share/indicator-doom-cpu + vinstall debian/indicator-doom-cpu.desktop 644 usr/share/applications + vcopy icons usr/share/indicator-doom-cpu +} diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template index f4648d880bf..0b98b288f7f 100644 --- a/srcpkgs/influxdb/template +++ b/srcpkgs/influxdb/template @@ -1,7 +1,7 @@ # Template file for 'influxdb' pkgname=influxdb version=1.2.0 -revision=3 +revision=4 build_style=go hostmakedepends="git-perl mercurial" go_import_path="github.com/influxdata/influxdb" diff --git a/srcpkgs/injeqt/template b/srcpkgs/injeqt/template index 764ab70ef33..846299cdb6e 100644 --- a/srcpkgs/injeqt/template +++ b/srcpkgs/injeqt/template @@ -1,7 +1,7 @@ # Template file for 'injeqt' pkgname=injeqt -version=1.1.0 -revision=2 +version=1.2.0 +revision=1 build_style=cmake hostmakedepends="pkg-config" makedepends="qt5-devel" @@ -10,12 +10,12 @@ maintainer="Jürgen Buchmüller " license="LGPL-2.1" homepage="https://github.com/vogel/injeqt/" distfiles="https://github.com/vogel/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=a5e125ab3e8c9f7139fccbce22d772b01c4e1af074dea3bbb1ddb4379a42cb16 +checksum=77540cedb0b26affe993dd18124d796059e34c80a51d9ae6433fdff1860db135 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" fi -CXXFLAGS="-fno-lifetime-dse" +CXXFLAGS="-fno-lifetime-dse -Wno-error=cast-align" injeqt-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 0858f8b9f37..69a88b65caa 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape'. pkgname=inkscape version=0.92.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-lcms --enable-poppler-cairo --without-gnome-vfs --disable-static" diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template index 3a6ab339b35..9b21caa1a96 100644 --- a/srcpkgs/innoextract/template +++ b/srcpkgs/innoextract/template @@ -1,7 +1,7 @@ # Template file for 'innoextract'. pkgname=innoextract version=1.6 -revision=2 +revision=3 build_style=cmake configure_args="-DCMAKE_INSTALL_PREFIX=/usr" hostmakedepends="boost" diff --git a/srcpkgs/inspircd/files/inspircd/run b/srcpkgs/inspircd/files/inspircd/run index 6f912128052..ac98f4c9032 100755 --- a/srcpkgs/inspircd/files/inspircd/run +++ b/srcpkgs/inspircd/files/inspircd/run @@ -2,6 +2,9 @@ if [ ! -d /var/run/inspircd ]; then mkdir -m0755 -p /var/run/inspircd fi + +chown inspircd:inspircd /var/run/inspircd + exec chpst -u inspircd inspircd \ --nofork --config /etc/inspircd/inspircd.conf \ --logfile /var/log/inspircd/ircd.log diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template index 4af0dc99318..c462acf543a 100644 --- a/srcpkgs/inspircd/template +++ b/srcpkgs/inspircd/template @@ -1,7 +1,7 @@ # Template file for 'inspircd' pkgname=inspircd version=2.0.23 -revision=2 +revision=4 build_style=gnu-makefile hostmakedepends="perl pkg-config" makedepends="geoip-devel libressl-devel sqlite-devel" diff --git a/srcpkgs/intel-gpu-tools/template b/srcpkgs/intel-gpu-tools/template index 40abd637928..06882c6da5e 100644 --- a/srcpkgs/intel-gpu-tools/template +++ b/srcpkgs/intel-gpu-tools/template @@ -1,6 +1,6 @@ # Template file for 'intel-gpu-tools' pkgname=intel-gpu-tools -version=1.17 +version=1.18 revision=1 build_style=gnu-configure configure_args="--disable-tests" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="MIT" homepage="http://cgit.freedesktop.org/xorg/app/intel-gpu-tools/" distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" -checksum=a6cbc4e0e52ea87c082987d1bb90a354f8ffac94a31b7b4cd48b38b7f4aafb1a +checksum=df77f91b5a8bdd590f1128a36b7616bc292f18ecb98e77c9c4467574fb67e4ee lib32disabled=yes only_for_archs="i686 i686-musl x86_64 x86_64-musl" diff --git a/srcpkgs/interbench/template b/srcpkgs/interbench/template index a5dcc36ccc4..213987ba9c6 100644 --- a/srcpkgs/interbench/template +++ b/srcpkgs/interbench/template @@ -4,7 +4,7 @@ version=0.31 revision=2 build_style=gnu-makefile short_desc="Emulates and measures CPU scheduling latency and jitter" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://users.on.net/~ckolivas/interbench" distfiles="http://ck.kolivas.org/apps/interbench/$pkgname-$version.tar.bz2" diff --git a/srcpkgs/iouyap/template b/srcpkgs/iouyap/template new file mode 100644 index 00000000000..47f9f8360a4 --- /dev/null +++ b/srcpkgs/iouyap/template @@ -0,0 +1,22 @@ +# Template file for 'iouyap' +pkgname=iouyap +version=0.97 +revision=1 +build_style=gnu-makefile +hostmakedepends="bison flex" +short_desc="Bridge IOU to UDP, TAP and Ethernet" +maintainer="Michael Aldridge " +license="GPL-3" +homepage="https://github.com/GNS3/iouyap" +distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" +checksum=181850a4ce73a4d4035f9eb39b2656ae31d360f18b577ee65f5149132da3eccf + +case $XBPS_TARGET_MACHINE in + *-musl) broken=yes # Uses GNU Short types + ;; +esac + + +do_install() { + vbin iouyap +} diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template index ba79f6c145e..9220f996e57 100644 --- a/srcpkgs/ipe/template +++ b/srcpkgs/ipe/template @@ -1,7 +1,7 @@ # Template file for 'ipe' pkgname=ipe version=7.2.7 -revision=3 +revision=4 _tools_commit=e5b23399a83d69fd5bb5d4645ef7325b4b57435b hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools wget" makedepends="qt5-devel lua52-devel libjpeg-turbo-devel cairo-devel poppler-devel" diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template index c3c3356003e..647dac69230 100644 --- a/srcpkgs/ipmitool/template +++ b/srcpkgs/ipmitool/template @@ -1,7 +1,7 @@ # Template file for 'ipmitool' pkgname=ipmitool version=1.8.18 -revision=1 +revision=2 build_style=gnu-configure makedepends="libressl-devel" short_desc="Command-line interface to IPMI-enabled devices" diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template index c8c5262c904..c3944f9b4fe 100644 --- a/srcpkgs/ipmiutil/template +++ b/srcpkgs/ipmiutil/template @@ -1,7 +1,7 @@ # Template file for 'ipmiutil' pkgname=ipmiutil version=3.0.0 -revision=2 +revision=3 build_style=gnu-configure makedepends="libressl-devel" short_desc="Series of utilities that perform common IPMI management functions" diff --git a/srcpkgs/iproute2/patches/musl.patch b/srcpkgs/iproute2/patches/musl.patch index 5db80d5046e..347d9d96732 100644 --- a/srcpkgs/iproute2/patches/musl.patch +++ b/srcpkgs/iproute2/patches/musl.patch @@ -22,6 +22,17 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. #include +--- include/linux/l2tp.h.orig 2017-02-20 17:47:52.000000000 +0100 ++++ include/linux/l2tp.h 2017-03-01 13:28:13.023515139 +0100 +@@ -9,8 +9,6 @@ + + #include + #include +-#include +-#include + + #define IPPROTO_L2TP 115 + --- include/linux/netfilter.h 2015-09-01 01:31:15.000000000 +0200 +++ include/linux/netfilter.h 2015-09-14 16:27:34.928205553 +0200 @@ -4,8 +4,6 @@ diff --git a/srcpkgs/iproute2/patches/tipc-bearer-missing-def.patch b/srcpkgs/iproute2/patches/tipc-bearer-missing-def.patch deleted file mode 100644 index f37be3eeae0..00000000000 --- a/srcpkgs/iproute2/patches/tipc-bearer-missing-def.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- tipc/bearer.c.orig 2015-06-26 21:28:25.000000000 +0200 -+++ tipc/bearer.c 2015-06-28 09:24:34.836132040 +0200 -@@ -26,6 +26,10 @@ - #include "msg.h" - #include "bearer.h" - -+#ifndef TIPC_MAX_BEARER_NAME -+#define TIPC_MAX_BEARER_NAME 32 -+#endif -+ - static void _print_bearer_opts(void) - { - fprintf(stderr, diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template index 2d40b4b22f4..35ec0456fa8 100644 --- a/srcpkgs/iproute2/template +++ b/srcpkgs/iproute2/template @@ -1,7 +1,7 @@ # Template file for 'iproute2' pkgname=iproute2 -version=4.9.0 -revision=2 +version=4.10.0 +revision=1 hostmakedepends="pkg-config perl flex" makedepends="libfl-devel libmnl-devel db-devel iptables-devel" conf_files=" @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="http://www.linux-foundation.org/en/Net:Iproute2" license="GPL-2" distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz" -checksum=c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4 +checksum=22b1e1c1fc704ad35837e5a66103739727b8b48ac90b48c13f79b7367ff0a9a8 do_configure() { ./configure diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template index 44540f830ee..640b4e4f02d 100644 --- a/srcpkgs/ipset/template +++ b/srcpkgs/ipset/template @@ -1,6 +1,6 @@ # Template file for 'ipset' pkgname=ipset -version=6.31 +version=6.32 revision=1 build_style=gnu-configure configure_args="--with-kmod=no --sbindir=/usr/bin PKG_CONFIG=pkg-config" @@ -11,7 +11,7 @@ maintainer="beefcurtains " license="GPL-2" homepage="http://ipset.netfilter.org/" distfiles="${homepage}${pkgname}-${version}.tar.bz2" -checksum=498e411cc1d134201a31a56def6c0936c642958c2d4b4ce7d9955240047a45fe +checksum=d9cbb49a4ae9e32d7808a604f1a37f359f9fc9064c210c4c5f35d629d49fb9fe libipset_package() { short_desc+=" - library files" diff --git a/srcpkgs/iptraf-ng/template b/srcpkgs/iptraf-ng/template index e1968e77ad5..84f5e935f57 100644 --- a/srcpkgs/iptraf-ng/template +++ b/srcpkgs/iptraf-ng/template @@ -4,11 +4,10 @@ version=1.1.4 revision=2 LDFLAGS="-lncursesw -lpanelw -lmenuw" build_style=gnu-configure -configure_args="--sbindir=/usr/bin" makedepends="ncurses-devel" short_desc="IP traffic monitor (iptraf-3.0.0 fork)" maintainer="Juan RP " license="GPL-2" -homepage="https://fedorahosted.org/iptraf-ng/" -distfiles="https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$version.tar.gz" +homepage="https://tracker.debian.org/pkg/iptraf-ng" +distfiles="http://http.debian.net/debian/pool/main/i/iptraf-ng/iptraf-ng_${version}.orig.tar.gz" checksum=79140cf07c0cceb1b5723242847a73aa86f5e4f9dccfe8970fda6801d347eb09 diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template index 49cd672b435..3f72563df6f 100644 --- a/srcpkgs/iputils/template +++ b/srcpkgs/iputils/template @@ -1,7 +1,7 @@ # Template file for 'iputils' pkgname=iputils version=20151218 -revision=2 +revision=3 patch_args="-Np1" wrksrc="${pkgname}-s${version}" makedepends="libressl-devel libcap-devel" diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template index a6ad211b8da..ee7fc141416 100644 --- a/srcpkgs/irssi/template +++ b/srcpkgs/irssi/template @@ -1,7 +1,7 @@ # Template build file for 'irssi' pkgname=irssi -version=1.0.1 -revision=1 +version=1.0.2 +revision=2 build_style=gnu-configure configure_args="--disable-static --with-proxy --enable-true-color" hostmakedepends="pkg-config" @@ -13,7 +13,7 @@ short_desc="Secure and modular IRC client with text mode user interface" maintainer="Juan RP " license="GPL-2" distfiles="https://github.com/irssi/irssi/releases/download/${version}/irssi-${version}.tar.gz" -checksum=196ae830763be0a9dc0b377e571db105e82f9b7f7e0f443a81fbc665cea819db +checksum=8e4f79797a269cc5e026f084b4b0017c4818bb83735f0d0011153df371335ab9 LDFLAGS="-lncursesw" subpackages="irssi-devel" diff --git a/srcpkgs/ispc/template b/srcpkgs/ispc/template index 45e0719c148..ada83d85311 100644 --- a/srcpkgs/ispc/template +++ b/srcpkgs/ispc/template @@ -7,7 +7,7 @@ build_style=gnu-makefile hostmakedepends="llvm clang python m4 bison flex" makedepends="ncurses-devel zlib-devel" short_desc="A compiler for high-performance SIMD programming on the CPU" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="BSD" homepage="https://ispc.github.io" distfiles="https://github.com/ispc/ispc/archive/v${version}.tar.gz" diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template index dcff4cd9ac5..dd348220036 100644 --- a/srcpkgs/isync/template +++ b/srcpkgs/isync/template @@ -1,7 +1,7 @@ # Template file for 'isync' pkgname=isync version=1.2.1 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libressl-devel libsasl-devel db-devel zlib-devel" diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template index 6ab82172ac5..44033611a34 100644 --- a/srcpkgs/jack/template +++ b/srcpkgs/jack/template @@ -2,6 +2,7 @@ pkgname=jack version=1.9.10 revision=11 +wrksrc="jack2-${version}" # XXX libffado (firewire) hostmakedepends="pkg-config python" makedepends="opus-devel libsamplerate-devel readline-devel dbus-devel celt-devel" @@ -10,8 +11,8 @@ short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)" maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://jackaudio.org/" -distfiles="https://dl.dropboxusercontent.com/u/28869550/jack-${version}.tar.bz2" -checksum=5bc6336e6ac9799e3cb241915e2ba5d01b030589bbb2afae39579a59ef0f2f56 +distfiles="https://github.com/jackaudio/jack2/archive/v${version}.tar.gz" +checksum=88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d if [ -z "CROSS_BUILD" ]; then makedepends+=" eigen" @@ -44,8 +45,8 @@ jack-devel_package() { depends="libjack>=${version}_${revision}" short_desc+=" - development files" pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig + vmove usr/include + vmove usr/lib/pkgconfig vmove "usr/lib/*.so" } } diff --git a/srcpkgs/jbigkit/template b/srcpkgs/jbigkit/template index f59ed939fbf..17882cd7511 100644 --- a/srcpkgs/jbigkit/template +++ b/srcpkgs/jbigkit/template @@ -6,7 +6,7 @@ wrksrc="${pkgname}-shared-${version}" build_style=gnu-configure hostmakedepends="automake libtool" short_desc="Data compression library/utilities for bi-level high-resolution images" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://www.cl.cam.ac.uk/~mgk25/jbigkit" distfiles="https://github.com/voidlinux/jbigkit-shared/archive/v${version}.tar.gz" diff --git a/srcpkgs/jemalloc/template b/srcpkgs/jemalloc/template index 92ab6c62b3f..926285017ac 100644 --- a/srcpkgs/jemalloc/template +++ b/srcpkgs/jemalloc/template @@ -1,6 +1,6 @@ # Template file for 'jemalloc' pkgname=jemalloc -version=4.4.0 +version=4.5.0 revision=1 build_style=gnu-configure configure_args="je_cv_static_page_shift=12" @@ -9,7 +9,7 @@ maintainer="Eivind Uggedal " homepage="http://jemalloc.net/" license="2-clause-BSD" distfiles="https://github.com/jemalloc/jemalloc/releases/download/${version}/jemalloc-${version}.tar.bz2" -checksum=a7aea63e9718d2f1adf81d87e3df3cb1b58deb86fc77bad5d702c4c59687b033 +checksum=9409d85664b4f135b77518b0b118c549009dc10f6cba14557d170476611f6780 post_install() { vlicense COPYING diff --git a/srcpkgs/jhead/patches/CVE-2016-3822.patch b/srcpkgs/jhead/patches/CVE-2016-3822.patch new file mode 100644 index 00000000000..f016b82404f --- /dev/null +++ b/srcpkgs/jhead/patches/CVE-2016-3822.patch @@ -0,0 +1,19 @@ +--- exif.c ++++ exif.c +@@ -9,6 +9,7 @@ + #include "jhead.h" + + #include ++#include + + static unsigned char * DirWithThumbnailPtrs; + static double FocalplaneXRes; +@@ -527,7 +528,7 @@ + unsigned OffsetVal; + OffsetVal = Get32u(DirEntry+8); + // If its bigger than 4 bytes, the dir entry contains an offset. +- if (OffsetVal+ByteCount > ExifLength){ ++ if (OffsetVal > UINT32_MAX - ByteCount || OffsetVal+ByteCount > ExifLength){ + // Bogus pointer offset and / or bytecount value + ErrNonfatal("Illegal value pointer for tag %04x in Exif", Tag,0); + continue; diff --git a/srcpkgs/jhead/template b/srcpkgs/jhead/template index 9eee13acc55..c7d5794bece 100644 --- a/srcpkgs/jhead/template +++ b/srcpkgs/jhead/template @@ -1,7 +1,7 @@ # Template file for 'jhead' pkgname=jhead version=3.00 -revision=2 +revision=3 build_style=gnu-makefile short_desc="Display and manipulate EXIF header of JPEG images" maintainer="Oliver Kiddle " diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template new file mode 100644 index 00000000000..d46f2738527 --- /dev/null +++ b/srcpkgs/jid/template @@ -0,0 +1,19 @@ +# Template file for 'jid' +pkgname=jid +version=0.7.2 +revision=2 +build_style=go +go_import_path="https://github.com/simeji/jid" +go_package="https://github.com/simeji/jid/cmd/jid" +hostmakedepends="git" +short_desc="Drill down JSON interactively by using filtering queries" +maintainer="Michael Gehring " +license="MIT" +homepage="https://github.com/simeji/jid" +distfiles="https://github.com/simeji/jid/archive/${version}.tar.gz" +checksum=a16932049fb617fd7490742fcd3b5f131873309a12d97adbaf41a882cd1b99d1 + +post_install() { + vlicense LICENSE + vdoc README.md +} diff --git a/srcpkgs/jnettop/template b/srcpkgs/jnettop/template new file mode 100644 index 00000000000..1ac2fb80593 --- /dev/null +++ b/srcpkgs/jnettop/template @@ -0,0 +1,24 @@ +# Template file for 'jnettop' +pkgname=jnettop +version=0.13.0 +revision=1 +create_wrksrc=yes +build_wrksrc="${pkgname}-${version}" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="glib-devel libpcap-devel ncurses-devel" +short_desc="View hosts/ports taking up the most network traffic" +maintainer="Leah Neukirchen " +license="GPL-2" +homepage="https://packages.debian.org/sid/net/jnettop" +distfiles="${DEBIAN_SITE}/main/j/${pkgname}/${pkgname}_${version}.orig.tar.gz + ${DEBIAN_SITE}/main/j/${pkgname}/${pkgname}_${version}-1.debian.tar.gz" +checksum="e987a1a9325595c8a0543ab61cf3b6d781b4faf72dd0e0e0c70b2cc2ceb5a5a0 + 5d9b32596039d1f77493403618326f3c15868ced3b7e4849f107cc4754c94c37" + +post_extract() { + cd ${build_wrksrc} + cat ../debian/patches/*.patch | patch -Np1 + sed -i '/^CFLAGS/d' Makefile.in + sed -i '5308s/.*exit 1.*/:; }/' configure +} diff --git a/srcpkgs/john/patches/gcc5.patch b/srcpkgs/john/patches/gcc5.patch new file mode 100644 index 00000000000..d6665333e7a --- /dev/null +++ b/srcpkgs/john/patches/gcc5.patch @@ -0,0 +1,13 @@ +--- src/common.h.orig ++++ src/common.h +@@ -31,7 +31,9 @@ typedef unsigned long long ARCH_WORD_64; + #define is_aligned(PTR, CNT) ((((ARCH_WORD)(const void *)(PTR))&(CNT-1))==0) + + #ifdef __GNUC__ +-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER) ++#if __GNUC__ >= 5 ++#define MAYBE_INLINE __attribute__((gnu_inline)) inline ++#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER) + #define MAYBE_INLINE __attribute__((always_inline)) inline + #elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) + #define MAYBE_INLINE __attribute__((always_inline)) diff --git a/srcpkgs/john/template b/srcpkgs/john/template index 6bc78da5865..6b64c2f22ac 100644 --- a/srcpkgs/john/template +++ b/srcpkgs/john/template @@ -1,7 +1,7 @@ # Template file for 'john' pkgname=john version=1.8.0 -revision=7 +revision=8 _jumbover=1 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}" build_wrksrc="src" diff --git a/srcpkgs/jreen-qt5/template b/srcpkgs/jreen-qt5/template index 3b59beacdc3..4836e3764af 100644 --- a/srcpkgs/jreen-qt5/template +++ b/srcpkgs/jreen-qt5/template @@ -1,28 +1,24 @@ # Template file for 'jreen' pkgname=jreen-qt5 -version=1.2.1 -revision=2 -wrksrc=${pkgname%-*}-${version} +version=1.3.0 +revision=1 +wrksrc="${pkgname%-*}-${version}" build_style=cmake hostmakedepends="pkg-config" makedepends="gsasl-devel speex-devel qt5-devel zlib-devel" -short_desc="Extensible XMPP library written in C++ using Qt" +short_desc="Qt5 Jabber/XMPP extensible library" maintainer="Duncaen " -license="GPL-2" -homepage="http://qutim.org/jreen" -distfiles="http://github.com/euroelessar/${pkgname%-*}/archive/v${version}.tar.gz" -checksum=be5de04b6f54e47bdec92707600441a39e46add958181ad2b5b2d1bf92693fbd +license="LGPL-3" +homepage="https://github.com/euroelessar/jreen" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" fi -post_extract() { - sed -i 's|^#include length); ++n) + JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]); + return ida; +--- js/src/jsfun.cpp ++++ js/src/jsfun.cpp +@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje + + JSString *str = JS_DecompileFunction(cx, fun, indent); + if (!str) +- return false; ++ return NULL; + + if (!indent) + cx->compartment->toSourceCache.put(fun, str); +@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon + const Shape *shape = funobj->nativeLookup(id); + if (!shape) { + if (!ResolveInterpretedFunctionPrototype(cx, funobj)) +- return false; ++ return NULL; + shape = funobj->nativeLookup(id); + } + JS_ASSERT(!shape->configurable()); +--- js/src/jsiter.cpp ++++ js/src/jsiter.cpp +@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f + */ + JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0); + if (!obj) +- return false; ++ return NULL; + obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false); + obj->setMap(cx->compartment->emptyEnumeratorShape); + return obj; +--- js/src/jsparse.cpp ++++ js/src/jsparse.cpp +@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun + if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) { + JS_ASSERT(pn->pn_cookie.isFree()); + if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom)) +- return false; ++ return NULL; + } + + pn->pn_blockid = outertc->blockid(); +--- js/src/jsstr.cpp ++++ js/src/jsstr.cpp +@@ -1734,7 +1734,7 @@ class RegExpGuard + if (flat) { + patstr = flattenPattern(cx, fm.patstr); + if (!patstr) +- return false; ++ return NULL; + } else { + patstr = fm.patstr; + } +@@ -3400,7 +3400,7 @@ js_InitStringClass(JSContext *cx, JSObje + UndefinedValue(), NULL, NULL, + JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0, + NULL)) { +- return JS_FALSE; ++ return NULL; + } + + return proto; +--- js/src/jstypedarray.cpp ++++ js/src/jstypedarray.cpp +@@ -1334,7 +1334,7 @@ class TypedArrayTemplate + if (size != 0 && count >= INT32_MAX / size) { + JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, + JSMSG_NEED_DIET, "size and count"); +- return false; ++ return NULL; + } + + int32 bytelen = size * count; +@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint + + default: + JS_NOT_REACHED("shouldn't have gotten here"); +- return false; ++ return NULL; + } + } + +--- js/src/jsxml.cpp ++++ js/src/jsxml.cpp +@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS + + obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass); + if (!obj) +- return JS_FALSE; ++ return NULL; + JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal())); + JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal())); + JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared())); +@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb + size_t length = str->length(); + jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar)); + if (!chars) +- return JS_FALSE; ++ return NULL; + *chars = '@'; + const jschar *strChars = str->getChars(cx); + if (!strChars) { +--- js/src/methodjit/InvokeHelpers.cpp ++++ js/src/methodjit/InvokeHelpers.cpp +@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx) + { + JSStackFrame *fp = cx->fp(); + if (fp->hasImacropc()) +- return false; ++ return NULL; + + JSScript *script = fp->script(); + return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc); +--- js/src/nanojit/NativeX64.cpp ++++ js/src/nanojit/NativeX64.cpp +@@ -1899,7 +1899,7 @@ namespace nanojit + } + } + +- static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0}; ++ static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {int64_t(0x8000000000000000LL),0}; + + void Assembler::asm_fneg(LIns *ins) { + Register rr, ra; diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template index f1e9f9e3939..5c9e6537dc7 100644 --- a/srcpkgs/json-glib/template +++ b/srcpkgs/json-glib/template @@ -1,6 +1,6 @@ # Template build file for 'json-glib'. pkgname=json-glib -version=1.2.2 +version=1.2.8 revision=1 build_style=gnu-configure configure_args="$(vopt_enable gir introspection)" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://live.gnome.org/JsonGlib" license="LGPL-2" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ea128ab52a824fcd06e5448fbb2bd8d9a13740d51c66d445828edba71321a621 +checksum=fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a # Package build options build_options="gir" diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template index 8c929146387..8646a7ba8c0 100644 --- a/srcpkgs/kactivities5/template +++ b/srcpkgs/kactivities5/template @@ -1,12 +1,13 @@ # Template file for 'kactivities5' pkgname=kactivities5 version=5.29.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" wrksrc="${pkgname%5}-${version}" hostmakedepends="extra-cmake-modules" makedepends="boost-devel kio-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds" +depends="qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds" short_desc="KDE API for using and interacting with the Activity Manager" maintainer="Denis Revin " license="LGPL-2" diff --git a/srcpkgs/kakoune/template b/srcpkgs/kakoune/template new file mode 100644 index 00000000000..44ca817699f --- /dev/null +++ b/srcpkgs/kakoune/template @@ -0,0 +1,18 @@ +# Template file for 'kakoune' +pkgname=kakoune +version=0.0.20170311 +revision=2 +_commit="b9317ba38c3e8f2bc4196705d65bbc8a8ef8dbf4" +wrksrc="${pkgname}-${_commit}" +build_wrksrc="src" +build_style=gnu-makefile +make_build_args="debug=no" +make_install_args="debug=no" +hostmakedepends="unzip asciidoc" +makedepends="boost-devel ncurses-devel" +short_desc="Selection-based vim-like editor with less keystrokes" +maintainer="Jakub Skrzypnik " +license="UNLICENSE" +homepage="http://kakoune.org" +distfiles="https://github.com/mawww/kakoune/archive/${_commit}.zip" +checksum=a867c61b1071268dfd27da5ed278a838a042c1add0416fe9384379543d9d630e diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template index dc64e86d5e3..7dc51a01c7a 100644 --- a/srcpkgs/kbookmarks/template +++ b/srcpkgs/kbookmarks/template @@ -1,10 +1,10 @@ # Template file for 'kbookmarks' pkgname=kbookmarks version=5.29.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules" +hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools" makedepends="kxmlgui-devel" short_desc="KDE Bookmarks management library" maintainer="Denis Revin " diff --git a/srcpkgs/kcgi/template b/srcpkgs/kcgi/template index 58e5ae28273..eda81c6cb29 100644 --- a/srcpkgs/kcgi/template +++ b/srcpkgs/kcgi/template @@ -1,6 +1,6 @@ # Template file for 'kcgi' pkgname=kcgi -version=0.9.3 +version=0.9.4 revision=1 build_style=gnu-makefile short_desc="Minimal CGI library for web applications in C" @@ -8,7 +8,7 @@ maintainer="Juan RP " license="ISC" homepage="http://kristaps.bsd.lv/kcgi/" distfiles="http://kristaps.bsd.lv/kcgi/snapshots/kcgi-${version}.tgz" -checksum=cb7021066d2a6aef9a7c9ce603f99cc07b55bce2f4a01cc4ff626289710a9558 +checksum=4e76d6ccc5bbbcb1c912fce86ef9b38ed1ad1fd85ad41f832c61ad3539c867f8 post_extract() { case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template index 9c469f0950a..e81c43741ad 100644 --- a/srcpkgs/kconfigwidgets/template +++ b/srcpkgs/kconfigwidgets/template @@ -1,10 +1,10 @@ # Template file for 'kconfigwidgets' pkgname=kconfigwidgets version=5.29.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules" +hostmakedepends="extra-cmake-modules qt5-devel qt5-host-tools kdoctools" makedepends="qt5-devel kauth-devel kcodecs-devel kconfig-devel kguiaddons-devel kdoctools-devel ki18n-devel kwidgetsaddons-devel" short_desc="KDE Widgets for configuration dialogs" maintainer="Denis Revin " diff --git a/srcpkgs/kde-runtime/template b/srcpkgs/kde-runtime/template index 058f0a856de..77a57e0e90e 100644 --- a/srcpkgs/kde-runtime/template +++ b/srcpkgs/kde-runtime/template @@ -1,7 +1,7 @@ # Template file for 'kde-runtime' pkgname=kde-runtime version=4.14.3 -revision=8 +revision=9 build_style=cmake configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF DWITH_QNtrack=OFF -DWITH_NepomukCore=OFF" # XXX OpenSLP diff --git a/srcpkgs/kde-workspace/template b/srcpkgs/kde-workspace/template index 23ff9e62ac0..a73f920f819 100644 --- a/srcpkgs/kde-workspace/template +++ b/srcpkgs/kde-workspace/template @@ -4,7 +4,7 @@ _kappversion=15.08.0 pkgname=kde-workspace version=4.11.22 -revision=2 +revision=3 short_desc="Provides the interface and basic tools for the KDE workspace" maintainer="Juan RP " license="GPL-2, LGPL-2.1, FDL" diff --git a/srcpkgs/kdoctools/patches/cmake_macro_cross.patch b/srcpkgs/kdoctools/patches/cmake_macro_cross.patch new file mode 100644 index 00000000000..c6cc06fbb17 --- /dev/null +++ b/srcpkgs/kdoctools/patches/cmake_macro_cross.patch @@ -0,0 +1,5 @@ +--- KF5DocToolsMacros.cmake.orig ++++ KF5DocToolsMacros.cmake +@@ -86 +86 @@ set(KDOCTOOLS_SERIALIZE_TOOL "" CACHE ST +-set(KDOCTOOLS_MEINPROC_EXECUTABLE "KF5::meinproc5") ++set(KDOCTOOLS_MEINPROC_EXECUTABLE "meinproc5") diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template index 3d03ae8d8fb..bcf7277f919 100644 --- a/srcpkgs/kdoctools/template +++ b/srcpkgs/kdoctools/template @@ -1,7 +1,7 @@ # Template file for 'kdoctools' pkgname=kdoctools version=5.29.0 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules perl perl-URI" diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template index 6d6a978cb0f..7822e3338fb 100644 --- a/srcpkgs/kea/template +++ b/srcpkgs/kea/template @@ -1,7 +1,7 @@ # Template file for 'kea' pkgname=kea version=1.1.0 -revision=4 +revision=5 build_style=gnu-configure configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr $(vopt_if mysql --with-dhcp-mysql) diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template index b56abd9cc76..403b7ed327b 100644 --- a/srcpkgs/keepalived/template +++ b/srcpkgs/keepalived/template @@ -1,7 +1,7 @@ # Template file for 'keepalived' pkgname=keepalived -version=1.3.4 -revision=1 +version=1.3.5 +revision=2 conf_files="/etc/${pkgname}/${pkgname}.conf" build_style=gnu-configure configure_args="--enable-sha1" @@ -12,11 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.keepalived.org/" distfiles="http://www.keepalived.org/software/$pkgname-$version.tar.gz" -checksum=d946e3db6f1b2ec8c8fd255c0a4d2d326d1539db61136ba147d33ef219e3a754 - -case "$XBPS_TARGET_MACHINE" in - aarch64-musl) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/1290/steps/shell_3/logs/stdio" ;; -esac +checksum=c0114d86ea4c896557beb0d9367819a423ffba772bc5d7c548dc455e6b3bd048 post_install() { vsv $pkgname diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template index 6b0beb14cf3..034dc7a9eda 100644 --- a/srcpkgs/keybase/template +++ b/srcpkgs/keybase/template @@ -1,7 +1,7 @@ # Template file for 'keybase' pkgname=keybase -version=1.0.18 -revision=3 +version=1.0.21 +revision=1 wrksrc="client-${version}" build_style=go go_import_path="github.com/keybase/client" @@ -13,7 +13,7 @@ maintainer="Toyam Cox " license="BSD" homepage="https://keybase.io/" distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz" -checksum=8a4ebcb3ce8e3ed3649be870ab407fafeaeaed23c399f18dc25cba50fbb7f5a6 +checksum=a9bbaf16cb7b7cc3614ca5e76e0fb1b3bd164f38e14b9d49d4ca351941c8c0a3 post_install() { vlicense LICENSE diff --git a/srcpkgs/keyutils/template b/srcpkgs/keyutils/template index f24b9861cf7..3a5192e7436 100644 --- a/srcpkgs/keyutils/template +++ b/srcpkgs/keyutils/template @@ -1,14 +1,14 @@ # Template file for 'keyutils' pkgname=keyutils -version=1.5.9 -revision=4 +version=1.5.10 +revision=1 conf_files="/etc/request-key.conf" short_desc="Linux Key Management Utilities" maintainer="Juan RP " homepage="http://www.kernel.org" license="GPL-2, LGPL-2.1" distfiles="http://people.redhat.com/~dhowells/$pkgname/$pkgname-$version.tar.bz2" -checksum=4da2c5552c688b65ab14d4fd40fbdf720c8b396d8ece643e040cf6e707e083ae +checksum=115c3deae7f181778fd0e0ffaa2dad1bf1fe2f5677cf2e0e348cdb7a1c93afb6 pre_build() { # Fix musl build - doesn't hurt glibc either diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template index f760be98dec..939edf3ecb3 100644 --- a/srcpkgs/kglobalaccel/template +++ b/srcpkgs/kglobalaccel/template @@ -1,10 +1,10 @@ # Template file for 'kglobalaccel' pkgname=kglobalaccel version=5.29.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules pkg-config" +hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools qt5-tools" makedepends="kservice-devel" short_desc="KDE Global desktop keyboard shortcuts" maintainer="Denis Revin " diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template index ec33aad053a..7ccca022696 100644 --- a/srcpkgs/khal/template +++ b/srcpkgs/khal/template @@ -1,6 +1,6 @@ # Template file for 'khal' pkgname=khal -version=0.9.2 +version=0.9.5 revision=1 noarch=yes build_style=python3-module @@ -14,7 +14,7 @@ maintainer="Oliver Kiddle " license="MIT" homepage="http://lostpackets.de/khal/" distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz" -checksum=97eb94f345dd7a93f2b983d43e74b3cf86bf679f35e942f17d8823400e2bd0e7 +checksum=b945894cb4ededa6711989814bd4866815f322aa25dff581d808a7eae5047b3b pre_build() { sed -i setup.py \ diff --git a/srcpkgs/kicad-library/template b/srcpkgs/kicad-library/template index fba498cf737..6b0305e4170 100644 --- a/srcpkgs/kicad-library/template +++ b/srcpkgs/kicad-library/template @@ -1,7 +1,7 @@ # Template file for 'kicad-library' pkgname=kicad-library -version=4.0.5 -revision=1 +version=4.0.6 +revision=2 noarch=yes build_style=cmake depends="kicad" @@ -10,4 +10,4 @@ maintainer="Steve Prybylski " license="LGPL-2" homepage="http://kicad-pcb.org" distfiles="https://github.com/kicad/kicad-library/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=7169d1cfa1a55cbe7570252e68dc1242ae91458f16a13f7fc3f7804c504b1af1 +checksum=eedc596583a56325f0f518342218a2af809db23d62dcdc7ad3ad0167da3dc499 diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template index d3475d47a63..8a6927c6633 100644 --- a/srcpkgs/kicad/template +++ b/srcpkgs/kicad/template @@ -1,21 +1,21 @@ # Template file for 'kicad' pkgname=kicad -version=4.0.5 -revision=1 +version=4.0.6 +revision=3 build_style=cmake configure_args="-DKICAD_BUILD_VERSION=$version -DKICAD_SKIP_BOOST=ON -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0" hostmakedepends="pkg-config swig" makedepends="wxWidgets-devel wxPython-devel python-devel glew-devel cairo-devel - libressl-devel boost-devel" + libressl-devel boost-devel libcurl-devel" depends="wxPython" short_desc="Electronic schematic and PCB design software" maintainer="Steve Prybylski " license="GPL-2" homepage="http://kicad-pcb.org" distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.xz" -checksum=73f286733bb69b04749279a1848cbedfad908e7dcd1d11363c7fae7677c85331 +checksum=e97cacc179839e65f2afa14d8830a3bed549aaa9ed234c988851971bf2a42298 patch_args="-Np1" CXXFLAGS="-std=c++11" diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template index f1b7fc36b66..c5220f470dd 100644 --- a/srcpkgs/kiconthemes/template +++ b/srcpkgs/kiconthemes/template @@ -1,10 +1,10 @@ # Template file for 'kiconthemes' pkgname=kiconthemes version=5.29.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules" +hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python" makedepends="kitemviews-devel qt5-svg-devel karchive-devel kconfigwidgets-devel" short_desc="KDE Icon GUI utilities" maintainer="Denis Revin " diff --git a/srcpkgs/kirkwood-kernel/template b/srcpkgs/kirkwood-kernel/template index c81f6d9ac4d..adac7b9df1f 100644 --- a/srcpkgs/kirkwood-kernel/template +++ b/srcpkgs/kirkwood-kernel/template @@ -3,7 +3,7 @@ pkgname=kirkwood-kernel version=4.1.36 revision=1 wrksrc="linux-${version}" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " homepage="http://www.kernel.org/" license="GPL-2" short_desc="The Linux kernel and modules for kirkwood" diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template index 6f75c4be32f..7c09d621f89 100644 --- a/srcpkgs/kjobwidgets/template +++ b/srcpkgs/kjobwidgets/template @@ -1,10 +1,10 @@ # Template file for 'kjobwidgets' pkgname=kjobwidgets version=5.29.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules" +hostmakedepends="extra-cmake-modules qt5-host-tools qt5-tools qt5-qmake" makedepends="kcoreaddons-devel kwidgetsaddons-devel qt5-x11extras-devel" short_desc="KDE Widgets for showing progress of asynchronous jobs" maintainer="Denis Revin " diff --git a/srcpkgs/klystrack/template b/srcpkgs/klystrack/template new file mode 100644 index 00000000000..38ffacaa1f6 --- /dev/null +++ b/srcpkgs/klystrack/template @@ -0,0 +1,48 @@ +# Template file for 'klystrack' +pkgname=klystrack +version=1.7.0 +revision=1 +_klystronsha=4bbadbda271da642b87b2d83cd44742f36c27da0 +wrksrc=klystrack-${version}-final +create_wrksrc=yes +hostmakedepends="SDL2-devel" +makedepends="SDL2_image-devel SDL2_mixer-devel" +short_desc="Chiptune music tracker" +maintainer="allan " +license="BSD" +homepage="http://kometbomb.github.io/klystrack/" +distfiles="https://github.com/kometbomb/klystrack/archive/${version}-final.tar.gz + https://github.com/kometbomb/klystron/archive/${_klystronsha}.tar.gz" +checksum="cc8fd6a8ee84974ee1ee576342901a0e63f311848495ae0ba504305a5ccdfb97 + 8f957d1250fa36d343d3eecd6585c5890342b0a1b3d8ecaec22217e95d1dbf96" + +do_build() { + test -d klystron || + mv klystron-${_klystronsha} klystron + cd klystrack-${version}-final + + sed -i \ + -e 's/\r$//' \ + -e "/^CFLAGS/s,\$, ${CFLAGS}," \ + -e "/^LDFLAGS/s:\$: ${LDFLAGS}:" \ + -e 's/^CC := gcc/CC := $(CC)/' \ + -e '36s/$/ -lSDL2_mixer/' \ + Makefile + sed -i \ + -e 's/\r$//' \ + -e 's/^CC = gcc/CC = $(CC)/' \ + ../klystron/Makefile + + make CC=$CC $makejobs CFG=release +} + +do_install() { + cd klystrack-${version}-final + vbin bin.release/klystrack + vmkdir usr/lib/klystrack + vcopy res usr/lib/klystrack + vcopy key usr/lib/klystrack + vmkdir usr/share/examples/klystrack + vcopy examples usr/share/examples/klystrack + vlicense linux/copyright +} diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template index 6fb22ba4ae6..25a2a213d09 100644 --- a/srcpkgs/knotifications/template +++ b/srcpkgs/knotifications/template @@ -1,10 +1,10 @@ # Template file for 'knotifications' pkgname=knotifications version=5.29.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules" +hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools" makedepends="kwindowsystem-devel kcodecs-devel kconfig-devel kcoreaddons-devel phonon-qt5-devel libdbusmenu-qt5-devel" short_desc="KDE Desktop notifications" maintainer="Denis Revin " diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index b35f79d6e73..2b7a5a2df8b 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita version=3.1.2.1 -revision=1 +revision=2 nocross=yes build_style=cmake replaces="calligra-krita>=0" diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template index 1d28c990394..8b6c713f3e1 100644 --- a/srcpkgs/ktextwidgets/template +++ b/srcpkgs/ktextwidgets/template @@ -1,10 +1,10 @@ # Template file for 'ktextwidgets' pkgname=ktextwidgets version=5.29.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules" +hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools python" makedepends="kcompletion-devel kiconthemes-devel kservice-devel sonnet-devel" short_desc="KDE Text editing widgets" maintainer="Denis Revin " diff --git a/srcpkgs/ktoblzcheck/template b/srcpkgs/ktoblzcheck/template index 33d76c8e10a..525b7a206b8 100644 --- a/srcpkgs/ktoblzcheck/template +++ b/srcpkgs/ktoblzcheck/template @@ -1,7 +1,7 @@ # Template file for 'ktoblzcheck' pkgname=ktoblzcheck -version=1.48 -revision=2 +version=1.49 +revision=1 hostmakedepends="pkg-config" makedepends="python-devel" build_style="gnu-configure" @@ -11,7 +11,7 @@ license="LGPL" homepage="http://ktoblzcheck.sourceforge.net" short_desc="Tool for verification of account numbers and bank codes" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=0f4e66d3a880355b1afc88870d224755e078dfaf192242d9c6acb8853f5bcf58 +checksum=e8971bc6689ea72b174c194bd43ba2c0b65112b0c3f9fd2371562e0c3ab57d29 ktoblzcheck-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index 19e33726166..5cdf6d5fad6 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -1,18 +1,18 @@ # Template file for 'kubernetes' pkgname=kubernetes -version=1.5.3 -revision=2 +version=1.6.2 +revision=1 build_style=go nocross=yes only_for_archs="x86_64 x86_64-musl" hostmakedepends="rsync git git-perl go-bindata" short_desc="Container Cluster Manager for Docker" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="Apache-2.0" go_import_path="github.com/kubernetes/kubernetes" homepage="http://kubernetes.io" distfiles="https://$go_import_path/archive/v$version.tar.gz" -checksum=bd83212374091e41a24f3cbbd70a36ac7635becac76cfff590b4ded67cb537bc +checksum=2af4bcc196a90b78baf65d5bcdf6cbb613d71d3952a98813e15bb6a41f3b922c system_accounts="kube" make_dirs="/var/lib/kubelet 0755 kube kube" conf_files="/etc/kubernetes/*" diff --git a/srcpkgs/kvirc/patches/gcc6.patch b/srcpkgs/kvirc/patches/gcc6.patch new file mode 100644 index 00000000000..cd39cbaed69 --- /dev/null +++ b/srcpkgs/kvirc/patches/gcc6.patch @@ -0,0 +1,20 @@ +--- src/kvirc/kernel/KviIrcConnection.cpp.orig ++++ src/kvirc/kernel/KviIrcConnection.cpp +@@ -669,7 +669,7 @@ + while(m_pChannelList->first()) + { + m_pChannelList->first()->close(); +- QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents); ++ QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents); + } + } + +@@ -678,7 +678,7 @@ + while(m_pQueryList->first()) + { + m_pQueryList->first()->close(); +- QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents); ++ QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents); + } + } + diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template index 0cc2c71da1a..ad611a01da3 100644 --- a/srcpkgs/kvirc/template +++ b/srcpkgs/kvirc/template @@ -1,13 +1,13 @@ # Template file for 'kvirc' pkgname=kvirc version=4.2.0 -revision=11 +revision=12 build_style=cmake configure_args="-DWANT_ENV_FLAGS=1" hostmakedepends="automoc4" makedepends="zlib-devel qt-devel qt-webkit-devel libressl-devel python-devel kdelibs-devel perl" short_desc="Qt-based IRC client" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://www.kvirc.net" distfiles="ftp://ftp.kvirc.de/pub/kvirc/${version}/source/${pkgname}-${version}.tar.bz2" diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template index 379015061fc..680e3322838 100644 --- a/srcpkgs/kxmlgui/template +++ b/srcpkgs/kxmlgui/template @@ -1,10 +1,10 @@ # Template file for 'kxmlgui' pkgname=kxmlgui version=5.29.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules" +hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python" makedepends="kglobalaccel-devel ktextwidgets-devel attica-qt5-devel" short_desc="KDE Framework for managing menu and toolbar actions" maintainer="Denis Revin " diff --git a/srcpkgs/lame/template b/srcpkgs/lame/template index 9ae094fa63b..f00d90c658d 100644 --- a/srcpkgs/lame/template +++ b/srcpkgs/lame/template @@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/lame/lame-${version}.tar.gz" checksum=24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff pre_configure() { - if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then + if [ "${XBPS_TARGET_MACHINE%%-musl}" = "i686" ]; then CFLAGS+=" -msse" fi } diff --git a/srcpkgs/lapack/template b/srcpkgs/lapack/template index 8bbce3ebd0c..85a24ad9396 100644 --- a/srcpkgs/lapack/template +++ b/srcpkgs/lapack/template @@ -2,11 +2,10 @@ pkgname=lapack version=3.7.0 revision=1 -nocross=yes build_style=cmake configure_args=" -DBUILD_SHARED_LIBS=ON -DCMAKE_SKIP_RPATH=ON -DBUILD_TESTING=OFF - -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_Fortran_COMPILER=gfortran + -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_Fortran_COMPILER=$FC -DCMAKE_Fortran_FLAGS=-fPIC -DCBLAS=ON -DLAPACKE=ON -DBUILD_DEPRECATED=ON" hostmakedepends="gcc-fortran" short_desc="Linear Algebra PACKage" diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template index b58df2de026..c7122aac500 100644 --- a/srcpkgs/lastpass-cli/template +++ b/srcpkgs/lastpass-cli/template @@ -1,7 +1,7 @@ # Template file for 'lastpass-cli' pkgname=lastpass-cli version=1.1.2 -revision=1 +revision=2 build_style=cmake make_install_target="install install-doc" hostmakedepends="pkg-config asciidoc" diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template index 97eba162373..4435e63c172 100644 --- a/srcpkgs/ldapvi/template +++ b/srcpkgs/ldapvi/template @@ -1,10 +1,10 @@ # Template file for 'ldapvi' pkgname=ldapvi version=1.7 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-sha" -maintainer="Orphaned " +maintainer="Leah Neukirchen " hostmakedepends="pkg-config" makedepends="ncurses-devel readline-devel libsasl-devel popt-devel libldap-devel glib-devel" license="GPL-2" diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template index adae8e0dad9..6cf51a3202b 100644 --- a/srcpkgs/ldc/template +++ b/srcpkgs/ldc/template @@ -1,7 +1,7 @@ # Template file for 'ldc' pkgname=ldc -version=1.0.0 -revision=2 +version=1.1.1 +revision=1 wrksrc="ldc-${version}-src" build_style=cmake configure_args="-DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc -DBUILD_SHARED_LIBS=ON" @@ -11,10 +11,10 @@ depends="ldc-runtime" conf_files="/etc/ldc2.conf" maintainer="Juan RP " homepage="http://wiki.dlang.org/LDC" -license="BSD" +license="3-clause-BSD, Boost Software License 1.0" short_desc="Portable D programming language compiler based on LLVM" distfiles="https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz" -checksum=3740ee6d5871e953aeb03b11f9d8c951286a55884892b51981bfe579b8fe571d +checksum=3d35253a76288a78939fea467409462f0b87461ffb89550eb0d9958e59eb7e97 nopie=yes nocross=yes diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template index 30a38f8923b..31d7ea8270e 100644 --- a/srcpkgs/ldns/template +++ b/srcpkgs/ldns/template @@ -1,7 +1,7 @@ # Template file for 'ldns' pkgname=ldns version=1.7.0 -revision=1 +revision=3 build_style=gnu-configure configure_args="--with-drill --with-examples --disable-dane-ta-usage --with-trust-anchor=/etc/dns/root.key @@ -18,6 +18,10 @@ checksum=c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc post_extract() { sed -i 's/defined(@\$also)/@$also/' doc/doxyparse.pl } +post_install() { + sed -i -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" ${DESTDIR}/usr/bin/ldns-config +} + libldns_package() { depends="dnssec-anchors" diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template index 9acfbaf24b2..17fc272864b 100644 --- a/srcpkgs/leatherman/template +++ b/srcpkgs/leatherman/template @@ -1,8 +1,8 @@ # Template file for 'leatherman' # Note: always revbump cpp-hocon when updating as it links against this static lib pkgname=leatherman -version=0.11.1 -revision=1 +version=0.11.2 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel libcurl-devel" @@ -11,4 +11,4 @@ maintainer="Jürgen Buchmüller " license="Apache-2.0" homepage="https://github.com/puppetlabs/leatherman" distfiles="https://github.com/puppetlabs/leatherman/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=3059ecd28ce8468e5d535a7e21eea4b0cdf6aabdaec71deab5e5d18b715ecf73 +checksum=a0d3b2308aaddfb31ed4d4bcccb52206c4ad7d5da332b5254d1a6c3223ae980b diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template index 669eadb4560..0a8d96b583c 100644 --- a/srcpkgs/ledger/template +++ b/srcpkgs/ledger/template @@ -1,7 +1,7 @@ # Template file for 'ledger' pkgname=ledger version=3.1.1 -revision=3 +revision=4 build_style=cmake maintainer="Orphaned " makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel" @@ -11,6 +11,8 @@ short_desc="A powerful, double-entry accounting system that is accessed from the distfiles="https://github.com/ledger/${pkgname}/archive/v${version}.tar.gz" checksum="90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a" +broken="https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/2265/steps/shell_3/logs/stdio" + post_install() { rm -Rf ${DESTDIR}/usr/local if [ -e ${DESTDIR}/usr/lib64 ]; then diff --git a/srcpkgs/less/template b/srcpkgs/less/template index add61778c9c..12f3ac58261 100644 --- a/srcpkgs/less/template +++ b/srcpkgs/less/template @@ -1,6 +1,6 @@ # Template file for 'less' pkgname=less -version=488 +version=491 revision=1 build_style=gnu-configure configure_args="--with-regex=pcre" @@ -10,4 +10,4 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.greenwoodsoftware.com/less" distfiles="${homepage}/less-${version}.tar.gz" -checksum=f3b622a7b1d29a28b327357cacfd3b0e8e50710eeb6d290107e478f3f0ca15a2 +checksum=1b40da1d58e9604b50bc75fd31c8591e6138a627a9525572c6c4232dee4c83fd diff --git a/srcpkgs/lft/template b/srcpkgs/lft/template index 2866a03f3c8..8b606486f4c 100644 --- a/srcpkgs/lft/template +++ b/srcpkgs/lft/template @@ -1,15 +1,15 @@ # Template file for 'lft' pkgname=lft -version=3.77 +version=3.79 revision=1 build_style=gnu-configure makedepends="libpcap-devel" short_desc="Layer Four Traceroute" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="VOSTROM Public License" homepage="http://pwhois.org/lft/" distfiles="http://pwhois.org/dl/index.who?file=${pkgname}-${version}.tar.gz" -checksum=d182d6774e64dcdeb19ed1a598fa588e57ddb6cbb6847d9277c405d3a4597d89 +checksum=08e5c7973551b529c850bffbc7152c4e5f0bcb1f07ebbb39151a7dc9a3bf9de0 post_install() { vlicense COPYING diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template index 4d1db78c43a..4dfdf1413a8 100644 --- a/srcpkgs/lftp/template +++ b/srcpkgs/lftp/template @@ -1,7 +1,7 @@ # Template file for 'lftp' pkgname=lftp -version=4.7.6 -revision=1 +version=4.7.7 +revision=2 lib32disabled=yes build_style=gnu-configure configure_args="--with-modules --disable-rpath --without-included-regex @@ -17,7 +17,7 @@ maintainer="Juan RP " homepage="http://lftp.yar.ru/" license="GPL-3" distfiles="http://lftp.yar.ru/ftp/${pkgname}-${version}.tar.xz" -checksum=6e26254fdc7e1b92ceb31116a2c7bdcd891a07c72a7823144aaaf147a1841b7b +checksum=4483df04502660dcc65a11cf09d530e31bea99483d69328c1c5cbaa41d6619b4 XBPS_FETCH_CMD=wget # checks user-agent, serves html/please donate with xbps diff --git a/srcpkgs/libCello/template b/srcpkgs/libCello/template index 3ecb4ed87d1..bf02a9f2406 100644 --- a/srcpkgs/libCello/template +++ b/srcpkgs/libCello/template @@ -1,13 +1,13 @@ # Template file for 'libcello' pkgname=libCello -version=2.0.3 +version=2.1.0 revision=1 short_desc="Higher level programming in C" maintainer="Juan RP " homepage="http://www.libcello.org/" license="BSD" distfiles="http://$pkgname.org/static/$pkgname-$version.tar.gz" -checksum=2ebe995f0175c8397f41a32751e60d1b4907eddae7c1442c67d484a16d1c6b99 +checksum=49acf6525ac6808c49f2125ecdc101626801cffe87da16736afb80684b172b28 post_configure() { # There is no include in musl libc diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index 11db9d680ed..3416f8bc6b0 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,31 +1,37 @@ # Template build file for 'libGL'. pkgname=libGL -version=17.0.1 +version=17.0.5 revision=1 wrksrc="mesa-${version}" build_style=gnu-configure configure_args="--enable-shared-glapi --enable-gbm --enable-gles1 --enable-gles2 --enable-egl --enable-vdpau --enable-xvmc --enable-osmesa --enable-texture-float - --with-egl-platforms=x11,drm,wayland" + --with-egl-platforms=x11,drm,$(vopt_if wayland wayland)" short_desc="Graphics library similar to SGI's OpenGL" maintainer="Juan RP " homepage="http://www.mesa3d.org/" license="MIT, LGPL-2.1" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c +checksum=668efa445d2f57a26e5c096b1965a685733a3b57d9c736f9d6460263847f9bfe hostmakedepends=" - automake libtool flex pkg-config llvm python-Mako libxml2-python wayland-devel" + automake libtool flex pkg-config llvm python-Mako libxml2-python $(vopt_if wayland wayland-devel)" makedepends=" glproto dri2proto dri3proto presentproto libXext-devel libXxf86vm-devel eudev-libudev-devel libdrm-devel expat-devel talloc-devel libvdpau-devel libva-devel - libXdamage-devel libXvMC-devel libxshmfence-devel wayland-devel + libXdamage-devel libXvMC-devel libxshmfence-devel $(vopt_if wayland wayland-devel) elfutils-devel ncurses-devel zlib-devel libffi-devel" conf_files="/etc/drirc" +# Package build options +build_options="wayland" + +# Enable all options by default. +build_options_default="wayland" + # Set subpackages manually to set proper rdeps in 32bit pkgs. -subpackages="libglapi libgbm libEGL libGLES libOSMesa libwayland-egl" +subpackages="libglapi libgbm libEGL libGLES libOSMesa $(vopt_if wayland libwayland-egl)" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) @@ -58,7 +64,7 @@ esac subpackages+=" MesaLib-devel" case "$XBPS_TARGET_MACHINE" in - i686*) configure_args+=" --with-dri-driverdir=/usr/lib32/xorg/modules/drivers";; + i686) configure_args+=" --with-dri-driverdir=/usr/lib32/xorg/modules/drivers";; *) configure_args+=" --with-dri-driverdir=/usr/lib/xorg/modules/drivers";; esac case "$XBPS_TARGET_MACHINE" in @@ -68,7 +74,6 @@ case "$XBPS_TARGET_MACHINE" in *) configure_args+=" --enable-glx-tls";; esac - pre_configure() { libtoolize -f NOCONFIGURE=1 ./autogen.sh @@ -123,7 +128,7 @@ MesaLib-devel_package() { libGL>=${version}_${revision} libGLES>=${version}_${revision} libEGL>=${version}_${revision} libOSMesa>=${version}_${revision} libgbm>=${version}_${revision} - libwayland-egl>=${version}_${revision}" + $(vopt_if wayland "libwayland-egl>=${version}_${revision}")" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) depends+=" libxatracker>=${version}_${revision}";; esac @@ -193,4 +198,3 @@ mesa-opencl_package() { vmove "usr/lib/lib*OpenCL*" } } - diff --git a/srcpkgs/libXfont2-devel b/srcpkgs/libXfont2-devel new file mode 120000 index 00000000000..26dd2cf01a7 --- /dev/null +++ b/srcpkgs/libXfont2-devel @@ -0,0 +1 @@ +libXfont2 \ No newline at end of file diff --git a/srcpkgs/libXfont2/template b/srcpkgs/libXfont2/template new file mode 100644 index 00000000000..2188d68b883 --- /dev/null +++ b/srcpkgs/libXfont2/template @@ -0,0 +1,28 @@ +# Template file for 'libXfont2' +pkgname=libXfont2 +version=2.0.1 +revision=1 +hostmakedepends="pkg-config" +makedepends="xproto xtrans fontcacheproto fontsproto freetype-devel libfontenc-devel" +build_style=gnu-configure +short_desc="X font 2 Library" +maintainer="Juan RP " +homepage="http://xorg.freedesktop.org/" +license="MIT" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" +checksum=e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e + +post_install() { + vlicense COPYING +} + +libXfont2-devel_package() { + depends="${makedepends} ${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/libabw/update b/srcpkgs/libabw/update new file mode 100644 index 00000000000..3b42a817093 --- /dev/null +++ b/srcpkgs/libabw/update @@ -0,0 +1 @@ +site="http://dev-www.libreoffice.org/src/libabw" diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 400b94d9c73..ad442095647 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,7 +1,7 @@ # Template file for 'libarchive' pkgname=libarchive version=3.3.1 -revision=1 +revision=2 bootstrap=yes build_style=gnu-configure configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) diff --git a/srcpkgs/libassimp b/srcpkgs/libassimp new file mode 120000 index 00000000000..04302370c5b --- /dev/null +++ b/srcpkgs/libassimp @@ -0,0 +1 @@ +assimp \ No newline at end of file diff --git a/srcpkgs/libassimp-devel b/srcpkgs/libassimp-devel new file mode 120000 index 00000000000..04302370c5b --- /dev/null +++ b/srcpkgs/libassimp-devel @@ -0,0 +1 @@ +assimp \ No newline at end of file diff --git a/srcpkgs/libbson/template b/srcpkgs/libbson/template index c9156383798..85bd86c5872 100644 --- a/srcpkgs/libbson/template +++ b/srcpkgs/libbson/template @@ -1,15 +1,15 @@ # Template file for 'libbson' pkgname=libbson -version=1.6.1 +version=1.6.2 revision=1 build_style=gnu-configure hostmakedepends="perl automake libtool" -short_desc="The libbson BSON serialization library" +short_desc="The BSON serialization library" maintainer="Juan RP " license="Apache-2.0" homepage="https://github.com/mongodb/libbson" distfiles="https://github.com/mongodb/libbson/archive/${version}.tar.gz" -checksum=915dcb35cb124f9922eb1b7f29e628e1663014b6077bd635d198dda471c41989 +checksum=d9a1b2229a4aac2edb1564b909f0770a972af9bf94994acce2b21b2905913aed pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/libcacard-devel b/srcpkgs/libcacard-devel new file mode 120000 index 00000000000..f2d5cc5a826 --- /dev/null +++ b/srcpkgs/libcacard-devel @@ -0,0 +1 @@ +libcacard \ No newline at end of file diff --git a/srcpkgs/libcacard-tools b/srcpkgs/libcacard-tools new file mode 120000 index 00000000000..f2d5cc5a826 --- /dev/null +++ b/srcpkgs/libcacard-tools @@ -0,0 +1 @@ +libcacard \ No newline at end of file diff --git a/srcpkgs/libcacard/template b/srcpkgs/libcacard/template new file mode 100644 index 00000000000..ea7a220339e --- /dev/null +++ b/srcpkgs/libcacard/template @@ -0,0 +1,29 @@ +# Template file for 'libcacard' +pkgname=libcacard +version=2.5.3 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="nss-devel glib-devel pcsclite-devel" +short_desc="Library to provide emulation of smart cards to a virtual card reader" +maintainer="Sir_Boops " +homepage="https://www.spice-space.org/page/Libcacard" +license="LGPL-2.1" +distfiles="https://www.spice-space.org/download/libcacard/libcacard-${version}.tar.xz" +checksum=243ff03c563a95faed497db7f524fcb34ccd6f388d1175ecf31c371a3188963b + +libcacard-devel_package() { + depends="nss-devel glib-devel ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/*.so + } +} +libcacard-tools_package() { + short_desc+=" - tools" + pkg_install() { + vmove usr/bin + } +} diff --git a/srcpkgs/libcap/patches/gperf-3.1-fix.patch b/srcpkgs/libcap/patches/gperf-3.1-fix.patch new file mode 100644 index 00000000000..f21cc15ae60 --- /dev/null +++ b/srcpkgs/libcap/patches/gperf-3.1-fix.patch @@ -0,0 +1,13 @@ +# Source: https://604802.bugs.gentoo.org/attachment.cgi?id=460354 + +--- libcap/Makefile ++++ libcap/Makefile +@@ -41,7 +41,7 @@ cap_names.h: _makenames + ./_makenames > cap_names.h + + $(GPERF_OUTPUT): cap_names.list.h +- perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@ ++ perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --includes --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@ + + cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h + @echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h" diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template index 9c9882349c0..1d6cea6ff41 100644 --- a/srcpkgs/libcap/template +++ b/srcpkgs/libcap/template @@ -1,7 +1,7 @@ # Template file for 'libcap' pkgname=libcap version=2.25 -revision=1 +revision=2 bootstrap=yes makedepends="attr-devel" short_desc="POSIX.1e capabilities suite" diff --git a/srcpkgs/libcdio-paranoia/template b/srcpkgs/libcdio-paranoia/template index d5cc61f1448..8faa2ba1a51 100644 --- a/srcpkgs/libcdio-paranoia/template +++ b/srcpkgs/libcdio-paranoia/template @@ -1,7 +1,7 @@ # Template file for 'libcdio-paranoia' pkgname=libcdio-paranoia -version="10.2+0.93+1" -revision=4 +version="10.2+0.94+1" +revision=1 build_style=gnu-configure configure_args="--enable-cpp-progs --disable-example-progs" hostmakedepends="automake libtool pkg-config" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/libcdio/" distfiles="${GNU_SITE}/libcdio/$pkgname-$version.tar.bz2" -checksum=ec1d9b1d5a28cc042f2cb33a7cc0a2b5ce5525f102bc4c15db1fac322559a493 +checksum=10304e64e5a125d5b4b336ba75eccb39ebfd977512fb04c40a7035f6ff4c6cd2 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template index e618c7f2042..f796dc93dba 100644 --- a/srcpkgs/libcdr/template +++ b/srcpkgs/libcdr/template @@ -1,7 +1,7 @@ # Template file for 'libcdr' pkgname=libcdr version=0.1.3 -revision=1 +revision=2 build_style=gnu-configure short_desc="Corel Draw file format importer library" maintainer="Enno Boland " diff --git a/srcpkgs/libcdr/update b/srcpkgs/libcdr/update new file mode 100644 index 00000000000..c73523e2ee9 --- /dev/null +++ b/srcpkgs/libcdr/update @@ -0,0 +1 @@ +site="http://dev-www.libreoffice.org/src/libcdr" diff --git a/srcpkgs/libchamplain/template b/srcpkgs/libchamplain/template index 73acd28b33f..a41b3203237 100644 --- a/srcpkgs/libchamplain/template +++ b/srcpkgs/libchamplain/template @@ -1,6 +1,6 @@ # Template file for 'libchamplain' pkgname=libchamplain -version=0.12.14 +version=0.12.15 revision=1 build_style=gnu-configure configure_args="$(vopt_enable gir introspection) --disable-static" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://projects.gnome.org/libchamplain/" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=f1621ddec1ffe64ca01c3216db8663f60ae0bb107521195fc6856119d4b4568f +checksum=54721a210bdef6d73c5192ed83542023117bf5d7441257e7a7a9f8c05550b874 # Package build options build_options="gir" diff --git a/srcpkgs/libclc-git/template b/srcpkgs/libclc-git/template index 193def5b01b..b74ecefbe5f 100644 --- a/srcpkgs/libclc-git/template +++ b/srcpkgs/libclc-git/template @@ -1,7 +1,8 @@ # Template file for 'libclc-git' pkgname=libclc-git +reverts=20160921_1 version=20160905 -revision=1 +revision=3 _git_hash=88b82a6f70012a903b10dfc1e2304d3ef2e76dbc wrksrc="libclc-${_git_hash}" build_style=configure @@ -16,9 +17,14 @@ homepage="http://libclc.llvm.org" provides="libclc-${version}_${revision}" replaces="libclc>=0" noarch=yes -distfiles="https://github.com/llvm-mirror/libclc/archive/${_git_hash}.tar.gz" +distfiles="https://github.com/llvm-mirror/libclc/archive/${_git_hash}.tar.gz>${pkgname}-${version}.tar.gz" checksum=4d01522ad7228fa91d46ccad68cac9fc6d2079bad23b4f0479f378dd9e9dc52e +pre_build() { + sed -i Makefile \ + -e"s;/usr/bin/clang++;g++;g" \ + -e"s;-mtune=i686;;g" +} post_install() { vlicense LICENSE.TXT } diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template index a62ef407ebf..4f3329b96b2 100644 --- a/srcpkgs/libcmis/template +++ b/srcpkgs/libcmis/template @@ -1,7 +1,7 @@ # Template file for 'libcmis' pkgname=libcmis version=0.5.0 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="pkg-config libtool automake" makedepends="libcurl-devel libxml2-devel libcppunit-devel boost-devel" diff --git a/srcpkgs/libcroco/template b/srcpkgs/libcroco/template index c3cad7815ba..d92b2d53087 100644 --- a/srcpkgs/libcroco/template +++ b/srcpkgs/libcroco/template @@ -1,6 +1,6 @@ # Template build file for 'libcroco'. pkgname=libcroco -version=0.6.11 +version=0.6.12 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=132b528a948586b0dfa05d7e9e059901bca5a3be675b6071a90a90b81ae5a056 +checksum=ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860 libcroco-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libcrypto38 b/srcpkgs/libcrypto41 similarity index 100% rename from srcpkgs/libcrypto38 rename to srcpkgs/libcrypto41 diff --git a/srcpkgs/libdill/template b/srcpkgs/libdill/template index eea92508190..ee38d09e95d 100644 --- a/srcpkgs/libdill/template +++ b/srcpkgs/libdill/template @@ -1,6 +1,6 @@ # Template file for 'libdill' pkgname=libdill -version=1.3 +version=1.6 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Tai Chi Minh Ralph Eastwood " license="MIT" homepage="http://libdill.org/" distfiles="https://github.com/sustrik/libdill/archive/${version}.tar.gz" -checksum=55a3432c237eb747508d7de649d94bcfcd00fac4b3c13959c9cc295deb340d9f +checksum=2539d3440971c876b117bc87295b0caabc8c8ec5f544856ca9e74ed12705ea51 pre_configure() { export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=?/}" diff --git a/srcpkgs/libdrm/patches/musl.patch b/srcpkgs/libdrm/patches/musl.patch deleted file mode 100644 index 14e4651e2e6..00000000000 --- a/srcpkgs/libdrm/patches/musl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- xf86drm.c.orig 2015-09-17 07:47:33.627138291 +0200 -+++ xf86drm.c 2015-09-17 07:47:51.209322782 +0200 -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include /* PATH_MAX */ - #include - #include - #define stat_t struct stat diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index 9c4993e22eb..5a13dbccf3c 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -1,6 +1,6 @@ # Template build file for 'libdrm'. pkgname=libdrm -version=2.4.75 +version=2.4.80 revision=1 build_style=gnu-configure configure_args="--enable-udev --disable-valgrind" @@ -8,13 +8,12 @@ hostmakedepends="libtool automake pkg-config xorg-util-macros" makedepends="eudev-libudev-devel libpciaccess-devel" short_desc="Userspace interface to kernel DRM services" maintainer="Juan RP " -homepage="http://dri.freedesktop.org/" +homepage="https://dri.freedesktop.org/" license="MIT" -distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2" -checksum=2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f +distfiles="https://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2" +checksum=a82a519601e9cdfad795e760807eb07ac8913b225e25fc8fe9bc03e3be6549f1 pre_configure() { - sed -e '/pthread-stubs/d' -i configure.ac autoreconf -fi } diff --git a/srcpkgs/libdwarf/patches/swf_compressed.patch b/srcpkgs/libdwarf/patches/swf_compressed.patch deleted file mode 100644 index c8c68b56d2d..00000000000 --- a/srcpkgs/libdwarf/patches/swf_compressed.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- libdwarf/libdwarfdefs.h.orig 2016-05-08 06:57:38.557143992 +0200 -+++ libdwarf/libdwarfdefs.h 2016-05-08 06:57:53.646144771 +0200 -@@ -84,10 +84,4 @@ - #define UNUSEDARG - #endif - --#ifndef SHF_COMPRESSED --/* This from ubuntu xenial. Is in top of trunk binutils -- as of February 2016. Elf Section Flag */ --#define SHF_COMPRESSED (1 << 11) --#endif -- - #endif /* LIBDWARFDEFS_H */ diff --git a/srcpkgs/libdwarf/template b/srcpkgs/libdwarf/template index dd85dad644e..69227e50120 100644 --- a/srcpkgs/libdwarf/template +++ b/srcpkgs/libdwarf/template @@ -1,6 +1,6 @@ # Template build file for 'libdwarf' pkgname=libdwarf -version=20161124 +version=20170416 revision=1 build_style=gnu-configure configure_args="--prefix=/usr --enable-shared" @@ -10,7 +10,7 @@ license="GPL-2, LGPL-2.1" makedepends="elfutils-devel" homepage="http://www.prevanders.net/dwarf.html" distfiles="http://prevanders.net/${pkgname}-${version}.tar.gz" -checksum=bd3d6dc7da0509876fb95b8681f165febd898845dc66714aa58e69b8feca988f +checksum=d340c395217d78a67bec069f9991130622626a87cdba73131d091cb2f1005d81 wrksrc="dwarf-${version}" build_wrksrc="libdwarf" nocross="yes" diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template index 01fcf00d9ef..cc9706775df 100644 --- a/srcpkgs/libe-book/template +++ b/srcpkgs/libe-book/template @@ -1,7 +1,7 @@ # Template file for 'libe-book' pkgname=libe-book version=0.1.2 -revision=5 +revision=6 build_style=gnu-configure configure_args="--disable-werror" hostmakedepends="automake libtool gperf doxygen pkg-config" diff --git a/srcpkgs/libedit/template b/srcpkgs/libedit/template index 7c975e8bb83..e61d3811632 100644 --- a/srcpkgs/libedit/template +++ b/srcpkgs/libedit/template @@ -1,6 +1,6 @@ # Template file for 'libedit' pkgname=libedit -_datever=20160903 +_datever=20170329 _distver=3.1 version=${_datever}.${_distver} revision=1 @@ -12,7 +12,7 @@ maintainer="Juan RP " license="2-clause-BSD" homepage="http://www.thrysoee.dk/editline/" distfiles="http://www.thrysoee.dk/editline/libedit-${_datever}-${_distver}.tar.gz" -checksum=0ccbd2e7d46097f136fcb1aaa0d5bc24e23bb73f57d25bee5a852a683eaa7567 +checksum=91f2d90fbd2a048ff6dad7131d9a39e690fd8a8fd982a353f1333dd4017dd4be post_install() { vlicense COPYING diff --git a/srcpkgs/libepoxy/template b/srcpkgs/libepoxy/template index 37f1665a3eb..02b7b781b71 100644 --- a/srcpkgs/libepoxy/template +++ b/srcpkgs/libepoxy/template @@ -1,6 +1,6 @@ # Template file for 'libepoxy' pkgname=libepoxy -version=1.4.1 +version=1.4.2 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config python xorg-util-macros" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="MIT" homepage="https://github.com/anholt/libepoxy" distfiles="https://github.com/anholt/libepoxy/archive/${version}.tar.gz" -checksum=da8f42c355b62c2c3ff6bc534c2a24099707b249c2af6eaf8db54b94c364a504 +checksum=61613b2cdc0167917229aa308d6eab2473f0408f84f3ccbd77d8677b42e89e39 pre_configure() { autoreconf -fi diff --git a/srcpkgs/liberation-fonts-ttf/template b/srcpkgs/liberation-fonts-ttf/template index 0eaa4af7ce5..4be86486ffd 100644 --- a/srcpkgs/liberation-fonts-ttf/template +++ b/srcpkgs/liberation-fonts-ttf/template @@ -9,8 +9,8 @@ font_dirs="/usr/share/fonts/TTF" short_desc="TrueType fonts from RedHat" maintainer="Juan RP " license="GPL-2, ${pkgname}" -homepage="http://www.redhat.com/promo/fonts/" -distfiles="https://fedorahosted.org/releases/l/i/liberation-fonts/${pkgname}-${version}.tar.gz" +homepage="https://pagure.io/liberation-fonts" +distfiles="https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz" checksum=7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504 do_install() { diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template index adf0da016eb..bdf1e3ea372 100644 --- a/srcpkgs/libesmtp/template +++ b/srcpkgs/libesmtp/template @@ -1,7 +1,7 @@ # Template file for 'libesmtp' pkgname=libesmtp version=1.0.6 -revision=13 +revision=14 build_style=gnu-configure configure_args="--disable-static --with-openssl" makedepends="libressl-devel" diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template index 5e306854ffc..3f5f36cc05b 100644 --- a/srcpkgs/libetpan/template +++ b/srcpkgs/libetpan/template @@ -1,7 +1,7 @@ # Template file for 'libetpan' pkgname=libetpan version=1.7.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl --with-curl --with-zlib --with-sasl" diff --git a/srcpkgs/libevent/patches/CVE-2016-10195.patch b/srcpkgs/libevent/patches/CVE-2016-10195.patch deleted file mode 100644 index 83a76600852..00000000000 --- a/srcpkgs/libevent/patches/CVE-2016-10195.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 96f64a022014a208105ead6c8a7066018449d86d Mon Sep 17 00:00:00 2001 -From: Azat Khuzhin -Date: Mon, 1 Feb 2016 17:32:09 +0300 -Subject: [PATCH] evdns: name_parse(): fix remote stack overread - ---- evdns.c -+++ evdns.c -@@ -976,7 +976,6 @@ name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) { - - for (;;) { - u8 label_len; -- if (j >= length) return -1; - GET8(label_len); - if (!label_len) break; - if (label_len & 0xc0) { -@@ -997,6 +996,7 @@ name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) { - *cp++ = '.'; - } - if (cp + label_len >= end) return -1; -+ if (j + label_len > length) return -1; - memcpy(cp, packet + j, label_len); - cp += label_len; - j += label_len; diff --git a/srcpkgs/libevent/patches/CVE-2016-10196.patch b/srcpkgs/libevent/patches/CVE-2016-10196.patch deleted file mode 100644 index aaaa7f796a0..00000000000 --- a/srcpkgs/libevent/patches/CVE-2016-10196.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 329acc18a0768c21ba22522f01a5c7f46cacc4d5 Mon Sep 17 00:00:00 2001 -From: Azat Khuzhin -Date: Sun, 31 Jan 2016 00:57:16 +0300 -Subject: [PATCH] evutil_parse_sockaddr_port(): fix buffer overflow - ---- evutil.c -+++ evutil.c -@@ -2058,12 +2058,12 @@ evutil_parse_sockaddr_port(const char *ip_as_string, struct sockaddr *out, int * - - cp = strchr(ip_as_string, ':'); - if (*ip_as_string == '[') { -- int len; -+ size_t len; - if (!(cp = strchr(ip_as_string, ']'))) { - return -1; - } -- len = (int) ( cp-(ip_as_string + 1) ); -- if (len > (int)sizeof(buf)-1) { -+ len = ( cp-(ip_as_string + 1) ); -+ if (len > sizeof(buf)-1) { - return -1; - } - memcpy(buf, ip_as_string+1, len); diff --git a/srcpkgs/libevent/patches/CVE-2016-10197.patch b/srcpkgs/libevent/patches/CVE-2016-10197.patch deleted file mode 100644 index 27bb7791d21..00000000000 --- a/srcpkgs/libevent/patches/CVE-2016-10197.patch +++ /dev/null @@ -1,21 +0,0 @@ -From ec65c42052d95d2c23d1d837136d1cf1d9ecef9e Mon Sep 17 00:00:00 2001 -From: Azat Khuzhin -Date: Fri, 25 Mar 2016 00:33:47 +0300 -Subject: [PATCH] evdns: fix searching empty hostnames - ---- evdns.c -+++ evdns.c -@@ -3175,9 +3175,12 @@ search_set_from_hostname(struct evdns_base *base) { - static char * - search_make_new(const struct search_state *const state, int n, const char *const base_name) { - const size_t base_len = strlen(base_name); -- const char need_to_append_dot = base_name[base_len - 1] == '.' ? 0 : 1; -+ char need_to_append_dot; - struct search_domain *dom; - -+ if (!base_len) return NULL; -+ need_to_append_dot = base_name[base_len - 1] == '.' ? 0 : 1; -+ - for (dom = state->head; dom; dom = dom->next) { - if (!n--) { - /* this is the postfix we want */ diff --git a/srcpkgs/libevent/patches/libressl.patch b/srcpkgs/libevent/patches/libressl.patch new file mode 100644 index 00000000000..a7cfcc59870 --- /dev/null +++ b/srcpkgs/libevent/patches/libressl.patch @@ -0,0 +1,81 @@ +--- openssl-compat.h.orig ++++ openssl-compat.h +@@ -1,7 +1,7 @@ + #ifndef OPENSSL_COMPAT_H + #define OPENSSL_COMPAT_H + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + + static inline BIO_METHOD *BIO_meth_new(int type, const char *name) + { +@@ -30,6 +30,6 @@ static inline BIO_METHOD *BIO_meth_new(i + + #define TLS_method SSLv23_method + +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) */ + + #endif /* OPENSSL_COMPAT_H */ +--- sample/https-client.c.orig ++++ sample/https-client.c +@@ -312,7 +312,7 @@ main(int argc, char **argv) + } + uri[sizeof(uri) - 1] = '\0'; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + // Initialize OpenSSL + SSL_library_init(); + ERR_load_crypto_strings(); +@@ -480,7 +480,7 @@ cleanup: + SSL_CTX_free(ssl_ctx); + if (type == HTTP && ssl) + SSL_free(ssl); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + EVP_cleanup(); + ERR_free_strings(); + +@@ -492,7 +492,7 @@ cleanup: + CRYPTO_cleanup_all_ex_data(); + + sk_SSL_COMP_free(SSL_COMP_get_compression_methods()); +-#endif /*OPENSSL_VERSION_NUMBER < 0x10100000L */ ++#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) */ + + #ifdef _WIN32 + WSACleanup(); +--- sample/le-proxy.c.orig ++++ sample/le-proxy.c +@@ -259,7 +259,7 @@ main(int argc, char **argv) + + if (use_ssl) { + int r; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + SSL_library_init(); + ERR_load_crypto_strings(); + SSL_load_error_strings(); +--- sample/openssl_hostname_validation.c.orig ++++ sample/openssl_hostname_validation.c +@@ -48,7 +48,7 @@ SOFTWARE. + + #define HOSTNAME_MAX_SIZE 255 + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + #define ASN1_STRING_get0_data ASN1_STRING_data + #endif + +--- test/regress_ssl.c.orig ++++ test/regress_ssl.c +@@ -186,7 +186,7 @@ get_ssl_ctx(void) + void + init_ssl(void) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + SSL_library_init(); + ERR_load_crypto_strings(); + SSL_load_error_strings(); diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template index 7a8785a52e0..07340038898 100644 --- a/srcpkgs/libevent/template +++ b/srcpkgs/libevent/template @@ -1,16 +1,20 @@ # Template file for 'libevent' pkgname=libevent -version=2.0.22 -revision=8 -wrksrc="$pkgname-$version-stable" +version=2.1.8 +revision=2 +wrksrc="${pkgname}-${version}-stable" build_style=gnu-configure makedepends="libressl-devel" short_desc="Abstract asynchronous event notification library" maintainer="Juan RP " -homepage="http://www.monkey.org/~provos/libevent/" -license="GPL-2" -distfiles="${SOURCEFORGE_SITE}/levent/$pkgname-$version-stable.tar.gz" -checksum=71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3 +homepage="http://libevent.org/" +license="3-clause-BSD" +distfiles="https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz" +checksum=965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2 + +post_install() { + vlicense LICENSE +} libevent-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libevent/update b/srcpkgs/libevent/update deleted file mode 100644 index 125db71da82..00000000000 --- a/srcpkgs/libevent/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*beta*" diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template index 7a5378c7056..6b7e20750df 100644 --- a/srcpkgs/libfetch/template +++ b/srcpkgs/libfetch/template @@ -1,7 +1,7 @@ # Template file for 'libfetch' pkgname=libfetch version=2.34 -revision=14 +revision=15 build_style=gnu-makefile makedepends="libressl-devel" short_desc="File Transfer Library for URLs" diff --git a/srcpkgs/libfreehand/update b/srcpkgs/libfreehand/update new file mode 100644 index 00000000000..099bb3dcd27 --- /dev/null +++ b/srcpkgs/libfreehand/update @@ -0,0 +1 @@ +site="http://dev-www.libreoffice.org/src/libfreehand" diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template index 25eebd51899..93eb1b6afa9 100644 --- a/srcpkgs/libgda/template +++ b/srcpkgs/libgda/template @@ -1,7 +1,7 @@ # Template file for 'libgda' pkgname=libgda version=5.2.4 -revision=7 +revision=8 build_style=gnu-configure configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json --enable-system-sqlite" diff --git a/srcpkgs/libgee08/template b/srcpkgs/libgee08/template index b09e31a926e..e7f7fcd0e5b 100644 --- a/srcpkgs/libgee08/template +++ b/srcpkgs/libgee08/template @@ -1,6 +1,6 @@ # Template file for 'libgee08' pkgname=libgee08 -version=0.18.1 +version=0.20.0 revision=1 wrksrc="libgee-${version}" build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://live.gnome.org/Libgee" distfiles="${GNOME_SITE}/libgee/${version%.*}/libgee-${version}.tar.xz" -checksum=99686bbe5a9c89ba9502c25f61314ee8efa0dd2a1159c9a639afc1458c2839a2 +checksum=21308ba3ed77646dda2e724c0e8d5a2f8d101fb05e078975a532d7887223c2bb # Package build options build_options="gir" diff --git a/srcpkgs/libgexiv2/template b/srcpkgs/libgexiv2/template index 9b6f679cb9e..2f46c3b93b6 100644 --- a/srcpkgs/libgexiv2/template +++ b/srcpkgs/libgexiv2/template @@ -1,6 +1,6 @@ # Template file for 'libgexiv2' pkgname=libgexiv2 -version=0.10.4 +version=0.10.5 revision=1 wrksrc="${pkgname/lib/}-${version}" build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://wiki.gnome.org/Projects/gexiv2" distfiles="${GNOME_SITE}/gexiv2/${version%.*}/${pkgname/lib/}-${version}.tar.xz" -checksum=ad8d31afdc0a1932cc44c4cfcea449497c0d0b445c0ad2f9735707b306e71ca4 +checksum=318fe068cd414c0af91759a87c29fd577cd5d42bf7a6f50caff27535c02ac7f3 libgexiv2-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template index 67ca0d209c0..202dc460af5 100644 --- a/srcpkgs/libgit2-glib/template +++ b/srcpkgs/libgit2-glib/template @@ -1,7 +1,7 @@ # Template file for 'libgit2-glib' pkgname=libgit2-glib version=0.25.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-silent-rules" hostmakedepends="automake glib-devel gnome-common @@ -19,7 +19,7 @@ pre_configure() { } libgit2-glib-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} $makedepends" short_desc+=" - development files" pkg_install() { vmove "usr/lib/*.so" diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template index 84c585eca3f..479e2954135 100644 --- a/srcpkgs/libgit2/template +++ b/srcpkgs/libgit2/template @@ -1,7 +1,7 @@ # Template file for 'libgit2' pkgname=libgit2 version=0.25.1 -revision=1 +revision=4 build_style=cmake hostmakedepends="python git pkg-config" makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel" @@ -11,6 +11,7 @@ homepage="http://libgit2.github.com/" license="GPL-2 with Linking Exception" distfiles="https://github.com/libgit2/libgit2/archive/v${version}.tar.gz" checksum=7ae8e699ff7ff9a1fa702249140ee31ea6fd556bf7968e84e38165870667bcb1 +configure_args="-DTHREADSAFE=ON" case "$XBPS_TARGET_MACHINE" in *-musl) diff --git a/srcpkgs/libglade/patches/libglade-gmodule.patch b/srcpkgs/libglade/patches/libglade-gmodule.patch new file mode 100644 index 00000000000..353088fa452 --- /dev/null +++ b/srcpkgs/libglade/patches/libglade-gmodule.patch @@ -0,0 +1,12 @@ +--- configure.in.orig ++++ configure.in +@@ -46,7 +46,8 @@ PKG_CHECK_MODULES(LIBGLADE, [dnl + libxml-2.0 >= required_libxml_version dnl + atk >= required_atk_version dnl + gtk+-2.0 >= required_gtk_version dnl +- glib-2.0 >= required_glib_version]) ++ glib-2.0 >= required_glib_version dnl ++ gmodule-no-export-2.0 >= required_glib_version]) + + AC_MSG_CHECKING([for native Win32]) + case "$host" in diff --git a/srcpkgs/libglade/template b/srcpkgs/libglade/template index b014d5d7571..fccb2356d44 100644 --- a/srcpkgs/libglade/template +++ b/srcpkgs/libglade/template @@ -1,10 +1,10 @@ # Template build file for 'libglade'. pkgname=libglade version=2.6.4 -revision=11 +revision=12 build_style=gnu-configure configure_args="--disable-static --without-xml-catalog" -hostmakedepends="pkg-config python" +hostmakedepends="automake pkg-config libtool python glib-devel gtk+-devel" makedepends="libxml2-devel gtk+-devel xmlcatmgr" depends="xmlcatmgr" short_desc="Runtime interpreter for GLADE GUI files" @@ -17,6 +17,10 @@ checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec # Register DTDs with xmlcatmgr. xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd" +pre_configure() { + autoreconf -fi +} + libglade-devel_package() { depends="libxml2-devel gtk+-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" -- development files" diff --git a/srcpkgs/libgphoto2/template b/srcpkgs/libgphoto2/template index b878df86ccd..efed68659ae 100644 --- a/srcpkgs/libgphoto2/template +++ b/srcpkgs/libgphoto2/template @@ -1,6 +1,6 @@ # Template file for 'libgphoto2' pkgname=libgphoto2 -version=2.5.12 +version=2.5.13 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-rpath udevscriptdir=/usr/lib/udev" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.gphoto.org" distfiles="${SOURCEFORGE_SITE}/gphoto/$pkgname-$version.tar.bz2" -checksum=b9bb28990fde45ac385e4851a07dbad2e1250404b535b0a3a3b898bb431e4e2e +checksum=ceaacbdf187d1cd1aed5336991f46b0100f6960b6c8383f9aeab98f1f64780ef if [ "$CROSS_BUILD" ]; then hostmakedepends+=" libgphoto2" diff --git a/srcpkgs/libgtop/template b/srcpkgs/libgtop/template index 27282895fb4..56a9a6db9dd 100644 --- a/srcpkgs/libgtop/template +++ b/srcpkgs/libgtop/template @@ -1,6 +1,6 @@ # Template build file for 'libgtop'. pkgname=libgtop -version=2.34.2 +version=2.36.0 revision=1 build_style=gnu-configure configure_args="--with-libgtop-smp $(vopt_enable gir introspection)" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org/" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=268ad1478363e8c0955ea842fa134f6eb88965ab5e03166c20d8df9e7a1f8ef8 +checksum=13bfe34c150b2b00b03df4732e8c7ccfae09ab15897ee4f4ebf0d16b0f3ba12b # Package build options build_options="gir" diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index 0509d454fe1..86d0ae7c87c 100644 --- a/srcpkgs/libguestfs/template +++ b/srcpkgs/libguestfs/template @@ -1,6 +1,6 @@ # Template file for 'libguestfs' pkgname=libguestfs -version=1.35.28 +version=1.37.12 revision=1 _version_short=${version%.*} build_style=gnu-configure @@ -12,15 +12,15 @@ $(vopt_enable php) $(vopt_enable lua) $(vopt_enable fuse)" hostmakedepends="cpio gperf cdrtools flex pkg-config automake libtool qemu git ocaml ocaml-findlib perl-Module-Build perl $(vopt_if ruby ruby) $(vopt_if python python) $(vopt_if go go) $(vopt_if php php) $(vopt_if lua lua)" -makedepends="ncurses-devel pcre-devel augeas-devel libxml2-devel gettext-devel +makedepends="ncurses-devel pcre-devel augeas-devel libxml2-devel gettext-devel file-devel yajl-devel perl $(vopt_if ruby ruby-devel) $(vopt_if python python-devel) $(vopt_if php php-devel) $(vopt_if lua lua-devel) $(vopt_if fuse fuse-devel)" short_desc="Access and modify virtual machine disk image" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://libguestfs.org" distfiles="http://libguestfs.org/download/$_version_short-development/$pkgname-$version.tar.gz" -checksum=b128106cc01b672873648ae333f8b6d82afe18d5f95b6a65e6ec67d5c06d91b5 +checksum=6e250f537be27dfb35661bebf709b2a81b4f3bde9b4cd207871ae3627ce1eef0 conf_files="etc/libguestfs-tools.conf etc/xdg/virt-builder/repos.d/libguestfs.conf diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template index 30243108733..4ad99b98bca 100644 --- a/srcpkgs/libgusb/template +++ b/srcpkgs/libgusb/template @@ -1,6 +1,6 @@ # Template file for 'libgusb' pkgname=libgusb -version=0.2.9 +version=0.2.10 revision=1 build_style=gnu-configure configure_args="--disable-static $(vopt_enable gir introspection)" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="https://gitorious.org/gusb/" license="LGPL-2.1" distfiles="http://people.freedesktop.org/~hughsient/releases/$pkgname-${version}.tar.xz" -checksum=7320bdcd0ab1750d314fa86f48bd2cc186b9e33332314403779af9772fedde14 +checksum=5c0442f5e00792bea939bbd16df09245740ae0d8b6ad9890d09189e1f4a3a17a # Package build options build_options="gir" diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index 4f1cc7c6c1f..f3dc0140e73 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,6 +1,6 @@ # Template file for 'libgweather' pkgname=libgweather -version=3.20.4 +version=3.24.0 revision=1 build_style=gnu-configure build_options="gir" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.gnome.org/" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=7dcdc555c48461d07a198bc44e0e6ed39105d8513b12fa97c4590f5b2d912fc2 +checksum=1089b932205085add19e5e1b63361c0cff1a2c46a67ab2dded6dd2ca87bdfa3d if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" diff --git a/srcpkgs/libimagequant/template b/srcpkgs/libimagequant/template index 7c02330f89d..502e933f783 100644 --- a/srcpkgs/libimagequant/template +++ b/srcpkgs/libimagequant/template @@ -1,6 +1,6 @@ # Template file for 'libimagequant' pkgname=libimagequant -version=2.8.2 +version=2.9.1 revision=1 build_style=configure configure_args="--with-openmp" @@ -11,7 +11,7 @@ maintainer="Alessio Sergi " homepage="https://pngquant.org/lib/" license="GPL-3" distfiles="https://github.com/ImageOptim/libimagequant/archive/${version}.tar.gz" -checksum=0c1532456f273cc759932b3869e76161ac87b1fcbbd525c2478b0d0262a98d5f +checksum=34669bdc8c86fbc2e52727fd4addd1fdb67e4e2bb6db74cdcd901715d2de3690 case "$XBPS_TARGET_MACHINE" in x86_64*) configure_args+=" --enable-sse";; diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template index 23f553a679c..91c684973e5 100644 --- a/srcpkgs/libimobiledevice/template +++ b/srcpkgs/libimobiledevice/template @@ -1,7 +1,7 @@ # Template file for 'libimobiledevice' pkgname=libimobiledevice version=1.2.0 -revision=7 +revision=8 build_style=gnu-configure hostmakedepends="automake libtool pkg-config python-devel" makedepends="python-devel libglib-devel libressl-devel libusb-devel libplist-devel libusbmuxd-devel" diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template index feb12b8e7e5..f225189610f 100644 --- a/srcpkgs/libinput/template +++ b/srcpkgs/libinput/template @@ -1,6 +1,6 @@ # Template file for 'libinput' pkgname=libinput -version=1.6.2 +version=1.7.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="MIT" homepage="http://www.freedesktop.org/wiki/Software/libinput/" distfiles="$FREEDESKTOP_SITE/$pkgname/$pkgname-$version.tar.xz" -checksum=96fc0e0b24a96042b16e561201979dfa4a3f00a642538195c62f72b79f4084fa +checksum=2e56bc5bbf7d202dd94e1a5673489ce86fe10b1d4b5145948e9ba15f053247c1 post_install() { vlicense COPYING diff --git a/srcpkgs/libiodbc/patches/musl-remove-wchar_t-check.patch b/srcpkgs/libiodbc/patches/musl-remove-wchar_t-check.patch new file mode 100644 index 00000000000..ded98ddf0de --- /dev/null +++ b/srcpkgs/libiodbc/patches/musl-remove-wchar_t-check.patch @@ -0,0 +1,23 @@ +diff -Naur iODBC-3.52.8.orig/include/sqltypes.h iODBC-3.52.8/include/sqltypes.h +--- include/sqltypes.h 2012-03-27 05:15:02.000000000 -0400 ++++ include/sqltypes.h 2015-07-18 14:05:24.514478508 -0400 +@@ -399,19 +399,7 @@ + typedef unsigned short SQLWCHAR; + #else + # include +- +-# if defined(__cplusplus) || \ +- defined(_WCHAR_T) || \ +- defined(_WCHAR_T_DEFINED) || \ +- defined(_WCHAR_T_DEFINED_) || \ +- defined(_WCHAR_T_DECLARED) || \ +- defined(_BSD_WCHAR_T_DEFINED_) || \ +- defined(_BSD_WCHAR_T_) || \ +- defined(_BSD_CT_RUNE_T_) + typedef wchar_t SQLWCHAR; +-# else +-# error Please make sure your system supports the wchar_t type +-# endif + #endif /* WIN32 */ + + diff --git a/srcpkgs/libiodbc/template b/srcpkgs/libiodbc/template index 5ca77fb4564..39c1c477a16 100644 --- a/srcpkgs/libiodbc/template +++ b/srcpkgs/libiodbc/template @@ -1,7 +1,7 @@ # Template file for 'libiodbc' pkgname=libiodbc -version=3.52.10 -revision=1 +version=3.52.12 +revision=2 hostmakedepends="chrpath" build_style=gnu-configure configure_args="--disable-static --disable-gui @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/" distfiles="${SOURCEFORGE_SITE}/iodbc/${pkgname}-${version}.tar.gz" -checksum=1568b42b4e97f36110af661d39bfea7d94ac4ff020014574b16a7199f068e11f +checksum=51c5ff3a7d9a54202486cb77a3514e0e379a135beefcd5d12b96d1901f9dfb62 post_install() { rm -rf ${DESTDIR}/usr/share/libiodbc diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template index ccfb14965ed..4a0aaf6bb45 100644 --- a/srcpkgs/libixion/template +++ b/srcpkgs/libixion/template @@ -1,7 +1,7 @@ # Template file for 'libixion' pkgname=libixion version=0.12.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="boost-devel mdds python3-devel" diff --git a/srcpkgs/libixion11/template b/srcpkgs/libixion11/template index 13e77afe5fa..7a1f57f1b9c 100644 --- a/srcpkgs/libixion11/template +++ b/srcpkgs/libixion11/template @@ -1,7 +1,7 @@ # Template file for 'libixion' pkgname=libixion11 version=0.11.1 -revision=7 +revision=8 wrksrc="${pkgname%11}-${version}" build_style=gnu-configure hostmakedepends="pkg-config python3" diff --git a/srcpkgs/liblouis/patches/crosspython.patch b/srcpkgs/liblouis/patches/crosspython.patch new file mode 100644 index 00000000000..0d7f876f98d --- /dev/null +++ b/srcpkgs/liblouis/patches/crosspython.patch @@ -0,0 +1,23 @@ +Fixed by https://github.com/liblouis/liblouis/pull/325 +which has been merged upstream. +The Python bindings use ctypes, and they load the .so as soon as they +are imported. setup.py imports them and calls the library's version() +function, rather than hard-coding a version number. This breaks crossbuilds. +diff -Naur python/setup.py liblouis-3.1.0/python/setup.py +--- python/setup.py 2017-03-06 05:49:10.000000000 -0800 ++++ python/setup.py 2017-04-24 16:34:57.293458084 -0700 +@@ -23,7 +23,6 @@ + """ + + from distutils.core import setup +-import louis + + classifiers = [ + 'Development Status :: 4 - Beta', +@@ -38,5 +37,5 @@ + download_url = "http://code.google.com/p/liblouis/", + license="LGPLv2.2", + classifiers=classifiers, +- version=louis.version().split(',')[0].split('-',1)[-1], ++ version='@VERSION@', + packages=["louis"]) diff --git a/srcpkgs/liblouis/patches/wcharmismatch.patch b/srcpkgs/liblouis/patches/wcharmismatch.patch new file mode 100644 index 00000000000..904157e44e2 --- /dev/null +++ b/srcpkgs/liblouis/patches/wcharmismatch.patch @@ -0,0 +1,14 @@ +Fixed by https://github.com/liblouis/liblouis/pull/324 +which has been merged upstream. +diff --git tools/brl_checks.c tools/brl_checks.c +index c125ed5b..0ef2f808 100644 +--- tools/brl_checks.c ++++ tools/brl_checks.c +@@ -13,6 +13,7 @@ are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. This file is offered as-is, + without any warranty. */ + ++#include + #include + #include + #include diff --git a/srcpkgs/liblouis/template b/srcpkgs/liblouis/template index dac1558be76..1eb16be2b00 100644 --- a/srcpkgs/liblouis/template +++ b/srcpkgs/liblouis/template @@ -1,16 +1,31 @@ # Template file for 'liblouis' pkgname=liblouis -version=2.6.4 +version=3.1.0 revision=1 build_style=gnu-configure -hostmakedepends="pkg-config help2man python-devel" -makedepends="python-devel" +hostmakedepends="pkg-config help2man python3-devel" +makedepends="python3-devel" +depends="python3" +disable_parallel_build=yes +configure_args="--enable-ucs4" short_desc="Open-source braille translator and back-translator" maintainer="Juan RP " license="GPL-3" homepage="http://liblouis.org/" distfiles="https://github.com/$pkgname/$pkgname/releases/download/v$version/$pkgname-$version.tar.gz" -checksum=5b897a8ffd513153a4999b72374cbdd35417c32317fd6ec3c2e76674ae486ac0 +checksum=2132930503b580ecb75b57105db5dbc2fbdae4341ae749e6a432910a3b33ff1c +pycompile_module='louis' + +# See my commentary in patches/crosspython.patch +# for justification of pre_build: +pre_build() { + sed -i -e "s/@VERSION@/${version}/" python/setup.py +} + +post_install() { + cd python + python3 setup.py install --root="${DESTDIR}" +} liblouis-devel_package() { short_desc+=" - development files" @@ -20,5 +35,10 @@ liblouis-devel_package() { vmove usr/lib/*.a vmove usr/lib/*.so vmove usr/lib/pkgconfig + # .info files aren't installed because texinfo>=5 isn't + # available in the chroot. Prebuilt .info is supplied + # with the source distribution, so install that. + vmkdir usr/share/info + vcopy "doc/*.info*" usr/share/info } } diff --git a/srcpkgs/liblxqt/template b/srcpkgs/liblxqt/template index 3efeaf31f32..5b4849f03f4 100644 --- a/srcpkgs/liblxqt/template +++ b/srcpkgs/liblxqt/template @@ -1,7 +1,7 @@ # Template file for 'liblxqt' pkgname=liblxqt version=0.11.1 -revision=1 +revision=2 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" hostmakedepends="pkg-config qt5-host-tools kwindowsystem-devel" diff --git a/srcpkgs/libmatekbd/template b/srcpkgs/libmatekbd/template index a28ebf12f2f..c23ad9f9a02 100644 --- a/srcpkgs/libmatekbd/template +++ b/srcpkgs/libmatekbd/template @@ -1,9 +1,9 @@ # Template file for 'libmatekbd' pkgname=libmatekbd -version=1.16.0 +version=1.18.2 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-static $(vopt_enable gir introspection)" +configure_args="--disable-static $(vopt_enable gir introspection)" hostmakedepends="mate-common pkg-config intltool itstool glib-devel gobject-introspection" makedepends="libICE-devel gtk+3-devel libxklavier-devel iso-codes" depends="dconf iso-codes" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="LGPL-3" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7834c3d70892851bf5346e6b344662b5f8dc79a0f4a7cacbff5eac3bbfd26e9a +checksum=03df100cf931a1f6880a32b0b3eb90e82e81f6d17085bb44a2a7ca8551a00b0c build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/libmatemixer/template b/srcpkgs/libmatemixer/template index b9890aa4f20..d0097129e5d 100644 --- a/srcpkgs/libmatemixer/template +++ b/srcpkgs/libmatemixer/template @@ -1,6 +1,6 @@ # Template file for 'libmatemixer' pkgname=libmatemixer -version=1.16.0 +version=1.18.0 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-3" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=83ca5fbfd7d8c3904e5ebfd84c17e0b005682551541463f77f703fa97804cf09 +checksum=b99209e310ba614c5b0bd6a97545ba974bc34a74cd29fd50189a5365a9ed7e27 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libmateweather/template b/srcpkgs/libmateweather/template index 4f450837838..651c5b2aaa2 100644 --- a/srcpkgs/libmateweather/template +++ b/srcpkgs/libmateweather/template @@ -1,9 +1,9 @@ # Template file for 'libmateweather' pkgname=libmateweather -version=1.16.1 +version=1.18.0 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-static --disable-python +configure_args="--disable-static --disable-python --enable-locations-compression --with-zoneinfo-dir=/usr/share/zoneinfo" hostmakedepends="pkg-config intltool itstool glib-devel" makedepends="gtk+3-devel libsoup-devel" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="LGPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a3569ea5a51ec75eb29aadfba253faf04fbd3815d0a7882ddf6bd6c9c2422b70 +checksum=72e205f92bd9aed1a1d82abb17c5e26d447198d8bbdccf969d50c1c7c429b287 libmateweather-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libmatroska/template b/srcpkgs/libmatroska/template index 4507baee5b8..b95d7f1eb8d 100644 --- a/srcpkgs/libmatroska/template +++ b/srcpkgs/libmatroska/template @@ -1,6 +1,6 @@ # Template file for 'libmatroska' pkgname=libmatroska -version=1.4.5 +version=1.4.7 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://dl.matroska.org/downloads/libmatroska/" license="LGPL-2.1" distfiles="http://dl.matroska.org/downloads/libmatroska/libmatroska-${version}.tar.bz2" -checksum=79023fa46901e5562b27d93a9dd168278fa101361d7fd11a35e84e58e11557bc +checksum=46441eb3bae9f970f68affaa211dd74302a7072dcd2becfb1114da11b66525fa pre_configure() { autoreconf -if diff --git a/srcpkgs/libmediaart/template b/srcpkgs/libmediaart/template index 3d33afd878e..57e44763427 100644 --- a/srcpkgs/libmediaart/template +++ b/srcpkgs/libmediaart/template @@ -1,10 +1,9 @@ # Template file for 'libmediaart' pkgname=libmediaart -version=1.9.0 -revision=3 +version=1.9.1 +revision=1 build_style=gnu-configure -configure_args="--disable-schemas-compile - $(vopt_if gir '--enable-introspection --enable-vala' '--disable-introspection --disable-vala')" +configure_args="$(vopt_if gir '--enable-introspection --enable-vala' '--disable-introspection --disable-vala')" hostmakedepends="pkg-config intltool glib-devel $(vopt_if gir 'gobject-introspection vala-devel')" makedepends="libglib-devel gdk-pixbuf-devel" short_desc="Media art extraction and cache management library" @@ -12,11 +11,10 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.gnome.org/" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=94668adb29d4dc3115b0fd105942ebd5ca6f5f9dbb2afa8a191a73a747dd506f +checksum=5b14aa4e0cc84eaec57b6cb28f39092d503fdaecf36d5d165fac37583b7fe949 # Package build options build_options="gir" - # Disable gir for cross builds. if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" diff --git a/srcpkgs/libmediaart2-devel b/srcpkgs/libmediaart2-devel deleted file mode 120000 index c514c22057b..00000000000 --- a/srcpkgs/libmediaart2-devel +++ /dev/null @@ -1 +0,0 @@ -libmediaart2 \ No newline at end of file diff --git a/srcpkgs/libmediaart2/template b/srcpkgs/libmediaart2/template deleted file mode 100644 index 101804395c4..00000000000 --- a/srcpkgs/libmediaart2/template +++ /dev/null @@ -1,40 +0,0 @@ -# Template file for 'libmediaart2' -pkgname=libmediaart2 -version=1.9.0 -revision=3 -wrksrc="libmediaart-$version" -build_style=gnu-configure -configure_args="--disable-schemas-compile - $(vopt_if gir '--enable-vala --enable-introspection' '--disable-vala --disable-introspection')" -hostmakedepends="pkg-config intltool glib-devel - $(vopt_if gir 'vala-devel gobject-introspection')" -makedepends="libglib-devel gdk-pixbuf-devel" -short_desc="Media art extraction and cache management library" -maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://www.gnome.org/" -distfiles="${GNOME_SITE}/libmediaart/${version%.*}/libmediaart-$version.tar.xz" -checksum=94668adb29d4dc3115b0fd105942ebd5ca6f5f9dbb2afa8a191a73a747dd506f - -# Package build options -build_options="gir" - -# Disable gir for cross builds. -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" -fi - -libmediaart2-devel_package() { - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - vmove usr/share/gtk-doc - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - vmove usr/share/vala - fi - } -} diff --git a/srcpkgs/libmediaart2/update b/srcpkgs/libmediaart2/update deleted file mode 100644 index 92aef547740..00000000000 --- a/srcpkgs/libmediaart2/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=libmediaart diff --git a/srcpkgs/libmediainfo/template b/srcpkgs/libmediainfo/template index 683b750c3dd..fbc6ec1f191 100644 --- a/srcpkgs/libmediainfo/template +++ b/srcpkgs/libmediainfo/template @@ -1,6 +1,6 @@ # Template file for 'libmediainfo' pkgname=libmediainfo -version=0.7.93 +version=0.7.94 revision=1 short_desc="Shared library for mediainfo" homepage="http://mediaarea.net/MediaInfo" @@ -8,7 +8,7 @@ maintainer="Georg Schabel " license="BSD" distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.bz2" -checksum=9643c4624aeb6dbcf12aded240bc773272644f17bad5d7534fdda1ca62ee75b0 +checksum=e41483a7a7323a74315e95db4573fb5bd057e78f5d0eaf630e48df153bc421b5 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/libmicrohttpd/template b/srcpkgs/libmicrohttpd/template index e5f718ee01e..0d21048a701 100644 --- a/srcpkgs/libmicrohttpd/template +++ b/srcpkgs/libmicrohttpd/template @@ -1,6 +1,6 @@ # Template file for 'libmicrohttpd' pkgname=libmicrohttpd -version=0.9.52 +version=0.9.53 revision=1 build_style=gnu-configure makedepends="libgcrypt-devel gnutls-devel" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="http://www.gnu.org/software/libmicrohttpd/" license="LGPL-2.1" distfiles="${GNU_SITE}/libmicrohttpd/${pkgname}-${version}.tar.gz" -checksum=54797f6e763d417627f89f60e4ae0a431dab0523f92f83def23ea02d0defafea +checksum=9b15ec2d381f44936323adfd4f989fa35add517cccbbfa581896b02a393c2cc4 libmicrohttpd-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" diff --git a/srcpkgs/libmilter/template b/srcpkgs/libmilter/template index 0ff62304184..e451271d13e 100644 --- a/srcpkgs/libmilter/template +++ b/srcpkgs/libmilter/template @@ -1,7 +1,7 @@ # Template file for 'libmilter' pkgname=libmilter version=1.0.2 -revision=2 +revision=3 _pkgname=sendmail _version=8.15.2 hostmakedepends="m4" @@ -9,7 +9,7 @@ short_desc="Implementation of the sendmail Mail Filter API" maintainer="John Regan " license="Sendmail" homepage="https://www.milter.org/developers/api/" -distfiles="ftp://ftp.sendmail.org/pub/${_pkgname}/${_pkgname}.${_version}.tar.gz" +distfiles="ftp://ftp.mirrorservice.org/sites/ftp.sendmail.org/pub/${_pkgname}/${_pkgname}.${_version}.tar.gz" checksum=24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439 wrksrc="${_pkgname}-${_version}" @@ -21,10 +21,12 @@ define(\`confLD',\`${LD}') define(\`confCCOPTS',\`${CFLAGS} ${CPPFLAGS}') define(\`confLDOPTS',\`${LDFLAGS}') define(\`confRANLIB',\`${RANLIB}') +APPENDDEF(\`conf_libmilter_ENVDEF',\`-DNETINET6=1') EOF case "$XBPS_TARGET_MACHINE" in *-musl) echo "APPENDDEF(\`confLIBSEARCH', \`crypt')" >> devtools/Site/site.config.m4 + echo "APPENDDEF(\`conf_libmilter_ENVDEF',\`-DNEEDSGETIPNODE=1')" >> devtools/Site/site.config.m4 ;; *) echo "APPENDDEF(\`confLIBSEARCH', \`crypt nsl')" >> devtools/Site/site.config.m4 diff --git a/srcpkgs/libmodplug/template b/srcpkgs/libmodplug/template index 206f14ed311..9a8eac1c7e0 100644 --- a/srcpkgs/libmodplug/template +++ b/srcpkgs/libmodplug/template @@ -1,7 +1,7 @@ # Template file for 'libmodplug' pkgname=libmodplug -version=0.8.8.5 -revision=3 +version=0.8.9.0 +revision=1 build_style=gnu-configure configure_args="--enable-static" short_desc="A MOD playing library" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="http://modplug-xmms.sourceforge.net/" license="Public domain" distfiles="${SOURCEFORGE_SITE}/modplug-xmms/$pkgname-$version.tar.gz" -checksum=77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad +checksum=457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de libmodplug-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template index 6ac22c40124..836c039aaaa 100644 --- a/srcpkgs/libmowgli/template +++ b/srcpkgs/libmowgli/template @@ -1,7 +1,7 @@ # Template file for 'libmowgli' pkgname=libmowgli version=2.1.0 -revision=1 +revision=2 wrksrc="${pkgname}-2-${version}" build_style=gnu-configure hostmakedepends="pkg-config" diff --git a/srcpkgs/libmpdclient/template b/srcpkgs/libmpdclient/template index 67d1b4cf0da..754dbbcf278 100644 --- a/srcpkgs/libmpdclient/template +++ b/srcpkgs/libmpdclient/template @@ -1,6 +1,6 @@ # Template file for 'libmpdclient' pkgname=libmpdclient -version=2.10 +version=2.11 revision=1 build_style=gnu-configure configure_args="--disable-documentation" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="3-clause-BSD" homepage="http://www.musicpd.org/libs/libmpdclient/" distfiles="http://www.musicpd.org/download/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4f08cde82dae70895f8e4532a6e9b54b201efd5591c6b5d6834895807ed2ff82 +checksum=15fe693893c0d7ea3f4c35c4016fbd0332836164178b20983eec9b470846baf6 libmpdclient-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template index 01d8ed04e22..1807430ea76 100644 --- a/srcpkgs/libmspub/template +++ b/srcpkgs/libmspub/template @@ -1,7 +1,7 @@ # Template file for 'libmspub' pkgname=libmspub version=0.1.2 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="icu-devel boost-devel librevenge-devel zlib-devel" diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template index b7495ba83e1..0248b6287dd 100644 --- a/srcpkgs/libmtp/template +++ b/srcpkgs/libmtp/template @@ -1,6 +1,6 @@ # Template file for 'libmtp' pkgname=libmtp -version=1.1.12 +version=1.1.13 revision=1 build_style=gnu-configure configure_args="--disable-static --with-udev=/usr/lib/udev" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://libmtp.sourceforge.net" license="LGPL-2.1" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=cdf59e816c6cda3e908a876c7fb42943f40b85669aea0029a1ca431c89afa1a0 +checksum=494ee02fbfbc316aad75b93263dac00f02a4899f28cfda1decbbd6e26fda6d40 if [ "$CROSS_BUILD" ]; then # XXX needs host mtp-hotplug diff --git a/srcpkgs/libmwaw/template b/srcpkgs/libmwaw/template index 9c3ef0cd902..6e16085b495 100644 --- a/srcpkgs/libmwaw/template +++ b/srcpkgs/libmwaw/template @@ -1,6 +1,6 @@ # Template file for 'libmwaw' pkgname=libmwaw -version=0.3.10 +version=0.3.11 revision=1 build_style=gnu-configure hostmakedepends="pkg-config doxygen" @@ -10,7 +10,7 @@ maintainer="bra1nwave " license="LGPL-2.1, MPL-2" homepage="https://sourceforge.net/projects/libmwaw/" distfiles="${SOURCEFORGE_SITE}/libmwaw/libmwaw/${pkgname}-${version}/${pkgname}-${version}.tar.xz" -checksum=b246a0c15fcf98076f2a1f2cf4d44a714f5c8eb39690442fc7fbbd01fa34f220 +checksum=4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a libmwaw-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libnfc/template b/srcpkgs/libnfc/template index 5a17d95c377..9702c05d209 100644 --- a/srcpkgs/libnfc/template +++ b/srcpkgs/libnfc/template @@ -7,7 +7,7 @@ build_style=cmake short_desc="Low level NFC SDK and Programmers API" hostmakedepends="pkg-config" makedepends="libusb-devel libusb-compat-devel" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://nfc-tools.org/" distfiles="https://github.com/nfc-tools/libnfc/archive/libnfc-${version}.tar.gz" diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template index d09f57479bd..ca5cbec23f1 100644 --- a/srcpkgs/libnice/template +++ b/srcpkgs/libnice/template @@ -1,17 +1,17 @@ # Template file for 'libnice' pkgname=libnice -version=0.1.13 -revision=2 +version=0.1.14 +revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libtool gtk-doc gettext-devel pkg-config intltool" -makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel" +makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel gnutls-devel" short_desc="An implementation of the IETF's draft ICE (for P2P UDP data streams)" maintainer="Juan RP " license="LGPL-2.1" homepage="http://nice.freedesktop.org" distfiles="$homepage/releases/$pkgname-$version.tar.gz" -checksum=61112d9f3be933a827c8365f20551563953af6718057928f51f487bfe88419e1 +checksum=be120ba95d4490436f0da077ffa8f767bf727b82decf2bf499e39becc027809c pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/libode/template b/srcpkgs/libode/template index 5a053c5647e..64269211a21 100644 --- a/srcpkgs/libode/template +++ b/srcpkgs/libode/template @@ -1,6 +1,6 @@ # Template build file for 'libode' pkgname=libode -version=0.14 +version=0.15.1 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="LGPL-2/BSD" homepage="http://www.ode.org" distfiles="https://bitbucket.org/odedevs/ode/downloads/ode-$version.tar.gz" -checksum=1072fc98d9d00262a0d6136e7b9ff7f5d953bbdb23b646f426909d28c0b4f6db +checksum=2e563de4cff09b56bdd8a702e0f8f857345dccbabc23cf2c2b9543996d586c08 wrksrc="ode-$version" configure_args="--disable-static --enable-shared --enable-double-precision" diff --git a/srcpkgs/libogre/template b/srcpkgs/libogre/template index 6af1565379e..1e40a759103 100644 --- a/srcpkgs/libogre/template +++ b/srcpkgs/libogre/template @@ -1,7 +1,7 @@ # Template file for 'ogre' pkgname=libogre version=1.9.0 -revision=7 +revision=8 build_style=cmake _hgrev=108ab0bcc69603dba32c0ffd4bbbc39051f421c9 configure_args="-DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/srcpkgs/libomxil-bellagio-devel b/srcpkgs/libomxil-bellagio-devel new file mode 120000 index 00000000000..a84ebe8637f --- /dev/null +++ b/srcpkgs/libomxil-bellagio-devel @@ -0,0 +1 @@ +libomxil-bellagio \ No newline at end of file diff --git a/srcpkgs/libomxil-bellagio/patches/fedora-fixes.patch b/srcpkgs/libomxil-bellagio/patches/fedora-fixes.patch new file mode 100644 index 00000000000..59e35e39e4c --- /dev/null +++ b/srcpkgs/libomxil-bellagio/patches/fedora-fixes.patch @@ -0,0 +1,199 @@ +When libomxdynamicloader.so is loaded, it complains that RM_Deinit can't be resolved. +Link explicitly against omxil-bellagio so that ld.so can find the reference. + +Signed-off-by: Qais Yousef + +--- src/dynamic_loader/Makefile.am.old 2012-03-23 15:07:47.379021034 +0000 ++++ src/dynamic_loader/Makefile.am 2012-03-23 15:08:47.563034818 +0000 +@@ -3,7 +3,7 @@ + omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la + libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h + +-libomxdynamicloader_la_LDFLAGS = ++libomxdynamicloader_la_LDFLAGS = -L$(abs_top_srcdir)/src/.libs -lomxil-bellagio + libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/base \ +Fix dependency issue to allow parallel build + +Signed-off-by: Qais Yousef + +Index: bellagio-0.9.3/src/Makefile.am +=================================================================== +--- src/Makefile.am ++++ src/Makefile.am +@@ -8,6 +8,7 @@ omxregister_bellagio_SOURCES = omxregist + omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \ + -I$(top_srcdir)/include + omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir) ++omxregister_bellagio_DEPENDENCIES = libomxil-bellagio.la + + lib_LTLIBRARIES = libomxil-bellagio.la + libomxil_bellagio_la_SOURCES = component_loader.h \ +We always access globalComponentList[] at indexComponent=-1 which causes a +segfault. Use i as the index instead. + +Signed-off-by: Qais Yousef + +--- src/omx_reference_resource_manager.c.old 2012-03-13 10:15:25.743940980 +0000 ++++ src/omx_reference_resource_manager.c 2012-03-13 10:18:02.201971009 +0000 +@@ -485,7 +485,6 @@ + OMX_ERRORTYPE RM_removeFromWaitForResource(OMX_COMPONENTTYPE *openmaxStandComp) { + omx_base_component_PrivateType* omx_base_component_Private; + int i = 0; +- int indexComponent = -1; + + DEBUG(DEB_LEV_FUNCTION_NAME, "In %s\n", __func__); + omx_base_component_Private = (omx_base_component_PrivateType*)openmaxStandComp->pComponentPrivate; +@@ -493,16 +492,13 @@ + while(listOfcomponentRegistered[i].component_name != NULL ) { + if (!strcmp(listOfcomponentRegistered[i].component_name, omx_base_component_Private->name)) { + // found component in the list of the resource manager +- removeElemFromList(&globalComponentList[indexComponent], openmaxStandComp); +- break; ++ removeElemFromList(&globalComponentList[i], openmaxStandComp); ++ DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__); ++ return OMX_ErrorNone; + } + i++; + } +- if (indexComponent <0) { +- // No resource to be handled +- DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__); +- return OMX_ErrorNone; +- } +- DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__); ++ // No resource to be handled ++ DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__); + return OMX_ErrorNone; + } + OMX_INDEXTYPE/OMX_INDEXVENDORTYPE in one switch + src/base/omx_base_component.c | 54 ++++++++++++++++++++++------------------- + 1 files changed, 29 insertions(+), 25 deletions(-) +--- src/base/omx_base_component.c ++++ src/base/omx_base_component.c +@@ -915,14 +915,6 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter( + return OMX_ErrorBadParameter; + } + switch(nParamIndex) { +- case OMX_IndexParameterThreadsID: +- if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) { +- break; +- } +- threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure; +- threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID; +- threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID; +- break; + case OMX_IndexParamAudioInit: + case OMX_IndexParamVideoInit: + case OMX_IndexParamImageInit: +@@ -988,28 +980,40 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter( + } + } + break; +- case OMX_IndexVendorCompPropTunnelFlags: +- pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure; ++ default: ++ /* additional switch statement for extended OMX_INDEXTYPE */ ++ switch((OMX_INDEXVENDORTYPE) nParamIndex) { ++ case OMX_IndexParameterThreadsID: ++ if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) { ++ break; ++ } ++ threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure; ++ threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID; ++ threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID; ++ break; ++ case OMX_IndexVendorCompPropTunnelFlags: ++ pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure; + +- if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts + +- omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts + +- omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts + +- omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) { ++ if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts + ++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts + ++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts + ++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) { + +- DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n", +- __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__); ++ DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n", ++ __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__); + +- return OMX_ErrorBadPortIndex; +- } ++ return OMX_ErrorBadPortIndex; ++ } + +- pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex]; ++ pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex]; + +- pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags; +- pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier; +- break; +- default: +- err = OMX_ErrorUnsupportedIndex; +- break; ++ pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags; ++ pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier; ++ break; ++ default: ++ err = OMX_ErrorUnsupportedIndex; ++ break; ++ } + } + DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s for component %p\n", __func__, hComponent); + return err; +diff -up libomxil-bellagio-0.9.3/Makefile.am.nodoc libomxil-bellagio-0.9.3/Makefile.am +--- Makefile.am.nodoc 2011-01-12 08:53:26.000000000 +0100 ++++ Makefile.am 2012-04-23 13:46:15.410823381 +0200 +@@ -7,7 +7,6 @@ EXTRA_DIST = libomxil-bellagio.spec + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libomxil-bellagio.pc + +-docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@ + doc_DATA = README \ + ChangeLog \ + TODO +diff -up libomxil-bellagio-0.9.3/src/omxregister.c.unused libomxil-bellagio-0.9.3/src/omxregister.c +--- src/omxregister.c.unused 2011-01-12 08:53:26.000000000 +0100 ++++ src/omxregister.c 2012-12-10 22:02:28.621695659 +0100 +@@ -248,7 +248,15 @@ static int buildComponentsList(FILE* omx + } + fptr(stComponents); + err = fwrite(lib_absolute_path, 1, strlen(lib_absolute_path), omxregistryfp); +- err = fwrite("\n", 1, 1, omxregistryfp); ++ if (err != strlen(lib_absolute_path)) { ++ DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(lib_absolute_path), fileno(omxregistryfp)); ++ continue; ++ } ++ err = fwrite("\n", 1, strlen(buffer), omxregistryfp); ++ if (err != strlen(buffer)) { ++ DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(buffer), fileno(omxregistryfp)); ++ continue; ++ } + + + for (i = 0; i - #include - #include -+#include - - #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) - #include diff --git a/srcpkgs/libpciaccess/template b/srcpkgs/libpciaccess/template index 05146808298..817cae65fc0 100644 --- a/srcpkgs/libpciaccess/template +++ b/srcpkgs/libpciaccess/template @@ -1,14 +1,14 @@ # Template build file for 'libpciaccess'. pkgname=libpciaccess -version=0.13.4 -revision=2 +version=0.13.5 +revision=1 build_style=gnu-configure short_desc="X11 PCI Access library" maintainer="Juan RP " license="MIT" homepage="http://xorg.freedesktop.org/" distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" -checksum=07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf +checksum=752c54e9b3c311b4347cb50aea8566fa48eab274346ea8a06f7f15de3240b999 libpciaccess-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template index acc7bcdd738..eac3263a74d 100644 --- a/srcpkgs/libplist/template +++ b/srcpkgs/libplist/template @@ -1,7 +1,7 @@ # Template file for 'libplist' pkgname=libplist -version=1.12 -revision=4 +version=2.0.0 +revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libtool pkg-config python-devel python-Cython" @@ -11,7 +11,9 @@ maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://libimobiledevice.org/" distfiles="http://www.libimobiledevice.org/downloads/${pkgname}-${version}.tar.bz2" -checksum=0effdedcb3de128c4930d8c03a3854c74c426c16728b8ab5f0a5b6bdc0b644be +checksum=3a7e9694c2d9a85174ba1fa92417cfabaea7f6d19631e544948dc7e17e82f602 + +nocross="investigate why this works with aarch64 but not arm[67]" pre_configure() { sed -i 's,-L$(libdir),,g' cython/Makefile.am diff --git a/srcpkgs/libpng/template b/srcpkgs/libpng/template index c967dbbc848..5efc5921242 100644 --- a/srcpkgs/libpng/template +++ b/srcpkgs/libpng/template @@ -1,6 +1,6 @@ # Template build file for 'libpng'. pkgname=libpng -version=1.6.28 +version=1.6.29 revision=1 build_style=gnu-configure makedepends="zlib-devel" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="http://www.libpng.org/pub/png/libpng.html" license="libpng" distfiles="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-${version}.tar.xz" -checksum=d8d3ec9de6b5db740fefac702c37ffcf96ae46cb17c18c1544635a3852f78f7a +checksum=4245b684e8fe829ebb76186327bb37ce5a639938b219882b53d64bd3cfc5f239 post_install() { rm -f ${DESTDIR}/usr/lib/*.la diff --git a/srcpkgs/libpurple-skypeweb/template b/srcpkgs/libpurple-skypeweb/template index 32a885c6cd9..ca1a9cbb944 100644 --- a/srcpkgs/libpurple-skypeweb/template +++ b/srcpkgs/libpurple-skypeweb/template @@ -2,7 +2,7 @@ pkgname="libpurple-skypeweb" reverts="20160622_2" -version=1.2.2 +version=1.3 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" @@ -12,6 +12,6 @@ maintainer="John Regan " license="GPL-3" homepage="https://github.com/EionRobb/skype4pidgin" distfiles="https://github.com/EionRobb/skype4pidgin/archive/${version}.tar.gz" -checksum=32efa6fc8aa7f50ea45dbb7a4b22f8c55744a12a311f34df0739a1e724635691 +checksum=85a6caa2a8cb753f9a2c92332ae4c7c07d6cb64bd51c15e6e6da28d251939477 wrksrc="skype4pidgin-${version}" build_wrksrc="skypeweb" diff --git a/srcpkgs/libpurple-telegram/template b/srcpkgs/libpurple-telegram/template index dbd33bcd749..a3a2e54fff9 100644 --- a/srcpkgs/libpurple-telegram/template +++ b/srcpkgs/libpurple-telegram/template @@ -2,7 +2,7 @@ pkgname="libpurple-telegram" version="1.2.5" -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="git git-perl pkg-config" makedepends="libpurple-devel libglib-devel libwebp-devel libgcrypt-devel" diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template index b161fa95e5d..9d60ea05f62 100644 --- a/srcpkgs/libpwquality/template +++ b/srcpkgs/libpwquality/template @@ -10,9 +10,9 @@ makedepends="cracklib-devel pam-devel" conf_files="/etc/security/pwquality.conf" short_desc="Library for password quality checking and generating random passwords" maintainer="Juan RP " -homepage="https://fedorahosted.org/libpwquality/" +homepage="https://github.com/libpwquality/libpwquality" license="GPL-2" -distfiles="https://fedorahosted.org/releases/l/i/$pkgname/$pkgname-$version.tar.bz2" +distfiles="${homepage}/releases/download/libpwquality-${version}/libpwquality-${version}.tar.bz2" checksum=74d2ea90e103323c1f2d6a6cc9617cdae6877573eddb31aaf31a40f354cc2d2a pre_configure() { diff --git a/srcpkgs/libqtelegram-ae/template b/srcpkgs/libqtelegram-ae/template index d8b1083fa55..2b698eece20 100644 --- a/srcpkgs/libqtelegram-ae/template +++ b/srcpkgs/libqtelegram-ae/template @@ -2,13 +2,13 @@ pkgname=libqtelegram-ae reverts=10.0.0_1 version=6.1 -revision=4 +revision=5 wrksrc=${pkgname/-ae/-aseman-edition}-${version}-stable build_style=qmake # See https://github.com/Aseman-Land/libqtelegram-aseman-edition/issues/44 configure_args="QMAKE_CFLAGS_ISYSTEM=" hostmakedepends="qt5-qmake" -makedepends="qt5-devel qt5-multimedia-devel" +makedepends="qt5-devel qt5-multimedia-devel pulseaudio-devel" short_desc="A libqtelegram fork by Aseman Team" maintainer="Duncaen " license="GPL-3" diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template index 31b1a56178b..66bbfaabf5f 100644 --- a/srcpkgs/libqtxdg/template +++ b/srcpkgs/libqtxdg/template @@ -1,7 +1,7 @@ # Template file for 'libqtxdg' pkgname=libqtxdg version=2.0.0 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools-devel" makedepends="qt5-tools-devel qt5-svg-devel" diff --git a/srcpkgs/libraw/template b/srcpkgs/libraw/template index 9872151e3a4..de7e5ef3b91 100644 --- a/srcpkgs/libraw/template +++ b/srcpkgs/libraw/template @@ -1,6 +1,6 @@ # Template file for 'libraw' pkgname=libraw -version=0.18.1 +version=0.18.2 revision=1 wrksrc=LibRaw-${version} build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-2.1, CDDL" homepage="http://www.libraw.org" distfiles="http://www.libraw.org/data/LibRaw-${version}.tar.gz" -checksum=48228f733013a7a0cba08d1821438b983e698feeda7cbc3976ce46ceab07b899 +checksum=ce366bb38c1144130737eb16e919038937b4dc1ab165179a225d5e847af2abc6 post_install() { vmkdir usr/share/licenses diff --git a/srcpkgs/libreoffice/patches/0010-icu-58.patch b/srcpkgs/libreoffice/patches/0010-icu-58.patch new file mode 100644 index 00000000000..9b0e971d344 --- /dev/null +++ b/srcpkgs/libreoffice/patches/0010-icu-58.patch @@ -0,0 +1,42 @@ +Minimal exceprt from upstream fix only to unbreak build + +https://cgit.freedesktop.org/libreoffice/core/commit/?id=3e42714c76b1347babfdea0564009d8d82a83af4 + +--- i18npool/source/breakiterator/breakiterator_unicode.cxx.orig 2016-05-04 21:28:24 UTC ++++ i18npool/source/breakiterator/breakiterator_unicode.cxx +@@ -64,10 +64,13 @@ BreakIterator_Unicode::~BreakIterator_Un + class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator + { + public: ++#if (U_ICU_VERSION_MAJOR_NUM < 58) ++ // RuleBasedBreakIterator::setBreakType() is private as of ICU 58. + inline void publicSetBreakType(int32_t type) + { + setBreakType(type); + }; ++#endif + OOoRuleBasedBreakIterator(UDataMemory* image, + UErrorCode &status) + : RuleBasedBreakIterator(image, status) +@@ -143,12 +146,21 @@ void SAL_CALL BreakIterator_Unicode::loa + } + } + if (rbi) { ++#if (U_ICU_VERSION_MAJOR_NUM < 58) ++ // ICU 58 made RuleBasedBreakIterator::setBreakType() private ++ // instead of protected, so the old workaround of ++ // https://ssl.icu-project.org/trac/ticket/5498 ++ // doesn't work anymore. However, they also claim to have fixed ++ // the cause that an initial fBreakType==-1 would lead to an ++ // endless loop under some circumstances. ++ // Let's see ... + switch (rBreakType) { + case LOAD_CHARACTER_BREAKITERATOR: rbi->publicSetBreakType(UBRK_CHARACTER); break; + case LOAD_WORD_BREAKITERATOR: rbi->publicSetBreakType(UBRK_WORD); break; + case LOAD_SENTENCE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_SENTENCE); break; + case LOAD_LINE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_LINE); break; + } ++#endif + icuBI->aBreakIterator = rbi; + } + } diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index c2b4704edf6..df865e92e85 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice version=5.2.5.1 -revision=1 +revision=6 build_style=gnu-configure configure_args="--disable-werror" nopie=yes @@ -95,6 +95,13 @@ case "$XBPS_TARGET_MACHINE" in ;; esac +case "$XBPS_TARGET_MACHINE" in + *-musl) + ;; + *) makedepends+=" apache-ant openjdk " + ;; +esac + post_fetch() { local srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} pkg mkdir -p ${wrksrc}/external/tarballs @@ -131,7 +138,6 @@ do_configure() { configure_args+=" --with-vendor='VoidLinux'" configure_args+=" --with-help" configure_args+=" --with-alloc=system" - configure_args+=" --without-java" configure_args+=" --without-system-dicts" configure_args+=" --disable-odk" configure_args+=" --enable-python=system" @@ -146,6 +152,7 @@ do_configure() { configure_args+=" --enable-extra-font" case "$XBPS_TARGET_MACHINE" in *-musl) # Can't use the glibc external modules + configure_args+=" --without-java" ;; *) configure_args+=" --enable-ext-mariadb-connector" configure_args+=" --enable-ext-watch-window" @@ -159,6 +166,8 @@ do_configure() { configure_args+=" --enable-ext-google-docs" configure_args+=" --enable-ext-nlpsolver" configure_args+=" --enable-ext-languagetool" + configure_args+=" --with-jdk-home=/usr/lib/jvm/openjdk" + configure_args+=" --without-junit" ;; esac configure_args+=" --with-tls=nss" diff --git a/srcpkgs/libressl/patches/CVE-2017-8301.patch b/srcpkgs/libressl/patches/CVE-2017-8301.patch new file mode 100644 index 00000000000..634fd904dad --- /dev/null +++ b/srcpkgs/libressl/patches/CVE-2017-8301.patch @@ -0,0 +1,28 @@ +From e4ea34f17cdd3b81ab1b6bd4df3712fbe49dc136 Mon Sep 17 00:00:00 2001 +From: beck <> +Date: Fri, 28 Apr 2017 23:03:58 +0000 +Subject: [PATCH] Revert previous change that forced consistency between return + value and error code, since this breaks the documented API. Under certain + circumstances this will result in incorrect successful certiticate + verification (where a user supplied callback always returns 1, and later code + checks the error code to potentially abort post verification) + +--- crypto/x509/x509_vfy.c ++++ crypto/x509/x509_vfy.c +@@ -541,15 +541,7 @@ X509_verify_cert(X509_STORE_CTX *ctx) + /* Safety net, error returns must set ctx->error */ + if (ok <= 0 && ctx->error == X509_V_OK) + ctx->error = X509_V_ERR_UNSPECIFIED; +- +- /* +- * Safety net, if user provided verify callback indicates sucess +- * make sure they have set error to X509_V_OK +- */ +- if (ctx->verify_cb != null_callback && ok == 1) +- ctx->error = X509_V_OK; +- +- return(ctx->error == X509_V_OK); ++ return ok; + } + + /* Given a STACK_OF(X509) find the issuer of cert (if any) diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template index 6b72ba15cd9..2824de0b6c6 100644 --- a/srcpkgs/libressl/template +++ b/srcpkgs/libressl/template @@ -1,6 +1,6 @@ # Template file for 'libressl' pkgname=libressl -version=2.4.5 +version=2.5.3 revision=2 bootstrap=yes build_style=gnu-configure @@ -9,7 +9,7 @@ maintainer="Juan RP " license="OpenSSL-License, SSLeay-License, ISC" homepage="http://www.libressl.org/" distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz" -checksum=d300c4e358aee951af6dfd1684ef0c034758b47171544230f3ccf6ce24fe4347 +checksum=14e34cc586ec4ce5763f76046dcf366c45104b2cc71d77b63be5505608e68a30 provides="openssl-${version}_${revision}" replaces="openssl>=0" @@ -38,21 +38,21 @@ post_install() { find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete } -libcrypto38_package() { +libcrypto41_package() { short_desc+=" - crypto library" pkg_install() { vmove usr/lib/libcrypto.so.* } } -libssl39_package() { +libssl43_package() { short_desc+=" - SSL/TLS library" pkg_install() { vmove usr/lib/libssl.so.* } } -libtls11_package() { +libtls15_package() { short_desc+=" - new TLS library" pkg_install() { vmove usr/lib/libtls.so.* @@ -61,7 +61,7 @@ libtls11_package() { libressl-devel_package() { short_desc+=" - development files" - depends="libcrypto38-${version}_${revision} libssl39-${version}_${revision} libtls11-${version}_${revision}" + depends="libcrypto41-${version}_${revision} libssl43-${version}_${revision} libtls15-${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/*.a diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template index 093ecb9bcdd..212fce1de63 100644 --- a/srcpkgs/librsvg/template +++ b/srcpkgs/librsvg/template @@ -1,6 +1,6 @@ # Template build file for 'librsvg'. pkgname=librsvg -version=2.40.16 +version=2.40.17 revision=1 build_style=gnu-configure configure_args="--disable-static $(vopt_enable gir introspection)" @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://librsvg.sourceforge.net/" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=d48bcf6b03fa98f07df10332fb49d8c010786ddca6ab34cbba217684f533ff2e +checksum=e6f6c5cbecc405bb945c7cd15061276035ae3173bbb3bb25e8a916779c7f69cc # Package build options build_options="gir" diff --git a/srcpkgs/libsass/template b/srcpkgs/libsass/template index d7ae04dd14a..95ca08d78c6 100644 --- a/srcpkgs/libsass/template +++ b/srcpkgs/libsass/template @@ -1,6 +1,6 @@ # Template file for 'libsass' pkgname=libsass -version=3.4.3 +version=3.4.4 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Gerardo Di Iorio " homepage="http://libsass.org/" license="MIT" distfiles="https://github.com/sass/${pkgname}/archive/${version}.tar.gz" -checksum=bbeda2e1ec2d21d27fbcbd8f2e18c3f4573cc168bb8b5cd5010715db4b3e5670 +checksum=1dc4d49a9a53b891b7e98935709e625f1d68782d87aef4304a41e6d590abb480 pre_configure() { autoreconf -i diff --git a/srcpkgs/libserialport-devel b/srcpkgs/libserialport-devel new file mode 120000 index 00000000000..79777debf8a --- /dev/null +++ b/srcpkgs/libserialport-devel @@ -0,0 +1 @@ +libserialport \ No newline at end of file diff --git a/srcpkgs/libserialport/template b/srcpkgs/libserialport/template new file mode 100644 index 00000000000..3e75ad0e96d --- /dev/null +++ b/srcpkgs/libserialport/template @@ -0,0 +1,23 @@ +# Template file for 'libserialport' +pkgname=libserialport +version=0.1.1 +revision=1 +build_style=gnu-configure +short_desc="Cross-platform library for accessing serial ports" +maintainer="lemmi " +license="GPL-3" +homepage="https://sigrok.org/" +distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d + +libserialport-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} + diff --git a/srcpkgs/libsigrok-devel b/srcpkgs/libsigrok-devel new file mode 120000 index 00000000000..1980042823e --- /dev/null +++ b/srcpkgs/libsigrok-devel @@ -0,0 +1 @@ +libsigrok/ \ No newline at end of file diff --git a/srcpkgs/libsigrok/patches/replace_stringify_macro.patch b/srcpkgs/libsigrok/patches/replace_stringify_macro.patch new file mode 100644 index 00000000000..6172d11c4d8 --- /dev/null +++ b/srcpkgs/libsigrok/patches/replace_stringify_macro.patch @@ -0,0 +1,12 @@ +--- src/hardware/beaglelogic/beaglelogic.h ++++ src/hardware/beaglelogic/beaglelogic.h +@@ -30,8 +30,7 @@ + + /* BeagleLogic device node name */ + #define BEAGLELOGIC_DEV_NODE "/dev/beaglelogic" +-#define BEAGLELOGIC_SYSFS_ATTR(a) "/sys/devices/virtual/misc/beaglelogic/"\ +- __STRING(a) ++#define BEAGLELOGIC_SYSFS_ATTR(a) "/sys/devices/virtual/misc/beaglelogic/" #a + + /* Reproduced verbatim from beaglelogic.h in the kernel tree until the kernel + * module hits the mainline. Contains the ABI, so DO NOT TOUCH this section */ diff --git a/srcpkgs/libsigrok/template b/srcpkgs/libsigrok/template new file mode 100644 index 00000000000..b31e7ee6b48 --- /dev/null +++ b/srcpkgs/libsigrok/template @@ -0,0 +1,30 @@ +# Template file for 'libsigrok' +pkgname=libsigrok +version=0.4.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config doxygen python3" +_devicelibs="libserialport-devel libusb-devel libftdi1-devel" + +case $XBPS_TARGET_MACHINE in + i686* | x86_64*) _devicelibs+=" libieee1284-devel";; +esac + +makedepends="glib-devel libzip-devel glibmm-devel ${_devicelibs}" +short_desc="C library for talking to hardware" +maintainer="lemmi " +license="GPL-3" +homepage="https://sigrok.org/" +distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=5f291f3fee36e6dab1336f1c78596e50588831bc5ebd7cddc2a95fe8c71d669e + +libsigrok-devel_package() { + depends="${sourcepkg}>=${version}_${revision} ${_devicelibs}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/libsigrokdecode-devel b/srcpkgs/libsigrokdecode-devel new file mode 120000 index 00000000000..5d1fb164d3b --- /dev/null +++ b/srcpkgs/libsigrokdecode-devel @@ -0,0 +1 @@ +libsigrokdecode \ No newline at end of file diff --git a/srcpkgs/libsigrokdecode/template b/srcpkgs/libsigrokdecode/template new file mode 100644 index 00000000000..260f7179728 --- /dev/null +++ b/srcpkgs/libsigrokdecode/template @@ -0,0 +1,24 @@ +# Template file for 'libsigrokdecode' +pkgname=libsigrokdecode +version=0.4.1 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config python3" +makedepends="glib-devel python3-devel" +short_desc="C library provides basic API for running sigrok protocol decoders" +maintainer="lemmi " +license="GPL-3" +homepage="https://sigrok.org/" +distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=065f70c10971173d86e03a8cf5534e600c7a622775113997d8061572135d4a95 + +libsigrokdecode-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/libsndfile/template b/srcpkgs/libsndfile/template index 05287dede2c..05678c52b6b 100644 --- a/srcpkgs/libsndfile/template +++ b/srcpkgs/libsndfile/template @@ -1,6 +1,6 @@ # Template file for 'libsndfile' pkgname=libsndfile -version=1.0.27 +version=1.0.28 revision=1 build_style=gnu-configure hostmakedepends="pkg-config python" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://www.mega-nerd.com/libsndfile" license="LGPL-2.1" distfiles="http://www.mega-nerd.com/$pkgname/files/$pkgname-$version.tar.gz" -checksum=a391952f27f4a92ceb2b4c06493ac107896ed6c76be9a613a4731f076d30fac0 +checksum=1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9 libsndfile-progs_package() { short_desc+=" - bundled cmdline apps" diff --git a/srcpkgs/libsodium/template b/srcpkgs/libsodium/template index f2daf7f5cb2..8d06bb17d10 100644 --- a/srcpkgs/libsodium/template +++ b/srcpkgs/libsodium/template @@ -1,6 +1,6 @@ # Template file for 'libsodium' pkgname=libsodium -version=1.0.11 +version=1.0.12 revision=1 build_style=gnu-configure configure_args="lt_cv_prog_compiler_static_works=yes" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="ISC" homepage="https://github.com/jedisct1/libsodium" distfiles="https://github.com/jedisct1/libsodium/releases/download/${version}/${pkgname}-${version}.tar.gz" -checksum=a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765 +checksum=b8648f1bb3a54b0251cf4ffa4f0d76ded13977d4fa7517d988f4c902dd8e2f95 post_install() { vlicense LICENSE diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template index 0f5ef2f8957..b48b0b17beb 100644 --- a/srcpkgs/libsoup/template +++ b/srcpkgs/libsoup/template @@ -1,6 +1,6 @@ # Template file for 'libsoup' pkgname=libsoup -version=2.56.0 +version=2.58.0 revision=1 build_style=gnu-configure configure_args="--disable-tls-check --disable-static @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5 +checksum=b61567e25ed61f4b89bb23a36713c807df6b76a8451beb786d8cc362e8f097f5 # Package build options build_options="gir" diff --git a/srcpkgs/libspectrum-devel b/srcpkgs/libspectrum-devel new file mode 120000 index 00000000000..0c240bf6457 --- /dev/null +++ b/srcpkgs/libspectrum-devel @@ -0,0 +1 @@ +libspectrum \ No newline at end of file diff --git a/srcpkgs/libspectrum/template b/srcpkgs/libspectrum/template new file mode 100644 index 00000000000..4548f26cdcf --- /dev/null +++ b/srcpkgs/libspectrum/template @@ -0,0 +1,22 @@ +# Template file for 'libspectrum' +pkgname=libspectrum +version=1.2.2 +revision=1 +build_style=gnu-configure +hostmakedepends="perl pkg-config" +makedepends="glib-devel libgcrypt-devel zlib-devel bzip2-devel audiofile-devel" +short_desc="Spectrum emulation support library" +maintainer="Jakub Skrzypnik " +license="GPL-2" +homepage="http://fuse-emulator.sourceforge.net/" +distfiles="${SOURCEFORGE_SITE}/fuse-emulator/${pkgname}-${version}.tar.gz" +checksum=1f8a365df30d7cb2bb5c289163cf122241660cae6dc2cb70687064c847ad12d1 + +libspectrum-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/*.a + } +} diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template index db4be63d4b8..493e3a12ba6 100644 --- a/srcpkgs/libssh/template +++ b/srcpkgs/libssh/template @@ -1,6 +1,6 @@ # Template file for 'libssh' pkgname=libssh -version=0.7.4 +version=0.7.5 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.libssh.org/" distfiles="http://git.libssh.org/projects/libssh.git/snapshot/${pkgname}-${version}.tar.bz2" -checksum=4c8bc918b350a3b350d83a6e4d10db5b836f76765139fd54bdf09f358ac24cc2 +checksum=ff914e2ec6596badec453efaa63ef68c82c60074466f951167a4c60e49903336 libssh-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template index 4a614215e8c..8095344603f 100644 --- a/srcpkgs/libssh2/template +++ b/srcpkgs/libssh2/template @@ -1,7 +1,7 @@ # Template file for 'libssh2' pkgname=libssh2 version=1.8.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr" makedepends="zlib-devel libressl-devel" diff --git a/srcpkgs/libssl39 b/srcpkgs/libssl43 similarity index 100% rename from srcpkgs/libssl39 rename to srcpkgs/libssl43 diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template index a0bfc4a59b4..aa9500a627b 100644 --- a/srcpkgs/libstrophe/template +++ b/srcpkgs/libstrophe/template @@ -1,7 +1,7 @@ # Template file for 'libstrophe' pkgname=libstrophe version=0.9.1 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="expat-devel zlib-devel libressl-devel" diff --git a/srcpkgs/libtermkey/template b/srcpkgs/libtermkey/template index 33f190ffaa2..4ecc265179e 100644 --- a/srcpkgs/libtermkey/template +++ b/srcpkgs/libtermkey/template @@ -1,7 +1,7 @@ # Template file for 'libtermkey' pkgname=libtermkey -version=0.18 -revision=2 +version=0.19 +revision=1 build_style=gnu-makefile hostmakedepends="libtool pkg-config perl" makedepends="unibilium-devel" @@ -10,7 +10,7 @@ maintainer="Steve Prybylski " license="MIT" homepage="http://www.leonerd.org.uk/code/libtermkey" distfiles="${homepage}/${pkgname}-${version}.tar.gz" -checksum=239746de41c845af52bb3c14055558f743292dd6c24ac26c2d6567a5a6093926 +checksum=c505aa4cb48c8fa59c526265576b97a19e6ebe7b7da20f4ecaae898b727b48b7 do_build() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/libtls11 b/srcpkgs/libtls15 similarity index 100% rename from srcpkgs/libtls11 rename to srcpkgs/libtls15 diff --git a/srcpkgs/libtorrent-rasterbar/patches/libressl.patch b/srcpkgs/libtorrent-rasterbar/patches/libressl.patch deleted file mode 100644 index 4626d33be2b..00000000000 --- a/srcpkgs/libtorrent-rasterbar/patches/libressl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- include/libtorrent/config.hpp.orig 2014-08-15 08:51:56.000000000 +0200 -+++ include/libtorrent/config.hpp 2015-01-03 18:34:41.639761027 +0100 -@@ -33,6 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. - #ifndef TORRENT_CONFIG_HPP_INCLUDED - #define TORRENT_CONFIG_HPP_INCLUDED - -+#include - #include - #include - #include // for snprintf diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template index 39f3fb44786..4b4c987eba8 100644 --- a/srcpkgs/libtorrent-rasterbar/template +++ b/srcpkgs/libtorrent-rasterbar/template @@ -1,46 +1,42 @@ # Template file for 'libtorrent-rasterbar' pkgname=libtorrent-rasterbar -version=1.1.1 -revision=5 +version=1.1.3 +revision=3 build_style=gnu-configure -configure_args="--with-libgeoip --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib" -hostmakedepends="pkg-config intltool" -makedepends="libressl-devel boost-devel geoip-devel" +configure_args="--enable-python-binding --with-boost=${XBPS_CROSS_BASE}/usr" +hostmakedepends="automake pkg-config intltool libtool python-devel" +makedepends="libressl-devel boost-devel boost-python geoip-devel python-devel" short_desc="C++ bittorrent library by Rasterbar Software" maintainer="Eivind Uggedal " homepage="http://www.rasterbar.com/products/libtorrent/" -license="BSD" +license="3-clause-BSD" distfiles="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${version//./_}/libtorrent-rasterbar-${version}.tar.gz" -checksum=f70c82367b0980460ef95aff3e117fd4a174477892d529beec434f74d615b31f - -subpackages="libtorrent-rasterbar-devel" -CXXFLAGS="-std=c++11" -CFLAGS="-std=c++11" # FIXME: bindings/python doesn't use CXXFLAGS - -if [ -z "$CROSS_BUILD" ]; then - configure_args+=" --enable-python-binding" - makedepends+=" boost-python python-devel" - subpackages+=" libtorrent-rasterbar-python" -fi +checksum=44196a89932c26528f5db19289d0f0f4130730a61dccc61c9f1eac9ad3e881d8 +pre_configure() { + export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7" + export PYTHON_CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7" + export PYTHON_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython2.7" + autoreconf -fi +} post_install() { vlicense LICENSE } libtorrent-rasterbar-python_package() { replaces="${sourcepkg}<1.0.9_2" - short_desc+=" - python bindings" + short_desc+=" - Python bindings" pkg_install() { vmove usr/lib/python* } } libtorrent-rasterbar-devel_package() { - depends="${sourcepkg}>=${version}_${revision} libressl-devel>=2.1.4 boost-devel geoip-devel" + depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - vmove "usr/lib/*.a" + vmove usr/lib/*.so + vmove usr/lib/*.a } } diff --git a/srcpkgs/libtorrent-rasterbar/update b/srcpkgs/libtorrent-rasterbar/update index 2f098c594ea..1e40d58c7c3 100644 --- a/srcpkgs/libtorrent-rasterbar/update +++ b/srcpkgs/libtorrent-rasterbar/update @@ -1 +1,2 @@ -pattern='libtorrent-\K[\d]+_[\d]+_[\d]+' +site='https://github.com/arvidn/libtorrent/releases' +pattern='libtorrent-rasterbar-\K[\d\.]+(?=\.tar\.gz")' diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template index cd41f29caae..966f317b2d4 100644 --- a/srcpkgs/libtorrent/template +++ b/srcpkgs/libtorrent/template @@ -1,7 +1,7 @@ # Template build file for 'libtorrent' pkgname=libtorrent version=0.13.6 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-static --disable-debug --without-kqueue --enable-aligned --with-posix-fallocate" diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template index 74934593d30..d511dac79fe 100644 --- a/srcpkgs/libu2f-host/template +++ b/srcpkgs/libu2f-host/template @@ -1,7 +1,7 @@ # Template file for 'libu2f-host' pkgname=libu2f-host version=1.1.3 -revision=3 +revision=4 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure configure_args="--with-openssl=yes --with-udevrulesdir=/usr/lib/udev/rules.d" diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template index 2fc5d7610fd..50a745b6740 100644 --- a/srcpkgs/libu2f-server/template +++ b/srcpkgs/libu2f-server/template @@ -1,7 +1,7 @@ # Template file for 'libu2f-server' pkgname=libu2f-server version=1.0.1 -revision=3 +revision=4 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure configure_args="--enable-gtk-doc-html=no" diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template index 6a85941adcc..dc7c4da2fe3 100644 --- a/srcpkgs/libucl/template +++ b/srcpkgs/libucl/template @@ -1,7 +1,7 @@ # Template file for 'libucl' pkgname=libucl version=0.8.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-urls --enable-signatures" hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/libva-glx/template b/srcpkgs/libva-glx/template index c74a8b0a504..a15ab8689da 100644 --- a/srcpkgs/libva-glx/template +++ b/srcpkgs/libva-glx/template @@ -7,23 +7,20 @@ # KEEP THIS PACKAGE SYNCHRONIZED WITH "libva". # pkgname=libva-glx -version=1.7.3 +version=1.8.1 revision=1 wrksrc="libva-${version}" build_style=gnu-configure -configure_args="--disable-static --enable-glx --enable-egl" -hostmakedepends="automake pkg-config libtool" +configure_args="--enable-glx --enable-egl" +hostmakedepends="pkg-config wayland-devel" makedepends="libva-devel libXfixes-devel MesaLib-devel wayland-devel" short_desc="Video Acceleration (VA) API - GLX backend" maintainer="Juan RP " -homepage="http://freedesktop.org/wiki/Software/vaapi" +homepage="https://01.org/linuxmedia" license="MIT" -distfiles="${FREEDESKTOP_SITE}/vaapi/releases/libva/libva-${version}.tar.bz2" -checksum=22bc139498065a7950d966dbdb000cad04905cbd3dc8f3541f80d36c4670b9d9 +distfiles="https://github.com/01org/libva/releases/download/${version}/libva-${version}.tar.bz2" +checksum=c1d5d85b6b40b76f37993b4da33388d3d73b64998dcbc160b7578e24ed775c73 -pre_configure() { - autoreconf -fi -} post_install() { # We are only interested in the glx component, remove everything else. mkdir -p ${wrksrc}/temp/usr/lib/pkgconfig ${wrksrc}/temp/usr/include/va diff --git a/srcpkgs/libva-intel-driver/template b/srcpkgs/libva-intel-driver/template index 75a2ef7dfca..c57a6a0194a 100644 --- a/srcpkgs/libva-intel-driver/template +++ b/srcpkgs/libva-intel-driver/template @@ -1,16 +1,17 @@ # Template file for 'libva-intel-driver' pkgname=libva-intel-driver -version=1.7.3 +version=1.8.1 revision=1 +wrksrc="intel-vaapi-driver-${version}" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libX11-devel libva-glx-devel libdrm-devel wayland-devel MesaLib-devel" short_desc="Video Acceleration (VA) API - Intel Graphics backend" maintainer="Juan RP " -homepage="http://freedesktop.org/wiki/Software/vaapi" +homepage="https://01.org/linuxmedia" license="MIT" -distfiles="${FREEDESKTOP_SITE}/vaapi/releases/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=76ad37d9fd5ae23d8ce6052d50b5e6438a8df9e769b13fe34b771cd453f4f937 +distfiles="https://github.com/01org/intel-vaapi-driver/releases/download/${version}/intel-vaapi-driver-${version}.tar.bz2" +checksum=efd041602635ce9450fbdf864563d3b95341ef3877337772af708d9cc17b2fce only_for_archs="i686 i686-musl x86_64 x86_64-musl" post_install() { diff --git a/srcpkgs/libva-utils/template b/srcpkgs/libva-utils/template new file mode 100644 index 00000000000..89812cc1fbd --- /dev/null +++ b/srcpkgs/libva-utils/template @@ -0,0 +1,17 @@ +# Template file for 'libva-utils' +pkgname=libva-utils +version=1.8.1 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config wayland-devel" +makedepends="libva-devel libXfixes-devel libXext-devel libdrm-devel wayland-devel" +short_desc="Video Acceleration (VA) API - Utilities" +maintainer="Juan RP " +homepage="https://01.org/linuxmedia" +license="MIT" +distfiles="https://github.com/01org/libva-utils/releases/download/${version}/libva-utils-${version}.tar.bz2" +checksum=fff17327739b801d9d91dbc79ae385026ae7ddc564d489fa1d12d8d6f9f1e2c9 + +post_install() { + vlicense COPYING +} diff --git a/srcpkgs/libva/patches/fix-wayland_makefile_am.patch b/srcpkgs/libva/patches/fix-wayland_makefile_am.patch deleted file mode 100644 index 1a4c686d2d0..00000000000 --- a/srcpkgs/libva/patches/fix-wayland_makefile_am.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- va/wayland/Makefile.am 2016-08-25 04:42:40.000000000 +0200 -+++ va/wayland/Makefile.am 2016-09-12 18:05:59.410106843 +0200 -@@ -24,6 +24,7 @@ - -DLINUX \ - -I$(top_srcdir) \ - -I$(top_srcdir)/va \ -+ -I$(top_srcdir)/va/drm \ - $(WAYLAND_CFLAGS) \ - $(DRM_CFLAGS) \ - $(NULL) -@@ -32,7 +33,7 @@ - va_wayland.c \ - va_wayland_drm.c \ - va_wayland_emgd.c \ -- $(top_srcdir)/va/drm/va_drm_utils.c \ -+ va_drm_utils.c \ - $(NULL) - - source_h = \ -@@ -58,7 +59,7 @@ - - # Wayland protocol - va_wayland_drm.c: $(protocol_source_h) --%-client-protocol.h : %.xml -+wayland-client-protocol.h : wayland.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - - EXTRA_DIST = \ diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template index c8902e813b0..d5ae5107f7d 100644 --- a/srcpkgs/libva/template +++ b/srcpkgs/libva/template @@ -1,23 +1,18 @@ # Template file for 'libva' pkgname=libva -version=1.7.3 +version=1.8.1 revision=1 build_style=gnu-configure -configure_args="--disable-static --enable-x11 --disable-egl --disable-glx" -hostmakedepends="automake pkg-config libtool" +configure_args="--disable-egl --disable-glx" +hostmakedepends="pkg-config wayland-devel" makedepends="libXfixes-devel libXext-devel libdrm-devel wayland-devel" short_desc="Video Acceleration (VA) API" maintainer="Juan RP " -homepage="http://freedesktop.org/wiki/Software/vaapi" +homepage="https://01.org/linuxmedia" license="MIT" -distfiles="${FREEDESKTOP_SITE}/vaapi/releases/libva/libva-${version}.tar.bz2" -checksum=22bc139498065a7950d966dbdb000cad04905cbd3dc8f3541f80d36c4670b9d9 +distfiles="https://github.com/01org/libva/releases/download/${version}/libva-${version}.tar.bz2" +checksum=c1d5d85b6b40b76f37993b4da33388d3d73b64998dcbc160b7578e24ed775c73 -pre_configure() { - # Create a symbolic link to avoid out of source tree compiling - ln -sf ../drm/va_drm_utils.c va/wayland/va_drm_utils.c - autoreconf -fi -} post_install() { vlicense COPYING } diff --git a/srcpkgs/libvirt-glib-python b/srcpkgs/libvirt-glib-python deleted file mode 120000 index ecf88a43a58..00000000000 --- a/srcpkgs/libvirt-glib-python +++ /dev/null @@ -1 +0,0 @@ -libvirt-glib \ No newline at end of file diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template index 465d86c3fc7..33d902ca85f 100644 --- a/srcpkgs/libvirt-glib/template +++ b/srcpkgs/libvirt-glib/template @@ -1,6 +1,6 @@ # Template file for 'libvirt-glib' pkgname=libvirt-glib -version=0.2.3 +version=1.0.0 revision=1 build_options="gir" build_style=gnu-configure @@ -13,7 +13,8 @@ maintainer="Juan RP " homepage="http://libvirt.org" license="LGPL-2.1" distfiles="http://libvirt.org/sources/glib/$pkgname-$version.tar.gz" -checksum=c3b11aa34584b3416148b36bb005505e461830c73c9fd2f40143cca3309250dd +checksum=ca9158d01cc4d9e0218f94f8c9ee04ae367d8c3b4396daaebca2c4b89a2e8a47 +replaces="libvirt-glib-python>=0" if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" @@ -21,7 +22,6 @@ fi pre_configure() { autoreconf -fi - sed -i "s,@PYTHON_INCLUDES@,${XBPS_CROSS_BASE}/usr/include/python2.7," python/Makefile.in } libvirt-glib-devel_package() { @@ -38,11 +38,3 @@ libvirt-glib-devel_package() { fi } } -libvirt-glib-python_package() { - lib32disabled=yes - depends="python" - short_desc+=" - python bindings" - pkg_install() { - vmove "usr/lib/python*" - } -} diff --git a/srcpkgs/libvirt-python/template b/srcpkgs/libvirt-python/template index 56f6dc9b6cb..38108e82042 100644 --- a/srcpkgs/libvirt-python/template +++ b/srcpkgs/libvirt-python/template @@ -1,15 +1,22 @@ # Template file for 'libvirt-python' pkgname=libvirt-python -version=3.1.0 -revision=1 -build_style=python2-module -hostmakedepends="python pkg-config libvirt-devel" -makedepends="libvirt-devel python-devel" +version=3.2.0 +revision=2 +build_style=python-module +hostmakedepends="pkg-config python-devel python3-devel libvirt-devel" +makedepends="libvirt-devel python-devel python3-devel" pycompile_module="libvirt.py libvirt_lxc.py libvirt_qemu.py" -depends="libvirt" -short_desc="The libvirt virtualization API python binding" -maintainer="Andrea Brancaleoni " +short_desc="The libvirt virtualization API Python2 binding" +maintainer="Andrea Brancaleoni " license="LGPL-2.1" homepage="https://pypi.python.org/pypi/libvirt-python" distfiles="${PYPI_SITE}/l/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=f36a62ace3b815ef1f14a760a5feee31bd502bed0daf92ab75d21d516123a218 +checksum=ac85dd8dec332f308e5e0e40889be0d2f10b5d6917f00f0c474405ad25dc003d + +libvirt-python3_package() { + short_desc="${short_desc/Python2/Python3}" + pycompile_module="libvirt.py libvirt_lxc.py libvirt_qemu.py" + pkg_install() { + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/libvirt-python3 b/srcpkgs/libvirt-python3 new file mode 120000 index 00000000000..5a47ce821b0 --- /dev/null +++ b/srcpkgs/libvirt-python3 @@ -0,0 +1 @@ +libvirt-python \ No newline at end of file diff --git a/srcpkgs/libvirt/files/libvirtd/log/run b/srcpkgs/libvirt/files/libvirtd/log/run new file mode 100755 index 00000000000..a4cd886e5de --- /dev/null +++ b/srcpkgs/libvirt/files/libvirtd/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec logger -t libvirtd -p daemon.info diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index 8e7c32ac1f5..64dd092c33d 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,7 +1,7 @@ # Template file for 'libvirt' pkgname=libvirt -version=2.3.0 -revision=2 +version=3.2.0 +revision=1 build_style=gnu-configure configure_args="--without-hal --with-storage-lvm --with-qemu-user=libvirt --with-qemu-group=libvirt --without-netcf --with-interface --disable-static" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="https://libvirt.org" license="LGPL-2.1" distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz" -checksum=e430e69b27d3f6c97255e638617b59b179618d531d81ac7dfe0783a1c1eeafd1 +checksum=9481a083b567a07927f239553dd70b5c0d1bff5b9b4ec61be1899981c646209e # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649 system_accounts="libvirt" diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template index 899ee50112b..52731988e7d 100644 --- a/srcpkgs/libvisio/template +++ b/srcpkgs/libvisio/template @@ -1,7 +1,7 @@ # Template file for 'libvisio' pkgname=libvisio version=0.1.5 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="gperf pkg-config perl" makedepends="boost-devel librevenge-devel libxml2-devel icu-devel" diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template index 3a2996cf3e4..2468391730d 100644 --- a/srcpkgs/libvncserver/template +++ b/srcpkgs/libvncserver/template @@ -1,7 +1,7 @@ # Template file for 'libvncserver' pkgname=libvncserver version=0.9.11 -revision=1 +revision=2 wrksrc="libvncserver-LibVNCServer-${version}" build_style=gnu-configure hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/libvpx/patches/01-arm-fixes.patch b/srcpkgs/libvpx/patches/01-arm-fixes.patch new file mode 100644 index 00000000000..3e212abbf86 --- /dev/null +++ b/srcpkgs/libvpx/patches/01-arm-fixes.patch @@ -0,0 +1,78 @@ +From ac94b8f1653ee9a459aa26a65243d11b8c308064 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Sun, 15 Jan 2017 12:11:57 -0700 +Subject: [PATCH] ARM fixes + +--- + build/make/configure.sh | 21 +++++++++++---------- + configure | 2 ++ + 2 files changed, 13 insertions(+), 10 deletions(-) + +diff --git a/build/make/configure.sh b/build/make/configure.sh +index 007e02000..c7e9076b3 100644 +--- build/make/configure.sh ++++ build/make/configure.sh +@@ -680,6 +680,14 @@ process_common_toolchain() { + aarch64*) + tgt_isa=arm64 + ;; ++ armv5te*) ++ tgt_isa=armv5te ++ float_abi=soft ++ ;; ++ armv6*-gnueabihf) ++ tgt_isa=armv6 ++ float_abi=hard ++ ;; + armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf) + tgt_isa=armv7 + float_abi=hard +@@ -873,7 +881,8 @@ process_common_toolchain() { + soft_enable neon + ;; + armv7|armv7s) + soft_enable neon ++ float_abi=hard + # Only enable neon_asm when neon is also enabled. + enabled neon && soft_enable neon_asm + # If someone tries to force it through, die. +@@ -894,13 +902,6 @@ process_common_toolchain() { + check_add_asflags --defsym ARCHITECTURE=${arch_int} + tune_cflags="-mtune=" + if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then +- if [ -z "${float_abi}" ]; then +- check_cpp <" homepage="https://developers.google.com/speed/webp/" license="3-clause-BSD" distfiles="http://downloads.webmproject.org/releases/webp/${pkgname}-${version}.tar.gz" -checksum=b75310c810b3eda222c77f6d6c26b061240e3d9060095de44b2c1bae291ecdef +checksum=c928119229d4f8f35e20113ffb61f281eda267634a8dc2285af4b0ee27cf2b40 case "$XBPS_TARGET_MACHINE" in armv6*) configure_args+=" --disable-neon";; diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template index f9dbcbbc4d2..856cbbebdd3 100644 --- a/srcpkgs/libwebsockets/template +++ b/srcpkgs/libwebsockets/template @@ -1,7 +1,7 @@ # Template file for 'libwebsockets' pkgname=libwebsockets -version=2.1.1 -revision=1 +version=2.2.1 +revision=2 build_style=cmake makedepends="zlib-devel libressl-devel libev-devel" configure_args="-DLWS_WITH_LIBEV=1 -DLWS_WITH_HTTP2=1 -DLWS_USE_IPV6=1" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="LGPL-2" homepage="https://libwebsockets.org" distfiles="https://github.com/warmcat/libwebsockets/archive/v$version.tar.gz" -checksum=96183cbdfcd6e6a3d9465e854a924b7bfde6c8c6d3384d6159ad797c2e823b4d +checksum=e7f9eaef258e003c9ada0803a9a5636757a5bc0a58927858834fb38a87d18ad2 CFLAGS="-Wno-error" diff --git a/srcpkgs/libwps/template b/srcpkgs/libwps/template index d241cfa262a..8f4909f7dcf 100644 --- a/srcpkgs/libwps/template +++ b/srcpkgs/libwps/template @@ -1,6 +1,6 @@ # Template file for 'libwps' pkgname=libwps -version=0.4.5 +version=0.4.6 revision=1 build_style=gnu-configure short_desc="Library for importing Microsoft Works documents" @@ -10,7 +10,7 @@ makedepends="boost-devel librevenge-devel" hostmakedepends="pkg-config" homepage="http://libwps.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/libwps/libwps-${version}.tar.xz" -checksum=8e175ab9339d447a285a1533bfdc405432b9a275e4f3a98690ffaf12fe7f4d4a +checksum=e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0 libwps-devel_package() { depends="libwps>=${version}_${revision} $makedepends" diff --git a/srcpkgs/libzen/template b/srcpkgs/libzen/template index a3124eb5489..8b1398ccf9e 100644 --- a/srcpkgs/libzen/template +++ b/srcpkgs/libzen/template @@ -1,6 +1,6 @@ # Template build file for 'libzen'. pkgname=libzen -version=0.4.34 +version=0.4.35 revision=1 short_desc="Shared library for libmediainfo and mediainfo" homepage="http://mediaarea.net/MediaInfo" @@ -8,7 +8,7 @@ maintainer="Georg Schabel " license="zlib" distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.gz" -checksum=bb51136f9cf5c5660d3804a10ed5b34224cf7bbbacdf264ea50e1e65a9c0394e +checksum=e8b9086e25b3175d49417e26e0f6f23e05683ed6ed27d3ebe0e1f9b9c9ef2ef7 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/lightsoff/template b/srcpkgs/lightsoff/template index 6c03f2e8952..d9bd9c20eb1 100644 --- a/srcpkgs/lightsoff/template +++ b/srcpkgs/lightsoff/template @@ -1,6 +1,6 @@ # Template file for 'lightsoff' pkgname=lightsoff -version=3.22.2 +version=3.24.0 revision=1 build_style=gnu-configure hostmakedepends="glib intltool itstool pkg-config" @@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Lightsoff" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=07a518a97060c62cfbed278930aa0b35962187e2a6a600d367ac793a95687999 +checksum=5d1bb7de4b3f5c7814e5599a5171cfdeef74e774a8a6dbd992c893a5af6bd8ce diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template index 8e2f2ab4045..1cbab8a2163 100644 --- a/srcpkgs/lighttpd/template +++ b/srcpkgs/lighttpd/template @@ -1,7 +1,7 @@ # Template file for 'lighttpd' pkgname=lighttpd version=1.4.45 -revision=1 +revision=2 makedepends="libuuid-devel libmysqlclient-devel lua-devel libxml2-devel sqlite-devel gdbm-devel pcre-devel libressl-devel fcgi-devel libldap-devel" hostmakedepends="automake pkg-config libtool" diff --git a/srcpkgs/links/template b/srcpkgs/links/template index 015ef462be0..90d0fcaae6c 100644 --- a/srcpkgs/links/template +++ b/srcpkgs/links/template @@ -1,7 +1,7 @@ # Template file for 'links' pkgname=links version=2.14 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-ssl --enable-graphics" makedepends="libpng-devel libjpeg-turbo tiff-devel bzip2-devel zlib-devel gpm-devel libressl-devel" diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template index cf95f1002b3..3b2988b53b0 100644 --- a/srcpkgs/linux-firmware/template +++ b/srcpkgs/linux-firmware/template @@ -1,6 +1,6 @@ # Template file for 'linux-firmware' pkgname=linux-firmware -version=20170217 +version=20170311 revision=1 noarch=yes short_desc="Binary firmware blobs for the Linux kernel" @@ -11,7 +11,7 @@ hostmakedepends="git" depends="${pkgname}-amd-${version}_${revision} ${pkgname}-network-${version}_${revision}" do_fetch() { - local _githash=12987cadb37de28719990dfc2397ec6d09e10566 + local _githash=695f2d6d82173f4e322d8f834c9849775778022a local _url="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" git clone ${_url} ${wrksrc} cd ${wrksrc} @@ -19,6 +19,8 @@ do_fetch() { # Restore old Bluetooth firmware # https://bugzilla.kernel.org/show_bug.cgi?id=190831 + # @pullmoll: Looks like it is fixed (Emmanuel Grumbach 2017-03-08 07:10:16 UTC: OK - close this for now) + # Leaving it enabled until someone confirms it isn't needed anymore git checkout 9c71af939b51ce1431087acfb5b0f61c0b491c63 -- intel/ibt-11-5.{sfi,ddc} } do_install() { diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index 56d3f3a5f3a..a3a1e9904ab 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -12,8 +12,8 @@ makedepends="pciutils-devel python-devel libglib-devel libsysfs-devel depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}" maintainer="Juan RP " license="GPL-2" -homepage="http://www.kernel.org" -distfiles="http://ftp.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" +homepage="https://www.kernel.org" +distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz" checksum=029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall" diff --git a/srcpkgs/linux3.18/template b/srcpkgs/linux3.18/template index 20d27264369..4c84678c583 100644 --- a/srcpkgs/linux3.18/template +++ b/srcpkgs/linux3.18/template @@ -1,6 +1,6 @@ # Template file for 'linux3.18' pkgname=linux3.18 -version=3.18.46 +version=3.18.50 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="${KERNEL_SITE}/kernel/v3.x/linux-${version}.tar.xz" -checksum=cb404757b727faceae9fe1a436ef0cd12d37d54c67df4814f36b00c4bad17b4a +checksum=8e8a6a80cc25aab6224e75876dbf2797eb0f4eaae409e8230409dbf04fb4db5d _kernver="${version}_${revision}" diff --git a/srcpkgs/linux4.1/template b/srcpkgs/linux4.1/template index 90d6f6a9f70..8d625343214 100644 --- a/srcpkgs/linux4.1/template +++ b/srcpkgs/linux4.1/template @@ -1,6 +1,6 @@ # Template file for 'linux4.1' pkgname=linux4.1 -version=4.1.37 +version=4.1.39 revision=1 wrksrc="linux-${version}" maintainer="Juan RP " @@ -8,7 +8,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz" -checksum=da139c1a78a0d4e37931de33030c73d8e4a2a2e155eeface9a50f7692b263bee +checksum=a8e82c8b1580ac4f8b176c714206498adedec9591eda48b895f6c61116d58854 nocross=yes nodebug=yes diff --git a/srcpkgs/linux4.10/files/arm64-dotconfig b/srcpkgs/linux4.10/files/arm64-dotconfig index 37fc7ffd6a2..c39bb5ac17d 100644 --- a/srcpkgs/linux4.10/files/arm64-dotconfig +++ b/srcpkgs/linux4.10/files/arm64-dotconfig @@ -1,17 +1,17 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.10.0 Kernel Configuration +# Linux/arm64 4.10.10 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_MMU=y CONFIG_DEBUG_RODATA=y -CONFIG_ARM64_PAGE_SHIFT=16 -CONFIG_ARM64_CONT_SHIFT=5 -CONFIG_ARCH_MMAP_RND_BITS_MIN=14 -CONFIG_ARCH_MMAP_RND_BITS_MAX=29 -CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7 +CONFIG_ARM64_PAGE_SHIFT=12 +CONFIG_ARM64_CONT_SHIFT=4 +CONFIG_ARCH_MMAP_RND_BITS_MIN=18 +CONFIG_ARCH_MMAP_RND_BITS_MAX=33 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 CONFIG_STACKTRACE_SUPPORT=y CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 @@ -33,7 +33,7 @@ CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y CONFIG_KERNEL_MODE_NEON=y CONFIG_FIX_EARLYCON_MEM=y -CONFIG_PGTABLE_LEVELS=3 +CONFIG_PGTABLE_LEVELS=4 CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y @@ -173,9 +173,11 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_BPF=y CONFIG_EXPERT=y +CONFIG_UID16=y CONFIG_MULTIUSER=y # CONFIG_SGETMASK_SYSCALL is not set CONFIG_SYSFS_SYSCALL=y @@ -263,10 +265,14 @@ CONFIG_HAVE_ARCH_HUGE_VMAP=y CONFIG_MODULES_USE_ELF_RELA=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y -CONFIG_ARCH_MMAP_RND_BITS=14 +CONFIG_ARCH_MMAP_RND_BITS=18 +CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 # CONFIG_HAVE_ARCH_HASH is not set # CONFIG_ISA_BUS_API is not set CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y # CONFIG_CPU_NO_EFFICIENT_FFS is not set # CONFIG_HAVE_ARCH_VMAP_STACK is not set @@ -286,9 +292,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set -CONFIG_MODULE_COMPRESS=y -CONFIG_MODULE_COMPRESS_GZIP=y -# CONFIG_MODULE_COMPRESS_XZ is not set +# CONFIG_MODULE_COMPRESS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y @@ -325,6 +329,7 @@ CONFIG_KARMA_PARTITION=y CONFIG_EFI_PARTITION=y # CONFIG_SYSV68_PARTITION is not set # CONFIG_CMDLINE_PARTITION is not set +CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_PCI=y # @@ -451,13 +456,16 @@ CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_834220=y +CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y -# CONFIG_ARM64_4K_PAGES is not set +CONFIG_QCOM_QDF2400_ERRATUM_0065=y +CONFIG_ARM64_4K_PAGES=y # CONFIG_ARM64_16K_PAGES is not set -CONFIG_ARM64_64K_PAGES=y +# CONFIG_ARM64_64K_PAGES is not set +# CONFIG_ARM64_VA_BITS_39 is not set # CONFIG_ARM64_VA_BITS_42 is not set CONFIG_ARM64_VA_BITS_48=y CONFIG_ARM64_VA_BITS=48 @@ -484,6 +492,7 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HW_PERF_EVENTS=y CONFIG_SYS_SUPPORTS_HUGETLBFS=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_SPARSEMEM_MANUAL=y @@ -529,6 +538,7 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_KEXEC=y # CONFIG_XEN is not set CONFIG_FORCE_MAX_ZONEORDER=11 +# CONFIG_ARMV8_DEPRECATED is not set CONFIG_ARM64_SW_TTBR0_PAN=y # @@ -560,13 +570,15 @@ CONFIG_DMI=y # Userspace binary formats # CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y CONFIG_ELFCORE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_BINFMT_SCRIPT=y # CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y -# CONFIG_COMPAT is not set +CONFIG_COMPAT=y +CONFIG_SYSVIPC_COMPAT=y # # Power management options @@ -648,6 +660,7 @@ CONFIG_ARM_TEGRA20_CPUFREQ=y CONFIG_ARM_TEGRA124_CPUFREQ=y CONFIG_ACPI_CPPC_CPUFREQ=y CONFIG_NET=y +CONFIG_COMPAT_NETLINK_MESSAGES=y CONFIG_NET_INGRESS=y CONFIG_NET_EGRESS=y @@ -6700,6 +6713,7 @@ CONFIG_NVMEM=m CONFIG_MTK_EFUSE=m CONFIG_QCOM_QFPROM=m CONFIG_NVMEM_SUNXI_SID=m +# CONFIG_MESON_EFUSE is not set # CONFIG_STM is not set # CONFIG_INTEL_TH is not set @@ -6739,6 +6753,7 @@ CONFIG_EFI_BOOTLOADER_CONTROL=y # CONFIG_EFI_TEST is not set CONFIG_UEFI_CPER=y # CONFIG_EFI_DEV_PATH_PARSER is not set +CONFIG_MESON_SM=y # # Tegra firmware driver @@ -7112,6 +7127,7 @@ CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y +CONFIG_KVM_COMPAT=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=y CONFIG_KVM_ARM_HOST=y @@ -7575,6 +7591,7 @@ CONFIG_LIBCRC32C=y CONFIG_CRC8=m CONFIG_AUDIT_GENERIC=y CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y +CONFIG_AUDIT_COMPAT_GENERIC=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_842_COMPRESS=m CONFIG_842_DECOMPRESS=m diff --git a/srcpkgs/linux4.10/files/i386-dotconfig b/srcpkgs/linux4.10/files/i386-dotconfig index f2d33f1a854..71ede35099c 100644 --- a/srcpkgs/linux4.10/files/i386-dotconfig +++ b/srcpkgs/linux4.10/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 4.10.0 Kernel Configuration +# Linux/i386 4.10.12 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4954,7 +4954,7 @@ CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_USERPTR=y CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_CIK=y CONFIG_DRM_AMDGPU_USERPTR=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set @@ -5365,6 +5365,7 @@ CONFIG_SND_SOC_INTEL_HASWELL=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m +CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m @@ -5442,7 +5443,8 @@ CONFIG_SND_SOC_RT5640=m CONFIG_SND_SOC_RT5645=m CONFIG_SND_SOC_RT5651=m CONFIG_SND_SOC_RT5670=m -# CONFIG_SND_SOC_RT5677_SPI is not set +CONFIG_SND_SOC_RT5677=m +CONFIG_SND_SOC_RT5677_SPI=m CONFIG_SND_SOC_SGTL5000=m CONFIG_SND_SOC_SI476X=m CONFIG_SND_SOC_SIGMADSP=m @@ -7880,7 +7882,7 @@ CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_CTR=m CONFIG_CRYPTO_CTS=m -CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_LRW=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_XTS=y diff --git a/srcpkgs/linux4.10/files/x86_64-dotconfig b/srcpkgs/linux4.10/files/x86_64-dotconfig index 5d8561e2360..2ff99a29628 100644 --- a/srcpkgs/linux4.10/files/x86_64-dotconfig +++ b/srcpkgs/linux4.10/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.10.0 Kernel Configuration +# Linux/x86_64 4.10.12 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -4970,7 +4970,7 @@ CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_USERPTR=y CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMDGPU_SI is not set +CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_CIK=y CONFIG_DRM_AMDGPU_USERPTR=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set @@ -5377,6 +5377,7 @@ CONFIG_SND_SOC_INTEL_HASWELL=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m +CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m @@ -5454,7 +5455,8 @@ CONFIG_SND_SOC_RT5640=m CONFIG_SND_SOC_RT5645=m CONFIG_SND_SOC_RT5651=m CONFIG_SND_SOC_RT5670=m -# CONFIG_SND_SOC_RT5677_SPI is not set +CONFIG_SND_SOC_RT5677=m +CONFIG_SND_SOC_RT5677_SPI=m CONFIG_SND_SOC_SGTL5000=m CONFIG_SND_SOC_SI476X=m CONFIG_SND_SOC_SIGMADSP=m diff --git a/srcpkgs/linux4.10/patches/drm_armada-include-dir.patch b/srcpkgs/linux4.10/patches/drm_armada-include-dir.patch deleted file mode 100644 index 0a37b62bffc..00000000000 --- a/srcpkgs/linux4.10/patches/drm_armada-include-dir.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/drivers/gpu/drm/armada/Makefile b/drivers/gpu/drm/armada/Makefile -index a18f156..64c0b45 100644 ---- a/drivers/gpu/drm/armada/Makefile -+++ b/drivers/gpu/drm/armada/Makefile -@@ -4,3 +4,5 @@ armada-y += armada_510.o - armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o - - obj-$(CONFIG_DRM_ARMADA) := armada.o -+ -+CFLAGS_armada_trace.o := -I$(src) diff --git a/srcpkgs/linux4.10/patches/musl.patch b/srcpkgs/linux4.10/patches/musl.patch index 2aa0c9a789b..bf88b666fd4 100644 --- a/srcpkgs/linux4.10/patches/musl.patch +++ b/srcpkgs/linux4.10/patches/musl.patch @@ -9,3 +9,14 @@ #include #include #include +--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c ++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +@@ -39,8 +39,6 @@ + + #include "vchiq_util.h" + +-#include +- + #define vchiq_status_to_vchi(status) ((int32_t)status) + + typedef struct { diff --git a/srcpkgs/linux4.10/template b/srcpkgs/linux4.10/template index 005196c9ec5..acce101e87e 100644 --- a/srcpkgs/linux4.10/template +++ b/srcpkgs/linux4.10/template @@ -1,6 +1,6 @@ # Template file for 'linux4.10' pkgname=linux4.10 -version=4.10.1 +version=4.10.13 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=6ca06bb5faf5f83600d7388bb623dae41df2a257de85ad5d1792e03302bc3543 +checksum=dab0291aeeb68ad76056aced6a9011d5dd098bf9503f5b7cea1058b0ff78d4ef nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/linux4.11-dbg b/srcpkgs/linux4.11-dbg new file mode 120000 index 00000000000..6161a7937d3 --- /dev/null +++ b/srcpkgs/linux4.11-dbg @@ -0,0 +1 @@ +linux4.11 \ No newline at end of file diff --git a/srcpkgs/linux4.11-headers b/srcpkgs/linux4.11-headers new file mode 120000 index 00000000000..6161a7937d3 --- /dev/null +++ b/srcpkgs/linux4.11-headers @@ -0,0 +1 @@ +linux4.11 \ No newline at end of file diff --git a/srcpkgs/linux4.11/files/arm64-dotconfig b/srcpkgs/linux4.11/files/arm64-dotconfig new file mode 100644 index 00000000000..3f8c536bdd5 --- /dev/null +++ b/srcpkgs/linux4.11/files/arm64-dotconfig @@ -0,0 +1,7759 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/arm64 4.11.0-rc7 Kernel Configuration +# +CONFIG_ARM64=y +CONFIG_64BIT=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_MMU=y +CONFIG_ARM64_PAGE_SHIFT=16 +CONFIG_ARM64_CONT_SHIFT=5 +CONFIG_ARCH_MMAP_RND_BITS_MIN=14 +CONFIG_ARCH_MMAP_RND_BITS_MAX=29 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CSUM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_HAVE_GENERIC_RCU_GUP=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_SMP=y +CONFIG_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +CONFIG_KERNEL_MODE_NEON=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_PGTABLE_LEVELS=3 +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y +CONFIG_THREAD_INFO_IN_TASK=y + +# +# General setup +# +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +# CONFIG_COMPILE_TEST is not set +CONFIG_LOCALVERSION="_1" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_FHANDLE=y +# CONFIG_USELIB is not set +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_GENERIC_IRQ_MIGRATION=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y +CONFIG_HANDLE_DOMAIN_IRQ=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_ARCH_HAS_TICK_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +# CONFIG_NO_HZ_FULL is not set +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +CONFIG_TASKS_RCU=y +CONFIG_RCU_STALL_COMMON=y +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_BUILD_BIN2C=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 +CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 +CONFIG_GENERIC_SCHED_CLOCK=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_CGROUPS=y +CONFIG_PAGE_COUNTER=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_CGROUP_WRITEBACK=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_CGROUP_PIDS=y +# CONFIG_CGROUP_RDMA is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_HUGETLB=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_BPF=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_SOCK_CGROUP_DATA=y +CONFIG_CHECKPOINT_RESTORE=y +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +CONFIG_RD_LZ4=y +CONFIG_INITRAMFS_COMPRESSION=".gz" +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_BPF=y +CONFIG_EXPERT=y +CONFIG_UID16=y +CONFIG_MULTIUSER=y +# CONFIG_SGETMASK_SYSCALL is not set +CONFIG_SYSFS_SYSCALL=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_POSIX_TIMERS=y +CONFIG_KALLSYMS=y +CONFIG_KALLSYMS_ALL=y +# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set +CONFIG_KALLSYMS_BASE_RELATIVE=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_BPF_SYSCALL=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_ADVISE_SYSCALLS=y +# CONFIG_USERFAULTFD is not set +CONFIG_PCI_QUIRKS=y +CONFIG_MEMBARRIER=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y +# CONFIG_PC104 is not set + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_MEMCG_SYSFS_ON is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +CONFIG_SLAB_FREELIST_RANDOM=y +CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_DATA_VERIFICATION is not set +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_KEXEC_CORE=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +# CONFIG_STATIC_KEYS_SELFTEST is not set +CONFIG_UPROBES=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_GCC_PLUGINS=y +# CONFIG_GCC_PLUGINS is not set +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +# CONFIG_CC_STACKPROTECTOR_REGULAR is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_HAVE_ARCH_HUGE_VMAP=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y +CONFIG_ARCH_MMAP_RND_BITS=14 +CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=7 +# CONFIG_HAVE_ARCH_HASH is not set +# CONFIG_ISA_BUS_API is not set +CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y +# CONFIG_CPU_NO_EFFICIENT_FFS is not set +# CONFIG_HAVE_ARCH_VMAP_STACK is not set +# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set +# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_STRICT_MODULE_RWX=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set +# CONFIG_MODULE_COMPRESS is not set +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_BLK_DEV_ZONED=y +CONFIG_BLK_DEV_THROTTLING=y +CONFIG_BLK_CMDLINE_PARSER=y +CONFIG_BLK_WBT=y +# CONFIG_BLK_WBT_SQ is not set +CONFIG_BLK_WBT_MQ=y +CONFIG_BLK_DEBUG_FS=y +# CONFIG_BLK_SED_OPAL is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +CONFIG_AIX_PARTITION=y +CONFIG_OSF_PARTITION=y +CONFIG_AMIGA_PARTITION=y +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +CONFIG_SGI_PARTITION=y +# CONFIG_ULTRIX_PARTITION is not set +CONFIG_SUN_PARTITION=y +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +# CONFIG_CMDLINE_PARTITION is not set +CONFIG_BLOCK_COMPAT=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +CONFIG_ASN1=y +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +CONFIG_INLINE_READ_UNLOCK=y +CONFIG_INLINE_READ_UNLOCK_IRQ=y +CONFIG_INLINE_WRITE_UNLOCK=y +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_FREEZER=y + +# +# Platform selection +# +CONFIG_ARCH_SUNXI=y +# CONFIG_ARCH_ALPINE is not set +CONFIG_ARCH_BCM2835=y +# CONFIG_ARCH_BCM_IPROC is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_BRCMSTB is not set +# CONFIG_ARCH_EXYNOS is not set +# CONFIG_ARCH_LAYERSCAPE is not set +# CONFIG_ARCH_LG1K is not set +CONFIG_ARCH_HISI=y +CONFIG_ARCH_MEDIATEK=y +CONFIG_ARCH_MESON=y +CONFIG_ARCH_MVEBU=y +CONFIG_ARCH_QCOM=y +# CONFIG_ARCH_ROCKCHIP is not set +CONFIG_ARCH_SEATTLE=y +# CONFIG_ARCH_RENESAS is not set +# CONFIG_ARCH_STRATIX10 is not set +CONFIG_ARCH_TEGRA=y +# CONFIG_ARCH_SPRD is not set +# CONFIG_ARCH_THUNDER is not set +# CONFIG_ARCH_THUNDER2 is not set +# CONFIG_ARCH_UNIPHIER is not set +CONFIG_ARCH_VEXPRESS=y +# CONFIG_ARCH_VULCAN is not set +CONFIG_ARCH_XGENE=y +# CONFIG_ARCH_ZX is not set +# CONFIG_ARCH_ZYNQMP is not set + +# +# Bus support +# +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_DOMAINS_GENERIC=y +CONFIG_PCI_SYSCALL=y +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=y +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_PCIEAER_INJECT=m +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +# CONFIG_PCIE_DPC is not set +# CONFIG_PCIE_PTM is not set +CONFIG_PCI_BUS_ADDR_T_64BIT=y +CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +# CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set +CONFIG_PCI_STUB=y +CONFIG_PCI_ATS=y +CONFIG_PCI_ECAM=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_LABEL=y +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_ACPI=y +# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set +# CONFIG_HOTPLUG_PCI_CPCI is not set +# CONFIG_HOTPLUG_PCI_SHPC is not set + +# +# DesignWare PCI Core Support +# +CONFIG_PCIE_DW=y +CONFIG_PCIE_DW_HOST=y +CONFIG_PCIE_DW_PLAT=y +CONFIG_PCI_HISI=y +CONFIG_PCIE_QCOM=y +# CONFIG_PCIE_ARMADA_8K is not set + +# +# PCI host controller drivers +# +CONFIG_PCI_AARDVARK=y +CONFIG_PCI_TEGRA=y +CONFIG_PCI_HOST_COMMON=y +CONFIG_PCI_HOST_GENERIC=y +CONFIG_PCI_XGENE=y +CONFIG_PCI_XGENE_MSI=y +# CONFIG_PCI_HOST_THUNDER_PEM is not set +# CONFIG_PCI_HOST_THUNDER_ECAM is not set + +# +# Kernel Features +# + +# +# ARM errata workarounds via the alternatives framework +# +CONFIG_ARM64_ERRATUM_826319=y +CONFIG_ARM64_ERRATUM_827319=y +CONFIG_ARM64_ERRATUM_824069=y +CONFIG_ARM64_ERRATUM_819472=y +CONFIG_ARM64_ERRATUM_832075=y +CONFIG_ARM64_ERRATUM_834220=y +CONFIG_ARM64_ERRATUM_845719=y +CONFIG_ARM64_ERRATUM_843419=y +CONFIG_CAVIUM_ERRATUM_22375=y +CONFIG_CAVIUM_ERRATUM_23154=y +CONFIG_CAVIUM_ERRATUM_27456=y +CONFIG_QCOM_FALKOR_ERRATUM_1003=y +CONFIG_QCOM_FALKOR_ERRATUM_1009=y +CONFIG_QCOM_QDF2400_ERRATUM_0065=y +# CONFIG_ARM64_4K_PAGES is not set +# CONFIG_ARM64_16K_PAGES is not set +CONFIG_ARM64_64K_PAGES=y +# CONFIG_ARM64_VA_BITS_42 is not set +CONFIG_ARM64_VA_BITS_48=y +CONFIG_ARM64_VA_BITS=48 +# CONFIG_CPU_BIG_ENDIAN is not set +CONFIG_SCHED_MC=y +CONFIG_SCHED_SMT=y +CONFIG_NR_CPUS=8 +CONFIG_HOTPLUG_CPU=y +# CONFIG_NUMA is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=100 +CONFIG_SCHED_HRTICK=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_HW_PERF_EVENTS=y +CONFIG_SYS_SUPPORTS_HUGETLBFS=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_NO_BOOTMEM=y +CONFIG_MEMORY_ISOLATION=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_BOUNCE=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y +CONFIG_CMA=y +# CONFIG_CMA_DEBUG is not set +CONFIG_CMA_DEBUGFS=y +CONFIG_CMA_AREAS=7 +CONFIG_ZSWAP=y +CONFIG_ZPOOL=y +CONFIG_ZBUD=y +# CONFIG_Z3FOLD is not set +CONFIG_ZSMALLOC=y +# CONFIG_PGTABLE_MAPPING is not set +# CONFIG_ZSMALLOC_STAT is not set +CONFIG_GENERIC_EARLY_IOREMAP=y +# CONFIG_IDLE_PAGE_TRACKING is not set +CONFIG_FRAME_VECTOR=y +CONFIG_SECCOMP=y +CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_TIME_ACCOUNTING=y +CONFIG_KEXEC=y +# CONFIG_XEN is not set +CONFIG_FORCE_MAX_ZONEORDER=11 +# CONFIG_ARMV8_DEPRECATED is not set +CONFIG_ARM64_SW_TTBR0_PAN=y + +# +# ARMv8.1 architectural features +# +CONFIG_ARM64_HW_AFDBM=y +CONFIG_ARM64_PAN=y +# CONFIG_ARM64_LSE_ATOMICS is not set +CONFIG_ARM64_VHE=y + +# +# ARMv8.2 architectural features +# +CONFIG_ARM64_UAO=y +CONFIG_ARM64_MODULE_CMODEL_LARGE=y +# CONFIG_RANDOMIZE_BASE is not set + +# +# Boot options +# +CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y +CONFIG_CMDLINE="console=ttyAMA0" +# CONFIG_CMDLINE_FORCE is not set +CONFIG_EFI_STUB=y +CONFIG_EFI=y +CONFIG_DMI=y + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_ELFCORE=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y +# CONFIG_HAVE_AOUT is not set +CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y +CONFIG_COMPAT=y +CONFIG_SYSVIPC_COMPAT=y +CONFIG_KEYS_COMPAT=y + +# +# Power management options +# +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_SUSPEND_SKIP_SYNC is not set +# CONFIG_HIBERNATION is not set +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set +CONFIG_PM=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_ADVANCED_DEBUG is not set +CONFIG_PM_TEST_SUSPEND=y +CONFIG_PM_SLEEP_DEBUG=y +# CONFIG_DPM_WATCHDOG is not set +CONFIG_PM_OPP=y +CONFIG_PM_CLK=y +CONFIG_PM_GENERIC_DOMAINS=y +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set +CONFIG_PM_GENERIC_DOMAINS_SLEEP=y +CONFIG_PM_GENERIC_DOMAINS_OF=y +CONFIG_CPU_PM=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y + +# +# CPU Power Management +# + +# +# CPU Idle +# +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_DT_IDLE_STATES=y + +# +# ARM CPU Idle Drivers +# +CONFIG_ARM_CPUIDLE=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_ATTR_SET=y +CONFIG_CPU_FREQ_GOV_COMMON=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y + +# +# CPU frequency scaling drivers +# +CONFIG_CPUFREQ_DT=y +CONFIG_CPUFREQ_DT_PLATDEV=y +CONFIG_ARM_BIG_LITTLE_CPUFREQ=y +CONFIG_ARM_DT_BL_CPUFREQ=y +# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set +CONFIG_ARM_MT8173_CPUFREQ=y +CONFIG_ARM_SCPI_CPUFREQ=y +CONFIG_ARM_TEGRA20_CPUFREQ=y +CONFIG_ARM_TEGRA124_CPUFREQ=y +CONFIG_ACPI_CPPC_CPUFREQ=y +# CONFIG_QORIQ_CPUFREQ is not set +CONFIG_NET=y +CONFIG_COMPAT_NETLINK_MESSAGES=y +CONFIG_NET_INGRESS=y +CONFIG_NET_EGRESS=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +CONFIG_XFRM=y +CONFIG_XFRM_ALGO=y +CONFIG_XFRM_USER=y +CONFIG_XFRM_SUB_POLICY=y +CONFIG_XFRM_MIGRATE=y +CONFIG_XFRM_STATISTICS=y +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +CONFIG_NET_UDP_TUNNEL=m +CONFIG_NET_FOU=m +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +# CONFIG_INET_ESP_OFFLOAD is not set +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_INET_UDP_DIAG=m +CONFIG_INET_RAW_DIAG=m +# CONFIG_INET_DIAG_DESTROY is not set +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_NV=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_TCP_CONG_DCTCP=m +CONFIG_TCP_CONG_CDG=m +CONFIG_TCP_CONG_BBR=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +# CONFIG_INET6_ESP_OFFLOAD is not set +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=y +CONFIG_IPV6_ILA=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m +CONFIG_IPV6_FOU=m +CONFIG_IPV6_FOU_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y +CONFIG_IPV6_PIMSM_V2=y +CONFIG_IPV6_SEG6_LWTUNNEL=y +CONFIG_IPV6_SEG6_INLINE=y +CONFIG_IPV6_SEG6_HMAC=y +CONFIG_NETLABEL=y +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NET_PTP_CLASSIFY=y +CONFIG_NETWORK_PHY_TIMESTAMPING=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=m + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_INGRESS=y +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_ACCT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m +CONFIG_NF_LOG_NETDEV=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_PROCFS=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_GLUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=y +CONFIG_NF_NAT_PROTO_UDPLITE=y +CONFIG_NF_NAT_PROTO_SCTP=y +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_REDIRECT=m +CONFIG_NETFILTER_SYNPROXY=m +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_INET=m +CONFIG_NF_TABLES_NETDEV=m +CONFIG_NFT_EXTHDR=m +CONFIG_NFT_META=m +CONFIG_NFT_RT=m +CONFIG_NFT_NUMGEN=m +CONFIG_NFT_CT=m +CONFIG_NFT_SET_RBTREE=m +CONFIG_NFT_SET_HASH=m +# CONFIG_NFT_SET_BITMAP is not set +CONFIG_NFT_COUNTER=m +CONFIG_NFT_LOG=m +CONFIG_NFT_LIMIT=m +CONFIG_NFT_MASQ=m +CONFIG_NFT_REDIR=m +CONFIG_NFT_NAT=m +CONFIG_NFT_OBJREF=m +CONFIG_NFT_QUEUE=m +CONFIG_NFT_QUOTA=m +CONFIG_NFT_REJECT=m +CONFIG_NFT_REJECT_INET=m +CONFIG_NFT_COMPAT=m +CONFIG_NFT_HASH=m +CONFIG_NFT_FIB=m +CONFIG_NFT_FIB_INET=m +CONFIG_NF_DUP_NETDEV=m +CONFIG_NFT_DUP_NETDEV=m +CONFIG_NFT_FWD_NETDEV=m +CONFIG_NETFILTER_XTABLES=y + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_HMARK=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_NAT=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m +CONFIG_NETFILTER_XT_MATCH_CGROUP=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_L2TP=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPMARK=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_IPMAC=m +CONFIG_IP_SET_HASH_MAC=m +CONFIG_IP_SET_HASH_NETPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETNET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_FO=m +CONFIG_IP_VS_OVF=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_SOCKET_IPV4=m +CONFIG_NF_TABLES_IPV4=m +CONFIG_NFT_CHAIN_ROUTE_IPV4=m +CONFIG_NFT_REJECT_IPV4=m +CONFIG_NFT_DUP_IPV4=m +CONFIG_NFT_FIB_IPV4=m +CONFIG_NF_TABLES_ARP=m +CONFIG_NF_DUP_IPV4=m +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m +CONFIG_NF_REJECT_IPV4=y +CONFIG_NF_NAT_IPV4=m +CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_NF_NAT_MASQUERADE_IPV4=m +CONFIG_NFT_MASQ_IPV4=m +CONFIG_NFT_REDIR_IPV4=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_SYNPROXY=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_NF_SOCKET_IPV6=m +CONFIG_NF_TABLES_IPV6=m +CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_REJECT_IPV6=m +CONFIG_NFT_DUP_IPV6=m +CONFIG_NFT_FIB_IPV6=m +CONFIG_NF_DUP_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +CONFIG_NF_NAT_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NF_NAT_MASQUERADE_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_TARGET_SYNPROXY=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m +CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NF_LOG_BRIDGE=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +# CONFIG_NET_DCCPPROBE is not set +CONFIG_IP_SCTP=m +# CONFIG_NET_SCTPPROBE is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +CONFIG_SCTP_COOKIE_HMAC_SHA1=y +CONFIG_INET_SCTP_DIAG=m +CONFIG_RDS=m +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set +CONFIG_TIPC=m +CONFIG_TIPC_MEDIA_UDP=y +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +# CONFIG_ATM_MPOA is not set +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +CONFIG_L2TP_DEBUGFS=m +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_MRP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_BRCM=y +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_TRAILER=y +CONFIG_NET_DSA_TAG_QCA=y +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +CONFIG_VLAN_8021Q_MVRP=y +# CONFIG_DECNET is not set +CONFIG_LLC=m +# CONFIG_LLC2 is not set +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_PHONET is not set +CONFIG_6LOWPAN=m +# CONFIG_6LOWPAN_DEBUGFS is not set +CONFIG_6LOWPAN_NHC=m +CONFIG_6LOWPAN_NHC_DEST=m +CONFIG_6LOWPAN_NHC_FRAGMENT=m +CONFIG_6LOWPAN_NHC_HOP=m +CONFIG_6LOWPAN_NHC_IPV6=m +CONFIG_6LOWPAN_NHC_MOBILITY=m +CONFIG_6LOWPAN_NHC_ROUTING=m +CONFIG_6LOWPAN_NHC_UDP=m +CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m +CONFIG_6LOWPAN_GHC_UDP=m +CONFIG_6LOWPAN_GHC_ICMPV6=m +CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m +CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m +CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m +CONFIG_IEEE802154=m +# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set +CONFIG_IEEE802154_SOCKET=m +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_MAC802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=y +CONFIG_NET_SCH_FQ=m +CONFIG_NET_SCH_HHF=m +CONFIG_NET_SCH_PIE=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=y +CONFIG_NET_CLS_BPF=m +CONFIG_NET_CLS_FLOWER=m +CONFIG_NET_CLS_MATCHALL=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_EMATCH_CANID=m +CONFIG_NET_EMATCH_IPSET=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +# CONFIG_NET_ACT_SAMPLE is not set +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_ACT_VLAN=m +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m +CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_IFE=m +CONFIG_NET_ACT_TUNNEL_KEY=m +CONFIG_NET_IFE_SKBMARK=m +CONFIG_NET_IFE_SKBPRIO=m +CONFIG_NET_IFE_SKBTCINDEX=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +CONFIG_DCB=y +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_BATMAN_V is not set +CONFIG_BATMAN_ADV_BLA=y +CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y +CONFIG_BATMAN_ADV_MCAST=y +CONFIG_BATMAN_ADV_DEBUGFS=y +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_OPENVSWITCH_GRE=m +CONFIG_OPENVSWITCH_VXLAN=m +CONFIG_OPENVSWITCH_GENEVE=m +CONFIG_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS_COMMON=m +CONFIG_NETLINK_DIAG=m +CONFIG_MPLS=y +CONFIG_NET_MPLS_GSO=m +CONFIG_MPLS_ROUTING=m +# CONFIG_MPLS_IPTUNNEL is not set +# CONFIG_HSR is not set +CONFIG_NET_SWITCHDEV=y +CONFIG_NET_L3_MASTER_DEV=y +CONFIG_QRTR=m +CONFIG_QRTR_SMD=m +# CONFIG_NET_NCSI is not set +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_CGROUP_NET_PRIO=y +CONFIG_CGROUP_NET_CLASSID=y +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +CONFIG_BPF_JIT=y +CONFIG_NET_FLOW_LIMIT=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +# CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_YAM=m +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +CONFIG_CAN_SLCAN=m +CONFIG_CAN_DEV=m +CONFIG_CAN_CALC_BITTIMING=y +CONFIG_CAN_LEDS=y +# CONFIG_CAN_GRCAN is not set +# CONFIG_CAN_XILINXCAN is not set +CONFIG_CAN_C_CAN=m +CONFIG_CAN_C_CAN_PLATFORM=m +CONFIG_CAN_C_CAN_PCI=m +CONFIG_CAN_CC770=m +# CONFIG_CAN_CC770_ISA is not set +CONFIG_CAN_CC770_PLATFORM=m +# CONFIG_CAN_IFI_CANFD is not set +CONFIG_CAN_M_CAN=m +CONFIG_CAN_SJA1000=m +# CONFIG_CAN_SJA1000_ISA is not set +CONFIG_CAN_SJA1000_PLATFORM=m +CONFIG_CAN_EMS_PCI=m +CONFIG_CAN_PEAK_PCI=m +CONFIG_CAN_PEAK_PCIEC=y +CONFIG_CAN_KVASER_PCI=m +CONFIG_CAN_PLX_PCI=m +CONFIG_CAN_SOFTING=m + +# +# CAN SPI interfaces +# +# CONFIG_CAN_MCP251X is not set + +# +# CAN USB interfaces +# +CONFIG_CAN_EMS_USB=m +CONFIG_CAN_ESD_USB2=m +CONFIG_CAN_GS_USB=m +CONFIG_CAN_KVASER_USB=m +CONFIG_CAN_PEAK_USB=m +CONFIG_CAN_8DEV_USB=m +# CONFIG_CAN_DEBUG_DEVICES is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_BREDR=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m +CONFIG_BT_HS=y +CONFIG_BT_LE=y +CONFIG_BT_6LOWPAN=m +# CONFIG_BT_LEDS is not set +# CONFIG_BT_SELFTEST is not set +# CONFIG_BT_DEBUGFS is not set + +# +# Bluetooth device drivers +# +CONFIG_BT_INTEL=m +CONFIG_BT_BCM=m +CONFIG_BT_RTL=m +CONFIG_BT_QCA=m +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTUSB_BCM=y +CONFIG_BT_HCIBTUSB_RTL=y +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_INTEL=y +CONFIG_BT_HCIUART_BCM=y +CONFIG_BT_HCIUART_QCA=y +# CONFIG_BT_HCIUART_AG6XX is not set +CONFIG_BT_HCIUART_MRVL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_QCOMSMD=m +# CONFIG_AF_RXRPC is not set +# CONFIG_AF_KCM is not set +# CONFIG_STREAM_PARSER is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_CERTIFICATION_ONUS is not set +CONFIG_CFG80211_DEFAULT_PS=y +CONFIG_CFG80211_DEBUGFS=y +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_CRDA_SUPPORT=y +CONFIG_CFG80211_WEXT=y +CONFIG_CFG80211_WEXT_EXPORT=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +# CONFIG_MAC80211_RC_MINSTREL_VHT is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +CONFIG_MAC80211_DEBUGFS=y +# CONFIG_MAC80211_MESSAGE_TRACING is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 +# CONFIG_WIMAX is not set +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_RFKILL_GPIO=m +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_DEBUG is not set +# CONFIG_CAIF is not set +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set +CONFIG_NFC=m +CONFIG_NFC_DIGITAL=m +CONFIG_NFC_NCI=m +# CONFIG_NFC_NCI_SPI is not set +# CONFIG_NFC_NCI_UART is not set +CONFIG_NFC_HCI=m +CONFIG_NFC_SHDLC=y + +# +# Near Field Communication (NFC) devices +# +# CONFIG_NFC_TRF7970A is not set +CONFIG_NFC_SIM=m +CONFIG_NFC_PORT100=m +# CONFIG_NFC_FDP is not set +CONFIG_NFC_PN544=m +CONFIG_NFC_PN544_I2C=m +# CONFIG_NFC_PN533_USB is not set +# CONFIG_NFC_PN533_I2C is not set +CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_I2C=m +CONFIG_NFC_MRVL=m +CONFIG_NFC_MRVL_USB=m +# CONFIG_NFC_MRVL_I2C is not set +CONFIG_NFC_ST21NFCA=m +CONFIG_NFC_ST21NFCA_I2C=m +# CONFIG_NFC_ST_NCI_I2C is not set +# CONFIG_NFC_ST_NCI_SPI is not set +# CONFIG_NFC_NXP_NCI is not set +# CONFIG_NFC_S3FWRN5_I2C is not set +# CONFIG_NFC_ST95HF is not set +# CONFIG_PSAMPLE is not set +CONFIG_NET_IFE=m +CONFIG_LWTUNNEL=y +CONFIG_LWTUNNEL_BPF=y +CONFIG_DST_CACHE=y +CONFIG_GRO_CELLS=y +# CONFIG_NET_DEVLINK is not set +CONFIG_MAY_USE_DEVLINK=y +CONFIG_HAVE_EBPF_JIT=y + +# +# Device Drivers +# +CONFIG_ARM_AMBA=y +CONFIG_TEGRA_AHB=y + +# +# Generic Driver Options +# +# CONFIG_UEVENT_HELPER is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_WANT_DEV_COREDUMP=y +CONFIG_ALLOW_DEV_COREDUMP=y +CONFIG_DEV_COREDUMP=y +# CONFIG_DEBUG_DRIVER is not set +CONFIG_DEBUG_DEVRES=y +# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +CONFIG_TEST_ASYNC_DRIVER_PROBE=m +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_SPI=y +CONFIG_REGMAP_SPMI=y +CONFIG_REGMAP_MMIO=y +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set +CONFIG_DMA_CMA=y + +# +# Default contiguous memory area size: +# +CONFIG_CMA_SIZE_MBYTES=16 +CONFIG_CMA_SIZE_SEL_MBYTES=y +# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SIZE_SEL_MIN is not set +# CONFIG_CMA_SIZE_SEL_MAX is not set +CONFIG_CMA_ALIGNMENT=8 + +# +# Bus devices +# +CONFIG_ARM_CCI=y +CONFIG_ARM_CCI_PMU=y +CONFIG_ARM_CCI400_COMMON=y +CONFIG_ARM_CCI400_PMU=y +# CONFIG_ARM_CCI5xx_PMU is not set +CONFIG_ARM_CCN=y +CONFIG_QCOM_EBI2=y +CONFIG_SUNXI_RSB=y +# CONFIG_TEGRA_ACONNECT is not set +CONFIG_TEGRA_GMI=m +CONFIG_VEXPRESS_CONFIG=y +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=y +# CONFIG_MTD_TESTS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set +CONFIG_MTD_OF_PARTS=m +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set +# CONFIG_MTD_OOPS is not set +# CONFIG_MTD_SWAP is not set +# CONFIG_MTD_PARTITIONED_MASTER is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +CONFIG_MTD_PHYSMAP=m +# CONFIG_MTD_PHYSMAP_COMPAT is not set +CONFIG_MTD_PHYSMAP_OF=m +# CONFIG_MTD_PHYSMAP_OF_VERSATILE is not set +# CONFIG_MTD_PHYSMAP_OF_GEMINI is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_DATAFLASH is not set +CONFIG_MTD_M25P80=y +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOCG3 is not set +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR & LPDDR2 PCM memory drivers +# +# CONFIG_MTD_LPDDR is not set +CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_MT81xx_NOR=m +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +CONFIG_SPI_HISI_SFC=m +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set +# CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_BLOCK is not set +CONFIG_DTC=y +CONFIG_OF=y +# CONFIG_OF_UNITTEST is not set +CONFIG_OF_FLATTREE=y +CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_DYNAMIC=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_ADDRESS_PCI=y +CONFIG_OF_IRQ=y +CONFIG_OF_NET=y +CONFIG_OF_MDIO=y +CONFIG_OF_PCI=y +CONFIG_OF_PCI_IRQ=y +CONFIG_OF_RESERVED_MEM=y +CONFIG_OF_RESOLVE=y +CONFIG_OF_OVERLAY=y +# CONFIG_PARPORT is not set +CONFIG_PNP=y +CONFIG_PNP_DEBUG_MESSAGES=y + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_NULL_BLK=m +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set +CONFIG_ZRAM=m +CONFIG_BLK_CPQ_CISS_DA=m +CONFIG_CISS_SCSI_TAPE=y +# CONFIG_BLK_DEV_DAC960 is not set +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP_MIN_COUNT=0 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SKD=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_VIRTIO_BLK=y +# CONFIG_VIRTIO_BLK_SCSI is not set +CONFIG_BLK_DEV_RBD=m +# CONFIG_BLK_DEV_RSXX is not set +CONFIG_NVME_CORE=m +CONFIG_BLK_DEV_NVME=m +# CONFIG_BLK_DEV_NVME_SCSI is not set +CONFIG_NVME_FABRICS=m +CONFIG_NVME_FC=m +# CONFIG_NVME_TARGET is not set + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +# CONFIG_AD525X_DPOT is not set +# CONFIG_DUMMY_IRQ is not set +# CONFIG_PHANTOM is not set +# CONFIG_SGI_IOC4 is not set +CONFIG_TIFM_CORE=y +CONFIG_TIFM_7XX1=m +# CONFIG_ICS932S401 is not set +CONFIG_ENCLOSURE_SERVICES=m +# CONFIG_HP_ILO is not set +# CONFIG_QCOM_COINCELL is not set +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +# CONFIG_HMC6352 is not set +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set +# CONFIG_USB_SWITCH_FSA9480 is not set +# CONFIG_LATTICE_ECP3_CONFIG is not set +CONFIG_SRAM=y +CONFIG_VEXPRESS_SYSCFG=y +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +# CONFIG_EEPROM_AT25 is not set +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93XX46 is not set +# CONFIG_EEPROM_IDT_89HPESX is not set +CONFIG_CB710_CORE=y +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y + +# +# Texas Instruments shared transport line discipline +# +# CONFIG_TI_ST is not set +CONFIG_SENSORS_LIS3_I2C=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m + +# +# Intel MIC Bus Driver +# + +# +# SCIF Bus Driver +# + +# +# VOP Bus Driver +# + +# +# Intel MIC Host Driver +# + +# +# Intel MIC Card Driver +# + +# +# SCIF Driver +# + +# +# Intel MIC Coprocessor State Management (COSM) Drivers +# + +# +# VOP Driver +# +# CONFIG_GENWQE is not set +CONFIG_ECHO=m +# CONFIG_CXL_BASE is not set +# CONFIG_CXL_AFU_DRIVER_OPS is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +CONFIG_SCSI_NETLINK=y +# CONFIG_SCSI_MQ_DEFAULT is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +CONFIG_SCSI_HPSA=m +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_HISI_SAS is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_MVSAS_TASKLET=y +CONFIG_SCSI_MVUMI=m +# CONFIG_SCSI_ADVANSYS is not set +CONFIG_SCSI_ARCMSR=m +CONFIG_SCSI_ESAS2R=m +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +# CONFIG_SCSI_MPT3SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_SMARTPQI is not set +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m +# CONFIG_SCSI_UFS_DWC_TC_PCI is not set +CONFIG_SCSI_UFSHCD_PLATFORM=m +# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set +CONFIG_SCSI_UFS_QCOM=m +CONFIG_SCSI_HPTIOP=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_SCSI_SNIC=m +# CONFIG_SCSI_SNIC_DEBUG_FS is not set +CONFIG_SCSI_DMX3191D=m +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_IPS is not set +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +CONFIG_SCSI_IPR_TRACE=y +CONFIG_SCSI_IPR_DUMP=y +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_TCM_QLA2XXX=m +# CONFIG_TCM_QLA2XXX_DEBUG is not set +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_AM53C974=m +CONFIG_SCSI_WD719X=m +CONFIG_SCSI_DEBUG=m +CONFIG_SCSI_PMCRAID=m +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_BFA_FC is not set +CONFIG_SCSI_VIRTIO=y +CONFIG_SCSI_CHELSIO_FCOE=m +# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set +CONFIG_SCSI_DH=y +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=1 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_HAVE_PATA_PLATFORM=y +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +# CONFIG_SATA_ZPODD is not set +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=y +CONFIG_SATA_AHCI_PLATFORM=y +# CONFIG_AHCI_CEVA is not set +CONFIG_AHCI_MVEBU=y +CONFIG_AHCI_SUNXI=y +# CONFIG_AHCI_TEGRA is not set +CONFIG_AHCI_XGENE=y +# CONFIG_AHCI_QORIQ is not set +CONFIG_SATA_AHCI_SEATTLE=y +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=y +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=y +# CONFIG_SATA_DWC is not set +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +# CONFIG_PATA_RADISYS is not set +CONFIG_PATA_RDC=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PLATFORM=y +CONFIG_PATA_OF_PLATFORM=y +# CONFIG_PATA_RZ1000 is not set + +# +# Generic fallback / legacy drivers +# +# CONFIG_PATA_ACPI is not set +CONFIG_ATA_GENERIC=m +# CONFIG_PATA_LEGACY is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_AUTODETECT=y +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +# CONFIG_MD_CLUSTER is not set +CONFIG_BCACHE=m +# CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=y +# CONFIG_DM_MQ_DEFAULT is not set +CONFIG_DM_DEBUG=y +CONFIG_DM_BUFIO=y +# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set +CONFIG_DM_BIO_PRISON=m +CONFIG_DM_PERSISTENT_DATA=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=y +CONFIG_DM_THIN_PROVISIONING=m +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_SMQ=m +CONFIG_DM_CACHE_CLEANER=m +# CONFIG_DM_ERA is not set +CONFIG_DM_MIRROR=y +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_RAID=m +CONFIG_DM_ZERO=y +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +CONFIG_DM_VERITY_FEC=y +CONFIG_DM_SWITCH=m +CONFIG_DM_LOG_WRITES=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_TCM_USER2=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_FIREWIRE is not set +CONFIG_FIREWIRE_NOSY=m +CONFIG_NETDEVICES=y +CONFIG_MII=m +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +CONFIG_NET_FC=y +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_RANDOM=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_IPVLAN=m +# CONFIG_IPVTAP is not set +CONFIG_VXLAN=m +CONFIG_GENEVE=m +# CONFIG_GTP is not set +# CONFIG_MACSEC is not set +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_TUN=m +CONFIG_TAP=m +# CONFIG_TUN_VNET_CROSS_LE is not set +CONFIG_VETH=m +CONFIG_VIRTIO_NET=m +CONFIG_NLMON=m +CONFIG_NET_VRF=m +# CONFIG_ARCNET is not set +# CONFIG_ATM_DRIVERS is not set + +# +# CAIF transport drivers +# + +# +# Distributed Switch Architecture drivers +# +CONFIG_NET_DSA_MV88E6060=m +CONFIG_NET_DSA_BCM_SF2=m +CONFIG_B53=m +# CONFIG_B53_SPI_DRIVER is not set +# CONFIG_B53_MDIO_DRIVER is not set +# CONFIG_B53_MMAP_DRIVER is not set +# CONFIG_B53_SRAB_DRIVER is not set +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y +CONFIG_NET_DSA_QCA8K=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_ADAPTEC is not set +CONFIG_NET_VENDOR_AGERE=y +CONFIG_ET131X=m +CONFIG_NET_VENDOR_ALACRITECH=y +CONFIG_SLICOSS=m +CONFIG_NET_VENDOR_ALLWINNER=y +# CONFIG_SUN4I_EMAC is not set +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_ALTERA_TSE=m +CONFIG_NET_VENDOR_AMAZON=y +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_PCNET32=m +CONFIG_AMD_XGBE=m +CONFIG_AMD_XGBE_DCB=y +# CONFIG_AMD_XGBE_HAVE_ECC is not set +CONFIG_NET_XGENE=y +CONFIG_NET_VENDOR_AQUANTIA=y +CONFIG_NET_VENDOR_ARC=y +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_ALX=m +# CONFIG_NET_VENDOR_AURORA is not set +CONFIG_NET_CADENCE=y +CONFIG_MACB=m +CONFIG_MACB_PCI=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_BCMGENET=m +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y +# CONFIG_SYSTEMPORT is not set +# CONFIG_BNXT is not set +# CONFIG_NET_VENDOR_BROCADE is not set +# CONFIG_NET_VENDOR_CAVIUM is not set +# CONFIG_NET_VENDOR_CHELSIO is not set +# CONFIG_NET_VENDOR_CISCO is not set +CONFIG_DNET=m +# CONFIG_NET_VENDOR_DEC is not set +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +# CONFIG_NET_VENDOR_EMULEX is not set +# CONFIG_NET_VENDOR_EZCHIP is not set +# CONFIG_NET_VENDOR_EXAR is not set +CONFIG_NET_VENDOR_HISILICON=y +CONFIG_HIX5HD2_GMAC=m +# CONFIG_HISI_FEMAC is not set +CONFIG_HIP04_ETH=m +CONFIG_HNS_MDIO=m +CONFIG_HNS=m +CONFIG_HNS_DSAF=m +CONFIG_HNS_ENET=m +# CONFIG_NET_VENDOR_HP is not set +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IGB_HWMON=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_HWMON=y +CONFIG_IXGBE_DCB=y +CONFIG_IXGBEVF=m +CONFIG_I40E=m +# CONFIG_I40E_DCB is not set +# CONFIG_I40E_FCOE is not set +CONFIG_I40EVF=m +CONFIG_FM10K=m +# CONFIG_NET_VENDOR_I825XX is not set +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=m +CONFIG_MVNETA=m +# CONFIG_MVPP2 is not set +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MEDIATEK=y +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_DCB=y +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +# CONFIG_MLX5_CORE is not set +# CONFIG_MLXSW_CORE is not set +CONFIG_NET_VENDOR_MICREL=y +# CONFIG_KS8842 is not set +# CONFIG_KS8851 is not set +# CONFIG_KS8851_MLL is not set +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +# CONFIG_ENC28J60 is not set +# CONFIG_ENCX24J600 is not set +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_NETRONOME=y +# CONFIG_NFP is not set +CONFIG_NET_VENDOR_8390=y +CONFIG_NE2K_PCI=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +CONFIG_ETHOC=m +CONFIG_NET_PACKET_ENGINE=y +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +# CONFIG_NET_VENDOR_QLOGIC is not set +# CONFIG_NET_VENDOR_QUALCOMM is not set +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +# CONFIG_NET_VENDOR_RENESAS is not set +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_ROCKER=y +CONFIG_ROCKER=m +# CONFIG_NET_VENDOR_SAMSUNG is not set +# CONFIG_NET_VENDOR_SEEQ is not set +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_NET_VENDOR_SOLARFLARE=y +# CONFIG_SFC is not set +CONFIG_SFC_FALCON=m +CONFIG_SFC_FALCON_MTD=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_SMC91X=m +CONFIG_EPIC100=m +CONFIG_SMSC911X=m +# CONFIG_SMSC911X_ARCH_HOOKS is not set +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +CONFIG_STMMAC_PLATFORM=m +# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_GENERIC=m +CONFIG_DWMAC_IPQ806X=m +CONFIG_DWMAC_MESON=m +CONFIG_DWMAC_SUNXI=m +# CONFIG_STMMAC_PCI is not set +# CONFIG_NET_VENDOR_SUN is not set +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +# CONFIG_TI_CPSW_ALE is not set +# CONFIG_TLAN is not set +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE_MMIO=y +CONFIG_VIA_VELOCITY=m +# CONFIG_NET_VENDOR_WIZNET is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_NET_SB1000=y +CONFIG_PHYLIB=y +CONFIG_SWPHY=y +CONFIG_LED_TRIGGER_PHY=y + +# +# MDIO bus device drivers +# +CONFIG_MDIO_BCM_UNIMAC=m +CONFIG_MDIO_BITBANG=m +# CONFIG_MDIO_BUS_MUX_GPIO is not set +# CONFIG_MDIO_BUS_MUX_MMIOREG is not set +# CONFIG_MDIO_GPIO is not set +# CONFIG_MDIO_HISI_FEMAC is not set +# CONFIG_MDIO_OCTEON is not set +# CONFIG_MDIO_SUN4I is not set +# CONFIG_MDIO_THUNDER is not set +CONFIG_MDIO_XGENE=y + +# +# MII PHY device drivers +# +CONFIG_AMD_PHY=m +# CONFIG_AQUANTIA_PHY is not set +CONFIG_AT803X_PHY=m +CONFIG_BCM7XXX_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_BCM_NET_PHYLIB=m +CONFIG_BROADCOM_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_DP83848_PHY=m +CONFIG_DP83867_PHY=m +CONFIG_FIXED_PHY=y +CONFIG_ICPLUS_PHY=m +# CONFIG_INTEL_XWAY_PHY is not set +CONFIG_LSI_ET1011C_PHY=m +CONFIG_LXT_PHY=m +CONFIG_MARVELL_PHY=m +CONFIG_MESON_GXL_PHY=m +CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_PHY=m +# CONFIG_MICROSEMI_PHY is not set +CONFIG_NATIONAL_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_STE10XP=m +# CONFIG_TERANETICS_PHY is not set +CONFIG_VITESSE_PHY=m +# CONFIG_XILINX_GMII2RGMII is not set +# CONFIG_MICREL_KS8995MA is not set +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set +CONFIG_USB_NET_DRIVERS=y +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=m +CONFIG_USB_LAN78XX=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_HUAWEI_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SR9700=m +CONFIG_USB_NET_SR9800=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET_ENABLE=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_USB_NET_CH9200=m +CONFIG_WLAN=y +CONFIG_WIRELESS_WDS=y +CONFIG_WLAN_VENDOR_ADMTEK=y +CONFIG_ADM8211=m +CONFIG_ATH_COMMON=m +CONFIG_WLAN_VENDOR_ATH=y +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +CONFIG_ATH5K_DEBUG=y +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_COMMON_DEBUG=y +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +CONFIG_ATH9K_AHB=y +CONFIG_ATH9K_DEBUGFS=y +# CONFIG_ATH9K_STATION_STATISTICS is not set +# CONFIG_ATH9K_DYNACK is not set +# CONFIG_ATH9K_WOW is not set +CONFIG_ATH9K_RFKILL=y +# CONFIG_ATH9K_CHANNEL_CONTEXT is not set +CONFIG_ATH9K_PCOEM=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +CONFIG_ATH9K_HWRNG=y +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +# CONFIG_CARL9170_DEBUGFS is not set +CONFIG_CARL9170_WPC=y +# CONFIG_CARL9170_HWRNG is not set +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +CONFIG_ATH6KL_DEBUG=y +# CONFIG_ATH6KL_TRACING is not set +CONFIG_AR5523=m +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y +# CONFIG_WIL6210_TRACING is not set +CONFIG_ATH10K=m +CONFIG_ATH10K_PCI=m +# CONFIG_ATH10K_AHB is not set +# CONFIG_ATH10K_DEBUG is not set +CONFIG_ATH10K_DEBUGFS=y +# CONFIG_ATH10K_TRACING is not set +CONFIG_WCN36XX=m +# CONFIG_WCN36XX_DEBUGFS is not set +CONFIG_WLAN_VENDOR_ATMEL=y +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_WLAN_VENDOR_BROADCOM=y +CONFIG_B43=m +CONFIG_B43_BCMA=y +CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_G=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +CONFIG_B43_DEBUG=y +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_PROTO_BCDC=y +CONFIG_BRCMFMAC_PROTO_MSGBUF=y +CONFIG_BRCMFMAC_SDIO=y +CONFIG_BRCMFMAC_USB=y +CONFIG_BRCMFMAC_PCIE=y +# CONFIG_BRCM_TRACING is not set +# CONFIG_BRCMDBG is not set +CONFIG_WLAN_VENDOR_CISCO=y +CONFIG_WLAN_VENDOR_INTEL=y +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +CONFIG_IWLEGACY_DEBUG=y +CONFIG_IWLEGACY_DEBUGFS=y +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y +# CONFIG_IWLWIFI_BCAST_FILTERING is not set +# CONFIG_IWLWIFI_PCIE_RTPM is not set + +# +# Debugging Options +# +CONFIG_IWLWIFI_DEBUG=y +CONFIG_IWLWIFI_DEBUGFS=y +# CONFIG_IWLWIFI_DEVICE_TRACING is not set +CONFIG_WLAN_VENDOR_INTERSIL=y +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HERMES=m +CONFIG_HERMES_PRISM=y +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_ORINOCO_USB=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +# CONFIG_P54_SPI is not set +CONFIG_P54_LEDS=y +CONFIG_PRISM54=m +CONFIG_WLAN_VENDOR_MARVELL=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_SPI is not set +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m +CONFIG_MWL8K=m +CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_MT7601U=m +CONFIG_WLAN_VENDOR_RALINK=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT3573=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2800_LIB_MMIO=m +CONFIG_RT2X00_LIB_MMIO=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +CONFIG_RT2X00_LIB_DEBUGFS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_WLAN_VENDOR_REALTEK=y +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_RTL_CARDS=m +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m +CONFIG_RTL8723BE=m +CONFIG_RTL8188EE=m +CONFIG_RTL8192EE=m +CONFIG_RTL8821AE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_PCI=m +CONFIG_RTLWIFI_USB=m +CONFIG_RTLWIFI_DEBUG=y +CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8723_COMMON=m +CONFIG_RTLBTCOEXIST=m +CONFIG_RTL8XXXU=m +# CONFIG_RTL8XXXU_UNTESTED is not set +CONFIG_WLAN_VENDOR_RSI=y +CONFIG_RSI_91X=m +CONFIG_RSI_DEBUGFS=y +CONFIG_RSI_SDIO=m +CONFIG_RSI_USB=m +CONFIG_WLAN_VENDOR_ST=y +CONFIG_CW1200=m +CONFIG_CW1200_WLAN_SDIO=m +# CONFIG_CW1200_WLAN_SPI is not set +CONFIG_WLAN_VENDOR_TI=y +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX=m +CONFIG_WL18XX=m +CONFIG_WLCORE=m +CONFIG_WLCORE_SPI=m +CONFIG_WLCORE_SDIO=m +CONFIG_WILINK_PLATFORM_DATA=y +CONFIG_WLAN_VENDOR_ZYDAS=y +CONFIG_USB_ZD1201=m +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_MAC80211_HWSIM=m +CONFIG_USB_NET_RNDIS_WLAN=m + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# +# CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKELB=m +# CONFIG_IEEE802154_AT86RF230 is not set +# CONFIG_IEEE802154_MRF24J40 is not set +# CONFIG_IEEE802154_CC2520 is not set +CONFIG_IEEE802154_ATUSB=m +# CONFIG_IEEE802154_ADF7242 is not set +# CONFIG_FUJITSU_ES is not set +# CONFIG_ISDN is not set +# CONFIG_NVM is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_LEDS=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_MATRIXKMAP=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADC is not set +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ADP5589 is not set +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_QT1070 is not set +# CONFIG_KEYBOARD_QT2160 is not set +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m +# CONFIG_KEYBOARD_TCA6416 is not set +# CONFIG_KEYBOARD_TCA8418 is not set +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_LM8333 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_MCS is not set +# CONFIG_KEYBOARD_MPR121 is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_TEGRA is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_SAMSUNG is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_SUN4I_LRADC is not set +# CONFIG_KEYBOARD_OMAP4 is not set +# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_KEYBOARD_CROS_EC=y +# CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_BCM is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_BYD=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_CYPRESS=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_PS2_FOCALTECH=y +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m +CONFIG_MOUSE_ELAN_I2C=m +CONFIG_MOUSE_ELAN_I2C_I2C=y +CONFIG_MOUSE_ELAN_I2C_SMBUS=y +CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_GPIO is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +# CONFIG_JOYSTICK_AS5011 is not set +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_PEGASUS=m +CONFIG_TABLET_SERIAL_WACOM4=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_PROPERTIES=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_AR1021_I2C is not set +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set +CONFIG_TOUCHSCREEN_AUO_PIXCIR=m +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set +# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set +CONFIG_TOUCHSCREEN_DYNAPRO=m +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_EGALAX=m +# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set +CONFIG_TOUCHSCREEN_FUJITSU=m +# CONFIG_TOUCHSCREEN_GOODIX is not set +CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_GUNZE=m +# CONFIG_TOUCHSCREEN_EKTF2127 is not set +CONFIG_TOUCHSCREEN_ELAN=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_WACOM_I2C=m +# CONFIG_TOUCHSCREEN_MAX11801 is not set +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set +CONFIG_TOUCHSCREEN_MTOUCH=m +# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_EDT_FT5X06=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_PIXCIR=m +# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set +# CONFIG_TOUCHSCREEN_WM97XX is not set +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m +# CONFIG_TOUCHSCREEN_TSC2004 is not set +# CONFIG_TOUCHSCREEN_TSC2005 is not set +CONFIG_TOUCHSCREEN_TSC2007=m +# CONFIG_TOUCHSCREEN_RM_TS is not set +# CONFIG_TOUCHSCREEN_SILEAD is not set +# CONFIG_TOUCHSCREEN_SIS_I2C is not set +CONFIG_TOUCHSCREEN_ST1232=m +# CONFIG_TOUCHSCREEN_SUN4I is not set +# CONFIG_TOUCHSCREEN_SUR40 is not set +# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set +# CONFIG_TOUCHSCREEN_SX8654 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set +# CONFIG_TOUCHSCREEN_ZET6223 is not set +CONFIG_TOUCHSCREEN_ZFORCE=m +# CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set +# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_ATMEL_CAPTOUCH is not set +# CONFIG_INPUT_BMA150 is not set +CONFIG_INPUT_E3X0_BUTTON=m +CONFIG_INPUT_PM8941_PWRKEY=y +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_GP2A=m +# CONFIG_INPUT_GPIO_BEEPER is not set +# CONFIG_INPUT_GPIO_TILT_POLLED is not set +# CONFIG_INPUT_GPIO_DECODER is not set +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +# CONFIG_INPUT_REGULATOR_HAPTIC is not set +CONFIG_INPUT_UINPUT=m +# CONFIG_INPUT_PCF8574 is not set +CONFIG_INPUT_PWM_BEEPER=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +# CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_IMS_PCU is not set +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m +CONFIG_INPUT_SOC_BUTTON_ARRAY=m +# CONFIG_INPUT_DRV260X_HAPTICS is not set +# CONFIG_INPUT_DRV2665_HAPTICS is not set +# CONFIG_INPUT_DRV2667_HAPTICS is not set +CONFIG_INPUT_HISI_POWERKEY=y +CONFIG_RMI4_CORE=m +# CONFIG_RMI4_I2C is not set +# CONFIG_RMI4_SPI is not set +# CONFIG_RMI4_SMB is not set +CONFIG_RMI4_F03=y +CONFIG_RMI4_F03_SERIO=m +CONFIG_RMI4_2D_SENSOR=y +CONFIG_RMI4_F11=y +CONFIG_RMI4_F12=y +CONFIG_RMI4_F30=y +# CONFIG_RMI4_F34 is not set +# CONFIG_RMI4_F54 is not set +# CONFIG_RMI4_F55 is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_AMBAKMI=y +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +# CONFIG_SERIO_PS2MULT is not set +CONFIG_SERIO_ARC_PS2=m +# CONFIG_SERIO_APBPS2 is not set +# CONFIG_SERIO_SUN4I_PS2 is not set +# CONFIG_USERIO is not set +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_NOZOMI=m +# CONFIG_ISI is not set +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +# CONFIG_TRACE_SINK is not set +CONFIG_DEVMEM=y +# CONFIG_DEVKMEM is not set + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +CONFIG_SERIAL_8250_PNP=y +# CONFIG_SERIAL_8250_FINTEK is not set +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_EXAR=y +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_8250_BCM2835AUX=y +CONFIG_SERIAL_8250_FSL=y +CONFIG_SERIAL_8250_DW=y +# CONFIG_SERIAL_8250_RT288X is not set +# CONFIG_SERIAL_8250_MT6577 is not set +# CONFIG_SERIAL_8250_MOXA is not set +CONFIG_SERIAL_OF_PLATFORM=y + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_AMBA_PL010 is not set +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y +# CONFIG_SERIAL_KGDB_NMI is not set +CONFIG_SERIAL_MESON=y +CONFIG_SERIAL_MESON_CONSOLE=y +CONFIG_SERIAL_TEGRA=y +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_CONSOLE_POLL=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_MSM=y +CONFIG_SERIAL_MSM_CONSOLE=y +# CONFIG_SERIAL_SCCNXP is not set +# CONFIG_SERIAL_SC16IS7XX is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +# CONFIG_SERIAL_IFX6X60 is not set +# CONFIG_SERIAL_XILINX_PS_UART is not set +CONFIG_SERIAL_ARC=m +CONFIG_SERIAL_ARC_NR_PORTS=1 +# CONFIG_SERIAL_RP2 is not set +# CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set +CONFIG_SERIAL_MVEBU_UART=y +CONFIG_SERIAL_MVEBU_CONSOLE=y +# CONFIG_SERIAL_DEV_BUS is not set +# CONFIG_TTY_PRINTK is not set +CONFIG_HVC_DRIVER=y +# CONFIG_HVC_DCC is not set +CONFIG_VIRTIO_CONSOLE=y +CONFIG_IPMI_HANDLER=y +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_SSIF=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_BCM2835=y +CONFIG_HW_RANDOM_OMAP=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m +CONFIG_HW_RANDOM_HISI=y +CONFIG_HW_RANDOM_MSM=y +CONFIG_HW_RANDOM_XGENE=m +CONFIG_HW_RANDOM_MESON=y +CONFIG_HW_RANDOM_CAVIUM=y +CONFIG_R3964=m +# CONFIG_APPLICOM is not set + +# +# PCMCIA character devices +# +CONFIG_RAW_DRIVER=y +CONFIG_MAX_RAW_DEVS=8192 +# CONFIG_HPET is not set +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS_CORE=m +CONFIG_TCG_TIS=m +# CONFIG_TCG_TIS_SPI is not set +# CONFIG_TCG_TIS_I2C_ATMEL is not set +# CONFIG_TCG_TIS_I2C_INFINEON is not set +# CONFIG_TCG_TIS_I2C_NUVOTON is not set +CONFIG_TCG_ATMEL=m +# CONFIG_TCG_INFINEON is not set +# CONFIG_TCG_VTPM_PROXY is not set +# CONFIG_TCG_TIS_ST33ZP24_I2C is not set +# CONFIG_TCG_TIS_ST33ZP24_SPI is not set +CONFIG_DEVPORT=y +# CONFIG_XILLYBUS is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_ACPI_I2C_OPREGION=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +CONFIG_I2C_ARB_GPIO_CHALLENGE=m +CONFIG_I2C_MUX_GPIO=m +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m +CONFIG_I2C_MUX_PINCTRL=m +CONFIG_I2C_MUX_REG=m +CONFIG_I2C_DEMUX_PINCTRL=m +CONFIG_I2C_MUX_MLXCPLD=m +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_HIX5HD2 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_ISCH is not set +# CONFIG_I2C_PIIX4 is not set +CONFIG_I2C_NFORCE2=m +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=y + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_BCM2835=m +# CONFIG_I2C_CADENCE is not set +# CONFIG_I2C_CBUS_GPIO is not set +CONFIG_I2C_DESIGNWARE_CORE=y +CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_I2C_DESIGNWARE_PCI=m +# CONFIG_I2C_EMEV2 is not set +CONFIG_I2C_GPIO=m +CONFIG_I2C_MESON=y +CONFIG_I2C_MT65XX=y +CONFIG_I2C_MV64XXX=y +# CONFIG_I2C_NOMADIK is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_PCA_PLATFORM=m +CONFIG_I2C_PXA=m +# CONFIG_I2C_PXA_PCI is not set +# CONFIG_I2C_PXA_SLAVE is not set +CONFIG_I2C_QUP=y +# CONFIG_I2C_RK3X is not set +CONFIG_I2C_SIMTEC=m +# CONFIG_I2C_TEGRA is not set +# CONFIG_I2C_TEGRA_BPMP is not set +CONFIG_I2C_VERSATILE=m +# CONFIG_I2C_THUNDERX is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +CONFIG_I2C_PARPORT_LIGHT=m +# CONFIG_I2C_ROBOTFUZZ_OSIF is not set +# CONFIG_I2C_TAOS_EVM is not set +CONFIG_I2C_TINY_USB=m +CONFIG_I2C_VIPERBOARD=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_CROS_EC_TUNNEL=y +CONFIG_I2C_XGENE_SLIMPRO=m +CONFIG_I2C_STUB=m +CONFIG_I2C_SLAVE=y +CONFIG_I2C_SLAVE_EEPROM=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +CONFIG_SPI_ARMADA_3700=m +# CONFIG_SPI_AXI_SPI_ENGINE is not set +CONFIG_SPI_BCM2835=m +CONFIG_SPI_BCM2835AUX=m +CONFIG_SPI_BITBANG=y +# CONFIG_SPI_CADENCE is not set +# CONFIG_SPI_DESIGNWARE is not set +CONFIG_SPI_GPIO=y +# CONFIG_SPI_FSL_SPI is not set +CONFIG_SPI_MESON_SPIFC=y +CONFIG_SPI_MT65XX=y +# CONFIG_SPI_OC_TINY is not set +CONFIG_SPI_ORION=y +CONFIG_SPI_PL022=y +# CONFIG_SPI_PXA2XX is not set +# CONFIG_SPI_PXA2XX_PCI is not set +# CONFIG_SPI_ROCKCHIP is not set +CONFIG_SPI_QUP=y +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_SUN4I is not set +# CONFIG_SPI_SUN6I is not set +# CONFIG_SPI_TEGRA114 is not set +# CONFIG_SPI_TEGRA20_SFLASH is not set +# CONFIG_SPI_TEGRA20_SLINK is not set +# CONFIG_SPI_THUNDERX is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_ZYNQMP_GQSPI is not set + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=m +# CONFIG_SPI_LOOPBACK_TEST is not set +# CONFIG_SPI_TLE62X0 is not set +CONFIG_SPMI=y +CONFIG_SPMI_MSM_PMIC_ARB=y +# CONFIG_HSI is not set + +# +# PPS support +# +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_GPIO=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m +CONFIG_DP83640_PHY=m +CONFIG_PINCTRL=y + +# +# Pin controllers +# +CONFIG_GENERIC_PINCTRL_GROUPS=y +CONFIG_PINMUX=y +CONFIG_GENERIC_PINMUX_FUNCTIONS=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y +# CONFIG_DEBUG_PINCTRL is not set +CONFIG_PINCTRL_AMD=y +CONFIG_PINCTRL_MESON=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_PINCTRL_SX150X=y +CONFIG_PINCTRL_BCM2835=y +# CONFIG_PINCTRL_BAYTRAIL is not set +# CONFIG_PINCTRL_CHERRYVIEW is not set +# CONFIG_PINCTRL_BROXTON is not set +# CONFIG_PINCTRL_GEMINILAKE is not set +# CONFIG_PINCTRL_SUNRISEPOINT is not set +CONFIG_PINCTRL_MSM=y +CONFIG_PINCTRL_APQ8064=y +# CONFIG_PINCTRL_APQ8084 is not set +# CONFIG_PINCTRL_IPQ4019 is not set +# CONFIG_PINCTRL_IPQ8064 is not set +# CONFIG_PINCTRL_MSM8660 is not set +# CONFIG_PINCTRL_MSM8960 is not set +# CONFIG_PINCTRL_MDM9615 is not set +# CONFIG_PINCTRL_MSM8X74 is not set +CONFIG_PINCTRL_MSM8916=y +CONFIG_PINCTRL_MSM8994=m +CONFIG_PINCTRL_MSM8996=y +# CONFIG_PINCTRL_QDF2XXX is not set +CONFIG_PINCTRL_QCOM_SPMI_PMIC=y +CONFIG_PINCTRL_QCOM_SSBI_PMIC=y +CONFIG_PINCTRL_SUNXI=y +# CONFIG_PINCTRL_SUN4I_A10 is not set +# CONFIG_PINCTRL_SUN5I is not set +# CONFIG_PINCTRL_SUN6I_A31 is not set +# CONFIG_PINCTRL_SUN6I_A31_R is not set +# CONFIG_PINCTRL_SUN7I_A20 is not set +# CONFIG_PINCTRL_SUN8I_A23 is not set +# CONFIG_PINCTRL_SUN8I_A33 is not set +# CONFIG_PINCTRL_SUN8I_A83T is not set +# CONFIG_PINCTRL_SUN8I_A23_R is not set +# CONFIG_PINCTRL_SUN8I_H3 is not set +# CONFIG_PINCTRL_SUN8I_H3_R is not set +# CONFIG_PINCTRL_SUN8I_V3S is not set +# CONFIG_PINCTRL_SUN9I_A80 is not set +# CONFIG_PINCTRL_SUN9I_A80_R is not set +CONFIG_PINCTRL_SUN50I_A64=y +CONFIG_PINCTRL_TEGRA=y +CONFIG_PINCTRL_TEGRA124=y +CONFIG_PINCTRL_TEGRA210=y +CONFIG_PINCTRL_TEGRA_XUSB=y +CONFIG_PINCTRL_MTK=y +CONFIG_PINCTRL_MT8173=y +CONFIG_GPIOLIB=y +CONFIG_OF_GPIO=y +CONFIG_GPIO_ACPI=y +CONFIG_GPIOLIB_IRQCHIP=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GENERIC=y + +# +# Memory mapped GPIO drivers +# +# CONFIG_GPIO_74XX_MMIO is not set +# CONFIG_GPIO_ALTERA is not set +# CONFIG_GPIO_AMDPT is not set +CONFIG_GPIO_DWAPB=y +# CONFIG_GPIO_EXAR is not set +CONFIG_GPIO_GENERIC_PLATFORM=y +# CONFIG_GPIO_GRGPIO is not set +# CONFIG_GPIO_MOCKUP is not set +CONFIG_GPIO_PL061=y +# CONFIG_GPIO_SYSCON is not set +CONFIG_GPIO_TEGRA=y +CONFIG_GPIO_XGENE=y +CONFIG_GPIO_XGENE_SB=m +# CONFIG_GPIO_XILINX is not set + +# +# I2C GPIO expanders +# +# CONFIG_GPIO_ADP5588 is not set +# CONFIG_GPIO_ADNP is not set +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCA953X_IRQ=y +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_SX150X is not set +# CONFIG_GPIO_TPIC2810 is not set + +# +# MFD GPIO expanders +# + +# +# PCI GPIO expanders +# +# CONFIG_GPIO_PCI_IDIO_16 is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI GPIO expanders +# +# CONFIG_GPIO_74X164 is not set +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_PISOSR is not set + +# +# SPI or I2C GPIO expanders +# +# CONFIG_GPIO_MCP23S08 is not set + +# +# USB GPIO expanders +# +CONFIG_GPIO_VIPERBOARD=m +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_MATROX is not set +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m +CONFIG_W1_MASTER_DS1WM=m +# CONFIG_W1_MASTER_GPIO is not set + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +# CONFIG_W1_SLAVE_DS2405 is not set +CONFIG_W1_SLAVE_DS2408=m +# CONFIG_W1_SLAVE_DS2408_READBACK is not set +CONFIG_W1_SLAVE_DS2413=m +CONFIG_W1_SLAVE_DS2406=m +CONFIG_W1_SLAVE_DS2423=m +CONFIG_W1_SLAVE_DS2431=m +CONFIG_W1_SLAVE_DS2433=m +CONFIG_W1_SLAVE_DS2433_CRC=y +CONFIG_W1_SLAVE_DS2760=m +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_DS2781=m +CONFIG_W1_SLAVE_DS28E04=m +CONFIG_W1_SLAVE_BQ27000=m +# CONFIG_POWER_AVS is not set +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_RESET_GPIO_RESTART=y +CONFIG_POWER_RESET_HISI=y +CONFIG_POWER_RESET_MSM=y +# CONFIG_POWER_RESET_LTC2952 is not set +CONFIG_POWER_RESET_RESTART=y +CONFIG_POWER_RESET_VEXPRESS=y +CONFIG_POWER_RESET_XGENE=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y +CONFIG_REBOOT_MODE=y +CONFIG_SYSCON_REBOOT_MODE=y +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_GENERIC_ADC_BATTERY is not set +# CONFIG_TEST_POWER is not set +# CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_SBS is not set +# CONFIG_CHARGER_SBS is not set +# CONFIG_BATTERY_BQ27XXX is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_GPIO is not set +# CONFIG_CHARGER_MANAGER is not set +# CONFIG_CHARGER_DETECTOR_MAX14656 is not set +CONFIG_CHARGER_QCOM_SMBB=m +# CONFIG_CHARGER_BQ2415X is not set +# CONFIG_CHARGER_BQ24190 is not set +# CONFIG_CHARGER_BQ24257 is not set +# CONFIG_CHARGER_BQ24735 is not set +# CONFIG_CHARGER_BQ25890 is not set +CONFIG_CHARGER_SMB347=m +# CONFIG_BATTERY_GAUGE_LTC2941 is not set +# CONFIG_CHARGER_RT9455 is not set +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +# CONFIG_SENSORS_AD7314 is not set +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7X10=m +# CONFIG_SENSORS_ADT7310 is not set +CONFIG_SENSORS_ADT7410=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_ARM_SCPI=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +# CONFIG_SENSORS_I5K_AMB is not set +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +# CONFIG_SENSORS_FTSTEUTATES is not set +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_G762=m +# CONFIG_SENSORS_GPIO_FAN is not set +# CONFIG_SENSORS_HIH6130 is not set +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IIO_HWMON=m +CONFIG_SENSORS_IT87=m +# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_POWR1220=m +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LTC2945=m +# CONFIG_SENSORS_LTC2990 is not set +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4222=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4260=m +CONFIG_SENSORS_LTC4261=m +# CONFIG_SENSORS_MAX1111 is not set +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m +# CONFIG_SENSORS_MAX31722 is not set +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m +# CONFIG_SENSORS_MAX31790 is not set +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_TC654=m +# CONFIG_SENSORS_ADCXX is not set +CONFIG_SENSORS_LM63=m +# CONFIG_SENSORS_LM70 is not set +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LM95234=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6683=m +CONFIG_SENSORS_NCT6775=m +CONFIG_SENSORS_NCT7802=m +CONFIG_SENSORS_NCT7904=m +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m +# CONFIG_SENSORS_LTC2978_REGULATOR is not set +# CONFIG_SENSORS_LTC3815 is not set +CONFIG_SENSORS_MAX16064=m +# CONFIG_SENSORS_MAX20751 is not set +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_TPS40422=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_PWM_FAN=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SHT3x=m +CONFIG_SENSORS_SHTC1=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +# CONFIG_SENSORS_EMC2103 is not set +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m +# CONFIG_SENSORS_STTS751 is not set +# CONFIG_SENSORS_SMM665 is not set +CONFIG_SENSORS_ADC128D818=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +# CONFIG_SENSORS_ADS7871 is not set +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m +CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_INA3221=m +CONFIG_SENSORS_TC74=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP103=m +CONFIG_SENSORS_TMP108=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VEXPRESS=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +# CONFIG_SENSORS_XGENE is not set + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_OF=y +CONFIG_THERMAL_WRITABLE_TRIPS=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_GOV_BANG_BANG=y +CONFIG_THERMAL_GOV_USER_SPACE=y +CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y +CONFIG_CPU_THERMAL=y +# CONFIG_CLOCK_THERMAL is not set +# CONFIG_DEVFREQ_THERMAL is not set +CONFIG_THERMAL_EMULATION=y +CONFIG_HISI_THERMAL=y +# CONFIG_QORIQ_THERMAL is not set +# CONFIG_ARMADA_THERMAL is not set + +# +# ACPI INT340X thermal drivers +# +CONFIG_MTK_THERMAL=m + +# +# NVIDIA Tegra thermal drivers +# +# CONFIG_TEGRA_SOCTHERM is not set +CONFIG_QCOM_SPMI_TEMP_ALARM=y +# CONFIG_GENERIC_ADC_THERMAL is not set + +# +# Qualcomm thermal drivers +# +# CONFIG_QCOM_TSENS is not set +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +# CONFIG_WATCHDOG_SYSFS is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_GPIO_WATCHDOG=m +# CONFIG_WDAT_WDT is not set +# CONFIG_XILINX_WATCHDOG is not set +# CONFIG_ZIIRAVE_WATCHDOG is not set +CONFIG_ARM_SP805_WATCHDOG=m +CONFIG_ARM_SBSA_WATCHDOG=m +# CONFIG_CADENCE_WATCHDOG is not set +CONFIG_DW_WATCHDOG=m +CONFIG_SUNXI_WATCHDOG=m +# CONFIG_MAX63XX_WATCHDOG is not set +# CONFIG_TEGRA_WATCHDOG is not set +CONFIG_QCOM_WDT=m +CONFIG_MESON_GXBB_WATCHDOG=m +CONFIG_MESON_WATCHDOG=m +CONFIG_MEDIATEK_WATCHDOG=m +CONFIG_ALIM7101_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_BCM2835_WDT=m +# CONFIG_MEN_A21_WDT is not set + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m + +# +# Watchdog Pretimeout Governors +# +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_SSB_DRIVER_GPIO=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +# CONFIG_BCMA_HOST_SOC is not set +CONFIG_BCMA_DRIVER_PCI=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +# CONFIG_MFD_ACT8945A is not set +CONFIG_MFD_SUN4I_GPADC=m +# CONFIG_MFD_AS3711 is not set +# CONFIG_MFD_AS3722 is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_AAT2870_CORE is not set +# CONFIG_MFD_ATMEL_FLEXCOM is not set +# CONFIG_MFD_ATMEL_HLCDC is not set +# CONFIG_MFD_BCM590XX is not set +# CONFIG_MFD_AC100 is not set +# CONFIG_MFD_AXP20X_I2C is not set +# CONFIG_MFD_AXP20X_RSB is not set +CONFIG_MFD_CROS_EC=y +CONFIG_MFD_CROS_EC_I2C=y +CONFIG_MFD_CROS_EC_SPI=y +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_DA9052_SPI is not set +# CONFIG_MFD_DA9052_I2C is not set +# CONFIG_MFD_DA9055 is not set +# CONFIG_MFD_DA9062 is not set +# CONFIG_MFD_DA9063 is not set +# CONFIG_MFD_DA9150 is not set +# CONFIG_MFD_DLN2 is not set +# CONFIG_MFD_MC13XXX_SPI is not set +# CONFIG_MFD_MC13XXX_I2C is not set +# CONFIG_MFD_HI6421_PMIC is not set +CONFIG_MFD_HI655X_PMIC=y +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +# CONFIG_LPC_ICH is not set +# CONFIG_LPC_SCH is not set +# CONFIG_INTEL_SOC_PMIC is not set +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_88PM800 is not set +# CONFIG_MFD_88PM805 is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_MAX14577 is not set +# CONFIG_MFD_MAX77620 is not set +# CONFIG_MFD_MAX77686 is not set +# CONFIG_MFD_MAX77693 is not set +# CONFIG_MFD_MAX77843 is not set +# CONFIG_MFD_MAX8907 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_MAX8998 is not set +# CONFIG_MFD_MT6397 is not set +# CONFIG_MFD_MENF21BMC is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_MFD_CPCAP is not set +CONFIG_MFD_VIPERBOARD=m +# CONFIG_MFD_RETU is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_UCB1400_CORE is not set +CONFIG_MFD_QCOM_RPM=y +CONFIG_MFD_SPMI_PMIC=y +# CONFIG_MFD_RDC321X is not set +CONFIG_MFD_RTSX_PCI=m +# CONFIG_MFD_RT5033 is not set +CONFIG_MFD_RTSX_USB=m +# CONFIG_MFD_RC5T583 is not set +# CONFIG_MFD_RK808 is not set +# CONFIG_MFD_RN5T618 is not set +CONFIG_MFD_SEC_CORE=y +# CONFIG_MFD_SI476X_CORE is not set +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +# CONFIG_MFD_SKY81452 is not set +# CONFIG_MFD_SMSC is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_SUN6I_PRCM is not set +CONFIG_MFD_SYSCON=y +# CONFIG_MFD_TI_AM335X_TSCADC is not set +# CONFIG_MFD_LP3943 is not set +# CONFIG_MFD_LP8788 is not set +# CONFIG_MFD_PALMAS is not set +# CONFIG_TPS6105X is not set +# CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65086 is not set +# CONFIG_MFD_TPS65090 is not set +# CONFIG_MFD_TPS65217 is not set +# CONFIG_MFD_TI_LP873X is not set +# CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS65910 is not set +# CONFIG_MFD_TPS65912_I2C is not set +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_TPS80031 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_TWL6040_CORE is not set +CONFIG_MFD_WL1273_CORE=m +# CONFIG_MFD_LM3533 is not set +# CONFIG_MFD_TC3589X is not set +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_VX855=m +# CONFIG_MFD_ARIZONA_I2C is not set +# CONFIG_MFD_ARIZONA_SPI is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +CONFIG_MFD_VEXPRESS_SYSREG=y +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=y +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_ACT8865 is not set +# CONFIG_REGULATOR_AD5398 is not set +# CONFIG_REGULATOR_ANATOP is not set +# CONFIG_REGULATOR_DA9210 is not set +# CONFIG_REGULATOR_DA9211 is not set +# CONFIG_REGULATOR_FAN53555 is not set +CONFIG_REGULATOR_GPIO=y +CONFIG_REGULATOR_HI655X=y +# CONFIG_REGULATOR_ISL9305 is not set +# CONFIG_REGULATOR_ISL6271A is not set +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_LP3972 is not set +# CONFIG_REGULATOR_LP872X is not set +# CONFIG_REGULATOR_LP8755 is not set +# CONFIG_REGULATOR_LTC3589 is not set +# CONFIG_REGULATOR_LTC3676 is not set +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_MAX8952 is not set +# CONFIG_REGULATOR_MAX8973 is not set +# CONFIG_REGULATOR_MT6311 is not set +# CONFIG_REGULATOR_PFUZE100 is not set +# CONFIG_REGULATOR_PV88060 is not set +# CONFIG_REGULATOR_PV88080 is not set +# CONFIG_REGULATOR_PV88090 is not set +CONFIG_REGULATOR_PWM=y +CONFIG_REGULATOR_QCOM_RPM=y +CONFIG_REGULATOR_QCOM_SMD_RPM=y +CONFIG_REGULATOR_QCOM_SPMI=y +# CONFIG_REGULATOR_S2MPA01 is not set +CONFIG_REGULATOR_S2MPS11=y +# CONFIG_REGULATOR_S5M8767 is not set +# CONFIG_REGULATOR_TPS51632 is not set +# CONFIG_REGULATOR_TPS62360 is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +# CONFIG_REGULATOR_TPS6524X is not set +CONFIG_REGULATOR_VEXPRESS=y +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_SDR_SUPPORT=y +CONFIG_MEDIA_RC_SUPPORT=y +CONFIG_MEDIA_CEC_SUPPORT=y +CONFIG_MEDIA_CEC_DEBUG=y +CONFIG_MEDIA_CEC_EDID=y +CONFIG_MEDIA_CONTROLLER=y +# CONFIG_MEDIA_CONTROLLER_DVB is not set +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_PCI_SKELETON is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +# CONFIG_V4L2_FLASH_LED_CLASS is not set +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m +CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_MAX_ADAPTERS=8 +CONFIG_DVB_DYNAMIC_MINORS=y +# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set + +# +# Media drivers +# +CONFIG_RC_CORE=m +CONFIG_RC_MAP=m +CONFIG_RC_DECODERS=y +CONFIG_LIRC=m +CONFIG_IR_LIRC_CODEC=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_XMP_DECODER=m +CONFIG_RC_DEVICES=y +CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_ENE=m +CONFIG_IR_HIX5HD2=m +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_MESON=m +# CONFIG_IR_MTK is not set +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +# CONFIG_IR_SPI is not set +CONFIG_IR_STREAMZAP=m +CONFIG_IR_IGORPLUGUSB=m +CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_GPIO_CIR=m +# CONFIG_IR_SUNXI is not set +CONFIG_IR_SERIAL=m +CONFIG_IR_SERIAL_TRANSMITTER=y +CONFIG_MEDIA_USB_SUPPORT=y + +# +# Webcam devices +# +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_DTCS033=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STK1135=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TOUPTEK=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_VIDEO_USBTV=m + +# +# Analog TV USB devices +# +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160_COMMON=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m + +# +# Analog/digital TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y +CONFIG_VIDEO_AU0828_RC=y +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_DIB3000MC=m +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_USB_DVBSKY=m +# CONFIG_DVB_USB_ZD1301 is not set +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set +CONFIG_DVB_AS102=m + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_V4L2=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m + +# +# Software defined radio USB devices +# +CONFIG_USB_AIRSPY=m +CONFIG_USB_HACKRF=m +# CONFIG_USB_MSI2500 is not set + +# +# USB HDMI CEC adapters +# +CONFIG_USB_PULSE8_CEC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_SOLO6X10=m +# CONFIG_VIDEO_TW5864 is not set +CONFIG_VIDEO_TW68=m +# CONFIG_VIDEO_TW686X is not set + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DT3155=m + +# +# Media capture/analog/hybrid TV support +# +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_ENABLE_VP3054=y +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7134_GO7007=m +CONFIG_VIDEO_SAA7164=m + +# +# Media digital TV PCI Adapters +# +CONFIG_DVB_AV7110_IR=y +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_DVB_PT3=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m +CONFIG_DVB_SMIPCIE=m +# CONFIG_DVB_NETUP_UNIDVB is not set +# CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEDIATEK_VPU=m +CONFIG_VIDEO_MEDIATEK_MDP=m +# CONFIG_VIDEO_MEDIATEK_VCODEC is not set +# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set +# CONFIG_VIDEO_SH_VEU is not set +# CONFIG_V4L_TEST_DRIVERS is not set +# CONFIG_DVB_PLATFORM_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_TEA575X=m +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_SI4713=m +CONFIG_PLATFORM_SI4713=m +CONFIG_I2C_SI4713=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_USB_KEENE=m +CONFIG_USB_RAREMONO=m +CONFIG_USB_MA901=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_CYPRESS_FIRMWARE=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set + +# +# Media ancillary drivers (tuners, sensors, i2c, spi, frontends) +# +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y +CONFIG_VIDEO_IR_I2C=m + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS3308=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_OV7640=m +CONFIG_VIDEO_MT9V011=m + +# +# Flash devices +# + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m + +# +# Miscellaneous helper chips +# +CONFIG_VIDEO_M52790=m + +# +# Sensors used on soc_camera driver +# +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_R820T=m +CONFIG_MEDIA_TUNER_MXL301RF=m +CONFIG_MEDIA_TUNER_QM1D1C0042=m + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m +CONFIG_DVB_M88DS3103=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_SI2165=m +CONFIG_DVB_MN88472=m +CONFIG_DVB_MN88473=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_CX24117=m +CONFIG_DVB_CX24120=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m +CONFIG_DVB_RTL2832_SDR=m +CONFIG_DVB_SI2168=m +CONFIG_DVB_AS102_FE=m +CONFIG_DVB_GP8PSK_FE=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_LGDT3306A=m +CONFIG_DVB_LG2160=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# ISDB-S (satellite) & ISDB-T (terrestrial) frontends +# +CONFIG_DVB_TC90522=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_DRX39XYJ=m +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_SP2=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_TEGRA_HOST1X=m +CONFIG_TEGRA_HOST1X_FIREWALL=y +CONFIG_DRM=m +CONFIG_DRM_MIPI_DSI=y +# CONFIG_DRM_DP_AUX_CHARDEV is not set +# CONFIG_DRM_DEBUG_MM_SELFTEST is not set +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_KMS_FB_HELPER=y +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +CONFIG_DRM_TTM=m +CONFIG_DRM_GEM_CMA_HELPER=y +CONFIG_DRM_KMS_CMA_HELPER=y +CONFIG_DRM_VM=y + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_ARM=y +CONFIG_DRM_HDLCD=m +# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set +CONFIG_DRM_MALI_DISPLAY=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_USERPTR=y +CONFIG_DRM_AMDGPU=m +# CONFIG_DRM_AMDGPU_SI is not set +# CONFIG_DRM_AMDGPU_CIK is not set +CONFIG_DRM_AMDGPU_USERPTR=y +# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set + +# +# ACP (Audio CoProcessor) Configuration +# +# CONFIG_DRM_AMD_ACP is not set +CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_PLATFORM_DRIVER=y +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_VGEM=m +CONFIG_DRM_UDL=m +CONFIG_DRM_AST=m +CONFIG_DRM_MGAG200=m +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_QXL=m +CONFIG_DRM_BOCHS=m +CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DRM_MSM=m +# CONFIG_DRM_MSM_REGISTER_LOGGING is not set +CONFIG_DRM_MSM_HDMI_HDCP=y +CONFIG_DRM_MSM_DSI=y +CONFIG_DRM_MSM_DSI_PLL=y +CONFIG_DRM_MSM_DSI_28NM_PHY=y +CONFIG_DRM_MSM_DSI_20NM_PHY=y +CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y +CONFIG_DRM_MSM_DSI_14NM_PHY=y +CONFIG_DRM_TEGRA=m +# CONFIG_DRM_TEGRA_DEBUG is not set +CONFIG_DRM_TEGRA_STAGING=y +CONFIG_DRM_PANEL=y + +# +# Display Panels +# +CONFIG_DRM_PANEL_SIMPLE=m +# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set +# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set +# CONFIG_DRM_PANEL_LG_LG4573 is not set +# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set +# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set +# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set +CONFIG_DRM_BRIDGE=y + +# +# Display Interface Bridges +# +CONFIG_DRM_ANALOGIX_ANX78XX=m +# CONFIG_DRM_DUMB_VGA_DAC is not set +CONFIG_DRM_NXP_PTN3460=m +CONFIG_DRM_PARADE_PS8622=m +CONFIG_DRM_SIL_SII8620=m +# CONFIG_DRM_SII902X is not set +# CONFIG_DRM_TOSHIBA_TC358767 is not set +CONFIG_DRM_TI_TFP410=m +CONFIG_DRM_I2C_ADV7511=m +CONFIG_DRM_I2C_ADV7511_AUDIO=y +CONFIG_DRM_I2C_ADV7533=y +CONFIG_DRM_VC4=m +# CONFIG_DRM_ARCPGU is not set +CONFIG_DRM_HISI_HIBMC=m +CONFIG_DRM_HISI_KIRIN=m +CONFIG_HISI_KIRIN_DW_DSI=m +CONFIG_DRM_MEDIATEK=m +CONFIG_DRM_MEDIATEK_HDMI=m +CONFIG_DRM_MXS=y +CONFIG_DRM_MXSFB=m +CONFIG_DRM_MESON=m +# CONFIG_DRM_TINYDRM is not set +# CONFIG_DRM_LEGACY is not set +# CONFIG_DRM_LIB_RANDOM is not set + +# +# Frame buffer Devices +# +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_CMDLINE=y +CONFIG_FB_NOTIFY=y +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +CONFIG_FB_ARMCLCD=y +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_UVESA is not set +# CONFIG_FB_EFI is not set +# CONFIG_FB_OPENCORES is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_SM501 is not set +# CONFIG_FB_SMSCUFX is not set +CONFIG_FB_UDL=m +# CONFIG_FB_IBM_GXT4500 is not set +CONFIG_FB_VIRTUAL=m +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_AUO_K190X is not set +CONFIG_FB_SIMPLE=y +CONFIG_FB_SSD1307=m +# CONFIG_FB_SM712 is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI922X is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set +CONFIG_LCD_PLATFORM=m +# CONFIG_LCD_S6E63M0 is not set +# CONFIG_LCD_LD9040 is not set +# CONFIG_LCD_AMS369FG06 is not set +# CONFIG_LCD_LMS501KF03 is not set +# CONFIG_LCD_HX8357 is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=m +CONFIG_BACKLIGHT_PWM=m +# CONFIG_BACKLIGHT_PM8941_WLED is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +# CONFIG_BACKLIGHT_LM3630A is not set +# CONFIG_BACKLIGHT_LM3639 is not set +CONFIG_BACKLIGHT_LP855X=m +CONFIG_BACKLIGHT_GPIO=m +# CONFIG_BACKLIGHT_LV5207LP is not set +# CONFIG_BACKLIGHT_BD6107 is not set +# CONFIG_VGASTATE is not set +CONFIG_VIDEOMODE_HELPERS=y +CONFIG_HDMI=y + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +CONFIG_DUMMY_CONSOLE_COLUMNS=80 +CONFIG_DUMMY_CONSOLE_ROWS=25 +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_PCM_ELD=y +CONFIG_SND_PCM_IEC958=y +CONFIG_SND_DMAENGINE_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_PCM_TIMER=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_MAX_CARDS=32 +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_PROC_FS=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +# CONFIG_SND_AW2 is not set +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m + +# +# HD-Audio +# +CONFIG_SND_HDA=m +CONFIG_SND_HDA_INTEL=m +# CONFIG_SND_HDA_TEGRA is not set +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=0 +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=m +CONFIG_SND_HDA_CODEC_ANALOG=m +CONFIG_SND_HDA_CODEC_SIGMATEL=m +CONFIG_SND_HDA_CODEC_VIA=m +CONFIG_SND_HDA_CODEC_HDMI=m +CONFIG_SND_HDA_CODEC_CIRRUS=m +CONFIG_SND_HDA_CODEC_CONEXANT=m +CONFIG_SND_HDA_CODEC_CA0110=m +CONFIG_SND_HDA_CODEC_CA0132=m +CONFIG_SND_HDA_CODEC_CA0132_DSP=y +CONFIG_SND_HDA_CODEC_CMEDIA=m +CONFIG_SND_HDA_CODEC_SI3054=m +CONFIG_SND_HDA_GENERIC=m +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_CORE=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_PREALLOC_SIZE=4096 +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_USB_HIFACE=m +# CONFIG_SND_BCD2000 is not set +CONFIG_SND_USB_LINE6=m +CONFIG_SND_USB_POD=m +CONFIG_SND_USB_PODHD=m +CONFIG_SND_USB_TONEPORT=m +CONFIG_SND_USB_VARIAX=m +CONFIG_SND_SOC=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +CONFIG_SND_SOC_AMD_ACP=m +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_BCM2835_SOC_I2S=m +# CONFIG_SND_DESIGNWARE_I2S is not set + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +# CONFIG_SND_KIRKWOOD_SOC is not set +# CONFIG_SND_SOC_IMG is not set +CONFIG_SND_SOC_MEDIATEK=m +# CONFIG_SND_SOC_MT2701 is not set +CONFIG_SND_SOC_MT8173=m +CONFIG_SND_SOC_MT8173_MAX98090=m +CONFIG_SND_SOC_MT8173_RT5650=m +CONFIG_SND_SOC_MT8173_RT5650_RT5514=m +CONFIG_SND_SOC_MT8173_RT5650_RT5676=m +CONFIG_SND_SOC_QCOM=m +CONFIG_SND_SOC_LPASS_CPU=m +CONFIG_SND_SOC_LPASS_PLATFORM=m +CONFIG_SND_SOC_LPASS_APQ8016=m +# CONFIG_SND_SOC_STORM is not set +CONFIG_SND_SOC_APQ8016_SBC=m + +# +# Allwinner SoC Audio support +# +# CONFIG_SND_SUN4I_CODEC is not set +# CONFIG_SND_SUN8I_CODEC_ANALOG is not set +# CONFIG_SND_SUN4I_I2S is not set +# CONFIG_SND_SUN4I_SPDIF is not set +# CONFIG_SND_SOC_TEGRA is not set +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_AC97_CODEC is not set +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_ADAU7002 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4613 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_BT_SCO is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS35L33 is not set +CONFIG_SND_SOC_CS35L34=m +CONFIG_SND_SOC_CS42L42=m +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +# CONFIG_SND_SOC_CS4349 is not set +# CONFIG_SND_SOC_CS53L30 is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328_I2C is not set +# CONFIG_SND_SOC_ES8328_SPI is not set +# CONFIG_SND_SOC_GTM601 is not set +# CONFIG_SND_SOC_INNO_RK3036 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_MAX98504 is not set +# CONFIG_SND_SOC_MAX9860 is not set +CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m +CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM179X_I2C is not set +# CONFIG_SND_SOC_PCM179X_SPI is not set +# CONFIG_SND_SOC_PCM3168A_I2C is not set +# CONFIG_SND_SOC_PCM3168A_SPI is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT5514=m +# CONFIG_SND_SOC_RT5616 is not set +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5677=m +CONFIG_SND_SOC_RT5677_SPI=m +# CONFIG_SND_SOC_SGTL5000 is not set +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +# CONFIG_SND_SOC_SPDIF is not set +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_STI_SAS is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set +# CONFIG_SND_SOC_TAS5720 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804_I2C is not set +# CONFIG_SND_SOC_WM8804_SPI is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8960 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8974 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_WM8985 is not set +# CONFIG_SND_SOC_NAU8540 is not set +# CONFIG_SND_SOC_NAU8810 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD_UTILS=m +CONFIG_SND_SIMPLE_CARD=m +# CONFIG_SND_SIMPLE_SCU_CARD is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID support +# +CONFIG_HID=y +CONFIG_HID_BATTERY_STRENGTH=y +CONFIG_HIDRAW=y +CONFIG_UHID=m +CONFIG_HID_GENERIC=y + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_APPLEIR=m +# CONFIG_HID_ASUS is not set +CONFIG_HID_AUREAL=m +CONFIG_HID_BELKIN=m +CONFIG_HID_BETOP_FF=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CORSAIR=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CMEDIA=m +CONFIG_HID_CP2112=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELECOM=m +CONFIG_HID_ELO=m +CONFIG_HID_EZKEY=m +CONFIG_HID_GEMBIRD=m +CONFIG_HID_GFRM=m +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +CONFIG_HID_GT683R=m +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LED=m +CONFIG_HID_LENOVO=m +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_HID_LOGITECH_HIDPP=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MAYFLASH=m +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PENMOUNT=m +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y +CONFIG_HID_PLANTRONICS=m +CONFIG_HID_PRIMAX=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_SONY_FF=y +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_UDRAW_PS3=m +CONFIG_HID_WACOM=m +CONFIG_HID_WIIMOTE=m +CONFIG_HID_XINMO=m +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m +CONFIG_HID_SENSOR_CUSTOM_SENSOR=m +# CONFIG_HID_ALPS is not set + +# +# USB HID support +# +CONFIG_USB_HID=y +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# I2C HID support +# +CONFIG_I2C_HID=m +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEFAULT_PERSIST=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set +CONFIG_USB_MON=y +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PCI=y +CONFIG_USB_XHCI_PLATFORM=y +CONFIG_USB_XHCI_MTK=y +CONFIG_USB_XHCI_MVEBU=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_PCI=y +CONFIG_USB_EHCI_MSM=y +CONFIG_USB_EHCI_TEGRA=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_ISP1362_HCD=y +# CONFIG_USB_FOTG210_HCD is not set +CONFIG_USB_MAX3421_HCD=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PCI=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_UHCI_HCD=y +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_HCD_ISO=y +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_WHCI_HCD is not set +CONFIG_USB_HWA_HCD=m +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set +# CONFIG_USB_HCD_TEST_MODE is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=y +CONFIG_REALTEK_AUTOPM=y +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_USB_STORAGE_ALAUDA=y +CONFIG_USB_STORAGE_ONETOUCH=y +CONFIG_USB_STORAGE_KARMA=y +CONFIG_USB_STORAGE_CYPRESS_ATACB=y +CONFIG_USB_STORAGE_ENE_UB6250=y +CONFIG_USB_UAS=y + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_VHCI_HC_PORTS=8 +CONFIG_USBIP_VHCI_NR_HCS=1 +CONFIG_USBIP_HOST=m +CONFIG_USBIP_VUDC=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_USB_MTU3=m +# CONFIG_USB_MTU3_HOST is not set +# CONFIG_USB_MTU3_GADGET is not set +CONFIG_USB_MTU3_DUAL_ROLE=y +# CONFIG_USB_MTU3_DEBUG is not set +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_HOST=y +# CONFIG_USB_MUSB_GADGET is not set +# CONFIG_USB_MUSB_DUAL_ROLE is not set + +# +# Platform Glue Layer +# + +# +# MUSB DMA mode +# +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_ULPI=y +CONFIG_USB_DWC3_HOST=y +# CONFIG_USB_DWC3_GADGET is not set +# CONFIG_USB_DWC3_DUAL_ROLE is not set + +# +# Platform Glue Driver Support +# +CONFIG_USB_DWC3_PCI=y +CONFIG_USB_DWC3_OF_SIMPLE=y +CONFIG_USB_DWC2=y +CONFIG_USB_DWC2_HOST=y + +# +# Gadget/Dual-role mode requires USB Gadget support to be enabled +# +# CONFIG_USB_DWC2_PERIPHERAL is not set +# CONFIG_USB_DWC2_DUAL_ROLE is not set +CONFIG_USB_DWC2_PCI=y +# CONFIG_USB_DWC2_DEBUG is not set +# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_OF=y +CONFIG_USB_CHIPIDEA_PCI=y +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +# CONFIG_USB_CHIPIDEA_ULPI is not set +CONFIG_USB_ISP1760=y +CONFIG_USB_ISP1760_HCD=y +CONFIG_USB_ISP1760_HOST_ROLE=y +# CONFIG_USB_ISP1760_GADGET_ROLE is not set +# CONFIG_USB_ISP1760_DUAL_ROLE is not set + +# +# USB port drivers +# +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=m +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +CONFIG_USB_SERIAL_F8153X=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MXUPORT=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SAFE_PADDED=y +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_XSENS_MT=m +CONFIG_USB_SERIAL_WISHBONE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m +# CONFIG_USB_SERIAL_UPD78F0730 is not set +CONFIG_USB_SERIAL_DEBUG=m + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +# CONFIG_USB_RIO500 is not set +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +# CONFIG_USB_TEST is not set +# CONFIG_USB_EHSET_TEST_FIXTURE is not set +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m +# CONFIG_USB_HUB_USB251XB is not set +CONFIG_USB_HSIC_USB3503=y +CONFIG_USB_HSIC_USB4604=y +# CONFIG_USB_LINK_LAYER_TEST is not set +CONFIG_USB_CHAOSKEY=m +CONFIG_UCSI=m +CONFIG_USB_ATM=m +# CONFIG_USB_SPEEDTOUCH is not set +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m + +# +# USB Physical Layer drivers +# +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=y +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_USB_ISP1301 is not set +CONFIG_USB_MSM_OTG=y +CONFIG_USB_QCOM_8X16_PHY=y +CONFIG_USB_ULPI=y +CONFIG_USB_ULPI_VIEWPORT=y +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=500 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +# CONFIG_U_SERIAL_CONSOLE is not set + +# +# USB Peripheral Controller +# +# CONFIG_USB_FOTG210_UDC is not set +# CONFIG_USB_GR_UDC is not set +# CONFIG_USB_R8A66597 is not set +# CONFIG_USB_PXA27X is not set +# CONFIG_USB_MV_UDC is not set +# CONFIG_USB_MV_U3D is not set +# CONFIG_USB_M66592 is not set +# CONFIG_USB_BDC_UDC is not set +# CONFIG_USB_AMD5536UDC is not set +# CONFIG_USB_NET2272 is not set +# CONFIG_USB_NET2280 is not set +# CONFIG_USB_GOKU is not set +# CONFIG_USB_EG20T is not set +# CONFIG_USB_GADGET_XILINX is not set +# CONFIG_USB_DUMMY_HCD is not set +CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_U_SERIAL=m +CONFIG_USB_U_ETHER=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m +CONFIG_USB_F_NCM=m +CONFIG_USB_F_ECM=m +CONFIG_USB_F_EEM=m +CONFIG_USB_F_SUBSET=m +CONFIG_USB_F_RNDIS=m +CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_HID=m +# CONFIG_USB_CONFIGFS is not set +# CONFIG_USB_ZERO is not set +# CONFIG_USB_AUDIO is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_ETH_EEM=y +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +# CONFIG_USB_FUNCTIONFS is not set +CONFIG_USB_MASS_STORAGE=m +# CONFIG_USB_GADGET_TARGET is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +CONFIG_USB_CDC_COMPOSITE=m +CONFIG_USB_G_ACM_MS=m +CONFIG_USB_G_MULTI=m +CONFIG_USB_G_MULTI_RNDIS=y +CONFIG_USB_G_MULTI_CDC=y +CONFIG_USB_G_HID=m +# CONFIG_USB_G_DBGP is not set +# CONFIG_USB_G_WEBCAM is not set +CONFIG_USB_LED_TRIG=y +CONFIG_USB_ULPI_BUS=y +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_PWRSEQ_EMMC=y +# CONFIG_PWRSEQ_SD8787 is not set +CONFIG_PWRSEQ_SIMPLE=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=32 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_ARMMMCI=y +# CONFIG_MMC_QCOM_DML is not set +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_IO_ACCESSORS=y +CONFIG_MMC_SDHCI_PCI=y +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_ACPI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OF_ARASAN=y +CONFIG_MMC_SDHCI_OF_AT91=y +CONFIG_MMC_SDHCI_CADENCE=m +CONFIG_MMC_SDHCI_TEGRA=y +CONFIG_MMC_SDHCI_PXAV3=y +CONFIG_MMC_SDHCI_F_SDH30=y +CONFIG_MMC_SDHCI_IPROC=y +CONFIG_MMC_MESON_GX=m +CONFIG_MMC_SDHCI_MSM=y +CONFIG_MMC_TIFM_SD=y +CONFIG_MMC_SPI=y +CONFIG_MMC_CB710=y +CONFIG_MMC_VIA_SDMMC=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_PLTFM=y +CONFIG_MMC_DW_EXYNOS=y +CONFIG_MMC_DW_K3=y +CONFIG_MMC_DW_PCI=y +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +# CONFIG_MMC_USDHI6ROL0 is not set +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m +CONFIG_MMC_SUNXI=y +CONFIG_MMC_TOSHIBA_PCI=y +CONFIG_MMC_MTK=y +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m +# CONFIG_MS_BLOCK is not set + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS_FLASH=m +# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set + +# +# LED drivers +# +# CONFIG_LEDS_AAT1290 is not set +# CONFIG_LEDS_BCM6328 is not set +# CONFIG_LEDS_BCM6358 is not set +CONFIG_LEDS_LM3530=m +# CONFIG_LEDS_LM3642 is not set +# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_LP3944=m +# CONFIG_LEDS_LP3952 is not set +# CONFIG_LEDS_LP5521 is not set +# CONFIG_LEDS_LP5523 is not set +# CONFIG_LEDS_LP5562 is not set +# CONFIG_LEDS_LP8501 is not set +# CONFIG_LEDS_LP8860 is not set +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_PCA963X=m +# CONFIG_LEDS_DAC124S085 is not set +CONFIG_LEDS_PWM=m +# CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_BD2802 is not set +CONFIG_LEDS_LT3593=m +# CONFIG_LEDS_TCA6507 is not set +# CONFIG_LEDS_TLC591XX is not set +# CONFIG_LEDS_LM355x is not set +# CONFIG_LEDS_KTD2692 is not set +# CONFIG_LEDS_IS31FL319X is not set +# CONFIG_LEDS_IS31FL32XX is not set + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# +CONFIG_LEDS_BLINKM=m +# CONFIG_LEDS_SYSCON is not set +CONFIG_LEDS_USER=m + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_ONESHOT=y +CONFIG_LEDS_TRIGGER_DISK=y +CONFIG_LEDS_TRIGGER_MTD=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_BACKLIGHT=y +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_GPIO=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=y +CONFIG_LEDS_TRIGGER_CAMERA=y +CONFIG_LEDS_TRIGGER_PANIC=y +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +# CONFIG_INFINIBAND is not set +CONFIG_EDAC_SUPPORT=y +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_XGENE=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_SYSTOHC is not set +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_ABB5ZES3 is not set +CONFIG_RTC_DRV_ABX80X=m +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1307_HWMON=y +# CONFIG_RTC_DRV_DS1307_CENTURY is not set +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1374_WDT=y +CONFIG_RTC_DRV_DS1672=m +# CONFIG_RTC_DRV_HYM8563 is not set +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8523=m +CONFIG_RTC_DRV_PCF85063=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +# CONFIG_RTC_DRV_S35390A is not set +CONFIG_RTC_DRV_FM3130=m +# CONFIG_RTC_DRV_RX8010 is not set +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +# CONFIG_RTC_DRV_RV8803 is not set +# CONFIG_RTC_DRV_S5M is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T93 is not set +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1302 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1343 is not set +# CONFIG_RTC_DRV_DS1347 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6916 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RX4581 is not set +# CONFIG_RTC_DRV_RX6110 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_PCF2123 is not set +# CONFIG_RTC_DRV_MCP795 is not set +CONFIG_RTC_I2C_AND_SPI=y + +# +# SPI and I2C RTC drivers +# +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_PCF2127=m +CONFIG_RTC_DRV_RV3029C2=m +CONFIG_RTC_DRV_RV3029_HWMON=y + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1685_FAMILY=m +CONFIG_RTC_DRV_DS1685=y +# CONFIG_RTC_DRV_DS1689 is not set +# CONFIG_RTC_DRV_DS17285 is not set +# CONFIG_RTC_DRV_DS17485 is not set +# CONFIG_RTC_DRV_DS17885 is not set +# CONFIG_RTC_DS1685_PROC_REGS is not set +CONFIG_RTC_DS1685_SYSFS_REGS=y +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_DS2404=m +CONFIG_RTC_DRV_EFI=y +CONFIG_RTC_DRV_STK17TA8=m +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +# CONFIG_RTC_DRV_ZYNQMP is not set + +# +# on-CPU RTC drivers +# +# CONFIG_RTC_DRV_PL030 is not set +CONFIG_RTC_DRV_PL031=y +CONFIG_RTC_DRV_SUN6I=y +# CONFIG_RTC_DRV_MV is not set +# CONFIG_RTC_DRV_ARMADA38X is not set +CONFIG_RTC_DRV_PM8XXX=y +# CONFIG_RTC_DRV_TEGRA is not set +# CONFIG_RTC_DRV_SNVS is not set +CONFIG_RTC_DRV_XGENE=m +CONFIG_RTC_DRV_R7301=m + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y +CONFIG_DMA_ENGINE=y +CONFIG_DMA_VIRTUAL_CHANNELS=y +CONFIG_DMA_ACPI=y +CONFIG_DMA_OF=y +# CONFIG_AMBA_PL08X is not set +CONFIG_DMA_BCM2835=y +# CONFIG_DMA_SUN6I is not set +# CONFIG_FSL_EDMA is not set +# CONFIG_INTEL_IDMA64 is not set +# CONFIG_K3_DMA is not set +CONFIG_MV_XOR=y +CONFIG_MV_XOR_V2=y +CONFIG_PL330_DMA=m +CONFIG_TEGRA20_APB_DMA=y +CONFIG_TEGRA210_ADMA=y +CONFIG_XGENE_DMA=m +# CONFIG_XILINX_DMA is not set +# CONFIG_XILINX_ZYNQMP_DMA is not set +CONFIG_QCOM_BAM_DMA=y +CONFIG_QCOM_HIDMA_MGMT=y +CONFIG_QCOM_HIDMA=y +CONFIG_DW_DMAC_CORE=m +CONFIG_DW_DMAC=m +CONFIG_DW_DMAC_PCI=m + +# +# DMA Clients +# +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DMA_ENGINE_RAID=y + +# +# DMABUF options +# +CONFIG_SYNC_FILE=y +# CONFIG_SW_SYNC is not set +CONFIG_AUXDISPLAY=y +# CONFIG_IMG_ASCII_LCD is not set +CONFIG_HT16K33=m +CONFIG_UIO=m +CONFIG_UIO_CIF=m +# CONFIG_UIO_PDRV_GENIRQ is not set +# CONFIG_UIO_DMEM_GENIRQ is not set +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +# CONFIG_UIO_NETX is not set +# CONFIG_UIO_PRUSS is not set +# CONFIG_UIO_MF624 is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO_VIRQFD=m +CONFIG_VFIO=m +# CONFIG_VFIO_NOIOMMU is not set +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_MMAP=y +CONFIG_VFIO_PCI_INTX=y +CONFIG_VFIO_PLATFORM=m +CONFIG_VFIO_AMBA=m +CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m +CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m +CONFIG_VFIO_MDEV=m +CONFIG_VFIO_MDEV_DEVICE=m +CONFIG_IRQ_BYPASS_MANAGER=m +# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRTIO=y + +# +# Virtio drivers +# +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MMIO=m +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set + +# +# Microsoft Hyper-V guest support +# +CONFIG_STAGING=y +CONFIG_PRISM2_USB=m +# CONFIG_COMEDI is not set +CONFIG_RTL8192U=m +CONFIG_RTLLIB=m +CONFIG_RTLLIB_CRYPTO_CCMP=m +CONFIG_RTLLIB_CRYPTO_TKIP=m +CONFIG_RTLLIB_CRYPTO_WEP=m +CONFIG_RTL8192E=m +CONFIG_R8712U=m +CONFIG_R8188EU=m +CONFIG_88EU_AP_MODE=y +# CONFIG_RTS5208 is not set +# CONFIG_VT6655 is not set +# CONFIG_VT6656 is not set + +# +# IIO staging drivers +# + +# +# Accelerometers +# +CONFIG_ADIS16201=m +CONFIG_ADIS16203=m +CONFIG_ADIS16209=m +CONFIG_ADIS16240=m + +# +# Analog to digital converters +# +CONFIG_AD7606=m +CONFIG_AD7606_IFACE_PARALLEL=m +CONFIG_AD7606_IFACE_SPI=m +CONFIG_AD7780=m +CONFIG_AD7816=m +CONFIG_AD7192=m +CONFIG_AD7280=m + +# +# Analog digital bi-direction converters +# +CONFIG_ADT7316=m +CONFIG_ADT7316_SPI=m +CONFIG_ADT7316_I2C=m + +# +# Capacitance to digital converters +# +CONFIG_AD7150=m +CONFIG_AD7152=m +CONFIG_AD7746=m + +# +# Direct Digital Synthesis +# +CONFIG_AD9832=m +CONFIG_AD9834=m + +# +# Digital gyroscope sensors +# +CONFIG_ADIS16060=m + +# +# Network Analyzer, Impedance Converters +# +CONFIG_AD5933=m + +# +# Light sensors +# +CONFIG_SENSORS_ISL29028=m +CONFIG_TSL2x7x=m + +# +# Active energy metering IC +# +CONFIG_ADE7753=m +CONFIG_ADE7754=m +CONFIG_ADE7758=m +CONFIG_ADE7759=m +CONFIG_ADE7854=m +CONFIG_ADE7854_I2C=m +CONFIG_ADE7854_SPI=m + +# +# Resolver to digital converters +# +CONFIG_AD2S90=m +CONFIG_AD2S1200=m +CONFIG_AD2S1210=m + +# +# Triggers - standalone +# +# CONFIG_FB_SM750 is not set +# CONFIG_FB_XGI is not set + +# +# Speakup console speech +# +# CONFIG_SPEAKUP is not set +# CONFIG_MFD_NVEC is not set +CONFIG_STAGING_MEDIA=y +# CONFIG_I2C_BCM2048 is not set +# CONFIG_DVB_CXD2099 is not set +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SIR=m +CONFIG_LIRC_ZILOG=m + +# +# Android +# +# CONFIG_STAGING_BOARD is not set +# CONFIG_LTE_GDM724X is not set +# CONFIG_LNET is not set +# CONFIG_DGNC is not set +# CONFIG_GS_FPGABOOT is not set +# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set +CONFIG_FB_TFT=m +CONFIG_FB_TFT_AGM1264K_FL=m +CONFIG_FB_TFT_BD663474=m +CONFIG_FB_TFT_HX8340BN=m +CONFIG_FB_TFT_HX8347D=m +CONFIG_FB_TFT_HX8353D=m +CONFIG_FB_TFT_HX8357D=m +CONFIG_FB_TFT_ILI9163=m +CONFIG_FB_TFT_ILI9320=m +CONFIG_FB_TFT_ILI9325=m +CONFIG_FB_TFT_ILI9340=m +CONFIG_FB_TFT_ILI9341=m +CONFIG_FB_TFT_ILI9481=m +CONFIG_FB_TFT_ILI9486=m +CONFIG_FB_TFT_PCD8544=m +CONFIG_FB_TFT_RA8875=m +CONFIG_FB_TFT_S6D02A1=m +CONFIG_FB_TFT_S6D1121=m +CONFIG_FB_TFT_SSD1289=m +CONFIG_FB_TFT_SSD1305=m +CONFIG_FB_TFT_SSD1306=m +CONFIG_FB_TFT_SSD1325=m +CONFIG_FB_TFT_SSD1331=m +CONFIG_FB_TFT_SSD1351=m +CONFIG_FB_TFT_ST7735R=m +CONFIG_FB_TFT_ST7789V=m +CONFIG_FB_TFT_TINYLCD=m +CONFIG_FB_TFT_TLS8204=m +CONFIG_FB_TFT_UC1611=m +CONFIG_FB_TFT_UC1701=m +CONFIG_FB_TFT_UPD161704=m +CONFIG_FB_TFT_WATTEROTT=m +CONFIG_FB_FLEX=m +# CONFIG_FB_TFT_FBTFT_DEVICE is not set +# CONFIG_WILC1000_SDIO is not set +# CONFIG_WILC1000_SPI is not set +# CONFIG_MOST is not set +# CONFIG_KS7010 is not set +# CONFIG_GREYBUS is not set +CONFIG_BCM2835_VCHIQ=m +# CONFIG_SND_BCM2835 is not set +# CONFIG_GOLDFISH is not set +CONFIG_CHROME_PLATFORMS=y +CONFIG_CROS_EC_CHARDEV=y +CONFIG_CROS_EC_PROTO=y +CONFIG_CROS_KBD_LED_BACKLIGHT=y +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +CONFIG_COMMON_CLK_VERSATILE=y +CONFIG_CLK_SP810=y +CONFIG_CLK_VEXPRESS_OSC=y +CONFIG_COMMON_CLK_SCPI=y +# CONFIG_COMMON_CLK_SI5351 is not set +# CONFIG_COMMON_CLK_SI514 is not set +# CONFIG_COMMON_CLK_SI570 is not set +# CONFIG_COMMON_CLK_CDCE706 is not set +# CONFIG_COMMON_CLK_CDCE925 is not set +# CONFIG_COMMON_CLK_CS2000_CP is not set +# CONFIG_COMMON_CLK_S2MPS11 is not set +# CONFIG_CLK_QORIQ is not set +CONFIG_COMMON_CLK_XGENE=y +# CONFIG_COMMON_CLK_NXP is not set +# CONFIG_COMMON_CLK_PWM is not set +# CONFIG_COMMON_CLK_PXA is not set +# CONFIG_COMMON_CLK_PIC32 is not set +# CONFIG_COMMON_CLK_VC5 is not set +CONFIG_COMMON_CLK_HI3516CV300=m +CONFIG_COMMON_CLK_HI3519=y +CONFIG_COMMON_CLK_HI3660=y +CONFIG_COMMON_CLK_HI3798CV200=m +CONFIG_COMMON_CLK_HI6220=y +CONFIG_RESET_HISI=y +CONFIG_STUB_CLK_HI6220=y +CONFIG_COMMON_CLK_MEDIATEK=y +CONFIG_COMMON_CLK_MT8173=y +CONFIG_COMMON_CLK_AMLOGIC=y +CONFIG_COMMON_CLK_GXBB=y +CONFIG_ARMADA_37XX_CLK=y +CONFIG_ARMADA_AP806_SYSCON=y +CONFIG_ARMADA_CP110_SYSCON=y +CONFIG_QCOM_GDSC=y +CONFIG_QCOM_RPMCC=y +CONFIG_COMMON_CLK_QCOM=y +CONFIG_QCOM_CLK_RPM=m +CONFIG_QCOM_CLK_SMD_RPM=m +# CONFIG_APQ_GCC_8084 is not set +# CONFIG_APQ_MMCC_8084 is not set +# CONFIG_IPQ_GCC_4019 is not set +# CONFIG_IPQ_GCC_806X is not set +# CONFIG_IPQ_LCC_806X is not set +# CONFIG_MSM_GCC_8660 is not set +CONFIG_MSM_GCC_8916=y +CONFIG_MSM_GCC_8960=y +CONFIG_MSM_LCC_8960=y +# CONFIG_MDM_GCC_9615 is not set +# CONFIG_MDM_LCC_9615 is not set +# CONFIG_MSM_MMCC_8960 is not set +# CONFIG_MSM_GCC_8974 is not set +# CONFIG_MSM_MMCC_8974 is not set +CONFIG_MSM_GCC_8994=m +CONFIG_MSM_GCC_8996=y +CONFIG_MSM_MMCC_8996=y +CONFIG_SUNXI_CCU=y +CONFIG_SUNXI_CCU_DIV=y +CONFIG_SUNXI_CCU_FRAC=y +CONFIG_SUNXI_CCU_GATE=y +CONFIG_SUNXI_CCU_MUX=y +CONFIG_SUNXI_CCU_PHASE=y +CONFIG_SUNXI_CCU_NK=y +CONFIG_SUNXI_CCU_NKM=y +CONFIG_SUNXI_CCU_NKMP=y +CONFIG_SUNXI_CCU_NM=y +CONFIG_SUNXI_CCU_MP=y +CONFIG_SUN50I_A64_CCU=y +# CONFIG_SUN5I_CCU is not set +# CONFIG_SUN6I_A31_CCU is not set +# CONFIG_SUN8I_A23_CCU is not set +# CONFIG_SUN8I_A33_CCU is not set +# CONFIG_SUN8I_H3_CCU is not set +# CONFIG_SUN8I_V3S_CCU is not set +# CONFIG_SUN9I_A80_CCU is not set +CONFIG_CLK_TEGRA_BPMP=y +CONFIG_HWSPINLOCK=y + +# +# Hardware Spinlock drivers +# +CONFIG_HWSPINLOCK_QCOM=y + +# +# Clock Source drivers +# +CONFIG_CLKSRC_OF=y +CONFIG_CLKSRC_ACPI=y +CONFIG_CLKSRC_PROBE=y +CONFIG_CLKSRC_MMIO=y +CONFIG_ARM_ARCH_TIMER=y +CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y +CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y +CONFIG_FSL_ERRATUM_A008585=y +CONFIG_HISILICON_ERRATUM_161010101=y +CONFIG_ARM_TIMER_SP804=y +# CONFIG_ATMEL_PIT is not set +CONFIG_MTK_TIMER=y +# CONFIG_SH_TIMER_CMT is not set +# CONFIG_SH_TIMER_MTU2 is not set +# CONFIG_SH_TIMER_TMU is not set +# CONFIG_EM_TIMER_STI is not set +CONFIG_CLKSRC_VERSATILE=y +CONFIG_MAILBOX=y +CONFIG_ARM_MHU=y +# CONFIG_PLATFORM_MHU is not set +# CONFIG_PL320_MBOX is not set +CONFIG_PCC=y +# CONFIG_ALTERA_MBOX is not set +CONFIG_BCM2835_MBOX=y +CONFIG_HI6220_MBOX=y +# CONFIG_MAILBOX_TEST is not set +CONFIG_TEGRA_HSP_MBOX=y +# CONFIG_XGENE_SLIMPRO_MBOX is not set +CONFIG_BCM_PDC_MBOX=y +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +CONFIG_IOMMU_IO_PGTABLE=y +CONFIG_IOMMU_IO_PGTABLE_LPAE=y +# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set +CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y +# CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set +CONFIG_IOMMU_IOVA=y +CONFIG_OF_IOMMU=y +CONFIG_IOMMU_DMA=y +# CONFIG_TEGRA_IOMMU_SMMU is not set +CONFIG_ARM_SMMU=y +CONFIG_ARM_SMMU_V3=y +CONFIG_MTK_IOMMU=y + +# +# Remoteproc drivers +# +CONFIG_REMOTEPROC=y +CONFIG_QCOM_ADSP_PIL=m +CONFIG_QCOM_RPROC_COMMON=y +CONFIG_QCOM_Q6V5_PIL=y +CONFIG_QCOM_WCNSS_PIL=y + +# +# Rpmsg drivers +# + +# +# SOC (System On Chip) specific Drivers +# + +# +# Broadcom SoC drivers +# +CONFIG_RASPBERRYPI_POWER=y +CONFIG_MTK_INFRACFG=y +CONFIG_MTK_PMIC_WRAP=y +CONFIG_MTK_SCPSYS=y +CONFIG_QCOM_GSBI=y +CONFIG_QCOM_MDT_LOADER=y +CONFIG_QCOM_SMEM=y +CONFIG_QCOM_SMD=y +CONFIG_QCOM_SMD_RPM=y +CONFIG_QCOM_SMEM_STATE=y +CONFIG_QCOM_SMP2P=y +CONFIG_QCOM_SMSM=y +CONFIG_QCOM_WCNSS_CTRL=y +CONFIG_SUNXI_SRAM=y +CONFIG_ARCH_TEGRA_132_SOC=y +CONFIG_ARCH_TEGRA_210_SOC=y +CONFIG_ARCH_TEGRA_186_SOC=y +# CONFIG_SOC_TI is not set +# CONFIG_SOC_ZTE is not set +CONFIG_PM_DEVFREQ=y + +# +# DEVFREQ Governors +# +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m +# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set +# CONFIG_DEVFREQ_GOV_POWERSAVE is not set +# CONFIG_DEVFREQ_GOV_USERSPACE is not set +# CONFIG_DEVFREQ_GOV_PASSIVE is not set + +# +# DEVFREQ Drivers +# +# CONFIG_PM_DEVFREQ_EVENT is not set +CONFIG_EXTCON=y + +# +# Extcon Device Drivers +# +CONFIG_EXTCON_ADC_JACK=m +CONFIG_EXTCON_GPIO=y +# CONFIG_EXTCON_MAX3355 is not set +CONFIG_EXTCON_QCOM_SPMI_MISC=y +# CONFIG_EXTCON_RT8973A is not set +# CONFIG_EXTCON_SM5502 is not set +CONFIG_EXTCON_USB_GPIO=y +CONFIG_MEMORY=y +# CONFIG_ARM_PL172_MPMC is not set +CONFIG_MTK_SMI=y +CONFIG_TEGRA_MC=y +CONFIG_IIO=y +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=y +CONFIG_IIO_KFIFO_BUF=y +CONFIG_IIO_TRIGGERED_BUFFER=y +CONFIG_IIO_CONFIGFS=m +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 +CONFIG_IIO_SW_DEVICE=m +CONFIG_IIO_SW_TRIGGER=m +CONFIG_IIO_TRIGGERED_EVENT=m + +# +# Accelerometers +# +CONFIG_BMA180=m +CONFIG_BMA220=m +CONFIG_BMC150_ACCEL=m +CONFIG_BMC150_ACCEL_I2C=m +CONFIG_BMC150_ACCEL_SPI=m +CONFIG_DA280=m +CONFIG_DA311=m +CONFIG_DMARD06=m +CONFIG_DMARD09=m +CONFIG_DMARD10=m +CONFIG_HID_SENSOR_ACCEL_3D=m +CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m +CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +CONFIG_KXSD9=m +CONFIG_KXSD9_SPI=m +CONFIG_KXSD9_I2C=m +CONFIG_KXCJK1013=m +CONFIG_MC3230=m +CONFIG_MMA7455=m +CONFIG_MMA7455_I2C=m +CONFIG_MMA7455_SPI=m +CONFIG_MMA7660=m +CONFIG_MMA8452=m +CONFIG_MMA9551_CORE=m +CONFIG_MMA9551=m +CONFIG_MMA9553=m +CONFIG_MXC4005=m +CONFIG_MXC6255=m +CONFIG_SCA3000=m +CONFIG_STK8312=m +CONFIG_STK8BA50=m + +# +# Analog to digital converters +# +CONFIG_AD_SIGMA_DELTA=m +CONFIG_AD7266=m +CONFIG_AD7291=m +CONFIG_AD7298=m +CONFIG_AD7476=m +CONFIG_AD7766=m +CONFIG_AD7791=m +CONFIG_AD7793=m +CONFIG_AD7887=m +CONFIG_AD7923=m +CONFIG_AD799X=m +CONFIG_CC10001_ADC=m +CONFIG_ENVELOPE_DETECTOR=m +CONFIG_HI8435=m +# CONFIG_HX711 is not set +CONFIG_INA2XX_ADC=m +CONFIG_LTC2485=m +CONFIG_MAX1027=m +# CONFIG_MAX11100 is not set +CONFIG_MAX1363=m +CONFIG_MCP320X=m +CONFIG_MCP3422=m +CONFIG_MEDIATEK_MT6577_AUXADC=m +CONFIG_MESON_SARADC=y +CONFIG_NAU7802=m +CONFIG_QCOM_SPMI_IADC=y +CONFIG_QCOM_SPMI_VADC=y +CONFIG_TI_ADC081C=m +CONFIG_TI_ADC0832=m +CONFIG_TI_ADC12138=m +CONFIG_TI_ADC128S052=m +CONFIG_TI_ADC161S626=m +CONFIG_TI_ADS1015=m +# CONFIG_TI_ADS7950 is not set +CONFIG_TI_ADS8688=m +# CONFIG_TI_TLC4541 is not set +CONFIG_VF610_ADC=m +CONFIG_VIPERBOARD_ADC=m + +# +# Amplifiers +# +CONFIG_AD8366=m + +# +# Chemical Sensors +# +CONFIG_ATLAS_PH_SENSOR=m +CONFIG_IAQCORE=m +CONFIG_VZ89X=m +CONFIG_IIO_CROS_EC_SENSORS_CORE=m +CONFIG_IIO_CROS_EC_SENSORS=m + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m +CONFIG_IIO_MS_SENSORS_I2C=m + +# +# SSP Sensor Common +# +# CONFIG_IIO_SSP_SENSORHUB is not set +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# Counters +# + +# +# Digital to analog converters +# +CONFIG_AD5064=m +CONFIG_AD5360=m +CONFIG_AD5380=m +CONFIG_AD5421=m +CONFIG_AD5446=m +CONFIG_AD5449=m +CONFIG_AD5592R_BASE=m +CONFIG_AD5592R=m +CONFIG_AD5593R=m +CONFIG_AD5504=m +CONFIG_AD5624R_SPI=m +CONFIG_AD5686=m +CONFIG_AD5755=m +CONFIG_AD5761=m +CONFIG_AD5764=m +CONFIG_AD5791=m +CONFIG_AD7303=m +CONFIG_AD8801=m +CONFIG_DPOT_DAC=m +CONFIG_M62332=m +CONFIG_MAX517=m +CONFIG_MAX5821=m +CONFIG_MCP4725=m +CONFIG_MCP4922=m +CONFIG_VF610_DAC=m + +# +# IIO dummy driver +# +# CONFIG_IIO_SIMPLE_DUMMY is not set + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +CONFIG_AD9523=m + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +CONFIG_ADF4350=m + +# +# Digital gyroscope sensors +# +CONFIG_ADIS16080=m +CONFIG_ADIS16130=m +CONFIG_ADIS16136=m +CONFIG_ADIS16260=m +CONFIG_ADXRS450=m +CONFIG_BMG160=m +CONFIG_BMG160_I2C=m +CONFIG_BMG160_SPI=m +CONFIG_HID_SENSOR_GYRO_3D=m +# CONFIG_MPU3050_I2C is not set +CONFIG_IIO_ST_GYRO_3AXIS=m +CONFIG_IIO_ST_GYRO_I2C_3AXIS=m +CONFIG_IIO_ST_GYRO_SPI_3AXIS=m +CONFIG_ITG3200=m + +# +# Health Sensors +# + +# +# Heart Rate Monitors +# +CONFIG_AFE4403=m +CONFIG_AFE4404=m +CONFIG_MAX30100=m + +# +# Humidity sensors +# +CONFIG_AM2315=m +CONFIG_DHT11=m +CONFIG_HDC100X=m +CONFIG_HTS221=m +CONFIG_HTS221_I2C=m +CONFIG_HTS221_SPI=m +CONFIG_HTU21=m +CONFIG_SI7005=m +CONFIG_SI7020=m + +# +# Inertial measurement units +# +CONFIG_ADIS16400=m +CONFIG_ADIS16480=m +CONFIG_BMI160=m +CONFIG_BMI160_I2C=m +CONFIG_BMI160_SPI=m +CONFIG_KMX61=m +CONFIG_INV_MPU6050_IIO=m +CONFIG_INV_MPU6050_I2C=m +CONFIG_INV_MPU6050_SPI=m +# CONFIG_IIO_ST_LSM6DSX is not set +CONFIG_IIO_ADIS_LIB=m +CONFIG_IIO_ADIS_LIB_BUFFER=y + +# +# Light sensors +# +CONFIG_ACPI_ALS=m +CONFIG_ADJD_S311=m +CONFIG_AL3320A=m +CONFIG_APDS9300=m +CONFIG_APDS9960=m +CONFIG_BH1750=m +CONFIG_BH1780=m +CONFIG_CM32181=m +CONFIG_CM3232=m +CONFIG_CM3323=m +# CONFIG_CM3605 is not set +CONFIG_CM36651=m +CONFIG_GP2AP020A00F=m +CONFIG_SENSORS_ISL29018=m +CONFIG_ISL29125=m +CONFIG_HID_SENSOR_ALS=m +CONFIG_HID_SENSOR_PROX=m +CONFIG_JSA1212=m +CONFIG_RPR0521=m +CONFIG_LTR501=m +CONFIG_MAX44000=m +CONFIG_OPT3001=m +CONFIG_PA12203001=m +CONFIG_SI1145=m +CONFIG_STK3310=m +CONFIG_TCS3414=m +CONFIG_TCS3472=m +CONFIG_SENSORS_TSL2563=m +CONFIG_TSL2583=m +CONFIG_TSL4531=m +CONFIG_US5182D=m +CONFIG_VCNL4000=m +CONFIG_VEML6070=m + +# +# Magnetometer sensors +# +CONFIG_AK8974=m +CONFIG_AK8975=m +CONFIG_AK09911=m +CONFIG_BMC150_MAGN=m +CONFIG_BMC150_MAGN_I2C=m +CONFIG_BMC150_MAGN_SPI=m +CONFIG_MAG3110=m +CONFIG_HID_SENSOR_MAGNETOMETER_3D=m +CONFIG_MMC35240=m +CONFIG_IIO_ST_MAGN_3AXIS=m +CONFIG_IIO_ST_MAGN_I2C_3AXIS=m +CONFIG_IIO_ST_MAGN_SPI_3AXIS=m +CONFIG_SENSORS_HMC5843=m +CONFIG_SENSORS_HMC5843_I2C=m +CONFIG_SENSORS_HMC5843_SPI=m + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m + +# +# Triggers - standalone +# +CONFIG_IIO_HRTIMER_TRIGGER=m +CONFIG_IIO_INTERRUPT_TRIGGER=m +CONFIG_IIO_TIGHTLOOP_TRIGGER=m +CONFIG_IIO_SYSFS_TRIGGER=m + +# +# Digital potentiometers +# +CONFIG_DS1803=m +# CONFIG_MAX5481 is not set +CONFIG_MAX5487=m +CONFIG_MCP4131=m +CONFIG_MCP4531=m +CONFIG_TPL0102=m + +# +# Digital potentiostats +# +CONFIG_LMP91000=m + +# +# Pressure sensors +# +CONFIG_ABP060MG=m +CONFIG_BMP280=m +CONFIG_BMP280_I2C=m +CONFIG_BMP280_SPI=m +# CONFIG_IIO_CROS_EC_BARO is not set +CONFIG_HID_SENSOR_PRESS=m +CONFIG_HP03=m +CONFIG_MPL115=m +CONFIG_MPL115_I2C=m +CONFIG_MPL115_SPI=m +CONFIG_MPL3115=m +CONFIG_MS5611=m +CONFIG_MS5611_I2C=m +CONFIG_MS5611_SPI=m +CONFIG_MS5637=m +CONFIG_IIO_ST_PRESS=m +CONFIG_IIO_ST_PRESS_I2C=m +CONFIG_IIO_ST_PRESS_SPI=m +CONFIG_T5403=m +CONFIG_HP206C=m +CONFIG_ZPA2326=m +CONFIG_ZPA2326_I2C=m +CONFIG_ZPA2326_SPI=m + +# +# Lightning sensors +# +CONFIG_AS3935=m + +# +# Proximity and distance sensors +# +CONFIG_LIDAR_LITE_V2=m +CONFIG_SX9500=m +# CONFIG_SRF08 is not set + +# +# Temperature sensors +# +CONFIG_MAXIM_THERMOCOUPLE=m +CONFIG_MLX90614=m +CONFIG_TMP006=m +# CONFIG_TMP007 is not set +CONFIG_TSYS01=m +CONFIG_TSYS02D=m +# CONFIG_NTB is not set +# CONFIG_VME_BUS is not set +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +CONFIG_PWM_BCM2835=m +CONFIG_PWM_CROS_EC=m +# CONFIG_PWM_FSL_FTM is not set +CONFIG_PWM_HIBVT=m +CONFIG_PWM_MESON=m +CONFIG_PWM_MTK_DISP=m +# CONFIG_PWM_PCA9685 is not set +CONFIG_PWM_SUN4I=m +# CONFIG_PWM_TEGRA is not set +CONFIG_IRQCHIP=y +CONFIG_ARM_GIC=y +CONFIG_ARM_GIC_MAX_NR=1 +CONFIG_ARM_GIC_V2M=y +CONFIG_ARM_GIC_V3=y +CONFIG_ARM_GIC_V3_ITS=y +CONFIG_HISILICON_IRQ_MBIGEN=y +CONFIG_MVEBU_ODMI=y +CONFIG_MVEBU_PIC=y +CONFIG_PARTITION_PERCPU=y +# CONFIG_QCOM_IRQ_COMBINER is not set +# CONFIG_IPACK_BUS is not set +CONFIG_ARCH_HAS_RESET_CONTROLLER=y +CONFIG_RESET_CONTROLLER=y +# CONFIG_RESET_ATH79 is not set +# CONFIG_RESET_BERLIN is not set +# CONFIG_RESET_LPC18XX is not set +CONFIG_RESET_MESON=y +# CONFIG_RESET_PISTACHIO is not set +# CONFIG_RESET_SOCFPGA is not set +# CONFIG_RESET_STM32 is not set +CONFIG_RESET_SUNXI=y +# CONFIG_TI_SYSCON_RESET is not set +# CONFIG_RESET_ZYNQ is not set +CONFIG_COMMON_RESET_HI3660=y +CONFIG_COMMON_RESET_HI6220=y +CONFIG_RESET_TEGRA_BPMP=y +CONFIG_FMC=m +CONFIG_FMC_FAKEDEV=m +CONFIG_FMC_TRIVIAL=m +CONFIG_FMC_WRITE_EEPROM=m +CONFIG_FMC_CHARDEV=m + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +# CONFIG_PHY_PXA_28NM_HSIC is not set +# CONFIG_PHY_PXA_28NM_USB2 is not set +# CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_PHY_MT65XX_USB3=y +CONFIG_PHY_HI6220_USB=y +# CONFIG_PHY_SUN4I_USB is not set +# CONFIG_PHY_SUN9I_USB is not set +# CONFIG_PHY_SAMSUNG_USB2 is not set +# CONFIG_PHY_QCOM_APQ8064_SATA is not set +# CONFIG_PHY_QCOM_IPQ806X_SATA is not set +CONFIG_PHY_XGENE=y +CONFIG_PHY_QCOM_UFS=y +# CONFIG_PHY_QCOM_USB_HS is not set +# CONFIG_PHY_QCOM_USB_HSIC is not set +# CONFIG_PHY_TUSB1210 is not set +# CONFIG_PHY_TEGRA_XUSB is not set +CONFIG_PHY_MESON8B_USB2=m +CONFIG_POWERCAP=y +# CONFIG_MCB is not set + +# +# Performance monitor support +# +CONFIG_ARM_PMU=y +# CONFIG_QCOM_L2_PMU is not set +# CONFIG_XGENE_PMU is not set +CONFIG_RAS=y + +# +# Android +# +# CONFIG_ANDROID is not set +CONFIG_LIBNVDIMM=y +CONFIG_BLK_DEV_PMEM=m +CONFIG_ND_BLK=m +CONFIG_ND_CLAIM=y +CONFIG_ND_BTT=m +CONFIG_BTT=y +CONFIG_NVMEM=m +CONFIG_MTK_EFUSE=m +CONFIG_QCOM_QFPROM=m +CONFIG_NVMEM_SUNXI_SID=m +# CONFIG_STM is not set +# CONFIG_INTEL_TH is not set + +# +# FPGA Configuration Support +# +# CONFIG_FPGA is not set + +# +# FSI support +# +# CONFIG_FSI is not set + +# +# Firmware Drivers +# +CONFIG_ARM_PSCI_FW=y +CONFIG_ARM_PSCI_CHECKER=y +CONFIG_ARM_SCPI_PROTOCOL=y +CONFIG_ARM_SCPI_POWER_DOMAIN=y +# CONFIG_FIRMWARE_MEMMAP is not set +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=y +CONFIG_RASPBERRYPI_FIRMWARE=y +# CONFIG_FW_CFG_SYSFS is not set +CONFIG_QCOM_SCM=y +CONFIG_QCOM_SCM_64=y +CONFIG_HAVE_ARM_SMCCC=y + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=y +CONFIG_EFI_ESRT=y +CONFIG_EFI_VARS_PSTORE=y +CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y +CONFIG_EFI_PARAMS_FROM_FDT=y +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_ARMSTUB=y +CONFIG_EFI_BOOTLOADER_CONTROL=y +# CONFIG_EFI_CAPSULE_LOADER is not set +# CONFIG_EFI_TEST is not set +CONFIG_UEFI_CPER=y +# CONFIG_EFI_DEV_PATH_PARSER is not set + +# +# Tegra firmware driver +# +CONFIG_TEGRA_IVC=y +CONFIG_TEGRA_BPMP=y +CONFIG_ACPI=y +CONFIG_ACPI_GENERIC_GSI=y +CONFIG_ACPI_CCA_REQUIRED=y +# CONFIG_ACPI_DEBUGGER is not set +CONFIG_ACPI_SPCR_TABLE=y +CONFIG_ACPI_EC_DEBUGFS=y +CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_FAN=y +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_PROCESSOR_IDLE=y +CONFIG_ACPI_MCFG=y +CONFIG_ACPI_CPPC_LIB=y +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_THERMAL=y +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y +CONFIG_ACPI_TABLE_UPGRADE=y +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=y +CONFIG_ACPI_CONTAINER=y +CONFIG_ACPI_HED=y +CONFIG_ACPI_CUSTOM_METHOD=y +CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y +CONFIG_HAVE_ACPI_APEI=y +CONFIG_ACPI_APEI=y +# CONFIG_ACPI_APEI_GHES is not set +# CONFIG_ACPI_APEI_PCIEAER is not set +# CONFIG_ACPI_APEI_EINJ is not set +CONFIG_ACPI_APEI_ERST_DEBUG=m +CONFIG_PMIC_OPREGION=y +CONFIG_ACPI_CONFIGFS=m +CONFIG_ACPI_IORT=y + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_FS_IOMAP=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT2=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_ENCRYPTION=y +CONFIG_EXT4_FS_ENCRYPTION=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_XFS_FS=y +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +# CONFIG_XFS_RT is not set +# CONFIG_XFS_WARN is not set +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +# CONFIG_OCFS2_FS_STATS is not set +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set +CONFIG_NILFS2_FS=m +CONFIG_F2FS_FS=y +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_F2FS_FS_SECURITY=y +# CONFIG_F2FS_CHECK_FS is not set +# CONFIG_F2FS_FS_ENCRYPTION is not set +# CONFIG_F2FS_IO_TRACE is not set +# CONFIG_F2FS_FAULT_INJECTION is not set +# CONFIG_FS_DAX is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_EXPORTFS_BLOCK_OPS=y +CONFIG_FILE_LOCKING=y +CONFIG_MANDATORY_FILE_LOCKING=y +CONFIG_FS_ENCRYPTION=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_OVERLAY_FS=m +# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +# CONFIG_FSCACHE_HISTOGRAM is not set +# CONFIG_FSCACHE_DEBUG is not set +CONFIG_FSCACHE_OBJECT_LIST=y +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="ascii" +# CONFIG_FAT_DEFAULT_UTF8 is not set +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_PROC_CHILDREN=y +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_ARCH_HAS_GIGANTIC_PAGE=y +CONFIG_CONFIGFS_FS=y +CONFIG_EFIVAR_FS=y +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ORANGEFS_FS is not set +# CONFIG_ADFS_FS is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +# CONFIG_ECRYPT_FS_MESSAGING is not set +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_HFSPLUS_FS_POSIX_ACL=y +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set +CONFIG_UBIFS_FS=m +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_ATIME_SUPPORT is not set +CONFIG_UBIFS_FS_ENCRYPTION=y +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_FILE_CACHE=y +# CONFIG_SQUASHFS_FILE_DIRECT is not set +CONFIG_SQUASHFS_DECOMP_SINGLE=y +# CONFIG_SQUASHFS_DECOMP_MULTI is not set +# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZ4=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y +CONFIG_PSTORE=y +CONFIG_PSTORE_ZLIB_COMPRESS=y +# CONFIG_PSTORE_LZO_COMPRESS is not set +# CONFIG_PSTORE_LZ4_COMPRESS is not set +# CONFIG_PSTORE_CONSOLE is not set +# CONFIG_PSTORE_PMSG is not set +# CONFIG_PSTORE_FTRACE is not set +CONFIG_PSTORE_RAM=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +# CONFIG_EXOFS_FS is not set +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +# CONFIG_NFS_V2 is not set +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_SWAP=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y +CONFIG_PNFS_FILE_LAYOUT=y +CONFIG_PNFS_BLOCK=y +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_PNFS_FLEXFILE_LAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +# CONFIG_NFS_V4_1_MIGRATION is not set +CONFIG_NFS_V4_SECURITY_LABEL=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_PNFS=y +CONFIG_NFSD_BLOCKLAYOUT=y +CONFIG_NFSD_SCSILAYOUT=y +CONFIG_NFSD_FLEXFILELAYOUT=y +CONFIG_NFSD_V4_SECURITY_LABEL=y +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_GRACE_PERIOD=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_SUNRPC_DEBUG=y +CONFIG_CEPH_FS=m +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y +CONFIG_CIFS_DEBUG=y +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y +# CONFIG_CIFS_SMB311 is not set +CONFIG_CIFS_FSCACHE=y +CONFIG_NCP_FS=m +CONFIG_NCPFS_PACKET_SIGNING=y +CONFIG_NCPFS_IOCTL_LOCKING=y +CONFIG_NCPFS_STRONG=y +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +CONFIG_NCPFS_EXTRAS=y +CONFIG_CODA_FS=m +# CONFIG_AFS_FS is not set +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +CONFIG_DLM_DEBUG=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQFD=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_MMIO=y +CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y +CONFIG_KVM_VFIO=y +CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y +CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y +CONFIG_KVM_COMPAT=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=y +CONFIG_KVM_ARM_HOST=y +CONFIG_KVM_ARM_PMU=y +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_VSOCK=m +CONFIG_VHOST=m +# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set + +# +# Kernel hacking +# + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +CONFIG_BOOT_PRINTK_DELAY=y +CONFIG_DYNAMIC_DEBUG=y + +# +# Compile-time checks and compiler options +# +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_INFO_REDUCED is not set +# CONFIG_DEBUG_INFO_SPLIT is not set +# CONFIG_DEBUG_INFO_DWARF4 is not set +# CONFIG_GDB_SCRIPTS is not set +# CONFIG_ENABLE_WARN_DEPRECATED is not set +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set +CONFIG_UNUSED_SYMBOLS=y +# CONFIG_PAGE_OWNER is not set +CONFIG_DEBUG_FS=y +CONFIG_HEADERS_CHECK=y +CONFIG_DEBUG_SECTION_MISMATCH=y +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_DEBUG_KERNEL=y + +# +# Memory Debugging +# +# CONFIG_PAGE_EXTENSION is not set +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_PAGE_POISONING is not set +# CONFIG_DEBUG_PAGE_REF is not set +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_VM is not set +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y +# CONFIG_DEBUG_VIRTUAL is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_HAVE_ARCH_KASAN=y +# CONFIG_KASAN is not set +CONFIG_ARCH_HAS_KCOV=y +# CONFIG_KCOV is not set +CONFIG_DEBUG_SHIRQ=y + +# +# Debug Lockups and Hangs +# +CONFIG_LOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +# CONFIG_WQ_WATCHDOG is not set +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHED_INFO=y +CONFIG_SCHEDSTATS=y +# CONFIG_SCHED_STACK_END_CHECK is not set +# CONFIG_DEBUG_TIMEKEEPING is not set + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_LOCK_TORTURE_TEST is not set +# CONFIG_WW_MUTEX_SELFTEST is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_HAVE_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_LIST=y +# CONFIG_DEBUG_PI_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set + +# +# RCU Debugging +# +# CONFIG_PROVE_RCU is not set +CONFIG_SPARSE_RCU_POINTER=y +CONFIG_TORTURE_TEST=m +# CONFIG_RCU_PERF_TEST is not set +CONFIG_RCU_TORTURE_TEST=m +# CONFIG_RCU_TORTURE_TEST_SLOW_PREINIT is not set +# CONFIG_RCU_TORTURE_TEST_SLOW_INIT is not set +# CONFIG_RCU_TORTURE_TEST_SLOW_CLEANUP is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +# CONFIG_FUNCTION_GRAPH_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +CONFIG_SCHED_TRACER=y +# CONFIG_HWLAT_TRACER is not set +CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y +# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENTS=y +CONFIG_UPROBE_EVENTS=y +CONFIG_BPF_EVENTS=y +CONFIG_PROBE_EVENTS=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set +CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_TRACE_ENUM_MAP_FILE is not set +CONFIG_TRACING_EVENTS_GPIO=y + +# +# Runtime Testing +# +# CONFIG_LKDTM is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_TEST_SORT is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set +# CONFIG_PERCPU_TEST is not set +CONFIG_ATOMIC64_SELFTEST=y +CONFIG_ASYNC_RAID6_TEST=m +# CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_STRING_HELPERS is not set +CONFIG_TEST_KSTRTOX=y +# CONFIG_TEST_PRINTF is not set +# CONFIG_TEST_BITMAP is not set +# CONFIG_TEST_UUID is not set +# CONFIG_TEST_RHASHTABLE is not set +# CONFIG_TEST_HASH is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_TEST_LKM is not set +# CONFIG_TEST_USER_COPY is not set +# CONFIG_TEST_BPF is not set +# CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_UDELAY is not set +# CONFIG_MEMTEST is not set +# CONFIG_TEST_STATIC_KEYS is not set +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_KGDB=y +CONFIG_KGDB_SERIAL_CONSOLE=y +CONFIG_KGDB_TESTS=y +# CONFIG_KGDB_TESTS_ON_BOOT is not set +# CONFIG_KGDB_KDB is not set +CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set +# CONFIG_UBSAN is not set +CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y +CONFIG_STRICT_DEVMEM=y +# CONFIG_IO_STRICT_DEVMEM is not set +# CONFIG_ARM64_PTDUMP_CORE is not set +# CONFIG_ARM64_PTDUMP_DEBUGFS is not set +# CONFIG_PID_IN_CONTEXTIDR is not set +# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set +# CONFIG_DEBUG_WX is not set +# CONFIG_DEBUG_ALIGN_RODATA is not set +# CONFIG_DEBUG_EFI is not set +# CONFIG_CORESIGHT is not set + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_PERSISTENT_KEYRINGS=y +CONFIG_BIG_KEYS=y +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=y +# CONFIG_KEY_DH_OPERATIONS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +CONFIG_SECURITY_NETWORK_XFRM=y +# CONFIG_SECURITY_PATH is not set +CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y +CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y +# CONFIG_HARDENED_USERCOPY is not set +# CONFIG_STATIC_USERMODEHELPER is not set +# CONFIG_SECURITY_SELINUX is not set +# CONFIG_SECURITY_SMACK is not set +# CONFIG_SECURITY_TOMOYO is not set +# CONFIG_SECURITY_APPARMOR is not set +# CONFIG_SECURITY_LOADPIN is not set +CONFIG_SECURITY_YAMA=y +# CONFIG_INTEGRITY is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=y +CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AKCIPHER=y +CONFIG_CRYPTO_KPP2=y +CONFIG_CRYPTO_KPP=m +CONFIG_CRYPTO_ACOMP2=y +CONFIG_CRYPTO_RSA=m +CONFIG_CRYPTO_DH=m +CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=y +CONFIG_CRYPTO_MCRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +# CONFIG_CRYPTO_TEST is not set +CONFIG_CRYPTO_SIMD=y +CONFIG_CRYPTO_ENGINE=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_SEQIV=y +CONFIG_CRYPTO_ECHAINIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_CTS=y +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=y +# CONFIG_CRYPTO_KEYWRAP is not set + +# +# Hash modes +# +CONFIG_CRYPTO_CMAC=m +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_CRC32=y +CONFIG_CRYPTO_CRCT10DIF=y +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=m +# CONFIG_CRYPTO_SHA3 is not set +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_AES_TI is not set +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST_COMMON=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_842=m +CONFIG_CRYPTO_LZ4=m +CONFIG_CRYPTO_LZ4HC=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_MENU=y +CONFIG_CRYPTO_DRBG_HMAC=y +CONFIG_CRYPTO_DRBG_HASH=y +CONFIG_CRYPTO_DRBG_CTR=y +CONFIG_CRYPTO_DRBG=y +CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_USER_API=y +CONFIG_CRYPTO_USER_API_HASH=y +CONFIG_CRYPTO_USER_API_SKCIPHER=y +CONFIG_CRYPTO_USER_API_RNG=y +CONFIG_CRYPTO_USER_API_AEAD=y +CONFIG_CRYPTO_HASH_INFO=y +CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_MARVELL_CESA is not set +# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set +CONFIG_CRYPTO_DEV_CCP=y +CONFIG_CRYPTO_DEV_CCP_DD=m +CONFIG_CRYPTO_DEV_CCP_CRYPTO=m +CONFIG_CRYPTO_DEV_QCE=m +CONFIG_CRYPTO_DEV_VIRTIO=m +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y + +# +# Certificates for signature checking +# +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set +CONFIG_ARM64_CRYPTO=y +CONFIG_CRYPTO_SHA256_ARM64=m +CONFIG_CRYPTO_SHA512_ARM64=m +CONFIG_CRYPTO_SHA1_ARM64_CE=y +CONFIG_CRYPTO_SHA2_ARM64_CE=y +CONFIG_CRYPTO_GHASH_ARM64_CE=y +CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m +CONFIG_CRYPTO_CRC32_ARM64_CE=m +# CONFIG_CRYPTO_AES_ARM64 is not set +CONFIG_CRYPTO_AES_ARM64_CE=y +CONFIG_CRYPTO_AES_ARM64_CE_CCM=y +CONFIG_CRYPTO_AES_ARM64_CE_BLK=y +CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y +# CONFIG_CRYPTO_CHACHA20_NEON is not set +# CONFIG_CRYPTO_AES_ARM64_BS is not set +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_HAVE_ARCH_BITREVERSE=y +CONFIG_RATIONAL=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=y +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +CONFIG_CRC7=y +CONFIG_LIBCRC32C=y +CONFIG_CRC8=m +CONFIG_AUDIT_GENERIC=y +CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y +CONFIG_AUDIT_COMPAT_GENERIC=y +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_842_COMPRESS=m +CONFIG_842_DECOMPRESS=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_COMPRESS=m +CONFIG_LZ4HC_COMPRESS=m +CONFIG_LZ4_DECOMPRESS=y +CONFIG_XZ_DEC=y +# CONFIG_XZ_DEC_X86 is not set +# CONFIG_XZ_DEC_POWERPC is not set +# CONFIG_XZ_DEC_IA64 is not set +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +# CONFIG_XZ_DEC_SPARC is not set +CONFIG_XZ_DEC_BCJ=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_DECOMPRESS_LZ4=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +# CONFIG_DMA_NOOP_OPS is not set +# CONFIG_DMA_VIRT_OPS is not set +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_GLOB=y +# CONFIG_GLOB_SELFTEST is not set +CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m +CONFIG_CLZ_TAB=y +CONFIG_CORDIC=m +# CONFIG_DDR is not set +CONFIG_IRQ_POLL=y +CONFIG_MPILIB=y +CONFIG_LIBFDT=y +CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y +CONFIG_FONT_SUPPORT=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_SG_SPLIT is not set +CONFIG_SG_POOL=y +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_SBITMAP=y diff --git a/srcpkgs/linux4.11/files/i386-dotconfig b/srcpkgs/linux4.11/files/i386-dotconfig new file mode 100644 index 00000000000..4ed7f839439 --- /dev/null +++ b/srcpkgs/linux4.11/files/i386-dotconfig @@ -0,0 +1,8245 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/i386 4.11.0-rc6 Kernel Configuration +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_MMU=y +CONFIG_ARCH_MMAP_RND_BITS_MIN=8 +CONFIG_ARCH_MMAP_RND_BITS_MAX=16 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_32_SMP=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_PGTABLE_LEVELS=3 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y +CONFIG_THREAD_INFO_IN_TASK=y + +# +# General setup +# +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +# CONFIG_COMPILE_TEST is not set +CONFIG_LOCALVERSION="_1" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_KERNEL_LZ4=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +# CONFIG_KERNEL_LZ4 is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_FHANDLE=y +# CONFIG_USELIB is not set +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +# CONFIG_NO_HZ is not set +CONFIG_HIGH_RES_TIMERS=y + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + +# +# RCU Subsystem +# +CONFIG_PREEMPT_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +CONFIG_TASKS_RCU=y +CONFIG_RCU_STALL_COMMON=y +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_BUILD_BIN2C=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=19 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 +CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y +CONFIG_CGROUPS=y +CONFIG_PAGE_COUNTER=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_CGROUP_WRITEBACK=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_CGROUP_PIDS=y +# CONFIG_CGROUP_RDMA is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_HUGETLB=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_BPF=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_SOCK_CGROUP_DATA=y +CONFIG_CHECKPOINT_RESTORE=y +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +CONFIG_RD_LZ4=y +CONFIG_INITRAMFS_COMPRESSION=".gz" +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BPF=y +CONFIG_EXPERT=y +CONFIG_UID16=y +CONFIG_MULTIUSER=y +CONFIG_SGETMASK_SYSCALL=y +CONFIG_SYSFS_SYSCALL=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_POSIX_TIMERS=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set +CONFIG_KALLSYMS_BASE_RELATIVE=y +CONFIG_PRINTK=y +CONFIG_PRINTK_NMI=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_BPF_SYSCALL=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_ADVISE_SYSCALLS=y +CONFIG_USERFAULTFD=y +CONFIG_PCI_QUIRKS=y +CONFIG_MEMBARRIER=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y +# CONFIG_PC104 is not set + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_MEMCG_SYSFS_ON is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_SLAB_FREELIST_RANDOM is not set +CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_DATA_VERIFICATION is not set +CONFIG_PROFILING=y +CONFIG_KEXEC_CORE=y +CONFIG_OPROFILE=m +CONFIG_OPROFILE_EVENT_MULTIPLEX=y +CONFIG_HAVE_OPROFILE=y +CONFIG_OPROFILE_NMI_TIMER=y +CONFIG_KPROBES=y +# CONFIG_JUMP_LABEL is not set +# CONFIG_UPROBES is not set +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_KRETPROBES=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y +CONFIG_HAVE_NMI=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_GCC_PLUGINS=y +# CONFIG_GCC_PLUGINS is not set +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +# CONFIG_CC_STACKPROTECTOR_REGULAR is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y +CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_HAVE_ARCH_HUGE_VMAP=y +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y +CONFIG_HAVE_EXIT_THREAD=y +CONFIG_ARCH_MMAP_RND_BITS=8 +CONFIG_HAVE_COPY_THREAD_TLS=y +# CONFIG_HAVE_ARCH_HASH is not set +# CONFIG_ISA_BUS_API is not set +CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y +# CONFIG_CPU_NO_EFFICIENT_FFS is not set +# CONFIG_HAVE_ARCH_VMAP_STACK is not set +# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set +# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_STRICT_MODULE_RWX=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set +# CONFIG_MODULE_COMPRESS is not set +# CONFIG_TRIM_UNUSED_KSYMS is not set +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_BLK_DEV_ZONED=y +CONFIG_BLK_DEV_THROTTLING=y +CONFIG_BLK_CMDLINE_PARSER=y +CONFIG_BLK_WBT=y +# CONFIG_BLK_WBT_SQ is not set +CONFIG_BLK_WBT_MQ=y +CONFIG_BLK_DEBUG_FS=y +# CONFIG_BLK_SED_OPAL is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_AIX_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_CMDLINE_PARTITION=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +CONFIG_ASN1=y +CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y +CONFIG_QUEUED_SPINLOCKS=y +CONFIG_ARCH_USE_QUEUED_RWLOCKS=y +CONFIG_QUEUED_RWLOCKS=y +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_ZONE_DMA=y +CONFIG_SMP=y +CONFIG_X86_FEATURE_NAMES=y +CONFIG_X86_FAST_FEATURE_TESTS=y +CONFIG_X86_MPPARSE=y +# CONFIG_X86_BIGSMP is not set +# CONFIG_GOLDFISH is not set +CONFIG_INTEL_RDT_A=y +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_X86_INTEL_LPSS=y +CONFIG_X86_AMD_PLATFORM_DEVICE=y +CONFIG_IOSF_MBI=y +# CONFIG_IOSF_MBI_DEBUG is not set +# CONFIG_X86_32_IRIS is not set +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set +# CONFIG_PARAVIRT_SPINLOCKS is not set +# CONFIG_XEN is not set +CONFIG_KVM_GUEST=y +CONFIG_KVM_DEBUG_FS=y +# CONFIG_LGUEST_GUEST is not set +CONFIG_PARAVIRT_TIME_ACCOUNTING=y +CONFIG_PARAVIRT_CLOCK=y +CONFIG_NO_BOOTMEM=y +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +CONFIG_M686=y +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MELAN is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +# CONFIG_X86_GENERIC is not set +CONFIG_X86_INTERNODE_CACHE_SHIFT=5 +CONFIG_X86_L1_CACHE_SHIFT=5 +# CONFIG_X86_PPRO_FENCE is not set +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=5 +CONFIG_X86_DEBUGCTLMSR=y +# CONFIG_PROCESSOR_SELECT is not set +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_CYRIX_32=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_CPU_SUP_UMC_32=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +CONFIG_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +CONFIG_SCHED_MC_PRIO=y +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +# CONFIG_X86_ANCIENT_MCE is not set +CONFIG_X86_MCE_THRESHOLD=y +CONFIG_X86_MCE_INJECT=m +CONFIG_X86_THERMAL_VECTOR=y + +# +# Performance monitoring +# +CONFIG_PERF_EVENTS_INTEL_UNCORE=y +CONFIG_PERF_EVENTS_INTEL_RAPL=m +CONFIG_PERF_EVENTS_INTEL_CSTATE=m +CONFIG_PERF_EVENTS_AMD_POWER=m +# CONFIG_X86_LEGACY_VM86 is not set +# CONFIG_VM86 is not set +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX32=y +# CONFIG_TOSHIBA is not set +CONFIG_I8K=m +# CONFIG_X86_REBOOTFIXUPS is not set +CONFIG_MICROCODE=y +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +# CONFIG_NOHIGHMEM is not set +# CONFIG_HIGHMEM4G is not set +CONFIG_HIGHMEM64G=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +CONFIG_X86_PAE=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_NEED_NODE_MEMMAP_SIZE=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ILLEGAL_POINTER_VALUE=0 +CONFIG_SELECT_MEMORY_MODEL=y +# CONFIG_FLATMEM_MANUAL is not set +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTPLUG_SPARSE=y +CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y +CONFIG_MEMORY_HOTREMOVE=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_TRANSPARENT_HUGE_PAGECACHE=y +CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y +# CONFIG_CMA is not set +CONFIG_ZSWAP=y +CONFIG_ZPOOL=y +CONFIG_ZBUD=y +CONFIG_Z3FOLD=m +CONFIG_ZSMALLOC=y +CONFIG_PGTABLE_MAPPING=y +# CONFIG_ZSMALLOC_STAT is not set +CONFIG_GENERIC_EARLY_IOREMAP=y +CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y +# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set +CONFIG_IDLE_PAGE_TRACKING=y +CONFIG_FRAME_VECTOR=y +# CONFIG_X86_PMEM_LEGACY is not set +# CONFIG_HIGHPTE is not set +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y +CONFIG_X86_INTEL_MPX=y +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_SECCOMP=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +CONFIG_CRASH_DUMP=y +# CONFIG_KEXEC_JUMP is not set +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_RANDOMIZE_BASE=y +CONFIG_X86_NEED_RELOCS=y +CONFIG_PHYSICAL_ALIGN=0x1000000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_MODIFY_LDT_SYSCALL=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y + +# +# Power management and ACPI options +# +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_SUSPEND_SKIP_SYNC is not set +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_CLK=y +CONFIG_PM_GENERIC_DOMAINS=y +CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y +CONFIG_PM_GENERIC_DOMAINS_SLEEP=y +CONFIG_ACPI=y +CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y +CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y +CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y +# CONFIG_ACPI_DEBUGGER is not set +CONFIG_ACPI_SLEEP=y +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y +CONFIG_ACPI_EC_DEBUGFS=m +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_CPU_FREQ_PSS=y +CONFIG_ACPI_PROCESSOR_CSTATE=y +CONFIG_ACPI_PROCESSOR_IDLE=y +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=m +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y +CONFIG_ACPI_TABLE_UPGRADE=y +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=y +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=y +CONFIG_ACPI_HOTPLUG_MEMORY=y +CONFIG_ACPI_HOTPLUG_IOAPIC=y +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=y +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_BGRT=y +# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set +# CONFIG_ACPI_NFIT is not set +CONFIG_HAVE_ACPI_APEI=y +CONFIG_HAVE_ACPI_APEI_NMI=y +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_EINJ=m +CONFIG_ACPI_APEI_ERST_DEBUG=m +CONFIG_DPTF_POWER=m +CONFIG_ACPI_WATCHDOG=y +CONFIG_ACPI_EXTLOG=m +# CONFIG_PMIC_OPREGION is not set +CONFIG_ACPI_CONFIGFS=m +CONFIG_SFI=y +# CONFIG_APM is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_ATTR_SET=y +CONFIG_CPU_FREQ_GOV_COMMON=y +# CONFIG_CPU_FREQ_STAT is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y + +# +# CPU frequency scaling drivers +# +CONFIG_X86_INTEL_PSTATE=y +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y +# CONFIG_X86_POWERNOW_K6 is not set +# CONFIG_X86_POWERNOW_K7 is not set +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_AMD_FREQ_SENSITIVITY=m +# CONFIG_X86_GX_SUSPMOD is not set +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +# CONFIG_X86_SPEEDSTEP_ICH is not set +# CONFIG_X86_SPEEDSTEP_SMI is not set +CONFIG_X86_P4_CLOCKMOD=m +# CONFIG_X86_CPUFREQ_NFORCE2 is not set +# CONFIG_X86_LONGRUN is not set +# CONFIG_X86_LONGHAUL is not set +# CONFIG_X86_E_POWERSAVER is not set + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m + +# +# CPU Idle +# +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set +CONFIG_INTEL_IDLE=y + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_DOMAINS=y +# CONFIG_PCI_CNB20LE_QUIRK is not set +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=y +CONFIG_PCIEAER=y +# CONFIG_PCIE_ECRC is not set +CONFIG_PCIEAER_INJECT=m +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +# CONFIG_PCIEASPM_DEFAULT is not set +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set +CONFIG_PCIEASPM_PERFORMANCE=y +CONFIG_PCIE_PME=y +# CONFIG_PCIE_DPC is not set +# CONFIG_PCIE_PTM is not set +CONFIG_PCI_BUS_ADDR_T_64BIT=y +CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_REALLOC_ENABLE_AUTO=y +CONFIG_PCI_STUB=m +CONFIG_HT_IRQ=y +CONFIG_PCI_ATS=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_LABEL=y +CONFIG_HOTPLUG_PCI=y +# CONFIG_HOTPLUG_PCI_COMPAQ is not set +# CONFIG_HOTPLUG_PCI_IBM is not set +CONFIG_HOTPLUG_PCI_ACPI=y +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=m + +# +# DesignWare PCI Core Support +# +CONFIG_PCIE_DW=y +CONFIG_PCIE_DW_HOST=y +CONFIG_PCIE_DW_PLAT=y + +# +# PCI host controller drivers +# +# CONFIG_ISA_BUS is not set +CONFIG_ISA_DMA_API=y +# CONFIG_ISA is not set +# CONFIG_SCx200 is not set +# CONFIG_ALIX is not set +# CONFIG_NET5501 is not set +# CONFIG_GEOS is not set +CONFIG_AMD_NB=y +CONFIG_PCCARD=m +# CONFIG_PCMCIA is not set +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_RAPIDIO=m +CONFIG_RAPIDIO_TSI721=m +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y +CONFIG_RAPIDIO_DMA_ENGINE=y +CONFIG_RAPIDIO_DEBUG=y +CONFIG_RAPIDIO_ENUM_BASIC=m +CONFIG_RAPIDIO_CHMAN=m +CONFIG_RAPIDIO_MPORT_CDEV=m + +# +# RapidIO Switch drivers +# +CONFIG_RAPIDIO_TSI57X=m +CONFIG_RAPIDIO_CPS_XX=m +CONFIG_RAPIDIO_TSI568=m +CONFIG_RAPIDIO_CPS_GEN2=m +CONFIG_RAPIDIO_RXS_GEN3=m +# CONFIG_X86_SYSFB is not set + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_ELFCORE=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=m +CONFIG_COREDUMP=y +CONFIG_COMPAT_32=y +CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_NET=y +CONFIG_NET_INGRESS=y +CONFIG_NET_EGRESS=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +CONFIG_XFRM=y +CONFIG_XFRM_OFFLOAD=y +CONFIG_XFRM_ALGO=m +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +CONFIG_XFRM_MIGRATE=y +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +CONFIG_SMC=m +CONFIG_SMC_DIAG=m +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +# CONFIG_IP_FIB_TRIE_STATS is not set +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +CONFIG_NET_UDP_TUNNEL=m +CONFIG_NET_FOU=m +# CONFIG_NET_FOU_IP_TUNNELS is not set +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_ESP_OFFLOAD=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_INET_UDP_DIAG=y +CONFIG_INET_RAW_DIAG=m +CONFIG_INET_DIAG_DESTROY=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_NV=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_TCP_CONG_DCTCP=m +CONFIG_TCP_CONG_CDG=m +CONFIG_TCP_CONG_BBR=m +CONFIG_DEFAULT_RENO=y +CONFIG_DEFAULT_TCP_CONG="reno" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_ESP_OFFLOAD=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_IPV6_ILA=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m +CONFIG_IPV6_FOU=m +# CONFIG_IPV6_FOU_TUNNEL is not set +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +# CONFIG_IPV6_MROUTE is not set +CONFIG_IPV6_SEG6_LWTUNNEL=y +CONFIG_IPV6_SEG6_INLINE=y +CONFIG_IPV6_SEG6_HMAC=y +# CONFIG_NETLABEL is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NET_PTP_CLASSIFY=y +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=m + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_INGRESS=y +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_ACCT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m +CONFIG_NF_LOG_NETDEV=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_ZONES=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_EVENTS=y +# CONFIG_NF_CONNTRACK_TIMEOUT is not set +# CONFIG_NF_CONNTRACK_TIMESTAMP is not set +CONFIG_NF_CONNTRACK_LABELS=y +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_GLUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=y +CONFIG_NF_NAT_PROTO_UDPLITE=y +CONFIG_NF_NAT_PROTO_SCTP=y +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_REDIRECT=m +CONFIG_NETFILTER_SYNPROXY=m +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_INET=m +CONFIG_NF_TABLES_NETDEV=m +CONFIG_NFT_EXTHDR=m +CONFIG_NFT_META=m +CONFIG_NFT_RT=m +CONFIG_NFT_NUMGEN=m +CONFIG_NFT_CT=m +CONFIG_NFT_SET_RBTREE=m +CONFIG_NFT_SET_HASH=m +CONFIG_NFT_SET_BITMAP=m +CONFIG_NFT_COUNTER=m +CONFIG_NFT_LOG=m +CONFIG_NFT_LIMIT=m +CONFIG_NFT_MASQ=m +CONFIG_NFT_REDIR=m +CONFIG_NFT_NAT=m +CONFIG_NFT_OBJREF=m +CONFIG_NFT_QUEUE=m +CONFIG_NFT_QUOTA=m +CONFIG_NFT_REJECT=m +CONFIG_NFT_REJECT_INET=m +CONFIG_NFT_COMPAT=m +CONFIG_NFT_HASH=m +CONFIG_NFT_FIB=m +CONFIG_NFT_FIB_INET=m +CONFIG_NF_DUP_NETDEV=m +CONFIG_NFT_DUP_NETDEV=m +CONFIG_NFT_FWD_NETDEV=m +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_HMARK=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_NAT=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m +CONFIG_NETFILTER_XT_MATCH_CGROUP=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_L2TP=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPMARK=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_IPMAC=m +CONFIG_IP_SET_HASH_MAC=m +CONFIG_IP_SET_HASH_NETPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETNET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_FO=m +CONFIG_IP_VS_OVF=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_SOCKET_IPV4=m +CONFIG_NF_TABLES_IPV4=m +CONFIG_NFT_CHAIN_ROUTE_IPV4=m +CONFIG_NFT_REJECT_IPV4=m +CONFIG_NFT_DUP_IPV4=m +CONFIG_NFT_FIB_IPV4=m +CONFIG_NF_TABLES_ARP=m +CONFIG_NF_DUP_IPV4=m +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m +CONFIG_NF_REJECT_IPV4=m +CONFIG_NF_NAT_IPV4=m +CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_NF_NAT_MASQUERADE_IPV4=m +CONFIG_NFT_MASQ_IPV4=m +CONFIG_NFT_REDIR_IPV4=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_SYNPROXY=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +# CONFIG_IP_NF_SECURITY is not set +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_NF_SOCKET_IPV6=m +CONFIG_NF_TABLES_IPV6=m +CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_REJECT_IPV6=m +CONFIG_NFT_DUP_IPV6=m +CONFIG_NFT_FIB_IPV6=m +CONFIG_NF_DUP_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +CONFIG_NF_NAT_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NF_NAT_MASQUERADE_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_TARGET_SYNPROXY=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +# CONFIG_IP6_NF_SECURITY is not set +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m +CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NF_LOG_BRIDGE=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_NET_DCCPPROBE=m +CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +# CONFIG_SCTP_COOKIE_HMAC_MD5 is not set +CONFIG_SCTP_COOKIE_HMAC_SHA1=y +CONFIG_INET_SCTP_DIAG=m +CONFIG_RDS=m +# CONFIG_RDS_RDMA is not set +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set +CONFIG_TIPC=m +CONFIG_TIPC_MEDIA_IB=y +CONFIG_TIPC_MEDIA_UDP=y +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +CONFIG_L2TP_DEBUGFS=m +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_MRP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_BRCM=y +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_TRAILER=y +CONFIG_NET_DSA_TAG_QCA=y +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +CONFIG_VLAN_8021Q_MVRP=y +# CONFIG_DECNET is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_IPX=m +CONFIG_IPX_INTERN=y +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_PHONET=m +# CONFIG_6LOWPAN is not set +CONFIG_IEEE802154=m +CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y +CONFIG_IEEE802154_SOCKET=m +CONFIG_MAC802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_FQ=m +CONFIG_NET_SCH_HHF=m +CONFIG_NET_SCH_PIE=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +# CONFIG_NET_CLS_CGROUP is not set +CONFIG_NET_CLS_BPF=m +CONFIG_NET_CLS_FLOWER=m +CONFIG_NET_CLS_MATCHALL=m +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_SAMPLE=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_ACT_VLAN=m +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m +CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_IFE=m +CONFIG_NET_ACT_TUNNEL_KEY=m +CONFIG_NET_IFE_SKBMARK=m +CONFIG_NET_IFE_SKBPRIO=m +CONFIG_NET_IFE_SKBTCINDEX=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +CONFIG_DCB=y +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +CONFIG_BATMAN_ADV_BATMAN_V=y +CONFIG_BATMAN_ADV_BLA=y +CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y +CONFIG_BATMAN_ADV_MCAST=y +CONFIG_BATMAN_ADV_DEBUGFS=y +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_OPENVSWITCH_GRE=m +CONFIG_OPENVSWITCH_VXLAN=m +CONFIG_OPENVSWITCH_GENEVE=m +CONFIG_VSOCKETS=m +CONFIG_VMWARE_VMCI_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS_COMMON=m +CONFIG_NETLINK_DIAG=m +CONFIG_MPLS=y +CONFIG_NET_MPLS_GSO=m +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m +CONFIG_HSR=m +CONFIG_NET_SWITCHDEV=y +CONFIG_NET_L3_MASTER_DEV=y +# CONFIG_NET_NCSI is not set +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_CGROUP_NET_PRIO=y +CONFIG_CGROUP_NET_CLASSID=y +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +CONFIG_NET_FLOW_LIMIT=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_NET_TCPPROBE=y +# CONFIG_HAMRADIO is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +CONFIG_CAN_SLCAN=m +CONFIG_CAN_DEV=m +CONFIG_CAN_CALC_BITTIMING=y +CONFIG_CAN_LEDS=y +# CONFIG_CAN_JANZ_ICAN3 is not set +# CONFIG_PCH_CAN is not set +CONFIG_CAN_C_CAN=m +CONFIG_CAN_C_CAN_PLATFORM=m +CONFIG_CAN_C_CAN_PCI=m +CONFIG_CAN_CC770=m +CONFIG_CAN_CC770_ISA=m +CONFIG_CAN_CC770_PLATFORM=m +CONFIG_CAN_IFI_CANFD=m +CONFIG_CAN_M_CAN=m +# CONFIG_CAN_SJA1000 is not set +CONFIG_CAN_SOFTING=m + +# +# CAN SPI interfaces +# +CONFIG_CAN_MCP251X=m + +# +# CAN USB interfaces +# +CONFIG_CAN_EMS_USB=m +CONFIG_CAN_ESD_USB2=m +CONFIG_CAN_GS_USB=m +CONFIG_CAN_KVASER_USB=m +CONFIG_CAN_PEAK_USB=m +CONFIG_CAN_8DEV_USB=m +CONFIG_CAN_DEBUG_DEVICES=y +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +# CONFIG_TOSHIBA_FIR is not set +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_BREDR=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m +CONFIG_BT_HS=y +CONFIG_BT_LE=y +CONFIG_BT_LEDS=y +# CONFIG_BT_SELFTEST is not set +CONFIG_BT_DEBUGFS=y + +# +# Bluetooth device drivers +# +CONFIG_BT_INTEL=m +CONFIG_BT_BCM=m +CONFIG_BT_RTL=m +CONFIG_BT_QCA=m +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTUSB_BCM=y +CONFIG_BT_HCIBTUSB_RTL=y +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_INTEL=y +CONFIG_BT_HCIUART_BCM=y +CONFIG_BT_HCIUART_QCA=y +CONFIG_BT_HCIUART_AG6XX=y +# CONFIG_BT_HCIUART_MRVL is not set +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_IPV6 is not set +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +# CONFIG_AF_RXRPC_DEBUG is not set +# CONFIG_RXKAD is not set +CONFIG_AF_KCM=m +CONFIG_STREAM_PARSER=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_CERTIFICATION_ONUS is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_CRDA_SUPPORT=y +CONFIG_CFG80211_WEXT=y +CONFIG_CFG80211_WEXT_EXPORT=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +# CONFIG_MAC80211_RC_MINSTREL_VHT is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_MESSAGE_TRACING is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_RFKILL_GPIO=m +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_RDMA is not set +# CONFIG_NET_9P_DEBUG is not set +CONFIG_CAIF=m +# CONFIG_CAIF_DEBUG is not set +CONFIG_CAIF_NETDEV=m +CONFIG_CAIF_USB=m +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y +CONFIG_NFC=m +CONFIG_NFC_DIGITAL=m +CONFIG_NFC_NCI=m +CONFIG_NFC_NCI_SPI=m +CONFIG_NFC_NCI_UART=m +CONFIG_NFC_HCI=m +# CONFIG_NFC_SHDLC is not set + +# +# Near Field Communication (NFC) devices +# +CONFIG_NFC_WILINK=m +CONFIG_NFC_TRF7970A=m +CONFIG_NFC_MEI_PHY=m +CONFIG_NFC_SIM=m +CONFIG_NFC_PORT100=m +CONFIG_NFC_FDP=m +CONFIG_NFC_FDP_I2C=m +CONFIG_NFC_PN544=m +CONFIG_NFC_PN544_MEI=m +CONFIG_NFC_PN533=m +CONFIG_NFC_PN533_USB=m +CONFIG_NFC_PN533_I2C=m +CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_MEI=m +CONFIG_NFC_MRVL=m +CONFIG_NFC_MRVL_USB=m +CONFIG_NFC_MRVL_UART=m +CONFIG_NFC_MRVL_I2C=m +CONFIG_NFC_MRVL_SPI=m +CONFIG_NFC_ST_NCI=m +CONFIG_NFC_ST_NCI_I2C=m +CONFIG_NFC_ST_NCI_SPI=m +CONFIG_NFC_NXP_NCI=m +CONFIG_NFC_NXP_NCI_I2C=m +CONFIG_NFC_S3FWRN5=m +CONFIG_NFC_S3FWRN5_I2C=m +CONFIG_NFC_ST95HF=m +CONFIG_PSAMPLE=m +CONFIG_NET_IFE=m +CONFIG_LWTUNNEL=y +CONFIG_LWTUNNEL_BPF=y +CONFIG_DST_CACHE=y +CONFIG_GRO_CELLS=y +CONFIG_NET_DEVLINK=m +CONFIG_MAY_USE_DEVLINK=m + +# +# Device Drivers +# + +# +# Generic Driver Options +# +# CONFIG_UEVENT_HELPER is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_WANT_DEV_COREDUMP=y +CONFIG_ALLOW_DEV_COREDUMP=y +CONFIG_DEV_COREDUMP=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +CONFIG_TEST_ASYNC_DRIVER_PROBE=m +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_SPI=y +CONFIG_REGMAP_SPMI=m +CONFIG_REGMAP_MMIO=y +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set + +# +# Bus devices +# +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=m +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_CMDLINE_PARTS=m +CONFIG_MTD_AR7_PARTS=m + +# +# User Modules And Translation Layers +# +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set +# CONFIG_MTD_OOPS is not set +CONFIG_MTD_SWAP=m +# CONFIG_MTD_PARTITIONED_MASTER is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +CONFIG_MTD_PHRAM=m +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +CONFIG_MTD_DOCG3=m +CONFIG_BCH_CONST_M=14 +CONFIG_BCH_CONST_T=4 +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR & LPDDR2 PCM memory drivers +# +# CONFIG_MTD_LPDDR is not set +# CONFIG_MTD_SPI_NOR is not set +# CONFIG_MTD_UBI is not set +# CONFIG_OF is not set +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_NULL_BLK=m +CONFIG_BLK_DEV_FD=m +# CONFIG_PARIDE is not set +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_ZRAM=m +CONFIG_BLK_CPQ_CISS_DA=m +# CONFIG_CISS_SCSI_TAPE is not set +CONFIG_BLK_DEV_DAC960=m +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_RAM_DAX is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_VIRTIO_BLK=m +# CONFIG_VIRTIO_BLK_SCSI is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m +CONFIG_NVME_CORE=m +CONFIG_BLK_DEV_NVME=m +# CONFIG_BLK_DEV_NVME_SCSI is not set +CONFIG_NVME_FABRICS=m +CONFIG_NVME_RDMA=m +CONFIG_NVME_FC=m +CONFIG_NVME_TARGET=m +CONFIG_NVME_TARGET_LOOP=m +CONFIG_NVME_TARGET_RDMA=m +CONFIG_NVME_TARGET_FC=m +CONFIG_NVME_TARGET_FCLOOP=m + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +CONFIG_AD525X_DPOT_SPI=m +CONFIG_DUMMY_IRQ=m +# CONFIG_IBM_ASM is not set +CONFIG_PHANTOM=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_CS5535_MFGPT=m +CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 +CONFIG_CS5535_CLOCK_EVENT_SRC=m +CONFIG_HP_ILO=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +CONFIG_TI_DAC7512=m +CONFIG_VMWARE_BALLOON=m +CONFIG_PCH_PHUB=m +CONFIG_USB_SWITCH_FSA9480=m +CONFIG_LATTICE_ECP3_CONFIG=m +CONFIG_SRAM=y +CONFIG_PANEL=m +CONFIG_PANEL_PARPORT=0 +CONFIG_PANEL_PROFILE=5 +# CONFIG_PANEL_CHANGE_MESSAGE is not set +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_EEPROM_93XX46=m +CONFIG_EEPROM_IDT_89HPESX=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m +CONFIG_INTEL_MEI_TXE=m +CONFIG_VMWARE_VMCI=m + +# +# Intel MIC Bus Driver +# + +# +# SCIF Bus Driver +# + +# +# VOP Bus Driver +# + +# +# Intel MIC Host Driver +# + +# +# Intel MIC Card Driver +# + +# +# SCIF Driver +# + +# +# Intel MIC Coprocessor State Management (COSM) Drivers +# + +# +# VOP Driver +# +CONFIG_VHOST_RING=m +CONFIG_ECHO=m +# CONFIG_CXL_BASE is not set +# CONFIG_CXL_AFU_DRIVER_OPS is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_NETLINK=y +# CONFIG_SCSI_MQ_DEFAULT is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +# CONFIG_SCSI_MVSAS_TASKLET is not set +CONFIG_SCSI_MVUMI=m +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_ARCMSR=m +CONFIG_SCSI_ESAS2R=m +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT3SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_SMARTPQI=m +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m +# CONFIG_SCSI_UFS_DWC_TC_PCI is not set +CONFIG_SCSI_UFSHCD_PLATFORM=m +# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +# CONFIG_SCSI_FLASHPOINT is not set +CONFIG_VMWARE_PVSCSI=m +CONFIG_HYPERV_STORAGE=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +CONFIG_SCSI_SNIC=m +# CONFIG_SCSI_SNIC_DEBUG_FS is not set +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_EATA=m +CONFIG_SCSI_EATA_TAGGED_QUEUE=y +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_TCM_QLA2XXX=m +# CONFIG_TCM_QLA2XXX_DEBUG is not set +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_QEDI=m +CONFIG_QEDF=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_AM53C974=m +# CONFIG_SCSI_NSP32 is not set +CONFIG_SCSI_WD719X=m +# CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_CHELSIO_FCOE=m +CONFIG_SCSI_DH=y +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=0 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_ZPODD=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=m +CONFIG_SATA_DWC=m +# CONFIG_SATA_DWC_OLD_DMA is not set +# CONFIG_SATA_DWC_DEBUG is not set +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +# CONFIG_PATA_CS5535 is not set +CONFIG_PATA_CS5536=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +CONFIG_PATA_HPT3X3_DMA=y +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RDC=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PLATFORM=m +CONFIG_PATA_RZ1000=m + +# +# Generic fallback / legacy drivers +# +CONFIG_PATA_ACPI=m +CONFIG_ATA_GENERIC=m +# CONFIG_PATA_LEGACY is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_MD_CLUSTER=m +CONFIG_BCACHE=m +# CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=m +CONFIG_DM_MQ_DEFAULT=y +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING=y +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_BIO_PRISON=m +CONFIG_DM_PERSISTENT_DATA=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_SMQ=m +CONFIG_DM_CACHE_CLEANER=m +CONFIG_DM_ERA=m +CONFIG_DM_MIRROR=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_RAID=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +# CONFIG_DM_VERITY_FEC is not set +CONFIG_DM_SWITCH=m +CONFIG_DM_LOG_WRITES=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_TCM_USER2=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_ISCSI_TARGET_CXGB4=m +CONFIG_SBP_TARGET=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +# CONFIG_FUSION_LAN is not set +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=m +CONFIG_NETDEVICES=y +CONFIG_MII=y +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +CONFIG_NET_FC=y +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_RANDOM=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_IPVLAN=m +CONFIG_IPVTAP=m +CONFIG_VXLAN=m +CONFIG_GENEVE=m +CONFIG_GTP=m +CONFIG_MACSEC=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_NTB_NETDEV=m +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 +CONFIG_TUN=m +CONFIG_TAP=m +CONFIG_TUN_VNET_CROSS_LE=y +CONFIG_VETH=m +CONFIG_VIRTIO_NET=m +CONFIG_NLMON=m +CONFIG_NET_VRF=m +CONFIG_SUNGEM_PHY=m +# CONFIG_ARCNET is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +CONFIG_ATM_NICSTAR_USE_SUNI=y +CONFIG_ATM_NICSTAR_USE_IDT77105=y +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_ATM_SOLOS=m + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +# CONFIG_CAIF_SPI_SYNC is not set +CONFIG_CAIF_HSI=m +CONFIG_CAIF_VIRTIO=m + +# +# Distributed Switch Architecture drivers +# +CONFIG_NET_DSA_MV88E6060=m +CONFIG_NET_DSA_BCM_SF2=m +CONFIG_B53=m +CONFIG_B53_SPI_DRIVER=m +CONFIG_B53_MDIO_DRIVER=m +CONFIG_B53_MMAP_DRIVER=m +CONFIG_B53_SRAB_DRIVER=m +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y +CONFIG_NET_DSA_QCA8K=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_AGERE=y +CONFIG_ET131X=m +CONFIG_NET_VENDOR_ALACRITECH=y +CONFIG_SLICOSS=m +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_ALTERA_TSE=m +CONFIG_NET_VENDOR_AMAZON=y +CONFIG_ENA_ETHERNET=m +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_PCNET32=y +CONFIG_AMD_XGBE=m +# CONFIG_AMD_XGBE_DCB is not set +CONFIG_AMD_XGBE_HAVE_ECC=y +CONFIG_NET_VENDOR_AQUANTIA=y +CONFIG_NET_VENDOR_ARC=y +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_ALX=m +CONFIG_NET_VENDOR_AURORA=y +CONFIG_AURORA_NB8800=m +CONFIG_NET_CADENCE=y +CONFIG_MACB=m +CONFIG_MACB_PCI=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_BCMGENET=m +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y +CONFIG_BNXT=m +CONFIG_BNXT_SRIOV=y +CONFIG_BNXT_DCB=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_VENDOR_CAVIUM=y +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +# CONFIG_CHELSIO_T4_DCB is not set +CONFIG_CHELSIO_T4VF=m +CONFIG_CHELSIO_LIB=m +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +CONFIG_CX_ECAT=m +CONFIG_DNET=m +CONFIG_NET_VENDOR_DEC=y +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +# CONFIG_PCMCIA_XIRCOM is not set +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_BE2NET_HWMON=y +CONFIG_NET_VENDOR_EZCHIP=y +CONFIG_NET_VENDOR_EXAR=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_NET_VENDOR_HP=y +CONFIG_HP100=m +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=y +CONFIG_E1000=y +CONFIG_E1000E=y +CONFIG_E1000E_HWTS=y +CONFIG_IGB=m +CONFIG_IGB_HWMON=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_HWMON=y +# CONFIG_IXGBE_DCB is not set +CONFIG_IXGBEVF=m +CONFIG_I40E=m +CONFIG_I40E_DCB=y +# CONFIG_I40E_FCOE is not set +CONFIG_I40EVF=m +CONFIG_FM10K=m +CONFIG_NET_VENDOR_I825XX=y +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=m +# CONFIG_MVNETA_BM is not set +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +# CONFIG_SKGE_GENESIS is not set +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_DCB=y +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_MLX5_CORE=m +CONFIG_MLX5_CORE_EN=y +CONFIG_MLX5_CORE_EN_DCB=y +CONFIG_MLXSW_CORE=m +CONFIG_MLXSW_CORE_HWMON=y +CONFIG_MLXSW_CORE_THERMAL=y +CONFIG_MLXSW_PCI=m +CONFIG_MLXSW_I2C=m +CONFIG_MLXSW_SWITCHIB=m +CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLXSW_SPECTRUM=m +CONFIG_MLXSW_SPECTRUM_DCB=y +CONFIG_MLXSW_MINIMAL=m +CONFIG_NET_VENDOR_MICREL=y +CONFIG_KS8842=m +CONFIG_KS8851=m +CONFIG_KS8851_MLL=m +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +CONFIG_ENC28J60=m +# CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_ENCX24J600=m +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_NETRONOME=y +CONFIG_NFP=m +# CONFIG_NFP_DEBUG is not set +CONFIG_NET_VENDOR_8390=y +CONFIG_NE2K_PCI=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +# CONFIG_PCH_GBE is not set +CONFIG_ETHOC=m +# CONFIG_NET_PACKET_ENGINE is not set +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLCNIC_SRIOV=y +CONFIG_QLCNIC_DCB=y +CONFIG_QLCNIC_HWMON=y +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_QED=m +CONFIG_QED_LL2=y +CONFIG_QED_SRIOV=y +CONFIG_QEDE=m +CONFIG_QED_ISCSI=y +CONFIG_QED_FCOE=y +CONFIG_NET_VENDOR_QUALCOMM=y +CONFIG_QCOM_EMAC=m +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_ATP=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RENESAS=y +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_ROCKER=y +CONFIG_ROCKER=m +CONFIG_NET_VENDOR_SAMSUNG=y +CONFIG_SXGBE_ETH=m +CONFIG_NET_VENDOR_SEEQ=y +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_NET_VENDOR_SOLARFLARE=y +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y +CONFIG_SFC_MCDI_LOGGING=y +CONFIG_SFC_FALCON=m +CONFIG_SFC_FALCON_MTD=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_EPIC100=m +CONFIG_SMSC911X=m +# CONFIG_SMSC911X_ARCH_HOOKS is not set +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +CONFIG_STMMAC_PLATFORM=m +CONFIG_DWMAC_GENERIC=m +CONFIG_STMMAC_PCI=m +CONFIG_NET_VENDOR_SUN=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TI_CPSW_ALE=m +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WIZNET=y +CONFIG_WIZNET_W5100=m +CONFIG_WIZNET_W5300=m +# CONFIG_WIZNET_BUS_DIRECT is not set +# CONFIG_WIZNET_BUS_INDIRECT is not set +CONFIG_WIZNET_BUS_ANY=y +CONFIG_WIZNET_W5100_SPI=m +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_NET_SB1000=m +CONFIG_PHYLIB=y +CONFIG_SWPHY=y +CONFIG_LED_TRIGGER_PHY=y + +# +# MDIO bus device drivers +# +CONFIG_MDIO_BCM_UNIMAC=m +CONFIG_MDIO_BITBANG=m +CONFIG_MDIO_GPIO=m + +# +# MII PHY device drivers +# +CONFIG_AMD_PHY=m +CONFIG_AQUANTIA_PHY=m +CONFIG_AT803X_PHY=m +CONFIG_BCM7XXX_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_BCM_NET_PHYLIB=m +CONFIG_BROADCOM_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_DP83848_PHY=m +CONFIG_DP83867_PHY=m +CONFIG_FIXED_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_INTEL_XWAY_PHY=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_LXT_PHY=m +CONFIG_MARVELL_PHY=m +CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_PHY=m +CONFIG_MICROSEMI_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_STE10XP=m +CONFIG_TERANETICS_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_XILINX_GMII2RGMII=m +CONFIG_MICREL_KS8995MA=m +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +# CONFIG_SLIP_COMPRESSED is not set +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set + +# +# Host-side USB support is needed for USB Network Adapter support +# +CONFIG_USB_NET_DRIVERS=m +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=m +CONFIG_USB_LAN78XX=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_HUAWEI_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SR9700=m +CONFIG_USB_NET_SR9800=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET_ENABLE=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_USB_NET_CH9200=m +CONFIG_WLAN=y +CONFIG_WIRELESS_WDS=y +CONFIG_WLAN_VENDOR_ADMTEK=y +CONFIG_ADM8211=m +CONFIG_ATH_COMMON=m +CONFIG_WLAN_VENDOR_ATH=y +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +# CONFIG_ATH9K_AHB is not set +# CONFIG_ATH9K_DEBUGFS is not set +# CONFIG_ATH9K_DYNACK is not set +CONFIG_ATH9K_WOW=y +CONFIG_ATH9K_RFKILL=y +# CONFIG_ATH9K_CHANNEL_CONTEXT is not set +CONFIG_ATH9K_PCOEM=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +CONFIG_ATH9K_HWRNG=y +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +CONFIG_CARL9170_WPC=y +CONFIG_CARL9170_HWRNG=y +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +# CONFIG_ATH6KL_DEBUG is not set +CONFIG_AR5523=m +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y +CONFIG_ATH10K=m +CONFIG_ATH10K_PCI=m +# CONFIG_ATH10K_DEBUG is not set +# CONFIG_ATH10K_DEBUGFS is not set +CONFIG_WCN36XX=m +# CONFIG_WCN36XX_DEBUGFS is not set +CONFIG_WLAN_VENDOR_ATMEL=y +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_WLAN_VENDOR_BROADCOM=y +CONFIG_B43=m +CONFIG_B43_BCMA=y +CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_G=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_PROTO_BCDC=y +CONFIG_BRCMFMAC_PROTO_MSGBUF=y +CONFIG_BRCMFMAC_SDIO=y +CONFIG_BRCMFMAC_USB=y +CONFIG_BRCMFMAC_PCIE=y +# CONFIG_BRCM_TRACING is not set +# CONFIG_BRCMDBG is not set +CONFIG_WLAN_VENDOR_CISCO=y +CONFIG_AIRO=m +CONFIG_WLAN_VENDOR_INTEL=y +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y +CONFIG_IWLWIFI_BCAST_FILTERING=y +CONFIG_IWLWIFI_PCIE_RTPM=y + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_WLAN_VENDOR_INTERSIL=y +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HERMES=m +CONFIG_HERMES_PRISM=y +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_ORINOCO_USB=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_SPI=m +# CONFIG_P54_SPI_DEFAULT_EEPROM is not set +CONFIG_P54_LEDS=y +CONFIG_PRISM54=m +CONFIG_WLAN_VENDOR_MARVELL=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_SDIO=m +CONFIG_LIBERTAS_SPI=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m +CONFIG_MWL8K=m +CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_MT7601U=m +CONFIG_WLAN_VENDOR_RALINK=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT3573=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2800_LIB_MMIO=m +CONFIG_RT2X00_LIB_MMIO=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_WLAN_VENDOR_REALTEK=y +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_RTL_CARDS=m +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m +CONFIG_RTL8723BE=m +CONFIG_RTL8188EE=m +CONFIG_RTL8192EE=m +CONFIG_RTL8821AE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_PCI=m +CONFIG_RTLWIFI_USB=m +CONFIG_RTLWIFI_DEBUG=y +CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8723_COMMON=m +CONFIG_RTLBTCOEXIST=m +CONFIG_RTL8XXXU=m +# CONFIG_RTL8XXXU_UNTESTED is not set +CONFIG_WLAN_VENDOR_RSI=y +CONFIG_RSI_91X=m +CONFIG_RSI_DEBUGFS=y +CONFIG_RSI_SDIO=m +CONFIG_RSI_USB=m +CONFIG_WLAN_VENDOR_ST=y +CONFIG_CW1200=m +CONFIG_CW1200_WLAN_SDIO=m +CONFIG_CW1200_WLAN_SPI=m +CONFIG_WLAN_VENDOR_TI=y +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX=m +CONFIG_WL18XX=m +CONFIG_WLCORE=m +CONFIG_WLCORE_SDIO=m +CONFIG_WILINK_PLATFORM_DATA=y +CONFIG_WLAN_VENDOR_ZYDAS=y +CONFIG_USB_ZD1201=m +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +# CONFIG_MAC80211_HWSIM is not set +CONFIG_USB_NET_RNDIS_WLAN=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +# CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set +CONFIG_IEEE802154_MRF24J40=m +# CONFIG_IEEE802154_CC2520 is not set +CONFIG_IEEE802154_ATUSB=m +CONFIG_IEEE802154_ADF7242=m +CONFIG_VMXNET3=m +CONFIG_FUJITSU_ES=m +CONFIG_HYPERV_NET=m +# CONFIG_ISDN is not set +CONFIG_NVM=y +# CONFIG_NVM_DEBUG is not set +CONFIG_NVM_RRPC=m + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_LEDS=m +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_MATRIXKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ADC=m +CONFIG_KEYBOARD_ADP5588=m +CONFIG_KEYBOARD_ADP5589=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_GPIO_POLLED=m +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_TCA8418=m +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_LM8323 is not set +CONFIG_KEYBOARD_LM8333=m +CONFIG_KEYBOARD_MAX7359=m +CONFIG_KEYBOARD_MCS=m +CONFIG_KEYBOARD_MPR121=m +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_KEYBOARD_OPENCORES=m +CONFIG_KEYBOARD_SAMSUNG=m +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +CONFIG_KEYBOARD_TM2_TOUCHKEY=m +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_KEYBOARD_CROS_EC=m +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_BYD=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_CYPRESS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_PS2_FOCALTECH=y +CONFIG_MOUSE_PS2_VMMOUSE=y +CONFIG_MOUSE_SERIAL=y +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m +CONFIG_MOUSE_ELAN_I2C=m +CONFIG_MOUSE_ELAN_I2C_I2C=y +# CONFIG_MOUSE_ELAN_I2C_SMBUS is not set +CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_GPIO is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_AS5011=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_PEGASUS=m +# CONFIG_TABLET_SERIAL_WACOM4 is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_PROPERTIES=y +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_AD7877=m +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_AD7879_SPI=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set +CONFIG_TOUCHSCREEN_AUO_PIXCIR=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_CYTTSP_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +CONFIG_TOUCHSCREEN_CYTTSP_SPI=m +CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m +CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m +CONFIG_TOUCHSCREEN_DA9052=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GOODIX=m +CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_EKTF2127=m +CONFIG_TOUCHSCREEN_ELAN=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_WACOM_I2C=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MMS114=m +CONFIG_TOUCHSCREEN_MELFAS_MIP4=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_EDT_FT5X06=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m +# CONFIG_TOUCHSCREEN_UCB1400 is not set +CONFIG_TOUCHSCREEN_PIXCIR=m +CONFIG_TOUCHSCREEN_WDT87XX_I2C=m +# CONFIG_TOUCHSCREEN_WM831X is not set +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_MC13783=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m +CONFIG_TOUCHSCREEN_TSC200X_CORE=m +CONFIG_TOUCHSCREEN_TSC2004=m +CONFIG_TOUCHSCREEN_TSC2005=m +CONFIG_TOUCHSCREEN_TSC2007=m +# CONFIG_TOUCHSCREEN_PCAP is not set +CONFIG_TOUCHSCREEN_RM_TS=m +CONFIG_TOUCHSCREEN_SILEAD=m +CONFIG_TOUCHSCREEN_SIS_I2C=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_SUR40=m +CONFIG_TOUCHSCREEN_SURFACE3_SPI=m +CONFIG_TOUCHSCREEN_SX8654=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_TOUCHSCREEN_ZET6223=m +CONFIG_TOUCHSCREEN_ZFORCE=m +CONFIG_TOUCHSCREEN_ROHM_BU21023=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m +CONFIG_INPUT_ARIZONA_HAPTICS=m +CONFIG_INPUT_BMA150=m +CONFIG_INPUT_E3X0_BUTTON=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MAX77693_HAPTIC=m +CONFIG_INPUT_MC13783_PWRBUTTON=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_GP2A=m +# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_TILT_POLLED=m +CONFIG_INPUT_GPIO_DECODER=m +# CONFIG_INPUT_WISTRON_BTNS is not set +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_REGULATOR_HAPTIC=m +CONFIG_INPUT_RETU_PWRBUTTON=m +CONFIG_INPUT_TPS65218_PWRBUTTON=m +CONFIG_INPUT_AXP20X_PEK=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_PWM_BEEPER=m +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +CONFIG_INPUT_DA9052_ONKEY=m +CONFIG_INPUT_DA9063_ONKEY=m +# CONFIG_INPUT_WM831X_ON is not set +# CONFIG_INPUT_PCAP is not set +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m +CONFIG_INPUT_IMS_PCU=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m +CONFIG_INPUT_IDEAPAD_SLIDEBAR=m +CONFIG_INPUT_DRV260X_HAPTICS=m +CONFIG_INPUT_DRV2665_HAPTICS=m +CONFIG_INPUT_DRV2667_HAPTICS=m +CONFIG_RMI4_CORE=m +CONFIG_RMI4_I2C=m +CONFIG_RMI4_SPI=m +CONFIG_RMI4_SMB=m +CONFIG_RMI4_F03=y +CONFIG_RMI4_F03_SERIO=m +CONFIG_RMI4_2D_SENSOR=y +CONFIG_RMI4_F11=y +CONFIG_RMI4_F12=y +CONFIG_RMI4_F30=y +CONFIG_RMI4_F34=y +# CONFIG_RMI4_F54 is not set +CONFIG_RMI4_F55=y + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +CONFIG_SERIO_PS2MULT=m +CONFIG_SERIO_ARC_PS2=m +CONFIG_HYPERV_KEYBOARD=m +CONFIG_USERIO=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +CONFIG_MOXA_INTELLIO=m +CONFIG_MOXA_SMARTIO=m +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_NOZOMI=m +CONFIG_ISI=m +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +CONFIG_TRACE_ROUTER=m +CONFIG_TRACE_SINK=m +CONFIG_DEVMEM=y +# CONFIG_DEVKMEM is not set + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_FINTEK=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_EXAR=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +CONFIG_SERIAL_8250_RSA=y +# CONFIG_SERIAL_8250_FSL is not set +CONFIG_SERIAL_8250_DW=m +CONFIG_SERIAL_8250_RT288X=y +CONFIG_SERIAL_8250_LPSS=m +CONFIG_SERIAL_8250_MID=m +CONFIG_SERIAL_8250_MOXA=m + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_MAX3100=m +CONFIG_SERIAL_MAX310X=y +CONFIG_SERIAL_UARTLITE=m +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_SCCNXP=y +CONFIG_SERIAL_SCCNXP_CONSOLE=y +# CONFIG_SERIAL_SC16IS7XX is not set +CONFIG_SERIAL_TIMBERDALE=m +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m +CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 +CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +CONFIG_SERIAL_IFX6X60=m +CONFIG_SERIAL_PCH_UART=m +CONFIG_SERIAL_ARC=m +CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 +CONFIG_SERIAL_FSL_LPUART=m +# CONFIG_SERIAL_MEN_Z135 is not set +CONFIG_SERIAL_DEV_BUS=m +CONFIG_TTY_PRINTK=m +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_VIRTIO_CONSOLE=m +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_SSIF=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=m +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_GEODE=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m +CONFIG_NVRAM=m +CONFIG_R3964=m +CONFIG_APPLICOM=m +# CONFIG_SONYPI is not set +CONFIG_MWAVE=m +# CONFIG_PC8736x_GPIO is not set +# CONFIG_NSC_GPIO is not set +CONFIG_RAW_DRIVER=m +CONFIG_MAX_RAW_DEVS=256 +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HPET_MMAP_DEFAULT=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS_CORE=m +CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_SPI=m +CONFIG_TCG_TIS_I2C_ATMEL=m +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_TIS_I2C_NUVOTON=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TCG_CRB=m +CONFIG_TCG_VTPM_PROXY=m +CONFIG_TCG_TIS_ST33ZP24=m +CONFIG_TCG_TIS_ST33ZP24_I2C=m +CONFIG_TCG_TIS_ST33ZP24_SPI=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_XILLYBUS=m +CONFIG_XILLYBUS_PCIE=m + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_ACPI_I2C_OPREGION=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +CONFIG_I2C_MUX_GPIO=m +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m +CONFIG_I2C_MUX_PINCTRL=m +CONFIG_I2C_MUX_REG=m +CONFIG_I2C_MUX_MLXCPLD=m +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_ISMT=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_CBUS_GPIO=m +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m +CONFIG_I2C_DESIGNWARE_PCI=m +CONFIG_I2C_DESIGNWARE_BAYTRAIL=y +CONFIG_I2C_EG20T=m +CONFIG_I2C_EMEV2=m +CONFIG_I2C_GPIO=m +CONFIG_I2C_KEMPLD=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PCA_PLATFORM=m +# CONFIG_I2C_PXA_PCI is not set +CONFIG_I2C_SIMTEC=m +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +CONFIG_I2C_DLN2=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_ROBOTFUZZ_OSIF=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m +CONFIG_I2C_VIPERBOARD=m + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_CROS_EC_TUNNEL is not set +# CONFIG_SCx200_ACB is not set +# CONFIG_I2C_STUB is not set +CONFIG_I2C_SLAVE=y +CONFIG_I2C_SLAVE_EEPROM=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_ALTERA=m +CONFIG_SPI_AXI_SPI_ENGINE=m +CONFIG_SPI_BITBANG=m +CONFIG_SPI_BUTTERFLY=m +CONFIG_SPI_CADENCE=m +CONFIG_SPI_DESIGNWARE=m +CONFIG_SPI_DW_PCI=m +CONFIG_SPI_DW_MID_DMA=y +CONFIG_SPI_DW_MMIO=m +CONFIG_SPI_DLN2=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_OC_TINY=m +CONFIG_SPI_PXA2XX=m +CONFIG_SPI_PXA2XX_PCI=m +CONFIG_SPI_ROCKCHIP=m +CONFIG_SPI_SC18IS602=m +CONFIG_SPI_TOPCLIFF_PCH=m +CONFIG_SPI_XCOMM=m +CONFIG_SPI_XILINX=m +CONFIG_SPI_ZYNQMP_GQSPI=m + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_LOOPBACK_TEST=m +CONFIG_SPI_TLE62X0=m +CONFIG_SPMI=m +CONFIG_HSI=m +CONFIG_HSI_BOARDINFO=y + +# +# HSI controllers +# + +# +# HSI clients +# +CONFIG_HSI_CHAR=m + +# +# PPS support +# +CONFIG_PPS=y +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +CONFIG_PPS_CLIENT_KTIMER=m +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m +CONFIG_PPS_CLIENT_GPIO=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=y + +# +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# +CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_PTP_1588_CLOCK_KVM=y +CONFIG_PINCTRL=y + +# +# Pin controllers +# +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y +# CONFIG_DEBUG_PINCTRL is not set +CONFIG_PINCTRL_AMD=y +# CONFIG_PINCTRL_SX150X is not set +CONFIG_PINCTRL_BAYTRAIL=y +CONFIG_PINCTRL_CHERRYVIEW=m +CONFIG_PINCTRL_INTEL=m +CONFIG_PINCTRL_BROXTON=m +CONFIG_PINCTRL_GEMINILAKE=m +CONFIG_PINCTRL_SUNRISEPOINT=m +CONFIG_GPIOLIB=y +CONFIG_GPIO_ACPI=y +CONFIG_GPIOLIB_IRQCHIP=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GENERIC=m +CONFIG_GPIO_MAX730X=m + +# +# Memory mapped GPIO drivers +# +CONFIG_GPIO_AMDPT=m +CONFIG_GPIO_AXP209=m +CONFIG_GPIO_DWAPB=m +CONFIG_GPIO_EXAR=m +CONFIG_GPIO_GENERIC_PLATFORM=m +CONFIG_GPIO_ICH=m +CONFIG_GPIO_LYNXPOINT=y +CONFIG_GPIO_MENZ127=m +CONFIG_GPIO_MOCKUP=m +CONFIG_GPIO_VX855=m + +# +# Port-mapped I/O GPIO drivers +# +CONFIG_GPIO_F7188X=m +CONFIG_GPIO_IT87=m +CONFIG_GPIO_SCH=m +CONFIG_GPIO_SCH311X=m + +# +# I2C GPIO expanders +# +CONFIG_GPIO_ADP5588=m +CONFIG_GPIO_MAX7300=m +CONFIG_GPIO_MAX732X=m +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCF857X=m +# CONFIG_GPIO_SX150X is not set +CONFIG_GPIO_TPIC2810=m + +# +# MFD GPIO expanders +# +CONFIG_GPIO_ARIZONA=m +CONFIG_GPIO_CS5535=m +CONFIG_GPIO_DA9052=m +CONFIG_GPIO_DLN2=m +CONFIG_GPIO_JANZ_TTL=m +CONFIG_GPIO_KEMPLD=m +CONFIG_GPIO_LP3943=m +CONFIG_GPIO_LP873X=m +CONFIG_GPIO_TIMBERDALE=y +CONFIG_GPIO_TPS65086=m +CONFIG_GPIO_TPS65218=m +# CONFIG_GPIO_TPS65912 is not set +CONFIG_GPIO_UCB1400=m +# CONFIG_GPIO_WM831X is not set + +# +# PCI GPIO expanders +# +CONFIG_GPIO_AMD8111=m +CONFIG_GPIO_ML_IOH=m +CONFIG_GPIO_PCH=m +CONFIG_GPIO_PCI_IDIO_16=m +CONFIG_GPIO_RDC321X=m + +# +# SPI GPIO expanders +# +CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_MC33880=m +CONFIG_GPIO_PISOSR=m + +# +# SPI or I2C GPIO expanders +# + +# +# USB GPIO expanders +# +CONFIG_GPIO_VIPERBOARD=m +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m +CONFIG_W1_MASTER_DS1WM=m +CONFIG_W1_MASTER_GPIO=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2405=m +CONFIG_W1_SLAVE_DS2408=m +CONFIG_W1_SLAVE_DS2408_READBACK=y +CONFIG_W1_SLAVE_DS2413=m +# CONFIG_W1_SLAVE_DS2406 is not set +CONFIG_W1_SLAVE_DS2423=m +CONFIG_W1_SLAVE_DS2431=m +CONFIG_W1_SLAVE_DS2433=m +CONFIG_W1_SLAVE_DS2433_CRC=y +CONFIG_W1_SLAVE_DS2760=m +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_DS2781=m +CONFIG_W1_SLAVE_DS28E04=m +CONFIG_W1_SLAVE_BQ27000=m +CONFIG_POWER_AVS=y +# CONFIG_POWER_RESET is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_GENERIC_ADC_BATTERY=m +# CONFIG_WM831X_BACKUP is not set +# CONFIG_WM831X_POWER is not set +CONFIG_TEST_POWER=m +CONFIG_BATTERY_DS2760=m +CONFIG_BATTERY_DS2780=m +CONFIG_BATTERY_DS2781=m +CONFIG_BATTERY_DS2782=m +CONFIG_BATTERY_SBS=m +CONFIG_CHARGER_SBS=m +CONFIG_BATTERY_BQ27XXX=m +CONFIG_BATTERY_BQ27XXX_I2C=m +CONFIG_BATTERY_DA9052=m +CONFIG_CHARGER_DA9150=m +CONFIG_BATTERY_DA9150=m +CONFIG_AXP288_CHARGER=m +CONFIG_AXP288_FUEL_GAUGE=m +CONFIG_BATTERY_MAX17040=m +CONFIG_BATTERY_MAX17042=m +CONFIG_CHARGER_PCF50633=m +CONFIG_CHARGER_ISP1704=m +CONFIG_CHARGER_MAX8903=m +CONFIG_CHARGER_LP8727=m +CONFIG_CHARGER_GPIO=m +CONFIG_CHARGER_MANAGER=y +CONFIG_CHARGER_BQ2415X=m +CONFIG_CHARGER_BQ24190=m +CONFIG_CHARGER_BQ24257=m +CONFIG_CHARGER_BQ24735=m +CONFIG_CHARGER_BQ25890=m +CONFIG_CHARGER_SMB347=m +CONFIG_CHARGER_TPS65217=m +CONFIG_BATTERY_GAUGE_LTC2941=m +CONFIG_BATTERY_RT5033=m +CONFIG_CHARGER_RT9455=m +CONFIG_AXP20X_POWER=m +CONFIG_HWMON=m +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7314=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7X10=m +CONFIG_SENSORS_ADT7310=m +CONFIG_SENSORS_ADT7410=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_APPLESMC=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_DELL_SMM=m +CONFIG_SENSORS_DA9052_ADC=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_MC13783_ADC=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_FTSTEUTATES=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_G762=m +CONFIG_SENSORS_GPIO_FAN=m +CONFIG_SENSORS_HIH6130=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IIO_HWMON=m +CONFIG_SENSORS_I5500=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_JC42=m +# CONFIG_SENSORS_POWR1220 is not set +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LTC2945=m +CONFIG_SENSORS_LTC2990=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4222=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4260=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m +CONFIG_SENSORS_MAX31722=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m +CONFIG_SENSORS_MAX31790=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_TC654=m +CONFIG_SENSORS_MENF21BMC_HWMON=m +CONFIG_SENSORS_ADCXX=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LM95234=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_NTC_THERMISTOR=m +# CONFIG_SENSORS_NCT6683 is not set +CONFIG_SENSORS_NCT6775=m +CONFIG_SENSORS_NCT7802=m +CONFIG_SENSORS_NCT7904=m +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m +# CONFIG_SENSORS_LTC2978_REGULATOR is not set +CONFIG_SENSORS_LTC3815=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX20751=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +# CONFIG_SENSORS_TPS40422 is not set +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SHT3x=m +# CONFIG_SENSORS_SHTC1 is not set +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m +CONFIG_SENSORS_STTS751=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_ADC128D818=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_ADS7871=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m +CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_INA3221=m +CONFIG_SENSORS_TC74=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +# CONFIG_SENSORS_TMP103 is not set +CONFIG_SENSORS_TMP108=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +# CONFIG_SENSORS_WM831X is not set + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +CONFIG_THERMAL_WRITABLE_TRIPS=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set +# CONFIG_THERMAL_GOV_FAIR_SHARE is not set +CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_GOV_BANG_BANG=y +CONFIG_THERMAL_GOV_USER_SPACE=y +CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y +# CONFIG_THERMAL_EMULATION is not set +CONFIG_INTEL_POWERCLAMP=m +CONFIG_X86_PKG_TEMP_THERMAL=m +CONFIG_INTEL_SOC_DTS_IOSF_CORE=m +# CONFIG_INTEL_SOC_DTS_THERMAL is not set + +# +# ACPI INT340X thermal drivers +# +CONFIG_INT340X_THERMAL=m +CONFIG_ACPI_THERMAL_REL=m +CONFIG_INT3406_THERMAL=m +CONFIG_INTEL_PCH_THERMAL=m +CONFIG_GENERIC_ADC_THERMAL=m +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_WATCHDOG_SYSFS=y + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_DA9052_WATCHDOG=m +CONFIG_DA9062_WATCHDOG=m +CONFIG_MENF21BMC_WATCHDOG=m +CONFIG_WDAT_WDT=m +# CONFIG_WM831X_WATCHDOG is not set +CONFIG_XILINX_WATCHDOG=m +CONFIG_ZIIRAVE_WATCHDOG=m +CONFIG_CADENCE_WATCHDOG=m +CONFIG_DW_WATCHDOG=m +CONFIG_MAX63XX_WATCHDOG=m +CONFIG_RETU_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_F71808E_WDT=m +CONFIG_SP5100_TCO=m +CONFIG_GEODE_WDT=m +CONFIG_SBC_FITPC2_WATCHDOG=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_IE6XX_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_KEMPLD_WDT=m +CONFIG_HPWDT_NMI_DECODING=y +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_NV_TCO=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +# CONFIG_SBC7240_WDT is not set +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_VIA_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m +CONFIG_INTEL_MEI_WDT=m +CONFIG_NI903X_WDT=m +CONFIG_NIC7018_WDT=m +CONFIG_MEN_A21_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m + +# +# Watchdog Pretimeout Governors +# +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_SSB_DRIVER_GPIO=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +CONFIG_BCMA_HOST_SOC=y +CONFIG_BCMA_DRIVER_PCI=y +CONFIG_BCMA_SFLASH=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +CONFIG_MFD_CS5535=m +# CONFIG_MFD_AS3711 is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_AAT2870_CORE is not set +CONFIG_MFD_BCM590XX=m +CONFIG_MFD_AXP20X=m +CONFIG_MFD_AXP20X_I2C=m +CONFIG_MFD_CROS_EC=m +CONFIG_MFD_CROS_EC_I2C=m +CONFIG_MFD_CROS_EC_SPI=m +# CONFIG_PMIC_DA903X is not set +CONFIG_PMIC_DA9052=y +CONFIG_MFD_DA9052_SPI=y +# CONFIG_MFD_DA9052_I2C is not set +# CONFIG_MFD_DA9055 is not set +CONFIG_MFD_DA9062=m +# CONFIG_MFD_DA9063 is not set +CONFIG_MFD_DA9150=m +CONFIG_MFD_DLN2=m +CONFIG_MFD_MC13XXX=m +CONFIG_MFD_MC13XXX_SPI=m +CONFIG_MFD_MC13XXX_I2C=m +CONFIG_HTC_PASIC3=m +# CONFIG_HTC_I2CPLD is not set +CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m +CONFIG_LPC_ICH=m +CONFIG_LPC_SCH=m +# CONFIG_INTEL_SOC_PMIC is not set +CONFIG_MFD_INTEL_LPSS=m +CONFIG_MFD_INTEL_LPSS_ACPI=m +CONFIG_MFD_INTEL_LPSS_PCI=m +CONFIG_MFD_JANZ_CMODIO=m +CONFIG_MFD_KEMPLD=m +# CONFIG_MFD_88PM800 is not set +# CONFIG_MFD_88PM805 is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_MAX14577 is not set +# CONFIG_MFD_MAX77693 is not set +CONFIG_MFD_MAX77843=y +# CONFIG_MFD_MAX8907 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_MAX8998 is not set +CONFIG_MFD_MT6397=m +CONFIG_MFD_MENF21BMC=m +CONFIG_EZX_PCAP=y +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_UCB1400_CORE=m +CONFIG_MFD_RDC321X=m +CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_RT5033=m +CONFIG_MFD_RTSX_USB=m +# CONFIG_MFD_RC5T583 is not set +# CONFIG_MFD_SEC_CORE is not set +CONFIG_MFD_SI476X_CORE=m +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_MFD_SKY81452=m +# CONFIG_MFD_SMSC is not set +CONFIG_ABX500_CORE=y +# CONFIG_AB3100_CORE is not set +CONFIG_MFD_SYSCON=y +CONFIG_MFD_TI_AM335X_TSCADC=m +CONFIG_MFD_LP3943=m +# CONFIG_MFD_LP8788 is not set +# CONFIG_MFD_PALMAS is not set +CONFIG_TPS6105X=m +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +CONFIG_MFD_TPS65086=m +# CONFIG_MFD_TPS65090 is not set +CONFIG_MFD_TPS65217=m +CONFIG_MFD_TI_LP873X=m +CONFIG_MFD_TPS65218=m +# CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS65910 is not set +CONFIG_MFD_TPS65912=y +# CONFIG_MFD_TPS65912_I2C is not set +CONFIG_MFD_TPS65912_SPI=y +# CONFIG_MFD_TPS80031 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_TWL6040_CORE is not set +CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_LM3533=m +CONFIG_MFD_TIMBERDALE=m +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_VX855=m +CONFIG_MFD_ARIZONA=y +CONFIG_MFD_ARIZONA_I2C=m +CONFIG_MFD_ARIZONA_SPI=m +CONFIG_MFD_CS47L24=y +CONFIG_MFD_WM5102=y +CONFIG_MFD_WM5110=y +# CONFIG_MFD_WM8997 is not set +CONFIG_MFD_WM8998=y +# CONFIG_MFD_WM8400 is not set +CONFIG_MFD_WM831X=y +# CONFIG_MFD_WM831X_I2C is not set +CONFIG_MFD_WM831X_SPI=y +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=m +CONFIG_REGULATOR_VIRTUAL_CONSUMER=m +CONFIG_REGULATOR_USERSPACE_CONSUMER=m +CONFIG_REGULATOR_ACT8865=m +CONFIG_REGULATOR_AD5398=m +CONFIG_REGULATOR_ANATOP=m +CONFIG_REGULATOR_ARIZONA=m +CONFIG_REGULATOR_AXP20X=m +CONFIG_REGULATOR_BCM590XX=m +CONFIG_REGULATOR_DA9052=m +CONFIG_REGULATOR_DA9062=m +CONFIG_REGULATOR_DA9210=m +# CONFIG_REGULATOR_DA9211 is not set +CONFIG_REGULATOR_FAN53555=m +CONFIG_REGULATOR_GPIO=m +CONFIG_REGULATOR_ISL9305=m +CONFIG_REGULATOR_ISL6271A=m +CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_LP3972=m +CONFIG_REGULATOR_LP872X=m +CONFIG_REGULATOR_LP8755=m +# CONFIG_REGULATOR_LTC3589 is not set +CONFIG_REGULATOR_LTC3676=m +CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX8649=m +CONFIG_REGULATOR_MAX8660=m +CONFIG_REGULATOR_MAX8952=m +CONFIG_REGULATOR_MAX77693=m +CONFIG_REGULATOR_MC13XXX_CORE=m +CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m +CONFIG_REGULATOR_MT6311=m +CONFIG_REGULATOR_MT6323=m +CONFIG_REGULATOR_MT6397=m +CONFIG_REGULATOR_PCAP=m +CONFIG_REGULATOR_PCF50633=m +CONFIG_REGULATOR_PFUZE100=m +CONFIG_REGULATOR_PV88060=m +CONFIG_REGULATOR_PV88080=m +CONFIG_REGULATOR_PV88090=m +CONFIG_REGULATOR_PWM=m +CONFIG_REGULATOR_QCOM_SPMI=m +CONFIG_REGULATOR_RT5033=m +CONFIG_REGULATOR_SKY81452=m +CONFIG_REGULATOR_TPS51632=m +CONFIG_REGULATOR_TPS6105X=m +CONFIG_REGULATOR_TPS62360=m +CONFIG_REGULATOR_TPS65023=m +CONFIG_REGULATOR_TPS6507X=m +CONFIG_REGULATOR_TPS65086=m +CONFIG_REGULATOR_TPS65217=m +CONFIG_REGULATOR_TPS6524X=m +# CONFIG_REGULATOR_TPS65912 is not set +# CONFIG_REGULATOR_WM831X is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +# CONFIG_MEDIA_SDR_SUPPORT is not set +CONFIG_MEDIA_RC_SUPPORT=y +CONFIG_MEDIA_CEC_SUPPORT=y +CONFIG_MEDIA_CEC_DEBUG=y +CONFIG_MEDIA_CEC_EDID=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_MEDIA_CONTROLLER_DVB=y +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_PCI_SKELETON=m +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_V4L2_FLASH_LED_CLASS=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m +CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_MAX_ADAPTERS=8 +CONFIG_DVB_DYNAMIC_MINORS=y +# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set + +# +# Media drivers +# +CONFIG_RC_CORE=m +CONFIG_RC_MAP=m +CONFIG_RC_DECODERS=y +CONFIG_LIRC=m +CONFIG_IR_LIRC_CODEC=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_XMP_DECODER=m +CONFIG_RC_DEVICES=y +CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_ENE=m +CONFIG_IR_HIX5HD2=m +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_SPI=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_IR_IGORPLUGUSB=m +CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_GPIO_CIR=m +CONFIG_IR_SERIAL=m +CONFIG_IR_SERIAL_TRANSMITTER=y +CONFIG_MEDIA_USB_SUPPORT=y + +# +# Webcam devices +# +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +# CONFIG_USB_GSPCA_DTCS033 is not set +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STK1135=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TOUPTEK=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_VIDEO_USBTV=m + +# +# Analog TV USB devices +# +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160_COMMON=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m + +# +# Analog/digital TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y +# CONFIG_VIDEO_AU0828_RC is not set +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_DIB3000MC=m +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_USB_DVBSKY=m +CONFIG_DVB_USB_ZD1301=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set +CONFIG_DVB_AS102=m + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_V4L2=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m + +# +# USB HDMI CEC adapters +# +CONFIG_USB_PULSE8_CEC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m +# CONFIG_VIDEO_SOLO6X10 is not set +CONFIG_VIDEO_TW5864=m +CONFIG_VIDEO_TW68=m +CONFIG_VIDEO_TW686X=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DT3155=m + +# +# Media capture/analog/hybrid TV support +# +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_ENABLE_VP3054=y +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7134_GO7007=m +CONFIG_VIDEO_SAA7164=m + +# +# Media digital TV PCI Adapters +# +CONFIG_DVB_AV7110_IR=y +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_DVB_PT3=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m +CONFIG_DVB_SMIPCIE=m +CONFIG_DVB_NETUP_UNIDVB=m +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIDEO_VIA_CAMERA=m +CONFIG_SOC_CAMERA=m +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m +# CONFIG_V4L_TEST_DRIVERS is not set +CONFIG_DVB_PLATFORM_DRIVERS=y + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_TEA575X=m +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_SI4713=m +CONFIG_PLATFORM_SI4713=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_USB_KEENE=m +CONFIG_USB_RAREMONO=m +CONFIG_USB_MA901=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_TIMBERDALE=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +# CONFIG_DVB_FIREDTV is not set +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_CYPRESS_FIRMWARE=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set + +# +# Media ancillary drivers (tuners, sensors, i2c, spi, frontends) +# +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y +CONFIG_VIDEO_IR_I2C=m + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS3308=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_OV7640=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9V011=m + +# +# Flash devices +# + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m + +# +# Miscellaneous helper chips +# +CONFIG_VIDEO_M52790=m + +# +# Sensors used on soc_camera driver +# + +# +# soc_camera sensor drivers +# +CONFIG_SOC_CAMERA_IMX074=m +CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_SOC_CAMERA_MT9M111=m +CONFIG_SOC_CAMERA_MT9T031=m +CONFIG_SOC_CAMERA_MT9T112=m +CONFIG_SOC_CAMERA_MT9V022=m +CONFIG_SOC_CAMERA_OV2640=m +CONFIG_SOC_CAMERA_OV5642=m +CONFIG_SOC_CAMERA_OV6650=m +CONFIG_SOC_CAMERA_OV772X=m +CONFIG_SOC_CAMERA_OV9640=m +CONFIG_SOC_CAMERA_OV9740=m +CONFIG_SOC_CAMERA_RJ54N1=m +CONFIG_SOC_CAMERA_TW9910=m +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_R820T=m +CONFIG_MEDIA_TUNER_MXL301RF=m +CONFIG_MEDIA_TUNER_QM1D1C0042=m + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m +CONFIG_DVB_M88DS3103=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_SI2165=m +CONFIG_DVB_MN88472=m +CONFIG_DVB_MN88473=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_CX24117=m +CONFIG_DVB_CX24120=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_CXD2841ER=m +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m +CONFIG_DVB_SI2168=m +CONFIG_DVB_AS102_FE=m +CONFIG_DVB_ZD1301_DEMOD=m +CONFIG_DVB_GP8PSK_FE=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_LGDT3306A=m +CONFIG_DVB_LG2160=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# ISDB-S (satellite) & ISDB-T (terrestrial) frontends +# +CONFIG_DVB_TC90522=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_DRX39XYJ=m +CONFIG_DVB_LNBH25=m +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_SP2=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=m +CONFIG_DVB_HORUS3A=m +CONFIG_DVB_ASCOT2E=m +CONFIG_DVB_HELENE=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_AGP=m +# CONFIG_AGP_ALI is not set +# CONFIG_AGP_ATI is not set +# CONFIG_AGP_AMD is not set +CONFIG_AGP_AMD64=m +CONFIG_AGP_INTEL=m +# CONFIG_AGP_NVIDIA is not set +CONFIG_AGP_SIS=m +# CONFIG_AGP_SWORKS is not set +CONFIG_AGP_VIA=m +# CONFIG_AGP_EFFICEON is not set +CONFIG_INTEL_GTT=m +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y +CONFIG_DRM=m +CONFIG_DRM_MIPI_DSI=y +CONFIG_DRM_DP_AUX_CHARDEV=y +CONFIG_DRM_DEBUG_MM_SELFTEST=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_KMS_FB_HELPER=y +CONFIG_DRM_FBDEV_EMULATION=y +# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set +CONFIG_DRM_TTM=m +CONFIG_DRM_GEM_CMA_HELPER=y +CONFIG_DRM_KMS_CMA_HELPER=y +CONFIG_DRM_VM=y + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_USERPTR=y +CONFIG_DRM_AMDGPU=m +CONFIG_DRM_AMDGPU_SI=y +CONFIG_DRM_AMDGPU_CIK=y +CONFIG_DRM_AMDGPU_USERPTR=y +# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set + +# +# ACP (Audio CoProcessor) Configuration +# +CONFIG_DRM_AMD_ACP=y +CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_I915=m +# CONFIG_DRM_I915_ALPHA_SUPPORT is not set +CONFIG_DRM_I915_CAPTURE_ERROR=y +CONFIG_DRM_I915_COMPRESS_ERROR=y +CONFIG_DRM_I915_USERPTR=y + +# +# drm/i915 Debugging +# +# CONFIG_DRM_I915_WERROR is not set +# CONFIG_DRM_I915_DEBUG is not set +# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set +CONFIG_DRM_VGEM=m +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_VMWGFX_FBCON=y +CONFIG_DRM_GMA500=m +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y +CONFIG_DRM_UDL=m +CONFIG_DRM_AST=m +CONFIG_DRM_MGAG200=m +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_QXL=m +CONFIG_DRM_BOCHS=m +CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DRM_PANEL=y + +# +# Display Panels +# +CONFIG_DRM_BRIDGE=y + +# +# Display Interface Bridges +# +CONFIG_DRM_ANALOGIX_ANX78XX=m +CONFIG_DRM_HISI_HIBMC=m +CONFIG_DRM_TINYDRM=m +CONFIG_TINYDRM_MIPI_DBI=m +CONFIG_TINYDRM_MI0283QT=m +# CONFIG_DRM_LEGACY is not set +CONFIG_DRM_LIB_RANDOM=y + +# +# Frame buffer Devices +# +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_CMDLINE=y +CONFIG_FB_NOTIFY=y +CONFIG_FB_DDC=m +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +CONFIG_FB_OPENCORES=m +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +# CONFIG_FB_I810 is not set +# CONFIG_FB_LE80578 is not set +CONFIG_FB_INTEL=m +# CONFIG_FB_INTEL_DEBUG is not set +CONFIG_FB_INTEL_I2C=y +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +CONFIG_FB_VIA=m +CONFIG_FB_VIA_DIRECT_PROCFS=y +CONFIG_FB_VIA_X_COMPATIBILITY=y +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_GEODE is not set +# CONFIG_FB_SM501 is not set +# CONFIG_FB_SMSCUFX is not set +CONFIG_FB_UDL=m +CONFIG_FB_IBM_GXT4500=m +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_AUO_K190X is not set +CONFIG_FB_HYPERV=m +# CONFIG_FB_SIMPLE is not set +CONFIG_FB_SM712=m +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_L4F00242T03=m +CONFIG_LCD_LMS283GF05=m +CONFIG_LCD_LTV350QV=m +CONFIG_LCD_ILI922X=m +CONFIG_LCD_ILI9320=m +CONFIG_LCD_TDO24M=m +CONFIG_LCD_VGG2432A4=m +CONFIG_LCD_PLATFORM=m +CONFIG_LCD_S6E63M0=m +CONFIG_LCD_LD9040=m +CONFIG_LCD_AMS369FG06=m +CONFIG_LCD_LMS501KF03=m +CONFIG_LCD_HX8357=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=m +CONFIG_BACKLIGHT_LM3533=m +CONFIG_BACKLIGHT_PWM=m +CONFIG_BACKLIGHT_DA9052=m +CONFIG_BACKLIGHT_APPLE=m +CONFIG_BACKLIGHT_PM8941_WLED=m +CONFIG_BACKLIGHT_SAHARA=m +# CONFIG_BACKLIGHT_WM831X is not set +CONFIG_BACKLIGHT_ADP8860=m +CONFIG_BACKLIGHT_ADP8870=m +CONFIG_BACKLIGHT_PCF50633=m +CONFIG_BACKLIGHT_LM3630A=m +CONFIG_BACKLIGHT_LM3639=m +CONFIG_BACKLIGHT_LP855X=m +CONFIG_BACKLIGHT_OT200=m +CONFIG_BACKLIGHT_SKY81452=m +CONFIG_BACKLIGHT_TPS65217=m +CONFIG_BACKLIGHT_GPIO=m +CONFIG_BACKLIGHT_LV5207LP=m +CONFIG_BACKLIGHT_BD6107=m +CONFIG_VGASTATE=m +CONFIG_HDMI=y + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +CONFIG_VGACON_SOFT_SCROLLBACK=y +CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 +CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT=y +CONFIG_DUMMY_CONSOLE=y +CONFIG_DUMMY_CONSOLE_COLUMNS=80 +CONFIG_DUMMY_CONSOLE_ROWS=25 +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_PCM_ELD=y +CONFIG_SND_PCM_IEC958=y +CONFIG_SND_DMAENGINE_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m +CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_PCM_TIMER=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_MAX_CARDS=32 +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_PROC_FS=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +# CONFIG_SND_PCSP is not set +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1 +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ASIHPI=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +# CONFIG_SND_ES1968_RADIO is not set +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +# CONFIG_SND_SIS7019 is not set +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m + +# +# HD-Audio +# +CONFIG_SND_HDA=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +# CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_CODEC_REALTEK=m +CONFIG_SND_HDA_CODEC_ANALOG=m +CONFIG_SND_HDA_CODEC_SIGMATEL=m +CONFIG_SND_HDA_CODEC_VIA=m +CONFIG_SND_HDA_CODEC_HDMI=m +CONFIG_SND_HDA_CODEC_CIRRUS=m +CONFIG_SND_HDA_CODEC_CONEXANT=m +CONFIG_SND_HDA_CODEC_CA0110=m +CONFIG_SND_HDA_CODEC_CA0132=m +CONFIG_SND_HDA_CODEC_CA0132_DSP=y +CONFIG_SND_HDA_CODEC_CMEDIA=m +CONFIG_SND_HDA_CODEC_SI3054=m +CONFIG_SND_HDA_GENERIC=m +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 +CONFIG_SND_HDA_CORE=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_I915=y +CONFIG_SND_HDA_EXT_CORE=m +CONFIG_SND_HDA_PREALLOC_SIZE=64 +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_USB_HIFACE=m +# CONFIG_SND_BCD2000 is not set +CONFIG_SND_USB_LINE6=m +CONFIG_SND_USB_POD=m +CONFIG_SND_USB_PODHD=m +CONFIG_SND_USB_TONEPORT=m +CONFIG_SND_USB_VARIAX=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_DICE=m +CONFIG_SND_OXFW=m +# CONFIG_SND_ISIGHT is not set +# CONFIG_SND_FIREWORKS is not set +# CONFIG_SND_BEBOB is not set +CONFIG_SND_FIREWIRE_DIGI00X=m +CONFIG_SND_FIREWIRE_TASCAM=m +CONFIG_SND_SOC=m +CONFIG_SND_SOC_AC97_BUS=y +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +CONFIG_SND_SOC_COMPRESS=y +CONFIG_SND_SOC_TOPOLOGY=y +CONFIG_SND_SOC_AMD_ACP=m +CONFIG_SND_ATMEL_SOC=m +CONFIG_SND_DESIGNWARE_I2S=m +CONFIG_SND_DESIGNWARE_PCM=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SOC_IMG=y +CONFIG_SND_SOC_IMG_I2S_IN=m +CONFIG_SND_SOC_IMG_I2S_OUT=m +CONFIG_SND_SOC_IMG_PARALLEL_OUT=m +CONFIG_SND_SOC_IMG_SPDIF_IN=m +CONFIG_SND_SOC_IMG_SPDIF_OUT=m +CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m +CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_SST_MATCH=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m +CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m +CONFIG_SND_SOC_INTEL_SKYLAKE=m +CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m +CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m +CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m +CONFIG_SND_SOC_XTFPGA_I2S=m +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +CONFIG_SND_SOC_AC97_CODEC=m +CONFIG_SND_SOC_ADAU1701=m +CONFIG_SND_SOC_ADAU7002=m +CONFIG_SND_SOC_AK4104=m +CONFIG_SND_SOC_AK4554=m +CONFIG_SND_SOC_AK4613=m +CONFIG_SND_SOC_AK4642=m +CONFIG_SND_SOC_AK5386=m +# CONFIG_SND_SOC_ALC5623 is not set +CONFIG_SND_SOC_BT_SCO=m +CONFIG_SND_SOC_CS35L32=m +CONFIG_SND_SOC_CS35L33=m +CONFIG_SND_SOC_CS35L34=m +CONFIG_SND_SOC_CS42L42=m +CONFIG_SND_SOC_CS42L51=m +CONFIG_SND_SOC_CS42L51_I2C=m +CONFIG_SND_SOC_CS42L52=m +# CONFIG_SND_SOC_CS42L56 is not set +CONFIG_SND_SOC_CS42L73=m +# CONFIG_SND_SOC_CS4265 is not set +CONFIG_SND_SOC_CS4270=m +CONFIG_SND_SOC_CS4271=m +CONFIG_SND_SOC_CS4271_I2C=m +CONFIG_SND_SOC_CS4271_SPI=m +CONFIG_SND_SOC_CS42XX8=m +CONFIG_SND_SOC_CS42XX8_I2C=m +CONFIG_SND_SOC_CS4349=m +CONFIG_SND_SOC_CS53L30=m +CONFIG_SND_SOC_DA7219=m +CONFIG_SND_SOC_DMIC=m +CONFIG_SND_SOC_HDMI_CODEC=m +CONFIG_SND_SOC_ES8328=m +CONFIG_SND_SOC_ES8328_I2C=m +CONFIG_SND_SOC_ES8328_SPI=m +CONFIG_SND_SOC_GTM601=m +CONFIG_SND_SOC_HDAC_HDMI=m +CONFIG_SND_SOC_INNO_RK3036=m +CONFIG_SND_SOC_MAX98090=m +CONFIG_SND_SOC_MAX98357A=m +CONFIG_SND_SOC_MAX98504=m +CONFIG_SND_SOC_MAX9860=m +CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m +CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m +CONFIG_SND_SOC_PCM1681=m +CONFIG_SND_SOC_PCM179X=m +CONFIG_SND_SOC_PCM179X_I2C=m +CONFIG_SND_SOC_PCM179X_SPI=m +CONFIG_SND_SOC_PCM3168A=m +CONFIG_SND_SOC_PCM3168A_I2C=m +CONFIG_SND_SOC_PCM3168A_SPI=m +CONFIG_SND_SOC_PCM512x=m +CONFIG_SND_SOC_PCM512x_I2C=m +CONFIG_SND_SOC_PCM512x_SPI=m +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RL6347A=m +CONFIG_SND_SOC_RT286=m +CONFIG_SND_SOC_RT298=m +CONFIG_SND_SOC_RT5616=m +CONFIG_SND_SOC_RT5631=m +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5651=m +CONFIG_SND_SOC_RT5670=m +CONFIG_SND_SOC_RT5677=m +CONFIG_SND_SOC_RT5677_SPI=m +CONFIG_SND_SOC_SGTL5000=m +CONFIG_SND_SOC_SI476X=m +CONFIG_SND_SOC_SIGMADSP=m +CONFIG_SND_SOC_SIGMADSP_I2C=m +CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m +CONFIG_SND_SOC_SPDIF=m +CONFIG_SND_SOC_SSM2602=m +CONFIG_SND_SOC_SSM2602_SPI=m +CONFIG_SND_SOC_SSM2602_I2C=m +CONFIG_SND_SOC_SSM4567=m +CONFIG_SND_SOC_STA32X=m +# CONFIG_SND_SOC_STA350 is not set +CONFIG_SND_SOC_STI_SAS=m +# CONFIG_SND_SOC_TAS2552 is not set +CONFIG_SND_SOC_TAS5086=m +CONFIG_SND_SOC_TAS571X=m +CONFIG_SND_SOC_TAS5720=m +CONFIG_SND_SOC_TFA9879=m +CONFIG_SND_SOC_TLV320AIC23=m +CONFIG_SND_SOC_TLV320AIC23_I2C=m +CONFIG_SND_SOC_TLV320AIC23_SPI=m +# CONFIG_SND_SOC_TLV320AIC31XX is not set +CONFIG_SND_SOC_TLV320AIC3X=m +CONFIG_SND_SOC_TS3A227E=m +CONFIG_SND_SOC_WM8510=m +CONFIG_SND_SOC_WM8523=m +CONFIG_SND_SOC_WM8580=m +CONFIG_SND_SOC_WM8711=m +CONFIG_SND_SOC_WM8728=m +CONFIG_SND_SOC_WM8731=m +CONFIG_SND_SOC_WM8737=m +CONFIG_SND_SOC_WM8741=m +CONFIG_SND_SOC_WM8750=m +CONFIG_SND_SOC_WM8753=m +CONFIG_SND_SOC_WM8770=m +CONFIG_SND_SOC_WM8776=m +CONFIG_SND_SOC_WM8804=m +CONFIG_SND_SOC_WM8804_I2C=m +CONFIG_SND_SOC_WM8804_SPI=m +CONFIG_SND_SOC_WM8903=m +CONFIG_SND_SOC_WM8960=m +CONFIG_SND_SOC_WM8962=m +CONFIG_SND_SOC_WM8974=m +CONFIG_SND_SOC_WM8978=m +CONFIG_SND_SOC_WM8985=m +CONFIG_SND_SOC_NAU8540=m +CONFIG_SND_SOC_NAU8810=m +CONFIG_SND_SOC_NAU8825=m +CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SIMPLE_CARD_UTILS=m +CONFIG_SND_SIMPLE_CARD=m +CONFIG_SND_X86=y +CONFIG_HDMI_LPE_AUDIO=m +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID support +# +CONFIG_HID=m +CONFIG_HID_BATTERY_STRENGTH=y +CONFIG_HIDRAW=y +CONFIG_UHID=m +CONFIG_HID_GENERIC=m + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_APPLEIR=m +CONFIG_HID_ASUS=m +CONFIG_HID_AUREAL=m +CONFIG_HID_BELKIN=m +CONFIG_HID_BETOP_FF=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CORSAIR=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CMEDIA=m +CONFIG_HID_CP2112=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELECOM=m +CONFIG_HID_ELO=m +CONFIG_HID_EZKEY=m +CONFIG_HID_GEMBIRD=m +CONFIG_HID_GFRM=m +CONFIG_HID_HOLTEK=m +# CONFIG_HOLTEK_FF is not set +# CONFIG_HID_GT683R is not set +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LED=m +CONFIG_HID_LENOVO=m +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_HID_LOGITECH_HIDPP=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MAYFLASH=m +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PENMOUNT=m +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y +CONFIG_HID_PLANTRONICS=m +CONFIG_HID_PRIMAX=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_SONY_FF=y +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_HYPERV_MOUSE=m +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_UDRAW_PS3=m +CONFIG_HID_WACOM=m +CONFIG_HID_WIIMOTE=m +CONFIG_HID_XINMO=m +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m +CONFIG_HID_SENSOR_CUSTOM_SENSOR=m +CONFIG_HID_ALPS=m + +# +# USB HID support +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m + +# +# I2C HID support +# +CONFIG_I2C_HID=m +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=m +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEFAULT_PERSIST=y +CONFIG_USB_DYNAMIC_MINORS=y +# CONFIG_USB_OTG is not set +CONFIG_USB_OTG_WHITELIST=y +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_LEDS_TRIGGER_USBPORT=m +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_XHCI_HCD=m +CONFIG_USB_XHCI_PCI=m +CONFIG_USB_XHCI_PLATFORM=m +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_PCI=m +CONFIG_USB_EHCI_HCD_PLATFORM=m +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_FOTG210_HCD=m +# CONFIG_USB_MAX3421_HCD is not set +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_PCI=m +CONFIG_USB_OHCI_HCD_SSB=y +CONFIG_USB_OHCI_HCD_PLATFORM=m +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +# CONFIG_USB_SL811_HCD_ISO is not set +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +CONFIG_USB_HCD_BCMA=m +CONFIG_USB_HCD_SSB=m +# CONFIG_USB_HCD_TEST_MODE is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_VHCI_HC_PORTS=8 +CONFIG_USBIP_VHCI_NR_HCS=1 +CONFIG_USBIP_HOST=m +CONFIG_USBIP_VUDC=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_USB_MUSB_HDRC=m +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_GADGET is not set +CONFIG_USB_MUSB_DUAL_ROLE=y + +# +# Platform Glue Layer +# + +# +# MUSB DMA mode +# +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_DWC3=m +CONFIG_USB_DWC3_ULPI=y +# CONFIG_USB_DWC3_HOST is not set +# CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_DUAL_ROLE=y + +# +# Platform Glue Driver Support +# +CONFIG_USB_DWC3_PCI=m +# CONFIG_USB_DWC2 is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_PCI=m +# CONFIG_USB_CHIPIDEA_UDC is not set +CONFIG_USB_CHIPIDEA_HOST=y +# CONFIG_USB_CHIPIDEA_ULPI is not set +CONFIG_USB_ISP1760=m +CONFIG_USB_ISP1760_HCD=y +CONFIG_USB_ISP1761_UDC=y +# CONFIG_USB_ISP1760_HOST_ROLE is not set +# CONFIG_USB_ISP1760_GADGET_ROLE is not set +CONFIG_USB_ISP1760_DUAL_ROLE=y + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=m +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +CONFIG_USB_SERIAL_F8153X=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MXUPORT=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_XSENS_MT=m +CONFIG_USB_SERIAL_WISHBONE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m +CONFIG_USB_SERIAL_UPD78F0730=m +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_EHSET_TEST_FIXTURE=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m +CONFIG_USB_HUB_USB251XB=m +CONFIG_USB_HSIC_USB3503=m +CONFIG_USB_HSIC_USB4604=m +# CONFIG_USB_LINK_LAYER_TEST is not set +CONFIG_USB_CHAOSKEY=m +CONFIG_UCSI=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m + +# +# USB Physical Layer drivers +# +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m +CONFIG_USB_GPIO_VBUS=m +CONFIG_TAHVO_USB=m +# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set +CONFIG_USB_ISP1301=m +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +CONFIG_U_SERIAL_CONSOLE=y + +# +# USB Peripheral Controller +# +CONFIG_USB_FOTG210_UDC=m +CONFIG_USB_GR_UDC=m +CONFIG_USB_R8A66597=m +CONFIG_USB_PXA27X=m +CONFIG_USB_MV_UDC=m +CONFIG_USB_MV_U3D=m +CONFIG_USB_M66592=m +CONFIG_USB_BDC_UDC=m + +# +# Platform Support +# +CONFIG_USB_BDC_PCI=m +CONFIG_USB_AMD5536UDC=m +CONFIG_USB_NET2272=m +# CONFIG_USB_NET2272_DMA is not set +CONFIG_USB_NET2280=m +CONFIG_USB_GOKU=m +CONFIG_USB_EG20T=m +CONFIG_USB_DUMMY_HCD=m +CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_U_SERIAL=m +CONFIG_USB_U_ETHER=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m +CONFIG_USB_F_NCM=m +CONFIG_USB_F_ECM=m +CONFIG_USB_F_PHONET=m +CONFIG_USB_F_EEM=m +CONFIG_USB_F_SUBSET=m +CONFIG_USB_F_RNDIS=m +CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_FS=m +CONFIG_USB_F_UAC1=m +CONFIG_USB_F_UVC=m +CONFIG_USB_F_MIDI=m +CONFIG_USB_F_HID=m +CONFIG_USB_F_PRINTER=m +CONFIG_USB_F_TCM=m +CONFIG_USB_CONFIGFS=m +# CONFIG_USB_CONFIGFS_SERIAL is not set +# CONFIG_USB_CONFIGFS_ACM is not set +# CONFIG_USB_CONFIGFS_OBEX is not set +# CONFIG_USB_CONFIGFS_NCM is not set +# CONFIG_USB_CONFIGFS_ECM is not set +# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set +# CONFIG_USB_CONFIGFS_RNDIS is not set +# CONFIG_USB_CONFIGFS_EEM is not set +# CONFIG_USB_CONFIGFS_PHONET is not set +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +# CONFIG_USB_CONFIGFS_F_LB_SS is not set +# CONFIG_USB_CONFIGFS_F_FS is not set +# CONFIG_USB_CONFIGFS_F_UAC1 is not set +# CONFIG_USB_CONFIGFS_F_UAC2 is not set +# CONFIG_USB_CONFIGFS_F_MIDI is not set +# CONFIG_USB_CONFIGFS_F_HID is not set +CONFIG_USB_CONFIGFS_F_UVC=y +CONFIG_USB_CONFIGFS_F_PRINTER=y +CONFIG_USB_CONFIGFS_F_TCM=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_AUDIO=m +CONFIG_GADGET_UAC1=y +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_ETH_EEM=y +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +# CONFIG_USB_FUNCTIONFS_ETH is not set +# CONFIG_USB_FUNCTIONFS_RNDIS is not set +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_GADGET_TARGET=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +# CONFIG_USB_CDC_COMPOSITE is not set +CONFIG_USB_G_NOKIA=m +CONFIG_USB_G_ACM_MS=m +CONFIG_USB_G_MULTI=m +CONFIG_USB_G_MULTI_RNDIS=y +CONFIG_USB_G_MULTI_CDC=y +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m +CONFIG_USB_LED_TRIG=y +CONFIG_USB_ULPI_BUS=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +# CONFIG_MMC_RICOH_MMC is not set +CONFIG_MMC_SDHCI_ACPI=m +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +# CONFIG_MMC_USDHI6ROL0 is not set +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m +CONFIG_MMC_TOSHIBA_PCI=m +CONFIG_MMC_MTK=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m +CONFIG_MS_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m +# CONFIG_MEMSTICK_REALTEK_USB is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS_FLASH=m +# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set + +# +# LED drivers +# +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m +CONFIG_LEDS_PCA9532=m +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP3952=m +CONFIG_LEDS_LP55XX_COMMON=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_LP5562=m +CONFIG_LEDS_LP8501=m +CONFIG_LEDS_LP8860=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_PCA963X=m +# CONFIG_LEDS_WM831X_STATUS is not set +CONFIG_LEDS_DA9052=m +CONFIG_LEDS_DAC124S085=m +CONFIG_LEDS_PWM=m +CONFIG_LEDS_REGULATOR=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_MC13783=m +CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_TLC591XX=m +CONFIG_LEDS_LM355x=m +CONFIG_LEDS_OT200=m +CONFIG_LEDS_MENF21BMC=m + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# +CONFIG_LEDS_BLINKM=m +CONFIG_LEDS_USER=m +CONFIG_LEDS_NIC78BX=m + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m +CONFIG_LEDS_TRIGGER_DISK=y +CONFIG_LEDS_TRIGGER_MTD=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_LEDS_TRIGGER_CAMERA=m +CONFIG_LEDS_TRIGGER_PANIC=y +# CONFIG_ACCESSIBILITY is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ON_DEMAND_PAGING=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_CXGB4=m +CONFIG_INFINIBAND_I40IW=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_INFINIBAND_OCRDMA=m +CONFIG_INFINIBAND_VMWARE_PVRDMA=m +CONFIG_INFINIBAND_USNIC=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +CONFIG_INFINIBAND_IPOIB_DEBUG=y +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_SRPT=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_ISERT=m +CONFIG_RDMA_RXE=m +CONFIG_INFINIBAND_BNXT_RE=m +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD64=m +# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set +# CONFIG_EDAC_AMD76X is not set +# CONFIG_EDAC_E7XXX is not set +CONFIG_EDAC_E752X=m +# CONFIG_EDAC_I82875P is not set +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +# CONFIG_EDAC_IE31200 is not set +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +# CONFIG_EDAC_I82860 is not set +# CONFIG_EDAC_R82600 is not set +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_RTC_LIB=y +CONFIG_RTC_MC146818_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +CONFIG_RTC_DRV_TEST=m + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_ABB5ZES3=m +CONFIG_RTC_DRV_ABX80X=m +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1307_HWMON=y +# CONFIG_RTC_DRV_DS1307_CENTURY is not set +CONFIG_RTC_DRV_DS1374=m +# CONFIG_RTC_DRV_DS1374_WDT is not set +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8523=m +CONFIG_RTC_DRV_PCF85063=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8010=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV8803=m + +# +# SPI RTC drivers +# +CONFIG_RTC_DRV_M41T93=m +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_DS1302=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_DS1343=m +CONFIG_RTC_DRV_DS1347=m +CONFIG_RTC_DRV_DS1390=m +CONFIG_RTC_DRV_MAX6916=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_RX4581=m +CONFIG_RTC_DRV_RX6110=m +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_PCF2123=m +CONFIG_RTC_DRV_MCP795=m +CONFIG_RTC_I2C_AND_SPI=y + +# +# SPI and I2C RTC drivers +# +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_PCF2127=m +CONFIG_RTC_DRV_RV3029C2=m +CONFIG_RTC_DRV_RV3029_HWMON=y + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1685_FAMILY=m +CONFIG_RTC_DRV_DS1685=y +# CONFIG_RTC_DRV_DS1689 is not set +# CONFIG_RTC_DRV_DS17285 is not set +# CONFIG_RTC_DRV_DS17485 is not set +# CONFIG_RTC_DRV_DS17885 is not set +# CONFIG_RTC_DS1685_PROC_REGS is not set +# CONFIG_RTC_DS1685_SYSFS_REGS is not set +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_DS2404=m +CONFIG_RTC_DRV_DA9052=m +CONFIG_RTC_DRV_DA9063=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_WM831X=m +CONFIG_RTC_DRV_PCF50633=m + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_PCAP=m +CONFIG_RTC_DRV_MC13XXX=m +CONFIG_RTC_DRV_MT6397=m + +# +# HID Sensor RTC drivers +# +CONFIG_RTC_DRV_HID_SENSOR_TIME=m +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_DMA_ENGINE=y +CONFIG_DMA_VIRTUAL_CHANNELS=m +CONFIG_DMA_ACPI=y +CONFIG_INTEL_IDMA64=m +CONFIG_PCH_DMA=m +CONFIG_TIMB_DMA=m +CONFIG_QCOM_HIDMA_MGMT=m +CONFIG_QCOM_HIDMA=m +CONFIG_DW_DMAC_CORE=m +CONFIG_DW_DMAC=m +CONFIG_DW_DMAC_PCI=m +CONFIG_HSU_DMA=m + +# +# DMA Clients +# +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set + +# +# DMABUF options +# +CONFIG_SYNC_FILE=y +# CONFIG_SW_SYNC is not set +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_IMG_ASCII_LCD=m +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_UIO_DMEM_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m +CONFIG_UIO_PRUSS=m +CONFIG_UIO_MF624=m +CONFIG_UIO_HV_GENERIC=m +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO_VIRQFD=m +CONFIG_VFIO=m +CONFIG_VFIO_NOIOMMU=y +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y +CONFIG_VFIO_PCI_MMAP=y +CONFIG_VFIO_PCI_INTX=y +CONFIG_VFIO_PCI_IGD=y +CONFIG_VFIO_MDEV=m +CONFIG_VFIO_MDEV_DEVICE=m +CONFIG_IRQ_BYPASS_MANAGER=m +CONFIG_VIRT_DRIVERS=y +CONFIG_VIRTIO=m + +# +# Virtio drivers +# +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MMIO=m +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m +CONFIG_STAGING=y +CONFIG_PRISM2_USB=m +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 +CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 +CONFIG_COMEDI_MISC_DRIVERS=y +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SERIAL2002=m +CONFIG_COMEDI_SSV_DNP=m +# CONFIG_COMEDI_ISA_DRIVERS is not set +CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_8255_PCI=m +CONFIG_COMEDI_ADDI_WATCHDOG=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7X3X=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1720=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI1724=m +CONFIG_COMEDI_ADV_PCI1760=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200_PCI=m +CONFIG_COMEDI_AMPLC_PC236_PCI=m +CONFIG_COMEDI_AMPLC_PC263_PCI=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DAS08_PCI=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_MF6X4=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIMDAS=m +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_LABPC_PCI=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIOCMD=m +CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_NI_USB6501=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_USBDUXSIGMA=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_8254=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_8255_SA=m +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_RTL8192U=m +CONFIG_RTLLIB=m +CONFIG_RTLLIB_CRYPTO_CCMP=m +CONFIG_RTLLIB_CRYPTO_TKIP=m +CONFIG_RTLLIB_CRYPTO_WEP=m +CONFIG_RTL8192E=m +CONFIG_R8712U=m +CONFIG_R8188EU=m +CONFIG_88EU_AP_MODE=y +CONFIG_RTS5208=m +CONFIG_VT6655=m +CONFIG_VT6656=m + +# +# IIO staging drivers +# + +# +# Accelerometers +# +CONFIG_ADIS16201=m +CONFIG_ADIS16203=m +CONFIG_ADIS16209=m +CONFIG_ADIS16240=m + +# +# Analog to digital converters +# +CONFIG_AD7606=m +CONFIG_AD7606_IFACE_PARALLEL=m +CONFIG_AD7606_IFACE_SPI=m +CONFIG_AD7780=m +CONFIG_AD7816=m +CONFIG_AD7192=m +CONFIG_AD7280=m + +# +# Analog digital bi-direction converters +# +CONFIG_ADT7316=m +CONFIG_ADT7316_SPI=m +CONFIG_ADT7316_I2C=m + +# +# Capacitance to digital converters +# +CONFIG_AD7150=m +CONFIG_AD7152=m +CONFIG_AD7746=m + +# +# Direct Digital Synthesis +# +CONFIG_AD9832=m +CONFIG_AD9834=m + +# +# Digital gyroscope sensors +# +CONFIG_ADIS16060=m + +# +# Network Analyzer, Impedance Converters +# +CONFIG_AD5933=m + +# +# Light sensors +# +CONFIG_SENSORS_ISL29028=m +CONFIG_TSL2x7x=m + +# +# Active energy metering IC +# +CONFIG_ADE7753=m +CONFIG_ADE7754=m +CONFIG_ADE7758=m +CONFIG_ADE7759=m +CONFIG_ADE7854=m +CONFIG_ADE7854_I2C=m +CONFIG_ADE7854_SPI=m + +# +# Resolver to digital converters +# +CONFIG_AD2S90=m +CONFIG_AD2S1200=m +CONFIG_AD2S1210=m + +# +# Triggers - standalone +# +CONFIG_FB_SM750=m +CONFIG_FB_XGI=m + +# +# Speakup console speech +# +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m +CONFIG_STAGING_MEDIA=y +CONFIG_I2C_BCM2048=m +CONFIG_DVB_CXD2099=m +# CONFIG_LIRC_STAGING is not set + +# +# Android +# +CONFIG_LTE_GDM724X=m +CONFIG_FIREWIRE_SERIAL=m +CONFIG_FWTTY_MAX_TOTAL_PORTS=64 +CONFIG_FWTTY_MAX_CARD_PORTS=32 +CONFIG_LNET=m +CONFIG_LNET_MAX_PAYLOAD=1048576 +CONFIG_LNET_SELFTEST=m +CONFIG_LUSTRE_FS=m +CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192 +# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set +CONFIG_DGNC=m +CONFIG_GS_FPGABOOT=m +CONFIG_FB_TFT=m +CONFIG_FB_TFT_AGM1264K_FL=m +CONFIG_FB_TFT_BD663474=m +CONFIG_FB_TFT_HX8340BN=m +CONFIG_FB_TFT_HX8347D=m +CONFIG_FB_TFT_HX8353D=m +CONFIG_FB_TFT_HX8357D=m +CONFIG_FB_TFT_ILI9163=m +CONFIG_FB_TFT_ILI9320=m +CONFIG_FB_TFT_ILI9325=m +CONFIG_FB_TFT_ILI9340=m +CONFIG_FB_TFT_ILI9341=m +CONFIG_FB_TFT_ILI9481=m +CONFIG_FB_TFT_ILI9486=m +CONFIG_FB_TFT_PCD8544=m +CONFIG_FB_TFT_RA8875=m +CONFIG_FB_TFT_S6D02A1=m +CONFIG_FB_TFT_S6D1121=m +CONFIG_FB_TFT_SSD1289=m +CONFIG_FB_TFT_SSD1305=m +CONFIG_FB_TFT_SSD1306=m +CONFIG_FB_TFT_SSD1325=m +CONFIG_FB_TFT_SSD1331=m +CONFIG_FB_TFT_SSD1351=m +CONFIG_FB_TFT_ST7735R=m +CONFIG_FB_TFT_ST7789V=m +CONFIG_FB_TFT_TINYLCD=m +CONFIG_FB_TFT_TLS8204=m +CONFIG_FB_TFT_UC1611=m +CONFIG_FB_TFT_UC1701=m +CONFIG_FB_TFT_UPD161704=m +CONFIG_FB_TFT_WATTEROTT=m +CONFIG_FB_FLEX=m +CONFIG_FB_TFT_FBTFT_DEVICE=m +CONFIG_WILC1000=m +CONFIG_WILC1000_SDIO=m +# CONFIG_WILC1000_SPI is not set +# CONFIG_WILC1000_HW_OOB_INTR is not set +CONFIG_MOST=m +CONFIG_MOSTCORE=m +CONFIG_AIM_CDEV=m +CONFIG_AIM_NETWORK=m +CONFIG_AIM_SOUND=m +CONFIG_AIM_V4L2=m +CONFIG_HDM_DIM2=m +CONFIG_HDM_I2C=m +CONFIG_HDM_USB=m +CONFIG_KS7010=m +CONFIG_GREYBUS=m +CONFIG_GREYBUS_ES2=m +CONFIG_GREYBUS_AUDIO=m +CONFIG_GREYBUS_BOOTROM=m +CONFIG_GREYBUS_FIRMWARE=m +CONFIG_GREYBUS_HID=m +CONFIG_GREYBUS_LIGHT=m +CONFIG_GREYBUS_LOG=m +CONFIG_GREYBUS_LOOPBACK=m +CONFIG_GREYBUS_POWER=m +CONFIG_GREYBUS_RAW=m +CONFIG_GREYBUS_VIBRATOR=m +CONFIG_GREYBUS_BRIDGED_PHY=m +CONFIG_GREYBUS_GPIO=m +CONFIG_GREYBUS_I2C=m +CONFIG_GREYBUS_PWM=m +CONFIG_GREYBUS_SDIO=m +CONFIG_GREYBUS_SPI=m +CONFIG_GREYBUS_UART=m +CONFIG_GREYBUS_USB=m +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACERHDF=m +CONFIG_ALIENWARE_WMI=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_SMBIOS=m +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m +# CONFIG_DELL_SMO8800 is not set +CONFIG_DELL_RBTN=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_FUJITSU_TABLET=m +CONFIG_AMILO_RFKILL=m +# CONFIG_TC1100_WMI is not set +CONFIG_HP_ACCEL=m +CONFIG_HP_WIRELESS=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_SURFACE3_WMI=m +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_SENSORS_HDAPS=m +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_WMI=m +CONFIG_ASUS_WIRELESS=m +CONFIG_ACPI_WMI=m +CONFIG_MSI_WMI=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +# CONFIG_TOSHIBA_HAPS is not set +CONFIG_TOSHIBA_WMI=m +CONFIG_ACPI_CMPC=m +CONFIG_INTEL_HID_EVENT=m +CONFIG_INTEL_VBTN=m +CONFIG_INTEL_IPS=m +CONFIG_INTEL_PMC_CORE=y +CONFIG_IBM_RTL=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_SAMSUNG_Q10=m +CONFIG_APPLE_GMUX=m +CONFIG_INTEL_RST=m +CONFIG_INTEL_SMARTCONNECT=m +CONFIG_PVPANIC=m +CONFIG_INTEL_PMC_IPC=m +CONFIG_SURFACE_PRO3_BUTTON=m +CONFIG_INTEL_PUNIT_IPC=m +CONFIG_MLX_CPLD_PLATFORM=m +# CONFIG_SILEAD_DMI is not set +CONFIG_PMC_ATOM=y +CONFIG_CHROME_PLATFORMS=y +CONFIG_CHROMEOS_LAPTOP=m +CONFIG_CHROMEOS_PSTORE=m +CONFIG_CROS_EC_CHARDEV=m +CONFIG_CROS_EC_LPC=m +CONFIG_CROS_EC_PROTO=y +CONFIG_CROS_KBD_LED_BACKLIGHT=m +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +CONFIG_COMMON_CLK_WM831X=m +CONFIG_COMMON_CLK_SI5351=m +CONFIG_COMMON_CLK_CDCE706=m +CONFIG_COMMON_CLK_CS2000_CP=m +# CONFIG_COMMON_CLK_NXP is not set +CONFIG_COMMON_CLK_PWM=m +# CONFIG_COMMON_CLK_PXA is not set +# CONFIG_COMMON_CLK_PIC32 is not set + +# +# Hardware Spinlock drivers +# + +# +# Clock Source drivers +# +CONFIG_CLKSRC_I8253=y +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +# CONFIG_ATMEL_PIT is not set +# CONFIG_SH_TIMER_CMT is not set +# CONFIG_SH_TIMER_MTU2 is not set +# CONFIG_SH_TIMER_TMU is not set +# CONFIG_EM_TIMER_STI is not set +CONFIG_MAILBOX=y +# CONFIG_PCC is not set +CONFIG_ALTERA_MBOX=m +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +CONFIG_IOMMU_IOVA=y +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +CONFIG_INTEL_IOMMU_SVM=y +CONFIG_INTEL_IOMMU_DEFAULT_ON=y +CONFIG_INTEL_IOMMU_FLOPPY_WA=y + +# +# Remoteproc drivers +# +CONFIG_REMOTEPROC=m + +# +# Rpmsg drivers +# + +# +# SOC (System On Chip) specific Drivers +# + +# +# Broadcom SoC drivers +# +# CONFIG_SUNXI_SRAM is not set +# CONFIG_SOC_TI is not set +# CONFIG_SOC_ZTE is not set +CONFIG_PM_DEVFREQ=y + +# +# DEVFREQ Governors +# +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y +CONFIG_DEVFREQ_GOV_PERFORMANCE=y +CONFIG_DEVFREQ_GOV_POWERSAVE=y +CONFIG_DEVFREQ_GOV_USERSPACE=y +CONFIG_DEVFREQ_GOV_PASSIVE=m + +# +# DEVFREQ Drivers +# +CONFIG_PM_DEVFREQ_EVENT=y +CONFIG_EXTCON=y + +# +# Extcon Device Drivers +# +CONFIG_EXTCON_ADC_JACK=m +CONFIG_EXTCON_ARIZONA=m +CONFIG_EXTCON_AXP288=m +CONFIG_EXTCON_GPIO=m +CONFIG_EXTCON_INTEL_INT3496=m +CONFIG_EXTCON_MAX3355=m +CONFIG_EXTCON_MAX77843=m +CONFIG_EXTCON_QCOM_SPMI_MISC=m +CONFIG_EXTCON_RT8973A=m +# CONFIG_EXTCON_SM5502 is not set +CONFIG_EXTCON_USB_GPIO=m +CONFIG_MEMORY=y +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=m +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +CONFIG_IIO_CONFIGFS=m +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 +CONFIG_IIO_SW_DEVICE=m +CONFIG_IIO_SW_TRIGGER=m +CONFIG_IIO_TRIGGERED_EVENT=m + +# +# Accelerometers +# +CONFIG_BMA180=m +CONFIG_BMA220=m +CONFIG_BMC150_ACCEL=m +CONFIG_BMC150_ACCEL_I2C=m +CONFIG_BMC150_ACCEL_SPI=m +CONFIG_DA280=m +CONFIG_DA311=m +CONFIG_DMARD09=m +CONFIG_DMARD10=m +CONFIG_HID_SENSOR_ACCEL_3D=m +CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m +CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +CONFIG_KXSD9=m +CONFIG_KXSD9_SPI=m +CONFIG_KXSD9_I2C=m +# CONFIG_KXCJK1013 is not set +CONFIG_MC3230=m +CONFIG_MMA7455=m +CONFIG_MMA7455_I2C=m +CONFIG_MMA7455_SPI=m +CONFIG_MMA7660=m +# CONFIG_MMA8452 is not set +CONFIG_MMA9551_CORE=m +CONFIG_MMA9551=m +CONFIG_MMA9553=m +CONFIG_MXC4005=m +CONFIG_MXC6255=m +CONFIG_SCA3000=m +CONFIG_STK8312=m +CONFIG_STK8BA50=m + +# +# Analog to digital converters +# +CONFIG_AD_SIGMA_DELTA=m +CONFIG_AD7266=m +CONFIG_AD7291=m +CONFIG_AD7298=m +CONFIG_AD7476=m +CONFIG_AD7766=m +CONFIG_AD7791=m +CONFIG_AD7793=m +CONFIG_AD7887=m +CONFIG_AD7923=m +CONFIG_AD799X=m +CONFIG_AXP288_ADC=m +CONFIG_CC10001_ADC=m +CONFIG_DA9150_GPADC=m +CONFIG_HI8435=m +CONFIG_HX711=m +CONFIG_INA2XX_ADC=m +CONFIG_LTC2485=m +# CONFIG_MAX1027 is not set +CONFIG_MAX11100=m +CONFIG_MAX1363=m +CONFIG_MCP320X=m +CONFIG_MCP3422=m +CONFIG_MEN_Z188_ADC=m +CONFIG_NAU7802=m +CONFIG_QCOM_SPMI_IADC=m +CONFIG_QCOM_SPMI_VADC=m +CONFIG_TI_ADC081C=m +CONFIG_TI_ADC0832=m +CONFIG_TI_ADC12138=m +CONFIG_TI_ADC128S052=m +CONFIG_TI_ADC161S626=m +CONFIG_TI_ADS1015=m +CONFIG_TI_ADS7950=m +CONFIG_TI_AM335X_ADC=m +CONFIG_TI_TLC4541=m +CONFIG_VIPERBOARD_ADC=m + +# +# Amplifiers +# +CONFIG_AD8366=m + +# +# Chemical Sensors +# +CONFIG_ATLAS_PH_SENSOR=m +CONFIG_IAQCORE=m +CONFIG_VZ89X=m +CONFIG_IIO_CROS_EC_SENSORS_CORE=m +CONFIG_IIO_CROS_EC_SENSORS=m + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m +CONFIG_IIO_MS_SENSORS_I2C=m + +# +# SSP Sensor Common +# +CONFIG_IIO_SSP_SENSORS_COMMONS=m +CONFIG_IIO_SSP_SENSORHUB=m +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# Counters +# + +# +# Digital to analog converters +# +CONFIG_AD5064=m +CONFIG_AD5360=m +CONFIG_AD5380=m +CONFIG_AD5421=m +CONFIG_AD5446=m +CONFIG_AD5449=m +CONFIG_AD5592R_BASE=m +CONFIG_AD5592R=m +CONFIG_AD5593R=m +CONFIG_AD5504=m +CONFIG_AD5624R_SPI=m +CONFIG_AD5686=m +CONFIG_AD5755=m +CONFIG_AD5761=m +CONFIG_AD5764=m +CONFIG_AD5791=m +CONFIG_AD7303=m +CONFIG_AD8801=m +CONFIG_M62332=m +CONFIG_MAX517=m +CONFIG_MCP4725=m +# CONFIG_MCP4922 is not set + +# +# IIO dummy driver +# +CONFIG_IIO_SIMPLE_DUMMY=m +# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set +# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +CONFIG_AD9523=m + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +CONFIG_ADF4350=m + +# +# Digital gyroscope sensors +# +CONFIG_ADIS16080=m +CONFIG_ADIS16130=m +CONFIG_ADIS16136=m +CONFIG_ADIS16260=m +CONFIG_ADXRS450=m +CONFIG_BMG160=m +CONFIG_BMG160_I2C=m +CONFIG_BMG160_SPI=m +CONFIG_HID_SENSOR_GYRO_3D=m +CONFIG_MPU3050=m +CONFIG_MPU3050_I2C=m +CONFIG_IIO_ST_GYRO_3AXIS=m +CONFIG_IIO_ST_GYRO_I2C_3AXIS=m +CONFIG_IIO_ST_GYRO_SPI_3AXIS=m +CONFIG_ITG3200=m + +# +# Health Sensors +# + +# +# Heart Rate Monitors +# +CONFIG_AFE4403=m +CONFIG_AFE4404=m +CONFIG_MAX30100=m + +# +# Humidity sensors +# +CONFIG_AM2315=m +CONFIG_DHT11=m +CONFIG_HDC100X=m +CONFIG_HTS221=m +CONFIG_HTS221_I2C=m +CONFIG_HTS221_SPI=m +CONFIG_HTU21=m +CONFIG_SI7005=m +CONFIG_SI7020=m + +# +# Inertial measurement units +# +CONFIG_ADIS16400=m +CONFIG_ADIS16480=m +CONFIG_BMI160=m +CONFIG_BMI160_I2C=m +CONFIG_BMI160_SPI=m +CONFIG_KMX61=m +CONFIG_INV_MPU6050_IIO=m +CONFIG_INV_MPU6050_I2C=m +CONFIG_INV_MPU6050_SPI=m +CONFIG_IIO_ST_LSM6DSX=m +CONFIG_IIO_ST_LSM6DSX_I2C=m +CONFIG_IIO_ST_LSM6DSX_SPI=m +CONFIG_IIO_ADIS_LIB=m +CONFIG_IIO_ADIS_LIB_BUFFER=y + +# +# Light sensors +# +CONFIG_ACPI_ALS=m +CONFIG_ADJD_S311=m +CONFIG_AL3320A=m +CONFIG_APDS9300=m +CONFIG_APDS9960=m +CONFIG_BH1750=m +CONFIG_BH1780=m +CONFIG_CM32181=m +CONFIG_CM3232=m +CONFIG_CM3323=m +CONFIG_CM36651=m +CONFIG_GP2AP020A00F=m +CONFIG_SENSORS_ISL29018=m +# CONFIG_ISL29125 is not set +CONFIG_HID_SENSOR_ALS=m +CONFIG_HID_SENSOR_PROX=m +CONFIG_JSA1212=m +CONFIG_RPR0521=m +CONFIG_SENSORS_LM3533=m +CONFIG_LTR501=m +CONFIG_MAX44000=m +CONFIG_OPT3001=m +CONFIG_PA12203001=m +CONFIG_SI1145=m +CONFIG_STK3310=m +# CONFIG_TCS3414 is not set +CONFIG_TCS3472=m +CONFIG_SENSORS_TSL2563=m +CONFIG_TSL2583=m +CONFIG_TSL4531=m +CONFIG_US5182D=m +CONFIG_VCNL4000=m +CONFIG_VEML6070=m + +# +# Magnetometer sensors +# +CONFIG_AK8975=m +# CONFIG_AK09911 is not set +CONFIG_BMC150_MAGN=m +CONFIG_BMC150_MAGN_I2C=m +CONFIG_BMC150_MAGN_SPI=m +CONFIG_MAG3110=m +CONFIG_HID_SENSOR_MAGNETOMETER_3D=m +CONFIG_MMC35240=m +CONFIG_IIO_ST_MAGN_3AXIS=m +CONFIG_IIO_ST_MAGN_I2C_3AXIS=m +CONFIG_IIO_ST_MAGN_SPI_3AXIS=m +# CONFIG_SENSORS_HMC5843_I2C is not set +# CONFIG_SENSORS_HMC5843_SPI is not set + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set + +# +# Triggers - standalone +# +CONFIG_IIO_HRTIMER_TRIGGER=m +CONFIG_IIO_INTERRUPT_TRIGGER=m +CONFIG_IIO_TIGHTLOOP_TRIGGER=m +CONFIG_IIO_SYSFS_TRIGGER=m + +# +# Digital potentiometers +# +CONFIG_DS1803=m +CONFIG_MAX5481=m +CONFIG_MAX5487=m +CONFIG_MCP4131=m +CONFIG_MCP4531=m +CONFIG_TPL0102=m + +# +# Digital potentiostats +# +CONFIG_LMP91000=m + +# +# Pressure sensors +# +CONFIG_ABP060MG=m +CONFIG_BMP280=m +CONFIG_BMP280_I2C=m +CONFIG_BMP280_SPI=m +CONFIG_IIO_CROS_EC_BARO=m +CONFIG_HID_SENSOR_PRESS=m +CONFIG_HP03=m +CONFIG_MPL115=m +CONFIG_MPL115_I2C=m +CONFIG_MPL115_SPI=m +CONFIG_MPL3115=m +CONFIG_MS5611=m +CONFIG_MS5611_I2C=m +CONFIG_MS5611_SPI=m +CONFIG_MS5637=m +CONFIG_IIO_ST_PRESS=m +CONFIG_IIO_ST_PRESS_I2C=m +CONFIG_IIO_ST_PRESS_SPI=m +# CONFIG_T5403 is not set +CONFIG_HP206C=m +CONFIG_ZPA2326=m +CONFIG_ZPA2326_I2C=m +CONFIG_ZPA2326_SPI=m + +# +# Lightning sensors +# +# CONFIG_AS3935 is not set + +# +# Proximity and distance sensors +# +CONFIG_LIDAR_LITE_V2=m +CONFIG_SX9500=m +CONFIG_SRF08=m + +# +# Temperature sensors +# +CONFIG_MAXIM_THERMOCOUPLE=m +# CONFIG_MLX90614 is not set +CONFIG_TMP006=m +CONFIG_TMP007=m +CONFIG_TSYS01=m +CONFIG_TSYS02D=m +CONFIG_NTB=m +CONFIG_NTB_PINGPONG=m +CONFIG_NTB_TOOL=m +CONFIG_NTB_PERF=m +CONFIG_NTB_TRANSPORT=m +# CONFIG_VME_BUS is not set +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +CONFIG_PWM_CROS_EC=m +CONFIG_PWM_LP3943=m +CONFIG_PWM_LPSS=m +CONFIG_PWM_LPSS_PCI=m +CONFIG_PWM_LPSS_PLATFORM=m +CONFIG_PWM_PCA9685=m +CONFIG_ARM_GIC_MAX_NR=1 +CONFIG_IPACK_BUS=m +CONFIG_BOARD_TPCI200=m +CONFIG_SERIAL_IPOCTAL=m +CONFIG_RESET_CONTROLLER=y +# CONFIG_RESET_ATH79 is not set +# CONFIG_RESET_BERLIN is not set +# CONFIG_RESET_LPC18XX is not set +# CONFIG_RESET_MESON is not set +# CONFIG_RESET_PISTACHIO is not set +# CONFIG_RESET_SOCFPGA is not set +# CONFIG_RESET_STM32 is not set +# CONFIG_RESET_SUNXI is not set +CONFIG_TI_SYSCON_RESET=m +# CONFIG_RESET_ZYNQ is not set +# CONFIG_RESET_TEGRA_BPMP is not set +CONFIG_FMC=m +CONFIG_FMC_FAKEDEV=m +CONFIG_FMC_TRIVIAL=m +CONFIG_FMC_WRITE_EEPROM=m +CONFIG_FMC_CHARDEV=m + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +CONFIG_PHY_PXA_28NM_HSIC=m +CONFIG_PHY_PXA_28NM_USB2=m +# CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_PHY_QCOM_USB_HS=m +CONFIG_PHY_QCOM_USB_HSIC=m +CONFIG_PHY_TUSB1210=m +CONFIG_POWERCAP=y +CONFIG_INTEL_RAPL=m +CONFIG_MCB=m +CONFIG_MCB_PCI=m +CONFIG_MCB_LPC=m + +# +# Performance monitor support +# +CONFIG_RAS=y +CONFIG_MCE_AMD_INJ=m +CONFIG_THUNDERBOLT=m + +# +# Android +# +# CONFIG_ANDROID is not set +# CONFIG_LIBNVDIMM is not set +CONFIG_DEV_DAX=m +CONFIG_NR_DEV_DAX=32768 +CONFIG_NVMEM=m +CONFIG_STM=m +CONFIG_STM_DUMMY=m +CONFIG_STM_SOURCE_CONSOLE=m +CONFIG_STM_SOURCE_HEARTBEAT=m +CONFIG_INTEL_TH=m +CONFIG_INTEL_TH_PCI=m +CONFIG_INTEL_TH_GTH=m +CONFIG_INTEL_TH_STH=m +CONFIG_INTEL_TH_MSU=m +CONFIG_INTEL_TH_PTI=m +# CONFIG_INTEL_TH_DEBUG is not set + +# +# FPGA Configuration Support +# +CONFIG_FPGA=m + +# +# FSI support +# +CONFIG_FSI=m + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m +CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +CONFIG_FW_CFG_SYSFS=m +CONFIG_FW_CFG_SYSFS_CMDLINE=y +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=y +CONFIG_EFI_ESRT=y +CONFIG_EFI_VARS_PSTORE=y +CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y +CONFIG_EFI_RUNTIME_MAP=y +# CONFIG_EFI_FAKE_MEMMAP is not set +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_BOOTLOADER_CONTROL=m +CONFIG_EFI_CAPSULE_LOADER=m +CONFIG_EFI_TEST=m +CONFIG_APPLE_PROPERTIES=y +CONFIG_UEFI_CPER=y +CONFIG_EFI_DEV_PATH_PARSER=y + +# +# Tegra firmware driver +# + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_FS_IOMAP=y +CONFIG_EXT2_FS=m +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_ENCRYPTION is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_WARN is not set +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set +CONFIG_NILFS2_FS=m +CONFIG_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_F2FS_FS_SECURITY=y +CONFIG_F2FS_CHECK_FS=y +CONFIG_F2FS_FS_ENCRYPTION=y +# CONFIG_F2FS_FAULT_INJECTION is not set +CONFIG_FS_DAX=y +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_EXPORTFS_BLOCK_OPS=y +CONFIG_FILE_LOCKING=y +CONFIG_MANDATORY_FILE_LOCKING=y +CONFIG_FS_ENCRYPTION=m +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_OVERLAY_FS=m +# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set + +# +# Caches +# +CONFIG_FSCACHE=m +# CONFIG_FSCACHE_STATS is not set +# CONFIG_FSCACHE_HISTOGRAM is not set +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_FAT_DEFAULT_UTF8=y +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_VMCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_PROC_CHILDREN=y +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=m +CONFIG_EFIVAR_FS=y +CONFIG_MISC_FILESYSTEMS=y +CONFIG_ORANGEFS_FS=m +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +# CONFIG_AFFS_FS is not set +CONFIG_ECRYPT_FS=m +# CONFIG_ECRYPT_FS_MESSAGING is not set +# CONFIG_HFS_FS is not set +CONFIG_HFSPLUS_FS=m +CONFIG_HFSPLUS_FS_POSIX_ACL=y +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_FILE_CACHE=y +# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set +CONFIG_SQUASHFS_DECOMP_MULTI=y +# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZ4=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +CONFIG_HPFS_FS=m +# CONFIG_QNX4FS_FS is not set +CONFIG_QNX6FS_FS=m +# CONFIG_QNX6FS_DEBUG is not set +# CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y +CONFIG_PSTORE_ZLIB_COMPRESS=y +# CONFIG_PSTORE_LZO_COMPRESS is not set +# CONFIG_PSTORE_LZ4_COMPRESS is not set +# CONFIG_PSTORE_CONSOLE is not set +# CONFIG_PSTORE_PMSG is not set +CONFIG_PSTORE_RAM=m +# CONFIG_SYSV_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +# CONFIG_EXOFS_FS is not set +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=m +CONFIG_NFS_SWAP=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_PNFS_FLEXFILE_LAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +CONFIG_NFS_V4_1_MIGRATION=y +CONFIG_NFS_V4_SECURITY_LABEL=y +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_PNFS=y +CONFIG_NFSD_BLOCKLAYOUT=y +CONFIG_NFSD_SCSILAYOUT=y +# CONFIG_NFSD_FLEXFILELAYOUT is not set +# CONFIG_NFSD_V4_SECURITY_LABEL is not set +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_GRACE_PERIOD=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_SUNRPC_DEBUG is not set +CONFIG_SUNRPC_XPRT_RDMA=m +CONFIG_CEPH_FS=m +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_UPCALL is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y +# CONFIG_CIFS_DEBUG is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y +CONFIG_CIFS_SMB311=y +CONFIG_CIFS_FSCACHE=y +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +# CONFIG_BOOT_PRINTK_DELAY is not set +CONFIG_DYNAMIC_DEBUG=y + +# +# Compile-time checks and compiler options +# +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_INFO_REDUCED is not set +# CONFIG_DEBUG_INFO_SPLIT is not set +# CONFIG_DEBUG_INFO_DWARF4 is not set +# CONFIG_GDB_SCRIPTS is not set +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_PAGE_OWNER is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +CONFIG_ARCH_WANT_FRAME_POINTERS=y +# CONFIG_FRAME_POINTER is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_DEBUG_KERNEL=y + +# +# Memory Debugging +# +CONFIG_PAGE_EXTENSION=y +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_PAGE_POISONING=y +CONFIG_PAGE_POISONING_NO_SANITY=y +CONFIG_PAGE_POISONING_ZERO=y +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_VM is not set +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y +# CONFIG_DEBUG_VIRTUAL is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_DEBUG_HIGHMEM is not set +CONFIG_HAVE_DEBUG_STACKOVERFLOW=y +# CONFIG_DEBUG_STACKOVERFLOW is not set +CONFIG_HAVE_ARCH_KMEMCHECK=y +# CONFIG_KMEMCHECK is not set +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Lockups and Hangs +# +CONFIG_LOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1 +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +# CONFIG_DETECT_HUNG_TASK is not set +# CONFIG_WQ_WATCHDOG is not set +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 +# CONFIG_SCHED_DEBUG is not set +CONFIG_SCHED_INFO=y +CONFIG_SCHEDSTATS=y +# CONFIG_SCHED_STACK_END_CHECK is not set +# CONFIG_DEBUG_TIMEKEEPING is not set +# CONFIG_DEBUG_PREEMPT is not set + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_LOCK_TORTURE_TEST is not set +CONFIG_WW_MUTEX_SELFTEST=m +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_LIST=y +# CONFIG_DEBUG_PI_LIST is not set +# CONFIG_DEBUG_SG is not set +CONFIG_DEBUG_NOTIFIERS=y +CONFIG_DEBUG_CREDENTIALS=y + +# +# RCU Debugging +# +# CONFIG_PROVE_RCU is not set +# CONFIG_SPARSE_RCU_POINTER is not set +CONFIG_TORTURE_TEST=m +CONFIG_RCU_PERF_TEST=m +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACE_CLOCK=y +CONFIG_RING_BUFFER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set + +# +# Runtime Testing +# +CONFIG_LKDTM=m +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_TEST_SORT is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set +# CONFIG_PERCPU_TEST is not set +# CONFIG_ATOMIC64_SELFTEST is not set +CONFIG_ASYNC_RAID6_TEST=m +CONFIG_TEST_HEXDUMP=m +CONFIG_TEST_STRING_HELPERS=m +CONFIG_TEST_KSTRTOX=m +CONFIG_TEST_PRINTF=m +CONFIG_TEST_BITMAP=m +CONFIG_TEST_UUID=m +# CONFIG_TEST_RHASHTABLE is not set +CONFIG_TEST_HASH=m +CONFIG_TEST_PARMAN=m +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_TEST_LKM is not set +# CONFIG_TEST_USER_COPY is not set +# CONFIG_TEST_BPF is not set +# CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_UDELAY is not set +# CONFIG_MEMTEST is not set +CONFIG_TEST_STATIC_KEYS=m +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set +# CONFIG_UBSAN is not set +CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y +CONFIG_STRICT_DEVMEM=y +CONFIG_IO_STRICT_DEVMEM=y +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +CONFIG_EARLY_PRINTK_EFI=y +# CONFIG_X86_PTDUMP_CORE is not set +# CONFIG_X86_PTDUMP is not set +# CONFIG_EFI_PGT_DUMP is not set +# CONFIG_DEBUG_WX is not set +CONFIG_DOUBLEFAULT=y +# CONFIG_DEBUG_TLBFLUSH is not set +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# CONFIG_OPTIMIZE_INLINING is not set +# CONFIG_DEBUG_ENTRY is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set +CONFIG_X86_DEBUG_FPU=y +CONFIG_PUNIT_ATOM_DEBUG=m + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_PERSISTENT_KEYRINGS is not set +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=m +# CONFIG_KEY_DH_OPERATIONS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +# CONFIG_SECURITY_NETWORK is not set +CONFIG_SECURITY_PATH=y +CONFIG_INTEL_TXT=y +CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y +CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y +CONFIG_HARDENED_USERCOPY=y +# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set +# CONFIG_STATIC_USERMODEHELPER is not set +# CONFIG_SECURITY_SMACK is not set +# CONFIG_SECURITY_TOMOYO is not set +# CONFIG_SECURITY_APPARMOR is not set +# CONFIG_SECURITY_LOADPIN is not set +CONFIG_SECURITY_YAMA=y +CONFIG_INTEGRITY=y +# CONFIG_INTEGRITY_SIGNATURE is not set +CONFIG_INTEGRITY_AUDIT=y +# CONFIG_IMA is not set +# CONFIG_EVM is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=m +CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AKCIPHER=y +CONFIG_CRYPTO_KPP2=y +CONFIG_CRYPTO_KPP=m +CONFIG_CRYPTO_ACOMP2=y +CONFIG_CRYPTO_RSA=m +CONFIG_CRYPTO_DH=m +CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=y +CONFIG_CRYPTO_MCRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_ABLK_HELPER=y +CONFIG_CRYPTO_SIMD=m +CONFIG_CRYPTO_GLUE_HELPER_X86=y +CONFIG_CRYPTO_ENGINE=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_ECHAINIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_LRW=y +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=y +CONFIG_CRYPTO_KEYWRAP=m + +# +# Hash modes +# +CONFIG_CRYPTO_CMAC=m +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=m +CONFIG_CRYPTO_CRCT10DIF=y +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +CONFIG_CRYPTO_SHA3=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_AES_TI=m +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST_COMMON=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_586=y +CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=y +CONFIG_CRYPTO_SERPENT_SSE2_586=y +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=y +CONFIG_CRYPTO_TWOFISH_586=y + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_842=m +CONFIG_CRYPTO_LZ4=m +CONFIG_CRYPTO_LZ4HC=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_MENU=m +CONFIG_CRYPTO_DRBG_HMAC=y +# CONFIG_CRYPTO_DRBG_HASH is not set +# CONFIG_CRYPTO_DRBG_CTR is not set +CONFIG_CRYPTO_DRBG=m +CONFIG_CRYPTO_JITTERENTROPY=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_RNG=m +CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_HASH_INFO=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_GEODE=m +# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set +CONFIG_CRYPTO_DEV_CCP=y +CONFIG_CRYPTO_DEV_CCP_DD=m +CONFIG_CRYPTO_DEV_CCP_CRYPTO=m +CONFIG_CRYPTO_DEV_QAT=m +# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set +CONFIG_CRYPTO_DEV_QAT_C3XXX=m +CONFIG_CRYPTO_DEV_QAT_C62X=m +CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m +CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m +CONFIG_CRYPTO_DEV_QAT_C62XVF=m +CONFIG_CRYPTO_DEV_CHELSIO=m +CONFIG_CRYPTO_DEV_VIRTIO=m +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y + +# +# Certificates for signature checking +# +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQFD=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y +CONFIG_KVM_VFIO=y +CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y +CONFIG_HAVE_KVM_IRQ_BYPASS=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_DEVICE_ASSIGNMENT=y +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_VSOCK=m +CONFIG_VHOST=m +CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y +# CONFIG_LGUEST is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +# CONFIG_HAVE_ARCH_BITREVERSE is not set +CONFIG_RATIONAL=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +CONFIG_AUDIT_GENERIC=y +# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_842_COMPRESS=m +CONFIG_842_DECOMPRESS=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_COMPRESS=m +CONFIG_LZ4HC_COMPRESS=m +CONFIG_LZ4_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_TEST=m +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_DECOMPRESS_LZ4=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_BCH=m +CONFIG_BCH_CONST_PARAMS=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y +CONFIG_RADIX_TREE_MULTIORDER=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +# CONFIG_DMA_NOOP_OPS is not set +CONFIG_DMA_VIRT_OPS=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_GLOB=y +# CONFIG_GLOB_SELFTEST is not set +CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m +CONFIG_CLZ_TAB=y +CONFIG_CORDIC=m +CONFIG_DDR=y +CONFIG_IRQ_POLL=y +CONFIG_MPILIB=y +CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y +CONFIG_FONT_SUPPORT=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_6x10 is not set +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_AUTOSELECT=y +# CONFIG_SG_SPLIT is not set +CONFIG_SG_POOL=y +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_ARCH_HAS_MMIO_FLUSH=y +CONFIG_SBITMAP=y +CONFIG_PARMAN=m +CONFIG_PRIME_NUMBERS=m diff --git a/srcpkgs/linux4.11/files/mv-debug b/srcpkgs/linux4.11/files/mv-debug new file mode 100755 index 00000000000..8898c928d11 --- /dev/null +++ b/srcpkgs/linux4.11/files/mv-debug @@ -0,0 +1,7 @@ +#!/bin/sh +mod=$1 +mkdir -p usr/lib/debug/${mod%/*} +$OBJCOPY --only-keep-debug --compress-debug-sections $mod usr/lib/debug/$mod +$OBJCOPY --add-gnu-debuglink=${DESTDIR}/usr/lib/debug/$mod $mod +/usr/bin/$STRIP --strip-debug $mod +gzip -9 $mod diff --git a/srcpkgs/linux4.11/files/x86_64-dotconfig b/srcpkgs/linux4.11/files/x86_64-dotconfig new file mode 100644 index 00000000000..2bb7c7ab8c6 --- /dev/null +++ b/srcpkgs/linux4.11/files/x86_64-dotconfig @@ -0,0 +1,8388 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86_64 4.11.0-rc6 Kernel Configuration +# +CONFIG_64BIT=y +CONFIG_X86_64=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf64-x86-64" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_MMU=y +CONFIG_ARCH_MMAP_RND_BITS_MIN=28 +CONFIG_ARCH_MMAP_RND_BITS_MAX=32 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ZONE_DMA32=y +CONFIG_AUDIT_ARCH=y +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_64_SMP=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_PGTABLE_LEVELS=4 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y +CONFIG_THREAD_INFO_IN_TASK=y + +# +# General setup +# +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +# CONFIG_COMPILE_TEST is not set +CONFIG_LOCALVERSION="_1" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_KERNEL_LZ4=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +# CONFIG_KERNEL_LZ4 is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_FHANDLE=y +# CONFIG_USELIB is not set +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +# CONFIG_NO_HZ_FULL is not set +# CONFIG_NO_HZ is not set +CONFIG_HIGH_RES_TIMERS=y + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + +# +# RCU Subsystem +# +CONFIG_PREEMPT_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +CONFIG_TASKS_RCU=y +CONFIG_RCU_STALL_COMMON=y +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_BUILD_BIN2C=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=19 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 +CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y +CONFIG_ARCH_SUPPORTS_INT128=y +CONFIG_NUMA_BALANCING=y +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y +CONFIG_CGROUPS=y +CONFIG_PAGE_COUNTER=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_CGROUP_WRITEBACK=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_CGROUP_PIDS=y +# CONFIG_CGROUP_RDMA is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_HUGETLB=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_BPF=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_SOCK_CGROUP_DATA=y +CONFIG_CHECKPOINT_RESTORE=y +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +CONFIG_RD_LZ4=y +CONFIG_INITRAMFS_COMPRESSION=".gz" +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BPF=y +CONFIG_EXPERT=y +CONFIG_UID16=y +CONFIG_MULTIUSER=y +CONFIG_SGETMASK_SYSCALL=y +CONFIG_SYSFS_SYSCALL=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_POSIX_TIMERS=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y +CONFIG_KALLSYMS_BASE_RELATIVE=y +CONFIG_PRINTK=y +CONFIG_PRINTK_NMI=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_BPF_SYSCALL=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_ADVISE_SYSCALLS=y +CONFIG_USERFAULTFD=y +CONFIG_PCI_QUIRKS=y +CONFIG_MEMBARRIER=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y +# CONFIG_PC104 is not set + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_MEMCG_SYSFS_ON is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_SLAB_FREELIST_RANDOM is not set +CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_DATA_VERIFICATION is not set +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_KEXEC_CORE=y +CONFIG_OPROFILE=m +CONFIG_OPROFILE_EVENT_MULTIPLEX=y +CONFIG_HAVE_OPROFILE=y +CONFIG_OPROFILE_NMI_TIMER=y +CONFIG_KPROBES=y +# CONFIG_JUMP_LABEL is not set +CONFIG_KPROBES_ON_FTRACE=y +CONFIG_UPROBES=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_KRETPROBES=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y +CONFIG_HAVE_NMI=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_GCC_PLUGINS=y +# CONFIG_GCC_PLUGINS is not set +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +# CONFIG_CC_STACKPROTECTOR_REGULAR is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y +CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y +CONFIG_HAVE_ARCH_HUGE_VMAP=y +CONFIG_HAVE_ARCH_SOFT_DIRTY=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y +CONFIG_HAVE_EXIT_THREAD=y +CONFIG_ARCH_MMAP_RND_BITS=28 +CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 +CONFIG_HAVE_COPY_THREAD_TLS=y +CONFIG_HAVE_STACK_VALIDATION=y +# CONFIG_HAVE_ARCH_HASH is not set +# CONFIG_ISA_BUS_API is not set +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y +# CONFIG_CPU_NO_EFFICIENT_FFS is not set +CONFIG_HAVE_ARCH_VMAP_STACK=y +CONFIG_VMAP_STACK=y +# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set +# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_STRICT_MODULE_RWX=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set +# CONFIG_MODULE_COMPRESS is not set +# CONFIG_TRIM_UNUSED_KSYMS is not set +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_BLK_DEV_ZONED=y +CONFIG_BLK_DEV_THROTTLING=y +CONFIG_BLK_CMDLINE_PARSER=y +CONFIG_BLK_WBT=y +# CONFIG_BLK_WBT_SQ is not set +CONFIG_BLK_WBT_MQ=y +CONFIG_BLK_DEBUG_FS=y +# CONFIG_BLK_SED_OPAL is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_AIX_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_UNIXWARE_DISKLABEL is not set +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_CMDLINE_PARTITION=y +CONFIG_BLOCK_COMPAT=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +CONFIG_ASN1=y +CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y +CONFIG_QUEUED_SPINLOCKS=y +CONFIG_ARCH_USE_QUEUED_RWLOCKS=y +CONFIG_QUEUED_RWLOCKS=y +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_ZONE_DMA=y +CONFIG_SMP=y +CONFIG_X86_FEATURE_NAMES=y +CONFIG_X86_FAST_FEATURE_TESTS=y +CONFIG_X86_X2APIC=y +CONFIG_X86_MPPARSE=y +# CONFIG_GOLDFISH is not set +CONFIG_INTEL_RDT_A=y +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_X86_INTEL_LPSS=y +CONFIG_X86_AMD_PLATFORM_DEVICE=y +CONFIG_IOSF_MBI=y +# CONFIG_IOSF_MBI_DEBUG is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set +# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_512GB=y +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_XEN_PVH=y +CONFIG_KVM_GUEST=y +# CONFIG_KVM_DEBUG_FS is not set +CONFIG_PARAVIRT_TIME_ACCOUNTING=y +CONFIG_PARAVIRT_CLOCK=y +CONFIG_NO_BOOTMEM=y +# CONFIG_MK8 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_GENERIC_CPU=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=64 +CONFIG_X86_DEBUGCTLMSR=y +# CONFIG_PROCESSOR_SELECT is not set +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +CONFIG_GART_IOMMU=y +CONFIG_CALGARY_IOMMU=y +CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y +CONFIG_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +# CONFIG_MAXSMP is not set +CONFIG_NR_CPUS=64 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +CONFIG_SCHED_MC_PRIO=y +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +CONFIG_X86_MCE_THRESHOLD=y +CONFIG_X86_MCE_INJECT=m +CONFIG_X86_THERMAL_VECTOR=y + +# +# Performance monitoring +# +CONFIG_PERF_EVENTS_INTEL_UNCORE=y +CONFIG_PERF_EVENTS_INTEL_RAPL=m +CONFIG_PERF_EVENTS_INTEL_CSTATE=m +CONFIG_PERF_EVENTS_AMD_POWER=m +# CONFIG_VM86 is not set +# CONFIG_X86_16BIT is not set +CONFIG_X86_VSYSCALL_EMULATION=y +CONFIG_I8K=m +CONFIG_MICROCODE=y +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_X86_DIRECT_GBPAGES=y +CONFIG_NUMA=y +CONFIG_AMD_NUMA=y +CONFIG_X86_64_ACPI_NUMA=y +CONFIG_NODES_SPAN_OTHER_NODES=y +# CONFIG_NUMA_EMU is not set +CONFIG_NODES_SHIFT=6 +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_MEMORY_PROBE=y +CONFIG_ARCH_PROC_KCORE_TEXT=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_MOVABLE_NODE=y +CONFIG_HAVE_BOOTMEM_INFO_NODE=y +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTPLUG_SPARSE=y +CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y +CONFIG_MEMORY_HOTREMOVE=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_MEMORY_FAILURE=y +# CONFIG_HWPOISON_INJECT is not set +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_TRANSPARENT_HUGE_PAGECACHE=y +CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y +# CONFIG_CMA is not set +# CONFIG_MEM_SOFT_DIRTY is not set +CONFIG_ZSWAP=y +CONFIG_ZPOOL=y +CONFIG_ZBUD=y +CONFIG_Z3FOLD=m +CONFIG_ZSMALLOC=y +CONFIG_PGTABLE_MAPPING=y +# CONFIG_ZSMALLOC_STAT is not set +CONFIG_GENERIC_EARLY_IOREMAP=y +CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y +# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set +CONFIG_IDLE_PAGE_TRACKING=y +CONFIG_ZONE_DEVICE=y +CONFIG_FRAME_VECTOR=y +CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y +CONFIG_ARCH_HAS_PKEYS=y +CONFIG_X86_PMEM_LEGACY_DEVICE=y +CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y +CONFIG_X86_INTEL_MPX=y +CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_EFI_MIXED=y +CONFIG_SECCOMP=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +# CONFIG_KEXEC_FILE is not set +CONFIG_CRASH_DUMP=y +# CONFIG_KEXEC_JUMP is not set +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_RANDOMIZE_BASE=y +CONFIG_X86_NEED_RELOCS=y +CONFIG_PHYSICAL_ALIGN=0x1000000 +CONFIG_RANDOMIZE_MEMORY=y +CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa +CONFIG_HOTPLUG_CPU=y +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set +# CONFIG_COMPAT_VDSO is not set +# CONFIG_LEGACY_VSYSCALL_NATIVE is not set +# CONFIG_LEGACY_VSYSCALL_EMULATE is not set +CONFIG_LEGACY_VSYSCALL_NONE=y +# CONFIG_CMDLINE_BOOL is not set +CONFIG_MODIFY_LDT_SYSCALL=y +CONFIG_HAVE_LIVEPATCH=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_USE_PERCPU_NUMA_NODE_ID=y + +# +# Power management and ACPI options +# +CONFIG_ARCH_HIBERNATION_HEADER=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_SUSPEND_SKIP_SYNC is not set +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_CLK=y +CONFIG_PM_GENERIC_DOMAINS=y +CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y +CONFIG_PM_GENERIC_DOMAINS_SLEEP=y +CONFIG_ACPI=y +CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y +CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y +CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y +# CONFIG_ACPI_DEBUGGER is not set +CONFIG_ACPI_SLEEP=y +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y +CONFIG_ACPI_EC_DEBUGFS=m +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_CPU_FREQ_PSS=y +CONFIG_ACPI_PROCESSOR_CSTATE=y +CONFIG_ACPI_PROCESSOR_IDLE=y +CONFIG_ACPI_CPPC_LIB=y +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_NUMA=y +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y +CONFIG_ACPI_TABLE_UPGRADE=y +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=y +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=y +CONFIG_ACPI_HOTPLUG_MEMORY=y +CONFIG_ACPI_HOTPLUG_IOAPIC=y +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=y +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_BGRT=y +# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set +CONFIG_ACPI_NFIT=m +# CONFIG_ACPI_NFIT_DEBUG is not set +CONFIG_HAVE_ACPI_APEI=y +CONFIG_HAVE_ACPI_APEI_NMI=y +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y +CONFIG_ACPI_APEI_EINJ=m +CONFIG_ACPI_APEI_ERST_DEBUG=m +CONFIG_DPTF_POWER=m +CONFIG_ACPI_WATCHDOG=y +CONFIG_ACPI_EXTLOG=m +# CONFIG_PMIC_OPREGION is not set +CONFIG_ACPI_CONFIGFS=m +CONFIG_SFI=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_ATTR_SET=y +CONFIG_CPU_FREQ_GOV_COMMON=y +# CONFIG_CPU_FREQ_STAT is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y + +# +# CPU frequency scaling drivers +# +CONFIG_X86_INTEL_PSTATE=y +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_AMD_FREQ_SENSITIVITY=m +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +CONFIG_X86_P4_CLOCKMOD=m + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m + +# +# CPU Idle +# +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set +CONFIG_INTEL_IDLE=y + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_XEN=y +CONFIG_PCI_DOMAINS=y +# CONFIG_PCI_CNB20LE_QUIRK is not set +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=y +CONFIG_PCIEAER=y +# CONFIG_PCIE_ECRC is not set +CONFIG_PCIEAER_INJECT=m +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +# CONFIG_PCIEASPM_DEFAULT is not set +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set +CONFIG_PCIEASPM_PERFORMANCE=y +CONFIG_PCIE_PME=y +# CONFIG_PCIE_DPC is not set +# CONFIG_PCIE_PTM is not set +CONFIG_PCI_BUS_ADDR_T_64BIT=y +CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_REALLOC_ENABLE_AUTO=y +CONFIG_PCI_STUB=m +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_HT_IRQ=y +CONFIG_PCI_ATS=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_LABEL=y +CONFIG_PCI_HYPERV=m +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_ACPI=y +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=m + +# +# DesignWare PCI Core Support +# +CONFIG_PCIE_DW=y +CONFIG_PCIE_DW_HOST=y +CONFIG_PCIE_DW_PLAT=y + +# +# PCI host controller drivers +# +CONFIG_VMD=m +# CONFIG_ISA_BUS is not set +CONFIG_ISA_DMA_API=y +CONFIG_AMD_NB=y +CONFIG_PCCARD=m +# CONFIG_PCMCIA is not set +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_RAPIDIO=m +CONFIG_RAPIDIO_TSI721=m +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y +CONFIG_RAPIDIO_DMA_ENGINE=y +CONFIG_RAPIDIO_DEBUG=y +CONFIG_RAPIDIO_ENUM_BASIC=m +CONFIG_RAPIDIO_CHMAN=m +CONFIG_RAPIDIO_MPORT_CDEV=m + +# +# RapidIO Switch drivers +# +CONFIG_RAPIDIO_TSI57X=m +CONFIG_RAPIDIO_CPS_XX=m +CONFIG_RAPIDIO_TSI568=m +CONFIG_RAPIDIO_CPS_GEN2=m +CONFIG_RAPIDIO_RXS_GEN3=m +# CONFIG_X86_SYSFB is not set + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_ELFCORE=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y +# CONFIG_HAVE_AOUT is not set +CONFIG_BINFMT_MISC=m +CONFIG_COREDUMP=y +CONFIG_IA32_EMULATION=y +# CONFIG_IA32_AOUT is not set +# CONFIG_X86_X32 is not set +CONFIG_COMPAT_32=y +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y +CONFIG_KEYS_COMPAT=y +CONFIG_X86_DEV_DMA_OPS=y +CONFIG_NET=y +CONFIG_COMPAT_NETLINK_MESSAGES=y +CONFIG_NET_INGRESS=y +CONFIG_NET_EGRESS=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +CONFIG_XFRM=y +CONFIG_XFRM_OFFLOAD=y +CONFIG_XFRM_ALGO=m +CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +CONFIG_XFRM_MIGRATE=y +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +CONFIG_SMC=m +CONFIG_SMC_DIAG=m +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +# CONFIG_IP_FIB_TRIE_STATS is not set +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +CONFIG_NET_UDP_TUNNEL=m +CONFIG_NET_FOU=m +# CONFIG_NET_FOU_IP_TUNNELS is not set +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_ESP_OFFLOAD=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_INET_UDP_DIAG=y +CONFIG_INET_RAW_DIAG=m +CONFIG_INET_DIAG_DESTROY=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_NV=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_TCP_CONG_DCTCP=m +CONFIG_TCP_CONG_CDG=m +CONFIG_TCP_CONG_BBR=m +CONFIG_DEFAULT_RENO=y +CONFIG_DEFAULT_TCP_CONG="reno" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_ESP_OFFLOAD=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_IPV6_ILA=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m +CONFIG_IPV6_FOU=m +# CONFIG_IPV6_FOU_TUNNEL is not set +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +# CONFIG_IPV6_MROUTE is not set +CONFIG_IPV6_SEG6_LWTUNNEL=y +CONFIG_IPV6_SEG6_INLINE=y +CONFIG_IPV6_SEG6_HMAC=y +# CONFIG_NETLABEL is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NET_PTP_CLASSIFY=y +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=m + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_INGRESS=y +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_ACCT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m +CONFIG_NF_LOG_NETDEV=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_ZONES=y +# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_EVENTS=y +# CONFIG_NF_CONNTRACK_TIMEOUT is not set +# CONFIG_NF_CONNTRACK_TIMESTAMP is not set +CONFIG_NF_CONNTRACK_LABELS=y +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_GLUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=y +CONFIG_NF_NAT_PROTO_UDPLITE=y +CONFIG_NF_NAT_PROTO_SCTP=y +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_REDIRECT=m +CONFIG_NETFILTER_SYNPROXY=m +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_INET=m +CONFIG_NF_TABLES_NETDEV=m +CONFIG_NFT_EXTHDR=m +CONFIG_NFT_META=m +CONFIG_NFT_RT=m +CONFIG_NFT_NUMGEN=m +CONFIG_NFT_CT=m +CONFIG_NFT_SET_RBTREE=m +CONFIG_NFT_SET_HASH=m +CONFIG_NFT_SET_BITMAP=m +CONFIG_NFT_COUNTER=m +CONFIG_NFT_LOG=m +CONFIG_NFT_LIMIT=m +CONFIG_NFT_MASQ=m +CONFIG_NFT_REDIR=m +CONFIG_NFT_NAT=m +CONFIG_NFT_OBJREF=m +CONFIG_NFT_QUEUE=m +CONFIG_NFT_QUOTA=m +CONFIG_NFT_REJECT=m +CONFIG_NFT_REJECT_INET=m +CONFIG_NFT_COMPAT=m +CONFIG_NFT_HASH=m +CONFIG_NFT_FIB=m +CONFIG_NFT_FIB_INET=m +CONFIG_NF_DUP_NETDEV=m +CONFIG_NFT_DUP_NETDEV=m +CONFIG_NFT_FWD_NETDEV=m +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_HMARK=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_NAT=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m +CONFIG_NETFILTER_XT_MATCH_CGROUP=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_L2TP=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPMARK=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_IPMAC=m +CONFIG_IP_SET_HASH_MAC=m +CONFIG_IP_SET_HASH_NETPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETNET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_FO=m +CONFIG_IP_VS_OVF=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_SOCKET_IPV4=m +CONFIG_NF_TABLES_IPV4=m +CONFIG_NFT_CHAIN_ROUTE_IPV4=m +CONFIG_NFT_REJECT_IPV4=m +CONFIG_NFT_DUP_IPV4=m +CONFIG_NFT_FIB_IPV4=m +CONFIG_NF_TABLES_ARP=m +CONFIG_NF_DUP_IPV4=m +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m +CONFIG_NF_REJECT_IPV4=m +CONFIG_NF_NAT_IPV4=m +CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_NF_NAT_MASQUERADE_IPV4=m +CONFIG_NFT_MASQ_IPV4=m +CONFIG_NFT_REDIR_IPV4=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_SYNPROXY=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +# CONFIG_IP_NF_SECURITY is not set +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_NF_SOCKET_IPV6=m +CONFIG_NF_TABLES_IPV6=m +CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_REJECT_IPV6=m +CONFIG_NFT_DUP_IPV6=m +CONFIG_NFT_FIB_IPV6=m +CONFIG_NF_DUP_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +CONFIG_NF_NAT_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NF_NAT_MASQUERADE_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_TARGET_SYNPROXY=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +# CONFIG_IP6_NF_SECURITY is not set +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m +CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NF_LOG_BRIDGE=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_NET_DCCPPROBE=m +CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +# CONFIG_SCTP_COOKIE_HMAC_MD5 is not set +CONFIG_SCTP_COOKIE_HMAC_SHA1=y +CONFIG_INET_SCTP_DIAG=m +CONFIG_RDS=m +# CONFIG_RDS_RDMA is not set +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set +CONFIG_TIPC=m +CONFIG_TIPC_MEDIA_IB=y +CONFIG_TIPC_MEDIA_UDP=y +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +CONFIG_L2TP_DEBUGFS=m +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_MRP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_BRCM=y +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_TRAILER=y +CONFIG_NET_DSA_TAG_QCA=y +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +CONFIG_VLAN_8021Q_MVRP=y +# CONFIG_DECNET is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_IPX=m +CONFIG_IPX_INTERN=y +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_PHONET=m +# CONFIG_6LOWPAN is not set +CONFIG_IEEE802154=m +CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y +CONFIG_IEEE802154_SOCKET=m +CONFIG_MAC802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_FQ=m +CONFIG_NET_SCH_HHF=m +CONFIG_NET_SCH_PIE=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +# CONFIG_NET_CLS_CGROUP is not set +CONFIG_NET_CLS_BPF=m +CONFIG_NET_CLS_FLOWER=m +CONFIG_NET_CLS_MATCHALL=m +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_SAMPLE=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_ACT_VLAN=m +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m +CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_IFE=m +CONFIG_NET_ACT_TUNNEL_KEY=m +CONFIG_NET_IFE_SKBMARK=m +CONFIG_NET_IFE_SKBPRIO=m +CONFIG_NET_IFE_SKBTCINDEX=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +CONFIG_DCB=y +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +CONFIG_BATMAN_ADV_BATMAN_V=y +CONFIG_BATMAN_ADV_BLA=y +CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y +CONFIG_BATMAN_ADV_MCAST=y +CONFIG_BATMAN_ADV_DEBUGFS=y +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_OPENVSWITCH_GRE=m +CONFIG_OPENVSWITCH_VXLAN=m +CONFIG_OPENVSWITCH_GENEVE=m +CONFIG_VSOCKETS=m +CONFIG_VMWARE_VMCI_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO_VSOCKETS_COMMON=m +CONFIG_NETLINK_DIAG=m +CONFIG_MPLS=y +CONFIG_NET_MPLS_GSO=m +CONFIG_MPLS_ROUTING=m +CONFIG_MPLS_IPTUNNEL=m +CONFIG_HSR=m +CONFIG_NET_SWITCHDEV=y +CONFIG_NET_L3_MASTER_DEV=y +# CONFIG_NET_NCSI is not set +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_CGROUP_NET_PRIO=y +CONFIG_CGROUP_NET_CLASSID=y +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +CONFIG_BPF_JIT=y +CONFIG_NET_FLOW_LIMIT=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_NET_TCPPROBE=m +# CONFIG_NET_DROP_MONITOR is not set +# CONFIG_HAMRADIO is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +CONFIG_CAN_SLCAN=m +CONFIG_CAN_DEV=m +CONFIG_CAN_CALC_BITTIMING=y +CONFIG_CAN_LEDS=y +# CONFIG_CAN_JANZ_ICAN3 is not set +CONFIG_CAN_C_CAN=m +CONFIG_CAN_C_CAN_PLATFORM=m +CONFIG_CAN_C_CAN_PCI=m +CONFIG_CAN_CC770=m +CONFIG_CAN_CC770_ISA=m +CONFIG_CAN_CC770_PLATFORM=m +CONFIG_CAN_IFI_CANFD=m +CONFIG_CAN_M_CAN=m +# CONFIG_CAN_SJA1000 is not set +CONFIG_CAN_SOFTING=m + +# +# CAN SPI interfaces +# +CONFIG_CAN_MCP251X=m + +# +# CAN USB interfaces +# +CONFIG_CAN_EMS_USB=m +CONFIG_CAN_ESD_USB2=m +CONFIG_CAN_GS_USB=m +CONFIG_CAN_KVASER_USB=m +CONFIG_CAN_PEAK_USB=m +CONFIG_CAN_8DEV_USB=m +CONFIG_CAN_DEBUG_DEVICES=y +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_BREDR=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m +CONFIG_BT_HS=y +CONFIG_BT_LE=y +CONFIG_BT_LEDS=y +# CONFIG_BT_SELFTEST is not set +CONFIG_BT_DEBUGFS=y + +# +# Bluetooth device drivers +# +CONFIG_BT_INTEL=m +CONFIG_BT_BCM=m +CONFIG_BT_RTL=m +CONFIG_BT_QCA=m +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTUSB_BCM=y +CONFIG_BT_HCIBTUSB_RTL=y +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_INTEL=y +CONFIG_BT_HCIUART_BCM=y +CONFIG_BT_HCIUART_QCA=y +CONFIG_BT_HCIUART_AG6XX=y +# CONFIG_BT_HCIUART_MRVL is not set +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_IPV6 is not set +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +# CONFIG_AF_RXRPC_DEBUG is not set +# CONFIG_RXKAD is not set +CONFIG_AF_KCM=m +CONFIG_STREAM_PARSER=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_CERTIFICATION_ONUS is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_CRDA_SUPPORT=y +CONFIG_CFG80211_WEXT=y +CONFIG_CFG80211_WEXT_EXPORT=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +# CONFIG_MAC80211_RC_MINSTREL_VHT is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_MESSAGE_TRACING is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_RFKILL_GPIO=m +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +# CONFIG_NET_9P_RDMA is not set +# CONFIG_NET_9P_DEBUG is not set +CONFIG_CAIF=m +# CONFIG_CAIF_DEBUG is not set +CONFIG_CAIF_NETDEV=m +CONFIG_CAIF_USB=m +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y +CONFIG_NFC=m +CONFIG_NFC_DIGITAL=m +CONFIG_NFC_NCI=m +CONFIG_NFC_NCI_SPI=m +CONFIG_NFC_NCI_UART=m +CONFIG_NFC_HCI=m +# CONFIG_NFC_SHDLC is not set + +# +# Near Field Communication (NFC) devices +# +CONFIG_NFC_WILINK=m +CONFIG_NFC_TRF7970A=m +CONFIG_NFC_MEI_PHY=m +CONFIG_NFC_SIM=m +CONFIG_NFC_PORT100=m +CONFIG_NFC_FDP=m +CONFIG_NFC_FDP_I2C=m +CONFIG_NFC_PN544=m +CONFIG_NFC_PN544_MEI=m +CONFIG_NFC_PN533=m +CONFIG_NFC_PN533_USB=m +CONFIG_NFC_PN533_I2C=m +CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_MEI=m +CONFIG_NFC_MRVL=m +CONFIG_NFC_MRVL_USB=m +CONFIG_NFC_MRVL_UART=m +CONFIG_NFC_MRVL_I2C=m +CONFIG_NFC_MRVL_SPI=m +CONFIG_NFC_ST_NCI=m +CONFIG_NFC_ST_NCI_I2C=m +CONFIG_NFC_ST_NCI_SPI=m +CONFIG_NFC_NXP_NCI=m +CONFIG_NFC_NXP_NCI_I2C=m +CONFIG_NFC_S3FWRN5=m +CONFIG_NFC_S3FWRN5_I2C=m +CONFIG_NFC_ST95HF=m +CONFIG_PSAMPLE=m +CONFIG_NET_IFE=m +CONFIG_LWTUNNEL=y +CONFIG_LWTUNNEL_BPF=y +CONFIG_DST_CACHE=y +CONFIG_GRO_CELLS=y +CONFIG_NET_DEVLINK=m +CONFIG_MAY_USE_DEVLINK=m +CONFIG_HAVE_EBPF_JIT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +# CONFIG_UEVENT_HELPER is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_WANT_DEV_COREDUMP=y +CONFIG_ALLOW_DEV_COREDUMP=y +CONFIG_DEV_COREDUMP=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +CONFIG_TEST_ASYNC_DRIVER_PROBE=m +CONFIG_SYS_HYPERVISOR=y +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_SPI=y +CONFIG_REGMAP_SPMI=m +CONFIG_REGMAP_MMIO=y +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set + +# +# Bus devices +# +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=m +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_CMDLINE_PARTS=m +CONFIG_MTD_AR7_PARTS=m + +# +# User Modules And Translation Layers +# +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set +# CONFIG_MTD_OOPS is not set +CONFIG_MTD_SWAP=m +# CONFIG_MTD_PARTITIONED_MASTER is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +CONFIG_MTD_PHRAM=m +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +CONFIG_MTD_DOCG3=m +CONFIG_BCH_CONST_M=14 +CONFIG_BCH_CONST_T=4 +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR & LPDDR2 PCM memory drivers +# +# CONFIG_MTD_LPDDR is not set +# CONFIG_MTD_SPI_NOR is not set +# CONFIG_MTD_UBI is not set +# CONFIG_OF is not set +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_NULL_BLK=m +CONFIG_BLK_DEV_FD=m +# CONFIG_PARIDE is not set +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_ZRAM=m +CONFIG_BLK_CPQ_CISS_DA=m +# CONFIG_CISS_SCSI_TAPE is not set +CONFIG_BLK_DEV_DAC960=m +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SKD=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_RAM_DAX is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_VIRTIO_BLK=m +# CONFIG_VIRTIO_BLK_SCSI is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m +CONFIG_NVME_CORE=m +CONFIG_BLK_DEV_NVME=m +# CONFIG_BLK_DEV_NVME_SCSI is not set +CONFIG_NVME_FABRICS=m +CONFIG_NVME_RDMA=m +CONFIG_NVME_FC=m +CONFIG_NVME_TARGET=m +CONFIG_NVME_TARGET_LOOP=m +CONFIG_NVME_TARGET_RDMA=m +CONFIG_NVME_TARGET_FC=m +CONFIG_NVME_TARGET_FCLOOP=m + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +CONFIG_AD525X_DPOT_SPI=m +CONFIG_DUMMY_IRQ=m +# CONFIG_IBM_ASM is not set +CONFIG_PHANTOM=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_HP_ILO=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +CONFIG_TI_DAC7512=m +CONFIG_VMWARE_BALLOON=m +CONFIG_USB_SWITCH_FSA9480=m +CONFIG_LATTICE_ECP3_CONFIG=m +CONFIG_SRAM=y +CONFIG_PANEL=m +CONFIG_PANEL_PARPORT=0 +CONFIG_PANEL_PROFILE=5 +# CONFIG_PANEL_CHANGE_MESSAGE is not set +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_EEPROM_93XX46=m +CONFIG_EEPROM_IDT_89HPESX=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m +CONFIG_INTEL_MEI_TXE=m +CONFIG_VMWARE_VMCI=m + +# +# Intel MIC Bus Driver +# +# CONFIG_INTEL_MIC_BUS is not set + +# +# SCIF Bus Driver +# +CONFIG_SCIF_BUS=m + +# +# VOP Bus Driver +# +CONFIG_VOP_BUS=m + +# +# Intel MIC Host Driver +# + +# +# Intel MIC Card Driver +# + +# +# SCIF Driver +# +CONFIG_SCIF=m + +# +# Intel MIC Coprocessor State Management (COSM) Drivers +# +CONFIG_MIC_COSM=m + +# +# VOP Driver +# +CONFIG_VOP=m +CONFIG_VHOST_RING=m +CONFIG_GENWQE=m +CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0 +CONFIG_ECHO=m +# CONFIG_CXL_BASE is not set +# CONFIG_CXL_AFU_DRIVER_OPS is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_NETLINK=y +# CONFIG_SCSI_MQ_DEFAULT is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +# CONFIG_SCSI_MVSAS_TASKLET is not set +CONFIG_SCSI_MVUMI=m +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_ARCMSR=m +CONFIG_SCSI_ESAS2R=m +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT3SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_SMARTPQI=m +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m +CONFIG_SCSI_UFS_DWC_TC_PCI=m +CONFIG_SCSI_UFSHCD_PLATFORM=m +CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +# CONFIG_SCSI_FLASHPOINT is not set +CONFIG_VMWARE_PVSCSI=m +CONFIG_XEN_SCSI_FRONTEND=m +CONFIG_HYPERV_STORAGE=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +CONFIG_SCSI_SNIC=m +# CONFIG_SCSI_SNIC_DEBUG_FS is not set +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_EATA=m +CONFIG_SCSI_EATA_TAGGED_QUEUE=y +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_TCM_QLA2XXX=m +# CONFIG_TCM_QLA2XXX_DEBUG is not set +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_QEDI=m +CONFIG_QEDF=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_AM53C974=m +CONFIG_SCSI_WD719X=m +# CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_CHELSIO_FCOE=m +CONFIG_SCSI_DH=y +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=0 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_ZPODD=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=m +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=m +CONFIG_SATA_DWC=m +# CONFIG_SATA_DWC_OLD_DMA is not set +# CONFIG_SATA_DWC_DEBUG is not set +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +CONFIG_PATA_HPT3X3_DMA=y +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RDC=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PLATFORM=m +CONFIG_PATA_RZ1000=m + +# +# Generic fallback / legacy drivers +# +CONFIG_PATA_ACPI=m +CONFIG_ATA_GENERIC=m +# CONFIG_PATA_LEGACY is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_MD_CLUSTER=m +CONFIG_BCACHE=m +# CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=m +CONFIG_DM_MQ_DEFAULT=y +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set +CONFIG_DM_BIO_PRISON=m +CONFIG_DM_PERSISTENT_DATA=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_SMQ=m +CONFIG_DM_CACHE_CLEANER=m +CONFIG_DM_ERA=m +CONFIG_DM_MIRROR=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_RAID=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +# CONFIG_DM_VERITY_FEC is not set +CONFIG_DM_SWITCH=m +CONFIG_DM_LOG_WRITES=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_TCM_USER2=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_ISCSI_TARGET_CXGB4=m +CONFIG_SBP_TARGET=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +# CONFIG_FUSION_LAN is not set +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=m +CONFIG_NETDEVICES=y +CONFIG_MII=y +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +CONFIG_NET_FC=y +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_RANDOM=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_IPVLAN=m +CONFIG_IPVTAP=m +CONFIG_VXLAN=m +CONFIG_GENEVE=m +CONFIG_GTP=m +CONFIG_MACSEC=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_NTB_NETDEV=m +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 +CONFIG_TUN=m +CONFIG_TAP=m +CONFIG_TUN_VNET_CROSS_LE=y +CONFIG_VETH=m +CONFIG_VIRTIO_NET=m +CONFIG_NLMON=m +CONFIG_NET_VRF=m +CONFIG_SUNGEM_PHY=m +# CONFIG_ARCNET is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +CONFIG_ATM_NICSTAR_USE_SUNI=y +CONFIG_ATM_NICSTAR_USE_IDT77105=y +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_ATM_SOLOS=m + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +# CONFIG_CAIF_SPI_SYNC is not set +CONFIG_CAIF_HSI=m +CONFIG_CAIF_VIRTIO=m + +# +# Distributed Switch Architecture drivers +# +CONFIG_NET_DSA_MV88E6060=m +CONFIG_NET_DSA_BCM_SF2=m +CONFIG_B53=m +CONFIG_B53_SPI_DRIVER=m +CONFIG_B53_MDIO_DRIVER=m +CONFIG_B53_MMAP_DRIVER=m +CONFIG_B53_SRAB_DRIVER=m +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y +CONFIG_NET_DSA_QCA8K=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_AGERE=y +CONFIG_ET131X=m +CONFIG_NET_VENDOR_ALACRITECH=y +CONFIG_SLICOSS=m +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_ALTERA_TSE=m +CONFIG_NET_VENDOR_AMAZON=y +CONFIG_ENA_ETHERNET=m +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_PCNET32=y +CONFIG_AMD_XGBE=m +CONFIG_AMD_XGBE_DCB=y +CONFIG_AMD_XGBE_HAVE_ECC=y +CONFIG_NET_VENDOR_AQUANTIA=y +CONFIG_AQTION=m +CONFIG_NET_VENDOR_ARC=y +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_ALX=m +CONFIG_NET_VENDOR_AURORA=y +CONFIG_AURORA_NB8800=m +CONFIG_NET_CADENCE=y +CONFIG_MACB=m +CONFIG_MACB_PCI=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_BCMGENET=m +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y +CONFIG_BNXT=m +CONFIG_BNXT_SRIOV=y +CONFIG_BNXT_DCB=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_VENDOR_CAVIUM=y +CONFIG_THUNDER_NIC_PF=m +CONFIG_THUNDER_NIC_VF=m +CONFIG_THUNDER_NIC_BGX=m +CONFIG_THUNDER_NIC_RGX=m +CONFIG_LIQUIDIO=m +CONFIG_LIQUIDIO_VF=m +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +# CONFIG_CHELSIO_T4_DCB is not set +CONFIG_CHELSIO_T4VF=m +CONFIG_CHELSIO_LIB=m +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +CONFIG_CX_ECAT=m +CONFIG_DNET=m +CONFIG_NET_VENDOR_DEC=y +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +# CONFIG_PCMCIA_XIRCOM is not set +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_BE2NET_HWMON=y +CONFIG_NET_VENDOR_EZCHIP=y +CONFIG_NET_VENDOR_EXAR=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_NET_VENDOR_HP=y +CONFIG_HP100=m +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=y +CONFIG_E1000=y +CONFIG_E1000E=y +CONFIG_E1000E_HWTS=y +CONFIG_IGB=m +CONFIG_IGB_HWMON=y +CONFIG_IGB_DCA=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_HWMON=y +CONFIG_IXGBE_DCA=y +# CONFIG_IXGBE_DCB is not set +CONFIG_IXGBEVF=m +CONFIG_I40E=m +CONFIG_I40E_DCB=y +# CONFIG_I40E_FCOE is not set +CONFIG_I40EVF=m +CONFIG_FM10K=m +CONFIG_NET_VENDOR_I825XX=y +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +# CONFIG_SKGE_GENESIS is not set +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_DCB=y +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_MLX5_CORE=m +CONFIG_MLX5_CORE_EN=y +CONFIG_MLX5_CORE_EN_DCB=y +CONFIG_MLXSW_CORE=m +CONFIG_MLXSW_CORE_HWMON=y +CONFIG_MLXSW_CORE_THERMAL=y +CONFIG_MLXSW_PCI=m +CONFIG_MLXSW_I2C=m +CONFIG_MLXSW_SWITCHIB=m +CONFIG_MLXSW_SWITCHX2=m +CONFIG_MLXSW_SPECTRUM=m +CONFIG_MLXSW_SPECTRUM_DCB=y +CONFIG_MLXSW_MINIMAL=m +CONFIG_NET_VENDOR_MICREL=y +CONFIG_KS8842=m +CONFIG_KS8851=m +CONFIG_KS8851_MLL=m +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +CONFIG_ENC28J60=m +# CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_ENCX24J600=m +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_NETRONOME=y +CONFIG_NFP=m +# CONFIG_NFP_DEBUG is not set +CONFIG_NET_VENDOR_8390=y +CONFIG_NE2K_PCI=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +CONFIG_ETHOC=m +# CONFIG_NET_PACKET_ENGINE is not set +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLCNIC_SRIOV=y +CONFIG_QLCNIC_DCB=y +CONFIG_QLCNIC_HWMON=y +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_QED=m +CONFIG_QED_LL2=y +CONFIG_QED_SRIOV=y +CONFIG_QEDE=m +CONFIG_QED_RDMA=y +CONFIG_QED_ISCSI=y +CONFIG_QED_FCOE=y +CONFIG_NET_VENDOR_QUALCOMM=y +CONFIG_QCOM_EMAC=m +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_ATP=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RENESAS=y +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_ROCKER=y +CONFIG_ROCKER=m +CONFIG_NET_VENDOR_SAMSUNG=y +CONFIG_SXGBE_ETH=m +CONFIG_NET_VENDOR_SEEQ=y +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_NET_VENDOR_SOLARFLARE=y +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y +CONFIG_SFC_MCDI_LOGGING=y +CONFIG_SFC_FALCON=m +CONFIG_SFC_FALCON_MTD=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_EPIC100=m +CONFIG_SMSC911X=m +# CONFIG_SMSC911X_ARCH_HOOKS is not set +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +CONFIG_STMMAC_PLATFORM=m +CONFIG_DWMAC_GENERIC=m +CONFIG_STMMAC_PCI=m +CONFIG_NET_VENDOR_SUN=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TI_CPSW_ALE=m +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WIZNET=y +CONFIG_WIZNET_W5100=m +CONFIG_WIZNET_W5300=m +# CONFIG_WIZNET_BUS_DIRECT is not set +# CONFIG_WIZNET_BUS_INDIRECT is not set +CONFIG_WIZNET_BUS_ANY=y +CONFIG_WIZNET_W5100_SPI=m +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_NET_SB1000=m +CONFIG_PHYLIB=y +CONFIG_SWPHY=y +CONFIG_LED_TRIGGER_PHY=y + +# +# MDIO bus device drivers +# +CONFIG_MDIO_BCM_UNIMAC=m +CONFIG_MDIO_BITBANG=m +CONFIG_MDIO_CAVIUM=m +CONFIG_MDIO_GPIO=m +CONFIG_MDIO_OCTEON=m +CONFIG_MDIO_THUNDER=m + +# +# MII PHY device drivers +# +CONFIG_AMD_PHY=m +CONFIG_AQUANTIA_PHY=m +CONFIG_AT803X_PHY=m +CONFIG_BCM7XXX_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_BCM_NET_PHYLIB=m +CONFIG_BROADCOM_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_DP83848_PHY=m +CONFIG_DP83867_PHY=m +CONFIG_FIXED_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_INTEL_XWAY_PHY=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_LXT_PHY=m +CONFIG_MARVELL_PHY=m +CONFIG_MICREL_PHY=m +CONFIG_MICROCHIP_PHY=m +CONFIG_MICROSEMI_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_STE10XP=m +CONFIG_TERANETICS_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_XILINX_GMII2RGMII=m +CONFIG_MICREL_KS8995MA=m +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +# CONFIG_SLIP_COMPRESSED is not set +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set + +# +# Host-side USB support is needed for USB Network Adapter support +# +CONFIG_USB_NET_DRIVERS=m +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=m +CONFIG_USB_LAN78XX=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_HUAWEI_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SR9700=m +CONFIG_USB_NET_SR9800=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET_ENABLE=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_USB_NET_CH9200=m +CONFIG_WLAN=y +CONFIG_WIRELESS_WDS=y +CONFIG_WLAN_VENDOR_ADMTEK=y +CONFIG_ADM8211=m +CONFIG_ATH_COMMON=m +CONFIG_WLAN_VENDOR_ATH=y +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +# CONFIG_ATH9K_AHB is not set +# CONFIG_ATH9K_DEBUGFS is not set +# CONFIG_ATH9K_DYNACK is not set +CONFIG_ATH9K_WOW=y +CONFIG_ATH9K_RFKILL=y +# CONFIG_ATH9K_CHANNEL_CONTEXT is not set +CONFIG_ATH9K_PCOEM=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +CONFIG_ATH9K_HWRNG=y +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +CONFIG_CARL9170_WPC=y +CONFIG_CARL9170_HWRNG=y +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +# CONFIG_ATH6KL_DEBUG is not set +# CONFIG_ATH6KL_TRACING is not set +CONFIG_AR5523=m +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y +# CONFIG_WIL6210_TRACING is not set +CONFIG_ATH10K=m +CONFIG_ATH10K_PCI=m +# CONFIG_ATH10K_DEBUG is not set +# CONFIG_ATH10K_DEBUGFS is not set +# CONFIG_ATH10K_TRACING is not set +CONFIG_WCN36XX=m +# CONFIG_WCN36XX_DEBUGFS is not set +CONFIG_WLAN_VENDOR_ATMEL=y +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_WLAN_VENDOR_BROADCOM=y +CONFIG_B43=m +CONFIG_B43_BCMA=y +CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_G=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_PROTO_BCDC=y +CONFIG_BRCMFMAC_PROTO_MSGBUF=y +CONFIG_BRCMFMAC_SDIO=y +CONFIG_BRCMFMAC_USB=y +CONFIG_BRCMFMAC_PCIE=y +# CONFIG_BRCM_TRACING is not set +# CONFIG_BRCMDBG is not set +CONFIG_WLAN_VENDOR_CISCO=y +CONFIG_AIRO=m +CONFIG_WLAN_VENDOR_INTEL=y +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y +CONFIG_IWLWIFI_BCAST_FILTERING=y +CONFIG_IWLWIFI_PCIE_RTPM=y + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +# CONFIG_IWLWIFI_DEVICE_TRACING is not set +CONFIG_WLAN_VENDOR_INTERSIL=y +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HERMES=m +CONFIG_HERMES_PRISM=y +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_ORINOCO_USB=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_SPI=m +# CONFIG_P54_SPI_DEFAULT_EEPROM is not set +CONFIG_P54_LEDS=y +CONFIG_PRISM54=m +CONFIG_WLAN_VENDOR_MARVELL=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_SDIO=m +CONFIG_LIBERTAS_SPI=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +CONFIG_LIBERTAS_THINFIRM=m +# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m +CONFIG_MWL8K=m +CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_MT7601U=m +CONFIG_WLAN_VENDOR_RALINK=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT3573=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2800_LIB_MMIO=m +CONFIG_RT2X00_LIB_MMIO=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_WLAN_VENDOR_REALTEK=y +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_RTL_CARDS=m +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m +CONFIG_RTL8723BE=m +CONFIG_RTL8188EE=m +CONFIG_RTL8192EE=m +CONFIG_RTL8821AE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_PCI=m +CONFIG_RTLWIFI_USB=m +CONFIG_RTLWIFI_DEBUG=y +CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8723_COMMON=m +CONFIG_RTLBTCOEXIST=m +CONFIG_RTL8XXXU=m +# CONFIG_RTL8XXXU_UNTESTED is not set +CONFIG_WLAN_VENDOR_RSI=y +CONFIG_RSI_91X=m +CONFIG_RSI_DEBUGFS=y +CONFIG_RSI_SDIO=m +CONFIG_RSI_USB=m +CONFIG_WLAN_VENDOR_ST=y +CONFIG_CW1200=m +CONFIG_CW1200_WLAN_SDIO=m +CONFIG_CW1200_WLAN_SPI=m +CONFIG_WLAN_VENDOR_TI=y +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX=m +CONFIG_WL18XX=m +CONFIG_WLCORE=m +CONFIG_WLCORE_SDIO=m +CONFIG_WILINK_PLATFORM_DATA=y +CONFIG_WLAN_VENDOR_ZYDAS=y +CONFIG_USB_ZD1201=m +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +# CONFIG_MAC80211_HWSIM is not set +CONFIG_USB_NET_RNDIS_WLAN=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +# CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set +CONFIG_IEEE802154_MRF24J40=m +# CONFIG_IEEE802154_CC2520 is not set +CONFIG_IEEE802154_ATUSB=m +CONFIG_IEEE802154_ADF7242=m +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_VMXNET3=m +CONFIG_FUJITSU_ES=m +CONFIG_HYPERV_NET=m +# CONFIG_ISDN is not set +CONFIG_NVM=y +# CONFIG_NVM_DEBUG is not set +CONFIG_NVM_RRPC=m + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_LEDS=m +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_MATRIXKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ADC=m +CONFIG_KEYBOARD_ADP5588=m +CONFIG_KEYBOARD_ADP5589=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_GPIO_POLLED=m +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_TCA8418=m +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_LM8323 is not set +CONFIG_KEYBOARD_LM8333=m +CONFIG_KEYBOARD_MAX7359=m +CONFIG_KEYBOARD_MCS=m +CONFIG_KEYBOARD_MPR121=m +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_KEYBOARD_OPENCORES=m +CONFIG_KEYBOARD_SAMSUNG=m +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +CONFIG_KEYBOARD_TM2_TOUCHKEY=m +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_KEYBOARD_CROS_EC=m +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_BYD=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_CYPRESS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_PS2_FOCALTECH=y +CONFIG_MOUSE_PS2_VMMOUSE=y +CONFIG_MOUSE_SERIAL=y +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m +CONFIG_MOUSE_ELAN_I2C=m +CONFIG_MOUSE_ELAN_I2C_I2C=y +# CONFIG_MOUSE_ELAN_I2C_SMBUS is not set +CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_GPIO is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +CONFIG_JOYSTICK_AS5011=m +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_PEGASUS=m +# CONFIG_TABLET_SERIAL_WACOM4 is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_PROPERTIES=y +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_AD7877=m +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_AD7879_SPI=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set +CONFIG_TOUCHSCREEN_AUO_PIXCIR=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_CYTTSP_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +CONFIG_TOUCHSCREEN_CYTTSP_SPI=m +CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m +CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m +CONFIG_TOUCHSCREEN_DA9052=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GOODIX=m +CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_EKTF2127=m +CONFIG_TOUCHSCREEN_ELAN=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_WACOM_I2C=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MMS114=m +CONFIG_TOUCHSCREEN_MELFAS_MIP4=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_EDT_FT5X06=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m +# CONFIG_TOUCHSCREEN_UCB1400 is not set +CONFIG_TOUCHSCREEN_PIXCIR=m +CONFIG_TOUCHSCREEN_WDT87XX_I2C=m +# CONFIG_TOUCHSCREEN_WM831X is not set +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_MC13783=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m +CONFIG_TOUCHSCREEN_TSC200X_CORE=m +CONFIG_TOUCHSCREEN_TSC2004=m +CONFIG_TOUCHSCREEN_TSC2005=m +CONFIG_TOUCHSCREEN_TSC2007=m +# CONFIG_TOUCHSCREEN_PCAP is not set +CONFIG_TOUCHSCREEN_RM_TS=m +CONFIG_TOUCHSCREEN_SILEAD=m +CONFIG_TOUCHSCREEN_SIS_I2C=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_SUR40=m +CONFIG_TOUCHSCREEN_SURFACE3_SPI=m +CONFIG_TOUCHSCREEN_SX8654=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_TOUCHSCREEN_ZET6223=m +CONFIG_TOUCHSCREEN_ZFORCE=m +CONFIG_TOUCHSCREEN_ROHM_BU21023=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m +CONFIG_INPUT_ARIZONA_HAPTICS=m +CONFIG_INPUT_BMA150=m +CONFIG_INPUT_E3X0_BUTTON=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MAX77693_HAPTIC=m +CONFIG_INPUT_MC13783_PWRBUTTON=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_GP2A=m +# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_TILT_POLLED=m +CONFIG_INPUT_GPIO_DECODER=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_REGULATOR_HAPTIC=m +CONFIG_INPUT_RETU_PWRBUTTON=m +CONFIG_INPUT_TPS65218_PWRBUTTON=m +CONFIG_INPUT_AXP20X_PEK=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_PWM_BEEPER=m +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +CONFIG_INPUT_DA9052_ONKEY=m +CONFIG_INPUT_DA9063_ONKEY=m +# CONFIG_INPUT_WM831X_ON is not set +# CONFIG_INPUT_PCAP is not set +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m +CONFIG_INPUT_IMS_PCU=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m +CONFIG_INPUT_IDEAPAD_SLIDEBAR=m +CONFIG_INPUT_DRV260X_HAPTICS=m +CONFIG_INPUT_DRV2665_HAPTICS=m +CONFIG_INPUT_DRV2667_HAPTICS=m +CONFIG_RMI4_CORE=m +CONFIG_RMI4_I2C=m +CONFIG_RMI4_SPI=m +CONFIG_RMI4_SMB=m +CONFIG_RMI4_F03=y +CONFIG_RMI4_F03_SERIO=m +CONFIG_RMI4_2D_SENSOR=y +CONFIG_RMI4_F11=y +CONFIG_RMI4_F12=y +CONFIG_RMI4_F30=y +CONFIG_RMI4_F34=y +# CONFIG_RMI4_F54 is not set +CONFIG_RMI4_F55=y + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +CONFIG_SERIO_PS2MULT=m +CONFIG_SERIO_ARC_PS2=m +CONFIG_HYPERV_KEYBOARD=m +CONFIG_USERIO=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +CONFIG_MOXA_INTELLIO=m +CONFIG_MOXA_SMARTIO=m +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_NOZOMI=m +CONFIG_ISI=m +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +CONFIG_TRACE_ROUTER=m +CONFIG_TRACE_SINK=m +CONFIG_DEVMEM=y +# CONFIG_DEVKMEM is not set + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_FINTEK=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_EXAR=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +CONFIG_SERIAL_8250_RSA=y +# CONFIG_SERIAL_8250_FSL is not set +CONFIG_SERIAL_8250_DW=m +CONFIG_SERIAL_8250_RT288X=y +CONFIG_SERIAL_8250_LPSS=m +CONFIG_SERIAL_8250_MID=m +CONFIG_SERIAL_8250_MOXA=m + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_MAX3100=m +CONFIG_SERIAL_MAX310X=y +CONFIG_SERIAL_UARTLITE=m +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_SCCNXP=y +CONFIG_SERIAL_SCCNXP_CONSOLE=y +# CONFIG_SERIAL_SC16IS7XX is not set +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m +CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 +CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +CONFIG_SERIAL_IFX6X60=m +CONFIG_SERIAL_ARC=m +CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 +CONFIG_SERIAL_FSL_LPUART=m +# CONFIG_SERIAL_MEN_Z135 is not set +CONFIG_SERIAL_DEV_BUS=m +CONFIG_TTY_PRINTK=m +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_VIRTIO_CONSOLE=m +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_SSIF=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=m +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m +CONFIG_NVRAM=m +CONFIG_R3964=m +CONFIG_APPLICOM=m +CONFIG_MWAVE=m +CONFIG_RAW_DRIVER=m +CONFIG_MAX_RAW_DEVS=256 +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HPET_MMAP_DEFAULT=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS_CORE=m +CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_SPI=m +CONFIG_TCG_TIS_I2C_ATMEL=m +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_TIS_I2C_NUVOTON=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TCG_XEN=m +CONFIG_TCG_CRB=m +CONFIG_TCG_VTPM_PROXY=m +CONFIG_TCG_TIS_ST33ZP24=m +CONFIG_TCG_TIS_ST33ZP24_I2C=m +CONFIG_TCG_TIS_ST33ZP24_SPI=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_XILLYBUS=m +CONFIG_XILLYBUS_PCIE=m + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_ACPI_I2C_OPREGION=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +CONFIG_I2C_MUX_GPIO=m +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m +CONFIG_I2C_MUX_PINCTRL=m +CONFIG_I2C_MUX_REG=m +CONFIG_I2C_MUX_MLXCPLD=m +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_ISMT=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_CBUS_GPIO=m +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m +CONFIG_I2C_DESIGNWARE_PCI=m +CONFIG_I2C_DESIGNWARE_BAYTRAIL=y +CONFIG_I2C_EMEV2=m +CONFIG_I2C_GPIO=m +CONFIG_I2C_KEMPLD=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PCA_PLATFORM=m +# CONFIG_I2C_PXA_PCI is not set +CONFIG_I2C_SIMTEC=m +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +# CONFIG_I2C_DLN2 is not set +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_ROBOTFUZZ_OSIF=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m +CONFIG_I2C_VIPERBOARD=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_MLXCPLD=m +# CONFIG_I2C_CROS_EC_TUNNEL is not set +# CONFIG_I2C_STUB is not set +CONFIG_I2C_SLAVE=y +CONFIG_I2C_SLAVE_EEPROM=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_ALTERA=m +CONFIG_SPI_AXI_SPI_ENGINE=m +CONFIG_SPI_BITBANG=m +CONFIG_SPI_BUTTERFLY=m +CONFIG_SPI_CADENCE=m +CONFIG_SPI_DESIGNWARE=m +CONFIG_SPI_DW_PCI=m +CONFIG_SPI_DW_MID_DMA=y +CONFIG_SPI_DW_MMIO=m +CONFIG_SPI_DLN2=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_OC_TINY=m +CONFIG_SPI_PXA2XX=m +CONFIG_SPI_PXA2XX_PCI=m +CONFIG_SPI_ROCKCHIP=m +CONFIG_SPI_SC18IS602=m +CONFIG_SPI_XCOMM=m +CONFIG_SPI_XILINX=m +CONFIG_SPI_ZYNQMP_GQSPI=m + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_LOOPBACK_TEST=m +CONFIG_SPI_TLE62X0=m +CONFIG_SPMI=m +CONFIG_HSI=m +CONFIG_HSI_BOARDINFO=y + +# +# HSI controllers +# + +# +# HSI clients +# +CONFIG_HSI_CHAR=m + +# +# PPS support +# +CONFIG_PPS=y +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +CONFIG_PPS_CLIENT_KTIMER=m +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m +CONFIG_PPS_CLIENT_GPIO=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=y + +# +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# +CONFIG_PTP_1588_CLOCK_KVM=y +CONFIG_PINCTRL=y + +# +# Pin controllers +# +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y +# CONFIG_DEBUG_PINCTRL is not set +CONFIG_PINCTRL_AMD=y +CONFIG_PINCTRL_SX150X=y +CONFIG_PINCTRL_BAYTRAIL=y +CONFIG_PINCTRL_CHERRYVIEW=m +CONFIG_PINCTRL_INTEL=m +CONFIG_PINCTRL_BROXTON=m +CONFIG_PINCTRL_GEMINILAKE=m +CONFIG_PINCTRL_SUNRISEPOINT=m +CONFIG_GPIOLIB=y +CONFIG_GPIO_ACPI=y +CONFIG_GPIOLIB_IRQCHIP=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GENERIC=m +CONFIG_GPIO_MAX730X=m + +# +# Memory mapped GPIO drivers +# +CONFIG_GPIO_AMDPT=m +CONFIG_GPIO_AXP209=m +CONFIG_GPIO_DWAPB=m +CONFIG_GPIO_EXAR=m +CONFIG_GPIO_GENERIC_PLATFORM=m +CONFIG_GPIO_ICH=m +CONFIG_GPIO_LYNXPOINT=y +CONFIG_GPIO_MENZ127=m +CONFIG_GPIO_MOCKUP=m +CONFIG_GPIO_VX855=m + +# +# Port-mapped I/O GPIO drivers +# +CONFIG_GPIO_F7188X=m +CONFIG_GPIO_IT87=m +CONFIG_GPIO_SCH=m +CONFIG_GPIO_SCH311X=m + +# +# I2C GPIO expanders +# +CONFIG_GPIO_ADP5588=m +CONFIG_GPIO_MAX7300=m +CONFIG_GPIO_MAX732X=m +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCF857X=m +# CONFIG_GPIO_SX150X is not set +CONFIG_GPIO_TPIC2810=m + +# +# MFD GPIO expanders +# +CONFIG_GPIO_ARIZONA=m +CONFIG_GPIO_DA9052=m +CONFIG_GPIO_DLN2=m +CONFIG_GPIO_JANZ_TTL=m +CONFIG_GPIO_KEMPLD=m +CONFIG_GPIO_LP3943=m +CONFIG_GPIO_LP873X=m +CONFIG_GPIO_TPS65086=m +CONFIG_GPIO_TPS65218=m +# CONFIG_GPIO_TPS65912 is not set +CONFIG_GPIO_UCB1400=m +# CONFIG_GPIO_WM831X is not set + +# +# PCI GPIO expanders +# +CONFIG_GPIO_AMD8111=m +CONFIG_GPIO_ML_IOH=m +CONFIG_GPIO_PCI_IDIO_16=m +CONFIG_GPIO_RDC321X=m + +# +# SPI GPIO expanders +# +CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_MC33880=m +CONFIG_GPIO_PISOSR=m + +# +# SPI or I2C GPIO expanders +# + +# +# USB GPIO expanders +# +CONFIG_GPIO_VIPERBOARD=m +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m +CONFIG_W1_MASTER_DS1WM=m +CONFIG_W1_MASTER_GPIO=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2405=m +CONFIG_W1_SLAVE_DS2408=m +CONFIG_W1_SLAVE_DS2408_READBACK=y +CONFIG_W1_SLAVE_DS2413=m +# CONFIG_W1_SLAVE_DS2406 is not set +CONFIG_W1_SLAVE_DS2423=m +CONFIG_W1_SLAVE_DS2431=m +CONFIG_W1_SLAVE_DS2433=m +CONFIG_W1_SLAVE_DS2433_CRC=y +CONFIG_W1_SLAVE_DS2760=m +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_DS2781=m +CONFIG_W1_SLAVE_DS28E04=m +CONFIG_W1_SLAVE_BQ27000=m +CONFIG_POWER_AVS=y +# CONFIG_POWER_RESET is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_GENERIC_ADC_BATTERY=m +# CONFIG_WM831X_BACKUP is not set +# CONFIG_WM831X_POWER is not set +CONFIG_TEST_POWER=m +CONFIG_BATTERY_DS2760=m +CONFIG_BATTERY_DS2780=m +CONFIG_BATTERY_DS2781=m +CONFIG_BATTERY_DS2782=m +CONFIG_BATTERY_SBS=m +CONFIG_CHARGER_SBS=m +CONFIG_BATTERY_BQ27XXX=m +CONFIG_BATTERY_BQ27XXX_I2C=m +CONFIG_BATTERY_DA9052=m +CONFIG_CHARGER_DA9150=m +CONFIG_BATTERY_DA9150=m +CONFIG_AXP288_CHARGER=m +CONFIG_AXP288_FUEL_GAUGE=m +CONFIG_BATTERY_MAX17040=m +CONFIG_BATTERY_MAX17042=m +CONFIG_CHARGER_PCF50633=m +CONFIG_CHARGER_ISP1704=m +CONFIG_CHARGER_MAX8903=m +CONFIG_CHARGER_LP8727=m +CONFIG_CHARGER_GPIO=m +CONFIG_CHARGER_MANAGER=y +CONFIG_CHARGER_BQ2415X=m +CONFIG_CHARGER_BQ24190=m +CONFIG_CHARGER_BQ24257=m +CONFIG_CHARGER_BQ24735=m +CONFIG_CHARGER_BQ25890=m +CONFIG_CHARGER_SMB347=m +CONFIG_CHARGER_TPS65217=m +CONFIG_BATTERY_GAUGE_LTC2941=m +CONFIG_BATTERY_RT5033=m +CONFIG_CHARGER_RT9455=m +CONFIG_AXP20X_POWER=m +CONFIG_HWMON=m +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7314=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7X10=m +CONFIG_SENSORS_ADT7310=m +CONFIG_SENSORS_ADT7410=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_APPLESMC=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_DELL_SMM=m +CONFIG_SENSORS_DA9052_ADC=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_MC13783_ADC=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_FTSTEUTATES=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_G762=m +CONFIG_SENSORS_GPIO_FAN=m +CONFIG_SENSORS_HIH6130=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IIO_HWMON=m +CONFIG_SENSORS_I5500=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_JC42=m +# CONFIG_SENSORS_POWR1220 is not set +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LTC2945=m +CONFIG_SENSORS_LTC2990=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4222=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4260=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m +CONFIG_SENSORS_MAX31722=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m +CONFIG_SENSORS_MAX31790=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_TC654=m +CONFIG_SENSORS_MENF21BMC_HWMON=m +CONFIG_SENSORS_ADCXX=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LM95234=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_NTC_THERMISTOR=m +# CONFIG_SENSORS_NCT6683 is not set +CONFIG_SENSORS_NCT6775=m +CONFIG_SENSORS_NCT7802=m +CONFIG_SENSORS_NCT7904=m +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m +# CONFIG_SENSORS_LTC2978_REGULATOR is not set +CONFIG_SENSORS_LTC3815=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX20751=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +# CONFIG_SENSORS_TPS40422 is not set +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SHT3x=m +# CONFIG_SENSORS_SHTC1 is not set +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m +CONFIG_SENSORS_STTS751=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_ADC128D818=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_ADS7871=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m +CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_INA3221=m +CONFIG_SENSORS_TC74=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +# CONFIG_SENSORS_TMP103 is not set +CONFIG_SENSORS_TMP108=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +# CONFIG_SENSORS_WM831X is not set +CONFIG_SENSORS_XGENE=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +CONFIG_THERMAL_WRITABLE_TRIPS=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set +# CONFIG_THERMAL_GOV_FAIR_SHARE is not set +CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_GOV_BANG_BANG=y +CONFIG_THERMAL_GOV_USER_SPACE=y +CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y +# CONFIG_THERMAL_EMULATION is not set +CONFIG_INTEL_POWERCLAMP=m +CONFIG_X86_PKG_TEMP_THERMAL=m +CONFIG_INTEL_SOC_DTS_IOSF_CORE=m +# CONFIG_INTEL_SOC_DTS_THERMAL is not set + +# +# ACPI INT340X thermal drivers +# +CONFIG_INT340X_THERMAL=m +CONFIG_ACPI_THERMAL_REL=m +CONFIG_INT3406_THERMAL=m +CONFIG_INTEL_PCH_THERMAL=m +CONFIG_GENERIC_ADC_THERMAL=m +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_WATCHDOG_SYSFS=y + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_DA9052_WATCHDOG=m +CONFIG_DA9062_WATCHDOG=m +CONFIG_MENF21BMC_WATCHDOG=m +CONFIG_WDAT_WDT=m +# CONFIG_WM831X_WATCHDOG is not set +CONFIG_XILINX_WATCHDOG=m +CONFIG_ZIIRAVE_WATCHDOG=m +CONFIG_CADENCE_WATCHDOG=m +CONFIG_DW_WATCHDOG=m +CONFIG_MAX63XX_WATCHDOG=m +CONFIG_RETU_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_F71808E_WDT=m +CONFIG_SP5100_TCO=m +CONFIG_SBC_FITPC2_WATCHDOG=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_IE6XX_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_KEMPLD_WDT=m +CONFIG_HPWDT_NMI_DECODING=y +CONFIG_SC1200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_NV_TCO=m +CONFIG_60XX_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_VIA_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m +CONFIG_INTEL_MEI_WDT=m +CONFIG_NI903X_WDT=m +CONFIG_NIC7018_WDT=m +CONFIG_MEN_A21_WDT=m +CONFIG_XEN_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m + +# +# Watchdog Pretimeout Governors +# +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_SSB_DRIVER_GPIO=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +CONFIG_BCMA_HOST_SOC=y +CONFIG_BCMA_DRIVER_PCI=y +CONFIG_BCMA_SFLASH=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +# CONFIG_MFD_AS3711 is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_AAT2870_CORE is not set +CONFIG_MFD_BCM590XX=m +CONFIG_MFD_AXP20X=m +CONFIG_MFD_AXP20X_I2C=m +CONFIG_MFD_CROS_EC=m +CONFIG_MFD_CROS_EC_I2C=m +CONFIG_MFD_CROS_EC_SPI=m +# CONFIG_PMIC_DA903X is not set +CONFIG_PMIC_DA9052=y +CONFIG_MFD_DA9052_SPI=y +# CONFIG_MFD_DA9052_I2C is not set +# CONFIG_MFD_DA9055 is not set +CONFIG_MFD_DA9062=m +# CONFIG_MFD_DA9063 is not set +CONFIG_MFD_DA9150=m +CONFIG_MFD_DLN2=m +CONFIG_MFD_MC13XXX=m +CONFIG_MFD_MC13XXX_SPI=m +CONFIG_MFD_MC13XXX_I2C=m +CONFIG_HTC_PASIC3=m +# CONFIG_HTC_I2CPLD is not set +CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m +CONFIG_LPC_ICH=m +CONFIG_LPC_SCH=m +# CONFIG_INTEL_SOC_PMIC is not set +CONFIG_MFD_INTEL_LPSS=m +CONFIG_MFD_INTEL_LPSS_ACPI=m +CONFIG_MFD_INTEL_LPSS_PCI=m +CONFIG_MFD_JANZ_CMODIO=m +CONFIG_MFD_KEMPLD=m +# CONFIG_MFD_88PM800 is not set +# CONFIG_MFD_88PM805 is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_MAX14577 is not set +# CONFIG_MFD_MAX77693 is not set +CONFIG_MFD_MAX77843=y +# CONFIG_MFD_MAX8907 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_MAX8998 is not set +CONFIG_MFD_MT6397=m +CONFIG_MFD_MENF21BMC=m +CONFIG_EZX_PCAP=y +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_UCB1400_CORE=m +CONFIG_MFD_RDC321X=m +CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_RT5033=m +CONFIG_MFD_RTSX_USB=m +# CONFIG_MFD_RC5T583 is not set +# CONFIG_MFD_SEC_CORE is not set +CONFIG_MFD_SI476X_CORE=m +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_MFD_SKY81452=m +# CONFIG_MFD_SMSC is not set +CONFIG_ABX500_CORE=y +# CONFIG_AB3100_CORE is not set +CONFIG_MFD_SYSCON=y +CONFIG_MFD_TI_AM335X_TSCADC=m +CONFIG_MFD_LP3943=m +# CONFIG_MFD_LP8788 is not set +# CONFIG_MFD_PALMAS is not set +CONFIG_TPS6105X=m +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +CONFIG_MFD_TPS65086=m +# CONFIG_MFD_TPS65090 is not set +CONFIG_MFD_TPS65217=m +CONFIG_MFD_TI_LP873X=m +CONFIG_MFD_TPS65218=m +# CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS65910 is not set +CONFIG_MFD_TPS65912=y +# CONFIG_MFD_TPS65912_I2C is not set +CONFIG_MFD_TPS65912_SPI=y +# CONFIG_MFD_TPS80031 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_TWL6040_CORE is not set +CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_LM3533=m +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_VX855=m +CONFIG_MFD_ARIZONA=y +CONFIG_MFD_ARIZONA_I2C=m +CONFIG_MFD_ARIZONA_SPI=m +CONFIG_MFD_CS47L24=y +CONFIG_MFD_WM5102=y +CONFIG_MFD_WM5110=y +# CONFIG_MFD_WM8997 is not set +CONFIG_MFD_WM8998=y +# CONFIG_MFD_WM8400 is not set +CONFIG_MFD_WM831X=y +# CONFIG_MFD_WM831X_I2C is not set +CONFIG_MFD_WM831X_SPI=y +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=m +CONFIG_REGULATOR_VIRTUAL_CONSUMER=m +CONFIG_REGULATOR_USERSPACE_CONSUMER=m +CONFIG_REGULATOR_ACT8865=m +CONFIG_REGULATOR_AD5398=m +CONFIG_REGULATOR_ANATOP=m +CONFIG_REGULATOR_ARIZONA=m +CONFIG_REGULATOR_AXP20X=m +CONFIG_REGULATOR_BCM590XX=m +CONFIG_REGULATOR_DA9052=m +CONFIG_REGULATOR_DA9062=m +CONFIG_REGULATOR_DA9210=m +# CONFIG_REGULATOR_DA9211 is not set +CONFIG_REGULATOR_FAN53555=m +CONFIG_REGULATOR_GPIO=m +CONFIG_REGULATOR_ISL9305=m +CONFIG_REGULATOR_ISL6271A=m +CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_LP3972=m +CONFIG_REGULATOR_LP872X=m +CONFIG_REGULATOR_LP8755=m +# CONFIG_REGULATOR_LTC3589 is not set +CONFIG_REGULATOR_LTC3676=m +CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX8649=m +CONFIG_REGULATOR_MAX8660=m +CONFIG_REGULATOR_MAX8952=m +CONFIG_REGULATOR_MAX77693=m +CONFIG_REGULATOR_MC13XXX_CORE=m +CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m +CONFIG_REGULATOR_MT6311=m +CONFIG_REGULATOR_MT6323=m +CONFIG_REGULATOR_MT6397=m +CONFIG_REGULATOR_PCAP=m +CONFIG_REGULATOR_PCF50633=m +CONFIG_REGULATOR_PFUZE100=m +CONFIG_REGULATOR_PV88060=m +CONFIG_REGULATOR_PV88080=m +CONFIG_REGULATOR_PV88090=m +CONFIG_REGULATOR_PWM=m +CONFIG_REGULATOR_QCOM_SPMI=m +CONFIG_REGULATOR_RT5033=m +CONFIG_REGULATOR_SKY81452=m +CONFIG_REGULATOR_TPS51632=m +CONFIG_REGULATOR_TPS6105X=m +CONFIG_REGULATOR_TPS62360=m +CONFIG_REGULATOR_TPS65023=m +CONFIG_REGULATOR_TPS6507X=m +CONFIG_REGULATOR_TPS65086=m +CONFIG_REGULATOR_TPS65217=m +CONFIG_REGULATOR_TPS6524X=m +# CONFIG_REGULATOR_TPS65912 is not set +# CONFIG_REGULATOR_WM831X is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +# CONFIG_MEDIA_SDR_SUPPORT is not set +CONFIG_MEDIA_RC_SUPPORT=y +CONFIG_MEDIA_CEC_SUPPORT=y +# CONFIG_MEDIA_CEC_DEBUG is not set +CONFIG_MEDIA_CEC_EDID=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_MEDIA_CONTROLLER_DVB=y +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_PCI_SKELETON=m +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_V4L2_FLASH_LED_CLASS=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m +CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_MAX_ADAPTERS=8 +CONFIG_DVB_DYNAMIC_MINORS=y +# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set + +# +# Media drivers +# +CONFIG_RC_CORE=m +CONFIG_RC_MAP=m +CONFIG_RC_DECODERS=y +CONFIG_LIRC=m +CONFIG_IR_LIRC_CODEC=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_XMP_DECODER=m +CONFIG_RC_DEVICES=y +CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_ENE=m +CONFIG_IR_HIX5HD2=m +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_SPI=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_IR_IGORPLUGUSB=m +CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_GPIO_CIR=m +CONFIG_IR_SERIAL=m +CONFIG_IR_SERIAL_TRANSMITTER=y +CONFIG_MEDIA_USB_SUPPORT=y + +# +# Webcam devices +# +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +# CONFIG_USB_GSPCA_DTCS033 is not set +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STK1135=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TOUPTEK=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_VIDEO_USBTV=m + +# +# Analog TV USB devices +# +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160_COMMON=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m + +# +# Analog/digital TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y +# CONFIG_VIDEO_AU0828_RC is not set +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_DIB3000MC=m +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_USB_DVBSKY=m +CONFIG_DVB_USB_ZD1301=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set +CONFIG_DVB_AS102=m + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_V4L2=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m + +# +# USB HDMI CEC adapters +# +CONFIG_USB_PULSE8_CEC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m +# CONFIG_VIDEO_SOLO6X10 is not set +CONFIG_VIDEO_TW5864=m +CONFIG_VIDEO_TW68=m +CONFIG_VIDEO_TW686X=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DT3155=m + +# +# Media capture/analog/hybrid TV support +# +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_ENABLE_VP3054=y +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7134_GO7007=m +CONFIG_VIDEO_SAA7164=m + +# +# Media digital TV PCI Adapters +# +CONFIG_DVB_AV7110_IR=y +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_DVB_PT3=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m +CONFIG_DVB_SMIPCIE=m +CONFIG_DVB_NETUP_UNIDVB=m +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIDEO_VIA_CAMERA=m +CONFIG_SOC_CAMERA=m +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m +# CONFIG_V4L_TEST_DRIVERS is not set +CONFIG_DVB_PLATFORM_DRIVERS=y + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_TEA575X=m +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_SI4713=m +CONFIG_PLATFORM_SI4713=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_USB_KEENE=m +CONFIG_USB_RAREMONO=m +CONFIG_USB_MA901=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +# CONFIG_DVB_FIREDTV is not set +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_CYPRESS_FIRMWARE=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set + +# +# Media ancillary drivers (tuners, sensors, i2c, spi, frontends) +# +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y +CONFIG_VIDEO_IR_I2C=m + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS3308=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_OV7640=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9V011=m + +# +# Flash devices +# + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m + +# +# Miscellaneous helper chips +# +CONFIG_VIDEO_M52790=m + +# +# Sensors used on soc_camera driver +# + +# +# soc_camera sensor drivers +# +CONFIG_SOC_CAMERA_IMX074=m +CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_SOC_CAMERA_MT9M111=m +CONFIG_SOC_CAMERA_MT9T031=m +CONFIG_SOC_CAMERA_MT9T112=m +CONFIG_SOC_CAMERA_MT9V022=m +CONFIG_SOC_CAMERA_OV2640=m +CONFIG_SOC_CAMERA_OV5642=m +CONFIG_SOC_CAMERA_OV6650=m +CONFIG_SOC_CAMERA_OV772X=m +CONFIG_SOC_CAMERA_OV9640=m +CONFIG_SOC_CAMERA_OV9740=m +CONFIG_SOC_CAMERA_RJ54N1=m +CONFIG_SOC_CAMERA_TW9910=m +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_R820T=m +CONFIG_MEDIA_TUNER_MXL301RF=m +CONFIG_MEDIA_TUNER_QM1D1C0042=m + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m +CONFIG_DVB_M88DS3103=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_SI2165=m +CONFIG_DVB_MN88472=m +CONFIG_DVB_MN88473=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_CX24117=m +CONFIG_DVB_CX24120=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_CXD2841ER=m +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m +CONFIG_DVB_SI2168=m +CONFIG_DVB_AS102_FE=m +CONFIG_DVB_ZD1301_DEMOD=m +CONFIG_DVB_GP8PSK_FE=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_LGDT3306A=m +CONFIG_DVB_LG2160=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# ISDB-S (satellite) & ISDB-T (terrestrial) frontends +# +CONFIG_DVB_TC90522=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_DRX39XYJ=m +CONFIG_DVB_LNBH25=m +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_SP2=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=m +CONFIG_DVB_HORUS3A=m +CONFIG_DVB_ASCOT2E=m +CONFIG_DVB_HELENE=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_AGP=m +CONFIG_AGP_AMD64=m +CONFIG_AGP_INTEL=m +CONFIG_AGP_SIS=m +CONFIG_AGP_VIA=m +CONFIG_INTEL_GTT=m +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y +CONFIG_DRM=m +CONFIG_DRM_MIPI_DSI=y +CONFIG_DRM_DP_AUX_CHARDEV=y +CONFIG_DRM_DEBUG_MM_SELFTEST=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_KMS_FB_HELPER=y +CONFIG_DRM_FBDEV_EMULATION=y +# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set +CONFIG_DRM_TTM=m +CONFIG_DRM_GEM_CMA_HELPER=y +CONFIG_DRM_KMS_CMA_HELPER=y +CONFIG_DRM_VM=y + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_USERPTR=y +CONFIG_DRM_AMDGPU=m +CONFIG_DRM_AMDGPU_SI=y +CONFIG_DRM_AMDGPU_CIK=y +CONFIG_DRM_AMDGPU_USERPTR=y +# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set + +# +# ACP (Audio CoProcessor) Configuration +# +CONFIG_DRM_AMD_ACP=y +CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_I915=m +# CONFIG_DRM_I915_ALPHA_SUPPORT is not set +CONFIG_DRM_I915_CAPTURE_ERROR=y +CONFIG_DRM_I915_COMPRESS_ERROR=y +CONFIG_DRM_I915_USERPTR=y +# CONFIG_DRM_I915_GVT is not set + +# +# drm/i915 Debugging +# +# CONFIG_DRM_I915_WERROR is not set +# CONFIG_DRM_I915_DEBUG is not set +# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set +CONFIG_DRM_VGEM=m +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_VMWGFX_FBCON=y +CONFIG_DRM_GMA500=m +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y +CONFIG_DRM_UDL=m +CONFIG_DRM_AST=m +CONFIG_DRM_MGAG200=m +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_QXL=m +CONFIG_DRM_BOCHS=m +CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DRM_PANEL=y + +# +# Display Panels +# +CONFIG_DRM_BRIDGE=y + +# +# Display Interface Bridges +# +CONFIG_DRM_ANALOGIX_ANX78XX=m +CONFIG_HSA_AMD=m +CONFIG_DRM_HISI_HIBMC=m +CONFIG_DRM_TINYDRM=m +CONFIG_TINYDRM_MIPI_DBI=m +CONFIG_TINYDRM_MI0283QT=m +# CONFIG_DRM_LEGACY is not set +CONFIG_DRM_LIB_RANDOM=y + +# +# Frame buffer Devices +# +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_CMDLINE=y +CONFIG_FB_NOTIFY=y +CONFIG_FB_DDC=m +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +CONFIG_FB_OPENCORES=m +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +# CONFIG_FB_LE80578 is not set +CONFIG_FB_INTEL=m +# CONFIG_FB_INTEL_DEBUG is not set +CONFIG_FB_INTEL_I2C=y +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +CONFIG_FB_VIA=m +CONFIG_FB_VIA_DIRECT_PROCFS=y +CONFIG_FB_VIA_X_COMPATIBILITY=y +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_SM501 is not set +# CONFIG_FB_SMSCUFX is not set +CONFIG_FB_UDL=m +CONFIG_FB_IBM_GXT4500=m +# CONFIG_FB_VIRTUAL is not set +CONFIG_XEN_FBDEV_FRONTEND=m +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_AUO_K190X is not set +CONFIG_FB_HYPERV=m +# CONFIG_FB_SIMPLE is not set +CONFIG_FB_SM712=m +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_L4F00242T03=m +CONFIG_LCD_LMS283GF05=m +CONFIG_LCD_LTV350QV=m +CONFIG_LCD_ILI922X=m +CONFIG_LCD_ILI9320=m +CONFIG_LCD_TDO24M=m +CONFIG_LCD_VGG2432A4=m +CONFIG_LCD_PLATFORM=m +CONFIG_LCD_S6E63M0=m +CONFIG_LCD_LD9040=m +CONFIG_LCD_AMS369FG06=m +CONFIG_LCD_LMS501KF03=m +CONFIG_LCD_HX8357=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=m +CONFIG_BACKLIGHT_LM3533=m +CONFIG_BACKLIGHT_PWM=m +CONFIG_BACKLIGHT_DA9052=m +CONFIG_BACKLIGHT_APPLE=m +CONFIG_BACKLIGHT_PM8941_WLED=m +CONFIG_BACKLIGHT_SAHARA=m +# CONFIG_BACKLIGHT_WM831X is not set +CONFIG_BACKLIGHT_ADP8860=m +CONFIG_BACKLIGHT_ADP8870=m +CONFIG_BACKLIGHT_PCF50633=m +CONFIG_BACKLIGHT_LM3630A=m +CONFIG_BACKLIGHT_LM3639=m +CONFIG_BACKLIGHT_LP855X=m +CONFIG_BACKLIGHT_SKY81452=m +CONFIG_BACKLIGHT_TPS65217=m +CONFIG_BACKLIGHT_GPIO=m +CONFIG_BACKLIGHT_LV5207LP=m +CONFIG_BACKLIGHT_BD6107=m +CONFIG_VGASTATE=m +CONFIG_HDMI=y + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +CONFIG_VGACON_SOFT_SCROLLBACK=y +CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 +CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT=y +CONFIG_DUMMY_CONSOLE=y +CONFIG_DUMMY_CONSOLE_COLUMNS=80 +CONFIG_DUMMY_CONSOLE_ROWS=25 +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_PCM_ELD=y +CONFIG_SND_PCM_IEC958=y +CONFIG_SND_DMAENGINE_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m +CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_PCM_TIMER=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_MAX_CARDS=32 +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_PROC_FS=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +# CONFIG_SND_PCSP is not set +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1 +CONFIG_SND_SB_COMMON=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ASIHPI=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +# CONFIG_SND_ES1968_RADIO is not set +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m + +# +# HD-Audio +# +CONFIG_SND_HDA=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +# CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_CODEC_REALTEK=m +CONFIG_SND_HDA_CODEC_ANALOG=m +CONFIG_SND_HDA_CODEC_SIGMATEL=m +CONFIG_SND_HDA_CODEC_VIA=m +CONFIG_SND_HDA_CODEC_HDMI=m +CONFIG_SND_HDA_CODEC_CIRRUS=m +CONFIG_SND_HDA_CODEC_CONEXANT=m +CONFIG_SND_HDA_CODEC_CA0110=m +CONFIG_SND_HDA_CODEC_CA0132=m +CONFIG_SND_HDA_CODEC_CA0132_DSP=y +CONFIG_SND_HDA_CODEC_CMEDIA=m +CONFIG_SND_HDA_CODEC_SI3054=m +CONFIG_SND_HDA_GENERIC=m +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 +CONFIG_SND_HDA_CORE=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_I915=y +CONFIG_SND_HDA_EXT_CORE=m +CONFIG_SND_HDA_PREALLOC_SIZE=64 +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_USB_HIFACE=m +# CONFIG_SND_BCD2000 is not set +CONFIG_SND_USB_LINE6=m +CONFIG_SND_USB_POD=m +CONFIG_SND_USB_PODHD=m +CONFIG_SND_USB_TONEPORT=m +CONFIG_SND_USB_VARIAX=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_DICE=m +CONFIG_SND_OXFW=m +# CONFIG_SND_ISIGHT is not set +# CONFIG_SND_FIREWORKS is not set +# CONFIG_SND_BEBOB is not set +CONFIG_SND_FIREWIRE_DIGI00X=m +CONFIG_SND_FIREWIRE_TASCAM=m +CONFIG_SND_SOC=m +CONFIG_SND_SOC_AC97_BUS=y +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +CONFIG_SND_SOC_COMPRESS=y +CONFIG_SND_SOC_TOPOLOGY=y +CONFIG_SND_SOC_AMD_ACP=m +CONFIG_SND_ATMEL_SOC=m +CONFIG_SND_DESIGNWARE_I2S=m +CONFIG_SND_DESIGNWARE_PCM=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SOC_IMG=y +CONFIG_SND_SOC_IMG_I2S_IN=m +CONFIG_SND_SOC_IMG_I2S_OUT=m +CONFIG_SND_SOC_IMG_PARALLEL_OUT=m +CONFIG_SND_SOC_IMG_SPDIF_IN=m +CONFIG_SND_SOC_IMG_SPDIF_OUT=m +CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m +CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_SST_MATCH=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m +CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m +CONFIG_SND_SOC_INTEL_SKYLAKE=m +CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m +CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m +CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m +CONFIG_SND_SOC_XTFPGA_I2S=m +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +CONFIG_SND_SOC_AC97_CODEC=m +CONFIG_SND_SOC_ADAU1701=m +CONFIG_SND_SOC_ADAU7002=m +CONFIG_SND_SOC_AK4104=m +CONFIG_SND_SOC_AK4554=m +CONFIG_SND_SOC_AK4613=m +CONFIG_SND_SOC_AK4642=m +CONFIG_SND_SOC_AK5386=m +# CONFIG_SND_SOC_ALC5623 is not set +CONFIG_SND_SOC_BT_SCO=m +CONFIG_SND_SOC_CS35L32=m +CONFIG_SND_SOC_CS35L33=m +CONFIG_SND_SOC_CS35L34=m +CONFIG_SND_SOC_CS42L42=m +CONFIG_SND_SOC_CS42L51=m +CONFIG_SND_SOC_CS42L51_I2C=m +CONFIG_SND_SOC_CS42L52=m +# CONFIG_SND_SOC_CS42L56 is not set +CONFIG_SND_SOC_CS42L73=m +# CONFIG_SND_SOC_CS4265 is not set +CONFIG_SND_SOC_CS4270=m +CONFIG_SND_SOC_CS4271=m +CONFIG_SND_SOC_CS4271_I2C=m +CONFIG_SND_SOC_CS4271_SPI=m +CONFIG_SND_SOC_CS42XX8=m +CONFIG_SND_SOC_CS42XX8_I2C=m +CONFIG_SND_SOC_CS4349=m +CONFIG_SND_SOC_CS53L30=m +CONFIG_SND_SOC_DA7219=m +CONFIG_SND_SOC_DMIC=m +CONFIG_SND_SOC_HDMI_CODEC=m +CONFIG_SND_SOC_ES8328=m +CONFIG_SND_SOC_ES8328_I2C=m +CONFIG_SND_SOC_ES8328_SPI=m +CONFIG_SND_SOC_GTM601=m +CONFIG_SND_SOC_HDAC_HDMI=m +CONFIG_SND_SOC_INNO_RK3036=m +CONFIG_SND_SOC_MAX98090=m +CONFIG_SND_SOC_MAX98357A=m +CONFIG_SND_SOC_MAX98504=m +CONFIG_SND_SOC_MAX9860=m +CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m +CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m +CONFIG_SND_SOC_PCM1681=m +CONFIG_SND_SOC_PCM179X=m +CONFIG_SND_SOC_PCM179X_I2C=m +CONFIG_SND_SOC_PCM179X_SPI=m +CONFIG_SND_SOC_PCM3168A=m +CONFIG_SND_SOC_PCM3168A_I2C=m +CONFIG_SND_SOC_PCM3168A_SPI=m +CONFIG_SND_SOC_PCM512x=m +CONFIG_SND_SOC_PCM512x_I2C=m +CONFIG_SND_SOC_PCM512x_SPI=m +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RL6347A=m +CONFIG_SND_SOC_RT286=m +CONFIG_SND_SOC_RT298=m +CONFIG_SND_SOC_RT5616=m +CONFIG_SND_SOC_RT5631=m +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5651=m +CONFIG_SND_SOC_RT5670=m +CONFIG_SND_SOC_RT5677=m +CONFIG_SND_SOC_RT5677_SPI=m +CONFIG_SND_SOC_SGTL5000=m +CONFIG_SND_SOC_SI476X=m +CONFIG_SND_SOC_SIGMADSP=m +CONFIG_SND_SOC_SIGMADSP_I2C=m +CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m +CONFIG_SND_SOC_SPDIF=m +CONFIG_SND_SOC_SSM2602=m +CONFIG_SND_SOC_SSM2602_SPI=m +CONFIG_SND_SOC_SSM2602_I2C=m +CONFIG_SND_SOC_SSM4567=m +CONFIG_SND_SOC_STA32X=m +# CONFIG_SND_SOC_STA350 is not set +CONFIG_SND_SOC_STI_SAS=m +# CONFIG_SND_SOC_TAS2552 is not set +CONFIG_SND_SOC_TAS5086=m +CONFIG_SND_SOC_TAS571X=m +CONFIG_SND_SOC_TAS5720=m +CONFIG_SND_SOC_TFA9879=m +CONFIG_SND_SOC_TLV320AIC23=m +CONFIG_SND_SOC_TLV320AIC23_I2C=m +CONFIG_SND_SOC_TLV320AIC23_SPI=m +# CONFIG_SND_SOC_TLV320AIC31XX is not set +CONFIG_SND_SOC_TLV320AIC3X=m +CONFIG_SND_SOC_TS3A227E=m +CONFIG_SND_SOC_WM8510=m +CONFIG_SND_SOC_WM8523=m +CONFIG_SND_SOC_WM8580=m +CONFIG_SND_SOC_WM8711=m +CONFIG_SND_SOC_WM8728=m +CONFIG_SND_SOC_WM8731=m +CONFIG_SND_SOC_WM8737=m +CONFIG_SND_SOC_WM8741=m +CONFIG_SND_SOC_WM8750=m +CONFIG_SND_SOC_WM8753=m +CONFIG_SND_SOC_WM8770=m +CONFIG_SND_SOC_WM8776=m +CONFIG_SND_SOC_WM8804=m +CONFIG_SND_SOC_WM8804_I2C=m +CONFIG_SND_SOC_WM8804_SPI=m +CONFIG_SND_SOC_WM8903=m +CONFIG_SND_SOC_WM8960=m +CONFIG_SND_SOC_WM8962=m +CONFIG_SND_SOC_WM8974=m +CONFIG_SND_SOC_WM8978=m +CONFIG_SND_SOC_WM8985=m +CONFIG_SND_SOC_NAU8540=m +CONFIG_SND_SOC_NAU8810=m +CONFIG_SND_SOC_NAU8825=m +CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SIMPLE_CARD_UTILS=m +CONFIG_SND_SIMPLE_CARD=m +CONFIG_SND_X86=y +CONFIG_HDMI_LPE_AUDIO=m +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID support +# +CONFIG_HID=m +CONFIG_HID_BATTERY_STRENGTH=y +CONFIG_HIDRAW=y +CONFIG_UHID=m +CONFIG_HID_GENERIC=m + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_APPLEIR=m +CONFIG_HID_ASUS=m +CONFIG_HID_AUREAL=m +CONFIG_HID_BELKIN=m +CONFIG_HID_BETOP_FF=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CORSAIR=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CMEDIA=m +CONFIG_HID_CP2112=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELECOM=m +CONFIG_HID_ELO=m +CONFIG_HID_EZKEY=m +CONFIG_HID_GEMBIRD=m +CONFIG_HID_GFRM=m +CONFIG_HID_HOLTEK=m +# CONFIG_HOLTEK_FF is not set +# CONFIG_HID_GT683R is not set +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LED=m +CONFIG_HID_LENOVO=m +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_HID_LOGITECH_HIDPP=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MAYFLASH=m +CONFIG_HID_MICROSOFT=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PENMOUNT=m +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y +CONFIG_HID_PLANTRONICS=m +CONFIG_HID_PRIMAX=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_SONY_FF=y +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_HYPERV_MOUSE=m +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_UDRAW_PS3=m +CONFIG_HID_WACOM=m +CONFIG_HID_WIIMOTE=m +CONFIG_HID_XINMO=m +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m +CONFIG_HID_SENSOR_CUSTOM_SENSOR=m +CONFIG_HID_ALPS=m + +# +# USB HID support +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m + +# +# I2C HID support +# +CONFIG_I2C_HID=m + +# +# Intel ISH HID support +# +CONFIG_INTEL_ISH_HID=m +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=m +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEFAULT_PERSIST=y +CONFIG_USB_DYNAMIC_MINORS=y +# CONFIG_USB_OTG is not set +CONFIG_USB_OTG_WHITELIST=y +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_LEDS_TRIGGER_USBPORT=m +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_XHCI_HCD=m +CONFIG_USB_XHCI_PCI=m +CONFIG_USB_XHCI_PLATFORM=m +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_PCI=m +CONFIG_USB_EHCI_HCD_PLATFORM=m +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_FOTG210_HCD=m +# CONFIG_USB_MAX3421_HCD is not set +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_PCI=m +CONFIG_USB_OHCI_HCD_SSB=y +CONFIG_USB_OHCI_HCD_PLATFORM=m +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +# CONFIG_USB_SL811_HCD_ISO is not set +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +CONFIG_USB_HCD_BCMA=m +CONFIG_USB_HCD_SSB=m +# CONFIG_USB_HCD_TEST_MODE is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_VHCI_HC_PORTS=8 +CONFIG_USBIP_VHCI_NR_HCS=1 +CONFIG_USBIP_HOST=m +CONFIG_USBIP_VUDC=m +# CONFIG_USBIP_DEBUG is not set +CONFIG_USB_MUSB_HDRC=m +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_GADGET is not set +CONFIG_USB_MUSB_DUAL_ROLE=y + +# +# Platform Glue Layer +# + +# +# MUSB DMA mode +# +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_DWC3=m +CONFIG_USB_DWC3_ULPI=y +# CONFIG_USB_DWC3_HOST is not set +# CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_DUAL_ROLE=y + +# +# Platform Glue Driver Support +# +CONFIG_USB_DWC3_PCI=m +# CONFIG_USB_DWC2 is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_PCI=m +# CONFIG_USB_CHIPIDEA_UDC is not set +CONFIG_USB_CHIPIDEA_HOST=y +# CONFIG_USB_CHIPIDEA_ULPI is not set +CONFIG_USB_ISP1760=m +CONFIG_USB_ISP1760_HCD=y +CONFIG_USB_ISP1761_UDC=y +# CONFIG_USB_ISP1760_HOST_ROLE is not set +# CONFIG_USB_ISP1760_GADGET_ROLE is not set +CONFIG_USB_ISP1760_DUAL_ROLE=y + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=m +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_F81232=m +CONFIG_USB_SERIAL_F8153X=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MXUPORT=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_XSENS_MT=m +CONFIG_USB_SERIAL_WISHBONE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m +CONFIG_USB_SERIAL_UPD78F0730=m +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_EHSET_TEST_FIXTURE=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m +CONFIG_USB_HUB_USB251XB=m +CONFIG_USB_HSIC_USB3503=m +CONFIG_USB_HSIC_USB4604=m +# CONFIG_USB_LINK_LAYER_TEST is not set +CONFIG_USB_CHAOSKEY=m +CONFIG_UCSI=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m + +# +# USB Physical Layer drivers +# +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m +CONFIG_USB_GPIO_VBUS=m +CONFIG_TAHVO_USB=m +# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set +CONFIG_USB_ISP1301=m +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +CONFIG_U_SERIAL_CONSOLE=y + +# +# USB Peripheral Controller +# +CONFIG_USB_FOTG210_UDC=m +CONFIG_USB_GR_UDC=m +CONFIG_USB_R8A66597=m +CONFIG_USB_PXA27X=m +CONFIG_USB_MV_UDC=m +CONFIG_USB_MV_U3D=m +CONFIG_USB_M66592=m +CONFIG_USB_BDC_UDC=m + +# +# Platform Support +# +CONFIG_USB_BDC_PCI=m +CONFIG_USB_AMD5536UDC=m +CONFIG_USB_NET2272=m +# CONFIG_USB_NET2272_DMA is not set +CONFIG_USB_NET2280=m +CONFIG_USB_GOKU=m +CONFIG_USB_EG20T=m +CONFIG_USB_DUMMY_HCD=m +CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_U_SERIAL=m +CONFIG_USB_U_ETHER=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m +CONFIG_USB_F_NCM=m +CONFIG_USB_F_ECM=m +CONFIG_USB_F_PHONET=m +CONFIG_USB_F_EEM=m +CONFIG_USB_F_SUBSET=m +CONFIG_USB_F_RNDIS=m +CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_FS=m +CONFIG_USB_F_UAC1=m +CONFIG_USB_F_UVC=m +CONFIG_USB_F_MIDI=m +CONFIG_USB_F_HID=m +CONFIG_USB_F_PRINTER=m +CONFIG_USB_F_TCM=m +CONFIG_USB_CONFIGFS=m +# CONFIG_USB_CONFIGFS_SERIAL is not set +# CONFIG_USB_CONFIGFS_ACM is not set +# CONFIG_USB_CONFIGFS_OBEX is not set +# CONFIG_USB_CONFIGFS_NCM is not set +# CONFIG_USB_CONFIGFS_ECM is not set +# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set +# CONFIG_USB_CONFIGFS_RNDIS is not set +# CONFIG_USB_CONFIGFS_EEM is not set +# CONFIG_USB_CONFIGFS_PHONET is not set +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +# CONFIG_USB_CONFIGFS_F_LB_SS is not set +# CONFIG_USB_CONFIGFS_F_FS is not set +# CONFIG_USB_CONFIGFS_F_UAC1 is not set +# CONFIG_USB_CONFIGFS_F_UAC2 is not set +# CONFIG_USB_CONFIGFS_F_MIDI is not set +# CONFIG_USB_CONFIGFS_F_HID is not set +CONFIG_USB_CONFIGFS_F_UVC=y +CONFIG_USB_CONFIGFS_F_PRINTER=y +CONFIG_USB_CONFIGFS_F_TCM=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_AUDIO=m +CONFIG_GADGET_UAC1=y +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_ETH_EEM=y +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +# CONFIG_USB_FUNCTIONFS_ETH is not set +# CONFIG_USB_FUNCTIONFS_RNDIS is not set +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_GADGET_TARGET=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +# CONFIG_USB_CDC_COMPOSITE is not set +CONFIG_USB_G_NOKIA=m +CONFIG_USB_G_ACM_MS=m +CONFIG_USB_G_MULTI=m +CONFIG_USB_G_MULTI_RNDIS=y +CONFIG_USB_G_MULTI_CDC=y +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m +CONFIG_USB_LED_TRIG=y +CONFIG_USB_ULPI_BUS=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +# CONFIG_MMC_RICOH_MMC is not set +CONFIG_MMC_SDHCI_ACPI=m +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SPI=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +# CONFIG_MMC_USDHI6ROL0 is not set +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m +CONFIG_MMC_TOSHIBA_PCI=m +CONFIG_MMC_MTK=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m +CONFIG_MS_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m +# CONFIG_MEMSTICK_REALTEK_USB is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS_FLASH=m +# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set + +# +# LED drivers +# +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m +CONFIG_LEDS_PCA9532=m +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP3952=m +CONFIG_LEDS_LP55XX_COMMON=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_LP5562=m +CONFIG_LEDS_LP8501=m +CONFIG_LEDS_LP8860=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_PCA963X=m +# CONFIG_LEDS_WM831X_STATUS is not set +CONFIG_LEDS_DA9052=m +CONFIG_LEDS_DAC124S085=m +CONFIG_LEDS_PWM=m +CONFIG_LEDS_REGULATOR=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_MC13783=m +CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_TLC591XX=m +CONFIG_LEDS_LM355x=m +CONFIG_LEDS_MENF21BMC=m + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# +CONFIG_LEDS_BLINKM=m +CONFIG_LEDS_MLXCPLD=m +CONFIG_LEDS_USER=m +CONFIG_LEDS_NIC78BX=m + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m +CONFIG_LEDS_TRIGGER_DISK=y +CONFIG_LEDS_TRIGGER_MTD=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_LEDS_TRIGGER_CAMERA=m +CONFIG_LEDS_TRIGGER_PANIC=y +# CONFIG_ACCESSIBILITY is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ON_DEMAND_PAGING=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_QIB=m +CONFIG_INFINIBAND_QIB_DCA=y +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_CXGB4=m +CONFIG_INFINIBAND_I40IW=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_INFINIBAND_OCRDMA=m +CONFIG_INFINIBAND_VMWARE_PVRDMA=m +CONFIG_INFINIBAND_USNIC=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +CONFIG_INFINIBAND_IPOIB_DEBUG=y +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_SRPT=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_ISERT=m +CONFIG_INFINIBAND_RDMAVT=m +CONFIG_RDMA_RXE=m +CONFIG_INFINIBAND_HFI1=m +# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set +CONFIG_HFI1_VERBS_31BIT_PSN=y +# CONFIG_SDMA_VERBOSITY is not set +CONFIG_INFINIBAND_QEDR=m +CONFIG_INFINIBAND_BNXT_RE=m +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD64=m +CONFIG_EDAC_AMD64_ERROR_INJECTION=y +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +# CONFIG_EDAC_IE31200 is not set +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_EDAC_SBRIDGE=m +CONFIG_EDAC_SKX=m +CONFIG_EDAC_PND2=m +CONFIG_RTC_LIB=y +CONFIG_RTC_MC146818_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +CONFIG_RTC_DRV_TEST=m + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_ABB5ZES3=m +CONFIG_RTC_DRV_ABX80X=m +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1307_HWMON=y +# CONFIG_RTC_DRV_DS1307_CENTURY is not set +CONFIG_RTC_DRV_DS1374=m +# CONFIG_RTC_DRV_DS1374_WDT is not set +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8523=m +CONFIG_RTC_DRV_PCF85063=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8010=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV8803=m + +# +# SPI RTC drivers +# +CONFIG_RTC_DRV_M41T93=m +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_DS1302=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_DS1343=m +CONFIG_RTC_DRV_DS1347=m +CONFIG_RTC_DRV_DS1390=m +CONFIG_RTC_DRV_MAX6916=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_RX4581=m +CONFIG_RTC_DRV_RX6110=m +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_PCF2123=m +CONFIG_RTC_DRV_MCP795=m +CONFIG_RTC_I2C_AND_SPI=y + +# +# SPI and I2C RTC drivers +# +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_PCF2127=m +CONFIG_RTC_DRV_RV3029C2=m +CONFIG_RTC_DRV_RV3029_HWMON=y + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1685_FAMILY=m +CONFIG_RTC_DRV_DS1685=y +# CONFIG_RTC_DRV_DS1689 is not set +# CONFIG_RTC_DRV_DS17285 is not set +# CONFIG_RTC_DRV_DS17485 is not set +# CONFIG_RTC_DRV_DS17885 is not set +# CONFIG_RTC_DS1685_PROC_REGS is not set +# CONFIG_RTC_DS1685_SYSFS_REGS is not set +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_DS2404=m +CONFIG_RTC_DRV_DA9052=m +CONFIG_RTC_DRV_DA9063=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_WM831X=m +CONFIG_RTC_DRV_PCF50633=m + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_PCAP=m +CONFIG_RTC_DRV_MC13XXX=m +CONFIG_RTC_DRV_MT6397=m + +# +# HID Sensor RTC drivers +# +CONFIG_RTC_DRV_HID_SENSOR_TIME=m +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_DMA_ENGINE=y +CONFIG_DMA_VIRTUAL_CHANNELS=m +CONFIG_DMA_ACPI=y +CONFIG_INTEL_IDMA64=m +CONFIG_INTEL_IOATDMA=m +CONFIG_QCOM_HIDMA_MGMT=m +CONFIG_QCOM_HIDMA=m +CONFIG_DW_DMAC_CORE=m +CONFIG_DW_DMAC=m +CONFIG_DW_DMAC_PCI=m +CONFIG_HSU_DMA=m + +# +# DMA Clients +# +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DMA_ENGINE_RAID=y + +# +# DMABUF options +# +CONFIG_SYNC_FILE=y +# CONFIG_SW_SYNC is not set +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_IMG_ASCII_LCD=m +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_UIO_DMEM_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m +CONFIG_UIO_PRUSS=m +CONFIG_UIO_MF624=m +CONFIG_UIO_HV_GENERIC=m +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO_VIRQFD=m +CONFIG_VFIO=m +CONFIG_VFIO_NOIOMMU=y +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y +CONFIG_VFIO_PCI_MMAP=y +CONFIG_VFIO_PCI_INTX=y +CONFIG_VFIO_PCI_IGD=y +CONFIG_VFIO_MDEV=m +CONFIG_VFIO_MDEV_DEVICE=m +CONFIG_IRQ_BYPASS_MANAGER=m +CONFIG_VIRT_DRIVERS=y +CONFIG_VIRTIO=m + +# +# Virtio drivers +# +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MMIO=m +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +# CONFIG_XEN_SELFBALLOONING is not set +# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_TMEM=m +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_SCSI_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=m +# CONFIG_XEN_MCE_LOG is not set +CONFIG_XEN_HAVE_PVMMU=y +CONFIG_XEN_EFI=y +CONFIG_XEN_AUTO_XLATE=y +CONFIG_XEN_ACPI=y +CONFIG_XEN_SYMS=y +CONFIG_XEN_HAVE_VPMU=y +CONFIG_STAGING=y +CONFIG_PRISM2_USB=m +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 +CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 +CONFIG_COMEDI_MISC_DRIVERS=y +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SERIAL2002=m +# CONFIG_COMEDI_ISA_DRIVERS is not set +CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_8255_PCI=m +CONFIG_COMEDI_ADDI_WATCHDOG=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7X3X=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1720=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI1724=m +CONFIG_COMEDI_ADV_PCI1760=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200_PCI=m +CONFIG_COMEDI_AMPLC_PC236_PCI=m +CONFIG_COMEDI_AMPLC_PC263_PCI=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DAS08_PCI=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_MF6X4=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIMDAS=m +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_LABPC_PCI=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIOCMD=m +CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_NI_USB6501=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_USBDUXSIGMA=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_8254=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_8255_SA=m +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_RTL8192U=m +CONFIG_RTLLIB=m +CONFIG_RTLLIB_CRYPTO_CCMP=m +CONFIG_RTLLIB_CRYPTO_TKIP=m +CONFIG_RTLLIB_CRYPTO_WEP=m +CONFIG_RTL8192E=m +CONFIG_R8712U=m +CONFIG_R8188EU=m +CONFIG_88EU_AP_MODE=y +CONFIG_RTS5208=m +CONFIG_VT6655=m +CONFIG_VT6656=m + +# +# IIO staging drivers +# + +# +# Accelerometers +# +CONFIG_ADIS16201=m +CONFIG_ADIS16203=m +CONFIG_ADIS16209=m +CONFIG_ADIS16240=m + +# +# Analog to digital converters +# +CONFIG_AD7606=m +CONFIG_AD7606_IFACE_PARALLEL=m +CONFIG_AD7606_IFACE_SPI=m +CONFIG_AD7780=m +CONFIG_AD7816=m +CONFIG_AD7192=m +CONFIG_AD7280=m + +# +# Analog digital bi-direction converters +# +CONFIG_ADT7316=m +CONFIG_ADT7316_SPI=m +CONFIG_ADT7316_I2C=m + +# +# Capacitance to digital converters +# +CONFIG_AD7150=m +CONFIG_AD7152=m +CONFIG_AD7746=m + +# +# Direct Digital Synthesis +# +CONFIG_AD9832=m +CONFIG_AD9834=m + +# +# Digital gyroscope sensors +# +CONFIG_ADIS16060=m + +# +# Network Analyzer, Impedance Converters +# +CONFIG_AD5933=m + +# +# Light sensors +# +CONFIG_SENSORS_ISL29028=m +CONFIG_TSL2x7x=m + +# +# Active energy metering IC +# +CONFIG_ADE7753=m +CONFIG_ADE7754=m +CONFIG_ADE7758=m +CONFIG_ADE7759=m +CONFIG_ADE7854=m +CONFIG_ADE7854_I2C=m +CONFIG_ADE7854_SPI=m + +# +# Resolver to digital converters +# +CONFIG_AD2S90=m +CONFIG_AD2S1200=m +CONFIG_AD2S1210=m + +# +# Triggers - standalone +# +CONFIG_FB_SM750=m +CONFIG_FB_XGI=m + +# +# Speakup console speech +# +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m +CONFIG_STAGING_MEDIA=y +CONFIG_I2C_BCM2048=m +CONFIG_DVB_CXD2099=m +# CONFIG_LIRC_STAGING is not set + +# +# Android +# +CONFIG_LTE_GDM724X=m +CONFIG_FIREWIRE_SERIAL=m +CONFIG_FWTTY_MAX_TOTAL_PORTS=64 +CONFIG_FWTTY_MAX_CARD_PORTS=32 +CONFIG_LNET=m +CONFIG_LNET_MAX_PAYLOAD=1048576 +CONFIG_LNET_SELFTEST=m +CONFIG_LUSTRE_FS=m +CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192 +# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set +CONFIG_DGNC=m +CONFIG_GS_FPGABOOT=m +# CONFIG_CRYPTO_SKEIN is not set +# CONFIG_UNISYSSPAR is not set +CONFIG_FB_TFT=m +CONFIG_FB_TFT_AGM1264K_FL=m +CONFIG_FB_TFT_BD663474=m +CONFIG_FB_TFT_HX8340BN=m +CONFIG_FB_TFT_HX8347D=m +CONFIG_FB_TFT_HX8353D=m +CONFIG_FB_TFT_HX8357D=m +CONFIG_FB_TFT_ILI9163=m +CONFIG_FB_TFT_ILI9320=m +CONFIG_FB_TFT_ILI9325=m +CONFIG_FB_TFT_ILI9340=m +CONFIG_FB_TFT_ILI9341=m +CONFIG_FB_TFT_ILI9481=m +CONFIG_FB_TFT_ILI9486=m +CONFIG_FB_TFT_PCD8544=m +CONFIG_FB_TFT_RA8875=m +CONFIG_FB_TFT_S6D02A1=m +CONFIG_FB_TFT_S6D1121=m +CONFIG_FB_TFT_SSD1289=m +CONFIG_FB_TFT_SSD1305=m +CONFIG_FB_TFT_SSD1306=m +CONFIG_FB_TFT_SSD1325=m +CONFIG_FB_TFT_SSD1331=m +CONFIG_FB_TFT_SSD1351=m +CONFIG_FB_TFT_ST7735R=m +CONFIG_FB_TFT_ST7789V=m +CONFIG_FB_TFT_TINYLCD=m +CONFIG_FB_TFT_TLS8204=m +CONFIG_FB_TFT_UC1611=m +CONFIG_FB_TFT_UC1701=m +CONFIG_FB_TFT_UPD161704=m +CONFIG_FB_TFT_WATTEROTT=m +CONFIG_FB_FLEX=m +CONFIG_FB_TFT_FBTFT_DEVICE=m +CONFIG_WILC1000=m +CONFIG_WILC1000_SDIO=m +# CONFIG_WILC1000_SPI is not set +# CONFIG_WILC1000_HW_OOB_INTR is not set +CONFIG_MOST=m +CONFIG_MOSTCORE=m +CONFIG_AIM_CDEV=m +CONFIG_AIM_NETWORK=m +CONFIG_AIM_SOUND=m +CONFIG_AIM_V4L2=m +CONFIG_HDM_DIM2=m +CONFIG_HDM_I2C=m +CONFIG_HDM_USB=m +CONFIG_KS7010=m +CONFIG_GREYBUS=m +CONFIG_GREYBUS_ES2=m +CONFIG_GREYBUS_AUDIO=m +CONFIG_GREYBUS_BOOTROM=m +CONFIG_GREYBUS_FIRMWARE=m +CONFIG_GREYBUS_HID=m +CONFIG_GREYBUS_LIGHT=m +CONFIG_GREYBUS_LOG=m +CONFIG_GREYBUS_LOOPBACK=m +CONFIG_GREYBUS_POWER=m +CONFIG_GREYBUS_RAW=m +CONFIG_GREYBUS_VIBRATOR=m +CONFIG_GREYBUS_BRIDGED_PHY=m +CONFIG_GREYBUS_GPIO=m +CONFIG_GREYBUS_I2C=m +CONFIG_GREYBUS_PWM=m +CONFIG_GREYBUS_SDIO=m +CONFIG_GREYBUS_SPI=m +CONFIG_GREYBUS_UART=m +CONFIG_GREYBUS_USB=m +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACERHDF=m +CONFIG_ALIENWARE_WMI=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_SMBIOS=m +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m +# CONFIG_DELL_SMO8800 is not set +CONFIG_DELL_RBTN=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_FUJITSU_TABLET=m +CONFIG_AMILO_RFKILL=m +CONFIG_HP_ACCEL=m +CONFIG_HP_WIRELESS=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_SURFACE3_WMI=m +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_SENSORS_HDAPS=m +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_WMI=m +CONFIG_ASUS_WIRELESS=m +CONFIG_ACPI_WMI=m +CONFIG_MSI_WMI=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +# CONFIG_TOSHIBA_HAPS is not set +CONFIG_TOSHIBA_WMI=m +CONFIG_ACPI_CMPC=m +CONFIG_INTEL_HID_EVENT=m +CONFIG_INTEL_VBTN=m +CONFIG_INTEL_IPS=m +CONFIG_INTEL_PMC_CORE=y +CONFIG_IBM_RTL=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_SAMSUNG_Q10=m +CONFIG_APPLE_GMUX=m +CONFIG_INTEL_RST=m +CONFIG_INTEL_SMARTCONNECT=m +CONFIG_PVPANIC=m +CONFIG_INTEL_PMC_IPC=m +CONFIG_SURFACE_PRO3_BUTTON=m +CONFIG_INTEL_PUNIT_IPC=m +CONFIG_INTEL_TELEMETRY=m +CONFIG_MLX_PLATFORM=m +CONFIG_MLX_CPLD_PLATFORM=m +# CONFIG_INTEL_TURBO_MAX_3 is not set +# CONFIG_SILEAD_DMI is not set +CONFIG_PMC_ATOM=y +CONFIG_CHROME_PLATFORMS=y +CONFIG_CHROMEOS_LAPTOP=m +CONFIG_CHROMEOS_PSTORE=m +CONFIG_CROS_EC_CHARDEV=m +CONFIG_CROS_EC_LPC=m +CONFIG_CROS_EC_PROTO=y +CONFIG_CROS_KBD_LED_BACKLIGHT=m +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +CONFIG_COMMON_CLK_WM831X=m +CONFIG_COMMON_CLK_SI5351=m +CONFIG_COMMON_CLK_CDCE706=m +CONFIG_COMMON_CLK_CS2000_CP=m +# CONFIG_COMMON_CLK_NXP is not set +CONFIG_COMMON_CLK_PWM=m +# CONFIG_COMMON_CLK_PXA is not set +# CONFIG_COMMON_CLK_PIC32 is not set + +# +# Hardware Spinlock drivers +# + +# +# Clock Source drivers +# +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +# CONFIG_ATMEL_PIT is not set +# CONFIG_SH_TIMER_CMT is not set +# CONFIG_SH_TIMER_MTU2 is not set +# CONFIG_SH_TIMER_TMU is not set +# CONFIG_EM_TIMER_STI is not set +CONFIG_MAILBOX=y +CONFIG_PCC=y +CONFIG_ALTERA_MBOX=m +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +CONFIG_IOMMU_IOVA=y +CONFIG_AMD_IOMMU=y +CONFIG_AMD_IOMMU_V2=m +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +CONFIG_INTEL_IOMMU_SVM=y +CONFIG_INTEL_IOMMU_DEFAULT_ON=y +CONFIG_INTEL_IOMMU_FLOPPY_WA=y +CONFIG_IRQ_REMAP=y + +# +# Remoteproc drivers +# +CONFIG_REMOTEPROC=m + +# +# Rpmsg drivers +# + +# +# SOC (System On Chip) specific Drivers +# + +# +# Broadcom SoC drivers +# +# CONFIG_SUNXI_SRAM is not set +# CONFIG_SOC_TI is not set +# CONFIG_SOC_ZTE is not set +CONFIG_PM_DEVFREQ=y + +# +# DEVFREQ Governors +# +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y +CONFIG_DEVFREQ_GOV_PERFORMANCE=y +CONFIG_DEVFREQ_GOV_POWERSAVE=y +CONFIG_DEVFREQ_GOV_USERSPACE=y +CONFIG_DEVFREQ_GOV_PASSIVE=m + +# +# DEVFREQ Drivers +# +CONFIG_PM_DEVFREQ_EVENT=y +CONFIG_EXTCON=y + +# +# Extcon Device Drivers +# +CONFIG_EXTCON_ADC_JACK=m +CONFIG_EXTCON_ARIZONA=m +CONFIG_EXTCON_AXP288=m +CONFIG_EXTCON_GPIO=m +CONFIG_EXTCON_INTEL_INT3496=m +CONFIG_EXTCON_MAX3355=m +CONFIG_EXTCON_MAX77843=m +CONFIG_EXTCON_QCOM_SPMI_MISC=m +CONFIG_EXTCON_RT8973A=m +# CONFIG_EXTCON_SM5502 is not set +CONFIG_EXTCON_USB_GPIO=m +CONFIG_MEMORY=y +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=m +CONFIG_IIO_KFIFO_BUF=m +CONFIG_IIO_TRIGGERED_BUFFER=m +CONFIG_IIO_CONFIGFS=m +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 +CONFIG_IIO_SW_DEVICE=m +CONFIG_IIO_SW_TRIGGER=m +CONFIG_IIO_TRIGGERED_EVENT=m + +# +# Accelerometers +# +CONFIG_BMA180=m +CONFIG_BMA220=m +CONFIG_BMC150_ACCEL=m +CONFIG_BMC150_ACCEL_I2C=m +CONFIG_BMC150_ACCEL_SPI=m +CONFIG_DA280=m +CONFIG_DA311=m +CONFIG_DMARD09=m +CONFIG_DMARD10=m +CONFIG_HID_SENSOR_ACCEL_3D=m +CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m +CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m +CONFIG_KXSD9=m +CONFIG_KXSD9_SPI=m +CONFIG_KXSD9_I2C=m +# CONFIG_KXCJK1013 is not set +# CONFIG_MC3230 is not set +CONFIG_MMA7455=m +CONFIG_MMA7455_I2C=m +CONFIG_MMA7455_SPI=m +CONFIG_MMA7660=m +# CONFIG_MMA8452 is not set +CONFIG_MMA9551_CORE=m +CONFIG_MMA9551=m +CONFIG_MMA9553=m +CONFIG_MXC4005=m +CONFIG_MXC6255=m +CONFIG_SCA3000=m +CONFIG_STK8312=m +CONFIG_STK8BA50=m + +# +# Analog to digital converters +# +CONFIG_AD_SIGMA_DELTA=m +CONFIG_AD7266=m +CONFIG_AD7291=m +CONFIG_AD7298=m +CONFIG_AD7476=m +CONFIG_AD7766=m +CONFIG_AD7791=m +CONFIG_AD7793=m +CONFIG_AD7887=m +CONFIG_AD7923=m +CONFIG_AD799X=m +CONFIG_AXP288_ADC=m +CONFIG_CC10001_ADC=m +CONFIG_DA9150_GPADC=m +CONFIG_HI8435=m +CONFIG_HX711=m +CONFIG_INA2XX_ADC=m +CONFIG_LTC2485=m +# CONFIG_MAX1027 is not set +CONFIG_MAX11100=m +CONFIG_MAX1363=m +CONFIG_MCP320X=m +CONFIG_MCP3422=m +CONFIG_MEN_Z188_ADC=m +CONFIG_NAU7802=m +CONFIG_QCOM_SPMI_IADC=m +CONFIG_QCOM_SPMI_VADC=m +CONFIG_TI_ADC081C=m +CONFIG_TI_ADC0832=m +CONFIG_TI_ADC12138=m +CONFIG_TI_ADC128S052=m +CONFIG_TI_ADC161S626=m +CONFIG_TI_ADS1015=m +CONFIG_TI_ADS7950=m +CONFIG_TI_AM335X_ADC=m +CONFIG_TI_TLC4541=m +CONFIG_VIPERBOARD_ADC=m + +# +# Amplifiers +# +CONFIG_AD8366=m + +# +# Chemical Sensors +# +CONFIG_ATLAS_PH_SENSOR=m +CONFIG_IAQCORE=m +CONFIG_VZ89X=m +CONFIG_IIO_CROS_EC_SENSORS_CORE=m +CONFIG_IIO_CROS_EC_SENSORS=m + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m +CONFIG_IIO_MS_SENSORS_I2C=m + +# +# SSP Sensor Common +# +CONFIG_IIO_SSP_SENSORS_COMMONS=m +CONFIG_IIO_SSP_SENSORHUB=m +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# Counters +# + +# +# Digital to analog converters +# +CONFIG_AD5064=m +CONFIG_AD5360=m +CONFIG_AD5380=m +CONFIG_AD5421=m +CONFIG_AD5446=m +CONFIG_AD5449=m +CONFIG_AD5592R_BASE=m +CONFIG_AD5592R=m +CONFIG_AD5593R=m +CONFIG_AD5504=m +CONFIG_AD5624R_SPI=m +CONFIG_AD5686=m +CONFIG_AD5755=m +CONFIG_AD5761=m +CONFIG_AD5764=m +CONFIG_AD5791=m +CONFIG_AD7303=m +CONFIG_AD8801=m +CONFIG_M62332=m +CONFIG_MAX517=m +CONFIG_MCP4725=m +# CONFIG_MCP4922 is not set + +# +# IIO dummy driver +# +CONFIG_IIO_SIMPLE_DUMMY=m +# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set +# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +CONFIG_AD9523=m + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +CONFIG_ADF4350=m + +# +# Digital gyroscope sensors +# +CONFIG_ADIS16080=m +CONFIG_ADIS16130=m +CONFIG_ADIS16136=m +CONFIG_ADIS16260=m +CONFIG_ADXRS450=m +CONFIG_BMG160=m +CONFIG_BMG160_I2C=m +CONFIG_BMG160_SPI=m +CONFIG_HID_SENSOR_GYRO_3D=m +CONFIG_MPU3050=m +CONFIG_MPU3050_I2C=m +CONFIG_IIO_ST_GYRO_3AXIS=m +CONFIG_IIO_ST_GYRO_I2C_3AXIS=m +CONFIG_IIO_ST_GYRO_SPI_3AXIS=m +CONFIG_ITG3200=m + +# +# Health Sensors +# + +# +# Heart Rate Monitors +# +CONFIG_AFE4403=m +CONFIG_AFE4404=m +CONFIG_MAX30100=m + +# +# Humidity sensors +# +CONFIG_AM2315=m +CONFIG_DHT11=m +CONFIG_HDC100X=m +CONFIG_HTS221=m +CONFIG_HTS221_I2C=m +CONFIG_HTS221_SPI=m +CONFIG_HTU21=m +CONFIG_SI7005=m +CONFIG_SI7020=m + +# +# Inertial measurement units +# +CONFIG_ADIS16400=m +CONFIG_ADIS16480=m +CONFIG_BMI160=m +CONFIG_BMI160_I2C=m +CONFIG_BMI160_SPI=m +CONFIG_KMX61=m +CONFIG_INV_MPU6050_IIO=m +CONFIG_INV_MPU6050_I2C=m +CONFIG_INV_MPU6050_SPI=m +CONFIG_IIO_ST_LSM6DSX=m +CONFIG_IIO_ST_LSM6DSX_I2C=m +CONFIG_IIO_ST_LSM6DSX_SPI=m +CONFIG_IIO_ADIS_LIB=m +CONFIG_IIO_ADIS_LIB_BUFFER=y + +# +# Light sensors +# +CONFIG_ACPI_ALS=m +CONFIG_ADJD_S311=m +CONFIG_AL3320A=m +CONFIG_APDS9300=m +CONFIG_APDS9960=m +CONFIG_BH1750=m +CONFIG_BH1780=m +CONFIG_CM32181=m +CONFIG_CM3232=m +CONFIG_CM3323=m +CONFIG_CM36651=m +CONFIG_GP2AP020A00F=m +CONFIG_SENSORS_ISL29018=m +# CONFIG_ISL29125 is not set +CONFIG_HID_SENSOR_ALS=m +CONFIG_HID_SENSOR_PROX=m +CONFIG_JSA1212=m +CONFIG_RPR0521=m +CONFIG_SENSORS_LM3533=m +CONFIG_LTR501=m +CONFIG_MAX44000=m +CONFIG_OPT3001=m +CONFIG_PA12203001=m +CONFIG_SI1145=m +CONFIG_STK3310=m +# CONFIG_TCS3414 is not set +CONFIG_TCS3472=m +CONFIG_SENSORS_TSL2563=m +CONFIG_TSL2583=m +CONFIG_TSL4531=m +CONFIG_US5182D=m +CONFIG_VCNL4000=m +CONFIG_VEML6070=m + +# +# Magnetometer sensors +# +CONFIG_AK8975=m +# CONFIG_AK09911 is not set +CONFIG_BMC150_MAGN=m +CONFIG_BMC150_MAGN_I2C=m +CONFIG_BMC150_MAGN_SPI=m +CONFIG_MAG3110=m +CONFIG_HID_SENSOR_MAGNETOMETER_3D=m +CONFIG_MMC35240=m +CONFIG_IIO_ST_MAGN_3AXIS=m +CONFIG_IIO_ST_MAGN_I2C_3AXIS=m +CONFIG_IIO_ST_MAGN_SPI_3AXIS=m +# CONFIG_SENSORS_HMC5843_I2C is not set +# CONFIG_SENSORS_HMC5843_SPI is not set + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set + +# +# Triggers - standalone +# +CONFIG_IIO_HRTIMER_TRIGGER=m +CONFIG_IIO_INTERRUPT_TRIGGER=m +CONFIG_IIO_TIGHTLOOP_TRIGGER=m +CONFIG_IIO_SYSFS_TRIGGER=m + +# +# Digital potentiometers +# +CONFIG_DS1803=m +CONFIG_MAX5481=m +CONFIG_MAX5487=m +CONFIG_MCP4131=m +CONFIG_MCP4531=m +CONFIG_TPL0102=m + +# +# Digital potentiostats +# +CONFIG_LMP91000=m + +# +# Pressure sensors +# +CONFIG_ABP060MG=m +CONFIG_BMP280=m +CONFIG_BMP280_I2C=m +CONFIG_BMP280_SPI=m +CONFIG_IIO_CROS_EC_BARO=m +CONFIG_HID_SENSOR_PRESS=m +CONFIG_HP03=m +CONFIG_MPL115=m +CONFIG_MPL115_I2C=m +CONFIG_MPL115_SPI=m +CONFIG_MPL3115=m +CONFIG_MS5611=m +CONFIG_MS5611_I2C=m +CONFIG_MS5611_SPI=m +CONFIG_MS5637=m +CONFIG_IIO_ST_PRESS=m +CONFIG_IIO_ST_PRESS_I2C=m +CONFIG_IIO_ST_PRESS_SPI=m +# CONFIG_T5403 is not set +CONFIG_HP206C=m +CONFIG_ZPA2326=m +CONFIG_ZPA2326_I2C=m +CONFIG_ZPA2326_SPI=m + +# +# Lightning sensors +# +# CONFIG_AS3935 is not set + +# +# Proximity and distance sensors +# +CONFIG_LIDAR_LITE_V2=m +CONFIG_SX9500=m +CONFIG_SRF08=m + +# +# Temperature sensors +# +CONFIG_MAXIM_THERMOCOUPLE=m +# CONFIG_MLX90614 is not set +CONFIG_TMP006=m +CONFIG_TMP007=m +CONFIG_TSYS01=m +CONFIG_TSYS02D=m +CONFIG_NTB=m +CONFIG_NTB_AMD=m +CONFIG_NTB_INTEL=m +CONFIG_NTB_PINGPONG=m +CONFIG_NTB_TOOL=m +CONFIG_NTB_PERF=m +CONFIG_NTB_TRANSPORT=m +# CONFIG_VME_BUS is not set +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +CONFIG_PWM_CROS_EC=m +CONFIG_PWM_LP3943=m +CONFIG_PWM_LPSS=m +CONFIG_PWM_LPSS_PCI=m +CONFIG_PWM_LPSS_PLATFORM=m +CONFIG_PWM_PCA9685=m +CONFIG_ARM_GIC_MAX_NR=1 +CONFIG_IPACK_BUS=m +CONFIG_BOARD_TPCI200=m +CONFIG_SERIAL_IPOCTAL=m +CONFIG_RESET_CONTROLLER=y +# CONFIG_RESET_ATH79 is not set +# CONFIG_RESET_BERLIN is not set +# CONFIG_RESET_LPC18XX is not set +# CONFIG_RESET_MESON is not set +# CONFIG_RESET_PISTACHIO is not set +# CONFIG_RESET_SOCFPGA is not set +# CONFIG_RESET_STM32 is not set +# CONFIG_RESET_SUNXI is not set +CONFIG_TI_SYSCON_RESET=m +# CONFIG_RESET_ZYNQ is not set +# CONFIG_RESET_TEGRA_BPMP is not set +CONFIG_FMC=m +CONFIG_FMC_FAKEDEV=m +CONFIG_FMC_TRIVIAL=m +CONFIG_FMC_WRITE_EEPROM=m +CONFIG_FMC_CHARDEV=m + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +CONFIG_PHY_PXA_28NM_HSIC=m +CONFIG_PHY_PXA_28NM_USB2=m +# CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_PHY_QCOM_USB_HS=m +CONFIG_PHY_QCOM_USB_HSIC=m +CONFIG_PHY_TUSB1210=m +CONFIG_POWERCAP=y +CONFIG_INTEL_RAPL=m +CONFIG_MCB=m +CONFIG_MCB_PCI=m +CONFIG_MCB_LPC=m + +# +# Performance monitor support +# +CONFIG_RAS=y +CONFIG_MCE_AMD_INJ=m +CONFIG_THUNDERBOLT=m + +# +# Android +# +# CONFIG_ANDROID is not set +CONFIG_LIBNVDIMM=y +CONFIG_BLK_DEV_PMEM=m +CONFIG_ND_BLK=m +CONFIG_ND_CLAIM=y +CONFIG_ND_BTT=m +CONFIG_BTT=y +CONFIG_ND_PFN=m +CONFIG_NVDIMM_PFN=y +CONFIG_NVDIMM_DAX=y +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m +CONFIG_NR_DEV_DAX=32768 +CONFIG_NVMEM=m +CONFIG_STM=m +CONFIG_STM_DUMMY=m +CONFIG_STM_SOURCE_CONSOLE=m +CONFIG_STM_SOURCE_HEARTBEAT=m +CONFIG_STM_SOURCE_FTRACE=m +CONFIG_INTEL_TH=m +CONFIG_INTEL_TH_PCI=m +CONFIG_INTEL_TH_GTH=m +CONFIG_INTEL_TH_STH=m +CONFIG_INTEL_TH_MSU=m +CONFIG_INTEL_TH_PTI=m +# CONFIG_INTEL_TH_DEBUG is not set + +# +# FPGA Configuration Support +# +CONFIG_FPGA=m + +# +# FSI support +# +CONFIG_FSI=m + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m +CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +CONFIG_FW_CFG_SYSFS=m +# CONFIG_FW_CFG_SYSFS_CMDLINE is not set +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=y +CONFIG_EFI_ESRT=y +CONFIG_EFI_VARS_PSTORE=y +CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y +CONFIG_EFI_RUNTIME_MAP=y +# CONFIG_EFI_FAKE_MEMMAP is not set +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_BOOTLOADER_CONTROL=m +CONFIG_EFI_CAPSULE_LOADER=m +CONFIG_EFI_TEST=m +CONFIG_APPLE_PROPERTIES=y +CONFIG_UEFI_CPER=y +CONFIG_EFI_DEV_PATH_PARSER=y + +# +# Tegra firmware driver +# + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_FS_IOMAP=y +CONFIG_EXT2_FS=m +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_ENCRYPTION is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_WARN is not set +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set +CONFIG_NILFS2_FS=m +CONFIG_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_F2FS_FS_SECURITY=y +CONFIG_F2FS_CHECK_FS=y +CONFIG_F2FS_FS_ENCRYPTION=y +# CONFIG_F2FS_IO_TRACE is not set +# CONFIG_F2FS_FAULT_INJECTION is not set +CONFIG_FS_DAX=y +CONFIG_FS_DAX_PMD=y +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_EXPORTFS_BLOCK_OPS=y +CONFIG_FILE_LOCKING=y +CONFIG_MANDATORY_FILE_LOCKING=y +CONFIG_FS_ENCRYPTION=m +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_QUOTACTL_COMPAT=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_OVERLAY_FS=m +# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set + +# +# Caches +# +CONFIG_FSCACHE=m +# CONFIG_FSCACHE_STATS is not set +# CONFIG_FSCACHE_HISTOGRAM is not set +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_FAT_DEFAULT_UTF8=y +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_VMCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_PROC_CHILDREN=y +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_ARCH_HAS_GIGANTIC_PAGE=y +CONFIG_CONFIGFS_FS=m +CONFIG_EFIVAR_FS=y +CONFIG_MISC_FILESYSTEMS=y +CONFIG_ORANGEFS_FS=m +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +# CONFIG_AFFS_FS is not set +CONFIG_ECRYPT_FS=m +# CONFIG_ECRYPT_FS_MESSAGING is not set +# CONFIG_HFS_FS is not set +CONFIG_HFSPLUS_FS=m +CONFIG_HFSPLUS_FS_POSIX_ACL=y +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_FILE_CACHE=y +# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set +CONFIG_SQUASHFS_DECOMP_MULTI=y +# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZ4=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +CONFIG_HPFS_FS=m +# CONFIG_QNX4FS_FS is not set +CONFIG_QNX6FS_FS=m +# CONFIG_QNX6FS_DEBUG is not set +# CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y +CONFIG_PSTORE_ZLIB_COMPRESS=y +# CONFIG_PSTORE_LZO_COMPRESS is not set +# CONFIG_PSTORE_LZ4_COMPRESS is not set +# CONFIG_PSTORE_CONSOLE is not set +# CONFIG_PSTORE_PMSG is not set +# CONFIG_PSTORE_FTRACE is not set +CONFIG_PSTORE_RAM=m +# CONFIG_SYSV_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +# CONFIG_EXOFS_FS is not set +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=m +CONFIG_NFS_SWAP=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_PNFS_FLEXFILE_LAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +CONFIG_NFS_V4_1_MIGRATION=y +CONFIG_NFS_V4_SECURITY_LABEL=y +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_PNFS=y +CONFIG_NFSD_BLOCKLAYOUT=y +CONFIG_NFSD_SCSILAYOUT=y +# CONFIG_NFSD_FLEXFILELAYOUT is not set +# CONFIG_NFSD_V4_SECURITY_LABEL is not set +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_GRACE_PERIOD=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_SUNRPC_DEBUG is not set +CONFIG_SUNRPC_XPRT_RDMA=m +CONFIG_CEPH_FS=m +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y +# CONFIG_CIFS_DEBUG is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y +CONFIG_CIFS_SMB311=y +CONFIG_CIFS_FSCACHE=y +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_AFS_FSCACHE=y +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +# CONFIG_BOOT_PRINTK_DELAY is not set +CONFIG_DYNAMIC_DEBUG=y + +# +# Compile-time checks and compiler options +# +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_INFO_REDUCED is not set +# CONFIG_DEBUG_INFO_SPLIT is not set +# CONFIG_DEBUG_INFO_DWARF4 is not set +# CONFIG_GDB_SCRIPTS is not set +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_PAGE_OWNER is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +CONFIG_ARCH_WANT_FRAME_POINTERS=y +# CONFIG_FRAME_POINTER is not set +# CONFIG_STACK_VALIDATION is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_DEBUG_KERNEL=y + +# +# Memory Debugging +# +CONFIG_PAGE_EXTENSION=y +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_PAGE_POISONING=y +CONFIG_PAGE_POISONING_NO_SANITY=y +CONFIG_PAGE_POISONING_ZERO=y +# CONFIG_DEBUG_PAGE_REF is not set +# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_VM is not set +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y +# CONFIG_DEBUG_VIRTUAL is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_HAVE_DEBUG_STACKOVERFLOW=y +# CONFIG_DEBUG_STACKOVERFLOW is not set +CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_HAVE_ARCH_KASAN=y +# CONFIG_KASAN is not set +CONFIG_ARCH_HAS_KCOV=y +# CONFIG_KCOV is not set +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Lockups and Hangs +# +CONFIG_LOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1 +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +# CONFIG_WQ_WATCHDOG is not set +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 +# CONFIG_SCHED_DEBUG is not set +CONFIG_SCHED_INFO=y +CONFIG_SCHEDSTATS=y +# CONFIG_SCHED_STACK_END_CHECK is not set +# CONFIG_DEBUG_TIMEKEEPING is not set +# CONFIG_DEBUG_PREEMPT is not set + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_LOCK_TORTURE_TEST is not set +CONFIG_WW_MUTEX_SELFTEST=m +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_LIST=y +# CONFIG_DEBUG_PI_LIST is not set +# CONFIG_DEBUG_SG is not set +CONFIG_DEBUG_NOTIFIERS=y +CONFIG_DEBUG_CREDENTIALS=y + +# +# RCU Debugging +# +# CONFIG_PROVE_RCU is not set +# CONFIG_SPARSE_RCU_POINTER is not set +CONFIG_TORTURE_TEST=m +CONFIG_RCU_PERF_TEST=m +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_FENTRY=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACE_CLOCK=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +# CONFIG_FUNCTION_GRAPH_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_HWLAT_TRACER is not set +CONFIG_FTRACE_SYSCALLS=y +# CONFIG_TRACER_SNAPSHOT is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_STACK_TRACER is not set +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENTS=y +CONFIG_UPROBE_EVENTS=y +CONFIG_BPF_EVENTS=y +CONFIG_PROBE_EVENTS=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y +# CONFIG_FUNCTION_PROFILER is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_MMIOTRACE is not set +# CONFIG_HIST_TRIGGERS is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_TRACE_ENUM_MAP_FILE is not set +CONFIG_TRACING_EVENTS_GPIO=y + +# +# Runtime Testing +# +CONFIG_LKDTM=m +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_TEST_SORT is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set +# CONFIG_PERCPU_TEST is not set +# CONFIG_ATOMIC64_SELFTEST is not set +CONFIG_ASYNC_RAID6_TEST=m +# CONFIG_TEST_HEXDUMP is not set +CONFIG_TEST_STRING_HELPERS=m +CONFIG_TEST_KSTRTOX=m +CONFIG_TEST_PRINTF=m +CONFIG_TEST_BITMAP=m +CONFIG_TEST_UUID=m +# CONFIG_TEST_RHASHTABLE is not set +CONFIG_TEST_HASH=m +CONFIG_TEST_PARMAN=m +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_TEST_LKM is not set +# CONFIG_TEST_USER_COPY is not set +# CONFIG_TEST_BPF is not set +# CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_UDELAY is not set +# CONFIG_MEMTEST is not set +CONFIG_TEST_STATIC_KEYS=m +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set +# CONFIG_UBSAN is not set +CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y +CONFIG_STRICT_DEVMEM=y +CONFIG_IO_STRICT_DEVMEM=y +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +CONFIG_EARLY_PRINTK_EFI=y +# CONFIG_X86_PTDUMP_CORE is not set +# CONFIG_X86_PTDUMP is not set +# CONFIG_EFI_PGT_DUMP is not set +# CONFIG_DEBUG_WX is not set +CONFIG_DOUBLEFAULT=y +# CONFIG_DEBUG_TLBFLUSH is not set +# CONFIG_IOMMU_DEBUG is not set +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# CONFIG_OPTIMIZE_INLINING is not set +# CONFIG_DEBUG_ENTRY is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set +CONFIG_X86_DEBUG_FPU=y +# CONFIG_PUNIT_ATOM_DEBUG is not set + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_PERSISTENT_KEYRINGS is not set +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=m +# CONFIG_KEY_DH_OPERATIONS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +# CONFIG_SECURITY_NETWORK is not set +CONFIG_SECURITY_PATH=y +CONFIG_INTEL_TXT=y +CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y +CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y +CONFIG_HARDENED_USERCOPY=y +# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set +# CONFIG_STATIC_USERMODEHELPER is not set +# CONFIG_SECURITY_SMACK is not set +# CONFIG_SECURITY_TOMOYO is not set +# CONFIG_SECURITY_APPARMOR is not set +# CONFIG_SECURITY_LOADPIN is not set +CONFIG_SECURITY_YAMA=y +CONFIG_INTEGRITY=y +# CONFIG_INTEGRITY_SIGNATURE is not set +CONFIG_INTEGRITY_AUDIT=y +# CONFIG_IMA is not set +# CONFIG_EVM is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=m +CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AKCIPHER=y +CONFIG_CRYPTO_KPP2=y +CONFIG_CRYPTO_KPP=m +CONFIG_CRYPTO_ACOMP2=y +CONFIG_CRYPTO_RSA=m +CONFIG_CRYPTO_DH=m +CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_MCRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_ABLK_HELPER=m +CONFIG_CRYPTO_SIMD=m +CONFIG_CRYPTO_GLUE_HELPER_X86=m +CONFIG_CRYPTO_ENGINE=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_ECHAINIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_KEYWRAP=m + +# +# Hash modes +# +CONFIG_CRYPTO_CMAC=m +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=m +CONFIG_CRYPTO_CRCT10DIF=y +CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_POLY1305_X86_64=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA1_SSSE3=m +CONFIG_CRYPTO_SHA256_SSSE3=m +CONFIG_CRYPTO_SHA512_SSSE3=m +CONFIG_CRYPTO_SHA1_MB=m +CONFIG_CRYPTO_SHA256_MB=m +CONFIG_CRYPTO_SHA512_MB=m +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +CONFIG_CRYPTO_SHA3=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_AES_TI=m +CONFIG_CRYPTO_AES_X86_64=m +CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_BLOWFISH_X86_64=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAMELLIA_X86_64=m +CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m +CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m +CONFIG_CRYPTO_CAST_COMMON=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST5_AVX_X86_64=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_CAST6_AVX_X86_64=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_DES3_EDE_X86_64=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_X86_64=m +CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_CHACHA20_X86_64=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_X86_64=m +CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m +CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_842=m +CONFIG_CRYPTO_LZ4=m +CONFIG_CRYPTO_LZ4HC=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_MENU=m +CONFIG_CRYPTO_DRBG_HMAC=y +# CONFIG_CRYPTO_DRBG_HASH is not set +# CONFIG_CRYPTO_DRBG_CTR is not set +CONFIG_CRYPTO_DRBG=m +CONFIG_CRYPTO_JITTERENTROPY=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_RNG=m +CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_HASH_INFO=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set +CONFIG_CRYPTO_DEV_CCP=y +CONFIG_CRYPTO_DEV_CCP_DD=m +CONFIG_CRYPTO_DEV_CCP_CRYPTO=m +CONFIG_CRYPTO_DEV_QAT=m +# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set +CONFIG_CRYPTO_DEV_QAT_C3XXX=m +CONFIG_CRYPTO_DEV_QAT_C62X=m +CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m +CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m +CONFIG_CRYPTO_DEV_QAT_C62XVF=m +CONFIG_CRYPTO_DEV_CHELSIO=m +CONFIG_CRYPTO_DEV_VIRTIO=m +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y + +# +# Certificates for signature checking +# +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQFD=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y +CONFIG_KVM_VFIO=y +CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y +CONFIG_KVM_COMPAT=y +CONFIG_HAVE_KVM_IRQ_BYPASS=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +# CONFIG_KVM_MMU_AUDIT is not set +CONFIG_KVM_DEVICE_ASSIGNMENT=y +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_VSOCK=m +CONFIG_VHOST=m +CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +# CONFIG_HAVE_ARCH_BITREVERSE is not set +CONFIG_RATIONAL=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_842_COMPRESS=m +CONFIG_842_DECOMPRESS=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_COMPRESS=m +CONFIG_LZ4HC_COMPRESS=m +CONFIG_LZ4_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_TEST=m +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_DECOMPRESS_LZ4=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_BCH=m +CONFIG_BCH_CONST_PARAMS=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y +CONFIG_RADIX_TREE_MULTIORDER=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +# CONFIG_DMA_NOOP_OPS is not set +CONFIG_DMA_VIRT_OPS=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_GLOB=y +# CONFIG_GLOB_SELFTEST is not set +CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m +CONFIG_CLZ_TAB=y +CONFIG_CORDIC=m +CONFIG_DDR=y +CONFIG_IRQ_POLL=y +CONFIG_MPILIB=y +CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y +CONFIG_FONT_SUPPORT=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_6x10 is not set +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_AUTOSELECT=y +# CONFIG_SG_SPLIT is not set +CONFIG_SG_POOL=y +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_ARCH_HAS_PMEM_API=y +CONFIG_ARCH_HAS_MMIO_FLUSH=y +CONFIG_SBITMAP=y +CONFIG_PARMAN=m +CONFIG_PRIME_NUMBERS=m diff --git a/srcpkgs/linux4.11/patches/smsc95xx-mac.patch b/srcpkgs/linux4.11/patches/smsc95xx-mac.patch new file mode 100644 index 00000000000..bf77c2d9e23 --- /dev/null +++ b/srcpkgs/linux4.11/patches/smsc95xx-mac.patch @@ -0,0 +1,95 @@ +From e36d607d56dc5c0cbf2cb600e7686b559ea77b44 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Tue, 18 Feb 2014 01:43:50 -0300 +Subject: [PATCH] net/smsc95xx: Allow mac address to be set as a parameter + +--- + drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 56 insertions(+) + +diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c +index dc989a8..912be75 100644 +--- a/drivers/net/usb/smsc95xx.c ++++ b/drivers/net/usb/smsc95xx.c +@@ -60,6 +60,7 @@ + #define SUSPEND_SUSPEND3 (0x08) + #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ + SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) ++#define MAC_ADDR_LEN (6) + + #define CARRIER_CHECK_DELAY (2 * HZ) + +@@ -80,6 +81,10 @@ static bool turbo_mode = true; + module_param(turbo_mode, bool, 0644); + MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction"); + ++static char *macaddr = ":"; ++module_param(macaddr, charp, 0); ++MODULE_PARM_DESC(macaddr, "MAC address"); ++ + static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, + u32 *data, int in_pm) + { +@@ -809,8 +814,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) + return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL); + } + ++/* Check the macaddr module parameter for a MAC address */ ++static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac) ++{ ++ int i, j, got_num, num; ++ u8 mtbl[MAC_ADDR_LEN]; ++ ++ if (macaddr[0] == ':') ++ return 0; ++ ++ i = 0; ++ j = 0; ++ num = 0; ++ got_num = 0; ++ while (j < MAC_ADDR_LEN) { ++ if (macaddr[i] && macaddr[i] != ':') { ++ got_num++; ++ if ('0' <= macaddr[i] && macaddr[i] <= '9') ++ num = num * 16 + macaddr[i] - '0'; ++ else if ('A' <= macaddr[i] && macaddr[i] <= 'F') ++ num = num * 16 + 10 + macaddr[i] - 'A'; ++ else if ('a' <= macaddr[i] && macaddr[i] <= 'f') ++ num = num * 16 + 10 + macaddr[i] - 'a'; ++ else ++ break; ++ i++; ++ } else if (got_num == 2) { ++ mtbl[j++] = (u8) num; ++ num = 0; ++ got_num = 0; ++ i++; ++ } else { ++ break; ++ } ++ } ++ ++ if (j == MAC_ADDR_LEN) { ++ netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: " ++ "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2], ++ mtbl[3], mtbl[4], mtbl[5]); ++ for (i = 0; i < MAC_ADDR_LEN; i++) ++ dev_mac[i] = mtbl[i]; ++ return 1; ++ } else { ++ return 0; ++ } ++} ++ + static void smsc95xx_init_mac_address(struct usbnet *dev) + { ++ /* Check module parameters */ ++ if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr)) ++ return; ++ + const u8 *mac_addr; + + /* maybe the boot loader passed the MAC address in devicetree */ +-- +2.10.2 + diff --git a/srcpkgs/linux4.11/template b/srcpkgs/linux4.11/template new file mode 100644 index 00000000000..256452fe75d --- /dev/null +++ b/srcpkgs/linux4.11/template @@ -0,0 +1,282 @@ +# Template file for 'linux4.11' +pkgname=linux4.11 +_distver=4.11.0 +version=${_distver} +revision=1 +patch_args="-Np1" +wrksrc="linux-${_distver%.*}" +maintainer="Juan RP " +homepage="http://www.kernel.org" +license="GPL-2" +short_desc="The Linux kernel and modules (${version%.*} series)" +distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${_distver%.*}.tar.xz" +checksum=b67ecafd0a42b3383bf4d82f0850cbff92a7e72a215a6d02f42ddbafcf42a7d6 + +nodebug=yes # -dbg package is generated below manually +nostrip=yes +noverifyrdeps=yes +noshlibprovides=yes +preserve=yes + +only_for_archs="i686 i686-musl x86_64 x86_64-musl armv7l armv7l-musl aarch64 aarch64-musl" +hostmakedepends="bc perl kmod uboot-mkimage libressl-devel" + +_kernver="${version}_${revision}" +triggers="kernel-hooks" +kernel_hooks_version="${_kernver}" + +# These files could be modified when an external module is built. +mutable_files=" + /usr/lib/modules/${_kernver}/modules.builtin.bin + /usr/lib/modules/${_kernver}/modules.softdep + /usr/lib/modules/${_kernver}/modules.dep + /usr/lib/modules/${_kernver}/modules.dep.bin + /usr/lib/modules/${_kernver}/modules.symbols + /usr/lib/modules/${_kernver}/modules.symbols.bin + /usr/lib/modules/${_kernver}/modules.alias + /usr/lib/modules/${_kernver}/modules.alias.bin + /usr/lib/modules/${_kernver}/modules.devname" + +do_configure() { + # If there's a file called -dotconfig, use it to + # configure the kernel; otherwise use arch defaults and all stuff + # as modules (defconfig+allmodconfig). + local arch _args + + case "$XBPS_TARGET_MACHINE" in + i686*) arch=i386;; + x86_64*) arch=x86_64;; + armv7*) arch=arm;; + aarch64*) arch=arm64;; + esac + + if [ "$CROSS_BUILD" ]; then + _args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-" + fi + + if [ -f ${FILESDIR}/${arch}-dotconfig-custom ]; then + msg_normal "Detected a custom .config file for your arch, using it.\n" + cp -f ${FILESDIR}/${arch}-dotconfig-custom .config + make ${makejobs} ARCH=$arch ${_args} oldconfig + elif [ -f ${FILESDIR}/${arch}-dotconfig ]; then + msg_normal "Detected a .config file for your arch, using it.\n" + cp -f ${FILESDIR}/${arch}-dotconfig .config + make ${makejobs} ARCH=$arch ${_args} oldconfig + else + msg_normal "Defaulting to 'defconfig and allmodconfig'.\n" + make ${makejobs} ARCH=$arch ${_args} defconfig + make ${makejobs} ARCH=$arch ${_args} allmodconfig + fi + # Always use our revision to CONFIG_LOCALVERSION to match our pkg version. + sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config +} +do_build() { + local arch _cross _args + + case "$XBPS_TARGET_MACHINE" in + i686*) _args="bzImage modules"; arch=i386;; + x86_64*) _args="bzImage modules"; arch=x86_64;; + armv7*) _args="zImage modules dtbs"; arch=arm;; + aarch64*) _args="Image modules dtbs"; arch=arm64;; + esac + if [ "$CROSS_BUILD" ]; then + _cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-" + fi + if [ "${_patchver}" ]; then + _version="EXTRAVERSION=${_patchver}" + fi + export LDFLAGS= + make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare + make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args} +} +do_install() { + local arch subarch _args hdrdest + + case "$XBPS_TARGET_MACHINE" in + i686*) arch=x86; subarch=i386;; + x86_64*) arch=x86; subarch=x86_64;; + armv7*) arch=arm;; + aarch64*) arch=arm64;; + esac + + # Run depmod after compressing modules. + sed -i '2iexit 0' scripts/depmod.sh + + # Install kernel, firmware and modules + make ${makejobs} INSTALL_MOD_PATH=${DESTDIR} modules_install + + hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver} + + vinstall .config 644 boot config-${_kernver} + vinstall System.map 644 boot System.map-${_kernver} + + case "$arch" in + x86) + vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver} + ;; + arm) + vinstall arch/arm/boot/zImage 644 boot + vmkdir boot/dtbs + cp arch/arm/boot/dts/*.dtb ${DESTDIR}/boot/dtbs + ;; + arm64) + vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver} + vmkdir boot/dtbs + cp arch/arm64/boot/dts/*/*.dtb ${DESTDIR}/boot/dtbs + ;; + esac + + # Switch to /usr. + vmkdir usr + mv ${DESTDIR}/lib ${DESTDIR}/usr + + cd ${DESTDIR}/usr/lib/modules/${_kernver} + rm -f source build + ln -sf ../../../src/kernel-headers-${_kernver} build + + cd ${wrksrc} + # Install required headers to build external modules + install -Dm644 Makefile ${hdrdest}/Makefile + install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile + install -Dm644 .config ${hdrdest}/.config + mkdir -p ${hdrdest}/include + # Remove firmware stuff provided by the "linux-firmware" pkg. + rm -rf ${DESTDIR}/usr/lib/firmware + + for i in acpi asm-generic config crypto drm generated linux math-emu \ + media net pcmcia scsi sound trace uapi video xen; do + if [ -d include/$i ]; then + cp -a include/$i ${hdrdest}/include + fi + done + + cd ${wrksrc} + mkdir -p ${hdrdest}/arch/${arch} + cp -a arch/${arch}/include ${hdrdest}/arch/${arch} + + # Copy files necessary for later builds, like nvidia and vmware + cp Module.symvers ${hdrdest} + cp -a scripts ${hdrdest} + + mkdir -p ${hdrdest}/arch/${arch}/kernel + cp arch/${arch}/Makefile ${hdrdest}/arch/${arch} + if [ "$subarch" = "i386" ]; then + mkdir -p ${hdrdest}/arch/x86 + cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86 + fi + if [ "$arch" = "x86" ]; then + mkdir -p ${hdrdest}/arch/x86/kernel + cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel + fi + + # add headers for lirc package + # pci + for i in bt8xx cx88 saa7134; do + mkdir -p ${hdrdest}/drivers/media/pci/${i} + cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i} + done + # usb + for i in cpia2 em28xx pwc; do + mkdir -p ${hdrdest}/drivers/media/usb/${i} + cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i} + done + # i2c + mkdir -p ${hdrdest}/drivers/media/i2c + cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c + for i in cx25840; do + mkdir -p ${hdrdest}/drivers/media/i2c/${i} + cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i} + done + + # Add docbook makefile + install -Dm644 Documentation/DocBook/Makefile \ + ${hdrdest}/Documentation/DocBook/Makefile + + # Add md headers + mkdir -p ${hdrdest}/drivers/md + cp drivers/md/*.h ${hdrdest}/drivers/md + + # Add inotify.h + mkdir -p ${hdrdest}/include/linux + cp include/linux/inotify.h ${hdrdest}/include/linux + + # Add wireless headers + mkdir -p ${hdrdest}/net/mac80211/ + cp net/mac80211/*.h ${hdrdest}/net/mac80211 + + # add dvb headers for external modules + mkdir -p ${hdrdest}/drivers/media/dvb-core + cp drivers/media/dvb-core/*.h ${hdrdest}/drivers/media/dvb-core/ + mkdir -p ${hdrdest}/include/config/dvb/ + cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/ + + # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new + mkdir -p ${hdrdest}/drivers/media/dvb-frontends + cp drivers/media/dvb-frontends/lgdt330x.h \ + ${hdrdest}/drivers/media/dvb-frontends/ + cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/ + + # add dvb headers + mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb + cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/ + mkdir -p ${hdrdest}/drivers/media/dvb-frontends + cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/ + mkdir -p ${hdrdest}/drivers/media/tuners + cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/ + + # Add xfs and shmem for aufs building + mkdir -p ${hdrdest}/fs/xfs/libxfs + mkdir -p ${hdrdest}/mm + cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h + + # Copy in Kconfig files + for i in $(find . -name "Kconfig*"); do + mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||') + cp $i ${hdrdest}/$i + done + + # Remove unneeded architectures + case "$arch" in + i386|x86_64) _args="arm*";; + arm|arm64) _args="x86*";; + esac + for arch in alpha avr32 blackfin cris frv h8300 \ + ia64 m* p* s* um v850 xtensa ${_args}; do + rm -rf ${hdrdest}/arch/${arch} + done + + # Extract debugging symbols + msg_normal "$pkgver: extracting debug info, please wait...\n" + install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver} + ( + cd ${DESTDIR} + export DESTDIR + find ./ -name '*.ko' -print0 | \ + xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug + ) + # ... and run depmod again. + depmod -b ${DESTDIR}/usr -F System.map ${_kernver} +} + +linux4.11-headers_package() { + preserve=yes + nostrip=yes + noverifyrdeps=yes + noshlibprovides=yes + short_desc+=" - source headers for 3rd party modules" + pkg_install() { + vmove usr/src + vmove usr/lib/modules/${_kernver}/build + } +} +linux4.11-dbg_package() { + preserve=yes + nostrip=yes + noverifyrdeps=yes + noshlibprovides=yes + repository=debug + short_desc+=" - debugging symbols" + pkg_install() { + vmove usr/lib/debug + } +} diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template index 96cac17faa5..db567fa66c4 100644 --- a/srcpkgs/linux4.4/template +++ b/srcpkgs/linux4.4/template @@ -1,6 +1,6 @@ # Template file for 'linux4.4' pkgname=linux4.4 -version=4.4.51 +version=4.4.59 revision=1 wrksrc="linux-${version}" maintainer="Juan RP " @@ -8,7 +8,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz" -checksum=ee51ad1c588608871ad25002fa6ae9623096f03b21f71530e6a2a2764be4b911 +checksum=64e9523c4c7fdaf391a16dd19541bb58e39943cb2151aa0c3d15b6aeaba996ca nocross=yes nodebug=yes diff --git a/srcpkgs/linux4.9/files/arm64-dotconfig b/srcpkgs/linux4.9/files/arm64-dotconfig index df72f0fc40e..8ed089a6642 100644 --- a/srcpkgs/linux4.9/files/arm64-dotconfig +++ b/srcpkgs/linux4.9/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.3 Kernel Configuration +# Linux/arm64 4.9.21 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -280,8 +280,8 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set -CONFIG_MODULE_COMPRESS=y -CONFIG_MODULE_COMPRESS_GZIP=y +# CONFIG_MODULE_COMPRESS is not set +# CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS_XZ is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y @@ -444,6 +444,7 @@ CONFIG_ARM64_ERRATUM_843419=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y +CONFIG_QCOM_QDF2400_ERRATUM_0065=y # CONFIG_ARM64_4K_PAGES is not set # CONFIG_ARM64_16K_PAGES is not set CONFIG_ARM64_64K_PAGES=y diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template index 4090c51eb3e..0504a0c1e7f 100644 --- a/srcpkgs/linux4.9/template +++ b/srcpkgs/linux4.9/template @@ -1,6 +1,6 @@ # Template file for 'linux4.9' pkgname=linux4.9 -version=4.9.13 +version=4.9.21 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=36464aec4fb32ed192252645819abb55ceb21eef17b3f7210b4a673e7486a268 +checksum=97503749bf7997b3e55a5126080df348e74c0bb0e10ad85b1b2ec9db7e5e6c24 nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/litecoin/patches/fix-libressl.patch b/srcpkgs/litecoin/patches/fix-libressl.patch new file mode 100644 index 00000000000..4687ef9622a --- /dev/null +++ b/srcpkgs/litecoin/patches/fix-libressl.patch @@ -0,0 +1,20 @@ +--- src/qt/paymentrequestplus.cpp.orig 2017-04-18 12:28:33.789257513 +0200 ++++ src/qt/paymentrequestplus.cpp 2017-04-18 12:29:01.597171846 +0200 +@@ -159,7 +159,7 @@ bool PaymentRequestPlus::getMerchant(X50 + std::string data_to_verify; // Everything but the signature + rcopy.SerializeToString(&data_to_verify); + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX *ctx = EVP_MD_CTX_new(); + if (!ctx) throw SSLVerifyError("Error allocating OpenSSL context."); + #else +@@ -174,7 +174,7 @@ bool PaymentRequestPlus::getMerchant(X50 + !EVP_VerifyFinal(ctx, (const unsigned char*)paymentRequest.signature().data(), (unsigned int)paymentRequest.signature().size(), pubkey)) { + throw SSLVerifyError("Bad signature, invalid payment request."); + } +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX_free(ctx); + #endif + diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index 556f8367d27..bb31a6d94bb 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,20 +1,19 @@ # Template file for 'litecoin' pkgname=litecoin -version=0.10.4.0 -revision=5 -wrksrc="${pkgname}-${version}" +version=0.13.2.1 +revision=2 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-libressl" hostmakedepends="automake libtool pkg-config yasm" makedepends="zlib-devel db-devel libressl-devel boost-devel - qt5-tools-devel miniupnpc-devel protobuf-devel" + qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel" short_desc="Peer-to-peer Internet currency based on scrypt cryptography" maintainer="Juan RP " license="MIT" homepage="http://www.litecoin.org/" distfiles="https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz" -checksum=a9adb6d2ae555afdaa2a5febb81341ac506930cf04ab95b9dc3ab99a4de0405e +checksum=cb07472b32f713bb37ea37cfcc336816a38c8684844c259c89203ed9fe54f85b nocross=yes pre_configure() { diff --git a/srcpkgs/livewallpaper/template b/srcpkgs/livewallpaper/template index a8f8e874ef2..b112cec56e5 100644 --- a/srcpkgs/livewallpaper/template +++ b/srcpkgs/livewallpaper/template @@ -6,7 +6,7 @@ build_style=cmake hostmakedepends="pkg-config gobject-introspection intltool vala" makedepends="glew-devel libpeas-devel gtk+3-devel upower-devel glib-devel" short_desc="Animated Wallpapers for your Desktop" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://launchpad.net/${pkgname}" distfiles="$homepage/${version%.*}/${version}/+download/${pkgname}-${version}.tar.gz" diff --git a/srcpkgs/logrotate/template b/srcpkgs/logrotate/template index 1898e006c4e..8dbbed6cd3c 100644 --- a/srcpkgs/logrotate/template +++ b/srcpkgs/logrotate/template @@ -1,20 +1,17 @@ # Template file for 'logrotate' pkgname=logrotate -version=3.9.1 -revision=2 +version=3.11.0 +revision=1 build_style=gnu-configure -configure_args="--sbindir=/usr/bin" hostmakedepends="automake libtool" makedepends="acl-devel popt-devel" conf_files="/etc/logrotate.conf" short_desc="Log file rotation and periodic maintenance" maintainer="Juan RP " -homepage="https://fedorahosted.org/logrotate/" license="GPL-2" -distfiles="https://fedorahosted.org/releases/l/o/$pkgname/${pkgname}-${version}.tar.gz" -checksum=022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 - -CFLAGS="-Wno-error" +homepage="https://github.com/logrotate/logrotate" +distfiles="${homepage}/releases/download/${version}/logrotate-${version}.tar.xz" +checksum=18ae0f2ec1f14d9550c9f6bd9a2b6a18440e6a0fd7d5923a6e3fcb7d45946261 pre_configure() { ./autogen.sh diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template index b171b5c46f8..23b35d9647d 100644 --- a/srcpkgs/lollypop/template +++ b/srcpkgs/lollypop/template @@ -1,6 +1,6 @@ # Template file for 'lollypop' pkgname=lollypop -version=0.9.230 +version=0.9.231 revision=1 build_style=gnu-configure noarch=yes @@ -15,4 +15,4 @@ maintainer="Jürgen Buchmüller " license="GPL-3" homepage="https://gnumdk.github.io/lollypop-web/" distfiles="https://github.com/gnumdk/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=fe4d33b21affd2b428b1e4555ae60c11741ee67063eabf00b1db18c6e97417b1 +checksum=d30040fd45d7c0d61e5d89d3564e0171cad3b4ce7d2fee7283065638e1d4e964 diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template index 73288bb4407..474fea91ef8 100644 --- a/srcpkgs/loudmouth/template +++ b/srcpkgs/loudmouth/template @@ -1,7 +1,7 @@ # Template file for 'loudmouth' pkgname="loudmouth" version="1.5.3" -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-ssl=openssl --with-asyncns" short_desc="A lightweight Jabber client library written in C/Glib" diff --git a/srcpkgs/lr/template b/srcpkgs/lr/template index 966353c7e00..1e8e7f5d2bf 100644 --- a/srcpkgs/lr/template +++ b/srcpkgs/lr/template @@ -1,16 +1,15 @@ # Template file for 'lr' pkgname=lr -version=0.3.2 +version=0.4 revision=1 build_style=gnu-makefile short_desc="List files, recursively (a better ls/find/stat/du)" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/chneukirchen/lr" distfiles="https://github.com/chneukirchen/${pkgname}/archive/v${version}.tar.gz" -checksum=c4fb7183c0068708cb57078a83ea3ec254cbebeedcd87650dc39a077aaa88599 +checksum=4fdfa4dbd5757c11e41398d076ded8d4bd87e61bb0a497c423b4625914b63562 post_install() { - head -n26 lr.c >LICENSE vlicense LICENSE } diff --git a/srcpkgs/lsp/template b/srcpkgs/lsp/template new file mode 100644 index 00000000000..741df7c9576 --- /dev/null +++ b/srcpkgs/lsp/template @@ -0,0 +1,17 @@ +# Template file for 'lsp' +pkgname=lsp +version=0.2.0 +revision=1 +build_style=go +go_import_path="github.com/dborzov/lsp" +hostmakedepends="git" +short_desc="Is like ls command but more human-friendly" +maintainer="Diogo Leal " +license="MIT" +homepage="https://github.com/dborzov/lsp" +distfiles="https://github.com/dborzov/lsp/archive/v${version}.tar.gz" +checksum=c8f1b27a5711526a23cd128d22483a86004f4bb71bd3896f0b8d3f69454d642b + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/lua51-bitlib/files/Makefile b/srcpkgs/lua51-bitlib/files/Makefile new file mode 100644 index 00000000000..8450f9f4824 --- /dev/null +++ b/srcpkgs/lua51-bitlib/files/Makefile @@ -0,0 +1,11 @@ + + +LUAVER = 5.1 + +LUAPC := lua$(LUAVER) +LUA_CFLAGS := $(shell pkg-config --cflags $(LUAPC)) + +$(LUAVER)/bit32.so: lbitlib.c + mkdir -p $(LUAVER) + $(CC) -I c-api $(CFLAGS) $(LUA_CFLAGS) -shared -fPIC $(LDFLAGS) -o $@ $< + diff --git a/srcpkgs/lua51-bitlib/template b/srcpkgs/lua51-bitlib/template new file mode 100644 index 00000000000..1c5dcaf7b0c --- /dev/null +++ b/srcpkgs/lua51-bitlib/template @@ -0,0 +1,25 @@ +# Template file for 'lua51-bitlib' +pkgname=lua51-bitlib +version=5.3.0 +revision=1 +wrksrc="lua-compat-5.2-bitlib-${version}" +build_style=gnu-makefile +hostmakedepends="pkg-config" +makedepends="lua51-devel" +depends="lua51" +short_desc="An implementation of lua 5.2's bit32 library for lua 5.1" +maintainer="Christopher Brannon " +license="MIT" +homepage="https://github.com/keplerproject/lua-compat-5.2" +distfiles="https://github.com/keplerproject/lua-compat-5.2/archive/bitlib-${version}.tar.gz" +checksum=dc1197b9e996b7bd2c6a679b86ed75106d5722424b3e731b8084f56626ec5552 + +pre_build() { + # Makefile taken from Alpine's aport. + cp "${FILESDIR}/Makefile" . +} + +do_install() { + vinstall 5.1/bit32.so 755 usr/lib/lua/5.1 + vlicense LICENSE +} diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template index 2dbd8a5dd18..412696d3513 100644 --- a/srcpkgs/lua51-luasec/template +++ b/srcpkgs/lua51-luasec/template @@ -2,7 +2,7 @@ pkgname=lua51-luasec reverts=0.6_1 version=0.5.1 -revision=5 +revision=6 wrksrc=${pkgname#*-}-${pkgname#*-}-${version} build_style=gnu-makefile hostmakedepends="lua51" diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template index 5971dfcca49..c0d84c7ddeb 100644 --- a/srcpkgs/lua52-luasec/template +++ b/srcpkgs/lua52-luasec/template @@ -1,7 +1,7 @@ # Template file for 'lua52-luasec' pkgname=lua52-luasec version=0.6 -revision=4 +revision=5 wrksrc=${pkgname#*-}-${pkgname#*-}-${version} build_style=gnu-makefile hostmakedepends="lua52" diff --git a/srcpkgs/luaposix/template b/srcpkgs/luaposix/template index f6e959714d8..62888ec92ce 100644 --- a/srcpkgs/luaposix/template +++ b/srcpkgs/luaposix/template @@ -1,22 +1,23 @@ # Template file for 'luaposix' pkgname=luaposix -version=5.1.28 -revision=5 +version=33.4.0 +revision=1 lib32disabled=yes wrksrc="${pkgname}-release-v${version}" build_style=gnu-configure -configure_args="--libdir=/usr/lib/lua/5.2 --datadir=/usr/share/lua/5.2" -hostmakedepends="perl lua52-devel" -makedepends="ncurses-devel lua52-devel" +configure_args="--libdir=/usr/lib/lua/5.3 --datadir=/usr/share/lua/5.3 --docdir=/usr/share/doc/${pkgname}" +hostmakedepends="perl lua-devel" +makedepends="ncurses-devel lua-devel" depends="lua" short_desc="A POSIX library for Lua programming language" maintainer="Juan RP " -license="GPL-2, LGPL-2.1" +license="MIT" homepage="http://luaforge.net/projects/luaposix/" distfiles="https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz" -checksum=d82a322cb93d25ef16ba2cbab79f6fa1d94806249542d771c2c89a5f9cc4345f +checksum=e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21 post_install() { + vlicense COPYING vmkdir usr/share/$pkgname/examples - vcopy "*.lua" usr/share/$pkgname/examples + vcopy "examples/*.lua" usr/share/$pkgname/examples } diff --git a/srcpkgs/luaposix51/template b/srcpkgs/luaposix51/template index bd8158ff237..e3bcc5781c4 100644 --- a/srcpkgs/luaposix51/template +++ b/srcpkgs/luaposix51/template @@ -1,20 +1,20 @@ # Template file for 'luaposix51' pkgname=luaposix51 -version=5.1.28 -revision=3 +version=33.4.0 +revision=1 lib32disabled=yes wrksrc="luaposix-release-v${version}" build_style=gnu-configure -configure_args="--libdir=/usr/lib/lua/5.1 --datadir=/usr/share/lua/5.1" +configure_args="--libdir=/usr/lib/lua/5.3 --datadir=/usr/share/lua/5.3 --docdir=/usr/share/doc/${pkgname}" hostmakedepends="perl lua51-devel automake libtool" makedepends="ncurses-devel lua51-devel" -depends="lua51 lua51-BitOp" +depends="lua51 lua51-bitlib" short_desc="A POSIX library for Lua programming language" maintainer="Juan RP " -license="GPL-2, LGPL-2.1" +license="MIT" homepage="http://luaforge.net/projects/luaposix/" distfiles="https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz" -checksum=d82a322cb93d25ef16ba2cbab79f6fa1d94806249542d771c2c89a5f9cc4345f +checksum=e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21 make_build_args="INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/lua5.1" @@ -26,6 +26,7 @@ pre_configure() { } post_install() { + vlicense COPYING vmkdir usr/share/$pkgname/examples - vcopy "*.lua" usr/share/$pkgname/examples + vcopy "examples/*.lua" usr/share/$pkgname/examples } diff --git a/srcpkgs/luaposix52/template b/srcpkgs/luaposix52/template new file mode 100644 index 00000000000..828f9419477 --- /dev/null +++ b/srcpkgs/luaposix52/template @@ -0,0 +1,23 @@ +# Template file for 'luaposix52' +pkgname=luaposix52 +version=33.4.0 +revision=1 +lib32disabled=yes +wrksrc="luaposix-release-v${version}" +build_style=gnu-configure +configure_args="--libdir=/usr/lib/lua/5.3 --datadir=/usr/share/lua/5.3 --docdir=/usr/share/doc/${pkgname}" +hostmakedepends="perl lua52-devel" +makedepends="ncurses-devel lua52-devel" +depends="lua52" +short_desc="A POSIX library for Lua programming language" +maintainer="Chris Brannon " +license="MIT" +homepage="http://luaforge.net/projects/luaposix/" +distfiles="https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz" +checksum=e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21 + +post_install() { + vlicense COPYING + vmkdir usr/share/$pkgname/examples + vcopy "examples/*.lua" usr/share/$pkgname/examples +} diff --git a/srcpkgs/luasec/template b/srcpkgs/luasec/template index d1c70aa94d7..99ada8d6148 100644 --- a/srcpkgs/luasec/template +++ b/srcpkgs/luasec/template @@ -1,7 +1,7 @@ # Template file for 'luasec' pkgname=luasec version=0.6 -revision=5 +revision=6 wrksrc=${pkgname}-${pkgname}-${version} build_style=gnu-makefile hostmakedepends="lua" diff --git a/srcpkgs/lumina-devel b/srcpkgs/lumina-devel deleted file mode 120000 index a188a9a4187..00000000000 --- a/srcpkgs/lumina-devel +++ /dev/null @@ -1 +0,0 @@ -lumina \ No newline at end of file diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template index 4c51d62246e..8043c020ffd 100644 --- a/srcpkgs/lutris/template +++ b/srcpkgs/lutris/template @@ -1,6 +1,6 @@ # Template file for 'Lutris' pkgname=lutris -version=0.4.4.1 +version=0.4.8 revision=1 build_style=python3-module wrksrc="${pkgname}" @@ -12,4 +12,4 @@ maintainer="Jan Wey. " license="GPL-3" homepage="https://lutris.net" distfiles="${homepage}/releases/${pkgname}_${version}.tar.xz" -checksum=203d24fdbb2f40e02e95e8f7b9c27701b8bfd9d25909ea149d702a18477b8485 +checksum=5e25d9d07269042abed8b18be83764bbd51541322d448bc372e8b25248b8a1b0 diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template index 8851b909842..2c38486b89f 100644 --- a/srcpkgs/luxmark/template +++ b/srcpkgs/luxmark/template @@ -7,7 +7,7 @@ makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel libopenexr-devel MesaLib-devel ocl-icd-devel opencl-headers boost-devel python-devel luxrays-devel glew-devel libfreeglut-devel qt-devel opencl-clhpp" short_desc="OpenCL benchmark based on LuxCore" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://www.luxrender.net/wiki/LuxMark" distfiles="https://bitbucket.org/luxrender/luxmark/get/${pkgname}_v${version}.tar.gz" diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template index 02555295c71..faf14fa1f1a 100644 --- a/srcpkgs/luxrays/template +++ b/srcpkgs/luxrays/template @@ -1,12 +1,12 @@ # Template file for 'luxrays' pkgname=luxrays version=3.1 -revision=5 +revision=6 build_style=cmake hostmakedepends="flex bison boost-python" makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel boost-devel glew-devel opencl-headers libopenexr-devel python-devel libfreeglut-devel embree-devel" short_desc="LuxMark renderer engine" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://www.luxrender.net/wiki/LuxRays" distfiles="https://bitbucket.org/luxrender/luxrays/get/luxmark_v$version.tar.gz" diff --git a/srcpkgs/lvm2/patches/mlockall-default-config.patch b/srcpkgs/lvm2/patches/mlockall-default-config.patch new file mode 100644 index 00000000000..d741df2e0e8 --- /dev/null +++ b/srcpkgs/lvm2/patches/mlockall-default-config.patch @@ -0,0 +1,14 @@ +--- ./lib/config/defaults.h.orig 2017-04-27 18:16:05.879936377 +0200 ++++ ./lib/config/defaults.h 2017-04-27 18:16:35.141849047 +0200 +@@ -55,7 +55,11 @@ + #define DEFAULT_LVMLOCKD_LOCK_RETRIES 3 + #define DEFAULT_LVMETAD_UPDATE_WAIT_TIME 10 + #define DEFAULT_PRIORITISE_WRITE_LOCKS 1 ++#ifdef __GLIBC__ + #define DEFAULT_USE_MLOCKALL 0 ++#else ++#define DEFAULT_USE_MLOCKALL 1 ++#endif + #define DEFAULT_METADATA_READ_ONLY 0 + #define DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH 0 + #define DEFAULT_UNKNOWN_DEVICE_NAME "[unknown]" diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template index 6fb8979cf15..2b5d64dfd38 100644 --- a/srcpkgs/lvm2/template +++ b/srcpkgs/lvm2/template @@ -1,7 +1,7 @@ # Template file for 'lvm2' pkgname=lvm2 -version=2.02.168 -revision=1 +version=2.02.170 +revision=2 wrksrc="LVM2.${version}" build_style=gnu-configure configure_args="--disable-selinux --enable-readline --enable-pkgconfig @@ -22,10 +22,15 @@ maintainer="Juan RP " homepage="http://sourceware.org/lvm2/" license="GPL-2, LGPL-2.1" distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz" -checksum=23a3d1cddd41b3ef51812ebf83e9fa491f502fe74130d4263be327a91914660d +checksum=9372d2523027a751cf54eafdf8b761ff843969520c32b0c50abfba65e23d0d40 post_install() { sed -i 's,use_lvmetad = 1,use_lvmetad = 0,' ${DESTDIR}/etc/lvm/lvm.conf + case $XBPS_TARGET_MACHINE in + *-musl) + sed -i 's,use_mlockall = 0,use_mlockall = 1,' ${DESTDIR}/etc/lvm/lvm.conf + ;; + esac vsv lvmetad } diff --git a/srcpkgs/lxqt-panel/template b/srcpkgs/lxqt-panel/template index e2fe3623b56..97b568d99e0 100644 --- a/srcpkgs/lxqt-panel/template +++ b/srcpkgs/lxqt-panel/template @@ -1,7 +1,7 @@ # Template file for 'lxqt-panel' pkgname=lxqt-panel version=0.11.1 -revision=2 +revision=3 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" hostmakedepends="pkg-config qt5-host-tools liblxqt-devel" diff --git a/srcpkgs/lxqt-qtplugin/template b/srcpkgs/lxqt-qtplugin/template index 95049de85f9..52a53fbaeea 100644 --- a/srcpkgs/lxqt-qtplugin/template +++ b/srcpkgs/lxqt-qtplugin/template @@ -1,7 +1,7 @@ # Template file for 'lxqt-qtplugin' pkgname=lxqt-qtplugin version=0.11.1 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config qt5-host-tools liblxqt-devel" makedepends="lxqt-build-tools liblxqt-devel libdbusmenu-qt5-devel" diff --git a/srcpkgs/lxqt/template b/srcpkgs/lxqt/template index 10c0d125d53..7b2f5aa895b 100644 --- a/srcpkgs/lxqt/template +++ b/srcpkgs/lxqt/template @@ -1,7 +1,7 @@ # Template file for 'lxqt' pkgname=lxqt version=0.11.1 -revision=1 +revision=2 build_style=meta depends=" lxqt-about>=${version} diff --git a/srcpkgs/lynx/patches/patch-WWW_Library_Implementation_HTTP.c b/srcpkgs/lynx/patches/patch-WWW_Library_Implementation_HTTP.c new file mode 100644 index 00000000000..477bc8a43f1 --- /dev/null +++ b/srcpkgs/lynx/patches/patch-WWW_Library_Implementation_HTTP.c @@ -0,0 +1,11 @@ +--- WWW/Library/Implementation/HTTP.c.orig 2017-02-09 21:20:27 UTC ++++ WWW/Library/Implementation/HTTP.c +@@ -721,7 +722,7 @@ static int HTLoadHTTP(const char *arg, + #elif SSLEAY_VERSION_NUMBER >= 0x0900 + #ifndef USE_NSS_COMPAT_INCL + if (!try_tls) { +- handle->options |= SSL_OP_NO_TLSv1; ++ SSL_set_options(handle, SSL_OP_NO_TLSv1); + #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) + } else { + int ret = (int) SSL_set_tlsext_host_name(handle, ssl_host); diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template index 4d6e89fef14..deb063ef335 100644 --- a/srcpkgs/lynx/template +++ b/srcpkgs/lynx/template @@ -3,7 +3,7 @@ pkgname=lynx _distver=2.8.8 _patchver=2 version=${_distver}.${_patchver} -revision=13 +revision=14 wrksrc="${pkgname}${_distver//./-}" build_style=gnu-configure configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6" diff --git a/srcpkgs/lyx/patches/0001-Fix-compilation-with-Qt5.8dev.patch b/srcpkgs/lyx/patches/0001-Fix-compilation-with-Qt5.8dev.patch new file mode 100644 index 00000000000..f79a03482fc --- /dev/null +++ b/srcpkgs/lyx/patches/0001-Fix-compilation-with-Qt5.8dev.patch @@ -0,0 +1,33 @@ +From 6d375ddeac49ac8c6340398c9797354edca3f5d1 Mon Sep 17 00:00:00 2001 +From: Guillaume Munch +Date: Tue, 20 Dec 2016 00:15:58 +0100 +Subject: [PATCH] Fix compilation with Qt5.8dev + +--- + src/frontends/qt4/GuiViewSource.cpp | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/src/frontends/qt4/GuiViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp +index 9c0ea1d707..fe593875e6 100644 +--- src/frontends/qt4/GuiViewSource.cpp ++++ src/frontends/qt4/GuiViewSource.cpp +@@ -218,14 +218,9 @@ void ViewSourceWidget::updateView(BufferView const * bv) + if (changed && !texrow_) { + // position-to-row is unavailable + // we jump to the first modification +- const QChar * oc = old.constData(); +- const QChar * nc = qcontent.constData(); ++ int length = min(old.length(), qcontent.length()); + int pos = 0; +- while (*oc != '\0' && *nc != '\0' && *oc == *nc) { +- ++oc; +- ++nc; +- ++pos; +- } ++ for (; pos < length && old.at(pos) == qcontent.at(pos); ++pos) {} + QTextCursor c = QTextCursor(viewSourceTV->document()); + //get some space below the cursor + c.setPosition(pos); +-- +2.12.2 + diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template index afc7f70bee3..c2dccdaa460 100644 --- a/srcpkgs/lyx/template +++ b/srcpkgs/lyx/template @@ -1,7 +1,7 @@ # Template file for 'lyx' pkgname=lyx version=2.2.2 -revision=4 +revision=5 build_style=gnu-configure configure_args="--enable-qt5 --without-included-mythes --without-included-boost" short_desc="The Document Processor WYSIWYM Editor & Latex frontend" diff --git a/srcpkgs/lzip/template b/srcpkgs/lzip/template index 077d12eee47..1beb648bc49 100644 --- a/srcpkgs/lzip/template +++ b/srcpkgs/lzip/template @@ -1,14 +1,14 @@ # Template file for 'lzip' pkgname=lzip -version=1.18 +version=1.19 revision=1 build_style=gnu-configure short_desc="Lossless data compressor based on the LZMA algorithm" maintainer="Juan RP " license="GPL-2" homepage="http://www.nongnu.org/lzip/lzip.html" -distfiles="http://download.savannah.gnu.org/releases-noredirect/lzip/lzip-${version}.tar.gz" -checksum=47f9882a104ab05532f467a7b8f4ddbb898fa2f1e8d9d468556d6c2d04db14dd +distfiles="http://download.savannah.gnu.org/releases/lzip/lzip-${version}.tar.gz" +checksum=ffadc4f56be1bc0d3ae155ec4527bd003133bdc703a753b2cc683f610e646ba9 do_configure() { ./configure --prefix=/usr CXX="$CXX" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" diff --git a/srcpkgs/lzlib/template b/srcpkgs/lzlib/template index c7584164f13..49a9dafca75 100644 --- a/srcpkgs/lzlib/template +++ b/srcpkgs/lzlib/template @@ -1,20 +1,24 @@ # Template file for 'lzlib' pkgname=lzlib -version=1.8 +version=1.9 revision=1 build_style=gnu-configure configure_args="--enable-shared --disable-static" short_desc="Compression library for the lzip file format" maintainer="bra1nwave " -license="GPL-2" +license="2-clause-BSD" homepage="http://www.nongnu.org/lzip/lzlib" distfiles="${NONGNU_SITE}/lzip/lzlib/${pkgname}-${version}.tar.gz" -checksum=41bfa82c6ee184ed0884437dc4074ad505e64cb747432cefa97976b89045cbad +checksum=2472f8d93830d0952b0c75f67e372d38c8f7c174dde2252369d5b20c87d3ba8e do_configure() { ./configure --prefix=/usr $configure_args CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" } +post_install() { + vlicense COPYING +} + lzlib-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/maildrop/update b/srcpkgs/maildrop/update new file mode 100644 index 00000000000..a046a810333 --- /dev/null +++ b/srcpkgs/maildrop/update @@ -0,0 +1 @@ +ignore='*.2017*' diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template index 29dc94bbc54..5d7ed7db19b 100644 --- a/srcpkgs/mailx/template +++ b/srcpkgs/mailx/template @@ -1,7 +1,7 @@ # Template file for 'mailx' pkgname=mailx version=12.5 -revision=16 +revision=17 patch_args="-Np1" wrksrc="mailx-${version}" makedepends="libressl-devel mit-krb5-devel" diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template index 3bd6327bcb9..9fd2b381a17 100644 --- a/srcpkgs/maim/template +++ b/srcpkgs/maim/template @@ -1,15 +1,15 @@ # Template file for 'maim' pkgname=maim -version=3.4.47 -revision=2 +version=4.4.62 +revision=1 build_style=cmake configure_args="-DCMAKE_COMPRESS_MAN=FALSE" hostmakedepends="pkg-config" -makedepends="imlib2-devel libXrandr-devel libXext-devel freetype-devel libXfixes-devel" -depends="slop" +makedepends="libXrandr-devel libXcomposite-devel libjpeg-turbo-devel + libpng-devel MesaLib-devel glm slop-devel" short_desc="Desktop screenshot utility" maintainer="Juan RP " license="GPL-3" homepage="https://github.com/naelstrof/maim" distfiles="https://github.com/naelstrof/maim/archive/v${version}.tar.gz" -checksum=fb12524cc05f7f4ff46fe40b951334c6dbc274e50b6d0ea08185f555ca3cd74d +checksum=21ef84fe1c1cdef82dc9cc1f734626f839f0c28fd7e898c38c98aa98a85e9622 diff --git a/srcpkgs/mame/patches/musl-bgfx.patch b/srcpkgs/mame/patches/musl-bgfx.patch index 93c2e3bc161..f851580d5d4 100644 --- a/srcpkgs/mame/patches/musl-bgfx.patch +++ b/srcpkgs/mame/patches/musl-bgfx.patch @@ -10,3 +10,16 @@ #if BX_PLATFORM_WINDOWS // BK - Remotery needs WinSock, but on VS2015/Win10 build // fails if WinSock2 is included after Windows.h?! +--- 3rdparty/bx/include/bx/platform.h 2017-04-26 01:02:36.000000000 +0200 ++++ 3rdparty/bx/include/bx/platform.h 2017-05-01 09:24:44.937447991 +0200 +@@ -242,6 +242,10 @@ + # elif defined(__apple_build_version__) || defined(__ORBIS__) || defined(__EMSCRIPTEN__) || defined(__llvm__) + # undef BX_CRT_LIBCXX + # define BX_CRT_LIBCXX 1 ++# else ++# undef BX_CRT_GLIBC ++# // Fake a glibc version for musl libc ++# define BX_CRT_GLIBC (2 * 10000 + 28 * 100) + # endif // + + # if !BX_CRT_BIONIC \ diff --git a/srcpkgs/mame/patches/musl-time_t.patch b/srcpkgs/mame/patches/musl-time_t.patch new file mode 100644 index 00000000000..841d96a6554 --- /dev/null +++ b/srcpkgs/mame/patches/musl-time_t.patch @@ -0,0 +1,10 @@ +--- 3rdparty/bx/src/crtnone.cpp 2017-04-26 01:02:36.000000000 +0200 ++++ 3rdparty/bx/src/crtnone.cpp 2017-04-29 16:12:17.956612429 +0200 +@@ -3,6 +3,7 @@ + * License: https://github.com/bkaradzic/bx#license-bsd-2-clause + */ + ++#include + #include + #include + #include diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index 9375d91d413..f2128edf84e 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -1,6 +1,6 @@ # Template file for 'mame' pkgname=mame -version=0183 +version=0185 revision=1 wrksrc="mame-mame${version}" homepage="http://mamedev.org" @@ -8,7 +8,7 @@ distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz" short_desc="The Multiple Arcade Machine Emulator" maintainer="Jürgen Buchmüller " license="GPL-2" -checksum=c12b3051f2f11331a38f557eac7f3074166e48155133b2f3e7cc323df56ce8b0 +checksum=c265b43af5459ef2a2133eaf727a8f065630af31f373374c53565a89bc650e33 hostmakedepends="perl pkg-config python automoc4" makedepends="libstdc++-devel SDL2_ttf-devel $(vopt_if qt qt5-devel) lua-devel @@ -31,6 +31,10 @@ fi do_build() { local opts="REGENIE=1" + opts+=" TARGETOS=linux" + case "$XBPS_TARGET_MACHINE" in + x86_64*|aarch64*) opts+=" PTR64=1" ;; + esac opts+=" NOWERROR=1" opts+=" TOOLS=1" opts+=" VERBOSE=1" @@ -53,8 +57,7 @@ do_build() { opts+=" CROSS_BUILD=1 OVERRIDE_CC=${CC} OVERRIDE_CXX=${CXX} OVERRIDE_LD=${CC}" fi case "$XBPS_TARGET_MACHINE" in - i686*) # Build mamearcade and mess separately to - # overcome linker memory exhaustion + i686*) # Overcome linker memory exhaustion opts+=" SYMBOLS=0" make ${opts} ${makejobs} ;; diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template index 2783a9a6c4a..5a5e81000c2 100644 --- a/srcpkgs/man-pages/template +++ b/srcpkgs/man-pages/template @@ -1,6 +1,6 @@ # Template file for 'man-pages' pkgname=man-pages -version=4.09 +version=4.10 revision=1 noarch=yes short_desc="Linux Documentation Project (LDP) manual pages" @@ -8,7 +8,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://man7.org/linux/man-pages/index.html" distfiles="${KERNEL_SITE}/docs/man-pages/$pkgname-$version.tar.xz" -checksum=a574a08e4a62a24dc639cb4ee3e7aa68e7cd8ef2c14a5d54b90d09ac137e809c +checksum=7395dfc391d545385a998d23df9accb60f2020451c53940eaf8a07b6ea8a63fa do_install() { make all prefix=${DESTDIR}/usr diff --git a/srcpkgs/marco/template b/srcpkgs/marco/template index 11e5f2dce02..6eb249de0d9 100644 --- a/srcpkgs/marco/template +++ b/srcpkgs/marco/template @@ -1,9 +1,9 @@ # Template file for 'marco' pkgname=marco -version=1.16.0 +version=1.18.0 revision=1 build_style=gnu-configure -configure_args="--disable-static --with-gtk=3.0 --enable-startup-notification --disable-schemas-compile" +configure_args="--disable-static --enable-startup-notification --disable-schemas-compile" hostmakedepends="automake libtool gettext-devel pkg-config intltool itstool glib-devel gdk-pixbuf-devel mate-common zenity" makedepends="gtk+3-devel libnotify-devel libgtop-devel libSM-devel @@ -15,7 +15,7 @@ maintainer="Juan RP " license="LGPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=33c0fbced78a4d0f22b16858517f9b3574f5de2e34dadf168ba7df5e9de0d0e3 +checksum=9b273026bc739352b5287f9d804ffae2d873f7ee3fbe4d1d5673473eae2938a8 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index a15faee91e1..bc2d26ffa3d 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -1,7 +1,7 @@ # Template file for 'mariadb' pkgname=mariadb -version=10.1.21 -revision=1 +version=10.1.22 +revision=2 build_style=cmake configure_args="-DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 @@ -31,7 +31,7 @@ maintainer="Juan RP " homepage="http://mariadb.org/" license="GPL-2" distfiles="https://downloads.$pkgname.org/f/$pkgname-$version/source/$pkgname-$version.tar.gz" -checksum=5a816355781ea22a6c65a436d8162f19bd292ec90e2b7d9499c031ae4a659490 +checksum=bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce CFLAGS="-w" pre_configure() { diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template index 396b366d074..88181cb02b4 100644 --- a/srcpkgs/massren/template +++ b/srcpkgs/massren/template @@ -1,11 +1,11 @@ # Template file for 'massren' pkgname=massren version=1.5.1 -revision=4 +revision=5 build_style=go hostmakedepends="git-perl" short_desc="Massive renamer from command line" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="MIT" go_import_path="github.com/laurent22/${pkgname}" homepage="https://${go_import_path}" diff --git a/srcpkgs/mate-applets/template b/srcpkgs/mate-applets/template index a61b0e4afaf..ea9852eacda 100644 --- a/srcpkgs/mate-applets/template +++ b/srcpkgs/mate-applets/template @@ -1,25 +1,21 @@ # Template file for 'mate-applets' pkgname=mate-applets -version=1.16.0 +version=1.18.1 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-static - --enable-networkmanager --enable-ipv6" +configure_args="--disable-static --enable-ipv6" hostmakedepends="pkg-config intltool itstool libxslt glib-devel" makedepends="libSM-devel gtk+3-devel libmate-panel-devel NetworkManager-devel mate-desktop-devel mate-settings-daemon-devel libgtop-devel libwnck-devel upower0-devel polkit-devel libxml2-devel libmateweather-devel libnotify-devel - gtksourceview-devel mate-icon-theme" -depends="mate-icon-theme upower0" -pycompile_module="mate_invest" + gtksourceview-devel wireless_tools-devel mate-icon-theme" +depends="mate-icon-theme" short_desc="Applets for MATE panel" maintainer="Juan RP " license="LGPL-3" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=adcc895478f5b1e1c5c40f3f20537dcf809e0f06802850b890d323602f16d817 - -replaces="mate-netspeed>=0" +checksum=05bae1324de35659b37307bb345bb9da16b19391c83388ef697df51a22caf4da case "$XBPS_TARGET_MACHINE" in i686|x86_64) diff --git a/srcpkgs/mate-backgrounds/template b/srcpkgs/mate-backgrounds/template index af86989f97f..46a0dcd1755 100644 --- a/srcpkgs/mate-backgrounds/template +++ b/srcpkgs/mate-backgrounds/template @@ -1,6 +1,6 @@ # Template file for 'mate-backgrounds' pkgname=mate-backgrounds -version=1.16.0 +version=1.18.0 revision=1 noarch=yes build_style=gnu-configure @@ -10,4 +10,4 @@ maintainer="Juan RP " license="LGPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=37cc2489033b1bba03de2ada567f8e40de3d5c3e36b7af16270baaf3765a1a39 +checksum=f103d38898cc088608c813d732e4681fd6a8b9cf2a9564b9d057461da59e081b diff --git a/srcpkgs/mate-common/template b/srcpkgs/mate-common/template index 9a86bd61b32..f492eec100a 100644 --- a/srcpkgs/mate-common/template +++ b/srcpkgs/mate-common/template @@ -1,6 +1,6 @@ # Template file for 'mate-common' pkgname=mate-common -version=1.16.0 +version=1.18.0 revision=1 noarch=yes build_style=gnu-configure @@ -11,4 +11,4 @@ maintainer="Juan RP " license="LGPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=34d3a8c58647806aebde24f705c07e1dc8083cd4baa55b45d3e51e367c2ef20a +checksum=d77c44546e748f94cf93707ab3593146109401c9bcde533fc308863f9ca20580 diff --git a/srcpkgs/mate-control-center/template b/srcpkgs/mate-control-center/template index 1167b809ef2..4cf846a009c 100644 --- a/srcpkgs/mate-control-center/template +++ b/srcpkgs/mate-control-center/template @@ -1,23 +1,22 @@ # Template file for 'mate-control-center' pkgname=mate-control-center -version=1.16.1 +version=1.18.1 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-static --disable-schemas-compile - --disable-update-mimedb --sbindir=/usr/bin" +configure_args="--disable-static --disable-schemas-compile --disable-update-mimedb" hostmakedepends="pkg-config intltool itstool glib-devel dbus-glib-devel desktop-file-utils" makedepends="gtk+3-devel dbus-glib-devel dconf-devel mate-desktop-devel mate-menus-devel - mate-settings-daemon-devel libmarco-devel libgtop-devel libmatekbd-devel libunique-devel + mate-settings-daemon-devel libmarco-devel libgtop-devel libmatekbd-devel libSM-devel libXxf86misc-devel libXScrnSaver-devel libXt-devel libXcursor-devel libXi-devel libcanberra-devel startup-notification-devel desktop-file-utils librsvg-devel" depends="marco mate-icon-theme mate-settings-daemon dconf gsettings-desktop-schemas" short_desc="The Control Center for MATE" maintainer="Juan RP " -license="LGPL-2" -homepage="http://mate-desktop.org" -distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2bda4ac8ead20d7d5031c295c7408eaeb649cc29d2ae7e813be7e1fff617fe16 +license="GPL-2" +homepage="https://mate-desktop.org" +distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=1d5c1fe4da8fc5c453d4d3d2b91e18c4dadd2baf65f4da167b27292e34874bd5 post_install() { rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache diff --git a/srcpkgs/mate-desktop/template b/srcpkgs/mate-desktop/template index 4a9168772c4..1dfda78a6ab 100644 --- a/srcpkgs/mate-desktop/template +++ b/srcpkgs/mate-desktop/template @@ -1,9 +1,9 @@ # Template file for 'mate-desktop' pkgname=mate-desktop -version=1.16.1 +version=1.18.0 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-static --enable-mpaste +configure_args="--disable-static --enable-mpaste --disable-schemas-compile $(vopt_enable gir introspection)" hostmakedepends="pkg-config intltool itstool glib-devel gobject-introspection" makedepends="gtk+3-devel dconf-devel libXrandr-devel startup-notification-devel" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="LGPL-3" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=587a8da6e65386015101992e1082bb4d4d38420873c70348ba55dc9f9f63f6df +checksum=6f2dd9fc60bacd0ff27b8328c7addceb9e73a75c7dce7db4132659d588173b8a # Package build options build_options="gir" diff --git a/srcpkgs/mate-extra/template b/srcpkgs/mate-extra/template index 99b88e75d69..67a01043a9c 100644 --- a/srcpkgs/mate-extra/template +++ b/srcpkgs/mate-extra/template @@ -1,6 +1,6 @@ # Template file for 'mate-extra'. pkgname=mate-extra -version=1.16.0 +version=1.18.0 revision=1 build_style=meta depends=" @@ -16,7 +16,6 @@ depends=" mate-system-monitor>=${version} mate-terminal>=${version} mate-utils>=${version} - pluma>=${version} caja-extensions>=${version} yelp" short_desc="The MATE extras meta-package for Void Linux" diff --git a/srcpkgs/mate-icon-theme-faenza/template b/srcpkgs/mate-icon-theme-faenza/template index 9fa61c84e7d..0e9f71ee9ec 100644 --- a/srcpkgs/mate-icon-theme-faenza/template +++ b/srcpkgs/mate-icon-theme-faenza/template @@ -1,6 +1,6 @@ # Template file for 'mate-icon-theme-faenza' pkgname=mate-icon-theme-faenza -version=1.16.0 +version=1.18.0 revision=1 noarch=yes build_style=gnu-configure @@ -11,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=6f45684c4df51598115e891c95e6949c1f066e436ef0a685fc30ef95151e7f5c +checksum=1ba1593b2deddaa454ab18fafd18baf4cb8587de2b09518f3a6c493ab4d92eb3 pre_configure() { autoreconf -fi diff --git a/srcpkgs/mate-icon-theme/template b/srcpkgs/mate-icon-theme/template index 16cd3cc0406..adbf9219ef5 100644 --- a/srcpkgs/mate-icon-theme/template +++ b/srcpkgs/mate-icon-theme/template @@ -1,6 +1,6 @@ # Template file for 'mate-icon-theme' pkgname=mate-icon-theme -version=1.16.0 +version=1.18.2 revision=1 noarch=yes build_style=gnu-configure @@ -9,10 +9,10 @@ makedepends="icon-naming-utils" depends="gtk-update-icon-cache hicolor-icon-theme" short_desc="MATE icon theme" maintainer="Juan RP " -license="LGPL-2" -homepage="http://mate-desktop.org" -distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=edec67867b26974ef286cd85e968efee3ee5ea4d232b86b48ee6c47085e08dfe +license="LGPL-3" +homepage="https://mate-desktop.org" +distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=9091373f9672634b5bc09344d4819df717e48ac55b6a057f21faa83f47a4236a post_install() { rm -f ${DESTDIR}/usr/share/icons/mate/icon-theme.cache diff --git a/srcpkgs/mate-media/template b/srcpkgs/mate-media/template index 146260c3f22..712d0a59c88 100644 --- a/srcpkgs/mate-media/template +++ b/srcpkgs/mate-media/template @@ -1,9 +1,9 @@ # Template file for 'mate-media' pkgname=mate-media -version=1.16.0 +version=1.18.0 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-static --enable-pulseaudio +configure_args="--disable-static --enable-pulseaudio --disable-gstmix --disable-gst-mixer-applet" hostmakedepends="pkg-config intltool itstool glib-devel" makedepends="gtk+3-devel pulseaudio-devel libcanberra-devel libunique-devel @@ -15,4 +15,4 @@ maintainer="Juan RP " license="LGPL-3" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=87a6aab1635cdf0890b4f99b733eb786144c90730a96d04c41e05ea781cd0a20 +checksum=94d26b96199a3b30e2050596d17e0125f86edf9ef009d4eb318308896f54296c diff --git a/srcpkgs/mate-menus/template b/srcpkgs/mate-menus/template index 2f3a9ea6c75..faa9e80cbb0 100644 --- a/srcpkgs/mate-menus/template +++ b/srcpkgs/mate-menus/template @@ -1,6 +1,6 @@ # Template file for 'mate-menus' pkgname=mate-menus -version=1.16.0 +version=1.18.0 revision=1 build_style=gnu-configure configure_args="--disable-static $(vopt_enable python)" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=85d51e02cd94f33b13265ba4847e93d99cef5ec3ce7ee4499958f3afe3013c33 +checksum=f07cdb952934b732678ed37a9cd740c8860e9e2d0ddb4d73a8d06cdccfc87e16 build_options="gir python" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/mate-netbook/template b/srcpkgs/mate-netbook/template index 0f1d54b6fb0..b698c9bc4b4 100644 --- a/srcpkgs/mate-netbook/template +++ b/srcpkgs/mate-netbook/template @@ -1,9 +1,8 @@ # Template file for 'mate-netbook' pkgname=mate-netbook -version=1.16.1 +version=1.18.0 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0" hostmakedepends="pkg-config intltool itstool glib-devel" makedepends="mate-desktop-devel libmate-panel-devel libunique-devel libXtst-devel libwnck-devel libfakekey-devel" short_desc="The MATE netbook extension" @@ -11,4 +10,4 @@ maintainer="Juan RP " license="GPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=911f0a92c190bd377a29458ce3a70ad2e47fbae145509c2cb42ef02ae4ffea76 +checksum=ca441a20b6afc340340520d45cfd84f36ecde2c665c4c0e178fc710e38cbe293 diff --git a/srcpkgs/mate-notification-daemon/template b/srcpkgs/mate-notification-daemon/template index e71b191298f..50eee8b9756 100644 --- a/srcpkgs/mate-notification-daemon/template +++ b/srcpkgs/mate-notification-daemon/template @@ -1,6 +1,6 @@ # Template file for 'mate-notification-daemon' pkgname=mate-notification-daemon -version=1.16.1 +version=1.18.0 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -12,4 +12,4 @@ maintainer="Juan RP " license="LGPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=dcbb253ecfb6dcd020cb1645cde319d98402c04a0df388834b5144f91e5cb9e6 +checksum=4c1f08fa348cdba0b7786a4207b0b4a40d06deb878f3d71ca1c7f71b53da1066 diff --git a/srcpkgs/mate-panel/template b/srcpkgs/mate-panel/template index e274b12fba4..96c64612a6e 100644 --- a/srcpkgs/mate-panel/template +++ b/srcpkgs/mate-panel/template @@ -1,9 +1,9 @@ # Template file for 'mate-panel' pkgname=mate-panel -version=1.16.1 +version=1.18.1 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-static --disable-schemas-compile +configure_args="--disable-static --disable-schemas-compile $(vopt_enable gir introspection)" hostmakedepends="pkg-config intltool itstool glib-devel $(vopt_if gir gobject-introspection)" @@ -14,9 +14,9 @@ depends="caja dconf marco mate-session-manager" short_desc="The MATE Panel" maintainer="Juan RP " license="GPL-2, LGPL-2" -homepage="http://mate-desktop.org" -distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b12891696e023ff8ca7eeacc735b5b90a487503df4c361b8feb1934cc5552d33 +homepage="https://mate-desktop.org" +distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=4782cadcadf8204790697d9c6aec6b3f2ab74983faeb13d9fc3301001fa94139 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/mate-polkit/template b/srcpkgs/mate-polkit/template index 6999e898864..720bdbc7ef4 100644 --- a/srcpkgs/mate-polkit/template +++ b/srcpkgs/mate-polkit/template @@ -1,9 +1,9 @@ # Template file for 'mate-polkit' pkgname=mate-polkit -version=1.16.0 +version=1.18.0 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-static $(vopt_enable gir introspection)" +configure_args="--disable-static $(vopt_enable gir introspection)" hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)" makedepends="gtk+3-devel polkit-devel" short_desc="PolicyKit integration for the MATE desktop" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-3" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e0aba1f4be2fef30a74509aef92c5773ee17c2279f158a7295415f700713457c +checksum=f41a06a0a76e2af5ae01f877b48e6eb4c0d31ccda6f35bf610e24052ac2a7e4e build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/mate-power-manager/template b/srcpkgs/mate-power-manager/template index c275adf533f..9a4eefa501d 100644 --- a/srcpkgs/mate-power-manager/template +++ b/srcpkgs/mate-power-manager/template @@ -1,9 +1,9 @@ # Template file for 'mate-power-manager' pkgname=mate-power-manager -version=1.16.2 +version=1.18.0 revision=1 build_style=gnu-configure -configure_args="--sbindir=/usr/bin --with-gtk=3.0 --disable-schemas-compile" +configure_args="--sbindir=/usr/bin --disable-schemas-compile" hostmakedepends="pkg-config intltool itstool libtool glib-devel dbus-glib-devel mate-common mate-desktop-devel" makedepends="gtk+3-devel dbus-glib-devel libnotify-devel libunique-devel @@ -15,7 +15,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=e895aeea74458b8b257ec00d53524470d0fcf965f90950303cf6a320b0fa94bf +checksum=dd0c5fc82d0ea81246890a95d57de92c60c3d735ad06f5946c79eebe7c52b3be pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/mate-screensaver/template b/srcpkgs/mate-screensaver/template index 9de0077390b..8bf3d4c89b4 100644 --- a/srcpkgs/mate-screensaver/template +++ b/srcpkgs/mate-screensaver/template @@ -1,9 +1,8 @@ # Template file for 'mate-screensaver' pkgname=mate-screensaver -version=1.16.1 +version=1.18.1 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-systemd" hostmakedepends="pkg-config intltool itstool glib-devel" makedepends="gtk+3-devel dbus-glib-devel libnotify-devel libXScrnSaver-devel libmatekbd-devel mate-menus-devel mate-desktop-devel pam-devel" @@ -13,7 +12,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=267c46f38f0699ff91f7e66b924b82f7c7eb01496ad4d93ce0c13e8f20980a36 +checksum=32bd34ac058e4a9206da5eeea07902f8f9321e76961f766aded605a71c08d135 post_install() { vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname} diff --git a/srcpkgs/mate-sensors-applet/template b/srcpkgs/mate-sensors-applet/template index 70bb6a4d11e..3f3d33bb210 100644 --- a/srcpkgs/mate-sensors-applet/template +++ b/srcpkgs/mate-sensors-applet/template @@ -1,15 +1,16 @@ # Template file for 'mate-sensors-applet' pkgname=mate-sensors-applet -version=1.16.1 +version=1.18.1 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-schemas-compile --disable-static" +configure_args="--disable-schemas-compile --disable-static" hostmakedepends="pkg-config intltool itstool libxslt glib-devel dbus-glib-devel" -makedepends="mate-desktop-devel libmate-panel-devel dbus-glib-devel libatasmart-devel libnotify-devel libsensors-devel" +makedepends="mate-desktop-devel libmate-panel-devel dbus-glib-devel + libatasmart-devel libnotify-devel libsensors-devel" depends="dconf" short_desc="Sensors applet for MATE" maintainer="Juan RP " license="GPL-2" -homepage="http://mate-desktop.org" -distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6c4c87b6bdb620a33620148e7844babe3c9184839806ce1091a7d7b1d66424eb +homepage="https://mate-desktop.org" +distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=582640e462e2174a46bcb592d3ca4e02ab938b1f476baa5ab9bd9c846f2ab397 diff --git a/srcpkgs/mate-session-manager/template b/srcpkgs/mate-session-manager/template index 532ce5fd31d..1714cb63d71 100644 --- a/srcpkgs/mate-session-manager/template +++ b/srcpkgs/mate-session-manager/template @@ -1,16 +1,15 @@ # Template file for 'mate-session-manager' pkgname=mate-session-manager -version=1.16.1 +version=1.18.0 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-static --disable-systemd --enable-upower" +configure_args="--disable-static --disable-systemd" hostmakedepends="pkg-config intltool itstool glib-devel dbus-glib-devel" makedepends="gtk+3-devel dbus-glib-devel libSM-devel libXtst-devel mate-desktop-devel - mate-settings-daemon-devel mate-polkit-devel pangox-compat-devel upower0-devel" -depends="upower0" + mate-settings-daemon-devel mate-polkit-devel pangox-compat-devel" short_desc="The MATE Session 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=49263853ce7918752aea580abe9da6880e309c5a0b4a80e0c760ef279db21332 +checksum=1c50f7866d8c75c1a918754960c6629798d6cb0f8d06aa3e48516ea672c7d419 diff --git a/srcpkgs/mate-settings-daemon/template b/srcpkgs/mate-settings-daemon/template index 801f9b12016..29c9e695c26 100644 --- a/srcpkgs/mate-settings-daemon/template +++ b/srcpkgs/mate-settings-daemon/template @@ -1,20 +1,20 @@ # Template file for 'mate-settings-daemon' pkgname=mate-settings-daemon -version=1.16.1 +version=1.18.1 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-static --enable-polkit --enable-pulse" +configure_args="--disable-static --disable-schemas-compile --enable-polkit --enable-pulse" hostmakedepends="pkg-config intltool itstool dbus-glib-devel glib-devel" -makedepends="gtk+-devel dbus-glib-devel fontconfig-devel libcanberra-devel +makedepends="dbus-glib-devel fontconfig-devel libcanberra-devel libmatekbd-devel libnotify-devel libXt-devel polkit-devel nss-devel libXxf86misc-devel pulseaudio-devel mate-desktop-devel libmatemixer-devel" depends="alsa-plugins-pulseaudio" short_desc="The MATE Settings daemon (pulseaudio)" maintainer="Juan RP " -license="LGPL-3" -homepage="http://mate-desktop.org" -distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7d7e5d8b5ac48825aee7bb4cee3bddbc075f24cc58afeec27ebeaa33261f2246 +license="LGPL-2.1" +homepage="https://mate-desktop.org" +distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=a64597c7bb9ac56b9b3f71671a20a3e68a83da4893b5f97293f6808dfb94621d mate-settings-daemon-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/mate-system-monitor/template b/srcpkgs/mate-system-monitor/template index 9f132b099f8..301fc9254a0 100644 --- a/srcpkgs/mate-system-monitor/template +++ b/srcpkgs/mate-system-monitor/template @@ -1,9 +1,9 @@ # Template file for 'mate-system-monitor' pkgname=mate-system-monitor -version=1.16.0 +version=1.18.0 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-python" +configure_args="--disable-python" hostmakedepends="pkg-config intltool itstool glib-devel" makedepends="dbus-glib-devel gtkmm-devel libgtop-devel librsvg-devel libwnck-devel mate-icon-theme" @@ -13,6 +13,4 @@ maintainer="Juan RP " license="LGPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=abbbfeba699f73a6eacb7545927693daba4fb6203a75170a93df4842cacd9fe1 - -CXXFLAGS="-std=c++11" +checksum=887c0d91fa866af75cc066591fcd521107976f123784b1b887535a4709cd9bf1 diff --git a/srcpkgs/mate-terminal/template b/srcpkgs/mate-terminal/template index 85edc83e084..3d6235eb751 100644 --- a/srcpkgs/mate-terminal/template +++ b/srcpkgs/mate-terminal/template @@ -1,9 +1,8 @@ # Template file for 'mate-terminal' pkgname=mate-terminal -version=1.16.2 +version=1.18.0 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0" hostmakedepends="pkg-config intltool itstool glib-devel" makedepends="gtk+3-devel dbus-devel vte3-devel libSM-devel dconf-devel mate-desktop-devel" depends="dbus dconf" @@ -12,4 +11,4 @@ maintainer="Juan RP " license="GPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c3de516abca113eb12082b67efa517830a822b6b131fd07964a95ac8d6b17296 +checksum=227dac7bea1fc19a7c5195bf05cbfeff3c6e2543e1d186fb696622363f7ae81f diff --git a/srcpkgs/mate-themes/template b/srcpkgs/mate-themes/template index dc1e120357a..a8305107f9e 100644 --- a/srcpkgs/mate-themes/template +++ b/srcpkgs/mate-themes/template @@ -1,6 +1,6 @@ # Template file for 'mate-themes' pkgname=mate-themes -version=3.20.16 +version=3.22.10 revision=1 noarch=yes build_style=gnu-configure @@ -12,4 +12,4 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/themes/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fbe4105c940e5a2055e6ca3a82701a60d938847b0a6bfb04ca4c3383afa47fb7 +checksum=8bc9ffe898d2e28eec7a92f1c36f9f6c479ffb171342cd36e91713d59d64d10d diff --git a/srcpkgs/mate-user-guide/template b/srcpkgs/mate-user-guide/template index b346334c81a..f1c58f7664b 100644 --- a/srcpkgs/mate-user-guide/template +++ b/srcpkgs/mate-user-guide/template @@ -1,6 +1,6 @@ # Template file for 'mate-user-guide' pkgname=mate-user-guide -version=1.16.0 +version=1.18.0 revision=1 noarch=yes build_style=gnu-configure @@ -10,4 +10,4 @@ maintainer="Juan RP " license="LGPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=78aef5ba91b776f6e50dd2770b3a2fda258d76679dc9f723797a37fb100a4f5f +checksum=abe2ee40b9788c887abccc7554564bd951eb26ed08c89b4fe59e0d95b2216b38 diff --git a/srcpkgs/mate-utils/template b/srcpkgs/mate-utils/template index 22fe32ffac8..d10c3ed04e3 100644 --- a/srcpkgs/mate-utils/template +++ b/srcpkgs/mate-utils/template @@ -1,9 +1,9 @@ # Template file for 'mate-utils' pkgname=mate-utils -version=1.16.0 +version=1.18.1 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 --disable-static" +configure_args="--disable-static --disable-schemas-compile" hostmakedepends="automake libtool gettext-devel pkg-config intltool itstool glib-devel mate-common" makedepends="gtk+3-devel libSM-devel zlib-devel libcanberra-devel @@ -12,9 +12,9 @@ depends="desktop-file-utils" short_desc="Common utilities for the MATE desktop" maintainer="Juan RP " license="GPL-2" -homepage="http://mate-desktop.org" -distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=05aad0bc57647e2d084f6588dd43692c8bd2a4284c9917d17033ca016b47c842 +homepage="https://mate-desktop.org" +distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=f5209744668e51d7d9f4ec9edb03d25d5e155759186e7df0061be7e07f74da95 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/mate/template b/srcpkgs/mate/template index 8bb611482cf..a1f1ef63379 100644 --- a/srcpkgs/mate/template +++ b/srcpkgs/mate/template @@ -1,9 +1,10 @@ # Template file for 'mate'. pkgname=mate -version=1.16.0 +version=1.18.0 revision=1 build_style=meta depends=" + mate-themes>=3.22 mate-user-guide>=${version} mate-backgrounds>=${version} mate-icon-theme>=${version} @@ -21,8 +22,7 @@ depends=" caja>=${version} marco>=${version} zenity - ConsoleKit2 - upower0" + ConsoleKit2" short_desc="The MATE meta-package for Void Linux" maintainer="Juan RP " homepage="http://www.mate-desktop.org" diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template index 0abdbffc95f..ee555a348a5 100644 --- a/srcpkgs/mbedtls/template +++ b/srcpkgs/mbedtls/template @@ -1,6 +1,6 @@ # Template file for 'mbedtls' pkgname=mbedtls -version=2.4.1 +version=2.4.2 revision=1 wrksrc="mbedtls-mbedtls-${version}" hostmakedepends="perl" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="Apache-2.0" homepage="https://tls.mbed.org/" distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz" -checksum=0c85fe59e1f0426b1c8f17efdc0c41bd531828b6cff746c392beb53c774af4cb +checksum=b7afab6a0f86e29c6055848b70d183c4e2531cb0ec955b66c0e4e1b7e4954bf4 pre_configure() { sed -i include/mbedtls/config.h \ diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template index 8aa5df30c20..4fa97d8c59d 100644 --- a/srcpkgs/mcelog/template +++ b/srcpkgs/mcelog/template @@ -1,6 +1,6 @@ # Template file for 'mcelog' pkgname=mcelog -version=148 +version=149 revision=1 conf_files="/etc/mcelog/mcelog.conf" only_for_archs="i686 i686-musl x86_64 x86_64-musl" @@ -8,8 +8,9 @@ short_desc="Decode kernel machine check log on x86 machines" maintainer="Leah Neukirchen " license="GPL-2" homepage="http://www.mcelog.org/" +_changelog="https://github.com/andikleen/mcelog/releases" distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz" -checksum=3de7312ee13b0968ae8e1aa0a77acaaee89a0ed7de45f7ce557939723df3dc04 +checksum=a9313ed45cabaf7ef0a4d986ecf24a3c9ced9a4b1e34032d380af4e70c73512f do_build() { make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs} diff --git a/srcpkgs/mclinker/template b/srcpkgs/mclinker/template index 964b1747669..e701c51304b 100644 --- a/srcpkgs/mclinker/template +++ b/srcpkgs/mclinker/template @@ -9,7 +9,7 @@ build_style=gnu-configure hostmakedepends="automake libtool flex llvm" makedepends="zlib-devel libffi-devel libedit-devel ncurses-devel llvm" short_desc="LLVM Linker for Mobile Computing" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="BSD" homepage="https://github.com/$pkgname/$pkgname" distfiles="$homepage/archive/release_${_distver}.tar.gz" diff --git a/srcpkgs/mdadm/template b/srcpkgs/mdadm/template index d97af818ae4..c1df685de94 100644 --- a/srcpkgs/mdadm/template +++ b/srcpkgs/mdadm/template @@ -7,8 +7,8 @@ makedepends="eudev-libudev-devel" short_desc="Tool for managing/monitoring Linux md device arrays" maintainer="Christian Neukirchen " license="GPL-2" -homepage="http://git.kernel.org/cgit/utils/mdadm/mdadm.git/log/" -distfiles="http://ftp.kernel.org/pub/linux/utils/raid/${pkgname}/${pkgname}-${version}.tar.xz" +homepage="https://git.kernel.org/cgit/utils/mdadm/mdadm.git/log/" +distfiles="${KERNEL_SITE}/utils/raid/${pkgname}/${pkgname}-${version}.tar.xz" checksum=1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9 pre_configure() { diff --git a/srcpkgs/mdoclint/template b/srcpkgs/mdoclint/template index 24c5dc428f8..18c75111f43 100644 --- a/srcpkgs/mdoclint/template +++ b/srcpkgs/mdoclint/template @@ -1,17 +1,17 @@ # Template file for 'mdoclint' pkgname=mdoclint -version=1.39 +version=1.46 revision=1 create_wrksrc=yes build_style=fetch depends="perl" short_desc="Verify man page correctness" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="2-clause-BSD" homepage="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/textproc/mdoclint/" -distfiles="http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/textproc/mdoclint/files/mdoclint?rev=1.58&content-type=text/plain>mdoclint +distfiles="http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/textproc/mdoclint/files/mdoclint?rev=1.65&content-type=text/plain>mdoclint http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/textproc/mdoclint/files/mdoclint.1?rev=1.13&content-type=text/plain>mdoclint.1" -checksum="8f8ee13ece9255ff3e80b78b7fbccb1a3f28c3c7bcba513e84c783c82af65f8a +checksum="053b27c01dd2066410dc7d68db1f6bbbf28fdc9326e846a97a27309796672ba5 c392be588b9a5d6c98732925b2ddad625dbb56cc112cbff7e902a34419d641b0" noarch=yes diff --git a/srcpkgs/mediainfo/template b/srcpkgs/mediainfo/template index a832fe907d9..11300bc97d2 100644 --- a/srcpkgs/mediainfo/template +++ b/srcpkgs/mediainfo/template @@ -1,6 +1,6 @@ # Template file for 'mediainfo' pkgname=mediainfo -version=0.7.93 +version=0.7.94 revision=1 short_desc="Display technical and tag data for video and audio files" homepage="http://mediaarea.net/MediaInfo" @@ -14,7 +14,7 @@ _gnudir="MediaInfo/Project/GNU" replaces="mediainfo-gui>=0" license="BSD" distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.gz" -checksum=5c600520d59344e03dbb89acf2f27bb0a38cdc2f999d10a3c0a3383a6c00fa85 +checksum=fe7cfe1551cc6d0e4a1deb32c55d9b8aee860b1fcacc1edb9b4092a103b18cd4 nocross=yes # wxWidgets do_configure() { diff --git a/srcpkgs/mednafen/template b/srcpkgs/mednafen/template index 14560119b4d..bd79c246ef2 100644 --- a/srcpkgs/mednafen/template +++ b/srcpkgs/mednafen/template @@ -1,6 +1,6 @@ # Template file for 'mednafen' pkgname=mednafen -version=0.9.42 +version=0.9.43 revision=1 wrksrc="$pkgname" build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://mednafen.sourceforge.net/" distfiles="https://mednafen.github.io/releases/files/mednafen-${version}.tar.xz" -checksum=93e000286bd24ed5d39e6f67a22b950f3081aa71eeee1107a552246bbd3b5c25 +checksum=b8305914cdf297fe6483219fa10c3fa14116fff8eed02f61326a0e32dd350f4d nopie=yes diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template index 1eb02a6f981..b38aa01d67d 100644 --- a/srcpkgs/megatools/template +++ b/srcpkgs/megatools/template @@ -1,7 +1,7 @@ # Template file for 'megatools' pkgname=megatools version=1.9.97 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel" diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template index 39823682d9c..39f678bd60e 100644 --- a/srcpkgs/meld/template +++ b/srcpkgs/meld/template @@ -1,7 +1,7 @@ # Template file for 'meld' pkgname=meld -version=3.17.0 -revision=2 +version=3.17.1 +revision=1 noarch=yes build_style=python3-module hostmakedepends="pkg-config intltool gnome-doc-utils python3 itstool gtk-update-icon-cache" @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://meldmerge.org/" license="GPL-2" distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz" -checksum=830a7a534f1a2fdc2b8754539a04af5ffe164acf8a429f47f233bbb403a484fa +checksum=0f499a7fed47e557dc49afff140b1dc5eb2ee99ca265c45e923862d2c0d8f1df configure_args="--disable-schemas-compile" post_install() { diff --git a/srcpkgs/memcached/template b/srcpkgs/memcached/template index c9886e06e5c..332f5634f2f 100644 --- a/srcpkgs/memcached/template +++ b/srcpkgs/memcached/template @@ -1,7 +1,7 @@ # Template file for 'memcached' pkgname=memcached -version=1.4.35 -revision=1 +version=1.4.36 +revision=2 build_style=gnu-configure makedepends="libevent-devel" short_desc="A distributed memory object caching system" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="3-clause-BSD" homepage="http://www.memcached.org" distfiles="http://${pkgname}.org/files/${pkgname}-${version}.tar.gz" -checksum=f4815ac95aa06c0f360052a0a12010533b2b78c3bfe475b171606c1b61469476 +checksum=773b6bb20bf80223ca6a15d75f570fbab346ad11ec98595e5af5e33f54bd82d8 post_install() { vlicense COPYING LICENSE diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template index e715a6d442a..07469646a7e 100644 --- a/srcpkgs/mercurial/template +++ b/srcpkgs/mercurial/template @@ -1,6 +1,6 @@ # Template file for 'mercurial' pkgname=mercurial -version=4.1.1 +version=4.1.3 revision=1 build_style=python2-module hostmakedepends="python-devel" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://www.mercurial-scm.org/" distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz" -checksum=63571be1202f83c72041eb8ca2a2ebaeda284d2031fd708919fc610589d3359e +checksum=103d2ae187d5c94110c0e86ccc3b46f55fcd8e21c78d1c209bac7b59a73e86d8 post_install() { vmkdir usr/share/man/man1 diff --git a/srcpkgs/mergerfs/template b/srcpkgs/mergerfs/template index 6c545df74f0..468cd71d9c1 100644 --- a/srcpkgs/mergerfs/template +++ b/srcpkgs/mergerfs/template @@ -1,6 +1,6 @@ # Template file for 'mergerfs' pkgname="mergerfs" -version=2.19.0 +version=2.20.0 revision=1 build_style=gnu-makefile makedepends="fuse-devel attr-devel" @@ -9,8 +9,8 @@ short_desc="FUSE union filesystem" maintainer="xinterer " license="ISC" homepage="https://github.com/trapexit/mergerfs" -distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.gz" -checksum=3b0980385817cf7474aa802b21d9561121ca52468aea8c0140b3e249ccb03a59 +distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=240c3dbbeb8b40494db9c345afe3410a6e4450ca4048c7d8f8c65eb333761b2a case "$XBPS_TARGET_MACHINE" in *-musl) # Does not have pandoc diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index 461ebebe9ac..ad4e7af482e 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,6 +1,6 @@ # Template file for 'meson' pkgname=meson -version=0.39.0 +version=0.40.0 revision=1 noarch=yes build_style=python3-module @@ -12,4 +12,4 @@ license="Apache-2.0" maintainer="Dylan Katz " homepage="http://mesonbuild.com" distfiles="https://github.com/mesonbuild/meson/archive/${version}.tar.gz" -checksum=c05931d1620ffd87c1121eca15c36217a5df31a03e227e2223ccbcbbaee6b863 +checksum=34bab8104df65f78b89c8d27d074ec6a426cc97cdea2b139892de2545904609a diff --git a/srcpkgs/mfoc/template b/srcpkgs/mfoc/template index 3b14fcd1faf..5c650dce117 100644 --- a/srcpkgs/mfoc/template +++ b/srcpkgs/mfoc/template @@ -7,7 +7,7 @@ build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="libnfc-devel" short_desc="Mifare Classic Offline Cracker" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://nfc-tools.org" distfiles="https://github.com/nfc-tools/mfoc/archive/${pkgname}-${version}.tar.gz" diff --git a/srcpkgs/mg/template b/srcpkgs/mg/template index fb2d4d26ed2..e6c04a0fd98 100644 --- a/srcpkgs/mg/template +++ b/srcpkgs/mg/template @@ -1,6 +1,6 @@ # Template file for 'mg' pkgname=mg -version=20161005 +version=20170401 revision=1 hostmakedepends="pkg-config" makedepends="libbsd-devel ncurses-devel" @@ -9,7 +9,7 @@ short_desc="Micro GNU/emacs" maintainer="Juan RP " license="Public Domain" distfiles="$homepage/mg-$version.tar.gz" -checksum=b7fcb5136a6783ca24c8463ab0852fc1f26bdb2bb1c24759b2c51ccfc46c5e61 +checksum=0a3608b17c153960cb1d954ca3b62445a77c0c1a18aa5c8c58aba9f6b8d62aab CFLAGS="-DTCSASOFT=0" diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template index aa8b49aa27c..80cd083ee33 100644 --- a/srcpkgs/micro/template +++ b/srcpkgs/micro/template @@ -1,7 +1,7 @@ # Template file for 'micro' pkgname=micro version=1.1.4 -revision=1 +revision=2 build_style=go go_import_path="github.com/zyedidia/micro" go_package="${go_import_path}/cmd/micro" diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template index 3495f504e69..e56e9db49bc 100644 --- a/srcpkgs/miller/template +++ b/srcpkgs/miller/template @@ -1,16 +1,16 @@ # Template file for 'miller' pkgname=miller -version=5.0.0 +version=5.1.0 revision=1 build_style=gnu-configure hostmakedepends="automake libtool flex asciidoc" short_desc="Tool like sed/awk/cut/join/sort for name-indexed data such as CSV" -maintainer="Christian Neukirchen " -license="BSD-2" +maintainer="Leah Neukirchen " +license="2-clause-BSD" homepage="http://johnkerl.org/miller/" distfiles="https://github.com/johnkerl/${pkgname}/archive/v${version}.tar.gz" _changelog="https://github.com/johnkerl/miller/releases" -checksum=28fe39efd83b3134261fc5614d429f0f5df940036a4cf7577dc1a95bb9e2eec7 +checksum=07a498c0228e15321798e5f3f6d03ee6ba9aaf13110f55e52ddfadee52b9da6a pre_configure() { # Disable debugging and profiling versions, broken on musl. diff --git a/srcpkgs/minicom/template b/srcpkgs/minicom/template index 2fa61a12268..72fe84c38cb 100644 --- a/srcpkgs/minicom/template +++ b/srcpkgs/minicom/template @@ -1,12 +1,12 @@ # Template file for 'minicom' pkgname=minicom -version=2.7 -revision=3 +version=2.7.1 +revision=1 build_style=gnu-configure makedepends="ncurses-devel" short_desc="Menu driven communications program" maintainer="Juan RP " license="GPL-2" homepage="http://alioth.debian.org/projects/minicom/" -distfiles="${DEBIAN_SITE}/main/m/${pkgname}/${pkgname}_${version}.orig.tar.gz" -checksum=9ac3a663b82f4f5df64114b4792b9926b536c85f59de0f2d2b321c7626a904f4 +distfiles="https://alioth.debian.org/frs/download.php/file/4215/minicom-${version}.tar.gz" +checksum=532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1 diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template index 1d34cee98e3..3239351f5d0 100644 --- a/srcpkgs/minify/template +++ b/srcpkgs/minify/template @@ -1,17 +1,17 @@ # Template file for 'minify' pkgname=minify -version=2.0.0 -revision=3 +version=2.1.0 +revision=2 build_style=go go_import_path="github.com/tdewolff/minify" go_package="github.com/tdewolff/minify/cmd/minify" hostmakedepends="git" short_desc="Go minifiers for web formats" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/tdewolff/minify" distfiles="https://github.com/tdewolff/${pkgname}/archive/v${version}.tar.gz" -checksum=e7f218427218d38bc4318353c70ba425c1c4f9e15d8e85c79d08f905eaebc12f +checksum=2233dc38482350def69e6b6ec943a2e4ef1355bfc0f7d874a2bdfd873cce7439 post_install() { vlicense LICENSE.md LICENSE diff --git a/srcpkgs/mininet/template b/srcpkgs/mininet/template index b593e1b4b22..c9f43d3ab53 100644 --- a/srcpkgs/mininet/template +++ b/srcpkgs/mininet/template @@ -1,6 +1,6 @@ # Template file for 'mininet' pkgname=mininet -version=2.2.1 +version=2.2.2 revision=1 build_style=python2-module pycompile_module="mininet" @@ -11,7 +11,7 @@ maintainer="Renato Aguiar " license="custom" homepage="http://mininet.org/" distfiles="https://github.com/mininet/${pkgname}/archive/${version}.tar.gz" -checksum=e4c20a6ab4ddfe4d5cad06ba25742507967df67a845dbe2e90d627af7cd21705 +checksum=d0aed2ea7a9096ae975694a4b3d0995259ef79268dd8888ba8be28601c100db5 post_extract() { sed -i 's/^\tcc /\t$(CC) /' Makefile diff --git a/srcpkgs/minitube/patches/patch-src_iconutils_cpp b/srcpkgs/minitube/patches/patch-src_iconutils_cpp deleted file mode 100644 index fa7a269c778..00000000000 --- a/srcpkgs/minitube/patches/patch-src_iconutils_cpp +++ /dev/null @@ -1,25 +0,0 @@ -$OpenBSD: patch-src_iconutils_cpp,v 1.1 2014/10/29 08:18:23 dcoppa Exp $ - -Use the Adwaita icon theme unconditionally: fixes a problem with -minitube GUI not having icons when executed outside of a Desktop -Environment - -Do not use symbolic icons - ---- src/iconutils.cpp.orig Thu Oct 23 12:47:15 2014 -+++ src/iconutils.cpp Sat Oct 25 19:55:31 2014 -@@ -21,12 +21,8 @@ $END_LICENSE */ - #include "iconutils.h" - - QIcon IconUtils::fromTheme(const QString &name) { -- const QLatin1String symbolic("-symbolic"); -- if (name.endsWith(symbolic)) return QIcon::fromTheme(name); -- QIcon icon; -- icon = QIcon::fromTheme(name + symbolic); -- if (icon.isNull()) return QIcon::fromTheme(name); -- return icon; -+ QIcon::setThemeName("Adwaita"); -+ return QIcon::fromTheme(name); - } - - QIcon IconUtils::fromResources(const QString &name) { diff --git a/srcpkgs/minitube/template b/srcpkgs/minitube/template index 864d2f46355..56b0434aa99 100644 --- a/srcpkgs/minitube/template +++ b/srcpkgs/minitube/template @@ -1,17 +1,17 @@ # Template file for 'minitube' pkgname=minitube -version=2.5.2 +version=2.6 revision=1 build_style=qmake hostmakedepends="qt5-tools" -makedepends="qt5-devel phonon-qt5-devel qt5-script-devel" +makedepends="qt5-devel phonon-qt5-devel qt5-script-devel qt5-declarative-devel" depends="virtual?phonon-qt5-backend desktop-file-utils hicolor-icon-theme" short_desc="A native YouTube client in Qt5" maintainer="Juan RP " license="GPL-3" homepage="http://flavio.tordini.org/minitube" distfiles="https://github.com/flaviotordini/minitube/archive/$version.tar.gz" -checksum=63678bf153e77e8cdaf6b43bb9a7bf2c5694c62698c3236f1a1133494362d6b5 +checksum=ae48d2af82c8fa841021f84059b2c7723c39e3efeaa7b2ad3944a4c6cb340c0e pre_configure() { # Provided by Gottox diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index 0e559781f7f..35a6f9642fd 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -1,7 +1,7 @@ # Template file for 'mit-krb5' pkgname=mit-krb5 version=1.14.4 -revision=2 +revision=3 short_desc="MIT Kerberos 5 implementation" maintainer="Juan RP " license="MIT" diff --git a/srcpkgs/mitlm/template b/srcpkgs/mitlm/template index e8e34917c58..be371d7184c 100644 --- a/srcpkgs/mitlm/template +++ b/srcpkgs/mitlm/template @@ -5,7 +5,7 @@ revision=2 short_desc="MIT Language Modeling toolkit" maintainer="Martin Riese " license="MIT" -homepage="https://mitlm.googlecode.com" +homepage="https://github.com/mitlm/mitlm" distfiles="https://github.com/$pkgname/$pkgname/releases/download/v${version}/${pkgname}_${version}.tar.gz" checksum="c7568ad8ad1b63204ae8e19b24dd95d1e912edd65efd6f59ca7149d47b4fa08a" build_style=gnu-configure diff --git a/srcpkgs/mixxx/patches/0007-fix_gcc6_issue.patch b/srcpkgs/mixxx/patches/0007-fix_gcc6_issue.patch new file mode 100644 index 00000000000..7cd7d2bc98b --- /dev/null +++ b/srcpkgs/mixxx/patches/0007-fix_gcc6_issue.patch @@ -0,0 +1,33 @@ +From: "Matteo F. Vescovi" +Date: Mon, 25 Jul 2016 22:17:43 +0200 +Subject: fix_gcc6_issue + +--- + src/util/math.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/util/math.h b/src/util/math.h +index 018335e..85971d1 100644 +--- src/util/math.h ++++ src/util/math.h +@@ -3,8 +3,20 @@ + + // Causes MSVC to define M_PI and friends. + // http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx ++// Our SConscript defines this but check anyway. ++#ifdef __WINDOWS__ ++#ifndef _USE_MATH_DEFINES + #define _USE_MATH_DEFINES ++#endif ++#endif ++ ++#include + #include ++// Note: Because of our fpclassify hack, we actualy need to inlude both, ++// the c and the c++ version of the math header. ++// From GCC 6.1.1 math.h depends on cmath, which failes to compile if included ++// after our fpclassify hack ++ + #include + + #include "util/assert.h" diff --git a/srcpkgs/mixxx/patches/0008-chromaprint-1.4.patch b/srcpkgs/mixxx/patches/0008-chromaprint-1.4.patch new file mode 100644 index 00000000000..367520497ea --- /dev/null +++ b/srcpkgs/mixxx/patches/0008-chromaprint-1.4.patch @@ -0,0 +1,44 @@ +Description: chromaprint 1.4 compatibility +Origin: upstream, + https://github.com/mixxxdj/mixxx/commit/71f3e5d0adb5116a23f9163b045f3419b9056a08, + https://github.com/mixxxdj/mixxx/commit/830e864384ee1c96272997ee3f1dae4f71b28f3e, + https://github.com/mixxxdj/mixxx/commit/c5b4368fd228feee28af4fb32ab6fbfd3f29f212 +Last-Update: 2017-01-11 + +--- src/musicbrainz/chromaprinter.cpp ++++ src/musicbrainz/chromaprinter.cpp +@@ -5,6 +5,19 @@ + #include "musicbrainz/chromaprinter.h" + #include "soundsourceproxy.h" + ++namespace ++{ ++ // Type declarations of *fprint and *encoded pointers need to account for Chromaprint API version ++ // (void* -> uint32_t*) and (void* -> char*) changed in versions v1.4.0 or later -- alyptik 12/2016 ++ #if (CHROMAPRINT_VERSION_MINOR > 3) || (CHROMAPRINT_VERSION_MAJOR > 1) ++ typedef uint32_t* uint32_p; ++ typedef char* char_p; ++ #else ++ typedef void* uint32_p; ++ typedef void* char_p; ++ #endif ++} ++ + ChromaPrinter::ChromaPrinter(QObject* parent) + : QObject(parent) { + } +@@ -57,12 +70,12 @@ QString ChromaPrinter::calcFingerPrint(c + } + chromaprint_finish(ctx); + +- void* fprint = NULL; ++ uint32_p fprint = NULL; + int size = 0; + int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size); + QByteArray fingerprint; + if (ret == 1) { +- void* encoded = NULL; ++ char_p encoded = NULL; + int encoded_size = 0; + chromaprint_encode_fingerprint(fprint, size, + CHROMAPRINT_ALGORITHM_DEFAULT, diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index b2444a4414f..3585021c393 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,7 +1,7 @@ # Template file for 'mixxx' pkgname=mixxx version=2.0.0 -revision=2 +revision=3 hostmakedepends="scons pkg-config" makedepends="portaudio-devel libusb-devel libmad-devel protobuf-devel libid3tag-devel glu-devel taglib-devel opus-devel portmidi-devel diff --git a/srcpkgs/mkinitcpio-encryptssh/template b/srcpkgs/mkinitcpio-encryptssh/template index 8ca16fa6e65..126a7dfa972 100644 --- a/srcpkgs/mkinitcpio-encryptssh/template +++ b/srcpkgs/mkinitcpio-encryptssh/template @@ -7,7 +7,7 @@ wrksrc="$_realname-$version-$revision" noarch=yes depends="mkinitcpio cryptsetup dropbear mkinitcpio-nfs-utils psmisc iproute2" short_desc="Allows for an encrypted root device to be unlocked remotely over SSH" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://github.com/grazzolini/dropbear_initrd_encrypt" distfiles="$homepage/archive/v$version-$revision.tar.gz" diff --git a/srcpkgs/mkinitcpio-nfs-utils/template b/srcpkgs/mkinitcpio-nfs-utils/template index 165068a78dd..d8f23343ad6 100644 --- a/srcpkgs/mkinitcpio-nfs-utils/template +++ b/srcpkgs/mkinitcpio-nfs-utils/template @@ -4,7 +4,7 @@ version=0.3 revision=2 build_style=gnu-makefile short_desc="Ipconfig and nfsmount tools for NFS root support in mkinitcpio" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://www.archlinux.org/" depends="mkinitcpio" diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template index 058b2bc116b..fd984a8c96d 100644 --- a/srcpkgs/mkinitcpio/template +++ b/srcpkgs/mkinitcpio/template @@ -1,16 +1,16 @@ # Template file for 'mkinitcpio' pkgname=mkinitcpio -version=22 +version=23 revision=1 noarch=yes build_style=gnu-makefile depends="busybox-static bsdtar bash" short_desc="Next generation of initramfs creation" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://wiki.archlinux.org/index.php/Mkinitcpio" distfiles="https://sources.archlinux.org/other/$pkgname/$pkgname-$version.tar.gz" -checksum=54c1fc0fc128ae486e72362f49f52e94acd5fcfea9f44b719dc33250e42664eb +checksum=80f12a07f0dceef81dfe87200f099bd2149e0990391dda6defebaa5697f8a35a conf_files="/etc/mkinitcpio.conf" diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template index be498adbece..bf7add805dd 100644 --- a/srcpkgs/mksh/template +++ b/srcpkgs/mksh/template @@ -1,15 +1,15 @@ # Template file for 'mksh' pkgname=mksh -version=R54 +version=R55 revision=1 wrksrc=mksh register_shell="/bin/mksh" short_desc="The MirBSD Korn Shell" -maintainer='Andrea Brancaleoni ' +maintainer='Andrea Brancaleoni ' homepage="https://www.mirbsd.org/mksh.htm" license="MirOS" distfiles="https://www.mirbsd.org/MirOS/dist/mir/${pkgname}/${pkgname}-${version}.tgz" -checksum=8bce3837c386684aa7780f085f1a4dbd5e3e26fb5c528ee0d41ae29af7f39013 +checksum=ced42cb4a181d97d52d98009eed753bd553f7c34e6991d404f9a8dcb45c35a57 alternatives=" sh:sh:/usr/bin/mksh diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index 28f585fc600..f5fa99b0ae7 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,6 +1,6 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix -version=9.9.0 +version=11.0.0 revision=1 build_style=gnu-configure configure_args="--without-curl --with-docbook-xsl-root=/usr/share/xsl/docbook" @@ -12,7 +12,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://www.bunkus.org/videotools/mkvtoolnix/" distfiles="${homepage}/sources/${pkgname}-${version}.tar.xz" -checksum=f06c9359bd197b5de6556a05506f0ea9ddab72045b72f1ed04b1807e4e042043 +checksum=bb642e1eb2c402c4f93a962f41a1832c99ee5b782f1596dc20f996e9a4aa426d # Cross compiling fails due to dependency chain eigen -> jack -> pulseaudio nocross=yes diff --git a/srcpkgs/mldonkey/template b/srcpkgs/mldonkey/template new file mode 100644 index 00000000000..c553cb88cab --- /dev/null +++ b/srcpkgs/mldonkey/template @@ -0,0 +1,18 @@ +# Template file for 'mldonkey' +pkgname=mldonkey +version=3.1.6 +revision=1 +_release="release-${version//./-}" +wrksrc="${pkgname}-${_release}" +build_style=gnu-configure +hostmakedepends="autoconf camlp4 ocaml ocamlbuild wget" +makedepends="bzip2-devel file-devel glib-devel ncurses-devel zlib-devel" +depends="wget" +short_desc="Multi-platform, multi-network p2p daemon" +maintainer="Leah Neukirchen " +license="GPL-2" +homepage="http://mldonkey.sourceforge.net/" +distfiles="https://github.com/ygrek/${pkgname}/archive/${_release}.tar.gz" +checksum=632735d835c33d9815ae64aa8d4abb61b1bd8dd6c55ef66694f9254c97c2877d +nopie=yes # can't link against ocaml runtime else +nocross=yes diff --git a/srcpkgs/mlocate/template b/srcpkgs/mlocate/template index 2b6d9d50306..d1546622b02 100644 --- a/srcpkgs/mlocate/template +++ b/srcpkgs/mlocate/template @@ -9,8 +9,8 @@ make_dirs="/var/lib/mlocate 0755 root root" short_desc="Implementation of locate/updatedb that reuses the database" maintainer="Steve Prybylski " license="GPL-2" -homepage="https://fedorahosted.org/mlocate/" -distfiles="https://fedorahosted.org/releases/m/l/${pkgname}/${pkgname}-${version}.tar.xz" +homepage="https://pagure.io/mlocate" +distfiles="http://releases.pagure.org/mlocate/${pkgname}-${version}.tar.xz" checksum=3063df79fe198fb9618e180c54baf3105b33d88fe602ff2d8570aaf944f1263e alternatives=" diff --git a/srcpkgs/mlterm/template b/srcpkgs/mlterm/template new file mode 100644 index 00000000000..68fd98ad229 --- /dev/null +++ b/srcpkgs/mlterm/template @@ -0,0 +1,23 @@ +# Template file for 'mlterm' +pkgname=mlterm +version=3.8.1 +revision=1 +build_style=gnu-configure +configure_args="--disable-static + --enable-fribidi --enable-optimize-redrawing + --with-tools=mlconfig,mlterm-zoom,mlterm-menu,mlclient,mlcc,mlfc + --with-gtk=2.0 --with-imagelib=gdk-pixbuf" +hostmakedepends="pkg-config" +makedepends="freetype-devel fribidi-devel gdk-pixbuf-devel gtk+-devel + libXft-devel libutempter-devel" +short_desc="Multi Lingual TERMinal emulator for X" +maintainer="Leah Neukirchen " +license="3-clause-BSD" +homepage="http://mlterm.sourceforge.net/" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=464fa3a76ea562e38945067003c68e5ce320b60063f412bff01cb6a0f5c5d6d9 +nocross=yes + +pre_configure() { + export ac_cv_func_posix_openpt=yes +} diff --git a/srcpkgs/mobile-broadband-provider-info/template b/srcpkgs/mobile-broadband-provider-info/template index 7030afb3ae0..6cf91ede7b1 100644 --- a/srcpkgs/mobile-broadband-provider-info/template +++ b/srcpkgs/mobile-broadband-provider-info/template @@ -1,6 +1,6 @@ # Template file for 'mobile-broadband-provider-info' pkgname=mobile-broadband-provider-info -version=20151214 +version=20170310 revision=1 noarch="yes" build_style=gnu-configure @@ -9,4 +9,4 @@ maintainer="Juan RP " license="CC-PD (Creative Commons Public Domain)" homepage="http://git.gnome.org/browse/mobile-broadband-provider-info/" distfiles="$GNOME_SITE/$pkgname/$version/$pkgname-$version.tar.xz" -checksum=8ae45d6f10fed9750e259935804c4f40a4372bb119f0504187e4221896b205a4 +checksum=144f03c95e03a82c53425bae38bc9adcca5a5da3cac642d1931da6897a08b53b diff --git a/srcpkgs/mod_wsgi/template b/srcpkgs/mod_wsgi/template index fbb8cb1725f..e7974685ca6 100644 --- a/srcpkgs/mod_wsgi/template +++ b/srcpkgs/mod_wsgi/template @@ -1,6 +1,6 @@ # Template file for 'mod_wsgi' pkgname=mod_wsgi -version=4.5.14 +version=4.5.15 revision=1 lib32disabled=yes build_style=gnu-configure @@ -11,4 +11,4 @@ homepage="https://modwsgi.org" license="Apache-2.0" maintainer="Juan RP " distfiles="https://github.com/GrahamDumpleton/$pkgname/archive/$version.tar.gz" -checksum=18a0a879d1130116b5fd0253d2d0695fe2c40db6f09b82a8fcb29bcb8c2fa989 +checksum=26e6d8253b342f78bf824152f8923a83e26d4f4d82cba105da2d5d466724bc22 diff --git a/srcpkgs/mongo-tools/template b/srcpkgs/mongo-tools/template index 0bd4bc0303f..30e0ad802e0 100644 --- a/srcpkgs/mongo-tools/template +++ b/srcpkgs/mongo-tools/template @@ -1,7 +1,7 @@ # Template file for 'mongo-tools' pkgname=mongo-tools version=3.4.1 -revision=3 +revision=5 wrksrc="${pkgname}-r${version}" build_style=go go_import_path="github.com/mongodb/mongo-tools" diff --git a/srcpkgs/mongodb/template b/srcpkgs/mongodb/template index 96e5adf4b7a..e604da77a74 100644 --- a/srcpkgs/mongodb/template +++ b/srcpkgs/mongodb/template @@ -1,6 +1,6 @@ # Template file for 'mongodb' pkgname=mongodb -version=3.4.2 +version=3.4.4 revision=1 wrksrc="mongodb-src-r${version}" hostmakedepends="scons" @@ -15,7 +15,7 @@ maintainer="Enno Boland " homepage="http://www.mongodb.org" license="AGPL-3" distfiles="https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz" -checksum=29b60f6c5331fd2ff5242171a65c03e3b47c1ff957fa317bfaa2ddccd8d51b59 +checksum=09e962bf3428474b9790bbd464cb6176817f9da6121c30e096240dbb4d51c9f6 # build flags broken. nopie=yes only_for_archs="aarch64 x86_64 aarch64-musl x86_64-musl" diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template index 1a2b7d5a593..f0c6517091d 100644 --- a/srcpkgs/mongoose/template +++ b/srcpkgs/mongoose/template @@ -1,7 +1,7 @@ # Template file for 'mongoose' pkgname=mongoose version=3.7 -revision=13 +revision=14 wrksrc=$pkgname makedepends="libressl-devel" short_desc="An Easy to use Web server" diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template index 09d1d2d09d3..1d81ea52a3c 100644 --- a/srcpkgs/monit/template +++ b/srcpkgs/monit/template @@ -1,18 +1,19 @@ # Template file for 'monit' pkgname=monit -version=5.20.0 +version=5.22.0 revision=1 build_style=gnu-configure configure_args="--with-ssl-dir=${XBPS_CROSS_BASE}/usr libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes" conf_files="/etc/monit/monitrc" +hostmakedepends="perl" makedepends="pam-devel libressl-devel zlib-devel" short_desc="Utility for monitoring, processes, files, directories and devices" maintainer="Duncaen " license="GPL-3" homepage="http://mmonit.com/monit/" distfiles="http://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz" -checksum=ebac395ec50c1ae64d568db1260bc049d0e0e624c00e79d7b1b9a59c2679b98d +checksum=9fc58b5e3caafd64f0b6fff3e65ae757239fab37d04fb33efce177da15176183 post_install() { vinstall monitrc 700 etc/monit diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template index d6b5c2c22b1..47297d135fe 100644 --- a/srcpkgs/monitoring-plugins/template +++ b/srcpkgs/monitoring-plugins/template @@ -1,7 +1,7 @@ # Template file for 'monitoring-plugins' pkgname=monitoring-plugins version=2.1.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--libexecdir=/usr/lib/monitoring-plugins" hostmakedepends="fping procps-ng openssh smbclient postfix" diff --git a/srcpkgs/mono-devel b/srcpkgs/mono-devel new file mode 120000 index 00000000000..386ccd8d238 --- /dev/null +++ b/srcpkgs/mono-devel @@ -0,0 +1 @@ +mono \ No newline at end of file diff --git a/srcpkgs/mono/patches/exceptions-arm.c.patch b/srcpkgs/mono/patches/exceptions-arm.c.patch deleted file mode 100644 index 922ff92e1d6..00000000000 --- a/srcpkgs/mono/patches/exceptions-arm.c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mono/mini/exceptions-arm.c 2015-05-08 17:22:57.000000000 +0200 -+++ mono/mini/exceptions-arm.c 2016-08-10 17:29:35.856372222 +0200 -@@ -15,7 +15,9 @@ - - #ifndef MONO_CROSS_COMPILE - #ifdef HAVE_ASM_SIGCONTEXT_H -+#if defined(__GLIBC__) - #include -+#endif - #endif /* def HAVE_ASM_SIGCONTEXT_H */ - #endif diff --git a/srcpkgs/mono/template b/srcpkgs/mono/template index 17ad677da42..9debb5ffafb 100644 --- a/srcpkgs/mono/template +++ b/srcpkgs/mono/template @@ -1,13 +1,13 @@ # Template file for 'mono' pkgname=mono -version=4.6.2.16 +version=4.8.1.0 revision=1 wrksrc="mono-${version%.*}" lib32disabled=yes build_style=gnu-configure -configure_args="--disable-static --disable-system-aot" +configure_args="--disable-system-aot" # XXX: figure out how to split this up into subpkgs. -hostmakedepends="automake libtool perl python" +hostmakedepends="automake libtool perl python cmake" makedepends="zlib-devel libX11-devel libgdiplus-devel" depends="ca-certificates python" short_desc="Free implementation of the .NET platform including runtime and compiler" @@ -15,7 +15,7 @@ maintainer="Juan RP " homepage="http://www.mono-project.com" license="MIT, 3-clause-BSD, GPL-2, LGPL-2, MPL-1.1" distfiles="http://download.mono-project.com/sources/mono/$pkgname-$version.tar.bz2" -checksum=8965d107f4ebf4583ba1b50e0dcad39f0dc6adac8df7a083e9c5879ad93c0ea4 +checksum="18cb38a670e51609c36c687ed90ad42cfedabeffd0a2dc5f7f0c46249eb8dbef" case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" --disable-boehm --without-sigaltstack" ;; @@ -28,3 +28,13 @@ pre_configure() { post_install() { vlicense LICENSE } + +mono-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/moreutils/template b/srcpkgs/moreutils/template index ad3d04cd939..c79839923ce 100644 --- a/srcpkgs/moreutils/template +++ b/srcpkgs/moreutils/template @@ -1,11 +1,11 @@ # Template file for 'moreutils' pkgname=moreutils version=0.60 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="DOCBOOK2XMAN=docbook2man" hostmakedepends="docbook2x" -depends="perl perl-IPC-Run perl-TimeDate" +depends="perl perl-IPC-Run perl-TimeDate perl-Time-Duration" short_desc="Unix tools that nobody thought to write, when Unix was young" maintainer="lemmi " license="GPL-2" diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index 79cf3a3804c..4acd5178d93 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -1,7 +1,7 @@ # Template file for 'mosh' pkgname=mosh -version=1.2.6 -revision=2 +version=1.3.0 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config protobuf-devel" makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel" @@ -11,4 +11,4 @@ maintainer="Juan RP " license="GPL-3" homepage="https://mosh.org/" distfiles="https://mosh.org/mosh-${version}.tar.gz" -checksum=7e82b7fbfcc698c70f5843bb960dadb8e7bd7ac1d4d2151c9d979372ea850e85 +checksum=320e12f461e55d71566597976bd9440ba6c5265fa68fbf614c6f1c8401f93376 diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template index a80fbc38757..d0efe4b3038 100644 --- a/srcpkgs/mosquitto/template +++ b/srcpkgs/mosquitto/template @@ -1,7 +1,7 @@ # Template file for 'mosquitto' pkgname=mosquitto version=1.4.11 -revision=1 +revision=4 build_style=gnu-makefile make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl make_install_args="prefix=/usr" @@ -13,10 +13,13 @@ license="epl-v10, edl-v10" homepage="http://mosquitto.org/" distfiles="http://mosquitto.org/files/source/mosquitto-${version}.tar.gz" checksum=ca47533bbc1b7c5e15d6e5d96d3efc59677f2515b6692263c34b7c48f33280c5 -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/1402/steps/shell_3/logs/stdio" ;; -esac +case "$XBPS_TARGET_MACHINE" in +*-musl) + post_extract() { + sed -i 's/-lanl//' config.mk + } +esac pre_install() { sed -i 's,sbin,bin,g' */Makefile } diff --git a/srcpkgs/motion/template b/srcpkgs/motion/template index 8f3057765a3..ca01898795e 100644 --- a/srcpkgs/motion/template +++ b/srcpkgs/motion/template @@ -7,7 +7,7 @@ build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="v4l-utils-devel zlib-devel ffmpeg-devel" short_desc="A motion detector software" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://motion-project.github.io/" distfiles="https://github.com/Motion-Project/motion/archive/release-${version}.tar.gz" diff --git a/srcpkgs/mozjs38-devel b/srcpkgs/mozjs38-devel new file mode 120000 index 00000000000..31c380552da --- /dev/null +++ b/srcpkgs/mozjs38-devel @@ -0,0 +1 @@ +mozjs38 \ No newline at end of file diff --git a/srcpkgs/mozjs38/patches/configure.patch b/srcpkgs/mozjs38/patches/configure.patch new file mode 100644 index 00000000000..a992af1d877 --- /dev/null +++ b/srcpkgs/mozjs38/patches/configure.patch @@ -0,0 +1,11 @@ +--- js/src/configure 2017-03-21 06:18:29.372463084 -0600 ++++ js/src/configure 2017-03-21 06:27:37.546371605 -0600 +@@ -15906,7 +15906,7 @@ + fi + fi + +- version=`sed -n 's/^[:space:]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` ++ version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` + if test x"$version" = x; then + { echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; exit 1; } + fi diff --git a/srcpkgs/mozjs38/template b/srcpkgs/mozjs38/template new file mode 100644 index 00000000000..7277b0c73d5 --- /dev/null +++ b/srcpkgs/mozjs38/template @@ -0,0 +1,63 @@ +# Template file for 'mozjs38' +pkgname=mozjs38 +version=38.8.0 +revision=2 +wrksrc="mozilla-esr${version%.*.*}" +build_wrksrc="js/src" +build_style=gnu-configure +hostmakedepends="perl python pkg-config" +makedepends="icu-devel libffi-devel nspr-devel zlib-devel" +short_desc="Mozilla JavaScript interpreter and library (38.x series)" +homepage="http://www.mozilla.org/js/" +license="MPL-1.1, GPL-2, LGPL-2.1" +maintainer="Juan RP " +distfiles="https://ftp.mozilla.org/pub/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2" +checksum=9475adcee29d590383c4885bc5f958093791d1db4302d694a5d2766698f59982 +nopie=yes + +# Flags for gcc6.3 conceived by Arch Linux developers +CFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing" +CXXFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing" +# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl +LDFLAGS="-fuse-ld=bfd" + +do_configure() { + local _args + + if [ "$CROSS_BUILD" ]; then + export HOST_CFLAGS="-Os" + export HOST_CXXFLAGS="-Os" + _args+=" --target=$XBPS_CROSS_TRIPLET" + fi + + SHELL=/bin/bash ./configure --prefix=/usr --enable-threadsafe \ + --enable-system-ffi --with-system-icu --with-system-nspr \ + ${_args} +} + +post_install() { + + # Rename pkgconfig + mv ${PKGDESTDIR}/usr/lib/pkgconfig/js.pc ${PKGDESTDIR}/usr/lib/pkgconfig/mozjs-${version%.*.*}.pc + + # Remove links + mv ${PKGDESTDIR}/usr/include/mozjs-/js-config.h ${PKGDESTDIR}/usr/include/ + rm -rf ${PKGDESTDIR}/usr/include/mozjs-/* + mv ${PKGDESTDIR}/usr/include/js-config.h ${PKGDESTDIR}/usr/include/mozjs-/ + cp -p ${wrksrc}/js/src/js.msg ${PKGDESTDIR}/usr/include/mozjs-/ + cp -p ${wrksrc}/js/src/*.h ${PKGDESTDIR}/usr/include/mozjs-/ + mkdir ${PKGDESTDIR}/usr/include/mozjs-/js/ + cp -p ${wrksrc}/js/public/*.h ${PKGDESTDIR}/usr/include/mozjs-/js/ + mkdir ${PKGDESTDIR}/usr/include/mozjs-/mozilla/ + cp -p ${wrksrc}/mfbt/*.h ${PKGDESTDIR}/usr/include/mozjs-/mozilla/ +} + +mozjs38-devel_package() { + depends="nspr-devel ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/bin/js-config + vmove usr/include + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/mozjs38/update b/srcpkgs/mozjs38/update new file mode 100644 index 00000000000..a1c3f7e43b0 --- /dev/null +++ b/srcpkgs/mozjs38/update @@ -0,0 +1 @@ +pkgname="mozjs" diff --git a/srcpkgs/mozo/template b/srcpkgs/mozo/template index 0622b8f1e1f..7757ff750e8 100644 --- a/srcpkgs/mozo/template +++ b/srcpkgs/mozo/template @@ -1,11 +1,10 @@ # Template file for 'mozo' pkgname=mozo -version=1.16.0 +version=1.18.0 revision=1 noarch=yes nocross=yes build_style=gnu-configure -configure_args="--with-gtk=3.0" hostmakedepends="pkg-config intltool itstool python-gobject-devel" makedepends="glib-devel mate-menus-devel python-gobject-devel" depends="mate-menus python-gobject gtk+3 desktop-file-utils" @@ -15,4 +14,4 @@ maintainer="Juan RP " license="LGPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1bba88f32caafbc2b1c6bd3095acc07d10de40f242b8c15acb98f0b6e1747432 +checksum=ab24241d3203aca75974f0aeb96dbd215c5ac7ca67cd7af72caa6062f84ad613 diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index 4c946348d52..a325f3090ca 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd -version=0.20.5 -revision=1 +version=0.20.6 +revision=3 build_style=gnu-configure configure_args="--enable-opus --enable-mikmod --enable-neighbor-plugins --enable-soundcloud --enable-pipe-output --disable-twolame-encoder @@ -27,7 +27,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.musicpd.org/" distfiles="http://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz" -checksum=525573be27443ae26868b21a61e88c03909e72f1212ddaa725a0389a28d88987 +checksum=f4055e1189e5cc00e83706b2e0b5ead924ced0303e073d7802ee9f9a8eba4b47 # Package build options build_options="jack lame mpcdec pulseaudio libao wavpack" diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template index 58f285e0494..04cdac7acb4 100644 --- a/srcpkgs/mplayer/template +++ b/srcpkgs/mplayer/template @@ -1,7 +1,7 @@ # Template file for 'mplayer' pkgname=mplayer version=1.3.0 -revision=3 +revision=4 wrksrc="MPlayer-${version}" short_desc="A multimedia player" maintainer="Juan RP " diff --git a/srcpkgs/mpop/template b/srcpkgs/mpop/template index b6b2abc52f5..4dcd0c2cb45 100644 --- a/srcpkgs/mpop/template +++ b/srcpkgs/mpop/template @@ -1,7 +1,7 @@ # Template file for 'mpop' pkgname=mpop version=1.2.6 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libressl-devel libidn-devel" diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 9cc3747246d..14c1e7c6c29 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,6 +1,6 @@ # Template file for 'mpv' pkgname=mpv -version=0.24.0 +version=0.25.0 revision=2 build_options="vapoursynth" short_desc="Video player based on MPlayer/mplayer2" @@ -17,11 +17,11 @@ makedepends=" libXv-devel libxkbcommon-devel libva-glx-devel libvdpau-devel alsa-lib-devel pulseaudio-devel libbluray-devel libcdio-paranoia-devel libdvdread-devel MesaLib-devel harfbuzz-devel libXScrnSaver-devel jack-devel libdvdnav-devel - wayland-devel libuuid-devel libguess-devel libXrandr-devel samba-devel + wayland-devel libwayland-egl libuuid-devel libguess-devel libXrandr-devel samba-devel rubberband-devel $(vopt_if vapoursynth 'vapoursynth-devel zimg-devel python3-devel')" depends="desktop-file-utils hicolor-icon-theme $(vopt_if vapoursynth vapoursynth-mvtools)" distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz" -checksum=a41854fa0ac35b9c309ad692aaee67c8d4495c3546f11cb4cdd0a124195d3f15 +checksum=07423ffad6921ec4da32f703cd7fbfb27012301dcb736ac8542ac8e6083b0bce if [ -z "$CROSS_BUILD" ]; then configure_args+=" --enable-zsh-comp" diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template index 82d95025a74..4bc81e13cda 100644 --- a/srcpkgs/msmtp/template +++ b/srcpkgs/msmtp/template @@ -1,7 +1,7 @@ # Template file for 'msmtp' pkgname=msmtp version=1.6.6 -revision=1 +revision=2 build_style=gnu-configure # Package build options build_options="idn sasl gnome" diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template index 74db12fda9f..d9b79cc2e80 100644 --- a/srcpkgs/mtree/template +++ b/srcpkgs/mtree/template @@ -1,7 +1,7 @@ # Template file for 'mtree' pkgname=mtree version=1.0.3 -revision=3 +revision=4 wrksrc="${pkgname}-port-${version}" build_style=gnu-configure hostmakedepends="automake" diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index ce77131a193..87b70eeb7fa 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,7 +1,7 @@ # Template file for 'mumble' pkgname=mumble version=1.2.19 -revision=2 +revision=3 hostmakedepends="pkg-config" makedepends=" libcap-devel Ice-devel protobuf-devel libXi-devel qt-devel libressl-devel diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template index 4e48b1599d9..b3d3fb7b4a5 100644 --- a/srcpkgs/munge/template +++ b/srcpkgs/munge/template @@ -1,7 +1,7 @@ # Template file for 'munge' pkgname=munge version=0.5.12 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-crypto-lib=openssl --with-openssl-prefix=${XBPS_CROSS_BASE}/usr diff --git a/srcpkgs/mupdf/patches/0001-mupdf-openjpeg.patch b/srcpkgs/mupdf/patches/0001-mupdf-openjpeg.patch index 9df350d555b..177080c75c8 100644 --- a/srcpkgs/mupdf/patches/0001-mupdf-openjpeg.patch +++ b/srcpkgs/mupdf/patches/0001-mupdf-openjpeg.patch @@ -1,29 +1,33 @@ --- source/fitz/load-jpx.c.orig +++ source/fitz/load-jpx.c -@@ -484,12 +484,17 @@ - /* Without the definition of OPJ_STATIC, compilation fails on windows - * due to the use of __stdcall. We believe it is required on some - * linux toolchains too. */ +@@ -444,14 +444,19 @@ + + #else /* HAVE_LURATECH */ + + +#ifdef __cplusplus +extern "C" +{ #define OPJ_STATIC - #ifndef _MSC_VER + #define OPJ_HAVE_INTTYPES_H + #if !defined(_WIN32) && !defined(_WIN64) #define OPJ_HAVE_STDINT_H #endif + #define USE_JPIP +#endif -#include +#include - /* OpenJPEG does not provide a safe mechanism to intercept - * allocations. In the latest version all allocations go -@@ -971,4 +976,7 @@ - fz_drop_pixmap(ctx, img); + struct fz_jpxd_s + { +@@ -919,6 +924,9 @@ + *yresp = state.yres; } +#ifdef __cplusplus -+} -+#endif ++} ++#endif #endif /* HAVE_LURATECH */ + + #else /* FZ_ENABLE_JPX */ diff --git a/srcpkgs/mupdf/patches/patch-thirdparty_mujs_jsdate.c b/srcpkgs/mupdf/patches/patch-thirdparty_mujs_jsdate.c deleted file mode 100644 index bb83c94204b..00000000000 --- a/srcpkgs/mupdf/patches/patch-thirdparty_mujs_jsdate.c +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-thirdparty_mujs_jsdate.c,v 1.1 2017/01/30 14:06:05 leot Exp $ - -Backport a fix from upstream for CVE-2017-5628: - -Fix 697496: Check NAN before accessing array in MakeDay(). - ---- thirdparty/mujs/jsdate.c.orig -+++ thirdparty/mujs/jsdate.c -@@ -207,12 +207,17 @@ static double MakeDay(double y, double m, double date) - }; - - double yd, md; -+ int im; - - y += floor(m / 12); - m = pmod(m, 12); - -+ im = (int)m; -+ if (im < 0 || im >= 12) -+ return NAN; -+ - yd = floor(TimeFromYear(y) / msPerDay); -- md = firstDayOfMonth[InLeapYear(y)][(int)m]; -+ md = firstDayOfMonth[InLeapYear(y)][im]; - - return yd + md + date - 1; - } diff --git a/srcpkgs/mupdf/patches/patch-thirdparty_mujs_jsrun.c b/srcpkgs/mupdf/patches/patch-thirdparty_mujs_jsrun.c deleted file mode 100644 index 3feecf477b2..00000000000 --- a/srcpkgs/mupdf/patches/patch-thirdparty_mujs_jsrun.c +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-thirdparty_mujs_jsrun.c,v 1.1 2017/01/30 14:06:05 leot Exp $ - -Backport a fix from upstream for CVE-2017-5627: - -Fix 697497: Ensure array length is positive. - -As a side effect when changing to using regular integers (and avoid the -nightmare of mixing signed and unsigned) we accidentally allowed negative -array lengths. - ---- thirdparty/mujs/jsrun.c.orig -+++ thirdparty/mujs/jsrun.c -@@ -544,7 +544,7 @@ static void jsR_setproperty(js_State *J, js_Object *obj, const char *name) - if (!strcmp(name, "length")) { - double rawlen = jsV_tonumber(J, value); - int newlen = jsV_numbertointeger(rawlen); -- if (newlen != rawlen) -+ if (newlen != rawlen || newlen < 0) - js_rangeerror(J, "array length"); - jsV_resizearray(J, obj, newlen); - return; diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template index 1c8146ae11c..688e86ccd87 100644 --- a/srcpkgs/mupdf/template +++ b/srcpkgs/mupdf/template @@ -1,7 +1,7 @@ # Template file for 'mupdf' pkgname=mupdf -version=1.10a -revision=2 +version=1.11 +revision=1 wrksrc="${pkgname}-${version}-source" hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel @@ -11,10 +11,10 @@ makedepends="${hostmakedepends}" depends="desktop-file-utils" short_desc="Lightweight PDF and XPS viewer" maintainer="Juan RP " -license="GPL-3" +license="AGPL-3" homepage="http://mupdf.com" -distfiles="http://mupdf.com/downloads/mupdf-${version}-source.tar.gz" -checksum=aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836 +distfiles="http://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.gz" +checksum=209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a pre_configure() { rm -rf thirdparty/{curl,freetype,harfbuzz,jpeg,zlib,jbig2dec,openjpeg} diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template index 36bb30b2fcb..2a13b157f47 100644 --- a/srcpkgs/mupen64plus/template +++ b/srcpkgs/mupen64plus/template @@ -1,7 +1,7 @@ # Template file for 'mupen64plus' pkgname=mupen64plus version=2.5 -revision=5 +revision=6 wrksrc="mupen64plus-bundle-src-${version}" hostmakedepends="pkg-config" makedepends="boost-devel SDL-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel" diff --git a/srcpkgs/mutt-kz/template b/srcpkgs/mutt-kz/template index 41bffb41521..ee1104897aa 100644 --- a/srcpkgs/mutt-kz/template +++ b/srcpkgs/mutt-kz/template @@ -2,7 +2,7 @@ pkgname=mutt-kz reverts=20141129_6 version=1.6.0.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-notmuch --enable-pop --sysconfdir=/etc/$pkgname --enable-hcache --enable-gpgme --with-regex --with-idn --with-ssl --with-sasl diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index 60e6210e073..cb4f628ee77 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -1,6 +1,6 @@ # Template file for 'mutt' pkgname=mutt -version=1.8.0 +version=1.8.2 revision=1 build_style=gnu-configure configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache @@ -18,7 +18,7 @@ license="GPL-2" # changelog="http://www.mutt.org/doc/UPDATING" homepage="http://www.mutt.org" distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz" -checksum=45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab +checksum=1d057bf1b565f2c38ee50c9a661654cbbe4165f98e25bfa361ebbd707d96f235 provides="mutt-0_1" # Begin alternatives: diff --git a/srcpkgs/mutter/patches/fix-includes.patch b/srcpkgs/mutter/patches/fix-includes.patch deleted file mode 100644 index 0042dca6b9f..00000000000 --- a/srcpkgs/mutter/patches/fix-includes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/wayland/meta-wayland-private.h.orig 2016-09-23 08:55:17.876037227 +0200 -+++ src/wayland/meta-wayland-private.h 2016-09-23 08:57:08.436042296 +0200 -@@ -27,6 +27,7 @@ - - #include "window-private.h" - #include -+#include - - #include "meta-wayland.h" - #include "meta-wayland-versions.h" diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index d28248bccdf..519aab84fed 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,23 +1,23 @@ # Template file for 'mutter' pkgname=mutter -version=3.22.3 +version=3.24.1 revision=1 build_style=gnu-configure -configure_args="--disable-schemas-compile --disable-static --enable-compile-warnings=no" -# wayland is currently broken -configure_args+=" --disable-wayland" +configure_args="--disable-schemas-compile --disable-static --enable-egl-device" hostmakedepends="pkg-config zenity glib-devel gobject-introspection" makedepends="json-glib-devel upower-devel gnome-desktop-devel libinput-devel -glib-devel libcanberra-devel startup-notification-devel libSM-devel" + glib-devel libcanberra-devel startup-notification-devel libSM-devel libXtst-devel + elogind-devel libdrm-devel libinput-devel libgudev-devel" depends="zenity desktop-file-utils" short_desc="Lightweight GTK+3 window manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=537eda8e5fdd4a70602da913b885ad745a7510678c24006b91ceba83ccab209a -shlib_provides="libmutter-clutter-1.0.so libmutter-cogl-path.so libmutter-cogl.so libmutter-cogl-pango.so" +checksum=acaa77f9705cc6ca4a3d41935524ff31ba7a4c677bdd3e1d4662bbf3ece86a24 +shlib_provides="libmutter-clutter-0.so libmutter-cogl-path-0.so libmutter-cogl-0.so libmutter-cogl-pango-0.so" nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/1295/steps/shell_3/logs/stdio" +CFLAGS+=' -Wno-error=sign-compare -Wno-error=format' # Package build options @@ -33,8 +33,8 @@ pre_configure() { CFLAGS+=" -I$i -I$i/uapi -I$i/../arch/$_arch/include" done #sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - #sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' cogl/libtool - #sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' clutter/libtool + #sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' cogl/libtool + #sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' clutter/libtool } mutter-devel_package() { diff --git a/srcpkgs/myrddin/template b/srcpkgs/myrddin/template new file mode 100644 index 00000000000..4ad832dc54f --- /dev/null +++ b/srcpkgs/myrddin/template @@ -0,0 +1,19 @@ +# Template file for 'myrddin' +pkgname=myrddin +version=0.1.1 +revision=1 +wrksrc=mc +only_for_archs="x86_64 x86_64-musl" +build_style=configure +configure_args="--prefix=/usr" +hostmakedepends="bison" +short_desc="Myrddin systems programming language compiler and tools" +maintainer="Duncaen " +license="MIT" +homepage="https://myrlang.org/" +distfiles="https://myrlang.org/releases/myrddin-${version}.tar.xz" +checksum=66405cc45d65da8c1a303b785b78c7df782a267810cd368e59ebb85a4da40068 + +pre_build() { + export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2//} +} diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template index b2f7bf4fe19..33739fe4e21 100644 --- a/srcpkgs/mysql/template +++ b/srcpkgs/mysql/template @@ -1,7 +1,7 @@ # Template file for 'mysql' pkgname=mysql version=5.6.30 -revision=3 +revision=4 build_style=cmake configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template index edbea27edfc..0d365547d6e 100644 --- a/srcpkgs/namecoin/template +++ b/srcpkgs/namecoin/template @@ -1,7 +1,7 @@ # Template file for 'namecoin' pkgname=namecoin version=0.13.99 -revision=1 +revision=4 hostmakedepends="pkg-config yasm automake libtool" build_style=gnu-configure makedepends="libevent-devel db-devel protobuf-devel boost-devel miniupnpc-devel libevent-devel qrencode-devel" diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template index 94b274610c9..f34f366353d 100644 --- a/srcpkgs/nano/template +++ b/srcpkgs/nano/template @@ -1,6 +1,6 @@ # Template file for 'nano' pkgname=nano -version=2.7.5 +version=2.8.1 revision=1 build_style=gnu-configure makedepends="file-devel zlib-devel ncurses-devel" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="https://www.nano-editor.org/" license="GPL-3" distfiles="https://www.nano-editor.org/dist/v${version%.*}/$pkgname-$version.tar.xz" -checksum=a64d24e6bc4fc448376d038f9a755af77f8e748c9051b6f45bf85e783a7e67e4 +checksum=e935a8bb373345c833dff3a304c6d392775d206b94c802d9285ae80ac6b66d0b case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS="-DREG_STARTEND=0";; diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index fb2e2fd95a7..b8289e6b220 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,6 +1,6 @@ # Template file for 'nautilus' pkgname=nautilus -version=3.22.2 +version=3.24.0 revision=1 build_style=gnu-configure configure_args="--disable-update-mimedb --disable-debug --disable-selinux @@ -11,10 +11,10 @@ makedepends="gtk+3-devel libnotify-devel libexif-devel exempi-devel depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14" short_desc="The GNOME file manager" maintainer="Juan RP " -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Nautilus" license="GPL-2, LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=ce1c9e97173b51750521971a26943593b397a08a2736b340ef5b130095ee65b3 +checksum=8a499247caff3c02437c0ad955f043e675a056912d8553d9c9783c762f5dbbbd build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/ncdns/template b/srcpkgs/ncdns/template index 2310c4bc599..5ed192285d0 100644 --- a/srcpkgs/ncdns/template +++ b/srcpkgs/ncdns/template @@ -1,7 +1,7 @@ # Template file for 'ncdns' pkgname=ncdns version=0.0.2 -revision=3 +revision=4 build_style=go hostmakedepends="git" makedepends="libcap-devel" diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template index 087c3d77f5b..8bdd9dec088 100644 --- a/srcpkgs/ncmpc/template +++ b/srcpkgs/ncmpc/template @@ -1,13 +1,19 @@ # Template file for 'ncmpc' pkgname=ncmpc -version="0.25" +version=0.27 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="ncurses-devel glib-devel libmpdclient-devel" -short_desc="An ncurses-based mpd client" +short_desc="Ncurses-based mpd client" maintainer="Getty Ritter " license="GPL-2" -homepage="http://www.musicpd.org/clients/ncmpc/" -distfiles="http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz" -checksum=6e328acb71d06ae9e6c5fced99bc28ae78bcab1a73130b42ce9ab08a814ecea4 +homepage="https://www.musicpd.org/clients/ncmpc/" +distfiles="https://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz" +checksum=f9a26a3fc869cfdf0a16b0ea3e6512c2fe28a031bbc71b1d24a2bf0bbd3e15d9 + +post_install() { + vmkdir usr/share/examples/ncmpc + mv ${DESTDIR}/usr/share/doc/ncmpc/{config.sample,keys.sample,ncmpc.lirc} \ + ${DESTDIR}/usr/share/examples/ncmpc/ +} diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template index 9214a79c390..e4bc29281ca 100644 --- a/srcpkgs/ncmpcpp/template +++ b/srcpkgs/ncmpcpp/template @@ -1,7 +1,7 @@ # Template file for 'ncmpcpp' pkgname=ncmpcpp version=0.7.7 -revision=2 +revision=4 build_style=gnu-configure configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs --enable-unicode diff --git a/srcpkgs/neofetch/template b/srcpkgs/neofetch/template index c44b1a1c4c6..a0f736b9178 100644 --- a/srcpkgs/neofetch/template +++ b/srcpkgs/neofetch/template @@ -1,6 +1,6 @@ # Template file for 'neofetch' pkgname=neofetch -version=3.0.1 +version=3.1.0 revision=1 noarch=yes build_style=gnu-makefile @@ -10,7 +10,7 @@ maintainer="Muhammad Herdiansyah " homepage="https://github.com/dylanaraps/neofetch" license="MIT" distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=31447da6507c13c44eb2006901c00ed4ca08f0423d9439aaddea64edcaca2c38 +checksum=db7afe24d859b9c8230c3491640d996701816ddc9cf66f98a5071775e8b4ffe5 post_install() { vlicense LICENSE.md diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index 5659afe5a4c..747e25ea0f9 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,15 +1,15 @@ # Template file for 'neomutt' pkgname=neomutt -version=20170306 +version=20170428 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure -configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache --with-gdbm - --enable-gpgme --with-regex --with-idn --with-ssl --with-sasl --enable-notmuch +configure_args="--enable-pop --enable-imap --enable-smtp --with-gdbm + --enable-gpgme --with-idn --with-ssl --with-sasl --enable-notmuch --enable-lua --enable-sidebar --enable-nfs-fix --sysconfdir=/etc/$pkgname" hostmakedepends="automake" makedepends="ncurses-devel gpgme-devel libidn-devel libressl-devel libsasl-devel - gdbm-devel aspell-devel libnotmuch-devel" + gdbm-devel aspell-devel libnotmuch-devel gettext-devel lua-devel" depends="mime-types" conf_files="/etc/$pkgname/Muttrc" short_desc="Mutt with misc fixes and feature patches" @@ -17,7 +17,7 @@ maintainer="Toyam Cox " license="GPL-2" homepage="http://www.neomutt.org" distfiles="https://github.com/neomutt/neomutt/archive/neomutt-${version}.tar.gz" -checksum=4fc1d02792ca8b6c74105c9376886b0c2fb7ef28bc04be7cfd0f0699aa5c8c63 +checksum=c6100c6afb120b6eb2810e9acae6512fc4851ebd7fe711c5bc40b3ee29c0d306 case "${XBPS_TARGET_MACHINE}" in x86_64-musl) CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";; diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template index df369ce80f8..cee2fd02298 100644 --- a/srcpkgs/neon/template +++ b/srcpkgs/neon/template @@ -1,7 +1,7 @@ # Template file for 'neon' pkgname=neon version=0.30.2 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-expat --with-ssl=openssl --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static" diff --git a/srcpkgs/neovim-qt/template b/srcpkgs/neovim-qt/template new file mode 100644 index 00000000000..95e5adbdd60 --- /dev/null +++ b/srcpkgs/neovim-qt/template @@ -0,0 +1,17 @@ +# Template file for 'neovim-qt' +pkgname=neovim-qt +version=0.2.6 +revision=1 +build_style=cmake +makedepends="qt5-devel neovim" +depends="neovim" +short_desc="Neovim client library and GUI, in Qt5" +maintainer="Dominic Monroe " +license="ISC" +homepage="https://github.com/equalsraf/neovim-qt" +distfiles="https://github.com/equalsraf/neovim-qt/archive/v${version}.tar.gz" +checksum=91b07a5e7130d75a012094f6ace3efef991bc861114fe740d77bed54b6a21bd2 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template index 9428228dbef..0d3b3806324 100644 --- a/srcpkgs/neovim/template +++ b/srcpkgs/neovim/template @@ -1,6 +1,6 @@ # Template file for 'neovim' pkgname=neovim -version=0.1.7 +version=0.2.0 revision=1 build_style=cmake configure_args="-DENABLE_JEMALLOC=0" @@ -11,7 +11,7 @@ maintainer="Steve Prybylski " license="Apache-2.0, GPL-2" homepage="http://neovim.io" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" -checksum=d8f885d019b1ad608f36ae23b8f1b15b7e33585e16f7514666ab6c9809bb4b7e +checksum=72e263f9d23fe60403d53a52d4c95026b0be428c1b9c02b80ab55166ea3f62b5 # XXX: neovim needs host bin to generate helptags at build time. nocross=yes diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template index 225abf6e356..68827785b40 100644 --- a/srcpkgs/net-snmp/template +++ b/srcpkgs/net-snmp/template @@ -1,7 +1,7 @@ # Template build file for 'net-snmp'. pkgname=net-snmp version=5.7.3 -revision=11 +revision=12 hostmakedepends="pkg-config unzip" makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel" short_desc="Simple Network Management Protocol (SNMP) suite" diff --git a/srcpkgs/net-tools/template b/srcpkgs/net-tools/template index c945c18d446..177c494ccd7 100644 --- a/srcpkgs/net-tools/template +++ b/srcpkgs/net-tools/template @@ -1,7 +1,7 @@ # Template file for 'net-tools' pkgname=net-tools version=1.60.20150526git -revision=3 +revision=4 hostmakedepends="git" short_desc="Basic networking tools" maintainer="Juan RP " @@ -10,7 +10,9 @@ license="GPL-2" alternatives=" ifconfig:ifconfig:/usr/bin/${pkgname}-ifconfig - ifconfig:/usr/share/man/man1/ifconfig.1:/usr/share/man/man8/${pkgname}-ifconfig.8" + ifconfig:/usr/share/man/man1/ifconfig.1:/usr/share/man/man8/${pkgname}-ifconfig.8 + hostname:hostname:/usr/bin/${pkgname}-hostname + hostname:/usr/share/man/man1/hostname.1:/usr/share/man/man8/${pkgname}-hostname.1" do_fetch() { git clone git://git.code.sf.net/p/net-tools/code ${pkgname}-${version} @@ -51,9 +53,9 @@ do_install() { # Rename ifconfig for alternatives. mv ${DESTDIR}/usr/bin/{ifconfig,${pkgname}-ifconfig} mv ${DESTDIR}/usr/share/man/man8/{ifconfig,${pkgname}-ifconfig}.8 - # Remove hostname(1), conflicts with coreutils/busybox. - rm ${DESTDIR}/usr/bin/hostname - rm ${DESTDIR}/usr/share/man/man1/hostname.1 + # Rename hostname(1) for alternatives. + mv ${DESTDIR}/usr/bin/{hostname,${pkgname}-hostname} + mv ${DESTDIR}/usr/share/man/man1/{hostname,${pkgname}-hostname}.1 # Remove dnsdomainname(1), conflicts with busybox/inetutils. rm ${DESTDIR}/usr/bin/*domainname rm ${DESTDIR}/usr/share/man/man1/*domainname* diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template index 580695401c1..323ef7e3c59 100644 --- a/srcpkgs/netdata/template +++ b/srcpkgs/netdata/template @@ -1,7 +1,7 @@ # Template file for 'netdata' pkgname=netdata -version=1.5.0 -revision=3 +version=1.6.0 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="zlib-devel" @@ -14,7 +14,7 @@ maintainer="Michael Aldridge " license="GPL-3" homepage="http://netdata.firehol.org/" distfiles="https://github.com/firehol/netdata/releases/download/v${version}/netdata-${version}.tar.bz2" -checksum=764212e1c71dbf5cbcd0cc391b7be0ffd4fcfd5e3b603b4fdb4e0b21a9286dd8 +checksum=a225688cc5349a3d62072192c8163427b5fad5e02723f793f6eeeb8a2791c67c post_install() { vsv netdata diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index 5e92942a74f..0aa9b933c27 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,14 +1,15 @@ # Template file for 'netpbm' pkgname=netpbm # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY -version=10.77.02 +version=10.78.03 revision=1 -_githash=dc5872298ba5e2f52dbacb283d348e4f11a2d77d -_githash_guide=0c95c02ee6de4145c60e7ecceadabb9540226b81 +_githash=d55db645b8f93b8f7f8c0cf92afcfef65454c020 +_githash_guide=2c074cfcc434e192acd0cdc2457f71b0bd7f33b4 create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" hostmakedepends="pkg-config perl python flex" -makedepends="libjpeg-turbo-devel tiff-devel libpng-devel zlib-devel libxml2-devel libX11-devel" +makedepends="libX11-devel libjpeg-turbo-devel libpng-devel libxml2-devel + tiff-devel zlib-devel" short_desc="Toolkit for manipulation of graphic images" maintainer="Leah Neukirchen " license="BSD,GPL-2,custom" @@ -16,8 +17,8 @@ homepage="http://netpbm.sourceforge.net/" nocross=yes distfiles="https://github.com/chneukirchen/netpbm-mirror/archive/${_githash}.tar.gz https://github.com/chneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" -checksum="84bba66b7c50d220f26f9c64fd205053747ad10a22540ea57737d10af96da2a2 - fefdd76d6347464dfc0b9d97126a1efb7982f50bb511a16327c21749d67495b6" +checksum="e5d762798c534fdfe52bfdb52a10a03c5f2e7c50ce2f09dada5f14ed9d855f9e + 043705343ae1d6d0b3cb644dff7d92799793a28b4eedc54df656714b5524d75b" post_extract() { cd $build_wrksrc @@ -45,7 +46,9 @@ do_build() { do_install() { make pkgdir=$DESTDIR/usr PKGMANDIR=share/man install-run install-dev - rm $DESTDIR/usr/share/man/man?/* + vmkdir usr/share/man/man1 + vmkdir usr/share/man/man3 + vmkdir usr/share/man/man5 make MAKEMAN="${PWD}/buildtools/makeman" MANDIR="$DESTDIR/usr/share/man" USERGUIDE=. \ -C ../netpbm-mirror-${_githash_guide} \ -f "${PWD}/buildtools/manpage.mk" installman diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template index c586922ce76..2053bac8ae3 100644 --- a/srcpkgs/netpgp/template +++ b/srcpkgs/netpgp/template @@ -1,7 +1,7 @@ # Template file for 'netpgp' pkgname=netpgp version=20140220 -revision=9 +revision=10 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="zlib-devel bzip2-devel libressl-devel" diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template index 699e05b15cf..f7c2024c87b 100644 --- a/srcpkgs/netsurf/template +++ b/srcpkgs/netsurf/template @@ -1,7 +1,7 @@ # Template build file for 'netsurf'. pkgname=netsurf version=3.6 -revision=1 +revision=2 hostmakedepends="pkg-config gperf flex nsgenbind gdk-pixbuf-devel perl-HTML-Parser glib-devel" makedepends=" libidn-devel libmng-devel libxml2-devel libcurl-devel lcms-devel libwebp-devel diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template index d3ca30a4060..728f5e420de 100644 --- a/srcpkgs/network-manager-applet/template +++ b/srcpkgs/network-manager-applet/template @@ -1,6 +1,6 @@ # Template file for 'network-manager-applet' pkgname=network-manager-applet -version=1.4.4 +version=1.4.6 revision=1 lib32disabled=yes build_style=gnu-configure @@ -20,7 +20,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org/projects/NetworkManager/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=693846eeae0986e79eb1cedfbc499f132f27a9976ef189a0f16938ac59ec3226 +checksum=10a6fcfe8c6206cf18ec78a522a716b5ec9d0b7ca1e7d234c638725b316fec76 # Package build options build_options="gir" diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template index aaf3a2eb5bb..0fbadff2de9 100644 --- a/srcpkgs/network-ups-tools/template +++ b/srcpkgs/network-ups-tools/template @@ -1,7 +1,7 @@ # Template file for 'network-ups-tools' pkgname=network-ups-tools version=2.7.4 -revision=2 +revision=3 wrksrc="nut-${version}" build_style=gnu-configure configure_args=" diff --git a/srcpkgs/newsbeuter/template b/srcpkgs/newsbeuter/template index 429fe4aff4a..383c17479a1 100644 --- a/srcpkgs/newsbeuter/template +++ b/srcpkgs/newsbeuter/template @@ -1,7 +1,7 @@ # Template file for 'newsbeuter' pkgname=newsbeuter version=r2.9 -revision=7 +revision=8 hostmakedepends="pkg-config perl" makedepends="stfl-devel json-c-devel libxml2-devel libcurl-devel sqlite-devel libressl-devel" short_desc="Newsbeuter is the Mutt of RSS feed readers" diff --git a/srcpkgs/newt/template b/srcpkgs/newt/template index 6f116d9f57a..a2067728e88 100644 --- a/srcpkgs/newt/template +++ b/srcpkgs/newt/template @@ -1,16 +1,16 @@ # Template file for 'newt' pkgname=newt -version=0.52.19 -revision=3 +version=0.52.20 +revision=1 build_style=gnu-configure hostmakedepends="python-devel python3-devel" makedepends="slang-devel popt-devel python3-devel python-devel" short_desc="Library for color text mode, widget based user interfaces" maintainer="Enno Boland " license="GPL-3" -homepage="https://fedorahosted.org/newt/" +homepage="https://pagure.io/newt/" distfiles="https://pagure.io/releases/newt/newt-${version}.tar.gz" -checksum=08c0db56c21996af6a7cbab99491b774c6c09cef91cd9b03903c84634bff2e80 +checksum=8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc newt-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template index 652ff7efcf0..d7b0bbb1fbb 100644 --- a/srcpkgs/nfs-utils/template +++ b/srcpkgs/nfs-utils/template @@ -1,7 +1,7 @@ # Template file for 'nfs-utils' pkgname=nfs-utils version=1.3.4 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4 --with-statedir=/var/lib/nfs --enable-libmount-mount --enable-gss diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template index 203c3b98a47..3e2601d2e1f 100644 --- a/srcpkgs/nghttp2/template +++ b/srcpkgs/nghttp2/template @@ -1,6 +1,6 @@ # Template file for 'nghttp2' pkgname=nghttp2 -version=1.20.0 +version=1.22.0 revision=1 build_style=gnu-configure configure_args="--without-libxml2 --without-jemalloc --without-spdylay" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="MIT" homepage="https://nghttp2.org" distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz" -checksum=2b2b78915284f32d86c80cd8037b8e5f8c9e94f8a98f674a45cdfb79b863ce62 +checksum=f14af22f14107901ea6077413f1a387948bf11cdaa4613ba361a0e3e8cacbbe7 post_install() { rm -rf ${DESTDIR}/usr/share/man diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index 1f8b3620518..df8071bab00 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -1,7 +1,7 @@ # Template file for 'nginx' pkgname=nginx -version=1.10.3 -revision=2 +version=1.12.0 +revision=3 makedepends="pcre-devel libressl-devel $(vopt_if geoip geoip-devel)" if [ "$CROSS_BUILD" ]; then # fake configure run on host @@ -28,7 +28,7 @@ maintainer="Juan RP " license="Simplified BSD" homepage="https://nginx.org" distfiles="https://nginx.org/download/nginx-$version.tar.gz" -checksum=75020f1364cac459cb733c4e1caed2d00376e40ea05588fb8793076a4c69dd90 +checksum=b4222e26fdb620a8d3c3a3a8b955e08b713672e1bc5198d1e4f462308a795b30 build_options="geoip" build_options_default="geoip" diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template index 54983315363..73ae1c9ef4c 100644 --- a/srcpkgs/ngircd/template +++ b/srcpkgs/ngircd/template @@ -1,7 +1,7 @@ # Template build file for 'ngircd' pkgname=ngircd version=23 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes" hostmakedepends="pkg-config" diff --git a/srcpkgs/nickle/template b/srcpkgs/nickle/template new file mode 100644 index 00000000000..6e6b5036bd2 --- /dev/null +++ b/srcpkgs/nickle/template @@ -0,0 +1,19 @@ +# Template file for 'nickle' +pkgname=nickle +version=2.79 +revision=1 +build_style=gnu-configure +makedepends="readline-devel" +short_desc="Powerful desk calculator language" +maintainer="Leah Neukirchen " +license="MIT" +homepage="https://nickle.org/" +distfiles="https://nickle.org/release/${pkgname}-${version}.tar.gz" +checksum=d8b25f788545e036f2b2fd9c246d7f3143ac8d4fd35378784d9cbb4325e5077f + +post_install() { + vmkdir usr/share/examples + mv ${DESTDIR}/usr/share/nickle/examples ${DESTDIR}/usr/share/examples/nickle + rm -rf ${DESTDIR}/usr/include + vlicense COPYING +} diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template index 45142706c4e..adfe6df2df2 100644 --- a/srcpkgs/nicotine+/template +++ b/srcpkgs/nicotine+/template @@ -1,11 +1,11 @@ # Template file for 'nicotine+' pkgname=nicotine+ version=1.2.16 -revision=2 +revision=3 noarch=yes build_style=python2-module hostmakedepends="python-gobject2-devel" -depends="pygtk mutagen" +depends="pygtk mutagen librsvg" pycompile_module="pynicotine" short_desc="Soulseek music-sharing client written in Python" maintainer="doggone " diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template index 1c437677300..b35279de8a6 100644 --- a/srcpkgs/nim/template +++ b/srcpkgs/nim/template @@ -1,9 +1,9 @@ # Template file for 'nim' pkgname=nim version=0.16.0 -revision=1 +revision=3 _cversion=0.16.0 -_nimbleversion=0.8.2 +_nimbleversion=0.8.4 depends="gcc" hostmakedepends="ed" short_desc="The Nim programming language" @@ -15,7 +15,7 @@ distfiles="https://github.com/nim-lang/Nim/archive/v${version}.tar.gz https://github.com/nim-lang/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz" checksum="63b35b35d5976fec9d88e3307adb78d2e3988538e5855d13b7f6e6f89c593f7c e909cea51c2d1f6b04af955db219877ab9f9666741ccc750334597eded80844e - 5cfdebdeddf5cf7d32c7b1b047a99d660de4e3a29e29ce7a3216020dc4f301cd" + ba47cee4f74c56d14d6142e9324b3a8fd5a0e6cd8cbcf81e04ae58543b848e5e" build_wrksrc=Nim-$version create_wrksrc=yes nopie=yes @@ -31,6 +31,12 @@ do_build() { CFLAGS= sh build.sh cd .. + ed lib/wrappers/openssl.nim <<-EDIT + ,s/versions = "(/versions = "(|.43|.41/ + w + q + EDIT + bin/nim c koch ./koch boot -d:release diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 8deb689397d..00bc288af45 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,7 +1,7 @@ # Template file for 'nix' pkgname=nix version=1.11.4 -revision=2 +revision=3 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var" diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template index bc72759dbcb..5d355b730b1 100644 --- a/srcpkgs/nmap/template +++ b/srcpkgs/nmap/template @@ -1,7 +1,7 @@ # Template file for 'nmap' pkgname=nmap version=7.40 -revision=1 +revision=2 build_style=gnu-configure build_options="lua" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template index 2c35da93951..f5df83133ff 100644 --- a/srcpkgs/nmh/template +++ b/srcpkgs/nmh/template @@ -1,7 +1,7 @@ # Template file for 'nmh' pkgname=nmh version=1.6 -revision=14 +revision=15 build_style=gnu-configure configure_args="--sysconfdir=/etc/nmh --libdir=/usr/libexec/nmh --with-cyrus-sasl --with-tls" makedepends="ncurses-devel db-devel libsasl-devel libressl-devel" diff --git a/srcpkgs/nmon/patches/endmntent.patch b/srcpkgs/nmon/patches/endmntent.patch index 0c0f27514ca..67a9db1e4ad 100644 --- a/srcpkgs/nmon/patches/endmntent.patch +++ b/srcpkgs/nmon/patches/endmntent.patch @@ -1,5 +1,5 @@ ---- lmon16e.c.orig 2016-05-14 18:38:40.459977271 +0200 -+++ lmon16e.c 2016-05-14 18:38:58.012263072 +0200 +--- lmon16f.c.orig 2016-05-14 18:38:40.459977271 +0200 ++++ lmon16f.c 2016-05-14 18:38:58.012263072 +0200 @@ -706,7 +706,6 @@ int isroot = 0; diff --git a/srcpkgs/nmon/patches/musl-string-macro.patch b/srcpkgs/nmon/patches/musl-string-macro.patch index 25944e4dfbc..aaa8820e20b 100644 --- a/srcpkgs/nmon/patches/musl-string-macro.patch +++ b/srcpkgs/nmon/patches/musl-string-macro.patch @@ -1,5 +1,5 @@ ---- lmon16e.c.orig 2016-03-04 18:41:57.788556435 +0100 -+++ lmon16e.c 2016-03-04 22:23:27.977248021 +0100 +--- lmon16f.c.orig 2016-03-04 18:41:57.788556435 +0100 ++++ lmon16f.c 2016-03-04 22:23:27.977248021 +0100 @@ -58,6 +58,10 @@ #include #include diff --git a/srcpkgs/nmon/template b/srcpkgs/nmon/template index 53adf2c96a5..4ca107eb0de 100644 --- a/srcpkgs/nmon/template +++ b/srcpkgs/nmon/template @@ -1,6 +1,6 @@ # Template file for 'nmon' pkgname=nmon -version=16e +version=16f revision=1 build_style=fetch maintainer="Orphaned " @@ -10,7 +10,7 @@ license="GPL-3" homepage="http://nmon.sourceforge.net/pmwiki.php?n=Main.HomePage" short_desc="Nigel's performance Monitor for Linux" distfiles="${SOURCEFORGE_SITE}/nmon/files/lmon${version}.c" -checksum=ee152d9c8d0b77a4ea39def320ae5a8990f81cbbcc6c408851cef296661cca5b +checksum=280a371e17488f8a2c5e0c64273155789be6fa5b937ab5c465488e591bdc5cd9 do_build() { $CC ${CFLAGS} ${LDFLAGS} -D JFS -D GETUSER -D LARGEMEM -D X86 \ diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template new file mode 100644 index 00000000000..81e7678aa69 --- /dev/null +++ b/srcpkgs/nncp/template @@ -0,0 +1,19 @@ +# Template file for 'nncp' +pkgname=nncp +version=0.7 +revision=1 +build_style=go +short_desc="Node to Node copy, utilities for secure store-and-forward" +maintainer="Leah Neukirchen " +license="GPL-3" +homepage="http://www.nncpgo.org/" +distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz" +checksum=d3407323f89296dd743fa76451964b43794e61be0e1d2dd4abd02042b94ffc4f + +do_build() { + make +} +do_install() { + make install DESTDIR="$DESTDIR" PREFIX=/usr \ + INFODIR=$DESTDIR/usr/share/info +} diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template new file mode 100644 index 00000000000..d6edbd68f44 --- /dev/null +++ b/srcpkgs/nnn/template @@ -0,0 +1,16 @@ +# Template file for 'nnn' +pkgname=nnn +version=1.0 +revision=1 +build_style=gnu-makefile +makedepends="ncurses-devel" +short_desc="A lightweight terminal file browser" +maintainer="Dennis Kraus " +license="BSD" +homepage="https://github.com/jarun/nnn" +distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz" +checksum=032d8cdcaa237f4392cc0ab335b984f2107c458c7d1ffec35a4abfe3aa0e5486 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 88b13a213ef..07c5ac09f8d 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,6 +1,6 @@ # Template file for 'nodejs' pkgname=nodejs -version=7.7.1 +version=7.9.0 revision=1 wrksrc=node-v${version} hostmakedepends="pkg-config python icu" @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="MIT" homepage="https://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" -checksum=9e87ec5420d558ca9651d13b10dd4a1be954fea0fc7a909016a1cc4aedfa651c +checksum=5cc131bb16f7ca688c29634a18b3c6a7816609a431a509f31baedf7caf25d626 # TODO: Fix cross compiling nocross="https://api.travis-ci.org/jobs/208411830/log.txt?deansi=true" diff --git a/srcpkgs/nomacs/patches/gcc6.patch b/srcpkgs/nomacs/patches/gcc6.patch deleted file mode 100644 index 61cb60badc6..00000000000 --- a/srcpkgs/nomacs/patches/gcc6.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/DkGui/DkPong.cpp.orig 2016-04-28 11:31:15.000000000 +0000 -+++ src/DkGui/DkPong.cpp 2016-12-30 18:51:24.147034114 +0000 -@@ -655,7 +655,7 @@ - double angle = mDirection.angle(); - double range = CV_PI / 5.0; - double sign = angle > 0 ? 1.0 : -1.0; -- angle = abs(angle); -+ angle = std::abs(angle); - double newAngle = 0.0; - - if (angle < CV_PI*0.5 && angle > CV_PI*0.5 - range) { ---- src/DkGui/DkViewPort.cpp.orig 2016-04-28 11:31:15.000000000 +0000 -+++ src/DkGui/DkViewPort.cpp 2016-12-30 18:54:36.602044043 +0000 -@@ -1251,7 +1251,7 @@ - mAnimationValue = 1.0f-(float)(mAnimationTime.elapsed()/1000.0)/Settings::param().display().animationDuration; - - // slow in - slow out -- double speed = mAnimationValue > 0.5 ? abs(1.0 - mAnimationValue) : abs(mAnimationValue); -+ double speed = mAnimationValue > 0.5 ? std::abs(1.0 - mAnimationValue) : std::abs(mAnimationValue); - speed *= .05; - - mAnimationValue += (float)speed; diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template index 384e3d829ee..3e408750c33 100644 --- a/srcpkgs/nomacs/template +++ b/srcpkgs/nomacs/template @@ -1,15 +1,25 @@ # Template file for 'nomacs' pkgname=nomacs -version=3.2.0 -revision=4 +version=3.6.1 +revision=1 build_style=cmake +build_wrksrc="ImageLounge" +configure_args="-DUSE_SYSTEM_QUAZIP=1" hostmakedepends="pkg-config" -# XXX: use vendored quazip for now -makedepends="qt5-tools-devel qt5-svg-devel exiv2-devel libopencv-devel libraw-devel" +makedepends="qt5-tools-devel qt5-svg-devel exiv2-devel libopencv-devel libraw-devel quazip-qt5-devel" short_desc="Simple yet powerful Qt imageviewer" maintainer="Kharlamov Alexey " -replaces="nomacs-qt5>=0" license="GPL-3" homepage="http://nomacs.org/" -distfiles="https://github.com/nomacs/nomacs/releases/download/${version}/nomacs-${version}-source.tar.bz2" -checksum=82462f36659b0b09ef4169d927d0861244ecf83790ba03185a244440278c49ad +distfiles="https://github.com/nomacs/nomacs/archive/${version}.tar.gz" +checksum=09b289cac51a5fdccc02aa4a60405bbbd4b5bfdb6b2a52ca5b0cb3b0f7a87068 + +pre_configure() { + # fix build with quazip-qt5 + sed -i 's/find_package(QuaZIP/find_package(QuaZip5/' cmake/Unix.cmake + sed -e 's/include " license="3-clause-BSD" homepage="http://www.nlnetlabs.nl/projects/nsd/" distfiles="http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=494a862cfcd26a525a4bf06306eb7ab0387b34678ac6d37767507438e3a23a4b +checksum=7f8367ad23cc5cddffa885e7e2f549123c8b4123db9726df41d99f255d6baab2 post_install() { vsv nsd diff --git a/srcpkgs/nsjail/patches/musl-rlim64_t.patch b/srcpkgs/nsjail/patches/musl-rlim64_t.patch index 62a39a106d4..b32fab9a20a 100644 --- a/srcpkgs/nsjail/patches/musl-rlim64_t.patch +++ b/srcpkgs/nsjail/patches/musl-rlim64_t.patch @@ -1,9 +1,10 @@ --- common.h 2016-09-10 03:20:32.000000000 +0200 +++ common.h 2017-01-04 17:24:12.807104061 +0100 -@@ -100,13 +100,13 @@ +@@ -100,14 +100,14 @@ bool verbose; bool keep_env; bool keep_caps; + bool disable_no_new_privs; - __rlim64_t rl_as; - __rlim64_t rl_core; - __rlim64_t rl_cpu; diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template index 145a169d4d3..bb1719efeae 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -1,27 +1,29 @@ # Template file for 'nsjail' pkgname=nsjail -version=1.2 -revision=2 +version=1.3 +revision=1 build_style=gnu-makefile +hostmakedepends="libnl3-devel" +makedepends="${hostmakedepends}" short_desc="A light-weight process isolation tool" maintainer="Andrea Brancaleoni " license="Apache-2.0" -homepage="https://github.com/google/$pkgname" -distfiles="$homepage/archive/$version.tar.gz" -checksum="9f262d56a189cf26f5c66b2c022364df979da92042f64c04300fdbb88aaba8ab" +homepage="https://github.com/google/nsjail" +distfiles="${homepage}/archive/${version}.tar.gz" +checksum=8df57499c3512362283fb1663f37bfa687a64654a377800dfa6ea94486bf119c CFLAGS="-Wno-error=format" -do_build() { - case "$XBPS_TARGET_MACHINE" in - *-musl) cp ${FILESDIR}/musl-compat.h . - sed -i common.h -e '/#include /a #include "musl-compat.h"' - ;; - esac - make CC=$CC +post_extract() { + sed -i '/^CC/d' Makefile + sed -i 's/\(C\|LD\)FLAGS +=/override &/' Makefile +} +pre_build() { + case "$XBPS_TARGET_MACHINE" in + *-musl) CFLAGS+=" -include ${FILESDIR}/musl-compat.h" ;; + esac } - do_install() { - vbin $pkgname + vbin ${pkgname} vlicense LICENSE } diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index b5600578b7b..83bc365ec4b 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -1,6 +1,6 @@ # Template file for 'nss' pkgname=nss -version=3.28.1 +version=3.29.5 revision=1 hostmakedepends="perl" makedepends="zlib-devel nspr-devel sqlite-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://www.mozilla.org/projects/security/pki/nss/" license="MPL-2.0" distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz" -checksum=58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad +checksum=5df483b73535d726207483f6349df23fe56aee83382b94b13298aec2e254d985 do_build() { # Respect LDFLAGS diff --git a/srcpkgs/ntfs-3g/patches/CVE-2017-0358.patch b/srcpkgs/ntfs-3g/patches/CVE-2017-0358.patch deleted file mode 100644 index fd53b40445c..00000000000 --- a/srcpkgs/ntfs-3g/patches/CVE-2017-0358.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- src/lowntfs-3g.c.ref 2016-12-31 08:56:59.011749600 +0100 -+++ src/lowntfs-3g.c 2017-01-05 14:41:52.041473700 +0100 -@@ -3827,13 +3827,14 @@ - struct stat st; - pid_t pid; - const char *cmd = "/sbin/modprobe"; -+ char *env = (char*)NULL; - struct timespec req = { 0, 100000000 }; /* 100 msec */ - fuse_fstype fstype; - - if (!stat(cmd, &st) && !geteuid()) { - pid = fork(); - if (!pid) { -- execl(cmd, cmd, "fuse", NULL); -+ execle(cmd, cmd, "fuse", NULL, &env); - _exit(1); - } else if (pid != -1) - waitpid(pid, NULL, 0); ---- src/ntfs-3g.c.ref 2016-12-31 08:56:59.022518700 +0100 -+++ src/ntfs-3g.c 2017-01-05 15:45:45.912499400 +0100 -@@ -3612,13 +3612,14 @@ - struct stat st; - pid_t pid; - const char *cmd = "/sbin/modprobe"; -+ char *env = (char*)NULL; - struct timespec req = { 0, 100000000 }; /* 100 msec */ - fuse_fstype fstype; - - if (!stat(cmd, &st) && !geteuid()) { - pid = fork(); - if (!pid) { -- execl(cmd, cmd, "fuse", NULL); -+ execle(cmd, cmd, "fuse", NULL, &env); - _exit(1); - } else if (pid != -1) - waitpid(pid, NULL, 0); diff --git a/srcpkgs/ntfs-3g/template b/srcpkgs/ntfs-3g/template index 5c80e816e8d..048af12d1ce 100644 --- a/srcpkgs/ntfs-3g/template +++ b/srcpkgs/ntfs-3g/template @@ -1,7 +1,7 @@ # Template file for 'ntfs-3g' pkgname=ntfs-3g -version=2016.2.22 -revision=2 +version=2017.3.23 +revision=1 wrksrc="${pkgname}_ntfsprogs-${version}" build_style=gnu-configure configure_args="--exec-prefix=/usr --disable-static --with-fuse=external @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.tuxera.com/community/ntfs-3g-download/" license="GPL-2" distfiles="http://www.tuxera.com/opensource/${pkgname}_ntfsprogs-${version}.tgz" -checksum=d7b72c05e4b3493e6095be789a760c9f5f2b141812d5b885f3190c98802f1ea0 +checksum=3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5 post_install() { mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin diff --git a/srcpkgs/ntp/patches/libressl.patch b/srcpkgs/ntp/patches/libressl.patch index 8fa439dab7d..dc920881783 100644 --- a/srcpkgs/ntp/patches/libressl.patch +++ b/srcpkgs/ntp/patches/libressl.patch @@ -9,14 +9,14 @@ /* ----------------------------------------------------------------- */ # include ---- libntp/libssl_compat.c.orig 2016-11-21 13:28:40.000000000 +0100 -+++ libntp/libssl_compat.c 2016-11-24 12:43:34.507174281 +0100 -@@ -23,7 +23,7 @@ - #include "ntp_types.h" +--- libntp/libssl_compat.c.orig 2017-02-01 10:47:13.000000000 +0100 ++++ libntp/libssl_compat.c 2017-03-23 13:03:13.569465673 +0100 +@@ -26,7 +26,7 @@ + /* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +-#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) /* ----------------------------------------------------------------- */ #include "libssl_compat.h" diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index 74c8311592d..06d97dd9469 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -1,7 +1,7 @@ # Template file for 'ntp' pkgname=ntp -version=4.2.8p9 -revision=1 +version=4.2.8p10 +revision=3 build_style=gnu-configure configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd --enable-all-clocks ol_cv_pthread_select_yields=yes" @@ -12,7 +12,7 @@ license="2-clause-BSD" maintainer="Juan RP " homepage="http://www.ntp.org/" distfiles="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${version}.tar.gz" -checksum=b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72 +checksum=ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f make_dirs="/var/db/ntpd 0755 ntpd ntpd" conf_files="/etc/ntp.conf" diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index 642f9116491..7315e19e7e3 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux (long-lived series)" pkgname=nvidia version=378.13 -revision=2 +revision=4 maintainer="Juan RP " license="Proprietary NVIDIA license" homepage="http://www.nvidia.com" @@ -15,7 +15,7 @@ repository="nonfree" create_wrksrc=yes short_desc="${_desc} - Libraries and Utilities" depends="nvidia-gtklibs-${version}_${revision} nvidia-dkms-${version}_${revision} pkg-config" -conflicts="catalyst>=0 xserver-abi-video>21_1" +conflicts="catalyst>=0 xserver-abi-video>23_1" build_options="glvnd" desc_option_glvnd="Add support for NVIDIA's GL Vendor Neutral Dispatch implementation" @@ -99,6 +99,12 @@ do_install() { vinstall libGLESv2.so.2 755 usr/lib ln -sf libGLESv2.so.2 ${DESTDIR}/usr/lib/libGLESv2.so + + vinstall libnvidia-egl-wayland.so.1.0.1 755 usr/lib + ln -sf libnvidia-egl-wayland.so.1.0.1 ${DESTDIR}/usr/lib/libnvidia-egl-wayland.so.1 + + vinstall 10_nvidia.json 755 usr/share/glvnd/egl_vendor.d + vinstall 10_nvidia_wayland.json 755 usr/share/egl/egl_external_platform.d # -------------------------------------------------- vinstall libEGL.so.1 755 usr/lib diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template index fac94728311..3233f64f436 100644 --- a/srcpkgs/nvidia304/template +++ b/srcpkgs/nvidia304/template @@ -3,7 +3,7 @@ _desc="NVIDIA drivers (For GeForce 5 FX, 6, 7, 8 series)" pkgname=nvidia304 version=304.135 -revision=3 +revision=4 maintainer="Juan RP " license="Proprietary NVIDIA license" homepage="http://www.nvidia.com" @@ -16,7 +16,7 @@ short_desc="${_desc} - Libraries and Utilities" depends="${pkgname}-dkms-${version}_${revision} pkg-config" provides="nvidia-${version}_${revision}" replaces="nvidia>=0" -conflicts="catalyst>=0 xserver-abi-video>21_1" +conflicts="catalyst>=0 xserver-abi-video>23_1" subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs" if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then diff --git a/srcpkgs/nvidia340/template b/srcpkgs/nvidia340/template index c43fa752468..f0cb52bb880 100644 --- a/srcpkgs/nvidia340/template +++ b/srcpkgs/nvidia340/template @@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 8, 9, 9M, 100, 100M, 200, 300 series)" pkgname=nvidia340 version=340.102 -revision=2 +revision=3 maintainer="Juan RP " license="Proprietary NVIDIA license" homepage="http://www.nvidia.com" @@ -15,7 +15,7 @@ repository="nonfree" create_wrksrc=yes short_desc="${_desc} - Libraries and Utilities" depends="${pkgname}-dkms-${version}_${revision} pkg-config" -conflicts="catalyst>=0 xserver-abi-video>21_1" +conflicts="catalyst>=0 xserver-abi-video>23_1" provides="nvidia-${version}_${revision}" replaces="nvidia>=0 nvidia-stable>=0" diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template index f89f0df1f94..cf3176b3509 100644 --- a/srcpkgs/nzbget/template +++ b/srcpkgs/nzbget/template @@ -1,7 +1,7 @@ # Template file for 'nzbget' pkgname=nzbget -version=18.0 -revision=1 +version=18.1 +revision=2 build_style=gnu-configure configure_args="--with-tlslib=OpenSSL --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include @@ -15,7 +15,7 @@ maintainer="Leah Neukirchen " license="GPL-2" homepage="http://nzbget.net/" distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/v${version}/${pkgname}-${version}-src.tar.gz" -checksum=4bc6366286988647d42165b442a62b73a1328d7e5b5067bd0078650e1716f55b +checksum=ddf7f9eda1cc4d6f01cd28a5ee4362ef7a399085cda45a82ffdf250d56393819 post_extract() { sed -i '1i#include ' daemon/remote/MessageBase.h diff --git a/srcpkgs/obmenu-generator/template b/srcpkgs/obmenu-generator/template index affd8ea6ccb..5d98022a407 100644 --- a/srcpkgs/obmenu-generator/template +++ b/srcpkgs/obmenu-generator/template @@ -1,6 +1,6 @@ # Template file for 'obmenu-generator' pkgname=obmenu-generator -version=0.68 +version=0.70 revision=1 noarch=yes maintainer="Juan RP " @@ -9,7 +9,7 @@ license="GPL-3" short_desc="Perl Script to generate Openbox menu" depends="perl>=5.20 perl-Linux-DesktopFiles perl-Data-Dump" distfiles="https://github.com/trizen/${pkgname}/archive/${version}.tar.gz" -checksum=baba6cbbbfb5fbad0e9448afeadf15d3dfe91f57744c1d54d8b7041b034594ef +checksum=5e23f54841ddcee80ea4c54fe1d32a5a2c0524ff21af244dbcf5658496f7b25c do_install() { vbin obmenu-generator diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index fc9086d456b..eb2bfb2bce7 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,6 +1,6 @@ # Template file for 'obs' pkgname=obs -version=18.0.0 +version=18.0.1 revision=1 wrksrc=obs-studio-${version} only_for_archs="i686 x86_64 i686-musl x86_64-musl" @@ -15,7 +15,7 @@ maintainer="lemmi " license="GPL-2" homepage="https://obsproject.com" distfiles="https://github.com/jp9000/obs-studio/archive/${version}.tar.gz" -checksum=ad7c95aaf29037baddff6bedac9e51fed221c1cc3c27729be3759e8feeffb95f +checksum=7945c184833ea8957d55ff81989fe693e5186d1ccfdf1d2f049412d85c456e10 obs-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template index c235ad5f5fa..3a1211135a6 100644 --- a/srcpkgs/ocaml/template +++ b/srcpkgs/ocaml/template @@ -1,14 +1,14 @@ # Template file for 'ocaml' pkgname=ocaml -version=4.04.0 +version=4.04.1 revision=1 makedepends="ncurses-devel libX11-devel" short_desc="The main implementation of the Caml language" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " homepage="http://ocaml.org/" license="QPL-1, LGPL-2" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" -checksum=03e49d09d5a509216ca0cc8fccd10df3ad9dd441d7633e89974a74e149be3c51 +checksum=9aea1867848e370ae79f9aea4d48b04daf416478b0f43dfcb3a0f4d3ecf5f8e4 nocross=yes nopie=yes diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template index f5dec0ad05f..8ef318be587 100644 --- a/srcpkgs/octave/template +++ b/srcpkgs/octave/template @@ -1,7 +1,7 @@ # Template file for 'octave' pkgname=octave version=4.2.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="perl gcc-fortran pkg-config gnuplot" makedepends="pcre-devel lapack-devel readline-devel libSM-devel libltdl-devel diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template index a795a05c649..99ab318761a 100644 --- a/srcpkgs/octoxbps/template +++ b/srcpkgs/octoxbps/template @@ -1,6 +1,6 @@ # Template file for 'octoxbps' pkgname=octoxbps -version=0.2.1 +version=0.2.2 revision=1 build_style=qmake hostmakedepends="qt5-qmake" @@ -11,7 +11,7 @@ maintainer="beefcurtains " license="GPL-2" homepage="https://github.com/aarnt/octoxbps" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=d543b74fd092ad4de7e022ae0cfae542a047be0abd34e920a2196e284a4d5600 +checksum=6f7643bb07960d8c8f60ce70dc495f866ae60a4d6d8160a7f108f79bf53d2d22 do_configure() { for _dir in ${wrksrc} ${wrksrc}/notifier/octoxbps-notifier; do diff --git a/srcpkgs/offlineimap/template b/srcpkgs/offlineimap/template index 2c05a3c3133..fd89e7d968b 100644 --- a/srcpkgs/offlineimap/template +++ b/srcpkgs/offlineimap/template @@ -1,6 +1,6 @@ # Template file for 'offlineimap' pkgname=offlineimap -version=7.0.13 +version=7.0.14 revision=1 noarch=yes build_style=python2-module @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://offlineimap.org/" license="GPL-2" distfiles="https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz" -checksum=f744843f943c6adaa754e1244e16bfd6eaa825affe385169f16475db191787ce +checksum=19494ecad4d7234ac69480abb7462d0cdcfcec444b55f5381651057d9fdfad44 post_install() { make -C docs man diff --git a/srcpkgs/oniguruma/template b/srcpkgs/oniguruma/template index 87a12e4b295..a05a1f9dce2 100644 --- a/srcpkgs/oniguruma/template +++ b/srcpkgs/oniguruma/template @@ -1,6 +1,6 @@ # Template build file for 'oniguruma' pkgname=oniguruma -version=6.1.3 +version=6.2.0 revision=1 build_style=gnu-configure short_desc="A multi-charset regular expressions library" @@ -8,7 +8,7 @@ maintainer="John Regan " license="2-clause-BSD" homepage="https://github.com/kkos/oniguruma" distfiles="https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz" -checksum=480c850cd7c7f2fcaad0942b4a488e2af01fbb8e65375d34908f558b432725cf +checksum=6561637f340c6cae468aa4df45c7a4d8525fad65495b0dcef72d749aa8733a4b wrksrc="onig-${version}" post_install() { diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template index 7f79cacfd94..e9430841d81 100644 --- a/srcpkgs/open-isns/template +++ b/srcpkgs/open-isns/template @@ -1,7 +1,7 @@ # Template file for 'open-isns' pkgname=open-isns version=0.97 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-shared" makedepends="libressl-devel" diff --git a/srcpkgs/opencollada/template b/srcpkgs/opencollada/template index b5d98bce40a..1de8625ea57 100644 --- a/srcpkgs/opencollada/template +++ b/srcpkgs/opencollada/template @@ -1,6 +1,6 @@ # Template file for 'opencollada' pkgname=opencollada -version=1.6.39 +version=1.6.45 revision=1 wrksrc="OpenCOLLADA-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Jürgen Buchmüller " license="GPL-3" homepage="https://github.com/KhronosGroup/OpenCOLLADA" distfiles="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=92c74856eb62a1462d473a2a51083dc6c22b413378854075ac1408e0654356e6 +checksum=29c04320a34bf704a3a6716c3ca233bd9b435382bd493a7c52bc4dc64e53a5ae CXXFLAGS="-fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" if [ -n "$CROSS_BUILD" ]; then diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template index 10e84f75c29..44c47199324 100644 --- a/srcpkgs/opendkim/template +++ b/srcpkgs/opendkim/template @@ -1,7 +1,7 @@ # Template file for 'opendkim' pkgname=opendkim version=2.10.3 -revision=3 +revision=5 build_style="gnu-configure" configure_args="--with-milter=${XBPS_CROSS_BASE}/usr" makedepends="libbsd-devel libressl-devel libmilter-devel" @@ -19,7 +19,7 @@ post_install() { } opendkim-devel_package() { - short_desc=" - development files" + short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 36cbd98ea24..9a599d1b1e9 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,7 +1,7 @@ # Template file for 'openimageio' pkgname=openimageio -version=1.7.12 -revision=1 +version=1.7.13 +revision=2 wrksrc=oiio-Release-${version} build_style=cmake configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 @@ -18,7 +18,7 @@ maintainer="lemmi " license="BSD" homepage="https://sites.google.com/site/openimageio/home" distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz" -checksum=7da061f0308d5135ea944dbbf88968e0e834cdd50263f9cd594bec97e694a70d +checksum=d9ffed79180232636ebed670233666ec7f05eb05fa24e12519b28d042b673b36 pre_build() { # Replace -isystem with -I to avoid "#include_next " file not found diff --git a/srcpkgs/openjdk/template b/srcpkgs/openjdk/template index cdbd2c08424..0bbda841672 100644 --- a/srcpkgs/openjdk/template +++ b/srcpkgs/openjdk/template @@ -1,18 +1,19 @@ +# Template file for 'openjdk' # TODO: better places for bin and man? # TODO: make -headless versions # TODO: config files? # TODO: find giflib patch for --with-giflib=system _java_ver=8 -_jdk_update=121 -_jdk_build=13 -_repo_ver="jdk${_java_ver}u${_jdk_update}-b${_jdk_build}" +_jdk_update=152 +_jdk_build=03 +_main_ver=${_java_ver}u${_jdk_update} _openjdk_version="openjdk-1.8.0_${_jdk_update}" -# Template file for 'openjdk' pkgname=openjdk -version=${_java_ver}u${_jdk_update} +version="jdk${_java_ver}u${_jdk_update}b${_jdk_build}" revision=1 +_repo_ver="${version/b/-b}" nocross=yes nopie=yes wrksrc=jdk8u-jdk8u${_jdk_update}-b${_jdk_build}/ @@ -42,7 +43,7 @@ esac depends="openjdk-jre-${version}_${revision}" provides="java-environment-${version}_1" short_desc="OpenJDK Java Development Kit" -maintainer="Christian Neukirchen " +maintainer="Toyam Cox " license="GPL-3" homepage="http://openjdk.java.net/" distfiles=" @@ -55,14 +56,14 @@ distfiles=" http://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/${_repo_ver}.tar.gz>langtools-${_repo_ver}.tar.gz http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/${_repo_ver}.tar.gz>nashorn-${_repo_ver}.tar.gz" -checksum="7b59600a2a19f63dda188cd19a4fd7a7f467a6f7ce3474df0cb3005ba8a540db - 0fa534d45890b8cfb92c6ed39d2d80c60901e9e17c440fc8abf2f57a730dae2f - 1a8af5e51986046827fccfcda94f9fc41738667c67a71e5c78936d4906939255 - 594f5e1c7cdffa97c1686115d9db3c7f40049d9f1dfc05cd171947fe6c20c681 - b1a774d15fea52d0e7308981853c25cd88ffe7ff68a0bf61a518c44e77bcf2ad - 31ef7c27c2f1fb78ce6be5c96b0b5435cd814868f2b7a05a2ed3c5c062596c9d - 08da4dcb698a0ba2d7a417732823a2797c38f3e267a95829ee2403c4b1ad456e - ec388bdb56ca5886312e4a8c75aeb703102c04f86011c4e4d911a7896fa4d5a5" +checksum="e5719264ea5370815c233bb8f055eacef4e4aaaef971fb84f731926ce9bc20f6 + 6968085c367e832a4b166daab89eaf61bb58acbe8d930a3d944ff2327bd846a2 + 183f958982b2a1c4f10fc834ae8e8d4ac254bf1a65373fd001ab4e58a99b0983 + ea44540bf90913ba5d122b093005d6e2ebfb0a07535187dc71f1cda639b8d185 + f3d8c2342970c229985d32bb49e84d007f50df5a6b27991b8e1473ff45832bfc + 843a397b1d610db27b378d006ade2d98ce53d5e1f7952bf64fa865f0119e6fd0 + 4d336740d2e94d2406eb310acc64b95332e5f276143e38efe663f42f67601e7b + 7f94034dd260c5f14a8cf3ef66b05452ca991e3d0e7a22a5513385124a8c8fc4" # Build is still parallel, but don't use -jN. disable_parallel_build=yes @@ -136,13 +137,6 @@ if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then CFLAGS+=" -Wno-error -std=c++98 -fno-delete-null-pointer-checks -fno-lifetime-dse" fi -do_build() { - # -D_FORTIFY_SOURCE=2 doesn't work with CXX_O_FLAG_NONE="-O0" - CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} - CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/} - make ${makejobs} ${make_build_args} -} - post_extract() { if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then cd ${XBPS_BUILDDIR}/jdk-${_repo_ver} @@ -166,6 +160,13 @@ post_extract() { -e "/SUPPORTED_OS_VERSION =/s;\(.*\);\1 4% 4.1%;" } +do_build() { + # -D_FORTIFY_SOURCE=2 doesn't work with CXX_O_FLAG_NONE="-O0" + CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/} + make ${makejobs} ${make_build_args} +} + post_install() { rm -rf ${DESTDIR}/usr/lib/bin vinstall ${FILESDIR}/mkcacerts 755 usr/lib/jvm/$_openjdk_version/jre/bin @@ -181,7 +182,7 @@ post_install() { } openjdk-jre_package() { - shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so" + shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" short_desc="OpenJDK Java Runtime Environment" provides="java-runtime-${version}_1" alternatives=" diff --git a/srcpkgs/openjdk/update b/srcpkgs/openjdk/update index b7130975e8f..1103e66ddac 100644 --- a/srcpkgs/openjdk/update +++ b/srcpkgs/openjdk/update @@ -1,2 +1,2 @@ site="http://hg.openjdk.java.net/jdk8u/jdk8u/tags" -pattern='jdk\K8u\d+' +pattern='\Kjdk8u\d+\-b\d+' diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template index d573850146f..344141150db 100644 --- a/srcpkgs/openldap/template +++ b/srcpkgs/openldap/template @@ -1,7 +1,7 @@ # Template file for 'libldap' pkgname=openldap version=2.4.44 -revision=4 +revision=5 build_style=gnu-configure configure_args="--prefix=/usr --libexecdir=/usr/libexec diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template index 8575dd74b07..587dbb7b02c 100644 --- a/srcpkgs/openmpi/template +++ b/srcpkgs/openmpi/template @@ -1,12 +1,12 @@ # Template file for 'openmpi' pkgname=openmpi -version=2.0.2 +version=2.1.0 revision=1 lib32disabled=yes build_style=gnu-configure configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr" -hostmakedepends="perl libgomp-devel" -makedepends="zlib-devel libgomp-devel libhwloc-devel" +hostmakedepends="libgomp-devel perl" +makedepends="libgomp-devel libhwloc-devel zlib-devel" conf_files=" /etc/openmpi-default-hostfile /etc/openmpi-mca-params.conf @@ -16,11 +16,12 @@ homepage="https://www.open-mpi.org/" license="3-clause-BSD" maintainer="Juan RP " distfiles="${homepage}/software/ompi/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2" -checksum=cae396e643f9f91f0a795f8d8694adf7bacfb16f967c22fb39e9e28d477730d3 +checksum=b169e15f5af81bf3572db764417670f508c0df37ce86ff50deb56bd3acb43957 nocross=yes # libtool -rpath /usr/lib issue -post_install() { - vlicense LICENSE +post_extract() { + sed -i 's,sys/unistd.h,unistd.h,g' opal/include/opal/sys/cma.h + sed -i '1i#include ' opal/mca/pmix/pmix112/pmix/include/pmix_server.h } pre_configure() { # used wrongly upstream? but nocross anyway @@ -36,6 +37,11 @@ pre_configure() { export LDFLAGS_FOR_BUILD="$LDFLAGS" export LIBS_FOR_BUILD="$LDFLAGS" export LIBS="$LDFLAGS" + + unset FC FC_FOR_BUILD +} +post_install() { + vlicense LICENSE } libopenmpi_package() { diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template index 3e5e3846508..bfb45771c56 100644 --- a/srcpkgs/openmsx/template +++ b/srcpkgs/openmsx/template @@ -1,17 +1,17 @@ # Template file for 'openmsx' pkgname=openmsx -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 short_desc="The MSX emulator that aims for perfection" maintainer="Juan RP " license="GPL-3" homepage="http://openmsx.sourceforge.net" distfiles="https://github.com/openMSX/openMSX/releases/download/RELEASE_${version//\./_}/openmsx-${version}.tar.gz" -checksum=1d96a466badd625e7b6860a65afb10a7b5283a15721faa4186546693fec06a92 - +checksum=41e37c938be6fc9f90659f8808418133601a85475058725d3e0dccf2902e62cb hostmakedepends="pkg-config python" makedepends="SDL-devel glew-devel libao-devel libtheora-devel libvorbis-devel libpng-devel libxml2-devel SDL_ttf-devel tcl-devel" +nopie=yes do_build() { sed -i 's@\(SYMLINK_FOR_BINARY:=\)true@\1false@' build/custom.mk diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template index cbbf26979ad..ce23981879c 100644 --- a/srcpkgs/openntpd/template +++ b/srcpkgs/openntpd/template @@ -1,7 +1,7 @@ # Template file for 'openntpd' pkgname=openntpd version=6.0p1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-privsep-user=$pkgname --with-cacert=/etc/ssl/certs.pem" hostmakedepends="automake libtool" diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template index b2ee587653c..ac797a259b4 100644 --- a/srcpkgs/openresolv/template +++ b/srcpkgs/openresolv/template @@ -5,7 +5,7 @@ revision=1 noarch=yes build_style=gnu-configure short_desc="Management framework for resolv.conf" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="BSD" conf_files="/etc/resolvconf.conf" hostmakedepends="runit" diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template index 5fc22df510f..f09f2cecd75 100644 --- a/srcpkgs/opensc/template +++ b/srcpkgs/opensc/template @@ -1,7 +1,7 @@ # Template file for 'opensc' pkgname=opensc version=0.16.0 -revision=5 +revision=6 build_style=gnu-configure configure_args="--enable-man --enable-sm --enable-static=no --enable-doc --with-xsl-stylesheetsdir=/usr/share/xsl/docbook" diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template index 7790b7eb0b2..b0c1f5cfba4 100644 --- a/srcpkgs/openscad/template +++ b/srcpkgs/openscad/template @@ -2,7 +2,7 @@ pkgname="openscad" version="2015.03.2" -revision=2 +revision=3 _distver="${version%.*}-${version##*.}" build_style=qmake short_desc="The programmers solid 3D CAD modeller" diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template index 938efc8987e..d6f3ea88c12 100644 --- a/srcpkgs/opensmtpd/template +++ b/srcpkgs/opensmtpd/template @@ -1,7 +1,7 @@ # Template file for 'opensmtpd' pkgname=opensmtpd version=6.0.2p1 -revision=1 +revision=3 build_style=gnu-configure configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin --with-path-socket=/run --with-mantype=doc --with-pie --with-table-db diff --git a/srcpkgs/openssh/patches/bug2722.patch b/srcpkgs/openssh/patches/bug2722.patch new file mode 100644 index 00000000000..8c40668c37e --- /dev/null +++ b/srcpkgs/openssh/patches/bug2722.patch @@ -0,0 +1,36 @@ +--- openbsd-compat/openbsd-compat.h ++++ openbsd-compat/openbsd-compat.h +@@ -179,20 +179,25 @@ int writev(int, struct iovec *, int); + int getpeereid(int , uid_t *, gid_t *); + #endif + +-#ifdef HAVE_ARC4RANDOM +-# ifndef HAVE_ARC4RANDOM_STIR +-# define arc4random_stir() +-# endif +-#else ++#if !defined(HAVE_ARC4RANDOM) || defined(LIBRESSL_VERSION_NUMBER) + unsigned int arc4random(void); ++#endif ++ ++#if defined(HAVE_ARC4RANDOM_STIR) + void arc4random_stir(void); +-#endif /* !HAVE_ARC4RANDOM */ ++#elif defined(HAVE_ARC4RANDOM) || defined(LIBRESSL_VERSION_NUMBER) ++/* Recent system/libressl implementation; no need for explicit stir */ ++# define arc4random_stir() ++#else ++/* openbsd-compat/arc4random.c provides arc4random_stir() */ ++void arc4random_stir(void); ++#endif + +-#ifndef HAVE_ARC4RANDOM_BUF ++#if !defined(HAVE_ARC4RANDOM_BUF) || defined(LIBRESSL_VERSION_NUMBER) + void arc4random_buf(void *, size_t); + #endif + +-#ifndef HAVE_ARC4RANDOM_UNIFORM ++#if !defined(HAVE_ARC4RANDOM_UNIFORM) || defined(LIBRESSL_VERSION_NUMBER) + u_int32_t arc4random_uniform(u_int32_t); + #endif + diff --git a/srcpkgs/openssh/patches/config.patch b/srcpkgs/openssh/patches/config.patch new file mode 100644 index 00000000000..66f992101df --- /dev/null +++ b/srcpkgs/openssh/patches/config.patch @@ -0,0 +1,57 @@ +--- configure.ac.orig ++++ configure.ac +@@ -184,6 +184,7 @@ + OSSH_CHECK_CFLAG_COMPILE([-Wall]) + OSSH_CHECK_CFLAG_COMPILE([-Wpointer-arith]) + OSSH_CHECK_CFLAG_COMPILE([-Wuninitialized]) ++ OSSH_CHECK_CFLAG_COMPILE([-Wimplicit-function-declaration]) + OSSH_CHECK_CFLAG_COMPILE([-Wsign-compare]) + OSSH_CHECK_CFLAG_COMPILE([-Wformat-security]) + OSSH_CHECK_CFLAG_COMPILE([-Wsizeof-pointer-memaccess]) +@@ -1692,7 +1693,6 @@ + endgrent \ + err \ + errx \ +- explicit_bzero \ + fchmod \ + fchown \ + freeaddrinfo \ +@@ -1732,7 +1732,6 @@ + prctl \ + pstat \ + readpassphrase \ +- reallocarray \ + recvmsg \ + rresvport_af \ + sendmsg \ +@@ -1761,8 +1760,6 @@ + strcasestr \ + strdup \ + strerror \ +- strlcat \ +- strlcpy \ + strmode \ + strnlen \ + strnvis \ +@@ -1774,7 +1771,6 @@ + swap32 \ + sysconf \ + tcgetpgrp \ +- timingsafe_bcmp \ + truncate \ + unsetenv \ + updwtmpx \ +@@ -1785,6 +1781,13 @@ + waitpid \ + warn \ + ]) ++AC_CHECK_DECLS([ \ ++ explicit_bzero, \ ++ strlcat, \ ++ strlcpy, ++ timingsafe_bcmp \ ++], [], [], [[#include ]]) ++AC_CHECK_DECLS([reallocarray], [], [], [[#include ]]) + + dnl Wide character support. + AC_CHECK_FUNCS([mblen mbtowc nl_langinfo wcwidth]) diff --git a/srcpkgs/openssh/patches/werror.patch b/srcpkgs/openssh/patches/werror.patch new file mode 100644 index 00000000000..79ff3943f68 --- /dev/null +++ b/srcpkgs/openssh/patches/werror.patch @@ -0,0 +1,26 @@ +--- servconf.c.orig ++++ servconf.c +@@ -935,13 +935,6 @@ + { "no", 0 }, + { NULL, -1 } + }; +-static const struct multistate multistate_privsep[] = { +- { "yes", PRIVSEP_NOSANDBOX }, +- { "sandbox", PRIVSEP_ON }, +- { "nosandbox", PRIVSEP_NOSANDBOX }, +- { "no", PRIVSEP_OFF }, +- { NULL, -1 } +-}; + static const struct multistate multistate_tcpfwd[] = { + { "yes", FORWARD_ALLOW }, + { "all", FORWARD_ALLOW }, +--- configure.ac.orig ++++ configure.ac +@@ -399,7 +399,6 @@ + sys/bitypes.h \ + sys/bsdtty.h \ + sys/capability.h \ +- sys/cdefs.h \ + sys/dir.h \ + sys/mman.h \ + sys/ndir.h \ diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index 8cf6ed68df9..754ae2e396e 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,16 +1,18 @@ # Template file for 'openssh' pkgname=openssh -version=7.4p1 -revision=3 +version=7.5p1 +revision=4 build_style=gnu-configure configure_args="--datadir=/usr/share/openssh --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody --with-mantype=doc --without-rpath --with-xauth=/usr/bin/xauth --disable-strip --with-privsep-path=/var/chroot/ssh - --with-pid-dir=/run --with-pam --without-kerberos5 - $(vopt_with ldns) $(vopt_if ssl --with-ssl-engine --without-openssl) - --without-ssh1 --with-libedit LD=$CC" -hostmakedepends="perl" + --with-pid-dir=/run --with-pam --without-kerberos5 --without-ssh1 + --with-libedit --with-Werror + $(vopt_with ldns ldns=$XBPS_CROSS_BASE/usr) + $(vopt_if ssl --with-ssl-engine --without-openssl) + LD=$CC" +hostmakedepends="autoconf perl" makedepends="zlib-devel pam-devel libedit-devel $(vopt_if ssl libressl-devel) $(vopt_if ldns libldns-devel)" short_desc="The OpenSSH implementation of SSH protocol" @@ -20,17 +22,25 @@ maintainer="Juan RP " homepage="http://www.openssh.org" license="BSD" distfiles="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz" -checksum=1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1 +checksum=9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0 # Package build options build_options="ldns ssl" build_options_default="ldns ssl" case $XBPS_TARGET_MACHINE in + i686-musl) + CFLAGS="-fno-stack-protector" + configure_args+=" --disable-wtmp --disable-utmp" + ;; *-musl) configure_args+=" --disable-wtmp --disable-utmp" + ;; esac +pre_configure() { + autoreconf -fi +} post_install() { vinstall contrib/sshd.pam.generic 644 etc/pam.d sshd vbin contrib/ssh-copy-id diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template index 2e27bf694ac..9f63a3b94c8 100644 --- a/srcpkgs/openttd/template +++ b/srcpkgs/openttd/template @@ -1,6 +1,6 @@ # Template file for 'openttd' pkgname=openttd -version=1.6.1 +version=1.7.0 revision=1 _gfxver=0.5.4 _sfxver=0.2.3 @@ -19,7 +19,7 @@ distfiles=" http://bundles.openttdcoop.org/opensfx/releases/${_sfxver}/opensfx-${_sfxver}.zip " checksum=" - 9b08996e31c3485ef8dedfa1ab65147091593f3f11bd51eb7662ce5ea41363aa + df9307f42a45ac57dff23fe5cfb9bdb2a3d676456e7c771de173de060c2a99e0 3d136d776906dbe8b5df1434cb9a68d1249511a3c4cfaca55cc24cc0028ae078 3574745ac0c138bae53b56972591db8d778ad9faffd51deae37a48a563e71662 " @@ -47,7 +47,7 @@ do_configure() { } openttd-data_package() { - short_desc=" - data files" + short_desc+=" - data files" noarch=yes pkg_install() { vmove usr/share/openttd diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template index 371b4828f20..428a9d6e0c2 100644 --- a/srcpkgs/openvpn/template +++ b/srcpkgs/openvpn/template @@ -1,7 +1,7 @@ # Template file for 'openvpn' pkgname=openvpn -version=2.4.0 -revision=1 +version=2.4.1 +revision=2 build_style=gnu-configure configure_args="--enable-iproute2 --disable-systemd" hostmakedepends="iproute2" @@ -11,8 +11,8 @@ short_desc="An easy-to-use, robust, and highly configurable VPN" maintainer="Juan RP " license="GPL-2" homepage="https://www.openvpn.net" -distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.gz" -checksum=f21db525b3c03a9bbd0a7ab6d0e4fbaf8902f238bf53b8bc4e04f834e4e7caa4 +distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz" +checksum=fde9e22c6df7a335d2d58c6a4d5967be76df173c766a5c51ece57fd044c76ee5 post_install() { vmkdir usr/share/examples/${pkgname} diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template index df68ae7966c..b6969fe2d6b 100644 --- a/srcpkgs/openvswitch/template +++ b/srcpkgs/openvswitch/template @@ -1,7 +1,7 @@ # Template file for 'openvswitch' pkgname=openvswitch version=2.5.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-rundir=/run/openvswitch" hostmakedepends="python perl" diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index 1c35587d037..f1b7b681f69 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=42.0.2393.351 +version=44.0.2510.1218 revision=1 only_for_archs="i686 x86_64" hostmakedepends="freetype-devel" @@ -14,10 +14,10 @@ nopie=yes if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ];then _debarch=amd64 - checksum=ca5017e3d7ee8c2e37632dd42a8e6cf8296deaa8a11a52d8fdb5e249c67cde82 + checksum=7b2294dfd8b54fa1c3f36d52f2f5be0ca86f03355db7b21053fa8005001f62c6 else _debarch=i386 - checksum=8f0d8328d32346d6fe04a258a337e4917dcda54bd5baba8e63948ca1c44ea645 + checksum=c483f6a671e33bee80ffb0d774bc73c7256d4e2914bc8a9ad40c108a82346e50 fi distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_${_debarch}.deb" diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template index 0caf5a68f1e..9dc33fe587e 100644 --- a/srcpkgs/opusfile/template +++ b/srcpkgs/opusfile/template @@ -1,7 +1,7 @@ # Template file for 'opusfile' pkgname=opusfile version=0.8 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libogg-devel opus-devel libressl-devel" diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index 4ed6919e236..28694eda7a7 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,6 +1,6 @@ # Template file for 'orca' pkgname=orca -version=3.22.2 +version=3.24.0 revision=1 noarch=yes build_style=gnu-configure @@ -15,4 +15,4 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.gnome.org/projects/orca" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=599beeeec99fcf24aed7b97c832140f9355c79504c9250fcae90f611680368ca +checksum=27bd5e4eee12da737176a200b31d33e118d55ae832a4e3f0cbd3e756027246d1 diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template index 5eb3b67970e..30aad364e41 100644 --- a/srcpkgs/owncloudclient/template +++ b/srcpkgs/owncloudclient/template @@ -1,10 +1,10 @@ # Template file for 'owncloudclient' pkgname=owncloudclient -version=2.1.0 -revision=4 +version=2.3.1 +revision=2 build_style=cmake configure_args="-Wno-dev" -hostmakedepends="pkg-config qt5-qmake" +hostmakedepends="pkg-config" makedepends="qtkeychain-qt5-devel sqlite-devel qt5-webkit-devel qt5-declarative-devel qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql qt5-plugin-sqlite" @@ -15,4 +15,8 @@ maintainer="Samuel Chodur " license="GPL-2" homepage="http://www.owncloud.org" distfiles="https://download.owncloud.com/desktop/stable/${pkgname}-${version}.tar.xz" -checksum=73553f182cc5e3d87a5382bf17f9adf6e1315cc9ea8f530bf39775e709a5d03f +checksum=93143752234a0bc4c9798b69d8239996d92130eecdc1d93b75e3d49b899f3914 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-host-tools qt5-tools-devel" +fi diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template index 6ac0d25a31c..29f9093c732 100644 --- a/srcpkgs/packer/template +++ b/srcpkgs/packer/template @@ -1,17 +1,17 @@ # Template file for 'packer' pkgname=packer -version=0.12.3 -revision=1 +version=1.0.0 +revision=2 replaces="packer-bin>=0" short_desc="Create identical multiplatform machine images from a single source" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " build_style=go hostmakedepends="git-perl" license="MPL-2" homepage="http://www.packer.io" go_import_path="github.com/mitchellh/packer" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=5b003c4b0ed7f70a66d8a3a75d536f7cd91f1036d103e9b6587cb07252537c3e +checksum=6458f8f20333ff202cb3ab183867ad08a6cc49479edf48da9e3144c7e9f71dc6 post_build() { for F in $(find -type f -name main.go); do diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template index c49c64b99f4..a7aa2fc5d19 100644 --- a/srcpkgs/pam_ssh/template +++ b/srcpkgs/pam_ssh/template @@ -1,7 +1,7 @@ # Template file for 'pam_ssh' pkgname=pam_ssh version=2.1 -revision=2 +revision=3 build_style=gnu-configure short_desc="PAM module providing single sign-on behavior for SSH" maintainer="Alexander Gehrke " diff --git a/srcpkgs/pamixer/template b/srcpkgs/pamixer/template index eb8c76bb37f..7629a436907 100644 --- a/srcpkgs/pamixer/template +++ b/srcpkgs/pamixer/template @@ -1,7 +1,7 @@ # Template file for 'pamixer' pkgname=pamixer version=1.3.1 -revision=3 +revision=4 build_style=gnu-makefile makedepends="pulseaudio-devel boost-devel" short_desc="Pulseaudio command line mixer" diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template index a6255a44e84..5d2430730a2 100644 --- a/srcpkgs/pango/template +++ b/srcpkgs/pango/template @@ -1,6 +1,6 @@ # Template build file for 'pango'. pkgname=pango -version=1.40.4 +version=1.40.5 revision=1 build_style=gnu-configure configure_args="--with-included-modules=basic-fc $(vopt_enable gir introspection)" @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.pango.org/" license="LGPL-2.1" distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f8fdc5fc66356dc4edf915048cceeee065a0e0cb70b3b2598f62bda320129a3e +checksum=24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9 # Package build options build_options="gir" diff --git a/srcpkgs/paper-icon-theme/template b/srcpkgs/paper-icon-theme/template index 4445abe4255..d58229cfc84 100644 --- a/srcpkgs/paper-icon-theme/template +++ b/srcpkgs/paper-icon-theme/template @@ -1,6 +1,6 @@ # Template file for 'paper-icon-theme' pkgname=paper-icon-theme -version=1.3.4 +version=1.4.0 revision=1 noarch=yes short_desc="A modern freedesktop icon theme" @@ -10,7 +10,7 @@ license="LGPL-3, CC-BY-SA-4.0" hostmakedepends="autoconf automake" homepage="https://github.com/snwh/${pkgname}" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=b32fc5f084b6be7dfe8275b5f1edfdcafe6200da7df90c13cc1d2628dd50c843 +checksum=b90f3a84634572bcba76cdd0c2a0d305a5c521c2054d3d390edffda5f233928b pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template index deb5c42ce18..ce319004f4e 100644 --- a/srcpkgs/parallel/template +++ b/srcpkgs/parallel/template @@ -1,6 +1,6 @@ # Template file for 'parallel' pkgname=parallel -version=20170222 +version=20170422 revision=1 noarch=yes build_style=gnu-configure @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " homepage="http://www.gnu.org/software/parallel/" license="GPL-3" distfiles="${GNU_SITE}/$pkgname/$pkgname-${version}.tar.bz2" -checksum=6248cae7e0da7702710bf082290054b0ca3d26225fe66f7b03df20f3550ac955 +checksum=7a2438a92692c662dae3d4e80f1190af4cfe527cd3fb1a0d14e07f5c110ed329 pre_configure() { # no html and pdf doc diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template index 469a23f986c..da08b11eb94 100644 --- a/srcpkgs/partclone/template +++ b/srcpkgs/partclone/template @@ -1,7 +1,7 @@ # Template file for 'partclone' pkgname=partclone version=0.2.89 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-rpath --enable-ncursesw --enable-f2fs --enable-extfs --enable-hfsp --enable-fat --enable-exfat diff --git a/srcpkgs/pass/template b/srcpkgs/pass/template index 34f276362de..9a4e3c77ba9 100644 --- a/srcpkgs/pass/template +++ b/srcpkgs/pass/template @@ -1,6 +1,6 @@ # Template file for 'pass' pkgname=pass -version=1.7 +version=1.7.1 revision=1 wrksrc="password-store-${version}" noarch=yes @@ -12,7 +12,7 @@ maintainer="Eivind Uggedal " license="GPL-2" homepage="http://www.passwordstore.org/" distfiles="http://git.zx2c4.com/password-store/snapshot/password-store-${version}.tar.xz" -checksum=161ac3bd3c452a97f134aa7aa4668fe3f2401c839fd23c10e16b8c0ae4e15500 +checksum=f6d2199593398aaefeaa55e21daddfb7f1073e9e096af6d887126141e99d9869 passmenu_package() { short_desc="A dmenu-based interface to pass" diff --git a/srcpkgs/passwordsafe/patches/passwordsafe-0.99-fix-resource-paths.patch b/srcpkgs/passwordsafe/patches/passwordsafe-0.99-fix-resource-paths.patch index 90a27c7d10c..0c5e7a4bbb0 100644 --- a/srcpkgs/passwordsafe/patches/passwordsafe-0.99-fix-resource-paths.patch +++ b/srcpkgs/passwordsafe/patches/passwordsafe-0.99-fix-resource-paths.patch @@ -1,15 +1,19 @@ ---- src/os/unix/dir.cpp.orig 2016-07-03 20:48:33.000000000 +0200 -+++ src/os/unix/dir.cpp 2016-07-20 21:03:49.299919267 +0200 -@@ -174,10 +174,10 @@ - - stringT pws_os::getxmldir(void) - { +--- src/os/unix/dir.cpp.orig ++++ src/os/unix/dir.cpp +@@ -176,7 +176,7 @@ + #ifdef __FreeBSD__ + return _S("/usr/local/share/pwsafe/xml/"); + #else - return _S("/usr/share/pwsafe/xml/"); + return _S("/usr/share/passwordsafe/xml/"); + #endif } - stringT pws_os::gethelpdir(void) - { +@@ -185,6 +185,6 @@ + #ifdef __FreeBSD__ + return _S("/usr/local/share/doc/passwordsafe/help/"); + #else - return _S("/usr/share/doc/passwordsafe/help/"); + return _S("/usr/share/passwordsafe/help/"); + #endif } diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template index 7b3213acbb3..506d7f2aab9 100644 --- a/srcpkgs/passwordsafe/template +++ b/srcpkgs/passwordsafe/template @@ -1,6 +1,6 @@ # Template file for 'passwordwsafe' pkgname=passwordsafe -version="1.01BETA" +version="1.02BETA" revision=1 wrksrc="pwsafe-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="Rui Abreu Ferreira " license="Artistic-2.0" homepage="http://pwsafe.org" distfiles="https://github.com/pwsafe/pwsafe/archive/${version}.tar.gz>pwsafe-${version}.tar.gz" -checksum=dc1e7e012009309f57a8611adad9ec62fdafe5b326f66dd0cefe2b5988ee52aa +checksum=78d5970e8de2b28584ebdf6a319dd484e733afea06d1b3d15ac80bf454b39ccc # wxWidgets is nocross nocross=yes diff --git a/srcpkgs/pavucontrol-qt/template b/srcpkgs/pavucontrol-qt/template index 9cc8a42c568..5cbcd63187d 100644 --- a/srcpkgs/pavucontrol-qt/template +++ b/srcpkgs/pavucontrol-qt/template @@ -1,7 +1,7 @@ # Template file for 'pavucontrol-qt' pkgname=pavucontrol-qt version=0.2.0 -revision=2 +revision=3 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" hostmakedepends="pkg-config xdg-user-dirs" @@ -12,3 +12,7 @@ license="LGPL-2.1" homepage="http://lxqt.org/" distfiles="https://github.com/lxde/pavucontrol-qt/releases/download/${version}/pavucontrol-qt-${version}.tar.xz" checksum=d60d2dfb0740f4f70030a8f57fc06ef0380989f8a57da223d0a9e28557da02cd + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-host-tools qt5-tools-devel" +fi diff --git a/srcpkgs/pd/template b/srcpkgs/pd/template index 57d9f499622..86018015601 100644 --- a/srcpkgs/pd/template +++ b/srcpkgs/pd/template @@ -9,7 +9,7 @@ configure_args="--enable-alsa --enable-jack --disable-portaudio --enable-fftw" hostmakedepends="automake libtool pkg-config" makedepends="alsa-lib-devel jack-devel tk-devel fftw-devel" short_desc="The Pure Data real-time music and multimedia environment" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="BSD" homepage="http://msp.ucsd.edu/software.html" distfiles="http://msp.ucsd.edu/Software/pd-$_ver.src.tar.gz" diff --git a/srcpkgs/pdf2htmlEX/template b/srcpkgs/pdf2htmlEX/template index 8027676c31d..2f0e5fa25bf 100644 --- a/srcpkgs/pdf2htmlEX/template +++ b/srcpkgs/pdf2htmlEX/template @@ -1,7 +1,7 @@ # Template file for 'pdf2htmlEX' pkgname=pdf2htmlEX version=0.14.6 -revision=10 +revision=11 build_style=cmake hostmakedepends="pkg-config" makedepends="poppler-devel cairo-devel fontforge-devel python-devel pango-devel libspiro-devel" diff --git a/srcpkgs/pdfgrep/template b/srcpkgs/pdfgrep/template index d417ee3b516..cb3d59f1f29 100644 --- a/srcpkgs/pdfgrep/template +++ b/srcpkgs/pdfgrep/template @@ -1,13 +1,13 @@ # Template file for 'pdfgrep' pkgname=pdfgrep -version=2.0 +version=2.0.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="poppler-cpp-devel pcre-devel libgcrypt-devel" +makedepends="libgcrypt-devel pcre-devel poppler-cpp-devel" short_desc="A commandline utility to search text in PDF files" -maintainer="Lukas Braun " +maintainer="Leah Neukirchen " license="GPL-2" homepage="https://pdfgrep.org" distfiles="http://pdfgrep.org/download/pdfgrep-${version}.tar.gz" -checksum=2636da1f3157722640170f4469b574835b1c834c71237a4c3ca00197e31a89b4 +checksum=0370d744b3072d47383dbed2cb9c8b0b64b83c084da5a8961f8d4bc7669e941e diff --git a/srcpkgs/pdfpc/template b/srcpkgs/pdfpc/template index 2975f53284d..e7146001aba 100644 --- a/srcpkgs/pdfpc/template +++ b/srcpkgs/pdfpc/template @@ -1,6 +1,6 @@ # Template file for 'pdfpc' pkgname=pdfpc -version=4.0.5 +version=4.0.6 revision=1 build_style=cmake hostmakedepends="pkg-config vala libgee08-devel" @@ -10,4 +10,4 @@ maintainer="Aaron Marcher " license="GPL-2" homepage="https://pdfpc.github.io/" distfiles="https://github.com/pdfpc/pdfpc/archive/v${version}.tar.gz>pdfpc-${version}.tar.gz" -checksum=dc2c333082b3e5294741d6bf184b04fd60962fed64956d2b63dea4ca51f32a65 +checksum=42b6bd421e977a98cf00d688da7b392b8d8be423eb56ea7ca929c3c0334f8aa4 diff --git a/srcpkgs/pdftk/template b/srcpkgs/pdftk/template index a3567f3800d..1bb801ce254 100644 --- a/srcpkgs/pdftk/template +++ b/srcpkgs/pdftk/template @@ -8,7 +8,7 @@ hostmakedepends="unzip gcc-gcj" makedepends="libgcj-devel" nocross=yes short_desc="Command-line tool for working with PDFs" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://www.pdflabs.com/tools/pdftk-server/" distfiles="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${pkgname}-${version}-src.zip" diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template index 5b89d0dbf47..1f13abcdcb8 100644 --- a/srcpkgs/peco/template +++ b/srcpkgs/peco/template @@ -1,7 +1,7 @@ # Template file for 'peco' pkgname=peco -version=0.5.0 -revision=1 +version=0.5.1 +revision=2 build_style=go go_import_path="github.com/peco/peco" go_package="${go_import_path}/cmd/peco" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/peco/peco" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" -checksum=079a7e1df392b2dd3dedcdca2de7e661c84ff0ae7c262c37393a1704d571b058 +checksum=1acbf8f7f077208a8d4406a37be88783432455d6ff905e0a19168c7c2a34f1c8 post_install() { vlicense LICENSE diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template index 64af1d0151e..9a1407832ea 100644 --- a/srcpkgs/pen/template +++ b/srcpkgs/pen/template @@ -1,7 +1,7 @@ # Template file for 'pen' pkgname=pen version=0.34.0 -revision=1 +revision=2 build_style=gnu-configure makedepends="geoip-devel libressl-devel" configure_args="--with-docdir=/usr/share/doc/pen" diff --git a/srcpkgs/perl-AnyEvent-I3/template b/srcpkgs/perl-AnyEvent-I3/template index 27b3d23e24f..e0c98868fca 100644 --- a/srcpkgs/perl-AnyEvent-I3/template +++ b/srcpkgs/perl-AnyEvent-I3/template @@ -1,15 +1,16 @@ # Template file for 'perl-AnyEvent-I3' pkgname=perl-AnyEvent-I3 -version=0.16 +version=0.17 revision=1 wrksrc="${pkgname/perl-/}-${version}" noarch=yes build_style=perl-module -hostmakedepends="perl" -depends="perl-JSON-XS perl-AnyEvent" +hostmakedepends="perl-JSON-XS perl-AnyEvent" +makedepends="${hostmakedepends}" +depends="${makedepends}" short_desc="AnyEvent::I3 - communicate with the i3 window manager" maintainer="Oliver Kiddle " license="Artistic, GPL-1" homepage="https://metacpan.org/release/AnyEvent-I3" distfiles="${CPAN_SITE}/AnyEvent/AnyEvent-I3-${version}.tar.gz" -checksum=2fc2010011462b6ac9f64dbc5049c5a4298020b9f0f3340d4d22d95a77519be3 +checksum=5382c984c9f138395f29f0c00af81aa0c8f4b765582055c73ede4b13f04a6d63 diff --git a/srcpkgs/perl-Bit-Vector/template b/srcpkgs/perl-Bit-Vector/template new file mode 100644 index 00000000000..557e84ebfc8 --- /dev/null +++ b/srcpkgs/perl-Bit-Vector/template @@ -0,0 +1,15 @@ +# Template build file for 'perl-Bit-Vector' +pkgname=perl-Bit-Vector +version=7.4 +revision=1 +wrksrc="Bit-Vector-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl perl-Carp-Clan" +depends="${makedepends}" +short_desc="Efficient bit vector, set of integers math library" +maintainer="Helmut Pozimski " +homepage="http://search.cpan.org/~stbey/Bit-Vector/" +license="Artistic" +distfiles="${CPAN_SITE}/Bit/Bit-Vector-${version}.tar.gz" +checksum="3c6daa671fecfbc35f92a9385b563d65f50dfc6bdc8b4805f9ef46c0d035a926" diff --git a/srcpkgs/perl-Carp-Clan/template b/srcpkgs/perl-Carp-Clan/template new file mode 100644 index 00000000000..2b70db50da6 --- /dev/null +++ b/srcpkgs/perl-Carp-Clan/template @@ -0,0 +1,16 @@ +# Template build file for 'perl-Carp-Clan' +pkgname=perl-Carp-Clan +version=6.06 +revision=1 +wrksrc="Carp-Clan-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl perl-Test-Exception" +depends="${makedepends}" +noarch=yes +short_desc="Report errors from perspective of caller of a clan of modules" +maintainer="Helmut Pozimski " +homepage="http://search.cpan.org/~kentnl/Carp-Clan/" +license="Artistic, GPL-1" +distfiles="${CPAN_SITE}/Carp/Carp-Clan-${version}.tar.gz" +checksum="ea4ac8f611354756d43cb369880032901e9cc4cc7e0bebb7b647186dac00c9d4" diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template index 1a114e85aa6..3841bbc3c3a 100644 --- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template +++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template @@ -1,7 +1,7 @@ # Template file for 'perl-Crypt-OpenSSL-Bignum' pkgname=perl-Crypt-OpenSSL-Bignum -version=0.07 -revision=1 +version=0.08 +revision=2 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" @@ -12,4 +12,4 @@ maintainer="Juan RP " homepage="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Crypt/Crypt-OpenSSL-Bignum-${version}.tar.gz" -checksum=2ddae11eec0436f67fe7a1fcef8226a5275d7ad98fdc7802c6e9484b9a4a886d +checksum=88c161b4f09c2f4b66dcdb1ffea1e2d3257b690b9e29aeed397f05e71ab1553d diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template index 4fec0ddd761..e23dbacccd4 100644 --- a/srcpkgs/perl-Crypt-OpenSSL-Random/template +++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template @@ -1,7 +1,7 @@ # Template file for 'perl-Crypt-OpenSSL-Random' pkgname=perl-Crypt-OpenSSL-Random version=0.11 -revision=4 +revision=5 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template index edafee453b5..0500dcf2b1d 100644 --- a/srcpkgs/perl-DBD-mysql/template +++ b/srcpkgs/perl-DBD-mysql/template @@ -1,10 +1,10 @@ # Template file for 'perl-DBD-mysql' pkgname=perl-DBD-mysql -version=4.041 -revision=1 +version=4.042 +revision=3 wrksrc="DBD-mysql-${version}" build_style=perl-module -hostmakedepends="perl perl-DBI" +hostmakedepends="perl perl-DBI perl-Devel-CheckLib" makedepends="${hostmakedepends} libmysqlclient-devel libressl-devel zlib-devel" depends="perl-DBI" short_desc="DBD::mysql - MySQL DBI driver" @@ -12,4 +12,5 @@ maintainer="Diogo Leal " homepage="http://search.cpan.org/dist/DBD-mysql/" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/DBD/DBD-mysql-$version.tar.gz" -checksum=4777de11c464b515db9da95c08c225900d0594b65ba3256982dc21f9f9379040 +checksum=dadb6884788dc3fdf40b13b72d8c60d5a83680cc2aeec7515c3e5999e064b455 +nocross="https://api.travis-ci.org/jobs/210781623/log.txt" diff --git a/srcpkgs/perl-Date-Calc/template b/srcpkgs/perl-Date-Calc/template new file mode 100644 index 00000000000..a2191db63f0 --- /dev/null +++ b/srcpkgs/perl-Date-Calc/template @@ -0,0 +1,16 @@ +# Template build file for 'perl-Date-Calc' +pkgname=perl-Date-Calc +version=6.4 +revision=1 +wrksrc="Date-Calc-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl perl-Carp-Clan perl-Bit-Vector" +depends="${makedepends}" +noarch=yes +short_desc="Date::Calc - Gregorian calendar date calculations" +maintainer="Helmut Pozimski " +homepage="http://search.cpan.org/~stbey/Date-Calc/" +license="Artistic, GPL-2, LGPL-2" +distfiles="${CPAN_SITE}/Date/Date-Calc-${version}.tar.gz" +checksum="7ce137b2e797b7c0901f3adf1a05a19343356cd1f04676aa1c56a9f624f859ad" diff --git a/srcpkgs/perl-DateTime-Locale/template b/srcpkgs/perl-DateTime-Locale/template index d824a85028a..d4747dd8c21 100644 --- a/srcpkgs/perl-DateTime-Locale/template +++ b/srcpkgs/perl-DateTime-Locale/template @@ -1,10 +1,10 @@ # Template file for 'perl-DateTime-Locale' pkgname=perl-DateTime-Locale -version=1.14 +version=1.16 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module -hostmakedepends="perl" +hostmakedepends="perl perl-File-ShareDir-Install" makedepends="${hostmakedepends}" depends="perl perl-List-MoreUtils perl-Params-Validate" noarch=yes @@ -13,4 +13,4 @@ maintainer="John Regan " homepage="http://search.cpan.org/dist/DateTime-Locale/" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-${version}.tar.gz" -checksum=41a84e5bcdca87e01c8edb82bcc089df70f201c894c7def715259624a8306cdd +checksum=dfaf4c42149c0622e80721773b8d7229d7785280503585895c9fe9f51e076cfe diff --git a/srcpkgs/perl-DateTime-TimeZone/template b/srcpkgs/perl-DateTime-TimeZone/template index 4899f2e569a..10dee7181d8 100644 --- a/srcpkgs/perl-DateTime-TimeZone/template +++ b/srcpkgs/perl-DateTime-TimeZone/template @@ -1,6 +1,6 @@ # Template file for 'perl-DateTime-TimeZone' pkgname=perl-DateTime-TimeZone -version=2.10 +version=2.11 revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" @@ -13,4 +13,4 @@ maintainer="John Regan " homepage="http://search.cpan.org/dist/DateTime-TimeZone" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-$version.tar.gz" -checksum=671064fba37cbdfa1d1b0bd6afed5087f3deea99cceaa8217845573ee0591580 +checksum=a7c0b2581d2bf6d5cc535364099a67678a9f6ee608e5042dff9ef9c4c577ea6b diff --git a/srcpkgs/perl-Devel-CheckLib/template b/srcpkgs/perl-Devel-CheckLib/template new file mode 100644 index 00000000000..7df54c59f68 --- /dev/null +++ b/srcpkgs/perl-Devel-CheckLib/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Devel-CheckLib' +pkgname=perl-Devel-CheckLib +version=1.10 +revision=1 +noarch=yes +build_style=perl-module +wrksrc="Devel-CheckLib-${version}" +hostmakedepends="perl-IO-CaptureOutput" +makedepends="${hostmakedepends}" +depends="perl" +short_desc="Module to check for other perl modules" +maintainer="Sir_Boops " +homepage="http://search.cpan.org/dist/Devel-CheckLib/" +license="Artistic, GPL-1" +distfiles="${CPAN_SITE}/Devel/Devel-CheckLib-${version}.tar.gz" +checksum=1633f10bcbe86cf65721813d69264c4f3a426a9d741bc041647c0887bd41ad14 diff --git a/srcpkgs/perl-Exporter-Tiny/template b/srcpkgs/perl-Exporter-Tiny/template index e50b3fb1bb9..3c45a133a9e 100644 --- a/srcpkgs/perl-Exporter-Tiny/template +++ b/srcpkgs/perl-Exporter-Tiny/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Exporter-Tiny' pkgname=perl-Exporter-Tiny -version=0.042 +version=0.044 revision=1 wrksrc="Exporter-Tiny-$version" build_style=perl-module @@ -8,9 +8,9 @@ hostmakedepends="perl" makedepends="perl" depends="perl" short_desc="Exporter::Tiny - an exporter with the features of Sub::Exporter" -maintainer="Orphaned " +maintainer="Leah Neukirchen " homepage="http://search.cpan.org/~tobyink/Exporter-Tiny/" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Exporter/Exporter-Tiny-${version}.tar.gz" -checksum=8f1622c5ebbfbcd519ead81df7917e48cb16cc527b1c46737b0459c3908a023f +checksum=eda868cc2da094b685ceace4245b83de11f439feb98e0ec8246cfbb9109c88ab noarch=yes diff --git a/srcpkgs/perl-File-ShareDir-Install/template b/srcpkgs/perl-File-ShareDir-Install/template new file mode 100644 index 00000000000..362f00efc05 --- /dev/null +++ b/srcpkgs/perl-File-ShareDir-Install/template @@ -0,0 +1,20 @@ +# Template build file for 'perl-File-ShareDir-Install'. +pkgname=perl-File-ShareDir-Install +version=0.11 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends}" +depends="${makedepends}" +noarch=yes +short_desc="File::ShareDir::Install - Install shared files" +maintainer="Leah Neukirchen " +homepage="http://search.cpan.org/dist/File-ShareDir-Install" +license="Artistic, GPL-1" +distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-$version.tar.gz" +checksum=32bf8772e9fea60866074b27ff31ab5bc3f88972d61915e84cbbb98455e00cc8 + +pre_configure() { + export PERL_MM_FALLBACK_SILENCE_WARNING=yes +} diff --git a/srcpkgs/perl-Gtk2/template b/srcpkgs/perl-Gtk2/template index e1e1f5ee860..d772f236b66 100644 --- a/srcpkgs/perl-Gtk2/template +++ b/srcpkgs/perl-Gtk2/template @@ -1,15 +1,15 @@ # Template file for 'perl-Gtk2' pkgname=perl-Gtk2 -version=1.2499 +version=1.24991 revision=1 wrksrc="Gtk2-$version" build_style=perl-module hostmakedepends="perl" makedepends="perl-ExtUtils-Depends perl-ExtUtils-PkgConfig gtk+-devel perl-Pango" -depends="perl>=5.20 perl-Pango" +depends="perl perl-Pango" short_desc="Perl bindings for Gtk2" maintainer="Juan RP " homepage="http://gtk2-perl.sourceforge.net/" license="LGPL-2.1" distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Gtk2-$version.tar.gz" -checksum=fd06ef8ff14ba75574963295e3ad8978cfb2671399a20cf6b62e644ca50335f8 +checksum=b3b3e69cb041b29dc0bc7d221f7bc5d08fce2b5cb695dff416209722303fc9e7 diff --git a/srcpkgs/perl-HTTP-Cookies/template b/srcpkgs/perl-HTTP-Cookies/template index 48764007487..ad691a110dd 100644 --- a/srcpkgs/perl-HTTP-Cookies/template +++ b/srcpkgs/perl-HTTP-Cookies/template @@ -1,7 +1,7 @@ # Template build file for 'perl-HTTP-Cookies'. pkgname=perl-HTTP-Cookies -version=6.01 -revision=4 +version=6.03 +revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://search.cpan.org/dist/HTTP-Cookies" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/HTTP/HTTP-Cookies-$version.tar.gz" -checksum=f5d3ade383ce6389d80cb0d0356b643af80435bb036afd8edce335215ec5eb20 +checksum=05051f2761832317554b0be4b74012c35fd278f6af2c9d218f055e0de891457c diff --git a/srcpkgs/perl-HTTP-Server-Simple/template b/srcpkgs/perl-HTTP-Server-Simple/template index 145f53d6140..8cbb3c9e1d1 100644 --- a/srcpkgs/perl-HTTP-Server-Simple/template +++ b/srcpkgs/perl-HTTP-Server-Simple/template @@ -1,6 +1,6 @@ # Template build file for 'perl-HTTP-Server-Simple'. pkgname=perl-HTTP-Server-Simple -version=0.51 +version=0.52 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -9,8 +9,8 @@ makedepends="${hostmakedepends}" depends="${makedepends} perl-URI" noarch="yes" short_desc="HTTP::Server::Simple - Lightweight HTTP server" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " homepage="http://search.cpan.org/dist/HTTP-Server-Simple" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/HTTP/${pkgname/perl-/}-$version.tar.gz" -checksum=b9dc5c9f12c16ca39a96f0ede1e27a18a5594274ff8f583000788a7fca136dfb +checksum=d8939fa4f12bd6b8c043537fd0bf96b055ac3686b9cdd9fa773dca6ae679cb4c diff --git a/srcpkgs/perl-IO-CaptureOutput/template b/srcpkgs/perl-IO-CaptureOutput/template new file mode 100644 index 00000000000..b6aadb28914 --- /dev/null +++ b/srcpkgs/perl-IO-CaptureOutput/template @@ -0,0 +1,15 @@ +# Template file for 'perl-IO-CaptureOutput' +pkgname=perl-IO-CaptureOutput +version=1.1104 +revision=1 +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends}" +depends="perl" +short_desc="Capture STOUT/ERR from perl code" +maintainer="Sir_Boops " +homepage="http://search.cpan.org/dist/IO-CaptureOutput/" +license="Artistic, GPL-1" +distfiles="${CPAN_SITE}/IO/IO-CaptureOutput-$version.tar.gz" +checksum=fcc732fcb438f97a72b30e8c7796484bef2562e374553b207028e2fbf73f8330 +wrksrc="IO-CaptureOutput-${version}" diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template index e1b54c7b8be..0f9e56bab66 100644 --- a/srcpkgs/perl-IO-Socket-SSL/template +++ b/srcpkgs/perl-IO-Socket-SSL/template @@ -1,6 +1,6 @@ # Template build file for 'perl-IO-Socket-SSL'. pkgname=perl-IO-Socket-SSL -version=2.047 +version=2.048 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="Leah Neukirchen " homepage="http://search.cpan.org/dist/IO-Socket-SSL/" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-$version.tar.gz" -checksum=c5ad8e14174863194ad43c23a38c77e0b202a989cac9d3e13fb30efcf1d41158 +checksum=b0f2199adf0f688a11357151fb47cd91b417a73d910539d4d48b5ac7e267ee07 diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template index d7f7492bd78..7165b08f6eb 100644 --- a/srcpkgs/perl-LWP/template +++ b/srcpkgs/perl-LWP/template @@ -1,13 +1,13 @@ # Template file for 'perl-LWP' pkgname=perl-LWP -version=6.15 +version=6.25 revision=1 wrksrc="libwww-perl-$version" build_style=perl-module hostmakedepends=" perl perl-URI perl-LWP-MediaTypes perl-Encode-Locale perl-HTTP-Message perl-File-Listing perl-HTTP-Negotiate perl-HTTP-Daemon perl-Net-HTTP - perl-HTTP-Cookies perl-WWW-RobotRules" + perl-HTTP-Cookies perl-WWW-RobotRules perl-Try-Tiny" makedepends="${hostmakedepends}" depends="${makedepends}" noarch=yes @@ -16,4 +16,4 @@ maintainer="Juan RP " homepage="http://search.cpan.org/dist/libwww-perl/lib/LWP.pm" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz" -checksum=6f349d45c21b1ec0501c4437dfcb70570940e6c3d5bff783bd91d4cddead8322 +checksum=49c0110ef38d27a8963a082cf61ce245447871676b85ec9f2b9b41d6c2f37f33 diff --git a/srcpkgs/perl-List-MoreUtils-XS/template b/srcpkgs/perl-List-MoreUtils-XS/template new file mode 100644 index 00000000000..e3c5d4f26d0 --- /dev/null +++ b/srcpkgs/perl-List-MoreUtils-XS/template @@ -0,0 +1,16 @@ +# Template build file for 'perl-List-MoreUtils-XS'. +pkgname=perl-List-MoreUtils-XS +version=0.418 +revision=1 +wrksrc="List-MoreUtils-XS-$version" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl perl-Exporter-Tiny" +depends="${makedepends} perl-List-MoreUtils" +short_desc="List::MoreUtils::XS - Provide compiled List::MoreUtils functions" +maintainer="Helmut Pozimski " +homepage="http://search.cpan.org/~rehsack/List-MoreUtils-XS/" +license="Apache 2.0, Artistic, GPL-1" +conflicts="perl-List-MoreUtils<0.419_1" +distfiles="${CPAN_SITE}/List/List-MoreUtils-XS-${version}.tar.gz" +checksum=0aa41a90337bb1ec48db50e5c73875b960685ff4dd49c26ed39dea0d52752d4f diff --git a/srcpkgs/perl-List-MoreUtils/template b/srcpkgs/perl-List-MoreUtils/template index 9f959c232ae..68d73b42762 100644 --- a/srcpkgs/perl-List-MoreUtils/template +++ b/srcpkgs/perl-List-MoreUtils/template @@ -1,15 +1,16 @@ # Template build file for 'perl-List-MoreUtils'. pkgname=perl-List-MoreUtils -version=0.416 +version=0.419 revision=1 wrksrc="List-MoreUtils-$version" build_style=perl-module hostmakedepends="perl" makedepends="perl perl-Exporter-Tiny" depends="${makedepends}" +noarch=yes short_desc="List::MoreUtils - Provide the stuff missing in List::Util" maintainer="Orphaned " homepage="http://search.cpan.org/~rehsack/List-MoreUtils/" -license="Artistic, GPL-1" +license="Apache 2.0, Artistic, GPL-1" distfiles="${CPAN_SITE}/List/List-MoreUtils-${version}.tar.gz" -checksum=d2ce2f93a4fba8e20a602eba2405d08f5b28c23764a5273fb0abbc413f74c5a5 +checksum=5f8e65608f5dc583faa6a703d19d277ad46dfc1816e51f8ff34fb8322ed48615 diff --git a/srcpkgs/perl-MIME-tools/template b/srcpkgs/perl-MIME-tools/template index 17686f5c75e..028cf39b561 100644 --- a/srcpkgs/perl-MIME-tools/template +++ b/srcpkgs/perl-MIME-tools/template @@ -1,6 +1,6 @@ # Template build file for 'perl-MIME-tools'. pkgname=perl-MIME-tools -version=5.508 +version=5.509 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://search.cpan.org/dist/MIME-tools/" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/MIME/${pkgname/perl-/}-$version.tar.gz" -checksum=adffe86cd0b045d5a1553f48e72e89b9834fbda4f334c98215995b98cb17c917 +checksum=64579f0c923d81d9a2194586e47c3475519e2646e4b5c102a8920759facf6973 diff --git a/srcpkgs/perl-Math-BigInt-GMP/template b/srcpkgs/perl-Math-BigInt-GMP/template index 3598a2f6f68..54e1d768f48 100644 --- a/srcpkgs/perl-Math-BigInt-GMP/template +++ b/srcpkgs/perl-Math-BigInt-GMP/template @@ -1,7 +1,7 @@ # Template file for 'perl-Math-BigInt-GMP' pkgname=perl-Math-BigInt-GMP -version=1.51 -revision=3 +version=1.6004 +revision=1 wrksrc="Math-BigInt-GMP-${version}" build_style=perl-module hostmakedepends="perl gmp-devel" @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://search.cpan.org/dist/Math-BigInt-GMP" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Math/Math-BigInt-GMP-${version}.tar.gz" -checksum=77ac59cc5af8a2c88ccc27098ed8c4b301d2b5ed5b9c1f12eb8961844f119475 +checksum=236229dd7d323f142d8b24b83d21061152432096be7aea026002b8dbbba733f2 post_extract() { sed -i /check_lib_or/d Makefile.PL diff --git a/srcpkgs/perl-Module-Build/template b/srcpkgs/perl-Module-Build/template index 665aff7a996..a491ea6e1df 100644 --- a/srcpkgs/perl-Module-Build/template +++ b/srcpkgs/perl-Module-Build/template @@ -1,6 +1,6 @@ # Template file for 'perl-Module-Build' pkgname=perl-Module-Build -version=0.4220 +version=0.4222 revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" @@ -9,8 +9,12 @@ hostmakedepends="perl" makedepends="${hostmakedepends}" depends="${makedepends}" short_desc="Module::Build - Build and install Perl modules" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " homepage="http://search.cpan.org/dist/Module-Build/" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Module/${pkgname/perl-/}-${version}.tar.gz" -checksum=fb1207c7e799366f7a8adda3f135bf8141c4d6068505650d4db2b2d3ce34b5a2 +checksum=e74b45d9a74736472b74830599cec0d1123f992760f9cd97104f94bee800b160 + +pre_configure() { + unset XBPS_CROSS_BASE +} diff --git a/srcpkgs/perl-Net-DNS/template b/srcpkgs/perl-Net-DNS/template index dbda7b0a3b3..951032eb236 100644 --- a/srcpkgs/perl-Net-DNS/template +++ b/srcpkgs/perl-Net-DNS/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Net-DNS'. pkgname=perl-Net-DNS -version=1.08 +version=1.09 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -12,4 +12,4 @@ homepage="https://metacpan.org/pod/Net::DNS" license="Artistic, GPL-1" maintainer="Enno Boland " distfiles="${CPAN_SITE}/Net/Net-DNS-${version}.tar.gz" -checksum=56113a5604d1d47a2e0b35e01f5ac0a2af9e5275b815549d032a46195637c7a1 +checksum=fec9b0c74b8fea5e41914339281ffd773ddd0ae3b5cfd532d2ac0c09618b7c0a diff --git a/srcpkgs/perl-Net-HTTP/template b/srcpkgs/perl-Net-HTTP/template index b7bbea4b3e4..fc9d2798efa 100644 --- a/srcpkgs/perl-Net-HTTP/template +++ b/srcpkgs/perl-Net-HTTP/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Net-HTTP'. pkgname=perl-Net-HTTP -version=6.12 +version=6.13 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://search.cpan.org/dist/Net-HTTP" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Net/Net-HTTP-${version}.tar.gz" -checksum=8565aff76b3d09084642f3a83c654fb4ced8220e8e19d35c78b661519b4c1be6 +checksum=2d25e696c5239c8a4aa5a97f07ecaa77cf908cc72bbeef7fa6573570af31ce87 diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template index 83293a67d79..c1474c4c319 100644 --- a/srcpkgs/perl-Net-SSH2/template +++ b/srcpkgs/perl-Net-SSH2/template @@ -1,7 +1,7 @@ # Template file for 'perl-Net-SSH2' pkgname=perl-Net-SSH2 version=0.63 -revision=1 +revision=2 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib" diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template index f6cab84e569..2487519c7dd 100644 --- a/srcpkgs/perl-Net-SSLeay/template +++ b/srcpkgs/perl-Net-SSLeay/template @@ -1,15 +1,15 @@ # Template build file for 'perl-Net-SSLeay'. pkgname=perl-Net-SSLeay -version=1.80 -revision=1 +version=1.81 +revision=2 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl libressl" makedepends="perl zlib-devel libressl-devel" depends="perl" short_desc="Net::SSLeay - Perl extension for using OpenSSL" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " homepage="http://search.cpan.org/dist/Net-SSLeay/" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Net/${pkgname/perl-/}-$version.tar.gz" -checksum=a541a66d59fc5f9bb7af09d3a0b68305e4c43ba9488b12915728fd282ea01b93 +checksum=00cbb6174e628b42178e1445c9fd5a3c5ae2cfd6a5a43e03610ba14786f21b7d diff --git a/srcpkgs/perl-Sub-Uplevel/template b/srcpkgs/perl-Sub-Uplevel/template index bbc310e18c4..bb065675273 100644 --- a/srcpkgs/perl-Sub-Uplevel/template +++ b/srcpkgs/perl-Sub-Uplevel/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Sub-Uplevel'. pkgname=perl-Sub-Uplevel -version=0.2600 +version=0.2800 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -9,8 +9,8 @@ makedepends="${hostmakedepends}" depends="${makedepends}" noarch="yes" short_desc="Sub::Uplevel - apparently run a function in a higher stack frame" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " homepage="http://search.cpan.org/dist/Sub-Uplevel" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-$version.tar.gz" -checksum=e833e29b7d6037efee6d7ee2056cbb8aaaa908e4f5451969043093eb2917a166 +checksum=b4f3f63b80f680a421332d8851ddbe5a8e72fcaa74d5d1d98f3c8cc4a3ece293 diff --git a/srcpkgs/perl-Template-Toolkit/template b/srcpkgs/perl-Template-Toolkit/template index 9eea9d30430..fd67c3de9f1 100644 --- a/srcpkgs/perl-Template-Toolkit/template +++ b/srcpkgs/perl-Template-Toolkit/template @@ -1,6 +1,6 @@ # Template file for 'perl-Template-Toolkit' pkgname=perl-Template-Toolkit -version=2.26 +version=2.27 revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" @@ -9,8 +9,8 @@ hostmakedepends="perl" makedepends="${hostmakedepends}" depends="${makedepends}" short_desc="Template Toolkit" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " homepage="http://search.cpan.org/dist/Template-Toolkit" license="Artistic, GPL-1" distfiles="http://search.cpan.org/CPAN/authors/id/A/AB/ABW/Template-Toolkit-${version}.tar.gz" -checksum=e7e1cf36026f1ef96d8233e18a3fb39e1eafe9109edc639ecf25b20651cd76be +checksum=1311a403264d0134c585af0309ff2a9d5074b8ece23ece5660d31ec96bf2c6dc diff --git a/srcpkgs/perl-Test-Script/template b/srcpkgs/perl-Test-Script/template index 163e7190587..984ff3aa2d2 100644 --- a/srcpkgs/perl-Test-Script/template +++ b/srcpkgs/perl-Test-Script/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Test-Script'. pkgname=perl-Test-Script -version=1.14 +version=1.16 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=perl-module @@ -12,5 +12,5 @@ maintainer="Enguerrand de Rochefort " homepage="https://metacpan.org/pod/Test::Script" license="GPL-1, Artistic" distfiles="$CPAN_SITE/Test/Test-Script-${version}.tar.gz" -checksum=3f29824e101e4402f4417427b157ee7069ba5e1268315386f72452938693cd99 -nocross="https://build.voidlinux.eu/builders/armv6l_builder/builds/27930/steps/shell_3/logs/stdio" +checksum=9a38d46d8c19d92330d5a6be2547ed709ba6f2fc2758556d9e191754f264df06 +nocross="https://api.travis-ci.org/jobs/209362491/log.txt" diff --git a/srcpkgs/perl-Text-Glob/template b/srcpkgs/perl-Text-Glob/template index 3a2bc72d052..f26f28def5e 100644 --- a/srcpkgs/perl-Text-Glob/template +++ b/srcpkgs/perl-Text-Glob/template @@ -1,6 +1,6 @@ # Template file for 'perl-Text-Glob' pkgname=perl-Text-Glob -version=0.10 +version=0.11 revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" @@ -9,8 +9,8 @@ hostmakedepends="perl" makedepends="${hostmakedepends}" depends="${makedepends}" short_desc="Text::Glob - match globbing patterns against text" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " homepage="http://search.cpan.org/dist/Text-Glob" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Text/Text-Glob-${version}.tar.gz" -checksum=d0af0549a9dd1c70edcd3b1429ccc3702b79b873375b79cd2bdfe8870e337449 +checksum=069ccd49d3f0a2dedb115f4bdc9fbac07a83592840953d1fcdfc39eb9d305287 diff --git a/srcpkgs/perl-Time-Duration/template b/srcpkgs/perl-Time-Duration/template new file mode 100644 index 00000000000..edcd41606b6 --- /dev/null +++ b/srcpkgs/perl-Time-Duration/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Time-Duration' +pkgname=perl-Time-Duration +version=1.20 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +noarch=yes +hostmakedepends="perl" +makedepends="${hostmakedepends}" +depends="${makedepends}" +short_desc="rounded or exact English expression of durations" +maintainer="Michael Gehring " +license="Artistic, GPL-1" +homepage="http://search.cpan.org/dist/Time-Duration/" +distfiles="${CPAN_SITE}/Time/${pkgname/perl-/}-$version.tar.gz" +checksum=458205b528818e741757b2854afac5f9af257f983000aae0c0b1d04b5a9cbbb8 diff --git a/srcpkgs/perl-User-Identity/template b/srcpkgs/perl-User-Identity/template index f5bd10ca0a5..7dcb60551a1 100644 --- a/srcpkgs/perl-User-Identity/template +++ b/srcpkgs/perl-User-Identity/template @@ -1,7 +1,7 @@ # Template file for 'perl-User-Identity' pkgname=perl-User-Identity -version=0.96 -revision=2 +version=0.97 +revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="Alessio Sergi " homepage="http://search.cpan.org/dist/User-Identity/" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/User/${pkgname/perl-/}-${version}.tar.gz" -checksum=d67345753d36645d2b12914dead95fda0e71d2eecc69f41ea67fed6d032887ea +checksum=faf9bd2eac1e8279d8c2846dbeaf6c45ba254eb1f4903b319dcc34e04b20e1c9 diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template index 7ae150dc5be..eb979c444a9 100644 --- a/srcpkgs/perl-WWW-Mechanize/template +++ b/srcpkgs/perl-WWW-Mechanize/template @@ -1,6 +1,6 @@ # Template build file for 'perl-WWW-Mechanize'. pkgname=perl-WWW-Mechanize -version=1.83 +version=1.84 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -11,11 +11,11 @@ makedepends="${hostmakedepends}" depends="${makedepends}" noarch=yes short_desc="WWW::Mechanize - Handy web browsing in a Perl object" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " homepage="http://search.cpan.org/dist/WWW-Mechanize" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz" -checksum=4b5fe979e0d00418ba92efe40725f2ad22333ef311ca0ec98363409c870e8ce5 +checksum=15e0fdb30ade2e0a84a5c2f30b834fda2af74c1caf9891ae664751505a762f1a pre_configure() { unset configure_args diff --git a/srcpkgs/perl-XML-NamespaceSupport/template b/srcpkgs/perl-XML-NamespaceSupport/template index 5d3993f12aa..330193fabf1 100644 --- a/srcpkgs/perl-XML-NamespaceSupport/template +++ b/srcpkgs/perl-XML-NamespaceSupport/template @@ -1,7 +1,7 @@ # Template build file for 'perl-XML-NamespaceSupport'. pkgname=perl-XML-NamespaceSupport -version=1.11 -revision=4 +version=1.12 +revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" @@ -9,8 +9,8 @@ makedepends="${hostmakedepends}" depends="${makedepends}" noarch="yes" short_desc="Perl module to the SAX2 NamespaceSupport class" -homepage="http://search.cpan.org/~perigrin/XML-NamespaceSupport-1.11/" +homepage="http://search.cpan.org/~perigrin/XML-NamespaceSupport/" license="Artistic, GPL-1" maintainer="Juan RP " distfiles="${CPAN_SITE}/XML/XML-NamespaceSupport-$version.tar.gz" -checksum=6d8151f0a3f102313d76b64bfd1c2d9ed46bfe63a16f038e7d860fda287b74ea +checksum=47e995859f8dd0413aa3f22d350c4a62da652e854267aa0586ae544ae2bae5ef diff --git a/srcpkgs/perl-XML-SAX-Base/template b/srcpkgs/perl-XML-SAX-Base/template index edb9df7962c..bd68755d384 100644 --- a/srcpkgs/perl-XML-SAX-Base/template +++ b/srcpkgs/perl-XML-SAX-Base/template @@ -1,7 +1,7 @@ # Template build file for 'perl-XML-SAX'. pkgname=perl-XML-SAX-Base -version=1.08 -revision=4 +version=1.09 +revision=1 wrksrc="${pkgname#perl-}-$version" build_style=perl-module hostmakedepends="perl" @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://search.cpan.org/dist/XML-SAX-Base" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/XML/${pkgname#perl-}-${version}.tar.gz" -checksum=666270318b15f88b8427e585198abbc19bc2e6ccb36dc4c0a4f2d9807330219e +checksum=66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0 diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template index b37cfded6bb..c6b604ee1fb 100644 --- a/srcpkgs/perl/template +++ b/srcpkgs/perl/template @@ -1,8 +1,8 @@ # Template build file for 'perl'. pkgname=perl version=5.24.1 -revision=3 -_perl_cross_version=1.1.3 +revision=4 +_perl_cross_version=1.1.4 build_style=gnu-configure hostmakedepends="less" makedepends="zlib-devel bzip2-devel gdbm-devel db-devel" @@ -14,7 +14,7 @@ license="Artistic, GPL-1" distfiles="http://www.cpan.org/src/5.0/perl-${version}.tar.gz https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz" checksum="e6c185c9b09bdb3f1b13f678999050c639859a7ef39c8cad418448075f5918af - 181b24ff71815fb2c8065e6ea139d106796eee0964aebfd8081f0b7f69e0696d" + c840a327d5464ca271cac40d52e2d199330875527bf1003c28a6e550fb7bcc57" disable_parallel_build=yes # Before updating this package to a new major version, run ${FILESDIR}/provides.pl diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template index 46637404558..fd9dba02c7f 100644 --- a/srcpkgs/pev/template +++ b/srcpkgs/pev/template @@ -1,13 +1,15 @@ # Template file for 'pev' pkgname=pev -version=0.70 -revision=4 +version=0.80 +revision=3 wrksrc=${pkgname} build_style=gnu-makefile +make_build_args="prefix=/usr" +make_install_args="prefix=/usr" makedepends="libressl-devel pcre-devel" short_desc="The PE file analysis toolkit" maintainer="Diogo Leal " license="GPL-3" homepage="http://pev.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=250396a06930d60a92e9bc86d7afb543d899ba12c007d1be5d09802a02908202 +checksum=f68c8596f16d221d9a742812f6f728bcc739be90957bc1b00fbaa5943ffc5cfa diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template index 43f8c3b1f56..f8731b4ca76 100644 --- a/srcpkgs/pgadmin3/template +++ b/srcpkgs/pgadmin3/template @@ -1,7 +1,7 @@ # Template file for 'pgadmin3' pkgname=pgadmin3 version=1.22.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="ac_cv_path_WX_CONFIG=wx-config-3.0 --with-wx-version=3.0" makedepends="postgresql-libs-devel wxWidgets-devel libxslt-devel libressl-devel" diff --git a/srcpkgs/phantomjs/patches/gcc5-compile-fix.patch b/srcpkgs/phantomjs/patches/gcc5-compile-fix.patch new file mode 100644 index 00000000000..587cd6bd2bf --- /dev/null +++ b/srcpkgs/phantomjs/patches/gcc5-compile-fix.patch @@ -0,0 +1,14 @@ +--- src/qt/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp.orig 2015-01-24 08:19:52.000000000 +0600 ++++ src/qt/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp 2015-09-24 18:18:45.598322592 +0600 +@@ -1909,6 +1909,11 @@ + } + } + ++// Used in JSArray.cpp so we must instantiate explicit ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++ + void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) + { + VM& vm = exec->vm(); diff --git a/srcpkgs/phantomjs/template b/srcpkgs/phantomjs/template index 0316da9c32e..e9a572a06eb 100644 --- a/srcpkgs/phantomjs/template +++ b/srcpkgs/phantomjs/template @@ -1,7 +1,7 @@ # Template file for 'phantomjs' pkgname=phantomjs version=2.0.0 -revision=5 +revision=7 hostmakedepends="unzip flex ruby gperf python perl pkg-config" makedepends=" fontconfig-devel icu-devel libressl-devel libpng-devel diff --git a/srcpkgs/php/patches/php-fpm.patch b/srcpkgs/php/patches/php-fpm.patch index b477fd52183..53edcbc2512 100644 --- a/srcpkgs/php/patches/php-fpm.patch +++ b/srcpkgs/php/patches/php-fpm.patch @@ -1,13 +1,13 @@ ---- ./sapi/fpm/Makefile.frag.orig 2016-02-28 18:32:56.357946535 -0500 -+++ ./sapi/fpm/Makefile.frag 2016-02-28 18:33:05.809945555 -0500 -@@ -12,8 +12,8 @@ - - @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \ - $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d || : -- @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || : -- @$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default || : -+ @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || : -+ @$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf || : - +--- sapi/fpm/Makefile.frag.orig 2017-04-15 23:58:56.965737425 +0200 ++++ sapi/fpm/Makefile.frag 2017-04-16 00:00:57.814831649 +0200 +@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH) + else \ + echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \ + $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \ +- $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \ +- $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \ ++ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \ ++ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \ + fi + @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" - @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 diff --git a/srcpkgs/php/template b/srcpkgs/php/template index 92bd7a0bd8f..e71a1c5bb82 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,6 +1,6 @@ # Template build file for 'php' pkgname=php -version=7.1.2 +version=7.1.4 revision=1 short_desc="An HTML-embedded scripting language" maintainer="Steve Prybylski " @@ -15,7 +15,7 @@ makedepends="postgresql-libs-devel libldap-devel sqlite-devel readline-devel libmysqlclient-devel" conf_files="/etc/php/php.ini" distfiles="http://www.php.net/distributions/php-${version}.tar.xz" -checksum=d815a0c39fd57bab1434a77ff0610fb507c22f790c66cd6f26e27030c4b3e971 +checksum=71514386adf3e963df087c2044a0b3747900b8b1fc8da3a99f0a0ae9180d300b # Needs (probably a lot of) work to make it cross compile nocross="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/16307/steps/shell_3/logs/stdio" diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template index 788da57ea50..4b89514bd61 100644 --- a/srcpkgs/picard/template +++ b/srcpkgs/picard/template @@ -1,16 +1,16 @@ # Template file for 'picard' pkgname=picard -version=1.4 +version=1.4.1 revision=1 wrksrc="${pkgname}-release-${version}" build_style=python2-module pycompile_module="picard" maintainer="Matthew Wynn " -hostmakedepends="python-devel" +hostmakedepends="python-devel python-sip" makedepends="${hostmakedepends}" depends="python-PyQt4 chromaprint libdiscid mutagen desktop-file-utils hicolor-icon-theme" license="GPL-2" homepage="http://picard.musicbrainz.org/" short_desc="MusicBrainz's audio tagger" distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=069266ce0b0e25cc4eacfd9cc1c78e1b19d4341a3ca2ce50b0e731796070273e +checksum=994c7f835e1adbd7905e88af841ee6e7c249dc75b8be9963b1b3dc6cb8de6a4a diff --git a/srcpkgs/pick/template b/srcpkgs/pick/template index 94550ad30a1..19509ebd62c 100644 --- a/srcpkgs/pick/template +++ b/srcpkgs/pick/template @@ -1,6 +1,6 @@ # Template file for 'pick' pkgname=pick -version=1.5.4 +version=1.6.1 revision=1 build_style=gnu-configure hostmakedepends="automake" @@ -10,7 +10,7 @@ maintainer="Diogo Leal " license="MIT" homepage="https://github.com/calleerlandsson/pick/" distfiles="https://github.com/calleerlandsson/pick/archive/v${version}.tar.gz" -checksum=0fa1e0c607eb05c6264e71a5bd697e4e1b551830814b0ef9839e9343eebaa459 +checksum=0c4a873ddc1b3e2f0804c8e0ace1d89e3b28b6827ad03ff2e785e5008f41cb1e pre_configure() { ./autogen.sh diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template index 90a5558e927..c555840cfcc 100644 --- a/srcpkgs/pidgin-sipe/template +++ b/srcpkgs/pidgin-sipe/template @@ -1,6 +1,6 @@ # Template file for 'pidgin-sipe' pkgname=pidgin-sipe -version=1.21.1 +version=1.22.0 revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool" @@ -11,4 +11,4 @@ maintainer="Renato Aguiar " license="GPL-2" homepage="http://sipe.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/sipe/sipe/$pkgname-$version.tar.xz" -checksum=651af55d65cbdf5bdbee0366bd5151bec4152c910743aa432204d015893fe444 +checksum=7fe7e483c0dc2578162a29e7e4e37287b890875fa828516fd353d3c113559ec3 diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template index cb4b12cfc04..2066db80ebb 100644 --- a/srcpkgs/pidgin/template +++ b/srcpkgs/pidgin/template @@ -1,6 +1,6 @@ # Template file for 'pidgin' pkgname=pidgin -version=2.11.0 +version=2.12.0 revision=1 lib32disabled=yes build_style=gnu-configure @@ -16,7 +16,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://pidgin.im/" distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2" -checksum=f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b3333 +checksum="8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8" hostmakedepends="pkg-config intltool automake libtool gettext-devel glib-devel" makedepends="libglib-devel gtk+-devel libXext-devel diff --git a/srcpkgs/pingus/template b/srcpkgs/pingus/template index e12eaa0fe8d..b95fef515c2 100644 --- a/srcpkgs/pingus/template +++ b/srcpkgs/pingus/template @@ -1,7 +1,7 @@ # Template file for 'pingus' pkgname=pingus version=0.7.6 -revision=7 +revision=8 build_style=scons hostmakedepends="scons pkg-config" makedepends="SDL_image-devel SDL_mixer-devel boost-devel libpng-devel libXi-devel zlib-devel" diff --git a/srcpkgs/pinktrace/template b/srcpkgs/pinktrace/template index 84a65e98f0e..0759732f55a 100644 --- a/srcpkgs/pinktrace/template +++ b/srcpkgs/pinktrace/template @@ -9,7 +9,7 @@ make_build_args="PYTHON_CFLAGS=-I${XBPS_CROSS_BASE}/usr/include/python2.7" hostmakedepends="automake pkg-config libtool python" makedepends="python-devel" short_desc="A ptrace() wrapper library" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="MIT" homepage="http://dev.exherbo.org/~alip/pinktrace/" distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz" diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template index 7fc87356081..5931a477c70 100644 --- a/srcpkgs/pjproject/template +++ b/srcpkgs/pjproject/template @@ -3,7 +3,7 @@ # and this template is heavily based on Alpine's APKBUILD. pkgname=pjproject version=2.6 -revision=1 +revision=2 disable_parallel_build=yes build_style=gnu-configure configure_args="--enable-shared \ diff --git a/srcpkgs/pkg-config/template b/srcpkgs/pkg-config/template index 74e80d0fe6f..90fbc8b8756 100644 --- a/srcpkgs/pkg-config/template +++ b/srcpkgs/pkg-config/template @@ -1,7 +1,7 @@ # Template build file for 'pkg-config' pkgname=pkg-config -version=0.29.1 -revision=2 +version=0.29.2 +revision=1 bootstrap=yes build_style=gnu-configure configure_args="--with-internal-glib --disable-host-tool" @@ -12,6 +12,4 @@ maintainer="Juan RP " homepage="http://pkgconfig.freedesktop.org/wiki/" license="GPL-2" distfiles="http://pkgconfig.freedesktop.org/releases/$pkgname-$version.tar.gz" -checksum=beb43c9e064555469bd4390dcfd8030b1536e0aa103f08d7abf7ae8cac0cb001 - -CFLAGS="-Wno-error=format-nonliteral" +checksum=6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591 diff --git a/srcpkgs/pkgconf/template b/srcpkgs/pkgconf/template index f024b5317b7..0ed383a3021 100644 --- a/srcpkgs/pkgconf/template +++ b/srcpkgs/pkgconf/template @@ -1,6 +1,6 @@ # Template file for 'pkgconf' pkgname=pkgconf -version=1.3.0 +version=1.3.5 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="MIT" homepage="https://github.com/pkgconf/pkgconf" distfiles="$homepage/archive/$pkgname-$version.tar.gz" -checksum=b5e8ea46a1bd001daa05af036f7796d3e8286113ec5c9f9a4d733431ea37378a +checksum=0da226f5d2fa9432d1b007e7a33168e46b7505b9cbf40c620abe35d97e3abab8 wrksrc="$pkgname-$pkgname-$version" pre_configure() { diff --git a/srcpkgs/plank/template b/srcpkgs/plank/template index 33f4a83b536..4c95fdb2c84 100644 --- a/srcpkgs/plank/template +++ b/srcpkgs/plank/template @@ -1,6 +1,6 @@ # Template file for 'plank' pkgname=plank -version=0.11.3 +version=0.11.4 revision=1 build_style=gnu-configure configure_args="$(vopt_enable dbusmenu) --disable-apport" @@ -13,7 +13,7 @@ maintainer="Steve Prybylski " license="GPL-3" homepage="https://launchpad.net/plank" distfiles="${homepage}/1.0/${version}/+download/${pkgname}-${version}.tar.xz" -checksum=7f091e3aca4b13e3507bb573c532973bdf4695289f8d1f095501adbed0f15608 +checksum=88b5cd6a84e67395df5e7cc1869521126830be0e8a509b28ee12e2db0b8981b8 build_options="dbusmenu" desc_option_dbusmenu="Enable dynamic quicklist support over dbusmenu" diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template index 0e3aa025c9a..d9174a698d1 100644 --- a/srcpkgs/plasma-framework/template +++ b/srcpkgs/plasma-framework/template @@ -1,11 +1,12 @@ # Template file for 'plasma-framework' pkgname=plasma-framework version=5.29.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules pkg-config" makedepends="kactivities5-devel kdeclarative-devel kdoctools-devel" +depends="qt5-quickcontrols qt5-graphicaleffects qt5-multimedia" short_desc="Foundational libraries, components, and tools of the Plasma workspaces" maintainer="Denis Revin " license="LGPL-2" diff --git a/srcpkgs/platform-devel b/srcpkgs/platform-devel deleted file mode 120000 index fdf623f16aa..00000000000 --- a/srcpkgs/platform-devel +++ /dev/null @@ -1 +0,0 @@ -platform \ No newline at end of file diff --git a/srcpkgs/platform/template b/srcpkgs/platform/template deleted file mode 100644 index 28a1e0e8dd3..00000000000 --- a/srcpkgs/platform/template +++ /dev/null @@ -1,33 +0,0 @@ -# Template file for 'platform' -pkgname=platform -version=2.0.1 -revision=1 -build_style=cmake -short_desc="Platform support library used by libCEC and binary add-ons for Kodi" -maintainer="Enno Boland " -license="GPL-2" -homepage="https://github.com/Pulse-Eight/platform" -distfiles="https://github.com/Pulse-Eight/platform/archive/platform-$version.tar.gz" -checksum=d83fd25fe8f48ed4d66f17fb3f7c35fcf915ca27dda9b088d61e8e3dd98f01f7 -configure_args+=" -DBUILD_SHARED_LIBS=1" -wrksrc=$pkgname-$pkgname-$version - -post_install() { - vmkdir usr/lib - if [ -d $DESTDIR/usr/lib64 ]; then - mv $DESTDIR/usr/lib64/* $DESTDIR/usr/lib - fi - sed -i "s#$wrksrc/build/##" $DESTDIR/usr/lib/platform/platform-config.cmake $DESTDIR/usr/lib/pkgconfig/platform.pc - mv $DESTDIR/$wrksrc/build/lib*/* $DESTDIR/usr/lib -} - -platform-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/platform - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template index 6b9abcca010..dea5963e6b7 100644 --- a/srcpkgs/pluma/template +++ b/srcpkgs/pluma/template @@ -1,23 +1,24 @@ # Template file for 'pluma' pkgname=pluma -version=1.16.0 +version=1.18.1 revision=1 build_style=gnu-configure -configure_args="--with-gtk=3.0 $(vopt_enable python)" -hostmakedepends="pkg-config intltool itstool glib-devel" -makedepends="gtk+3-devel enchant-devel libSM-devel mate-desktop-devel - gtksourceview-devel libsoup-devel iso-codes - $(vopt_if python 'pygtk-devel pygtksourceview')" -depends="$(vopt_if python pygtksourceview) desktop-file-utils iso-codes zenity" pycompile_dirs="usr/lib/pluma/plugins" -short_desc="A powerful text editor for MATE" +hostmakedepends="automake libtool pkg-config intltool itstool glib-devel + gobject-introspection mate-common" +makedepends="gtk+3-devel enchant-devel libSM-devel mate-desktop-devel + gtksourceview-devel libsoup-devel libpeas-devel iso-codes" +depends="desktop-file-utils iso-codes zenity" +short_desc="Powerful text editor for MATE" maintainer="Juan RP " -license="LGPL-2" -homepage="http://mate-desktop.org" -distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0eb4a4486f1c83119969567cedb05894f25ac5d43cefb4c3ed88ca2f75eff29d +license="GPL-2" +homepage="https://mate-desktop.org" +distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=3ad4ef5c67ee0edef15e4549b1d9de49bd106b551a5b6d17517860ad413873b6 -build_options="python" +pre_configure() { + NOCONFIGURE=1 ./autogen.sh +} pluma-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/plzip/template b/srcpkgs/plzip/template index f3484164b9b..18b3023e3c8 100644 --- a/srcpkgs/plzip/template +++ b/srcpkgs/plzip/template @@ -1,6 +1,6 @@ # Template file for 'plzip' pkgname=plzip -version=1.5 +version=1.6 revision=1 build_style=gnu-configure makedepends="lzlib-devel" @@ -9,7 +9,7 @@ maintainer="bra1nwave " license="GPL-2" homepage="http://www.nongnu.org/lzip/plzip" distfiles="${NONGNU_SITE}/lzip/plzip/${pkgname}-${version}.tar.gz" -checksum=cd401683c2c57ecf170c99a873e41e9e5fee0e9680341646e31032e31489cc8a +checksum=5d1d79fe4a1e41aa05e3926d067243efbaa607ed238036152f867662b7d14c7c do_configure() { ./configure --prefix=/usr CXX="$CXX" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" diff --git a/srcpkgs/pngquant/template b/srcpkgs/pngquant/template index ebcbc46d071..0f238bbc42d 100644 --- a/srcpkgs/pngquant/template +++ b/srcpkgs/pngquant/template @@ -1,6 +1,6 @@ # Template file for 'pngquant' pkgname=pngquant -version=2.9.0 +version=2.9.1 revision=1 build_style=gnu-configure create_wrksrc=yes @@ -16,9 +16,9 @@ maintainer="Leah Neukirchen " license="GPL-3" homepage="https://pngquant.org/" distfiles="https://github.com/pornel/${pkgname}/archive/${version}.tar.gz - https://github.com/ImageOptim/libimagequant/archive/211175cf6c96435f1506da5cd1bb9c670e40a06b.tar.gz" -checksum="1dbfdfe501ced9659dbe99e931a1eb596f27e6a6afda3a25b5ebce324977e957 - be9e0aaaf571b18ee477b789544d7192e0cd0d5e2e630fdae3ac7e65340fd721" + https://github.com/ImageOptim/libimagequant/archive/c927fa593a181d304caff3f1ccc91c0da0c02608.tar.gz" +checksum="0601f7c8c5757f4b634e3b172abf5e0f3d5b2922c8eabfd071230394d33e9834 + d4f5a8bfcc078a259d1a9d6fa06958aa6381bc14f7bc49b46abeacf162bdb856" post_extract() { cp -r libimagequant-*/* ${build_wrksrc}/lib diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template index 17f4ac7acf1..4ded424b175 100644 --- a/srcpkgs/podofo/template +++ b/srcpkgs/podofo/template @@ -1,13 +1,13 @@ # Template file for 'podofo' pkgname=podofo version=0.9.5 -revision=1 +revision=2 build_style=cmake configure_args="-DPODOFO_BUILD_SHARED=1" makedepends="zlib-devel libressl-devel libidn-devel freetype-devel fontconfig-devel libpng-devel libjpeg-turbo-devel lua52-devel tiff-devel" short_desc="Library to work with the PDF file format" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2, LGPL-2.1" homepage="http://podofo.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index af2b53d701a..0c924f05c8e 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -1,7 +1,7 @@ # Template file for 'poedit' pkgname=poedit -version=1.8.12 -revision=1 +version=2.0.1 +revision=2 build_style=gnu-configure configure_args="--with-wx-config=wx-config-3.0" hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="MIT" homepage="http://www.poedit.net/" distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz" -checksum=c78c7abc38b2f9b3dbdf8607845a81f629ed019ff09ed7629128f0e39f8f3a91 +checksum=8766874175b2221ef670d89b32f0fe900cde3e27e5dcb2c1b6cf6d01e8d56ff3 post_install() { vlicense COPYING diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template new file mode 100644 index 00000000000..bf71a89d9e1 --- /dev/null +++ b/srcpkgs/polari/template @@ -0,0 +1,16 @@ +# Template file for 'polari' +pkgname=polari +version=3.24.1 +revision=1 +build_style=gnu-configure +configure_args="--disable-schemas-compile" +hostmakedepends="pkg-config itstool gobject-introspection" +makedepends="gtk+3-devel telepathy-glib-devel gjs-devel gspell-devel libsecret-devel + libsoup-gnome-devel telepathy-logger-devel" +depends="telepathy-mission-control telepathy-idle" +short_desc="The GNOME IRC client" +maintainer="Sir_Boops " +license="GPL-2" +homepage="https://wiki.gnome.org/Apps/Polari" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=3a106160cd988d28620a27692c1f41073e3d140a264dd301d55933508533d7cc diff --git a/srcpkgs/polybar/INSTALL.msg b/srcpkgs/polybar/INSTALL.msg new file mode 100644 index 00000000000..77529c11a7c --- /dev/null +++ b/srcpkgs/polybar/INSTALL.msg @@ -0,0 +1,9 @@ + + Get started with the example configuration: + + $ install -Dm644 /usr/share/doc/polybar/config $HOME/.config/polybar + $ polybar example + + + For more information, see https://github.com/jaagr/polybar + diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template new file mode 100644 index 00000000000..b0ff9434643 --- /dev/null +++ b/srcpkgs/polybar/template @@ -0,0 +1,64 @@ +# Template file for 'polybar' +pkgname=polybar +version=3.0.5 +revision=1 +_i3ipcpp_version=0.6.2 +_xpp_version=1.3.6 +build_style=cmake +configure_args=" + -DENABLE_ALSA=$(vopt_if alsa ON OFF) + -DENABLE_CURL=$(vopt_if curl ON OFF) + -DENABLE_I3=$(vopt_if i3 ON OFF) + -DENABLE_MPD=$(vopt_if mpd ON OFF) + -DENABLE_NETWORK=$(vopt_if network ON OFF)" +hostmakedepends="pkg-config xcb-proto" +makedepends="cairo-devel xcb-util-image-devel xcb-util-wm-devel xcb-util-xrm-devel zlib-devel + $(vopt_if alsa "alsa-lib-devel") + $(vopt_if curl "libcurl-devel") + $(vopt_if i3 "i3-devel jsoncpp-devel") + $(vopt_if mpd "libmpdclient-devel") + $(vopt_if network "wireless_tools-devel")" +short_desc="A fast and easy-to-use status bar" +maintainer="Michael Carlberg " +license="MIT" +homepage="https://github.com/jaagr/polybar" +distfiles=" + https://github.com/jaagr/polybar/archive/${version}.tar.gz + https://github.com/jaagr/xpp/archive/${_xpp_version}.tar.gz + $(vopt_if i3 https://github.com/jaagr/i3ipcpp/archive/v${_i3ipcpp_version}.tar.gz)" +checksum=" + 5ce727c240f5fd0aafc5baaa242d3c6583770633b7292cc8152ae3b273baeffe + b81993893190bf7ba19529e0da6e8b069e13e833f6a62874830b46785bee3349 + $(vopt_if i3 7ad9c0c1e1cb9dfd07ecc2a7769eae9ac962c22db2e07be08b2186b7fd85189d)" + +build_options="alsa curl i3 mpd network" +build_options_default="$build_options" + +desc_option_alsa="Enable support for ALSA" +desc_option_curl="Enable support for cURL" +desc_option_i3="Enable support for i3" +desc_option_mpd="Enable support for MPD" +desc_option_network="Enable support for network" + +if [ "$build_option_network" ]; then + case "$XBPS_TARGET_MACHINE" in + *-musl) CXXFLAGS+=" -D_LINUX_IF_ETHER_H" ;; + esac +fi + +if [ "$CROSS_BUILD" ]; then + configure_args+=" -DTHREADS_PTHREAD_ARG=OFF" +fi + +post_extract() { + if [ -d ../i3ipcpp-${_i3ipcpp_version} ]; then + mv -f -T ../i3ipcpp-${_i3ipcpp_version} lib/i3ipcpp + fi + if [ -d ../xpp-${_xpp_version} ]; then + mv -f -T ../xpp-${_xpp_version} lib/xpp + fi +} + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template index f0108ce730c..2151324d116 100644 --- a/srcpkgs/polygen/template +++ b/srcpkgs/polygen/template @@ -6,7 +6,7 @@ build_style=gnu-makefile build_wrksrc="src" hostmakedepends="ocaml unzip" short_desc="Generative grammar phrase generator" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://www.polygen.org" distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz" diff --git a/srcpkgs/ponyc/patches/fix-pie.patch b/srcpkgs/ponyc/patches/fix-pie.patch index 0aed20bb26d..4bb0cb0706b 100644 --- a/srcpkgs/ponyc/patches/fix-pie.patch +++ b/srcpkgs/ponyc/patches/fix-pie.patch @@ -1,11 +1,11 @@ ---- Makefile.orig 2016-11-11 22:56:59.000000000 +0000 -+++ Makefile 2016-12-15 11:01:02.068138423 +0000 -@@ -93,7 +93,7 @@ +--- Makefile.orig 2017-03-30 18:27:39.852065849 +0200 ++++ Makefile 2017-03-30 18:28:08.953702029 +0200 +@@ -81,7 +81,7 @@ LIB_EXT ?= a - BUILD_FLAGS = -march=$(arch) -Werror -Wconversion \ + BUILD_FLAGS = -march=$(arch) -mtune=$(tune) -Werror -Wconversion \ -Wno-sign-conversion -Wextra -Wall --LINKER_FLAGS = -march=$(arch) -+LINKER_FLAGS = -march=$(arch) $(LDFLAGS) +-LINKER_FLAGS = -march=$(arch) -mtune=$(tune) ++LINKER_FLAGS = -march=$(arch) -mtune=$(tune) $(LDFLAGS) AR_FLAGS ?= rcs ALL_CFLAGS = -std=gnu11 -fexceptions \ -DPONY_VERSION=\"$(tag)\" -DLLVM_VERSION=\"$(llvm_version)\" \ diff --git a/srcpkgs/ponyc/template b/srcpkgs/ponyc/template index aa148d2d4bf..6f50b3488f1 100644 --- a/srcpkgs/ponyc/template +++ b/srcpkgs/ponyc/template @@ -1,6 +1,6 @@ # Template file for 'ponyc' pkgname=ponyc -version=0.10.0 +version=0.13.2 revision=1 only_for_archs="x86_64" build_style=gnu-makefile @@ -8,15 +8,14 @@ hostmakedepends="llvm" makedepends="zlib-devel ncurses-devel" short_desc="OO, actor-model, capabilities-secure, high-performance language" maintainer="bougyman " -license="BSD" +license="2-clause-BSD" homepage="http://ponylang.org/" distfiles="https://github.com/CausalityLtd/ponyc/archive/${version}.tar.gz" -checksum=694ae862d5c30978921097e64df68e6431a12224aeea632a37c9d333e5710749 +checksum=2e01a64e93c29adad3553a12188a20bfcfbb3f3a35f4a15f867d730cff13a34f do_build() { make config=release destdir=/usr/lib/pony/${version} prefix=/usr } - do_install() { make config=release destdir=${DESTDIR}/usr/lib/pony/${version} prefix=${DESTDIR}/usr install rm ${DESTDIR}/usr/bin/ponyc ${DESTDIR}/usr/lib/libponyrt.a \ diff --git a/srcpkgs/poppler-qt4/template b/srcpkgs/poppler-qt4/template index fbfe87207a6..673afb34a1c 100644 --- a/srcpkgs/poppler-qt4/template +++ b/srcpkgs/poppler-qt4/template @@ -4,7 +4,7 @@ # A CYCLIC DEPENDENCY: qt -> cups -> poppler -> qt. # pkgname=poppler-qt4 -version=0.52.0 +version=0.54.0 revision=1 wrksrc="poppler-${version}" build_style=gnu-configure @@ -21,7 +21,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" distfiles="${homepage}/poppler-$version.tar.xz" -checksum=528b661738839f9a25f6e580fcd2d5db007e0a1948580c6489f0062798ca1992 +checksum=10cca9a67cc2e6f4f9024192b1067c444218bf94430891f43dc819d78536ca31 post_install() { rm -f ${DESTDIR}/usr/lib/libpoppler.* diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template index ab6c1245da3..1d2df9f34be 100644 --- a/srcpkgs/poppler-qt5/template +++ b/srcpkgs/poppler-qt5/template @@ -4,7 +4,7 @@ # A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5. # pkgname=poppler-qt5 -version=0.52.0 +version=0.54.0 revision=1 wrksrc="poppler-${version}" build_style=gnu-configure @@ -21,7 +21,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" distfiles="${homepage}/poppler-$version.tar.xz" -checksum=528b661738839f9a25f6e580fcd2d5db007e0a1948580c6489f0062798ca1992 +checksum=10cca9a67cc2e6f4f9024192b1067c444218bf94430891f43dc819d78536ca31 post_install() { rm -f ${DESTDIR}/usr/lib/libpoppler.* diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index a044b94d5d4..23ec8b2080b 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt{4,5}". # pkgname=poppler -version=0.52.0 +version=0.54.0 revision=1 build_style=gnu-configure configure_args="--enable-zlib --enable-libcurl --enable-libjpeg @@ -19,7 +19,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" distfiles="${homepage}/$pkgname-$version.tar.xz" -checksum=528b661738839f9a25f6e580fcd2d5db007e0a1948580c6489f0062798ca1992 +checksum=10cca9a67cc2e6f4f9024192b1067c444218bf94430891f43dc819d78536ca31 # Package build options build_options="gir" diff --git a/srcpkgs/postfix/patches/libressl.patch b/srcpkgs/postfix/patches/libressl.patch index 040c2e6c5c3..a162085bf94 100644 --- a/srcpkgs/postfix/patches/libressl.patch +++ b/srcpkgs/postfix/patches/libressl.patch @@ -1,9 +1,80 @@ -$OpenBSD: patch-src_tls_tls_h,v 1.1 2016/03/05 17:34:24 sthen Exp $ +$OpenBSD: patch-src_posttls-finger_posttls-finger_c,v 1.2 2017/03/04 22:09:43 sthen Exp $ +--- src/posttls-finger/posttls-finger.c.orig Fri Feb 3 17:43:04 2017 ++++ src/posttls-finger/posttls-finger.c Mon Feb 20 12:42:58 2017 +@@ -1513,7 +1513,8 @@ static int finger(STATE *state) + return (0); + } + +-#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(USE_TLS) && \ ++ ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ) + + /* ssl_cleanup - free memory allocated in the OpenSSL library */ + +@@ -1966,7 +1967,8 @@ int main(int argc, char *argv[]) + cleanup(&state); + + /* OpenSSL 1.1.0 and later (de)initialization is implicit */ +-#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(USE_TLS) && \ ++ ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ) + ssl_cleanup(); + #endif + +$OpenBSD: patch-src_tls_tls_client_c,v 1.2 2017/03/04 22:09:43 sthen Exp $ +--- src/tls/tls_client.c.orig Sun Jan 1 17:22:13 2017 ++++ src/tls/tls_client.c Mon Feb 20 12:42:58 2017 +@@ -299,7 +299,7 @@ TLS_APPL_STATE *tls_client_init(const TLS_CLIENT_INIT_ + */ + tls_check_version(); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + /* + * Initialize the OpenSSL library by the book! To start with, we must +@@ -433,7 +433,7 @@ TLS_APPL_STATE *tls_client_init(const TLS_CLIENT_INIT_ + /* + * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev + */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + /* + * According to the OpenSSL documentation, temporary RSA key is needed +$OpenBSD: patch-src_tls_tls_dane_c,v 1.2 2017/03/04 22:09:43 sthen Exp $ +--- src/tls/tls_dane.c.orig Sun Jan 1 17:22:13 2017 ++++ src/tls/tls_dane.c Mon Feb 20 12:42:58 2017 +@@ -2125,7 +2125,7 @@ static SSL_CTX *ctx_init(const char *CAfile) + tls_param_init(); + tls_check_version(); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + SSL_load_error_strings(); + SSL_library_init(); + #endif +$OpenBSD: patch-src_tls_tls_dh_c,v 1.1 2017/03/04 22:09:43 sthen Exp $ Fix building with LibreSSL ---- src/tls/tls.h.orig Sat Feb 6 15:09:41 2016 -+++ src/tls/tls.h Fri Feb 12 20:15:25 2016 +--- src/tls/tls_dh.c.orig Mon Dec 26 18:47:24 2016 ++++ src/tls/tls_dh.c Sat Feb 4 01:45:39 2017 +@@ -314,7 +314,7 @@ void tls_auto_eecdh_curves(SSL_CTX *ctx) + * This is a NOP in OpenSSL 1.1.0 and later, where curves are always + * auto-negotiated. + */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000UL ++#if OPENSSL_VERSION_NUMBER < 0x10100000UL || defined(LIBRESSL_VERSION_NUMBER) + if (SSL_CTX_set_ecdh_auto(ctx, 1) <= 0) { + msg_warn("failed to enable automatic ECDHE curve selection"); + tls_print_errors(); +$OpenBSD: patch-src_tls_tls_h,v 1.2 2017/03/04 22:09:43 sthen Exp $ + +Fix building with LibreSSL + +--- src/tls/tls.h.orig Sun Jan 1 17:22:13 2017 ++++ src/tls/tls.h Fri Jan 6 23:17:26 2017 @@ -89,7 +89,7 @@ extern const char *str_tls_level(int); #endif @@ -13,72 +84,19 @@ Fix building with LibreSSL #define OpenSSL_version_num SSLeay #define OpenSSL_version SSLeay_version #define OPENSSL_VERSION SSLEAY_VERSION -diff -urp src/posttls-finger/posttls-finger.c src/posttls-finger/posttls-finger.c ---- src/posttls-finger/posttls-finger.c.orig 2016-08-27 22:27:50.000000000 +0200 -+++ src/posttls-finger/posttls-finger.c 2016-08-29 15:57:24.941368708 +0200 -@@ -1511,7 +1511,7 @@ static int finger(STATE *state) - return (0); - } - --#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(USE_TLS) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - - /* ssl_cleanup - free memory allocated in the OpenSSL library */ - -@@ -1958,7 +1958,7 @@ int main(int argc, char *argv[]) - cleanup(&state); - - /* OpenSSL 1.1.0 and later (de)initialization is implicit */ --#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - ssl_cleanup(); - #endif - -diff -urp src/tls/tls_client.c src/tls/tls_client.c ---- src/tls/tls_client.c.orig 2016-08-27 22:27:50.000000000 +0200 -+++ src/tls/tls_client.c 2016-08-29 16:00:17.115355822 +0200 -@@ -299,7 +299,7 @@ TLS_APPL_STATE *tls_client_init(const TL - */ - tls_check_version(); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - /* - * Initialize the OpenSSL library by the book! To start with, we must -@@ -356,7 +356,7 @@ TLS_APPL_STATE *tls_client_init(const TL - * TLS_ANY_VERSION macro. - */ - ERR_clear_error(); --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && defined(TLS_ANY_VERSION) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) && defined(TLS_ANY_VERSION) - client_ctx = SSL_CTX_new(TLS_client_method()); - #else - client_ctx = SSL_CTX_new(SSLv23_client_method()); -@@ -441,7 +441,7 @@ TLS_APPL_STATE *tls_client_init(const TL - /* - * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev - */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - /* - * According to the OpenSSL documentation, temporary RSA key is needed -diff -urp src/tls/tls_dane.c src/tls/tls_dane.c ---- src/tls/tls_dane.c.orig 2016-08-27 22:27:50.000000000 +0200 -+++ src/tls/tls_dane.c 2016-08-29 15:58:30.467363804 +0200 -@@ -2163,7 +2163,7 @@ static SSL_CTX *ctx_init(const char *CAf - tls_param_init(); - tls_check_version(); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - SSL_load_error_strings(); - SSL_library_init(); - #endif -diff -urp src/tls/tls_rsa.c src/tls/tls_rsa.c ---- src/tls/tls_rsa.c.orig 2016-01-03 15:49:51.000000000 +0100 -+++ src/tls/tls_rsa.c 2016-08-29 15:57:58.067366229 +0200 +@@ -104,6 +104,9 @@ extern const char *str_tls_level(int); + #define ASN1_STRING_get0_data ASN1_STRING_data + #define X509_getm_notBefore X509_get_notBefore + #define X509_getm_notAfter X509_get_notAfter ++#endif ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + #define TLS_method SSLv23_method + #define TLS_client_method SSLv23_client_method + #define TLS_server_method SSLv23_server_method +$OpenBSD: patch-src_tls_tls_rsa_c,v 1.1 2016/09/03 15:39:58 sthen Exp $ +--- src/tls/tls_rsa.c.orig Thu Sep 1 21:57:15 2016 ++++ src/tls/tls_rsa.c Thu Sep 1 21:58:11 2016 @@ -57,7 +57,7 @@ /* * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev @@ -88,7 +106,7 @@ diff -urp src/tls/tls_rsa.c src/tls/tls_rsa.c /* tls_tmp_rsa_cb - call-back to generate ephemeral RSA key */ -@@ -109,7 +109,7 @@ int main(int unused_argc, char *cons +@@ -109,7 +109,7 @@ int main(int unused_argc, char *const argv[]) /* * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev */ @@ -97,10 +115,10 @@ diff -urp src/tls/tls_rsa.c src/tls/tls_rsa.c RSA *rsa; msg_vstream_init(argv[0], VSTREAM_ERR); -diff -urp src/tls/tls_server.c src/tls/tls_server.c ---- src/tls/tls_server.c.orig 2016-08-27 22:27:50.000000000 +0200 -+++ src/tls/tls_server.c 2016-08-29 15:59:41.807358465 +0200 -@@ -174,7 +174,7 @@ static const char server_session_id_cont +$OpenBSD: patch-src_tls_tls_server_c,v 1.2 2017/03/04 22:09:43 sthen Exp $ +--- src/tls/tls_server.c.orig Sun Jan 1 17:22:13 2017 ++++ src/tls/tls_server.c Mon Feb 20 12:42:58 2017 +@@ -174,7 +174,7 @@ static const char server_session_id_context[] = "Postf #endif /* OPENSSL_VERSION_NUMBER */ /* OpenSSL 1.1.0 bitrot */ @@ -109,7 +127,7 @@ diff -urp src/tls/tls_server.c src/tls/tls_server.c typedef const unsigned char *session_id_t; #else -@@ -377,7 +377,7 @@ TLS_APPL_STATE *tls_server_init(const TL +@@ -377,7 +377,7 @@ TLS_APPL_STATE *tls_server_init(const TLS_SERVER_INIT_ */ tls_check_version(); @@ -118,16 +136,7 @@ diff -urp src/tls/tls_server.c src/tls/tls_server.c /* * Initialize the OpenSSL library by the book! To start with, we must -@@ -447,7 +447,7 @@ TLS_APPL_STATE *tls_server_init(const TL - * TLS_ANY_VERSION macro. - */ - ERR_clear_error(); --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && defined(TLS_ANY_VERSION) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) && defined(TLS_ANY_VERSION) - server_ctx = SSL_CTX_new(TLS_server_method()); - #else - server_ctx = SSL_CTX_new(SSLv23_server_method()); -@@ -588,7 +588,7 @@ TLS_APPL_STATE *tls_server_init(const TL +@@ -580,7 +580,7 @@ TLS_APPL_STATE *tls_server_init(const TLS_SERVER_INIT_ /* * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev */ @@ -136,3 +145,16 @@ diff -urp src/tls/tls_server.c src/tls/tls_server.c /* * According to OpenSSL documentation, a temporary RSA key is needed when + +For LibreSSL 2.4: +--- src/tls/tls_dh.c.orig ++++ src/tls/tls_dh.c +@@ -244,7 +244,7 @@ + + void tls_auto_eecdh_curves(SSL_CTX *ctx) + { +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(OPENSSL_NO_ECDH) ++#if OPENSSL_VERSION_NUMBER >= 0x1000200fUL && !defined(OPENSSL_NO_ECDH) && !defined(LIBRESSL_VERSION_NUMBER) + SSL_CTX *tmpctx; + int *nids; + int space = 5; diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template index 15cc1ba7184..a1582d69027 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -1,13 +1,13 @@ # Template file for 'postfix' pkgname=postfix -version=3.1.4 -revision=1 +version=3.2.0 +revision=3 short_desc="High-performance mail transport agent" maintainer="Juan RP " license="IBM Public License 1.0, BSD-alike" homepage="http://www.postfix.org/" distfiles="ftp://ftp.porcupine.org/mirrors/postfix-release/official/$pkgname-$version.tar.gz" -checksum=f33b470c47ae8b4ff199ab55dc42e86031ff0c535ccbc83069c8cff69b5bd027 +checksum=420726e79622620394fd17799e49268dada7041ea067ca3aa1c8bf155b9aa487 hostmakedepends="perl" makedepends="icu-devel libressl-devel db-devel pcre-devel libsasl-devel diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template index 944ac7439cd..9a9b8b9adef 100644 --- a/srcpkgs/postgresql/template +++ b/srcpkgs/postgresql/template @@ -1,7 +1,7 @@ # Template file for 'postgresql' pkgname=postgresql version=9.5.6 -revision=1 +revision=2 build_style=gnu-configure make_build_target="world" configure_args="--with-openssl --with-python diff --git a/srcpkgs/profont/template b/srcpkgs/profont/template new file mode 100644 index 00000000000..427aa1d7937 --- /dev/null +++ b/srcpkgs/profont/template @@ -0,0 +1,23 @@ +# Template file for 'profont' +pkgname="profont" +version="1.0" +revision=1 +noarch="yes" +hostmakedepends="unzip" +makedepends="font-util" +font_dirs="/usr/share/fonts/misc" +short_desc="A monospaced font created to be a most readable font for programming" +maintainer="Samantha Baldwin " +license="MIT" +homepage="http://tobiasjung.name/profont/" +distfiles="http://tobiasjung.name/downloadfile.php?file=${pkgname}-x11.zip" +checksum=99ab6ba0e48ea3cba2dee2bb0e1fafe0a4d60541ebc1a47a7cbdffee552c9ca7 +wrksrc=${pkgname}-x11 + +do_install() { + for f in *.pcf; do + vinstall "$f" 644 usr/share/fonts/misc + done + vdoc readme.txt README + vlicense LICENSE +} diff --git a/srcpkgs/progress/template b/srcpkgs/progress/template index 41a80435adb..261d50f1b08 100644 --- a/srcpkgs/progress/template +++ b/srcpkgs/progress/template @@ -1,8 +1,8 @@ # Template file for progress' pkgname=progress version=0.13.1 -revision=1 -maintainer="Orphaned " +revision=2 +maintainer="Leah Neukirchen " makedepends="ncurses-devel" license="GPL-3" homepage="https://github.com/Xfennec/progress" @@ -13,7 +13,8 @@ provides="cv-${version}_${revision}" replaces="cv>=0" do_build() { - $CC $CFLAGS $LDFLAGS -D_FILE_OFFSET_BITS=64 progress.c sizes.c hlist.c -o progress -lncurses -lm + ${CC} ${CFLAGS} -D_FILE_OFFSET_BITS=64 \ + progress.c sizes.c hlist.c -o progress ${LDFLAGS} -lncurses -lm } do_install() { diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template index b7eebd764f7..2ed31913f98 100644 --- a/srcpkgs/prometheus/template +++ b/srcpkgs/prometheus/template @@ -1,7 +1,7 @@ # Template file for 'prometheus' pkgname=prometheus -version=1.5.2 -revision=2 +version=1.6.1 +revision=1 build_style=go go_import_path="github.com/prometheus/prometheus" go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool" @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="https://prometheus.io/" short_desc="Monitoring system and time series database" distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz" -checksum=c4881cc305263cc8da434be69a20aa039386d4feab5e58f8b89a60bfe8b556ac +checksum=ecc9ce94fce45994c23b76eb0c5acbb1b942513be601872c8cd74d0821450c5e post_install() { vlicense LICENSE diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template index 75ae4b0a4aa..87d8a53bd5a 100644 --- a/srcpkgs/prosody/template +++ b/srcpkgs/prosody/template @@ -1,7 +1,7 @@ # Template file for 'prosody' pkgname=prosody version=0.9.12 -revision=1 +revision=2 build_style=configure conf_files=" /etc/prosody/prosody.cfg.lua diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index 307cf24f18f..9200e9f25c1 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf/template @@ -1,7 +1,7 @@ # Template file for 'protobuf' pkgname=protobuf version=2.6.1 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="zlib-devel" diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index 445898f53d2..c540db60220 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,7 +1,7 @@ # Template file for 'pulseaudio' pkgname=pulseaudio version=10.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template new file mode 100644 index 00000000000..52593413f35 --- /dev/null +++ b/srcpkgs/pulseview/template @@ -0,0 +1,22 @@ +# Template file for 'pulseview' +pkgname=pulseview +version=0.3.0 +revision=1 +build_style=cmake +configure_args="-DDISABLE_WERROR=TRUE" +hostmakedepends="pkg-config qt5-qmake" +makedepends="glib-devel libzip-devel glibmm-devel python3-devel qt5-devel + qt5-svg-devel boost-devel libsigrok-devel libsigrokdecode-devel" +depends="sigrok-firmware-fx2lafw qt5-svg" +short_desc="Qt-based LA/scope/MSO GUI for sigrok" +maintainer="lemmi " +license="GPL-3" +homepage="https://sigrok.org/" +distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=5ffe2cb7a602fcdc60933d400c77bcd66e6ce529bc4f6e97d6a5e5a86f2f530e + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-host-tools qt5-devel" +fi + +CXXFLAGS+=" -fext-numeric-literals" diff --git a/srcpkgs/pup/template b/srcpkgs/pup/template index 96df2b955fe..1dd70280fde 100644 --- a/srcpkgs/pup/template +++ b/srcpkgs/pup/template @@ -1,7 +1,7 @@ # Template file for 'pup' pkgname=pup version=0.4.0 -revision=3 +revision=4 build_style=go go_import_path="github.com/ericchiang/pup" short_desc="Command line tool for processing HTML" diff --git a/srcpkgs/putty/patches/fix-build.patch b/srcpkgs/putty/patches/fix-build.patch new file mode 100644 index 00000000000..4cfd85a2aa1 --- /dev/null +++ b/srcpkgs/putty/patches/fix-build.patch @@ -0,0 +1,16 @@ +--- unix/gtkwin.c.orig 2017-04-24 13:52:45.000000000 +0000 ++++ unix/gtkwin.c 2017-04-30 22:43:56.901428607 +0000 +@@ -2188,11 +2188,11 @@ + free(data); + free(col_css); + #else +- if (gtk_widget_get_window(win)) { ++ if (gtk_widget_get_window(widget)) { + /* For GTK1, which doesn't have a 'const' on + * gdk_window_set_background's second parameter type. */ + GdkColor col_mutable = *col; +- gdk_window_set_background(gtk_widget_get_window(win), &col_mutable); ++ gdk_window_set_background(gtk_widget_get_window(widget), &col_mutable); + } + #endif + } diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template index b2e6407830a..cc26cf1598e 100644 --- a/srcpkgs/putty/template +++ b/srcpkgs/putty/template @@ -1,6 +1,6 @@ # Template file for 'putty' pkgname=putty -version=0.68 +version=0.69 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="MIT" homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/" distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz" -checksum=7ba256f46e5a353cafe811ce7914d0e22a52bdfc0e6e2d183ad28b5af44cd09c +checksum=b7dad241ff01b0cbb9dc4c1471ec7cacf8f08d98a581aeb2f336da3c0eb96ad1 CFLAGS="-Wno-error" diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template index 5fb8d71ebc3..33478e029e2 100644 --- a/srcpkgs/py3status/template +++ b/srcpkgs/py3status/template @@ -1,6 +1,6 @@ # Template file for 'py3status' pkgname=py3status -version=3.4 +version=3.5 revision=1 noarch=yes build_style=python3-module @@ -12,7 +12,7 @@ license="3-clause-BSD" maintainer="teldra " homepage="https://github.com/ultrabug/py3status" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=f6ae4199ef65341a76f3a30c4e3ff56daec4d1962e9c333d4b0b2b65db2055dc +checksum=a062572c32f44c01733363df43c36c3dd450790f66c96e701e2253bc75aa2091 post_install() { vlicense LICENSE diff --git a/srcpkgs/pylint/INSTALL.msg b/srcpkgs/pylint/INSTALL.msg deleted file mode 100644 index eaa54ff8c44..00000000000 --- a/srcpkgs/pylint/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -To use pylint GUI install python-tkinter. diff --git a/srcpkgs/pylint/python3-pylint.INSTALL.msg b/srcpkgs/pylint/python3-pylint.INSTALL.msg deleted file mode 100644 index 908daa02973..00000000000 --- a/srcpkgs/pylint/python3-pylint.INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -To use pylint GUI install python3-tkinter. diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template index aea4a5252b6..3942cc8a50d 100644 --- a/srcpkgs/pylint/template +++ b/srcpkgs/pylint/template @@ -1,6 +1,6 @@ # Template file for 'pylint' pkgname=pylint -version=1.6.5 +version=1.7.1 revision=1 noarch=yes wrksrc="pylint-${version}" @@ -8,32 +8,34 @@ build_style=python-module pycompile_module="pylint" hostmakedepends="python-setuptools python3-setuptools" depends="python-setuptools python-astroid python-six python-isort python-mccabe - python-backports.configparser python-backports.functools_lru_cache" + python-backports.configparser python-backports.functools_lru_cache + python-singledispatch" short_desc="Python2 code static checker" maintainer="Alessio Sergi " homepage="http://www.pylint.org/" license="GPL-2" distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz" -checksum=a673984a8dd78e4a8b8cfdee5359a1309d833cf38405008f4a249994a8456719 +checksum=8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a alternatives=" pylint:epylint:/usr/bin/epylint2 pylint:pylint:/usr/bin/pylint2 - pylint:pylint-gui:/usr/bin/pylint-gui2 pylint:pyreverse:/usr/bin/pyreverse2 pylint:symilar:/usr/bin/symilar2 pylint:epylint.1:/usr/share/man/man1/epylint2.1 pylint:pylint.1:/usr/share/man/man1/pylint2.1 - pylint:pylint-gui.1:/usr/share/man/man1/pylint-gui2.1 pylint:pyreverse.1:/usr/share/man/man1/pyreverse2.1 pylint:symilar.1:/usr/share/man/man1/symilar2.1" +pre_build() { + sed -i '/setup_requires=/d' setup.py +} post_install() { # no tests rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test # create versioned man pages - for f in epylint pylint pylint-gui pyreverse symilar; do + for f in epylint pylint pyreverse symilar; do vman man/${f}.1 ${f}2.1 vman man/${f}.1 ${f}3.1 done @@ -49,12 +51,10 @@ python3-pylint_package() { alternatives=" pylint:epylint:/usr/bin/epylint3 pylint:pylint:/usr/bin/pylint3 - pylint:pylint-gui:/usr/bin/pylint-gui3 pylint:pyreverse:/usr/bin/pyreverse3 pylint:symilar:/usr/bin/symilar3 pylint:epylint.1:/usr/share/man/man1/epylint3.1 pylint:pylint.1:/usr/share/man/man1/pylint3.1 - pylint:pylint-gui.1:/usr/share/man/man1/pylint-gui3.1 pylint:pyreverse.1:/usr/share/man/man1/pyreverse3.1 pylint:symilar.1:/usr/share/man/man1/symilar3.1" noarch=yes diff --git a/srcpkgs/python-Babel/template b/srcpkgs/python-Babel/template index a73b5209d4a..b49d586cf0f 100644 --- a/srcpkgs/python-Babel/template +++ b/srcpkgs/python-Babel/template @@ -1,7 +1,7 @@ # Template file for 'python-Babel' pkgname=python-Babel -version=2.3.4 -revision=4 +version=2.4.0 +revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="http://babel.pocoo.org/" license="3-clause-BSD" distfiles="${PYPI_SITE}/B/Babel/Babel-${version}.tar.gz" -checksum=c535c4403802f6eb38173cd4863e419e2274921a01a8aad8a5b497c131c62875 +checksum=8c98f5e5f8f5f088571f2c6bd88d530e331cbbcb95a7311a0db69d3dca7ec563 alternatives="babel:pybabel:/usr/bin/pybabel2" post_install() { diff --git a/srcpkgs/python-Cheroot/template b/srcpkgs/python-Cheroot/template new file mode 100644 index 00000000000..d2ebbf45e8d --- /dev/null +++ b/srcpkgs/python-Cheroot/template @@ -0,0 +1,36 @@ +# Template file for 'python-Cheroot' +pkgname=python-Cheroot +version=5.4.0 +revision=2 +noarch=yes +wrksrc="cheroot-${version}" +build_style=python-module +pycompile_module="cheroot" +hostmakedepends="python-setuptools python3-setuptools" +depends="python-six" +short_desc="High-performance, pure-Python HTTP server" +maintainer="Andrea Brancaleoni " +license="3-clause-BSD" +homepage="https://github.com/cherrypy/cheroot" +distfiles="${PYPI_SITE}/c/cheroot/cheroot-${version}.tar.gz" +checksum=f4b3d2eaa949b8a2f6676e3bca7c68cd358e4aa6bab437362b4bee6781626135 + +pre_build() { + sed -i setup.py \ + -e '/setuptools_scm/d' \ + -e "s|use_scm_version=True|version='${version}'|" +} +post_install() { + vlicense LICENSE.md LICENSE +} + +python3-Cheroot_package() { + noarch=yes + depends="python3-six" + pycompile_module="cheroot" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + vlicense LICENSE.md LICENSE + } +} diff --git a/srcpkgs/python-CherryPy/template b/srcpkgs/python-CherryPy/template index 6ae2275dfdc..ab1c8d1960b 100644 --- a/srcpkgs/python-CherryPy/template +++ b/srcpkgs/python-CherryPy/template @@ -1,19 +1,19 @@ # Template file for 'python-CherryPy' pkgname=python-CherryPy -version=10.1.1 -revision=1 +version=10.2.1 +revision=2 noarch=yes wrksrc="CherryPy-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" -depends="python-six" +depends="python-six python-Cheroot" pycompile_module="cherrypy" short_desc="Object-oriented HTTP framework (Python2)" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="3-clause-BSD" homepage="http://www.cherrypy.org" distfiles="${PYPI_SITE}/C/CherryPy/CherryPy-${version}.tar.gz" -checksum=a78a604e3afb0074cafa9c15c4ca25af0db4e52b2931e4a2c4b7df09151aa032 +checksum=2ee7e514de0167b63233a6bba25dda2bb9d5ef800da8ea3a0282a9a57a382274 alternatives="cherrypy:cherryd:/usr/bin/cherryd2" post_install() { @@ -22,7 +22,7 @@ post_install() { python3-CherryPy_package() { noarch=yes - depends="python3-six" + depends="python3-six python3-Cheroot" pycompile_module="cherrypy" replaces="python3.4-CherryPy>=0" short_desc="${short_desc/Python2/Python3}" diff --git a/srcpkgs/python-Django/template b/srcpkgs/python-Django/template index 81cbab64bcf..17c7f1ad51d 100644 --- a/srcpkgs/python-Django/template +++ b/srcpkgs/python-Django/template @@ -1,19 +1,19 @@ # Template file for 'python-Django' pkgname=python-Django -version=1.10.6 +version=1.11 revision=1 noarch=yes wrksrc="Django-${version}" build_style=python-module pycompile_module="django" hostmakedepends="python-setuptools python3-setuptools" -depends="python-setuptools" +depends="python-setuptools python-pytz" short_desc="High-level Python2 Web framework" maintainer="Eivind Uggedal " license="3-clause-BSD" homepage="http://www.djangoproject.com/" distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz" -checksum=7a6ebe254ab126510da143628d019ca8d6da2de49d7682bf046c03713a3c2c61 +checksum=b6f3b864944276b4fd1d099952112696558f78b77b39188ac92b6c5e80152c30 alternatives="django:django-admin:/usr/bin/django-admin2" post_install() { @@ -25,7 +25,7 @@ python3-Django_package() { noarch=yes pycompile_module="django" replaces="python3.4-Django>=0" - depends="python3-setuptools" + depends="python3-setuptools python3-pytz" short_desc="${short_desc/Python2/Python3}" alternatives="django:django-admin:/usr/bin/django-admin3" pkg_install() { diff --git a/srcpkgs/python-Flask/template b/srcpkgs/python-Flask/template index fdaf57289dc..5232e4fca27 100644 --- a/srcpkgs/python-Flask/template +++ b/srcpkgs/python-Flask/template @@ -1,6 +1,6 @@ # Template file for 'python-Flask' pkgname=python-Flask -version=0.12 +version=0.12.1 revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" @@ -13,7 +13,7 @@ maintainer="Markus Berger " homepage="http://flask.pocoo.org" license="3-clause-BSD" distfiles="${PYPI_SITE}/F/Flask/Flask-${version}.tar.gz" -checksum=93e803cdbe326a61ebd5c5d353959397c85f829bec610d59cb635c9f97d7ca8b +checksum=9dce4b6bfbb5b062181d3f7da8f727ff70c1156cbb4024351eafd426deb5fb88 alternatives="flask:flask:/usr/bin/flask2" post_install() { diff --git a/srcpkgs/python-GitPython/template b/srcpkgs/python-GitPython/template index df31c0a3763..00841f1ca9f 100644 --- a/srcpkgs/python-GitPython/template +++ b/srcpkgs/python-GitPython/template @@ -1,6 +1,6 @@ # Template file for 'python-GitPython' pkgname=python-GitPython -version=2.1.1 +version=2.1.3 revision=1 noarch=yes wrksrc="GitPython-${version}" @@ -11,9 +11,9 @@ depends="python-gitdb" short_desc="Library to interact with Git repositories (Python2)" maintainer="Joseph LaFreniere " homepage="https://github.com/gitpython-developers/GitPython" -license="BSD" +license="3-clause-BSD" distfiles="${PYPI_SITE}/G/GitPython/GitPython-${version}.tar.gz" -checksum=e96f8e953cf9fee0a7599fc587667591328760b6341a0081ef311a942fc96204 +checksum=3826185b11e1fc372e7d31251e9b65e11ccb7c27f82c771d619048bdb5b66c81 post_install() { vlicense LICENSE @@ -25,5 +25,6 @@ python3-GitPython_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense LICENSE } } diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template index 2be0c3682f4..8b28d76c2d1 100644 --- a/srcpkgs/python-Jinja2/template +++ b/srcpkgs/python-Jinja2/template @@ -1,6 +1,6 @@ # Template file for 'python-Jinja2' pkgname=python-Jinja2 -version=2.8.1 +version=2.9.6 revision=1 noarch=yes wrksrc="Jinja2-${version}" @@ -13,9 +13,14 @@ maintainer="Alessio Sergi " homepage="http://jinja.pocoo.org/" license="3-clause-BSD" distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz" -checksum=35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891 +checksum=ddaa01a212cd6d641401cb01b605f4a4d9f37bfc93043d7f760ec70fb99ff9ff post_install() { + # these files are valid only on Python 3.6+ + for py_sitelib in $py2_sitelib $py3_sitelib; do + rm -f ${DESTDIR}/${py_sitelib}/jinja2/asyncsupport.py + rm -f ${DESTDIR}/${py_sitelib}/jinja2/asyncfilters.py + done vlicense LICENSE } diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template index c2393097df7..66c90589ed6 100644 --- a/srcpkgs/python-M2Crypto/template +++ b/srcpkgs/python-M2Crypto/template @@ -1,7 +1,7 @@ # Template file for 'python-M2Crypto' pkgname=python-M2Crypto -version=0.25.1 -revision=3 +version=0.26.0 +revision=2 wrksrc="M2Crypto-${version}" build_style=python2-module pycompile_module="M2Crypto" @@ -9,8 +9,8 @@ hostmakedepends="python-setuptools swig libressl-devel" makedepends="libressl-devel python-devel" depends="python-typing" short_desc="Python crypto and SSL toolkit" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="MIT" homepage="https://gitlab.com/m2crypto/m2crypto/" distfiles="${PYPI_SITE}/M/M2Crypto/M2Crypto-${version}.tar.gz" -checksum=ac303a1881307a51c85ee8b1d87844d9866ee823b4fdbc52f7e79187c2d9acef +checksum=05d94fd9b2dae2fb8e072819a795f0e05d3611b09ea185f68e1630530ec09ae8 diff --git a/srcpkgs/python-MarkupSafe/template b/srcpkgs/python-MarkupSafe/template index bac82895a5b..1acb8b584f0 100644 --- a/srcpkgs/python-MarkupSafe/template +++ b/srcpkgs/python-MarkupSafe/template @@ -1,7 +1,7 @@ # Template file for 'python-MarkupSafe' pkgname=python-MarkupSafe -version=0.23 -revision=7 +version=1.0 +revision=1 wrksrc="MarkupSafe-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" @@ -10,9 +10,9 @@ pycompile_module="markupsafe" short_desc="Implements a XML/HTML/XHTML Markup safe string for Python2" maintainer="Juan RP " homepage="http://github.com/mitsuhiko/markupsafe" -license="BSD" +license="3-clause-BSD" distfiles="${PYPI_SITE}/M/MarkupSafe/MarkupSafe-${version}.tar.gz" -checksum=a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3 +checksum=a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-Pillow/template b/srcpkgs/python-Pillow/template index e143f9be1b4..dc9d3bc74a8 100644 --- a/srcpkgs/python-Pillow/template +++ b/srcpkgs/python-Pillow/template @@ -1,6 +1,6 @@ # Template file for 'python-Pillow' pkgname=python-Pillow -version=4.0.0 +version=4.1.0 revision=1 wrksrc="Pillow-${version}" build_style=python-module @@ -14,7 +14,7 @@ maintainer="Alessio Sergi " homepage="https://python-pillow.org/" license="PIL" distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz" -checksum=ee26d2d7e7e300f76ba7b796014c04011394d0c4a5ed9a288264a3e443abca50 +checksum=a0fd487fed4a35717401b7566e51a1520b34e7c0f7f2a315a6509f82bc86299f pre_build() { # don't install example scripts in /usr/bin diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template index 4919f596b32..a0b03ec7d94 100644 --- a/srcpkgs/python-PyQt5/template +++ b/srcpkgs/python-PyQt5/template @@ -1,6 +1,6 @@ # Template file for 'python-PyQt5' pkgname=python-PyQt5 -version=5.7.1 +version=5.8.2 revision=1 lib32disabled=yes wrksrc="PyQt5_gpl-${version}" @@ -11,7 +11,7 @@ makedepends=" qt5-tools-devel qt5-connectivity-devel qt5-declarative-devel qt5-location-devel qt5-multimedia-devel qt5-sensors-devel qt5-serialport-devel qt5-svg-devel qt5-webchannel-devel qt5-webengine-devel qt5-webkit-devel qt5-websockets-devel - qt5-x11extras-devel qt5-xmlpatterns-devel" + qt5-x11extras-devel qt5-xmlpatterns-devel pulseaudio-devel" depends="python-sip" pycompile_module="PyQt5" short_desc="Python2 bindings for the Qt5 toolkit" @@ -19,7 +19,7 @@ maintainer="Alessio Sergi " homepage="http://www.riverbankcomputing.co.uk/software/pyqt/intro" license="GPL-3" distfiles="${SOURCEFORGE_SITE}/pyqt/PyQt5_gpl-${version}.tar.gz" -checksum=be849f212a074049b9ebc10b6c07dddefb86e6d30e8df8a5c715cbb2cf7fad14 +checksum=ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8 # FIXME: Cross fails because make -f qtdetail uses g++ but $CXXFLAGS # qtdetail is a host tool and should be compiled as such nocross=yes @@ -214,7 +214,8 @@ python-PyQt5-webchannel_package() { } python-PyQt5-webengine_package() { lib32disabled=yes - depends="${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}-${version}_${revision} + python-PyQt5-webchannel-${version}_${revision}" short_desc+=" - webengine module" pkg_install() { vmove ${py2_sitelib}/PyQt5/QtWebEngine.so @@ -385,7 +386,8 @@ python3-PyQt5-webchannel_package() { python3-PyQt5-webengine_package() { lib32disabled=yes replaces="python3.4-PyQt5-webengine>=0" - depends="python3-PyQt5-${version}_${revision}" + depends="python3-PyQt5-${version}_${revision} + python3-PyQt5-webchannel-${version}_${revision}" short_desc="${short_desc/Python2/Python3} - webengine module" pkg_install() { vmove ${py3_sitelib}/PyQt5/QtWebEngine.so diff --git a/srcpkgs/python-Pyro4/template b/srcpkgs/python-Pyro4/template index 8d33ca61b45..5676275d661 100644 --- a/srcpkgs/python-Pyro4/template +++ b/srcpkgs/python-Pyro4/template @@ -1,6 +1,6 @@ # Template file for 'python-Pyro4' pkgname=python-Pyro4 -version=4.55 +version=4.59 revision=1 wrksrc="${pkgname#*-}-${version}" noarch=yes @@ -13,7 +13,7 @@ maintainer="pulux " license="MIT" homepage="https://pythonhosted.org/Pyro4/" distfiles="${PYPI_SITE}/P/Pyro4/Pyro4-${version}.tar.gz" -checksum=49a7a142542d87dde1cecc8d3ee048ec9481ba861d61234d219fadd06e6ced96 +checksum=6a39dadbd2a83b6fd5ab7f5402f8a4befd467b5c0404b8610a8797f748b72a38 alternatives=" pyro4:pyro4-check-config:/usr/bin/pyro4-check-config2 diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template index c0674280c3e..9433949ce91 100644 --- a/srcpkgs/python-SQLAlchemy/template +++ b/srcpkgs/python-SQLAlchemy/template @@ -1,6 +1,6 @@ # Template file for 'python-SQLAlchemy' pkgname=python-SQLAlchemy -version=1.1.6 +version=1.1.9 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python-module @@ -12,7 +12,7 @@ maintainer="Alessio Sergi " homepage="http://www.sqlalchemy.org/" license="MIT" distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz" -checksum=815924e3218d878ddd195d2f9f5bf3d2bb39fabaddb1ea27dace6ac27d9865e4 +checksum=b65cdc73cd348448ef0164f6c77d45a9f27ca575d3c5d71ccc33adf684bc6ef0 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-Sphinx/template b/srcpkgs/python-Sphinx/template index e714ef1d29d..dbbe1803b64 100644 --- a/srcpkgs/python-Sphinx/template +++ b/srcpkgs/python-Sphinx/template @@ -1,6 +1,6 @@ # Template file for 'python-Sphinx' pkgname=python-Sphinx -version=1.5.3 +version=1.5.5 revision=1 noarch=yes wrksrc="Sphinx-${version}" @@ -15,7 +15,7 @@ maintainer="Alessio Sergi " homepage="http://sphinx-doc.org/" license="2-clause-BSD" distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz" -checksum=4f6b257bea61ee6454538dcdb9e8cf56470b4dc6c4f9f750de4aedc57557814f +checksum=4064ea6c56feeb268838cb8fbbee507d0c3d5d92fa63a7df935a916b52c9e2f5 alternatives=" sphinx:sphinx-apidoc:/usr/bin/sphinx-apidoc2 diff --git a/srcpkgs/python-Werkzeug/template b/srcpkgs/python-Werkzeug/template index 027ac558b2d..0e7eda62c8f 100644 --- a/srcpkgs/python-Werkzeug/template +++ b/srcpkgs/python-Werkzeug/template @@ -1,6 +1,6 @@ # Template file for 'python-Werkzeug' pkgname=python-Werkzeug -version=0.11.15 +version=0.12.1 revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" @@ -13,7 +13,7 @@ maintainer="Markus Berger " homepage="http://werkzeug.pocoo.org" license="3-clause-BSD" distfiles="${PYPI_SITE}/W/Werkzeug/Werkzeug-${version}.tar.gz" -checksum=455d7798ac263266dbd38d4841f7534dd35ca9c3da4a8df303f8488f38f3bcc0 +checksum=6716830febe9808bb7521fd26db3b398450cbed0886b2b4bea678b87340f534e post_install() { vlicense LICENSE diff --git a/srcpkgs/python-ansible-lint/template b/srcpkgs/python-ansible-lint/template index eb2c2ea3d7e..b78bf5ca869 100644 --- a/srcpkgs/python-ansible-lint/template +++ b/srcpkgs/python-ansible-lint/template @@ -1,6 +1,6 @@ # Template file for 'python-ansible-lint' pkgname=python-ansible-lint -version=3.4.11 +version=3.4.12 revision=1 noarch=yes wrksrc="ansible-lint-${version}" @@ -13,7 +13,7 @@ maintainer="Joseph LaFreniere " homepage="https://github.com/willthames/ansible-lint" license="MIT" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=8ab5541eaca25af8f8cc53a06f3b07bc9768cf1bff9941e84ecef7fd4367127d +checksum=cf97675d2908f865e7657d7082ba84c8adf4f3775e3920a6d4b9f171a5fdda2a post_install() { vlicense LICENSE diff --git a/srcpkgs/python-asn1crypto/template b/srcpkgs/python-asn1crypto/template new file mode 100644 index 00000000000..3060bdf2ff8 --- /dev/null +++ b/srcpkgs/python-asn1crypto/template @@ -0,0 +1,26 @@ +# Template file for 'python-asn1crypto' +pkgname=python-asn1crypto +version=0.22.0 +revision=1 +noarch=yes +wrksrc="asn1crypto-${version}" +build_style=python-module +pycompile_module="asn1crypto" +hostmakedepends="python-setuptools python3-setuptools" +depends="python" +short_desc="Python2 ASN.1 library with a focus on performance and a pythonic API" +maintainer="Alessio Sergi " +homepage="https://github.com/wbond/asn1crypto" +license="MIT" +distfiles="${PYPI_SITE}/a/asn1crypto/asn1crypto-${version}.tar.gz" +checksum=cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a + +python3-asn1crypto_package() { + noarch=yes + depends="python3" + pycompile_module="asn1crypto" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/python-astroid/template b/srcpkgs/python-astroid/template index 3047ba80dca..000bcd52776 100644 --- a/srcpkgs/python-astroid/template +++ b/srcpkgs/python-astroid/template @@ -1,19 +1,20 @@ # Template file for 'python-astroid' pkgname=python-astroid -version=1.4.9 +version=1.5.2 revision=1 noarch=yes wrksrc="astroid-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" -depends="python-six python-lazy-object-proxy python-wrapt" +depends="python-six python-lazy-object-proxy python-wrapt + python-backports.functools_lru_cache python-enum34 python-singledispatch" pycompile_module="astroid" short_desc="Abstract syntax tree for Python2" maintainer="Alessio Sergi " homepage="https://github.com/PyCQA/astroid" license="GPL-2, LGPL-2.1" distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz" -checksum=a483e7891ce3a06dadfc6cb9095b0938aca58940d43576d72e4502b480c085d7 +checksum=271f1c9ad6519a5dde2a7f0c9b62c2923b55e16569bdd888f9f9055cc5be37ed post_install() { # no tests diff --git a/srcpkgs/python-atspi/template b/srcpkgs/python-atspi/template index 937c0653224..ad88e7badc6 100644 --- a/srcpkgs/python-atspi/template +++ b/srcpkgs/python-atspi/template @@ -1,6 +1,6 @@ # Template file for 'python-atspi' pkgname=python-atspi -version=2.20.3 +version=2.24.0 revision=1 noarch=yes wrksrc="pyatspi-${version}" @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org/" license="GPL-2" distfiles="${GNOME_SITE}/pyatspi/${version%.*}/pyatspi-${version}.tar.xz" -checksum=628f19cc5790b02ae6ec8580902683520087fba503c06c71257c572108cb5850 +checksum=e7ef47a5d387fdc64a01722ef2bcced54c4d6b225fbe34867189e1f88ff0a692 pre_configure() { mkdir -p atspi-${py2_ver} diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template index c413783e544..c9291543d57 100644 --- a/srcpkgs/python-cffi/template +++ b/srcpkgs/python-cffi/template @@ -1,6 +1,6 @@ # Template file for 'python-cffi' pkgname=python-cffi -version=1.9.1 +version=1.10.0 revision=1 wrksrc="cffi-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://cffi.readthedocs.io/" license="MIT" distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz" -checksum=563e0bd53fda03c151573217b3a49b3abad8813de9dd0632e10090f6190fdaf8 +checksum=b3b02911eb1f6ada203b0763ba924234629b51586f72a21faacc638269f4ced5 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-chardet/template b/srcpkgs/python-chardet/template index 7d64df1a3ab..8c24c0a55cd 100644 --- a/srcpkgs/python-chardet/template +++ b/srcpkgs/python-chardet/template @@ -1,7 +1,7 @@ # Template file for 'python-chardet' pkgname=python-chardet -version=2.3.0 -revision=3 +version=3.0.2 +revision=1 noarch=yes wrksrc="chardet-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/chardet/chardet" license="LGPL-2.1" distfiles="${PYPI_SITE}/c/chardet/chardet-${version}.tar.gz" -checksum=e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa +checksum=4f7832e7c583348a9eddd927ee8514b3bf717c061f57b21dbe7697211454d9bb alternatives="chardet:chardetect:/usr/bin/chardetect2" python3-chardet_package() { diff --git a/srcpkgs/python-chess/template b/srcpkgs/python-chess/template index 72d2e6d05b0..53f184498ff 100644 --- a/srcpkgs/python-chess/template +++ b/srcpkgs/python-chess/template @@ -1,6 +1,6 @@ # Template file for 'python-chess' pkgname=python-chess -version=0.16.2 +version=0.18.0 revision=1 noarch=yes build_style=python-module @@ -12,7 +12,7 @@ maintainer="cipr3s " license="GPL-3" homepage="https://github.com/niklasf/python-chess" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=d9bcd4188dec74efab10be6bf36ca6990cdd624b33c721603dad691c6502cf13 +checksum=90d16d282f5dc185d50d3a371b2cf50db1fe61dfd2467b610f6070a20fc7b295 python3-chess_package() { noarch=yes diff --git a/srcpkgs/python-cryptography/patches/fix-libressl-2.5.3.patch b/srcpkgs/python-cryptography/patches/fix-libressl-2.5.3.patch new file mode 100644 index 00000000000..66fe89c4b91 --- /dev/null +++ b/srcpkgs/python-cryptography/patches/fix-libressl-2.5.3.patch @@ -0,0 +1,15 @@ +--- src/_cffi_src/openssl/x509_vfy.py.orig 2017-04-11 19:49:14.765073278 +0200 ++++ src/_cffi_src/openssl/x509_vfy.py 2017-04-11 19:48:51.541130712 +0200 +@@ -221,10 +221,12 @@ static const long X509_V_ERR_SUITE_B_INV + static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0; + static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0; + static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0; ++#if LIBRESSL_VERSION_NUMBER < 0x2050300fL + static const long X509_V_ERR_HOSTNAME_MISMATCH = 0; + static const long X509_V_ERR_EMAIL_MISMATCH = 0; + static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0; + #endif ++#endif + + /* OpenSSL 1.0.2beta2+ verification parameters */ + #if CRYPTOGRAPHY_OPENSSL_102BETA2_OR_GREATER && \ diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template index bc76efbf320..ad0bb6303ab 100644 --- a/srcpkgs/python-cryptography/template +++ b/srcpkgs/python-cryptography/template @@ -1,29 +1,33 @@ # Template file for 'python-cryptography' pkgname=python-cryptography -version=1.7.2 -revision=1 +version=1.8.1 +revision=3 wrksrc="cryptography-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools libressl-devel - python-enum34 python-ipaddress python-six python3-six python-pyasn1 - python3-pyasn1 python-cffi python3-cffi python-idna python3-idna" + python-enum34 python-ipaddress python-six python3-six python-asn1crypto + python3-asn1crypto python-cffi python3-cffi python-idna python3-idna" makedepends="libressl-devel python-devel python3-devel" -depends="python-setuptools python-cffi python-pyasn1 python-six python-enum34 - python-idna python-ipaddress" +depends="python-setuptools python-cffi python-asn1crypto python-six + python-enum34 python-idna python-ipaddress" pycompile_module="cryptography" short_desc="Python2 library that provides cryptographic recipes and primitives" maintainer="Alessio Sergi " homepage="https://github.com/pyca/cryptography" license="3-clause-BSD, Apache-2.0" distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz" -checksum=878cb68b3da3d493ffd68f36db11c29deee623671d3287c3f8d685117ffda9a9 +checksum=323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190 +pre_build() { + sed -i '/packaging/d' setup.py + sed -i 's/packaging.version/pkg_resources.extern.\0/' src/cryptography/utils.py +} post_install() { vlicense LICENSE } python3-cryptography_package() { - depends="python3-setuptools python3-cffi python3-pyasn1 + depends="python3-setuptools python3-cffi python3-asn1crypto python3-six python3-idna" pycompile_module="cryptography" replaces="python3.4-cryptography>=0" diff --git a/srcpkgs/python-cssutils/template b/srcpkgs/python-cssutils/template index 28cd902b840..0f78c494ce7 100644 --- a/srcpkgs/python-cssutils/template +++ b/srcpkgs/python-cssutils/template @@ -1,7 +1,7 @@ # Template file for 'python-cssutils' pkgname=python-cssutils -version=1.0.1 -revision=3 +version=1.0.2 +revision=1 noarch=yes wrksrc="cssutils-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Farhad Shahbazi " license="LGPL-3" homepage="http://pypi.python.org/pypi/cssutils" distfiles="${PYPI_SITE}/c/cssutils/cssutils-${version}.tar.gz" -checksum=d8a18b2848ea1011750231f1dd64fe9053dbec1be0b37563c582561e7a529063 +checksum=a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf alternatives=" cssutils:csscapture:/usr/bin/csscapture2 diff --git a/srcpkgs/python-curl/template b/srcpkgs/python-curl/template index ade4faefc98..5d7219ede3d 100644 --- a/srcpkgs/python-curl/template +++ b/srcpkgs/python-curl/template @@ -1,7 +1,7 @@ # Template file for 'python-curl' pkgname=python-curl version=7.43.0 -revision=4 +revision=5 wrksrc="pycurl-${version}" build_style=python-module hostmakedepends="python-devel python3-devel" diff --git a/srcpkgs/python-docker-py/template b/srcpkgs/python-docker-py/template index 4a8d3b87b79..0a7d1cff885 100644 --- a/srcpkgs/python-docker-py/template +++ b/srcpkgs/python-docker-py/template @@ -1,30 +1,21 @@ # Template file for 'python-docker-py' pkgname=python-docker-py version=1.9.0 -revision=3 +revision=4 noarch=yes -wrksrc="docker-py-${version}" -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" -depends="python-requests python-six python-websocket-client python-ipaddress - python-backports.ssl_match_hostname" -pycompile_module="docker" -short_desc="Python2 client for Docker" +build_style=meta +depends="python-docker>=${version}_${revision}" +short_desc="Python2 client for Docker (transitional dummy package)" maintainer="Sergi Alvarez " homepage="https://github.com/docker/docker-py" license="Apache-2.0" -distfiles="${PYPI_SITE}/d/docker-py/docker-py-${version}.tar.gz" -checksum=6dc6b914a745786d97817bf35bfc1559834c08517c119f846acdfda9cc7f6d7e python3-docker-py_package() { noarch=yes - depends="python3-requests python3-six python3-websocket-client" - pycompile_module="docker" + build_style=meta replaces="python3.4-docker-py>=0" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - } + depends="python3-docker>=${version}_${revision}" + short_desc="${short_desc/Python2/Python3} (transitional dummy package)" } python3.4-docker-py_package() { noarch=yes diff --git a/srcpkgs/python-docker-py/update b/srcpkgs/python-docker-py/update deleted file mode 100644 index e299d00ea67..00000000000 --- a/srcpkgs/python-docker-py/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*rc*" diff --git a/srcpkgs/python-docker-pycreds/template b/srcpkgs/python-docker-pycreds/template new file mode 100644 index 00000000000..7e30116f69f --- /dev/null +++ b/srcpkgs/python-docker-pycreds/template @@ -0,0 +1,26 @@ +# Template file for 'python-docker-pycreds +pkgname=python-docker-pycreds +version=0.2.1 +revision=1 +noarch=yes +wrksrc="docker-pycreds-${version}" +build_style=python-module +pycompile_module="dockerpycreds" +hostmakedepends="python-setuptools python3-setuptools" +depends="python-six" +short_desc="Python2 bindings for the docker credentials store API" +maintainer="Sergi Alvarez " +homepage="https://github.com/shin-/dockerpy-creds" +license="Apache-2.0" +distfiles="${PYPI_SITE}/d/docker-pycreds/docker-pycreds-${version}.tar.gz" +checksum=93833a2cf280b7d8abbe1b8121530413250c6cd4ffed2c1cf085f335262f7348 + +python3-docker-pycreds_package() { + noarch=yes + depends="python3-six" + pycompile_module="dockerpycreds" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/python-docker/patches/no-pip.patch b/srcpkgs/python-docker/patches/no-pip.patch new file mode 100644 index 00000000000..2cfdb33412b --- /dev/null +++ b/srcpkgs/python-docker/patches/no-pip.patch @@ -0,0 +1,20 @@ +--- setup.py.orig 2017-01-20 03:12:21.000000000 +0100 ++++ setup.py 2017-04-21 12:39:13.784172057 +0200 +@@ -5,17 +5,8 @@ + import os + import sys + +-import pip +- + from setuptools import setup, find_packages + +-if 'docker-py' in [x.project_name for x in pip.get_installed_distributions()]: +- print( +- 'ERROR: "docker-py" needs to be uninstalled before installing this' +- ' package:\npip uninstall docker-py', file=sys.stderr +- ) +- sys.exit(1) +- + ROOT_DIR = os.path.dirname(__file__) + SOURCE_DIR = os.path.join(ROOT_DIR) + diff --git a/srcpkgs/python-docker/template b/srcpkgs/python-docker/template new file mode 100644 index 00000000000..d2299424183 --- /dev/null +++ b/srcpkgs/python-docker/template @@ -0,0 +1,29 @@ +# Template file for 'python-docker' +pkgname=python-docker +version=2.2.1 +revision=1 +noarch=yes +wrksrc="docker-${version}" +build_style=python-module +pycompile_module="docker" +replaces="python-docker-py>=0" +hostmakedepends="python-setuptools python3-setuptools" +depends="python-requests python-six python-websocket-client python-ipaddress + python-backports.ssl_match_hostname python-docker-pycreds" +short_desc="Python2 library for the Docker Engine API" +maintainer="Sergi Alvarez " +homepage="https://github.com/docker/docker-py" +license="Apache-2.0" +distfiles="${PYPI_SITE}/d/docker/docker-${version}.tar.gz" +checksum=a67de803a8b3a9ef5adb9ce881feb74ec33d373a4f6d6cbb1a26cad03e809ae2 + +python3-docker_package() { + noarch=yes + pycompile_module="docker" + replaces="python3-docker-py>=0" + depends="python3-requests python3-six python3-websocket-client python3-docker-pycreds" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/python-dulwich/template b/srcpkgs/python-dulwich/template index 4f685782dee..e88d441b513 100644 --- a/srcpkgs/python-dulwich/template +++ b/srcpkgs/python-dulwich/template @@ -1,6 +1,6 @@ # Template file for 'python-dulwich' pkgname=python-dulwich -version=0.17.1 +version=0.17.3 revision=1 wrksrc="dulwich-${version}" build_style=python-module @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="https://www.dulwich.io/" license="GPL-2, Apache-2.0" distfiles="${PYPI_SITE}/d/dulwich/dulwich-${version}.tar.gz" -checksum=5d61812a810038b260ee88807fdb39b4d827e2f00fe5907dad22d2733008f3ea +checksum=0c3eccac93823e172b05d57aaeab3d6f03c6c0f1867613606d1909a3ab4100ca alternatives=" dulwich:dul-receive-pack:/usr/bin/dul-receive-pack2 diff --git a/srcpkgs/python-enchant/template b/srcpkgs/python-enchant/template index 845871c6354..17cc4295c28 100644 --- a/srcpkgs/python-enchant/template +++ b/srcpkgs/python-enchant/template @@ -9,7 +9,7 @@ pycompile_module=enchant hostmakedepends="python-setuptools python3-setuptools enchant-devel" depends="enchant" short_desc="Spellchecking library for Python2" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="LGPL-2.1" homepage="https://github.com/rfk/pyenchant" distfiles="${PYPI_SITE}/p/pyenchant/pyenchant-${version}.tar.gz" diff --git a/srcpkgs/python-futures/template b/srcpkgs/python-futures/template index 507fd226ab5..bb2ea78e333 100644 --- a/srcpkgs/python-futures/template +++ b/srcpkgs/python-futures/template @@ -1,6 +1,6 @@ # Template file for 'python-futures' pkgname=python-futures -version=3.0.5 +version=3.1.1 revision=1 noarch=yes wrksrc="futures-${version}" @@ -10,10 +10,10 @@ hostmakedepends="python-setuptools" depends="python" short_desc="Backport of the concurrent.futures package from Python 3.2" maintainer="Eivind Uggedal " -license="2-clause-BSD" +license="PSF" homepage="https://github.com/agronholm/pythonfutures" distfiles="${PYPI_SITE}/f/futures/futures-${version}.tar.gz" -checksum=0542525145d5afc984c88f914a0c85c77527f65946617edb5274f72406f981df +checksum=51ecb45f0add83c806c68e4b06106f90db260585b25ef2abfcda0bd95c0132fd post_install() { vlicense LICENSE diff --git a/srcpkgs/python-github3/template b/srcpkgs/python-github3/template index 61770e80eba..c68f4b11033 100644 --- a/srcpkgs/python-github3/template +++ b/srcpkgs/python-github3/template @@ -1,19 +1,20 @@ # Template file for 'python-github3' pkgname=python-github3 -version=1.0.0a4 +reverts="1.0.0a4_1" +version=0.9.6 revision=1 noarch=yes wrksrc="github3.py-${version}" build_style=python-module pycompile_module="github3" hostmakedepends="python-setuptools python3-setuptools" -depends="python-requests python-uritemplate python-openssl python-ndg_httpsclient python-pyasn1" +depends="python-requests python-uritemplate" short_desc="Wrapper for GitHub's API (Python2)" maintainer="Joseph LaFreniere " homepage="https://github3py.readthedocs.org" license="3-clause-BSD" distfiles="${PYPI_SITE}/g/github3.py/github3.py-${version}.tar.gz" -checksum=570e776e2ab1318533b1555ee2f2f784142883b49cb4090582c0307c16cc1666 +checksum=b831db85d7ff4a99d6f4e8368918095afeea10f0ec50798f9a937c830ab41dc5 post_install() { vlicense LICENSE @@ -21,7 +22,7 @@ post_install() { python3-github3_package() { noarch=yes - depends="python3-requests python3-uritemplate python3-openssl python3-ndg_httpsclient python3-pyasn1" + depends="python3-requests python3-uritemplate" pycompile_module="github3" short_desc="${short_desc/Python2/Python3}" pkg_install() { diff --git a/srcpkgs/python-gitlab/template b/srcpkgs/python-gitlab/template index 6e78989a88c..f3901fd8642 100644 --- a/srcpkgs/python-gitlab/template +++ b/srcpkgs/python-gitlab/template @@ -1,6 +1,6 @@ # Template file for 'python-gitlab' pkgname=python-gitlab -version=0.19 +version=0.20 revision=1 noarch=yes build_style=python-module @@ -12,7 +12,7 @@ maintainer="Joseph LaFreniere " homepage="https://github.com/gpocentek/python-gitlab" license="LGPL-3" distfiles="${PYPI_SITE}/p/python-gitlab/python-gitlab-${version}.tar.gz" -checksum=88b65591db7a10a0d9979797e4e654a113e2b93b3a559309f6092b27ab93934a +checksum=028cb3f13c968f93315159686bf3cc2f693cd84585c9f0f807d0869a579fefbf alternatives="python-gitlab:gitlab:/usr/bin/gitlab2" python3-gitlab_package() { diff --git a/srcpkgs/python-gobject/template b/srcpkgs/python-gobject/template index 290ee3991fe..b58cd59f913 100644 --- a/srcpkgs/python-gobject/template +++ b/srcpkgs/python-gobject/template @@ -1,6 +1,6 @@ # Template file for 'python-gobject' pkgname=python-gobject -version=3.22.0 +version=3.24.1 revision=1 wrksrc="pygobject-${version}" hostmakedepends="pkg-config gobject-introspection" @@ -12,7 +12,7 @@ homepage="https://live.gnome.org/PyGObject" maintainer="Juan RP " license="LGPL-2.1" distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz" -checksum=08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7 +checksum=a628a95aa0909e13fb08230b1b98fc48adef10b220932f76d62f6821b3fdbffd nocross="http://build.voidlinux.eu/builders/armv7l_builder/builds/8676/steps/shell_3/logs/stdio" diff --git a/srcpkgs/python-gogs-client/template b/srcpkgs/python-gogs-client/template index 3a608001781..ee4047c98ee 100644 --- a/srcpkgs/python-gogs-client/template +++ b/srcpkgs/python-gogs-client/template @@ -1,6 +1,6 @@ # Template file for 'python-gogs-client' pkgname=python-gogs-client -version=1.0.3 +version=1.0.4 revision=1 noarch=yes wrksrc="gogs_client-${version}" @@ -8,20 +8,17 @@ build_style=python-module pycompile_module="gogs_client" hostmakedepends="python-setuptools python3-setuptools" depends="python-future python-requests" -short_desc="Library for interacting with a gogs server (Python2)" +short_desc="Python2 library for interacting with a gogs server" maintainer="Joseph LaFreniere " homepage="https://github.com/unfoldingWord-dev/python-gogs-client" license="MIT" -# License not currently in PyPi: https://github.com/unfoldingWord-dev/python-gogs-client/issues/5 -distfiles="${PYPI_SITE}/g/gogs_client/gogs_client-${version}.tar.gz - https://raw.githubusercontent.com/unfoldingWord-dev/python-gogs-client/aec61c5e27044c9b2542de6a7700b386b594d2ab/LICENSE.txt -" -checksum="bcc164e554d30d8048e7c87ff2841fc027852f6b9da056fe4371829c42c95d9a - 59daafc62a061a847015d645814ebe5fbefbab50cea063c56aa3f1bf99be7f3e" -skip_extraction=LICENSE.txt +distfiles="${PYPI_SITE}/g/gogs_client/gogs_client-${version}.tar.gz" +checksum=4e76ac6193e662efe6f4c09777880569bd31e0f9b62088765b669a684452bcd2 post_install() { - vlicense ${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE.txt + # License not currently in PyPI: https://github.com/unfoldingWord-dev/python-gogs-client/issues/5 + $XBPS_FETCH_CMD https://raw.githubusercontent.com/unfoldingWord-dev/python-gogs-client/master/LICENSE.txt + vlicense LICENSE.txt } python3-gogs-client_package() { @@ -31,6 +28,6 @@ python3-gogs-client_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* - vlicense ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/LICENSE.txt + vlicense LICENSE.txt } } diff --git a/srcpkgs/python-gtkglext/template b/srcpkgs/python-gtkglext/template index 5bcabd7e940..7efe3402340 100644 --- a/srcpkgs/python-gtkglext/template +++ b/srcpkgs/python-gtkglext/template @@ -8,7 +8,7 @@ pycompile_module="gtk-2.0/gtk" hostmakedepends="pkg-config pygtk-devel" makedepends="pygtk-devel gtkglext-devel" short_desc="Python Bindings for GtkGLExt" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="LGPL-2.1" homepage="https://projects.gnome.org/gtkglext/" distfiles="${SOURCEFORGE_SITE}/gtkglext/pygtkglext-${version}.tar.bz2" diff --git a/srcpkgs/python-html5lib/template b/srcpkgs/python-html5lib/template index db35e0bef9e..a012a513cc0 100644 --- a/srcpkgs/python-html5lib/template +++ b/srcpkgs/python-html5lib/template @@ -1,28 +1,31 @@ # Template file for 'python-html5lib' pkgname=python-html5lib -version=0.9999999 +version=0.999999999 revision=2 noarch=yes wrksrc="html5lib-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" -depends="python-six" +depends="python-six python-webencodings" pycompile_module="html5lib" short_desc="Python2 HTML parser based on the WHATWG HTML5 specification" maintainer="Alessio Sergi " homepage="https://github.com/html5lib/html5lib-python" license="MIT" distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz" -checksum=2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868 +checksum=ee747c0ffd3028d2722061936b5c65ee4fe13c8e4613519b4447123fc4546298 +pre_build() { + sed -i '/setuptools>=/d' setup.py +} post_install() { vlicense LICENSE } python3-html5lib_package() { noarch=yes - depends="python3-six" pycompile_module="html5lib" + depends="python3-six python3-webencodings" replaces="python3.4-html5lib>=0" short_desc="${short_desc/Python2/Python3}" pkg_install() { diff --git a/srcpkgs/python-idna/template b/srcpkgs/python-idna/template index d51fdf5715e..a3bcb391f39 100644 --- a/srcpkgs/python-idna/template +++ b/srcpkgs/python-idna/template @@ -1,6 +1,6 @@ # Template file for 'python-idna' pkgname=python-idna -version=2.4 +version=2.5 revision=1 noarch=yes wrksrc="idna-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/kjd/idna" license="BSD" distfiles="${PYPI_SITE}/i/idna/idna-${version}.tar.gz" -checksum=2a07165f6288f4b920aa8ab4357c1e59073c5d62e048a400510982769e039bd9 +checksum=3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab python3-idna_package() { noarch=yes diff --git a/srcpkgs/python-ipaddr/template b/srcpkgs/python-ipaddr/template index 8cfdb3d0b52..32fbfc5c22f 100644 --- a/srcpkgs/python-ipaddr/template +++ b/srcpkgs/python-ipaddr/template @@ -9,7 +9,7 @@ pycompile_module="ipaddr.py" hostmakedepends="python" makedepends="python-devel" short_desc="Python IP address manipulation library" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://github.com/google/ipaddr-py" distfiles="${PYPI_SITE}/i/ipaddr/ipaddr-${version}.tar.gz" diff --git a/srcpkgs/python-ipython_genutils/template b/srcpkgs/python-ipython_genutils/template index bea385d018b..3e3ada8d171 100644 --- a/srcpkgs/python-ipython_genutils/template +++ b/srcpkgs/python-ipython_genutils/template @@ -1,7 +1,7 @@ # Template file for 'python-ipython_genutils' pkgname=python-ipython_genutils -version=0.1.0 -revision=2 +version=0.2.0 +revision=1 noarch=yes wrksrc="ipython_genutils-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/ipython/ipython_genutils" license="3-clause-BSD" distfiles="${PYPI_SITE}/i/ipython_genutils/ipython_genutils-${version}.tar.gz" -checksum=3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6 +checksum=eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8 post_install() { vlicense COPYING.md LICENSE diff --git a/srcpkgs/python-ipython_ipykernel/template b/srcpkgs/python-ipython_ipykernel/template index 3799a8d7769..f6064826b62 100644 --- a/srcpkgs/python-ipython_ipykernel/template +++ b/srcpkgs/python-ipython_ipykernel/template @@ -1,32 +1,38 @@ # Template file for 'python-ipython_ipykernel' pkgname=python-ipython_ipykernel -version=4.5.2 +version=4.6.1 revision=1 noarch=yes wrksrc="ipykernel-${version}" build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" -depends="python-ipython python-traitlets python-jupyter_client" -pycompile_module="ipykernel" +hostmakedepends="python-setuptools python3-setuptools python-ipython + python3-ipython python-jupyter_client python3-jupyter_client python-traitlets + python3-traitlets python-tornado python3-tornado" +depends="python-ipython python-traitlets python-jupyter_client python-tornado" +pycompile_module="ipykernel ipykernel_launcher.py" short_desc="IPython kernel for Jupyter (Python2)" maintainer="Alessio Sergi " homepage="https://github.com/ipython/ipykernel" license="3-clause-BSD" distfiles="${PYPI_SITE}/i/ipykernel/ipykernel-${version}.tar.gz" -checksum=5a54f25f0e6c8ee74c362c23f9a95e10e74c6b7f5ef42059c861ff6f26d89462 +checksum=2e1825aca4e2585b5adb7953ea16e53f53a62159ed49952a564b1e23507205db post_install() { + for v in 2 3; do + sed -i "s,python,&${v}," ${DESTDIR}/usr/share/jupyter/kernels/python${v}/kernel.json + done vlicense COPYING.md LICENSE } python3-ipython_ipykernel_package() { noarch=yes - depends="python3-ipython python3-traitlets python3-jupyter_client" + depends="python3-ipython python3-traitlets python3-jupyter_client python3-tornado" replaces="python3.4-ipython_ipykernel>=0" - pycompile_module="ipykernel" + pycompile_module="ipykernel ipykernel_launcher.py" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vmove usr/share/jupyter/kernels/python3 vlicense COPYING.md LICENSE } } diff --git a/srcpkgs/python-ipython_ipywidgets/template b/srcpkgs/python-ipython_ipywidgets/template index 020bd6b38d9..9ed385530a9 100644 --- a/srcpkgs/python-ipython_ipywidgets/template +++ b/srcpkgs/python-ipython_ipywidgets/template @@ -1,6 +1,6 @@ # Template file for 'python-ipython_ipywidgets' pkgname=python-ipython_ipywidgets -version=5.2.2 +version=6.0.0 revision=1 noarch=yes wrksrc="ipywidgets-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/ipython/ipywidgets" license="3-clause-BSD" distfiles="${PYPI_SITE}/i/ipywidgets/ipywidgets-${version}.tar.gz" -checksum=baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2 +checksum=afa6248850cff14ef86117db87aeab0b12237e4eaf740e73716460ed593a43a7 post_install() { vlicense COPYING.md LICENSE diff --git a/srcpkgs/python-jupyter_client/template b/srcpkgs/python-jupyter_client/template index bd5fdb97755..f7ddcc75957 100644 --- a/srcpkgs/python-jupyter_client/template +++ b/srcpkgs/python-jupyter_client/template @@ -1,19 +1,19 @@ # Template file for 'python-jupyter_client' pkgname=python-jupyter_client -version=5.0.0 +version=5.0.1 revision=1 noarch=yes wrksrc="jupyter_client-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" -depends="python-traitlets python-jupyter_core python-pyzmq" +depends="python-traitlets python-jupyter_core python-pyzmq python-dateutil" pycompile_module="jupyter_client" short_desc="Jupyter protocol client APIs (Python2)" maintainer="Alessio Sergi " homepage="https://github.com/jupyter/jupyter_client" license="3-clause-BSD" distfiles="${PYPI_SITE}/j/jupyter_client/jupyter_client-${version}.tar.gz" -checksum=2766f9c2deb9ae826e65d53a56a36d69b184f63d0dcb7710835273327126bc5b +checksum=1fe573880b5ca4469ed0bece098f4b910c373d349e12525e1ea3566f5a14536b alternatives="jupyter-client:jupyter-kernelspec:/usr/bin/jupyter-kernelspec2" post_install() { @@ -22,10 +22,10 @@ post_install() { python3-jupyter_client_package() { noarch=yes - depends="python3-traitlets python3-jupyter_core python3-pyzmq" pycompile_module="jupyter_client" replaces="python3.4-jupyter_client>=0" short_desc="${short_desc/Python2/Python3}" + depends="python3-traitlets python3-jupyter_core python3-pyzmq python3-dateutil" alternatives="jupyter-client:jupyter-kernelspec:/usr/bin/jupyter-kernelspec3" pkg_install() { vmove usr/bin/jupyter-kernelspec3 diff --git a/srcpkgs/python-jupyter_notebook/template b/srcpkgs/python-jupyter_notebook/template index 1cdb846247c..0eb44f6c24b 100644 --- a/srcpkgs/python-jupyter_notebook/template +++ b/srcpkgs/python-jupyter_notebook/template @@ -1,6 +1,6 @@ # Template file for 'python-jupyter_notebook' pkgname=python-jupyter_notebook -version=4.4.1 +version=5.0.0 revision=1 noarch=yes wrksrc="notebook-${version}" @@ -16,13 +16,18 @@ maintainer="Alessio Sergi " homepage="https://github.com/jupyter/notebook" license="3-clause-BSD" distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz" -checksum=dfadef2babd7c04c6c257df7d07d7ba587e503dbb4e4c95305f9a95b8d3a9765 +checksum=1cea3bbbd03c8e5842a1403347a8cc8134486b3ce081a2e5b1952a00ea66ed54 alternatives=" jupyter-notebook:jupyter-notebook:/usr/bin/jupyter-notebook2 jupyter-notebook:jupyter-nbextension:/usr/bin/jupyter-nbextension2 - jupyter-notebook:jupyter-serverextension:/usr/bin/jupyter-serverextension2" + jupyter-notebook:jupyter-serverextension:/usr/bin/jupyter-serverextension2 + jupyter-notebook:jupyter-bundlerextension:/usr/bin/jupyter-bundlerextension2" +pre_build() { + # remove less-watch script + rm -f scripts/less-watch +} post_install() { vlicense COPYING.md LICENSE # use system mathjax @@ -36,7 +41,8 @@ python3-jupyter_notebook_package() { alternatives=" jupyter-notebook:jupyter-notebook:/usr/bin/jupyter-notebook3 jupyter-notebook:jupyter-nbextension:/usr/bin/jupyter-nbextension3 - jupyter-notebook:jupyter-serverextension:/usr/bin/jupyter-serverextension3" + jupyter-notebook:jupyter-serverextension:/usr/bin/jupyter-serverextension3 + jupyter-notebook:jupyter-bundlerextension:/usr/bin/jupyter-bundlerextension3" noarch=yes replaces="python3.4-jupyter_notebook>=0" depends="python3-Jinja2 python3-terminado python3-tornado diff --git a/srcpkgs/python-jupyter_qtconsole/template b/srcpkgs/python-jupyter_qtconsole/template index a018c99fdcd..e4af8838303 100644 --- a/srcpkgs/python-jupyter_qtconsole/template +++ b/srcpkgs/python-jupyter_qtconsole/template @@ -1,20 +1,21 @@ # Template file for 'python-jupyter_qtconsole' pkgname=python-jupyter_qtconsole -version=4.2.1 -revision=3 +version=4.3.0 +revision=1 noarch=yes wrksrc="qtconsole-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" depends="python-traitlets python-jupyter_core python-jupyter_client - python-Pygments python-ipython_ipykernel python-PyQt5-svg" + python-Pygments python-ipython_ipykernel python-ipython_genutils + python-PyQt5-svg" pycompile_module="qtconsole" short_desc="Jupyter Qt console (Python2)" maintainer="Alessio Sergi " homepage="https://github.com/jupyter/qtconsole" license="3-clause-BSD" distfiles="${PYPI_SITE}/q/qtconsole/qtconsole-${version}.tar.gz" -checksum=25ec7d345528b3e8f3c91be349dd3c699755f206dc4b6ec668e2e5dd60ea18ef +checksum=2821ccf85853b83e4958521f82e36325208787eaf79b19b83905a99cc41aa209 alternatives="jupyter-qtconsole:jupyter-qtconsole:/usr/bin/jupyter-qtconsole2" post_install() { @@ -25,7 +26,8 @@ python3-jupyter_qtconsole_package() { noarch=yes replaces="python3.4-jupyter_qtconsole>=0" depends="python3-traitlets python3-jupyter_core python3-jupyter_client - python3-Pygments python3-ipython_ipykernel python3-PyQt5-svg" + python3-Pygments python3-ipython_ipykernel python3-ipython_genutils + python3-PyQt5-svg" pycompile_module="qtconsole" short_desc="${short_desc/Python2/Python3}" alternatives="jupyter-qtconsole:jupyter-qtconsole:/usr/bin/jupyter-qtconsole3" diff --git a/srcpkgs/python-keyring/template b/srcpkgs/python-keyring/template index 568e2fda114..f5deedc98e2 100644 --- a/srcpkgs/python-keyring/template +++ b/srcpkgs/python-keyring/template @@ -1,6 +1,6 @@ # Template file for 'python-keyring' pkgname=python-keyring -version=10.3 +version=10.3.2 revision=1 noarch=yes wrksrc="keyring-${version}" @@ -13,7 +13,7 @@ maintainer="Oliver Kiddle " license="MIT" homepage="https://github.com/jaraco/keyring" distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz" -checksum=220a92af8119eb38e7f9afbdf8c2c93eef8186cc39e9ab2a0e4c80807df00e45 +checksum=f462698bc8b96ef5f9fb31d392611f416c808a8244d679fb02530b72bab01ad6 alternatives="keyring:keyring:/usr/bin/keyring2" pre_build() { diff --git a/srcpkgs/python-libpcap/template b/srcpkgs/python-libpcap/template index 1dfaf3160b8..2eebdf80500 100644 --- a/srcpkgs/python-libpcap/template +++ b/srcpkgs/python-libpcap/template @@ -7,7 +7,7 @@ build_style=python2-module hostmakedepends="python" makedepends="libpcap-devel python-devel" short_desc="Python module for the libpcap packet capture library" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="BSD" homepage="http://pylibpcap.sourceforge.net/" distfiles="$SOURCEFORGE_SITE/pylibpcap/pylibpcap/$version/pylibpcap-$version.tar.gz" diff --git a/srcpkgs/python-lz4/template b/srcpkgs/python-lz4/template index 6297ddf044f..7ce7a6c98b5 100644 --- a/srcpkgs/python-lz4/template +++ b/srcpkgs/python-lz4/template @@ -1,7 +1,7 @@ # Template file for 'python-lz4' pkgname=python-lz4 -version=0.8.2 -revision=3 +version=0.9.0 +revision=1 wrksrc=lz4-${version} build_style=python-module hostmakedepends="pkg-config python-setuptools python3-setuptools" @@ -11,13 +11,16 @@ maintainer="Oliver Kiddle " license="3-clause-BSD" homepage="https://github.com/python-lz4/python-lz4" distfiles="${PYPI_SITE}/l/lz4/lz4-${version}.tar.gz" -checksum=6bf49061d73d69c453e892ace4586b99ccffc7de558f921d18b9418235692ac7 +checksum=93c2b83aa9c74c024062823f96515488c510fa5a4b3826579d0916049d28c205 pre_build() { - sed '/nose/ d' -i setup.py - sed -n 2,27p src/lz4.c > LICENSE + sed -i setup.py \ + -e '/setup_requires/d' \ + -e '/use_scm_version/,+2d' \ + -e "/name=/ a\ + version='${version}'," + sed -n 2,29p lz4/_version.c >LICENSE } - post_install() { vlicense LICENSE } diff --git a/srcpkgs/python-mistune/template b/srcpkgs/python-mistune/template index dd5c871654f..b3a9e4155ac 100644 --- a/srcpkgs/python-mistune/template +++ b/srcpkgs/python-mistune/template @@ -1,7 +1,7 @@ # Template file for 'python-mistune' pkgname=python-mistune -version=0.7.3 -revision=2 +version=0.7.4 +revision=1 wrksrc="mistune-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython" @@ -12,7 +12,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/lepture/mistune" license="3-clause-BSD" distfiles="${PYPI_SITE}/m/mistune/mistune-${version}.tar.gz" -checksum=21d0e869df3b9189f248e022f1c9763cf9069e1a2f00676f1f1852bd7f98b713 +checksum=8517af9f5cd1857bb83f9a23da75aa516d7538c32a2c5d5c56f3789a9e4cd22f post_install() { vlicense LICENSE diff --git a/srcpkgs/python-numpy/template b/srcpkgs/python-numpy/template index 506e308e180..038e3ad0567 100644 --- a/srcpkgs/python-numpy/template +++ b/srcpkgs/python-numpy/template @@ -1,6 +1,6 @@ # Template file for 'python-numpy' pkgname=python-numpy -version=1.12.0 +version=1.12.1 revision=1 wrksrc="numpy-${version}" build_style=python-module @@ -13,7 +13,9 @@ maintainer="Alessio Sergi " homepage="http://www.numpy.org/" license="3-clause-BSD" distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz" -checksum=edec8d62882bef688a0cfd6b79987a722d26028238b6120b47974da58824ad08 +checksum=71253c0db5df2d0a925090b0804aa1070e9c336d891217bda5701f455d8141f7 +# Needs cross Python headers and/or libs issues sorted out. +nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/1408/steps/shell_3/logs/stdio" alternatives=" numpy:f2py:/usr/bin/f2py2 diff --git a/srcpkgs/python-oauthlib/template b/srcpkgs/python-oauthlib/template index 9bb1142476f..0538c0ea887 100644 --- a/srcpkgs/python-oauthlib/template +++ b/srcpkgs/python-oauthlib/template @@ -1,6 +1,6 @@ # Template file for 'python-oauthlib' pkgname=python-oauthlib -version=2.0.1 +version=2.0.2 revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" @@ -13,7 +13,7 @@ maintainer="Eivind Uggedal " license="3-clause-BSD" homepage="https://github.com/idan/oauthlib" distfiles="${PYPI_SITE}/o/oauthlib/oauthlib-${version}.tar.gz" -checksum=132ad46df25e53a84b33f1fd43f80e973cda2cb018cc0168d7d0c8c4d5cef9b5 +checksum=b3b9b47f2a263fe249b5b48c4e25a5bce882ff20a0ac34d553ce43cff55b53ac post_install() { vlicense LICENSE diff --git a/srcpkgs/python-openssl/template b/srcpkgs/python-openssl/template index 7e5e01d5b8c..359b6d0ecc0 100644 --- a/srcpkgs/python-openssl/template +++ b/srcpkgs/python-openssl/template @@ -1,6 +1,6 @@ # Template file for 'python-openssl' pkgname=python-openssl -version=16.2.0 +version=17.0.0 revision=1 noarch=yes wrksrc="pyOpenSSL-${version}" @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="https://github.com/pyca/pyopenssl" license="Apache-2.0" distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz" -checksum=7779a3bbb74e79db234af6a08775568c6769b5821faecf6e2f4143edb227516e +checksum=48abfe9d2bb8eb8d8947c8452b0223b7b1be2383b332f3b4f248fe59ef0bafdd python3-openssl_package() { noarch=yes diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python-parsing/template index 5e0cf138ef9..fce3e70ea7b 100644 --- a/srcpkgs/python-parsing/template +++ b/srcpkgs/python-parsing/template @@ -1,7 +1,7 @@ # Template file for 'python-parsing' pkgname=python-parsing -version=2.1.10 -revision=2 +version=2.2.0 +revision=1 noarch=yes wrksrc="pyparsing-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Juan RP " license="MIT" homepage="http://pyparsing.wikispaces.com/" distfiles="${PYPI_SITE}/p/pyparsing/pyparsing-${version}.tar.gz" -checksum=811c3e7b0031021137fc83e051795025fcb98674d07eb8fe922ba4de53d39188 +checksum=0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-path/template b/srcpkgs/python-path/template index c51be276b2d..39a0f39141e 100644 --- a/srcpkgs/python-path/template +++ b/srcpkgs/python-path/template @@ -1,6 +1,6 @@ # Template file for 'python-path' pkgname=python-path -version=10.1 +version=10.3.1 revision=1 noarch=yes wrksrc="path.py-${version}" @@ -13,13 +13,17 @@ maintainer="Alessio Sergi " homepage="https://github.com/jaraco/path.py" license="MIT" distfiles="${PYPI_SITE}/p/path.py/path.py-${version}.tar.gz" -checksum=8b0ee56f6c1421a9038823926ee8da354ce70933424b408558bc6b48496587f3 +checksum=412706be1cd8ab723c77829f9aa0c4d4b7c7b26c7b1be0275a6841c3cb1001e0 pre_build() { sed -e '/setuptools_scm/d' \ -e "s/use_scm_version=True,/version=\"${version}\",/" \ -i setup.py } +post_install() { + sed -n '/Copyright/,/SOFTWARE\./p' path.py >LICENSE + vlicense LICENSE +} python3-path_package() { noarch=yes @@ -29,6 +33,7 @@ python3-path_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense LICENSE } } python3.4-path_package() { diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template index be4138f1600..98e10e93d29 100644 --- a/srcpkgs/python-pbr/template +++ b/srcpkgs/python-pbr/template @@ -1,6 +1,6 @@ # Template file for 'python-pbr' pkgname=python-pbr -version=2.0.0 +version=3.0.0 revision=1 noarch=yes wrksrc="pbr-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://docs.openstack.org/developer/pbr/" license="Apache-2.0" distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz" -checksum=0ccd2db529afd070df815b1521f01401d43de03941170f8a800e7531faba265d +checksum=568f988af109114fbfa0525dcb6836b069838360d11732736ecc82e4c15d5c12 alternatives="pbr:pbr:/usr/bin/pbr2" python3-pbr_package() { diff --git a/srcpkgs/python-progress/template b/srcpkgs/python-progress/template index 651e6285af8..9b133f5b3a7 100644 --- a/srcpkgs/python-progress/template +++ b/srcpkgs/python-progress/template @@ -1,27 +1,31 @@ # Template file for 'python-progress' pkgname=python-progress -version=1.2 +version=1.3 revision=1 noarch=yes wrksrc="progress-${version}" build_style=python-module pycompile_module="progress" hostmakedepends="python-setuptools python3-setuptools" +depends="python" short_desc="Easy to use progress bars (Python2)" maintainer="Joseph LaFreniere " homepage="https://github.com/verigak/progress" license="ISC" distfiles="${PYPI_SITE}/p/progress/progress-${version}.tar.gz" -checksum=5b6a50f9ac76820f619d7789b5354881c8c10060a64047e415868d8f503cc2eb +checksum=c88d89ee3bd06716a0b8b5504d9c3bcb3c1c0ab98f96dc7f1dc5f56812a4f60a + +post_install() { + vlicense LICENSE +} python3-progress_package() { noarch=yes + depends="python3" pycompile_module="progress" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense LICENSE } } -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/python-prompt_toolkit/template b/srcpkgs/python-prompt_toolkit/template index 374af66af4e..21aafccd91a 100644 --- a/srcpkgs/python-prompt_toolkit/template +++ b/srcpkgs/python-prompt_toolkit/template @@ -1,6 +1,6 @@ # Template file for 'python-prompt_toolkit' pkgname=python-prompt_toolkit -version=1.0.13 +version=1.0.14 revision=1 noarch=yes wrksrc="prompt_toolkit-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/jonathanslenders/python-prompt-toolkit" license="3-clause-BSD" distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz" -checksum=33d68ca09f76cd73287fde7df5748ffacf26a8238dd61ee81ac50860ea7c6776 +checksum=cc66413b1b4b17021675d9f2d15d57e640b06ddfd99bb724c73484126d22622f post_install() { vlicense LICENSE diff --git a/srcpkgs/python-psutil/template b/srcpkgs/python-psutil/template index 3fb226c0d14..115750ae2c2 100644 --- a/srcpkgs/python-psutil/template +++ b/srcpkgs/python-psutil/template @@ -1,6 +1,6 @@ # Template file for 'python-psutil' pkgname=python-psutil -version=5.1.3 +version=5.2.2 revision=1 wrksrc="psutil-${version}" build_style=python-module @@ -12,7 +12,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/giampaolo/psutil" license="3-clause-BSD" distfiles="${PYPI_SITE}/p/psutil/psutil-${version}.tar.gz" -checksum=959bd58bdc8152b0a143cb3bd822d4a1b8f7230617b0e3eb2ff6e63812120f2b +checksum=44746540c0fab5b95401520d29eb9ffe84b3b4a235bd1d1971cbe36e1f38dd13 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-psycopg2/template b/srcpkgs/python-psycopg2/template index 797640a67f9..1158b4508c3 100644 --- a/srcpkgs/python-psycopg2/template +++ b/srcpkgs/python-psycopg2/template @@ -1,8 +1,7 @@ # Template file for 'python-psycopg2' pkgname=python-psycopg2 -version=2.6.2 -revision=3 -_series="${version%.*}" +version=2.7.1 +revision=1 wrksrc="psycopg2-${version}" build_style=python-module pycompile_module="psycopg2" @@ -10,12 +9,12 @@ pycompile_module="psycopg2" hostmakedepends="python-devel python3-devel postgresql-libs-devel" # Require postgresql-libs-devel for libpq-fe.h makedepends="python-devel python3-devel postgresql-libs-devel" -short_desc="PostgreSQL adapter for Python designed to be thread safe" +short_desc="PostgreSQL adapter for Python2" maintainer="Toyam Cox " license="LGPL-3" homepage="http://initd.org/psycopg" -distfiles="${homepage}/tarballs/PSYCOPG-${_series/./-}/psycopg2-${version}.tar.gz" -checksum=70490e12ed9c5c818ecd85d185d363335cc8a8cbf7212e3c185431c79ff8c05c +distfiles="${PYPI_SITE}/p/psycopg2/psycopg2-${version}.tar.gz" +checksum=86c9355f5374b008c8479bc00023b295c07d508f7c3b91dbd2e74f8925b1d9c6 python3-psycopg2_package() { pycompile_module="psycopg2" diff --git a/srcpkgs/python-pyacoustid/template b/srcpkgs/python-pyacoustid/template index d0c20fce361..49c860d15c2 100644 --- a/srcpkgs/python-pyacoustid/template +++ b/srcpkgs/python-pyacoustid/template @@ -1,7 +1,7 @@ # Template file for 'python-pyacoustid' pkgname=python-pyacoustid -version=1.1.4 -revision=2 +version=1.1.5 +revision=1 noarch=yes wrksrc="pyacoustid-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="https://github.com/sampsyo/pyacoustid" license="MIT" distfiles="${PYPI_SITE}/p/pyacoustid/pyacoustid-${version}.tar.gz" -checksum=b54bc803e936e49170f01febcf89621dda4a1ebb3d407e04e9ead290fa3a6cf3 +checksum=efb6337a470c9301a108a539af7b775678ff67aa63944e9e04ce4216676cc777 post_install() { sed -n '0,/^$/p' acoustid.py > LICENSE diff --git a/srcpkgs/python-pyserial/template b/srcpkgs/python-pyserial/template index 533aee0d5d2..1d2714d505d 100644 --- a/srcpkgs/python-pyserial/template +++ b/srcpkgs/python-pyserial/template @@ -1,6 +1,6 @@ # Template file for 'python-pyserial' pkgname=python-pyserial -version=3.2.1 +version=3.3 revision=1 noarch=yes wrksrc="pyserial-${version}" @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="https://github.com/pyserial/pyserial" license="3-clause-BSD" distfiles="${PYPI_SITE}/p/pyserial/pyserial-${version}.tar.gz" -checksum=1eecfe4022240f2eab5af8d414f0504e072ee68377ba63d3b6fe6e66c26f66d1 +checksum=2949cddffc2b05683065a3cd2345114b1a49b08df8cb843d69ba99dc3e19edc2 alternatives="pyserial:miniterm:/usr/bin/miniterm.py2" post_install() { diff --git a/srcpkgs/python-pytz/template b/srcpkgs/python-pytz/template index 1834bba3ede..a027addac4b 100644 --- a/srcpkgs/python-pytz/template +++ b/srcpkgs/python-pytz/template @@ -1,19 +1,19 @@ # Template file for 'python-pytz' pkgname=python-pytz -version=2016.10 +version=2017.2 revision=1 noarch=yes wrksrc="pytz-${version}" build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" +hostmakedepends="unzip python-setuptools python3-setuptools" depends="python tzdata" pycompile_module="pytz" short_desc="Python2 timezone library" maintainer="Alessio Sergi " -homepage="http://pythonhosted.org/pytz/" +homepage="https://pythonhosted.org/pytz/" license="MIT" -distfiles="${PYPI_SITE}/p/pytz/pytz-${version}.tar.bz2" -checksum=7016b2c4fa075c564b81c37a252a5fccf60d8964aa31b7f5eae59aeb594ae02b +distfiles="${PYPI_SITE}/p/pytz/pytz-${version}.zip" +checksum=f5c056e8f62d45ba8215e5cb8f50dfccb198b4b9fbea8500674f3443e4689589 post_install() { # use system tz database diff --git a/srcpkgs/python-rencode/template b/srcpkgs/python-rencode/template index a61a2519b4d..1888625cd2d 100644 --- a/srcpkgs/python-rencode/template +++ b/srcpkgs/python-rencode/template @@ -8,7 +8,7 @@ hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cyth makedepends="python-devel python3-devel" pycompile_module="rencode" short_desc="Python2 module for fast (basic) object serialization" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://github.com/aresch/rencode" distfiles="${homepage}/archive/v${version}.tar.gz" diff --git a/srcpkgs/python-reportlab/template b/srcpkgs/python-reportlab/template index b4815cb1b63..c07aaff5376 100644 --- a/srcpkgs/python-reportlab/template +++ b/srcpkgs/python-reportlab/template @@ -1,7 +1,7 @@ # Template file for 'python-reportlab' pkgname=python-reportlab -version=3.3.0 -revision=3 +version=3.4.0 +revision=1 wrksrc="reportlab-$version" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " license="3-clause-BSD" homepage="http://www.reportlab.com/" distfiles="${PYPI_SITE}/r/reportlab/reportlab-${version}.tar.gz" -checksum=f48900b9321bcb2871a46543993bd995148d769a11a9e24495f25b4ec0bbe267 +checksum=5beaf35e59dfd5ebd814fdefd76908292e818c982bd7332b5d347dfd2f01c343 pre_build() { sed -i "s|'pip>=1.4.1', 'setuptools>=2.2'||" setup.py diff --git a/srcpkgs/python-ripe-atlas-cousteau/template b/srcpkgs/python-ripe-atlas-cousteau/template index 314ec26b686..059ef3b4a6a 100644 --- a/srcpkgs/python-ripe-atlas-cousteau/template +++ b/srcpkgs/python-ripe-atlas-cousteau/template @@ -1,6 +1,6 @@ # Template file for 'python-ripe-atlas-cousteau' pkgname=python-ripe-atlas-cousteau -version=1.3 +version=1.4 revision=1 build_style=python-module noarch=yes @@ -13,7 +13,7 @@ maintainer="johannes " license="GPL-3" homepage="https://github.com/RIPE-NCC/ripe-atlas-cousteau" distfiles="https://github.com/RIPE-NCC/ripe-atlas-cousteau/archive/v${version}.tar.gz" -checksum=d18ae2648f0fa685d47efee1a0dc03a9125f6e68e77289ca221c0509b1c53bbd +checksum=d317b9bd901d6207d930f6422b01370980d747e71895482508b3adeca5796652 python3-ripe-atlas-cousteau_package() { short_desc="${short_desc/Python2/Python3}" diff --git a/srcpkgs/python-ripe-atlas-sagan/template b/srcpkgs/python-ripe-atlas-sagan/template index 8b4c4f661a6..2f9ee89fd75 100644 --- a/srcpkgs/python-ripe-atlas-sagan/template +++ b/srcpkgs/python-ripe-atlas-sagan/template @@ -1,22 +1,22 @@ # Template file for 'ripe-atlas-sagan' pkgname=python-ripe-atlas-sagan -version=1.1.11 +version=1.2 revision=1 noarch=yes pycompile_module="ripe/atlas/sagan" wrksrc="ripe.atlas.sagan-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" -depends="python-dateutil python-pytz python-openssl" +depends="python-dateutil python-pytz python-cryptography" short_desc="Python2 parsing library for RIPE Atlas measurement results" maintainer="johannes " license="GPL-3" homepage="https://github.com/RIPE-NCC/ripe.atlas.sagan" distfiles="https://github.com/RIPE-NCC/ripe.atlas.sagan/archive/v${version}.tar.gz" -checksum=9d84c8346366e344b081a95cae684d397e1a8d0cb9be6bb0c3190e5f813ef869 +checksum=3f24bfa5fed9fe67c7052639ac02023648b1b14ebbfd101d6b0bfeeac7770ff2 python3-ripe-atlas-sagan_package() { - depends="python3-dateutil python3-pytz python3-openssl" + depends="python3-dateutil python3-pytz python3-cryptography" noarch=yes pycompile_module="ripe/atlas/sagan" short_desc="${short_desc/Python2/Python3}" diff --git a/srcpkgs/python-scipy/template b/srcpkgs/python-scipy/template index 6048bd9dfd4..4d729e09bba 100644 --- a/srcpkgs/python-scipy/template +++ b/srcpkgs/python-scipy/template @@ -1,10 +1,11 @@ # Template file for 'python-scipy' pkgname=python-scipy -version=0.18.1 -revision=2 +version=0.19.0 +revision=1 wrksrc="scipy-${version}" build_style=python-module -hostmakedepends="python-setuptools python3-setuptools gcc-fortran" +hostmakedepends="python-setuptools python3-setuptools + python-Cython python3-Cython gcc-fortran" makedepends="python-devel python3-devel python-numpy python3-numpy lapack-devel" depends="python-numpy" pycompile_module="scipy" @@ -12,10 +13,9 @@ short_desc="Scientific library for Python2" maintainer="Alessio Sergi " homepage="http://www.scipy.org/" license="3-clause-BSD" -distfiles="${PYPI_SITE}/s/scipy/scipy-${version}.tar.gz" -checksum=8ab6e9c808bf2fb3e8576cd8cf07226d9cdc18b012c06d9708429a821ac6634e +distfiles="https://github.com/scipy/scipy/archive/v${version}.tar.gz" +checksum=efa71d68ef0fa4a2836a3058fc1c5aa6b61d93ee0248a127cd862ea3bf22b69a -export FFLAGS="-fPIC" LDFLAGS="-shared" post_install() { diff --git a/srcpkgs/python-sh/template b/srcpkgs/python-sh/template index 6e23b8ab8b6..1a05084cfac 100644 --- a/srcpkgs/python-sh/template +++ b/srcpkgs/python-sh/template @@ -1,9 +1,9 @@ # Template file for 'python-sh' pkgname=python-sh -version=1.12.9 -revision=2 -wrksrc="${pkgname#*-}-${version}" +version=1.12.13 +revision=1 noarch=yes +wrksrc="${pkgname#*-}-${version}" build_style=python-module pycompile_module="sh.py" hostmakedepends="python-setuptools python3-setuptools" @@ -13,15 +13,15 @@ maintainer="pulux " license="MIT" homepage="https://github.com/amoffat/sh" distfiles="${PYPI_SITE}/s/sh/sh-${version}.tar.gz" -checksum=579aa19bae7fe86b607df1afaf4e8537c453d2ce3d84e1d3957e099359a51677 +checksum=979928ca113cade663bb1a0ff710e3eb9147596cf28a7ee4c04f9d85804f7b9f post_install() { vlicense LICENSE.txt } python3-sh_package() { - depends="python3" noarch=yes + depends="python3" pycompile_module="sh.py" short_desc="${short_desc/Python2/Python3}" pkg_install() { diff --git a/srcpkgs/python-sphinx_rtd_theme/template b/srcpkgs/python-sphinx_rtd_theme/template index 5caceda4ca0..f9cdae52f89 100644 --- a/srcpkgs/python-sphinx_rtd_theme/template +++ b/srcpkgs/python-sphinx_rtd_theme/template @@ -1,6 +1,6 @@ # Template file for 'python-sphinx_rtd_theme pkgname=python-sphinx_rtd_theme -version=0.2.0 +version=0.2.4 revision=1 noarch=yes wrksrc="sphinx_rtd_theme-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/snide/sphinx_rtd_theme/" license="MIT" distfiles="${PYPI_SITE}/s/sphinx_rtd_theme/sphinx_rtd_theme-${version}.tar.gz" -checksum=ecdcb87cbed7c4cc3ff5fbf44a3afe2fb4cbc4eb8e4751cea3564832d225bd3b +checksum=2df74b8ff6fae6965c527e97cca6c6c944886aae474b490e17f92adfbe843417 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template index 46be30fb48b..249895c0767 100644 --- a/srcpkgs/python-sqlparse/template +++ b/srcpkgs/python-sqlparse/template @@ -1,6 +1,6 @@ # Template file for 'python-sqlparse' pkgname=python-sqlparse -version=0.2.2 +version=0.2.3 revision=1 noarch=yes build_style=python-module @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/andialbrecht/sqlparse" license="3-clause-BSD" distfiles="${PYPI_SITE}/s/sqlparse/sqlparse-${version}.tar.gz" -checksum=d446296b2c26f9466860dd85fa32480bec523ab96bda8879262c38e8e8fbba21 +checksum=becd7cc7cebbdf311de8ceedfcf2bd2403297024418801947f8c953025beeff8 alternatives="sqlparse:sqlformat:/usr/bin/sqlformat2" python3-sqlparse_package() { diff --git a/srcpkgs/python-stevedore/template b/srcpkgs/python-stevedore/template index 51fdc761363..ac1f64107c4 100644 --- a/srcpkgs/python-stevedore/template +++ b/srcpkgs/python-stevedore/template @@ -1,6 +1,6 @@ # Template file for 'python-stevedore' pkgname=python-stevedore -version=1.20.0 +version=1.21.0 revision=1 noarch=yes wrksrc="stevedore-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://git.openstack.org/cgit/openstack/stevedore" license="Apache-2.0" distfiles="${PYPI_SITE}/s/stevedore/stevedore-${version}.tar.gz" -checksum=83884f80ed0917346e658bfe51cdb2474512ec6521c18480b41f58b54c4a1f83 +checksum=aa0e64490e9eef9f0ae96a3b226f963ebf54bb6a38176472d76253d015424f8b pre_build() { # remove dependency on pbr; it's not a runtime dependency diff --git a/srcpkgs/python-tables/template b/srcpkgs/python-tables/template index 80903679e50..625720b3741 100644 --- a/srcpkgs/python-tables/template +++ b/srcpkgs/python-tables/template @@ -1,7 +1,7 @@ # Template file for 'python-tables' pkgname=python-tables -version=3.3.0 -revision=2 +version=3.4.2 +revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python-module pycompile_module="tables" @@ -15,7 +15,7 @@ maintainer="pulux " license="3-clause-BSD" homepage="http://www.pytables.org/" distfiles="${PYPI_SITE}/t/tables/tables-${version}.tar.gz" -checksum=8383ccf02e041a5d55494a09fc5514140b4653055a2732c981b5fd0f7408822c +checksum=fdbbea4edb6bad0ac0e53fc7bc6970e78e12eef4944aa4146bcdcb573201676c alternatives=" tables:pt2to3:/usr/bin/python2-pt2to3 diff --git a/srcpkgs/python-texttable/template b/srcpkgs/python-texttable/template index 8d3ffee0ed2..40e349a6b9c 100644 --- a/srcpkgs/python-texttable/template +++ b/srcpkgs/python-texttable/template @@ -1,6 +1,6 @@ # Template file for 'python-texttable' pkgname=python-texttable -version=0.8.7 +version=0.8.8 revision=1 noarch=yes wrksrc="texttable-${version}" @@ -13,7 +13,7 @@ maintainer="Sergi Alvarez " homepage="https://github.com/foutaise/texttable/" license="LGPL-3" distfiles="${PYPI_SITE}/t/texttable/texttable-${version}.tar.gz" -checksum=8a38082fe822e825fde5bcf150741bdf38ef52e00a05a20c8967bcf99a8f31d2 +checksum=0be1ecd6468847fc2f3b57b6c1862d8c0ae6832c037c97db502053311eff9a99 python3-texttable_package() { noarch=yes diff --git a/srcpkgs/python-tornado/patches/0001-use-system-ca-certificates.patch b/srcpkgs/python-tornado/patches/0001-use-system-ca-certificates.patch deleted file mode 100644 index 1c836ad82eb..00000000000 --- a/srcpkgs/python-tornado/patches/0001-use-system-ca-certificates.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- setup.py.orig -+++ setup.py -@@ -136,7 +136,7 @@ if setuptools is not None: - # Certifi is also optional on 2.7.9+, although making our dependencies - # conditional on micro version numbers seems like a bad idea - # until we have more declarative metadata. -- install_requires.append('certifi') -+ # install_requires.append('certifi') - if sys.version_info < (3, 5): - install_requires.append('backports_abc>=0.4') - kwargs['install_requires'] = install_requires diff --git a/srcpkgs/python-tornado/template b/srcpkgs/python-tornado/template index 72e9192aa30..324735f5127 100644 --- a/srcpkgs/python-tornado/template +++ b/srcpkgs/python-tornado/template @@ -1,7 +1,7 @@ # Template file for 'python-tornado' pkgname=python-tornado -version=4.4.2 -revision=3 +version=4.5.1 +revision=1 wrksrc="tornado-${version}" build_style=python-module pycompile_module="tornado" @@ -13,7 +13,12 @@ maintainer="Alessio Sergi " homepage="http://www.tornadoweb.org/" license="Apache-2.0" distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz" -checksum=2898f992f898cd41eeb8d53b6df75495f2f423b6672890aadaf196ea1448edcc +checksum=db0904a28253cfe53e7dedc765c71596f3c53bb8a866ae50123320ec1a7b73fd + +pre_build() { + # use system ca-certificates + sed -i "/install_requires.append('certifi')/d" setup.py +} python3-tornado_package() { pycompile_module="tornado" diff --git a/srcpkgs/python-typing/template b/srcpkgs/python-typing/template index f08b3867583..7bbd1581c70 100644 --- a/srcpkgs/python-typing/template +++ b/srcpkgs/python-typing/template @@ -1,6 +1,6 @@ # Template file for 'python-typing' pkgname=python-typing -version=3.5.3.0 +version=3.6.1 revision=1 noarch=yes wrksrc="typing-${version}" @@ -10,10 +10,10 @@ hostmakedepends="python-devel" depends="python" short_desc="Backport of the typing module from Python 3.5+" maintainer="Alessio Sergi " -homepage="https://docs.python.org/3.5/library/typing.html" +homepage="https://docs.python.org/3/library/typing.html" license="PSF" distfiles="${PYPI_SITE}/t/typing/typing-${version}.tar.gz" -checksum=ca2daac7e393e8ee86e9140cd0cf0172ff6bb50ebdf0b06281770f98f31bff21 +checksum=c36dec260238e7464213dcd50d4b5ef63a507972f5780652e835d0228d0edace post_install() { vlicense LICENSE diff --git a/srcpkgs/python-tzlocal/template b/srcpkgs/python-tzlocal/template index 0ea1592e5d1..f04af672475 100644 --- a/srcpkgs/python-tzlocal/template +++ b/srcpkgs/python-tzlocal/template @@ -1,6 +1,6 @@ # Template file for 'python-tzlocal' pkgname=python-tzlocal -version=1.3 +version=1.4 revision=1 noarch=yes wrksrc="tzlocal-${version}" @@ -8,12 +8,16 @@ build_style=python-module hostmakedepends="python-setuptools python3-setuptools" depends="python-pytz" pycompile_module="tzlocal" -short_desc="Return the tzinfo object for the local timezone in Python2" +short_desc="Return the tzinfo object for the local timezone (Python2)" maintainer="Oliver Kiddle " -license="CC0-1.0" -homepage="https://pypi.python.org/pypi/tzlocal" +license="MIT" +homepage="https://github.com/regebro/tzlocal" distfiles="${PYPI_SITE}/t/tzlocal/tzlocal-${version}.tar.gz" -checksum=d160c2ce4f8b1831dabfe766bd844cf9012f766539cf84139c2faac5201882ce +checksum=05a2908f7fb1ba8843f03b2360d6ad314dbf2bce4644feb702ccd38527e13059 + +post_install() { + vlicense LICENSE.txt LICENSE +} python3-tzlocal_package() { noarch=yes @@ -23,6 +27,7 @@ python3-tzlocal_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense LICENSE.txt LICENSE } } python3.4-tzlocal_package() { diff --git a/srcpkgs/python-tzlocal/update b/srcpkgs/python-tzlocal/update new file mode 100644 index 00000000000..e9b0a0a5ea4 --- /dev/null +++ b/srcpkgs/python-tzlocal/update @@ -0,0 +1 @@ +ignore="*b*" diff --git a/srcpkgs/python-webencodings/template b/srcpkgs/python-webencodings/template new file mode 100644 index 00000000000..6784eb5e46f --- /dev/null +++ b/srcpkgs/python-webencodings/template @@ -0,0 +1,26 @@ +# Template file for 'python-webencodings' +pkgname=python-webencodings +version=0.5.1 +revision=1 +noarch=yes +wrksrc="webencodings-${version}" +build_style=python-module +pycompile_module="webencodings" +hostmakedepends="python-setuptools python3-setuptools" +depends="python" +short_desc="Python2 implementation of the WHATWG Encoding standard" +maintainer="Alessio Sergi " +homepage="https://github.com/gsnedders/python-webencodings" +license="3-clause-BSD" +distfiles="${PYPI_SITE}/w/webencodings/webencodings-${version}.tar.gz" +checksum=b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 + +python3-webencodings_package() { + noarch=yes + depends="python3" + pycompile_module="webencodings" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/python-wrapt/template b/srcpkgs/python-wrapt/template index db86cb0e79f..e5eee84b984 100644 --- a/srcpkgs/python-wrapt/template +++ b/srcpkgs/python-wrapt/template @@ -1,7 +1,7 @@ # Template file for 'python-wrapt' pkgname=python-wrapt -version=1.10.8 -revision=2 +version=1.10.10 +revision=1 wrksrc="wrapt-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" @@ -12,7 +12,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/GrahamDumpleton/wrapt" license="2-clause-BSD" distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz" -checksum=4ea17e814e39883c6cf1bb9b0835d316b2f69f0f0882ffe7dad1ede66ba82c73 +checksum=42160c91b77f1bc64a955890038e02f2f72986c01d462d53cb6cb039b995cdd9 post_install() { vlicense LICENSE diff --git a/srcpkgs/python/template b/srcpkgs/python/template index cf9164753a9..7e733856396 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -4,7 +4,7 @@ # pkgname=python version=2.7.13 -revision=3 +revision=4 wrksrc="Python-${version}" hostmakedepends="pkg-config" makedepends=" diff --git a/srcpkgs/python3-Cheroot b/srcpkgs/python3-Cheroot new file mode 120000 index 00000000000..46f9f7c6fdc --- /dev/null +++ b/srcpkgs/python3-Cheroot @@ -0,0 +1 @@ +python-Cheroot \ No newline at end of file diff --git a/srcpkgs/python3-aiohttp-cors/template b/srcpkgs/python3-aiohttp-cors/template new file mode 100644 index 00000000000..cef39a633c5 --- /dev/null +++ b/srcpkgs/python3-aiohttp-cors/template @@ -0,0 +1,18 @@ +# Template file for 'python3-aiohttp-cors' +pkgname=python3-aiohttp-cors +version=0.5.0 +revision=1 +wrksrc=aiohttp-cors-${version} +build_style=python3-module +hostmakedepends="python3 python3-setuptools" +depends="python3-aiohttp" +short_desc="CORS support for aiohttp" +maintainer="Michael Aldridge " +license="Apache-2" +homepage="https://github.com/aio-libs/aiohttp-cors" +distfiles="https://github.com/aio-libs/aiohttp-cors/archive/v${version}.tar.gz" +checksum=7d0c682657db4f3265337875be75e5f222aef644e780e125267e98a690ff9d85 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template new file mode 100644 index 00000000000..a7eeea7a521 --- /dev/null +++ b/srcpkgs/python3-aiohttp/template @@ -0,0 +1,18 @@ +# Template file for 'python3-aiohttp' +pkgname=python3-aiohttp +version=1.2.0 +revision=1 +wrksrc=aiohttp-${version} +build_style=python3-module +hostmakedepends="python3 python3-setuptools" +depends="python3-async-timeout python3-chardet" +short_desc="HTTP client/server for asyncio (PEP-3156)" +maintainer="Michael Aldridge " +license="Apache-2" +homepage="http://aiohttp.readthedocs.io/" +distfiles="https://github.com/KeepSafe/aiohttp/archive/v${version}.tar.gz" +checksum=b2fa11df067207ff15813be84b78910f6f9d897f02e9c345993b9962802a6bea + +post_install() { + vlicense LICENSE.txt +} diff --git a/srcpkgs/python3-asn1crypto b/srcpkgs/python3-asn1crypto new file mode 120000 index 00000000000..dd2d73e2a49 --- /dev/null +++ b/srcpkgs/python3-asn1crypto @@ -0,0 +1 @@ +python-asn1crypto \ No newline at end of file diff --git a/srcpkgs/python3-async-timeout/template b/srcpkgs/python3-async-timeout/template new file mode 100644 index 00000000000..876d1ac97d3 --- /dev/null +++ b/srcpkgs/python3-async-timeout/template @@ -0,0 +1,17 @@ +# Template file for 'python3-async-timeout' +pkgname=python3-async-timeout +version=1.1.0 +revision=1 +wrksrc=async-timeout-${version} +build_style=python3-module +hostmakedepends="python3 python3-setuptools" +short_desc="Timeout class compatible with asyncio" +maintainer="Michael Aldridge " +license="Apache-2" +homepage="https://github.com/aio-libs/async-timeout" +distfiles="https://github.com/aio-libs/async-timeout/archive/v${version}.tar.gz" +checksum=44a72eaedb82e53786d2b2590499b5e86a97805557361f51d467c283dc79b328 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/python3-docker b/srcpkgs/python3-docker new file mode 120000 index 00000000000..e68cef56d8a --- /dev/null +++ b/srcpkgs/python3-docker @@ -0,0 +1 @@ +python-docker \ No newline at end of file diff --git a/srcpkgs/python3-docker-pycreds b/srcpkgs/python3-docker-pycreds new file mode 120000 index 00000000000..1295fdde0cf --- /dev/null +++ b/srcpkgs/python3-docker-pycreds @@ -0,0 +1 @@ +python-docker-pycreds \ No newline at end of file diff --git a/srcpkgs/python3-icdiff b/srcpkgs/python3-icdiff new file mode 120000 index 00000000000..b0d027f7001 --- /dev/null +++ b/srcpkgs/python3-icdiff @@ -0,0 +1 @@ +icdiff \ No newline at end of file diff --git a/srcpkgs/python3-multidict/template b/srcpkgs/python3-multidict/template new file mode 100644 index 00000000000..bd4c359edd3 --- /dev/null +++ b/srcpkgs/python3-multidict/template @@ -0,0 +1,17 @@ +# Template file for 'python3-multidict' +pkgname=python3-multidict +version=2.1.4 +revision=1 +wrksrc=multidict-${version} +build_style=python3-module +hostmakedepends="python3 python3-setuptools" +short_desc="Multidict implementation from aiohttp" +maintainer="Michael Aldridge " +license="Apache-2" +homepage="https://github.com/aio-libs/multidict" +distfiles="https://github.com/aio-libs/multidict/archive/v${version}.tar.gz" +checksum=4116a99f024269210bc5629661e55f5f613e1b11016b3bbf4e0ba453b02a65c1 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/python3-webencodings b/srcpkgs/python3-webencodings new file mode 120000 index 00000000000..b6398d6f113 --- /dev/null +++ b/srcpkgs/python3-webencodings @@ -0,0 +1 @@ +python-webencodings \ No newline at end of file diff --git a/srcpkgs/python3-yarl/template b/srcpkgs/python3-yarl/template new file mode 100644 index 00000000000..2c3eeca2fdd --- /dev/null +++ b/srcpkgs/python3-yarl/template @@ -0,0 +1,20 @@ +# Template file for 'python3-yarl' +pkgname=python3-yarl +version=0.8.1 +revision=1 +wrksrc=yarl-${version} +#create_wrksrc=yes +#only_for_archs="i686 x86_64" +build_style=python3-module +hostmakedepends="python3 python3-setuptools" +depends="python3-multidict" +short_desc="Yet another URL library" +maintainer="Michael Aldridge " +license="Apache-2.0" +homepage="http://yarl.readthedocs.io/" +distfiles="https://github.com/aio-libs/yarl/archive/v${version}.tar.gz" +checksum=cb2790f35af5d04986b14c5b79678954cd4052ad9846f3d7327baed62581c48e + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/python3-zipstream/template b/srcpkgs/python3-zipstream/template new file mode 100644 index 00000000000..fdda1a65088 --- /dev/null +++ b/srcpkgs/python3-zipstream/template @@ -0,0 +1,13 @@ +# Template file for 'python3-zipstream' +pkgname=python3-zipstream +version=1.1.4 +revision=1 +wrksrc=python-zipstream-${version} +build_style=python3-module +hostmakedepends="python python3 python-setuptools python3-setuptools" +short_desc="Python's ZipFile module, except it works as a generator" +maintainer="Michael Aldridge " +license="GPL-3" +homepage="https://github.com/allanlei/python-zipstream" +distfiles="https://github.com/allanlei/python-zipstream/archive/v${version}.tar.gz" +checksum=32a7a4bdb786914445589595273beffbbf9b6a0a3a3dc2cf19ea96114bd2abd7 diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index f9667455508..c21d6c6a35a 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -1,7 +1,7 @@ # Template file for 'python3' pkgname=python3 version=3.5.3 -revision=2 +revision=4 wrksrc="Python-${version}" short_desc="Interpreted, interactive, object-oriented programming language (${version%.*} series)" maintainer="Juan RP " diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template index 9708692ebfb..321f1e83549 100644 --- a/srcpkgs/qalculate-gtk/template +++ b/srcpkgs/qalculate-gtk/template @@ -1,6 +1,6 @@ # Template file for 'qalculate-gtk' pkgname=qalculate-gtk -version=0.9.9 +version=0.9.11 revision=1 build_style=gnu-configure maintainer="Orphaned " @@ -10,4 +10,4 @@ license="GPL-2" homepage="https://qalculate.github.io/" short_desc="A multi-purpose desktop calculator - GTK+ version" distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz" -checksum=5c88b7595b654c128d0aa56c16e80b6e02e5cfc6378112000fb01133872d024a +checksum=ca3fe9d34c78f78b75b9ec27044b28a63a79b62bc48f0a5cf4358a4bafe19054 diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template index d080da6bec9..9e57f401397 100644 --- a/srcpkgs/qalculate/template +++ b/srcpkgs/qalculate/template @@ -1,7 +1,7 @@ # Template file for 'qalculate' pkgname=qalculate -version=0.9.10 -revision=2 +version=0.9.11 +revision=1 wrksrc="lib${pkgname}-${version}" build_style=gnu-configure maintainer="Orphaned " @@ -11,7 +11,7 @@ license="GPL-2" homepage="https://qalculate.github.io/" short_desc="A multi-purpose desktop calculator" distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz" -checksum=7d81e1b15bc1e674e3d4db71c4fc08dafcef830e6acd39f65034e3c0f694b3b9 +checksum=fb5014b04e0f80d85d85d96974c4d069a14791cb2d6aef016c72a24e30917f14 libqalculate-data_package() { noarch=yes diff --git a/srcpkgs/qbittorrent/patches/libtorrent-1.1.1.patch b/srcpkgs/qbittorrent/patches/libtorrent-1.1.1.patch deleted file mode 100644 index 7d26c8d3474..00000000000 --- a/srcpkgs/qbittorrent/patches/libtorrent-1.1.1.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- src/base/bittorrent/session.cpp -+++ src/base/bittorrent/session.cpp -@@ -45,6 +45,9 @@ - #include - - #include -+#if LIBTORRENT_VERSION_NUM >= 10100 && LIBTORRENT_VERSION_NUM < 10102 -+#include -+#endif - #include - #include - -@@ -194,6 +197,36 @@ namespace - - template - LowerLimited lowerLimited(T limit, T ret) { return LowerLimited(limit, ret); } -+ -+#if LIBTORRENT_VERSION_NUM >= 10100 && LIBTORRENT_VERSION_NUM < 10102 -+ std::string makeFingerprint(const char* peerId, int major, int minor, int revision, int tag) -+ { -+ Q_ASSERT(peerId); -+ Q_ASSERT(major >= 0); -+ Q_ASSERT(minor >= 0); -+ Q_ASSERT(revision >= 0); -+ Q_ASSERT(tag >= 0); -+ Q_ASSERT(std::strlen(peerId) == 2); -+ -+ auto versionToChar = [](int v) -> char -+ { -+ if (v >= 0 && v < 10) return static_cast('0' + v); -+ if (v >= 10) return static_cast('A' + (v - 10)); -+ Q_ASSERT(false); -+ return '0'; -+ }; -+ -+ std::ostringstream buf; -+ buf << '-' -+ << peerId -+ << versionToChar(major) -+ << versionToChar(minor) -+ << versionToChar(revision) -+ << versionToChar(tag) -+ << '-'; -+ return buf.str(); -+ } -+#endif - } - - // Session -@@ -334,7 +367,11 @@ Session::Session(QObject *parent) - dispatchAlerts(alertPtr.release()); - }); - #else -+#if LIBTORRENT_VERSION_NUM < 10102 -+ std::string peerId = makeFingerprint(PEER_ID, VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, VERSION_BUILD); -+#else - std::string peerId = libt::generate_fingerprint(PEER_ID, VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, VERSION_BUILD); -+#endif - libt::settings_pack pack; - pack.set_int(libt::settings_pack::alert_mask, alertMask); - pack.set_str(libt::settings_pack::peer_fingerprint, peerId); - diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template index a5a5b166ef9..a26783ee353 100644 --- a/srcpkgs/qbittorrent/template +++ b/srcpkgs/qbittorrent/template @@ -1,7 +1,7 @@ # Template file for 'qbittorrent' pkgname=qbittorrent -version=3.3.11 -revision=1 +version=3.3.12 +revision=2 build_style=qmake hostmakedepends="automake libtool pkg-config qt5-qmake qt5-tools qt5-host-tools qt5-declarative-devel" @@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="http://www.qbittorrent.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=4892ac5ed4bde2ed325fb67456698e703bb933b9eb1d146598259f4e2154a760 +checksum=56528c47f09b316ecf682e3896157c76c18898ef996728b0c5186e05a711466f nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/1349/steps/shell_3/logs/stdio build_options="gui webui" diff --git a/srcpkgs/qca-qt5/patches/fix-qiodevice.patch b/srcpkgs/qca-qt5/patches/fix-qiodevice.patch deleted file mode 100644 index 9d3d6db0f8a..00000000000 --- a/srcpkgs/qca-qt5/patches/fix-qiodevice.patch +++ /dev/null @@ -1,34 +0,0 @@ -Since Qt5-5.5.0 explicit include is required -if QIODevice is used in headers or source files. It seems -it was included as a side-effect by other header files before. - ---- src/qca_publickey.cpp 2014-11-06 09:15:45.000000000 +0100 -+++ src/qca_publickey.cpp 2015-07-07 09:26:59.819005743 +0200 -@@ -25,6 +25,7 @@ - - #include - #include -+#include - - namespace QCA { - ---- src/qca_keystore.cpp 2014-11-06 09:15:45.000000000 +0100 -+++ src/qca_keystore.cpp 2015-07-07 09:29:24.886016202 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include // abort - #include // fprintf ---- include/QtCrypto/qca_core.h 2014-11-06 09:15:45.000000000 +0100 -+++ include/QtCrypto/qca_core.h 2015-07-07 09:36:30.737046903 +0200 -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - #include "qca_export.h" - #include "qca_support.h" - #include "qca_tools.h" diff --git a/srcpkgs/qca-qt5/patches/libressl-2.3.patch b/srcpkgs/qca-qt5/patches/libressl-2.3.patch deleted file mode 120000 index 72eef8d83c4..00000000000 --- a/srcpkgs/qca-qt5/patches/libressl-2.3.patch +++ /dev/null @@ -1 +0,0 @@ -../../qca/patches/libressl-2.3.patch \ No newline at end of file diff --git a/srcpkgs/qca-qt5/patches/libressl.patch b/srcpkgs/qca-qt5/patches/libressl.patch deleted file mode 100644 index 2da07337d6f..00000000000 --- a/srcpkgs/qca-qt5/patches/libressl.patch +++ /dev/null @@ -1,14 +0,0 @@ -# upstream -# http://quickgit.kde.org/?p=qca.git&a=commit&h=593de6855a4f4dc26cface3e96de8889f90cb4bb - ---- plugins/qca-ossl/qca-ossl.cpp 2015-01-24 00:38:42.000000000 +0100 -+++ plugins/qca-ossl/qca-ossl.cpp 2015-01-24 00:38:27.000000000 +0100 -@@ -5801,7 +5801,7 @@ - { - SessionInfo sessInfo; - -- sessInfo.isCompressed = (0 != ssl->session->compress_meth); -+ sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(ssl->session)); - - if (ssl->version == TLS1_VERSION) - sessInfo.version = TLS::TLS_v1; diff --git a/srcpkgs/qca-qt5/patches/narrowing.patch b/srcpkgs/qca-qt5/patches/narrowing.patch deleted file mode 100644 index 030373daa50..00000000000 --- a/srcpkgs/qca-qt5/patches/narrowing.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- src/qca_textfilter.cpp 2014-11-06 09:15:45.000000000 +0100 -+++ src/qca_textfilter.cpp 2017-01-25 05:19:43.948129764 +0100 -@@ -289,29 +289,31 @@ - - static QByteArray b64decode(const QByteArray &s, bool *ok) - { -- // -1 specifies invalid -+#define _I '\xff' -+ // _I specifies invalid - // 64 specifies eof - // everything else specifies data - - static char tbl[] = - { -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63, -- 52,53,54,55,56,57,58,59,60,61,-1,-1,-1,64,-1,-1, -- -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14, -- 15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1, -- -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40, -- 41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,62,_I,_I,_I,63, -+ 52,53,54,55,56,57,58,59,60,61,_I,_I,_I,64,_I,_I, -+ _I, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14, -+ 15,16,17,18,19,20,21,22,23,24,25,_I,_I,_I,_I,_I, -+ _I,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40, -+ 41,42,43,44,45,46,47,48,49,50,51,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, - }; -+#undef _I - - // return value - QByteArray p; diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template index c797d3f78f9..ebe01d8722b 100644 --- a/srcpkgs/qca-qt5/template +++ b/srcpkgs/qca-qt5/template @@ -1,52 +1,40 @@ -# Template file for 'qca' +# Template file for 'qca-qt5' pkgname=qca-qt5 -version=2.1.0 -revision=9 +version=2.1.3 +revision=2 wrksrc=${pkgname%-*}-${version} build_style=cmake -configure_args="-DBUILD_TESTS=0 -DQC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt - -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca/mkspecs -DWITH_ossl_PLUGIN=yes" +configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs" hostmakedepends="pkg-config ca-certificates" makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel" depends="ca-certificates" -short_desc="Qt Cryptographic Architecture" +short_desc="Qt5 Cryptographic Architecture" maintainer="Duncaen " license="LGPL-2.1" -homepage="http://delta.affinix.com/qca/" -distfiles="http://delta.affinix.com/download/qca/2.0/${pkgname%-*}-${version}.tar.gz" -checksum=226dcd76138c3738cdc15863607a96b3758a4c3efd3c47295939bcea4e7a9284 - -provides="qca-${version}_${revision}" -replaces="qca>=0" +homepage="https://userbase.kde.org/QCA" +distfiles="http://download.kde.org/stable/qca/${version}/src/qca-${version}.tar.xz" +checksum=003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" fi -pre_configure() { - sed -e "s;-D_BSD_SOURCE;-D_DEFAULT_SOURCE;" \ - -i CMakeLists.txt -} - qca-qt5-ossl_package() { depends="${sourcepkg}-${version}_${revision}" short_desc+=" - QCA OSSL plugin" - provides="qca-ossl-${version}_${revision}" - replaces="qca-ossl>=0" pkg_install() { - vmove usr/lib/qca/crypto/libqca-ossl.so + vmove usr/lib/qca-qt5/crypto/libqca-ossl.so } } qca-qt5-devel_package() { depends="qt5-devel ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" - provides="qca-devel-${version}_${revision}" - replaces="qca-devel>=0" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/lib/cmake - vmove usr/share/qca/mkspecs + vmove usr/share/qca-qt5/mkspecs + vmove usr/lib/*.so } } diff --git a/srcpkgs/qca/patches/libressl-2.3.patch b/srcpkgs/qca/patches/libressl-2.3.patch deleted file mode 100644 index 34b6d4aa569..00000000000 --- a/srcpkgs/qca/patches/libressl-2.3.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- plugins/qca-ossl/qca-ossl.cpp.orig 2016-03-31 09:00:14.410576583 +0200 -+++ plugins/qca-ossl/qca-ossl.cpp 2016-03-31 09:00:21.935576020 +0200 -@@ -7129,8 +7129,6 @@ public: - return new opensslInfoContext(this); - else if ( type == "sha1" ) - return new opensslHashContext( EVP_sha1(), this, type); -- else if ( type == "sha0" ) -- return new opensslHashContext( EVP_sha(), this, type); - else if ( type == "ripemd160" ) - return new opensslHashContext( EVP_ripemd160(), this, type); - #ifdef HAVE_OPENSSL_MD2 ---- plugins/qca-ossl/qca-ossl.cpp.orig 2016-03-31 09:09:28.995535076 +0200 -+++ plugins/qca-ossl/qca-ossl.cpp 2016-03-31 09:09:36.345534526 +0200 -@@ -5394,13 +5394,8 @@ public: - OpenSSL_add_ssl_algorithms(); - SSL_CTX *ctx = 0; - switch (version) { --#ifndef OPENSSL_NO_SSL2 -- case TLS::SSL_v2: -- ctx = SSL_CTX_new(SSLv2_client_method()); -- break; --#endif - case TLS::SSL_v3: -- ctx = SSL_CTX_new(SSLv3_client_method()); -+ ctx = SSL_CTX_new(SSLv23_client_method()); - break; - case TLS::TLS_v1: - ctx = SSL_CTX_new(TLSv1_client_method()); diff --git a/srcpkgs/qca/patches/libressl.patch b/srcpkgs/qca/patches/libressl.patch deleted file mode 100644 index 2da07337d6f..00000000000 --- a/srcpkgs/qca/patches/libressl.patch +++ /dev/null @@ -1,14 +0,0 @@ -# upstream -# http://quickgit.kde.org/?p=qca.git&a=commit&h=593de6855a4f4dc26cface3e96de8889f90cb4bb - ---- plugins/qca-ossl/qca-ossl.cpp 2015-01-24 00:38:42.000000000 +0100 -+++ plugins/qca-ossl/qca-ossl.cpp 2015-01-24 00:38:27.000000000 +0100 -@@ -5801,7 +5801,7 @@ - { - SessionInfo sessInfo; - -- sessInfo.isCompressed = (0 != ssl->session->compress_meth); -+ sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(ssl->session)); - - if (ssl->version == TLS1_VERSION) - sessInfo.version = TLS::TLS_v1; diff --git a/srcpkgs/qca/patches/narrowing.patch b/srcpkgs/qca/patches/narrowing.patch deleted file mode 100644 index 030373daa50..00000000000 --- a/srcpkgs/qca/patches/narrowing.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- src/qca_textfilter.cpp 2014-11-06 09:15:45.000000000 +0100 -+++ src/qca_textfilter.cpp 2017-01-25 05:19:43.948129764 +0100 -@@ -289,29 +289,31 @@ - - static QByteArray b64decode(const QByteArray &s, bool *ok) - { -- // -1 specifies invalid -+#define _I '\xff' -+ // _I specifies invalid - // 64 specifies eof - // everything else specifies data - - static char tbl[] = - { -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63, -- 52,53,54,55,56,57,58,59,60,61,-1,-1,-1,64,-1,-1, -- -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14, -- 15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1, -- -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40, -- 41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,62,_I,_I,_I,63, -+ 52,53,54,55,56,57,58,59,60,61,_I,_I,_I,64,_I,_I, -+ _I, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14, -+ 15,16,17,18,19,20,21,22,23,24,25,_I,_I,_I,_I,_I, -+ _I,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40, -+ 41,42,43,44,45,46,47,48,49,50,51,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, - }; -+#undef _I - - // return value - QByteArray p; diff --git a/srcpkgs/qca/template b/srcpkgs/qca/template index faff7788ea3..ed64ab4fb83 100644 --- a/srcpkgs/qca/template +++ b/srcpkgs/qca/template @@ -1,7 +1,7 @@ # Template file for 'qca' pkgname=qca -version=2.1.0 -revision=10 +version=2.1.3 +revision=1 build_style=cmake configure_args="-DBUILD_TESTS=0 -DQC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca/mkspecs -DWITH_ossl_PLUGIN=yes" @@ -12,8 +12,8 @@ short_desc="Qt Cryptographic Architecture" maintainer="Juan RP " license="LGPL-2.1" homepage="http://delta.affinix.com/qca/" -distfiles="http://delta.affinix.com/download/qca/2.0/${pkgname}-${version}.tar.gz" -checksum=226dcd76138c3738cdc15863607a96b3758a4c3efd3c47295939bcea4e7a9284 +distfiles="https://download.kde.org/stable/$pkgname/$version/src/${pkgname}-${version}.tar.xz" +checksum=003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt-host-tools qt-devel" diff --git a/srcpkgs/qdirstat-cache-writer b/srcpkgs/qdirstat-cache-writer new file mode 120000 index 00000000000..0b6052c1a9e --- /dev/null +++ b/srcpkgs/qdirstat-cache-writer @@ -0,0 +1 @@ +qdirstat \ No newline at end of file diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template index 051c0276770..8480168144f 100644 --- a/srcpkgs/qdirstat/template +++ b/srcpkgs/qdirstat/template @@ -1,7 +1,7 @@ # Template file for 'qdirstat' pkgname=qdirstat version=1.3 -revision=1 +revision=2 build_style=qmake hostmakedepends="qt5-qmake" makedepends="zlib-devel qt5-devel" @@ -15,3 +15,12 @@ checksum=dd5fa00e8745344de73794e5d4076dff7ec1b20ce34091264cb0091bf7e123c9 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" fi + +qdirstat-cache-writer_package() { + short_desc+=" - headless scanner" + depends="perl" + noarch=yes + pkg_install() { + vmove usr/bin/qdirstat-cache-writer + } +} diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template index e97eaec3d5f..0af913b58fe 100644 --- a/srcpkgs/qemu-user-static/template +++ b/srcpkgs/qemu-user-static/template @@ -1,7 +1,7 @@ # Template file for 'qemu-user-static' pkgname=qemu-user-static -version=2.8.0 -revision=1 +version=2.9.0 +revision=2 wrksrc="qemu-${version}" hostmakedepends="pkg-config automake python" makedepends="libglib-devel pixman-devel libuuid-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://qemu.org" license="GPL-2, LGPL-2.1" distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2" -checksum=dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 +checksum=00bfb217b1bb03c7a6c3261b819cfccbfb5a58e3e2ceff546327d271773c6c14 _fmts="aarch64 alpha arm armeb cris i386 m68k microblaze mips mipsel mips64 mips64el ppc ppc64 ppc64abi32 ppc64le s390x sh4 sh4eb sparc sparc32plus sparc64 x86_64" @@ -79,6 +79,9 @@ done binfmts="${binfmts%?}" nopie=yes +post_extract() { + sed -i 's/__u64/unsigned long/' linux-user/host/aarch64/hostdep.h +} do_configure() { ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec \ --disable-kvm --disable-vnc-png \ diff --git a/srcpkgs/qemu/patches/musl-fix-SIOCGSTAMPNS.patch b/srcpkgs/qemu/patches/musl-fix-SIOCGSTAMPNS.patch new file mode 100644 index 00000000000..1b00c27e70a --- /dev/null +++ b/srcpkgs/qemu/patches/musl-fix-SIOCGSTAMPNS.patch @@ -0,0 +1,10 @@ +--- linux-user/syscall.c.orig 2017-04-25 23:46:47.896819860 +0200 ++++ linux-user/syscall.c 2017-04-26 08:43:48.821452132 +0200 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #include + #ifdef __ia64__ diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 9da4ef5bb5f..438fe3350cf 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,14 +1,14 @@ # Template file for 'qemu' pkgname=qemu -version=2.8.0 -revision=2 +version=2.9.0 +revision=1 short_desc="Open Source Processor Emulator" maintainer="Juan RP " homepage="http://qemu.org" license="GPL-2, LGPL-2.1" distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2" -checksum=dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 -nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/30051/steps/shell_3/logs/stdio +checksum=00bfb217b1bb03c7a6c3261b819cfccbfb5a58e3e2ceff546327d271773c6c14 +nocross="https://api.travis-ci.org/jobs/210268003/log.txt" nostrip=yes hostmakedepends="pkg-config perl python automake libtool flex" @@ -19,15 +19,17 @@ makedepends="libpng-devel libjpeg-turbo-devel pixman-devel snappy-devel libbluetooth-devel libssh2-devel libusb-devel pulseaudio-devel libnfs-devel $(vopt_if sdl SDL-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if gtk gtk+-devel) $(vopt_if spice spice-devel) $(vopt_if virgl virglrenderer-devel) - $(vopt_if opengl 'libepoxy-devel libdrm-devel MesaLib-devel')" + $(vopt_if opengl 'libepoxy-devel libdrm-devel MesaLib-devel') + $(vopt_if smartcard libcacard-devel)" -build_options="gtk opengl sdl sdl2 spice virgl" +build_options="gtk opengl sdl sdl2 spice virgl smartcard" build_options_default="opengl sdl2 virgl" desc_option_gtk="Enable GTK display and use it by default" desc_option_sdl="Use SDL (1.x) video output" desc_option_sdl2="Use SDL (2.x) video output" desc_option_spice="Enable support for SPICE" desc_option_virgl="Enable support for VirGL (A Virtual 3D GPU renderer)" +desc_option_smartcard="Enable smartcard support" vopt_conflict "sdl" "sdl2" case "$XBPS_TARGET_MACHINE" in @@ -67,6 +69,7 @@ do_configure() { ${want_sdl} \ $(vopt_if sdl "--with-sdlabi=1.2") \ $(vopt_if sdl2 "--with-sdlabi=2.0") \ + $(vopt_enable smartcard) \ $(vopt_enable gtk) ${args} } do_build() { diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template index aec106f2ca4..b6878724384 100644 --- a/srcpkgs/qingy/template +++ b/srcpkgs/qingy/template @@ -1,12 +1,12 @@ # Template file for 'qingy' pkgname=qingy version=1.0.0 -revision=21 +revision=22 lib32disabled=yes build_style=gnu-configure makedepends="ncurses-devel libressl-devel $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel scrnsaverproto')" -configure_args="--sbindir=/usr/bin --disable-static --disable-DirectFB-support +configure_args="--disable-optimizations --disable-static --disable-DirectFB-support $(vopt_enable pam) $(vopt_enable x11 x-support)" short_desc="Qingy Is Not Getty" maintainer="Jens E. Becker " @@ -24,8 +24,6 @@ conf_files=" build_options="pam x11" build_options_default="pam x11" -# Build System is broken with -fPIC -nopie=yes post_install() { sed -i '/pam_console/d' ${DESTDIR}/etc/pam.d/qingy diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template index 9f3b2e050ca..1d8dac64658 100644 --- a/srcpkgs/qjackctl/template +++ b/srcpkgs/qjackctl/template @@ -1,6 +1,6 @@ # Template file for 'qjackctl' pkgname=qjackctl -version=0.4.4 +version=0.4.5 revision=1 build_style=gnu-configure configure_args="--enable-jack-version --enable-qt4 --disable-qt5" @@ -12,7 +12,9 @@ maintainer="Juan RP " license="GPL-2" homepage="http://qjackctl.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=531db2f7eca654fd8769a1281dccb54ebca57a0b2a575734d1bafc3896a46ba5 +checksum=c50da569ec8466ac6cc72c65e2d8212eb9c40149daed0a10fb7795ff9ddc4ab7 + +nocross="https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/2366/steps/shell_3/logs/stdio" post_extract() { sed -i '21i#include // gethostname()' src/qjackctl.cpp diff --git a/srcpkgs/qmltermwidget/template b/srcpkgs/qmltermwidget/template new file mode 100644 index 00000000000..078a3dff697 --- /dev/null +++ b/srcpkgs/qmltermwidget/template @@ -0,0 +1,13 @@ +# Template file for 'qmltermwidget' +pkgname=qmltermwidget +version=0.1.0 +revision=1 +build_style=qmake +hostmakedepends="qt5-declarative-devel qt5-qmake" +makedepends="qt5-devel qt5-declarative-devel" +short_desc="QML port of qtermwidget" +maintainer="bra1nwave " +license="GPL-2" +homepage="https://github.com/Swordfish90/qmltermwidget" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=127f529a96cf1c96ff201c79458cff67f497b1820b04b0b30cb473423ccb30f9 diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template index 4078a311420..9d8bcbb4da7 100644 --- a/srcpkgs/qmmp/template +++ b/srcpkgs/qmmp/template @@ -1,11 +1,11 @@ # Template file for 'qmmp' pkgname=qmmp -version=1.1.7 -revision=1 +version=1.1.8 +revision=2 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-tools" # XXX projectm, libsidplayfp, libgme, wildmidi -makedepends="curlpp-devel jack-devel libsoxr-devel libmpcdec-devel +makedepends="libcurl-devel jack-devel libsoxr-devel libmpcdec-devel ffmpeg-devel pulseaudio-devel libcdio-paranoia-devel enca-devel libmad-devel libmms-devel libsamplerate-devel libmodplug-devel portmidi-devel wavpack-devel faad2-devel libbs2b-devel taglib-devel @@ -15,7 +15,7 @@ maintainer="Jürgen Buchmüller " license="GPL-3" homepage="http://qmmp.ylsoftware.com/" distfiles="http://qmmp.ylsoftware.com/files/qmmp-${version}.tar.bz2" -checksum=464f79d9a54e6456c5abcb570d7f062e48d3eaa3d60ad2b09c58bc62af5b87a7 +checksum=17bc88d00ea0753e6fc7273592e894320f05cae807f7cc2c6a5351c73217f010 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-multimedia-devel qt5-x11extras-devel" diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template index 207d4ed62fb..e2e84862271 100644 --- a/srcpkgs/qsynth/template +++ b/srcpkgs/qsynth/template @@ -1,6 +1,6 @@ # Template file for 'qsynth' pkgname=qsynth -version=0.4.3 +version=0.4.4 revision=1 build_style=gnu-configure hostmakedepends="pkg-config qt5-qmake qt5-tools" @@ -11,4 +11,6 @@ maintainer="Juan RP " license="GPL-2" homepage="http://qsynth.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=de27097a6e5e68799e0ab72641682b3c8f3d7bc404d2ba38e2ca66e952aab0c8 +checksum=0ef914447b1f3a3ecd9c38101f06fc9c67e1d8367202a3f7a494f5d167b40e62 + +nocross="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/2580" diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index 1b7787efd9f..deb93bab600 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,7 +1,7 @@ # Template file for 'qt' pkgname=qt version=4.8.7 -revision=20 +revision=22 _distname=qt-everywhere-opensource-src patch_args="-Np1" wrksrc=${_distname}-${version} diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template index 8542f4916da..b1cc78e6b44 100644 --- a/srcpkgs/qt5-webkit/template +++ b/srcpkgs/qt5-webkit/template @@ -1,7 +1,7 @@ # Template file for 'qt5-webkit' pkgname=qt5-webkit version=5.8.0 -revision=2 +revision=3 wrksrc=qtwebkit-opensource-src-${version} hostmakedepends="bison flex gperf perl python ruby pkg-config" makedepends="libwebp-devel libxslt-devel libXcomposite-devel sqlite-devel libjpeg-turbo-devel diff --git a/srcpkgs/qt5/patches/libressl-compat.patch b/srcpkgs/qt5/patches/libressl-compat.patch index 805df35ff2e..c9f2e33f50c 100644 --- a/srcpkgs/qt5/patches/libressl-compat.patch +++ b/srcpkgs/qt5/patches/libressl-compat.patch @@ -11,76 +11,6 @@ #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L --- qtbase/src/network/ssl/qsslsocket_openssl.cpp 2017-01-18 15:20:58.000000000 +0100 +++ qtbase/src/network/ssl/qsslsocket_openssl.cpp 2017-02-21 19:12:22.200604090 +0100 -@@ -94,7 +94,7 @@ - bool QSslSocketPrivate::s_loadedCiphersAndCerts = false; - bool QSslSocketPrivate::s_loadRootCertsOnDemand = false; - --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - int QSslSocketBackendPrivate::s_indexForSSLExtraData = -1; - #endif - -@@ -191,7 +191,7 @@ - return (quintptr)QThread::currentThreadId(); - } - --#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(OPENSSL_NO_PSK) && !defined(LIBRESSL_VERSION_NUMBER) - static unsigned int q_ssl_psk_client_callback(SSL *ssl, - const char *hint, - char *identity, unsigned int max_identity_len, -@@ -328,7 +328,7 @@ - options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3; - else if (protocol == QSsl::TlsV1_0OrLater) - options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3; --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - // Choosing Tlsv1_1OrLater or TlsV1_2OrLater on OpenSSL < 1.0.1 - // will cause an error in QSslContext::fromConfiguration, meaning - // we will never get here. -@@ -437,13 +437,13 @@ - else - q_SSL_set_accept_state(ssl); - --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - // Save a pointer to this object into the SSL structure. - if (q_SSLeay() >= 0x10001000L) - q_SSL_set_ex_data(ssl, s_indexForSSLExtraData, this); - #endif - --#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(OPENSSL_NO_PSK) && !defined(LIBRESSL_VERSION_NUMBER) - // Set the client callback for PSK - if (q_SSLeay() >= 0x10001000L) { - if (mode == QSslSocket::SslClientMode) -@@ -506,7 +506,7 @@ - q_SSL_load_error_strings(); - q_OpenSSL_add_all_algorithms(); - --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - if (q_SSLeay() >= 0x10001000L) - QSslSocketBackendPrivate::s_indexForSSLExtraData = q_SSL_get_ex_new_index(0L, NULL, NULL, NULL, NULL); - #endif -@@ -1594,7 +1594,7 @@ - } - } - --#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -+#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL) && !defined(OPENSSL_NO_NEXTPROTONEG) && !defined(LIBRESSL_VERSION_NUMBER) - - configuration.nextProtocolNegotiationStatus = sslContextPointer->npnContext().status; - if (sslContextPointer->npnContext().status == QSslConfiguration::NextProtocolNegotiationUnsupported) { -@@ -1603,7 +1603,7 @@ - } else { - const unsigned char *proto = 0; - unsigned int proto_len = 0; --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) - if (q_SSLeay() >= 0x10002000L) { - q_SSL_get0_alpn_selected(ssl, &proto, &proto_len); - if (proto_len && mode == QSslSocket::SslClientMode) { @@ -1626,7 +1626,7 @@ } #endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... @@ -101,62 +31,6 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) #endif DEFINEFUNC2(BN_ULONG, BN_mod_word, const BIGNUM *a, a, BN_ULONG w, w, return -1, return) -@@ -300,17 +300,17 @@ - DEFINEFUNC(void, SSL_SESSION_free, SSL_SESSION *ses, ses, return, DUMMYARG) - DEFINEFUNC(SSL_SESSION*, SSL_get1_session, SSL *ssl, ssl, return 0, return) - DEFINEFUNC(SSL_SESSION*, SSL_get_session, const SSL *ssl, ssl, return 0, return) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - DEFINEFUNC5(int, SSL_get_ex_new_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) - DEFINEFUNC3(int, SSL_set_ex_data, SSL *ssl, ssl, int idx, idx, void *arg, arg, return 0, return) - DEFINEFUNC2(void *, SSL_get_ex_data, const SSL *ssl, ssl, int idx, idx, return NULL, return) - #endif --#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(OPENSSL_NO_PSK) && !defined(LIBRESSL_VERSION_NUMBER) - DEFINEFUNC2(void, SSL_set_psk_client_callback, SSL* ssl, ssl, q_psk_client_callback_t callback, callback, return, DUMMYARG) - DEFINEFUNC2(void, SSL_set_psk_server_callback, SSL* ssl, ssl, q_psk_server_callback_t callback, callback, return, DUMMYARG) - DEFINEFUNC2(int, SSL_CTX_use_psk_identity_hint, SSL_CTX* ctx, ctx, const char *hint, hint, return 0, return) - #endif - #if OPENSSL_VERSION_NUMBER >= 0x10000000L - #ifndef OPENSSL_NO_SSL2 - DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) - #endif -@@ -319,7 +319,7 @@ - #endif - DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - DEFINEFUNC(const SSL_METHOD *, TLSv1_1_client_method, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const SSL_METHOD *, TLSv1_2_client_method, DUMMYARG, DUMMYARG, return 0, return) - #endif -@@ -331,7 +331,7 @@ - #endif - DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - DEFINEFUNC(const SSL_METHOD *, TLSv1_1_server_method, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const SSL_METHOD *, TLSv1_2_server_method, DUMMYARG, DUMMYARG, return 0, return) - #endif -@@ -414,7 +414,7 @@ - DEFINEFUNC(const char *, SSLeay_version, int a, a, return 0, return) - DEFINEFUNC2(int, i2d_SSL_SESSION, SSL_SESSION *in, in, unsigned char **pp, pp, return 0, return) - DEFINEFUNC3(SSL_SESSION *, d2i_SSL_SESSION, SSL_SESSION **a, a, const unsigned char **pp, pp, long length, length, return 0, return) --#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -+#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL) && !defined(OPENSSL_NO_NEXTPROTONEG) && !defined(LIBRESSL_VERSION_NUMBER) - DEFINEFUNC6(int, SSL_select_next_proto, unsigned char **out, out, unsigned char *outlen, outlen, - const unsigned char *in, in, unsigned int inlen, inlen, - const unsigned char *client, client, unsigned int client_len, client_len, -@@ -427,7 +427,7 @@ - void *arg, arg, return, DUMMYARG) - DEFINEFUNC3(void, SSL_get0_next_proto_negotiated, const SSL *s, s, - const unsigned char **data, data, unsigned *len, len, return, DUMMYARG) --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) - DEFINEFUNC3(int, SSL_set_alpn_protos, SSL *s, s, const unsigned char *protos, protos, - unsigned protos_len, protos_len, return -1, return) - DEFINEFUNC3(void, SSL_CTX_set_alpn_select_cb, SSL_CTX *s, s, @@ -451,7 +451,7 @@ DEFINEFUNC(EC_KEY *, EC_KEY_new_by_curve_name, int nid, nid, return 0, return) DEFINEFUNC(void, EC_KEY_free, EC_KEY *ecdh, ecdh, return, DUMMYARG) @@ -175,54 +49,6 @@ RESOLVEFUNC(BN_is_word) #endif RESOLVEFUNC(BN_mod_word) -@@ -912,12 +912,12 @@ - RESOLVEFUNC(SSL_SESSION_free) - RESOLVEFUNC(SSL_get1_session) - RESOLVEFUNC(SSL_get_session) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - RESOLVEFUNC(SSL_get_ex_new_index) - RESOLVEFUNC(SSL_set_ex_data) - RESOLVEFUNC(SSL_get_ex_data) - #endif --#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(OPENSSL_NO_PSK) && !defined(LIBRESSL_VERSION_NUMBER) - RESOLVEFUNC(SSL_set_psk_client_callback) - RESOLVEFUNC(SSL_set_psk_server_callback) - RESOLVEFUNC(SSL_CTX_use_psk_identity_hint) -@@ -931,7 +931,7 @@ - #endif - RESOLVEFUNC(SSLv23_client_method) - RESOLVEFUNC(TLSv1_client_method) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - RESOLVEFUNC(TLSv1_1_client_method) - RESOLVEFUNC(TLSv1_2_client_method) - #endif -@@ -943,7 +943,7 @@ - #endif - RESOLVEFUNC(SSLv23_server_method) - RESOLVEFUNC(TLSv1_server_method) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - RESOLVEFUNC(TLSv1_1_server_method) - RESOLVEFUNC(TLSv1_2_server_method) - #endif -@@ -999,12 +999,12 @@ - RESOLVEFUNC(SSLeay_version) - RESOLVEFUNC(i2d_SSL_SESSION) - RESOLVEFUNC(d2i_SSL_SESSION) --#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -+#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL) && !defined(OPENSSL_NO_NEXTPROTONEG) && !defined(LIBRESSL_VERSION_NUMBER) - RESOLVEFUNC(SSL_select_next_proto) - RESOLVEFUNC(SSL_CTX_set_next_proto_select_cb) - RESOLVEFUNC(SSL_get0_next_proto_negotiated) - #endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) - RESOLVEFUNC(SSL_set_alpn_protos) - RESOLVEFUNC(SSL_CTX_set_alpn_select_cb) - RESOLVEFUNC(SSL_get0_alpn_selected) @@ -1020,7 +1020,7 @@ RESOLVEFUNC(EC_KEY_new_by_curve_name) RESOLVEFUNC(EC_KEY_free) @@ -252,29 +78,6 @@ BN_ULONG q_BN_mod_word(const BIGNUM *a, BN_ULONG w); #ifndef OPENSSL_NO_EC const EC_GROUP* q_EC_KEY_get0_group(const EC_KEY* k); -@@ -387,19 +387,19 @@ - void q_SSL_SESSION_free(SSL_SESSION *ses); - SSL_SESSION *q_SSL_get1_session(SSL *ssl); - SSL_SESSION *q_SSL_get_session(const SSL *ssl); --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - int q_SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); - int q_SSL_set_ex_data(SSL *ssl, int idx, void *arg); - void *q_SSL_get_ex_data(const SSL *ssl, int idx); - #endif --#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(OPENSSL_NO_PSK) && !defined(LIBRESSL_VERSION_NUMBER) - typedef unsigned int (*q_psk_client_callback_t)(SSL *ssl, const char *hint, char *identity, unsigned int max_identity_len, unsigned char *psk, unsigned int max_psk_len); - void q_SSL_set_psk_client_callback(SSL *ssl, q_psk_client_callback_t callback); - typedef unsigned int (*q_psk_server_callback_t)(SSL *ssl, const char *identity, unsigned char *psk, unsigned int max_psk_len); - void q_SSL_set_psk_server_callback(SSL *ssl, q_psk_server_callback_t callback); - int q_SSL_CTX_use_psk_identity_hint(SSL_CTX *ctx, const char *hint); --#endif // OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -+#endif // (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(OPENSSL_NO_PSK) && !defined(LIBRESSL_VERSION_NUMBER) - #if OPENSSL_VERSION_NUMBER >= 0x10000000L - #ifndef OPENSSL_NO_SSL2 - const SSL_METHOD *q_SSLv2_client_method(); - #endif @@ -509,13 +509,13 @@ // EC curves management @@ -293,80 +96,9 @@ // PKCS#12 support int q_PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca); -@@ -573,7 +573,7 @@ - int q_i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp); - SSL_SESSION *q_d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length); - --#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -+#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL) && !defined(OPENSSL_NO_NEXTPROTONEG) && !defined(LIBRESSL_VERSION_NUMBER) - int q_SSL_select_next_proto(unsigned char **out, unsigned char *outlen, - const unsigned char *in, unsigned int inlen, - const unsigned char *client, unsigned int client_len); -@@ -585,7 +585,7 @@ - void *arg); - void q_SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data, - unsigned *len); --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) - int q_SSL_set_alpn_protos(SSL *ssl, const unsigned char *protos, - unsigned protos_len); - void q_SSL_CTX_set_alpn_select_cb(SSL_CTX *ctx, -@@ -598,7 +598,7 @@ - void q_SSL_get0_alpn_selected(const SSL *ssl, const unsigned char **data, - unsigned *len); - #endif --#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... -+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000100fL) && !defined(OPENSSL_NO_NEXTPROTONEG) && !defined(LIBRESSL_VERSION_NUMBER) - - // Helper function - class QDateTime; --- qtbase/src/network/ssl/qsslcontext_openssl.cpp 2017-01-18 15:20:58.000000000 +0100 +++ qtbase/src/network/ssl/qsslcontext_openssl.cpp 2017-02-21 19:23:04.291975945 +0100 -@@ -126,7 +126,7 @@ - sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method()); - break; - case QSsl::TlsV1_1: --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_1_client_method() : q_TLSv1_1_server_method()); - #else - // TLS 1.1 not supported by the system, but chosen deliberately -> error -@@ -135,7 +135,7 @@ - #endif - break; - case QSsl::TlsV1_2: --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_2_client_method() : q_TLSv1_2_server_method()); - #else - // TLS 1.2 not supported by the system, but chosen deliberately -> error -@@ -149,7 +149,7 @@ - break; - case QSsl::TlsV1_1OrLater: - case QSsl::TlsV1_2OrLater: --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(LIBRESSL_VERSION_NUMBER) - // Specific protocols will be specified via SSL options. - sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); - #else -@@ -330,7 +330,7 @@ - } - - #ifndef OPENSSL_NO_EC --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) - if (q_SSLeay() >= 0x10002000L) { - q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_SET_ECDH_AUTO, 1, NULL); - } else -@@ -344,14 +344,14 @@ - } - #endif // OPENSSL_NO_EC - --#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -+#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(OPENSSL_NO_PSK) && !defined(LIBRESSL_VERSION_NUMBER) - if (!client) - q_SSL_CTX_use_psk_identity_hint(sslContext->ctx, sslContext->sslConfiguration.preSharedKeyIdentityHint().constData()); - #endif // OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) +@@ -344,7 +344,7 @@ const QVector qcurves = sslContext->sslConfiguration.ellipticCurves(); if (!qcurves.isEmpty()) { @@ -375,24 +107,6 @@ // Set the curves to be used if (q_SSLeay() >= 0x10002000L) { // SSL_CTX_ctrl wants a non-const pointer as last argument, -@@ -387,7 +387,7 @@ - return sslContext; - } - --#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -+#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL) && !defined(OPENSSL_NO_NEXTPROTONEG) && !defined(LIBRESSL_VERSION_NUMBER) - - static int next_proto_cb(SSL *, unsigned char **out, unsigned char *outlen, - const unsigned char *in, unsigned int inlen, void *arg) -@@ -447,7 +447,7 @@ - } - } - --#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -+#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL) && !defined(OPENSSL_NO_NEXTPROTONEG) && !defined(LIBRESSL_VERSION_NUMBER) - QList protocols = sslConfiguration.d->nextAllowedProtocols; - if (!protocols.isEmpty()) { - m_supportedNPNVersions.clear(); @@ -462,7 +462,7 @@ m_npnContext.data = reinterpret_cast(m_supportedNPNVersions.data()); m_npnContext.len = m_supportedNPNVersions.count(); diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 85e20633749..e810f6dd4fd 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,7 +1,7 @@ # Template file for 'qt5' pkgname=qt5 version=5.8.0 -revision=2 +revision=5 wrksrc="qt-everywhere-opensource-src-${version}" build_style=gnu-configure homepage="http://qt.io/" @@ -11,11 +11,6 @@ license="GPL-3, LGPL-2.1" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-opensource-src-${version}.tar.xz" checksum=0f4c54386d3dbac0606a936a7145cebb7b94b0ca2d29bc001ea49642984824b6 -if [ "${XBPS_TARGET_MACHINE%-musl}" = aarch64 ]; then - # The aarch64* builders can't build qt5; it compiles fine here, though. - broken="https://build.voidlinux.eu/builders/aarch64_builder/builds/1327/steps/shell_3/logs/stdio" -fi - if [ "${XBPS_MACHINE%%-musl}" = i686 ]; then nodebug=yes # prevent OOM fi @@ -33,14 +28,14 @@ makedepends=" mtdev-devel freetds-devel libmysqlclient-devel postgresql-libs-devel pulseaudio-devel libbluetooth-devel gst-plugins-base1-devel libxslt-devel pciutils-devel nss-devel libcap-devel libinput-devel libproxy-devel - libxcb-devel libxkbcommon-devel tslib-devel wayland-devel" + libxcb-devel libxkbcommon-devel tslib-devel wayland-devel libwayland-egl" depends="qtchooser" replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0 qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1" # Work around SSLv3_{client,server}_method missing in libressl-2.3.3 -CFLAGS="-DOPENSSL_NO_SSL3_METHOD" -CXXFLAGS="-DOPENSSL_NO_SSL3_METHOD -Wno-deprecated-declarations -fno-delete-null-pointer-checks" +CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG -DOPENSSL_NO_SSL3_METHOD" +CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -fno-delete-null-pointer-checks" # Required for musl libc LDFLAGS="-pthread -ldl -fPIE" @@ -236,11 +231,8 @@ do_configure() { # opts+=" -silent" opts+=" -v" - if [ -z "$CROSS_BUILD" ]; then - if [ "${XBPS_MACHINE%%-musl}" = i686 ]; then - LDFLAGS+=" -Wl,--no-keep-memory" # else OOM on 32-bit - fi - else + LDFLAGS+=" -Wl,--no-keep-memory" # needs more than 8GB RAM else + if [ -n "$CROSS_BUILD" ]; then spec=void-${XBPS_CROSS_TRIPLET}-g++ _create_config ${spec} opts+=" -device ${spec}" diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template index b06a55efb3c..f1389d7039e 100644 --- a/srcpkgs/qtcreator/template +++ b/srcpkgs/qtcreator/template @@ -1,6 +1,6 @@ # Template file for 'qtcreator' pkgname=qtcreator -version=4.2.1 +version=4.2.2 revision=1 wrksrc=qt-creator-opensource-src-${version} build_style=qmake @@ -14,7 +14,7 @@ maintainer="Jürgen Buchmüller " license="LGPL-2.1" homepage="http://wiki.qt.io/Category:Tools::QtCreator" distfiles="http://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.gz" -checksum=2537c2fcd127136241d0bf3bf9e1f03cf35be1a24414479d5502a7539ca25a38 +checksum=0402f0e33bf3c8ee7f89c673f25fcf75fef03ba4262e077d9d9f42454d1e799b do_build() { # Note: A simple "make ${makejobs}" fails after libs because diff --git a/srcpkgs/qtkeychain-qt5/template b/srcpkgs/qtkeychain-qt5/template index 68c7276ecee..9e5b0c6494d 100644 --- a/srcpkgs/qtkeychain-qt5/template +++ b/srcpkgs/qtkeychain-qt5/template @@ -1,16 +1,16 @@ # Template file for 'qtkeychain' pkgname=qtkeychain-qt5 -version=0.6.2 +version=0.7.0 revision=1 -wrksrc=${pkgname%-*}-${version} +wrksrc="${pkgname%-*}-${version}" build_style=cmake -makedepends="icu-devel qt5-devel qt5-tools-devel" -short_desc="Platform-independent Qt API for storing passwords securely" +makedepends="qt5-tools-devel" +short_desc="Platform-independent Qt5 API for storing passwords securely" maintainer="Duncaen " license="2-clause-BSD" homepage="https://github.com/frankosterfeld/qtkeychain" distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/v${version}.tar.gz" -checksum=ae13459234feeeab3a154457319d9b26ee9600973443517c77e055838ebae63c +checksum=9f9afaae8e909391d7fc932bac95e38befaac5b2eb49f6623a8efec60a2e6a3a if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-tools-devel" @@ -21,7 +21,7 @@ post_install() { } qtkeychain-qt5-devel_package() { - depends="qtkeychain-qt5>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template index d41aa6ae94c..28d200e7a72 100644 --- a/srcpkgs/qtox/template +++ b/srcpkgs/qtox/template @@ -1,6 +1,6 @@ # Template file for 'qtox' pkgname=qtox -version=1.8.1 +version=1.9.0 revision=1 build_style=qmake short_desc="QT-based TOX instant messenger client" @@ -14,7 +14,7 @@ makedepends="toxcore-devel filteraudio-devel-git ffmpeg-devel qt5-svg-devel sqlcipher-devel" depends="qt5-plugin-sqlite" distfiles="https://github.com/tux3/qTox/archive/v${version}.tar.gz" -checksum=32837b5f824b6987a68f9211f93a7ec32b892be895605012d35784d702f13d6c +checksum=aceaac0c9cf8c9c98e364c8380f992547f369db6f0ac62505531c0474c7e04d6 wrksrc="qTox-${version}" pre_configure() { diff --git a/srcpkgs/quazip-qt5/template b/srcpkgs/quazip-qt5/template index a3a43ceb222..7eefb55e7ca 100644 --- a/srcpkgs/quazip-qt5/template +++ b/srcpkgs/quazip-qt5/template @@ -1,30 +1,29 @@ -# Template file for 'quazip' +# Template file for 'quazip-qt5' pkgname=quazip-qt5 version=0.7.3 -revision=1 -build_style=qmake -wrksrc=${pkgname%-*}-${version} -hostmakedepends="qt5-qmake" +revision=2 +build_style=cmake +wrksrc="${pkgname%-*}-${version}" +configure_args="-DCMAKE_CXX_FLAGS=-fPIC" makedepends="qt5-devel zlib-devel" -short_desc="C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package" +short_desc="Qt5/C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package" maintainer="Duncaen " -license="LGPL-2.0" +license="LGPL-2.1" homepage="http://sourceforge.net/projects/quazip/" distfiles="${SOURCEFORGE_SITE}/${pkgname%-*}/${pkgname%-*}-${version}.tar.gz" checksum=2ad4f354746e8260d46036cde1496c223ec79765041ea28eb920ced015e269b5 -provides="quazip-${version}_${revision}" -replaces="quazip>=0" - if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" fi quazip-qt5-devel_package() { - depends="quazip-qt5>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include + vmove usr/share + vmove usr/lib/*.a vmove usr/lib/*.so } } diff --git a/srcpkgs/quilt/template b/srcpkgs/quilt/template new file mode 100644 index 00000000000..7a7a514368a --- /dev/null +++ b/srcpkgs/quilt/template @@ -0,0 +1,17 @@ +# Template file for 'quilt' +pkgname=quilt +version=0.65 +revision=1 +build_style=gnu-configure +configure_args="--without-rpmbuild" +hostmakedepends="perl" +short_desc="A Tool for Working with Many Patches" +maintainer="Diogo Leal " +license="GPL-2" +homepage="http://savannah.nongnu.org/projects/quilt" +distfiles="http://download.savannah.gnu.org/releases/quilt/quilt-${version}.tar.gz" +checksum=f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa096819 + +do_install() { + make BUILD_ROOT=\"$DESTDIR\" install +} diff --git a/srcpkgs/qupzilla/template b/srcpkgs/qupzilla/template index 284aed289f9..44f0c902c58 100644 --- a/srcpkgs/qupzilla/template +++ b/srcpkgs/qupzilla/template @@ -1,7 +1,7 @@ # Template file for 'qupzilla' pkgname=qupzilla -version=2.1.1 -revision=1 +version=2.1.2 +revision=2 wrksrc=QupZilla-${version} build_style=qmake hostmakedepends="pkg-config qt5-tools-devel qt5-declarative-devel qt5-location-devel @@ -15,5 +15,5 @@ maintainer="Jürgen Buchmüller " license="GPL-3" homepage="http://www.qupzilla.com/" distfiles="https://github.com/QupZilla/${pkgname}/releases/download/v${version}/QupZilla-${version}.tar.xz" -checksum=5c2137875574607c017f3f94288f08f8ec4187d0d0ea4877f923437aeb08def5 +checksum=d8f860d8c41bbf2bf78889aef3ffed118a34b2754f7e114ad44eb2c6103ee58a conflicts="qupzilla1>=0" diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template index e470e4481a6..ff34bc69c63 100644 --- a/srcpkgs/qupzilla1/template +++ b/srcpkgs/qupzilla1/template @@ -1,7 +1,7 @@ # Template file for 'qupzilla1' pkgname=qupzilla1 version=1.8.9 -revision=6 +revision=7 wrksrc=QupZilla-${version} build_style=qmake hostmakedepends="pkg-config" diff --git a/srcpkgs/qutebrowser/INSTALL.msg b/srcpkgs/qutebrowser/INSTALL.msg new file mode 100644 index 00000000000..2d692777c72 --- /dev/null +++ b/srcpkgs/qutebrowser/INSTALL.msg @@ -0,0 +1 @@ +To use the new QtWebEngine backend, install python3-PyQt5-webengine. diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template index 0015b4d694c..d389b058752 100644 --- a/srcpkgs/qutebrowser/template +++ b/srcpkgs/qutebrowser/template @@ -1,7 +1,7 @@ # Template file for 'qutebrowser' pkgname=qutebrowser -version=0.10.0 -revision=1 +version=0.10.1 +revision=3 noarch=yes build_style=python3-module pycompile_module="${pkgname}" @@ -13,7 +13,7 @@ maintainer="Eivind Uggedal " license="GPL-3" homepage="https://qutebrowser.org/" distfiles="https://github.com/The-Compiler/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=b5f3516b8f886a972e5028858a9508a6d1adaf89190b38de27f6177998592b70 +checksum=57f4915f0f2b1509f3aa1cb9c47117fdaad35b4c895e9223c4eb0a6e8af51917 pre_build() { a2x -f manpage doc/${pkgname}.1.asciidoc diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template index dca9b275316..11ca0c8c290 100644 --- a/srcpkgs/racket/template +++ b/srcpkgs/racket/template @@ -1,6 +1,6 @@ # Template file for 'racket' pkgname=racket -version=6.8 +version=6.9 revision=1 build_style=gnu-configure build_wrksrc=src @@ -8,11 +8,11 @@ hostmakedepends="gsfonts" makedepends="sqlite-devel gtk+-devel" depends="gtk+" short_desc="A programmable programming language" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="LGPL-3" homepage="http://racket-lang.org/" distfiles="http://mirror.racket-lang.org/installers/$version/$pkgname-$version-src.tgz" -checksum=fbe18113ca813a11c2c11d84488cb3fc023ab8eca9d3c940c9cdff92810a3fd1 +checksum=1cd218ee2ba1dc683de858a866c6666eb72a11adee8d1df6cdd59c5c5a47b714 nostrip=yes configure_args="--disable-docs" only_for_archs="i686 x86_64 armv5tel armv6l armv7l aarch64" diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template index 93b731890ed..331dada909f 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,6 +1,6 @@ # Template file for 'radare2' pkgname=radare2 -version=1.2.1 +version=1.4.0 revision=1 build_style=gnu-configure configure_args="--with-syscapstone" @@ -11,4 +11,4 @@ maintainer="Juan RP " license="LGPL-3" homepage="http://www.radare.org" distfiles="https://github.com/radare/radare2/archive/${version}.tar.gz" -checksum=bf10bd83640002feec75a2d0449db7243ce99d307da2b5416a5c37988be88f1a +checksum=fb58417a6d35af4096da9130a041e1d36f900b17e2c2594b405a9b88ce33c7a8 diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template index aefb41fbaf1..9c2ee5fd93d 100644 --- a/srcpkgs/radicale/template +++ b/srcpkgs/radicale/template @@ -1,6 +1,6 @@ # Template file for 'radicale' pkgname=radicale -version=1.1.1 +version=1.1.2 revision=1 wrksrc=Radicale-${version} build_style=python2-module @@ -21,7 +21,7 @@ maintainer="lemmi " license="GPL-3" homepage="http://radicale.org" distfiles="${PYPI_SITE}/R/Radicale/Radicale-${version}.tar.gz" -checksum=e2c9812913c464ab88ae1f66b29e81f87a4cc6ee1c94d167b33508c530dab4b0 +checksum=ebe22afb7fdcac45a5722a5b3037cc4bf261fc059beba31af7863894d2b840bc system_accounts="radicale" radicale_homedir="/var/lib/radicale" diff --git a/srcpkgs/ragel/template b/srcpkgs/ragel/template index 0eee30738f0..f054f975db3 100644 --- a/srcpkgs/ragel/template +++ b/srcpkgs/ragel/template @@ -1,16 +1,14 @@ # Template file for 'ragel' pkgname=ragel -version=6.9 -revision=3 +version=6.10 +revision=1 build_style=gnu-configure short_desc="Compile regular languages into executable state machines" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-2" homepage="http://www.colm.net/open-source/ragel/" -distfiles="http://www.colm.net/files/ragel/${pkgname}-${version}.tar.gz" -checksum=6e07be0fab5ca1d9c2d9e177718a018fc666141f594a5d6e7025658620cf660a - -CXXFLAGS="-std=gnu++98 -Wno-error=narrowing" +distfiles="http://www.colm.net/files/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f post_install() { vdoc doc/ragel-guide.pdf diff --git a/srcpkgs/rakarrack/template b/srcpkgs/rakarrack/template index 7d61a02f668..a460e375557 100644 --- a/srcpkgs/rakarrack/template +++ b/srcpkgs/rakarrack/template @@ -6,7 +6,7 @@ build_style=gnu-configure hostmakedepends="alsa-utils" makedepends="jack-devel libsndfile-devel libXpm-devel fltk-devel libsamplerate-devel" short_desc="Versatile guitar multi-effects processor" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://rakarrack.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" diff --git a/srcpkgs/ratpoison/template b/srcpkgs/ratpoison/template index cb17302abc3..dc32b90a884 100644 --- a/srcpkgs/ratpoison/template +++ b/srcpkgs/ratpoison/template @@ -1,17 +1,18 @@ # Template file for 'ratpoison' pkgname=ratpoison -version=1.4.8 -revision=4 +version=1.4.9 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="readline-devel libICE-devel libXinerama-devel libXtst-devel libXft-devel" +makedepends="libICE-devel libXft-devel libXinerama-devel libXrandr-devel + libXtst-devel readline-devel" depends="perl" short_desc="Window manager without mouse dependency" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-2" homepage="http://savannah.nongnu.org/download/ratpoison/" distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=da4695636d1fce8883ef2144d79ce46ebb0431a5da02440bd1ffec5dca17a0f0 +checksum=d98fa4be025ecca453c407ff311ab3949f29f20d6d8abedf8f0716b85fc8d1f1 post_install() { vsconf doc/sample.ratpoisonrc diff --git a/srcpkgs/raven-python/template b/srcpkgs/raven-python/template new file mode 100644 index 00000000000..f2c4b299e60 --- /dev/null +++ b/srcpkgs/raven-python/template @@ -0,0 +1,13 @@ +# Template file for 'raven-python' +pkgname=raven-python +version=5.32.0 +revision=1 +build_style=python3-module +hostmakedepends="python3 python3-setuptools" +depends="python3" +short_desc="Raven is a Python client for Sentry (getsentry.com)" +maintainer="Michael Aldridge " +license="GPL-3" +homepage="https://github.com/getsentry/raven-python" +distfiles="https://github.com/getsentry/${pkgname}/archive/${version}.tar.gz" +checksum=beb421c7741c94225d1648dcd8165e709e885b45505b4a99acb1f2867bf279cb diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template index 88e9b3ee549..5e404926e83 100644 --- a/srcpkgs/rclone/template +++ b/srcpkgs/rclone/template @@ -1,7 +1,7 @@ # Template file for 'rclone' pkgname=rclone -version=1.35 -revision=3 +version=1.36 +revision=2 build_style=go go_import_path="github.com/ncw/rclone" short_desc="A rsync for cloud storage" @@ -9,7 +9,7 @@ maintainer="Diogo Leal " license="MIT" homepage="http://rclone.org/downloads/" distfiles="https://github.com/ncw/rclone/archive/v${version}.tar.gz" -checksum=63a075c4e6725f1a59c151a2d0d8cdf3119940fe293ee6220ff9fea6438b6fd7 +checksum=a573b70e3aeb355b943dddd6ae9375386fc21bf12dfba601d8d7280f97c4c884 post_install() { vlicense COPYING diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template index 5b1b09ae590..bea2f8c2748 100644 --- a/srcpkgs/rdesktop/template +++ b/srcpkgs/rdesktop/template @@ -1,7 +1,7 @@ # Template file for 'rdesktop' pkgname=rdesktop version=1.8.3 -revision=8 +revision=9 build_style=gnu-configure configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="pkg-config" diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template index 427ee61acd2..be46897f110 100644 --- a/srcpkgs/rdis-git/template +++ b/srcpkgs/rdis-git/template @@ -1,7 +1,7 @@ # Template file for 'rdis-git' pkgname=rdis-git version=20150722 -revision=5 +revision=6 hostmakedepends="pkg-config git" makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel" short_desc="A binary analysis tool for Linux" diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template index 877dc49cdf8..a4c01ac4e88 100644 --- a/srcpkgs/re2/template +++ b/srcpkgs/re2/template @@ -1,7 +1,7 @@ # Template build file for 're2'. pkgname=re2 reverts=20140304_1 -version=2016.11.01 +version=2017.04.01 revision=1 wrksrc="${pkgname}-${version//./-}" build_style=gnu-makefile @@ -11,7 +11,7 @@ maintainer="Steve Prybylski " license="3-clause-BSD" homepage="https://github.com/google/re2" distfiles="${homepage}/archive/${version//./-}.tar.gz" -checksum=01ee949f03e1c4057dc533cf139f967fb1b427015769d53b9ee07757631e9669 +checksum=908b2152eea1a7c5eefe27131d322308a9c30ed62e1254824404a2ab92bb2992 post_install() { vlicense LICENSE diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index 911a63ac0f7..dca487f78cd 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -1,6 +1,6 @@ # Template file for 'retroarch' pkgname=retroarch -version=1.4.1 +version=1.5.0 revision=1 wrksrc="RetroArch-$version" conf_files="/etc/retroarch.cfg" @@ -21,7 +21,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.libretro.com/" distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz" -checksum=3ef2939d988f09feac537088539cdb4f9b4f68d169ef088f636e0f64d424bffa +checksum=5de6385d4a0031709ef133d04a8573309e1090f0fda2917678be8e1147576de5 build_options_default="ffmpeg" diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template index af0507b1c10..b3569a41144 100644 --- a/srcpkgs/retroshare/template +++ b/srcpkgs/retroshare/template @@ -1,7 +1,7 @@ # Template file for 'retroshare' pkgname=retroshare version=0.6.1 -revision=2 +revision=3 build_style=qmake wrksrc="RetroShare-${version}" homepage="http://retroshare.github.io" @@ -12,6 +12,7 @@ hostmakedepends="pkg-config qt5-qmake" makedepends="qt5-tools-devel qt5-multimedia-devel qt5-x11extras-devel libressl-devel libssh-devel zlib-devel bzip2-devel sqlite-devel libopencv-devel libupnp-devel libgnome-keyring-devel libmicrohttpd-devel sqlcipher-devel - libXScrnSaver-devel libxslt-devel libcurl-devel ffmpeg-devel speex-devel" + libXScrnSaver-devel libxslt-devel libcurl-devel ffmpeg-devel speex-devel + pulseaudio-devel" distfiles="https://github.com/RetroShare/RetroShare/archive/v${version}.tar.gz" checksum=4ffbb6c61538f80d0f667c2a155c5eac38b0722a3e8d4f1dc1487d10087cfe42 diff --git a/srcpkgs/rhash-devel b/srcpkgs/rhash-devel new file mode 120000 index 00000000000..a4df32cd166 --- /dev/null +++ b/srcpkgs/rhash-devel @@ -0,0 +1 @@ +rhash \ No newline at end of file diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template index de517aa7627..5cadcf5625a 100644 --- a/srcpkgs/rhash/template +++ b/srcpkgs/rhash/template @@ -1,7 +1,7 @@ # Template file for 'rhash' pkgname=rhash version=1.3.4 -revision=1 +revision=2 wrksrc="RHash-${version}" build_style=gnu-makefile conf_files="/etc/rhashrc" @@ -11,6 +11,8 @@ license="RHash" homepage="https://github.com/rhash/RHash" distfiles="https://github.com/rhash/RHash/archive/v${version}.tar.gz" checksum=1f6daa0c066c94d2575f0aace76f34e5800c51f59f4b30029ddcfa9799564f98 +make_build_target="all lib-shared" +make_install_target="install install-lib-shared" post_extract() { sed -i 's/__GLIBC__/__linux__/' librhash/byte_order.h @@ -18,4 +20,15 @@ post_extract() { post_install() { vlicense COPYING + make -C librhash install-headers DESTDIR=$DESTDIR PREFIX=/usr + ln -s librhash.so.0 $DESTDIR/usr/lib/librhash.so +} + +rhash-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + } } diff --git a/srcpkgs/ripe-atlas-tools/template b/srcpkgs/ripe-atlas-tools/template index 5704a9b366d..b61539edca6 100644 --- a/srcpkgs/ripe-atlas-tools/template +++ b/srcpkgs/ripe-atlas-tools/template @@ -1,6 +1,6 @@ # Template file for 'ripe-atlas-tools' pkgname=ripe-atlas-tools -version=2.0.2 +version=2.1 revision=1 noarch=yes build_style=python3-module @@ -14,7 +14,7 @@ maintainer="johannes " license="GPL-3" homepage="https://github.com/ripe-ncc/ripe-atlas-tools" distfiles="https://github.com/ripe-ncc/${pkgname}/archive/v${version}.tar.gz" -checksum=994f095d79415d7e0df3dc6d5a8dd330161acd7b105eab42e7ae6e7a131b3c2e +checksum=32e22ea7c7e3e826a3b8d7a8d31f26e40a1abd95b152bb33a0809aeac8e545cb post_install() { vinstall ripe-atlas-bash-completion.sh 644 \ diff --git a/srcpkgs/ripgrep/template b/srcpkgs/ripgrep/template index 5a268627d70..81310c55e58 100644 --- a/srcpkgs/ripgrep/template +++ b/srcpkgs/ripgrep/template @@ -1,6 +1,6 @@ # Template file for 'ripgrep' pkgname=ripgrep -version=0.4.0 +version=0.5.1 revision=1 hostmakedepends="cargo rust" short_desc="Fast search tool inspired by ag and grep" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="Public Domain, MIT" homepage="https://github.com/BurntSushi/ripgrep/" distfiles="https://github.com/BurntSushi/${pkgname}/archive/${version}.tar.gz" -checksum=e93a6b59e38bc7912249175ab58ad7af0052a444b3c2c08a846fabba003414d6 +checksum=e0724d40f069580bac9f28cbf6005020fdc1b80e5d15fb69679d50ca341116f9 nocross=yes do_build() { diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template index c210c84e68f..ae2f8bde53c 100644 --- a/srcpkgs/rkt/template +++ b/srcpkgs/rkt/template @@ -7,7 +7,7 @@ hostmakedepends="automake wget cpio squashfs-tools bc gnupg git go" makedepends="acl-devel zlib-devel libressl-devel" depends="virtual?rkt-stage1" short_desc="App Container runtime for Linux" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://github.com/coreos/rkt" distfiles="$homepage/archive/v$version.tar.gz" diff --git a/srcpkgs/rlwrap/template b/srcpkgs/rlwrap/template index 764cb07f697..536945e2b18 100644 --- a/srcpkgs/rlwrap/template +++ b/srcpkgs/rlwrap/template @@ -1,18 +1,14 @@ # Template file for 'rlwrap' pkgname=rlwrap -version=0.42 -revision=4 +version=0.43 +revision=1 build_style=gnu-configure +python_version=3 makedepends="readline-devel" depends="perl" short_desc="Adds readline-style editing and history to programs" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-2" -homepage="http://utopia.knoware.nl/~hlub/uck/rlwrap/" -#distfiles="http://utopia.knoware.nl/~hlub/uck/rlwrap/$pkgname-$version.tar.gz" -distfiles="https://ftp.heanet.ie/mirrors/OpenBSD/distfiles/rlwrap-${version}.tar.gz" -checksum=5a70d8469db9d0a6630628f2d5d2972ad16c092400b7fbbdf699693ec0f87e44 - -pre_configure() { - sed -i '/file existence when cross compiling/s/as_fn_error/echo/' configure -} +homepage="https://github.com/hanslub42/rlwrap" +distfiles="https://github.com/hanslub42/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" +checksum=8e86d0b7882d9b8a73d229897a90edc207b1ae7fa0899dca8ee01c31a93feb2f diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template index fb987d4c51d..a1c14a2b038 100644 --- a/srcpkgs/rmilter/template +++ b/srcpkgs/rmilter/template @@ -1,17 +1,17 @@ # Template file for 'rmilter' pkgname=rmilter -version=1.8.6 +version=1.10.0 revision=1 build_style=cmake configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin" hostmakedepends="pkg-config bison flex" -makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel" +makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel" short_desc="Postfix/sendmail integration for rspamd" maintainer="John Regan " license="BSD" homepage="https://github.com/vstakhov/rmilter" distfiles="$homepage/archive/${version}.tar.gz" -checksum=dd00e10a6c5e2a7682bd81155f8cb09fbdbed0416e1c7ccc955a4338c85f144f +checksum=ea80563fa7636afed0b5fd9a29aa2300f15793ed85788e4ce69c187d341a7d54 system_accounts="rmilter" rmilter_homedir="/var/lib/rmilter" diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template index dd3ea106b7d..87c6045010e 100644 --- a/srcpkgs/rmlint/template +++ b/srcpkgs/rmlint/template @@ -7,7 +7,7 @@ hostmakedepends="scons pkg-config python3-Sphinx glib-devel" makedepends="libblkid-devel elfutils-devel json-glib-devel" pycompile_module="shredder" short_desc="Extremely fast tool to remove duplicates" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://rmlint.rtfd.org/" distfiles="https://github.com/sahib/$pkgname/archive/v$version.tar.gz" diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template index 83eb1cb281d..6e1e6330aa7 100644 --- a/srcpkgs/rng-tools/template +++ b/srcpkgs/rng-tools/template @@ -5,7 +5,7 @@ revision=5 build_style=gnu-configure makedepends="libgcrypt-devel" short_desc="Random number generator related utilities" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://sourceforge.net/projects/gkernel" distfiles="${SOURCEFORGE_SITE}/gkernel/${pkgname}-${version}.tar.gz" diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template index c07cfe00661..b6f07b9a63c 100644 --- a/srcpkgs/rocksndiamonds/template +++ b/srcpkgs/rocksndiamonds/template @@ -1,6 +1,6 @@ # Template file for 'rocksndiamonds' pkgname=rocksndiamonds -version=4.0.0.1 +version=4.0.0.2 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="http://www.artsoft.org/rocksndiamonds" distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=8649a450419d9cee2ffd9463cae65e7ebcbbf48c2cc945a85d91bbcdd9be3249 +checksum=64dd10e8e543a2ff111475243c8360f4009bcf186af34f4c95d36eafe836f637 do_build() { CFLAGS+=" -DTARGET_SDL" diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template index 95eaf4c01de..f78a30669a0 100644 --- a/srcpkgs/rpi-firmware/template +++ b/srcpkgs/rpi-firmware/template @@ -1,9 +1,9 @@ # Template file for 'rpi-firmware' -_githash="051aed71b1be697c5fec48a38df82cc3f91350af" +_githash="08abc0bd01367f141bc1858eae3b9e4e12d13272" _gitshort="${_githash:0:7}" pkgname=rpi-firmware -version=20160717 +version=20170427 revision=1 noarch=yes wrksrc="firmware-${_githash}" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="3-clause-BSD" homepage="https://github.com/raspberrypi/firmware" distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz" -checksum=32f30e5b1920724f911f01373d8c61cf5a99409b4db666bd56db4c0211279911 +checksum=d852990d9a742858a7a4aa47f9ea44c88ec7036dc80df6bffe3be0dea405ab07 conf_files="/boot/cmdline.txt /boot/config.txt" diff --git a/srcpkgs/rpi-userland/template b/srcpkgs/rpi-userland/template index 7a55c6a458a..935e08305fe 100644 --- a/srcpkgs/rpi-userland/template +++ b/srcpkgs/rpi-userland/template @@ -1,9 +1,9 @@ # Template file for 'rpi-firmware' -_githash="333cdee2ab1b236a5836c4dc419cfaf22c423ab9" +_githash="e022e802aab29f9f8af0d29d46536534d289fee3" _gitshort="${_githash:0:7}" pkgname=rpi-userland -version=20160717 +version=20170427 revision=1 wrksrc="userland-${_githash}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="Juan RP " license="3-clause-BSD" homepage="https://github.com/raspberrypi/userland" distfiles="https://github.com/raspberrypi/userland/archive/${_githash}.tar.gz" -checksum=70936addc928a02884b683344ca197d3763df564867f1b860227e1f32ff3ca9a +checksum=ae4fabb8b7bbde900fa5a03e075c0a7fb31e19ef38758baeeac88d915cc7f88a LDFLAGS="-Wl,--no-as-needed" only_for_archs="armv6l armv6l-musl armv7l armv7l-musl" diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template index 8fa682b7a96..9cd955149b2 100644 --- a/srcpkgs/rspamd/template +++ b/srcpkgs/rspamd/template @@ -1,6 +1,6 @@ # Template file for 'rspamd' pkgname=rspamd -version=1.4.4 +version=1.5.6 revision=1 build_style=cmake configure_args=" @@ -8,19 +8,17 @@ configure_args=" -DCONFDIR=/etc/rspamd -DDBDIR=/var/lib/rspamd" hostmakedepends="pkg-config perl ragel" -makedepends="LuaJIT-devel libressl-devel gmime-devel libevent-devel sqlite-devel hiredis-devel file-devel" +makedepends="LuaJIT-devel libressl-devel gmime-devel libevent-devel sqlite-devel + hiredis-devel file-devel icu-devel fann-devel gd-devel" short_desc="Fast, free and open-source spam filtering system" maintainer="Enno Boland " license="BSD" homepage="http://rspamd.com/" distfiles="http://rspamd.com/downloads/rspamd-${version}.tar.xz" -checksum=51342639dd1e50b235ae7fb2e877dee1d5b90c8102ce7ff817545fa0fb6ebc6d +checksum=cda2a5b93f0e57b890767514ce00a2660baf9d48627f7367a36fe938ade14f31 system_accounts="rspamd" rspamd_homedir="/var/lib/rspamd" conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf" -case "$XBPS_TARGET_MACHINE" in - armv*) broken="https://build.voidlinux.eu/builders/armv6l_builder/builds/29680/steps/shell_3/logs/stdio" ;; -esac if [ "$CROSS_BUILD" ]; then hostmakedepends+=" $makedepends" diff --git a/srcpkgs/rstudio/patches/r-3.4.0.patch b/srcpkgs/rstudio/patches/r-3.4.0.patch new file mode 100644 index 00000000000..696bfddc421 --- /dev/null +++ b/srcpkgs/rstudio/patches/r-3.4.0.patch @@ -0,0 +1,10 @@ +--- src/cpp/r/RRoutines.cpp.orig 2017-04-13 16:16:15.000000000 +0000 ++++ src/cpp/r/RRoutines.cpp 2017-04-23 08:48:22.700317995 +0000 +@@ -59,7 +59,6 @@ + nullMethodDef.fun = NULL ; + nullMethodDef.numArgs = 0 ; + nullMethodDef.types = NULL; +- nullMethodDef.styles = NULL; + s_cMethods.push_back(nullMethodDef); + pCMethods = &s_cMethods[0]; + } diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index d02987c96dc..8941b8318a7 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -1,7 +1,7 @@ # Template file for 'rstudio' pkgname=rstudio -version=1.0.136 -revision=1 +version=1.0.143 +revision=2 only_for_archs="i686 x86_64" build_style=cmake make_install_args="INSTALL_ROOT=${DESTDIR} \ @@ -36,7 +36,7 @@ distfiles="https://github.com/rstudio/rstudio/archive/v${version}.tar.gz ${_aws}/rstudio-buildtools/selenium-java-${_selenium_version}.zip ${_aws}/rstudio-buildtools/selenium-server-standalone-${_selenium_version}.jar ${_aws}/rstudio-buildtools/chromedriver-linux" -checksum="bb6a8aa475e09dd090cd2b5ea505f578d270858784120599aee5c10bd8ca58e8 +checksum="8ae88731b4474e5e2ff9030aa14e168903fe3a7ffc4fa716f497084a86801062 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94 aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3 diff --git a/srcpkgs/rstudio/update b/srcpkgs/rstudio/update index e21ed7b39e2..ef085c03c71 100644 --- a/srcpkgs/rstudio/update +++ b/srcpkgs/rstudio/update @@ -1,2 +1,2 @@ site="https://www.rstudio.com/products/rstudio/download/" -pattern="RStudio Desktop \K[\d.]+(?=)" +pattern="RStudio Desktop \K[\d.]+[\d]+(?=)" diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index e4c4c169425..1b7159b49bb 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,6 +1,6 @@ # Template file for 'rsyslog' pkgname=rsyslog -version=8.24.0 +version=8.26.0 revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin @@ -15,7 +15,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.rsyslog.com" distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz" -checksum=37f32ce33e32a88e1bea0511e8e557d90b7378b81520e3236a9af5ba6ea993d7 +checksum=637d43c4384f8b96dda873a0b8384045f72cb43139808dadd9e0a94dccf25916 lib32disabled=yes disable_parallel_build=yes diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template index 6b7023ded83..0c4831f6ea0 100644 --- a/srcpkgs/rtmpdump/template +++ b/srcpkgs/rtmpdump/template @@ -1,7 +1,7 @@ # Template file for 'rtmpdump' pkgname=rtmpdump version=2.4.20161210 -revision=1 +revision=3 _patchlevel=${version##*.} create_wrksrc=yes makedepends="zlib-devel libressl-devel" @@ -11,11 +11,11 @@ homepage="http://rtmpdump.mplayerhq.hu/" license="GPL-2, LGPL-2.1" distfiles="http://dev.gentoo.org/~hwoarang/distfiles/${pkgname}-${version%.*}_p${_patchlevel}.tar.gz" checksum=d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f -case "$XBPS_TARGET_MACHINE" in - aarch64-musl) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/1409/steps/shell_3/logs/stdio" ;; -esac CFLAGS="-Wno-unused-const-variable -Wno-unused-but-set-variable" +case "$XBPS_TARGET_MACHINE" in + *-musl) CFLAGS+=" -D__LINUX_NETFILTER_H" +esac do_build() { make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" ${makejobs} diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index 47be8e20da2..cba5e28515c 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -2,8 +2,8 @@ _ruby_abiver=2.4.0 pkgname=ruby -version=2.4.0 -revision=1 +version=2.4.1 +revision=2 build_style=gnu-configure configure_args="--enable-shared --disable-rpath DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config" @@ -13,7 +13,7 @@ homepage="http://www.ruby-lang.org/en/" maintainer="Leah Neukirchen " license="BSD" distfiles="ftp://ftp.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=440bbbdc49d08d3650f340dccb35986d9399177ad69a204def56e5d3954600cf +checksum=ccfb2d0a61e2a9c374d51e099b0d833b09241ee78fc17e1fe38e3b282160237c hostmakedepends="pkg-config bison groff doxygen graphviz" makedepends="zlib-devel readline-devel libffi-devel libressl-devel diff --git a/srcpkgs/run-parts/template b/srcpkgs/run-parts/template index dffc6b03cdf..c0acfd4b449 100644 --- a/srcpkgs/run-parts/template +++ b/srcpkgs/run-parts/template @@ -1,6 +1,6 @@ # Template file for 'run-parts' pkgname=run-parts -version=4.8.1 +version=4.8.1.1 revision=1 bootstrap=yes build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="https://tracker.debian.org/pkg/debianutils" license="GPL-2" distfiles="${DEBIAN_SITE}/main/d/debianutils/debianutils_${version}.tar.xz" -checksum=2c395c0bdcfe89de30828b1d25cc5549ded5225a6d3625fbcb2cc0881ef5f026 +checksum=06446cd4c0d309fd31a0682c5c2f07f7613fb867f769414b9cc51f155ad73172 do_install() { vbin run-parts diff --git a/srcpkgs/runit-swap/template b/srcpkgs/runit-swap/template index ceed6c0d4a0..45256f49c13 100644 --- a/srcpkgs/runit-swap/template +++ b/srcpkgs/runit-swap/template @@ -6,7 +6,7 @@ build_style=meta depends="runit bash util-linux>=2.26" hostmakedepends="git" short_desc="Script to manage swapspaces" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://github.com/thypon/runit-swap" conf_files="/etc/runit/swap.conf" diff --git a/srcpkgs/rust/patches/cargo.patch b/srcpkgs/rust/patches/cargo.patch new file mode 100644 index 00000000000..5f1febd4c77 --- /dev/null +++ b/srcpkgs/rust/patches/cargo.patch @@ -0,0 +1,20 @@ +--- rustc-1.16.0-src/src/tools/rustbook/Cargo.toml.orig ++++ rustc-1.16.0-src/src/tools/rustbook/Cargo.toml +@@ -2,7 +2,6 @@ + authors = ["The Rust Project Developers"] + name = "rustbook" + version = "0.0.0" +-build = false + + [[bin]] + name = "rustbook" +--- rustc-1.16.0-src/src/librustc_plugin/Cargo.toml.orig ++++ rustc-1.16.0-src/src/librustc_plugin/Cargo.toml +@@ -2,7 +2,6 @@ + authors = ["The Rust Project Developers"] + name = "rustc_plugin" + version = "0.0.0" +-build = false + + [lib] + name = "rustc_plugin" diff --git a/srcpkgs/rust/patches/dont-require-filecheck.patch b/srcpkgs/rust/patches/dont-require-filecheck.patch index 86ecee4a9c2..b9ba5d38f71 100644 --- a/srcpkgs/rust/patches/dont-require-filecheck.patch +++ b/srcpkgs/rust/patches/dont-require-filecheck.patch @@ -1,15 +1,15 @@ ---- rustc-1.13.0/src/bootstrap/sanity.rs -+++ rustc-1.13.0/src/bootstrap/sanity.rs -@@ -93,12 +93,6 @@ - need_cmd(build.cxx(host).as_ref()); +--- rustc-1.16.0-src/src/bootstrap/sanity.rs.orig ++++ rustc-1.16.0-src/src/bootstrap/sanity.rs +@@ -144,12 +144,6 @@ + } } - // Externally configured LLVM requires FileCheck to exist - let filecheck = build.llvm_filecheck(&build.config.build); - if !filecheck.starts_with(&build.out) && !filecheck.exists() && build.config.codegen_tests { -- panic!("filecheck executable {:?} does not exist", filecheck); +- panic!("FileCheck executable {:?} does not exist", filecheck); - } - for target in build.config.target.iter() { - // Either can't build or don't want to run jemalloc on these targets - if target.contains("rumprun") || + // Can't compile for iOS unless we're on OSX + if target.contains("apple-ios") && diff --git a/srcpkgs/rust/patches/link-musl-dynamically.patch b/srcpkgs/rust/patches/link-musl-dynamically.patch index 457616c6d53..95917fe6516 100644 --- a/srcpkgs/rust/patches/link-musl-dynamically.patch +++ b/srcpkgs/rust/patches/link-musl-dynamically.patch @@ -1,16 +1,25 @@ ---- a/src/bootstrap/compile.rs -+++ b/src/bootstrap/compile.rs -@@ -89,10 +89,6 @@ - t!(fs::create_dir_all(&libdir)); - } +--- rustc-1.16.0-src/src/bootstrap/compile.rs.orig ++++ rustc-1.16.0-src/src/bootstrap/compile.rs +@@ -93,19 +93,6 @@ + + t!(fs::create_dir_all(&libdir)); add_to_sysroot(&out_dir, &libdir); - - if target.contains("musl") && !target.contains("mips") { - copy_musl_third_party_objects(build, target, &libdir); +- } +-} +- +-/// Copies the crt(1,i,n).o startup objects +-/// +-/// Only required for musl targets that statically link to libc +-fn copy_musl_third_party_objects(build: &Build, target: &str, into: &Path) { +- for &obj in &["crt1.o", "crti.o", "crtn.o"] { +- copy(&build.musl_root(target).unwrap().join("lib").join(obj), &into.join(obj)); - } } - /// Copies the crt(1,i,n).o startup objects + /// Build and prepare startup objects like rsbegin.o and rsend.o --- a/src/bootstrap/sanity.rs +++ b/src/bootstrap/sanity.rs @@ -132,27 +132,6 @@ diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index ca2fa66ad35..9b1ea1f732d 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -1,6 +1,6 @@ # Template file for 'rust' pkgname=rust -version=1.15.1 +version=1.16.0 revision=1 # NB. if you push any(!) new version, don't forget to put a build # output of musl to https://repo.voidlinux.eu/distfiles/ @@ -17,39 +17,39 @@ maintainer="Leah Neukirchen " homepage="http://www.rust-lang.org/" license="MIT, Apache-2.0" distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz" -checksum=2e7daad418a830b45b977cd7ecf181b65f30f73df63ff36e124ea5fe5d1af327 +checksum=f966b31eb1cd9bd2df817c391a338eeb5b9253ae0a19bf8a11960c560f96e8b4 case "$XBPS_MACHINE" in x86_64-musl) distfiles+=" - https://repo.voidlinux.eu/distfiles/rustc-1.14.0-x86_64-unknown-linux-musl.tar.gz - https://repo.voidlinux.eu/distfiles/rust-std-1.14.0-x86_64-unknown-linux-musl.tar.gz + https://repo.voidlinux.eu/distfiles/rustc-1.15.1-x86_64-unknown-linux-musl.tar.gz + https://repo.voidlinux.eu/distfiles/rust-std-1.15.1-x86_64-unknown-linux-musl.tar.gz https://alpine.geeknet.cz/distfiles/cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz" checksum+=" - 0976d4d64a4b6c61d0706239880ec8c35cb4a3c46919474019c2e1d51900222b - 51147baa27f5eef372fe946f695df3f269ede92559ac3e519a794397c0fff347 + e7518b083cfa871ff84b589db754ebf9cbf727e3be37e6df4169056c9b34b45e + ac65873446807038df761ba94e00ba5aaa51efd379a69b938102773cbad7f2dc 587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9" ;; x86_64) # extract from src/stage0.txt distfiles+=" - https://static.rust-lang.org/dist/2016-12-18/rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz - https://static.rust-lang.org/dist/2016-12-18/rust-std-1.14.0-x86_64-unknown-linux-gnu.tar.gz - https://static.rust-lang.org/cargo-dist/2016-11-28/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" + https://static.rust-lang.org/dist/2017-02-09/rustc-1.15.1-x86_64-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/dist/2017-02-09/rust-std-1.15.1-x86_64-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/cargo-dist/2016-11-26/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" checksum+=" - 3df0ba1f65366e9220788b13ff0b91a2c3e46bfde196d54b233038157d040a9e - 08f8cde5c305ba22052871292336d63cb493cbf38bb050ab0b8496a3536cac1c - 8ecf9bca3ece59ee291afda5fd8c371739d0d52771912c5da0d909fd9d130b3f" + 33ff44672b731fc71145974ce84194a1a9bafe6da3a74fd1e7543f12467f8894 + 69b251b478e284dfcaefc1153183f26f41d504ae213a81224f2101d8dbd52bb0 + 4a76ae206dba572e3de3f2fd7b906b42866ca4fd5f929a6f52d38579d2794e61" ;; i686) # extract from src/stage0.txt distfiles+=" - https://static.rust-lang.org/dist/2016-12-18/rustc-1.14.0-i686-unknown-linux-gnu.tar.gz - https://static.rust-lang.org/dist/2016-12-18/rust-std-1.14.0-i686-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/dist/2017-02-09/rustc-1.15.1-i686-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/dist/2017-02-09/rust-std-1.15.1-i686-unknown-linux-gnu.tar.gz https://static.rust-lang.org/cargo-dist/2016-11-28/cargo-nightly-i686-unknown-linux-gnu.tar.gz" checksum+=" - af22508823865245dc1c451d79679c33898092573608017b5b4b764b1dfe205e - 6ddbcb00893645d9c06ef2f82d60e516e618cfed03abe6deb0a18be7914d3394 + a833304f99071600c72ecd868c1c7bd5ce49d1102332637a8eb7adb942f349ab + eff452a54b208a83b35432f226cb7de046d27b5e43edfc31d71ff340af686db0 8fb0cacdd2ab32b8dbdf74ae63914e1f97baf8bac0e8c1db1414a57677b93f88" ;; esac diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template index 3bfe10c0289..e7198539e40 100644 --- a/srcpkgs/rygel/template +++ b/srcpkgs/rygel/template @@ -1,6 +1,6 @@ # Template file for 'rygel' pkgname=rygel -version=0.32.1 +version=0.34.0 revision=1 build_style=gnu-configure configure_args="--enable-gst-launch-plugin" @@ -8,15 +8,15 @@ hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel vala-devel gobject-introspection" makedepends="sqlite-devel gtk+3-devel libsoup-devel libgee08-devel gupnp-av-devel - gupnp-dlna-devel tracker-devel libmediaart2-devel" + gupnp-dlna-devel tracker-devel libmediaart-devel" depends="hicolor-icon-theme desktop-file-utils" conf_files="/etc/rygel.conf" short_desc="GNOME home media solution" maintainer="Juan RP " -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Projects/Rygel" license="GPL-2" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=94300e7349e7d161fc8b2d42cd4d5ac4d161362b81f58f126abd98d000f9d2c8 +checksum=fbb2d46cbe4e750df6610b4c66b2278f06d1f71a257c7903e676ccb394dad418 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template index aa0325a884a..bcca17e734d 100644 --- a/srcpkgs/s-nail/template +++ b/srcpkgs/s-nail/template @@ -1,7 +1,7 @@ # Template file for 's-nail' pkgname=s-nail version=14.8.16 -revision=1 +revision=2 makedepends="libressl-devel libidn-devel" conf_files="/etc/s-nail.rc" short_desc="Mail processing system with a command syntax reminiscent of ed" diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template index 44dc79efa8a..f63267a85c0 100644 --- a/srcpkgs/s3fs-fuse/template +++ b/srcpkgs/s3fs-fuse/template @@ -1,7 +1,7 @@ # Template file for 's3fs-fuse' pkgname=s3fs-fuse version=1.80 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-openssl ac_cv_file__git=no" hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template index 273127aac15..bb49cec425d 100644 --- a/srcpkgs/s6-dns/template +++ b/srcpkgs/s6-dns/template @@ -1,6 +1,6 @@ # Template file for 's6-dns' pkgname=s6-dns -version=2.1.0.0 +version=2.2.0.0 revision=1 build_style=gnu-configure makedepends="execline-devel skalibs-devel" @@ -10,7 +10,7 @@ maintainer="lemmi " license="ISC" homepage="http://skarnet.org/software/${pkgname}/" distfiles="http://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=8455f3b1edad8f01a1340cb1242c141755729bfd5d71059739eced5c006539ad +checksum=06856745aa034a1655b7d8226a4b235579b098c58b6009d92151dedd41b15fc2 post_install() { vlicense COPYING diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template index b581df7b5cd..34fd32d07a7 100644 --- a/srcpkgs/s6-networking/template +++ b/srcpkgs/s6-networking/template @@ -1,7 +1,7 @@ # Template file for 's6-networking' pkgname=s6-networking -version=2.2.1.0 -revision=1 +version=2.3.0.0 +revision=2 build_style=gnu-configure makedepends="execline-devel libressl-devel skalibs-devel s6-devel s6-dns-devel" configure_args="--libdir=/usr/lib --enable-ssl=libressl" @@ -10,7 +10,7 @@ maintainer="lemmi " license="ISC" homepage="http://skarnet.org/software/${pkgname}/" distfiles="http://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=5d8150d7413b335693c6e63092381dd0866b1b6f95662a2cbae5ec17ca449ab0 +checksum=1a21d6f3e29eaa50a8de8cddd1e60372fb36c024f2a0c1afc4c9b704b4e3e6dd post_install() { vlicense COPYING diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template index 2b5180478d4..8f9c1d34502 100644 --- a/srcpkgs/s6/template +++ b/srcpkgs/s6/template @@ -1,6 +1,6 @@ # Template file for 's6' pkgname=s6 -version=2.4.0.0 +version=2.5.0.0 revision=1 build_style=gnu-configure makedepends="execline-devel skalibs-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="ISC" homepage="http://skarnet.org/software/s6/" distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz" -checksum=5e788d5935dbcce76ac9a99cfcf6ee46a2ffb84220c84225df7589e9a3585560 +checksum=11413aea4add3aea2d0f3f7515d274ac58d4adfb03661a1f6ce7fa2abd24dab1 post_install() { vlicense COPYING diff --git a/srcpkgs/sabnzbd/template b/srcpkgs/sabnzbd/template index bcecb8a0e40..e76acfc21d3 100644 --- a/srcpkgs/sabnzbd/template +++ b/srcpkgs/sabnzbd/template @@ -1,18 +1,18 @@ # Template file for 'sabnzbd' pkgname=sabnzbd -version=1.2.2 +version=1.2.3 revision=1 wrksrc="SABnzbd-${version}" depends="par2cmdline python-cheetah python-configobj python-feedparser python-gntp python-openssl python-yenc unzip" -maintainer="Leah Neukirchen " +maintainer="Orphaned " # sabnzbd itself is GPL, but it bundles libraries that are covered by # BSD, LGPL-2 and MIT. In combination, that makes this package GPL. license="GPL-2" homepage="http://sabnzbd.org/" short_desc="Open Source Binary Newsreader written in Python" distfiles="https://github.com/sabnzbd/sabnzbd/releases/download/${version}/SABnzbd-${version}-src.tar.gz" -checksum=0565ea3384f2f876c22ad0c07b96670fcb2514aefc73c47e315bb2d7b281c6c0 +checksum=a0100d19edd9c6b528f79214a64690941281758048e4ead6671446070e1e9e24 noarch=yes pycompile_dirs="/usr/share/sabnzbd" diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template index b1065c25d88..9ba4d1d69be 100644 --- a/srcpkgs/salt/template +++ b/srcpkgs/salt/template @@ -1,6 +1,6 @@ # Template file for 'salt' pkgname=salt -version=2016.11.3 +version=2016.11.4 revision=1 build_style=python2-module noarch=yes @@ -16,7 +16,7 @@ maintainer="Toyam Cox " license="Apache-2.0" homepage="http://saltstack.org/" distfiles="$PYPI_SITE/s/salt/salt-${version}.tar.gz" -checksum=9d5849f38a858288ebc6ef790ced86ae724e61b06e3ee27e6cecf3f6c1ecbc51 +checksum=fb4109b28d3fd898291c162e42ef843fbd4c3e57244075670fa8f366e705765f post_install() { vmkdir /etc/salt 0750 diff --git a/srcpkgs/sam2p/patches/cpp11.patch b/srcpkgs/sam2p/patches/cpp11.patch new file mode 100644 index 00000000000..70d3373311c --- /dev/null +++ b/srcpkgs/sam2p/patches/cpp11.patch @@ -0,0 +1,101 @@ +--- minips.cpp.orig ++++ minips.cpp +@@ -292,9 +292,9 @@ + void MiniPS::Real::dump(GenBuffer::Writable &out_, bool dumpPS_force) { + char buf[64]; /* Imp: should be enough?? */ + if (metric!=0 && (dumpPS_force || dumpPS)) { +- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g%s", d, me_psfactor[metric]); ++ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g%s", d, me_psfactor[metric]); + } else { +- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d*me_factor[metric]); ++ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d*me_factor[metric]); + } + out_ << buf; + } +@@ -1044,7 +1044,7 @@ + } else { + d = d < 0 ? 72.0 / -d : d / 72.0; + char buf[64]; /* Dat: enough */ +- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d); ++ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d); + out << buf; + } + } +@@ -1093,7 +1093,7 @@ + out << (rounding>=2 && ll<0 ? 0 : ll); + } else { + char buf[64]; /* Dat: enough */ +- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d); ++ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d); + out << buf; + } + } +--- ps_tiny.c.orig ++++ ps_tiny.c +@@ -151,7 +151,7 @@ + } + + static void erri(char const*msg1, char const*msg2) { +- fprintf(stderr, "%s: error at %"SLEN_P"u.%"SLEN_P"u.%"SLEN_P"u: %s%s\n", ++ fprintf(stderr, "%s: error at %" SLEN_P "u.%" SLEN_P "u.%" SLEN_P "u: %s%s\n", + PROGNAME, curline, curofs-leftofs+1, curofs, msg1, msg2?msg2:""); + exit(3); + } +@@ -230,7 +230,7 @@ + /** @param b: assume null-terminated @return true on error */ + static /*inline*/ sbool toInteger(char *s, psint_t *ret) { + int n=0; /* BUGFIX?? found by __CHECKER__ */ +- return sscanf(s, "%"SLEN_P"i%n", ret, &n)<1 || s[n]!='\0'; ++ return sscanf(s, "%" SLEN_P "i%n", ret, &n)<1 || s[n]!='\0'; + } + + /** @param b: assume null-terminated @return true on error */ +@@ -700,7 +700,7 @@ + getotag("Abbr"); + getkey("acount"); acount=getuintval(); + getkey("xcount"); xcount=getuintval(); +- sprintf(tmp,"%"SLEN_P"u dict%%", acount+xcount); ++ sprintf(tmp,"%" SLEN_P "u dict%%", acount+xcount); + setifmt(tmp,0); copy("I"); noifmt(); + gettagbeg(); + +--- gensio.cpp.orig ++++ gensio.cpp +@@ -494,7 +494,7 @@ + + #if HAVE_PTS_POPEN + if (!tmpsname) { +- if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; ++ if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; + signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */ + } else { + #else +@@ -622,7 +622,7 @@ + if (state==0) { /* Read the whole stream from `in', write it to `tmpsname' */ + #if HAVE_PTS_POPEN + if (!tmpsname) { +- if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; ++ if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; + signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */ + vi_precopy(); + in.vi_read(0,0); +--- in_ps.cpp.orig ++++ in_ps.cpp +@@ -137,7 +137,7 @@ + // fprintf(stderr, "bbox=[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]\n", llx, lly, urx, ury); + /* Dat: we must call translate _after_ setpagedevice (so it will take effect), at least with ESP Ghostscript 7.05.6 (2003-02-05); BUGFIX at Fri Aug 12 22:49:07 CEST 2005 */ + sprintf(bboxline, +- "<>setpagedevice\n" ++ "<>setpagedevice\n" + /* removing /PageSize also cancels /a4, /a5 etc. */ + /* we need `currentmatrix ... setpagedevice setmatrix' because + * setpagedevice cancels the current transformation matrix so our +@@ -147,7 +147,7 @@ + "/setpagedevice{matrix currentmatrix exch " + "dup length dict copy dup /PageSize undef setpagedevice " + "setmatrix}bind def\n" +- "%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g translate\n" ++ "%" PTS_CFG_PRINTFGLEN "g %" PTS_CFG_PRINTFGLEN "g translate\n" + , urx-llx, ury-lly, -llx, -lly); + } else { + Error::sev(Error::WARNING) << "in_eps_reader: missing EPS bbox" << (Error*)0; diff --git a/srcpkgs/sam2p/template b/srcpkgs/sam2p/template new file mode 100644 index 00000000000..69605120c5e --- /dev/null +++ b/srcpkgs/sam2p/template @@ -0,0 +1,24 @@ +# Template file for 'sam2p' +pkgname=sam2p +version=0.49.3 +revision=1 +build_style=gnu-configure +hostmakedepends="perl" +depends="perl" +short_desc="Raster image converter with smart PDF and PostScript output" +maintainer="Leah Neukirchen " +license="GPL-2" +homepage="https://github.com/pts/sam2p" +distfiles="https://github.com/pts/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" +checksum=33b1bf018a19b19c30d41defcb8b20c7cdcbc7ddd7703040c3a54d9cb1fcaaea +nocross=yes + +LDFLAGS="-fPIC" + +post_extract() { + sed -i '/^CXXFLAGS=/d' configure +} +do_install() { + vbin sam2p + vdoc README +} diff --git a/srcpkgs/sbcl/patches/musl-fixes.patch b/srcpkgs/sbcl/patches/musl-fixes.patch index 3be0dd27541..cfd18746a40 100644 --- a/srcpkgs/sbcl/patches/musl-fixes.patch +++ b/srcpkgs/sbcl/patches/musl-fixes.patch @@ -63,10 +63,11 @@ #define QSHOW_BLOCK \ --- src/runtime/wrap.c 2016-11-30 08:07:36.000000000 +1100 +++ src/runtime/wrap.c 2016-12-23 22:02:15.792123225 +1100 -@@ -35,6 +35,9 @@ +@@ -35,7 +35,10 @@ #include #include #include + #include +#ifndef __GLIBC__ +#include +#endif diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index 17fc0401833..e4f1dbdce98 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -1,6 +1,6 @@ # Template file for 'sbcl' pkgname=sbcl -version=1.3.15 +version=1.3.17 revision=1 only_for_archs="x86_64 x86_64-musl armv7l aarch64" hostmakedepends="iana-etc" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="custom" homepage="http://www.sbcl.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2" -checksum=b1b532d9df81b6a014dd6463f9129cd9470ba84db0952496970ac5b1e745ab85 +checksum=94b9f576328de3a5d9ced452fdaa4d2f55437af8838fbbfb4f226c86591a0daf nocross=yes nopie=yes @@ -19,7 +19,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d case "$XBPS_TARGET_MACHINE" in x86_64) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2" - checksum+=" c7a9f143d539164abdf8771fbef071e5f1b26a5ecd496ddb4d778946faf758fe" + checksum+=" d782a1b6f0666b26c9e7c2487bbb1c542c5c597627f1ead3d6692970df369987" ;; i686) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.7-x86-linux-binary.tar.bz2" diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template index 18af235f854..4e428b08280 100644 --- a/srcpkgs/sc-im/template +++ b/srcpkgs/sc-im/template @@ -1,30 +1,25 @@ # Template file for 'sc-im' pkgname=sc-im -version=0.5.0 +version=0.6.0 revision=2 build_wrksrc="src" build_style=gnu-makefile +make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader" make_install_args="prefix=/usr" -hostmakedepends="bison" -makedepends="libxls-devel libxml2-devel libzip-devel ncurses-devel" +hostmakedepends="bison pkg-config" +makedepends="libxls-devel libxml2-devel libzip-devel lua51-devel ncurses-devel" depends="less" short_desc="SpreadSheet Calculator (sc) Improvised" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="4-clause-BSD" homepage="https://github.com/andmarti1424/sc-im/" distfiles="https://github.com/andmarti1424/${pkgname}/archive/v${version}.tar.gz" -checksum=d7a31c5225e02239e925b50b414d7e69d12bc3554f218621823782872ccc5e4d +checksum=5da644d380ab3752de283b83cce18c3ba12b068d0762c44193c34367a0dcbc38 post_extract() { - sed -i 's,= 0x10100000L ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + #define USE_OPENSSL_1_1_API + #endif + diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template index 174fba1c813..469bb805ee4 100644 --- a/srcpkgs/serf/template +++ b/srcpkgs/serf/template @@ -1,15 +1,16 @@ # Template file for 'serf' pkgname=serf -version=1.3.8 -revision=10 -hostmakedepends="unzip scons" +version=1.3.9 +revision=3 +nocross=yes +hostmakedepends="scons libressl-devel apr-util-devel" makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel" short_desc="High-performance asynchronous HTTP client library" maintainer="Juan RP " license="Apache-2.0" homepage="http://serf.apache.org" distfiles="https://archive.apache.org/dist/serf/serf-${version}.tar.bz2" -checksum=e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590 +checksum=549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc do_build() { scons ${makejobs} CC="$CC" CFLAGS="$CFLAGS" PREFIX=/usr diff --git a/srcpkgs/serf/update b/srcpkgs/serf/update deleted file mode 100644 index 2aa9adad6d0..00000000000 --- a/srcpkgs/serf/update +++ /dev/null @@ -1 +0,0 @@ -site="http://serf.googlecode.com/svn/src_releases/" diff --git a/srcpkgs/shadow/patches/fix-suidubins-assignments.patch b/srcpkgs/shadow/patches/fix-suidubins-assignments.patch new file mode 100644 index 00000000000..0425dc563ed --- /dev/null +++ b/srcpkgs/shadow/patches/fix-suidubins-assignments.patch @@ -0,0 +1,31 @@ +From 61abb4645cb0c4911eea0a7ce63a9c7d37cabe8f Mon Sep 17 00:00:00 2001 +From: Wolfgang Bumiller +Date: Sat, 5 Nov 2016 15:51:13 +0100 +Subject: [PATCH] buildsys: fix suidubins assignments + +These assignments were pasted as is into the Makefile and +ended up as part of a rule. (Usually the .PRECIOUS rule +which is why the build system never attempted to execute it +as commands, hiding the problem.) + +Signed-off-by: Wolfgang Bumiller +Reported-by: Rahel A +--- + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- src/Makefile.am.orig ++++ src/Makefile.am +@@ -54,10 +54,10 @@ noinst_PROGRAMS = id sulogin + suidbins = su + suidubins = chage chfn chsh expiry gpasswd newgrp passwd + if ACCT_TOOLS_SETUID +- suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod ++suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod + endif + if ENABLE_SUBIDS +- suidubins += newgidmap newuidmap ++suidubins += newgidmap newuidmap + endif + + if WITH_TCB diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template index 3b55cb9bfea..18d20187308 100644 --- a/srcpkgs/shadow/template +++ b/srcpkgs/shadow/template @@ -1,7 +1,7 @@ # Template file for 'shadow' pkgname=shadow version=4.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--bindir=/usr/bin --sbindir=/usr/bin --libdir=/usr/lib --enable-shared --disable-static diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template index 16da5b142f4..f16b9ee4955 100644 --- a/srcpkgs/shellcheck/template +++ b/srcpkgs/shellcheck/template @@ -1,6 +1,6 @@ # Template file for 'shellcheck' pkgname=shellcheck -version=0.4.5 +version=0.4.6 revision=1 hostmakedepends="cabal-install" short_desc="A static analysis tool for shell scripts" @@ -8,7 +8,7 @@ maintainer="Diogo Leal " license="GPL-3" homepage="http://www.shellcheck.net/" distfiles="https://github.com/koalaman/shellcheck/archive/v${version}.tar.gz" -checksum=b9d34cd8aa88e2b278bd0df5009c18e84ff08a629b6e95c6b031236199232893 +checksum=1c3cd8995ebebf6c8e5475910809762b91bebf0a3827ad87a0c392c168326de2 nocross=yes nopie=yes diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template index 9d125735a31..5b6087a01ee 100644 --- a/srcpkgs/shfmt/template +++ b/srcpkgs/shfmt/template @@ -1,6 +1,6 @@ # Template file for 'shfmt' pkgname=shfmt -version=1.2.0 +version=1.3.0 revision=1 build_style=go go_import_path="github.com/mvdan/sh" @@ -11,7 +11,7 @@ maintainer="Michael Gehring " license="BSD" homepage="https://github.com/mvdan/sh" distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz" -checksum=3d2973f1adf99fcf65baae3c85697313a782dbedc2600fedb28687541a20ed43 +checksum=e1c2ad59e18e9a0af4bfb3f75c9b1c783877f2bcf839784b5bf488bb36b80bf7 post_install() { vlicense LICENSE diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template index c650e1a245e..e1664e4c3d4 100644 --- a/srcpkgs/shorewall/template +++ b/srcpkgs/shorewall/template @@ -1,15 +1,15 @@ # Template file for 'shorewall' pkgname=shorewall -version=5.0.15.3 +version=5.1.3.2 revision=1 -_disturl="http://www.shorewall.net/pub/${pkgname}/${version:0:3}/${pkgname}-${version:0:6}" +_disturl="http://www.shorewall.net/pub/${pkgname}/${version:0:3}/${pkgname}-${version:0:5}" distfiles=" ${_disturl}/${pkgname}-${version}.tar.bz2 ${_disturl}/${pkgname}6-${version}.tar.bz2 ${_disturl}/${pkgname}-core-${version}.tar.bz2" -checksum="c71c42e9697057b39ae27593725d2fcc5829cc8eab78ef2109a1f16ed89534db - 79b91e33b24ac620a682e91c48ca18590dbac33e36c0fea37bdb2b1f3db47d7e - 0d174d9aabd3608e000a4536470b35d15a856d7394f5e8bd22ef410d8501b989" +checksum="6576014971f83d1d90aa5e03f7d1dc7eaacf23efb70ec8525f2f28859c25bcbd + f797f916f6760c9adbef7e15ff4257662a9b352c7848bd7ba0b723a2bad360ee + 501b283ce6643647e6e7dfc352b014dcf43650199892917fc7effda3aa00c4b3" depends="shorewall-core perl" maintainer="Juan RP " homepage="http://www.shorewall.net/" diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template index 48b0b58b6d1..8effd41dbe2 100644 --- a/srcpkgs/shotwell/template +++ b/srcpkgs/shotwell/template @@ -1,6 +1,6 @@ # Template file for 'shotwell' pkgname=shotwell -version=0.24.5 +version=0.26.1 revision=1 lib32disabled=yes nocross=yes @@ -11,11 +11,11 @@ hostmakedepends="pkg-config m4 gnome-doc-utils makedepends="gnome-doc-utils vala-devel libgee08-devel libraw-devel libgphoto2-devel libgexiv2-devel libunique-devel rest-devel sqlite-devel gtk+3-devel webkit2gtk-devel libgudev-devel json-glib-devel - gst-plugins-base1-devel" + gst-plugins-base1-devel gcr-devel libgdata-devel" depends="hicolor-icon-theme desktop-file-utils" short_desc="Open source photo manager for GNOME" maintainer="Juan RP " license="LGPL-2.1" homepage="https://wiki.gnome.org/Apps/Shotwell" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=4936c2c8c63b701ac0cf15b7bd6619ee3241a6d08b4187f2475348642ff9c1fd +checksum=0a60cc8a132fd962ed8c73f82b3f8ad7cbf1014bb93e89eee83e5c9a8c0b5375 diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template index c5fddb6f2e5..8bb857fae75 100644 --- a/srcpkgs/sift/template +++ b/srcpkgs/sift/template @@ -1,11 +1,11 @@ # Template file for 'sift' pkgname=sift version=0.9.0 -revision=3 +revision=4 build_style=go hostmakedepends="git-perl" short_desc="A fast and powerful open source alternative to grep" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" go_import_path="github.com/svent/sift" homepage="https://$go_import_path" diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template index cb15823bec1..20402498533 100644 --- a/srcpkgs/sigil/template +++ b/srcpkgs/sigil/template @@ -1,7 +1,7 @@ # Template file for 'sigil' pkgname=sigil -version=0.9.7 -revision=3 +version=0.9.8 +revision=1 create_wrksrc=yes build_style=cmake # Can use system zlib, minizip and hunspell; can't use system pcre @@ -18,7 +18,7 @@ maintainer="Juan RP " license="GPL-3" homepage="https://github.com/Sigil-Ebook/Sigil" distfiles="${homepage}/releases/download/${version}/Sigil-${version}-Code.zip" -checksum=fbd7afdef862794512cde6eb42c0abc05daff428a483bd03710226c5bdf09c69 +checksum=78f9f200c86da326984543bd86cbb8eab91308a5a4d7f8cfcc88eb9b0779749a if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel" diff --git a/srcpkgs/sigrok-cli/template b/srcpkgs/sigrok-cli/template new file mode 100644 index 00000000000..0bd1161b2cb --- /dev/null +++ b/srcpkgs/sigrok-cli/template @@ -0,0 +1,14 @@ +# Template file for 'sigrok-cli' +pkgname=sigrok-cli +version=0.6.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="glib-devel libzip-devel libsigrok-devel libsigrokdecode-devel" +depends="sigrok-firmware-fx2lafw" +short_desc="Provide the basic sigrok functionality from the command-line" +maintainer="lemmi " +license="GPL-3" +homepage="https://sigrok.org/" +distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=ab2ede4e245f3987e19a89a530bd204e0d792c07474d9fed3345d4af4e84723c diff --git a/srcpkgs/sigrok-firmware-fx2lafw/template b/srcpkgs/sigrok-firmware-fx2lafw/template new file mode 100644 index 00000000000..70cce900a2a --- /dev/null +++ b/srcpkgs/sigrok-firmware-fx2lafw/template @@ -0,0 +1,19 @@ +# Template file for 'sigrok-firmware-fx2lafw' +pkgname=sigrok-firmware-fx2lafw +version=0.1.4 +revision=1 +build_style=fetch +noarch=yes +short_desc="Sigrok fx2lafw Firmware files" +maintainer="lemmi " +license="GPL-2 LGPL-2.1" +homepage="https://sigrok.org/" +distfiles="https://sigrok.org/download/binary/${pkgname}/${pkgname}-bin-${version}.tar.gz" +checksum=e48ae384fdcf3f552b91fb35d1a49fd211cfdadebbdbbb5b31befb8eb0f8a35a + +do_install() { + tar xf ${pkgname}-bin-${version}.tar.gz + for fw in ${pkgname}-bin-${version}/fx2lafw-*.fw; do + vinstall "$fw" 0644 /usr/share/sigrok-firmware + done +} diff --git a/srcpkgs/simgear/template b/srcpkgs/simgear/template index cc225700be5..c51c013ff84 100644 --- a/srcpkgs/simgear/template +++ b/srcpkgs/simgear/template @@ -1,6 +1,6 @@ # Template file for 'simgear' pkgname=simgear -version=2016.4.4 +version=2017.1.3 revision=1 # XXX: always keep in sync with flightgear version! build_style=cmake @@ -13,13 +13,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="http://www.flightgear.org/" distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=5514fd0006bbfcdbdc0e2dab7da41eae491ea03a6246cc6a009590032b2fc1dc +checksum=85304d985b4fc0dc00d9f7603b02d096e3c24ca4c98adc18dc9af1e2d0e3c310 # Suppress warnings regarding auto_ptr CXXFLAGS="-Wno-deprecated-declarations" - -case "$XBPS_TARGET_MACHINE" in - aarch64-musl) - broken="ICE: http://build.voidlinux.eu/builders/aarch64-musl_builder/builds/29/steps/shell_3/logs/stdio" - ;; -esac diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template index 0fb57792643..93bf5cb547d 100644 --- a/srcpkgs/sip/template +++ b/srcpkgs/sip/template @@ -1,6 +1,6 @@ # Template file for 'sip' pkgname=sip -version=4.19 +version=4.19.2 revision=1 wrksrc="sip-${version}" hostmakedepends="python-devel python3-devel" @@ -10,7 +10,7 @@ maintainer="Alessio Sergi " homepage="http://www.riverbankcomputing.co.uk/software/sip/intro" license="GPL-2, GPL-3, SIP" distfiles="${SOURCEFORGE_SITE}/pyqt/sip-${version}.tar.gz" -checksum=014bf55f653e0d8bcc582705ef4fbd61e0859a36e959ab46d8fa060cdf0b5e27 +checksum=432b4aad25254e6997913e33b1ca3cf5fd21d5729a50a3ce2edccbea82c80533 pre_build() { mkdir -p sip-${py2_ver} diff --git a/srcpkgs/sitecopy/template b/srcpkgs/sitecopy/template index c7b92714326..6901e898bd5 100644 --- a/srcpkgs/sitecopy/template +++ b/srcpkgs/sitecopy/template @@ -1,7 +1,7 @@ # Template file for 'sitecopy' pkgname=sitecopy version=0.16.6 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-ssl=openssl" hostmakedepends="pkg-config" diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template index 1280a88c393..0d9b080f90c 100644 --- a/srcpkgs/skalibs/template +++ b/srcpkgs/skalibs/template @@ -1,6 +1,6 @@ # Template file for 'skalibs' pkgname=skalibs -version=2.4.0.2 +version=2.5.0.0 revision=1 nocross=yes build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="bougyman " license="ISC" homepage="http://skarnet.org/software/skalibs/" distfiles="http://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=0708172bc2ec9825f8a4f312d35f8dcd94da5f291425a598c33c873b3de77df8 +checksum=38408ff6d0aec581010ecf9e49703ec5f4c8887bbe68717ec087634a7ade849c CFLAGS="-D_DEFAULT_SOURCE" diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template new file mode 100644 index 00000000000..0938f33d6c3 --- /dev/null +++ b/srcpkgs/slit/template @@ -0,0 +1,18 @@ +# Template file for 'slit' +pkgname=slit +version=1.1.3 +revision=1 +build_style=go +go_import_path="github.com/tigrawap/slit" +short_desc="A modern PAGER for viewing logs" +maintainer="Michael Gehring " +license="MIT" +hostmakedepends="git" +homepage="https://github.com/tigrawap/slit" +distfiles="https://github.com/tigrawap/slit/archive/${version}.tar.gz" +checksum=771a1d0858cb75dd62e47eba64b8b82a3a58996416098356b3f8470d9d2afe23 + +post_install() { + vlicense LICENSE + vdoc README.md +} diff --git a/srcpkgs/slop-devel b/srcpkgs/slop-devel new file mode 120000 index 00000000000..99037a0276c --- /dev/null +++ b/srcpkgs/slop-devel @@ -0,0 +1 @@ +slop \ No newline at end of file diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template index cc63bec8c68..fd12e11aa72 100644 --- a/srcpkgs/slop/template +++ b/srcpkgs/slop/template @@ -1,13 +1,26 @@ # Template file for 'slop' pkgname=slop -version=5.3.34 +version=5.3.37 revision=1 build_style=cmake hostmakedepends="pkg-config" -makedepends="imlib2-devel glew-devel libXext-devel libXrender-devel libXrandr-devel glm" +makedepends="imlib2-devel glew-devel libXext-devel libXrender-devel glm" short_desc="Utility to query for a selection and print the region to stdout" maintainer="Juan RP " license="GPL-3" homepage="https://github.com/naelstrof/slop" distfiles="https://github.com/naelstrof/slop/archive/v${version}.tar.gz" -checksum=9747d43a2d40615730eea3205bad2400eed6cc5ed516fd8abc42f9ff99d5d298 +checksum=3a1656f8ccc53ab5a2c6ffe095893b05cf50a3ba5d33857ecf48ce3f448051dc + +pre_configure() { + sed -i -e '$a\set_target_properties(slopy PROPERTIES VERSION 0.1.0)' CMakeLists.txt +} + +slop-devel_package() { + short_desc+=" - developments files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/*.so + } +} diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template index 5fcfc6eceb5..8abe5c9ed55 100644 --- a/srcpkgs/slrn/template +++ b/srcpkgs/slrn/template @@ -2,7 +2,7 @@ pkgname=slrn version=1.0.3a wrksrc="${pkgname}-${version%a}" -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-slrnpull --with-ssl --with-slanginc=${XBPS_CROSS_BASE}/usr/include @@ -13,7 +13,8 @@ short_desc="Text mode Usenet news reader" maintainer="Christian Neukirchen " license="GPL-2" homepage="http://www.slrn.org/" -distfiles="http://jedsoft.org/releases/slrn/${pkgname}-${version}.tar.bz2" +# distfiles="http://jedsoft.org/releases/slrn/${pkgname}-${version}.tar.bz2" +distfiles="https://ftp.icm.edu.pl/packages/slrn/slrn-${version}.tar.bz2" checksum=3ba8a4d549201640f2b82d53fb1bec1250f908052a7983f0061c983c634c2dac nocross=yes # need to host-compile chkslang diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template index 54b50175acf..9d871e1cafc 100644 --- a/srcpkgs/slurm-wlm/template +++ b/srcpkgs/slurm-wlm/template @@ -1,7 +1,7 @@ # Template file for 'slurm-wlm' pkgname=slurm-wlm -version=17.02.1.1 -revision=1 +version=17.02.2.1 +revision=2 _distver="${version//./-}" wrksrc="slurm-slurm-${_distver}" build_style=gnu-configure @@ -16,7 +16,7 @@ maintainer="Toyam Cox " license="GPL-2" homepage="http://slurm.schedmd.com/slurm.html" distfiles="https://github.com/SchedMD/slurm/archive/slurm-${_distver}.tar.gz" -checksum=508f40c68127d6d345a3d765150ad42e596a351e26381bf5e63d0da37f589be0 +checksum=e73ca3b20a016a33bb25610aa27bb9b0b6d90ddeba159416fe3ed57723d96072 case "${XBPS_TARGET_MACHINE}" in # Undefined: inet_nsap_addr and getgrent_r diff --git a/srcpkgs/smali/template b/srcpkgs/smali/template index 15406719d27..2026bd7ba02 100644 --- a/srcpkgs/smali/template +++ b/srcpkgs/smali/template @@ -1,6 +1,6 @@ # Template file for 'smali' pkgname=smali -version=2.1.3 +version=2.2.0 revision=1 short_desc="An assembler/disassembler for Android's dex format" maintainer="Juan RP " @@ -11,8 +11,8 @@ distfiles=" https://bitbucket.org/JesusFreke/smali/downloads/smali-${version}.jar https://bitbucket.org/JesusFreke/smali/downloads/baksmali-${version}.jar https://raw.githubusercontent.com/JesusFreke/smali/v${version}/NOTICE" -checksum="9b63186344a095d9bbffb27b7100ddfe933432f2b8f90f649a1e5e8cc26bb355 - 01ec5e42ccd197658314967e86e311a695bc86b2ace32fc4ad95e34d3595750a +checksum="381b3ab7e376b8322e31091f57f2e8a6882bd704025b88cd4de678a7b3448ee0 + 699717fd18ee4ca35b7c5a29a659de23d80c9c53d26aea9eb5eb0dde99657bb7 6a5ccbe10280293e14ecfc435ae422afc406265244e98f0a87e1ecfa238ab10c" nocross=yes diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template index 8eb3c761933..44858d37568 100644 --- a/srcpkgs/smplayer/template +++ b/srcpkgs/smplayer/template @@ -1,7 +1,7 @@ # Template file for 'smplayer' pkgname=smplayer -version=17.2.0 -revision=2 +version=17.4.2 +revision=1 build_style=gnu-makefile hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel" makedepends="zlib-devel qt5-script-devel qt5-tools-devel" @@ -11,11 +11,13 @@ maintainer="Juan RP " license="GPL-2" homepage="http://smplayer.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=adc1080de88b2fac4a63844091968c8f9df475084743766efc9efe01fde5d816 +checksum=05577880df3620ab238a9a28055816c8e97d294ad4b2b39eb7de9be281bc85d1 pre_build() { - export QMAKE_OPTS="QMAKE_CXXFLAGS=\"${CXXFLAGS}\" QMAKE_LFLAGS=\"${LDFLAGS}\"" + export QMAKE_OPTS="QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CFLAGS=\"${CFLAGS}\" \ + QMAKE_CXXFLAGS=\"${CXXFLAGS}\" QMAKE_LFLAGS=\"${LDFLAGS}\"" sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro + sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile } do_build() { diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 9a642ee6b0b..51ae3c36187 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,7 +1,7 @@ # Template file for 'snapper' pkgname=snapper version=0.4.1 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure configure_args="--disable-zypp --with-conf=/etc/conf.d --sbindir=/usr/bin" diff --git a/srcpkgs/sniproxy/template b/srcpkgs/sniproxy/template index d08706f188b..9d6a559ab49 100644 --- a/srcpkgs/sniproxy/template +++ b/srcpkgs/sniproxy/template @@ -1,7 +1,7 @@ # Template file for 'sniproxy' pkgname=sniproxy -version=0.4.0 -revision=4 +version=0.5.0 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool autoconf pkg-config udns-devel gettext-devel" makedepends="libev-devel pcre-devel" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="GPL-3" homepage="https://github.com/dlundquist/$pkgname" distfiles="$homepage/archive/$version.tar.gz" -checksum=d842a428480c7cdd7354080869e4ed3c8bb35a6c1b2124ce832378119774e4d8 +checksum=0b8dd06f9aa9e1c4151b572caf645ffceacdd35a139ded16a7fb0035452c17e5 configure_args="--sbindir=/usr/bin" conf_files="/etc/$pkgname.conf" diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template index aa356551161..12fb965bf94 100644 --- a/srcpkgs/socat/template +++ b/srcpkgs/socat/template @@ -1,7 +1,7 @@ # Template file for 'socat' pkgname=socat version=1.7.3.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-libwrap --enable-fips ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9 @@ -16,5 +16,5 @@ distfiles="http://www.dest-unreach.org/socat/download/socat-$version.tar.bz2" checksum=e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251 case "$XBPS_TARGET_MACHINE" in - aarch64-musl) CFLAGS="-D_LINUX_IF_ETHER_H";; + *-musl) CFLAGS="-D_LINUX_IF_ETHER_H";; esac diff --git a/srcpkgs/socklog-void/INSTALL.msg b/srcpkgs/socklog-void/INSTALL.msg index 88c014feb88..7199e4dfa03 100644 --- a/srcpkgs/socklog-void/INSTALL.msg +++ b/srcpkgs/socklog-void/INSTALL.msg @@ -8,6 +8,6 @@ Logs reside in /var/log/socklog/*, use svlogtail for simple access. To access logs as ordinary user, add yourself to group socklog: - # sudo usermod -a -G socklog + $ sudo usermod -a -G socklog $USER and then re-login to make it effective. diff --git a/srcpkgs/socklog-void/template b/srcpkgs/socklog-void/template index a2ebc9d5f71..c606adb5c89 100644 --- a/srcpkgs/socklog-void/template +++ b/srcpkgs/socklog-void/template @@ -1,7 +1,7 @@ # Template file for 'socklog-void' pkgname=socklog-void version=20150726 -revision=2 +revision=3 build_style=gnu-makefile system_groups="socklog" make_dirs="/var/log/socklog 2750 root socklog" diff --git a/srcpkgs/sound-juicer/template b/srcpkgs/sound-juicer/template index 2faded169ce..7c4badc7dfa 100644 --- a/srcpkgs/sound-juicer/template +++ b/srcpkgs/sound-juicer/template @@ -1,6 +1,6 @@ # Template file for 'sound-juicer' pkgname=sound-juicer -version=3.22.1 +version=3.24.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool gnome-doc-utils glib-devel" @@ -15,4 +15,4 @@ maintainer="Juan RP " homepage="https://wiki.gnome.org/Apps/SoundJuicer" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=adbbda063436ca2c4d04f2ccfe6e3a5ce4abb7e1c61bc9a47300665eed9e38ec +checksum=de6ae3889e60a572221274517a90d29dd21023acf3a94cc9c033270776270fa7 diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template index a2875bbedd2..047bf969bb3 100644 --- a/srcpkgs/source-highlight/template +++ b/srcpkgs/source-highlight/template @@ -1,7 +1,7 @@ # Template file for 'source-highlight' pkgname=source-highlight version=3.1.8 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --with-bash-completion=/usr/share/bash-completion/completions" diff --git a/srcpkgs/speech-dispatcher/patches/spdconfig.patch b/srcpkgs/speech-dispatcher/patches/spdconfig.patch new file mode 100644 index 00000000000..39dec79a54e --- /dev/null +++ b/srcpkgs/speech-dispatcher/patches/spdconfig.patch @@ -0,0 +1,23 @@ +Patch pulled from upstream repo, author Samuel Thibault. +Goes away with 0.8.7 or whatever their next version is. +diff --git src/api/python/speechd_config/config.py.in src/api/python/speechd_config/config.py.in +index a59ef79a..e9b2ae53 100644 +--- src/api/python/speechd_config/config.py.in ++++ src/api/python/speechd_config/config.py.in +@@ -156,6 +156,7 @@ def setup_argparse(): + parser.add_argument('-D', '--debug', dest='debug', + action="store_true", default=False, + help=_("Debug a problem and generate a report")) ++ return parser + + class Tests: + """Tests of functionality of Speech Dispatcher and its dependencies +@@ -750,7 +751,7 @@ you have to start it manually to continue.""")) + + def main(): + options = setup_argparse() +- options.parse() ++ options = options.parse_args() + test = Tests() + configure = Configure(test) # that should possibly be refactored, test should not be passed + diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template index d7da122cb8e..cf89fb6eda5 100644 --- a/srcpkgs/speech-dispatcher/template +++ b/srcpkgs/speech-dispatcher/template @@ -1,18 +1,20 @@ # Template build file for 'speech-dispatcher'. pkgname=speech-dispatcher version=0.8.6 -revision=1 +revision=3 build_style=gnu-configure configure_args="--disable-static" short_desc="High-level device independent layer for speech synthesis interface" maintainer="Juan RP " -license="GPL2/FDL" +license="GPL-2, LGPL-2.1, GFDL-1.2" homepage="http://devel.freebsoft.org/speechd" distfiles="http://devel.freebsoft.org/pub/projects/speechd/${pkgname}-${version}.tar.gz" checksum=c233dc3757c1f0d3676480d1052d42d88d18d29ab0cb0c8b5ce8edc3e7386ff8 +pycompile_module='speechd speechd_config' -hostmakedepends="pkg-config intltool" -makedepends="libltdl-devel glib-devel dotconf-devel libsndfile-devel libespeak-devel" +hostmakedepends="pkg-config intltool python3-devel" +makedepends="libltdl-devel glib-devel dotconf-devel libsndfile-devel libespeak-devel libao-devel python3-devel" +depends="python3" conf_files=" /etc/speech-dispatcher/clients/*.conf /etc/speech-dispatcher/modules/*.conf diff --git a/srcpkgs/speedtest-cli/template b/srcpkgs/speedtest-cli/template index ec9f2a324ba..f555f6d28b0 100644 --- a/srcpkgs/speedtest-cli/template +++ b/srcpkgs/speedtest-cli/template @@ -1,6 +1,6 @@ # Template file for 'speedtest-cli' pkgname=speedtest-cli -version=1.0.2 +version=1.0.4 revision=1 noarch=yes build_style=python3-module @@ -12,4 +12,4 @@ maintainer="Aaron Marcher " license="Apache-2.0" homepage="https://github.com/sivel/speedtest-cli" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=41f50ffb082322eedcfa8b33d0354fc5f1d9fcdc09be76b09b89b293397629c7 +checksum=8548af6284763030f346d5c0aab9bd19dfdebdcb36b20f068c7c8227edfefae0 diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template index 4b30f548bb4..4b022e8461c 100644 --- a/srcpkgs/spice-gtk/template +++ b/srcpkgs/spice-gtk/template @@ -1,7 +1,7 @@ # Template file for 'spice-gtk' pkgname=spice-gtk version=0.33 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --enable-vala $(vopt_enable gir introspection) --enable-smartcard=no --enable-usbredir --enable-polkit=yes diff --git a/srcpkgs/spice-vdagent/files/spice-vdagentd/run b/srcpkgs/spice-vdagent/files/spice-vdagentd/run new file mode 100755 index 00000000000..97f1150565d --- /dev/null +++ b/srcpkgs/spice-vdagent/files/spice-vdagentd/run @@ -0,0 +1,3 @@ +#!/bin/sh +mkdir -p /var/run/spice-vdagentd +exec /usr/bin/spice-vdagentd -x diff --git a/srcpkgs/spice-vdagent/template b/srcpkgs/spice-vdagent/template index 66a0a6b305f..b07e3effe12 100644 --- a/srcpkgs/spice-vdagent/template +++ b/srcpkgs/spice-vdagent/template @@ -1,7 +1,7 @@ # Template file for 'spice-vdagent' pkgname=spice-vdagent version=0.17.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libglib-devel dbus-devel libXfixes-devel libXrandr-devel @@ -19,3 +19,7 @@ configure_args="--sbindir=/usr/bin" do_install() { make DESTDIR=${DESTDIR} udevrulesdir=/usr/lib/udev/rules.d install } + +post_install() { + vsv spice-vdagentd +} diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template index d84aa579754..0c2c47ddb92 100644 --- a/srcpkgs/spice/template +++ b/srcpkgs/spice/template @@ -1,14 +1,15 @@ # Template file for 'spice' pkgname=spice version=0.13.3 -revision=1 +revision=3 build_style=gnu-configure -configure_args="--disable-tunnel --disable-opengl --disable-smartcard +configure_args="--disable-tunnel --disable-opengl --enable-smartcard --with-sasl --disable-static --enable-xinerama --disable-celt051" hostmakedepends="pkg-config python" makedepends="spice-protocol libjpeg-turbo-devel pixman-devel libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel - libXrandr-devel libsasl-devel libXinerama-devel libglib-devel" + libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel + nss-devel" short_desc="Implements the SPICE protocol" maintainer="Juan RP " license="GPL-2" diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template index 3635e5af0d7..712780ea18c 100644 --- a/srcpkgs/spiped/template +++ b/srcpkgs/spiped/template @@ -1,7 +1,7 @@ # Template file for 'spiped' pkgname=spiped -version=1.5.0 -revision=7 +version=1.6.0 +revision=1 build_style=gnu-makefile makedepends="libressl-devel" short_desc="The spiped secure pipe daemon" @@ -9,12 +9,8 @@ maintainer="Juan RP " license="2-clause-BSD" homepage="http://www.tarsnap.com/spiped.html" distfiles="http://www.tarsnap.com/spiped/spiped-${version}.tgz" -checksum=b2f74b34fb62fd37d6e2bfc969a209c039b88847e853a49e91768dec625facd7 +checksum=e6f7f8f912172c3ad55638af8346ae7c4ecaa92aed6d3fb60f2bda4359cba1e4 -pre_install() { - # remove hardcoded strip(1) - sed -i '/strip .*/d' */Makefile -} pre_build() { export LDADD_EXTRA="$LDFLAGS" } diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template index f202d1dd57d..60315c5d7b6 100644 --- a/srcpkgs/splix/template +++ b/srcpkgs/splix/template @@ -6,7 +6,7 @@ wrksrc="$pkgname-$version.orig" build_style=gnu-makefile makedepends="cups-devel mit-krb5-devel jbigkit-devel" short_desc="CUPS driver for SPL printers (Samsung and several Xerox printers)" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://splix.ap2c.org" distfiles="${DEBIAN_SITE}/main/s/$pkgname/${pkgname}_$version.orig.tar.gz" diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template index 5c01715532c..850962ade69 100644 --- a/srcpkgs/spotify/template +++ b/srcpkgs/spotify/template @@ -1,7 +1,7 @@ # Template build file for 'spotify'. pkgname=spotify -version=1.0.49 -revision=2 +version=1.0.53 +revision=1 short_desc="Proprietary music streaming client" maintainer="Stefan Mühlinghaus " homepage="https://www.spotify.com" @@ -13,11 +13,11 @@ build_style=fetch depends="binutils gtk+ nss GConf libXScrnSaver xz" if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ]; then - _sversion=".125.g72ee7853-111_amd64" - _schecksum="1d6d1cccfb7f996b835f21c8dbabc16ca4bd214878e06738dba7886640470050" + _sversion=".758.gde3fc4b2-33_amd64" + _schecksum="6fac209d35828bc9a8bc5449320b92310462a2f78201e3ea620e743fc45e06ea" else - _sversion=".125.g72ee7853-22_i386" - _schecksum="96c02fdc77991feb0797089d701744c2de4584322f966a1c070b559df27f9b04" + _sversion=".758.gde3fc4b2-34_i386" + _schecksum="1c559e776481ae8b03d966bd931f788030d41ad9cd751c43fe99616494a7d84a" fi do_install() { diff --git a/srcpkgs/spt/template b/srcpkgs/spt/template new file mode 100644 index 00000000000..02f27e9be28 --- /dev/null +++ b/srcpkgs/spt/template @@ -0,0 +1,22 @@ +# Template file for 'spt' +pkgname=spt +version=0.4 +revision=1 +short_desc="Simple pomodoro timer" +maintainer="Inokentiy Babushkin " +license="ISC" +hostmakedepends="pkg-config" +makedepends="libnotify-devel glib-devel" +build_style="gnu-makefile" +homepage="https://github.com/pickfire/spt" +distfiles="https://github.com/pickfire/${pkgname}/archive/${version}.tar.gz" +checksum=b0d0871085a472bdaaf16359765ba4bb3f2d35aeefcc7f737f1bf8d186a02dd6 + +do_build() { + sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk + make CC=$CC ${makejobs} +} + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template index 2f8450afbfb..4b27a2818a3 100644 --- a/srcpkgs/sqlcipher/template +++ b/srcpkgs/sqlcipher/template @@ -1,7 +1,7 @@ # Template file for 'sqlcipher' pkgname=sqlcipher version=3.4.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-tempstore=yes" hostmakedepends="tcl" diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index ed1acbb7cca..1daa72bad4f 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,20 +1,23 @@ # Template build file for 'sqlite'. pkgname=sqlite -version=3.17.0 -revision=1 +version=3.18.0 +revision=2 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ }) wrksrc="sqlite-autoconf-${_amalgamationver}" build_style=gnu-configure -configure_args="--enable-threadsafe --enable-readline --enable-dynamic-extensions" +configure_args="--enable-threadsafe --enable-readline --enable-dynamic-extensions --enable-fts5" makedepends="libedit-devel" short_desc="SQL Database Engine in a C Library" maintainer="Juan RP " homepage="http://www.sqlite.org" license="Public Domain" distfiles="http://sqlite.org/2017/sqlite-autoconf-${_amalgamationver}.tar.gz" -checksum=a4e485ad3a16e054765baf6371826b5000beed07e626510896069c0bf013874c +checksum=3757612463976e7d08c5e9f0af3021613fc24bbcfe1c51197d6776b9ece9ac5c -CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1" +CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \ + -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \ + -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 \ + -DSQLITE_ENABLE_FTS3_TOKENIZER=1 " # explicitly enable fdatasync CFLAGS+=" -DHAVE_FDATASYNC" disable_parallel_build=yes diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template index 4808f935918..f8c7589470a 100644 --- a/srcpkgs/squid/template +++ b/srcpkgs/squid/template @@ -1,7 +1,7 @@ # Template file for 'squid' pkgname=squid -version=3.5.24 -revision=1 +version=3.5.25 +revision=2 build_style=gnu-configure configure_args=" --sbindir=/usr/bin @@ -63,7 +63,7 @@ maintainer="Toyam Cox " license="GPL-2" homepage="http://www.squid-cache.org/" distfiles="ftp://ftp.fu-berlin.de/unix/www/${pkgname}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=4fe29f582eef357faa541a53835b6885e24e6f28b80a3abcdf3b57f5393bbdb2 +checksum=28959254c32b8cd87e9599b6beb97352cf0638524e0f5ac3e1754f08462f3585 post_install() { chmod u+s \ diff --git a/srcpkgs/sshguard/template b/srcpkgs/sshguard/template index 9bff2633db3..b435877df6a 100644 --- a/srcpkgs/sshguard/template +++ b/srcpkgs/sshguard/template @@ -1,9 +1,8 @@ # Template file for 'sshguard' pkgname=sshguard -version=1.99.0 +version=2.0.0 revision=1 build_style=gnu-configure -configure_args="--with-firewall=iptables" make_dirs="/var/db/sshguard 0755 root root" depends="iptables" short_desc="Protects networked hosts from brute force attacks" @@ -11,9 +10,13 @@ maintainer="Lodvær " license="3-clause-BSD" homepage="http://www.sshguard.net/" distfiles="${SOURCEFORGE_SITE}/sshguard/$pkgname-$version.tar.gz" -checksum=d55ec6f57c24d954998328e0363000dbded9aed0580cfe4b558fce0abe550f95 +checksum=e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06 + +conf_files="/etc/sshguard.conf" post_install() { vsv sshguard-socklog + vconf examples/sshguard.conf.sample sshguard.conf + sed -i 's@/usr/local/@/usr/@g' ${DESTDIR}/etc/sshguard.conf vlicense COPYING } diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template index 4044c50fe0f..34aa75b87a6 100644 --- a/srcpkgs/sssd/template +++ b/srcpkgs/sssd/template @@ -6,16 +6,15 @@ build_style=gnu-configure configure_args="--with-selinux=no --with-semanage=no --disable-cifs-idmap-plugin --without-samba --disable-config-lib --without-python3-bindings" -hostmakedepends="pkg-config nscd bind xmlcatmgr - docbook-xsl" +hostmakedepends="pkg-config nscd bind xmlcatmgr docbook-xsl" makedepends="pam-devel popt-devel talloc-devel tdb-devel tevent-devel ldb-devel ding-libs-devel libldap-devel mit-krb5-devel c-ares-devel glib-devel libxslt-devel python-devel nss-devel libnfsidmap-devel" short_desc="System Security Services Daemon" maintainer="Michael Aldridge " license="GPL-3" -homepage="https://fedorahosted.org/sssd/" -distfiles="https://fedorahosted.org/released/sssd/sssd-${version}.tar.gz" +homepage="https://pagure.io/SSSD/sssd/" +distfiles="https://releases.pagure.org/SSSD/sssd/sssd-${version}.tar.gz" checksum=0a7bba7697088734c5fa1844dbb6de4f1f11afd30df02f0c1dd2579114c0a194 post_install() { diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template index 944b6228af4..c54a7d0b618 100644 --- a/srcpkgs/stack/template +++ b/srcpkgs/stack/template @@ -1,27 +1,28 @@ # Template file for 'stack' pkgname=stack -version=1.1.2 -revision=2 -_stackage="lts-6.17" +version=1.4.0 +revision=1 +_stackage="lts-8.9" hostmakedepends="cabal-install pkg-config" makedepends="zlib-devel pcre-devel" depends="git iana-etc" short_desc="Cross-platform program for developing Haskell projects" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="BSD-3" homepage="http://haskellstack.org" distfiles="https://github.com/commercialhaskell/stack/archive/v${version}.tar.gz https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}" skip_extraction="cabal.config-${_stackage}" -checksum="8f43d69a00a8861b156705a634e55179524cefbd98e6c29182e7bdcb57d8b3be - 2fe4734c6033257966c0f8beba7420e003286498c97326d313ded0ae9f5cc9eb" +checksum="595d311ad117e41ad908b7065743917542b40f343d1334673e98171ee74d36e6 + 05c840d29192fc45d71b1b6d3be852f07903648f9f4993fc6c91759a0f97e204" nocross=yes nopie=yes # network-2.6.2.1 build fails with a relocation do_build() { cabal sandbox init cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cabal.config-${_stackage} cabal.config - sed -i 's/Cabal ==.*/Cabal ==1.24.0.0,/' cabal.config # XXX hack for cabal-install + sed -i 's/ store ==.*/ store ==0.3.1,/' cabal.config + sed -i 's/ store-core ==.*/ store-core ==0.3,/' cabal.config cabal update cabal install ${makejobs} --only-dependencies cabal install ${makejobs} cpphs diff --git a/srcpkgs/stack/update b/srcpkgs/stack/update deleted file mode 100644 index fdd634612c0..00000000000 --- a/srcpkgs/stack/update +++ /dev/null @@ -1,2 +0,0 @@ -site='http://www.stackage.org/lts' -pattern='package/stack-\K[\d.]+' diff --git a/srcpkgs/steam-fonts/template b/srcpkgs/steam-fonts/template index 2da7850f978..628b9cb2018 100644 --- a/srcpkgs/steam-fonts/template +++ b/srcpkgs/steam-fonts/template @@ -6,7 +6,7 @@ noarch=yes hostmakedepends="unzip" depends="fontconfig mkfontscale mkfontdir" short_desc="Fonts to fix scrambled or missing text in steam menus" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="proprietary" homepage="https://support.steampowered.com/kb_article.php?ref=1974-YFKL-4947" distfiles="https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip" diff --git a/srcpkgs/stella/template b/srcpkgs/stella/template index b3de7e8f3a8..90516595c93 100644 --- a/srcpkgs/stella/template +++ b/srcpkgs/stella/template @@ -7,8 +7,8 @@ makedepends="SDL2-devel glu-devel libpng-devel zlib-devel" short_desc="A multi-platform Atari 2600 VCS Emulator" maintainer="Diogo Leal " license="GPL-2" -homepage="http://stella.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/stella/stella/${version}/stella-${version}-src.tar.xz" +homepage="https://stella-emu.github.io/" +distfiles="https://github.com/stella-emu/stella/releases/download/release-${version}/stella-${version}-src.tar.xz" checksum=93a75d1b343b1e66b6dc526c0f9d8a0c3678d346033f7cdfe76dc93f14d956ad do_configure() { diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template index ecd7e7c3061..8e7c4c08d85 100644 --- a/srcpkgs/stellarium/template +++ b/srcpkgs/stellarium/template @@ -1,6 +1,6 @@ # Template file for 'stellarium' pkgname=stellarium -version=0.15.1 +version=0.15.2 revision=1 build_style=cmake hostmakedepends="perl" @@ -12,5 +12,5 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.stellarium.org/" distfiles="${SOURCEFORGE_SITE}/stellarium/Stellarium-sources/${version}/stellarium-${version}.tar.gz" -checksum=0fe52fc496c11d92728742ae6d71bac116746dca7885d34d17b1a288fe8b5b11 +checksum=6943c088fa7675164168d3f627491131df60fc6377eac7224e1086271091dda6 only_for_archs="i686 i686-musl x86_64 x86_64-musl" diff --git a/srcpkgs/streamripper/patches/musl-fix.patch b/srcpkgs/streamripper/patches/musl-fix.patch new file mode 100644 index 00000000000..c9579d5ad58 --- /dev/null +++ b/srcpkgs/streamripper/patches/musl-fix.patch @@ -0,0 +1,11 @@ +--- lib/ripstream.c ++++ lib/ripstream.c +@@ -714,7 +714,7 @@ + char bigbuf[HEADER_SIZE] = ""; + ID3V2frame id3v2frame; + #ifndef WIN32 +- __uint32_t framesize = 0; ++ uint32_t framesize = 0; + #else + unsigned long int framesize = 0; + #endif diff --git a/srcpkgs/streamripper/template b/srcpkgs/streamripper/template new file mode 100644 index 00000000000..3d93ed576ce --- /dev/null +++ b/srcpkgs/streamripper/template @@ -0,0 +1,13 @@ +# Template file for 'streamripper' +pkgname=streamripper +version=1.64.6 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="glib-devel libvorbis-devel libmad-devel faad2-devel" +short_desc="Mp3 recorder for shoutcast-compatible streams / internet radio" +maintainer="Piraty " +license="GPL-2" +homepage="http://streamripper.sourceforge.net/" +distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" +checksum=c1d75f2e9c7b38fd4695be66eff4533395248132f3cc61f375196403c4d8de42 diff --git a/srcpkgs/strip-nondeterminism/template b/srcpkgs/strip-nondeterminism/template index 40cd9a6719d..d2c47222d3c 100644 --- a/srcpkgs/strip-nondeterminism/template +++ b/srcpkgs/strip-nondeterminism/template @@ -1,6 +1,6 @@ # Template file for 'strip-nondeterminism' pkgname=strip-nondeterminism -version=0.031 +version=0.032 revision=1 create_wrksrc=yes build_style=perl-module @@ -12,4 +12,4 @@ maintainer="Enno Boland " license="GPL-3" homepage="https://tracker.debian.org/pkg/strip-nondeterminism" distfiles="http://http.debian.net/debian/pool/main/s/${pkgname}/${pkgname}_${version}.orig.tar.gz" -checksum=91624ef86acade6431a0e87f1ae7651084e787debc91e22abec7935d2e2ce4f8 +checksum=43912c367deaf3d2bf545180e07545415c5e0ee7461481e9d89e66328a591b89 diff --git a/srcpkgs/strongswan/template b/srcpkgs/strongswan/template index 2e4e0a7e59d..99c09379f7b 100644 --- a/srcpkgs/strongswan/template +++ b/srcpkgs/strongswan/template @@ -1,6 +1,6 @@ # Template file for 'strongswan' pkgname=strongswan -version=5.5.1 +version=5.5.2 revision=1 build_style=gnu-configure # tpm support waits on libtss2 @@ -18,7 +18,7 @@ license="GPL-2" # changelog="https://wiki.strongswan.org/projects/strongswan/wiki/Changelog" homepage="http://www.strongswan.org/" distfiles="http://download.strongswan.org/${pkgname}-${version}.tar.bz2" -checksum=720b301991f77bdedd8d551a956f52e2d11686a0ec18e832094f86cf2b842ab7 +checksum=da976fca836f05fc7b7a38baab299745f960cb7640319969d239d8aa4ace9f6a post_install() { touch .empty diff --git a/srcpkgs/stunnel/patches/stunnel-openbsd.patch b/srcpkgs/stunnel/patches/stunnel-openbsd.patch index 1ff82df299f..e60fae630ad 100644 --- a/srcpkgs/stunnel/patches/stunnel-openbsd.patch +++ b/srcpkgs/stunnel/patches/stunnel-openbsd.patch @@ -1,17 +1,16 @@ $OpenBSD: patch-src_verify_c,v 1.5 2016/11/10 10:10:50 gsoares Exp $ ---- src/verify.c.orig Wed Jul 6 13:18:17 2016 -+++ src/verify.c Thu Nov 10 07:00:09 2016 -@@ -349,7 +349,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback +--- src/verify.c.orig 2017-04-04 20:02:57.168123782 -0400 ++++ src/verify.c 2017-04-04 20:51:08.931284080 -0400 +@@ -352,7 +352,7 @@ + cert=X509_STORE_CTX_get_current_cert(callback_ctx); subject=X509_get_subject_name(cert); - - #if OPENSSL_VERSION_NUMBER>=0x10000000L + -#if OPENSSL_VERSION_NUMBER<0x10100006L +#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER) #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs #endif /* modern API allows retrieving multiple matching certificates */ - $OpenBSD: patch-src_sthreads_c,v 1.2 2016/11/10 10:10:50 gsoares Exp $ --- src/sthreads.c.orig Sat Oct 29 05:25:37 2016 +++ src/sthreads.c Wed Nov 9 20:22:39 2016 diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template index 2fa04d21b85..7069b3649ab 100644 --- a/srcpkgs/stunnel/template +++ b/srcpkgs/stunnel/template @@ -1,7 +1,7 @@ # Template file for 'stunnel' pkgname=stunnel -version=5.40 -revision=1 +version=5.41 +revision=2 build_style=gnu-configure configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="perl" @@ -11,7 +11,7 @@ maintainer="Toyam Cox " license="GPL-2" homepage="https://www.stunnel.org/" distfiles="https://www.stunnel.org/downloads/archive/5.x/${pkgname}-${version}.tar.gz" -checksum=23acdb390326ffd507d90f8984ecc90e0d9993f6bd6eac1d0a642456565c45ff +checksum=f05c6321ee1f6ddebacc234ccf20825971941e831b5beea6d0ce0b8e1668148f post_install() { rm ${DESTDIR}/usr/share/man/man8/stunnel.??.8 @@ -24,13 +24,24 @@ post_install() { # Using the archive is the only way to get builds to keep working after the # new version is out. LibreSSL patches for stunnel 5.35 don't yet work. Not # enough is made conditional. +# -- +# It is important to note that upstream has expressly refused to support +# LibreSSL. +# -- # Significant thanks to the OpenBSD project for creating patch sets for 5.37 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and # modify the configuration samples to chroot and use this by default. # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to # be out of line with what libressl provides. # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)' -# This is probably not a security problem. -# As of 5.39_2 it is patched to avoid the function call if using LibreSSL, -# and a different call to SSL_CTX_sess_set_get_cb gets a const unsigned char -# * instead of an unsigned char * +# This is probably not a security problem. EDIT: Well, it would break. Badly. +# -- +# As of 5.39_2 the code now doesn't use above function call if using LibreSSL, +# and a different call to SSL_CTX_sess_set_get_cb gets a const unsigned char * +# instead of an unsigned char * +# -- +# As of 5.41_1 there are only two sorts of code warnings: +# conversion 'long int' from 'long unsigned int' for what appear to be flags +# and SSL_SESSION* (*)(struct ssl_st *, unsigned char *, int, int*) expected +# got SSL_SESSION* (*)(struct ssl_st *, const unsigned char *, int, int*) +# These are not being considered issues. diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template index 8346a245ab0..52c247fe59f 100644 --- a/srcpkgs/subtle/template +++ b/srcpkgs/subtle/template @@ -7,7 +7,7 @@ hostmakedepends="mercurial ruby-devel pkg-config" makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel libXinerama-devel libXrandr-devel libXtst-devel" short_desc="Manual tiling window manager" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://subtle.subforge.org" conf_files="/etc/xdg/subtle/subtle.rb" diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template index 0b3c0166d47..353879cac84 100644 --- a/srcpkgs/subversion/template +++ b/srcpkgs/subversion/template @@ -1,7 +1,7 @@ # Template file for 'subversion' pkgname=subversion version=1.9.5 -revision=1 +revision=2 short_desc="Enterprise-class centralized version control for the masses" maintainer="Juan RP " license="Apache-2.0, BSD" diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template index f2bc885c9f0..1b9a7b35929 100644 --- a/srcpkgs/sudo/template +++ b/srcpkgs/sudo/template @@ -18,6 +18,14 @@ license="ISC, BSD, zlib" distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz" checksum=237e18e67c2ad59ecacfa4b7707198b09fcf84914621585a9bc670dcc31a52e0 +post_configure() { + case "$XBPS_TARGET_MACHINE" in + i686-musl) find -type f -exec sed -i "{}" \ + -e "s;-fstack-protector-strong;-fno-stack-protector;g" \; + ;; + esac +} + pre_install() { find ${wrksrc} -type f -name Makefile -exec sed -i 's,$(INSTALL_OWNER),,g' {} \; } diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index 4384965cdbd..0b70448710b 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -7,7 +7,7 @@ build_style=cmake hostmakedepends="pkg-config" makedepends="jack-devel fftw-devel qt5-webkit-devel yaml-cpp-devel libsndfile-devel libXt-devel qt5-sensors-devel avahi-libs-devel qt5-declarative-devel qt5-devel qt5-plugin-odbc qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-mysql qt5-plugin-pgsql qt5-location-devel qt5-tools-devel emacs" short_desc="An environment and programming language for real time audio synthesis" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://github.com/supercollider/supercollider" distfiles="https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2" diff --git a/srcpkgs/surf/template b/srcpkgs/surf/template index a06b83e93ed..c6a50717c2c 100644 --- a/srcpkgs/surf/template +++ b/srcpkgs/surf/template @@ -1,21 +1,21 @@ # Template file for 'surf' pkgname=surf -version=0.7 -revision=2 +version=2.0 +revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" -makedepends="webkitgtk2-devel" +makedepends="webkit2gtk-devel" short_desc="Simple web browser based on WebKit/GTK+" maintainer="Juan RP " license="MIT" homepage="http://surf.suckless.org" distfiles="http://dl.suckless.org/surf/$pkgname-$version.tar.gz" -checksum=95608546fb64d01c7a8153c356be0e284ebe120c3c596a94eb3f3ad47e1c494a +checksum=faee4c7a62c38fc9791eff1ad06787c3c9b2b79f338806827f5152a7bc54951d do_build() { sed -i 's,/usr/include,,g;s,/usr/lib,,g' config.mk sed -i "/CFLAGS/s|\${CPPFLAGS}|& $CFLAGS|g" config.mk - sed -i "/LDFLAGS/s|\-g|$LDFLAGS|g" config.mk + sed -i "/LDFLAGS/s|\-s|$LDFLAGS|g" config.mk make CC=$CC ${makejobs} } diff --git a/srcpkgs/suricata/files/suricata/run b/srcpkgs/suricata/files/suricata/run new file mode 100644 index 00000000000..586e6cc8e34 --- /dev/null +++ b/srcpkgs/suricata/files/suricata/run @@ -0,0 +1,6 @@ +#!/bin/sh +exec 2>&1 +[ -r conf ] && . ./conf +mkdir -p /var/log/suricata /var/{lib,log}/suricata +chown -R suricata:suricata /var/{lib,log}/suricata +exec suricata -i ${INTERFACE:=eth0} ${OPTS} diff --git a/srcpkgs/suricata/template b/srcpkgs/suricata/template index 8cfedcb08f0..f206c55d5b9 100644 --- a/srcpkgs/suricata/template +++ b/srcpkgs/suricata/template @@ -1,21 +1,38 @@ # Template file for 'suricata' pkgname=suricata version=3.2.1 -revision=1 +revision=4 build_style=gnu-configure +configure_args="--disable-gccmarch-native" hostmakedepends="pkg-config" makedepends="libnet-devel libpcap-devel pcre-devel libyaml-devel libcap-ng-devel file-devel" short_desc="Next Generation Intrusion Detection and Prevention Engine" maintainer="demiaster " license="GPL-2" homepage="https://suricata-ids.org/" -distfiles="https://www.openinfosecfoundation.org/download/$pkgname-$version.tar.gz" -checksum=0e0b0cf49016804bb2fb1fc4327341617e76a67902f4e03e0ef6d16c1d7d3994 +distfiles="https://www.openinfosecfoundation.org/download/$pkgname-$version.tar.gz +https://rules.emergingthreats.net/open/suricata/emerging.rules.tar.gz" +checksum="0e0b0cf49016804bb2fb1fc4327341617e76a67902f4e03e0ef6d16c1d7d3994 +82f7bbfd45f101a2247f62021bd304db1a6c246ed29b1771ed5cd53ac4b4af31" + +system_accounts="$pkgname" +confs_files="/etc/$pkgname/* /etc/$pkgname/rules/*" + +post_build() { + sed -i 's|#run-as:|run-as:|g' $pkgname.yaml + sed -i "s|# user: suri| user: $pkgname|g" $pkgname.yaml + sed -i "s|# group: suri| group: $pkgname|g" $pkgname.yaml + sed -i "s|#daemon-directory: \"/\"|daemon-directory: \"/var/lib/suricata\"|g" $pkgname.yaml +} post_install() { - vinstall $pkgname.yaml 644 etc/$pkgname/$pkgname.yaml - vinstall classification.config 644 etc/$pkgname/classification.config - vinstall reference.config 644 etc/$pkgname/reference.config + vsv $pkgname + vinstall $pkgname.yaml 644 etc/$pkgname + vinstall classification.config 644 etc/$pkgname + vinstall reference.config 644 etc/$pkgname + vinstall threshold.config 644 etc/$pkgname vmkdir etc/$pkgname/rules vcopy rules/*.rules etc/$pkgname/rules + vcopy ../rules/*.rules etc/$pkgname/rules + vlicense ../rules/LICENSE emerging-rules.LICENSE } diff --git a/srcpkgs/sv-netmount/files/netmount/conf b/srcpkgs/sv-netmount/files/netmount/conf new file mode 100644 index 00000000000..34f6faa8e00 --- /dev/null +++ b/srcpkgs/sv-netmount/files/netmount/conf @@ -0,0 +1,11 @@ +# Configuration for netmount service + +# List of network filesystems +NETWORK_FS="nfs,nfs4,cifs,ceph,glusterfs,fuse.sshfs,davfs" + +# Put here the network manager service name you use +# If you set static ip from rc.local leave commented or empty +#NETWORK_MANAGER=connmand + +# You can specify your gateway or let it be detected +#GATEWAY=192.168.1.1 diff --git a/srcpkgs/sv-netmount/files/netmount/finish b/srcpkgs/sv-netmount/files/netmount/finish new file mode 100755 index 00000000000..86749ee5678 --- /dev/null +++ b/srcpkgs/sv-netmount/files/netmount/finish @@ -0,0 +1,15 @@ +#!/bin/sh +# Load user defined variables +[ -r conf ] && . ./conf + +# Don't do anything if ./run didn't exit properly +[ "$1" -eq 1 ] && exit 0 + +# Simply umount network filesystems +umount -a -f -t $NETWORK_FS > /dev/null 2>&1 +ret=$? +[ $ret -ne 0 ] && umount -a -f -l -t $NETWORK_FS > /dev/null 2>&1 + +umount -a -f -O _netdev > /dev/null 2>&1 +ret=$? +[ $ret -ne 0 ] && umount -a -f -l -O _netdev > /dev/null 2>&1 diff --git a/srcpkgs/sv-netmount/files/netmount/run b/srcpkgs/sv-netmount/files/netmount/run new file mode 100755 index 00000000000..6214befa9c8 --- /dev/null +++ b/srcpkgs/sv-netmount/files/netmount/run @@ -0,0 +1,22 @@ +#!/bin/sh +# Load user defined variables +[ -r conf ] && . ./conf + +# Ensure the network manager is running +[ -z "$NETWORK_MANAGER" ] || sv check "$NETWORK_MANAGER" 2> /dev/null || exit 1 + +# If it's running or not in used - rc.local - discover default gateway +if [ -z "$GATEWAY" ]; then + set -- $(ip route show | grep default) + GATEWAY="$3" +fi + +ping -W 1 -c 1 $GATEWAY > /dev/null 2>&1 || exit 1 + +# Network is up and running so now mount network filesystems from fstab +mount -a -t "$NETWORK_FS" || exit 1 +mount -a -O _netdev || exit 1 + +# Then wait to behave like the service is up +exec chpst -b netmount pause + diff --git a/srcpkgs/sv-netmount/template b/srcpkgs/sv-netmount/template new file mode 100644 index 00000000000..0a062a5d2e2 --- /dev/null +++ b/srcpkgs/sv-netmount/template @@ -0,0 +1,16 @@ +# Template file for 'sv-netmount' +pkgname=sv-netmount +version=0.1 +revision=1 +short_desc="Service to mount/umount network filesystems from fstab" +homepage="http://www.voidlinux.eu/" +maintainer="Olivier Mauras " +license="GPL-2" +build_style="meta" + +depends="runit" + +post_install() { + # runit services + vsv netmount +} diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index ee74e286801..b523b98c3ce 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -1,6 +1,6 @@ # Template file for 'sway' pkgname=sway -version=0.11 +version=0.12.2 revision=1 build_style=cmake configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="MIT" homepage="http://swaywm.org" distfiles="https://github.com/SirCmpwn/sway/archive/${version}.tar.gz" -checksum=3d4d18afc849db8704d8da9cb69eb121ea92b27d7fa556acdcc6708f05c84964 +checksum=134387d4da1b912f31c0b23f75722d3896cd2560ef5a37775f75e7057cd4a010 post_install() { vlicense LICENSE diff --git a/srcpkgs/swell-foop/template b/srcpkgs/swell-foop/template index 7cb58fe6366..ca75a95b190 100644 --- a/srcpkgs/swell-foop/template +++ b/srcpkgs/swell-foop/template @@ -1,6 +1,6 @@ # Template file for 'swell-foop' pkgname=swell-foop -version=3.22.2 +version=3.24.0 revision=1 build_style=gnu-configure hostmakedepends="glib intltool itstool pkg-config" @@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Swell%20Foop" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6e0fedc98fb1191779db2de04cfa950357e81e3191164006412b09ad2ef64e67 +checksum=1b2d444e4d399e300afe07a243423c8b3ab1ca32828c749e0be9af48a5904a11 diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template index 1f89ff4ec12..839b2fa6bb1 100644 --- a/srcpkgs/swi-prolog/template +++ b/srcpkgs/swi-prolog/template @@ -1,6 +1,6 @@ # Template file for 'swi-prolog' pkgname=swi-prolog -version=7.4.1 +version=7.4.2 revision=1 wrksrc="swipl-${version}" build_style=gnu-configure @@ -12,8 +12,9 @@ short_desc="Comprehensive free Prolog environment" maintainer="Leah Neukirchen " license="LGPL-2.1" homepage="http://www.swi-prolog.org/" +_changelog="http://www.swi-prolog.org/ChangeLog?branch=stable" distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz" -checksum=891e314e8f5d856ef71d8bbce5d255a18b0c8f227628748bb0e1e19473273cc1 +checksum=7f17257da334bc1e7a35e9cf5cb8fca01d82f1ea406c7ace76e9062af8f0df8b nocross=yes post_extract() { diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template index 393735f7423..476cfd89685 100644 --- a/srcpkgs/swiften/template +++ b/srcpkgs/swiften/template @@ -1,7 +1,7 @@ # Template file for 'swiften' pkgname=swiften version=3.0 -revision=3 +revision=5 build_style=scons hostmakedepends="scons" makedepends="boost-devel libressl-devel libxml2-devel libidn-devel" diff --git a/srcpkgs/sydbox/template b/srcpkgs/sydbox/template index 1cc14ee93c9..a5c5499be87 100644 --- a/srcpkgs/sydbox/template +++ b/srcpkgs/sydbox/template @@ -7,7 +7,7 @@ build_style=gnu-configure hostmakedepends="automake pkg-config libtool pinktrace-devel" makedepends="pinktrace-devel" short_desc="A ptrace() sandbox utility" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="MIT" homepage="http://dev.exherbo.org/~alip/sydbox/sydbox.html" distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz" diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template index 49806d10365..a76264ea4ba 100644 --- a/srcpkgs/sylpheed/template +++ b/srcpkgs/sylpheed/template @@ -1,7 +1,7 @@ # Template build file for 'sylpheed'. pkgname=sylpheed version=3.5.1 -revision=2 +revision=3 lib32disabled=yes build_style=gnu-configure configure_args="--disable-compface --disable-gtkspell --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr" diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template index 0ea6769b665..54e806c335e 100644 --- a/srcpkgs/syncthing/template +++ b/srcpkgs/syncthing/template @@ -1,6 +1,6 @@ # Template file for 'syncthing' pkgname=syncthing -version=0.14.24 +version=0.14.27 revision=1 build_style=go go_import_path="github.com/syncthing/syncthing" @@ -12,7 +12,7 @@ maintainer="Duncaen " license="MPLv2" homepage="http://syncthing.net/" distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz" -checksum=6538536d4c1c17dc20e1f1253f7a393ea7cf2f993d27b41e74d98af5963c2fc3 +checksum=27051df042b73df7cbee590a56a75931a63e228dcd5c044d0950e14b46730d64 pre_build() { GOARCH= go run script/genassets.go gui > ./lib/auto/gui.files.go diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template index b543e936fa3..a706329ce59 100644 --- a/srcpkgs/synergy/template +++ b/srcpkgs/synergy/template @@ -1,7 +1,7 @@ # Template file for 'synergy' pkgname=synergy version=1.8.8 -revision=1 +revision=2 wrksrc="${pkgname}-${version}-stable" build_style=cmake hostmakedepends="unzip pkg-config" diff --git a/srcpkgs/synfig/patches/fix-isnan.patch b/srcpkgs/synfig/patches/fix-isnan.patch deleted file mode 100644 index 6428fe18c72..00000000000 --- a/srcpkgs/synfig/patches/fix-isnan.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- src/synfig/time.cpp 2015-07-09 09:33:03.000000000 +0200 -+++ src/synfig/time.cpp 2015-10-20 02:51:23.394773482 +0200 -@@ -319,5 +319,5 @@ - bool - Time::is_valid()const - { -- return !isnan(value_); -+ return !std::isnan(value_); - } diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template index bbe19de5f68..664aa8a6cf6 100644 --- a/srcpkgs/synfig/template +++ b/srcpkgs/synfig/template @@ -1,7 +1,7 @@ # Template file for 'synfig' pkgname=synfig -version=1.0.2 -revision=3 +version=1.2.0 +revision=2 build_style=gnu-configure hostmakedepends="boost-build ImageMagick pkg-config" makedepends="ETL gettext-devel libxml++-devel mlt-devel @@ -12,7 +12,7 @@ maintainer="Diogo Leal " license="GPL-3" homepage="http://www.synfig.org/" distfiles="${SOURCEFORGE_SITE}/synfig/releases/${version}/source/synfig-${version}.tar.gz" -checksum=34cdf9eac90aadea29fb2997e82da1c32713ab02940f7c8873330f894e167fb4 +checksum=611ea9f156188c9ecbb99a21116b5330e5070c51a0ffa721c7791c46ec231dbf nocross=yes CXXFLAGS="-std=c++11" diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index de23bd77874..0a6373b1720 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -1,7 +1,7 @@ # Template file for 'sysdig' pkgname=sysdig -version=0.15.0 -revision=1 +version=0.15.1 +revision=2 build_style=cmake configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF" @@ -17,7 +17,7 @@ license="GPL-2" homepage="http://www.sysdig.org/" _changelog="https://github.com/draios/sysdig/releases" distfiles="https://github.com/draios/${pkgname}/archive/${version}.tar.gz" -checksum=824bfd44c89d60e56a5a7a81a505ec91b6afcb3fd3962bf5697a9afe7ebe5723 +checksum=4b404e15da9050742e62f3d65e0013fb497f84132ead4da61ba658c4f3d33a74 nocross=yes disable_parallel_build=yes only_for_archs="i686 x86_64" diff --git a/srcpkgs/syslinux/template b/srcpkgs/syslinux/template index d8933a72c1f..15cff728fdf 100644 --- a/srcpkgs/syslinux/template +++ b/srcpkgs/syslinux/template @@ -1,7 +1,7 @@ # Template file for 'syslinux' pkgname=syslinux version=6.03 -revision=3 +revision=4 hostmakedepends="perl python nasm" makedepends="gnu-efi-libs libuuid-devel" short_desc="A boot loader for the Linux operating system" @@ -17,7 +17,7 @@ pre_build() { # Do not try to build the Windows or DOS installers and DIAG files sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i Makefile sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i Makefile - sed 's|dosutil/*.com dosutil/*.sys||g' -i Makefile + sed 's|dosutil/\*.com dosutil/\*.sys||g' -i Makefile sed 's|dos/syslinux.com||g' -i Makefile sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i Makefile sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i Makefile diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template index f5314b65b1e..a353411bf94 100644 --- a/srcpkgs/tab/template +++ b/srcpkgs/tab/template @@ -1,14 +1,14 @@ # Template file for 'tab' pkgname=tab -version=6.1 +version=6.2 revision=1 -wrksrc="tkatchev-tab-388a97e074ce" +wrksrc="tkatchev-tab-948c36918511" short_desc="Shell language for text/number manipulation" maintainer="Leah Neukirchen " license="Boost Software License 1.0" -homepage="http://tkatchev.bitbucket.org/tab/" +homepage="http://tkatchev.bitbucket.io/tab/" distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2" -checksum=63f5b44bc522e365a72e4eb98ce06af790bd63b67073214c08d8dfcbeb305961 +checksum=5a456269def9bb6a5ce1fe49a2fb5d0b320b797eb33012e618b6437f5af17cad do_build() { ${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template index 1f70ff2fa53..0e9ce251738 100644 --- a/srcpkgs/tag/template +++ b/srcpkgs/tag/template @@ -1,12 +1,12 @@ # Template file for 'tag' pkgname=tag version=1.3.0 -revision=3 +revision=4 build_style=go hostmakedepends="git mercurial" go_import_path="github.com/aykamko/${pkgname}" short_desc="Instantly jump to your ag matches" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/aykamko/tag" distfiles="https://${go_import_path}/archive/${version}.tar.gz" diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template index a8afc02df2b..e8bc03bc846 100644 --- a/srcpkgs/taglib/template +++ b/srcpkgs/taglib/template @@ -1,7 +1,7 @@ # Template file for 'taglib' pkgname=taglib version=1.11.1 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON" hostmakedepends="pkg-config" diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template index c3f464453f0..a3c125043f6 100644 --- a/srcpkgs/tbb/template +++ b/srcpkgs/tbb/template @@ -7,7 +7,7 @@ _rv="${version##*.}" wrksrc="$pkgname${_lv}_${_rv}oss" build_style=gnu-makefile short_desc="Intel Threading Building Blocks" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://www.threadingbuildingblocks.org" distfiles="https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${_lv}_${_rv}oss_src.tgz" diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template index 77d5eff82dd..1beb44905e5 100644 --- a/srcpkgs/tcpdump/template +++ b/srcpkgs/tcpdump/template @@ -1,7 +1,7 @@ # Template file for 'tcpdump' pkgname=tcpdump version=4.9.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-ipv6 td_cv_buggygetaddrinfo=no" makedepends="libpcap-devel libressl-devel" diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template index 67a8c93564e..6ef11b9ceb3 100644 --- a/srcpkgs/tcpflow/template +++ b/srcpkgs/tcpflow/template @@ -1,7 +1,7 @@ # Template file for 'tcpflow' pkgname=tcpflow version=1.4.5 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="automake" makedepends="libpcap-devel zlib-devel libressl-devel boost-devel" diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template index dc6c619fd41..daa96c5d99d 100644 --- a/srcpkgs/tcsh/template +++ b/srcpkgs/tcsh/template @@ -1,7 +1,7 @@ # Template file for 'tcsh' pkgname=tcsh version=6.20.00 -revision=1 +revision=2 build_style=gnu-configure register_shell="/bin/tcsh /bin/csh" conf_files="/etc/csh.login /etc/csh.cshrc" @@ -16,6 +16,13 @@ checksum=b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d post_extract() { sed -i '/define BSDWAIT/d' sh.proc.c } +pre_configure() { +case "$XBPS_TARGET_MACHINE" in + *-musl) + sed -e ';s/# undef SYSMALLOC/# define SYSMALLOC/g' -i config_f.h + ;; +esac +} pre_build() { make CC_FOR_GETHOST="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" gethost } diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template index 7d796b899ac..e86c12395d9 100644 --- a/srcpkgs/tdb/template +++ b/srcpkgs/tdb/template @@ -1,6 +1,6 @@ # Template build file for 'tdb'. pkgname=tdb -version=1.3.12 +version=1.3.13 revision=1 build_style=gnu-configure hostmakedepends="pkg-config python libxslt docbook-xsl" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://tdb.samba.org/" distfiles="http://samba.org/ftp/tdb/tdb-$version.tar.gz" -checksum=60134e32253cac8e2efe5e0185d20123c208bcf6ad15edf2f50d80daadf8c348 +checksum=0db04678ae16a8150e0976f6958ee4db46aaef789b9d3e40dab53f0f6414b868 do_configure() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template index 1bedfdc97f1..27e489adbf2 100644 --- a/srcpkgs/telepathy-salut/template +++ b/srcpkgs/telepathy-salut/template @@ -1,7 +1,7 @@ # Template file for 'telepathy-salut' pkgname=telepathy-salut version=0.8.1 -revision=12 +revision=13 lib32disabled=yes build_style=gnu-configure configure_args="--disable-tests --disable-plugins --with-tls=openssl diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template index 9021f65f9d6..4e31f0408e0 100644 --- a/srcpkgs/terraform/template +++ b/srcpkgs/terraform/template @@ -1,15 +1,15 @@ # Template file for 'terraform' pkgname=terraform -version=0.8.8 +version=0.9.4 revision=1 build_style=go short_desc="A tool for building, changing, and combining infrastructure" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="MPL-2.0" homepage="https://www.terraform.io/" go_import_path="github.com/hashicorp/$pkgname" distfiles="https://$go_import_path/archive/v$version.tar.gz" -checksum=030714052a63dbdadc7cf290256a1c88ccad53650481129528495dd271ee11d2 +checksum=aeb7ae29a8da6035d995ffb00f767911746165f4cb7432657d361f399370f377 case "${XBPS_TARGET_MACHINE}" in arm*) broken="https://build.voidlinux.eu/builders/armv7l_builder/builds/1032/steps/shell_3/logs/stdio" ;; diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template index 9b3f0d00f19..3f041b8fd5d 100644 --- a/srcpkgs/tesseract-ocr/template +++ b/srcpkgs/tesseract-ocr/template @@ -1,7 +1,7 @@ # Template file for 'tesseract-ocr' pkgname=tesseract-ocr version=3.05.00 -revision=2 +revision=3 wrksrc=tesseract-${version} _tessdata_ver=8bf2e7ad08db9ca174ae2b0b3a7498c9f1f71d40 build_style=gnu-configure diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template index 6c7bf5173f9..599a5a299b6 100644 --- a/srcpkgs/testdisk/template +++ b/srcpkgs/testdisk/template @@ -1,7 +1,7 @@ # Template file for 'testdisk' pkgname=testdisk version=7.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--without-ewf --enable-sudo" makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template index 523ee68105c..5fc5abcfc01 100644 --- a/srcpkgs/testssl.sh/template +++ b/srcpkgs/testssl.sh/template @@ -1,17 +1,16 @@ # Template file for 'testssl.sh' pkgname=testssl.sh -version=2.6 -revision=2 +version=2.8 +revision=1 depends="libressl" short_desc="Command line tool which checks a server for the support of TLS/SSL" maintainer="Enno Boland " license="GPL-2" homepage="http://testssl.sh" distfiles="https://github.com/drwetter/testssl.sh/archive/v$version.tar.gz" -checksum=286b3285f096a5d249de1507eee88b14848514696bc5bbc4faceffa46b563ebd +checksum=76763037e0ef89753fabed5620a24e163b70b4acedeb73448d1f116ba5214975 noarch=yes - do_install() { vbin testssl.sh } diff --git a/srcpkgs/texmaker/template b/srcpkgs/texmaker/template index dfef6218e77..bbf19a7de65 100644 --- a/srcpkgs/texmaker/template +++ b/srcpkgs/texmaker/template @@ -6,7 +6,7 @@ build_style=qmake hostmakedepends="qt5-qmake pkg-config" makedepends="poppler-qt5-devel qt5-webkit-devel qt5-script-devel" short_desc="Free cross-platform LaTeX editor" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://www.xm1math.net/texmaker/index.html" distfiles="http://www.xm1math.net/$pkgname/$pkgname-$version.tar.bz2" diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template index e6311c96567..b3ef43e43a0 100644 --- a/srcpkgs/texstudio/template +++ b/srcpkgs/texstudio/template @@ -1,6 +1,6 @@ # Template file for 'texstudio' pkgname=texstudio -version=2.12.2 +version=2.12.4 revision=1 build_style=qmake short_desc="Powerful Tex/LaTeX editor based on texmaker" @@ -8,7 +8,7 @@ maintainer="Piraty " license="GPL-3" homepage="http://texstudio.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/TeXstudio%20${version}/${pkgname}-${version}.tar.gz" -checksum=3ffdaf0a3cb8bb9801e68ecba7641778b94121b4320de8751b79f2d8718cdcb1 +checksum=dc4752bd8a1c5249d87ccda780822aba65c59c607419b4cc0c0a788f953b210d wrksrc="${pkgname}${version}" hostmakedepends="pkg-config qt5-qmake" makedepends="qt5-webkit-devel qt5-svg-devel qt5-script-devel qt5-tools-devel" diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template index 4f0cd7f30d1..1650ea6c0ae 100644 --- a/srcpkgs/thefuck/template +++ b/srcpkgs/thefuck/template @@ -1,7 +1,7 @@ # Template file for 'thefuck' pkgname=thefuck -version=3.14 -revision=3 +version=3.15 +revision=1 build_style=python2-module pycompile_module="thefuck" noarch=yes @@ -13,7 +13,7 @@ maintainer='Benjamin "Doctors" Hoffmeyer ' license="MIT" homepage="https://github.com/nvbn/thefuck" distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz" -checksum=5757d7ba05ead08e867ab6b41e34d6f27fe38d5bb8af1ffc097aeed5ccc9c72f +checksum=30d0c1e2c2540396c9719316f2f0d14fa1820ee8c71d6f160bc4d50283d0aaef post_install() { vlicense LICENSE.md diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template index 6a52c9f2005..664bca87077 100644 --- a/srcpkgs/thermald/template +++ b/srcpkgs/thermald/template @@ -9,7 +9,7 @@ build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="dbus-glib-devel libxml2-devel glib-devel libgomp-devel" short_desc="The Linux Thermal Daemon program from 01.org" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://github.com/01org/${_pkgname}" distfiles="${homepage}/archive/v${version}.tar.gz" diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index 0bc40c62ca6..325e2bf68c8 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -1,6 +1,6 @@ # Template file for 'thunderbird-i18n' pkgname=thunderbird-i18n -version=45.7.1 +version=52.1.0 revision=1 build_style=meta homepage="https://www.mozilla.org/thunderbird/" @@ -99,61 +99,61 @@ _pkgtmpl() { } } -checksum="64d4bf7ae5b134921b23cf4cad64c4f53a6f8dd84bc0e2c5b7fe48ab54351659 - 88058bc53d278e94b13fa080eefd0aa55b1a4db395c1eae6fd4b74bc07d0e92b - 99500e9056b013a54da2436c1b00807b2e58c6de3591c2215ecdbbddd35b525f - a57be6f20d3298ffc7cf05a4c1b541f4a2afd44943558ec1e00da08c5636c99a - e94839bf309c31830498f0a3a4c7a6c8f26312c295c029db1b41df6756524bd9 - 98e42508ff614c4ac1cb43732f1ff3a0efe20615a3d1a4177d4488ff87f923f7 - ae5e378034cc754889cdd964d631b8f4e8cb4940f465937bb89a5c0b9898ebc7 - 4af2d7c93c0cce6062f3cf47aa47395388be51fe9caf4b206857c860b1091081 - c264d06fd73fbcecc609b0bcdea6ea58ea51bbd9e485dfad31fbcdb5bb8af4c0 - 495ab8331c2578e3a71751cafb2cae937e42125713e4a68f1e21a34f2249d067 - fb9026189a2e2f6d2cd83ea3c50a983ebcb1014d3ecdf7666a18b520bd18dc09 - f54ffa1d5ef0d17e996da758f427817e7abe13fee5895bee5379b4566545d869 - d0798c5fbe1be6ef6147b2ca7c93d48522ff6721ed6422bec98878d6b64dd65a - 18ed3f53c6664e21a96ca1e86f2f6ea494cd948733c576a3adeec61b454c4829 - 94cf35f455941db5b9d82d2b7473a46adc19e2ca7808f766945a481185755612 - 2db090f80c7038fa4f39bf88f74cd2e2938c7b39be622db65404d6af56b38263 - e5f7af2740f8c01aa36e657824be51c758fe068dc89bfc6939d3e6cb04fd4209 - 68e1d07a63a242807cdca85c8a0a14e4c5f0da5e38eb09d16f86ff07580107ba - 47e0b18f66fc66bdd562f218fc07e6f28215813302a20ec2484b131172f17878 - 3a3d1651b58df480813afc791da6fac68955aecaab5101045a13f87587aae695 - 4319105423683e3bfff62dfaf641f325b5311b6067a4e36b4b3920f7761eea27 - 79a33520bd11288d96b5eaa7749a2892f397fbd14193858236be8630a0d6384e - 708172a893d1facd30ce7aec1884e2b63cccb8e659e5a27458dfa5e46e0a5c78 - fada9422cc41c75042a814b0fa4e33443079772760495dd8bae7ea83b932ce61 - e433772cd7c581a3920a394802a7a08fb43d9fcba3a234c6bab45bc6e06033c4 - fd21b3f57a7edd7476a6e19218a3d02638aa7eb2b36c5df3f545b7841c2c0553 - 08f5bd9b11ce6254778600d3c73878ddd74d2a167fcb8083dd743bcabb0b9000 - 5309288c86b16f682f069866e7a72fc0942e99e88c9255c9c54325dd36f62c2e - fd1f0b5d11893f9645d8344a2607ad59986f9fc6db5dd41014428605e4e8d946 - 34baa7c614bf2dbc959870690dd0ce0f395aa7823d1ad735bd196974cdd5aacb - be4d0bb1a591bb7f35c3a4fe43690ce2bd1ffd01e4ecd410803adb0dc059cbab - c6fb89f2b062ccbfadc8d5be7bbd7249687889e7a9786685e1046120d20b9258 - d05b2e3112479bf3c21b4347f4d6e9fed4f47e5cb520183adf70e5c9274a7b9a - 692d332fd800a05c2d29cf3a46da3eb60e8af5f917ec4fb484ea5190a3a2e3e7 - c9e12d4f060d3107db92b36a9a575db284625d6ff6cbbca02bb6a5c33640a8fa - c266202d59fc903ad4ea79192ca05fb9f3539af27cf0351b696ef22d2fcbb477 - 99806ab184a996595c426ed88a8cc72d4d948580983378117041c06e401eeaa9 - 47f38dd509a998684af7baa6badd865b89cfde3b9d65dc28cc21f64421bbbeab - 2bafdd946d90ce34ba6ec2866666ae0d0fc425cde402931cc9073fece5f2e56e - b53b5c02f45944dcf53e87c919daab561a0e63dc077252af0531653b34f8637c - dcc012fd8e4f58e50de1e15b6bb2d77597ad0db0481f86d903e31182b6c1c6b7 - 129512ed1d713235f2b87218675e76040add02858f46c0d3e36d5f43712c3e99 - ee3ed5d1d6d3308a506dec6e072867ee631186114588399a4a797ef64afd2401 - 1f164db6a8ba26d2400980346c0979a3a25bb05d03159a7bafbc695ec49544b2 - abee9b9a245b7fc7298481cb315cb21feeb98edab27a6818691c020a3ebf4e79 - d533a1a29c946b4dc26f41bed4b1db0ed0d2a25052e5ad94a196bdd9bc158f00 - cfc36a29ea501d43e418dfb5cdec6211a72029e210dfc668f5fc8a3560211bb7 - ae3176c6271263c5e5edf8f8795f6e21b28a2414082be55578a44980180a2165 - 6f3da3412445643ab061bd035b9ea47efe45be0cb3e7119469ae0d367861fb68 - 0588f3a64ddf0d13571d8c16ed4bb17dcdf8180d1dd3a520e85ad08753a8365f - 3f51e7bdc64a7dd0e04247d379d870b06ae07680bfefb9f2c5a1bda97e725fdf - 1dfe7a109a703f07171c7a9857e11534382756b7d7afd220a0102c2bb8132edd - cb8a1c1ce7feb4b972041dd3971adb591c434001a2eb9a0fcad9f96d85ad62f8 - 1434b31ab137d76b4ea4f0ce0038133ab55be4a07e7ab18d95d4ed9af0570eee - de694c24e60f471c5badd3327341c4e93010cdb221b92e03ac9697e0eaa1c416 - 32f546bda57ff04b1267b17a891dc07b8a6e68fcafe2e42ac3592b4b7e8978e8 - 971bfbcd7989c53ed64541797cb72f3bb4a32b088d4ce0ec7be36cbd9f665911 - e0f4ce434e7140216e4af69dbbd45eeb82a4ed311d9ff9619a41027d5a2a261b" +checksum="cd1d424120449b922d970b3fee89d753ae231354e4181a4d4700dc807504f6d1 + d920be2b1070c04a806745a91e15ab1139d5d2e97480755dd62642bc15222c40 + 9da12e3f1b9bccddddb673c7e8b613badecd2e71b28aaaccf16ea6ec4a64e095 + 151a7deaddafcdfd704abf7f933daafcc1f1465624b01a856f7c0ff02e3b8701 + f281a18cbd823db0331e351f02543249b90d414f9146579b52d45f2826463403 + b31c85a62f99cc6f8e043f52b16f977124f3ba89a0539b064b0b751910496689 + 5bb06005edc6dc5cad1836abf4bf2a79a71912a841ea5dcede9ee04c50410e3f + 41d2fcc1cc5aed3f6036f6337bf93aaa9b37a32e99bd9145f4921a6a927b451b + 28321a38846a06bed47996fe5f68c5579baa6c8804138866c307df0d26147fd5 + ee813026f6312a6f11572422f0bdac9bb866eb820d8fef917bde943747df18c1 + bfa9265887d64317841f85222638ec901cc95ec230670994f2231e65d4952836 + e29a9433a9f7b9b8d17bc4be1f95ebfd2c4982fefc3ca90372ae2d627f20ad71 + eedb7abd583f2a4b7a61f81ad79d5ff02159535faba07fc30088776e75837207 + b916e3be5c5529e321a8defb0397dadc45116d9d06378e86d7007d7babe9fb45 + 803d67f5d6729116b2d1d3ad619c174c122cbe57a51d36f96390f2b563405fa8 + 1140407c98f609ddcfeef4ad9a3538e3c68da86b3fa8a138ab042453e737645b + 1dad4a61a98a594304708eb8c3056463b07482210cf404a1cc5ab96736eb9c94 + b54d1f3692b492ae7792ee42ba6c15e668e3ea76021496464feac0414bfcae52 + 552f2943a37ec9a3f997d904bd5b852d7cdf9977f0b8fbb87b511662f944e986 + aeb4bdb8cd8a5e1933b784e16ce121c6653b4aaa05c2c6f9b056309933521475 + f41fde901cc9210967ec39e3d258ad568d889f07a1f2fb1e10747ef933631cf0 + a7e856a42d8e021f1e1385857525e5ea751ff143ff725aa15eb6e1c6b78c76cd + 78aa1c4f60ffc943b4541d8ebf08a9c804c7f8c0dad3264e6f09aacb1d5c9e74 + d27cd41dd6595ee588e18ed10736d84b2587f192b84efcaa99a172c055513f11 + 8ea7ae7a48e45854e194ff300510a7f10fb064a68bf0c9fa5cc8c54bb860fa44 + 100b0da1c56554c496cf93f1489aff171a6794371e0f2336206f408dc5dbb862 + 5161640824d3cd84dafe08f7fef762dbe00c6ec0cc0ada9669c72e42869804e6 + d32e7b469905e2831a311bf3b541330b530d57d7bc618d9e2f1e01d4fdf337e2 + e8264f71facb7aa89aa73ba19253d7d37b247d01bc98399c1bfcb9749b9b8e57 + 3fcf04ae1c549aa2408b131389bbbf7d96b3f5ae80ee51fbabcaf57f9af73581 + b258b88c3618cf03258e1f2a88b58ed8a9ac8d6f510cbedc65d30fd0d1833a5f + 9a9ac947b7fa56ad90940214a383d1a2e284f1fae723683fdc03cc5cc044a7f9 + 81439f2a46fc2fcbaba27a790d13371bb29944dbce536adf3a4bc88c57c58708 + c614414408bd3ef96c0acae40c01cef76af07457f73ba3388f96ed646d0e93fb + 3f652698258901e7dfc05751b9c44e6c6cb303b9580b8393b85aa5ba532a5145 + 6800858ccd1722bb805a899af954a62cff97feb6645648ee75cfcb8948628cef + dc7703816f06360432c9f7d69eb4db6524db38605bb43dc33fa61be0582ada08 + cc1bf83672eba56775988c6671ac0101330df302ff7d3b34e3f8d84a3486ee2a + 557458360291cf1b69634329b58e9f8d59f0e235ea23fe04c83692784aa05956 + a7fbb749c6222a020cc50ddd11428c16c3fc9b1349b757426b9d2e2204e2356d + 0ecfed322da41c4e6b21a7fab03d61a2436f0f4e0898928f19eac28b52da8a05 + d5b5bec393b299367610794958ac2d7bef54ad2cc9a29ca2559c8c230bf6564b + 998587a0074de0b0a26206c7de2cb83ff5bebd194e7ce184783fcc2d58eefe97 + 33a1c4dc8cee63c7640f7b492c171015b391f88b2629660b83845726925d1604 + f59e4ac38e6f60808bc7552da66a74a9b059f3e6fd8d1aef2999cac3b157de5a + d152fa89d2e6769b00ef8a7c04debc6da8e8a7013a5faf92038651a99172bec9 + f4d0a47bef66689b53506078e961547c0100e7104a5960c9eec2341facad27d5 + 5d57f3e86f4e19daf5fa0fc5cb63aaff646d4cbd47a742c04ba77259c25dffb7 + 56dda066bd8e6367351d0790a2765a05813bf19b65aeab27cbdc133609a30b2c + 8a2773b55f020278f658b7254dcedf0d17154b6f5d63400943cd15bf902c9019 + 09f3de38925c36734471ec2694094211236d1edae433280e7547ec57c8040826 + 5f3705d4270357b3e57fd26131155516fc51a47886a20ef143905e15334dd86a + bb585f6cc8166e5445e84220cd432a99489ea898e58edcd7a0b0f2134ba73acd + d95eeadbf12ae6e554a7f9a1453befc6dc3530b3e441491db4ed96aa7c355463 + 124146d36b56811e02c1f6a849611e4977a2189fd95b793b71347532caf76070 + 8e3c84b436a9d0465507bdf42dd42c9b26d23987fd7f7a46cad8dd9f6ad0afcc + e372440fcafc54328c5df328fc22642924eec67fd05e33f8ad5a15cfdbef878b + 2ba552e364815ddebef45de1e7442add05bd81d34516a512b4f6f59b9c3cfdfa" diff --git a/srcpkgs/thunderbird/files/mozconfig b/srcpkgs/thunderbird/files/mozconfig new file mode 100644 index 00000000000..dbbf6ea1c64 --- /dev/null +++ b/srcpkgs/thunderbird/files/mozconfig @@ -0,0 +1,49 @@ +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +ac_add_options --with-pthreads +# XXX build without system cairo see: +# - https://github.com/voidlinux/void-packages/issues/2308#issuecomment-135426813 +# - https://bugs.gentoo.org/show_bug.cgi?id=558150 +# ac_add_options --with-system-cairo +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-bz2 +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --with-system-icu +# XXX: the system's libpng doesn't have APNG support +ac_add_options --without-system-png +ac_add_options --enable-system-pixman +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi + +ac_add_options --with-nspr-prefix=${XBPS_CROSS_BASE}/usr +ac_add_options --with-nss-prefix=${XBPS_CROSS_BASE}/usr + +nspr_config_args=" + --libdir=${XBPS_CROSS_BASE}/usr/lib + --includedir=${XBPS_CROSS_BASE}/usr/include/nspr" + +nss_config_args=" + --libdir=${XBPS_CROSS_BASE}/usr/lib + --includedir=${XBPS_CROSS_BASE}/usr/include/nss" + +ac_add_options --disable-gconf +ac_add_options --disable-tests +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-elf-hack +ac_add_options --disable-install-strip +ac_add_options --disable-strip +ac_add_options --disable-profiling +ac_add_options --enable-optimize="$CFLAGS" +ac_add_options --enable-pie + +ac_add_options --enable-official-branding +ac_add_options --enable-safe-browsing +ac_add_options --enable-calendar +ac_add_options --enable-application=mail diff --git a/srcpkgs/thunderbird/fix-python-foo.patch b/srcpkgs/thunderbird/fix-python-foo.patch new file mode 100644 index 00000000000..cf05f73046c --- /dev/null +++ b/srcpkgs/thunderbird/fix-python-foo.patch @@ -0,0 +1,23 @@ +reverted from https://hg.mozilla.org/mozilla-central/rev/aa63a2a40325 +--- mozilla/dom/bindings/GenerateCSS2PropertiesWebIDL.py.orig ++++ mozilla/dom/bindings/GenerateCSS2PropertiesWebIDL.py +@@ -16,7 +16,7 @@ + return " [%s] attribute DOMString %s;\n" % (", ".join(extendedAttrs), + propName) + def generate(output, idlFilename, preprocessorHeader): +- cpp = list(buildconfig.substs['CPP']) ++ cpp = shellutil.split(buildconfig.substs['CPP']) + cpp += shellutil.split(buildconfig.substs['ACDEFINES']) + cpp.append(preprocessorHeader) + preprocessed = subprocess.check_output(cpp) +--- mozilla/layout/style/GenerateCSSPropsGenerated.py.orig ++++ mozilla/layout/style/GenerateCSSPropsGenerated.py +@@ -10,7 +10,7 @@ + from mozbuild import shellutil + + def get_properties(preprocessorHeader): +- cpp = list(buildconfig.substs['CPP']) ++ cpp = shellutil.split(buildconfig.substs['CPP']) + cpp += shellutil.split(buildconfig.substs['ACDEFINES']) + cpp.append(preprocessorHeader) + preprocessed = subprocess.check_output(cpp) diff --git a/srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch b/srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch new file mode 100644 index 00000000000..de93efe65b1 --- /dev/null +++ b/srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch @@ -0,0 +1,11 @@ +--- mozilla/mozilla-config.h.in 2016-07-06 15:16:06.621880293 +0200 ++++ mozilla/mozilla-config.h.in 2016-07-06 15:16:42.958428126 +0200 +@@ -54,7 +54,7 @@ + * HUNSPELL_STATIC is defined in extensions/spellcheck/hunspell/src/Makefile.in, + * unless --enable-system-hunspell is defined. + */ +-#if defined(HUNSPELL_STATIC) ++#if 0 + #include "hunspell_alloc_hooks.h" + #include "hunspell_fopen_hooks.h" + #endif diff --git a/srcpkgs/thunderbird/patches/fix-gcc-tests.patch b/srcpkgs/thunderbird/patches/fix-gcc-tests.patch deleted file mode 100644 index 43cbd665cce..00000000000 --- a/srcpkgs/thunderbird/patches/fix-gcc-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- mozilla/configure.orig 2015-05-29 18:30:41.474423097 +0200 -+++ mozilla/configure 2015-05-29 18:30:53.451550589 +0200 -@@ -10966,8 +10966,8 @@ ac_have_llvm_pr8927="no" - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' --ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+ac_compile='${CC-cc} -c conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross - - ---- mozilla/js/src/configure.orig 2015-05-29 18:31:25.049874012 +0200 -+++ mozilla/js/src/configure 2015-05-29 18:31:36.898995291 +0200 -@@ -9820,8 +9820,8 @@ ac_have_llvm_pr8927="no" - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' --ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+ac_compile='${CC-cc} -c conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross - - diff --git a/srcpkgs/thunderbird/patches/fix-gcc6-cpluplus_scope.patch b/srcpkgs/thunderbird/patches/fix-gcc6-cpluplus_scope.patch deleted file mode 100644 index 096acd8323d..00000000000 --- a/srcpkgs/thunderbird/patches/fix-gcc6-cpluplus_scope.patch +++ /dev/null @@ -1,15 +0,0 @@ -Add patch to to correct the source to be compatible with gcc6 by -preventing c++ scope errors. - ---- mozilla/nsprpub/config/make-system-wrappers.pl 2016-05-12 19:10:05.000000000 +0200 -+++ mozilla/nsprpub/config/make-system-wrappers.pl 2016-09-17 15:03:53.901400739 +0200 -@@ -19,7 +19,9 @@ - open OUT, ">$output_dir/$_"; - print OUT "#pragma GCC system_header\n"; # suppress include_next warning - print OUT "#pragma GCC visibility push(default)\n"; -+ print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n"; - print OUT "#include_next \<$_\>\n"; -+ print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n"; - print OUT "#pragma GCC visibility pop\n"; - close OUT; - } diff --git a/srcpkgs/thunderbird/patches/fix-stack-overflow.patch b/srcpkgs/thunderbird/patches/fix-stack-overflow.patch deleted file mode 100644 index 0b0d74daa87..00000000000 --- a/srcpkgs/thunderbird/patches/fix-stack-overflow.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://bugs.alpinelinux.org/issues/5559 -https://bugzilla.mozilla.org/show_bug.cgi?id=1274732 - ---- mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp -+++ mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp -@@ -165,9 +165,8 @@ nsHTTPCompressConv::BrotliHandler(nsIInputStream *stream, void *closure, const c - nsHTTPCompressConv *self = static_cast(closure); - *countRead = 0; - -- const uint32_t kOutSize = 128 * 1024; // just a chunk size, we call in a loop -- unsigned char outBuffer[kOutSize]; -- unsigned char *outPtr; -+ const size_t kOutSize = 128 * 1024; // just a chunk size, we call in a loop -+ uint8_t *outPtr; - size_t outSize; - size_t avail = aAvail; - BrotliResult res; -@@ -177,9 +176,15 @@ nsHTTPCompressConv::BrotliHandler(nsIInputStream *stream, void *closure, const c - return NS_OK; - } - -+ auto outBuffer = MakeUniqueFallible(kOutSize); -+ if (outBuffer == nullptr) { -+ self->mBrotli->mStatus = NS_ERROR_OUT_OF_MEMORY; -+ return self->mBrotli->mStatus; -+ } -+ - do { - outSize = kOutSize; -- outPtr = outBuffer; -+ outPtr = outBuffer.get(); - - // brotli api is documented in brotli/dec/decode.h and brotli/dec/decode.c - LOG(("nsHttpCompresssConv %p brotlihandler decompress %d\n", self, avail)); -@@ -210,7 +215,7 @@ nsHTTPCompressConv::BrotliHandler(nsIInputStream *stream, void *closure, const c - nsresult rv = self->do_OnDataAvailable(self->mBrotli->mRequest, - self->mBrotli->mContext, - self->mBrotli->mSourceOffset, -- reinterpret_cast(outBuffer), -+ reinterpret_cast(outBuffer.get()), - outSize); - LOG(("nsHttpCompressConv %p BrotliHandler ODA rv=%x", self, rv)); - if (NS_FAILED(rv)) { diff --git a/srcpkgs/thunderbird/patches/fix-toolkit.patch b/srcpkgs/thunderbird/patches/fix-toolkit.patch index 90e2c5aaa5a..b7ad8b4f510 100644 --- a/srcpkgs/thunderbird/patches/fix-toolkit.patch +++ b/srcpkgs/thunderbird/patches/fix-toolkit.patch @@ -1,3 +1,18 @@ +--- mozilla/toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig 2016-07-05 21:00:03.672000517 +0200 ++++ mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2016-07-05 21:05:37.347806230 +0200 +@@ -1134,6 +1134,12 @@ + #ifndef __NR_fallocate + #define __NR_fallocate 285 + #endif ++ ++#undef __NR_pread ++#define __NR_pread __NR_pread64 ++#undef __NR_pwrite ++#define __NR_pwrite __NR_pwrite64 ++ + /* End of x86-64 definitions */ + #elif defined(__mips__) + #if _MIPS_SIM == _MIPS_SIM_ABI32 --- mozilla/toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-03-15 05:19:36.000000000 +0000 +++ mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-04-17 10:24:33.793431933 +0000 @@ -45,6 +45,7 @@ @@ -23,29 +38,16 @@ namespace google_breakpad { --- mozilla/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-03-15 05:19:36.000000000 +0000 +++ mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-04-17 10:24:33.793431933 +0000 -@@ -53,9 +53,10 @@ - #include - #endif - --#ifdef HAVE_A_OUT_H -+#if 0 - #include - #endif -+ +@@ -55,7 +55,7 @@ + #ifdef HAVE_MACH_O_NLIST_H #include +-#elif defined(HAVE_A_OUT_H) ++#elif 0 + #include #endif ---- mozilla/toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-03-15 05:19:37.000000000 +0000 -+++ mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-04-17 10:24:33.793431933 +0000 -@@ -2813,7 +2813,7 @@ - LSS_INLINE _syscall6(void*, mmap, void*, s, - size_t, l, int, p, - int, f, int, d, -- __off64_t, o) -+ off_t, o) - - LSS_INLINE _syscall4(int, newfstatat, int, d, - const char *, p, + + --- mozilla/toolkit.orig/mozapps/update/common/updatedefines.h 2014-03-15 05:19:37.000000000 +0000 +++ mozilla/toolkit/mozapps/update/common/updatedefines.h 2014-04-17 10:24:33.793431933 +0000 @@ -105,7 +105,7 @@ diff --git a/srcpkgs/thunderbird/patches/fix-tools.patch b/srcpkgs/thunderbird/patches/fix-tools.patch index 5fcfff919b9..5bb06ef1721 100644 --- a/srcpkgs/thunderbird/patches/fix-tools.patch +++ b/srcpkgs/thunderbird/patches/fix-tools.patch @@ -1,13 +1,3 @@ ---- mozilla/tools/profiler/gecko/local_debug_info_symbolizer.cc -+++ mozilla/tools/profiler/gecko/local_debug_info_symbolizer.cc -@@ -3,6 +3,7 @@ - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -+#include - #include "PlatformMacros.h" - #include "nsAutoPtr.h" - --- mozilla/tools/profiler/core/platform.h +++ mozilla/tools/profiler/core/platform.h @@ -29,6 +29,8 @@ @@ -52,31 +42,3 @@ } void OS::SleepMicro(int microseconds) ---- mozilla/tools/profiler/core/platform.h.orig 2015-11-04 18:27:58.170732586 +0100 -+++ mozilla/tools/profiler/core/platform.h 2015-11-04 18:29:11.898478051 +0100 -@@ -60,9 +60,9 @@ - #include "v8-support.h" - #include - --// We need a definition of gettid(), but glibc doesn't provide a -+// We need a definition of gettid(), but glibc nor musl don't provide a - // wrapper for it. --#if defined(__GLIBC__) -+#if defined(__linux__) - #include - #include - static inline pid_t gettid() ---- mozilla/media/libav/config_unix.h.orig 2015-11-04 18:38:46.660289503 +0100 -+++ mozilla/media/libav/config_unix.h 2015-11-04 18:39:38.620814879 +0100 -@@ -223,7 +223,11 @@ - #define HAVE_STRERROR_R 1 - #define HAVE_STRPTIME 1 - #define HAVE_SYSCONF 1 -+#if !defined(__linux__) || defined(__GLIBC__) - #define HAVE_SYSCTL 1 -+#else -+#define HAVE_SYSCTL 0 -+#endif - #define HAVE_USLEEP 1 - #define HAVE_VIRTUALALLOC 0 - #define HAVE_PTHREADS 0 diff --git a/srcpkgs/thunderbird/patches/patch-mozilla_xpcom_components_Module.h b/srcpkgs/thunderbird/patches/patch-mozilla_xpcom_components_Module.h deleted file mode 100644 index 718bc6468c8..00000000000 --- a/srcpkgs/thunderbird/patches/patch-mozilla_xpcom_components_Module.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_xpcom_components_Module.h,v 1.2 2016/04/17 18:33:50 ryoon Exp $ - ---- mozilla/xpcom/components/Module.h.orig 2016-04-07 21:33:35.000000000 +0000 -+++ mozilla/xpcom/components/Module.h -@@ -125,7 +125,7 @@ struct Module - # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport) - # elif defined(__GNUC__) - # if defined(__ELF__) --# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("protected"))) -+# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("default"))) - # elif defined(__MACH__) - # define NSMODULE_SECTION __attribute__((section("__DATA, .kPStaticModules"), visibility("default"))) - # elif defined (_WIN32) diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 2a7bd566dba..e3bc119d4cc 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -1,137 +1,120 @@ # Template build file for 'thunderbird'. pkgname=thunderbird -version=45.7.1 +version=52.1.0 revision=1 short_desc="Standalone Mail/News reader" maintainer="Enno Boland " homepage="http://www.mozilla.org/thunderbird/" license="MPL-2.0, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=5fc7a39c6a1baacfa37d6a52c9384f70c171dd0bb581576d370bdb29c84b9ffb +checksum=c33ca35b6acd1a0dc0d0f4b1df16745a33144c5d3d3715fe05454a5e9eefd48b +only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes lib32disabled=yes -only_for_archs="i686 i686-musl x86_64 x86_64-musl" -hostmakedepends="unzip zip pkg-config perl python yasm autoconf" +hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm + $(vopt_if rust 'rust cargo')" makedepends=" nss-devel libjpeg-turbo-devel gtk+-devel icu-devel pixman-devel - sqlite-devel pulseaudio-devel libevent-devel libnotify-devel - libvpx-devel libXrender-devel startup-notification-devel - dbus-glib-devel alsa-lib-devel hunspell-devel libXcomposite-devel - libSM-devel libXScrnSaver-devel libXt-devel libXdamage-devel" -depends="desktop-file-utils hicolor-icon-theme" + sqlite-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel + hunspell-devel libXcomposite-devel libSM-devel libXt-devel libXdamage-devel + $(vopt_if alsa alsa-lib-devel) $(vopt_if dbus dbus-glib-devel) + $(vopt_if gtk3 gtk+3-devel) $(vopt_if pulseaudio pulseaudio-devel) + $(vopt_if startup_notification startup-notification-devel) + $(vopt_if xscreensaver libXScrnSaver-devel)" +depends="nss>=3.27 desktop-file-utils hicolor-icon-theme" -if [ "${XBPS_GCC_VERSION_MAJOR}" -gt 5 ]; then - # Append CFLAGS and CXXFLAGS to set work around code which gcc6 would - # otherwise regard as out-of-specification and allow it to produce a - # working program. - CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" - CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" -fi +build_options="alsa dbus gtk3 rust pulseaudio startup_notification xscreensaver" +build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensaver" -pre_configure() { +desc_option_gtk3="Build the GTK+3 toolkit UI" +desc_option_rust="Build rust components" + +case "$XBPS_TARGET_MACHINE" in + x86_64*) build_options_default+=" rust" ;; +esac + +post_extract() { case "$XBPS_TARGET_MACHINE" in *-musl) - # http://git.alpinelinux.org/cgit/aports/plain/community/firefox-esr/stab.h - cp $FILESDIR/stab.h mozilla/toolkit/crashreporter/google-breakpad/src/ + # fix musl rust triplet + sed -i "s/\(x86_64-unknown-linux\)-gnu/\1-musl/" mozilla/build/moz.configure/rust.configure + cp "${FILESDIR}/stab.h" mozilla/toolkit/crashreporter/google-breakpad/src/ ;; esac - # configure script misdetects the preprocessor without an optimization level - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure - # Google API key (see http://www.chromium.org/developers/how-tos/api-keys) # Note: This is for Void Linux use ONLY. - _google_api_key="AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" - echo -n "$_google_api_key" > google-api-key - [ ! -d xbps-build ] && mkdir -p xbps-build + echo -n "AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" >google-api-key } -do_configure() { - local _args +do_build() { + cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig" case "$XBPS_TARGET_MACHINE" in - *-musl) # XXX gold linking with --hash-style=sysv results in unhidden symbols - # XXX see https://sourceware.org/ml/binutils/2014-09/msg00230.html - # - # XXX disable jemalloc. - _args+=" --disable-jemalloc --enable-gold=no" + *-musl) + echo "ac_add_options --disable-jemalloc" >>.mozconfig + echo "ac_add_options --enable-gold=no" >>.mozconfig ;; esac if [ "$CROSS_BUILD" ]; then - _args+=" --target=$XBPS_CROSS_TRIPLET --disable-jemalloc" - - # Make config/system_wrappers/alsa/alsalib.h and pulse/pulse.h find - # the required includes. Set system nspr and nss include paths. export HOST_CFLAGS="${XBPS_CFLAGS}" export HOST_CXXFLAGS="${XBPS_CXXFLAGS}" - export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/alsa \ - -I${XBPS_CROSS_BASE}/usr/include/pulse \ - -I${XBPS_CROSS_BASE}/usr/include/nspr \ - -I${XBPS_CROSS_BASE}/usr/include/nss" - export CXXFLAGS+=" ${CFLAGS}" - export LDFLAGS+=" -L${XBPS_CROSS_BASE}/usr/lib" - export ac_cv_sqlite_secure_delete=yes \ ac_cv_sqlite_threadsafe=yes \ ac_cv_sqlite_enable_fts3=yes \ ac_cv_sqlite_dbstat_vtab=yes \ ac_cv_sqlite_enable_unlock_notify=yes \ ac_cv_prog_hostcxx_works=1 + echo "ac_add_options --target=$XBPS_CROSS_TRIPLET" >>.mozconfig + fi + + if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then + # Append CFLAGS and CXXFLAGS to set work around code which gcc6 would + # otherwise regard as out-of-specification and allow it to produce a + # working program. + export CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" + export CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" fi - mkdir -p /usr/lib/thunderbird export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird" - cd xbps-build - # XXX build without --system-cairo. See: - # - https://github.com/voidlinux/void-packages/issues/2308#issuecomment-135426813 - # - https://bugs.gentoo.org/show_bug.cgi?id=558150 - # Use bundled libpng, our does not have the apng patch. - SHELL=/bin/bash ../configure --prefix=/usr --libdir=/usr/lib \ - --enable-application=mail \ - --with-system-nspr --with-system-nss --with-system-bz2 \ - --with-system-jpeg --with-system-zlib --without-system-png \ - --with-system-libevent --with-system-libvpx \ - --enable-system-pixman --enable-system-hunspell --enable-system-sqlite \ - --enable-system-ffi --enable-startup-notification --disable-gio \ - --with-pthreads --enable-official-branding --enable-safe-browsing \ - --disable-skia --disable-debug --disable-gnomevfs --disable-gconf \ - --disable-crashreporter --disable-updater --disable-xprint --disable-tests \ - --disable-mochitest --disable-installer --disable-elf-hack \ - --with-system-icu --enable-pulseaudio --disable-gstreamer \ - --disable-cpp-exceptions --disable-javaxpcom \ - --with-nspr-prefix=${XBPS_CROSS_BASE}/usr \ - --with-nss-prefix=${XBPS_CROSS_BASE}/usr \ - --with-google-api-keyfile="${wrksrc}/google-api-key" \ - --enable-optimize="$CFLAGS" --disable-strip --disable-install-strip \ - --disable-static --enable-pie --disable-profiling \ - --disable-profilelocking ${_args} -} -do_build() { if [ "$SOURCE_DATE_EPOCH" ]; then - mozdate="MOZ_BUILD_DATE=$(date --date "@$SOURCE_DATE_EPOCH" "+%Y%m%d%H%M%S")" + export MOZ_BUILD_DATE=$(date --date "@$SOURCE_DATE_EPOCH" "+%Y%m%d%H%M%S") fi - cd xbps-build - SHELL=/bin/bash make ${mozdate} ${makejobs} + + export MOZ_MAKE_FLAGS="${makejobs}" + + cat <>.mozconfig +ac_add_options --with-google-api-keyfile="${wrksrc}/google-api-key" +ac_add_options --enable-default-toolkit=cairo-gtk$(vopt_if gtk3 '3' '2') +ac_add_options $(vopt_enable alsa) +ac_add_options $(vopt_enable dbus) +ac_add_options $(vopt_enable dbus necko-wifi) +ac_add_options $(vopt_enable pulseaudio) +ac_add_options $(vopt_enable rust) +ac_add_options $(vopt_enable startup_notification startup-notification) +! + + make -f client.mk build } do_install() { - cd xbps-build - make DESTDIR=${DESTDIR} install + make -f client.mk DESTDIR="$DESTDIR" install vinstall ${FILESDIR}/vendor.js 644 usr/lib/thunderbird/defaults/preferences vinstall ${FILESDIR}/thunderbird.desktop 644 usr/share/applications for i in 16 22 24 32 48 256; do - vinstall ../other-licenses/branding/thunderbird/mailicon${i}.png 644 \ + vinstall other-licenses/branding/thunderbird/mailicon${i}.png 644 \ usr/share/icons/hicolor/${i}x${i}/apps thunderbird.png + done # Use system-provided dictionaries rm -rf ${DESTDIR}/usr/lib/thunderbird/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell ${DESTDIR}/usr/lib/thunderbird/dictionaries - ln -sf /usr/share/hyphen ${DESTDIR}/usr/lib/thunderbird/hyphenation + ln -s /usr/share/hunspell ${DESTDIR}/usr/lib/thunderbird/dictionaries + ln -s /usr/share/hyphen ${DESTDIR}/usr/lib/thunderbird/hyphenation # We don't want the development stuff rm -rf ${DESTDIR}/usr/{include,lib/thunderbird-devel,share/idl} diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template index cb61523875f..e2795df1b87 100644 --- a/srcpkgs/tinc/template +++ b/srcpkgs/tinc/template @@ -1,7 +1,7 @@ # Template file for 'tinc' pkgname=tinc version=1.0.31 -revision=1 +revision=2 build_style=gnu-configure makedepends="zlib-devel lzo-devel libressl-devel" short_desc="VPN (Virtual Private Network) daemon" diff --git a/srcpkgs/tint2/template b/srcpkgs/tint2/template index 271b71c8288..5db1ab1d522 100644 --- a/srcpkgs/tint2/template +++ b/srcpkgs/tint2/template @@ -1,8 +1,8 @@ # Template file for 'tint2' pkgname=tint2 -version=0.12.12 +version=0.14.4 revision=1 -wrksrc="${pkgname}-${version}-e9d6ec9f2301e88857ffa7b287a4a3eb36543940" +wrksrc="${pkgname}-${version}-6df4eb4bee6a4872cfa66fbcb3bafe5b0548f173" build_style=cmake hostmakedepends="pkg-config" makedepends="libXdamage-devel libXcomposite-devel libXinerama-devel libXrandr-devel @@ -13,4 +13,4 @@ maintainer="Juan RP " license="GPL-2" homepage="https://gitlab.com/o9000/tint2" distfiles="https://gitlab.com/o9000/${pkgname}/repository/archive.tar.gz?ref=${version}>${pkgname}-${version}.tar.gz" -checksum=f91b0d4669b6cd7de6a21efe8bf3f26cfe8878ebf1ab8e8804bf0289a650034e +checksum=cdda888ac111017695e2a16d995e92a7d704568bd00af9cf4686225145742a3f diff --git a/srcpkgs/tintin/template b/srcpkgs/tintin/template index f6349a30899..3f0390a110f 100644 --- a/srcpkgs/tintin/template +++ b/srcpkgs/tintin/template @@ -1,7 +1,7 @@ # Template file for 'tintin' pkgname=tintin -version=2.01.1 -revision=5 +version=2.01.2 +revision=1 wrksrc="tt" build_wrksrc="src" build_style=gnu-configure @@ -11,7 +11,7 @@ license="GPL-2" homepage="http://tintin.sourceforge.net/index.php" short_desc="A console-based MUD client" distfiles="${SOURCEFORGE_SITE}/tintin/${pkgname}-${version}.tar.gz" -checksum=cc0ba550880bd5efdba8fde11d1e4ddd4ae8737f81e6f64649de23ed99cbbca4 +checksum=01e11e3cded48ff686b2ea16e767acf1f6b5ea326551ecff091552e89f4a038e post_install() { for i in FAQ SCRIPTS README; do diff --git a/srcpkgs/tinycron/template b/srcpkgs/tinycron/template index 4b24ef6a576..c0c78f6331a 100644 --- a/srcpkgs/tinycron/template +++ b/srcpkgs/tinycron/template @@ -1,7 +1,7 @@ # Template file for 'tinycron' pkgname=tinycron version=0.4 -revision=3 +revision=4 build_style=go go_import_path="github.com/bcicen/tinycron" hostmakedepends="git" diff --git a/srcpkgs/tlsdate/patches/libressl-sslstate.patch b/srcpkgs/tlsdate/patches/libressl-sslstate.patch new file mode 100644 index 00000000000..5207753222b --- /dev/null +++ b/srcpkgs/tlsdate/patches/libressl-sslstate.patch @@ -0,0 +1,11 @@ +--- src/tlsdate-helper.c.orig ++++ src/tlsdate-helper.c +@@ -374,7 +374,7 @@ + openssl_time_callback (const SSL* ssl, int where, int ret) + { + if (where == SSL_CB_CONNECT_LOOP && +- (ssl->state == SSL3_ST_CR_SRVR_HELLO_A || ssl->state == SSL3_ST_CR_SRVR_HELLO_B)) ++ (SSL_state(ssl) == SSL3_ST_CR_SRVR_HELLO_A || SSL_state(ssl) == SSL3_ST_CR_SRVR_HELLO_B)) + { + // XXX TODO: If we want to trust the remote system for time, + // can we just read that time out of the remote system and if the diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template index 79c6f23ddae..b2aad11649e 100644 --- a/srcpkgs/tlsdate/template +++ b/srcpkgs/tlsdate/template @@ -1,7 +1,7 @@ # Template file for 'tlsdate' pkgname=tlsdate version=0.0.13 -revision=7 +revision=9 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure configure_args="--with-polarssl=no ac_cv_func_clock_gettime=yes" diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template index 39fe5fbbc6a..54fc3b58f91 100644 --- a/srcpkgs/tmfs/template +++ b/srcpkgs/tmfs/template @@ -1,7 +1,7 @@ # Template file for 'tmfs' pkgname=tmfs version=r5 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config" makedepends="fuse-devel boost-devel" diff --git a/srcpkgs/tmux-mem-cpu-load/template b/srcpkgs/tmux-mem-cpu-load/template new file mode 100644 index 00000000000..3597c41a3bb --- /dev/null +++ b/srcpkgs/tmux-mem-cpu-load/template @@ -0,0 +1,16 @@ +# Template file for 'tmux-mem-cpu-load' +pkgname=tmux-mem-cpu-load +version=3.4.0 +revision=1 +build_style=cmake +depends="tmux" +short_desc="A CPU, RAM and load monitor for use with tmux" +maintainer="Diogo Leal " +license="Apache-2.0" +homepage="https://github.com/thewtex/tmux-mem-cpu-load" +distfiles="https://github.com/thewtex/tmux-mem-cpu-load/archive/v${version}.tar.gz" +checksum=a773994e160812a964abc7fc4e8ec16b7d9833edb0a66e5c67f287c7c5949ecb + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template index eb5cab504b6..318e63b58f0 100644 --- a/srcpkgs/tmux/template +++ b/srcpkgs/tmux/template @@ -1,6 +1,6 @@ # Template file for 'tmux' pkgname=tmux -version=2.3 +version=2.4 revision=1 build_style=gnu-configure makedepends="ncurses-devel libevent-devel" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="http://tmux.github.io" license="ISC" distfiles="https://github.com/tmux/tmux/releases/download/${version}/tmux-${version}.tar.gz" -checksum=55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b +checksum=757d6b13231d0d9dd48404968fc114ac09e005d475705ad0cd4b7166f799b349 post_install() { vlicense COPYING diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template index 83379189b31..9a17c3145bc 100644 --- a/srcpkgs/tnftp/template +++ b/srcpkgs/tnftp/template @@ -1,7 +1,7 @@ # Template file for 'tnftp' pkgname=tnftp version=20151004 -revision=3 +revision=4 build_style=gnu-configure makedepends="libressl-devel ncurses-devel" short_desc="NetBSD enhanced ftp client" diff --git a/srcpkgs/tomahawk-qt5/patches/cross-musl.patch b/srcpkgs/tomahawk-qt5/patches/cross-musl.patch deleted file mode 100644 index 65a08da0309..00000000000 --- a/srcpkgs/tomahawk-qt5/patches/cross-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- src/libtomahawk/accounts/ResolverAccount.cpp 2016-11-08 20:50:59.907398017 +0100 -+++ src/libtomahawk/accounts/ResolverAccount.cpp 2016-11-08 20:56:33.222289769 +0100 -@@ -16,6 +16,9 @@ - * You should have received a copy of the GNU General Public License - * along with Tomahawk. If not, see . - */ -+#if !defined(__GLIBC__) -+#include -+#endif - - #include "ResolverAccount.h" - -@@ -185,10 +185,17 @@ - #elif defined( Q_OS_MAC ) - myPlatform = "osx"; - #elif defined( Q_OS_LINUX ) -+#if defined(__GLIBC__) - if ( __WORDSIZE == 32 ) - myPlatform = "linux-x86"; - else if ( __WORDSIZE == 64 ) - myPlatform = "linux-x64"; -+#else -+ if ( __WORDSIZE == 32 ) -+ myPlatform = "linux-musl-x86"; -+ else if ( __WORDSIZE == 64 ) -+ myPlatform = "linux-musl-x64"; -+#endif - #endif - - if ( !myPlatform.contains( platform ) ) diff --git a/srcpkgs/tomahawk-qt5/patches/musl.patch b/srcpkgs/tomahawk-qt5/patches/musl.patch new file mode 100644 index 00000000000..1f967ef46f6 --- /dev/null +++ b/srcpkgs/tomahawk-qt5/patches/musl.patch @@ -0,0 +1,20 @@ +--- src/libtomahawk/accounts/ResolverAccount.cpp.orig ++++ src/libtomahawk/accounts/ResolverAccount.cpp +@@ -44,6 +44,17 @@ + #include + #include + ++#include ++ ++#ifndef __WORDSIZE ++# if ULONG_MAX == 0xffffffffffffffff ++# define __WORDSIZE 64 ++# elif ULONG_MAX == 0xffffffff ++# define __WORDSIZE 32 ++# endif /* ULONG_MAX */ ++#endif /* __WORDSIZE */ ++ ++ + #define MANUALRESOLVERS_DIR "manualresolvers" + + using namespace Tomahawk; diff --git a/srcpkgs/tomahawk-qt5/template b/srcpkgs/tomahawk-qt5/template index a62d12ed6c4..402486715ae 100644 --- a/srcpkgs/tomahawk-qt5/template +++ b/srcpkgs/tomahawk-qt5/template @@ -1,7 +1,7 @@ # Template file for 'tomahawk' pkgname=tomahawk-qt5 version=0.8.4 -revision=9 +revision=11 wrksrc=${pkgname%-*}-${version} build_style=cmake build_options="upower hatchet kde xmpp" @@ -9,7 +9,7 @@ desc_option_hatchet="Enable support for http://hatchet.is" desc_option_kde="Enable support for KDE" desc_option_xmpp="Enable support for XMPP" build_options_default=${build_options} -configure_args="-DBUILD_RELEASE=ON \ +configure_args="-Wno-dev -DBUILD_RELEASE=ON \ $(vopt_if hatchet '-DBUILD_HATCHET=ON' '-DBUILD_HATCHET=OFF') \ -DBUILD_WITH_QT4=OFF \ -DWITH_CRASHREPORTER=OFF \ @@ -22,8 +22,7 @@ makedepends="boost-devel Lucene++-devel qt5-devel taglib-devel sparsehash qt5-svg-devel qt5-tools-devel phonon-qt5-devel liblastfm-qt5-devel quazip-qt5-devel libechonest-qt5-devel libressl-devel $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-qt5-devel) $(vopt_if kde telepathy-qt5-devel)" -depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl) - qca-qt5 quazip-qt5" +depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)" short_desc="Multi-source social music player" maintainer="Duncaen " license="GPL-3" @@ -54,6 +53,15 @@ post_extract() { src/libtomahawk/EchonestCatalogSynchronizer.h \ src/infoplugins/generic/echonest/EchonestPlugin.cpp \ src/infoplugins/generic/echonest/EchonestPlugin.h + # fix quazip-qt5 detection + sed -i CMakeModules/FindQuaZip.cmake \ + -e 's|quazip/quazip.h|quazip5/quazip.h|' \ + -e '/^find_library/s|quazip|&5|' + sed -i 's|#include ' src/libtomahawk/network/acl/AclRegistry.cpp sed -i '30a#include ' src/libtomahawk/utils/TomahawkCache.h diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template index f0f899ab4e4..df37c2578f5 100644 --- a/srcpkgs/tomahawk/template +++ b/srcpkgs/tomahawk/template @@ -1,7 +1,7 @@ # Template file for 'tomahawk' pkgname=tomahawk version=0.8.4 -revision=8 +revision=9 build_style=cmake build_options="upower hatchet kde xmpp" desc_option_hatchet="Enable support for http://hatchet.is" diff --git a/srcpkgs/tomb/template b/srcpkgs/tomb/template index 4248f89a852..0338cba7692 100644 --- a/srcpkgs/tomb/template +++ b/srcpkgs/tomb/template @@ -1,6 +1,6 @@ # Template file for 'tomb' pkgname=tomb -version=2.3 +version=2.4 revision=1 wrksrc=Tomb-${version} build_style=gnu-makefile @@ -12,7 +12,7 @@ maintainer="Diogo Leal " license="GPL-3" homepage="https://www.dyne.org/software/tomb/" distfiles="https://github.com/dyne/Tomb/archive/v${version}.tar.gz" -checksum=750239a4e4029717fb7e76e21094227be05f0731e667f0258cd293de1c674345 +checksum=aba329dceb9ffc62d65b3aa18583b68162f769167161067142c70a76141882f0 pre_build() { sed -i extras/gtk-tray/Makefile \ diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template index 8fb8709f46e..239893d388b 100644 --- a/srcpkgs/tor/template +++ b/srcpkgs/tor/template @@ -1,6 +1,6 @@ # Template file for 'tor' pkgname=tor -version=0.2.9.10 +version=0.3.0.6 revision=1 build_style=gnu-configure makedepends="zlib-devel libressl-devel libevent-devel libseccomp-devel" @@ -14,7 +14,7 @@ maintainer="Juan RP " license="BSD" homepage="https://www.torproject.org/" distfiles="https://www.torproject.org/dist/tor-$version.tar.gz" -checksum=d611283e1fb284b5f884f8c07e7d3151016851848304f56cfdf3be2a88bd1341 +checksum=a3e512e93cb555601fd207d914d7c5fe981d66d6ebb5821ecdf5dea738c2fb14 case "$XBPS_TARGET_MACHINE" in aarch64*) configure_args="--disable-seccomp";; diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index 99d2b395b41..f4e0d2ac33b 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -1,13 +1,13 @@ # Template file for 'totem' pkgname=totem -version=3.22.0 +version=3.24.0 revision=1 short_desc="A GNOME integrated movie player based on Gstreamer" maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2, GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=026a5b5b1674bdb941bc28e1ee95ecc168627e0fc323b6ec8d73407d21964fea +checksum=9bd78f7b940e886b5c809acdfe00a610a834de5080dd40272b92835528a58d01 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile diff --git a/srcpkgs/toxcore/template b/srcpkgs/toxcore/template index 2aa374baff6..a2076bb4813 100644 --- a/srcpkgs/toxcore/template +++ b/srcpkgs/toxcore/template @@ -1,6 +1,6 @@ # Template file for 'toxcore' pkgname=toxcore -version=0.1.6 +version=0.1.8 revision=1 build_style=gnu-configure wrksrc="c-toxcore-${version}" @@ -11,7 +11,7 @@ maintainer="Spencer Hill " license="GPL-3" homepage="https://tox.chat" distfiles="https://github.com/TokTok/c-toxcore/archive/v${version}.tar.gz" -checksum=c2fea86ea15fb04e3c9841fc6ab0f53ca8d0328b90e577fb82c676b8ec6cde13 +checksum=f8b44a54b775a4cb3b6f5efb37d5954bdc6f142c982169f1fad3300c6bf25639 configure_args="--enable-daemon" system_accounts="toxbootstrapd" diff --git a/srcpkgs/tp_smapi-dkms/template b/srcpkgs/tp_smapi-dkms/template index e312da5108a..0617a9f2ab1 100644 --- a/srcpkgs/tp_smapi-dkms/template +++ b/srcpkgs/tp_smapi-dkms/template @@ -1,11 +1,11 @@ # Template file for 'tp_smapi-dkms' pkgname=tp_smapi-dkms version=0.42 -revision=1 +revision=2 wrksrc=tp_smapi-${version} -only_for_archs="i686 x86_64" +only_for_archs="i686 i686-musl x86_64 x86_64-musl" short_desc="IBM ThinkPad hardware functions driver" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-2" homepage="http://www.thinkwiki.org/wiki/Tp_smapi" distfiles="https://github.com/evgeni/tp_smapi/releases/download/tp-smapi%2F${version}/tp_smapi-${version}.tgz" diff --git a/srcpkgs/tpacpi-bat/template b/srcpkgs/tpacpi-bat/template index 33e27625408..afc3402f6f2 100644 --- a/srcpkgs/tpacpi-bat/template +++ b/srcpkgs/tpacpi-bat/template @@ -3,7 +3,7 @@ pkgname=tpacpi-bat version=3.1 revision=1 depends="acpi_call-dkms perl" -only_for_archs="i686 x86_64" +only_for_archs="i686 x86_64 x86_64-musl" short_desc="ThinkPad ACPI Battery Util using acpi_call" maintainer="Daniel A. Maierhofer " license="GPL-3" diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template index 6a36bb703b2..6ccf3f768c0 100644 --- a/srcpkgs/tpm-tools/template +++ b/srcpkgs/tpm-tools/template @@ -1,15 +1,19 @@ # Template file for 'tpm-tools' pkgname=tpm-tools -version=1.3.8 -revision=3 +version=1.3.9.1 +revision=1 +create_wrksrc=yes build_style=gnu-configure +hostmakedepends="perl" # wants pod2man makedepends="libressl-devel trousers-devel" short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)" maintainer="Toyam Cox " license="CPL" homepage="http://trousers.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/trousers/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=66eb4ff095542403db6b4bd4b574e8a5c08084fe4e9e5aa9a829ee84e20bea83 +checksum=9cb714e2650826e2e932f65bc0ba9d61b927dc5fea47f2c2a2b64f0fdfcbfa68 +CFLAGS='-Wno-error=misleading-indentation -Wno-error=bool-compare + -Wno-error=logical-not-parentheses' post_install() { vlicense LICENSE diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index bd651f8ff40..22c8bf059b4 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -1,6 +1,6 @@ # Template file for 'tracker' pkgname=tracker -version=1.10.5 +version=1.12.0 revision=1 build_style=gnu-configure configure_args="--enable-libflac --enable-libvorbis --disable-unit-tests @@ -16,13 +16,14 @@ makedepends=" libgsf-devel icu-devel enca-devel libvorbis-devel libflac-devel taglib-devel giflib-devel totem-pl-parser-devel libexif-devel tiff-devel network-manager-applet-devel sqlite-devel - libmediaart-devel libuuid-devel libxslt-devel" + libmediaart-devel libuuid-devel libxslt-devel json-glib-devel + libseccomp-devel" short_desc="Personal search tool and storage system" maintainer="Juan RP " license="GPL-2" homepage="http://live.gnome.org/Tracker" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=3b8488f0e372054790f2fd4207227c5b15425bf1ab829d76928ac0b32de9c5b7 +checksum=83193dd8c05e3e8b05fa8f1cfb80964fa78f7aeb86f3302fa4be6ec7e6ff596f # Package build options build_options="gir" diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template index 3539826c55d..c8dc0636bf7 100644 --- a/srcpkgs/transmission/template +++ b/srcpkgs/transmission/template @@ -1,7 +1,7 @@ # Template file for 'transmission' pkgname=transmission version=2.92 -revision=5 +revision=7 build_style=gnu-configure configure_args="--enable-nls --enable-cli --enable-daemon --enable-utp --without-systemd-daemon" hostmakedepends="pkg-config intltool" diff --git a/srcpkgs/trayer-srg/template b/srcpkgs/trayer-srg/template index aa8efcd4673..1b9bb7900b6 100644 --- a/srcpkgs/trayer-srg/template +++ b/srcpkgs/trayer-srg/template @@ -1,19 +1,22 @@ # Template file for 'trayer-srg' pkgname=trayer-srg -version=1.1.6 -revision=2 +version=1.1.7 +revision=1 wrksrc="trayer-srg-trayer-${version}" build_style=gnu-makefile make_build_args="DEVEL=nostrip" hostmakedepends="pkg-config" makedepends="gtk+-devel libXmu-devel" short_desc="Lightweight GTK2-based systray (srg fork)" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/sargon/trayer-srg/" distfiles="https://github.com/sargon/trayer-srg/archive/trayer-${version}.tar.gz" -checksum=998a6db7eb7ec735ecff752c6c6ed94e9e579e2264013599136ee4e1c5dc7f34 +checksum=145de7081a338d0334f4d0fad73f1fcd08d3b32ebbf865eb99cf6f18bf02eb49 +do_configure() { + ./configure --prefix=/usr +} do_install() { vbin trayer vman man/trayer.1 diff --git a/srcpkgs/trollock/template b/srcpkgs/trollock/template index 4d4b4f639e6..3eba407b7df 100644 --- a/srcpkgs/trollock/template +++ b/srcpkgs/trollock/template @@ -4,7 +4,7 @@ version=4.1 revision=1 build_style=gnu-configure short_desc="Xtrlock fork with PAM support" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " hostmakedepends="python pkg-config" makedepends="libX11-devel pam-devel" license="GPL-2" diff --git a/srcpkgs/trousers/patches/fix-libressl.patch b/srcpkgs/trousers/patches/fix-libressl.patch new file mode 100644 index 00000000000..b7ac6243444 --- /dev/null +++ b/srcpkgs/trousers/patches/fix-libressl.patch @@ -0,0 +1,11 @@ +--- src/trspi/crypto/openssl/rsa.c 2016-11-21 03:16:10 UTC ++++ src/trspi/crypto/openssl/rsa.c +@@ -38,7 +38,7 @@ + #define DEBUG_print_openssl_errors() + #endif + +-#if OPENSSL_VERSION_NUMBER < 0x10100001L ++#if OPENSSL_VERSION_NUMBER < 0x10100001L || defined(LIBRESSL_VERSION_NUMBER) + static int + RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) + { diff --git a/srcpkgs/trousers/patches/musl-local_lim.patch b/srcpkgs/trousers/patches/musl-local_lim.patch deleted file mode 100644 index 766dbffd263..00000000000 --- a/srcpkgs/trousers/patches/musl-local_lim.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/tspi/tsp_tcsi_param.c.orig 2015-11-18 10:44:20.263987906 +0100 -+++ src/tspi/tsp_tcsi_param.c 2015-11-18 10:45:20.524547393 +0100 -@@ -11,7 +11,11 @@ - #include - #include - #include -+#if defined(__GLIBC__) - #include -+#else -+#define HOST_NAME_MAX 64 -+#endif - #include "trousers/tss.h" - #include "trousers/trousers.h" - #include "trousers_types.h" diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template index b3d990315ad..0caf4ea74b3 100644 --- a/srcpkgs/trousers/template +++ b/srcpkgs/trousers/template @@ -1,7 +1,7 @@ # Template file for 'trousers' pkgname=trousers -version=0.3.13 -revision=3 +version=0.3.14 +revision=2 build_style=gnu-configure conf_files="/etc/tcsd.conf" makedepends="libressl-devel" @@ -12,7 +12,8 @@ maintainer="Toyam Cox " license="BSD" homepage="http://trousers.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=bb908e4a3c88a17b247a4fc8e0fff3419d8a13170fe7bdfbe0e2c5c082a276d3 +checksum=ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47 +create_wrksrc=yes post_install() { vlicense LICENSE diff --git a/srcpkgs/ts/template b/srcpkgs/ts/template index 3525198fcfc..3f0f6789877 100644 --- a/srcpkgs/ts/template +++ b/srcpkgs/ts/template @@ -1,19 +1,15 @@ # Template file for 'ts' pkgname=ts version=1.0 -revision=1 +revision=2 build_style=gnu-makefile short_desc="A simple unix task spool system" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-2" homepage="http://vicerveza.homeunix.net/~viric/soft/ts/" distfiles="http://vicerveza.homeunix.net/~viric/soft/ts/${pkgname}-${version}.tar.gz" checksum=4f53e34fff0bb24caaa44cdf7598fd02f3e5fa7cacaea43fa0d081d03ffbb395 -do_build() { - make ${makejobs} CC="$CC" CFLAGS="$CFLAGS $CPPFLAGS" LDFLAGS="$LDFLAGS" -} - do_install() { make PREFIX="$DESTDIR/usr" install vdoc Changelog diff --git a/srcpkgs/tslib/template b/srcpkgs/tslib/template index b5f062caf9f..8e9a13d2624 100644 --- a/srcpkgs/tslib/template +++ b/srcpkgs/tslib/template @@ -1,6 +1,6 @@ # Template file for 'tslib' pkgname=tslib -version=1.6 +version=1.9 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://github.com/kergoth/tslib" distfiles="https://github.com/kergoth/tslib/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=b9fbb93984d02506c5a944d475d0bf7f19473a111e547f523328138ed5c6e02b +checksum=af4e40a4cf2aa7a81f1602de1613190a101760689709103cc3590132266ac7b8 pre_configure() { sed -i configure.ac -e "5iAC_CONFIG_MACRO_DIRS([m4/internal])" diff --git a/srcpkgs/ttf-ubuntu-font-family/template b/srcpkgs/ttf-ubuntu-font-family/template index 7040ce3528c..556f385cd5c 100644 --- a/srcpkgs/ttf-ubuntu-font-family/template +++ b/srcpkgs/ttf-ubuntu-font-family/template @@ -8,7 +8,7 @@ hostmakedepends="unzip" depends="font-util" font_dirs="/usr/share/fonts/TTF" short_desc="Ubuntu font family" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="custom" homepage="http://font.ubuntu.com/" distfiles="http://font.ubuntu.com/download/ubuntu-font-family-${version}.zip" diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template index cf51e2d0a9b..9021e7645b7 100644 --- a/srcpkgs/tvheadend/template +++ b/srcpkgs/tvheadend/template @@ -1,7 +1,7 @@ # Template file for 'tvheadend' pkgname=tvheadend version=4.1 -revision=6 +revision=7 wrksrc=tvheadend-${version} build_style=gnu-configure configure_args="--disable-dvbscan" diff --git a/srcpkgs/twemoji/template b/srcpkgs/twemoji/template new file mode 100644 index 00000000000..83214b34d6c --- /dev/null +++ b/srcpkgs/twemoji/template @@ -0,0 +1,21 @@ +# Template build file for 'twemoji'. +pkgname=twemoji +version=1.1 +revision=1 +depends="font-util" +font_dirs="/usr/share/fonts/twemoji" +short_desc="Twitter emoji font set in color and b&w" +maintainer="Sir_Boops " +license="CC-BY-4, MIT" +homepage="https://github.com/eosrei/twemoji-color-font" +distfiles="https://github.com/eosrei/twemoji-color-font/releases/download/v${version}/TwitterColorEmoji-SVGinOT-Linux-${version}.tar.gz" +checksum=1e63ba00d54120c88505af76a91f0e1180701dfe6034257f2e3c1eedf5b8367b +wrksrc="TwitterColorEmoji-SVGinOT-Linux-${version}" +noarch="yes" + +do_install() { + vlicense LICENSE-MIT.txt + vlicense LICENSE-CC-BY.txt + vmkdir usr/share/fonts/twemoji + install -Dm644 TwitterColorEmoji-SVGinOT.ttf ${DESTDIR}/usr/share/fonts/twemoji +} diff --git a/srcpkgs/txr/patches/musl-configure.patch b/srcpkgs/txr/patches/musl-configure.patch index c143523591f..9694fe51d51 100644 --- a/srcpkgs/txr/patches/musl-configure.patch +++ b/srcpkgs/txr/patches/musl-configure.patch @@ -1,11 +1,11 @@ ---- configure- 2015-10-03 23:20:36.976105846 +0200 -+++ configure 2015-10-03 23:21:38.708814989 +0200 -@@ -2176,7 +2176,7 @@ +--- configure.orig 2017-04-19 12:13:46.969129248 +0000 ++++ configure 2017-04-19 12:16:31.248137723 +0000 +@@ -2457,7 +2457,7 @@ if conftest ; then printf "yes\n" - printf "#define HAVE_ALLOCA 1\n" >> $config_h -- printf "#define ALLOCA_H <%s>\n" $try_header >> $config_h -+ printf '#define ALLOCA_H "%s"\n' $try_header >> $config_h + printf "#define HAVE_ALLOCA 1\n" >> config.h +- printf "#define ALLOCA_H <%s>\n" $try_header >> config.h ++ printf '#define ALLOCA_H "%s"\n' $try_header >> config.h have_alloca=y break; fi diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template index 544e94e976c..70bedb84d8c 100644 --- a/srcpkgs/txr/template +++ b/srcpkgs/txr/template @@ -1,6 +1,6 @@ # Template file for 'txr' pkgname=txr -version=170 +version=174 revision=1 build_style=configure hostmakedepends="bison flex" @@ -9,7 +9,11 @@ maintainer="Oliver Kiddle " license="2-clause-BSD" homepage="http://www.nongnu.org/txr/" distfiles="http://www.kylheku.com/cgit/txr/snapshot/${pkgname}-${version}.tar.bz2" -checksum=e20938dd4f261cc299070bf8f94e0c20b810c75c95de816bd80f0536c9d0948e +checksum=209fe8290081b1bc61c622cf2bf2ea330f2bea742508eb4d6b2589878f83fbe2 + +case "$XBPS_TARGET_MACHINE" in + aarch64*) broken="#error port me!" ;; +esac do_configure() { ./configure --prefix=/usr --ccname="${CC}" \ diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template index a271efbc583..febed24ae4c 100644 --- a/srcpkgs/tzdata/template +++ b/srcpkgs/tzdata/template @@ -1,6 +1,6 @@ # Template file for 'tzdata' pkgname=tzdata -version=2017a +version=2017b revision=1 wrksrc=${pkgname} create_wrksrc=yes @@ -11,7 +11,7 @@ short_desc="Time zone and daylight-saving time data" maintainer="Juan RP " license="Public Domain" distfiles="http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz" -checksum=df3a5c4d0a2cf0cde0b3f35796ccf6c9acfd598b8e70f8dece5404cd7626bbd6 +checksum=f8242a522ea3496b0ce4ff4f2e75a049178da21001a08b8e666d8cbe07d18086 do_install() { local timezones="africa antarctica asia australasia europe northamerica \ diff --git a/srcpkgs/tzupdate/template b/srcpkgs/tzupdate/template index 4a922156cb3..53f3f0ac7d2 100644 --- a/srcpkgs/tzupdate/template +++ b/srcpkgs/tzupdate/template @@ -1,15 +1,15 @@ # Template file for 'tzupdate' pkgname=tzupdate -version=1.1.0 +version=1.2.0 revision=1 noarch=yes -build_style=python2-module -hostmakedepends="python-setuptools" -depends="python-setuptools python-requests" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-setuptools python3-requests" pycompile_module="tzupdate.py" short_desc="Set the system timezone based on IP geolocation" maintainer="Diogo Leal " license="Public domain" homepage="https://github.com/cdown/tzupdate" distfiles="https://github.com/cdown/tzupdate/archive/${version}.tar.gz" -checksum=ac11268af598663d06bdb126a5437c2bf379542aa3dc93b825e64f11c5453c3d +checksum=2768c8def78cd7c78d43250a9188ee1a917323bdbb5dc5c76e3419f97d9aac4e diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template index 15caff6ea9d..301f28bdcc5 100644 --- a/srcpkgs/tzutils/template +++ b/srcpkgs/tzutils/template @@ -1,6 +1,6 @@ # Template file for 'tzutils' pkgname=tzutils -version=2017a +version=2017b revision=1 wrksrc="tz-${version}" homepage="http://www.iana.org/time-zones" @@ -8,7 +8,7 @@ short_desc="Time zone and daylight-saving time utilities" maintainer="Juan RP " license="Public Domain" distfiles="https://github.com/eggert/tz/archive/${version}.tar.gz" -checksum=d560ecd9d7f4cd6a2142b713f42464ba0870ca25f45f69dab46063d89aafb6f4 +checksum=8e5d235f978a7463cda46fe0ea1f9d9f644a0f9f452678fcf61a37b73849a393 do_build() { make TZDIR=/usr/share/zoneinfo CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" diff --git a/srcpkgs/uberwriter/template b/srcpkgs/uberwriter/template index 30901f7e10a..ae69f2da64a 100644 --- a/srcpkgs/uberwriter/template +++ b/srcpkgs/uberwriter/template @@ -11,7 +11,7 @@ patch_args='-p1' hostmakedepends="python-distutils-extra intltool" depends="python-enchant python-gobject python-enchant pandoc ttf-ubuntu-font-family" short_desc="The simplest writing application" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://uberwriter.wolfvollprecht.de" distfiles="https://launchpad.net/$pkgname/trunk/${version%.*}/+download/${pkgname}_${version}-${_subversion}.tar.gz" diff --git a/srcpkgs/ucspi-ssl/patches/libressl.patch b/srcpkgs/ucspi-ssl/patches/libressl.patch new file mode 100644 index 00000000000..1dbfea3b619 --- /dev/null +++ b/srcpkgs/ucspi-ssl/patches/libressl.patch @@ -0,0 +1,56 @@ +--- host/superscript.com/net/ucspi-ssl-0.99/src/ssl_env.c.orig ++++ host/superscript.com/net/ucspi-ssl-0.99/src/ssl_env.c +@@ -47,7 +47,7 @@ + int n; + + if (!env) return 1; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + for (m = 0; m < sk_X509_NAME_ENTRY_num(xname->entries); m++) { + xne = sk_X509_NAME_ENTRY_value(xname->entries,m); + n = OBJ_obj2nid(xne->object); +@@ -76,7 +76,7 @@ + if (!env_str("SSL_PROTOCOL",SSL_get_version(ssl))) + return 0; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + session = SSL_get_session(ssl); + x = session->session_id; + n = session->session_id_length; +@@ -227,7 +227,7 @@ + set_env_id(xname,"SSL_CLIENT_I_DN_Email",NID_pkcs9_emailAddress); + + /* Signature Algorithm for PubKey */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + n = OBJ_obj2nid(cert->cert_info->signature->algorithm); + #else + sigalg = X509_get0_tbs_sigalg(cert); +@@ -238,7 +238,7 @@ + return 0; + + /* Algorithm for PubKey */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + n = OBJ_obj2nid(cert->cert_info->key->algor->algorithm); + #else + pubkey = X509_get_X509_PUBKEY(cert); +@@ -371,7 +371,7 @@ + set_env_id(xname,"SSL_SERVER_I_DN_Email",NID_pkcs9_emailAddress); + + /* Signature Algorithm of PubKey */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + n = OBJ_obj2nid(cert->cert_info->signature->algorithm); + #else + sigalg = X509_get0_tbs_sigalg(cert); +@@ -382,7 +382,7 @@ + return 0; + + /* Algorithm of PubKey */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + n = OBJ_obj2nid(cert->cert_info->key->algor->algorithm); + #else + pubkey = X509_get_X509_PUBKEY(cert); diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template index 4ced8bcb0ce..52712f2c282 100644 --- a/srcpkgs/ucspi-ssl/template +++ b/srcpkgs/ucspi-ssl/template @@ -1,7 +1,7 @@ # Template file for 'ucspi-ssl' pkgname=ucspi-ssl -version=0.98b -revision=1 +version=0.99 +revision=2 short_desc="Command-line tools for building SSL client-server applications" maintainer="Evan Deaubl " license="Public Domain" @@ -11,7 +11,7 @@ makedepends="libressl-devel" depends="ucspi-tcp" homepage="http://www.fehcom.de/ipnet/ucspi-ssl.html" distfiles="http://www.fehcom.de/ipnet/ucspi-ssl/${pkgname}-${version}.tgz" -checksum=10d4f47c7085d8b0b56b026901569d73bb366a73825f4042b6c99cbcde506ff3 +checksum=083421b4da939221e01f3e576a3d7c7d49c78ab46e782ef31f6310e8a847d6c3 wrksrc="${pkgname}-${version}" create_wrksrc=yes build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src" diff --git a/srcpkgs/udiskie/template b/srcpkgs/udiskie/template index 1abd00b84de..28aa186dd9b 100644 --- a/srcpkgs/udiskie/template +++ b/srcpkgs/udiskie/template @@ -1,19 +1,19 @@ # Template file for 'udiskie' pkgname=udiskie -version=1.6.1 +version=1.7.0 revision=1 noarch=yes build_style=python3-module pycompile_module="udiskie" hostmakedepends="python3-setuptools" -depends="udisks2 python3-setuptools python3-gobject python3-yaml python3-docopt - gtk+3 libnotify python3-keyutils" +depends="udisks2 python3-gobject python3-yaml python3-docopt gtk+3 libnotify + python3-keyutils" short_desc="Removable disk automounter using udisks" maintainer="Matthias Fulz " homepage="https://github.com/coldfix/udiskie" license="MIT" distfiles="${PYPI_SITE}/u/udiskie/udiskie-${version}.tar.gz" -checksum=8c95e11004145b4b11c67a5043807d269e9863bf584ee862bf9b4936ee108f9b +checksum=2e2129bea9bbfe16a5c8ea1dfc86527806c0faf7c418b6446a6bf2c62c26c786 post_install() { vlicense COPYING diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template index 3f2f5a6cf45..9763c6bd3bf 100644 --- a/srcpkgs/uget/template +++ b/srcpkgs/uget/template @@ -1,6 +1,6 @@ # Template file for 'uget' pkgname=uget -version=2.1.4 +version=2.1.5 revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool" @@ -10,4 +10,4 @@ maintainer="Alexander Mamay " license="LGPL-2.1" homepage="http://ugetdm.com/" distfiles="${SOURCEFORGE_SITE}/urlget/${pkgname}-${version}.tar.gz" -checksum=e308cb1c676a832afa2ebea63e21f54fc416683f14ff9dd7be5fdf9a852751be +checksum=a32f2fb8ad558c552caeb0c9dedb4f5825f531f71baf54b6cb9b809b0d3c0ed9 diff --git a/srcpkgs/uhttpmock/template b/srcpkgs/uhttpmock/template index e5c21746fc0..946a2b84996 100644 --- a/srcpkgs/uhttpmock/template +++ b/srcpkgs/uhttpmock/template @@ -1,6 +1,6 @@ # Template file for 'uhttpmock' pkgname=uhttpmock -version=0.5.0 +version=0.5.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="https://gitlab.com/uhttpmock/uhttpmock" distfiles="http://tecnocode.co.uk/downloads/uhttpmock/$pkgname-$version.tar.xz" -checksum=26da182a2db2579c5ba4dad9096d52099e0766228c295cfbaed6de4046f7d16e +checksum=a6a34a011db142a98473b492039c84468d575f416689484f1f82a84927f17798 uhttpmock-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/ulatencyd/template b/srcpkgs/ulatencyd/template index 1e130b7f368..67a9ee29563 100644 --- a/srcpkgs/ulatencyd/template +++ b/srcpkgs/ulatencyd/template @@ -10,7 +10,7 @@ makedepends="procps-ng-devel glib-devel dbus-glib-devel lua51-devel libxcb-devel depends="luaposix51 ConsoleKit2" nopie=yes short_desc="Daemon to minimize latency on a linux system using cgroups" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://github.com/poelzi/${pkgname}" distfiles="${homepage}/archive/${version}-${_subrelease}.tar.gz" diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template index b7c6d702169..81d76683398 100644 --- a/srcpkgs/umurmur/template +++ b/srcpkgs/umurmur/template @@ -1,7 +1,7 @@ # Template file for 'umurmur' pkgname=umurmur -version=0.2.16a -revision=3 +version=0.2.17 +revision=1 build_style=gnu-configure configure_args="--enable-shmapi --with-ssl=openssl" conf_files="/etc/umurmur/umurmur.conf" @@ -12,7 +12,7 @@ maintainer="Duncaen " license="3-clause-BSD" homepage="http://umurmur.net/" distfiles="https://github.com/umurmur/umurmur/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=d64df8f77ceaa4951d7f2adbb2dcc173841d1e387ef4cd2082c42150a84349a5 +checksum=e77b7b6616768f4a1c07442afe49a772692f667b00c23cc85909d4dd0ce206d2 system_accounts="umurmur" umurmur_homedir="/var/lib/umurmur" diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template index 651fc6c5f15..41a0d9e1fc0 100644 --- a/srcpkgs/unbound/template +++ b/srcpkgs/unbound/template @@ -1,14 +1,15 @@ # Template file for 'unbound' pkgname=unbound -version=1.6.1 +version=1.6.2 revision=1 build_style=gnu-configure configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr --with-libevent=${XBPS_CROSS_BASE}/usr --with-libexpat=${XBPS_CROSS_BASE}/usr + --enable-dnscrypt --with-rootkey-file=/etc/dns/root.key --sbindir=/usr/bin" conf_files="/etc/unbound/unbound.conf" -makedepends="libressl-devel expat-devel libevent-devel" +makedepends="expat-devel libevent-devel libressl-devel libsodium-devel" depends="dnssec-anchors" system_accounts="unbound" short_desc="Validating, recursive, and caching DNS resolver" @@ -16,7 +17,7 @@ maintainer="Leah Neukirchen " license="3-clause-BSD" homepage="http://unbound.net/" distfiles="http://unbound.net/downloads/${pkgname}-${version}.tar.gz" -checksum=42df63f743c0fe8424aeafcf003ad4b880b46c14149d696057313f5c1ef51400 +checksum=1a323d72c32180b7141c9e6ebf199fc68a0208dfebad4640cd2c4c27235e3b9c post_install() { vsconf doc/example.conf unbound.conf diff --git a/srcpkgs/unicorn/template b/srcpkgs/unicorn/template index 96b130935b1..995cd90bb17 100644 --- a/srcpkgs/unicorn/template +++ b/srcpkgs/unicorn/template @@ -1,7 +1,7 @@ # Template file for 'unicorn' pkgname=unicorn -version=1.0 -revision=2 +version=1.0.1 +revision=1 only_for_archs="x86_64 x86_64-musl i686 i686-musl" hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools" short_desc="Lightweight multi-platform, multi-architecture CPU emulator framework" @@ -9,7 +9,7 @@ maintainer="Michael Gehring " license="GPL-2" homepage="http://www.unicorn-engine.org/" distfiles="https://github.com/unicorn-engine/unicorn/archive/${version}.tar.gz" -checksum=27efa24e465f3eca9a1fa8f7f456f6fecd91beeba0b4be21b34308040047def9 +checksum=3a6a4f2b8c405ab009040ca43af8e4aa10ebe44d9c8b336aa36dc35df955017c post_extract() { # don't build the samples diff --git a/srcpkgs/units/template b/srcpkgs/units/template index fb5c0b257f7..697c8558518 100644 --- a/srcpkgs/units/template +++ b/srcpkgs/units/template @@ -1,7 +1,7 @@ # Template file for 'units' pkgname=units -version=2.13 -revision=2 +version=2.14 +revision=1 build_style=gnu-configure hostmakedepends="python" makedepends="readline-devel" @@ -11,4 +11,4 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/units/units.html" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=0ba5403111f8e5ea22be7d51ab74c8ccb576dc30ddfbf18a46cb51f9139790ab +checksum=9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8 diff --git a/srcpkgs/unixbench/template b/srcpkgs/unixbench/template index be3c350c99b..031e4e1f7b2 100644 --- a/srcpkgs/unixbench/template +++ b/srcpkgs/unixbench/template @@ -8,7 +8,7 @@ build_wrksrc="UnixBench" build_style=gnu-makefile depends="perl" short_desc="BYTE UNIX benchmark suite" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://github.com/kdlucas/byte-unixbench" distfiles="$homepage/archive/$_commit.tar.gz" diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template index c287ebfdb09..4d8693bdc5f 100644 --- a/srcpkgs/unrar/template +++ b/srcpkgs/unrar/template @@ -1,6 +1,6 @@ # Template file for 'unrar' pkgname=unrar -version=5.4.5 +version=5.5.3 revision=1 wrksrc=unrar homepage="http://www.rarlab.com/rar_add.htm" @@ -9,7 +9,7 @@ short_desc="Unarchiver for .rar files (non-free version)" maintainer="Juan RP " license="freeware" repository="nonfree" -checksum=e470c584332422893fb52e049f2cbd99e24dc6c6da971008b4e2ae4284f8796c +checksum=d1d9ef4a9247db088f825666de8f8bb69006d8d8b0e004ff366b3e04c103a2b3 do_build() { sed -i 's/^\(CXXFLAGS\)=\(.*\)/\1+=\2/' makefile diff --git a/srcpkgs/upx/template b/srcpkgs/upx/template index 25cb0e6481f..50cd356ea7e 100644 --- a/srcpkgs/upx/template +++ b/srcpkgs/upx/template @@ -1,6 +1,6 @@ # Template file for 'upx' pkgname=upx -version=3.92 +version=3.93 revision=1 build_style=gnu-makefile make_build_target="all" @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="https://upx.github.io/" license="GPL-2" distfiles="https://github.com/upx/upx/releases/download/v${version}/upx-${version}-src.tar.xz" -checksum=0378169c342a0f98dc93236deae42f72fda07d0b02d7f51e6147448ee7e77794 +checksum=893f1cf1580c8f0048a4d328474cb81d1a9bf9844410d2fd99f518ca41141007 do_install() { vbin src/upx.out upx diff --git a/srcpkgs/upx/update b/srcpkgs/upx/update deleted file mode 100644 index e046ce1fa12..00000000000 --- a/srcpkgs/upx/update +++ /dev/null @@ -1 +0,0 @@ -pattern='[\d.]+(?=-src\.tar)' diff --git a/srcpkgs/urbanterror-data/template b/srcpkgs/urbanterror-data/template index 0016a8810fb..241321f6c44 100644 --- a/srcpkgs/urbanterror-data/template +++ b/srcpkgs/urbanterror-data/template @@ -6,7 +6,7 @@ noarch=yes wrksrc="UrbanTerror43" hostmakedepends="unzip" short_desc="Urbanterror data files" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="Freeware" homepage="http://www.urbanterror.info" distfiles="http://cdn.urbanterror.info/urt/43/releases/zips/UrbanTerror432_full.zip" diff --git a/srcpkgs/urbanterror/template b/srcpkgs/urbanterror/template index 6375ab88c5a..486f578d2ef 100644 --- a/srcpkgs/urbanterror/template +++ b/srcpkgs/urbanterror/template @@ -6,7 +6,7 @@ wrksrc="ioq3-for-UrbanTerror-4-release-${version}" makedepends="SDL-devel libopenal-devel libcurl-devel libvorbis-devel" depends="urbanterror-data>=${version}" short_desc="A team tactical shooter based on ioquake" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://github.com/Barbatos/ioq3-for-UrbanTerror-4" distfiles="https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.tar.gz" diff --git a/srcpkgs/usbredir/template b/srcpkgs/usbredir/template index 6f88df0d64a..2f45ca44494 100644 --- a/srcpkgs/usbredir/template +++ b/srcpkgs/usbredir/template @@ -7,7 +7,7 @@ configure_args="--sbindir=/usr/bin" hostmakedepends="automake libtool pkg-config" makedepends="libusb-devel" short_desc="USB traffic redirection protocol" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://spice-space.org" distfiles="http://spice-space.org/download/${pkgname}/${pkgname}-${version}.tar.bz2" diff --git a/srcpkgs/utox/template b/srcpkgs/utox/template index 1caf0e3214b..59d02f6bc6d 100644 --- a/srcpkgs/utox/template +++ b/srcpkgs/utox/template @@ -1,6 +1,6 @@ # Template file for 'utox' pkgname=utox -version=0.13.1 +version=0.14.0 revision=1 wrksrc="uTox-${version}" build_style=cmake @@ -8,12 +8,13 @@ short_desc="Lightweight TOX instant messenger client written in C" maintainer="Spencer Hill " license="GPL-3" homepage="http://utox.org/" +hostmakedepends="pkg-config" makedepends="toxcore-devel filteraudio-devel-git fontconfig-devel freetype-devel libopenal-devel libvpx-devel libX11-devel libXext-devel - libXrender-devel dbus-devel v4l-utils-devel libsodium-devel opus-devel" -hostmakedepends="pkg-config" + libXrender-devel dbus-devel v4l-utils-devel libsodium-devel opus-devel + check-devel" distfiles="https://github.com/uTox/uTox/archive/v${version}.tar.gz" -checksum=d6afaa04223192d37426833607096bdef2edcd45a023923470deedf753a77555 +checksum=f1c4802a79c1172086c1508ce79243569c0c020aad428f633c3a0e89832e168d case "$XBPS_TARGET_MACHINE" in i686*) broken="https://build.voidlinux.eu/builders/i686_builder/builds/55/steps/shell_3/logs/stdio" diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template index 677493c1c30..cf73b40bc9f 100644 --- a/srcpkgs/vagrant/template +++ b/srcpkgs/vagrant/template @@ -1,16 +1,16 @@ # Template file for 'vagrant' pkgname=vagrant -version=1.9.2 +version=1.9.3 revision=1 hostmakedepends="ruby" makedepends="ruby-devel zlib-devel" depends="openssh curl bsdtar" short_desc="Tool for building and distributing development environments" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="MIT" homepage="https://www.vagrantup.com/" distfiles="https://github.com/mitchellh/$pkgname/archive/v$version.tar.gz" -checksum=53723eec1180ed0e89c1968e06626c6d45e42f6dc25ae9934ca8dfc240a82046 +checksum=4b141f60e7e59e654b9a77eb137f208613349db331cdbfcd9a8354b8ebba5c00 nocross=yes patch_args="-p1" diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index 972ddad5871..be1ead85c0e 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -1,6 +1,6 @@ # Template file for 'vala' pkgname=vala -version=0.34.4 +version=0.36.1 revision=1 build_style=gnu-configure configure_args="--enable-vapigen" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://live.gnome.org/Vala" license="LGPL-2.1" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=6b17bd339414563ebc51f64b0b837919ea7552d8a8ffa71cdc837d25c9696b83 +checksum=13f4a3f99d983bf76e8d9dd736021ecc95f53ec1f9582423aa4b4be87455aa07 libvala_package() { short_desc+=" - shared library" diff --git a/srcpkgs/valabind/patches/fix-vala-0.36.patch b/srcpkgs/valabind/patches/fix-vala-0.36.patch new file mode 100644 index 00000000000..a906fc3776a --- /dev/null +++ b/srcpkgs/valabind/patches/fix-vala-0.36.patch @@ -0,0 +1,36 @@ +From f23ff9421c1875d18b1e558596557009b45faa19 Mon Sep 17 00:00:00 2001 +From: pancake +Date: Thu, 9 Feb 2017 10:21:16 +0100 +Subject: [PATCH] Fix build for Vala-git (future 0.36) + +--- + cxxwriter.vala | 2 +- + dlangwriter.vala | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git cxxwriter.vala cxxwriter.vala +index cca65fe..890e085 100644 +--- cxxwriter.vala ++++ cxxwriter.vala +@@ -157,7 +157,7 @@ public class CxxWriter : ValabindWriter { + } + + public void walk_field (Field f) { +- if (f.get_ctype () == null) { ++ if (f.get_attribute_string ("CCode", "type") == null) { + //warning ( + // "Cannot resolve type for field '%s'".printf (f.get_cname ())); + } else { +diff --git dlangwriter.vala dlangwriter.vala +index 8d42676..898d3ca 100644 +--- dlangwriter.vala ++++ dlangwriter.vala +@@ -167,7 +167,7 @@ public class DlangWriter : ValabindWriter { + } + + public void walk_field (Field f) { +- if (f.get_ctype () == null) { ++ if (f.get_attribute_string ("CCode", "type") == null) { + //warning ( + // "Cannot resolve type for field '%s'".printf (f.get_cname ())); + } else { diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template index 33856eae9f8..e9adf892ab2 100644 --- a/srcpkgs/valabind/template +++ b/srcpkgs/valabind/template @@ -1,7 +1,7 @@ # Template file for 'valabind' pkgname=valabind version=0.10.0 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="pkg-config vala-devel" makedepends="vala-devel glib-devel" diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template index 45abb08d21a..9661d16e0eb 100644 --- a/srcpkgs/vanitygen/template +++ b/srcpkgs/vanitygen/template @@ -1,7 +1,7 @@ # Template file for 'vanitygen' pkgname=vanitygen version=0.21 -revision=11 +revision=12 makedepends="pcre-devel libressl-devel" short_desc="Bitcoin vanity address generator" maintainer="Juan RP " diff --git a/srcpkgs/vapoursynth-mvtools/template b/srcpkgs/vapoursynth-mvtools/template index c1b8b9c1d62..4dcf1ebaac7 100644 --- a/srcpkgs/vapoursynth-mvtools/template +++ b/srcpkgs/vapoursynth-mvtools/template @@ -1,6 +1,6 @@ # Template file for 'vapoursynth-mvtools' pkgname=vapoursynth-mvtools -version=17 +version=18 revision=1 build_style=gnu-configure hostmakedepends="automake pkg-config libtool yasm" @@ -10,7 +10,7 @@ maintainer="lemmi " license="GPL-2" homepage="http://avisynth.org.ru/mvtools/mvtools2.html" distfiles="https://github.com/dubhater/vapoursynth-mvtools/archive/v${version}.tar.gz" -checksum=739656d8ea3fb864b72e3e3d167dc1f7fdb8feff4e396cdf9414b367621ca011 +checksum=1cfd1b11ada04c0381b90b9561362d8e6b58cc0a0592925e2564b2bf36b5046c case "$XBPS_TARGET_MACHINE" in arm*) diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template index 110cffa528f..b67e0e32271 100644 --- a/srcpkgs/vapoursynth/template +++ b/srcpkgs/vapoursynth/template @@ -1,6 +1,6 @@ # Template file for 'vapoursynth' pkgname=vapoursynth -version=R36 +version=R37 revision=1 build_style=gnu-configure hostmakedepends="automake pkg-config libtool yasm python3-Cython" @@ -10,7 +10,7 @@ maintainer="lemmi " license="LGPL-2" homepage="http://www.vapoursynth.com" distfiles="https://github.com/vapoursynth/vapoursynth/archive/$version.tar.gz" -checksum=8a156c5143cecd70b48e59428ec175e901510593082d3ddbc16fba93f5b6c704 +checksum=25fee086442f07f8b6caf1508c18e6a694d52e125eec5959f89570990e6070bc case $XBPS_TARGET_MACHINE in aarch64*) diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template index 7b3405b4ac8..8dfbd66cf46 100644 --- a/srcpkgs/vba-m/template +++ b/srcpkgs/vba-m/template @@ -10,7 +10,7 @@ hostmakedepends="unzip pkg-config zip" makedepends="zlib-devel libpng-devel MesaLib-devel SDL2-devel libopenal-devel gtkmm2-devel gtkglext-devel gtkglextmm-devel ffmpeg-devel gtk+-devel SFML-devel wxWidgets-devel" short_desc="Gameboy Advance Emulator" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://github.com/visualboyadvance-m/visualboyadvance-m/" distfiles="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/${_subversion}.tar.gz" diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template index 44a523e3689..197fc1c1e83 100644 --- a/srcpkgs/vboot-utils/template +++ b/srcpkgs/vboot-utils/template @@ -1,7 +1,7 @@ # Template file for 'vboot-utils' pkgname=vboot-utils version=45.7262 -revision=7 +revision=8 _githash=0e8c964915fffb58032bb59bdb31949de718ca90 hostmakedepends="pkg-config git" makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel" diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template index 2ccff688ab5..ec55aec448f 100644 --- a/srcpkgs/vc/template +++ b/srcpkgs/vc/template @@ -1,13 +1,14 @@ # Template file for 'vc' pkgname=vc -version=1.3.0 -revision=1 +version=1.3.1 +revision=2 wrksrc="Vc-${version}" build_style=cmake configure_args="-DTARGET_ARCHITECTURE=generic" short_desc="Library to ease explicit vectorization of C++ code" maintainer="Juan RP " -license="LGPL-3" +license="3-clause-BSD" homepage="https://github.com/VcDevel/Vc" distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz" -checksum=38416eb702e677472032014d50b15001718aa027108d177e565a561f03c88bda +checksum=5acc9dcc0e857edad1df0bc3ef0f23712a86bd4f7c45bc9882ec07e57840024b +only_for_archs="i686 i686-musl x86_64 x86_64-musl" diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template index 4e02b49e9ac..0671a3d5181 100644 --- a/srcpkgs/vde2/template +++ b/srcpkgs/vde2/template @@ -1,7 +1,7 @@ # Template file for 'vde2' pkgname=vde2 version=2.3.2 -revision=16 +revision=17 build_style=gnu-configure configure_args="--disable-static --enable-experimental --disable-python --enable-kernel-switch" diff --git a/srcpkgs/vidcutter/template b/srcpkgs/vidcutter/template new file mode 100644 index 00000000000..30f49724699 --- /dev/null +++ b/srcpkgs/vidcutter/template @@ -0,0 +1,19 @@ +# Template file for 'vidcutter' +pkgname=vidcutter +version=3.0.1 +revision=1 +noarch=yes +build_style=python3-module +pycompile_module="${pkgname}" +hostmakedepends="python3-setuptools" +depends="python3-PyQt5 python3-setuptools ffmpeg mpv mediainfo" +short_desc="Video cutter and joiner based on FFmpeg" +maintainer="bra1nwave " +license="GPL-3" +homepage="http://vidcutter.ozmartians.com/" +distfiles="https://github.com/ozmartian/${pkgname}/archive/${version}.tar.gz" +checksum=3eceb1a27a4f4012322acb82792085b27ff3547370b3ad095cb2de5f89bb87fc + +pre_configure() { + sed -i "s/pypi/arch/" vidcutter/__init__.py +} diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index 1f3fca1b362..d4682783255 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -1,6 +1,6 @@ # Template file for 'vim' pkgname=vim -version=8.0.0363 +version=8.0.0586 revision=1 hostmakedepends="pkg-config glib-devel" makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel perl @@ -11,12 +11,12 @@ maintainer="Juan RP " homepage="http://www.vim.org" license="Vim" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=72ca33242271f2eb0abb98f790c62ef2cf1f7e94a65270be7e82fb05e28d810b +checksum=2525d2954a4a020583f569e65d7d4912f976bd6ed93388214787c9ff26553e44 subpackages="xxd vim-common vim-x11 gvim" # XXX vim-huge cannot be cross compiled for now. if [ -z "$CROSS_BUILD" ]; then - subpackages+=" vim-huge vim-huge-python3" + subpackages+=" vim-huge vim-huge-python3 gvim-huge" fi alternatives="vim:vim:/usr/bin/vim-normal" @@ -72,6 +72,12 @@ do_configure() { --with-features=huge --enable-perlinterp \ --disable-pythoninterp --enable-python3interp \ --enable-rubyinterp --enable-luainterp + + cd $wrksrc/gvim-huge + ./configure ${configure_args} ${args} \ + --enable-gui=gtk2 --with-x --with-vim-name=gvim-huge \ + --with-features=huge --enable-perlinterp --enable-pythoninterp \ + --enable-rubyinterp --enable-luainterp --enable-clientserver fi } @@ -147,6 +153,21 @@ gvim_package() { rm "$PKGDESTDIR"/usr/share/applications/vim.desktop } } +gvim-huge_package() { + depends="python vim-common-${version}_${revision} desktop-file-utils hicolor-icon-theme" + provides="vim-${version}_${revision}" + short_desc+=" - GTK+ GUI - Huge (all features enabled, using Python 2)" + alternatives="vim:vim:/usr/bin/gvim-huge" + pkg_install() { + cd $wrksrc/gvim-huge + sed -i "s|/locolor|/hicolor|g" src/Makefile + for d in 16 32 48; do + install -d ${PKGDESTDIR}/usr/share/icons/hicolor/${d}x${d}/apps + done + make -C src DESTDIR=${PKGDESTDIR} installvimbin install-icons + vmove usr/share/applications/*.desktop + } +} vim-huge_package() { depends="python vim-common-${version}_${revision}" short_desc+=" - Huge (all features enabled, using Python 2)" diff --git a/srcpkgs/vimb/template b/srcpkgs/vimb/template index 2d85ce564fb..6cd51fe5b9f 100644 --- a/srcpkgs/vimb/template +++ b/srcpkgs/vimb/template @@ -1,7 +1,7 @@ # Template file for 'vimb' pkgname=vimb -version=2.11 -revision=2 +version=2.12 +revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="$(vopt_if gtk3 webkitgtk-devel webkitgtk2-devel)" @@ -10,7 +10,7 @@ maintainer="Eivind Uggedal " license="GPL-3" homepage="http://fanglingsu.github.io/vimb" distfiles="https://github.com/fanglingsu/vimb/archive/${version}.tar.gz" -checksum=2ec583e6e425f8d620b54db6bcc56483770c7c5fd3f93b0429ddd6f7a7553935 +checksum=2443a27d625ff2a7aa7e7b694ec853e25dbdcb33b7c681c98c8fe81b1833b0b7 build_options="gtk3" desc_option_gtk3="Use GTK+3" diff --git a/srcpkgs/virglrenderer/template b/srcpkgs/virglrenderer/template index 9e2a841c5b1..79a0c3869fb 100644 --- a/srcpkgs/virglrenderer/template +++ b/srcpkgs/virglrenderer/template @@ -1,6 +1,6 @@ # Template file for 'virglrenderer' pkgname=virglrenderer -version=0.5.0 +version=0.6.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="MIT" homepage="https://virgil3d.github.io/" distfiles="https://www.freedesktop.org/software/virgl/${pkgname}-${version}.tar.bz2" -checksum=a1955a3433b6a51c3ee5def007b1973da22807b91437a2dbcdf664bf2c9240b6 +checksum=a549e351e0eb2ad1df471386ddcf85f522e7202808d1616ee9ff894209066e1a post_install() { vlicense COPYING diff --git a/srcpkgs/virt-manager/template b/srcpkgs/virt-manager/template index f138856ebf9..57fe174e26f 100644 --- a/srcpkgs/virt-manager/template +++ b/srcpkgs/virt-manager/template @@ -1,22 +1,22 @@ # Template file for 'virt-manager' pkgname=virt-manager -version=1.4.0 -revision=1 +version=1.4.1 +revision=2 noarch=yes nocross=yes build_style=python2-module hostmakedepends="intltool python-devel glib-devel gtk-update-icon-cache" depends="libosinfo python-gobject gnome-icon-theme gnome-ssh-askpass - openbsd-netcat yajl python-gconf libvirt-glib-python libvirt-python - python-urlgrabber libxml2-python python-ipaddr gir-freedesktop + openbsd-netcat yajl python-gconf libvirt-python python-urlgrabber + libxml2-python python-ipaddr gir-freedesktop libvirt-glib spice-gtk gtk-vnc vte3 python-requests dmidecode" pycompile_dirs="/usr/share/$pkgname" short_desc="User interface for managing virtual machines" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://virt-manager.org" distfiles="http://virt-manager.org/download/sources/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=bf31a40cc48500cbf87a0e93a5838fc3f6ce4e2fa03f8bce6aa2615625e6caca +checksum=e6c549999f14fbda210c07821910bfa35c086542e166f8b00d7c83717e9f3944 post_install() { rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \ diff --git a/srcpkgs/virt-what/template b/srcpkgs/virt-what/template new file mode 100644 index 00000000000..da3baa25f73 --- /dev/null +++ b/srcpkgs/virt-what/template @@ -0,0 +1,11 @@ +# Template file for 'virt-what' +pkgname=virt-what +version=1.15 +revision=1 +build_style=gnu-configure +short_desc="Detect when running in a virtual machine" +maintainer="Leah Neukirchen " +license="GPL-2" +homepage="https://people.redhat.com/~rjones/virt-what/" +distfiles="https://people.redhat.com/~rjones/${pkgname}/files/${pkgname}-${version}.tar.gz" +checksum=7ab9220d4682eadf9139c6afe62d33ebd273fff69e49054279caba5514937c41 diff --git a/srcpkgs/virtme/template b/srcpkgs/virtme/template index 4b5b71d5020..ae83ae92fab 100644 --- a/srcpkgs/virtme/template +++ b/srcpkgs/virtme/template @@ -10,7 +10,7 @@ hostmakedepends="python3-setuptools" depends="python3" pycompile_module="virtme" short_desc="An easy way to test your kernel changes in qemu/kvm" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://lwn.net/Articles/584620/" distfiles="https://git.kernel.org/cgit/utils/kernel/virtme/virtme.git/snapshot/${_commit}.tar.gz" diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk index b4f9087f5ef..e8c7cb5cdb6 100644 --- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk +++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk @@ -13,6 +13,7 @@ VBOX_PATH_APP_DOCS = $(VBOX_PATH_PACKAGE_DOCS) VBOX_WITH_REGISTRATION_REQUEST = VBOX_WITH_UPDATE_REQUEST = VBOX_USE_SYSTEM_XORG_HEADERS = 1 +VBOX_NO_LEGACY_XORG_X11 = 1 # Enable it when vnc pkg is available. #VBOX_WITH_VNC := 1 VBOX_GCC_WERR = diff --git a/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch b/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch new file mode 100644 index 00000000000..6d5dc9bdcb1 --- /dev/null +++ b/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch @@ -0,0 +1,11 @@ +--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2016-10-11 02:49:23.184986182 +0100 ++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:39.879176964 +0100 +@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo + + ifdef VBOX_USE_SYSTEM_XORG_HEADERS + # Build using local X.Org headers. We assume X.Org Server 1.7 or later. +- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system ++ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) + SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS)) + vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_system_CFLAGS := \ diff --git a/srcpkgs/virtualbox-ose/patches/008-root-window.patch b/srcpkgs/virtualbox-ose/patches/008-root-window.patch deleted file mode 100644 index af5ba1eb874..00000000000 --- a/srcpkgs/virtualbox-ose/patches/008-root-window.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/VBox/Additions/x11/vboxvideo/vboxvideo.h 2015-03-04 00:38:45.381480285 +0100 -+++ src/VBox/Additions/x11/vboxvideo/vboxvideo.h 2015-03-04 00:40:57.536942966 +0100 -@@ -130,15 +130,7 @@ - #define VBOX_MAX_DRAWABLES 256 /* At random. */ - - #define VBOXPTR(p) ((VBOXPtr)((p)->driverPrivate)) -- --/** Helper to work round different ways of getting the root window in different -- * server versions. */ --#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 70000000 \ -- && XORG_VERSION_CURRENT >= 10900000 --# define ROOT_WINDOW(pScrn) screenInfo.screens[(pScrn)->scrnIndex]->root --#else --# define ROOT_WINDOW(pScrn) WindowTable[(pScrn)->scrnIndex] --#endif -+#define ROOT_WINDOW(pScrn) screenInfo.screens[(pScrn)->scrnIndex]->root - - /** Structure containing all virtual monitor-specific information. */ - struct VBoxScreen diff --git a/srcpkgs/virtualbox-ose/patches/009-linux-4-10.patch b/srcpkgs/virtualbox-ose/patches/009-linux-4-10.patch deleted file mode 100644 index e3305fc0652..00000000000 --- a/srcpkgs/virtualbox-ose/patches/009-linux-4-10.patch +++ /dev/null @@ -1,22 +0,0 @@ -From d9bd947b1fa1d7c47cd1cdb894dadfa07f51e446 Mon Sep 17 00:00:00 2001 -From: vboxsync -Date: Tue, 24 Jan 2017 08:13:25 +0000 -Subject: [PATCH] Additions/linux/sharedfolders: Linux 4.10 fix - -git-svn-id: http://www.virtualbox.org/svn/vbox@65409 cfe28804-0f27-0410-a406-dd0f0b0b656f ---- - trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- src/VBox/Additions/linux/sharedfolders/lnkops.c.orig -+++ src/VBox/Additions/linux/sharedfolders/lnkops.c -@@ -90,7 +90,9 @@ static const char *sf_get_link(struct dentry *dentry, struct inode *inode, - - struct inode_operations sf_lnk_iops = - { -+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - .readlink = generic_readlink, -+# endif - # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) - .get_link = sf_get_link - # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index 6c0e1e47d36..02511474df4 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,14 +1,14 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose -version=5.1.14 -revision=2 -wrksrc="VirtualBox-${version}" +version=5.1.22 +revision=1 +wrksrc="VirtualBox-${version%*a}" short_desc="General-purpose full virtualizer for x86 hardware" maintainer="Juan RP " homepage="http://virtualbox.org" license="GPL-2, CDDL" -distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2" -checksum=8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a +distfiles="http://download.virtualbox.org/virtualbox/${version%*a}/VirtualBox-$version.tar.bz2" +checksum=fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899 nopie=yes lib32disabled=yes @@ -139,7 +139,7 @@ virtualbox-ose-dkms_package() { virtualbox-ose-guest_package() { lib32disabled=yes depends="virtualbox-ose-guest-dkms-${version}_${revision}" - conflicts="xserver-abi-video>20_1" + conflicts="xserver-abi-video>23_1" short_desc+=" - guest utilities" pkg_install() { @@ -154,8 +154,6 @@ virtualbox-ose-guest_package() { ${PKGDESTDIR}/etc/xdg/autostart/vboxclient.desktop cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions - install -D vboxvideo_drv_system.so \ - ${PKGDESTDIR}/usr/lib/xorg/modules/drivers/vboxvideo.so install -d ${PKGDESTDIR}/usr/lib/xorg/modules/drivers install -m755 VBoxOGL*.so ${PKGDESTDIR}/usr/lib ln -sf /usr/lib/VBoxOGL.so \ diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template index b489a3129e1..c471623d376 100644 --- a/srcpkgs/virtuoso/template +++ b/srcpkgs/virtuoso/template @@ -1,7 +1,7 @@ # Template file for 'virtuoso' pkgname=virtuoso version=6.1.8 -revision=9 +revision=10 build_style=gnu-configure wrksrc="${pkgname}-opensource-${version}" hostmakedepends="flex gperf net-tools" diff --git a/srcpkgs/vis/template b/srcpkgs/vis/template index 62bfd3beec1..a6ca0690563 100644 --- a/srcpkgs/vis/template +++ b/srcpkgs/vis/template @@ -1,6 +1,6 @@ # Template file for 'vis' pkgname=vis -version=0.2 +version=0.3 revision=1 build_style=gnu-configure makedepends="libtermkey-devel ncurses-devel lua-devel" @@ -9,8 +9,8 @@ short_desc="Tiny vim like editor" maintainer="Diogo Leal " license="BSD" homepage="https://github.com/martanne/vis" -distfiles="http://www.brain-dump.org/projects/vis/vis-${version}.tar.gz" -checksum=3e5b81d760849c56ee378421e9ba0f653c641bf78e7594f71d85357be99a752d +distfiles="https://github.com/martanne/vis/archive/v${version}.tar.gz" +checksum=bed8ed32ef4f81bc4fd28e297ea8edc80027ac6923b9d3b5bd955d24899c7077 conflicts="outils" # /usr/bin/vis post_install() { diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template index cf6a18071d5..2f405badad2 100644 --- a/srcpkgs/vivaldi/template +++ b/srcpkgs/vivaldi/template @@ -1,6 +1,6 @@ # Template file for 'vivaldi' pkgname=vivaldi -version=1.7.735.46 +version=1.9.818.44 revision=1 _release=1 only_for_archs="i686 x86_64" @@ -14,10 +14,10 @@ nopie=yes if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ];then _debarch=amd64 - checksum=bb15313f9d7f17bc135b5a41df0aaf83b1bdc1867bf3fe4fce5757a0bbadebbe + checksum=7821b002c975a46ad29d367b89e22dab9a6f8f99f5d36bcf99a55194dae3f32a else _debarch=i386 - checksum=0aada8e99560c60d0a49ee3ff8ef1c5e38e2ae8bf1f7aa59b72b5871ad64b1c6 + checksum=ddd50af0ad4fa25cfd9ce4c77ccf083b38d9e4694bbf6cf61dab7ecbc207ce77 fi distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb" diff --git a/srcpkgs/vmtouch/template b/srcpkgs/vmtouch/template index 4f38af2b330..8c278a51e67 100644 --- a/srcpkgs/vmtouch/template +++ b/srcpkgs/vmtouch/template @@ -1,6 +1,6 @@ # Template file for 'vmtouch' pkgname=vmtouch -version=1.2.0 +version=1.3.0 revision=1 maintainer="Orphaned " license="BSD" @@ -8,10 +8,10 @@ hostmakedepends="perl" homepage="http://hoytech.com/vmtouch/" short_desc="The Virtual Memory Toucher" distfiles="https://github.com/hoytech/vmtouch/archive/v${version}.tar.gz" -checksum=154034dec5ef550dcb7ff5a359ee1b7a9421f586f47237e3bc2617efa148b5fd +checksum=4615980b8f824c8eb164e50ec0880bcb71591f4e3989a6075e5a3e2efd122ceb do_install() { - make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man/man8 install + make PREFIX=${DESTDIR}/usr install # for xlint: vlicense vmkdir usr/share/licenses/vmtouch sed -n '/^*/,/^*/p' vmtouch.c > ${DESTDIR}/usr/share/licenses/vmtouch/LICENSE diff --git a/srcpkgs/vpcs/patches/ldflags.patch b/srcpkgs/vpcs/patches/ldflags.patch new file mode 100644 index 00000000000..98f2bbb5fea --- /dev/null +++ b/srcpkgs/vpcs/patches/ldflags.patch @@ -0,0 +1,13 @@ +--- src/Makefile.linux.orig 2017-01-20 15:51:20.339835620 -0600 ++++ src/Makefile.linux 2017-01-20 15:52:18.975831788 -0600 +@@ -4,8 +4,8 @@ + CPUTYPE=i386 + HVOPT=-DHV + +-CFLAGS=-D$(OSTYPE) -D$(CPUTYPE) $(HVOPT) -Wall -I. -DTAP +-LDFLAGS=-lpthread -lutil -s -static ++override CFLAGS+=-D$(OSTYPE) -D$(CPUTYPE) $(HVOPT) -Wall -I. -DTAP ++override LDFLAGS+=-lpthread -lutil -s -static + OBJS=vpcs.o \ + daemon.o \ + readline.o \ diff --git a/srcpkgs/vpcs/patches/readline.patch b/srcpkgs/vpcs/patches/readline.patch new file mode 100644 index 00000000000..22ddaea890c --- /dev/null +++ b/srcpkgs/vpcs/patches/readline.patch @@ -0,0 +1,11 @@ +--- src/readline.c.orig 2017-04-21 00:27:54.248062134 -0500 ++++ src/readline.c 2017-04-21 00:28:07.690155810 -0500 +@@ -431,7 +431,7 @@ + i = kb[0]; + if (!isprint(i)) + continue; +- if (rls->pos < strlen(rls->kbuffer) - 1) { ++ if (rls->pos < strlen(rls->kbuffer) + 1) { + j = strlen(rls->kbuffer); + /* avoid overflow */ + if (j < rls->maxbuflen - 1) { diff --git a/srcpkgs/vpcs/patches/remote_musl.patch b/srcpkgs/vpcs/patches/remote_musl.patch new file mode 100644 index 00000000000..80c069c7207 --- /dev/null +++ b/srcpkgs/vpcs/patches/remote_musl.patch @@ -0,0 +1,18 @@ +--- src/remote.c.orig 2017-01-20 16:46:45.037618348 -0600 ++++ src/remote.c 2017-01-20 16:47:18.504616161 -0600 +@@ -43,13 +43,13 @@ + #include "readline.h" + #include "utils.h" + +-int open_remote(int fdio, const char *destip, const u_short destport) ++int open_remote(int fdio, const char *destip, const unsigned short destport) + { + int s; + struct sockaddr_in addr_in; + struct termios termios; + char kb[512]; +- u_char outbuf[512]; ++ unsigned char outbuf[512]; + int rc; + int i; + struct timeval tv; diff --git a/srcpkgs/vpcs/template b/srcpkgs/vpcs/template new file mode 100644 index 00000000000..a090690326e --- /dev/null +++ b/srcpkgs/vpcs/template @@ -0,0 +1,27 @@ +# Template file for 'vpcs' +pkgname=vpcs +version=0.8 +revision=1 +build_wrksrc="src" +build_style=gnu-makefile +makedepends="glibc-devel" +short_desc="Virtual PC Simulator" +maintainer="Michael Aldridge " +license="BSD 2-Clause" +homepage="https://sourceforge.net/projects/vpcs" +distfiles="${SOURCEFORGE_SITE}/project/vpcs/${version}/${pkgname}-${version}-src.tbz" +checksum=dca602d0571ba852c916632c4c0060aa9557dd744059c0f7368860cfa8b3c993 + +case "$XBPS_TARGET_MACHINE" in + *-musl) broken=yes # depends on GNU getopt + ;; +esac + +pre_build() { + ln -s Makefile.linux Makefile +} + +do_install() { + vbin vpcs + vlicense $wrksrc/COPYING +} diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template index 71a15babe68..4c5adf9c470 100644 --- a/srcpkgs/vsftpd/template +++ b/srcpkgs/vsftpd/template @@ -1,7 +1,7 @@ # Template file for 'vsftpd' pkgname=vsftpd version=3.0.3 -revision=6 +revision=7 build_style=gnu-makefile makedepends="pam-devel libcap-devel libressl-devel" short_desc="FTP deamon with focus on security" diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template index 31b9a7d32f5..bdc9ec3a558 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -1,13 +1,13 @@ # Template build file for 'vte3'. pkgname=vte3 -version=0.46.1 +version=0.48.2 revision=1 wrksrc=vte-${version} build_style=gnu-configure configure_args="--disable-static $(vopt_if gir '--enable-introspection --enable-vala' '--disable-introspection --disable-vala')" hostmakedepends="pkg-config intltool glib-devel gnome-doc-utils - $(vopt_if gir 'gobject-introspection vala-devel')" + $(vopt_if gir 'gobject-introspection vala-devel') gperf" makedepends="gtk+3-devel ncurses-devel gnutls-devel pcre2-devel" depends="vte" short_desc="Terminal widget with improved accessibility and I18N support" @@ -15,7 +15,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz" -checksum=8800cf8bc259704a12ad1853fb0eb43bfe3857af15242e6fb9f2c3fd95b3f5c6 +checksum=c278b301edfe38b43baec1bccc86e225dacea5b670a96ca7ea55ca9a4b030690 # Suppress warnings as errors for NULL format strings (musl libc) CXXFLAGS="-Wno-error=format=" diff --git a/srcpkgs/vttest/template b/srcpkgs/vttest/template new file mode 100644 index 00000000000..a5c186f44ce --- /dev/null +++ b/srcpkgs/vttest/template @@ -0,0 +1,15 @@ +# Template file for 'vttest' +pkgname=vttest +version=20140305 +revision=1 +build_style=gnu-configure +short_desc="Tests the compatibility so-called 'VT100-compatible' terminals" +maintainer="Leah Neukirchen " +license="BSD" +homepage="http://invisible-island.net/vttest/vttest.html" +distfiles="http://invisible-mirror.net/archives/${pkgname}/${pkgname}-${version}.tgz" +checksum=0168aa34061d4470a68b0dd0781a2a9e2bbfb1493e540c99f615b867a11cbf83 + +post_install() { + vlicense COPYING +} diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template index 85c5ab7fa59..c96cbd2b19c 100644 --- a/srcpkgs/w3m/template +++ b/srcpkgs/w3m/template @@ -1,7 +1,7 @@ # Template file for 'w3m' pkgname=w3m version=0.5.3.git20170102 -revision=1 +revision=2 wrksrc="${pkgname}-${version/.git/-git}" build_style=gnu-configure configure_args=" diff --git a/srcpkgs/w_scan/patches/fix-uint.patch b/srcpkgs/w_scan/patches/fix-uint.patch index d7db19a51c6..3bfd94384be 100644 --- a/srcpkgs/w_scan/patches/fix-uint.patch +++ b/srcpkgs/w_scan/patches/fix-uint.patch @@ -15,7 +15,7 @@ /* AUTOMATICALLY GENERATED - DO NOT EDIT MANUALLY */ #ifndef W_SCAN_VERSION_H #define W_SCAN_VERSION_H --uint version=20161022; -+unsigned int version=20161022; +-uint version=20170107; ++unsigned int version=20170107; #endif diff --git a/srcpkgs/w_scan/template b/srcpkgs/w_scan/template index b09b577859c..2af50272418 100644 --- a/srcpkgs/w_scan/template +++ b/srcpkgs/w_scan/template @@ -1,6 +1,6 @@ # Template file for 'w_scan' pkgname="w_scan" -version="20161022" +version="20170107" revision=1 hostmakedepends="automake libtool" short_desc="A universal ATSC and DVB blind scanner" @@ -8,7 +8,7 @@ maintainer="Stefan Mühlinghaus " license="GPL-2" homepage="http://wirbel.htpc-forum.de/w_scan/index2.html" distfiles="http://wirbel.htpc-forum.de/w_scan/w_scan-${version}.tar.bz2" -checksum="2077af7f8b42b7af038e83abf0565f96f59461bbc5e14c4516b68f50b5c00d79" +checksum="38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe" build_style="gnu-configure" pre_configure() { diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template index 77393b5fcfd..e3261206b85 100644 --- a/srcpkgs/warzone2100/template +++ b/srcpkgs/warzone2100/template @@ -1,6 +1,6 @@ # Template file for 'warzone2100' pkgname=warzone2100 -version=3.2.2 +version=3.2.3 revision=1 build_style=gnu-configure configure_args="--with-distributor=void" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://wz2100.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=af5a8dfe9e9df3505ef2543e4e62afb1f61a4ee4cc903f8ff7785f3c79779d18 +checksum=fcab9e860203e7dacda6ee60384da490a9d44aeafc07aa31ff25f9c548be7582 nocross="yes" # cannot run test program while cross compiling diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template index 89d3d30d3f0..44d6d053740 100644 --- a/srcpkgs/wayland/template +++ b/srcpkgs/wayland/template @@ -1,6 +1,6 @@ # Template file for 'wayland'. pkgname=wayland -version=1.12.0 +version=1.13.0 revision=1 build_style=gnu-configure configure_args="--disable-documentation --disable-static" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://wayland.freedesktop.org/" license="MIT" distfiles="http://wayland.freedesktop.org/releases/wayland-${version}.tar.xz" -checksum=d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1 +checksum=69b052c031a61e89af7cc8780893d0da1e301492352aa449dee9345043e6fe51 pre_configure() { autoreconf -fi diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template index 3942a8354b7..f5ba9f436fd 100644 --- a/srcpkgs/webcat/template +++ b/srcpkgs/webcat/template @@ -1,12 +1,12 @@ # Template file for 'webcat' pkgname=webcat version=1.0 -revision=6 +revision=7 go_import_path="github.com/thypon/webcat" build_style=go hostmakedepends="git-perl" short_desc="WebSocket Netcat" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://github.com/thypon/webcat" distfiles="https://github.com/thypon/${pkgname}/archive/v${version}.tar.gz" diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 6ecf7c81f31..abe7d1db9ee 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -1,6 +1,6 @@ # Template file for 'webkit2gtk' pkgname=webkit2gtk -version=2.14.5 +version=2.16.1 revision=1 wrksrc="webkitgtk-$version" build_style=cmake @@ -10,7 +10,7 @@ maintainer="Enno Boland " homepage="http://webkitgtk.org/" license="LGPL-2.1, 2-clause-BSD" distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz" -checksum=3ca8f1c33a9b43d6c753dcac1c0788656930e06382b10fdf5c2805ea8f96369f +checksum=eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945 # ETOOHUGE nodebug=1 @@ -20,11 +20,16 @@ makedepends=" at-spi2-core-devel libjpeg-turbo-devel libpng-devel sqlite-devel harfbuzz-devel gst-plugins-base1-devel libsoup-devel libxslt-devel gnutls-devel icu-devel enchant-devel dbus-glib-devel libwebp-devel - gtk+-devel gtk+3-devel libgudev-devel libsecret-devel ruby-devel geoclue2 - libnotify-devel hyphen-devel" + gtk+-devel gtk+3-devel libgudev-devel libsecret-devel ruby-devel + geoclue2-devel libnotify-devel hyphen-devel" case "$XBPS_TARGET_MACHINE" in - armv6*) CXXFLAGS="-D__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8=1" +aarch64*) + broken="https://build.voidlinux.eu/builders/aarch64_builder/builds/1709/steps/shell_3/logs/stdio" ;; +armv6*) + configure_args+=" -DENABLE_JIT=0" + CXXFLAGS="-D__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8=1" + ;; esac # Package build options diff --git a/srcpkgs/webkitgtk/template b/srcpkgs/webkitgtk/template index 543a485c206..d04418405f8 100644 --- a/srcpkgs/webkitgtk/template +++ b/srcpkgs/webkitgtk/template @@ -1,7 +1,7 @@ # Template file for 'webkitgtk' pkgname=webkitgtk version=2.4.11 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-gtk-doc --disable-schemas-compile --enable-accelerated-compositing $(vopt_enable gir introspection) @@ -21,9 +21,9 @@ hostmakedepends="automake libtool perl python pkg-config intltool gperf flex makedepends=" at-spi2-core-devel libjpeg-turbo-devel libpng-devel sqlite-devel harfbuzz-devel gst-plugins-base1-devel libsoup-devel libxslt-devel - icu-devel enchant-devel dbus-glib-devel libwebp-devel - gtk+-devel gtk+3-devel libgudev-devel libsecret-devel MesaLib-devel geoclue2 - $(vopt_if wayland 'libxkbcommon-devel wayland-devel') + icu-devel enchant-devel dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel + libgudev-devel libsecret-devel MesaLib-devel geoclue2-devel + $(vopt_if wayland 'libxkbcommon-devel wayland-devel libwayland-egl') $(vopt_if x11 libXt-devel)" # Package build options diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template index f786214c22f..ff71d97ecf4 100644 --- a/srcpkgs/weechat/template +++ b/srcpkgs/weechat/template @@ -1,7 +1,7 @@ # Template file for 'weechat' pkgname=weechat -version=1.7 -revision=2 +version=1.7.1 +revision=1 lib32disabled=yes build_style=cmake configure_args="-DENABLE_MAN=ON -DENABLE_ENCHANT=ON -DPYTHON_EXECUTABLE=/usr/bin/python2.7 -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so" @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.weechat.org" distfiles="${homepage}/files/src/$pkgname-$version.tar.bz2" -checksum=c78a0063eee2f4cf3e67a3ff3936cfba0ed0012b1b7e5ec381c2d981f2cb64d0 +checksum=c0f9786cdfcf7411bfadca828c5e0819ac641717f775da804d8fa2aa69a84080 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template index 24758748f53..465a0e00f9c 100644 --- a/srcpkgs/wego/template +++ b/srcpkgs/wego/template @@ -1,7 +1,7 @@ # Template file for 'wego' pkgname=wego version=2.0 -revision=4 +revision=5 hostmakedepends="git-perl" build_style=go go_import_path=github.com/schachmat/wego diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template index 4484dabad21..5be207f54df 100644 --- a/srcpkgs/wesnoth/template +++ b/srcpkgs/wesnoth/template @@ -1,7 +1,7 @@ # Template file for 'wesnoth' pkgname=wesnoth version=1.12.6 -revision=2 +revision=3 build_style=cmake configure_args="-DENABLE_OMP=1" hostmakedepends="pkg-config" diff --git a/srcpkgs/weston/patches/0001-make-error-portable.patch b/srcpkgs/weston/patches/0001-make-error-portable.patch deleted file mode 100644 index bc47d193c7f..00000000000 --- a/srcpkgs/weston/patches/0001-make-error-portable.patch +++ /dev/null @@ -1,80 +0,0 @@ -From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 29 May 2015 20:56:00 -0700 -Subject: [PATCH weston] make error() portable - -error() is not posix but gnu extension so may not be available on all -kind of systemsi e.g. musl. - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - configure.ac | 2 ++ - src/weston-error.h | 20 ++++++++++++++++++++ - src/weston-launch.c | 2 +- - 3 files changed, 23 insertions(+), 1 deletion(-) - create mode 100644 src/weston-error.h - -diff --git configure.ac configure.ac -index 263fc22..f52cd62 100644 ---- configure.ac -+++ configure.ac -@@ -57,6 +57,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], - [[#include ]]) - AC_CHECK_HEADERS([execinfo.h]) - -+AC_CHECK_HEADERS([error.h]) -+ - AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) - - COMPOSITOR_MODULES="wayland-server >= 1.7.93 pixman-1 >= 0.25.2" -diff --git src/weston-error.h src/weston-error.h -new file mode 100644 -index 0000000..2089d02 ---- /dev/null -+++ src/weston-error.h -@@ -0,0 +1,20 @@ -+#ifndef _WESTON_ERROR_H -+#define _WESTON_ERROR_H -+ -+#if defined(HAVE_ERROR_H) -+#include -+#else -+#include -+#include -+#define _weston_error(S, E, F, ...) do { \ -+ if (E) \ -+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ -+ else \ -+ err(S, F, ##__VA_ARGS__); \ -+} while(0) -+ -+#define error _weston_error -+#endif -+ -+#endif -+ -diff --git src/weston-launch.c src/weston-launch.c -index 10c66de..3e6d30a 100644 ---- src/weston-launch.c -+++ src/weston-launch.c -@@ -30,7 +30,6 @@ - #include - #include - --#include - #include - - #include -@@ -56,6 +55,7 @@ - #endif - - #include "weston-launch.h" -+#include "weston-error.h" - - #define DRM_MAJOR 226 - --- -2.1.4 - diff --git a/srcpkgs/weston/patches/musl.patch b/srcpkgs/weston/patches/musl.patch index 8a85e9767c0..5c99b8a4976 100644 --- a/srcpkgs/weston/patches/musl.patch +++ b/srcpkgs/weston/patches/musl.patch @@ -1,10 +1,41 @@ ---- shared/xalloc.h.orig 2016-06-01 07:31:00.671473482 +0200 -+++ shared/xalloc.h 2016-06-01 07:31:13.382610803 +0200 -@@ -32,6 +32,7 @@ extern "C" { +--- libweston/weston-launch.c 2016-10-22 10:23:57.000000000 -0600 ++++ libweston/weston-launch.c 2017-04-11 12:34:26.299944516 -0600 +@@ -33,7 +33,6 @@ + #include + #include - #include - #include -+#include +-#include + #include - #include "zalloc.h" + #include +@@ -59,6 +58,7 @@ + #endif + #include "weston-launch.h" ++#include "src/weston-error.h" + + #define DRM_MAJOR 226 + + +--- /dev/null 2017-04-11 08:58:10.024649386 -0600 ++++ src/weston-error.h 2017-04-11 12:38:10.575544091 -0600 +@@ -0,0 +1,19 @@ ++#ifndef _WESTON_ERROR_H ++#define _WESTON_ERROR_H ++ ++#if defined(HAVE_ERROR_H) ++#include ++#else ++#include ++#include ++#define _weston_error(S, E, F, ...) do { \ ++ if (E) \ ++ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ ++ else \ ++ err(S, F, ##__VA_ARGS__); \ ++} while(0) ++ ++#define error _weston_error ++#endif ++#endif ++ diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template index aa269fcf62e..da6191ef4ae 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -1,6 +1,6 @@ # Template file for 'weston'. pkgname=weston -version=1.11.1 +version=2.0.0 revision=1 build_style=gnu-configure # XXX enable rdp compositor if freerdp is updated to >=1.1. @@ -13,12 +13,12 @@ maintainer="Juan RP " homepage="http://wayland.freedesktop.org/" license="MIT" distfiles="http://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz" -checksum=548973496a5c8613d6690f9120f21066946a544df65ce4fe0ef153a8dc0bf6de +checksum=b4e446ac27f118196f1609dab89bb3cb3e81652d981414ad860e733b355365d8 system_groups="weston-launch" lib32disabled=yes hostmakedepends="pkg-config wayland-devel wayland-protocols autoconf automake libtool" -makedepends="libpng-devel wayland-devel wayland-protocols libxkbcommon-devel +makedepends="libpng-devel wayland-devel wayland-protocols libwayland-egl libxkbcommon-devel pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel poppler-glib-devel pam-devel lcms2-devel eudev-libudev-devel libdrm-devel libinput-devel libxcb-devel libXcursor-devel colord-devel @@ -46,6 +46,9 @@ x86_64*|i686*) makedepends+=" glu-devel libva-devel" configure_args+=" --enable-vaapi-recorder" ;; +aarch64*) + broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/1785/steps/shell_3/logs/stdio" + ;; esac pre_configure() { @@ -69,12 +72,12 @@ weston-colord_package() { weston-x11_package() { short_desc+=" - x11 backend" pkg_install() { - vmove /usr/lib/weston/x11-backend.so + vmove /usr/lib/libweston-2/x11-backend.so } } weston-xwayland_package() { short_desc+=" - xwayland backend" pkg_install() { - vmove /usr/lib/weston/xwayland.so + vmove /usr/lib/libweston-2/xwayland.so } } diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template index 488a99b2321..f324fc969a7 100644 --- a/srcpkgs/wget/template +++ b/srcpkgs/wget/template @@ -1,7 +1,7 @@ # Template file for 'wget' pkgname=wget version=1.19.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')" hostmakedepends="perl pkg-config" diff --git a/srcpkgs/windowchef/template b/srcpkgs/windowchef/template index 4ea5edfa7d4..bfc5100af80 100644 --- a/srcpkgs/windowchef/template +++ b/srcpkgs/windowchef/template @@ -1,6 +1,6 @@ # Template file for 'windowchef' pkgname=windowchef -version=0.3.1 +version=0.3.2 revision=1 build_style=gnu-makefile makedepends="xcb-util-wm-devel" @@ -9,7 +9,7 @@ maintainer="Diogo Leal " license="ISC" homepage="https://github.com/tudurom/windowchef" distfiles="https://github.com/tudurom/windowchef/archive/v${version}.tar.gz" -checksum=ff1ff6fde354556c71cbd7090264a56de59ada99baa51bbf3d58134c320358fc +checksum=4de42c00e062d4e1c31c3321d7826eb53b5d7fe9d4deeaf40c405d9191ea36c4 pre_build() { sed -i 's|^CFLAGS +=|override CFLAGS +=|g' config.mk diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 85da126b88d..7ee5dcf5703 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,15 +1,15 @@ # Template file for 'wine' pkgname=wine -version=2.3 +version=2.6 revision=1 build_style=gnu-configure configure_args="--without-gstreamer" short_desc="Run Microsoft Windows applications" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="LGPL-2.1" homepage="http://www.winehq.org/" distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${version}.tar.xz" -checksum=afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e +checksum=e6ff64758f437647e99a36c1275e41adf54f0432907172d3bba22b070a97aac0 CC="gcc" CFLAGS="-O2 -pipe" @@ -28,7 +28,8 @@ makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel libpcap-devel cups-devel dbus-devel ocl-icd-devel" depends="libXi libXinerama libXcomposite libXcursor libOSMesa - desktop-file-utils hicolor-icon-theme liberation-fonts-ttf" + desktop-file-utils hicolor-icon-theme liberation-fonts-ttf + gnutls" binfmts="/usr/bin/wine --magic MZ" @@ -45,7 +46,7 @@ fi if [ ${build_option_staging} ]; then makedepends+=" libva-devel gtk+3-devel" distfiles+=" https://github.com/wine-compholio/wine-staging/archive/v${version}.tar.gz" - checksum+=" 9a81be606836fab6203857f7937ff97575947f75d52c80fb5489418efb8b87e1" + checksum+=" ff86ddcceb7f6857bd415db3842ddf216a5cb301452e2a08053a9378cbf5580a" fi post_extract() { diff --git a/srcpkgs/winetricks/template b/srcpkgs/winetricks/template index 4b30a6f3670..7d272791b8e 100644 --- a/srcpkgs/winetricks/template +++ b/srcpkgs/winetricks/template @@ -1,13 +1,13 @@ # Template file for 'winetricks' pkgname=winetricks -version=20170207 +version=20170327 revision=1 noarch=yes build_style=gnu-makefile depends="cabextract unzip xmessage" # actually it depends on wine short_desc="Script to install various redistributable runtime libraries in Wine" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="LGPL-3" homepage="http://wiki.winehq.org/$pkgname" distfiles="https://github.com/Winetricks/$pkgname/archive/$version.tar.gz" -checksum=a322a2e71b67306f9943a41456a5fe743d33c643569c2462ea5fc00dcb6008ea +checksum=ad381386be95f5f2c34a69a6d1d77f3d41d86f883b8bed7ac4699947cf13e97d diff --git a/srcpkgs/wireguard/template b/srcpkgs/wireguard/template index 86c32afb2e9..652a71566b3 100644 --- a/srcpkgs/wireguard/template +++ b/srcpkgs/wireguard/template @@ -1,6 +1,6 @@ # Template file for 'wireguard' pkgname=wireguard -version=0.0.20170223 +version=0.0.20170421 revision=1 wrksrc="WireGuard-${version}" build_wrksrc="src/tools" @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="GPL-2" homepage="https://www.wireguard.io/" distfiles="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz" -checksum=6d2c8cd29c4f9fb404546a4749ec050739a26b4a49b5864f1dec531377c3c50d +checksum=03c82af774224cd171d000ee4a519b5e474cc6842ac04967773cf77b26750000 triggers="dkms" dkms_modules="wireguard ${version}" diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index 133c8ad66e9..2450f36e2e6 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,6 +1,6 @@ # Template file for 'wireshark' pkgname=wireshark -version=2.2.5 +version=2.2.6 revision=1 build_style=gnu-configure configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua @@ -17,7 +17,7 @@ license="GPL-2" # XXX ovh is blocked (repo4.voidlinux.eu can't download this). distfiles="http://www.wireshark.org/download/src/${pkgname}-${version}.tar.bz2" #distfiles="https://sources.voidlinux.eu/${pkgname}-${version}/${pkgname}-${version}.tar.bz2" -checksum=75dd88d3d6336559e5b0b72077d8a772a988197d571f00029986225fef609ac8 +checksum=f627d51eda85f5ae5f5c8c9fc1f6539ffc2a270dd7500dc7f67490a8534ca849 system_groups="wireshark" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" diff --git a/srcpkgs/wmii/template b/srcpkgs/wmii/template index 38a14f23205..0c0a06a3bfa 100644 --- a/srcpkgs/wmii/template +++ b/srcpkgs/wmii/template @@ -9,7 +9,7 @@ short_desc="A lightweight, dynamic window manager for X11" maintainer="Zach L. " license="GPL-3" homepage="https://code.google.com/p/wmii/" -distfiles="https://wmii.googlecode.com/files/${pkgname}+ixp-${version}.tbz" +distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wmii/wmii+ixp-${version}.tbz" checksum=0466f1a5c534b0ee9fdace2c7a2d251845b7ec0ae80bdb8e68ae6584ebeebf2b nocross="http://build.voidlinux.eu/builders/armv7l_builder/builds/12036/steps/shell_3/logs/stdio" diff --git a/srcpkgs/wpa_supplicant/files/config b/srcpkgs/wpa_supplicant/files/config index 961de5425e4..75fc1b68c68 100644 --- a/srcpkgs/wpa_supplicant/files/config +++ b/srcpkgs/wpa_supplicant/files/config @@ -20,63 +20,6 @@ # used to fix build issues on such systems (krb5.h not found). #CFLAGS += -I/usr/include/kerberos -# Example configuration for various cross-compilation platforms - -#### sveasoft (e.g., for Linksys WRT54G) ###################################### -#CC=mipsel-uclibc-gcc -#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc -#CFLAGS += -Os -#CPPFLAGS += -I../src/include -I../../src/router/openssl/include -#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl -############################################################################### - -#### openwrt (e.g., for Linksys WRT54G) ####################################### -#CC=mipsel-uclibc-gcc -#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc -#CFLAGS += -Os -#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ -# -I../WRT54GS/release/src/include -#LIBS = -lssl -############################################################################### - - -# Driver interface for Host AP driver -#CONFIG_DRIVER_HOSTAP=y - -# Driver interface for Agere driver -#CONFIG_DRIVER_HERMES=y -# Change include directories to match with the local setup -#CFLAGS += -I../../hcf -I../../include -I../../include/hcf -#CFLAGS += -I../../include/wireless - -# Driver interface for madwifi driver -# Deprecated; use CONFIG_DRIVER_WEXT=y instead. -#CONFIG_DRIVER_MADWIFI=y -# Set include directory to the madwifi source tree -#CFLAGS += -I../../madwifi - -# Driver interface for ndiswrapper -# Deprecated; use CONFIG_DRIVER_WEXT=y instead. -#CONFIG_DRIVER_NDISWRAPPER=y - -# Driver interface for Atmel driver -#CONFIG_DRIVER_ATMEL=y - -# Driver interface for old Broadcom driver -# Please note that the newer Broadcom driver ("hybrid Linux driver") supports -# Linux wireless extensions and does not need (or even work) with the old -# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. -#CONFIG_DRIVER_BROADCOM=y -# Example path for wlioctl.h; change to match your configuration -#CFLAGS += -I/opt/WRT54GS/release/src/include - -# Driver interface for Intel ipw2100/2200 driver -# Deprecated; use CONFIG_DRIVER_WEXT=y instead. -#CONFIG_DRIVER_IPW=y - -# Driver interface for Ralink driver -#CONFIG_DRIVER_RALINK=y - # Driver interface for generic Linux wireless extensions # Note: WEXT is deprecated in the current Linux kernel version and no new # functionality is added to it. nl80211-based interface is the new @@ -88,6 +31,22 @@ CONFIG_DRIVER_WEXT=y # Driver interface for Linux drivers using the nl80211 kernel interface CONFIG_DRIVER_NL80211=y +# QCA vendor extensions to nl80211 +#CONFIG_DRIVER_NL80211_QCA=y + +# driver_nl80211.c requires libnl. If you are compiling it yourself +# you may need to point hostapd to your version of libnl. +# +#CFLAGS += -I$ +#LIBS += -L$ + +# Use libnl v2.0 (or 3.0) libraries. +#CONFIG_LIBNL20=y + +# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored) +CONFIG_LIBNL32=y + + # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) #CONFIG_DRIVER_BSD=y #CFLAGS += -I/usr/local/include @@ -111,9 +70,6 @@ CONFIG_DRIVER_NL80211=y # wpa_supplicant. # CONFIG_USE_NDISUIO=y -# Driver interface for development testing -#CONFIG_DRIVER_TEST=y - # Driver interface for wired Ethernet drivers CONFIG_DRIVER_WIRED=y @@ -147,10 +103,9 @@ CONFIG_EAP_PEAP=y CONFIG_EAP_TTLS=y # EAP-FAST -# Note: Default OpenSSL package does not include support for all the -# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, -# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch) -# to add the needed functions. +# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed +# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g., +# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions. #CONFIG_EAP_FAST=y # EAP-GTC @@ -197,17 +152,20 @@ CONFIG_EAP_LEAP=y # Wi-Fi Protected Setup (WPS) CONFIG_WPS=y -# Enable WSC 2.0 support -#CONFIG_WPS2=y # Enable WPS external registrar functionality #CONFIG_WPS_ER=y # Disable credentials for an open network by default when acting as a WPS # registrar. #CONFIG_WPS_REG_DISABLE_OPEN=y +# Enable WPS support with NFC config method +#CONFIG_WPS_NFC=y # EAP-IKEv2 #CONFIG_EAP_IKEV2=y +# EAP-EKE +#CONFIG_EAP_EKE=y + # PKCS#12 (PFX) support (used to read private key and certificate file from # a file that usually has extension .p12 or .pfx) CONFIG_PKCS12=y @@ -220,13 +178,22 @@ CONFIG_SMARTCARD=y # Enable this if EAP-SIM or EAP-AKA is included #CONFIG_PCSC=y +# Support HT overrides (disable HT/HT40, mask MCS rates, etc.) +#CONFIG_HT_OVERRIDES=y + +# Support VHT overrides (disable VHT, mask MCS rates, etc.) +#CONFIG_VHT_OVERRIDES=y + # Development testing #CONFIG_EAPOL_TEST=y # Select control interface backend for external programs, e.g, wpa_cli: # unix = UNIX domain sockets (default for Linux/*BSD) # udp = UDP sockets using localhost (127.0.0.1) +# udp6 = UDP IPv6 sockets using localhost (::1) # named_pipe = Windows Named Pipe (default for Windows) +# udp-remote = UDP sockets with remote access (only for tests systems/purpose) +# udp6-remote = UDP IPv6 sockets with remote access (only for tests purpose) # y = use default (backwards compatibility) # If this option is commented out, control interface is not included in the # build. @@ -236,11 +203,11 @@ CONFIG_CTRL_IFACE=y # When building a wpa_cli binary for distribution, please note that these # libraries are licensed under GPL and as such, BSD license may not apply for # the resulting binary. -CONFIG_READLINE=y +#CONFIG_READLINE=y # Include internal line edit mode in wpa_cli. This can be used as a replacement # for GNU Readline to provide limited command line editing and history support. -#CONFIG_WPA_CLI_EDIT=y +CONFIG_WPA_CLI_EDIT=y # Remove debugging code that is printing out debug message to stdout. # This can be used to reduce the size of the wpa_supplicant considerably @@ -252,11 +219,6 @@ CONFIG_READLINE=y # 35-50 kB in code size. #CONFIG_NO_WPA=y -# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to -# save about 1 kB in code size when building only WPA-Personal (no EAP support) -# or 6 kB if building for WPA-Enterprise. -#CONFIG_NO_WPA2=y - # Remove IEEE 802.11i/WPA-Personal ASCII passphrase support # This option can be used to reduce code size by removing support for # converting ASCII passphrases into PSK. If this functionality is removed, the @@ -291,7 +253,7 @@ CONFIG_BACKEND=file # main_none = Very basic example (development use only) #CONFIG_MAIN=main -# Select wrapper for operatins system and C library specific functions +# Select wrapper for operating system and C library specific functions # unix = UNIX/POSIX like systems (default) # win32 = Windows systems # none = Empty template @@ -300,9 +262,17 @@ CONFIG_BACKEND=file # Select event loop implementation # eloop = select() loop (default) # eloop_win = Windows events and WaitForMultipleObject() loop -# eloop_none = Empty template #CONFIG_ELOOP=eloop +# Should we use poll instead of select? Select is used by default. +#CONFIG_ELOOP_POLL=y + +# Should we use epoll instead of select? Select is used by default. +#CONFIG_ELOOP_EPOLL=y + +# Should we use kqueue instead of select? Select is used by default. +#CONFIG_ELOOP_KQUEUE=y + # Select layer 2 packet implementation # linux = Linux packet socket (default) # pcap = libpcap/libdnet/WinPcap @@ -312,12 +282,16 @@ CONFIG_BACKEND=file # none = Empty template #CONFIG_L2_PACKET=linux +# Disable Linux packet socket workaround applicable for station interface +# in a bridge for EAPOL frames. This should be uncommented only if the kernel +# is known to not have the regression issue in packet socket behavior with +# bridge interfaces (commit 'bridge: respect RFC2863 operational state')'). +#CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y + # PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) CONFIG_PEERKEY=y -# IEEE 802.11w (management frame protection) -# This version is an experimental implementation based on IEEE 802.11w/D1.0 -# draft and is subject to change since the standard has not yet been finalized. +# IEEE 802.11w (management frame protection), also known as PMF # Driver support is also needed for IEEE 802.11w. #CONFIG_IEEE80211W=y @@ -335,6 +309,13 @@ CONFIG_PEERKEY=y # sent prior to negotiating which version will be used) #CONFIG_TLSV11=y +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2) +# can be enabled to enable use of stronger crypto algorithms. It should be +# noted that some existing TLS v1.0 -based implementation may not be compatible +# with TLS v1.2 message (ClientHello is sent prior to negotiating which version +# will be used) +#CONFIG_TLSV12=y + # If CONFIG_TLS=internal is used, additional library and include paths are # needed for LibTomMath. Alternatively, an integrated, minimal version of # LibTomMath can be used. See beginning of libtommath.c for details on benefits @@ -359,7 +340,7 @@ CONFIG_PEERKEY=y # Add support for old DBus control interface # (fi.epitest.hostap.WPASupplicant) -CONFIG_CTRL_IFACE_DBUS=y +#CONFIG_CTRL_IFACE_DBUS=y # Add support for new DBus control interface # (fi.w1.hostap.wpa_supplicant1) @@ -400,6 +381,16 @@ CONFIG_DEBUG_SYSLOG=y # Set syslog facility for debug messages CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON +# Add support for sending all debug messages (regardless of debug verbosity) +# to the Linux kernel tracing facility. This helps debug the entire stack by +# making it easy to record everything happening from the driver up into the +# same file, e.g., using trace-cmd. +#CONFIG_DEBUG_LINUX_TRACING=y + +# Add support for writing debug log to Android logcat instead of standard +# output +#CONFIG_ANDROID_LOG=y + # Enable privilege separation (see README 'Privilege separation' for details) #CONFIG_PRIVSEP=y @@ -459,10 +450,101 @@ CONFIG_NO_RANDOM_POOL=y # IEEE 802.11n (High Throughput) support (mainly for AP mode) #CONFIG_IEEE80211N=y +# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode) +# (depends on CONFIG_IEEE80211N) +#CONFIG_IEEE80211AC=y + +# Wireless Network Management (IEEE Std 802.11v-2011) +# Note: This is experimental and not complete implementation. +#CONFIG_WNM=y + # Interworking (IEEE 802.11u) # This can be used to enable functionality to improve interworking with # external networks (GAS/ANQP to learn more about the networks and network # selection based on available credentials). #CONFIG_INTERWORKING=y -CONFIG_LIBNL32=y +# Hotspot 2.0 +#CONFIG_HS20=y + +# Enable interface matching in wpa_supplicant +#CONFIG_MATCH_IFACE=y + +# Disable roaming in wpa_supplicant +#CONFIG_NO_ROAMING=y + +# AP mode operations with wpa_supplicant +# This can be used for controlling AP mode operations with wpa_supplicant. It +# should be noted that this is mainly aimed at simple cases like +# WPA2-Personal while more complex configurations like WPA2-Enterprise with an +# external RADIUS server can be supported with hostapd. +CONFIG_AP=y + +# P2P (Wi-Fi Direct) +# This can be used to enable P2P support in wpa_supplicant. See README-P2P for +# more information on P2P operations. +CONFIG_P2P=y + +# Enable TDLS support +#CONFIG_TDLS=y + +# Wi-Fi Direct +# This can be used to enable Wi-Fi Direct extensions for P2P using an external +# program to control the additional information exchanges in the messages. +#CONFIG_WIFI_DISPLAY=y + +# Autoscan +# This can be used to enable automatic scan support in wpa_supplicant. +# See wpa_supplicant.conf for more information on autoscan usage. +# +# Enabling directly a module will enable autoscan support. +# For exponential module: +#CONFIG_AUTOSCAN_EXPONENTIAL=y +# For periodic module: +#CONFIG_AUTOSCAN_PERIODIC=y + +# Password (and passphrase, etc.) backend for external storage +# These optional mechanisms can be used to add support for storing passwords +# and other secrets in external (to wpa_supplicant) location. This allows, for +# example, operating system specific key storage to be used +# +# External password backend for testing purposes (developer use) +#CONFIG_EXT_PASSWORD_TEST=y + +# Enable Fast Session Transfer (FST) +#CONFIG_FST=y + +# Enable CLI commands for FST testing +#CONFIG_FST_TEST=y + +# OS X builds. This is only for building eapol_test. +#CONFIG_OSX=y + +# Automatic Channel Selection +# This will allow wpa_supplicant to pick the channel automatically when channel +# is set to "0". +# +# TODO: Extend parser to be able to parse "channel=acs_survey" as an alternative +# to "channel=0". This would enable us to eventually add other ACS algorithms in +# similar way. +# +# Automatic selection is currently only done through initialization, later on +# we hope to do background checks to keep us moving to more ideal channels as +# time goes by. ACS is currently only supported through the nl80211 driver and +# your driver must have survey dump capability that is filled by the driver +# during scanning. +# +# TODO: In analogy to hostapd be able to customize the ACS survey algorithm with +# a newly to create wpa_supplicant.conf variable acs_num_scans. +# +# Supported ACS drivers: +# * ath9k +# * ath5k +# * ath10k +# +# For more details refer to: +# http://wireless.kernel.org/en/users/Documentation/acs +#CONFIG_ACS=y + +# Support Multi Band Operation +#CONFIG_MBO=y diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index 6d0517fb4c7..c412e197ddf 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,7 +1,7 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=2.6 -revision=4 +revision=6 build_wrksrc=$pkgname short_desc="WPA/WPA2/IEEE 802.1X Supplicant" maintainer="Juan RP " diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template index 2de75fe887f..d7ab9c2c443 100644 --- a/srcpkgs/wvstreams/template +++ b/srcpkgs/wvstreams/template @@ -1,7 +1,7 @@ # Template file for 'wvstreams' pkgname=wvstreams version=4.6.1 -revision=13 +revision=14 build_style=gnu-configure maintainer="Enno Boland " license="LGPL-2" diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template index 83f6ee9c86a..2a3f47aedde 100644 --- a/srcpkgs/x11vnc/template +++ b/srcpkgs/x11vnc/template @@ -1,7 +1,7 @@ # Template file for 'x11vnc' pkgname=x11vnc version=0.9.13 -revision=11 +revision=12 build_style=gnu-configure makedepends="zlib-devel libX11-devel libXtst-devel libXinerama-devel libXdamage-devel libXrandr-devel libressl-devel libjpeg-turbo-devel" short_desc="VNC server for real X displays" diff --git a/srcpkgs/xapian-core/template b/srcpkgs/xapian-core/template index b7a34a7b59d..5f1d3dff2bd 100644 --- a/srcpkgs/xapian-core/template +++ b/srcpkgs/xapian-core/template @@ -1,6 +1,6 @@ # Template file for 'xapian-core' pkgname=xapian-core -version=1.4.3 +version=1.4.4 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -11,7 +11,7 @@ homepage="http://www.xapian.org/" license="GPL-2" # distfiles="http://oligarchy.co.uk/xapian/${version}/${pkgname}-${version}.tar.xz" distfiles="http://ftp.osuosl.org/pub/blfs/conglomeration/xapian/${pkgname}-${version}.tar.xz" -checksum=7d5295511ca2de70463a29e75f6a2393df5dc1485bf33074b778c66e1721e475 +checksum=a6a985a9841a452d75cf2169196b7ca6ebeef27da7c607078cd401ad041732d9 # xapian-config needs the .la keep_libtool_archives=yes diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template index 138c3accbdf..f31c7c0ccaf 100644 --- a/srcpkgs/xar/template +++ b/srcpkgs/xar/template @@ -1,7 +1,7 @@ # Template file for 'xar' pkgname=xar version=1.6.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="ac_cv_sizeof_uid_t=4" makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel" diff --git a/srcpkgs/xboxdrv/template b/srcpkgs/xboxdrv/template index 486872722e6..4b33fa0c495 100644 --- a/srcpkgs/xboxdrv/template +++ b/srcpkgs/xboxdrv/template @@ -6,7 +6,7 @@ build_style=scons hostmakedepends="scons unzip pkg-config glib-devel dbus-glib-devel" makedepends="boost-devel libX11-devel eudev-libudev-devel libusb-devel dbus-glib-devel glib-devel" short_desc="Xbox Gamepad Userspace Driver" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://pingus.seul.org/~grumbel/xboxdrv/" distfiles="https://github.com/Grumbel/${pkgname}/archive/v${version}.zip" diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index a25b1ce4400..6c25e6dfebc 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.51 -revision=16 +revision=18 bootstrap=yes build_style=configure short_desc="The XBPS package system utilities" diff --git a/srcpkgs/xchat/template b/srcpkgs/xchat/template index 10cd4af737d..22b6d583c8a 100644 --- a/srcpkgs/xchat/template +++ b/srcpkgs/xchat/template @@ -1,7 +1,7 @@ # Template file for 'xchat' pkgname=xchat version=2.8.8 -revision=15 +revision=16 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config gdk-pixbuf-devel perl" diff --git a/srcpkgs/xclip/template b/srcpkgs/xclip/template index f8a1350ea78..b307cbca33f 100644 --- a/srcpkgs/xclip/template +++ b/srcpkgs/xclip/template @@ -1,12 +1,17 @@ # Template file for 'xclip' pkgname=xclip -version=0.12 -revision=3 -distfiles="${SOURCEFORGE_SITE}/xclip/xclip-${version}.tar.gz" -checksum="b7c7fad059ba446df5692d175c2a1d3816e542549661224806db369a0d716c45" -build_style="gnu-configure" +version=0.13 +revision=1 +build_style=gnu-configure +hostmakedepends="automake" makedepends="libXmu-devel" maintainer="Steven R " -homepage="http://sourceforge.net/projects/xclip/" +homepage="https://github.com/astrand/xclip" license="GPL-2" short_desc="Command line interface to the X11 clipboard" +distfiles="https://github.com/astrand/xclip/archive/${version}.tar.gz" +checksum=ca5b8804e3c910a66423a882d79bf3c9450b875ac8528791fb60ec9de667f758 + +pre_configure() { + autoreconf -fi +} diff --git a/srcpkgs/xcompmgr/template b/srcpkgs/xcompmgr/template index fe086acf0ba..f20574f589e 100644 --- a/srcpkgs/xcompmgr/template +++ b/srcpkgs/xcompmgr/template @@ -6,7 +6,7 @@ build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libXcomposite-devel libXdamage-devel libXrender-devel libXext-devel" short_desc="Composite Window-effects manager for X.org" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="custom" homepage="http://xorg.freedesktop.org" distfiles="http://xorg.freedesktop.org/releases/individual/app/${pkgname}-${version}.tar.bz2" diff --git a/srcpkgs/xe/template b/srcpkgs/xe/template index b459da1ec95..4030565cf3f 100644 --- a/srcpkgs/xe/template +++ b/srcpkgs/xe/template @@ -1,11 +1,11 @@ # Template file for 'xe' pkgname=xe -version=0.6.1 +version=0.7.0 revision=1 build_style=gnu-makefile short_desc="Execute for every... (a better xargs/apply)" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="Public Domain" homepage="https://github.com/chneukirchen/xe" distfiles="https://github.com/chneukirchen/${pkgname}/archive/v${version}.tar.gz" -checksum=36036d0e9464233d3113af187c473491298ed1168976330d7dd615b8f0521b96 +checksum=32af920a2d27ed0bb8bcb69339fcc805110888e872c92a372d3888df52b300f8 diff --git a/srcpkgs/xed/template b/srcpkgs/xed/template new file mode 100644 index 00000000000..22582db89d6 --- /dev/null +++ b/srcpkgs/xed/template @@ -0,0 +1,17 @@ +# Template file for 'xed' +pkgname=xed +version=0.9.1 +revision=1 +noarch=yes +depends="tk" +short_desc="The standard text editor, for X11" +maintainer="Leah Neukirchen " +license="GPL-2" +homepage="http://xed.sourceforge.net/" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=783abeb175a2937c385c5ff0d23dba918d225b160960f216d5a9d7ef7938efa8 + +do_install() { + vbin xed + vman xed.man xed.1 +} diff --git a/srcpkgs/xen/patches/xsa200-4.7.patch b/srcpkgs/xen/patches/xsa200-4.7.patch deleted file mode 100644 index 69608f6fc31..00000000000 --- a/srcpkgs/xen/patches/xsa200-4.7.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Jan Beulich -Subject: x86emul: CMPXCHG8B ignores operand size prefix - -Otherwise besides mis-handling the instruction, the comparison failure -case would result in uninitialized stack data being handed back to the -guest in rDX:rAX (32 bits leaked for 32-bit guests, 96 bits for 64-bit -ones). - -This is XSA-200. - -Signed-off-by: Jan Beulich - ---- a/tools/tests/x86_emulator/test_x86_emulator.c -+++ b/tools/tests/x86_emulator/test_x86_emulator.c -@@ -435,6 +435,24 @@ int main(int argc, char **argv) - goto fail; - printf("okay\n"); - -+ printf("%-40s", "Testing cmpxchg8b (%edi) [opsize]..."); -+ instr[0] = 0x66; instr[1] = 0x0f; instr[2] = 0xc7; instr[3] = 0x0f; -+ res[0] = 0x12345678; -+ res[1] = 0x87654321; -+ regs.eflags = 0x200; -+ regs.eip = (unsigned long)&instr[0]; -+ regs.edi = (unsigned long)res; -+ rc = x86_emulate(&ctxt, &emulops); -+ if ( (rc != X86EMUL_OKAY) || -+ (res[0] != 0x12345678) || -+ (res[1] != 0x87654321) || -+ (regs.eax != 0x12345678) || -+ (regs.edx != 0x87654321) || -+ ((regs.eflags&0x240) != 0x200) || -+ (regs.eip != (unsigned long)&instr[4]) ) -+ goto fail; -+ printf("okay\n"); -+ - printf("%-40s", "Testing movsxbd (%%eax),%%ecx..."); - instr[0] = 0x0f; instr[1] = 0xbe; instr[2] = 0x08; - regs.eflags = 0x200; ---- a/xen/arch/x86/x86_emulate/x86_emulate.c -+++ b/xen/arch/x86/x86_emulate/x86_emulate.c -@@ -4775,8 +4775,12 @@ x86_emulate( - generate_exception_if((modrm_reg & 7) != 1, EXC_UD, -1); - generate_exception_if(ea.type != OP_MEM, EXC_UD, -1); - if ( op_bytes == 8 ) -+ { - host_and_vcpu_must_have(cx16); -- op_bytes *= 2; -+ op_bytes = 16; -+ } -+ else -+ op_bytes = 8; - - /* Get actual old value. */ - if ( (rc = ops->read(ea.mem.seg, ea.mem.off, old, op_bytes, diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template index e76db259601..d6708d12283 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -1,13 +1,13 @@ # Template file for 'xen' pkgname=xen -version=4.7.1 -revision=2 +version=4.7.2 +revision=1 short_desc="The Xen hypervisor utilities" maintainer="Juan RP " homepage="http://xen.org" license="GPL-2" distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz" -checksum=e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe +checksum=61494a56d9251e2108080f95b0dc8e3d175f1ba4da34603fc07b91cfebf358d5 patch_args="-Np1" only_for_archs="x86_64 x86_64-musl" diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template index c804c7e31d8..b9390547fb7 100644 --- a/srcpkgs/xerces-c/template +++ b/srcpkgs/xerces-c/template @@ -1,7 +1,7 @@ # Template file for 'xerces-c' pkgname=xerces-c version=3.1.4 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libcurl-devel icu-devel" diff --git a/srcpkgs/xf86-input-evdev/template b/srcpkgs/xf86-input-evdev/template index a5a18ca15e6..80a62e69736 100644 --- a/srcpkgs/xf86-input-evdev/template +++ b/srcpkgs/xf86-input-evdev/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-input-evdev'. pkgname=xf86-input-evdev version=2.10.5 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel mtdev-devel libevdev-devel" -depends="virtual?xserver-abi-input-22_1" +depends="virtual?xserver-abi-input-24_1" short_desc="Xorg event device input driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" diff --git a/srcpkgs/xf86-input-joystick/template b/srcpkgs/xf86-input-joystick/template index 6fb65641cc0..31f863c27c7 100644 --- a/srcpkgs/xf86-input-joystick/template +++ b/srcpkgs/xf86-input-joystick/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-input-joystick'. pkgname=xf86-input-joystick version=1.6.3 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-input-22_1" +depends="virtual?xserver-abi-input-24_1" short_desc="Joystick Input driver for Xorg" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" diff --git a/srcpkgs/xf86-input-libinput/template b/srcpkgs/xf86-input-libinput/template index d36a2aa011b..538160f9de9 100644 --- a/srcpkgs/xf86-input-libinput/template +++ b/srcpkgs/xf86-input-libinput/template @@ -1,18 +1,18 @@ # Template build file for 'xf86-input-libinput'. pkgname=xf86-input-libinput -version=0.24.0 +version=0.25.0 revision=1 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel libinput-devel" -depends="virtual?xserver-abi-input-22_1" +depends="virtual?xserver-abi-input-24_1" short_desc="Generic input driver for the X.Org server based on libinput" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" license="MIT" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" -checksum=ddcb07350aed59b2996a92a1b4ff64d1c0b0c86a3f0ddca15b2b1c8c8bb13628 +checksum=bb7fd1658fa7e6c757fd55480aa8a07f8ccfb0a80ae42c29dbc67d57958c556f post_install() { vlicense COPYING diff --git a/srcpkgs/xf86-input-mtrack/template b/srcpkgs/xf86-input-mtrack/template index ce3a1cf4ee4..93504555f11 100644 --- a/srcpkgs/xf86-input-mtrack/template +++ b/srcpkgs/xf86-input-mtrack/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-input-mtrack'. pkgname=xf86-input-mtrack version=0.3.1 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config xorg-util-macros" makedepends="xorg-server-devel mtdev-devel" -depends="virtual?xserver-abi-input-22_1" +depends="virtual?xserver-abi-input-24_1" short_desc="Xorg Multitouch Trackpad Driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" diff --git a/srcpkgs/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template index 113fc50d2f0..cf4701e617d 100644 --- a/srcpkgs/xf86-input-synaptics/template +++ b/srcpkgs/xf86-input-synaptics/template @@ -1,13 +1,13 @@ # Template build file for 'xf86-input-synaptics'. pkgname=xf86-input-synaptics version=1.9.0 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libX11-devel libXtst-devel libevdev-devel pixman-devel libpciaccess-devel xorg-server-devel" -depends="virtual?xserver-abi-input-22_1" +depends="virtual?xserver-abi-input-24_1" short_desc="Xorg synaptics touchpad input driver" maintainer="Juan RP " homepage="http://www.x.org/" diff --git a/srcpkgs/xf86-input-vmmouse/template b/srcpkgs/xf86-input-vmmouse/template index aa6941101af..300a82fc0e8 100644 --- a/srcpkgs/xf86-input-vmmouse/template +++ b/srcpkgs/xf86-input-vmmouse/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-input-vmmouse'. pkgname=xf86-input-vmmouse version=13.1.0 -revision=2 +revision=3 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-input-22_1" +depends="virtual?xserver-abi-input-24_1" short_desc="Xorg VMware virtual mouse input driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" diff --git a/srcpkgs/xf86-input-wacom/template b/srcpkgs/xf86-input-wacom/template index f85a19c2580..0e01500f39e 100644 --- a/srcpkgs/xf86-input-wacom/template +++ b/srcpkgs/xf86-input-wacom/template @@ -1,19 +1,19 @@ # Template file for 'xf86-input-wacom' pkgname=xf86-input-wacom -version=0.34.0 +version=0.34.2 revision=1 lib32disabled=yes build_style=gnu-configure configure_args="--without-systemd-unit-dir --without-udev-rules-dir" hostmakedepends="pkg-config" makedepends="xorg-server-devel libXrandr-devel libXinerama-devel libXi-devel" -depends="virtual?xserver-abi-input-22_1" +depends="virtual?xserver-abi-input-24_1" short_desc="Xorg Wacom tablet input driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" license="GPL-2" distfiles="${SOURCEFORGE_SITE}/linuxwacom/${pkgname}-${version}.tar.bz2" -checksum=f15d8e4f3bf3a5b2db0b3f9c9565361b084896c3cb54ac11b8de5e405f9cb045 +checksum=2ad1b9db141104370aef4966aae419dde915caea316e1df2c6ac063545706b1c post_install() { vinstall ${FILESDIR}/70-wacom.rules 644 usr/lib/udev/rules.d diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template index e6f22d317b0..16602d2d4a4 100644 --- a/srcpkgs/xf86-video-amdgpu/template +++ b/srcpkgs/xf86-video-amdgpu/template @@ -1,19 +1,19 @@ # Template build file for 'xf86-video-amdgpu'. pkgname=xf86-video-amdgpu -version=1.2.0 -revision=1 +version=1.3.0 +revision=2 lib32disabled=yes only_for_archs="i686 i686-musl x86_64 x86_64-musl" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xf86driproto eudev-libudev-devel libpciaccess-devel libdrm-devel pixman-devel MesaLib-devel xorg-server-devel" -depends="virtual?xserver-abi-video-20_1 mesa-ati-dri" +depends="virtual?xserver-abi-video-23_1 mesa-ati-dri" short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" license="MIT" distfiles="http://xorg.freedesktop.org//releases/individual/driver/${pkgname}-${version}.tar.bz2" -checksum=275b1aac5f127f55ba3d7480a1df89eace1d02650e24e46908067fc875e76c8f +checksum=c1630f228938be949273f72b29ae70822dde064ad79c3ccb14d55f427e3f4e70 LDFLAGS="-Wl,-z,lazy" diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template index 8054baa794e..758c773e170 100644 --- a/srcpkgs/xf86-video-ati/template +++ b/srcpkgs/xf86-video-ati/template @@ -1,19 +1,19 @@ # Template build file for 'xf86-video-ati'. pkgname=xf86-video-ati -version=7.8.0 -revision=1 +version=7.9.0 +revision=2 lib32disabled=yes only_for_archs="i686 i686-musl x86_64 x86_64-musl" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xf86driproto eudev-libudev-devel libpciaccess-devel libdrm-devel pixman-devel MesaLib-devel xorg-server-devel" -depends="virtual?xserver-abi-video-20_1 mesa-ati-dri" +depends="virtual?xserver-abi-video-23_1 mesa-ati-dri" short_desc="Xorg ATI Radeon video driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" license="MIT" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" -checksum=401f5de772928f3dc4ce43a885adb0a47a2f61aa4a9e45d2ab3d184136a9d6fa +checksum=3cad872e6330afb1707da11e4e959e6887ebe5bcd81854b4d2e496c52c059875 LDFLAGS="-Wl,-z,lazy" diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template index b036ff87770..53676347fe0 100644 --- a/srcpkgs/xf86-video-cirrus/template +++ b/srcpkgs/xf86-video-cirrus/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-cirrus'. pkgname=xf86-video-cirrus version=1.5.3 -revision=4 +revision=5 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-video-20_1" +depends="virtual?xserver-abi-video-23_1" short_desc="Xorg Cirrus Logic video driver" homepage="http://xorg.freedesktop.org" license="MIT" diff --git a/srcpkgs/xf86-video-dummy/template b/srcpkgs/xf86-video-dummy/template index 03597113c69..36a4837e5bb 100644 --- a/srcpkgs/xf86-video-dummy/template +++ b/srcpkgs/xf86-video-dummy/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-dummy'. pkgname=xf86-video-dummy version=0.3.8 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-video-20_1" +depends="virtual?xserver-abi-video-23_1" short_desc="Xorg dummy video driver" homepage="http://xorg.freedesktop.org" license="MIT" diff --git a/srcpkgs/xf86-video-fbdev/template b/srcpkgs/xf86-video-fbdev/template index 449be908bdf..054af7bb552 100644 --- a/srcpkgs/xf86-video-fbdev/template +++ b/srcpkgs/xf86-video-fbdev/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-fbdev'. pkgname=xf86-video-fbdev version=0.4.4 -revision=7 +revision=8 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-video-20_1" +depends="virtual?xserver-abi-video-23_1" short_desc="Xorg framebuffer video driver" homepage="http://xorg.freedesktop.org" license="MIT" diff --git a/srcpkgs/xf86-video-fbturbo-sunxi/template b/srcpkgs/xf86-video-fbturbo-sunxi/template index 6cf2ba50917..be76903108e 100644 --- a/srcpkgs/xf86-video-fbturbo-sunxi/template +++ b/srcpkgs/xf86-video-fbturbo-sunxi/template @@ -1,7 +1,7 @@ # Template build file for 'xf86-video-fbturbo-sunxi'. pkgname=xf86-video-fbturbo-sunxi version=0.4.0 -revision=3 +revision=4 wrksrc="${pkgname%-sunxi}-${version}" build_style=gnu-configure short_desc="Xorg DDX driver for Allwinner SoC (A10/A13/A20)" @@ -14,7 +14,7 @@ checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f only_for_archs="armv7l" hostmakedepends="pkg-config xorg-server-devel" makedepends="libXrandr-devel libump-devel-git xorg-server-devel" -depends="virtual?xserver-abi-video-20_1 sunxi-mali" +depends="virtual?xserver-abi-video-23_1 sunxi-mali" conflicts="xf86-video-fbturbo>=0" LDFLAGS="-Wl,-z,lazy" diff --git a/srcpkgs/xf86-video-fbturbo/template b/srcpkgs/xf86-video-fbturbo/template index 2f83f2af25c..5ad5a8aeb30 100644 --- a/srcpkgs/xf86-video-fbturbo/template +++ b/srcpkgs/xf86-video-fbturbo/template @@ -1,7 +1,7 @@ # Template build file for 'xf86-video-fbturbo'. pkgname=xf86-video-fbturbo version=0.4.0 -revision=14 +revision=15 build_style=gnu-configure short_desc="Xorg DDX driver for ARM devices (RaspberryPi/Allwinner)" homepage="http://github.com/ssvb/xf86-video-fbturbo" @@ -13,7 +13,7 @@ checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f only_for_archs="armv6l armv6l-musl armv7l armv7l-musl" hostmakedepends="pkg-config xorg-server-devel" makedepends="libXrandr-devel xorg-server-devel" -depends="virtual?xserver-abi-video-20_1" +depends="virtual?xserver-abi-video-23_1" LDFLAGS="-Wl,-z,lazy" diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template index 5ec0edec993..35ad3a199ff 100644 --- a/srcpkgs/xf86-video-intel/template +++ b/srcpkgs/xf86-video-intel/template @@ -1,7 +1,7 @@ # Template build file for 'xf86-video-intel'. pkgname=xf86-video-intel -version=2.99.917.54 -revision=1 +version=2.99.917.55 +revision=2 lib32disabled=yes build_style=gnu-configure configure_args="--with-default-dri=3" @@ -9,7 +9,7 @@ hostmakedepends="git automake libtool pkg-config xorg-util-macros" makedepends="eudev-libudev-devel libdrm-devel libpciaccess-devel libXext-devel libXfixes-devel libXv-devel libXvMC-devel xcb-util-devel MesaLib-devel xorg-server-devel" -depends="virtual?xserver-abi-video-20_1 mesa-intel-dri" +depends="virtual?xserver-abi-video-23_1 mesa-intel-dri" only_for_archs="i686 i686-musl x86_64 x86_64-musl" short_desc="Xorg DDX Intel video driver" maintainer="Juan RP " @@ -23,8 +23,8 @@ LDFLAGS="-Wl,-z,lazy" do_fetch() { git clone git://anongit.freedesktop.org/xorg/driver/xf86-video-intel ${wrksrc} cd ${wrksrc} - # Latest commit as of 20170211 - git reset --hard 93942b7de84ad16d34fac4b80bde6aec55786e05 + # Latest commit as of 20170403 + git reset --hard cb6ba2da056f3298a765b4da5cd626343c00a533 } pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/xf86-video-mga/template b/srcpkgs/xf86-video-mga/template index 451df8526ba..2d4a9a71a60 100644 --- a/srcpkgs/xf86-video-mga/template +++ b/srcpkgs/xf86-video-mga/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-mga'. pkgname=xf86-video-mga version=1.6.5 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure hostmakedepends="automake libtool pkg-config xorg-util-macros" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-video-20_1" +depends="virtual?xserver-abi-video-23_1" nocross=yes short_desc="Xorg Matrox Graphics Adapter video driver" homepage="http://xorg.freedesktop.org" diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template index b80f039ce22..841f115808d 100644 --- a/srcpkgs/xf86-video-nouveau/template +++ b/srcpkgs/xf86-video-nouveau/template @@ -1,18 +1,18 @@ # Template build file for 'xf86-video-nouveau'. pkgname=xf86-video-nouveau -version=1.0.13 +version=1.0.15 revision=1 lib32disabled=yes build_style=gnu-configure only_for_archs="i686 i686-musl x86_64 x86_64-musl" hostmakedepends="pkg-config" makedepends="eudev-libudev-devel libdrm-devel xorg-server-devel" -depends="virtual?xserver-abi-video-20_1 mesa-nouveau-dri" +depends="virtual?xserver-abi-video-23_1 mesa-nouveau-dri" short_desc="Xorg opensource NVIDIA video driver" maintainer="Juan RP " homepage="http://nouveau.freedesktop.org/wiki/" license="GPL-2" -distfiles="http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${version}.tar.bz2" -checksum=6d9242ba139c3df7afefffb455573b52f4427920b978161c00483c64a6da47cb +distfiles="http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${version}.tar.gz" +checksum=3932af6878b000eac5a8992ce797f9c7a334f9b3257c5cf53f2bf177c1f942c2 LDFLAGS="-Wl,-z,lazy" diff --git a/srcpkgs/xf86-video-openchrome/template b/srcpkgs/xf86-video-openchrome/template new file mode 100644 index 00000000000..e7526b77e9f --- /dev/null +++ b/srcpkgs/xf86-video-openchrome/template @@ -0,0 +1,18 @@ +# Template build file for 'xf86-video-openchrome'. +pkgname=xf86-video-openchrome +version=0.6.0 +revision=1 +lib32disabled=yes +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="xorg-server-devel libXvMC-devel" +depends="virtual?xserver-abi-video-23_1" +short_desc="Xorg driver for VIA IGPs" +homepage="http://xorg.freedesktop.org" +license="MIT" +maintainer="Duncaen " +distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" +checksum=da2975c6379358de52c1257710c67eb59139a7f0a1cd28d00cc64cc3e1c02f75 + +CFLAGS="-I$XBPS_CROSS_BASE/usr/include/xorg" +LDFLAGS="-Wl,-z,lazy" diff --git a/srcpkgs/xf86-video-sisusb/patches/git-fixes.patch b/srcpkgs/xf86-video-sisusb/patches/git-fixes.patch deleted file mode 100644 index 48c4288c679..00000000000 --- a/srcpkgs/xf86-video-sisusb/patches/git-fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 12:54:52 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson ---- -diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c -index 539b9f1..0fdc8e9 100644 ---- src/sisusb_driver.c -+++ src/sisusb_driver.c -@@ -39,7 +39,6 @@ - #include "shadowfb.h" - #include "micmap.h" - #include "mipointer.h" --#include "mibstore.h" - - #include "sisusb_regs.h" - #include "sisusb_dac.h" -@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL) - /* Initialize the accelerators */ - SiSUSBAccelInit(pScreen); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* NO SilkenMouse. Never. Ever. */ --- -cgit v0.9.0.2-2-gbebe diff --git a/srcpkgs/xf86-video-sisusb/template b/srcpkgs/xf86-video-sisusb/template index e74f9b31d58..816da4993cc 100644 --- a/srcpkgs/xf86-video-sisusb/template +++ b/srcpkgs/xf86-video-sisusb/template @@ -1,18 +1,17 @@ # Template build file for 'xf86-video-sisusb'. pkgname=xf86-video-sisusb -version=0.9.6 -revision=10 +version=0.9.7 +revision=1 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-video-20_1" +depends="virtual?xserver-abi-video-23_1" short_desc="Xorg SiS USB video driver" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " -#distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" -distfiles="http://pkgs.fedoraproject.org/repo/pkgs/xorg-x11-drv-sisusb/${pkgname}-${version}.tar.bz2/8ebcd2bc5a87a3f1362fa76616a83e57/${pkgname}-${version}.tar.bz2" -checksum=73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046 +distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" +checksum=f4400416b920cd1136d60d36b99d33f245cdeaf2ad6c1340936c7c0987761424 LDFLAGS="-Wl,-z,lazy" diff --git a/srcpkgs/xf86-video-vesa/template b/srcpkgs/xf86-video-vesa/template index 63d3414eca2..538d646b7b3 100644 --- a/srcpkgs/xf86-video-vesa/template +++ b/srcpkgs/xf86-video-vesa/template @@ -2,12 +2,12 @@ pkgname=xf86-video-vesa reverts=2:2.3.3_5 version=2.3.4 -revision=3 +revision=4 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-video-20_1" +depends="virtual?xserver-abi-video-23_1" short_desc="Xorg VESA video driver" homepage="http://xorg.freedesktop.org" license="MIT" diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template index d06933c1d2b..bc0ab951e2d 100644 --- a/srcpkgs/xf86-video-vmware/template +++ b/srcpkgs/xf86-video-vmware/template @@ -1,14 +1,14 @@ # Template build file for 'xf86-video-vmware'. pkgname=xf86-video-vmware version=13.2.1 -revision=1 +revision=2 lib32disabled=yes only_for_archs="i686 i686-musl x86_64 x86_64-musl" build_style=gnu-configure configure_args="--enable-vmwarectrl-client" hostmakedepends="pkg-config" makedepends="libdrm-devel MesaLib-devel xorg-server-devel" -depends="virtual?xserver-abi-video-20_1 mesa-vmwgfx-dri" +depends="virtual?xserver-abi-video-23_1 mesa-vmwgfx-dri" short_desc="Modular Xorg VMware virtual video driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" diff --git a/srcpkgs/xfce4-hardware-monitor-plugin/template b/srcpkgs/xfce4-hardware-monitor-plugin/template new file mode 100644 index 00000000000..930a6f69505 --- /dev/null +++ b/srcpkgs/xfce4-hardware-monitor-plugin/template @@ -0,0 +1,17 @@ +# Template file for 'xfce4-hardware-monitor-plugin' +pkgname=xfce4-hardware-monitor-plugin +version=1.5.0 +revision=1 +build_style=gnu-configure +hostmakedepends="autoconf automake libtool intltool pkg-config glib-devel gettext-devel" +makedepends="xfce4-panel-devel libgtop-devel libgnomecanvasmm-devel gtkmm2-devel libsensors-devel" +short_desc="Hardware monitoring plugin for the xfce-panel" +maintainer="Piraty " +license="GPL-3" +homepage="http://goodies.xfce.org/projects/panel-plugins/xfce4-hardware-monitor-plugin" +distfiles="https://git.xfce.org/panel-plugins/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2" +checksum=e1a3a4cab30b75889ed04526142329b2767806c7df3b9d30f7f7a987b28e1b6b + +pre_configure() { + autoreconf -fi +} diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template index ed11fbe5e17..9aa10c8c552 100644 --- a/srcpkgs/xfce4-notifyd/template +++ b/srcpkgs/xfce4-notifyd/template @@ -1,6 +1,6 @@ # Template file for 'xfce4-notifyd' pkgname=xfce4-notifyd -version=0.3.5 +version=0.3.6 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel" @@ -13,7 +13,7 @@ homepage="http://goodies.xfce.org/projects/applications/xfce4-notifyd" license="GPL-2" maintainer="Juan RP " distfiles="http://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=b9b86938bdd31b4a69650d8b76e5cb0a6a30c1aa726130bd803f6c6f1f7af7a6 +checksum=f4ca7c0dadd3d4cdf8cd3c8ae60ccea77b8cf409f8517161796364eb1d766cf9 post_install() { rm -rf ${DESTDIR}/usr/lib/systemd diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template index 6a2806d16b8..820ba3e2f59 100644 --- a/srcpkgs/xfce4-whiskermenu-plugin/template +++ b/srcpkgs/xfce4-whiskermenu-plugin/template @@ -1,6 +1,6 @@ # Template file for 'xfce4-whiskermenu-plugin' pkgname=xfce4-whiskermenu-plugin -version=1.7.0 +version=1.7.2 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -10,4 +10,4 @@ maintainer="Giedrius Statkevičius " license="GPL-2" homepage="http://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin" distfiles="http://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=c6ef8ab93829c51244951796d792dce71c4f0f43e31ce4427029337fa1623024 +checksum=d47dbdbd38830058cb06ca6e3d9cfd752d58e487659282fe2f61f01e9f38ef4f diff --git a/srcpkgs/xfsprogs/patches/cross-compile.patch b/srcpkgs/xfsprogs/patches/cross-compile.patch deleted file mode 100644 index 25b1d4283ab..00000000000 --- a/srcpkgs/xfsprogs/patches/cross-compile.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- configure.orig -+++ configure -@@ -861,6 +861,7 @@ - enable_blkid - enable_gettext - enable_shared -+BUILD_CFLAGS - BUILD_CC - CPP - OTOOL64 -@@ -960,7 +961,9 @@ - LDFLAGS - LIBS - CPPFLAGS --CPP' -+CPP -+BUILD_CC -+BUILD_CFLAGS' - - - # Initialize some variables set by options. -@@ -1616,6 +1619,9 @@ - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CPP C preprocessor -+ BUILD_CC C compiler for build tools -+ BUILD_CFLAGS -+ C compiler flags for build tools - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. -@@ -11116,11 +11122,12 @@ - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --if test $cross_compiling = no; then -- BUILD_CC="$CC" - --else -- for ac_prog in gcc cc -+if test "${BUILD_CC+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CC="$CC" -+ else -+ for ac_prog in gcc cc - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -@@ -11162,6 +11169,15 @@ - test -n "$BUILD_CC" && break - done - -+ fi -+fi -+ -+if test "${BUILD_CFLAGS+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CFLAGS="$CFLAGS" -+ else -+ BUILD_CFLAGS="-g -O2" -+ fi - fi - - # Check whether --enable-shared was given. ---- configure.ac.orig -+++ configure.ac -@@ -9,11 +9,21 @@ - AC_PROG_LIBTOOL - - AC_PROG_CC --if test $cross_compiling = no; then -- BUILD_CC="$CC" -- AC_SUBST(BUILD_CC) --else -- AC_CHECK_PROGS(BUILD_CC, gcc cc) -+AC_ARG_VAR(BUILD_CC, [C compiler for build tools]) -+if test "${BUILD_CC+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CC="$CC" -+ else -+ AC_CHECK_PROGS(BUILD_CC, gcc cc) -+ fi -+fi -+AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools]) -+if test "${BUILD_CFLAGS+set}" != "set"; then -+ if test $cross_compiling = no; then -+ BUILD_CFLAGS="$CFLAGS" -+ else -+ BUILD_CFLAGS="-g -O2" -+ fi - fi - - AC_ARG_ENABLE(shared, ---- include/builddefs.in.orig -+++ include/builddefs.in -@@ -26,6 +26,7 @@ - LOADERFLAGS = @LDFLAGS@ - LTLDFLAGS = @LDFLAGS@ - CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64 -+BUILD_CFLAGS = @BUILD_CFLAGS@ -D_FILE_OFFSET_BITS=64 - - LIBRT = @librt@ - LIBUUID = @libuuid@ -@@ -154,7 +155,7 @@ - endif - - --GCFLAGS = $(OPTIMIZER) $(DEBUG) \ -+GCFLAGS = $(DEBUG) \ - -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \ - -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs - -@@ -162,8 +163,9 @@ - GCFLAGS += -DENABLE_GETTEXT - endif - -+BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS) - # First, Global, Platform, Local CFLAGS --CFLAGS += $(FCFLAGS) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) -+CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) - - include $(TOPDIR)/include/buildmacros - ---- libxfs/Makefile.orig -+++ libxfs/Makefile -@@ -124,7 +124,7 @@ - - crc32table.h: gen_crc32table.c - @echo " [CC] gen_crc32table" -- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $< -+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table $< - @echo " [GENERATE] $@" - $(Q) ./gen_crc32table > crc32table.h - -@@ -135,7 +135,7 @@ - # disk. - crc32selftest: gen_crc32table.c crc32table.h crc32.c - @echo " [TEST] CRC32" -- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@ -+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@ - $(Q) ./$@ - - # set up include/xfs header directory diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template index 3dac38b886b..d673f07a249 100644 --- a/srcpkgs/xfsprogs/template +++ b/srcpkgs/xfsprogs/template @@ -1,6 +1,6 @@ # Template file for 'xfsprogs' pkgname=xfsprogs -version=4.9.0 +version=4.10.0 revision=1 build_style=gnu-configure configure_args="--enable-readline=yes --enable-lib64=no" @@ -10,8 +10,8 @@ short_desc="Utilities for managing the XFS filesystem" maintainer="Juan RP " license="LGPL-2.1" homepage="http://xfs.org/" -distfiles="http://ftp.kernel.org/pub/linux/utils/fs/xfs/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=f1e60a9a54583dba82fa506dd9b59bdec110a968f80f507bf5f93b263af7a4df +distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz" +checksum=d8cb9ab2c686699d37914354ce3992b4aff3677093cbce06ad18bf798da8a8a7 do_install() { make install install-dev DIST_ROOT=${DESTDIR} \ diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template index 719d51b3752..b51fa418842 100644 --- a/srcpkgs/xfwm4/template +++ b/srcpkgs/xfwm4/template @@ -1,6 +1,6 @@ # Template file for 'xfwm4' pkgname=xfwm4 -version=4.12.3 +version=4.12.4 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" @@ -13,4 +13,4 @@ maintainer="Juan RP " license="GPL-2" homepage="http://xfce.org" distfiles="http://archive.xfce.org/src/xfce/xfwm4/${version%.*}/xfwm4-$version.tar.bz2" -checksum=f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac +checksum=fa74048a75649a6e92df763a3cfb706d3fed1e1a6adf567f6693325a5a6efb36 diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template index 4ee9fc2bd16..fb28a57ae8d 100644 --- a/srcpkgs/xine-lib/template +++ b/srcpkgs/xine-lib/template @@ -1,10 +1,10 @@ # Template file for 'xine-lib' pkgname=xine-lib -version=1.2.6 -revision=9 +version=1.2.8 +revision=2 build_style=gnu-configure -configure_args=" - --disable-vcd --disable-gnomevfs --without-esound --disable-dxr3 --disable-oss" +configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3 + --disable-oss --disable-optimizations" hostmakedepends="automake gettext-devel libtool pkg-config perl" makedepends=" zlib-devel alsa-lib-devel libxcb-devel libSM-devel libXext-devel libXv-devel @@ -12,40 +12,17 @@ makedepends=" jack-devel samba-devel libflac-devel libmodplug-devel libmpcdec-devel speex-devel libtheora-devel libvorbis-devel libdca-devel faad2-devel libcdio-devel libbluray-devel aalib-devel libcaca-devel libXinerama-devel - libjpeg-turbo-devel libmng-devel" + libjpeg-turbo-devel libmng-devel libdvdnav-devel" short_desc="A multimedia playback engine" maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://www.xine-project.org" distfiles="${SOURCEFORGE_SITE}/xine/$pkgname-$version.tar.xz" -checksum=bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005 +checksum=f1b299a71dcae075bf6792e7b5a2020ed5ac8c46ad5091e004ce266aac40e8a6 -if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - makedepends+=" libva-glx-devel libvdpau-devel glu-devel" -fi - -# XXX: Remove when Void uses gcc5 -# Linking with gcc4.9 (gcc < 5) compiled source and binutils >= 2.26 -# results in an error. See a build log at: http://sprunge.us/NiYS -# Also see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65248#c6 -# To overcome this problem we force configure to not use -# __attribute(( visibility("protected") )) -export cc_cv_attribute_visibility_protected=no - -pre_configure() { - # Hot fixes for building with ffmpeg-3.1.3 found at - # http://www.linuxfromscratch.org/blfs/view/svn/multimedia/xine-lib.html - sed -i src/combined/ffmpeg/ff_{audio,video}_decoder.c src/dxr3/ffmpeg_encoder.c \ - -e 's;avcodec_alloc_frame;av_frame_alloc;' \ - -e 's;avcodec_free_frame;av_frame_free;' - sed -i src/video_dec/image.c \ - -e 's;wand/magick_wand.h;ImageMagick-6/wand/MagickWand.h;' - sed -i m4/video_out.m4 \ - -e 's;\(xcb-shape >= 1.0\);xcb \1;' - autoreconf -if - sed -i src/video_out/Makefile.in \ - -e '/xineplug_vo_out_xcbxv_la_LIBADD/s;$(XCB_LIBS);$(XCB_LIBS) $(XCBSHM_LIBS);' -} +case "$XBPS_TARGET_MACHINE" in + i686*|x86_64*) makedepends+=" libva-glx-devel libvdpau-devel glu-devel";; +esac libxine_package() { short_desc+=" - runtime library" diff --git a/srcpkgs/xl2tpd/template b/srcpkgs/xl2tpd/template index a33d7b3bc74..3fe0fb98d5c 100644 --- a/srcpkgs/xl2tpd/template +++ b/srcpkgs/xl2tpd/template @@ -14,10 +14,6 @@ conf_files=" /etc/${pkgname}/${pkgname}.conf /etc/ppp/options.l2tp" -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/704/steps/shell_3/logs/stdio" -esac - do_build() { make LDFLAGS="${LDFLAGS}" KERNELSRC="${XBPS_CROSS_BASE}/usr" ${makejobs} } diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template index a86c43d2ec8..1a5e1cee59d 100644 --- a/srcpkgs/xlockmore/template +++ b/srcpkgs/xlockmore/template @@ -1,6 +1,6 @@ # Template file for 'xlockmore' pkgname=xlockmore -version=5.50 +version=5.53 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="BSD" homepage="http://sillycycle.com/xlockmore.html" distfiles="http://sillycycle.com/xlock/xlockmore-${version}.tar.xz" -checksum=635f72df44589d028200acf604093959968a7e19f79c4363a76599615f563a29 +checksum=4973659c3b1d9747e79e29f3e5a5d04f3a0cb36f35ba88507c69be2e04db4967 CFLAGS="-D_DEFAULT_SOURCE" pre_configure() { diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template index ff90c7038f8..6ffe242aeae 100644 --- a/srcpkgs/xmlsec1/template +++ b/srcpkgs/xmlsec1/template @@ -1,6 +1,6 @@ # Template file for 'xmlsec' pkgname=xmlsec1 -version=1.2.23 +version=1.2.24 revision=1 hostmakedepends="automake libtool pkg-config gnutls-devel" makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel" @@ -10,7 +10,7 @@ license="MIT" homepage="https://www.aleksey.com/xmlsec/" short_desc="XML Security Library is a C library based on LibXML2" distfiles="https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz" -checksum=41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f +checksum=99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc pre_configure() { autoreconf -if diff --git a/srcpkgs/xmlto/template b/srcpkgs/xmlto/template index 56a23a63908..2b46b03fd3e 100644 --- a/srcpkgs/xmlto/template +++ b/srcpkgs/xmlto/template @@ -11,5 +11,5 @@ short_desc="Tool to help transform XML documents into other formats" maintainer="Juan RP " license="GPL-2" homepage="http://cyberelk.net/tim/software/xmlto/" -distfiles="https://fedorahosted.org/releases/x/m/xmlto/xmlto-$version.tar.bz2" +distfiles="http://anduin.linuxfromscratch.org/BLFS/xmlto/xmlto-${version}.tar.bz2" checksum=1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276 diff --git a/srcpkgs/xonotic/template b/srcpkgs/xonotic/template index 6d3a2997e2b..71ee4b6b85c 100644 --- a/srcpkgs/xonotic/template +++ b/srcpkgs/xonotic/template @@ -1,14 +1,14 @@ # Template file for 'xonotic' pkgname=xonotic -version=0.8.1 -revision=3 +version=0.8.2 +revision=1 wrksrc="Xonotic" homepage="http://xonotic.org" license="GPL-2, GPL-3" distfiles="http://dl.xonotic.org/xonotic-${version}-source.zip" short_desc="A free, fast-paced crossplatform first-person shooter" maintainer="Juan RP " -checksum=c212e31fc1de2c0b49e439e222520a424daa15e87f92a526d9a0f52d0f6c62be +checksum=5e6916f1e6e9e22285bb71ddd075189102857383e74ed0b0a3d27cef08e0bd2b nocross=yes hostmakedepends="unzip automake libtool" diff --git a/srcpkgs/xorg-minimal/template b/srcpkgs/xorg-minimal/template index 6b0b3427be0..3b3c2d58cab 100644 --- a/srcpkgs/xorg-minimal/template +++ b/srcpkgs/xorg-minimal/template @@ -1,9 +1,9 @@ # Template file for 'xorg-minimal' pkgname=xorg-minimal -version=1.1 -revision=2 +version=1.2 +revision=1 build_style=meta -depends="xorg-server xauth xinit xf86-input-evdev" +depends="xorg-server xauth xinit xf86-input-libinput" short_desc="Xorg meta-package including xorg-xserver and needed tools" homepage="http://xorg.freedesktop.org/" license="MIT" diff --git a/srcpkgs/xorg-server-xwayland b/srcpkgs/xorg-server-xwayland new file mode 120000 index 00000000000..0e680f217e7 --- /dev/null +++ b/srcpkgs/xorg-server-xwayland @@ -0,0 +1 @@ +xorg-server \ No newline at end of file diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 53e985afa0c..7c879b7a6f3 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,6 +1,6 @@ # Template build file for 'xorg-server'. pkgname=xorg-server -version=1.18.4 +version=1.19.3 revision=4 build_style=gnu-configure configure_args="--enable-ipv6 --enable-record --enable-xorg @@ -11,7 +11,7 @@ configure_args="--enable-ipv6 --enable-record --enable-xorg --with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto --disable-dmx --disable-xfree86-utils --enable-kdrive-mouse --enable-kdrive --enable-kdrive-evdev --enable-kdrive-kbd - --disable-linux-acpi --disable-linux-apm --enable-xwayland + --disable-linux-acpi --disable-linux-apm --enable-suid-wrapper --with-shared-memory-dir=/dev/shm --without-systemd-daemon --enable-xcsecurity" short_desc="The X11 server from X.org" @@ -19,7 +19,7 @@ maintainer="Juan RP " homepage="http://xorg.freedesktop.org" license="MIT, BSD" distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2" -checksum=278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 +checksum=677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98 lib32disabled=yes @@ -33,23 +33,26 @@ makedepends=" libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel libxshmfence-devel - wayland-devel libepoxy-devel xcb-util-renderutil-devel" + wayland-devel wayland-protocols libepoxy-devel xcb-util-renderutil-devel + libXfont2-devel" # See hw/xfree86/common/xf86Module.h. Only care for the major version. depends="xkeyboard-config" -provides="xserver-abi-extension-9_1 xserver-abi-input-22_1 xserver-abi-video-20_1 xf86-video-modesetting-1_1" +provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-23_1 xf86-video-modesetting-1_1" replaces="xf86-video-modesetting>=0" +subpackages="xorg-server-devel xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-server" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) - # Enable glamor/dri/opengl by default on x86. - configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx" + # Enable glamor/dri/opengl/xwayland by default on x86. + configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx --enable-xwayland" makedepends+=" MesaLib-devel" replaces+=" glamor-egl>=0" + subpackages+=" xorg-server-xwayland" ;; *) # Enable dri2 on !x86 via libdri. - configure_args+=" --disable-glx --disable-dri --enable-dri2 --enable-dri3" - makedepends+=" dri2proto libdri2-devel-git" + configure_args+=" --disable-glx --disable-dri --enable-dri2 --enable-dri3 --disable-xwayland" + makedepends+=" MesaLib-devel dri2proto libdri2-devel-git" ;; esac @@ -84,6 +87,12 @@ post_install() { fi } +xorg-server-xwayland_package() { + short_desc="A nested X server that runs as a wayland client" + pkg_install() { + vmove usr/bin/Xwayland + } +} xorg-server-xnest_package() { short_desc="A nested X server that runs as an X application" pkg_install() { diff --git a/srcpkgs/xorg-util-macros/template b/srcpkgs/xorg-util-macros/template index 44e7cd3801b..df174d171ec 100644 --- a/srcpkgs/xorg-util-macros/template +++ b/srcpkgs/xorg-util-macros/template @@ -1,6 +1,6 @@ # Template file for 'xorg-util-macros' pkgname=xorg-util-macros -version=1.19.0 +version=1.19.1 revision=1 wrksrc="${pkgname/xorg-/}-${version}" noarch=yes @@ -11,4 +11,4 @@ homepage="http://www.x.org/" license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/util/util-macros-$version.tar.bz2" -checksum=2835b11829ee634e19fa56517b4cfc52ef39acea0cd82e15f68096e27cbed0ba +checksum=18d459400558f4ea99527bc9786c033965a3db45bf4c6a32eefdc07aa9e306a6 diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index d7bac361178..5a975d20158 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,35 +1,29 @@ # Template file for 'xpra' pkgname=xpra -version=1.0.3 +version=2.0.2 revision=1 build_style=python2-module conf_files=" /etc/xpra/xpra.conf /etc/xpra/xorg.conf - /etc/xpra/conf.d/* - /etc/xpra/cuda.conf - /etc/xpra/nvenc.keys" + /etc/xpra/conf.d/*" pycompile_module="xpra" hostmakedepends="python pkg-config python-Cython" makedepends="ffmpeg-devel libXcomposite-devel libXdamage-devel libXrandr-devel libXtst-devel libwebp-devel libxkbfile-devel pygtk-devel x264-devel - $(vopt_if vpx libvpx-devel)" + libvpx-devel" depends="pygtk python-Pillow xorg-server-xvfb python-rencode python-lz4 - python-cups xf86-video-dummy python-PyOpenGL-accelerate pulseaudio cups - python-dbus xauth python-numpy" + python-cups xf86-video-dummy cups python-dbus xauth" short_desc="Like screen(1) for X" maintainer="Leah Neukirchen " license="GPL-2" homepage="http://xpra.org/" distfiles="https://xpra.org/src/${pkgname}-${version}.tar.xz" -checksum=f83c5946f67fe26eee8b44fba0fa30bca9fbc7aa58ee66b903b7385c2d332166 +checksum=4341bb6652d6e7784dddc02c63a634019c782332e9af1c08f4b8ec24f57a1f26 -build_options="vpx" - -case "$XBPS_TARGET_MACHINE" in - armv6*) ;; - *) build_options_default+=" vpx" ;; -esac +if [ -z "$CROSS_BUILD" ]; then + depends+=" python-PyOpenGL-accelerate" +fi post_extract() { sed -i 's/-Werror/-Wno-error/g' setup.py # ugh diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template index 4d74d1c8ea6..8dbc388e93f 100644 --- a/srcpkgs/xtools/template +++ b/srcpkgs/xtools/template @@ -1,13 +1,13 @@ # Template file for 'xtools' pkgname=xtools -version=0.44 +version=0.45 revision=1 noarch=yes build_style=gnu-makefile -depends="bash curl findutils git xbps" +depends="bash curl findutils git make xbps" short_desc="Opinionated helpers for working with XBPS" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="Public Domain" homepage="https://github.com/chneukirchen/xtools" distfiles="https://github.com/chneukirchen/xtools/archive/v${version}.tar.gz" -checksum=b726ff175751863f65536d68e9ee65b3253931c619d6c4a4cb2cd0935425e544 +checksum=ffee29076b7a5d9a23b629c300096ae4c3008bac11751f5723ee3bc1af980d31 diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template index 5c91d4f20a2..f427f0c9eda 100644 --- a/srcpkgs/yad/template +++ b/srcpkgs/yad/template @@ -1,6 +1,6 @@ # Template file for 'yad' pkgname=yad -version=0.38.2 +version=0.39.0 revision=1 build_style=gnu-configure configure_args="--enable-html --enable-icon-browser" @@ -11,4 +11,4 @@ maintainer="Juan RP " license="GPL-3" homepage="http://sourceforge.net/projects/yad-dialog/" distfiles="${SOURCEFORGE_SITE}/$pkgname-dialog/$pkgname-$version.tar.xz" -checksum=91299cba8836b4e510c4527a081d0ad519ad0c6d9f96b3f7f5409acfb66fd5fa +checksum=11e114c1434f4fa42b2c9a7e6a5f818beead8a697a429906a59fb6f85723a9ed diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template index bf866802dc1..1261c4eae86 100644 --- a/srcpkgs/yakuake/template +++ b/srcpkgs/yakuake/template @@ -6,7 +6,7 @@ build_style=cmake hostmakedepends="automoc4" makedepends="kdelibs-devel qt-devel phonon-devel" short_desc="A drop-down terminal emulator based on KDE konsole technology" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://yakuake.kde.org/" distfiles="http://download.kde.org/stable/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz" diff --git a/srcpkgs/yash/template b/srcpkgs/yash/template new file mode 100644 index 00000000000..6f155a5c0db --- /dev/null +++ b/srcpkgs/yash/template @@ -0,0 +1,32 @@ +# Template file for 'yash' +pkgname=yash +version=2.44 +revision=2 +build_style=configure +configure_args="--prefix=/usr" +make_build_args="LDLIBS=-lm LDLIBS+=${XBPS_CROSS_BASE}/usr/lib/libncursesw.a" +makedepends="ncurses-devel" +short_desc="Yet another shell (POSIX-compliant)" +maintainer="Leah Neukirchen " +license="GPL-2" +homepage="http://yash.osdn.jp/" +_changelog="https://github.com/magicant/yash/releases" +distfiles="https://github.com/magicant/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" +checksum=f1352b49195a3879284e3ab60af4b30d3a87d696c838b246e2068ccbdfcf2e66 +register_shell="/bin/yash" +alternatives=" + sh:sh:/usr/bin/yash + sh:sh.1:/usr/share/man/man1/yash.1" + +post_extract() { + sed -i '40i#undef iswdigit' arith.c # macro in musl + if [ "$CROSS_BUILD" ]; then + sed -i 's/checkby "${tempout}"/true/' configure + fi +} +pre_build() { + if [ "$CROSS_BUILD" ]; then + make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \ + LDFLAGS= LDLIBS= makesignum + fi +} diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template index df0f516a644..efc6c8c9474 100644 --- a/srcpkgs/yoshimi/template +++ b/srcpkgs/yoshimi/template @@ -1,6 +1,6 @@ # Template file for 'yoshimi' pkgname=yoshimi -version=1.5.0 +version=1.5.1.1 revision=1 build_style=cmake build_wrksrc=src @@ -8,11 +8,11 @@ hostmakedepends="pkg-config fltk" makedepends="boost-devel jack-devel fltk-devel fftw-devel mxml-devel cairo-devel lv2 readline-devel ncurses-devel" short_desc="ZynAddSubFX fork with improved JACK audio & MIDI IO" -maintainer="Andrea Brancaleoni " +maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://yoshimi.sourceforge.net" distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz" -checksum=172b95f184368047966015a9be9632bb584908e5a801483a21ac5503982bf0f3 +checksum=1ef6d0d9aed21b8db3dd1e851c6a14b3cc9a6b0ad3611a083f92abf002db0f70 case "$XBPS_TARGET_MACHINE" in *-musl) broken="https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/10648/steps/shell_3/logs/stdio";; diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index a2f75090212..46dc146ee1a 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2017.03.07 +version=2017.05.01 revision=1 noarch=yes wrksrc="${pkgname}" @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="http://rg3.github.com/youtube-dl/" license="Public Domain" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=db4a9f91b23375da53b29859e0c9475c9e1ba24d2a51a26b0cedab376afa4ca5 +checksum=58e2151634a66fa9ab4a98978fa72bf15990ec1c088ac7e4393cca00c9a32e53 alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { diff --git a/srcpkgs/ytnef/template b/srcpkgs/ytnef/template index 5b11f2d0390..622e9331b1a 100644 --- a/srcpkgs/ytnef/template +++ b/srcpkgs/ytnef/template @@ -1,15 +1,15 @@ # Template file for 'ytnef' pkgname=ytnef -version=1.9.1 +version=1.9.2 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" short_desc="Yerase's TNEF Stream Reader" -maintainer="Juergen Buchmueller " +maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://github.com/Yeraze/ytnef" distfiles="https://github.com/Yeraze/ytnef/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=281f718e0b00cabe95a1eeef6617e72ba592f321cfd354a5b198843a4d99dacf +checksum=48f7d7272ba74b267d3f98a1b14c81fef54cfb53460346d7c36a9604df1f95ad pre_configure() { ./autogen.sh diff --git a/srcpkgs/zaproxy/patches/build.patch b/srcpkgs/zaproxy/patches/build.patch deleted file mode 100644 index a3a4fbe6532..00000000000 --- a/srcpkgs/zaproxy/patches/build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- build/build.xml -+++ build/build.xml -@@ -129,7 +129,7 @@ - - - -- -+ - - - diff --git a/srcpkgs/zaproxy/template b/srcpkgs/zaproxy/template index daa706483b4..3c201159988 100644 --- a/srcpkgs/zaproxy/template +++ b/srcpkgs/zaproxy/template @@ -1,6 +1,6 @@ # Template file for 'zaproxy' pkgname=zaproxy -version=2.5.0 +version=2.6.0 revision=1 hostmakedepends="openjdk apache-ant" depends="virtual?java-runtime" @@ -9,7 +9,7 @@ maintainer="Nicklaus McClendon " license="Apache-2.0" homepage="https://www.owasp.org/index.php/ZAP" distfiles="https://github.com/zaproxy/zaproxy/archive/${version}.tar.gz" -checksum=3fc4e6700e8fc462f01cf8af27c6d531ad682bb4e016ffc9897ce72cb9e28866 +checksum=ed9addbb3a074b208ae1bc3f509aee2c34d118ee28744a8f8f5f4e821afef687 do_configure() { # Set version for ant diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template index 178b10360a6..b9b4e778a0e 100644 --- a/srcpkgs/zathura-pdf-mupdf/template +++ b/srcpkgs/zathura-pdf-mupdf/template @@ -1,7 +1,7 @@ # Template file for 'zathura-pdf-mupdf' pkgname=zathura-pdf-mupdf version=0.3.1 -revision=2 +revision=3 build_style=gnu-makefile make_build_args="MUPDF_LIB=-lmupdf MUPDF_LIB+=-lmujs" maintainer="lemmi " diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template index 48ca2fe4017..e879ee3d649 100644 --- a/srcpkgs/zbackup/template +++ b/srcpkgs/zbackup/template @@ -1,7 +1,7 @@ # Template file for 'zbackup' pkgname=zbackup version=1.4.4 -revision=3 +revision=4 build_style=cmake hostmakedepends="protobuf" makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel" diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template index a652cd8da33..c412366e300 100644 --- a/srcpkgs/zenity/template +++ b/srcpkgs/zenity/template @@ -1,6 +1,6 @@ # Template file for 'zenity' pkgname=zenity -version=3.22.0 +version=3.24.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool gnome-doc-utils" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=1ecdfa1071d383b373b8135954b3ec38d402d671dcd528e69d144aff36a0e466 +checksum=6ff0a026ec94e5bc1b30f78df91e54f4f82fd982f4c29b52fe5dacc886a9f7f7 pre_configure() { sed -i '/-I$(includedir)/d' -i src/Makefile.in diff --git a/srcpkgs/zimg/template b/srcpkgs/zimg/template index 02c73099134..4e53c8b5d0a 100644 --- a/srcpkgs/zimg/template +++ b/srcpkgs/zimg/template @@ -1,6 +1,6 @@ # Template file for 'zimg' pkgname=zimg -version=2.4 +version=2.5.1 revision=1 wrksrc=zimg-release-${version} build_style=gnu-configure @@ -10,7 +10,7 @@ maintainer="lemmi " license="WTFPL" homepage="https://github.com/sekrit-twc/zimg" distfiles="https://github.com/sekrit-twc/zimg/archive/release-${version}.tar.gz" -checksum=996ea0e446df6ff4d6cb9c04a77d60978eca47c32d3785cd63fe8c29a9523d1f +checksum=deb85887081cab7fa9c492b588900d60d6466e61ee8ea51a84ca280688d93de9 pre_configure() { ./autogen.sh diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template index 5ebc9a451e7..a180e665541 100644 --- a/srcpkgs/znc/template +++ b/srcpkgs/znc/template @@ -1,7 +1,7 @@ # Template file for 'znc' pkgname=znc -version=1.6.4 -revision=1 +version=1.6.5 +revision=3 build_style=gnu-configure configure_args="--enable-python --enable-perl --enable-tcl --enable-cyrus" hostmakedepends="pkg-config perl" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="Apache-2.0" homepage="http://znc.in/" distfiles="http://znc.in/releases/$pkgname-$version.tar.gz" -checksum=431097eb17860bfc980f3e68fdd75f98af4bdeecd793c84835c6cb11c3320d1c +checksum=2f0225d49c53a01f8d94feea4619a6fe92857792bb3401a4eb1edd65f0342aca system_accounts="znc" znc_homedir="/var/lib/znc" diff --git a/srcpkgs/zproto/template b/srcpkgs/zproto/template new file mode 100644 index 00000000000..aabc6bab4fd --- /dev/null +++ b/srcpkgs/zproto/template @@ -0,0 +1,22 @@ +# Template file for 'zproto' +pkgname=zproto +version=0.0.20170303 +revision=1 +_githash=3d0f98e3da06058e065efebc5d901608d1924abe +wrksrc="${pkgname}-${_githash}" +build_style=gnu-configure +hostmakedepends="automake libtool gsl-ucg xmlto asciidoc" +short_desc="Protocol framework for ZeroMQ" +maintainer="Toyam Cox " +license="MIT" +homepage="https://github.com/zeromq/zproto" +distfiles="https://github.com/zeromq/zproto/archive/${_githash}.tar.gz" +checksum=6ac24c20388fe52a31f569a647246130b16691fd234a3151c25bdeae96fbb365 + +pre_configure() { + ./autogen.sh +} + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/zsh-syntax-highlighting/template b/srcpkgs/zsh-syntax-highlighting/template index ef458834d09..a0f81736da8 100644 --- a/srcpkgs/zsh-syntax-highlighting/template +++ b/srcpkgs/zsh-syntax-highlighting/template @@ -1,6 +1,6 @@ # Template file for 'zsh-syntax-highlighting' pkgname=zsh-syntax-highlighting -version=0.4.1 +version=0.5.0 revision=1 noarch=yes depends="zsh" @@ -9,7 +9,7 @@ maintainer="Eivind Uggedal " license="BSD" homepage="https://github.com/zsh-users/zsh-syntax-highlighting" distfiles="${homepage}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=971b9c1e881a8d60442e40003c9e4c98bd1d5243a32fdf386a217c4cd7815197 +checksum=e2a7f140e838578ddb2769d99a32f0bbbd2c990585c61b203cf1f676b09608be do_install() { vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname} diff --git a/srcpkgs/zstd/template b/srcpkgs/zstd/template index db21912f74f..57b7f61576b 100644 --- a/srcpkgs/zstd/template +++ b/srcpkgs/zstd/template @@ -1,13 +1,13 @@ # Template file for 'zstd' pkgname=zstd -version=1.1.3 +version=1.1.4 revision=1 short_desc="Fast real-time compression algorithm" maintainer="Michael Gehring " license="BSD" homepage="http://www.zstd.net" distfiles="https://github.com/facebook/zstd/archive/v${version}.tar.gz" -checksum=106c532ae840a6ee4aee5258f04f3acab7b3e09b9e9584ebe94e4fbfd899af0a +checksum=6aae2b586e359344cb8ecfe6917a407dc7e01b5d7d7388559714de37900fb9fb do_build() { make diff --git a/srcpkgs/zutils/template b/srcpkgs/zutils/template index c4ec2f13459..37e148f7114 100644 --- a/srcpkgs/zutils/template +++ b/srcpkgs/zutils/template @@ -1,17 +1,17 @@ # Template file for 'zutils' pkgname=zutils -version=1.5 +version=1.6 revision=1 build_style=gnu-configure hostmakedepends="lzip" depends="bzip2 gzip lzip xz" conf_files="/etc/zutilsrc" short_desc="Utilities to deal with compressed files transparently" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-2" homepage="http://www.nongnu.org/zutils/zutils.html" distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.lz" -checksum=0ea5aff71da22e967cd3508e2a99a60155d8df573d623cdc480476364ae708b2 +checksum=eb100df09e3ff1af2c2424cf2799946d742f8275ea281118f87ff14ed1b8d73a post_install() { cd ${DESTDIR}/usr/bin diff --git a/xbps-src b/xbps-src index 713691cb039..4d1d0a5bbf1 100755 --- a/xbps-src +++ b/xbps-src @@ -570,8 +570,8 @@ export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \ XBPS_REPOSITORY XBPS_ALT_REPOSITORY XBPS_SRCDISTDIR XBPS_DIGEST_CMD \ XBPS_UHELPER_CMD XBPS_INSTALL_CMD XBPS_QUERY_CMD \ XBPS_RINDEX_CMD XBPS_RECONFIGURE_CMD XBPS_REMOVE_CMD \ - XBPS_CMPVER_CMD XBPS_FETCH_CMD XBPS_VERSION XBPS_APIVER \ - XBPS_BUILDSTYLEDIR XBPS_CPPFLAGS XBPS_CFLAGS XBPS_CXXFLAGS XBPS_LDFLAGS \ + XBPS_CMPVER_CMD XBPS_FETCH_CMD XBPS_VERSION XBPS_APIVER XBPS_BUILDSTYLEDIR \ + XBPS_CPPFLAGS XBPS_CFLAGS XBPS_CXXFLAGS XBPS_FFLAGS XBPS_LDFLAGS \ XBPS_MAKEJOBS XBPS_BUILD_FORCEMODE XBPS_USE_GIT_REVS XBPS_DEBUG_PKGS \ XBPS_CHECK_PKGS XBPS_CCACHE XBPS_DISTCC XBPS_DISTCC_HOSTS XBPS_SKIP_DEPS \ XBPS_SKIP_REMOTEREPOS XBPS_CROSS_BUILD XBPS_PKG_OPTIONS XBPS_CONFIG_FILE \