diff --git a/acpi_call-lts/PKGBUILD b/acpi_call-lts/PKGBUILD index fee87e3d3..58baf883c 100644 --- a/acpi_call-lts/PKGBUILD +++ b/acpi_call-lts/PKGBUILD @@ -1,62 +1,40 @@ # Maintainer: Neophytos Kolokotronis -# Find the kernel name inside the chroot -_extramodules=extramodules-3.2-lts -_kver="$(cat /usr/lib/modules/${_extramodules}/version)" -_kernelver=3.2.63 +_extramodules=extramodules-3.14-CHAKRA-LTS +_kver="$(cat /lib/modules/${_extramodules}/version)" +_kernelver=3.14.44 pkgname=acpi_call-lts _pkgname=acpi_call -pkgver=1.0.0 -pkgrel=8 +pkgver=1.1.0 +pkgrel=2 pkgdesc="A kernel module that enables you to call parameterless ACPI methods by writing the method name to /proc/acpi/call, e.g. to turn off discrete graphics card in a dual graphics environment (like NVIDIA Optimus)." arch=('x86_64') url=("http://github.com/mkottman/acpi_call") license=('GPL') -depends=("linux-lts>=${_kernelver}" "linux-lts-headers=${_kernelver}") -makedepends=('git') -provides=('acpi-call-lts') -replaces=('acpi-call-lts') -conflicts=('acpi-call-lts') -install=acpi_call.install -source=("https://github.com/mkottman/acpi_call/archive/v${pkgver}.tar.gz") -md5sums=('3c71239792ddd725d13f7c8d168b4ecf') +depends=("linux-lts>=${_kernelver}") +makedepends=("linux-lts-headers=${_kernelver}") +provides=("${pkgname%-*}") +install="${pkgname%-*}.install" +source=("acpi_call-$pkgver.tar.gz::${url}/archive/v${pkgver}.tar.gz") +sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') build() { - cd ${srcdir}/$_pkgname-${pkgver} - - sed \ - -e 's/$(shell uname -r)/3.2.63-1-lts/g' \ - -i Makefile + cd ${pkgname%-*}-${pkgver} - make + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + + make KVERSION="${_kernver}" } + package() { - cd ${srcdir}/$_pkgname-${pkgver} - install -d ${pkgdir}/usr/share/$_pkgname - install -d ${pkgdir}/usr/bin - install -Dm755 ${srcdir}/$_pkgname-${pkgver}/examples/asus1215n.sh \ - ${pkgdir}/usr/share/$_pkgname - install -Dm755 ${srcdir}/$_pkgname-${pkgver}/examples/m11xr2.sh \ - ${pkgdir}/usr/share/$_pkgname - install -Dm755 ${srcdir}/$_pkgname-${pkgver}/examples/dellL702X.sh \ - ${pkgdir}/usr/share/$_pkgname - install -Dm755 ${srcdir}/$_pkgname-${pkgver}/examples/turn_off_gpu.sh \ - ${pkgdir}/usr/share/$_pkgname - ln -s /usr/share/$_pkgname/turn_off_gpu.sh \ - ${pkgdir}/usr/bin/turn_off_gpu.sh - install -Dm755 ${srcdir}/$_pkgname-${pkgver}/support/query_dsdt.pl \ - ${pkgdir}/usr/share/$_pkgname-${pkgver} - cp -R support/windump_hack \ - ${pkgdir}/usr/share/$_pkgname/ - install -Dm644 README.md \ - ${pkgdir}/usr/share/$_pkgname/README.md + cd ${pkgname%-*}-${pkgver} - msg2 "Building module for $_kver..." + install -dm 755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d} + install -m 644 ${pkgname%-*}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/ + gzip "${pkgdir}"/usr/lib/modules/${_extramodules}/${pkgname%-*}.ko + echo ${pkgname%-*} > "${pkgdir}"/usr/lib/modules-load.d/${pkgname}.conf - # KDIR is necessary even when cleaning - #make KDIR=/usr/src/linux-${_kver} clean - make KDIR=/usr/src/linux-${_kver} - - install -D -m644 acpi_call.ko $pkgdir/usr/lib/modules/${_kver}/kernel/drivers/acpi/acpi_call.ko + install -dm 755 "${pkgdir}"/usr/share/${pkgname} + cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${pkgname}/ } diff --git a/acpi_call/PKGBUILD b/acpi_call/PKGBUILD index c4161987d..cf4ef7339 100644 --- a/acpi_call/PKGBUILD +++ b/acpi_call/PKGBUILD @@ -1,14 +1,14 @@ # -# Core Packages for Chakra, part of chakra-project.org +# Core Packages for Chakra, part of chakraos.org -_extramodules=extramodules-3.19-CHAKRA +_extramodules=extramodules-4.0-CHAKRA _kver="$(cat /usr/lib/modules/${_extramodules}/version)" -_kernelver=3.19.4 +_kernelver=4.0.5 pkgname=acpi_call _pkgname=acpi_call pkgver=1.1.0 -pkgrel=23 +pkgrel=24 pkgdesc="A kernel module that enables you to call parameterless ACPI methods by writing the method name to /proc/acpi/call, e.g. to turn off discrete graphics card in a dual graphics environment (like NVIDIA Optimus)." arch=('x86_64') url=("http://github.com/mkottman/acpi_call") diff --git a/acpi_call/acpi_call.install b/acpi_call/acpi_call.install index 541d4609d..72b4b9b74 100755 --- a/acpi_call/acpi_call.install +++ b/acpi_call/acpi_call.install @@ -1,5 +1,5 @@ post_install() { - EXTRAMODULES='extramodules-3.19-CHAKRA' + EXTRAMODULES='extramodules-4.0-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo "" echo "[+] modprobe acpi_call" @@ -12,7 +12,7 @@ post_upgrade() { } post_remove() { - EXTRAMODULES='extramodules-3.19-CHAKRA' + EXTRAMODULES='extramodules-4.0-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/apr-util/PKGBUILD b/apr-util/PKGBUILD index 8207e8bca..acb5f2df6 100644 --- a/apr-util/PKGBUILD +++ b/apr-util/PKGBUILD @@ -1,16 +1,15 @@ # Maintainer: Neophytos Kolokotronis pkgname=apr-util -pkgver=1.5.3 +pkgver=1.5.4 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('x86_64') url="http://apr.apache.org/" depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') -options=('!libtool') license=('APACHE') source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('6f3417691c7a27090f36e7cf4d94b36e') +md5sums=('2202b18f269ad606d70e1864857ed93c') build() { cd "${srcdir}/apr-util-${pkgver}" diff --git a/apr/PKGBUILD b/apr/PKGBUILD index 96f5d1a58..76b5a0d0e 100644 --- a/apr/PKGBUILD +++ b/apr/PKGBUILD @@ -1,16 +1,17 @@ # Maintainer: Neophytos Kolokotronis pkgname=apr -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('x86_64') url="http://apr.apache.org/" depends=('util-linux') -options=('!libtool') license=('APACHE') -source=("http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2") -md5sums=('5486180ec5a23efb5cae6d4292b300ab') +source=(http://www.apache.org/dist/apr/apr-$pkgver.tar.bz2{,.asc}) +md5sums=('4e9769f3349fe11fc0a5e1b224c236aa' + 'SKIP') +validpgpkeys=('5B5181C2C0AB13E59DA3F7A3EC582EB639FF092C') # Jeff Trawick build() { cd "${srcdir}/apr-${pkgver}" @@ -19,7 +20,7 @@ build() { ./configure --prefix=/usr --includedir=/usr/include/apr-1 \ --with-installbuilddir=/usr/share/apr-1/build \ --enable-nonportable-atomics \ - --with-devrandom=/dev/urandom + --with-devrandom=/dev/urandom --disable-static make } diff --git a/automake/PKGBUILD b/automake/PKGBUILD index b80660a46..84b5fd4d8 100644 --- a/automake/PKGBUILD +++ b/automake/PKGBUILD @@ -1,10 +1,6 @@ -# -# Core Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas@chakra-project.org pkgname=automake -pkgver=1.11.6 +pkgver=1.15 pkgrel=1 pkgdesc="A GNU tool for automatically creating Makefiles" arch=('any') @@ -13,9 +9,19 @@ url="http://www.gnu.org/software/automake" groups=('base-devel') depends=('perl' 'bash') makedepends=('autoconf') +checkdepends=('dejagnu' 'python3' 'gcc-fortran' 'java-environment' 'vala' 'emacs') install=automake.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('0286dc30295b62985ca51919202ecfcc') +source=(http://mirror.bibleonline.ru/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('9a1ddb0e053474d9d1105cfe39b0c48d' + 'SKIP') +validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573') # Stefano Lattarini + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # skip failing test... + sed -i "/instmany-python.sh/d" Makefile.in +} build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -23,15 +29,12 @@ build() { make } -check() -{ +check() { cd ${srcdir}/${pkgname}-${pkgver} - # 1.11 is not really maintained anymore, thefore tests failing is a WONTFIX for upstream - [ ${pkgver} = "1.11.6" ] || make check + make check } package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install -} - +} \ No newline at end of file diff --git a/b43-fwcutter/PKGBUILD b/b43-fwcutter/PKGBUILD index 05f853d7e..3106b460e 100644 --- a/b43-fwcutter/PKGBUILD +++ b/b43-fwcutter/PKGBUILD @@ -1,10 +1,6 @@ -# -# Core Packages for Chakra, part of chakra-project.org -# -# maintainer Manuel Tortosa pkgname=b43-fwcutter -pkgver=017 +pkgver=019 pkgrel=1 pkgdesc="firmware extractor for the bcm43xx kernel module" url="http://wireless.kernel.org/en/users/Drivers/b43" @@ -12,7 +8,7 @@ depends=('glibc') license=('GPL') arch=('x86_64') source=("http://bues.ch/b43/fwcutter/${pkgname}-${pkgver}.tar.bz2") -md5sums=('fe6a3cc765d8a8328dc09f7a6159bfb7') +md5sums=('19d1f4226a625756726bdf7ed5dc2a0a') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/bash/PKGBUILD b/bash/PKGBUILD index e03aa9ba5..eb50a444e 100644 --- a/bash/PKGBUILD +++ b/bash/PKGBUILD @@ -4,7 +4,7 @@ pkgname=bash _basever=4.3 -_patchlevel=030 #prepare for some patches +_patchlevel=039 #prepare for some patches pkgver=$_basever.$_patchlevel pkgrel=1 pkgdesc="The GNU Bourne Again shell" @@ -17,7 +17,7 @@ depends=('readline>=6.3' 'glibc') optdepends=('bash-completion: for tab completion') provides=('sh') install=bash.install -source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} +source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz dot.bashrc dot.bash_profile dot.bash_logout @@ -27,7 +27,7 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} if [[ $((10#${_patchlevel})) -gt 0 ]]; then for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//.}-$(printf "%03d" $_p){,.sig}) + source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//.}-$(printf "%03d" $_p)) done fi @@ -80,7 +80,6 @@ package() { } md5sums=('81348932d5da294953e15d4814c74dd1' - 'SKIP' '027d6bd8f5f6a06b75bb7698cb478089' '2902e0fee7a9168f3a4fd2ccd60ff047' '42f4400ed2314bd7519c020d0187edc5' @@ -88,62 +87,41 @@ md5sums=('81348932d5da294953e15d4814c74dd1' '472f536d7c9e8250dc4568ec4cfaf294' 'a577d42e38249d298d6a8d4bf2823883' '1ab682b4e36afa4cf1b426aa7ac81c0d' - 'SKIP' '8fc22cf50ec85da00f6af3d66f7ddc1b' - 'SKIP' 'a41728eca78858758e26b5dea64ae506' - 'SKIP' 'bf8d53d227829d67235927689a03cc7a' - 'SKIP' 'c0c00935c8b8ffff76e8ab77e7be7d15' - 'SKIP' '6f01e364cd092faa28dd7119f47ddb5f' - 'SKIP' 'dcf471d222bcd83283d3094e6ceeb6f8' - 'SKIP' 'f7553416646dc26c266454c78a916d36' - 'SKIP' '7e73d2151f4064b484a4ba2c4b09960e' - 'SKIP' 'a275463d21735bb6d7161f9fbd320d8f' - 'SKIP' 'c17103ee20420d77e46b224c8d3fceda' - 'SKIP' '3e2a057a19d02b3f92a3a09eacbc03ae' - 'SKIP' 'fb377143a996d4ff087a2771bc8332f9' - 'SKIP' '1a1aaecc99a9d0cbc310e8e247dcc8b6' - 'SKIP' '4f04387458a3c1b4d460d199f49991a8' - 'SKIP' '90e759709720c4f877525bebc9d5dc06' - 'SKIP' '11e4046e1b86070f6adbb7ffc89641be' - 'SKIP' 'cd5a9b46f5bea0dc0248c93c7dfac011' - 'SKIP' 'cff4dc024d9d3456888aaaf8a36ca774' - 'SKIP' '167839c5f147347f4a03d88ab97ff787' - 'SKIP' '1d350671c48dec30b34d8b81f09cd79d' - 'SKIP' '11c349af66a55481a3215ef2520bec36' - 'SKIP' 'b3cb0d80fd0c47728264405cbb3b23c7' - 'SKIP' 'b5ea5600942acceb4b6f07313d2de74e' - 'SKIP' '193c06f578d38ffdbaebae9c51a7551f' - 'SKIP' '922578e2be7ed03729454e92ee8d3f3a' - 'SKIP' '8ff6948b16f2db5c29b1b9ae1085bbe7' - 'SKIP' 'dd51fa67913b5dca45a702b672b3323f' - 'SKIP' '0729364c977ef4271e9f8dfafadacf67' - 'SKIP' 'efb709fdb1368945513de23ccbfae053' - 'SKIP') + '236df1ac1130a033ed0dbe2d2115f28f' + '2360f7e79cfb28526f80021025ea5909' + 'b551c4ee7b8713759e4143499d0bbd48' + 'c9a56fbe0348e05a886dff97f2872b74' + 'e564e8ab44ed1ca3a4e315a9f6cabdc9' + 'b00ff66c41a7c0f06e191200981980b0' + 'be2a7b05f6ae560313f3c9d5f7127bda' + '61e0522830b24fbe8c0d1b010f132470' + 'a4775487abe958536751c8ce53cdf6f9') diff --git a/broadcom-wl-lts/PKGBUILD b/broadcom-wl-lts/PKGBUILD index fdd17dd8a..b042ab291 100644 --- a/broadcom-wl-lts/PKGBUILD +++ b/broadcom-wl-lts/PKGBUILD @@ -1,14 +1,14 @@ # -# Chakra Packages for Chakra, part of chakra-project.org +# Chakra Packages for Chakra, part of chakraos.org # -_extramodules=extramodules-3.2-lts -_kernver="$(cat /lib/modules/${_extramodules}/version)" -_kernelver=3.2.63 +_extramodules=extramodules-3.14-CHAKRA-LTS +_kver="$(cat /lib/modules/${_extramodules}/version)" +_kernelver=3.14.44 pkgname=broadcom-wl-lts pkgver=6.30.223.248 -pkgrel=2 +pkgrel=4 pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver' arch=('x86_64') url='http://www.broadcom.com/support/802.11/linux_sta.php' @@ -17,20 +17,29 @@ depends=("linux-lts=${_kernelver}") makedepends=("linux-lts-headers=${_kernelver}") backup=('etc/modprobe.d/broadcom-wl-lts.conf') install=install - source=("http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz" + #"http://ftp.de.debian.org/debian/pool/non-free/b/broadcom-sta/broadcom-sta_5.100.82.112.orig.tar.gz" "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${ARCH}-v${pkgver//./_}.tar.gz" we need the debian version, because upstream URL doesn't exist anymore 'modprobe.d' - 'license.patch') + 'license.patch' + 'gcc.patch') sha1sums=('bd55f1fdc6b0a4d0a70dc4ba4bb4169a824e238c' '89bf92286ede30dd85304c6c4e42e89cfdc0f60a' - 'ea7b67982ddc0f56fd3becb9914fd4458fe7d373') + 'ea7b67982ddc0f56fd3becb9914fd4458fe7d373' + '8a940675e8c0baa65494c378e6155543b26a9a58') + +prepare() { + cd "${srcdir}" + patch -p1 -i license.patch + patch -p1 -i gcc.patch + + sed -e "/BRCM_WLAN_IFNAME/s:eth:wlan:" \ + -i src/wl/sys/wl_linux.c +} build() { cd "${srcdir}" - patch -p1 -i ${srcdir}/license.patch - - make -C /lib/modules/"${_kernver}"/build M=`pwd` + make -C /lib/modules/"${_kver}"/build M=`pwd` } package() { diff --git a/broadcom-wl-lts/gcc.patch b/broadcom-wl-lts/gcc.patch new file mode 100644 index 000000000..f93e3f1d3 --- /dev/null +++ b/broadcom-wl-lts/gcc.patch @@ -0,0 +1,11 @@ +--- a/Makefile 2014-06-26 10:42:08.000000000 +0000 ++++ b/Makefile 2014-07-17 22:44:01.662297228 +0000 +@@ -126,6 +126,8 @@ + EXTRA_CFLAGS += -I$(src)/src/shared/bcmwifi/include + #EXTRA_CFLAGS += -DBCMDBG_ASSERT -DBCMDBG_ERR + ++EXTRA_CFLAGS += -Wno-date-time ++ + EXTRA_LDFLAGS := $(src)/lib/wlc_hybrid.o_shipped + + KBASE ?= /lib/modules/`uname -r` diff --git a/broadcom-wl/PKGBUILD b/broadcom-wl/PKGBUILD index 90eb2113e..27a66882f 100644 --- a/broadcom-wl/PKGBUILD +++ b/broadcom-wl/PKGBUILD @@ -1,12 +1,12 @@ #maintainer: Neophytos Kolokotronis -_extramodules=extramodules-3.19-CHAKRA -_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" -_kernelver=3.19.4 +_extramodules=extramodules-4.0-CHAKRA +_kver="$(cat /usr/lib/modules/${_extramodules}/version)" +_kernelver=4.0.5 pkgname=broadcom-wl pkgver=6.30.223.248 -pkgrel=12 +pkgrel=14 pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver' url='http://www.broadcom.com/support/802.11/linux_sta.php' arch=('x86_64') @@ -15,25 +15,29 @@ depends=("linux=${_kernelver}") makedepends=("linux-headers=${_kernelver}") source=("http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz" #"http://ftp.de.debian.org/debian/pool/non-free/b/broadcom-sta/broadcom-sta_5.100.82.112.orig.tar.gz" "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${ARCH}-v${pkgver//./_}.tar.gz" we need the debian version, because upstream URL doesn't exist anymore - 'modprobe.d' - 'license.patch' - 'gcc.patch' - 'linux-recent.patch') + modprobe.d + license.patch + gcc.patch + linux-recent.patch + support-for-Linux-4.0.patch) sha1sums=('bd55f1fdc6b0a4d0a70dc4ba4bb4169a824e238c' 'a37c5dd9ab279372f0c68595bb2a8f1fe694cd13' '81c05d48b234d56ad2e18eaee5ce89b79550ef20' '8a940675e8c0baa65494c378e6155543b26a9a58' - '758cb8ed0448aeedae18c64c25ddf330ac1a5177') + '758cb8ed0448aeedae18c64c25ddf330ac1a5177' + 'bc38818662f50418c7b4e2588f84b8d7cafcd56c') install=install - prepare() { cd "${srcdir}" patch -p1 -i linux-recent.patch patch -p1 -i license.patch patch -p1 -i gcc.patch + + # based on https://bugs.launchpad.net/ubuntu/+source/bcmwl/+bug/1424676 + patch -p1 -i support-for-Linux-4.0.patch sed -e "/BRCM_WLAN_IFNAME/s:eth:wlan:" \ -i src/wl/sys/wl_linux.c @@ -42,7 +46,7 @@ prepare() { build() { cd "${srcdir}" - make -C /usr/lib/modules/"${_kernver}"/build M=`pwd` + make -C /usr/lib/modules/"${_kver}"/build M=`pwd` } package() { diff --git a/broadcom-wl/install b/broadcom-wl/install index de55fcec0..4d611986c 100644 --- a/broadcom-wl/install +++ b/broadcom-wl/install @@ -1,9 +1,13 @@ post_upgrade() { - cd lib/modules - for i in extramodules-*; do depmod $(cat "$i/version"); done - cd ../.. + for i in /usr/lib/modules/extramodules-* + do + if [ -f "$i/version" ] + then + depmod $(cat "$i/version") + fi + done } post_install() { - post_upgrade + post_upgrade } diff --git a/broadcom-wl/support-for-Linux-4.0.patch b/broadcom-wl/support-for-Linux-4.0.patch new file mode 100644 index 000000000..04f8ef8e3 --- /dev/null +++ b/broadcom-wl/support-for-Linux-4.0.patch @@ -0,0 +1,20 @@ +--- a/src/wl/sys/wl_cfg80211_hybrid.c 2015-02-25 16:48:03.117609023 -0500 ++++ b/src/wl/sys/wl_cfg80211_hybrid.c 2015-02-25 17:00:43.073595414 -0500 +@@ -1441,7 +1441,7 @@ + WL_DBG(("Could not get rate (%d)\n", err)); + } else { + rate = dtoh32(rate); +- sinfo->filled |= STATION_INFO_TX_BITRATE; ++ sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); + sinfo->txrate.legacy = rate * 5; + WL_DBG(("Rate %d Mbps\n", (rate / 2))); + } +@@ -1454,7 +1454,7 @@ + return err; + } + rssi = dtoh32(scb_val.val); +- sinfo->filled |= STATION_INFO_SIGNAL; ++ sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); + sinfo->signal = rssi; + WL_DBG(("RSSI %d dBm\n", rssi)); + } diff --git a/btrfs-progs/PKGBUILD b/btrfs-progs/PKGBUILD index aec6c6fc4..ce59dd2a4 100644 --- a/btrfs-progs/PKGBUILD +++ b/btrfs-progs/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Tobias Powalowski pkgname=btrfs-progs -pkgver=3.18.2 +pkgver=4.0.1 pkgrel=1 pkgdesc='Btrfs filesystem utilities' arch=('x86_64') @@ -28,8 +28,9 @@ md5sums=('SKIP' build() { cd $pkgname - make CFLAGS="$CFLAGS" - make CFLAGS="$CFLAGS" btrfs-select-super + ./autogen.sh + ./configure --prefix=/usr + make } check() { @@ -41,7 +42,9 @@ package() { cd $pkgname make prefix="$pkgdir"/usr install - install -Dm755 btrfs-select-super "$pkgdir"/usr/bin + + # install bash completion (FS#44618) + install -Dm644 btrfs-completion "$pkgdir/usr/share/bash-completion/completions/btrfs" # install mkinitcpio hooks cd "$srcdir" diff --git a/ca-certificates/PKGBUILD b/ca-certificates/PKGBUILD index 00135074c..f41e688c3 100644 --- a/ca-certificates/PKGBUILD +++ b/ca-certificates/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=ca-certificates pkgname=(ca-certificates-utils ca-certificates) -pkgver=20140923 +pkgver=20150402 pkgrel=1 pkgdesc='Common CA certificates' arch=('any') @@ -12,8 +12,8 @@ url='http://pkgs.fedoraproject.org/cgit/ca-certificates.git' license=('GPL2') makedepends=('asciidoc' 'p11-kit') source=(update-ca-trust update-ca-trust.8.txt) -sha256sums=('fe6d5bc3bd133d7bd1047abef9f98ad9b9c1e3762766e1b2df9dbeabe3420abe' - '916bc0582b5230aedc7fdada70bc387fbd605dbc9d3d421621e4736c60a8ef41') +sha256sums=('746d2cce8ec107fa3b7aaa246d69a7e238c3d2ac5cd82c5aeed996fe9cb0a874' + '38c10446738c1e99bc95e42fe844a9e95ea106795059fa769f3b4ba82b395929') build() { asciidoc.py -v -d manpage -b docbook update-ca-trust.8.txt diff --git a/ca-certificates/ca-certificates-utils.install b/ca-certificates/ca-certificates-utils.install index ef8196810..8120878d7 100644 --- a/ca-certificates/ca-certificates-utils.install +++ b/ca-certificates/ca-certificates-utils.install @@ -2,25 +2,17 @@ export LC_ALL=C post_install() { usr/bin/update-ca-trust -} -pre_upgrade() { - if (( $(vercmp $2 20140923-1) < 0 )); then - find /etc/ssl/certs -type l -print | while read symlink; do - case $(readlink $symlink) in - /usr/share/ca-certificates*) rm -f $symlink;; - esac - done - find /etc/ssl/certs -type l -print | while read symlink; do - test -f $symlink || rm -f $symlink - done - fi + # This should be a normally packaged file, but that would + # require user intervention at upgrade + ln -srf etc/ca-certificates/extracted/tls-ca-bundle.pem \ + etc/ssl/certs/ca-certificates.crt } post_upgrade() { usr/bin/update-ca-trust - if (( $(vercmp $2 20140923-1) < 0 )); then + if (( $(vercmp $2 20140923-7.1) < 0 )); then cat <> section. +The directory /etc/ssl/certs contains a OpenSSL-cadir-style hash farm. +Distrust information cannot be represented in this format, +and distrusted certificates are missing from these files. + The directory /etc/ssl/certs/java contains a CA certificate bundle in the java keystore file format. Distrust information cannot be represented in this file format, and distrusted certificates are missing from these files. File cacerts contains CA certificates trusted for TLS server authentication. -The directory /etc/ssl/certs contains a OpenSSL-cadir-style hash farm, as well -as a ca-bundle.trust.crt bundle file in the extended BEGIN/END TRUSTED CERTIFICATE file format, -as described in the x509(1) manual page. -The dir or the bundle contain the full set of all trusted -or distrusted certificates, including the associated trust flags. - The directory /etc/ca-certificates/extracted contains CA certificate bundle files in the simple BEGIN/END CERTIFICATE file format, as decribed in the x509(1) manual page. @@ -201,6 +199,10 @@ File email-ca-bundle.pem contains CA certificates trusted for E-Mail protection. File objsign-ca-bundle.pem contains CA certificates trusted for code signing. +File ca-bundle.trust.crt contains certificates in the extended +BEGIN/END TRUSTED CERTIFICATE file format, as described in the x509(1) manual page. +This bundle contains the full set of all trusted +and distrusted certificates, including the associated trust flags. COMMANDS @@ -218,27 +220,6 @@ COMMANDS FILES ----- -/etc/ssl/certs:: - Classic directory, contains individual CA certificates in the extended BEGIN/END TRUSTED CERTIFICATE file format, which includes trust (and/or distrust) flags specific to certificate usage, - which are created by the 'update-ca-trust extract' command. Don't edit files in this directory, because they will be overwritten. - See section <> for additional details. - -/etc/ssl/certs/ca-bundle.trust.crt:: - Classic filename, file contains a list of CA certificates in the extended BEGIN/END TRUSTED CERTIFICATE file format, which includes trust (and/or distrust) flags specific to certificate usage. - This file is consolidated output created by the update-ca-trust command. - -/etc/ssl/certs/ca-certificates.crt:: - Classic filename, file contains a list of CA certificates trusted for TLS server authentication usage, in the simple BEGIN/END CERTIFICATE file format, without distrust information. - This file is a symbolic link that refers to consolidated output created by the update-ca-trust command. - -/etc/ssl/cert.pem:: - Classic filename, file contains a list of CA certificates trusted for TLS server authentication usage, in the simple BEGIN/END CERTIFICATE file format, without distrust information. - This file is a symbolic link that refers to consolidated output created by the update-ca-trust command. - -/etc/ssl/java/cacerts:: - Classic filename, file contains a list of CA certificates trusted for TLS server authentication usage, in the Java keystore file format, without distrust information. - This file is consolidated output created by the update-ca-trust command. - /usr/share/ca-certificates/trust-source:: Contains multiple, low priority source configuration files as explained in section <>. Please pay attention to the specific meanings of the respective subdirectories. @@ -250,6 +231,35 @@ FILES which are created using the 'update-ca-trust extract' command. Don't edit files in this directory, because they will be overwritten. See section <> for additional details. +/etc/ca-certificates/extracted/tls-ca-bundle.pem:: + Contains a list of CA certificates trusted for TLS server authentication, in the simple BEGIN/END CERTIFICATE file format, without distrust information. + +/etc/ca-certificates/extracted/email-ca-bundle.pem:: + Contains a list of CA certificates trusted for E-Mail protection, in the simple BEGIN/END CERTIFICATE file format, without distrust information. + +/etc/ca-certificates/extracted/objsign-ca-bundle.pem:: + Contains a list of CA certificates trusted for code signing, in the simple BEGIN/END CERTIFICATE file format, without distrust information. + +/etc/ca-certificates/extracted/ca-bundle.trust.crt:: + Contains a list of CA certificates in the extended BEGIN/END TRUSTED CERTIFICATE file format, which includes trust (and/or distrust) flags specific to certificate usage. + +/etc/ca-certificates/extracted/cadir:: + Contains individual CA certificates trusted for TLS server authentication usage, in the simple BEGIN/END CERTIFICATE file format, without distrust information. + Also includes the necessary hash symlinks expected by OpenSSL. + +/etc/ssl/certs:: + Classic directory, contains symlinks into /etc/ca-certificates/extracted/cadir which are maintained by the update-ca-trust command. + +/etc/ssl/certs/ca-certificates.crt:: + Classic filename, a symlink to /etc/ca-certificates/extracted/tls-ca-bundle.pem. + +/etc/ssl/cert.pem:: + Classic filename, a symlink to /etc/ca-certificates/extracted/tls-ca-bundle.pem. + +/etc/ssl/java/cacerts:: + Classic filename, contains a list of CA certificates trusted for TLS server authentication usage, in the Java keystore file format, without distrust information. + This file is consolidated output created by the update-ca-trust command. + AUTHOR ------ Written by Kai Engert and Stef Walter. diff --git a/crda/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch b/crda/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch deleted file mode 100644 index 6807e99f8..000000000 --- a/crda/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch +++ /dev/null @@ -1,52 +0,0 @@ -From fefefdb2c52c8fbedbb339b4badb8226cad7e7e0 Mon Sep 17 00:00:00 2001 -From: Krishna Chaitanya -Date: Mon, 16 Dec 2013 21:57:39 +0530 -Subject: [PATCH] crda: Fix the linking order to avoid compilation error - -While linking the crda.o and libreg.so, first put crda.o -and then -lreg. This fixed the below error: - - GEN keys-gcrypt.c - Trusted pubkeys: pubkeys/linville.key.pub.pem - CC libreg.so - CC crda.o - LD crda -crda.o: In function `main': -crda/crda.c:196: undefined reference to `reglib_get_rd_alpha2' -collect2: ld returned 1 exit status -make: *** [crda] Error 1 - -Note: This still doesn't fix the below error (will send another mail) - - CHK /usr/lib/crda/regulatory.bin -Database signature verification failed. -Invalid or empty regulatory file, note: a binary regulatory file should be used. -make: *** [verify] Error 234 - -Signed-off-by: Luis R. Rodriguez -Signed-off-by: Chaitanya T K ---- - Makefile | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 4a351c6..0b2f0d7 100644 ---- a/Makefile -+++ b/Makefile -@@ -28,10 +28,11 @@ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys - CFLAGS += -O2 -fpic - CFLAGS += -std=gnu99 -Wall -Werror -pedantic - CFLAGS += -Wall -g --LDLIBS += -lm - LDLIBREG += -lreg -+LDLIBS += $(LDLIBREG) -+LDLIBS += -lm - LIBREG += libreg.so --LDFLAGS += -L ./ $(LDLIBREG) -+LDFLAGS += -L ./ - - all: all_noverify verify - --- -1.9.0 - diff --git a/crda/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch b/crda/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch deleted file mode 100644 index c69f8f7cb..000000000 --- a/crda/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2cabb2588da56735369131b709f191453c080be0 Mon Sep 17 00:00:00 2001 -From: "John W. Linville" -Date: Fri, 14 Feb 2014 13:58:44 -0500 -Subject: [PATCH 2/2] crda: Add DESTDIR support in install-libreg* rules in - Makefile - -Signed-off-by: John W. Linville -Signed-off-by: Luis R. Rodriguez ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 0b2f0d7..1f25509 100644 ---- a/Makefile -+++ b/Makefile -@@ -120,13 +120,13 @@ $(LIBREG): regdb.h reglib.h reglib.c - - install-libreg-headers: - $(NQ) ' INSTALL libreg-headers' -- $(Q)mkdir -p $(INCLUDE_DIR) -- $(Q)cp *.h $(INCLUDE_DIR)/ -+ $(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR) -+ $(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/ - - install-libreg: - $(NQ) ' INSTALL libreg' -- $(Q)mkdir -p $(LIBDIR) -- $(Q)cp $(LIBREG) $(LIBDIR)/ -+ $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) -+ $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ - $(Q)ldconfig - - %.o: %.c regdb.h $(LIBREG) --- -1.9.0 - diff --git a/crda/PKGBUILD b/crda/PKGBUILD index 1e9400774..2e4b961f2 100644 --- a/crda/PKGBUILD +++ b/crda/PKGBUILD @@ -2,33 +2,30 @@ # Contributor: Thomas Bächler pkgname=crda -pkgver=3.13 +pkgver=3.18 pkgrel=1 pkgdesc="Central Regulatory Domain Agent for wireless networks" -arch=(i686 x86_64) +arch=('x86_64') url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" license=('custom') depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd' 'iw') makedepends=('python2-m2crypto') install=crda.install -source=(https://kernel.org/pub/software/network/crda/${pkgname}-${pkgver}.tar.xz +source=(https://kernel.org/pub/software/network/crda/${pkgname}-${pkgver}.tar{.xz,.sign} set-wireless-regdom - 0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch - 0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch 0001-Makefile-Link-libreg.so-against-the-crypto-library.patch 0001-Makefile-Don-t-run-ldconfig.patch) -sha256sums=('2f85da7ab0170b140d6ed62596c8f268d4a7dedecf84cac7182ada979742ff59' +sha256sums=('43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf' + 'SKIP' '603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3' - '8920b5988eb1befe13f88ce5c0dbbf30c294796d613681a2b0925f6f8534c51b' - 'ced0a372b06ffd64f90be77d7267c9d8cc10413bc017c3154b7208dbf69be3cb' '96b2068b27202f8bc78009869520e396cb3f3ac7a826efef06d0fc41047f2520' 'ff52990cf9295e5cebcf07ebbf2a96e225d97088573edcc898b29ce33a0fb663') +validpgpkeys=('E4053F8D0E7C4B9A0A20AB27DC553250F8FE7407') #Luis R. Rodriguez + prepare() { cd "${srcdir}"/${pkgname}-${pkgver} sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py - patch -p1 -i "${srcdir}"/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch - patch -p1 -i "${srcdir}"/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch patch -p1 -i "${srcdir}"/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch patch -p1 -i "${srcdir}"/0001-Makefile-Don-t-run-ldconfig.patch } diff --git a/dbus/30-dbus b/dbus/30-dbus.sh similarity index 57% rename from dbus/30-dbus rename to dbus/30-dbus.sh index 42b3a5ff7..96a51828a 100644 --- a/dbus/30-dbus +++ b/dbus/30-dbus.sh @@ -1,6 +1,6 @@ #!/bin/bash # launches a session dbus instance -if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && type dbus-launch >/dev/null; then +if [ -z "${DBUS_SESSION_BUS_ADDRESS-}" ] && type dbus-launch >/dev/null; then eval $(dbus-launch --sh-syntax --exit-with-session) fi diff --git a/dbus/PKGBUILD b/dbus/PKGBUILD index bb03f25a3..12d162aee 100644 --- a/dbus/PKGBUILD +++ b/dbus/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=dbus pkgname=('dbus' 'libdbus') -pkgver=1.8.16 +pkgver=1.8.18 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -12,9 +12,9 @@ arch=('x86_64') license=('GPL' 'custom') makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl') source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz - 30-dbus) -md5sums=('020824a38850501e7d6ba8307a7c5ac3' - '3314d727fa57fc443fce25b5cbeebbcc') + 30-dbus.sh) +md5sums=('83e607e9ccb1c921d5b6bbea2376a36c' + '6683a05bd749929ef9442816c22c3268') # note: remember to add the dbus group in the chroot, groupadd -g 81 dbus @@ -52,7 +52,7 @@ package_dbus(){ rm -rf "${pkgdir}/var/run" rm -rf "${pkgdir}/usr/lib/pkgconfig" - install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus" + install -Dm755 ../30-dbus.sh "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus.sh" install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING" } diff --git a/dejagnu/PKGBUILD b/dejagnu/PKGBUILD index 729319c0b..fe8dee788 100644 --- a/dejagnu/PKGBUILD +++ b/dejagnu/PKGBUILD @@ -1,21 +1,15 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas[at]chakra-project[dot]org> pkgname=dejagnu -pkgver=1.5.1 +pkgver=1.5.3 pkgrel=1 pkgdesc="Framework for testing other programs" arch=('any') url="http://www.gnu.org/software/dejagnu/" license=('GPL') depends=('sh' 'expect') -makedepends=('dejagnu') -options=('!libtool') install=dejagnu.install source=("http://ftp.gnu.org/gnu/dejagnu/${pkgname}-${pkgver}.tar.gz") -md5sums=('8386e04e362345f50ad169f052f4c4ab') +md5sums=('5bda2cdb1af51a80aecce58d6e42bd2f') build() { diff --git a/dhcpcd/Makefile_test.patch b/dhcpcd/Makefile_test.patch deleted file mode 100644 index 3269c4807..000000000 --- a/dhcpcd/Makefile_test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dhcpcd-6.4.3/test/Makefile 2014-07-30 17:13:12.000000000 +0200 -+++ test/Makefile 2014-07-31 21:34:43.471109436 +0200 -@@ -3,7 +3,7 @@ - - PROG= test - SRCS= test.c --SRCS+= test_hmac_md5.c hmac_md5.c ${MD5_SRC} -+SRCS+= test_hmac_md5.c ../crypt/hmac_md5.c ../${MD5_SRC} - - CFLAGS?= -O2 - CSTD?= c99 diff --git a/dhcpcd/PKGBUILD b/dhcpcd/PKGBUILD index 70fe359c3..bfbc38be0 100644 --- a/dhcpcd/PKGBUILD +++ b/dhcpcd/PKGBUILD @@ -3,8 +3,8 @@ # pkgname=dhcpcd -pkgver=6.5.1 -pkgrel=2 +pkgver=6.9.0 +pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/projects/dhcpcd/" arch=('x86_64') @@ -15,8 +15,8 @@ backup=('etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" 'dhcpcd_.service' - 'dhcpcd.service') -sha1sums=('e4ffeee13efff17aadbc60d669206819b99d0a74' + 'dhcpcd.service') +sha1sums=('0e4900e05c01b795508b51f882e1316aad5ad932' '6f1633edde14d29b5cdc09c4f029a450ef2ebc96' '52c1bad9ab43e9a253c1eb175e7eefb13497b8f9') diff --git a/dnssec-anchors/PKGBUILD b/dnssec-anchors/PKGBUILD index 06f74bb62..15544d7f3 100644 --- a/dnssec-anchors/PKGBUILD +++ b/dnssec-anchors/PKGBUILD @@ -1,38 +1,41 @@ # # Maintainer: Weng Xuetian -# Contributor: Gaetan Bisson -# Contributor: Thomas Mudrunka -# Contributor: m4xm4n + pkgname=dnssec-anchors -pkgver=20141008 +pkgver=20150403 pkgrel=1 pkgdesc='DNSSEC trust anchors for the root zone' url='http://data.iana.org/root-anchors/' license=('custom:NoCopyright') arch=('any') -source=('LICENSE' - 'trusted-key.key') -sha256sums=('dd37e92942d5a4024f1c77df49d61ca77fc6284691814903a741785df61f78cb' - '1fa004d34051182762f1f238268040170dc44c1c242ff7df35ffa39c845c58d9') +makedepends=('ldns') +validpgpkeys=('2FBB91BCAAEE0ABE1F8031C7D1AFBCE00F6C91D2') +source=('http://data.iana.org/root-anchors/root-anchors.xml' + 'root-anchors.xml.asc::http://data.iana.org/root-anchors/root-anchors.asc' + 'LICENSE') +sha256sums=('dfb281b771dc854c18d1cff9d2eecaf184cf7a9668606aaa33e8f01bf4b4d8e4' + 'SKIP' + 'dd37e92942d5a4024f1c77df49d61ca77fc6284691814903a741785df61f78cb') -get_trusted-key() { - drill -z -s DNSKEY . > root.key +build() { + cd "${srcdir}" + drill -z -s DNSKEY . > root.key - curl http://data.iana.org/root-anchors/root-anchors.xml | - awk 'BEGIN{ORS=" "}(NR>4){gsub(/<[^>]*>/,"");print tolower($0)}' | - sed 's/ /\n/' > root.ds + cat root-anchors.xml | + awk 'BEGIN{ORS=" "}(NR>4){gsub(/<[^>]*>/,"");print tolower($0)}' | + sed 's/ /\n/' > root.ds - # Any of those tests failing is suspicious; check thoroughly! - [[ "$( trusted-key.key + sed '/DNSKEY/s/ ;{id = '"$(cut -d\ -f1 trusted-key.key } package() { - cd "${srcdir}" - install -Dm644 trusted-key.key "${pkgdir}"/etc/trusted-key.key - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} + cd "${srcdir}" + install -Dm644 trusted-key.key "${pkgdir}"/etc/trusted-key.key + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} \ No newline at end of file diff --git a/efivar/PKGBUILD b/efivar/PKGBUILD index 55ef40c8d..9332913dd 100644 --- a/efivar/PKGBUILD +++ b/efivar/PKGBUILD @@ -5,7 +5,7 @@ pkgname=efivar pkgdesc="Tools and library to manipulate EFI variables" -pkgver="0.10" +pkgver="0.15" pkgrel="1" arch=('x86_64') url="https://github.com/vathpela/efivar" diff --git a/filesystem/PKGBUILD b/filesystem/PKGBUILD index 459bc37e2..03b0c9c4d 100644 --- a/filesystem/PKGBUILD +++ b/filesystem/PKGBUILD @@ -6,8 +6,8 @@ # contributor Manuel Tortosa pkgname=filesystem -pkgver=2014.10 -pkgrel=1 +pkgver=2015.05 +pkgrel=4 pkgdesc='Base filesystem' arch=('x86_64') license=('GPL') @@ -16,6 +16,7 @@ groups=('base') install='filesystem.install' depends=('iana-etc') makedepends=('asciidoc') +conflicts=('filesystem-extra') backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd' 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf' 'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue' 'etc/hostname' diff --git a/gawk/PKGBUILD b/gawk/PKGBUILD index c24630f52..36aa6034a 100644 --- a/gawk/PKGBUILD +++ b/gawk/PKGBUILD @@ -1,23 +1,19 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa pkgname=gawk -pkgver=4.1.1 +pkgver=4.1.3 pkgrel=1 pkgdesc="The GNU awk utility interprets a special-purpose programming language that makes it possible to handle simple data-reformatting jobs with just a few lines of code." -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.gnu.org/software/gawk/" license=('GPL') -groups=('base') +groups=('base' 'base-devel') depends=('sh' 'glibc' 'mpfr') provides=('awk') install=gawk.install source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('45f5b09aa87b4744c4c53bf274e96ed0' +md5sums=('55d37f4069502677f25d1340df8eec97' 'SKIP') +validpgpkeys=('D1967C63788713177D861ED7DF597815937EC0D2') # Arnold Robbins build() { cd ${pkgname}-${pkgver} diff --git a/gc/PKGBUILD b/gc/PKGBUILD index c19a2a7a6..3f324e03e 100644 --- a/gc/PKGBUILD +++ b/gc/PKGBUILD @@ -3,18 +3,24 @@ # Contributor: dorphell pkgname=gc -pkgver=7.4.0 -pkgrel=3 +pkgver=7.4.2 +pkgrel=1 pkgdesc="A garbage collector for C and C++" arch=('x86_64') url="http://www.hboehm.info/gc/" license=('GPL') -source=("http://www.hboehm.info/gc/gc_source/${pkgname}-${pkgver}.tar.gz") depends=('gcc-libs' 'libatomic_ops') -md5sums=('f40d9a47c90d60791eeecb484f8df5ee') +source=("http://www.hboehm.info/gc/gc_source/${pkgname}-${pkgver}.tar.gz" + noelision.patch) +md5sums=('12c05fd2811d989341d8c6d81f66af87' + '0be354bf60cc18363dc4c1601697717b') prepare() { cd ${pkgname}-${pkgver} + + # https://github.com/ivmai/bdwgc/pull/51 + patch -p1 -i ../noelision.patch + sed -i 's#pkgdata#doc#' doc/doc.am } @@ -25,6 +31,11 @@ build() { make } +check() { + cd ${pkgname}-${pkgver} + make check +} + package() { cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install diff --git a/gc/noelision.patch b/gc/noelision.patch new file mode 100644 index 000000000..0e1515ea1 --- /dev/null +++ b/gc/noelision.patch @@ -0,0 +1,127 @@ +diff --git c/include/private/gc_priv.h w/include/private/gc_priv.h +index 0ad92fc..b877fac 100644 +--- c/include/private/gc_priv.h ++++ w/include/private/gc_priv.h +@@ -2368,6 +2368,7 @@ GC_INNER ptr_t GC_store_debug_info(ptr_t p, word sz, const char *str, + /* GC_notify_all_builder() is called when GC_fl_builder_count */ + /* reaches 0. */ + ++ GC_INNER void GC_setup_mark_lock(void); + GC_INNER void GC_acquire_mark_lock(void); + GC_INNER void GC_release_mark_lock(void); + GC_INNER void GC_notify_all_builder(void); +diff --git c/include/private/gcconfig.h w/include/private/gcconfig.h +index c753cc2..b5ed075 100644 +--- c/include/private/gcconfig.h ++++ w/include/private/gcconfig.h +@@ -1357,6 +1357,11 @@ + # define PREFETCH_FOR_WRITE(x) \ + __asm__ __volatile__ ("prefetchw %0" : : "m"(*(char *)(x))) + # endif ++# if defined(__GLIBC__) ++ /* Workaround lock elision implementation for some glibc. */ ++# define GLIBC_2_19_TSX_BUG ++# include /* for gnu_get_libc_version() */ ++# endif + # endif + # ifdef CYGWIN32 + # define OS_TYPE "CYGWIN32" +@@ -2257,6 +2262,11 @@ + /* FIXME: This seems to be fixed in GLibc v2.14. */ + # define GETCONTEXT_FPU_EXCMASK_BUG + # endif ++# if defined(__GLIBC__) ++ /* Workaround lock elision implementation for some glibc. */ ++# define GLIBC_2_19_TSX_BUG ++# include /* for gnu_get_libc_version() */ ++# endif + # endif + # ifdef DARWIN + # define OS_TYPE "DARWIN" +diff --git c/include/private/pthread_support.h w/include/private/pthread_support.h +index 525a9aa..017f194 100644 +--- c/include/private/pthread_support.h ++++ w/include/private/pthread_support.h +@@ -148,6 +148,8 @@ GC_INNER_PTHRSTART GC_thread GC_start_rtn_prepare_thread( + struct GC_stack_base *sb, void *arg); + GC_INNER_PTHRSTART void GC_thread_exit_proc(void *); + ++GC_INNER void GC_setup_mark_lock(void); ++ + #endif /* GC_PTHREADS && !GC_WIN32_THREADS */ + + #endif /* GC_PTHREAD_SUPPORT_H */ +diff --git c/misc.c w/misc.c +index df434a1..3aca41d 100644 +--- c/misc.c ++++ w/misc.c +@@ -875,6 +875,9 @@ GC_API void GC_CALL GC_init(void) + /* else */ InitializeCriticalSection (&GC_allocate_ml); + } + # endif /* GC_WIN32_THREADS */ ++# if defined(GC_PTHREADS) && !defined(GC_WIN32_THREADS) ++ GC_setup_mark_lock(); ++# endif /* GC_PTHREADS */ + # if (defined(MSWIN32) || defined(MSWINCE)) && defined(THREADS) + InitializeCriticalSection(&GC_write_cs); + # endif +diff --git c/pthread_support.c w/pthread_support.c +index c00b93d..8a7c50b 100644 +--- c/pthread_support.c ++++ w/pthread_support.c +@@ -1979,6 +1979,55 @@ GC_INNER void GC_lock(void) + + static pthread_cond_t builder_cv = PTHREAD_COND_INITIALIZER; + ++#ifdef GLIBC_2_19_TSX_BUG ++ /* Parse string like [.[]] and return major value. */ ++ static int parse_version(int *pminor, const char *pverstr) { ++ char *endp; ++ unsigned long value = strtoul(pverstr, &endp, 10); ++ int major = (int)value; ++ ++ if (major < 0 || (char *)pverstr == endp || (unsigned)major != value) { ++ /* Parse error */ ++ return -1; ++ } ++ if (*endp != '.') { ++ /* No minor part. */ ++ *pminor = -1; ++ } else { ++ value = strtoul(endp + 1, &endp, 10); ++ *pminor = (int)value; ++ if (*pminor < 0 || (unsigned)(*pminor) != value) { ++ return -1; ++ } ++ } ++ return major; ++ } ++#endif /* GLIBC_2_19_TSX_BUG */ ++ ++GC_INNER void GC_setup_mark_lock(void) ++{ ++# ifdef GLIBC_2_19_TSX_BUG ++ pthread_mutexattr_t mattr; ++ int glibc_minor = -1; ++ int glibc_major = parse_version(&glibc_minor, gnu_get_libc_version()); ++ ++ if (glibc_major > 2 || (glibc_major == 2 && glibc_minor >= 19)) { ++ /* TODO: disable this workaround for glibc with fixed TSX */ ++ /* This disables lock elision to workaround a bug in glibc 2.19+ */ ++ if (0 != pthread_mutexattr_init(&mattr)) { ++ ABORT("pthread_mutexattr_init failed"); ++ } ++ if (0 != pthread_mutexattr_settype(&mattr, PTHREAD_MUTEX_NORMAL)) { ++ ABORT("pthread_mutexattr_settype failed"); ++ } ++ if (0 != pthread_mutex_init(&mark_mutex, &mattr)) { ++ ABORT("pthread_mutex_init failed"); ++ } ++ pthread_mutexattr_destroy(&mattr); ++ } ++# endif ++} ++ + GC_INNER void GC_acquire_mark_lock(void) + { + GC_ASSERT(GC_mark_lock_holder != NUMERIC_THREAD_ID(pthread_self())); diff --git a/gdbm/PKGBUILD b/gdbm/PKGBUILD index c0f4365ff..0168a17c1 100644 --- a/gdbm/PKGBUILD +++ b/gdbm/PKGBUILD @@ -1,22 +1,21 @@ -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa pkgname=gdbm -pkgver=1.10 +pkgver=1.11 pkgrel=1 pkgdesc="GNU database library" url="http://www.gnu.org/software/gdbm/gdbm.html" -license=('GPL') -arch=('i686' 'x86_64') +license=('GPL3') +arch=('x86_64') depends=('glibc' 'sh') -source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz - gdbm-1.10-zeroheaders.patch) -options=('!libtool' '!makeflags') +options=('!makeflags') install=gdbm.install -md5sums=('88770493c2559dc80b561293e39d3570' +source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz{,.sig} + gdbm-1.10-zeroheaders.patch) +validpgpkeys=('325F650C4C2B6AD58807327A3602B07F55D0C732') +md5sums=('72c832680cf0999caedbe5b265c8c1bd' + 'SKIP' '2a5979910c338dabda6935263b3d8af9') + build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,11 +28,9 @@ build() { patch -Np1 -i ../gdbm-1.10-zeroheaders.patch ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ --enable-libgdbm-compat - make prefix=/usr + make } check() { @@ -43,11 +40,7 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}"/usr \ - manprefix="${pkgdir}"/usr/share/man \ - man3dir="${pkgdir}"/usr/share/man/man3 \ - infodir="${pkgdir}"/usr/share/info \ - install + make DESTDIR="${pkgdir}" install # create symlinks for compatibility install -dm755 "${pkgdir}"/usr/include/gdbm diff --git a/git/0001-create-gpg-homedir-on-the-fly.patch b/git/0001-create-gpg-homedir-on-the-fly.patch deleted file mode 100644 index e20c280a0..000000000 --- a/git/0001-create-gpg-homedir-on-the-fly.patch +++ /dev/null @@ -1,58 +0,0 @@ -From d2c93870da4997abeb2813873878c1a556defde4 Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Fri, 12 Dec 2014 07:34:34 +0100 -Subject: [PATCH 1/3] create gpg homedir on the fly - -GnuPG 2.1 homedir looks different, so just create it on the fly by -importing needed private and public keys and ownertrust. -This solves an issue with gnupg 2.1 running interactive pinentry when -old secret key is present. - -Signed-off-by: Christian Hesse ---- - t/lib-gpg.sh | 10 +++++++--- - t/lib-gpg/ownertrust | 4 ++++ - t/lib-gpg/random_seed | Bin 600 -> 0 bytes - t/lib-gpg/trustdb.gpg | Bin 1360 -> 0 bytes - 4 files changed, 11 insertions(+), 3 deletions(-) - create mode 100644 t/lib-gpg/ownertrust - delete mode 100644 t/lib-gpg/random_seed - delete mode 100644 t/lib-gpg/trustdb.gpg - -diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh -index cd2baef..4e57942 100755 ---- a/t/lib-gpg.sh -+++ b/t/lib-gpg.sh -@@ -16,11 +16,15 @@ else - # Type DSA and Elgamal, size 2048 bits, no expiration date. - # Name and email: C O Mitter - # No password given, to enable non-interactive operation. -- cp -R "$TEST_DIRECTORY"/lib-gpg ./gpghome -- chmod 0700 gpghome -- chmod 0600 gpghome/* -+ mkdir ./gpghome -+ chmod 0700 ./gpghome - GNUPGHOME="$(pwd)/gpghome" - export GNUPGHOME -+ gpg --homedir "${GNUPGHOME}" --import \ -+ "$TEST_DIRECTORY"/lib-gpg/pubring.gpg \ -+ "$TEST_DIRECTORY"/lib-gpg/secring.gpg -+ gpg --homedir "${GNUPGHOME}" --import-ownertrust \ -+ "$TEST_DIRECTORY"/lib-gpg/ownertrust - test_set_prereq GPG - ;; - esac -diff --git a/t/lib-gpg/ownertrust b/t/lib-gpg/ownertrust -new file mode 100644 -index 0000000..b3e3c4f ---- /dev/null -+++ b/t/lib-gpg/ownertrust -@@ -0,0 +1,4 @@ -+# List of assigned trustvalues, created Thu 11 Dec 2014 01:26:28 PM CET -+# (Use "gpg --import-ownertrust" to restore them) -+73D758744BE721698EC54E8713B6F51ECDDE430D:6: -+D4BE22311AD3131E5EDA29A461092E85B7227189:3: - --- -2.2.0 - diff --git a/git/0002-skip-RFC1991-tests-for-gnupg-2.1.patch b/git/0002-skip-RFC1991-tests-for-gnupg-2.1.patch deleted file mode 100644 index a58c124ec..000000000 --- a/git/0002-skip-RFC1991-tests-for-gnupg-2.1.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 2bbdf8703ea22b91f6d0b12b8c4ff3b90293b717 Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Fri, 12 Dec 2014 07:40:28 +0100 -Subject: [PATCH 2/3] skip RFC1991 tests for gnupg 2.1 - -GnuPG >= 2.1.0 does not longer support RFC1991, so skip these -tests. - -Signed-off-by: Christian Hesse ---- - t/lib-gpg.sh | 3 +++ - t/t7004-tag.sh | 14 +++++++------- - 2 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh -index 4e57942..b0138ad 100755 ---- a/t/lib-gpg.sh -+++ b/t/lib-gpg.sh -@@ -26,6 +26,9 @@ else - gpg --homedir "${GNUPGHOME}" --import-ownertrust \ - "$TEST_DIRECTORY"/lib-gpg/ownertrust - test_set_prereq GPG -+ if echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null 2>/dev/null; then -+ test_set_prereq RFC1991 -+ fi - ;; - esac - fi -diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh -index 796e9f7..35c805a 100755 ---- a/t/t7004-tag.sh -+++ b/t/t7004-tag.sh -@@ -1081,7 +1081,7 @@ test_expect_success GPG \ - get_tag_header rfc1991-signed-tag $commit commit $time >expect - echo "RFC1991 signed tag" >>expect - echo '-----BEGIN PGP MESSAGE-----' >>expect --test_expect_success GPG \ -+test_expect_success GPG,RFC1991 \ - 'creating a signed tag with rfc1991' ' - echo "rfc1991" >gpghome/gpg.conf && - git tag -s -m "RFC1991 signed tag" rfc1991-signed-tag $commit && -@@ -1095,7 +1095,7 @@ cp "$1" actual - EOF - chmod +x fakeeditor - --test_expect_success GPG \ -+test_expect_success GPG,RFC1991 \ - 'reediting a signed tag body omits signature' ' - echo "rfc1991" >gpghome/gpg.conf && - echo "RFC1991 signed tag" >expect && -@@ -1103,13 +1103,13 @@ test_expect_success GPG \ - test_cmp expect actual - ' - --test_expect_success GPG \ -+test_expect_success GPG,RFC1991 \ - 'verifying rfc1991 signature' ' - echo "rfc1991" >gpghome/gpg.conf && - git tag -v rfc1991-signed-tag - ' - --test_expect_success GPG \ -+test_expect_success GPG,RFC1991 \ - 'list tag with rfc1991 signature' ' - echo "rfc1991" >gpghome/gpg.conf && - echo "rfc1991-signed-tag RFC1991 signed tag" >expect && -@@ -1123,12 +1123,12 @@ test_expect_success GPG \ - - rm -f gpghome/gpg.conf - --test_expect_success GPG \ -+test_expect_success GPG,RFC1991 \ - 'verifying rfc1991 signature without --rfc1991' ' - git tag -v rfc1991-signed-tag - ' - --test_expect_success GPG \ -+test_expect_success GPG,RFC1991 \ - 'list tag with rfc1991 signature without --rfc1991' ' - echo "rfc1991-signed-tag RFC1991 signed tag" >expect && - git tag -l -n1 rfc1991-signed-tag >actual && -@@ -1139,7 +1139,7 @@ test_expect_success GPG \ - test_cmp expect actual - ' - --test_expect_success GPG \ -+test_expect_success GPG,RFC1991 \ - 'reediting a signed tag body omits signature' ' - echo "RFC1991 signed tag" >expect && - GIT_EDITOR=./fakeeditor git tag -f -s rfc1991-signed-tag $commit && --- -2.2.0 - diff --git a/git/PKGBUILD b/git/PKGBUILD index 4b77753c0..ce233bae1 100644 --- a/git/PKGBUILD +++ b/git/PKGBUILD @@ -2,7 +2,7 @@ # contributor pkgname=git -pkgver=2.3.5 +pkgver=2.4.1 pkgrel=1 pkgdesc="Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency." arch=('x86_64') @@ -20,13 +20,9 @@ replaces=('git-core') provides=('git-core') install="git.install" source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz" - 0001-create-gpg-homedir-on-the-fly.patch - 0002-skip-RFC1991-tests-for-gnupg-2.1.patch git-daemon@.service git-daemon.socket) -md5sums=('be8c0bbb0c5ee6ab7cdcffd2c9375fe6' - '5383e27f24bfd356f24b709ea27f8201' - '9bb82b29aee1772a893cc2a0a1584b89' +md5sums=('aed4a96723f600dfc879a2eb58e6e673' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/glibc/PKGBUILD b/glibc/PKGBUILD index 48f94b63d..b6cc11f8c 100644 --- a/glibc/PKGBUILD +++ b/glibc/PKGBUILD @@ -3,7 +3,7 @@ pkgname=glibc pkgver=2.20 -pkgrel=4 +pkgrel=8 pkgdesc="GNU C Library" arch=('x86_64') url="http://www.gnu.org/software/libc" @@ -20,6 +20,8 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} glibc-2.20-getifaddrs_internal-segfault.patch glibc-2.20-linux-3.16-additions.patch glibc-2.20-do_ftell_wide-memleak.patch + glibc-2.20-disable-tsx.patch + dtv_surplus.patch locale.gen.txt locale-gen) md5sums=('948a6e06419a01bd51e97206861595b0' @@ -27,6 +29,8 @@ md5sums=('948a6e06419a01bd51e97206861595b0' '1c5d5c2017445c75dbc5c6d0c1e45ddb' '8f1059f431b842e54b12bde689620df8' 'b50feeab78fa6ce0a8cfb41ee8dc1fd8' + 'd7fd951fd0b7d891eefb6b14e5dd2d28' + '6469cba12e2252e16e32db0353ed3f21' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -43,6 +47,12 @@ prepare() { # plug memory leak - commit 984c0ea9 patch -p1 -i $srcdir/glibc-2.20-do_ftell_wide-memleak.patch + # disable tsx to avoid crashes on fw update (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762195#20, https://bbs.archlinux.org/viewtopic.php?id=188879) + patch -p1 -i $srcdir/glibc-2.20-disable-tsx.patch + + # http://chakraos.org/bugtracker/index.php?do=details&task_id=1060&project=8 + patch -p1 -i $srcdir/dtv_surplus.patch + mkdir ${srcdir}/glibc-build } @@ -67,8 +77,8 @@ build() { --enable-kernel=2.6.32 \ --enable-bind-now --disable-profile \ --enable-stackguard-randomization \ - --enable-lock-elision \ --enable-multi-arch +# --enable-lock-elision \ # build libraries with hardening disabled echo "build-programs=no" >> configparms diff --git a/glibc/dtv_surplus.patch b/glibc/dtv_surplus.patch new file mode 100644 index 000000000..0b0c3ab68 --- /dev/null +++ b/glibc/dtv_surplus.patch @@ -0,0 +1,32 @@ +# +# This is an experimental patch that should go into rawhide and +# Fedora 21 to fix failures where python applications fail to +# load graphics applications because of the slot usages for TLS. +# This should eventually go upstream. +# +# - Carlos O'Donell +# +diff -urN glibc-2.19-886-gdd763fd/sysdeps/generic/ldsodefs.h glibc-2.19-886-gdd763fd.mod/sysdeps/generic/ldsodefs.h +--- glibc-2.19-886-gdd763fd/sysdeps/generic/ldsodefs.h 2014-08-21 01:00:55.000000000 -0400 ++++ glibc-2.19-886-gdd763fd.mod/sysdeps/generic/ldsodefs.h 2014-09-04 19:29:42.929692810 -0400 +@@ -388,8 +388,18 @@ + have to iterate beyond the first element in the slotinfo list. */ + #define TLS_SLOTINFO_SURPLUS (62) + +-/* Number of additional slots in the dtv allocated. */ +-#define DTV_SURPLUS (14) ++/* Number of additional allocated dtv slots. This was initially ++ 14, but problems with python, MESA, and X11's uses of static TLS meant ++ that most distributions were very close to this limit when they loaded ++ dynamically interpreted languages that used graphics. The simplest ++ solution was to roughly double the number of slots. The actual static ++ image space usage was relatively small, for example in MESA you ++ had only two dispatch pointers for a total of 16 bytes. If we hit up ++ against this limit again we should start a campaign with the ++ distributions to coordinate the usage of static TLS. Any user of this ++ resource is effectively coordinating a global resource since this ++ surplus is allocated for each thread at startup. */ ++#define DTV_SURPLUS (32) + + /* Initial dtv of the main thread, not allocated with normal malloc. */ + EXTERN void *_dl_initial_dtv; diff --git a/glibc/glibc-2.20-disable-tsx.patch b/glibc/glibc-2.20-disable-tsx.patch new file mode 100644 index 000000000..6206231ef --- /dev/null +++ b/glibc/glibc-2.20-disable-tsx.patch @@ -0,0 +1,88 @@ +Intel TSX is broken on Haswell based processors (erratum HSD136/HSW136) +and a microcode update is available to simply disable the corresponding +instructions. + +While the responsability to continue or not using TSX should be left to +the users, a live microcode update will disable the TSX instructions +causing already started binaries to segfault. This patch simply disable +Intel TSX (HLE and RTM) on processors which might receive a microcode +update, so that it doesn't happen. We might expect newer steppings to +fix the issue, and if it is not the case the corresponding processors +will be shipped with TSX already disabled. + +Author: Henrique de Moraes Holschuh + +diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c +index db74d97..6f61ae6 100644 +--- a/sysdeps/x86_64/multiarch/init-arch.c ++++ b/sysdeps/x86_64/multiarch/init-arch.c +@@ -26,7 +26,7 @@ struct cpu_features __cpu_features attribute_hidden; + + + static void +-get_common_indeces (unsigned int *family, unsigned int *model) ++get_common_indeces (unsigned int *family, unsigned int *model, unsigned int *stepping) + { + __cpuid (1, __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax, + __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ebx, +@@ -36,6 +36,7 @@ get_common_indeces (unsigned int *family, unsigned int *model) + unsigned int eax = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax; + *family = (eax >> 8) & 0x0f; + *model = (eax >> 4) & 0x0f; ++ *stepping = eax & 0x0f; + } + + +@@ -47,6 +48,7 @@ __init_cpu_features (void) + unsigned int edx; + unsigned int family = 0; + unsigned int model = 0; ++ unsigned int stepping = 0; + enum cpu_features_kind kind; + + __cpuid (0, __cpu_features.max_cpuid, ebx, ecx, edx); +@@ -56,7 +58,7 @@ __init_cpu_features (void) + { + kind = arch_kind_intel; + +- get_common_indeces (&family, &model); ++ get_common_indeces (&family, &model, &stepping); + + unsigned int eax = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax; + unsigned int extended_family = (eax >> 20) & 0xff; +@@ -131,7 +133,7 @@ __init_cpu_features (void) + { + kind = arch_kind_amd; + +- get_common_indeces (&family, &model); ++ get_common_indeces (&family, &model, &stepping); + + ecx = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx; + +@@ -179,6 +181,14 @@ __init_cpu_features (void) + } + } + ++ /* Disable Intel TSX (HLE and RTM) due to erratum HSD136/HSW136 ++ on Haswell processors, to work around outdated microcode that ++ doesn't disable the broken feature by default */ ++ if (kind == arch_kind_intel && family == 6 && ++ ((model == 63 && stepping <= 2) || (model == 60 && stepping <= 3) || ++ (model == 69 && stepping <= 1) || (model == 70 && stepping <= 1))) ++ __cpu_features.cpuid[COMMON_CPUID_INDEX_7].ebx &= ~(bit_RTM | bit_HLE); ++ + __cpu_features.family = family; + __cpu_features.model = model; + atomic_write_barrier (); +diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h +index 793707a..e2745cb 100644 +--- a/sysdeps/x86_64/multiarch/init-arch.h ++++ b/sysdeps/x86_64/multiarch/init-arch.h +@@ -41,6 +41,7 @@ #define bit_FMA4 (1 << 16) + + /* COMMON_CPUID_INDEX_7. */ + #define bit_RTM (1 << 11) ++#define bit_HLE (1 << 4) + #define bit_AVX2 (1 << 5) + + /* XCR0 Feature flags. */ diff --git a/heirloom-mailx/PKGBUILD b/heirloom-mailx/PKGBUILD deleted file mode 100644 index 7a5245f9e..000000000 --- a/heirloom-mailx/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -pkgname=heirloom-mailx -pkgver=12.5 -pkgrel=1 -pkgdesc="A commandline utility for sending and receiving email" -arch=('x86_64') -url="http://heirloom.sourceforge.net/mailx.html" -license=('custom') -groups=('base') -depends=('openssl' 'krb5') -optdepends=('smtp-forwarder: for sending mail') -replaces=('mailx') -provides=('mailx') -conflicts=('mailx') -backup=(etc/mail.rc) -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('1998dd6168a68400e533712ae7163c72b6a7c056') -options=('!makeflags') # Does not build with MAKEFLAGS=-jX, X>1 - -# source PKGBUILD && mksource -mksource() { - export CVSROOT=:pserver:anonymous@nail.cvs.sourceforge.net:/cvsroot/nail - D=nail - [ -d "${D}" ] && cvs up "${D}" || cvs co "${D}" - - _dirname=${pkgname}-${pkgver} - mv $D ${_dirname} - tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${_dirname} - rm -rf ${_dirname} -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's|/etc/nail.rc|/etc/mail.rc|g' mailx.1 - - # For Linux and BSD, this should be set. - echo "set bsdcompat" >> nail.rc - - sed -i "s/pg/less/" cmd1.c - - echo PREFIX=/usr \ - MAILRC=/etc/mail.rc \ - SENDMAIL=/usr/sbin/sendmail \ - MAILSPOOL=/var/spool/mail \ - UCBINSTALL=/usr/bin/install > makeflags - - make `cat makeflags` IPv6=-DHAVE_IPv6_FUNCS -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" `cat makeflags` install - - # For compatibility with the old mailx program - ln -sf mailx "${pkgdir}"/usr/bin/mail - ln -sf mailx.1.gz "${pkgdir}"/usr/share/man/man1/mail.1.gz - - install -D -m0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/help2man/PKGBUILD b/help2man/PKGBUILD index 290ffd09d..6f4333b2c 100644 --- a/help2man/PKGBUILD +++ b/help2man/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: abveritas[at]chakra-project[dot]org> pkgname=help2man -pkgver=1.44.1 +pkgver=1.46.4 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('perl-locale-gettext') install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") -md5sums=('a5dc6530340b41f0e492d400670dd7ae') +md5sums=('a1b7fe49eddae8a2537ed74ee9ef11cb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/iasl/PKGBUILD b/iasl/PKGBUILD index 34b2186d5..03fc86a19 100644 --- a/iasl/PKGBUILD +++ b/iasl/PKGBUILD @@ -1,11 +1,6 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa pkgname=iasl -pkgver=20140724 +pkgver=20150408 pkgrel=1 pkgdesc="Intel ACPI Source Language compiler" arch=('x86_64') @@ -16,7 +11,7 @@ makedepends=('flex' 'bison') options=('!makeflags') source=(http://acpica.org/sites/acpica/files/acpica-unix-${pkgver}.tar.gz LICENSE) -md5sums=('ae8e83b353510a73f24dc43840f6a662' +md5sums=('c86b316b3b3ff51528e7c835dc8d5f94' '8615526144f69ea4e870d9bc37df9b29') build() { diff --git a/isl3887usb-firmware/PKGBUILD b/isl3887usb-firmware/PKGBUILD index ca0b5a730..20a318124 100644 --- a/isl3887usb-firmware/PKGBUILD +++ b/isl3887usb-firmware/PKGBUILD @@ -1,19 +1,15 @@ -# -# Core Packages for Chakra, part of chakra-project.org -# -# maintainer (x86_64): Manuel Tortosa pkgname=isl3887usb-firmware -pkgver=2 -pkgrel=3 +pkgver=2.13.25.0 +pkgrel=1 pkgdesc="Firmware for wireless cards using isl3887usb" arch=('any') url="http://wireless.kernel.org/en/users/Drivers/p54/devices" license=('GPL') -source=('http://daemonizer.de/prism54/prism54-fw/fw-usb/2.13.25.0.lm87.arm') +source=("https://daemonizer.de/prism54/prism54-fw/fw-usb/$pkgver.lm87.arm") md5sums=('39be687c87544b892e7a8ffe7ffd9371') -build() { +package() { mkdir -p ${pkgdir}/usr/lib/firmware install -m644 * ${pkgdir}/usr/lib/firmware/isl3887usb } diff --git a/isl3890-firmware/PKGBUILD b/isl3890-firmware/PKGBUILD deleted file mode 100644 index 9605829c8..000000000 --- a/isl3890-firmware/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# -# Core Packages for Chakra, part of chakra-project.org -# -# maintainer (x86_64): Manuel Tortosa - -pkgname=isl3890-firmware -pkgver=2 -pkgrel=4 -pkgdesc="Firmware for wireless card 3Com 3CRWE154G72" -arch=('any') -url="http://wireless.kernel.org/en/users/Drivers/p54/devices" -license=('GPL') -source=('http://daemonizer.de/prism54/prism54-fw/fw-softmac/2.13.12.0.arm') -md5sums=('ff7536af2092b1c4b21315bd103ef4c4') - -build() { - mkdir -p ${pkgdir}/usr/lib/firmware/isl3890/ - install -m644 * ${pkgdir}/usr/lib/firmware/isl3890/isl3890 -} diff --git a/kbd/PKGBUILD b/kbd/PKGBUILD index 1fde47926..fcbede268 100644 --- a/kbd/PKGBUILD +++ b/kbd/PKGBUILD @@ -1,10 +1,6 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (x86_64): Manuel Tortosa pkgname=kbd -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc="Keytable files and keyboard utilities" arch=('x86_64') @@ -18,7 +14,7 @@ source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz provides=('vlock') conflicts=('vlock') replaces=('vlock') -md5sums=('cc0ee9f2537d8636cae85a8c6541ed2e' +md5sums=('f1f75f0dd5f7dde89ce47585274366f8' '998957c4f815347dcc874c4d7555dc66' 'd869200acbc0aab6a9cafa43cb140d4e') diff --git a/libarchive/0001-Limit-write-requests-to-at-most-INT_MAX.patch b/libarchive/0001-Limit-write-requests-to-at-most-INT_MAX.patch new file mode 100644 index 000000000..c805ce199 --- /dev/null +++ b/libarchive/0001-Limit-write-requests-to-at-most-INT_MAX.patch @@ -0,0 +1,32 @@ +From 22531545514043e04633e1c015c7540b9de9dbe4 Mon Sep 17 00:00:00 2001 +From: Tim Kientzle +Date: Fri, 22 Mar 2013 23:48:41 -0700 +Subject: [PATCH] Limit write requests to at most INT_MAX. This prevents a + certain common programming error (passing -1 to write) from leading to other + problems deeper in the library. + +--- + libarchive/archive_write.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c +index eede5e0..be85621 100644 +--- a/libarchive/archive_write.c ++++ b/libarchive/archive_write.c +@@ -673,8 +673,13 @@ static ssize_t + _archive_write_data(struct archive *_a, const void *buff, size_t s) + { + struct archive_write *a = (struct archive_write *)_a; ++ const size_t max_write = INT_MAX; ++ + archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC, + ARCHIVE_STATE_DATA, "archive_write_data"); ++ /* In particular, this catches attempts to pass negative values. */ ++ if (s > max_write) ++ s = max_write; + archive_clear_error(&a->archive); + return ((a->format_write_data)(a, buff, s)); + } +-- +1.9.0 + diff --git a/libarchive/PKGBUILD b/libarchive/PKGBUILD index 2b38e7ced..319c08296 100644 --- a/libarchive/PKGBUILD +++ b/libarchive/PKGBUILD @@ -4,24 +4,45 @@ pkgname=libarchive pkgver=3.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="library that can create and read several streaming archive formats" arch=('x86_64') url="http://libarchive.org/" license=('BSD') depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2>=2.06' 'openssl' 'xz' 'zlib') +options=('libtool') +provides=('libarchive.so') source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz" - '0001-mtree-fix-line-filename-length-calculation.patch') + '0001-mtree-fix-line-filename-length-calculation.patch' + '0001-Limit-write-requests-to-at-most-INT_MAX.patch' + 'libarchive-3.1.2-acl.patch' + 'libarchive-3.1.2-sparce-mtree.patch') md5sums=('efad5a503f66329bb9d2f4308b5de98a' - 'fda89c145bbcd793a96b06b463ef6a72') + 'fda89c145bbcd793a96b06b463ef6a72' + '9bf80940bd3ce861137a0a8dcacf5705' + 'a5c995661c62429ceff2c23ea322393b' + 'cb344a879b3c4550fe3faf86c3826f23') -build() { +prepare() { cd "$pkgname-$pkgver" # https://code.google.com/p/libarchive/issues/detail?id=301 # upstream commit e65bf287f0133426b26611fe3e80b51267987106 patch -Np1 -i "$srcdir/0001-mtree-fix-line-filename-length-calculation.patch" + # https://code.google.com/p/libarchive/issues/detail?id=329 + patch -Np1 -i "$srcdir/libarchive-3.1.2-acl.patch" + + # CVE-2013-0211 + patch -Np1 -i "$srcdir/0001-Limit-write-requests-to-at-most-INT_MAX.patch" + + # upstream commit 977bf2a4 - improved mtree support + patch -p1 -i $srcdir/libarchive-3.1.2-sparce-mtree.patch +} + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --without-xml2 make } diff --git a/libarchive/libarchive-3.1.2-acl.patch b/libarchive/libarchive-3.1.2-acl.patch new file mode 100644 index 000000000..ce563b0c1 --- /dev/null +++ b/libarchive/libarchive-3.1.2-acl.patch @@ -0,0 +1,219 @@ +diff -ruN libarchive-3.1.2/libarchive/archive_read_disk_entry_from_file.c libarchive-3.1.2.fixed/libarchive/archive_read_disk_entry_from_file.c +--- libarchive-3.1.2/libarchive/archive_read_disk_entry_from_file.c 2013-02-08 01:52:07.000000000 +0100 ++++ libarchive-3.1.2.fixed/libarchive/archive_read_disk_entry_from_file.c 2013-08-08 10:47:41.000000000 +0200 +@@ -399,7 +399,7 @@ + #endif + + +-#if defined(HAVE_POSIX_ACL) && defined(ACL_TYPE_NFS4) ++#ifdef HAVE_POSIX_ACL + static int translate_acl(struct archive_read_disk *a, + struct archive_entry *entry, acl_t acl, int archive_entry_acl_type); + +@@ -419,6 +419,7 @@ + + archive_entry_acl_clear(entry); + ++#ifdef ACL_TYPE_NFS4 + /* Try NFS4 ACL first. */ + if (*fd >= 0) + acl = acl_get_fd(*fd); +@@ -447,6 +448,7 @@ + acl_free(acl); + return (ARCHIVE_OK); + } ++#endif + + /* Retrieve access ACL from file. */ + if (*fd >= 0) +@@ -492,6 +494,7 @@ + {ARCHIVE_ENTRY_ACL_EXECUTE, ACL_EXECUTE}, + {ARCHIVE_ENTRY_ACL_WRITE, ACL_WRITE}, + {ARCHIVE_ENTRY_ACL_READ, ACL_READ}, ++#ifdef ACL_TYPE_NFS4 + {ARCHIVE_ENTRY_ACL_READ_DATA, ACL_READ_DATA}, + {ARCHIVE_ENTRY_ACL_LIST_DIRECTORY, ACL_LIST_DIRECTORY}, + {ARCHIVE_ENTRY_ACL_WRITE_DATA, ACL_WRITE_DATA}, +@@ -508,8 +511,10 @@ + {ARCHIVE_ENTRY_ACL_WRITE_ACL, ACL_WRITE_ACL}, + {ARCHIVE_ENTRY_ACL_WRITE_OWNER, ACL_WRITE_OWNER}, + {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE} ++#endif + }; + ++#ifdef ACL_TYPE_NFS4 + static struct { + int archive_inherit; + int platform_inherit; +@@ -519,21 +524,25 @@ + {ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT}, + {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY} + }; +- ++#endif + static int + translate_acl(struct archive_read_disk *a, + struct archive_entry *entry, acl_t acl, int default_entry_acl_type) + { + acl_tag_t acl_tag; ++#ifdef ACL_TYPE_NFS4 + acl_entry_type_t acl_type; + acl_flagset_t acl_flagset; ++ int brand, r; ++#endif + acl_entry_t acl_entry; + acl_permset_t acl_permset; +- int brand, i, r, entry_acl_type; ++ int i, entry_acl_type; + int s, ae_id, ae_tag, ae_perm; + const char *ae_name; + + ++#ifdef ACL_TYPE_NFS4 + // FreeBSD "brands" ACLs as POSIX.1e or NFSv4 + // Make sure the "brand" on this ACL is consistent + // with the default_entry_acl_type bits provided. +@@ -560,6 +569,7 @@ + return ARCHIVE_FAILED; + break; + } ++#endif + + + s = acl_get_entry(acl, ACL_FIRST_ENTRY, &acl_entry); +@@ -592,9 +602,11 @@ + case ACL_OTHER: + ae_tag = ARCHIVE_ENTRY_ACL_OTHER; + break; ++#ifdef ACL_TYPE_NFS4 + case ACL_EVERYONE: + ae_tag = ARCHIVE_ENTRY_ACL_EVERYONE; + break; ++#endif + default: + /* Skip types that libarchive can't support. */ + s = acl_get_entry(acl, ACL_NEXT_ENTRY, &acl_entry); +@@ -605,6 +617,7 @@ + // XXX acl_get_entry_type_np on FreeBSD returns EINVAL for + // non-NFSv4 ACLs + entry_acl_type = default_entry_acl_type; ++#ifdef ACL_TYPE_NFS4 + r = acl_get_entry_type_np(acl_entry, &acl_type); + if (r == 0) { + switch (acl_type) { +@@ -634,9 +647,10 @@ + ae_perm |= acl_inherit_map[i].archive_inherit; + + } ++#endif + + acl_get_permset(acl_entry, &acl_permset); +- for (i = 0; i < (int)(sizeof(acl_perm_map) / sizeof(acl_perm_map[0])); ++i) { ++ for (i = 0; i < (int)(sizeof(acl_perm_map) / sizeof(acl_perm_map[0])); ++i) { + /* + * acl_get_perm() is spelled differently on different + * platforms; see above. +diff -ruN libarchive-3.1.2/libarchive/archive_write_disk_acl.c libarchive-3.1.2.fixed/libarchive/archive_write_disk_acl.c +--- libarchive-3.1.2/libarchive/archive_write_disk_acl.c 2013-01-14 02:43:45.000000000 +0100 ++++ libarchive-3.1.2.fixed/libarchive/archive_write_disk_acl.c 2013-08-08 10:31:35.000000000 +0200 +@@ -43,7 +43,7 @@ + #include "archive_acl_private.h" + #include "archive_write_disk_private.h" + +-#if !defined(HAVE_POSIX_ACL) || !defined(ACL_TYPE_NFS4) ++#ifndef HAVE_POSIX_ACL + /* Default empty function body to satisfy mainline code. */ + int + archive_write_disk_set_acls(struct archive *a, int fd, const char *name, +@@ -79,10 +79,12 @@ + ret = set_acl(a, fd, name, abstract_acl, ACL_TYPE_DEFAULT, + ARCHIVE_ENTRY_ACL_TYPE_DEFAULT, "default"); + return (ret); ++#ifdef ACL_TYPE_NFS4 + } else if (archive_acl_count(abstract_acl, ARCHIVE_ENTRY_ACL_TYPE_NFS4) > 0) { + ret = set_acl(a, fd, name, abstract_acl, ACL_TYPE_NFS4, + ARCHIVE_ENTRY_ACL_TYPE_NFS4, "nfs4"); + return (ret); ++#endif + } else + return ARCHIVE_OK; + } +@@ -94,6 +96,7 @@ + {ARCHIVE_ENTRY_ACL_EXECUTE, ACL_EXECUTE}, + {ARCHIVE_ENTRY_ACL_WRITE, ACL_WRITE}, + {ARCHIVE_ENTRY_ACL_READ, ACL_READ}, ++#ifdef ACL_TYPE_NFS4 + {ARCHIVE_ENTRY_ACL_READ_DATA, ACL_READ_DATA}, + {ARCHIVE_ENTRY_ACL_LIST_DIRECTORY, ACL_LIST_DIRECTORY}, + {ARCHIVE_ENTRY_ACL_WRITE_DATA, ACL_WRITE_DATA}, +@@ -110,8 +113,10 @@ + {ARCHIVE_ENTRY_ACL_WRITE_ACL, ACL_WRITE_ACL}, + {ARCHIVE_ENTRY_ACL_WRITE_OWNER, ACL_WRITE_OWNER}, + {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE} ++#endif + }; + ++#ifdef ACL_TYPE_NFS4 + static struct { + int archive_inherit; + int platform_inherit; +@@ -121,6 +126,7 @@ + {ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT}, + {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY} + }; ++#endif + + static int + set_acl(struct archive *a, int fd, const char *name, +@@ -130,7 +136,9 @@ + acl_t acl; + acl_entry_t acl_entry; + acl_permset_t acl_permset; ++#ifdef ACL_TYPE_NFS4 + acl_flagset_t acl_flagset; ++#endif + int ret; + int ae_type, ae_permset, ae_tag, ae_id; + uid_t ae_uid; +@@ -171,14 +179,17 @@ + case ARCHIVE_ENTRY_ACL_OTHER: + acl_set_tag_type(acl_entry, ACL_OTHER); + break; ++#ifdef ACL_TYPE_NFS4 + case ARCHIVE_ENTRY_ACL_EVERYONE: + acl_set_tag_type(acl_entry, ACL_EVERYONE); + break; ++#endif + default: + /* XXX */ + break; + } + ++#ifdef ACL_TYPE_NFS4 + switch (ae_type) { + case ARCHIVE_ENTRY_ACL_TYPE_ALLOW: + acl_set_entry_type_np(acl_entry, ACL_ENTRY_TYPE_ALLOW); +@@ -200,6 +211,7 @@ + // XXX error handling here. + break; + } ++#endif + + acl_get_permset(acl_entry, &acl_permset); + acl_clear_perms(acl_permset); +@@ -210,6 +222,7 @@ + acl_perm_map[i].platform_perm); + } + ++#ifdef ACL_TYPE_NFS4 + acl_get_flagset_np(acl_entry, &acl_flagset); + acl_clear_flags_np(acl_flagset); + for (i = 0; i < (int)(sizeof(acl_inherit_map) / sizeof(acl_inherit_map[0])); ++i) { +@@ -217,6 +230,7 @@ + acl_add_flag_np(acl_flagset, + acl_inherit_map[i].platform_inherit); + } ++#endif + } + + /* Try restoring the ACL through 'fd' if we can. */ diff --git a/libarchive/libarchive-3.1.2-sparce-mtree.patch b/libarchive/libarchive-3.1.2-sparce-mtree.patch new file mode 100644 index 000000000..7b4027749 --- /dev/null +++ b/libarchive/libarchive-3.1.2-sparce-mtree.patch @@ -0,0 +1,478 @@ +From 977bf2a49484239f7a7b6ce08bfa9da413a27ead Mon Sep 17 00:00:00 2001 +From: Florian Pritz +Date: Sat, 1 Mar 2014 17:21:47 +0100 +Subject: [PATCH] mtree: Make reading additional information from the fs + optional + +This feature is not needed if users just want to read in the content of +an mtree file and do validation against the file system themselves. + +It is needed for `bsdtar cvf out.tar @input.mtree` which is why the +option is enabled in bsdtar. + +Since the mtree tests rely on this feature, this patch also enables it +there. + +Signed-off-by: Florian Pritz +--- + libarchive/archive_read_support_format_mtree.c | 290 ++++++++++++++----------- + libarchive/test/test_read_format_mtree.c | 20 ++ + tar/write.c | 1 + + 3 files changed, 179 insertions(+), 132 deletions(-) + +diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c +index 44799df..d82d4c1 100644 +--- a/libarchive/archive_read_support_format_mtree.c ++++ b/libarchive/archive_read_support_format_mtree.c +@@ -104,6 +104,7 @@ struct mtree { + struct archive_entry_linkresolver *resolver; + + int64_t cur_size; ++ char checkfs; + }; + + static int bid_keycmp(const char *, const char *, ssize_t); +@@ -174,6 +175,29 @@ static int read_header(struct archive_read *, + #endif + } + ++static int ++archive_read_format_mtree_options(struct archive_read *a, ++ const char *key, const char *val) ++{ ++ struct mtree *mtree; ++ ++ mtree = (struct mtree *)(a->format->data); ++ if (strcmp(key, "checkfs") == 0) { ++ /* Allows to read information missing from the mtree from the file system */ ++ if (val == NULL || val[0] == 0) { ++ mtree->checkfs = 0; ++ } else { ++ mtree->checkfs = 1; ++ } ++ return (ARCHIVE_OK); ++ } ++ ++ /* Note: The "warn" return is just to inform the options ++ * supervisor that we didn't handle it. It will generate ++ * a suitable error if no one used this option. */ ++ return (ARCHIVE_WARN); ++} ++ + static void + free_options(struct mtree_option *head) + { +@@ -206,7 +230,7 @@ static int read_header(struct archive_read *, + mtree->fd = -1; + + r = __archive_read_register_format(a, mtree, "mtree", +- mtree_bid, NULL, read_header, read_data, skip, NULL, cleanup); ++ mtree_bid, archive_read_format_mtree_options, read_header, read_data, skip, NULL, cleanup); + + if (r != ARCHIVE_OK) + free(mtree); +@@ -1104,162 +1128,164 @@ static int read_header(struct archive_read *, + mtree->current_dir.length = n; + } + +- /* +- * Try to open and stat the file to get the real size +- * and other file info. It would be nice to avoid +- * this here so that getting a listing of an mtree +- * wouldn't require opening every referenced contents +- * file. But then we wouldn't know the actual +- * contents size, so I don't see a really viable way +- * around this. (Also, we may want to someday pull +- * other unspecified info from the contents file on +- * disk.) +- */ +- mtree->fd = -1; +- if (archive_strlen(&mtree->contents_name) > 0) +- path = mtree->contents_name.s; +- else +- path = archive_entry_pathname(entry); +- +- if (archive_entry_filetype(entry) == AE_IFREG || +- archive_entry_filetype(entry) == AE_IFDIR) { +- mtree->fd = open(path, O_RDONLY | O_BINARY | O_CLOEXEC); +- __archive_ensure_cloexec_flag(mtree->fd); +- if (mtree->fd == -1 && +- (errno != ENOENT || +- archive_strlen(&mtree->contents_name) > 0)) { +- archive_set_error(&a->archive, errno, +- "Can't open %s", path); +- r = ARCHIVE_WARN; ++ if (mtree->checkfs) { ++ /* ++ * Try to open and stat the file to get the real size ++ * and other file info. It would be nice to avoid ++ * this here so that getting a listing of an mtree ++ * wouldn't require opening every referenced contents ++ * file. But then we wouldn't know the actual ++ * contents size, so I don't see a really viable way ++ * around this. (Also, we may want to someday pull ++ * other unspecified info from the contents file on ++ * disk.) ++ */ ++ mtree->fd = -1; ++ if (archive_strlen(&mtree->contents_name) > 0) ++ path = mtree->contents_name.s; ++ else ++ path = archive_entry_pathname(entry); ++ ++ if (archive_entry_filetype(entry) == AE_IFREG || ++ archive_entry_filetype(entry) == AE_IFDIR) { ++ mtree->fd = open(path, O_RDONLY | O_BINARY | O_CLOEXEC); ++ __archive_ensure_cloexec_flag(mtree->fd); ++ if (mtree->fd == -1 && ++ (errno != ENOENT || ++ archive_strlen(&mtree->contents_name) > 0)) { ++ archive_set_error(&a->archive, errno, ++ "Can't open %s", path); ++ r = ARCHIVE_WARN; ++ } + } +- } + +- st = &st_storage; +- if (mtree->fd >= 0) { +- if (fstat(mtree->fd, st) == -1) { +- archive_set_error(&a->archive, errno, +- "Could not fstat %s", path); +- r = ARCHIVE_WARN; +- /* If we can't stat it, don't keep it open. */ +- close(mtree->fd); +- mtree->fd = -1; ++ st = &st_storage; ++ if (mtree->fd >= 0) { ++ if (fstat(mtree->fd, st) == -1) { ++ archive_set_error(&a->archive, errno, ++ "Could not fstat %s", path); ++ r = ARCHIVE_WARN; ++ /* If we can't stat it, don't keep it open. */ ++ close(mtree->fd); ++ mtree->fd = -1; ++ st = NULL; ++ } ++ } else if (lstat(path, st) == -1) { + st = NULL; + } +- } else if (lstat(path, st) == -1) { +- st = NULL; +- } + +- /* +- * Check for a mismatch between the type in the specification and +- * the type of the contents object on disk. +- */ +- if (st != NULL) { +- if ( +- ((st->st_mode & S_IFMT) == S_IFREG && +- archive_entry_filetype(entry) == AE_IFREG) ++ /* ++ * Check for a mismatch between the type in the specification and ++ * the type of the contents object on disk. ++ */ ++ if (st != NULL) { ++ if ( ++ ((st->st_mode & S_IFMT) == S_IFREG && ++ archive_entry_filetype(entry) == AE_IFREG) + #ifdef S_IFLNK +- || ((st->st_mode & S_IFMT) == S_IFLNK && +- archive_entry_filetype(entry) == AE_IFLNK) ++ || ((st->st_mode & S_IFMT) == S_IFLNK && ++ archive_entry_filetype(entry) == AE_IFLNK) + #endif + #ifdef S_IFSOCK +- || ((st->st_mode & S_IFSOCK) == S_IFSOCK && +- archive_entry_filetype(entry) == AE_IFSOCK) ++ || ((st->st_mode & S_IFSOCK) == S_IFSOCK && ++ archive_entry_filetype(entry) == AE_IFSOCK) + #endif + #ifdef S_IFCHR +- || ((st->st_mode & S_IFMT) == S_IFCHR && +- archive_entry_filetype(entry) == AE_IFCHR) ++ || ((st->st_mode & S_IFMT) == S_IFCHR && ++ archive_entry_filetype(entry) == AE_IFCHR) + #endif + #ifdef S_IFBLK +- || ((st->st_mode & S_IFMT) == S_IFBLK && +- archive_entry_filetype(entry) == AE_IFBLK) ++ || ((st->st_mode & S_IFMT) == S_IFBLK && ++ archive_entry_filetype(entry) == AE_IFBLK) + #endif +- || ((st->st_mode & S_IFMT) == S_IFDIR && +- archive_entry_filetype(entry) == AE_IFDIR) ++ || ((st->st_mode & S_IFMT) == S_IFDIR && ++ archive_entry_filetype(entry) == AE_IFDIR) + #ifdef S_IFIFO +- || ((st->st_mode & S_IFMT) == S_IFIFO && +- archive_entry_filetype(entry) == AE_IFIFO) ++ || ((st->st_mode & S_IFMT) == S_IFIFO && ++ archive_entry_filetype(entry) == AE_IFIFO) + #endif +- ) { +- /* Types match. */ +- } else { +- /* Types don't match; bail out gracefully. */ +- if (mtree->fd >= 0) +- close(mtree->fd); +- mtree->fd = -1; +- if (parsed_kws & MTREE_HAS_OPTIONAL) { +- /* It's not an error for an optional entry +- to not match disk. */ +- *use_next = 1; +- } else if (r == ARCHIVE_OK) { +- archive_set_error(&a->archive, +- ARCHIVE_ERRNO_MISC, +- "mtree specification has different type for %s", +- archive_entry_pathname(entry)); +- r = ARCHIVE_WARN; +- } +- return r; ++ ) { ++ /* Types match. */ ++ } else { ++ /* Types don't match; bail out gracefully. */ ++ if (mtree->fd >= 0) ++ close(mtree->fd); ++ mtree->fd = -1; ++ if (parsed_kws & MTREE_HAS_OPTIONAL) { ++ /* It's not an error for an optional entry ++ to not match disk. */ ++ *use_next = 1; ++ } else if (r == ARCHIVE_OK) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_MISC, ++ "mtree specification has different type for %s", ++ archive_entry_pathname(entry)); ++ r = ARCHIVE_WARN; ++ } ++ return r; ++ } + } +- } + +- /* +- * If there is a contents file on disk, pick some of the metadata +- * from that file. For most of these, we only set it from the contents +- * if it wasn't already parsed from the specification. +- */ +- if (st != NULL) { +- if (((parsed_kws & MTREE_HAS_DEVICE) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) && +- (archive_entry_filetype(entry) == AE_IFCHR || +- archive_entry_filetype(entry) == AE_IFBLK)) +- archive_entry_set_rdev(entry, st->st_rdev); +- if ((parsed_kws & (MTREE_HAS_GID | MTREE_HAS_GNAME)) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) +- archive_entry_set_gid(entry, st->st_gid); +- if ((parsed_kws & (MTREE_HAS_UID | MTREE_HAS_UNAME)) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) +- archive_entry_set_uid(entry, st->st_uid); +- if ((parsed_kws & MTREE_HAS_MTIME) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) { ++ /* ++ * If there is a contents file on disk, pick some of the metadata ++ * from that file. For most of these, we only set it from the contents ++ * if it wasn't already parsed from the specification. ++ */ ++ if (st != NULL) { ++ if (((parsed_kws & MTREE_HAS_DEVICE) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) && ++ (archive_entry_filetype(entry) == AE_IFCHR || ++ archive_entry_filetype(entry) == AE_IFBLK)) ++ archive_entry_set_rdev(entry, st->st_rdev); ++ if ((parsed_kws & (MTREE_HAS_GID | MTREE_HAS_GNAME)) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) ++ archive_entry_set_gid(entry, st->st_gid); ++ if ((parsed_kws & (MTREE_HAS_UID | MTREE_HAS_UNAME)) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) ++ archive_entry_set_uid(entry, st->st_uid); ++ if ((parsed_kws & MTREE_HAS_MTIME) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) { + #if HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC +- archive_entry_set_mtime(entry, st->st_mtime, +- st->st_mtimespec.tv_nsec); ++ archive_entry_set_mtime(entry, st->st_mtime, ++ st->st_mtimespec.tv_nsec); + #elif HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC +- archive_entry_set_mtime(entry, st->st_mtime, +- st->st_mtim.tv_nsec); ++ archive_entry_set_mtime(entry, st->st_mtime, ++ st->st_mtim.tv_nsec); + #elif HAVE_STRUCT_STAT_ST_MTIME_N +- archive_entry_set_mtime(entry, st->st_mtime, +- st->st_mtime_n); ++ archive_entry_set_mtime(entry, st->st_mtime, ++ st->st_mtime_n); + #elif HAVE_STRUCT_STAT_ST_UMTIME +- archive_entry_set_mtime(entry, st->st_mtime, +- st->st_umtime*1000); ++ archive_entry_set_mtime(entry, st->st_mtime, ++ st->st_umtime*1000); + #elif HAVE_STRUCT_STAT_ST_MTIME_USEC +- archive_entry_set_mtime(entry, st->st_mtime, +- st->st_mtime_usec*1000); ++ archive_entry_set_mtime(entry, st->st_mtime, ++ st->st_mtime_usec*1000); + #else +- archive_entry_set_mtime(entry, st->st_mtime, 0); ++ archive_entry_set_mtime(entry, st->st_mtime, 0); + #endif ++ } ++ if ((parsed_kws & MTREE_HAS_NLINK) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) ++ archive_entry_set_nlink(entry, st->st_nlink); ++ if ((parsed_kws & MTREE_HAS_PERM) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) ++ archive_entry_set_perm(entry, st->st_mode); ++ if ((parsed_kws & MTREE_HAS_SIZE) == 0 || ++ (parsed_kws & MTREE_HAS_NOCHANGE) != 0) ++ archive_entry_set_size(entry, st->st_size); ++ archive_entry_set_ino(entry, st->st_ino); ++ archive_entry_set_dev(entry, st->st_dev); ++ ++ archive_entry_linkify(mtree->resolver, &entry, &sparse_entry); ++ } else if (parsed_kws & MTREE_HAS_OPTIONAL) { ++ /* ++ * Couldn't open the entry, stat it or the on-disk type ++ * didn't match. If this entry is optional, just ignore it ++ * and read the next header entry. ++ */ ++ *use_next = 1; ++ return ARCHIVE_OK; + } +- if ((parsed_kws & MTREE_HAS_NLINK) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) +- archive_entry_set_nlink(entry, st->st_nlink); +- if ((parsed_kws & MTREE_HAS_PERM) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) +- archive_entry_set_perm(entry, st->st_mode); +- if ((parsed_kws & MTREE_HAS_SIZE) == 0 || +- (parsed_kws & MTREE_HAS_NOCHANGE) != 0) +- archive_entry_set_size(entry, st->st_size); +- archive_entry_set_ino(entry, st->st_ino); +- archive_entry_set_dev(entry, st->st_dev); +- +- archive_entry_linkify(mtree->resolver, &entry, &sparse_entry); +- } else if (parsed_kws & MTREE_HAS_OPTIONAL) { +- /* +- * Couldn't open the entry, stat it or the on-disk type +- * didn't match. If this entry is optional, just ignore it +- * and read the next header entry. +- */ +- *use_next = 1; +- return ARCHIVE_OK; + } + + mtree->cur_size = archive_entry_size(entry); +diff --git a/libarchive/test/test_read_format_mtree.c b/libarchive/test/test_read_format_mtree.c +index 830fa0a..f96529d 100644 +--- a/libarchive/test/test_read_format_mtree.c ++++ b/libarchive/test/test_read_format_mtree.c +@@ -58,6 +58,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_filename(a, reffile, 11)); + + /* +@@ -209,6 +211,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_memory(a, archive, sizeof(archive))); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualInt(archive_format(a), ARCHIVE_FORMAT_MTREE); +@@ -246,6 +250,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_memory(a, archive, sizeof(archive))); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString(archive_entry_pathname(ae), "a"); +@@ -299,6 +305,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_memory(a, archive, sizeof(archive))); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString(archive_entry_pathname(ae), "./a"); +@@ -365,6 +373,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_memory(a, archive, sizeof(archive))); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString(archive_entry_pathname(ae), "./a"); +@@ -402,6 +412,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_memory(a, archive2, sizeof(archive2))); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString(archive_entry_pathname(ae), "./a"); +@@ -449,6 +461,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_filename(a, reffile, 11)); + + /* +@@ -552,6 +566,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_filename(a, reffile, 11)); + + /* +@@ -617,6 +633,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_filename(a, reffile, 11)); + + /* +@@ -680,6 +698,8 @@ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_set_options(a, "mtree:checkfs")); ++ assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_memory(a, archive, sizeof(archive))); + assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); + assert(strlen(archive_error_string(a)) > 0); +diff --git a/tar/write.c b/tar/write.c +index 40d2fb0..7e8cb13 100644 +--- a/tar/write.c ++++ b/tar/write.c +@@ -648,6 +648,7 @@ static void write_hierarchy(struct bsdtar *, struct archive *, + archive_read_support_format_all(ina); + archive_read_support_filter_all(ina); + set_reader_options(bsdtar, a); ++ archive_read_set_options(ina, "mtree:checkfs"); + if (archive_read_open_filename(ina, filename, + bsdtar->bytes_per_block)) { + lafe_warnc(0, "%s", archive_error_string(ina)); +-- +1.8.5.5 + diff --git a/libevent/PKGBUILD b/libevent/PKGBUILD index 86bc8874d..01034d1de 100644 --- a/libevent/PKGBUILD +++ b/libevent/PKGBUILD @@ -1,20 +1,16 @@ -# -# Core Packages for Chakra, part of chakra-project.org -# -# maintainer -# contributor pkgname=libevent -pkgver=2.0.21 -pkgrel=4 +pkgver=2.0.22 +pkgrel=1 pkgdesc="An event notification library" -license=('GPL2') +license=('BSD') arch=('x86_64') url="http://www.monkey.org/~provos/libevent/" depends=('openssl') -source=(https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-$pkgver-stable.tar.gz{,.asc}) -md5sums=('b2405cc9ebf264aa47ff615d9de527a2' - '31ffa4efc611c452697bd120a3bf8f9e') +source=(http://sourceforge.net/projects/levent/files/libevent/libevent-${pkgver%.*}/${pkgname}-$pkgver-stable.tar.gz{,.asc}) +md5sums=('c4c56f986aa985677ca1db89630a2e11' + 'SKIP') +validpgpkeys=('B35BF85BF19489D04E28C33C21194EBB165733EA') build() { cd "${srcdir}/${pkgname}-${pkgver}-stable" @@ -25,13 +21,12 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}-stable" - # does not work as of 20.07.2013 because of - # https://github.com/libevent/libevent/issues/38 - #make check + make check } package() { cd "${srcdir}/${pkgname}-${pkgver}-stable" make DESTDIR="${pkgdir}" install + install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/libevent/LICENSE } diff --git a/libgudev/PKGBUILD b/libgudev/PKGBUILD new file mode 100644 index 000000000..d64c3330f --- /dev/null +++ b/libgudev/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Weng Xuetian +# Contributor: Evangelos Foutras + +pkgname=libgudev +pkgver=230 +pkgrel=1 +pkgdesc="GObject bindings for libudev" +arch=('i686' 'x86_64') +url="https://wiki.gnome.org/Projects/libgudev" +license=('LGPL2.1') +depends=('systemd>=221') +makedepends=('systemd' 'gobject-introspection') +provides=('libgudev-1.0.so') +conflicts=('systemd<221') +source=(https://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) +sha256sums=('a2e77faced0c66d7498403adefcc0707105e03db71a2b2abd620025b86347c18') + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --disable-gtk-doc + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/libmpc/PKGBUILD b/libmpc/PKGBUILD index 849f4ca9f..c32185012 100644 --- a/libmpc/PKGBUILD +++ b/libmpc/PKGBUILD @@ -1,23 +1,17 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer: Manuel Tortosa pkgname=libmpc -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 -# dash the next line if you want to skip the tests -_test=1 pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision" arch=('x86_64') url="http://www.multiprecision.org" license=('LGPL') -depends=('mpfr>=3.1.2') -options=('!libtool') +depends=('mpfr') install=libmpc.install source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz{,.sig}) -md5sums=('68fadff3358fb3e7976c7a398a0af4c3' +md5sums=('d6a1d5f8ddea3abd2cc3e98f58352d26' 'SKIP') +validpgpkeys=('AD17A21EF8AED8F1CC02DBD9F7D5C9BF765C61E3') # Andreas Enge build() { cd "${srcdir}/mpc-${pkgver}" diff --git a/libusb-compat/PKGBUILD b/libusb-compat/PKGBUILD index a1efcac22..b649495b7 100644 --- a/libusb-compat/PKGBUILD +++ b/libusb-compat/PKGBUILD @@ -1,19 +1,14 @@ -# -# Core Packages for Chakra, part of chakra-project.org -# -# maintainer: abveritas@chakra-project.org pkgname=libusb-compat -pkgver=0.1.4 +pkgver=0.1.5 pkgrel=1 depends=('libusbx' 'sh') pkgdesc="Library to enable user space application programs to communicate with USB devices." -arch=(i686 x86_64) +arch=('x86_64') url="http://libusb.sourceforge.net/" license=('LGPL') source=(http://downloads.sourceforge.net/libusb/libusb-compat-0.1/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2) -options=('!libtool') -md5sums=('2ca521fffadd0c28fdf174e6ec73865b') +md5sums=('2780b6a758a1e2c2943bdbf7faf740e4') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/licenses/PKGBUILD b/licenses/PKGBUILD index a65f5ae47..f894e7f8f 100644 --- a/licenses/PKGBUILD +++ b/licenses/PKGBUILD @@ -1,13 +1,11 @@ -# $Id: PKGBUILD 79789 2010-05-07 13:49:02Z dan $ -# Maintainer: Dan McGee pkgname=licenses -pkgver=2.6 -pkgrel=2 +pkgver=20150428 +pkgrel=1 pkgdesc="The standard licenses distribution package" arch=('any') license=('custom:none') -url="http://archlinux.org" +url="http://chakraos.org" groups=('base') source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt cc-by-3.0.txt @@ -33,7 +31,8 @@ source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt cpl-1.0.txt python-2.txt LICENSE.ralink-firmware.txt - ZopePublicLicense.txt) + ZopePublicLicense.txt + w3c.txt) md5sums=('3b83ef96387f14655fc854ddc3c6bd57' 'ffb24d1bbf8b83d373f0b8edc3feb0c6' '682a5e3b03510ba46c4f566478c871bc' @@ -51,16 +50,17 @@ md5sums=('3b83ef96387f14655fc854ddc3c6bd57' '24ea4c7092233849b4394699333b5c56' '10b9de612d532fdeeb7fe8fcd1435cc6' '9f4337828d782bdea41f03dd2ad1b808' - 'bfe1f75d606912a4111c90743d6c7325' + 'b7426de1c630b269dc95ba20ea82a290' 'd09c120ca7db95ef2aeecec0cb08293b' 'a45bb1bbeed9e26b26c5763df1d3913d' - '68d59ff8306e3a9f5f1c01462c77a317' + '837b32593517ae48b9c3b5c87a5d288c' 'f083e41c43db25e18f36c91e57750b64' 'a055911c32fb4ed6e96c453ceaeba857' '682eac07428a4e8f138bc082f090ecac' - 'dc8502850eab9e1ff330a12d7ca18a19') + 'dc8502850eab9e1ff330a12d7ca18a19' + '6f2095b5d61770740852873b195a4d21') -build() { +package() { cd ${pkgdir} mkdir -p usr/share/licenses/common cd usr/share/licenses/common @@ -122,6 +122,9 @@ build() { mkdir RUBY cp ${srcdir}/ruby-license.txt RUBY/license.txt + mkdir W3C + cp "$srcdir"/w3c.txt W3C/license.txt + mkdir ZPL cp ${srcdir}/ZopePublicLicense.txt ZPL/license.txt } diff --git a/licenses/w3c.txt b/licenses/w3c.txt new file mode 100644 index 000000000..6a29463d3 --- /dev/null +++ b/licenses/w3c.txt @@ -0,0 +1,76 @@ +W3C Software Notice and License + +This work (and included software, documentation such as READMEs, or +other related items) is being provided by the copyright holders under +the following license. + +License + +By obtaining, using and/or copying this work, you (the licensee) agree +that you have read, understood, and will comply with the following +terms and conditions. + +Permission to copy, modify, and distribute this software and its +documentation, with or without modification, for any purpose and +without fee or royalty is hereby granted, provided that you include +the following on ALL copies of the software and documentation or +portions thereof, including modifications: + + - The full text of this NOTICE in a location viewable to users of + the redistributed or derivative work. + + - Any pre-existing intellectual property disclaimers, notices, or + terms and conditions. If none exist, the W3C Software Short + Notice should be included (hypertext is preferred, text is + permitted) within the body of any redistributed or derivative + code. + *"W3C Software Short Notice" above links to: + www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html + + - Notice of any changes or modifications to the files, including + the date changes were made. (We recommend you provide URIs to + the location from which the code is derived.) + +Disclaimers + +THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT +HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR +DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, +TRADEMARKS OR OTHER RIGHTS. + +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL +OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR +DOCUMENTATION. + +The name and trademarks of copyright holders may NOT be used in +advertising or publicity pertaining to the software without specific, +written prior permission. Title to copyright in this software and any +associated documentation will at all times remain with copyright +holders. Notes + +This version: +http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 + +This formulation of W3C's notice and license became active on December +31 2002. This version removes the copyright ownership notice such that +this license can be used with materials other than those owned by the +W3C, reflects that ERCIM is now a host of the W3C, includes references +to this specific dated version of the license, and removes the +ambiguous grant of "use". Otherwise, this version is the same as the +previous version and is written so as to preserve the Free Software +Foundation's assessment of GPL compatibility and OSI's certification +under the Open Source Definition. + + *"previous version" above links to: + http://www.w3.org/Consortium/Legal/copyright-software-19980720 + + *"Free Software Foundation's assessment of GPL compatibility" links to: + http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses + + *"OSI's certification" above links to: + http://opensource.org/licenses/W3C.php + + *"Open Source Definition" above links to: + http://opensource.org/docs/definition.php diff --git a/linux-api-headers/PKGBUILD b/linux-api-headers/PKGBUILD index c0a4292ba..32e05656a 100644 --- a/linux-api-headers/PKGBUILD +++ b/linux-api-headers/PKGBUILD @@ -1,29 +1,30 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer: Manuel Tortosa # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-api-headers -pkgver=3.16.2 -_basever=3.16 +pkgver=4.0 +_basever=4.0 pkgrel=1 pkgdesc="Kernel headers sanitized for use in userspace" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.gnu.org/software/libc" license=('GPL2') -provides=("kernel-headers=${pkgver}") -conflicts=('kernel-headers') -replaces=('kernel-headers') -source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz - http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz) -md5sums=('5c569ed649a0c9711879f333e90c5386' - '926e6e2ee0634ce53730701da749b040') +source=(http://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basever}.tar.xz + http://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basever}.tar.sign) + #http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz + #http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign) +md5sums=('a86916bd12798220da9eb4a1eec3616d' + 'SKIP') +validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds + '647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman + +prepare() { + cd ${srcdir}/linux-${_basever} + [[ $pkgver != $_basever ]] && patch -p1 -i ${srcdir}/patch-${pkgver} || true +} build() { cd ${srcdir}/linux-${_basever} - [[ $pkgver != $_basever ]] && patch -p1 -i ${srcdir}/patch-${pkgver} make mrproper make headers_check diff --git a/linux-firmware/PKGBUILD b/linux-firmware/PKGBUILD index f992bfbfb..79b367eb7 100644 --- a/linux-firmware/PKGBUILD +++ b/linux-firmware/PKGBUILD @@ -3,8 +3,8 @@ pkgname=linux-firmware -_rev=b794c50 -pkgver=20150127.${_rev} +_rev=8e18132 +pkgver=20150511.${_rev} _b43=5.100.138 _legacy=3.130.20.0 pkgrel=1 @@ -70,4 +70,9 @@ package() { # remove asc file from amd-ucode rm "${pkgdir}"/usr/lib/firmware/amd-ucode/*.asc + + # Trigger a microcode reload for configurations not using early updates + install -d "${pkgdir}/usr/lib/tmpfiles.d" + echo 'w /sys/devices/system/cpu/microcode/reload - - - - 1' \ + >"${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" } diff --git a/linux-lts.order b/linux-lts.order new file mode 100644 index 000000000..064a1713b --- /dev/null +++ b/linux-lts.order @@ -0,0 +1,13 @@ +#core_packages +#linux-lts +vhba-module-lts +broadcom-wl-lts +acpi_call-lts +ndiswrapper-lts + +#platform_packages +../platform/bbswitch-lts +../platform/nvidia-lts +../platform/nvidia-304xx-lts +../platform/nvidia-340xx-lts +../platform/catalyst-lts diff --git a/linux-lts/PKGBUILD b/linux-lts/PKGBUILD index 6e94c8531..f61b02aa1 100644 --- a/linux-lts/PKGBUILD +++ b/linux-lts/PKGBUILD @@ -1,33 +1,32 @@ # -# Core Packages for Chakra, part of chakra-project.org +# Core Packages for Chakra, part of chakraos.org +# -# ToDo remove the " from "linux-lts" and add on all lts pkgs "extramodules-3.2-CHAKRA-LTS" instead of extramodules-3.2-lts pkgbase="linux-lts" -pkgname=('linux-lts' 'linux-lts-headers' 'linux-lts-docs') # Build stock -CHAKRA-LTS kernel -# pkgname=linux-custom # Build kernel with a different name -_kernelname=${pkgname#linux} -_basekernel=3.2 -pkgver=3.2.63 -pkgrel=1 -makedepends=('xmlto' 'docbook-xsl') +pkgname=('linux-lts' 'linux-lts-headers' 'linux-lts-docs') +_kernelname="-CHAKRA-LTS" +_basekernel=3.14 +pkgver=3.14.44 +pkgrel=2 +makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') arch=('x86_64') license=('GPL2') url="http://www.kernel.org" options=(!strip) -source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_basekernel.tar.bz2" - "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" +source=("https://www.kernel.org/pub/linux/kernel/v3.x/linux-$_basekernel.tar.xz" + "https://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" # the main kernel config files 'config.x86_64' # standard config files for mkinitcpio ramdisk 'linux-lts.preset' 'change-default-console-loglevel.patch') -md5sums=('7ceb61f87c097fc17509844b71268935' - 'b0415bfb76e94590e3d0ab68884af8c9' - 'd73da01f9e20687abda70c10e7e5ea71' +md5sums=('b621207b3f6ecbb67db18b13258f8ea8' + 'd522100449d8c3428e2f2fbc0082b045' + '9847f68028ea7bc5e249cda4d6d8f1d9' '232b52576a62c7a333e9fe7a1e1ca359' - '9d3c56a4b999c8bfbd4018089a62f662') + '98beb36f9b8cf16e58de2483ea9985e3') -build() { +prepare() { cd ${srcdir}/linux-$_basekernel # add upstream patch @@ -46,10 +45,14 @@ build() { if [ "${_kernelname}" != "" ]; then sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config + sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config fi # set extraversion to pkgrel sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + + # don't run depmod on 'make install'. We'll do this ourselves in packaging + sed -i '2iexit 0' scripts/depmod.sh # get kernel version make prepare @@ -62,31 +65,38 @@ build() { #make oldconfig # using old config from previous kernel version # ... or manually edit .config + # rewrite configuration + yes "" | make config >/dev/null + + # save configuration for later reuse + cat .config > "${startdir}/config.x86_64.last" + #################### # stop here # this is useful to configure the kernel #msg "Stopping build" #return 1 #################### +} - yes "" | make config +build() { + cd ${srcdir}/linux-$_basekernel - # build! - make ${MAKEFLAGS} bzImage modules + make ${MAKEFLAGS} LOCALVERSION= bzImage modules } package_linux-lts() { pkgdesc="The Linux LTS-Kernel and modules" groups=('lts') - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7.5') + depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio') optdepends=('crda: to set the correct wireless channels of your country') - replaces=('kernel26-lts' 'linux-scsi' + replaces=('linux-scsi' 'squashfs' 'unionfs' 'ivtv' 'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs' 'gspcav1' 'atl2' 'wlan-ng26' 'rt2500' 'aufs3' 'nouveau-drm') - provides=("aufs3=$_aufs" 'nouveau-drm-lts' 'kernel26-lts' 'acerhk-lts=0.5.35') - conflicts=('kernel26-lts' 'acerhk-lts') + provides=("aufs3=$_aufs" 'nouveau-drm-lts' 'acerhk-lts=0.5.35') + conflicts=('acerhk-lts') backup=("etc/mkinitcpio.d/${pkgname}.preset") install=${pkgname}.install @@ -95,7 +105,7 @@ package_linux-lts() { KARCH=x86 # get kernel version - _kernver="$(make kernelrelease)" + _kernver="$(make LOCALVERSION= kernelrelease)" mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} make INSTALL_MOD_PATH="${pkgdir}" modules_install @@ -140,9 +150,6 @@ package_linux-lts() { package_linux-lts-headers() { pkgdesc="Header files and scripts for building modules for linux lts-kernel" - provides=('kernel26-lts-headers') - conflicts=('kernel26-lts-headers') - replaces=('kernel26-lts-headers') install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" @@ -160,7 +167,7 @@ package_linux-lts-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" for i in acpi asm-generic config crypto drm generated linux math-emu \ - media mtd net pcmcia scsi sound trace video xen; do + media net pcmcia scsi sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done @@ -182,16 +189,6 @@ package_linux-lts-headers() { cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/" - # add headers for lirc package - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video" - - cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/" - - for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" - cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" - done - # add docbook makefile install -D -m644 Documentation/DocBook/Makefile \ "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" @@ -209,24 +206,31 @@ package_linux-lts-headers() { cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" # add dvb headers for external modules - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core" - cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/" + mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core" + cp drivers/media/dvb-core/*.h \ + "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core/" # and... mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" + cp drivers/media/dvb-frontends/lgdt330x.h \ + "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" + mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/" + cp drivers/media/i2c/msp3400-driver.h \ + "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/" # add dvb headers - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb" - cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/" - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends" - cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners" - cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/" + mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb" + cp drivers/media/usb/dvb-usb/*.h \ + "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb/" + mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends" + cp drivers/media/dvb-frontends/*.h \ + "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/" + mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners" + cp drivers/media/tuners/*.h \ + "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners/" # add xfs and shmem for aufs building mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs" @@ -255,14 +259,11 @@ package_linux-lts-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} } package_linux-lts-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the Linux lts-kernel." - provides=('kernel26-lts-docs') - conflicts=('kernel26-lts-docs') - replaces=('kernel26-lts-docs') cd "${srcdir}/linux-${_basekernel}" diff --git a/linux-lts/change-default-console-loglevel.patch b/linux-lts/change-default-console-loglevel.patch index 63435d84f..22cd69a09 100644 --- a/linux-lts/change-default-console-loglevel.patch +++ b/linux-lts/change-default-console-loglevel.patch @@ -1,12 +1,12 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c ---- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300 -+++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300 +--- linux-3.0.orig/kernel/printk/printk.c 2011-07-22 05:17:23.000000000 +0300 ++++ linux-3.0/kernel/printk/printk.c 2011-07-27 14:43:07.000000000 +0300 @@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */ DECLARE_WAIT_QUEUE_HEAD(log_wait); diff --git a/linux-lts/config.x86_64 b/linux-lts/config.x86_64 index fc23cc779..c2c1d9258 100644 --- a/linux-lts/config.x86_64 +++ b/linux-lts/config.x86_64 @@ -1,122 +1,144 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.2.51-1 Kernel Configuration +# Linux/x86 3.14.44-1 Kernel Configuration # CONFIG_64BIT=y -# CONFIG_X86_32 is not set 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_GENERIC_CMOS_UPDATE=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_MMU=y -CONFIG_ZONE_DMA=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_GPIO=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CPU_AUTOPROBE=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_ARCH_POPULATES_NODE_MAP=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_X86_HT=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" -# CONFIG_KTIME_SCALAR is not set -CONFIG_ARCH_CPU_PROBE_RELEASE=y +CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_HAVE_IRQ_WORK=y CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # -CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="-lts" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_COMPILE_TEST is not set +CONFIG_LOCALVERSION="-CHAKRA-LTS" +# 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_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_FHANDLE=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y -CONFIG_HAVE_GENERIC_HARDIRQS=y +# CONFIG_AUDIT is not set # # IRQ subsystem # -CONFIG_GENERIC_HARDIRQS=y -CONFIG_HAVE_SPARSE_IRQ=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_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_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=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=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_PREEMPT_RCU=y -CONFIG_PREEMPT_RCU=y -# CONFIG_RCU_TRACE is not set +CONFIG_TREE_RCU=y +# CONFIG_PREEMPT_RCU is not set +CONFIG_RCU_STALL_COMMON=y +# CONFIG_RCU_USER_QS is not set CONFIG_RCU_FANOUT=64 +CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_RCU_FAST_NO_HZ is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_RCU_BOOST is not set +# CONFIG_RCU_NOCB_CPU is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_SUPPORTS_INT128=y +CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y +CONFIG_ARCH_USES_NUMA_PROT_NONE=y +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y +CONFIG_NUMA_BALANCING=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set CONFIG_CGROUP_FREEZER=y @@ -125,9 +147,11 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_MEM_RES_CTLR=y -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y -# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y +# CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -135,10 +159,11 @@ CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set +# CONFIG_CHECKPOINT_RESTORE is not set CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y -CONFIG_USER_NS=y +# CONFIG_USER_NS is not set CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y @@ -152,20 +177,22 @@ CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y CONFIG_RD_XZ=y CONFIG_RD_LZO=y +CONFIG_RD_LZ4=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_EXPERT is not set CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set -CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_PCSPKR_PLATFORM=y -CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -174,6 +201,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_PCI_QUIRKS=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -181,39 +209,70 @@ CONFIG_HAVE_PERF_EVENTS=y # Kernel Performance Events And Counters # CONFIG_PERF_EVENTS=y -CONFIG_PERF_COUNTERS=y # CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y -CONFIG_PCI_QUIRKS=y CONFIG_SLUB_DEBUG=y # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y +CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y +CONFIG_OPROFILE_NMI_TIMER=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_OPTPROBES=y +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_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y -CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=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_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_SOFT_DIRTY=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y # # GCOV-based kernel profiling @@ -229,12 +288,39 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y -# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_CMDLINE_PARSER is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +CONFIG_AIX_PARTITION=y +# 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=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +# CONFIG_CMDLINE_PARTITION is not set CONFIG_BLOCK_COMPAT=y # @@ -244,71 +330,49 @@ 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_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_DEFAULT_IOSCHED="deadline" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -# CONFIG_INLINE_SPIN_UNLOCK is not set -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_UNLOCK is not set -# CONFIG_INLINE_READ_UNLOCK_BH is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_ASN1=m +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_FREEZER=y # # Processor type and features # -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_ZONE_DMA=y CONFIG_SMP=y +CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y # CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_X86_INTEL_LPSS=y CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_PARAVIRT_GUEST=y -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +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_PRIVILEGED_GUEST=y CONFIG_XEN_PVHVM=y -CONFIG_XEN_MAX_DOMAIN_MEMORY=128 +CONFIG_XEN_MAX_DOMAIN_MEMORY=500 CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set -CONFIG_KVM_CLOCK=y +CONFIG_XEN_PVH=y CONFIG_KVM_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set +# CONFIG_KVM_DEBUG_FS is not set +CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set # CONFIG_MK8 is not set @@ -316,13 +380,8 @@ CONFIG_NO_BOOTMEM=y # CONFIG_MCORE2 is not set # CONFIG_MATOM is not set CONFIG_GENERIC_CPU=y -CONFIG_X86_INTERNODE_CACHE_SHIFT=7 -CONFIG_X86_CMPXCHG=y -CONFIG_CMPXCHG_LOCAL=y -CONFIG_CMPXCHG_DOUBLE=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_L1_CACHE_SHIFT=6 -CONFIG_X86_XADD=y -CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_TSC=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y @@ -340,14 +399,13 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y # CONFIG_MAXSMP is not set -CONFIG_NR_CPUS=64 +CONFIG_NR_CPUS=128 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set -# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y -CONFIG_PREEMPT_COUNT=y +# CONFIG_PREEMPT is not set +CONFIG_X86_UP_APIC_MSI=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y @@ -357,11 +415,16 @@ CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX64=y CONFIG_I8K=m -CONFIG_MICROCODE=m +CONFIG_MICROCODE=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_MICROCODE_INTEL_EARLY=y +CONFIG_MICROCODE_AMD_EARLY=y +CONFIG_MICROCODE_EARLY=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m CONFIG_ARCH_PHYS_ADDR_T_64BIT=y @@ -389,27 +452,42 @@ 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 is not set +CONFIG_HAVE_BOOTMEM_INFO_NODE=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_MEMORY_HOTREMOVE=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y +CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m CONFIG_TRANSPARENT_HUGEPAGE=y -# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set -CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y +# CONFIG_CMA is not set +CONFIG_ZBUD=y +CONFIG_ZSWAP=y +CONFIG_ZSMALLOC=y +# CONFIG_PGTABLE_MAPPING is not set CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_RESERVE_LOW=64 @@ -420,14 +498,15 @@ 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_EFI=y +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y -CONFIG_CC_STACKPROTECTOR=y -# CONFIG_HZ_100 is not set +CONFIG_HZ_100=y # CONFIG_HZ_250 is not set -CONFIG_HZ_300=y +# CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set -CONFIG_HZ=300 +CONFIG_HZ=100 CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set @@ -436,6 +515,8 @@ CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=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_ARCH_ENABLE_MEMORY_HOTPLUG=y @@ -453,20 +534,26 @@ CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION="" CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=100 +CONFIG_PM_WAKELOCKS_GC=y CONFIG_PM_RUNTIME=y CONFIG_PM=y CONFIG_PM_DEBUG=y CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_TEST_SUSPEND is not set -CONFIG_CAN_PM_TRACE=y +CONFIG_PM_SLEEP_DEBUG=y +# CONFIG_DPM_WATCHDOG is not set CONFIG_PM_TRACE=y CONFIG_PM_TRACE_RTC=y +CONFIG_PM_CLK=y +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set # CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m -# CONFIG_ACPI_PROC_EVENT is not set CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BUTTON=m @@ -480,7 +567,7 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=m CONFIG_ACPI_NUMA=y # CONFIG_ACPI_CUSTOM_DSDT is not set -CONFIG_ACPI_BLACKLIST_YEAR=0 +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y @@ -489,19 +576,21 @@ CONFIG_ACPI_HOTPLUG_MEMORY=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_BGRT=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_ACPI_EXTLOG=m CONFIG_SFI=y # # CPU Frequency scaling # CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_GOV_COMMON=y CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set @@ -517,9 +606,12 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # x86 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 @@ -527,9 +619,15 @@ CONFIG_X86_P4_CLOCKMOD=m # shared options # CONFIG_X86_SPEEDSTEP_LIB=m + +# +# CPU Idle +# CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set 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 # @@ -546,7 +644,6 @@ 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 @@ -554,10 +651,13 @@ CONFIG_PCIEAER=y # CONFIG_PCIEAER_INJECT is not set CONFIG_PCIEASPM=y # CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y -CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=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 @@ -567,6 +667,10 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y CONFIG_PCI_IOAPIC=y CONFIG_PCI_LABEL=y + +# +# PCI host controller drivers +# CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y CONFIG_PCCARD=m @@ -587,39 +691,49 @@ CONFIG_PD6729=m CONFIG_I82092=m CONFIG_PCCARD_NONSTATIC=y CONFIG_HOTPLUG_PCI=y -# CONFIG_HOTPLUG_PCI_FAKE 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 -CONFIG_RAPIDIO=y -CONFIG_RAPIDIO_TSI721=y +CONFIG_RAPIDIO=m +CONFIG_RAPIDIO_TSI721=m CONFIG_RAPIDIO_DISC_TIMEOUT=30 # CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_DMA_ENGINE=y CONFIG_RAPIDIO_DEBUG=y -CONFIG_RAPIDIO_TSI57X=y -CONFIG_RAPIDIO_CPS_XX=y -CONFIG_RAPIDIO_TSI568=y -CONFIG_RAPIDIO_CPS_GEN2=y -CONFIG_RAPIDIO_TSI500=y +CONFIG_RAPIDIO_ENUM_BASIC=m + +# +# RapidIO Switch drivers +# +CONFIG_RAPIDIO_TSI57X=m +CONFIG_RAPIDIO_CPS_XX=m +CONFIG_RAPIDIO_TSI568=m +CONFIG_RAPIDIO_CPS_GEN2=m +# CONFIG_X86_SYSFB is not set # # Executable file formats / Emulations # CONFIG_BINFMT_ELF=y CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_BINFMT_SCRIPT=y # CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y CONFIG_IA32_EMULATION=y -CONFIG_IA32_AOUT=m +# CONFIG_IA32_AOUT is not set +# CONFIG_X86_X32 is not set CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y CONFIG_KEYS_COMPAT=y -CONFIG_HAVE_TEXT_POKE_SMP=y +CONFIG_X86_DEV_DMA_OPS=y +CONFIG_IOSF_MBI=m CONFIG_NET=y CONFIG_COMPAT_NETLINK_MESSAGES=y @@ -627,8 +741,11 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y # Networking options # CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m CONFIG_XFRM=y +CONFIG_XFRM_ALGO=m CONFIG_XFRM_USER=m # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set @@ -647,14 +764,15 @@ 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 is not set CONFIG_IP_MROUTE=y # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -CONFIG_ARPD=y CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m @@ -666,6 +784,7 @@ CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_LRO=y CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m +CONFIG_INET_UDP_DIAG=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BIC=m CONFIG_TCP_CONG_CUBIC=y @@ -684,7 +803,6 @@ CONFIG_DEFAULT_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y @@ -698,10 +816,12 @@ 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_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y # CONFIG_IPV6_MROUTE is not set @@ -717,14 +837,18 @@ CONFIG_BRIDGE_NETFILTER=y # Core Netfilter Configuration # 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_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=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=m CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m @@ -741,7 +865,35 @@ CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m -CONFIG_NETFILTER_TPROXY=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +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_NETFILTER_SYNPROXY=m +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_INET=m +CONFIG_NFT_EXTHDR=m +CONFIG_NFT_META=m +CONFIG_NFT_CT=m +CONFIG_NFT_RBTREE=m +CONFIG_NFT_HASH=m +CONFIG_NFT_COUNTER=m +CONFIG_NFT_LOG=m +CONFIG_NFT_LIMIT=m +CONFIG_NFT_NAT=m +CONFIG_NFT_QUEUE=m +CONFIG_NFT_REJECT=m +CONFIG_NFT_REJECT_INET=m +CONFIG_NFT_COMPAT=m CONFIG_NETFILTER_XTABLES=m # @@ -754,7 +906,6 @@ 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 @@ -762,13 +913,17 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=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_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 @@ -780,9 +935,12 @@ 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 @@ -790,17 +948,21 @@ 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 @@ -827,12 +989,14 @@ CONFIG_IP_SET_HASH_IP=m CONFIG_IP_SET_HASH_IPPORT=m CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTNET=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 is not set +CONFIG_IP_VS_IPV6=y # CONFIG_IP_VS_DEBUG is not set CONFIG_IP_VS_TAB_BITS=12 @@ -860,6 +1024,11 @@ 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 # @@ -873,32 +1042,28 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -# CONFIG_IP_NF_QUEUE is not set +CONFIG_NF_TABLES_IPV4=m +CONFIG_NFT_CHAIN_ROUTE_IPV4=m +CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_NFT_REJECT_IPV4=m +CONFIG_NF_TABLES_ARP=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_LOG=m +CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_DCCP=m CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -914,7 +1079,10 @@ CONFIG_IP_NF_ARP_MANGLE=m # CONFIG_NF_DEFRAG_IPV6=m CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_QUEUE=m +CONFIG_NF_TABLES_IPV6=m +CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_REJECT_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -923,14 +1091,19 @@ 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_TARGET_LOG=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_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m +CONFIG_NF_TABLES_BRIDGE=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -957,7 +1130,7 @@ CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m # -# DCCP CCIDs Configuration (EXPERIMENTAL) +# DCCP CCIDs Configuration # # CONFIG_IP_DCCP_CCID2_DEBUG is not set CONFIG_IP_DCCP_CCID3=y @@ -971,11 +1144,12 @@ CONFIG_IP_DCCP_TFRC_LIB=y CONFIG_NET_DCCPPROBE=m CONFIG_IP_SCTP=m CONFIG_NET_SCTPPROBE=m -# CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_HMAC_NONE is not set -CONFIG_SCTP_HMAC_SHA1=y -# CONFIG_SCTP_HMAC_MD5 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_RDS is not set # CONFIG_TIPC is not set CONFIG_ATM=m @@ -991,28 +1165,30 @@ CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m CONFIG_STP=m +CONFIG_MRP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y -# CONFIG_NET_DSA is not set +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y +# CONFIG_IPX is not set +# CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set CONFIG_PHONET=m CONFIG_IEEE802154=m -# CONFIG_IEEE802154_6LOWPAN is not set +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_6LOWPAN_IPHC=m +CONFIG_MAC802154=m CONFIG_NET_SCHED=y # @@ -1036,7 +1212,13 @@ 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 @@ -1052,7 +1234,8 @@ CONFIG_NET_CLS_U32=m CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m -CONFIG_NET_CLS_CGROUP=y +CONFIG_NET_CLS_CGROUP=m +CONFIG_NET_CLS_BPF=m # CONFIG_NET_EMATCH is not set CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=m @@ -1068,21 +1251,37 @@ CONFIG_NET_ACT_CSUM=m CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set -CONFIG_DNS_RESOLVER=y +CONFIG_DNS_RESOLVER=m CONFIG_BATMAN_ADV=m +CONFIG_BATMAN_ADV_BLA=y +CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y # CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_OPENVSWITCH_GRE=y +CONFIG_OPENVSWITCH_VXLAN=y +CONFIG_VSOCKETS=m +CONFIG_VMWARE_VMCI_VSOCKETS=m +CONFIG_NETLINK_MMAP=y +CONFIG_NETLINK_DIAG=m +CONFIG_NET_MPLS_GSO=m +CONFIG_HSR=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y -CONFIG_HAVE_BPF_JIT=y +CONFIG_CGROUP_NET_PRIO=m +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=m -CONFIG_NET_DROP_MONITOR=y +CONFIG_NET_DROP_MONITOR=m CONFIG_HAMRADIO=y # @@ -1161,14 +1360,12 @@ CONFIG_VLSI_FIR=m CONFIG_VIA_FIR=m CONFIG_MCS_FIR=m CONFIG_BT=m -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m -# CONFIG_BT_BNEP_MC_FILTER is not set -# CONFIG_BT_BNEP_PROTO_FILTER is not set -# CONFIG_BT_CMTP is not set +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m CONFIG_BT_HIDP=m # @@ -1181,6 +1378,7 @@ 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_HCIBCM203X=m CONFIG_BT_HCIBPA10X=m CONFIG_BT_HCIBFUSB=m @@ -1204,14 +1402,13 @@ CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y CONFIG_CFG80211=m -CONFIG_NL80211_TESTMODE=y +# CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_DEBUGFS is not set # CONFIG_CFG80211_INTERNAL_REGDB is not set CONFIG_CFG80211_WEXT=y -CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_LIB80211=m CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m @@ -1226,22 +1423,47 @@ 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_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 is not set -# CONFIG_NFC is not set +CONFIG_NFC=m +CONFIG_NFC_DIGITAL=m +CONFIG_NFC_NCI=m +# CONFIG_NFC_NCI_SPI is not set +CONFIG_NFC_HCI=m +# CONFIG_NFC_SHDLC is not set + +# +# Near Field Communication (NFC) devices +# +CONFIG_NFC_PN533=m +CONFIG_NFC_WILINK=m +CONFIG_NFC_MEI_PHY=m +CONFIG_NFC_SIM=m +CONFIG_NFC_PORT100=m +CONFIG_NFC_PN544=m +CONFIG_NFC_PN544_MEI=m +CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_MEI=m +CONFIG_NFC_MRVL=m +CONFIG_NFC_MRVL_USB=m +CONFIG_HAVE_BPF_JIT=y # # Device Drivers @@ -1256,13 +1478,22 @@ CONFIG_DEVTMPFS=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y -CONFIG_FIRMWARE_IN_KERNEL=y +# CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set CONFIG_SYS_HYPERVISOR=y +# CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_MMIO=m +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y + +# +# Bus devices +# CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y CONFIG_MTD=m @@ -1271,12 +1502,12 @@ 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_CHAR=m CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m CONFIG_MTD_BLOCK_RO=m @@ -1357,32 +1588,26 @@ CONFIG_MTD_BLOCK2MTD=m # # Disk-On-Chip Device Drivers # -CONFIG_MTD_DOC2000=m -CONFIG_MTD_DOC2001=m -CONFIG_MTD_DOC2001PLUS=m CONFIG_MTD_DOCG3=m -CONFIG_MTD_DOCPROBE=m -CONFIG_MTD_DOCECC=m -# CONFIG_MTD_DOCPROBE_ADVANCED is not set -CONFIG_MTD_DOCPROBE_ADDRESS=0x0 +CONFIG_BCH_CONST_M=14 +CONFIG_BCH_CONST_T=4 CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_ECC_SMC=y CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_BCH is not set CONFIG_MTD_SM_COMMON=m -# CONFIG_MTD_NAND_MUSEUM_IDS is not set # CONFIG_MTD_NAND_DENALI is not set +CONFIG_MTD_NAND_GPIO=m CONFIG_MTD_NAND_IDS=m CONFIG_MTD_NAND_RICOH=m CONFIG_MTD_NAND_DISKONCHIP=m # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set -# CONFIG_MTD_NAND_CAFE is not set +CONFIG_MTD_NAND_DOCG4=m +CONFIG_MTD_NAND_CAFE=m CONFIG_MTD_NAND_NANDSIM=m # CONFIG_MTD_NAND_PLATFORM is not set -CONFIG_MTD_ALAUDA=m # CONFIG_MTD_ONENAND is not set # @@ -1392,9 +1617,10 @@ CONFIG_MTD_LPDDR=m CONFIG_MTD_QINFO_PROBE=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_RESERVE=1 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set -# CONFIG_MTD_UBI_DEBUG is not set +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m @@ -1413,23 +1639,27 @@ CONFIG_PNP=y # CONFIG_PNPACPI=y CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_BLK_DEV_FD=m # CONFIG_PARIDE is not set -CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set CONFIG_BLK_CPQ_CISS_DA=m # CONFIG_CISS_SCSI_TAPE is not set CONFIG_BLK_DEV_DAC960=m # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_LOOP_MIN_COUNT=0 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_NVME=m +CONFIG_BLK_DEV_SKD=m CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 @@ -1443,18 +1673,24 @@ CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m + +# +# Misc devices +# CONFIG_SENSORS_LIS3LV02D=m -CONFIG_MISC_DEVICES=y CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m -CONFIG_AD525X_DPOT_SPI=m +# CONFIG_AD525X_DPOT_SPI is not set +# CONFIG_ATMEL_PWM is not set +# CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m -CONFIG_INTEL_MID_PTI=m CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m +# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_CS5535_MFGPT=m CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 @@ -1469,11 +1705,15 @@ CONFIG_SENSORS_BH1770=m CONFIG_SENSORS_APDS990X=m CONFIG_HMC6352=m CONFIG_DS1682=m -CONFIG_TI_DAC7512=m +# CONFIG_TI_DAC7512 is not set CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=m +CONFIG_BMP085=y +CONFIG_BMP085_I2C=m +# CONFIG_BMP085_SPI is not set CONFIG_PCH_PHUB=m CONFIG_USB_SWITCH_FSA9480=m +# CONFIG_LATTICE_ECP3_CONFIG is not set +# CONFIG_SRAM is not set CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1481,17 +1721,14 @@ CONFIG_C2PORT_DURAMAR_2150=m # EEPROM support # CONFIG_EEPROM_AT24=m -CONFIG_EEPROM_AT25=m +# CONFIG_EEPROM_AT25 is not set CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m -CONFIG_EEPROM_93XX46=m +# CONFIG_EEPROM_93XX46 is not set CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y -CONFIG_IWMC3200TOP=m -# CONFIG_IWMC3200TOP_DEBUG is not set -# CONFIG_IWMC3200TOP_DEBUGFS is not set # # Texas Instruments shared transport line discipline @@ -1503,6 +1740,20 @@ CONFIG_SENSORS_LIS3_I2C=m # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m +CONFIG_VMWARE_VMCI=m + +# +# Intel MIC Host Driver +# +CONFIG_INTEL_MIC_HOST=m + +# +# Intel MIC Card Driver +# +CONFIG_INTEL_MIC_CARD=m +CONFIG_GENWQE=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1531,8 +1782,7 @@ CONFIG_SCSI_ENCLOSURE=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m +CONFIG_SCSI_SCAN_ASYNC=y # # SCSI Transports @@ -1567,7 +1817,6 @@ 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_AIC7XXX_OLD is not set CONFIG_SCSI_AIC79XX=m CONFIG_AIC79XX_CMDS_PER_DEVICE=32 CONFIG_AIC79XX_RESET_DELAY_MS=15000 @@ -1583,17 +1832,26 @@ 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_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set +CONFIG_SCSI_MPT3SAS=m +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT3SAS_LOGGING=y +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m +CONFIG_SCSI_UFSHCD_PLATFORM=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m +CONFIG_SCSI_FLASHPOINT=y CONFIG_VMWARE_PVSCSI=m +CONFIG_HYPERV_STORAGE=m CONFIG_LIBFC=m CONFIG_LIBFCOE=m CONFIG_FCOE=m @@ -1624,6 +1882,7 @@ CONFIG_SCSI_IPR=m # CONFIG_SCSI_IPR_DUMP is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m +CONFIG_TCM_QLA2XXX=m CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m # CONFIG_SCSI_LPFC_DEBUG_FS is not set @@ -1634,6 +1893,8 @@ CONFIG_SCSI_PMCRAID=m CONFIG_SCSI_PM8001=m CONFIG_SCSI_SRP=m CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_CHELSIO_FCOE=m CONFIG_SCSI_LOWLEVEL_PCMCIA=y CONFIG_PCMCIA_AHA152X=m CONFIG_PCMCIA_FDOMAIN=m @@ -1652,6 +1913,7 @@ 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 # @@ -1676,9 +1938,11 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # CONFIG_ATA_PIIX=m +CONFIG_SATA_HIGHBANK=m CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PROMISE=m +CONFIG_SATA_RCAR=m CONFIG_SATA_SIL=m CONFIG_SATA_SIS=m CONFIG_SATA_SVW=m @@ -1752,21 +2016,27 @@ CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m -# CONFIG_MULTICORE_RAID456 is not set CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=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_DEBUG is not set CONFIG_DM_BUFIO=m +CONFIG_DM_BIO_PRISON=m CONFIG_DM_PERSISTENT_DATA=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m -# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set -# CONFIG_DM_DEBUG_SPACE_MAPS is not set +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_CLEANER=m CONFIG_DM_MIRROR=m -CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_RAID=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_QL=m @@ -1774,6 +2044,8 @@ CONFIG_DM_MULTIPATH_ST=m CONFIG_DM_DELAY=m CONFIG_DM_UEVENT=y CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +CONFIG_DM_SWITCH=m CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m @@ -1781,6 +2053,7 @@ CONFIG_TCM_PSCSI=m CONFIG_LOOPBACK_TARGET=m CONFIG_TCM_FC=m CONFIG_ISCSI_TARGET=m +CONFIG_SBP_TARGET=m CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m @@ -1794,7 +2067,6 @@ CONFIG_FUSION_CTL=m # CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_OHCI_DEBUG=y CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m CONFIG_FIREWIRE_NOSY=m @@ -1809,19 +2081,24 @@ CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m CONFIG_MACINTOSH_DRIVERS=y -CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_MAC_EMUMOUSEBTN=m CONFIG_NETDEVICES=y +CONFIG_MII=m CONFIG_NET_CORE=y CONFIG_BONDING=m CONFIG_DUMMY=m CONFIG_EQUALIZER=m # CONFIG_NET_FC is not set -CONFIG_MII=m -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m 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_VXLAN=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y @@ -1833,6 +2110,7 @@ CONFIG_RIONET_RX_SIZE=128 CONFIG_TUN=m CONFIG_VETH=m CONFIG_VIRTIO_NET=m +CONFIG_NLMON=m CONFIG_SUNGEM_PHY=m # CONFIG_ARCNET is not set CONFIG_ATM_DRIVERS=y @@ -1873,6 +2151,20 @@ CONFIG_CAIF_TTY=m CONFIG_CAIF_SPI_SLAVE=m CONFIG_CAIF_SPI_SYNC=y CONFIG_CAIF_HSI=m +CONFIG_CAIF_VIRTIO=m +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_RING=m +CONFIG_VHOST=m + +# +# Distributed Switch Architecture drivers +# +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6060=m +CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y +CONFIG_NET_DSA_MV88E6131=m +CONFIG_NET_DSA_MV88E6123_61_65=m CONFIG_ETHERNET=y CONFIG_MDIO=m CONFIG_NET_VENDOR_3COM=y @@ -1889,11 +2181,16 @@ CONFIG_NET_VENDOR_AMD=y CONFIG_AMD8111_ETH=m CONFIG_PCNET32=m CONFIG_PCMCIA_NMCLAN=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_CADENCE=y +CONFIG_ARM_AT91_ETHER=m +CONFIG_MACB=m CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y @@ -1903,8 +2200,10 @@ CONFIG_BNX2=m CONFIG_CNIC=m CONFIG_TIGON3=m CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m +CONFIG_NET_CALXEDA_XGMAC=m CONFIG_NET_VENDOR_CHELSIO=y CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y @@ -1928,8 +2227,6 @@ CONFIG_DM9102=m CONFIG_ULI526X=m CONFIG_PCMCIA_XIRCOM=m CONFIG_NET_VENDOR_DLINK=y -CONFIG_DE600=m -CONFIG_DE620=m CONFIG_DL2K=m CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set @@ -1948,17 +2245,22 @@ CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m 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_IXGBEVF=m +CONFIG_I40E=m +CONFIG_I40E_VXLAN=y +CONFIG_I40EVF=m CONFIG_NET_VENDOR_I825XX=y -# CONFIG_ZNET is not set CONFIG_IP1000=m CONFIG_JME=m CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=m CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set CONFIG_SKGE_GENESIS=y @@ -1968,6 +2270,7 @@ CONFIG_NET_VENDOR_MELLANOX=y CONFIG_MLX4_EN=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y +CONFIG_MLX5_CORE=m CONFIG_NET_VENDOR_MICREL=y CONFIG_KS8842=m CONFIG_KS8851=m @@ -1998,6 +2301,7 @@ CONFIG_YELLOWFIN=m CONFIG_NET_VENDOR_QLOGIC=y CONFIG_QLA3XXX=m CONFIG_QLCNIC=m +CONFIG_QLCNIC_SRIOV=y CONFIG_QLGE=m CONFIG_NETXEN_NIC=m CONFIG_NET_VENDOR_REALTEK=y @@ -2009,10 +2313,10 @@ CONFIG_8139TOO_TUNE_TWISTER=y CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_R8169=m +CONFIG_SH_ETH=m CONFIG_NET_VENDOR_RDC=y CONFIG_R6040=m CONFIG_NET_VENDOR_SEEQ=y -# CONFIG_SEEQ8005 is not set CONFIG_NET_VENDOR_SILAN=y CONFIG_SC92031=m CONFIG_NET_VENDOR_SIS=y @@ -2020,16 +2324,20 @@ CONFIG_SIS900=m CONFIG_SIS190=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y CONFIG_NET_VENDOR_SMSC=y CONFIG_PCMCIA_SMC91C92=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 is not set +CONFIG_STMMAC_PCI=y # CONFIG_STMMAC_DEBUG_FS is not set # CONFIG_STMMAC_DA is not set -CONFIG_STMMAC_RING=y -# CONFIG_STMMAC_CHAINED is not set CONFIG_NET_VENDOR_SUN=y CONFIG_HAPPYMEAL=m CONFIG_SUNGEM=m @@ -2043,6 +2351,12 @@ 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_NET_VENDOR_XIRCOM=y CONFIG_PCMCIA_XIRC2PS=m # CONFIG_FDDI is not set @@ -2053,6 +2367,8 @@ CONFIG_PHYLIB=m # # MII PHY device drivers # +CONFIG_AT803X_PHY=m +CONFIG_AMD_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m CONFIG_QSEMI_PHY=m @@ -2061,6 +2377,7 @@ CONFIG_CICADA_PHY=m CONFIG_VITESSE_PHY=m CONFIG_SMSC_PHY=m CONFIG_BROADCOM_PHY=m +CONFIG_BCM87XX_PHY=m CONFIG_ICPLUS_PHY=m CONFIG_REALTEK_PHY=m CONFIG_NATIONAL_PHY=m @@ -2069,6 +2386,7 @@ CONFIG_LSI_ET1011C_PHY=m CONFIG_MICREL_PHY=m CONFIG_MDIO_BITBANG=m # CONFIG_MDIO_GPIO is not set +# CONFIG_MICREL_KS8995MA is not set CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -2087,7 +2405,6 @@ CONFIG_SLHC=m # CONFIG_SLIP_COMPRESSED is not set # CONFIG_SLIP_SMART is not set # CONFIG_SLIP_MODE_SLIP6 is not set -# CONFIG_TR is not set # # USB Network Adapters @@ -2096,12 +2413,18 @@ CONFIG_USB_CATC=m CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=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 @@ -2119,6 +2442,7 @@ 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 @@ -2147,6 +2471,7 @@ CONFIG_ADM8211=m # CONFIG_MAC80211_HWSIM is not set CONFIG_MWL8K=m CONFIG_ATH_COMMON=m +CONFIG_ATH_CARDS=m # CONFIG_ATH_DEBUG is not set CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set @@ -2154,11 +2479,14 @@ CONFIG_ATH5K=m 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=y # CONFIG_ATH9K_DEBUGFS is not set +CONFIG_ATH9K_WOW=y # CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set +CONFIG_ATH9K_RFKILL=y CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -2166,7 +2494,21 @@ CONFIG_CARL9170_LEDS=y CONFIG_CARL9170_WPC=y # CONFIG_CARL9170_HWRNG is not set 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=y +# CONFIG_ATH10K_TRACING is not set +CONFIG_WCN36XX=m +# CONFIG_WCN36XX_DEBUGFS is not set CONFIG_B43=m CONFIG_B43_BCMA=y CONFIG_B43_SSB=y @@ -2194,7 +2536,11 @@ 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_SDIO=y +CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCM_TRACING is not set # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -2214,25 +2560,23 @@ CONFIG_IPW2200_QOS=y CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_IWLWIFI=m +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y # # Debugging Options # # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLWIFI_DEVICE_TRACING=y -CONFIG_IWLWIFI_DEVICE_SVTOOL=y -CONFIG_IWLWIFI_LEGACY=m - -# -# Debugging Options -# -# CONFIG_IWLWIFI_LEGACY_DEBUG is not set -# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set +CONFIG_IWLEGACY=m CONFIG_IWL4965=m CONFIG_IWL3945=m -CONFIG_IWM=m -# CONFIG_IWM_DEBUG is not set -CONFIG_IWM_TRACING=y + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m @@ -2264,14 +2608,19 @@ 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 @@ -2279,39 +2628,54 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set +CONFIG_RTL_CARDS=m CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m +CONFIG_RTL8188EE=m CONFIG_RTL8192CU=m CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_PCI=m +CONFIG_RTLWIFI_USB=m +# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m +CONFIG_WL_TI=y CONFIG_WL1251=m -CONFIG_WL1251_SPI=m +# CONFIG_WL1251_SPI is not set CONFIG_WL1251_SDIO=m -CONFIG_WL12XX_MENU=m CONFIG_WL12XX=m -# CONFIG_WL12XX_SPI is not set -CONFIG_WL12XX_SDIO=m -CONFIG_WL12XX_SDIO_TEST=m -CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_WL18XX=m +CONFIG_WLCORE=m +# CONFIG_WLCORE_SPI is not set +CONFIG_WLCORE_SDIO=m +CONFIG_WILINK_PLATFORM_DATA=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m +CONFIG_CW1200=m +CONFIG_CW1200_WLAN_SDIO=m +CONFIG_CW1200_WLAN_SPI=m # # WiMAX Wireless Broadband devices # CONFIG_WIMAX_I2400M=m CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_SDIO=m -# CONFIG_WIMAX_IWMC3200_SDIO is not set CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 # CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +# CONFIG_IEEE802154_MRF24J40 is not set CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_NETDEV_BACKEND=m CONFIG_VMXNET3=m +CONFIG_HYPERV_NET=m CONFIG_ISDN=y CONFIG_ISDN_I4L=m CONFIG_ISDN_PPP=y @@ -2393,8 +2757,8 @@ CONFIG_HISAX_FRITZ_PCIPNP=m CONFIG_ISDN_CAPI=m CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y CONFIG_CAPI_TRACE=y -CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPIDRV=m # @@ -2442,7 +2806,6 @@ CONFIG_MISDN_NETJET=m CONFIG_MISDN_IPAC=m CONFIG_MISDN_ISAR=m CONFIG_ISDN_HDLC=m -# CONFIG_PHONE is not set # # Input device support @@ -2451,11 +2814,12 @@ CONFIG_INPUT=y 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=m CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 @@ -2469,39 +2833,46 @@ CONFIG_INPUT_EVDEV=m CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ADP5588=m CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_ATKBD=m CONFIG_KEYBOARD_QT1070=m CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_GPIO is not set # CONFIG_KEYBOARD_GPIO_POLLED is not set CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_TCA8418=m CONFIG_KEYBOARD_MATRIX=m # CONFIG_KEYBOARD_LM8323 is not set +CONFIG_KEYBOARD_LM8333=m # CONFIG_KEYBOARD_MAX7359 is not set CONFIG_KEYBOARD_MCS=m CONFIG_KEYBOARD_MPR121=m # CONFIG_KEYBOARD_NEWTON 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_XTKBD is not set +# CONFIG_KEYBOARD_CROS_EC is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ALPS=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_SERIAL=y +CONFIG_MOUSE_PS2_TOUCHKIT=y +CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m 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 @@ -2541,36 +2912,49 @@ CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=m -CONFIG_TOUCHSCREEN_AD7877=m +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m -CONFIG_TOUCHSCREEN_AD7879_SPI=m +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m +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 is not set +CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m +CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_GUNZE=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_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=m +CONFIG_TOUCHSCREEN_PIXCIR=m CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_TOUCHSCREEN_WM9705=y CONFIG_TOUCHSCREEN_WM9712=y CONFIG_TOUCHSCREEN_WM9713=y CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -# CONFIG_TOUCHSCREEN_MC13783 is not set +CONFIG_TOUCHSCREEN_MC13783=m CONFIG_TOUCHSCREEN_USB_EGALAX=y CONFIG_TOUCHSCREEN_USB_PANJIT=y CONFIG_TOUCHSCREEN_USB_3M=y @@ -2583,18 +2967,22 @@ 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_TSC2005=m +# CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m +# CONFIG_TOUCHSCREEN_W90X900 is not set CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_SUR40=m CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_INPUT_MISC=y -CONFIG_INPUT_AB8500_PONKEY=m CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m @@ -2604,6 +2992,8 @@ CONFIG_INPUT_MC13783_PWRBUTTON=m CONFIG_INPUT_MMA8450=m CONFIG_INPUT_MPU3050=m CONFIG_INPUT_APANEL=m +CONFIG_INPUT_GP2A=m +# CONFIG_INPUT_GPIO_TILT_POLLED is not set CONFIG_INPUT_ATLAS_BTNS=m CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_KEYSPAN_REMOTE=m @@ -2612,6 +3002,7 @@ CONFIG_INPUT_KXTJ9=m CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m +CONFIG_INPUT_RETU_PWRBUTTON=m CONFIG_INPUT_UINPUT=m CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_PCF8574=m @@ -2619,23 +3010,28 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m CONFIG_INPUT_ADXL34X_SPI=m +# CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m +CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # # Hardware I/O ports # -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y +CONFIG_SERIO=m +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_SERIO_I8042=m CONFIG_SERIO_SERPORT=m CONFIG_SERIO_CT82C710=m CONFIG_SERIO_PARKBD=m CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_LIBPS2=m CONFIG_SERIO_RAW=m CONFIG_SERIO_ALTERA_PS2=m CONFIG_SERIO_PS2MULT=m +CONFIG_SERIO_ARC_PS2=m +CONFIG_HYPERV_KEYBOARD=m CONFIG_GAMEPORT=m CONFIG_GAMEPORT_NS558=m CONFIG_GAMEPORT_L4=m @@ -2645,6 +3041,7 @@ CONFIG_GAMEPORT_FM801=m # # Character devices # +CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y @@ -2670,30 +3067,34 @@ CONFIG_N_GSM=m CONFIG_TRACE_ROUTER=m CONFIG_TRACE_SINK=m # CONFIG_DEVKMEM is not set -# CONFIG_STALDRV is not set # # Serial drivers # CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set +CONFIG_SERIAL_8250_DW=m # # Non-8250 serial port support # # CONFIG_SERIAL_MAX3100 is not set -# CONFIG_SERIAL_MAX3107 is not set +# CONFIG_SERIAL_MAX310X is not set +# CONFIG_SERIAL_MRST_MAX3110 is not set CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_SCCNXP=m # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m @@ -2701,13 +3102,18 @@ CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 # CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_PCH_UART=m -CONFIG_SERIAL_XILINX_PS_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_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 @@ -2715,12 +3121,15 @@ CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m -CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_ATMEL=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_EXYNOS=m +CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_R3964=m CONFIG_APPLICOM=m @@ -2733,23 +3142,37 @@ CONFIG_CARDMAN_4000=m CONFIG_CARDMAN_4040=m CONFIG_IPWIRELESS=m CONFIG_MWAVE=m -# CONFIG_RAW_DRIVER 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=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_ST33_I2C=m +CONFIG_TCG_XEN=m CONFIG_TELCLOCK=m CONFIG_DEVPORT=y -CONFIG_RAMOOPS=m CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_MUX is not set +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +# CONFIG_I2C_MUX_GPIO is not set +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m +# CONFIG_I2C_MUX_PINCTRL is not set CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m @@ -2770,6 +3193,7 @@ 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 @@ -2787,16 +3211,17 @@ CONFIG_I2C_SCMI=m # # I2C system bus drivers (mostly embedded / system-on-chip) # +# CONFIG_I2C_CBUS_GPIO is not set CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_DESIGNWARE_PCI=m +CONFIG_I2C_EG20T=m # CONFIG_I2C_GPIO is not set -CONFIG_I2C_INTEL_MID=m CONFIG_I2C_OCORES=m CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PXA_PCI is not set CONFIG_I2C_SIMTEC=m CONFIG_I2C_XILINX=m -CONFIG_I2C_EG20T=m # # External I2C/SMBus adapter drivers @@ -2804,8 +3229,10 @@ CONFIG_I2C_EG20T=m CONFIG_I2C_DIOLAN_U2C=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 @@ -2821,22 +3248,30 @@ CONFIG_SPI_MASTER=y # # SPI Master Controller Drivers # -# CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_BUTTERFLY is not set -# CONFIG_SPI_GPIO is not set -# CONFIG_SPI_LM70_LLP is not set -# CONFIG_SPI_OC_TINY is not set -# CONFIG_SPI_PXA2XX_PCI is not set -# CONFIG_SPI_TOPCLIFF_PCH is not set -# CONFIG_SPI_XILINX is not set -# CONFIG_SPI_DESIGNWARE is not set +CONFIG_SPI_ALTERA=m +CONFIG_SPI_BITBANG=m +CONFIG_SPI_BUTTERFLY=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_OC_TINY=m +CONFIG_SPI_PXA2XX_DMA=y +CONFIG_SPI_PXA2XX=m +CONFIG_SPI_PXA2XX_PCI=m +CONFIG_SPI_SC18IS602=m +CONFIG_SPI_TOPCLIFF_PCH=m +CONFIG_SPI_XCOMM=m +CONFIG_SPI_XILINX=m +CONFIG_SPI_DESIGNWARE=m +CONFIG_SPI_DW_PCI=m +# CONFIG_SPI_DW_MID_DMA is not set +CONFIG_SPI_DW_MMIO=m # # SPI Protocol Masters # -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TLE62X0 is not set +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m +# CONFIG_HSI is not set # # PPS support @@ -2861,8 +3296,20 @@ CONFIG_PPS_CLIENT_GPIO=m # CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m +CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_PINCTRL=y + +# +# Pin controllers +# +# CONFIG_PINMUX is not set +# CONFIG_PINCONF is not set +# CONFIG_DEBUG_PINCTRL is not set +# CONFIG_PINCTRL_BAYTRAIL is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +CONFIG_GPIO_ACPI=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y @@ -2871,12 +3318,19 @@ CONFIG_GPIO_SYSFS=y # # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_IT8761E is not set +# CONFIG_GPIO_F7188X is not set +CONFIG_GPIO_SCH311X=m +# CONFIG_GPIO_TS5500 is not set CONFIG_GPIO_SCH=m +CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set +CONFIG_GPIO_LYNXPOINT=m # # I2C GPIO expanders: # +CONFIG_GPIO_ARIZONA=m +CONFIG_GPIO_LP3943=m # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX732X is not set # CONFIG_GPIO_PCA953X is not set @@ -2887,7 +3341,8 @@ CONFIG_GPIO_SCH=m # PCI GPIO expanders: # CONFIG_GPIO_CS5535=m -CONFIG_GPIO_LANGWELL=y +CONFIG_GPIO_AMD8111=m +# CONFIG_GPIO_INTEL_MID is not set # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_ML_IOH is not set # CONFIG_GPIO_RDC321X is not set @@ -2896,34 +3351,49 @@ CONFIG_GPIO_LANGWELL=y # SPI GPIO expanders: # # CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MCP23S08 is not set # CONFIG_GPIO_MC33880 is not set -# CONFIG_GPIO_74X164 is not set # # AC97 GPIO expanders: # -CONFIG_GPIO_UCB1400=y +CONFIG_GPIO_UCB1400=m + +# +# LPC GPIO expanders: +# # # MODULbus GPIO expanders: # + +# +# USB GPIO expanders: +# +CONFIG_GPIO_VIPERBOARD=m # CONFIG_W1 is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=m CONFIG_TEST_POWER=m # CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set -# CONFIG_BATTERY_BQ20Z75 is not set +# CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_CHARGER_PCF50633 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_HWMON=y +# CONFIG_CHARGER_BQ2415X is not set +# CONFIG_CHARGER_BQ24190 is not set +CONFIG_CHARGER_BQ24735=m +# CONFIG_CHARGER_SMB347 is not set +CONFIG_POWER_RESET=y +CONFIG_POWER_AVS=y +CONFIG_HWMON=m CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -2942,6 +3412,9 @@ 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 @@ -2960,9 +3433,12 @@ CONFIG_SENSORS_F71882FG=m CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_G762=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m -# CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_GPIO_FAN=m +CONFIG_SENSORS_HIH6130=m +CONFIG_SENSORS_HTU21=m CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m @@ -2986,16 +3462,21 @@ CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95234=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_MAX1111=m CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m -# CONFIG_SENSORS_NTC_THERMISTOR is not set +CONFIG_SENSORS_MAX6697=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_NCT6775=m +CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m @@ -3028,6 +3509,8 @@ 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_THMC50=m CONFIG_SENSORS_TMP102=m CONFIG_SENSORS_TMP401=m @@ -3055,7 +3538,20 @@ CONFIG_SENSORS_MC13783_ADC=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y -CONFIG_THERMAL_HWMON=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_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_GOV_USER_SPACE=y +# CONFIG_THERMAL_EMULATION is not set +CONFIG_INTEL_POWERCLAMP=m +CONFIG_X86_PKG_TEMP_THERMAL=m +CONFIG_ACPI_INT3403_THERMAL=m + +# +# Texas Instruments thermal drivers +# CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3064,6 +3560,8 @@ CONFIG_WATCHDOG_CORE=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_DW_WATCHDOG=m +CONFIG_RETU_WATCHDOG=m CONFIG_ACQUIRE_WDT=m CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m @@ -3078,6 +3576,7 @@ 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 @@ -3092,6 +3591,7 @@ CONFIG_SBC8360_WDT=m CONFIG_CPU5_WDT=m CONFIG_SMSC_SCH311X_WDT=m CONFIG_SMSC37B787_WDT=m +CONFIG_VIA_WDT=m CONFIG_W83627HF_WDT=m CONFIG_W83697HF_WDT=m CONFIG_W83697UG_WDT=m @@ -3099,6 +3599,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m CONFIG_SBC_EPX_C3_WATCHDOG=m +CONFIG_MEN_A21_WDT=m CONFIG_XEN_WDT=m # @@ -3129,6 +3630,7 @@ CONFIG_SSB_SDIOHOST=y # 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 # @@ -3138,69 +3640,113 @@ 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_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y # CONFIG_BCMA_DEBUG is not set # # Multifunction device drivers # CONFIG_MFD_CORE=y -CONFIG_MFD_SM501=m -CONFIG_MFD_SM501_GPIO=y +CONFIG_MFD_CS5535=m +CONFIG_MFD_CROS_EC=m +CONFIG_MFD_CROS_EC_I2C=m +# CONFIG_MFD_DA9052_SPI is not set +CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX_SPI is not set +CONFIG_MFD_MC13XXX_I2C=m CONFIG_HTC_PASIC3=m -CONFIG_UCB1400_CORE=m -# CONFIG_TPS6105X is not set -CONFIG_TPS65010=m -CONFIG_TPS6507X=m -# CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_TMIO is not set -CONFIG_MFD_WM8400=m -# CONFIG_MFD_WM831X_SPI is not set +CONFIG_LPC_ICH=m +CONFIG_LPC_SCH=m +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_KEMPLD is not set +# CONFIG_EZX_PCAP is not set +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m CONFIG_MFD_PCF50633=m CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m -CONFIG_MFD_MC13783=m -CONFIG_MFD_MC13XXX=m -CONFIG_ABX500_CORE=y -# CONFIG_EZX_PCAP is not set -CONFIG_AB8500_CORE=y -# CONFIG_AB8500_DEBUG is not set -CONFIG_MFD_CS5535=m -# CONFIG_MFD_TIMBERDALE is not set -CONFIG_LPC_SCH=m +CONFIG_UCB1400_CORE=m CONFIG_MFD_RDC321X=m -# CONFIG_MFD_JANZ_CMODIO is not set -CONFIG_MFD_VX855=m +CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_SI476X_CORE=m +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_ABX500_CORE=y +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_SYSCON is not set +CONFIG_MFD_TI_AM335X_TSCADC=m +CONFIG_MFD_LP3943=m +# CONFIG_TPS6105X is not set +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +CONFIG_MFD_TPS65217=m +# CONFIG_MFD_TPS65912 is not set +# CONFIG_MFD_TPS65912_SPI is not set CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_LM3533=m +# CONFIG_MFD_TIMBERDALE is not set +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_VX855=m +CONFIG_MFD_ARIZONA=y +CONFIG_MFD_ARIZONA_I2C=m +# CONFIG_MFD_ARIZONA_SPI is not set +CONFIG_MFD_WM5102=y +CONFIG_MFD_WM5110=y +# CONFIG_MFD_WM8997 is not set +# CONFIG_MFD_WM831X_SPI is not set # CONFIG_REGULATOR 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_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=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_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=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_DVB_CORE=m CONFIG_DVB_NET=y -CONFIG_VIDEO_MEDIA=m +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set # -# Multimedia drivers +# Media drivers # -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m CONFIG_RC_CORE=m -CONFIG_LIRC=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_RC5_SZ_DECODER=m +CONFIG_IR_SANYO_DECODER=m CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_IR_LIRC_CODEC=m +CONFIG_RC_DEVICES=y CONFIG_RC_ATI_REMOTE=m CONFIG_IR_ENE=m CONFIG_IR_IMON=m @@ -3211,202 +3757,15 @@ CONFIG_IR_NUVOTON=m CONFIG_IR_REDRAT3=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m +CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m CONFIG_RC_LOOPBACK=m -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -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_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_TDA18212=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DMA_CONTIG=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_IR_I2C=m +CONFIG_IR_GPIO_CIR=m +CONFIG_MEDIA_USB_SUPPORT=y # -# Encoders, decoders, sensors and other helper chips +# Webcam devices # - -# -# 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_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7180=m -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_SAA7191=m -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TVP7002=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_ADV7343=m -CONFIG_VIDEO_AK881X=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_MT9P031=m -CONFIG_VIDEO_MT9T001=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_MT9V032=m -CONFIG_VIDEO_TCM825X=m -CONFIG_VIDEO_SR030PC30=m -CONFIG_VIDEO_NOON010PC30=m -CONFIG_VIDEO_M5MOLS=m -CONFIG_VIDEO_S5K6AA=m - -# -# Flash devices -# -CONFIG_VIDEO_ADP1653=m - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Miscelaneous helper chips -# -CONFIG_VIDEO_THS7303=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_VIVI=m -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y -CONFIG_VIDEO_BWQCAM=m -CONFIG_VIDEO_CQCAM=m -CONFIG_VIDEO_W9966=m -CONFIG_VIDEO_CPIA2=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 -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_RC=y -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_TIMBERDALE=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CX23885=m -CONFIG_MEDIA_ALTERA_CI=m -CONFIG_VIDEO_CX25821=m -CONFIG_VIDEO_CX25821_ALSA=m -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_CX18_ALSA=m -CONFIG_VIDEO_SAA7164=m -CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_VIDEO_VIA_CAMERA=m -CONFIG_SOC_CAMERA=m -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_RJ54N1=m -CONFIG_SOC_CAMERA_TW9910=m -CONFIG_SOC_CAMERA_PLATFORM=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_V4L_USB_DRIVERS=y CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y CONFIG_USB_GSPCA=m @@ -3419,6 +3778,7 @@ CONFIG_USB_GSPCA_CPIA1=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 @@ -3446,6 +3806,7 @@ 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 @@ -3455,16 +3816,34 @@ 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_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=y CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160_COMMON=m +CONFIG_VIDEO_STK1160_AC97=y +CONFIG_VIDEO_STK1160=m + +# +# Analog/digital TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3472,53 +3851,9 @@ CONFIG_VIDEO_CX231XX_DVB=m CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m -CONFIG_VIDEO_USBVISION=m -CONFIG_USB_ET61X251=m -CONFIG_USB_SN9C102=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m -CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_TESTDEV=m -CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_MAXIRADIO=m -CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI4713=m -CONFIG_USB_DSBR=m -CONFIG_RADIO_SI470X=y -CONFIG_USB_SI470X=m -CONFIG_I2C_SI470X=m -CONFIG_USB_MR800=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 -CONFIG_DVB_MAX_ADAPTERS=8 -# CONFIG_DVB_DYNAMIC_MINORS is not set -CONFIG_DVB_CAPTURE_DRIVERS=y - -# -# Supported SAA7146 based PCI Adapters -# -CONFIG_TTPCI_EEPROM=m -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 - -# -# Supported USB Adapters +# Digital TV USB devices # CONFIG_DVB_USB=m # CONFIG_DVB_USB_DEBUG is not set @@ -3530,8 +3865,6 @@ CONFIG_DVB_USB_DIB0700=m CONFIG_DVB_USB_UMT_010=m CONFIG_DVB_USB_CXUSB=m CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m CONFIG_DVB_USB_DIGITV=m CONFIG_DVB_USB_VP7045=m CONFIG_DVB_USB_VP702X=m @@ -3545,82 +3878,288 @@ 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_ANYSEE=m CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_CE6230=m CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_EC168=m CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_LME2510=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_IT913X=m +CONFIG_DVB_USB_LME2510=m CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_SIANO_MDTV=m - -# -# Siano module components -# CONFIG_SMS_USB_DRV=m -CONFIG_SMS_SDIO_DRV=m - -# -# Supported FlexCopII (B2C2) Adapters -# -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set # -# Supported BT878 Adapters +# 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 +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=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 +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=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_SAA7164=m # -# Supported Pluto2 Adapters +# Media digital TV PCI Adapters # +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_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m +# CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m +CONFIG_VIDEO_RENESAS_VSP1=m +# CONFIG_V4L_TEST_DRIVERS is not set # -# Supported SDMC DM1105 Adapters +# Supported MMC/SDIO adapters # -CONFIG_DVB_DM1105=m +CONFIG_SMS_SDIO_DRV=m +CONFIG_MEDIA_PARPORT_SUPPORT=y +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=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_RADIO_WL128X=m # # Supported FireWire (IEEE 1394) Adapters # CONFIG_DVB_FIREDTV=m CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y # -# Supported Earthsoft PT1 Adapters +# common driver options # -CONFIG_DVB_PT1=m +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_BTCX=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 # -# Supported Mantis Adapters +# Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y +CONFIG_VIDEO_IR_I2C=m # -# Supported nGene Adapters +# Audio decoders, processors and mixers # -CONFIG_DVB_NGENE=m +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_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 # -# Supported ddbridge ('Octopus') Adapters +# RDS decoders # -CONFIG_DVB_DDBRIDGE=m +CONFIG_VIDEO_SAA6588=m # -# Supported DVB Frontends +# Video decoders # -# CONFIG_DVB_FE_CUSTOMISE is not set +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_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_M88TS2022=m +CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_R820T=m # # Multistandard (satellite) frontends @@ -3629,6 +4168,7 @@ CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m +CONFIG_DVB_M88DS3103=m # # Multistandard (cable + terrestrial) frontends @@ -3659,7 +4199,9 @@ CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m +CONFIG_DVB_CX24117=m CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m CONFIG_DVB_MB86A16=m CONFIG_DVB_TDA10071=m @@ -3686,6 +4228,8 @@ CONFIG_DVB_AF9013=m CONFIG_DVB_EC100=m CONFIG_DVB_STV0367=m CONFIG_DVB_CXD2820R=m +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m # # DVB-C (cable) frontends @@ -3704,8 +4248,11 @@ CONFIG_DVB_OR51132=m CONFIG_DVB_BCM3510=m CONFIG_DVB_LGDT330X=m CONFIG_DVB_LGDT3305=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 # @@ -3736,6 +4283,8 @@ CONFIG_DVB_ATBM8830=m CONFIG_DVB_TDA665x=m CONFIG_DVB_IX2505V=m CONFIG_DVB_IT913X_FE=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=m # # Tools to develop new frontends @@ -3746,30 +4295,59 @@ CONFIG_DVB_IT913X_FE=m # Graphics support # CONFIG_AGP=y -CONFIG_AGP_AMD64=y +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_USB=m CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_KMS_FB_HELPER=y +CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_RADEON_UMS is not set +CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +# CONFIG_DRM_I810 is not set CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y +CONFIG_DRM_I915_FBDEV=y +# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set +# CONFIG_DRM_I915_UMS is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m CONFIG_DRM_SAVAGE=m CONFIG_DRM_VMWGFX=m -CONFIG_STUB_POULSBO=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_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_HDMI=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set @@ -3783,7 +4361,6 @@ CONFIG_FB_SYS_COPYAREA=m CONFIG_FB_SYS_IMAGEBLIT=m # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=m -# CONFIG_FB_WMT_GE_ROPS is not set CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set @@ -3806,9 +4383,11 @@ 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_MATROX is not set # CONFIG_FB_RADEON is not set @@ -3829,44 +4408,51 @@ CONFIG_FB_VOODOO1=m # 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_TMIO is not set # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m +# CONFIG_FB_GOLDFISH is not set CONFIG_FB_VIRTUAL=m 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_EXYNOS_VIDEO 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 is not set -CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_LM3533=m CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_SAHARA is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m - -# -# Display device support -# -CONFIG_DISPLAY_SUPPORT=m - -# -# Display hardware drivers -# +CONFIG_BACKLIGHT_LM3630A=m +# CONFIG_BACKLIGHT_LM3639 is not set +# CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_BACKLIGHT_OT200 is not set +# CONFIG_BACKLIGHT_TPS65217 is not set +# CONFIG_BACKLIGHT_GPIO is not set +# CONFIG_BACKLIGHT_LV5207LP is not set +# CONFIG_BACKLIGHT_BD6107 is not set # # Console display driver support @@ -3877,17 +4463,6 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=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_SUN8x16 is not set -# CONFIG_FONT_SUN12x22 is not set -# CONFIG_FONT_10x18 is not set # CONFIG_LOGO is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y @@ -3908,11 +4483,13 @@ CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_HRTIMER=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_MAX_CARDS=32 +# CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set CONFIG_SND_VMASTER=y +CONFIG_SND_KCTL_JACK=y CONFIG_SND_DMA_SGBUF=y CONFIG_SND_RAWMIDI_SEQ=m CONFIG_SND_OPL3_LIB_SEQ=m @@ -3937,7 +4514,6 @@ CONFIG_SND_AC97_POWER_SAVE=y CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 CONFIG_SND_SB_COMMON=m CONFIG_SND_SB16_DSP=m -CONFIG_SND_TEA575X=m CONFIG_SND_PCI=y CONFIG_SND_AD1889=m CONFIG_SND_ALS300=m @@ -3988,27 +4564,28 @@ CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_PREALLOC_SIZE=64 +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_PREALLOC_SIZE=4096 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_INPUT_JACK=y CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_CODEC_REALTEK=y -CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y -CONFIG_SND_HDA_CODEC_ANALOG=y -CONFIG_SND_HDA_CODEC_SIGMATEL=y -CONFIG_SND_HDA_CODEC_VIA=y -CONFIG_SND_HDA_CODEC_HDMI=y -CONFIG_SND_HDA_CODEC_CIRRUS=y -CONFIG_SND_HDA_CODEC_CONEXANT=y -CONFIG_SND_HDA_CODEC_CA0110=y -CONFIG_SND_HDA_CODEC_CA0132=y -CONFIG_SND_HDA_CODEC_CMEDIA=y -CONFIG_SND_HDA_CODEC_SI3054=y -CONFIG_SND_HDA_GENERIC=y -CONFIG_SND_HDA_POWER_SAVE=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_I915=y +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_HDSP=m CONFIG_SND_HDSPM=m @@ -4044,26 +4621,27 @@ 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_FIREWIRE=y CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_DICE=m CONFIG_SND_FIREWIRE_SPEAKERS=m CONFIG_SND_ISIGHT=m +CONFIG_SND_SCS1X=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m # CONFIG_SND_SOC is not set # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m -CONFIG_HID_SUPPORT=y -CONFIG_HID=m -CONFIG_HIDRAW=y # -# USB Input Devices +# HID support # -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y +CONFIG_HID=m +CONFIG_HIDRAW=y +CONFIG_UHID=m +CONFIG_HID_GENERIC=m # # Special HID drivers @@ -4072,6 +4650,8 @@ CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m +CONFIG_HID_APPLEIR=m +CONFIG_HID_AUREAL=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m @@ -4081,17 +4661,21 @@ 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_HOLTEK=m CONFIG_HOLTEK_FF=y +CONFIG_HID_HUION=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_LENOVO_TPKBD=m CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH_DJ=m CONFIG_LOGITECH_FF=y @@ -4112,38 +4696,49 @@ 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_PRIMAX=m -CONFIG_HID_QUANTA=m CONFIG_HID_ROCCAT=m -CONFIG_HID_ROCCAT_COMMON=m -CONFIG_HID_ROCCAT_ARVO=m -CONFIG_HID_ROCCAT_KONE=m -CONFIG_HID_ROCCAT_KONEPLUS=m -CONFIG_HID_ROCCAT_KOVAPLUS=m -CONFIG_HID_ROCCAT_PYRA=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_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_WACOM=m -CONFIG_HID_WACOM_POWER_SUPPLY=y 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 + +# +# USB HID support +# +CONFIG_USB_HID=m +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=m CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB_ARCH_HAS_XHCI=y CONFIG_USB=m # CONFIG_USB_DEBUG is not set # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set @@ -4151,12 +4746,11 @@ CONFIG_USB=m # # Miscellaneous USB options # -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_SUSPEND=y -# CONFIG_USB_OTG is not set -# CONFIG_USB_DWC3 is not set +CONFIG_USB_OTG=y +CONFIG_USB_OTG_WHITELIST=y +# CONFIG_USB_OTG_BLACKLIST_HUB is not set CONFIG_USB_MON=m CONFIG_USB_WUSB=m CONFIG_USB_WUSB_CBAF=m @@ -4167,19 +4761,21 @@ CONFIG_USB_WUSB_CBAF=m # CONFIG_USB_C67X00_HCD=m CONFIG_USB_XHCI_HCD=m -# CONFIG_USB_XHCI_HCD_DEBUGGING is not set 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 is not set CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_FUSBH200_HCD=m +CONFIG_USB_FOTG210_HCD=m CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_PCI=m # CONFIG_USB_OHCI_HCD_SSB is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_OHCI_HCD_PLATFORM is not set CONFIG_USB_UHCI_HCD=m CONFIG_USB_U132_HCD=m CONFIG_USB_SL811_HCD=m @@ -4189,6 +4785,9 @@ CONFIG_USB_R8A66597_HCD=m CONFIG_USB_RENESAS_USBHS_HCD=m CONFIG_USB_WHCI_HCD=m 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 CONFIG_USB_RENESAS_USBHS=m # @@ -4222,21 +4821,31 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m -# CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m +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 +CONFIG_USB_MUSB_TUSB6010=m +CONFIG_USB_MUSB_UX500=m +# CONFIG_USB_UX500_DMA is not set +CONFIG_MUSB_PIO_ONLY=y +# CONFIG_USB_DWC3 is not set +# CONFIG_USB_DWC2 is not set +# CONFIG_USB_CHIPIDEA is not set # # USB port drivers # CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=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 @@ -4247,46 +4856,33 @@ 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_FUNSOFT=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_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_MOS7715_PARPORT=y CONFIG_USB_SERIAL_MOS7840=m -CONFIG_USB_SERIAL_MOTOROLA=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_HP4X=m CONFIG_USB_SERIAL_SAFE=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set -CONFIG_USB_SERIAL_SIEMENS_MPI=m CONFIG_USB_SERIAL_SIERRAWIRELESS=m CONFIG_USB_SERIAL_SYMBOL=m CONFIG_USB_SERIAL_TI=m @@ -4296,9 +4892,11 @@ CONFIG_USB_SERIAL_WWAN=m CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m -CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m -CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_XSENS_MT=m +CONFIG_USB_SERIAL_WISHBONE=m +CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m # CONFIG_USB_SERIAL_DEBUG is not set # @@ -4323,33 +4921,72 @@ CONFIG_USB_LD=m CONFIG_USB_TRANCEVIBRATOR=m CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m +# CONFIG_USB_EHSET_TEST_FIXTURE is not set CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m +CONFIG_USB_HSIC_USB3503=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_USB_OTG_FSM=m +CONFIG_NOP_USB_XCEIV=m +CONFIG_SAMSUNG_USBPHY=m +CONFIG_SAMSUNG_USB2PHY=m +CONFIG_SAMSUNG_USB3PHY=m +# CONFIG_USB_GPIO_VBUS is not set +CONFIG_TAHVO_USB=m +# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set +CONFIG_USB_ISP1301=m +CONFIG_USB_RCAR_PHY=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 + +# +# USB Peripheral Controller +# +CONFIG_USB_FOTG210_UDC=m +CONFIG_USB_GR_UDC=m CONFIG_USB_R8A66597=m +CONFIG_USB_RENESAS_USBHS_UDC=m +CONFIG_USB_PXA27X=m +CONFIG_USB_MV_UDC=m +CONFIG_USB_MV_U3D=m CONFIG_USB_M66592=m CONFIG_USB_AMD5536UDC=m -CONFIG_USB_CI13XXX_PCI=m CONFIG_USB_NET2272=m -# CONFIG_USB_NET2272_DMA is not set +CONFIG_USB_NET2272_DMA=y CONFIG_USB_NET2280=m CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_GADGET_DUALSPEED=y -CONFIG_USB_GADGET_SUPERSPEED=y +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_SUBSET=m +CONFIG_USB_F_RNDIS=m +CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_FS=m +# CONFIG_USB_CONFIGFS is not set # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m +# CONFIG_GADGET_UAC1 is not set CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_ETH_EEM is not set @@ -4359,9 +4996,8 @@ CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FUNCTIONFS_ETH=y CONFIG_USB_FUNCTIONFS_RNDIS=y CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set 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 @@ -4374,14 +5010,6 @@ CONFIG_USB_G_DBGP=m # CONFIG_USB_G_DBGP_PRINTK is not set CONFIG_USB_G_DBGP_SERIAL=y CONFIG_USB_G_WEBCAM=m - -# -# OTG and related infrastructure -# -CONFIG_USB_OTG_UTILS=y -CONFIG_USB_GPIO_VBUS=m -CONFIG_NOP_USB_XCEIV=m -CONFIG_AB8500_USB=m CONFIG_UWB=m CONFIG_UWB_HWA=m CONFIG_UWB_WHCI=m @@ -4406,7 +5034,10 @@ CONFIG_SDIO_UART=m CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_ACPI=m CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_SDHCI_PXAV3=m +CONFIG_MMC_SDHCI_PXAV2=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m CONFIG_MMC_SPI=m @@ -4415,6 +5046,7 @@ CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m +CONFIG_MMC_REALTEK_PCI=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -4423,6 +5055,7 @@ CONFIG_MEMSTICK=m # # CONFIG_MEMSTICK_UNSAFE_RESUME is not set CONFIG_MSPRO_BLOCK=m +CONFIG_MS_BLOCK=m # # MemoryStick Host Controller Drivers @@ -4430,50 +5063,90 @@ CONFIG_MSPRO_BLOCK=m CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS=m # # LED drivers # CONFIG_LEDS_LM3530=m -CONFIG_LEDS_NET5501=m +CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set -# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_GPIO=m CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m +CONFIG_LEDS_LP5562=m +CONFIG_LEDS_LP8501=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m -# CONFIG_LEDS_DAC124S085 is not set +CONFIG_LEDS_PCA963X=m +CONFIG_LEDS_PCA9685=m +CONFIG_LEDS_DAC124S085=m CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m CONFIG_LEDS_DELL_NETBOOKS=m -# CONFIG_LEDS_MC13783 is not set -CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_MC13783=m +CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_LM355x=m +CONFIG_LEDS_OT200=m +CONFIG_LEDS_BLINKM=m # # LED Triggers # +CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m 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_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +CONFIG_INFINIBAND_QIB=m +# CONFIG_INFINIBAND_QIB_DCA is not set +CONFIG_INFINIBAND_AMSO1100=m +# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_CXGB4=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_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_EDAC=y - -# -# Reporting subsystems -# +CONFIG_EDAC_LEGACY_SYSFS=y # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DECODE_MCE=m CONFIG_EDAC_MCE_INJ=m @@ -4494,6 +5167,7 @@ CONFIG_EDAC_SBRIDGE=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set @@ -4517,7 +5191,10 @@ CONFIG_RTC_DRV_MAX6900=m CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_ISL12057=m CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF2127=m +CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_PCF8563=m CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m @@ -4542,6 +5219,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_DS3234 is not set # CONFIG_RTC_DRV_PCF2123 is not set +# CONFIG_RTC_DRV_RX4581 is not set # # Platform RTC drivers @@ -4559,13 +5237,19 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_PCF50633=m -CONFIG_RTC_DRV_AB8500=m # # on-CPU RTC drivers # -# CONFIG_RTC_DRV_MC13XXX is not set +CONFIG_RTC_DRV_MC13XXX=m +# CONFIG_RTC_DRV_MOXART is not set + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -4574,16 +5258,20 @@ CONFIG_DMADEVICES=y # CONFIG_INTEL_MID_DMAC=m CONFIG_INTEL_IOATDMA=m +CONFIG_DW_DMAC_CORE=m +CONFIG_DW_DMAC=m +CONFIG_DW_DMAC_PCI=m CONFIG_TIMB_DMA=m CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y +CONFIG_DMA_ACPI=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set +CONFIG_DMA_ENGINE_RAID=y CONFIG_DCA=m CONFIG_AUXDISPLAY=y CONFIG_KS0108=m @@ -4593,14 +5281,19 @@ CONFIG_CFAG12864B=m CONFIG_CFAG12864B_RATE=20 CONFIG_UIO=m CONFIG_UIO_CIF=m -CONFIG_UIO_PDRV=m CONFIG_UIO_PDRV_GENIRQ=m +# CONFIG_UIO_DMEM_GENIRQ is not set CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m +# CONFIG_UIO_MF624 is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO=m -CONFIG_VIRTIO_RING=m # # Virtio drivers @@ -4608,6 +5301,14 @@ CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_MMIO=m +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m # # Xen driver support @@ -4621,12 +5322,16 @@ CONFIG_XEN_BACKEND=y CONFIG_XENFS=m CONFIG_XEN_COMPAT_XENFS=y CONFIG_XEN_SYS_HYPERVISOR=y -CONFIG_XEN_XENBUS_FRONTEND=m +CONFIG_XEN_XENBUS_FRONTEND=y CONFIG_XEN_GNTDEV=m CONFIG_XEN_GRANT_DEV_ALLOC=m CONFIG_SWIOTLB_XEN=y -CONFIG_XEN_TMEM=y +CONFIG_XEN_TMEM=m CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=m +# CONFIG_XEN_MCE_LOG is not set +CONFIG_XEN_HAVE_PVMMU=y CONFIG_STAGING=y CONFIG_ET131X=m CONFIG_SLICOSS=m @@ -4639,56 +5344,57 @@ CONFIG_PRISM2_USB=m CONFIG_ECHO=m CONFIG_COMEDI=m # CONFIG_COMEDI_DEBUG is not set -CONFIG_COMEDI_MISC_DRIVERS=m +CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 +CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 +CONFIG_COMEDI_MISC_DRIVERS=y CONFIG_COMEDI_KCOMEDILIB=m CONFIG_COMEDI_BOND=m CONFIG_COMEDI_TEST=m CONFIG_COMEDI_PARPORT=m CONFIG_COMEDI_SERIAL2002=m CONFIG_COMEDI_SKEL=m -CONFIG_COMEDI_PCI_DRIVERS=m +# CONFIG_COMEDI_ISA_DRIVERS is not set +CONFIG_COMEDI_PCI_DRIVERS=y +CONFIG_COMEDI_8255_PCI=m +CONFIG_COMEDI_ADDI_WATCHDOG=m CONFIG_COMEDI_ADDI_APCI_035=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_2016=m CONFIG_COMEDI_ADDI_APCI_2032=m CONFIG_COMEDI_ADDI_APCI_2200=m -CONFIG_COMEDI_ADDI_APCI_3001=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_PCI7230=m -CONFIG_COMEDI_ADL_PCI7296=m -CONFIG_COMEDI_ADL_PCI7432=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_PCI1723=m +CONFIG_COMEDI_ADV_PCI1724=m CONFIG_COMEDI_ADV_PCI_DIO=m -CONFIG_COMEDI_AMPLC_DIO200=m -CONFIG_COMEDI_AMPLC_PC236=m -CONFIG_COMEDI_AMPLC_PC263=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_UNIOXX5=m CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_MF6X4=m CONFIG_COMEDI_ICP_MULTI=m -CONFIG_COMEDI_II_PCI20KC=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_PCIDIO=m CONFIG_COMEDI_CB_PCIMDAS=m CONFIG_COMEDI_CB_PCIMDDA=m CONFIG_COMEDI_ME4000=m @@ -4697,13 +5403,14 @@ 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_S526=m CONFIG_COMEDI_S626=m -CONFIG_COMEDI_SSV_DNP=m -CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIOCMD=m +CONFIG_COMEDI_PCMCIA_DRIVERS=y CONFIG_COMEDI_CB_DAS16_CS=m CONFIG_COMEDI_DAS08_CS=m CONFIG_COMEDI_NI_DAQ_700_CS=m @@ -4711,65 +5418,45 @@ CONFIG_COMEDI_NI_DAQ_DIO24_CS=m CONFIG_COMEDI_NI_LABPC_CS=m CONFIG_COMEDI_NI_MIO_CS=m CONFIG_COMEDI_QUATECH_DAQP_CS=m -CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_USB_DRIVERS=y CONFIG_COMEDI_DT9812=m CONFIG_COMEDI_USBDUX=m CONFIG_COMEDI_USBDUXFAST=m CONFIG_COMEDI_USBDUXSIGMA=m CONFIG_COMEDI_VMK80XX=m -CONFIG_COMEDI_NI_COMMON=m -CONFIG_COMEDI_MITE=m -CONFIG_COMEDI_NI_TIO=m -CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_8255=m -CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_FC=m -CONFIG_ASUS_OLED=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_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m -CONFIG_RTS_PSTOR=m -# CONFIG_RTS_PSTOR_DEBUG is not set +CONFIG_RTLLIB=m +CONFIG_RTLLIB_CRYPTO_CCMP=m +CONFIG_RTLLIB_CRYPTO_TKIP=m +CONFIG_RTLLIB_CRYPTO_WEP=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set +CONFIG_R8188EU=m +CONFIG_88EU_AP_MODE=y +CONFIG_88EU_P2P=y +CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set +# CONFIG_RTS5208 is not set # CONFIG_TRANZPORT is not set -CONFIG_POHMELFS=m -# CONFIG_POHMELFS_DEBUG is not set CONFIG_IDE_PHISON=m CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_DEBUG is not set -# CONFIG_LINE6_USB_DUMP_CTRL is not set -# CONFIG_LINE6_USB_DUMP_MIDI is not set -# CONFIG_LINE6_USB_DUMP_PCM is not set -# CONFIG_LINE6_USB_RAW is not set # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set -CONFIG_DRM_NOUVEAU=m -CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_NOUVEAU_DEBUG=y - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m CONFIG_USB_SERIAL_QUATECH2=m -CONFIG_USB_SERIAL_QUATECH_USB2=m CONFIG_VT6655=m CONFIG_VT6656=m -CONFIG_HYPERV_STORAGE=m -CONFIG_HYPERV_NET=m -CONFIG_HYPERV_MOUSE=m -# CONFIG_VME_BUS is not set CONFIG_DX_SEP=m -# CONFIG_IIO is not set -CONFIG_XVMALLOC=y -CONFIG_ZRAM=m -# CONFIG_ZRAM_DEBUG is not set -CONFIG_ZCACHE=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m @@ -4785,15 +5472,11 @@ CONFIG_FT1000_PCMCIA=m # CONFIG_SPEAKUP=m CONFIG_SPEAKUP_SYNTH_ACNTSA=m -CONFIG_SPEAKUP_SYNTH_ACNTPC=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_DECPC=m -CONFIG_SPEAKUP_SYNTH_DTLK=m -CONFIG_SPEAKUP_SYNTH_KEYPC=m CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m @@ -4801,12 +5484,66 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_DUMMY=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m -CONFIG_DRM_PSB=m -# CONFIG_DRM_PSB_MRST is not set -# CONFIG_DRM_PSB_MFLD is not set -# CONFIG_DRM_PSB_CDV is not set -# CONFIG_INTEL_MEI is not set -# CONFIG_STAGING_MEDIA is not set +CONFIG_STAGING_MEDIA=y +CONFIG_DVB_AS102=m +CONFIG_I2C_BCM2048=m +CONFIG_DVB_CXD2099=m +CONFIG_VIDEO_DT3155=m +CONFIG_DT3155_CCIR=y +CONFIG_DT3155_STREAMING=y +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set +# CONFIG_USB_MSI3101 is not set +CONFIG_VIDEO_V4L2_INT_DEVICE=m +CONFIG_VIDEO_TCM825X=m +CONFIG_USB_SN9C102=m +CONFIG_SOLO6X10=m +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_BT829=m +CONFIG_LIRC_IGORPLUGUSB=m +CONFIG_LIRC_IMON=m +CONFIG_LIRC_PARALLEL=m +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y +CONFIG_LIRC_SIR=m +CONFIG_LIRC_ZILOG=m + +# +# Android +# +# CONFIG_ANDROID is not set +CONFIG_USB_WPAN_HCD=m +CONFIG_WIMAX_GDM72XX=m +CONFIG_WIMAX_GDM72XX_QOS=y +CONFIG_WIMAX_GDM72XX_K_MODE=y +CONFIG_WIMAX_GDM72XX_WIMAX2=y +CONFIG_WIMAX_GDM72XX_USB=y +# CONFIG_WIMAX_GDM72XX_SDIO is not set +CONFIG_WIMAX_GDM72XX_USB_PM=y +CONFIG_LTE_GDM724X=m +CONFIG_NET_VENDOR_SILICOM=y +CONFIG_SBYPASS=m +CONFIG_BPCTL=m +CONFIG_CED1401=m +CONFIG_DGRP=m +CONFIG_FIREWIRE_SERIAL=m +CONFIG_FWTTY_MAX_TOTAL_PORTS=64 +CONFIG_FWTTY_MAX_CARD_PORTS=32 +# CONFIG_MTD_SPINAND_MT29F is not set +CONFIG_LUSTRE_FS=m +CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192 +# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set +CONFIG_LUSTRE_LLITE_LLOOP=m +CONFIG_LNET=m +CONFIG_LNET_MAX_PAYLOAD=1048576 +CONFIG_LNET_SELFTEST=m +CONFIG_LNET_XPRT_IB=m +# CONFIG_XILLYBUS is not set +CONFIG_DGNC=m +CONFIG_DGAP=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -4816,7 +5553,10 @@ CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=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 @@ -4839,7 +5579,6 @@ CONFIG_ASUS_NB_WMI=m CONFIG_EEEPC_WMI=m CONFIG_ACPI_WMI=m CONFIG_MSI_WMI=m -CONFIG_ACPI_ASUS=m CONFIG_TOPSTAR_LAPTOP=m CONFIG_ACPI_TOSHIBA=m CONFIG_TOSHIBA_BT_RFKILL=m @@ -4851,6 +5590,21 @@ 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=y +CONFIG_PVPANIC=m +CONFIG_CHROME_PLATFORMS=y +CONFIG_CHROMEOS_LAPTOP=m +CONFIG_CHROMEOS_PSTORE=m +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +# CONFIG_COMMON_CLK_SI5351 is not set # # Hardware Spinlock drivers @@ -4858,16 +5612,57 @@ CONFIG_SAMSUNG_Q10=m CONFIG_CLKEVT_I8253=y CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y +# CONFIG_MAILBOX is not set CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y CONFIG_AMD_IOMMU=y # CONFIG_AMD_IOMMU_STATS is not set -# CONFIG_INTEL_IOMMU is not set -# CONFIG_IRQ_REMAP is not set -CONFIG_VIRT_DRIVERS=y -CONFIG_HYPERV=m -CONFIG_HYPERV_UTILS=m +CONFIG_AMD_IOMMU_V2=m +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y +CONFIG_IRQ_REMAP=y + +# +# Remoteproc drivers +# +CONFIG_REMOTEPROC=m +CONFIG_STE_MODEM_RPROC=m + +# +# Rpmsg drivers +# # CONFIG_PM_DEVFREQ is not set +CONFIG_EXTCON=m + +# +# Extcon Device Drivers +# +CONFIG_EXTCON_GPIO=m +CONFIG_MEMORY=y +# CONFIG_IIO is not set +# CONFIG_NTB is not set +# CONFIG_VME_BUS is not set +# CONFIG_PWM is not set +CONFIG_IPACK_BUS=m +CONFIG_BOARD_TPCI200=m +CONFIG_SERIAL_IPOCTAL=m +CONFIG_RESET_CONTROLLER=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_EXYNOS_MIPI_VIDEO=m +CONFIG_BCM_KONA_USB2_PHY=m +CONFIG_POWERCAP=y +CONFIG_INTEL_RAPL=m # # Firmware Drivers @@ -4875,26 +5670,30 @@ CONFIG_HYPERV_UTILS=m CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y -CONFIG_EFI_VARS=y -CONFIG_EFI_VARS_PSTORE=y -# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set 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_SIGMA=m # CONFIG_GOOGLE_FIRMWARE is not set +# +# EFI (Extensible Firmware Interface) Support +# +# CONFIG_EFI_VARS is not set +CONFIG_EFI_RUNTIME_MAP=y +CONFIG_UEFI_CPER=y + # # File systems # +CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=m CONFIG_EXT4_USE_FOR_EXT23=y -CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set @@ -4916,6 +5715,7 @@ 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 @@ -4927,6 +5727,10 @@ CONFIG_OCFS2_FS_STATS=y # 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_FS_POSIX_ACL=y CONFIG_EXPORTFS=y @@ -4948,7 +5752,6 @@ CONFIG_QUOTACTL_COMPAT=y CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m -CONFIG_GENERIC_ACL=y # # Caches @@ -5001,8 +5804,10 @@ CONFIG_MISC_FILESYSTEMS=y # 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 @@ -5019,14 +5824,17 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_UBIFS_FS=m -CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y -# CONFIG_UBIFS_FS_DEBUG is not set CONFIG_LOGFS=m CONFIG_CRAMFS=m CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set +# CONFIG_SQUASHFS_DECOMP_MULTI is not set +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_ZLIB=y CONFIG_SQUASHFS_LZO=y @@ -5039,38 +5847,66 @@ CONFIG_MINIX_FS=m CONFIG_OMFS_FS=m # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_PSTORE=y +# CONFIG_PSTORE_CONSOLE 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=m # CONFIG_EXOFS_DEBUG is not set +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_EFIVAR_FS=y CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m -CONFIG_NFS_V3=y +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -# CONFIG_NFS_V4_1 is not set +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_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_NFS_USE_NEW_IDMAPPER is not set +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_V4_SECURITY_LABEL=y +# CONFIG_NFSD_FAULT_INJECTION is not set 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_XPRT_RDMA=m +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 @@ -5078,10 +5914,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_DEBUG2 is not set -CONFIG_CIFS_DFS_UPCALL=y -CONFIG_CIFS_FSCACHE=y CONFIG_CIFS_ACL=y +# CONFIG_CIFS_DEBUG is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y +CONFIG_CIFS_FSCACHE=y CONFIG_NCP_FS=m # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set @@ -5098,29 +5935,7 @@ CONFIG_AFS_FSCACHE=y CONFIG_9P_FS=m CONFIG_9P_FSCACHE=y CONFIG_9P_FS_POSIX_ACL=y - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_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=y -CONFIG_EFI_PARTITION=y -# CONFIG_SYSV68_PARTITION is not set +CONFIG_9P_FS_SECURITY=y CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=m @@ -5147,7 +5962,7 @@ CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_3=m CONFIG_NLS_ISO8859_4=m @@ -5160,6 +5975,17 @@ 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 @@ -5168,19 +5994,57 @@ CONFIG_DLM=m # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y + +# +# printk and dmesg options +# CONFIG_PRINTK_TIME=y CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +# CONFIG_BOOT_PRINTK_DELAY is not set +CONFIG_DYNAMIC_DEBUG=y + +# +# Compile-time checks and compiler options +# +# CONFIG_DEBUG_INFO is not set CONFIG_ENABLE_WARN_DEPRECATED=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=2048 -CONFIG_MAGIC_SYSRQ=y CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set CONFIG_UNUSED_SYMBOLS=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set +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_DEBUG_KERNEL=y + +# +# Memory Debugging +# +# CONFIG_DEBUG_PAGEALLOC 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_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_DEBUG_SHIRQ is not set + +# +# Debug Lockups and Hangs +# CONFIG_LOCKUP_DETECTOR=y CONFIG_HARDLOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set @@ -5191,70 +6055,65 @@ 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_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 CONFIG_SCHED_DEBUG=y CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -CONFIG_DEBUG_PREEMPT=y + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set -CONFIG_DEBUG_MUTEXES=y +# 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_SPARSE_RCU_POINTER 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_STACKTRACE=y -# CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_VIRTUAL is not set # CONFIG_DEBUG_WRITECOUNT is not set -CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_LIST is not set -# CONFIG_TEST_LIST_SORT is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_DEBUG_CREDENTIALS is not set -CONFIG_ARCH_WANT_FRAME_POINTERS=y -CONFIG_FRAME_POINTER=y -# CONFIG_BOOT_PRINTK_DELAY is not set + +# +# RCU Debugging +# +# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 -CONFIG_RCU_CPU_STALL_VERBOSE=y -# CONFIG_KPROBES_SANITY_TEST is not set -# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_RCU_CPU_STALL_INFO is not set +# CONFIG_RCU_TRACE is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -# CONFIG_DEBUG_PER_CPU_MAPS is not set -CONFIG_LKDTM=m -CONFIG_CPU_NOTIFIER_ERROR_INJECT=m +# CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y -CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=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_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y -CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y -CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y @@ -5264,43 +6123,61 @@ CONFIG_FTRACE=y CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set CONFIG_SCHED_TRACER=y 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_EVENT=y +CONFIG_UPROBE_EVENT=y +CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set CONFIG_RING_BUFFER_BENCHMARK=m -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -CONFIG_DYNAMIC_DEBUG=y -# CONFIG_DMA_API_DEBUG is not set +# CONFIG_RING_BUFFER_STARTUP_TEST is not set + +# +# Runtime Testing +# +CONFIG_LKDTM=m +# CONFIG_TEST_LIST_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=m # CONFIG_ATOMIC64_SELFTEST is not set CONFIG_ASYNC_RAID6_TEST=m +# CONFIG_TEST_STRING_HELPERS is not set +CONFIG_TEST_KSTRTOX=m +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_TEST_MODULE is not set +# CONFIG_TEST_USER_COPY is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set -CONFIG_HAVE_ARCH_KMEMCHECK=y -CONFIG_TEST_KSTRTOX=m CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set -# CONFIG_DEBUG_STACKOVERFLOW is not set +CONFIG_EARLY_PRINTK_EFI=y # CONFIG_X86_PTDUMP is not set CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST 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 @@ -5317,34 +6194,31 @@ 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_STRICT_USER_COPY_CHECKS is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set +# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set # # Security options # CONFIG_KEYS=y +CONFIG_PERSISTENT_KEYRINGS=y +CONFIG_BIG_KEYS=y CONFIG_TRUSTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m # CONFIG_KEYS_DEBUG_PROC_KEYS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_NETWORK_XFRM is not set +# CONFIG_SECURITY_NETWORK is not set CONFIG_SECURITY_PATH=y -# CONFIG_SECURITY_SELINUX is not set +# CONFIG_INTEL_TXT is not set # CONFIG_SECURITY_SMACK is not set -CONFIG_SECURITY_TOMOYO=y -CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 -CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 -# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set -CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +# CONFIG_SECURITY_TOMOYO is not set +# CONFIG_SECURITY_APPARMOR is not set +CONFIG_SECURITY_YAMA=y +CONFIG_SECURITY_YAMA_STACKED=y # CONFIG_IMA is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +# CONFIG_DEFAULT_SECURITY_YAMA is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" CONFIG_XOR_BLOCKS=m @@ -5353,8 +6227,6 @@ CONFIG_ASYNC_MEMCPY=m CONFIG_ASYNC_XOR=m CONFIG_ASYNC_PQ=m CONFIG_ASYNC_RAID6_RECOV=m -CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y -CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y CONFIG_CRYPTO=y # @@ -5372,7 +6244,7 @@ CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP=m CONFIG_CRYPTO_PCOMP2=y -CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y @@ -5383,6 +6255,8 @@ CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_ABLK_HELPER=m +CONFIG_CRYPTO_GLUE_HELPER_X86=m # # Authenticated Encryption with Associated Data @@ -5405,6 +6279,7 @@ CONFIG_CRYPTO_XTS=m # # Hash modes # +CONFIG_CRYPTO_CMAC=m CONFIG_CRYPTO_HMAC=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_VMAC=m @@ -5414,6 +6289,10 @@ CONFIG_CRYPTO_VMAC=m # CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=m +CONFIG_CRYPTO_CRCT10DIF=m +CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -5424,6 +6303,8 @@ CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA1_SSSE3=m +CONFIG_CRYPTO_SHA256_SSSE3=m +CONFIG_CRYPTO_SHA512_SSSE3=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m @@ -5442,8 +6323,14 @@ 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_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m @@ -5451,18 +6338,24 @@ CONFIG_CRYPTO_SALSA20=m CONFIG_CRYPTO_SALSA20_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_ZLIB=m -CONFIG_CRYPTO_LZO=m +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_LZ4=m +CONFIG_CRYPTO_LZ4HC=m # # Random Number Generation @@ -5471,22 +6364,34 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_USER_API=m CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=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_CCP=y +CONFIG_CRYPTO_DEV_CCP_DD=m +CONFIG_CRYPTO_DEV_CCP_CRYPTO=m +CONFIG_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_APIC_ARCHITECTURE=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_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_KVM_MMU_AUDIT=y -CONFIG_VHOST_NET=m +CONFIG_KVM_DEVICE_ASSIGNMENT=y CONFIG_BINARY_PRINTF=y # @@ -5494,19 +6399,36 @@ CONFIG_BINARY_PRINTF=y # CONFIG_RAID6_PQ=m CONFIG_BITREVERSE=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_PERCPU_RWSEM=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m CONFIG_CRC_T10DIF=m 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_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m +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 @@ -5521,20 +6443,46 @@ 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_REED_SOLOMON_DEC16=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_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y CONFIG_CPU_RMAP=y +CONFIG_DQL=y CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y +CONFIG_CLZ_TAB=y CONFIG_CORDIC=m +CONFIG_DDR=y +CONFIG_MPILIB=m +CONFIG_OID_REGISTRY=m +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_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +CONFIG_FONT_AUTOSELECT=y diff --git a/linux-lts/linux-lts.install b/linux-lts/linux-lts.install index d8067a256..9348b5fbb 100644 --- a/linux-lts/linux-lts.install +++ b/linux-lts/linux-lts.install @@ -1,8 +1,8 @@ # arg 1: the new package version # arg 2: the old package version -KERNEL_NAME=-lts -KERNEL_VERSION=3.2.63-1-lts +KERNEL_NAME=-CHAKRA-LTS +KERNEL_VERSION=3.14.44-1-CHAKRA-LTS post_install () { # updating module dependencies @@ -10,38 +10,19 @@ post_install () { depmod ${KERNEL_VERSION} echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." mkinitcpio -p linux${KERNEL_NAME} - - - # add compat symlinks for the initramfs images - ln -sf initramfs-linux${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img - ln -sf initramfs-linux${KERNEL_NAME}-fallback.img \ - boot/kernel26${KERNEL_NAME}-fallback.img - ln -sf vmlinuz-linux${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME} } post_upgrade() { - pacman -Q grub &>/dev/null - hasgrub=$? - pacman -Q grub2-common &>/dev/null - hasgrub2=$? - pacman -Q lilo &>/dev/null - haslilo=$? - # reminder notices - if [ $haslilo -eq 0 ]; then - echo ">>>" - if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then - echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting." - else - echo ">>> You appear to be using the LILO bootloader. You should run" - echo ">>> 'lilo' before rebooting." - fi - echo ">>>" - fi - if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then echo "WARNING: /boot appears to be a separate partition but is not mounted." fi + if [ $(vercmp $2 3.13) -lt 0 ]; then + echo ">>> WARNING: AT keyboard support is no longer built into the kernel." + echo ">>> In order to use your keyboard during early init, you MUST" + echo ">>> include the 'keyboard' hook in your mkinitcpio.conf." + fi + # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} @@ -51,8 +32,8 @@ post_upgrade() { post_remove() { # also remove the compat symlinks - rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}.img - rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}-fallback.img + rm -f boot/initramfs-linux${KERNEL_NAME}.img + rm -f boot/initramfs-linux${KERNEL_NAME}-fallback.img } diff --git a/linux.order b/linux.order new file mode 100644 index 000000000..abe7bb103 --- /dev/null +++ b/linux.order @@ -0,0 +1,13 @@ +#core_packages +#linux +vhba-module +broadcom-wl +acpi_call +ndiswrapper + +#platform_packages +../platform/bbswitch +../platform/nvidia +../platform/nvidia-304xx +../platform/nvidia-340xx +../platform/catalyst diff --git a/linux/PKGBUILD b/linux/PKGBUILD index f4efa4446..615e15b5d 100644 --- a/linux/PKGBUILD +++ b/linux/PKGBUILD @@ -5,29 +5,29 @@ pkgbase=linux pkgname=('linux' 'linux-headers' 'linux-docs') _kernelname=${pkgname#linux} -_basekernel="3.19" -pkgver=3.19.4 -pkgrel=1 +_basekernel="4.0" +pkgver=4.0.5 +pkgrel=2 arch=('x86_64') url="http://www.kernel.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'bc') options=('!strip') -_aufsver=3.19 -source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz" - "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" +_aufsver=4.0 +source=("http://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.xz" + "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" # the main kernel config files 'config.x86_64' # standard config files for mkinitcpio ramdisk 'linux.preset' 'change-default-console-loglevel.patch' - "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${_aufsver}" + "git://github.com/sfjro/aufs4-standalone.git#branch=aufs${_aufsver}" 'config.aufs' 'overlay-multi-layer.patch' ) -sha256sums=('be42511fe5321012bb4a2009167ce56a9e5fe362b4af43e8c371b3666859806c' - '2b086341154af3e8fd0cb5ded954c239a66ffefb9a8c2bd639249b3786dc52d2' - '7b30b8599910a4437a05e159af518a3404b2a39a653ffc597db4861b2cdb01fa' +sha256sums=('0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991' + '60b691210a9e412710e29eac6468d64b6c4d1efc53a6e22878dd51044001adf0' + 'd64ff4dab41da86ac3fd7323ee17a7b52a7bdcc9ec49571e825b838966dae17a' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' 'SKIP' @@ -55,20 +55,20 @@ prepare() { #aufs patches for Live: msg "starting aufs patches" - cp -va "${srcdir}/aufs3-standalone/"{Documentation,fs} . - cp -va "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/uapi/linux + cp -va "${srcdir}/aufs4-standalone/"{Documentation,fs} . + cp -va "${srcdir}/aufs4-standalone/include/uapi/linux/aufs_type.h" ./include/uapi/linux msg "starting aufs patches: kbuild" - patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-kbuild.patch" + patch -p1 -i "${srcdir}/aufs4-standalone/aufs4-kbuild.patch" msg "starting aufs patches: base" - patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-base.patch" + patch -p1 -i "${srcdir}/aufs4-standalone/aufs4-base.patch" msg "starting aufs patches: loopback" - patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-loopback.patch" + patch -p1 -i "${srcdir}/aufs4-standalone/aufs4-loopback.patch" msg "starting aufs patches: mmap" - patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-mmap.patch" + patch -p1 -i "${srcdir}/aufs4-standalone/aufs4-mmap.patch" msg "starting aufs patches: standalone" - patch -p1 -i "${srcdir}/aufs3-standalone/aufs3-standalone.patch" + patch -p1 -i "${srcdir}/aufs4-standalone/aufs4-standalone.patch" - patch -p1 -i "${srcdir}/overlay-multi-layer.patch" + #patch -p1 -i "${srcdir}/overlay-multi-layer.patch" cat "${srcdir}/config.x86_64" > ./.config @@ -163,6 +163,7 @@ package_linux() { # remove build and source links rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # remove the firmware + # we'll get it from the linux-firmware package and we don't want conflicts rm -rf "${pkgdir}/lib/firmware" # gzip -9 all modules to save 100MB of space find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; diff --git a/linux/config.x86_64 b/linux/config.x86_64 index df9d7c0d9..11cfac9a9 100644 --- a/linux/config.x86_64 +++ b/linux/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.19.1-1 Kernel Configuration +# Linux/x86 4.0.5-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -127,6 +127,7 @@ CONFIG_TASK_IO_ACCOUNTING=y # RCU Subsystem # CONFIG_PREEMPT_RCU=y +CONFIG_SRCU=y # CONFIG_TASKS_RCU is not set CONFIG_RCU_STALL_COMMON=y # CONFIG_RCU_USER_QS is not set @@ -190,7 +191,6 @@ CONFIG_RD_LZMA=y CONFIG_RD_XZ=y CONFIG_RD_LZO=y CONFIG_RD_LZ4=y -CONFIG_INIT_FALLBACK=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y @@ -361,6 +361,7 @@ 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_QUEUE_RWLOCK=y CONFIG_QUEUE_RWLOCK=y CONFIG_FREEZER=y @@ -375,6 +376,7 @@ CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_INTEL_LPSS=y +# CONFIG_X86_AMD_PLATFORM_DEVICE is not set CONFIG_IOSF_MBI=m # CONFIG_IOSF_MBI_DEBUG is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y @@ -514,6 +516,7 @@ CONFIG_ZPOOL=y CONFIG_ZBUD=y CONFIG_ZSMALLOC=y # CONFIG_PGTABLE_MAPPING is not set +# CONFIG_ZSMALLOC_STAT is not set CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y @@ -549,6 +552,8 @@ CONFIG_HOTPLUG_CPU=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_CMDLINE_BOOL is not set +CONFIG_HAVE_LIVEPATCH=y +CONFIG_LIVEPATCH=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y @@ -603,6 +608,7 @@ 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 @@ -1255,6 +1261,7 @@ CONFIG_IPDDP_ENCAP=y CONFIG_PHONET=m CONFIG_6LOWPAN=m CONFIG_IEEE802154=m +CONFIG_IEEE802154_SOCKET=m CONFIG_IEEE802154_6LOWPAN=m CONFIG_MAC802154=m CONFIG_NET_SCHED=y @@ -1317,6 +1324,8 @@ 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_CLS_IND=y CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set @@ -1442,6 +1451,7 @@ CONFIG_BT_CMTP=m CONFIG_BT_HIDP=m CONFIG_BT_LE=y CONFIG_BT_6LOWPAN=m +# CONFIG_BT_SELFTEST is not set # # Bluetooth device drivers @@ -1561,7 +1571,7 @@ 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 is not set # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_WANT_DEV_COREDUMP=y CONFIG_ALLOW_DEV_COREDUMP=y @@ -1694,6 +1704,7 @@ CONFIG_MTD_NAND_DOCG4=m CONFIG_MTD_NAND_CAFE=m CONFIG_MTD_NAND_NANDSIM=m # CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_NAND_HISI504=m # CONFIG_MTD_ONENAND is not set # @@ -1752,7 +1763,6 @@ 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_XIP is not set CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -2156,16 +2166,6 @@ CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m CONFIG_FIREWIRE_NOSY=m -CONFIG_I2O=m -CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y -CONFIG_I2O_EXT_ADAPTEC=y -CONFIG_I2O_EXT_ADAPTEC_DMA64=y -CONFIG_I2O_CONFIG=m -CONFIG_I2O_CONFIG_OLD_IOCTL=y -CONFIG_I2O_BUS=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m CONFIG_MACINTOSH_DRIVERS=y CONFIG_MAC_EMUMOUSEBTN=m CONFIG_NETDEVICES=y @@ -2273,6 +2273,7 @@ CONFIG_NET_VENDOR_AMD=y CONFIG_AMD8111_ETH=m CONFIG_PCNET32=m CONFIG_PCMCIA_NMCLAN=m +CONFIG_AMD_XGBE=m # CONFIG_NET_XGENE is not set CONFIG_NET_VENDOR_ARC=y CONFIG_NET_VENDOR_ATHEROS=y @@ -2342,6 +2343,7 @@ CONFIG_IGB_DCA=y CONFIG_IGBVF=m CONFIG_IXGB=m CONFIG_IXGBE=m +CONFIG_IXGBE_VXLAN=y CONFIG_IXGBE_HWMON=y CONFIG_IXGBE_DCA=y CONFIG_IXGBEVF=m @@ -2444,6 +2446,7 @@ 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 @@ -2467,6 +2470,7 @@ CONFIG_PHYLIB=m # CONFIG_AT803X_PHY=m CONFIG_AMD_PHY=m +CONFIG_AMD_XGBE_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m CONFIG_QSEMI_PHY=m @@ -2993,6 +2997,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y CONFIG_MOUSE_PS2_TOUCHKIT=y +CONFIG_MOUSE_PS2_FOCALTECH=y CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m @@ -3119,6 +3124,7 @@ CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m CONFIG_INPUT_BMA150=m +CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_MC13783_PWRBUTTON=m CONFIG_INPUT_MMA8450=m @@ -3136,6 +3142,7 @@ CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m CONFIG_INPUT_RETU_PWRBUTTON=m +CONFIG_INPUT_TPS65218_PWRBUTTON=m CONFIG_INPUT_UINPUT=m CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_PCF8574=m @@ -3201,6 +3208,7 @@ CONFIG_N_HDLC=m CONFIG_N_GSM=m CONFIG_TRACE_ROUTER=m CONFIG_TRACE_SINK=m +CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set # @@ -3225,7 +3233,6 @@ CONFIG_SERIAL_8250_FINTEK=m # # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set -# CONFIG_SERIAL_MRST_MAX3110 is not set CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -3292,8 +3299,9 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m -CONFIG_TCG_ST33_I2C=m +CONFIG_TCG_TIS_I2C_ST33=m CONFIG_TCG_XEN=m +CONFIG_TCG_CRB=m CONFIG_TELCLOCK=m CONFIG_DEVPORT=y # CONFIG_XILLYBUS is not set @@ -3535,7 +3543,9 @@ CONFIG_TEST_POWER=m # CONFIG_CHARGER_BQ24190 is not set CONFIG_CHARGER_BQ24735=m # CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GAUGE_LTC2941 is not set CONFIG_POWER_RESET=y +# CONFIG_POWER_RESET_RESTART is not set CONFIG_POWER_AVS=y CONFIG_HWMON=m CONFIG_HWMON_VID=m @@ -3978,6 +3988,7 @@ 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 @@ -4213,7 +4224,6 @@ CONFIG_MEDIA_COMMON_OPTIONS=y # common driver options # CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_TVEEPROM=m CONFIG_CYPRESS_FIRMWARE=m CONFIG_DVB_B2C2_FLEXCOP=m @@ -4505,6 +4515,7 @@ CONFIG_VGA_SWITCHEROO=y # Direct Rendering Manager # CONFIG_DRM=m +CONFIG_DRM_MIPI_DSI=y CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y @@ -4517,7 +4528,6 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I2C_NXP_TDA998X=m -CONFIG_DRM_PTN3460=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m @@ -4545,6 +4555,11 @@ CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_QXL=m CONFIG_DRM_BOCHS=m +CONFIG_DRM_PANEL=y + +# +# Display Panels +# CONFIG_HSA_AMD=m # @@ -4660,6 +4675,8 @@ CONFIG_HDMI=y CONFIG_VGA_CONSOLE=y # CONFIG_VGACON_SOFT_SCROLLBACK is not set 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 @@ -4825,6 +4842,11 @@ CONFIG_SND_USB_US122L=m CONFIG_SND_USB_6FIRE=m CONFIG_SND_USB_HIFACE=m CONFIG_SND_BCD2000=m +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 @@ -4859,6 +4881,7 @@ CONFIG_HID_APPLE=m CONFIG_HID_APPLEIR=m CONFIG_HID_AUREAL=m CONFIG_HID_BELKIN=m +CONFIG_HID_BETOP_FF=m CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_PRODIKEYS=m @@ -4987,7 +5010,6 @@ CONFIG_USB_EHCI_PCI=m # CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m -CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m CONFIG_USB_FUSBH200_HCD=m # CONFIG_USB_FOTG210_HCD is not set @@ -5062,6 +5084,7 @@ CONFIG_MUSB_PIO_ONLY=y # CONFIG_USB_DWC3 is not set # CONFIG_USB_DWC2 is not set # CONFIG_USB_CHIPIDEA is not set +# CONFIG_USB_ISP1760 is not set # # USB port drivers @@ -5264,8 +5287,6 @@ CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_RICOH_MMC=y CONFIG_MMC_SDHCI_ACPI=m CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_SDHCI_PXAV3=m -CONFIG_MMC_SDHCI_PXAV2=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m CONFIG_MMC_SPI=m @@ -5298,6 +5319,7 @@ CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m +CONFIG_LEDS_CLASS_FLASH=m # # LED drivers @@ -5420,6 +5442,7 @@ CONFIG_RTC_DRV_TEST=m # # I2C RTC drivers # +# CONFIG_RTC_DRV_ABB5ZES3 is not set CONFIG_RTC_DRV_DS1307=m CONFIG_RTC_DRV_DS1374=m CONFIG_RTC_DRV_DS1374_WDT=y @@ -5470,6 +5493,14 @@ 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=y CONFIG_RTC_DRV_DS1742=m CONFIG_RTC_DRV_DS2404=m CONFIG_RTC_DRV_STK17TA8=m @@ -5542,6 +5573,7 @@ CONFIG_VIRTIO=m # Virtio drivers # CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y @@ -5559,6 +5591,7 @@ CONFIG_HYPERV_BALLOON=m CONFIG_XEN_BALLOON=y # CONFIG_XEN_SELFBALLOONING is not set CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512 CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_DEV_EVTCHN=m CONFIG_XEN_BACKEND=y @@ -5711,6 +5744,7 @@ CONFIG_COMEDI_KCOMEDILIB=m CONFIG_COMEDI_AMPLC_DIO200=m CONFIG_COMEDI_AMPLC_PC236=m CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_ISADMA=m CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_LABPC_ISADMA=m CONFIG_COMEDI_NI_TIO=m @@ -5728,8 +5762,6 @@ CONFIG_R8723AU=m CONFIG_8723AU_AP_MODE=y CONFIG_8723AU_BT_COEXIST=y CONFIG_RTS5208=m -CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set CONFIG_VT6655=m CONFIG_VT6656=m @@ -5822,6 +5854,7 @@ CONFIG_SENSORS_HMC5843_SPI=m # # CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set # CONFIG_IIO_SIMPLE_DUMMY is not set +# CONFIG_FB_SM7XX is not set CONFIG_FB_XGI=m CONFIG_FT1000=m CONFIG_FT1000_USB=m @@ -5842,7 +5875,6 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m CONFIG_STAGING_MEDIA=y CONFIG_I2C_BCM2048=m @@ -5850,14 +5882,8 @@ CONFIG_DVB_CXD2099=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y CONFIG_DT3155_STREAMING=y -CONFIG_VIDEO_TLG2300=m CONFIG_DVB_MN88472=m CONFIG_DVB_MN88473=m -CONFIG_MEDIA_PARPORT_SUPPORT=y -CONFIG_VIDEO_BWQCAM=m -CONFIG_VIDEO_CQCAM=m -CONFIG_VIDEO_W9966=m -CONFIG_VIDEO_SAA7191=m CONFIG_LIRC_STAGING=y CONFIG_LIRC_BT829=m CONFIG_LIRC_IMON=m @@ -5897,6 +5923,17 @@ CONFIG_DGAP=m CONFIG_GS_FPGABOOT=m CONFIG_CRYPTO_SKEIN=y # CONFIG_UNISYSSPAR is not set +# CONFIG_FB_TFT is not set +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5961,6 +5998,7 @@ CONFIG_COMMON_CLK=y # # CONFIG_COMMON_CLK_SI5351 is not set # CONFIG_COMMON_CLK_PXA is not set +# CONFIG_COMMON_CLK_CDCE706 is not set # # Hardware Spinlock drivers @@ -5980,6 +6018,11 @@ CONFIG_CLKBLD_I8253=y # CONFIG_MAILBOX is not set CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +CONFIG_IOMMU_IOVA=y CONFIG_AMD_IOMMU=y # CONFIG_AMD_IOMMU_STATS is not set CONFIG_AMD_IOMMU_V2=m @@ -6016,6 +6059,7 @@ CONFIG_DEVFREQ_GOV_USERSPACE=m # # DEVFREQ Drivers # +# CONFIG_PM_DEVFREQ_EVENT is not set CONFIG_EXTCON=m # @@ -6046,6 +6090,8 @@ CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m # CONFIG_KXSD9 is not set # CONFIG_MMA8452 is not set CONFIG_KXCJK1013=m +# CONFIG_MMA9551 is not set +# CONFIG_MMA9553 is not set # # Analog to digital converters @@ -6059,12 +6105,14 @@ CONFIG_KXCJK1013=m # CONFIG_AD7887 is not set # CONFIG_AD7923 is not set # CONFIG_AD799X is not set +# CONFIG_CC10001_ADC is not set # CONFIG_MAX1027 is not set # CONFIG_MAX1363 is not set # CONFIG_MCP320X is not set # CONFIG_MCP3422 is not set # CONFIG_NAU7802 is not set CONFIG_QCOM_SPMI_IADC=m +# CONFIG_QCOM_SPMI_VADC is not set # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC128S052 is not set # CONFIG_TI_AM335X_ADC is not set @@ -6080,6 +6128,11 @@ CONFIG_QCOM_SPMI_IADC=m # CONFIG_HID_SENSOR_IIO_COMMON=m CONFIG_HID_SENSOR_IIO_TRIGGER=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 @@ -6145,6 +6198,7 @@ CONFIG_IIO_ST_GYRO_SPI_3AXIS=m # # CONFIG_ADIS16400 is not set # CONFIG_ADIS16480 is not set +# CONFIG_KMX61 is not set # CONFIG_INV_MPU6050_IIO is not set # @@ -6154,11 +6208,13 @@ CONFIG_IIO_ST_GYRO_SPI_3AXIS=m # CONFIG_AL3320A is not set # CONFIG_APDS9300 is not set # CONFIG_CM32181 is not set +# CONFIG_CM3232 is not set # CONFIG_CM36651 is not set # CONFIG_GP2AP020A00F is not set # CONFIG_ISL29125 is not set CONFIG_HID_SENSOR_ALS=m # CONFIG_HID_SENSOR_PROX is not set +# CONFIG_JSA1212 is not set # CONFIG_SENSORS_LM3533 is not set # CONFIG_LTR501 is not set # CONFIG_TCS3414 is not set @@ -6205,6 +6261,11 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m # # CONFIG_AS3935 is not set +# +# Proximity sensors +# +# CONFIG_SX9500 is not set + # # Temperature sensors # @@ -6310,6 +6371,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_DEBUG is not set # CONFIG_BTRFS_ASSERT is not set CONFIG_NILFS2_FS=m +# CONFIG_FS_DAX is not set CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y @@ -6380,6 +6442,7 @@ CONFIG_TMPFS_XATTR=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_CONFIGFS_FS=y +CONFIG_EFIVAR_FS=y CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m @@ -6436,6 +6499,7 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y CONFIG_ROMFS_ON_BLOCK=y CONFIG_PSTORE=y # 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 @@ -6450,7 +6514,27 @@ CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y CONFIG_F2FS_CHECK_FS=y -CONFIG_EFIVAR_FS=y +# CONFIG_F2FS_IO_TRACE is not set +CONFIG_AUFS_FS=m +CONFIG_AUFS_BRANCH_MAX_127=y +# CONFIG_AUFS_BRANCH_MAX_511 is not set +# CONFIG_AUFS_BRANCH_MAX_1023 is not set +# CONFIG_AUFS_BRANCH_MAX_32767 is not set +CONFIG_AUFS_SBILIST=y +CONFIG_AUFS_HNOTIFY=y +CONFIG_AUFS_HFSNOTIFY=y +CONFIG_AUFS_EXPORT=y +CONFIG_AUFS_INO_T_64=y +CONFIG_AUFS_XATTR=y +CONFIG_AUFS_FHSM=y +CONFIG_AUFS_RDU=y +CONFIG_AUFS_SHWH=y +CONFIG_AUFS_BR_RAMFS=y +CONFIG_AUFS_BR_FUSE=y +CONFIG_AUFS_POLL=y +CONFIG_AUFS_BR_HFSPLUS=y +CONFIG_AUFS_BDEV_LOOP=y +# CONFIG_AUFS_DEBUG is not set CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -6464,6 +6548,7 @@ 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 @@ -6476,6 +6561,7 @@ CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y +CONFIG_NFSD_PNFS=y CONFIG_NFSD_V4_SECURITY_LABEL=y # CONFIG_NFSD_FAULT_INJECTION is not set CONFIG_GRACE_PERIOD=m @@ -6628,6 +6714,8 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_HAVE_DEBUG_STACKOVERFLOW=y # CONFIG_DEBUG_STACKOVERFLOW is not set CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_KASAN_SHADOW_OFFSET=0xdffffc0000000000 # CONFIG_DEBUG_SHIRQ is not set # @@ -6749,6 +6837,7 @@ CONFIG_LKDTM=m CONFIG_PERCPU_TEST=m # CONFIG_ATOMIC64_SELFTEST is not set CONFIG_ASYNC_RAID6_TEST=m +# CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_STRING_HELPERS is not set CONFIG_TEST_KSTRTOX=m # CONFIG_TEST_RHASHTABLE is not set @@ -6801,7 +6890,6 @@ CONFIG_PERSISTENT_KEYRINGS=y CONFIG_BIG_KEYS=y CONFIG_TRUSTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m -# CONFIG_KEYS_DEBUG_PROC_KEYS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y @@ -6973,6 +7061,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=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_HASH_INFO=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m @@ -7000,6 +7089,8 @@ 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_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -7013,6 +7104,7 @@ CONFIG_BINARY_PRINTF=y # CONFIG_RAID6_PQ=m CONFIG_BITREVERSE=y +# CONFIG_HAVE_ARCH_BITREVERSE is not set CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_NET_UTILS=y diff --git a/linux/linux.install b/linux/linux.install index 55c8bb0f6..4fa86995c 100644 --- a/linux/linux.install +++ b/linux/linux.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.19.1-1-CHAKRA +KERNEL_VERSION=4.0.5-1-CHAKRA # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/logrotate/PKGBUILD b/logrotate/PKGBUILD index abacf07c6..bed915aa6 100644 --- a/logrotate/PKGBUILD +++ b/logrotate/PKGBUILD @@ -1,10 +1,6 @@ -# -# Core Packages for Chakra, part of chakra-project.org -# -# maintainer (x86_64): Manuel Tortosa pkgname=logrotate -pkgver=3.8.7 +pkgver=3.8.9 pkgrel=1 pkgdesc="Rotates system logs automatically" arch=('x86_64') @@ -12,13 +8,12 @@ url="https://fedorahosted.org/logrotate/" license=('GPL') groups=('base') depends=('popt' 'gzip' 'acl') -optdepends=('cron: scheduled log rotation') backup=('etc/logrotate.conf') source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz" 'paths.patch' 'logrotate.conf' logrotate.{timer,service}) -md5sums=('99e08503ef24c3e2e3ff74cc5f3be213' +md5sums=('2660f30742da79870d15d042b07829f6' 'e76526bcd6fc33c9d921e1cb1eff1ffb' '94dae4d3eded2fab9ae879533d3680db' '287c2ad9b074cb5478db7692f385827c' @@ -29,7 +24,13 @@ build() { patch -p0 -i "$srcdir/paths.patch" - make WITH_ACL=yes RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS" + ./autogen.sh + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --mandir=/usr/share/man \ + --with-acl + make } check() { @@ -39,8 +40,7 @@ check() { package() { cd "$srcdir/${pkgname}-${pkgver}" - make PREFIX="$pkgdir" MANDIR="/usr/share/man" install - mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin + make DESTDIR="$pkgdir" install install -dm755 "$pkgdir/etc/logrotate.d" install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf" @@ -48,5 +48,5 @@ package() { install -D -m644 ${srcdir}/logrotate.timer ${pkgdir}/usr/lib/systemd/system/logrotate.timer install -D -m644 ${srcdir}/logrotate.service ${pkgdir}/usr/lib/systemd/system/logrotate.service install -d -m755 ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants - ln -s ../logrotate.timer ${pkgdir}//usr/lib/systemd/system/multi-user.target.wants/logrotate.timer + ln -s ../logrotate.timer ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants/logrotate.timer } \ No newline at end of file diff --git a/lvm2/PKGBUILD b/lvm2/PKGBUILD index 6ed3582e9..b510269f2 100644 --- a/lvm2/PKGBUILD +++ b/lvm2/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.111 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -20,7 +20,7 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvm2-make-sockets-static.patch) sha1sums=('2e7b5d48d55aaf4aba1214c3211a194e4c13aa3e' 'SKIP' - 'be3b7db02e76d31d4742dc853b2fa3f898368ff8' + '3a00124d40028b278dd7d0b887ef891f43f83e98' 'ff0fdf0a3005a41acd4b36865056109effc3474b' '86c18852409dc03f38bdd734ac3e7b54bed9c4ce' 'f6a554eea9557c3c236df2943bb6e7e723945c41' diff --git a/lvm2/lvm2_install b/lvm2/lvm2_install index fd0a51075..aedae922d 100644 --- a/lvm2/lvm2_install +++ b/lvm2/lvm2_install @@ -6,9 +6,9 @@ build() { add_module "$mod" done - add_binary "/usr/bin/lvm" - add_binary "/usr/bin/lvmetad" - add_binary "/usr/bin/dmsetup" + add_binary "/usr/sbin/lvm" + add_binary "/usr/sbin/lvmetad" + add_binary "/usr/sbin/dmsetup" add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" diff --git a/lzo2/PKGBUILD b/lzo2/PKGBUILD index ea537c442..e22321df8 100644 --- a/lzo2/PKGBUILD +++ b/lzo2/PKGBUILD @@ -1,6 +1,6 @@ pkgname=lzo2 -pkgver=2.08 +pkgver=2.09 pkgrel=1 pkgdesc="Portable lossless data compression library" arch=('x86_64') @@ -8,7 +8,7 @@ url="http://www.oberhumer.com/opensource/lzo" license=('GPL') depends=('glibc') source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz) -sha1sums=('64c3e44843a44ffc4533aa89e41516f42bfefa76') +sha1sums=('e2a60aca818836181e7e6f8c4f2c323aca6ac057') build() { cd "${srcdir}/lzo-${pkgver}" diff --git a/m4/PKGBUILD b/m4/PKGBUILD index ad01933ed..991c3bc24 100644 --- a/m4/PKGBUILD +++ b/m4/PKGBUILD @@ -1,11 +1,7 @@ -# -# Core Packages for Chakra, part of chakra-project.org -# -# maintainer (x86_64): Manuel Tortosa pkgname=m4 -pkgver=1.4.16 -pkgrel=2 +pkgver=1.4.17 +pkgrel=1 pkgdesc="m4 macro processor" arch=('i686' 'x86_64') license=('GPL3') @@ -14,11 +10,20 @@ install=m4.install groups=('base-devel') depends=('glibc' 'bash') source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz) -md5sums=('7548ec061a1ba993790159764f522d0e') +md5sums=('12a3c829301a4fd6586a57d3fcf196dc') build() { - cd ${srcdir}/$pkgname-$pkgver + cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 - make prefix=${pkgdir}/usr install || return 1 + make } + +check() { + cd ${srcdir}/$pkgname-$pkgver + make check +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make prefix=${pkgdir}/usr install +} \ No newline at end of file diff --git a/man-pages/PKGBUILD b/man-pages/PKGBUILD index 85c2359d9..ccc0a61f6 100644 --- a/man-pages/PKGBUILD +++ b/man-pages/PKGBUILD @@ -1,10 +1,9 @@ # -# Core Packages for Chakra, part of chakra-project.org +# Core Packages for Chakra, part of chakra.org # -# maintainer (x86_64): Manuel Tortosa pkgname=man-pages -pkgver=3.70 +pkgver=4.00 _posixver=2003-a pkgrel=1 pkgdesc="Linux man pages" @@ -15,7 +14,7 @@ groups=('base') depends=() source=(http://www.kernel.org/pub/linux/docs/man-pages/$pkgname-$pkgver.tar.xz http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/$pkgname-posix-${_posixver}.tar.bz2) -md5sums=('e5a3fc1d7ae4f03a27676d7bad725416' +md5sums=('3401eb0020c56639070d199c3e59a4f8' '7c78aff03c0a6767ba483d34f19e4b09') build() { @@ -51,4 +50,6 @@ package() { rm -f man1/diff.1 # this is included in xf86-input-mouse rm -f man4/mouse.4 + # this is included in attr + rm -f man5/attr.5 } diff --git a/mkinitcpio-busybox/PKGBUILD b/mkinitcpio-busybox/PKGBUILD index e06c75d5e..72a765420 100644 --- a/mkinitcpio-busybox/PKGBUILD +++ b/mkinitcpio-busybox/PKGBUILD @@ -1,36 +1,33 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas[at]chakra-project[dog]org> -# maintainer Manuel Tortosa pkgname=mkinitcpio-busybox -pkgver=1.19.4 -pkgrel=2 +pkgver=1.23.2 +pkgrel=1 pkgdesc="base initramfs tools" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.busybox.net/" license=('GPL') depends=('glibc') options=('!buildflags') source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" 'config') -sha256sums=('9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee' - '28dc775e12c40718b48e1dd6a63544ca9d8aa128f786577b27e4df73e1e8766a') +sha256sums=('05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a' + '240c9ab805fbf5eb3347b2a42f62d840f160c4999d0f172b28ba50dadad09ada') + +prepare() { + cd "busybox-$pkgver" + + local safeflags="-march=${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" + + sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="'"$safeflags"'"|' "$srcdir/config" >.config +} build() { - cd "$srcdir/busybox-$pkgver" - - local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" - - sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ - "$srcdir/config" > .config - - make + make -C "busybox-$pkgver" + + # save configuration for later reuse + cat busybox-$pkgver/.config > "${startdir}/config.last" } package() { install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/usr/lib/initcpio/busybox" } - -# vim:set ts=2 sw=2 et: diff --git a/mkinitcpio-busybox/config b/mkinitcpio-busybox/config index 3cd776e03..61c4c0800 100644 --- a/mkinitcpio-busybox/config +++ b/mkinitcpio-busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.19.2 -# Sun Oct 16 15:24:19 2011 +# Busybox version: 1.23.2 +# Sun Jun 7 19:05:39 2015 # CONFIG_HAVE_DOT_CONFIG=y @@ -36,12 +36,15 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_PAM is not set +CONFIG_FEATURE_USE_SENDFILE=y CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_UTMP is not set # CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_PIDFILE is not set +CONFIG_PID_FILE_PATH="" CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set @@ -49,7 +52,7 @@ CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y +# CONFIG_FEATURE_HAVE_RPC is not set # # Build Options @@ -62,13 +65,17 @@ CONFIG_FEATURE_HAVE_RPC=y # CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_EXTRA_CFLAGS="" +CONFIG_SYSROOT="" +CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing" +CONFIG_EXTRA_LDFLAGS="" +CONFIG_EXTRA_LDLIBS="" # # Debugging Options # # CONFIG_DEBUG is not set # CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set @@ -92,7 +99,8 @@ CONFIG_PREFIX="./_install" # CONFIG_FEATURE_SYSTEMD is not set # CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=0 +CONFIG_MD5_SMALL=0 +CONFIG_SHA3_SMALL=0 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set # CONFIG_FEATURE_USE_TERMIOS is not set @@ -101,6 +109,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set CONFIG_FEATURE_EDITING_HISTORY=15 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set # CONFIG_FEATURE_REVERSE_SEARCH is not set CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set @@ -124,12 +133,19 @@ CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_FEATURE_SEAMLESS_XZ is not set # CONFIG_FEATURE_SEAMLESS_LZMA is not set # CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set +CONFIG_FEATURE_SEAMLESS_GZ=y # CONFIG_FEATURE_SEAMLESS_Z is not set # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set # CONFIG_FEATURE_AR_CREATE is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_GUNZIP is not set # CONFIG_BUNZIP2 is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +# CONFIG_LZMA is not set +# CONFIG_UNXZ is not set +# CONFIG_XZ is not set # CONFIG_BZIP2 is not set # CONFIG_CPIO is not set # CONFIG_FEATURE_CPIO_O is not set @@ -137,13 +153,13 @@ CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -# CONFIG_GUNZIP is not set # CONFIG_GZIP is not set # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set +CONFIG_GZIP_FAST=0 # CONFIG_LZOP is not set # CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set # CONFIG_RPM is not set +# CONFIG_RPM2CPIO is not set # CONFIG_TAR is not set # CONFIG_FEATURE_TAR_CREATE is not set # CONFIG_FEATURE_TAR_AUTODETECT is not set @@ -156,12 +172,6 @@ CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_FEATURE_TAR_UNAME_GNAME is not set # CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set # CONFIG_FEATURE_TAR_SELINUX is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -# CONFIG_LZMA is not set -# CONFIG_UNXZ is not set -# CONFIG_XZ is not set # CONFIG_UNZIP is not set # @@ -173,14 +183,19 @@ CONFIG_CAT=y # CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set # CONFIG_FEATURE_DATE_COMPAT is not set +# CONFIG_HOSTID is not set # CONFIG_ID is not set # CONFIG_GROUPS is not set +CONFIG_SHUF=y CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_NODEREF=y +# CONFIG_FEATURE_TOUCH_SUSV3 is not set # CONFIG_TR is not set # CONFIG_FEATURE_TR_CLASSES is not set # CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_UNLINK=y # CONFIG_BASE64 is not set # CONFIG_WHO is not set # CONFIG_USERS is not set @@ -220,7 +235,6 @@ CONFIG_FALSE=y # CONFIG_FSYNC is not set CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y -# CONFIG_HOSTID is not set CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y CONFIG_LN=y @@ -257,6 +271,7 @@ CONFIG_SEQ=y CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y CONFIG_SHA512SUM=y +# CONFIG_SHA3SUM is not set CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -268,7 +283,7 @@ CONFIG_STAT=y CONFIG_FEATURE_STAT_FORMAT=y # CONFIG_STTY is not set # CONFIG_SUM is not set -# CONFIG_SYNC is not set +CONFIG_SYNC=y CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -288,6 +303,11 @@ CONFIG_FEATURE_WC_LARGE=y # CONFIG_WHOAMI is not set CONFIG_YES=y +# +# Common options +# +CONFIG_FEATURE_VERBOSE=y + # # Common options for cp and mv # @@ -304,7 +324,7 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum, sha256sum, sha512sum +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y @@ -313,7 +333,7 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # CONFIG_CHVT is not set # CONFIG_FGCONSOLE is not set -# CONFIG_CLEAR is not set +CONFIG_CLEAR=y # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set CONFIG_KBD_MODE=y @@ -354,7 +374,16 @@ CONFIG_MKTEMP=y # # Editors # +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_LIBM is not set +CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y +# CONFIG_CMP is not set +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_ED is not set # CONFIG_PATCH is not set +CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 CONFIG_FEATURE_VI_8BIT=y @@ -369,15 +398,9 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -CONFIG_SED=y +CONFIG_FEATURE_VI_UNDO=y +CONFIG_FEATURE_VI_UNDO_QUEUE=y +CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 # CONFIG_FEATURE_ALLOW_EXEC is not set # @@ -394,6 +417,7 @@ CONFIG_SED=y # CONFIG_FEATURE_FIND_NEWER is not set # CONFIG_FEATURE_FIND_INUM is not set # CONFIG_FEATURE_FIND_EXEC is not set +# CONFIG_FEATURE_FIND_EXEC_PLUS is not set # CONFIG_FEATURE_FIND_USER is not set # CONFIG_FEATURE_FIND_GROUP is not set # CONFIG_FEATURE_FIND_NOT is not set @@ -415,6 +439,7 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set # CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set +# CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR is not set # # Init Utilities @@ -451,6 +476,7 @@ CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_ADDUSER is not set # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set # CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_LAST_ID=0 CONFIG_FIRST_SYSTEM_ID=0 CONFIG_LAST_SYSTEM_ID=0 # CONFIG_ADDGROUP is not set @@ -461,7 +487,7 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set # CONFIG_GETTY is not set # CONFIG_LOGIN is not set -# CONFIG_PAM is not set +# CONFIG_LOGIN_SESSION_AS_CHILD is not set # CONFIG_LOGIN_SCRIPTS is not set # CONFIG_FEATURE_NOLOGIN is not set # CONFIG_FEATURE_SECURETTY is not set @@ -469,6 +495,7 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set # CONFIG_CRYPTPW is not set # CONFIG_CHPASSWD is not set +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" # CONFIG_SU is not set # CONFIG_FEATURE_SU_SYSLOG is not set # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set @@ -511,13 +538,21 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set # CONFIG_FEATURE_MODUTILS_ALIAS is not set # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -# CONFIG_DEFAULT_MODULES_DIR is not set -# CONFIG_DEFAULT_DEPMOD_FILE is not set +CONFIG_DEFAULT_MODULES_DIR="" +CONFIG_DEFAULT_DEPMOD_FILE="" # # Linux System Utilities # # CONFIG_BLOCKDEV is not set +CONFIG_FATATTR=y +CONFIG_FSTRIM=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_RENAME is not set +# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set # CONFIG_REV is not set # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set @@ -561,12 +596,6 @@ CONFIG_HEXDUMP=y CONFIG_LOSETUP=y # CONFIG_LSPCI is not set # CONFIG_LSUSB is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set # CONFIG_MKSWAP is not set # CONFIG_FEATURE_MKSWAP_UUID is not set # CONFIG_MORE is not set @@ -588,6 +617,7 @@ CONFIG_LOSETUP=y # CONFIG_SCRIPTREPLAY is not set # CONFIG_SETARCH is not set # CONFIG_SWAPONOFF is not set +# CONFIG_FEATURE_SWAPON_DISCARD is not set # CONFIG_FEATURE_SWAPON_PRI is not set # CONFIG_SWITCH_ROOT is not set CONFIG_UMOUNT=y @@ -600,32 +630,36 @@ CONFIG_FEATURE_MOUNT_LOOP=y CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_MTAB_SUPPORT is not set # CONFIG_VOLUMEID is not set - -# -# Filesystem/Volume identification -# -# CONFIG_FEATURE_VOLUMEID_EXT is not set # CONFIG_FEATURE_VOLUMEID_BTRFS is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +# CONFIG_FEATURE_VOLUMEID_EXFAT is not set +# CONFIG_FEATURE_VOLUMEID_EXT is not set +# CONFIG_FEATURE_VOLUMEID_F2FS is not set # CONFIG_FEATURE_VOLUMEID_FAT is not set # CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +# CONFIG_FEATURE_VOLUMEID_JFS is not set # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set +# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set +# CONFIG_FEATURE_VOLUMEID_LUKS is not set +# CONFIG_FEATURE_VOLUMEID_NILFS is not set +# CONFIG_FEATURE_VOLUMEID_NTFS is not set +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +# CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_UDF is not set +# CONFIG_FEATURE_VOLUMEID_XFS is not set # # Miscellaneous Utilities # # CONFIG_CONSPY is not set +# CONFIG_CROND is not set +# CONFIG_FEATURE_CROND_D is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_DIR="" CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 CONFIG_FEATURE_LESS_BRACKETS=y @@ -638,13 +672,17 @@ CONFIG_FEATURE_LESS_FLAGS=y # CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set +# CONFIG_RFKILL is not set # CONFIG_SETSERIAL is not set +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set # CONFIG_UBIRMVOL is not set # CONFIG_UBIRSVOL is not set # CONFIG_UBIUPDATEVOL is not set +# CONFIG_WALL is not set # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set @@ -660,10 +698,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set # CONFIG_FEATURE_CHAT_CLR_ABORT is not set # CONFIG_CHRT is not set -# CONFIG_CROND is not set -# CONFIG_FEATURE_CROND_D is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="" # CONFIG_CRONTAB is not set # CONFIG_DC is not set # CONFIG_FEATURE_DC_LIBM is not set @@ -697,22 +731,18 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_FEATURE_MAKEDEVS_TABLE is not set # CONFIG_MAN is not set # CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set +CONFIG_MOUNTPOINT=y # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set # CONFIG_READAHEAD is not set -# CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set # CONFIG_SETSID is not set CONFIG_STRINGS=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set # CONFIG_TIME is not set # CONFIG_TIMEOUT is not set # CONFIG_TTYSIZE is not set # CONFIG_VOLNAME is not set -# CONFIG_WALL is not set # CONFIG_WATCHDOG is not set # @@ -744,13 +774,13 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y # CONFIG_FTPD is not set # CONFIG_FEATURE_FTP_WRITE is not set # CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set +# CONFIG_FEATURE_FTP_AUTHENTICATION is not set # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set # CONFIG_HOSTNAME is not set # CONFIG_HTTPD is not set # CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set @@ -807,6 +837,7 @@ CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set +# CONFIG_FEATURE_NTPD_CONF is not set # CONFIG_PSCAN is not set CONFIG_ROUTE=y # CONFIG_SLATTACH is not set @@ -835,6 +866,7 @@ CONFIG_FEATURE_TFTP_GET=y # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # CONFIG_TUNCTL is not set # CONFIG_FEATURE_TUNCTL_UG is not set +# CONFIG_UDHCPC6 is not set # CONFIG_UDHCPD is not set # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set @@ -843,6 +875,7 @@ CONFIG_FEATURE_TFTP_GET=y CONFIG_DHCPD_LEASES_FILE="" # CONFIG_UDHCPC is not set # CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set @@ -881,6 +914,7 @@ CONFIG_FEATURE_MIME_CHARSET="" # Process Utilities # # CONFIG_IOSTAT is not set +# CONFIG_LSOF is not set # CONFIG_MPSTAT is not set # CONFIG_NMETER is not set # CONFIG_PMAP is not set @@ -888,6 +922,13 @@ CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_PSTREE is not set # CONFIG_PWDX is not set # CONFIG_SMEMCAP is not set +# CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set +# CONFIG_FEATURE_TOP_SMP_CPU is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set +# CONFIG_FEATURE_TOPMEM is not set CONFIG_UPTIME=y # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_FREE=y @@ -902,18 +943,12 @@ CONFIG_FEATURE_PIDOF_OMIT=y # CONFIG_PKILL is not set CONFIG_PS=y CONFIG_FEATURE_PS_WIDE=y +CONFIG_FEATURE_PS_LONG=y # CONFIG_FEATURE_PS_TIME is not set # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set # CONFIG_RENICE is not set # CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set # CONFIG_FEATURE_SHOW_THREADS is not set # CONFIG_WATCH is not set @@ -959,6 +994,7 @@ CONFIG_ASH_GETOPTS=y CONFIG_ASH_BUILTIN_ECHO=y CONFIG_ASH_BUILTIN_PRINTF=y CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_HELP=y CONFIG_ASH_CMDCMD=y # CONFIG_ASH_MAIL is not set CONFIG_ASH_OPTIMIZE_FOR_SIZE=y @@ -1008,6 +1044,7 @@ CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 # CONFIG_LOGREAD is not set # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_FEATURE_KMSG_SYSLOG is not set # CONFIG_KLOGD is not set # CONFIG_FEATURE_KLOGD_KLOGCTL is not set # CONFIG_LOGGER is not set diff --git a/mpfr/PKGBUILD b/mpfr/PKGBUILD index 4868d5eaa..3220b4a16 100644 --- a/mpfr/PKGBUILD +++ b/mpfr/PKGBUILD @@ -1,11 +1,7 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer: Manuel Tortosa pkgname=mpfr _pkgver=3.1.2 -_patchlevel=p10 +_patchlevel=p11 pkgver=${_pkgver}.${_patchlevel} #pkgver=${_pkgver} pkgrel=1 @@ -19,7 +15,7 @@ source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc} mpfr-${_pkgver}-${_patchlevel}.patch) md5sums=('e3d203d188b8fe60bb6578dd3152e05c' 'SKIP' - '43121795ef12f1b29ada4508d9186ea9') + '9f96a5c7cac1d6cd983ed9cf7d997074') validpgpkeys=('07F3DBBECC1A39605078094D980C197698C3739D') build() { diff --git a/mpfr/mpfr-3.1.2-p10.patch b/mpfr/mpfr-3.1.2-p11.patch similarity index 96% rename from mpfr/mpfr-3.1.2-p10.patch rename to mpfr/mpfr-3.1.2-p11.patch index d42e62bf1..cbfe0f533 100644 --- a/mpfr/mpfr-3.1.2-p10.patch +++ b/mpfr/mpfr-3.1.2-p11.patch @@ -1575,3 +1575,52 @@ diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE) locale_da_DK (); +diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES +--- mpfr-3.1.2-a/PATCHES 2014-12-04 01:41:57.131789485 +0000 ++++ mpfr-3.1.2-b/PATCHES 2014-12-04 01:41:57.339791833 +0000 +@@ -0,0 +1 @@ ++strtofr +diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION +--- mpfr-3.1.2-a/VERSION 2014-12-04 01:41:57.127789443 +0000 ++++ mpfr-3.1.2-b/VERSION 2014-12-04 01:41:57.339791833 +0000 +@@ -1 +1 @@ +-3.1.2-p10 ++3.1.2-p11 +diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h +--- mpfr-3.1.2-a/src/mpfr.h 2014-12-04 01:41:57.127789443 +0000 ++++ mpfr-3.1.2-b/src/mpfr.h 2014-12-04 01:41:57.335791790 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "3.1.2-p10" ++#define MPFR_VERSION_STRING "3.1.2-p11" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.2-a/src/strtofr.c mpfr-3.1.2-b/src/strtofr.c +--- mpfr-3.1.2-a/src/strtofr.c 2013-03-13 15:37:32.000000000 +0000 ++++ mpfr-3.1.2-b/src/strtofr.c 2014-12-04 01:41:57.287791246 +0000 +@@ -473,8 +473,10 @@ + /* prec bits corresponds to ysize limbs */ + ysize_bits = ysize * GMP_NUMB_BITS; + /* and to ysize_bits >= prec > MPFR_PREC (x) bits */ +- y = MPFR_TMP_LIMBS_ALLOC (2 * ysize + 1); +- y += ysize; /* y has (ysize+1) allocated limbs */ ++ /* we need to allocate one more limb to work around bug ++ https://gmplib.org/list-archives/gmp-bugs/2013-December/003267.html */ ++ y = MPFR_TMP_LIMBS_ALLOC (2 * ysize + 2); ++ y += ysize; /* y has (ysize+2) allocated limbs */ + + /* pstr_size is the number of characters we read in pstr->mant + to have at least ysize full limbs. +diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c +--- mpfr-3.1.2-a/src/version.c 2014-12-04 01:41:57.131789485 +0000 ++++ mpfr-3.1.2-b/src/version.c 2014-12-04 01:41:57.339791833 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.2-p10"; ++ return "3.1.2-p11"; + } diff --git a/ndiswrapper-lts/PKGBUILD b/ndiswrapper-lts/PKGBUILD index 39159a7f5..039a388c8 100644 --- a/ndiswrapper-lts/PKGBUILD +++ b/ndiswrapper-lts/PKGBUILD @@ -1,15 +1,14 @@ # Maintainer: Neophytos Kolokotronis -# contributor: abveritas@chakra-project.org -# Find the kernel name inside the chroot -_extramodules=extramodules-3.2-lts +_extramodules=extramodules-3.14-CHAKRA-LTS _kver="$(cat /lib/modules/${_extramodules}/version)" -_kernelver=3.2.63 +_kernelver=3.14.44 +_rootOfSourceTree=/usr/src/linux-${_kver} pkgname=ndiswrapper-lts _pkgname=ndiswrapper pkgver=1.59 -pkgrel=4 +pkgrel=6 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For linux-testing." license=('GPL') arch=('x86_64') @@ -17,25 +16,32 @@ url="http://ndiswrapper.sourceforge.net" install="ndiswrapper.install" depends=("linux-lts=${_kernelver}") makedepends=("linux-lts-headers=${_kernelver}") -source=("http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz") -md5sums=('e26a7213468ccd6b0bb4c211c7aadeaa') +source=("http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz" + "ndiswrapper-1.59.patch") +sha1sums=('75fbbda677fe91ee07a6f6a8e19b1f3e2479540f' + 'f120e96fa9abab45e1c724aaac29da7b892820f0') + +prepare() { + [ -z "$_kver" ] && error "Could not get kernel version from '/usr/lib/modules/${_extramodules}/version'..." && false + msg "Found kernel version: $_kver" + + cd "$srcdir/$_pkgname-$pkgver" + patch -p1 -i ../ndiswrapper-1.59.patch + sed -i "/modinfo/s/s/usr\//" driver/Makefile +} build() { - cd "$srcdir/$_pkgname-$pkgver" - - sed -i "/modinfo/s/s/usr\//" driver/Makefile - - make KBUILD=/usr/src/linux-$_kver KVERS=$_kver + cd "$srcdir/$_pkgname-$pkgver" + make -C driver KVERS_UNAME=${_kver} + make -C utils } package() { cd "$srcdir/$_pkgname-$pkgver" - make KBUILD=/usr/src/linux-$_kver INST_DIR="usr/lib/modules/$_extramodules" \ - KVERS=$_kver DESTDIR="$pkgdir/" install + make sbindir=/usr/sbin usrsbindir=/usr/sbin KBUILD=${_rootOfSourceTree} INST_DIR="usr/lib/modules/$_extramodules" \ + KVERS=$_kver DESTDIR="$pkgdir/" install - # rm ndiswrapper - rm -r "$pkgdir/usr/share" "$pkgdir/usr/sbin" "$pkgdir/sbin" - - gzip "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko" -} + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" \ + "${startdir}/ndiswrapper.install" +} \ No newline at end of file diff --git a/ndiswrapper-lts/ndiswrapper-1.59.patch b/ndiswrapper-lts/ndiswrapper-1.59.patch new file mode 100644 index 000000000..1eb9a8698 --- /dev/null +++ b/ndiswrapper-lts/ndiswrapper-1.59.patch @@ -0,0 +1,35 @@ +diff -aur ndiswrapper-1.59.old/driver/crt.c ndiswrapper-1.59.new/driver/crt.c +--- ndiswrapper-1.59.old/driver/crt.c 2013-11-28 20:42:35.000000000 +0100 ++++ ndiswrapper-1.59.new/driver/crt.c 2014-04-11 20:39:22.384962602 +0200 +@@ -467,7 +467,7 @@ + noregparm void WIN_FUNC(_win_srand,1) + (UINT seed) + { +- net_srandom(seed); ++ prandom_seed((__force u32)(seed)); + } + + noregparm int WIN_FUNC(rand,0) +diff -aur ndiswrapper-1.59.old/driver/ntoskernel.h ndiswrapper-1.59.new/driver/ntoskernel.h +--- ndiswrapper-1.59.old/driver/ntoskernel.h 2013-11-28 20:42:36.000000000 +0100 ++++ ndiswrapper-1.59.new/driver/ntoskernel.h 2014-04-11 20:44:03.491617236 +0200 +@@ -347,7 +347,7 @@ + #define netdev_notifier_info_to_dev(x) ((struct net_device *)(x)) + #endif + +-#ifdef INIT_COMPLETION ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) + static inline void reinit_completion(struct completion *x) + { + INIT_COMPLETION(*x); +@@ -797,9 +797,8 @@ + #define nt_spin_unlock_irqrestore(lock, flags) \ + do { \ + nt_spin_unlock(lock); \ +- preempt_enable_no_resched(); \ ++ preempt_enable(); \ + local_irq_restore(flags); \ +- preempt_check_resched(); \ + } while (0) + + static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length) diff --git a/ndiswrapper-lts/ndiswrapper.install b/ndiswrapper-lts/ndiswrapper.install index aec2db92c..a79f18bb0 100644 --- a/ndiswrapper-lts/ndiswrapper.install +++ b/ndiswrapper-lts/ndiswrapper.install @@ -5,7 +5,7 @@ post_install() post_upgrade() { - EXTRAMODULES='extramodules-3.2-lts' + EXTRAMODULES='extramodules-3.14-CHAKRA-LTS' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/ndiswrapper/PKGBUILD b/ndiswrapper/PKGBUILD index c394d3f73..e41ece59f 100644 --- a/ndiswrapper/PKGBUILD +++ b/ndiswrapper/PKGBUILD @@ -1,13 +1,13 @@ # Maintainer: Neophytos Kolokotronis -_extramodules=extramodules-3.19-CHAKRA +_extramodules=extramodules-4.0-CHAKRA _kver="$(cat /usr/lib/modules/${_extramodules}/version)" -_kernelver=3.19.4 +_kernelver=4.0.5 _rootOfSourceTree=/usr/src/linux-${_kver} pkgname=ndiswrapper pkgver=1.59 -pkgrel=17 +pkgrel=18 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For linux-testing." license=('GPL') arch=('x86_64') @@ -20,32 +20,35 @@ replaces=('ndiswrapper-utils') conflicts=('ndiswrapper-utils') makedepends=('linux-headers') source=("http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz" - "ndiswrapper-1.59.patch" -) + "ndiswrapper-1.59.patch") sha1sums=('75fbbda677fe91ee07a6f6a8e19b1f3e2479540f' 'f120e96fa9abab45e1c724aaac29da7b892820f0') prepare() { - [ -z "$_kver" ] && error "Could not get kernel version from '/usr/lib/modules/${_extramodules}/version'..." && false - msg "Found kernel version: $_kver" + [ -z "$_kver" ] && error "Could not get kernel version from '/usr/lib/modules/${_extramodules}/version'..." && false + msg "Found kernel version: $_kver" + + cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i ../ndiswrapper-1.59.patch + + sed -i -e 's|strnicmp|strncasecmp|' driver/ndis.c + sed -i "/modinfo/s/s/usr\//" driver/Makefile } build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i ../ndiswrapper-1.59.patch - sed -i "/modinfo/s/s/usr\//" driver/Makefile - make -C driver KVERS_UNAME=${_kver} - make -C utils + cd "$srcdir/$pkgname-$pkgver" + make -C driver KVERS_UNAME=${_kver} + make -C utils } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" - make sbindir=/usr/sbin usrsbindir=/usr/sbin KBUILD=${_rootOfSourceTree} INST_DIR="usr/lib/modules/$_extramodules" \ - KVERS=$_kver DESTDIR="$pkgdir/" install + make sbindir=/usr/sbin usrsbindir=/usr/sbin KBUILD=${_rootOfSourceTree} INST_DIR="usr/lib/modules/$_extramodules" \ + KVERS=$_kver DESTDIR="$pkgdir/" install - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" \ - "${startdir}/ndiswrapper.install" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" \ + "${startdir}/ndiswrapper.install" } diff --git a/ndiswrapper/kernel-3.10.patch b/ndiswrapper/kernel-3.10.patch deleted file mode 100644 index 10b7339a5..000000000 --- a/ndiswrapper/kernel-3.10.patch +++ /dev/null @@ -1,701 +0,0 @@ -From 89857ddd1aecc262c03b00e66baa1126707a962d Mon Sep 17 00:00:00 2001 -From: Christian Weber -Date: Sat, 3 Aug 2013 22:11:04 +0200 -Subject: [PATCH] - API change of 'add_taint()' as of kernel 3.9 - procfs API - change as of kernel 3.10 - -TODO: - - 'proc.c':443 and 'wrapndis.c':1775 - Are wnd->net_dev->name and wnd->procfs_iface->name always equal? - - 'proc.c': - Commented out error checking in procfs-callback-functions. - Seem to make no sense to me with the new API, maybe they are handled by seq_file internally? ---- - driver/loader.c | 2 +- - driver/proc.c | 355 ++++++++++++++++++++++++++++++------------------------ - driver/wrapndis.c | 7 +- - driver/wrapper.c | 2 +- - 4 files changed, 208 insertions(+), 158 deletions(-) - -diff --git a/driver/loader.c b/driver/loader.c -index 406e6ba..8ae53c1 100644 ---- a/driver/loader.c -+++ b/driver/loader.c -@@ -575,7 +575,7 @@ static int load_user_space_driver(struct load_driver *load_driver) - } else { - printk(KERN_INFO "%s: driver %s (%s) loaded\n", - DRIVER_NAME, wrap_driver->name, wrap_driver->version); -- add_taint(TAINT_PROPRIETARY_MODULE); -+ add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_STILL_OK); - EXIT1(return 0); - } - } -diff --git a/driver/proc.c b/driver/proc.c -index 60ed0e0..11f0f8b 100644 ---- a/driver/proc.c -+++ b/driver/proc.c -@@ -13,6 +13,7 @@ - * - */ - #include -+#include - #include - #include - -@@ -24,116 +25,144 @@ - - #define MAX_PROC_STR_LEN 32 - --static struct proc_dir_entry *wrap_procfs_entry; -+static struct proc_dir_entry *procfs_hw, -+ *procfs_stats, -+ *procfs_encr, -+ *procfs_settings, -+ *procfs_debug, -+ *wrap_procfs_entry; - --static int procfs_read_ndis_stats(char *page, char **start, off_t off, -- int count, int *eof, void *data) -+/* stats */ -+ -+static int procfs_ndis_stats_show( struct seq_file *seqf, void *data) - { -- char *p = page; - struct ndis_device *wnd = (struct ndis_device *)data; - struct ndis_wireless_stats stats; - NDIS_STATUS res; - ndis_rssi rssi; - -- if (off != 0) { -+ /*if (off != 0) { - *eof = 1; - return 0; -- } -+ }*/ - - res = mp_query(wnd, OID_802_11_RSSI, &rssi, sizeof(rssi)); - if (!res) -- p += sprintf(p, "signal_level=%d dBm\n", (s32)rssi); -+ seq_printf(seqf, "signal_level=%d dBm\n", (s32)rssi); - - res = mp_query(wnd, OID_802_11_STATISTICS, &stats, sizeof(stats)); - if (!res) { - -- p += sprintf(p, "tx_frames=%llu\n", stats.tx_frag); -- p += sprintf(p, "tx_multicast_frames=%llu\n", -- stats.tx_multi_frag); -- p += sprintf(p, "tx_failed=%llu\n", stats.failed); -- p += sprintf(p, "tx_retry=%llu\n", stats.retry); -- p += sprintf(p, "tx_multi_retry=%llu\n", stats.multi_retry); -- p += sprintf(p, "tx_rtss_success=%llu\n", stats.rtss_succ); -- p += sprintf(p, "tx_rtss_fail=%llu\n", stats.rtss_fail); -- p += sprintf(p, "ack_fail=%llu\n", stats.ack_fail); -- p += sprintf(p, "frame_duplicates=%llu\n", stats.frame_dup); -- p += sprintf(p, "rx_frames=%llu\n", stats.rx_frag); -- p += sprintf(p, "rx_multicast_frames=%llu\n", -- stats.rx_multi_frag); -- p += sprintf(p, "fcs_errors=%llu\n", stats.fcs_err); -+ seq_printf(seqf, "tx_frames=%llu\n", stats.tx_frag); -+ seq_printf(seqf, "tx_multicast_frames=%llu\n", stats.tx_multi_frag); -+ seq_printf(seqf, "tx_failed=%llu\n", stats.failed); -+ seq_printf(seqf, "tx_retry=%llu\n", stats.retry); -+ seq_printf(seqf, "tx_multi_retry=%llu\n", stats.multi_retry); -+ seq_printf(seqf, "tx_rtss_success=%llu\n", stats.rtss_succ); -+ seq_printf(seqf, "tx_rtss_fail=%llu\n", stats.rtss_fail); -+ seq_printf(seqf, "ack_fail=%llu\n", stats.ack_fail); -+ seq_printf(seqf, "frame_duplicates=%llu\n", stats.frame_dup); -+ seq_printf(seqf, "rx_frames=%llu\n", stats.rx_frag); -+ seq_printf(seqf, "rx_multicast_frames=%llu\n", stats.rx_multi_frag); -+ seq_printf(seqf, "fcs_errors=%llu\n", stats.fcs_err); - } - -- if (p - page > count) { -+ /* if (p - page > count) { - ERROR("wrote %td bytes (limit is %u)\n", - p - page, count); - *eof = 1; -- } -+ }*/ - -- return p - page; -+ return 0; - } - --static int procfs_read_ndis_encr(char *page, char **start, off_t off, -- int count, int *eof, void *data) -+static int procfs_ndis_stats_open( struct inode *ino, struct file *f) -+{ -+ return single_open( f, procfs_ndis_stats_show, PDE_DATA( ino)); -+}; -+ -+static struct file_operations procfs_ndis_stats_ops = { -+ .open = procfs_ndis_stats_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = seq_release -+}; -+ -+ -+/* encr */ -+static int procfs_ndis_encr_show( struct seq_file *seqf, void *data) - { -- char *p = page; - struct ndis_device *wnd = (struct ndis_device *)data; - int i, encr_status, auth_mode, infra_mode; - NDIS_STATUS res; - struct ndis_essid essid; - mac_address ap_address; - -- if (off != 0) { -+ /*if (off != 0) { - *eof = 1; - return 0; -- } -+ }*/ - - res = mp_query(wnd, OID_802_11_BSSID, - &ap_address, sizeof(ap_address)); - if (res) - memset(ap_address, 0, ETH_ALEN); -- p += sprintf(p, "ap_address=%2.2X", ap_address[0]); -+ seq_printf(seqf, "ap_address=%2.2X", ap_address[0]); - for (i = 1; i < ETH_ALEN; i++) -- p += sprintf(p, ":%2.2X", ap_address[i]); -- p += sprintf(p, "\n"); -+ seq_printf(seqf, ":%2.2X", ap_address[i]); -+ seq_printf(seqf, "\n"); - - res = mp_query(wnd, OID_802_11_SSID, &essid, sizeof(essid)); - if (!res) -- p += sprintf(p, "essid=%.*s\n", essid.length, essid.essid); -+ seq_printf(seqf, "essid=%.*s\n", essid.length, essid.essid); - - res = mp_query_int(wnd, OID_802_11_ENCRYPTION_STATUS, &encr_status); - if (!res) { - typeof(&wnd->encr_info.keys[0]) tx_key; -- p += sprintf(p, "tx_key=%u\n", wnd->encr_info.tx_key_index); -- p += sprintf(p, "key="); -+ seq_printf(seqf, "tx_key=%u\n", wnd->encr_info.tx_key_index); -+ seq_printf(seqf, "key="); - tx_key = &wnd->encr_info.keys[wnd->encr_info.tx_key_index]; - if (tx_key->length > 0) - for (i = 0; i < tx_key->length; i++) -- p += sprintf(p, "%2.2X", tx_key->key[i]); -+ seq_printf(seqf, "%2.2X", tx_key->key[i]); - else -- p += sprintf(p, "off"); -- p += sprintf(p, "\n"); -- p += sprintf(p, "encr_mode=%d\n", encr_status); -+ seq_printf(seqf, "off"); -+ seq_printf(seqf, "\n"); -+ seq_printf(seqf, "encr_mode=%d\n", encr_status); - } - res = mp_query_int(wnd, OID_802_11_AUTHENTICATION_MODE, &auth_mode); - if (!res) -- p += sprintf(p, "auth_mode=%d\n", auth_mode); -+ seq_printf(seqf, "auth_mode=%d\n", auth_mode); - res = mp_query_int(wnd, OID_802_11_INFRASTRUCTURE_MODE, &infra_mode); -- p += sprintf(p, "mode=%s\n", (infra_mode == Ndis802_11IBSS) ? -+ seq_printf(seqf, "mode=%s\n", (infra_mode == Ndis802_11IBSS) ? - "adhoc" : (infra_mode == Ndis802_11Infrastructure) ? - "managed" : "auto"); -- if (p - page > count) { -+ /*if (p - page > count) { - WARNING("wrote %td bytes (limit is %u)", - p - page, count); - *eof = 1; -- } -+ }*/ - -- return p - page; -+ return 0; - } - --static int procfs_read_ndis_hw(char *page, char **start, off_t off, -- int count, int *eof, void *data) -+static int procfs_ndis_encr_open( struct inode *ino, struct file *f) -+{ -+ return single_open( f, procfs_ndis_encr_show, PDE_DATA( ino)); -+}; -+ -+static struct file_operations procfs_ndis_encr_ops = { -+ .open = procfs_ndis_encr_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = seq_release -+}; -+ -+ -+/* hw */ -+ -+static int procfs_ndis_hw_show( struct seq_file *seqf, void *data) - { -- char *p = page; - struct ndis_device *wnd = (struct ndis_device *)data; - struct ndis_configuration config; - enum ndis_power power_mode; -@@ -149,54 +178,51 @@ static int procfs_read_ndis_hw(char *page, char **start, off_t off, - char *hw_status[] = {"ready", "initializing", "resetting", "closing", - "not ready"}; - -- if (off != 0) { -+ /*if (off != 0) { - *eof = 1; - return 0; -- } -+ }*/ - - res = mp_query_int(wnd, OID_GEN_HARDWARE_STATUS, &n); - if (res == NDIS_STATUS_SUCCESS && n >= 0 && n < ARRAY_SIZE(hw_status)) -- p += sprintf(p, "status=%s\n", hw_status[n]); -+ seq_printf(seqf, "status=%s\n", hw_status[n]); - - res = mp_query(wnd, OID_802_3_CURRENT_ADDRESS, mac, sizeof(mac)); - if (!res) -- p += sprintf(p, "mac: " MACSTRSEP "\n", MAC2STR(mac)); -+ seq_printf(seqf, "mac: " MACSTRSEP "\n", MAC2STR(mac)); - res = mp_query(wnd, OID_802_11_CONFIGURATION, &config, sizeof(config)); - if (!res) { -- p += sprintf(p, "beacon_period=%u msec\n", -+ seq_printf(seqf, "beacon_period=%u msec\n", - config.beacon_period); -- p += sprintf(p, "atim_window=%u msec\n", config.atim_window); -- p += sprintf(p, "frequency=%u kHz\n", config.ds_config); -- p += sprintf(p, "hop_pattern=%u\n", -- config.fh_config.hop_pattern); -- p += sprintf(p, "hop_set=%u\n", -- config.fh_config.hop_set); -- p += sprintf(p, "dwell_time=%u msec\n", -- config.fh_config.dwell_time); -+ seq_printf(seqf, "atim_window=%u msec\n", config.atim_window); -+ seq_printf(seqf, "frequency=%u kHz\n", config.ds_config); -+ seq_printf(seqf, "hop_pattern=%u\n", config.fh_config.hop_pattern); -+ seq_printf(seqf, "hop_set=%u\n", config.fh_config.hop_set); -+ seq_printf(seqf, "dwell_time=%u msec\n", config.fh_config.dwell_time); - } - - res = mp_query(wnd, OID_802_11_TX_POWER_LEVEL, - &tx_power, sizeof(tx_power)); - if (!res) -- p += sprintf(p, "tx_power=%u mW\n", tx_power); -+ seq_printf(seqf, "tx_power=%u mW\n", tx_power); - - res = mp_query(wnd, OID_GEN_LINK_SPEED, &bit_rate, sizeof(bit_rate)); - if (!res) -- p += sprintf(p, "bit_rate=%u kBps\n", (u32)bit_rate / 10); -+ seq_printf(seqf, "bit_rate=%u kBps\n", (u32)bit_rate / 10); - - res = mp_query(wnd, OID_802_11_RTS_THRESHOLD, - &rts_threshold, sizeof(rts_threshold)); - if (!res) -- p += sprintf(p, "rts_threshold=%u bytes\n", rts_threshold); -+ seq_printf(seqf, "rts_threshold=%u bytes\n", rts_threshold); - - res = mp_query(wnd, OID_802_11_FRAGMENTATION_THRESHOLD, - &frag_threshold, sizeof(frag_threshold)); - if (!res) -- p += sprintf(p, "frag_threshold=%u bytes\n", frag_threshold); -+ seq_printf(seqf, "frag_threshold=%u bytes\n", frag_threshold); - - res = mp_query_int(wnd, OID_802_11_POWER_MODE, &power_mode); - if (!res) -- p += sprintf(p, "power_mode=%s\n", -+ seq_printf(seqf, "power_mode=%s\n", - (power_mode == NDIS_POWER_OFF) ? "always_on" : - (power_mode == NDIS_POWER_MAX) ? - "max_savings" : "min_savings"); -@@ -204,19 +230,19 @@ static int procfs_read_ndis_hw(char *page, char **start, off_t off, - res = mp_query(wnd, OID_802_11_NUMBER_OF_ANTENNAS, - &antenna, sizeof(antenna)); - if (!res) -- p += sprintf(p, "num_antennas=%u\n", antenna); -+ seq_printf(seqf, "num_antennas=%u\n", antenna); - - res = mp_query(wnd, OID_802_11_TX_ANTENNA_SELECTED, - &antenna, sizeof(antenna)); - if (!res) -- p += sprintf(p, "tx_antenna=%u\n", antenna); -+ seq_printf(seqf, "tx_antenna=%u\n", antenna); - - res = mp_query(wnd, OID_802_11_RX_ANTENNA_SELECTED, - &antenna, sizeof(antenna)); - if (!res) -- p += sprintf(p, "rx_antenna=%u\n", antenna); -+ seq_printf(seqf, "rx_antenna=%u\n", antenna); - -- p += sprintf(p, "encryption_modes=%s%s%s%s%s%s%s\n", -+ seq_printf(seqf, "encryption_modes=%s%s%s%s%s%s%s\n", - test_bit(Ndis802_11Encryption1Enabled, &wnd->capa.encr) ? - "WEP" : "none", - -@@ -239,57 +265,70 @@ static int procfs_read_ndis_hw(char *page, char **start, off_t off, - if (packet_filter != wnd->packet_filter) - WARNING("wrong packet_filter? 0x%08x, 0x%08x\n", - packet_filter, wnd->packet_filter); -- p += sprintf(p, "packet_filter: 0x%08x\n", packet_filter); -+ seq_printf(seqf, "packet_filter: 0x%08x\n", packet_filter); - } -- if (p - page > count) { -+ /*if (p - page > count) { - WARNING("wrote %td bytes (limit is %u)", - p - page, count); - *eof = 1; -- } -+ }*/ - -- return p - page; -+ return 0; - } - --static int procfs_read_ndis_settings(char *page, char **start, off_t off, -- int count, int *eof, void *data) -+static int procfs_ndis_hw_open( struct inode *ino, struct file *f) -+{ -+ return single_open( f, procfs_ndis_hw_show, PDE_DATA( ino)); -+}; -+ -+static struct file_operations procfs_ndis_hw_ops = { -+ .open = procfs_ndis_hw_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = seq_release -+}; -+ -+ -+/* settings */ -+ -+static int procfs_ndis_settings_show( struct seq_file *seqf, void *data) - { -- char *p = page; - struct ndis_device *wnd = (struct ndis_device *)data; - struct wrap_device_setting *setting; - -- if (off != 0) { -+ /*if (off != 0) { - *eof = 1; - return 0; -- } -+ }*/ - -- p += sprintf(p, "hangcheck_interval=%d\n", -+ seq_printf(seqf, "hangcheck_interval=%d\n", - hangcheck_interval == 0 ? - (wnd->hangcheck_interval / HZ) : -1); - - list_for_each_entry(setting, &wnd->wd->settings, list) { -- p += sprintf(p, "%s=%s\n", setting->name, setting->value); -+ seq_printf(seqf, "%s=%s\n", setting->name, setting->value); - } - - list_for_each_entry(setting, &wnd->wd->driver->settings, list) { -- p += sprintf(p, "%s=%s\n", setting->name, setting->value); -+ seq_printf(seqf, "%s=%s\n", setting->name, setting->value); - } - -- return p - page; -+ return 0; - } - - static int procfs_write_ndis_settings(struct file *file, const char __user *buf, -- unsigned long count, void *data) -+ size_t size, loff_t *ppos) - { -- struct ndis_device *wnd = (struct ndis_device *)data; -+ struct ndis_device *wnd = (struct ndis_device *)PDE_DATA( file->f_inode); - char setting[MAX_PROC_STR_LEN], *p; - unsigned int i; - NDIS_STATUS res; - -- if (count > MAX_PROC_STR_LEN) -+ if (size > MAX_PROC_STR_LEN) - return -EINVAL; - - memset(setting, 0, sizeof(setting)); -- if (copy_from_user(setting, buf, count)) -+ if (copy_from_user(setting, buf, size)) - return -EFAULT; - - if ((p = strchr(setting, '\n'))) -@@ -377,18 +416,35 @@ static int procfs_write_ndis_settings(struct file *file, const char __user *buf, - if (res != NDIS_STATUS_SUCCESS) - return -EFAULT; - } -- return count; -+ return size; - } - --int wrap_procfs_add_ndis_device(struct ndis_device *wnd) -+static int procfs_ndis_settings_open( struct inode *ino, struct file *f) - { -- struct proc_dir_entry *procfs_entry; -+ return single_open( f, procfs_ndis_settings_show, PDE_DATA( ino)); -+}; -+ -+static struct file_operations procfs_ndis_settings_ops = { -+ .open = procfs_ndis_settings_open, -+ .read = seq_read, -+ .write = procfs_write_ndis_settings, -+ .llseek = seq_lseek, -+ .release = seq_release -+}; -+ - -+int wrap_procfs_add_ndis_device(struct ndis_device *wnd) -+{ - if (wrap_procfs_entry == NULL) - return -ENOMEM; - - if (wnd->procfs_iface) { -- ERROR("%s already registered?", wnd->procfs_iface->name); -+ ERROR("%s already registered?", wnd->net_dev->name); -+/* NEEDS CLARIFICATION: -+ * 'wnd->procfs_iface->name' changed to 'wnd->net_dev_name', as the 'proc_dir_entry'-struct -+ * is now opaque. -+ * Are they always the same? -+ */ - return -EINVAL; - } - wnd->procfs_iface = proc_mkdir(wnd->net_dev->name, wrap_procfs_entry); -@@ -396,68 +452,51 @@ int wrap_procfs_add_ndis_device(struct ndis_device *wnd) - ERROR("couldn't create proc directory"); - return -ENOMEM; - } -- wnd->procfs_iface->uid = proc_uid; -- wnd->procfs_iface->gid = proc_gid; -+ proc_set_user( wnd->procfs_iface, proc_uid, proc_gid); - -- procfs_entry = create_proc_entry("hw", S_IFREG | S_IRUSR | S_IRGRP, -- wnd->procfs_iface); -- if (procfs_entry == NULL) { -+ procfs_hw = proc_create_data("hw", S_IFREG | S_IRUSR | S_IRGRP, wnd->procfs_iface, &procfs_ndis_hw_ops, wnd); -+ if (procfs_hw == NULL) { - ERROR("couldn't create proc entry for 'hw'"); - goto err_hw; - } else { -- procfs_entry->uid = proc_uid; -- procfs_entry->gid = proc_gid; -- procfs_entry->data = wnd; -- procfs_entry->read_proc = procfs_read_ndis_hw; -+ proc_set_user( procfs_hw, proc_uid, proc_gid); - } - -- procfs_entry = create_proc_entry("stats", S_IFREG | S_IRUSR | S_IRGRP, -- wnd->procfs_iface); -- if (procfs_entry == NULL) { -+ procfs_stats = proc_create_data("stats", S_IFREG | S_IRUSR | S_IRGRP, wnd->procfs_iface, &procfs_ndis_stats_ops, wnd); -+ if (procfs_stats == NULL) { - ERROR("couldn't create proc entry for 'stats'"); - goto err_stats; - } else { -- procfs_entry->uid = proc_uid; -- procfs_entry->gid = proc_gid; -- procfs_entry->data = wnd; -- procfs_entry->read_proc = procfs_read_ndis_stats; -+ proc_set_user( procfs_stats, proc_uid, proc_gid); - } - -- procfs_entry = create_proc_entry("encr", S_IFREG | S_IRUSR | S_IRGRP, -- wnd->procfs_iface); -- if (procfs_entry == NULL) { -+ procfs_encr = proc_create_data("encr", S_IFREG | S_IRUSR | S_IRGRP, wnd->procfs_iface, &procfs_ndis_encr_ops, wnd); -+ if (procfs_encr == NULL) { - ERROR("couldn't create proc entry for 'encr'"); - goto err_encr; - } else { -- procfs_entry->uid = proc_uid; -- procfs_entry->gid = proc_gid; -- procfs_entry->data = wnd; -- procfs_entry->read_proc = procfs_read_ndis_encr; -+ proc_set_user( procfs_encr, proc_uid, proc_gid); - } - -- procfs_entry = create_proc_entry("settings", S_IFREG | -+ procfs_settings = proc_create_data("settings", S_IFREG | - S_IRUSR | S_IRGRP | -- S_IWUSR | S_IWGRP, wnd->procfs_iface); -- if (procfs_entry == NULL) { -+ S_IWUSR | S_IWGRP, wnd->procfs_iface, &procfs_ndis_settings_ops, wnd); -+ if (procfs_settings == NULL) { - ERROR("couldn't create proc entry for 'settings'"); - goto err_settings; - } else { -- procfs_entry->uid = proc_uid; -- procfs_entry->gid = proc_gid; -- procfs_entry->data = wnd; -- procfs_entry->read_proc = procfs_read_ndis_settings; -- procfs_entry->write_proc = procfs_write_ndis_settings; -+ proc_set_user( procfs_settings, proc_uid, proc_gid); - } - return 0; - - err_settings: -- remove_proc_entry("encr", wnd->procfs_iface); -+ proc_remove( procfs_encr); - err_encr: -- remove_proc_entry("stats", wnd->procfs_iface); -+ proc_remove( procfs_stats); - err_stats: -- remove_proc_entry("hw", wnd->procfs_iface); -+ proc_remove( procfs_hw); - err_hw: -- remove_proc_entry(wnd->procfs_iface->name, wrap_procfs_entry); -+ proc_remove( wnd->procfs_iface); - wnd->procfs_iface = NULL; - return -ENOMEM; - } -@@ -468,46 +507,45 @@ void wrap_procfs_remove_ndis_device(struct ndis_device *wnd) - - if (procfs_iface == NULL) - return; -- remove_proc_entry("hw", procfs_iface); -- remove_proc_entry("stats", procfs_iface); -- remove_proc_entry("encr", procfs_iface); -- remove_proc_entry("settings", procfs_iface); -+ proc_remove( procfs_hw); -+ proc_remove( procfs_stats); -+ proc_remove( procfs_encr); -+ proc_remove( procfs_settings); - if (wrap_procfs_entry) -- remove_proc_entry(procfs_iface->name, wrap_procfs_entry); -+ proc_remove( procfs_iface); - } - --static int procfs_read_debug(char *page, char **start, off_t off, -- int count, int *eof, void *data) -+/* debug */ -+static int procfs_debug_show( struct seq_file *seqf, void *data) - { -- char *p = page; - #if ALLOC_DEBUG - enum alloc_type type; - #endif - -- if (off != 0) { -+ /*if (off != 0) { - *eof = 1; - return 0; -- } -- p += sprintf(p, "%d\n", debug); -+ }*/ -+ seq_printf(seqf, "%d\n", debug); - #if ALLOC_DEBUG - for (type = 0; type < ALLOC_TYPE_MAX; type++) -- p += sprintf(p, "total size of allocations in %s: %d\n", -+ seq_printf(seqf, "total size of allocations in %s: %d\n", - alloc_type_name[type], alloc_size(type)); - #endif -- return p - page; -+ return 0; - } - - static int procfs_write_debug(struct file *file, const char __user *buf, -- unsigned long count, void *data) -+ size_t size, loff_t *ppos) - { - int i; - char setting[MAX_PROC_STR_LEN], *p; - -- if (count > MAX_PROC_STR_LEN) -+ if (size > MAX_PROC_STR_LEN) - return -EINVAL; - - memset(setting, 0, sizeof(setting)); -- if (copy_from_user(setting, buf, count)) -+ if (copy_from_user(setting, buf, size)) - return -EFAULT; - - if ((p = strchr(setting, '\n'))) -@@ -521,31 +559,38 @@ static int procfs_write_debug(struct file *file, const char __user *buf, - debug = i; - else - return -EINVAL; -- return count; -+ return size; - } - --int wrap_procfs_init(void) -+static int procfs_debug_open( struct inode *ino, struct file *f) - { -- struct proc_dir_entry *procfs_entry; -+ return single_open( f, procfs_debug_show, NULL); -+}; -+ -+static struct file_operations procfs_debug_ops = { -+ .open = procfs_debug_open, -+ .read = seq_read, -+ .write = procfs_write_debug, -+ .llseek = seq_lseek, -+ .release = seq_release -+}; - -+int wrap_procfs_init(void) -+{ - wrap_procfs_entry = proc_mkdir(DRIVER_NAME, proc_net_root); - if (wrap_procfs_entry == NULL) { - ERROR("couldn't create procfs directory"); - return -ENOMEM; - } -- wrap_procfs_entry->uid = proc_uid; -- wrap_procfs_entry->gid = proc_gid; -+ proc_set_user( wrap_procfs_entry, proc_uid, proc_gid); - -- procfs_entry = create_proc_entry("debug", S_IFREG | S_IRUSR | S_IRGRP, -- wrap_procfs_entry); -- if (procfs_entry == NULL) { -+ procfs_debug = proc_create("debug", S_IFREG | S_IRUSR | S_IRGRP, -+ wrap_procfs_entry, &procfs_debug_ops); -+ if (procfs_debug == NULL) { - ERROR("couldn't create proc entry for 'debug'"); - return -ENOMEM; - } else { -- procfs_entry->uid = proc_uid; -- procfs_entry->gid = proc_gid; -- procfs_entry->read_proc = procfs_read_debug; -- procfs_entry->write_proc = procfs_write_debug; -+ proc_set_user( procfs_debug, proc_uid, proc_gid); - } - return 0; - } -@@ -554,6 +599,6 @@ void wrap_procfs_remove(void) - { - if (wrap_procfs_entry == NULL) - return; -- remove_proc_entry("debug", wrap_procfs_entry); -- remove_proc_entry(DRIVER_NAME, proc_net_root); -+ proc_remove( procfs_debug); -+ proc_remove( wrap_procfs_entry); - } -diff --git a/driver/wrapndis.c b/driver/wrapndis.c -index 7bb9568..43074f4 100644 ---- a/driver/wrapndis.c -+++ b/driver/wrapndis.c -@@ -1771,7 +1771,12 @@ static int notifier_event(struct notifier_block *notifier, unsigned long event, - if (likely(wnd->procfs_iface)) { - printk(KERN_INFO "%s: changing interface name from " - "'%s' to '%s'\n", DRIVER_NAME, -- wnd->procfs_iface->name, net_dev->name); -+ wnd->net_dev->name, net_dev->name); -+/* NEEDS CLARIFICATION: -+ * 'wnd->procfs_iface->name' changed to 'wnd->net_dev_name', as the 'proc_dir_entry'-struct -+ * is now opaque. -+ * Are they always the same? -+ */ - wrap_procfs_remove_ndis_device(wnd); - wrap_procfs_add_ndis_device(wnd); - } -diff --git a/driver/wrapper.c b/driver/wrapper.c -index f77c879..19a3249 100644 ---- a/driver/wrapper.c -+++ b/driver/wrapper.c -@@ -72,7 +72,7 @@ static void module_cleanup(void) - static int __init wrapper_init(void) - { - #ifdef TAINT_OOT_MODULE -- add_taint(TAINT_OOT_MODULE); -+ add_taint(TAINT_OOT_MODULE, LOCKDEP_STILL_OK); - #endif - printk(KERN_INFO "%s version %s loaded (smp=%s, preempt=%s)\n", - DRIVER_NAME, DRIVER_VERSION, --- -1.8.3.4 - diff --git a/ndiswrapper/ndiswrapper-1.58-add_taint.patch b/ndiswrapper/ndiswrapper-1.58-add_taint.patch deleted file mode 100644 index 87dc3a0e7..000000000 --- a/ndiswrapper/ndiswrapper-1.58-add_taint.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur ndiswrapper-1.58.orig/driver/loader.c ndiswrapper-1.58/driver/loader.c ---- ndiswrapper-1.58.orig/driver/loader.c 2013-05-01 09:48:34.910000000 +0900 -+++ ndiswrapper-1.58/driver/loader.c 2013-05-01 09:48:59.870000000 +0900 -@@ -575,7 +575,7 @@ - } else { - printk(KERN_INFO "%s: driver %s (%s) loaded\n", - DRIVER_NAME, wrap_driver->name, wrap_driver->version); -- add_taint(TAINT_PROPRIETARY_MODULE); -+ add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_STILL_OK); - EXIT1(return 0); - } - } -diff -ur ndiswrapper-1.58.orig/driver/wrapper.c ndiswrapper-1.58/driver/wrapper.c ---- ndiswrapper-1.58.orig/driver/wrapper.c 2013-02-20 03:00:37.000000000 +0900 -+++ ndiswrapper-1.58/driver/wrapper.c 2013-05-01 09:54:30.140000000 +0900 -@@ -72,7 +72,7 @@ - static int __init wrapper_init(void) - { - #ifdef TAINT_OOT_MODULE -- add_taint(TAINT_OOT_MODULE); -+ add_taint(TAINT_OOT_MODULE, LOCKDEP_STILL_OK); - #endif - printk(KERN_INFO "%s version %s loaded (smp=%s, preempt=%s)\n", - DRIVER_NAME, DRIVER_VERSION, diff --git a/ndiswrapper/ndiswrapper.install b/ndiswrapper/ndiswrapper.install index ef2cbd05c..91cda049d 100644 --- a/ndiswrapper/ndiswrapper.install +++ b/ndiswrapper/ndiswrapper.install @@ -5,7 +5,7 @@ post_install() post_upgrade() { - EXTRAMODULES='extramodules-3.19-CHAKRA' + EXTRAMODULES='extramodules-4.0-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/nfs-utils/PKGBUILD b/nfs-utils/PKGBUILD index ae90ee07a..5dafb5705 100644 --- a/nfs-utils/PKGBUILD +++ b/nfs-utils/PKGBUILD @@ -1,63 +1,79 @@ # -# Core Packages for Chakra, part of chakra-project.org +# Core Packages for Chakra, part of chakraos.org # # maintainer Samir Benmendil -# maintainer abveritas[at]chakra-project[dot]org> + pkgname=nfs-utils -pkgver=1.3.1 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 pkgdesc="Support programs for Network File Systems" arch=('x86_64') url='http://nfs.sourceforge.net' license=('GPL') backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent' 'device-mapper') +depends=('glibc' 'e2fsprogs' 'rpcbind' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent' 'device-mapper') makedepends=('pkg-config' 'autoconf' 'automake' 'sqlite3') source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - nfs-common.conf - nfs-server.conf - exports - idmapd.conf - nfs-utils-1.1.4-mtab-sym.patch - nfs-utils.conf + nfs-common.conf + nfs-server.conf + exports + idmapd.conf + nfs-utils.conf id_resolver.conf - nfs-utils_env.sh) + nfs-utils_env.sh + nfs-utils-1.3.2-statd-bg.patch + nfs-utils-1.3.2-statd-nowait.patch) install=nfs-utils.install -optdepends=('sqlite: for nfsdcltrack usage') -md5sums=('97f157f954edb6d4d4385a0c5986f36f' +optdepends=('sqlite3: for nfsdcltrack usage' + 'python2: for nfsiostat and mountstats usage') +md5sums=('1e2f3c1ed468dee02d00c534c002ea10' '21510b0b30e71c8d6679c7c23f3b78eb' 'c1fe8dd9581c1df788d8965f4f1479f3' 'e6ad3c7a59c7e4c24965a0e7da35026c' 'eb4f4027fab6fc1201f1ca04f5954c76' - '7674106eaaa4c149bccd4f05fe3604e9' '8ac484023d786766d287ccbe878ae4ba' 'a43aabf0b8d02406b1babc3a206d952a' - 'c6c9c32f153dfa6c0477ea6b99354288') + 'c6c9c32f153dfa6c0477ea6b99354288' + '45f55a5d581b2527b453c3a0816add24' + 'dde4e23776a2425d2a1241eb2daf8b7c') prepare() { - cd $srcdir/${pkgname}-${pkgver} - patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch - ./autogen.sh + cd ${pkgname}-${pkgver} + # fix rpc.statd starting + patch -Np1 -i $srcdir/nfs-utils-1.3.2-statd-bg.patch + # don't wait for online target on statd + patch -Np1 -i $srcdir/nfs-utils-1.3.2-statd-nowait.patch + + # fix hardcoded sbin path to our needs + sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am + autoreconf -vfi } build() { - cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr --sbindir=/usr/sbin --enable-nfsv4 --enable-nfsv41 --enable-gss \ - --without-tcp-wrappers --with-statedir=/var/lib/nfs \ - --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \ - --enable-mountconfig --with-start-statd=/usr/bin/start-statd - # move mount helpers to /usr/sbin - sed -i -e 's#sbindir = /sbin#sbindir = /usr/sbin#g' utils/mount/Makefile - # move osd_login to /usr/sbin - sed -i -e 's#sbindir = /sbin#sbindir = /usr/sbin#g' utils/osd_login/Makefile - # move nfsdcltrack to /usr/sbin - sed -i -e 's#sbindir = /sbin#sbindir = /usr/sbin#g' utils/nfsdcltrack/Makefile + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + --enable-nfsv4 \ + --enable-nfsv41 \ + --enable-gss \ + --without-tcp-wrappers \ + --with-statedir=/var/lib/nfs \ + --enable-ipv6 \ + --enable-libmount-mount \ + --enable-mountconfig \ + --with-start-statd=/usr/bin/start-statd make } +check() { + cd ${pkgname}-${pkgver} + make -k check +} + package() { - cd $srcdir/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR="$pkgdir" install sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} diff --git a/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch deleted file mode 100644 index c9e60afc7..000000000 --- a/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch +++ /dev/null @@ -1,39 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.4/utils/mount/fstab.c -+++ nfs-utils-1.1.4/utils/mount/fstab.c -@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { - return var_mtab_does_not_exist; - } - --static int -+int - mtab_is_a_symlink(void) { - get_mtab_info(); - return var_mtab_is_a_symlink; ---- nfs-utils-1.1.4/utils/mount/fstab.h -+++ nfs-utils-1.1.4/utils/mount/fstab.h -@@ -7,6 +7,7 @@ - #define _PATH_FSTAB "/etc/fstab" - #endif - -+int mtab_is_a_symlink(void); - int mtab_is_writable(void); - int mtab_does_not_exist(void); - void reset_mtab_info(void); ---- nfs-utils-1.1.4/utils/mount/mount.c -+++ nfs-utils-1.1.4/utils/mount/mount.c -@@ -230,6 +230,13 @@ create_mtab (void) { - int flags; - mntFILE *mfp; - -+ /* Avoid writing if the mtab is a symlink to /proc/mounts, since -+ that would create a file /proc/mounts in case the proc filesystem -+ is not mounted, and the fchmod below would also fail. */ -+ if (mtab_is_a_symlink()) { -+ return EX_SUCCESS; -+ } -+ - lock_mtab(); - - mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/nfs-utils/nfs-utils-1.3.2-statd-bg.patch b/nfs-utils/nfs-utils-1.3.2-statd-bg.patch new file mode 100644 index 000000000..dbfb6e5c0 --- /dev/null +++ b/nfs-utils/nfs-utils-1.3.2-statd-bg.patch @@ -0,0 +1,25 @@ +commit 17a3e5bffb7110d46de1bf42b64b90713ff5ea50 +Author: Chris Mayo +Date: Sun Feb 1 12:03:46 2015 -0500 + + statd: Fix test for foreground mode + + daemon_init parameter has the opposite sense + to code removed in commit 7addf9d + + Signed-off-by: Chris Mayo + Signed-off-by: Steve Dickson + +diff --git a/utils/statd/statd.c b/utils/statd/statd.c +index 60ce6d1..2b7a167 100644 +--- a/utils/statd/statd.c ++++ b/utils/statd/statd.c +@@ -393,7 +393,7 @@ int main (int argc, char **argv) + simulator (--argc, ++argv); /* simulator() does exit() */ + #endif + +- daemon_init(!(run_mode & MODE_NODAEMON)); ++ daemon_init((run_mode & MODE_NODAEMON)); + + if (run_mode & MODE_LOG_STDERR) { + xlog_syslog(0); diff --git a/nfs-utils/nfs-utils-1.3.2-statd-nowait.patch b/nfs-utils/nfs-utils-1.3.2-statd-nowait.patch new file mode 100644 index 000000000..a29df368c --- /dev/null +++ b/nfs-utils/nfs-utils-1.3.2-statd-nowait.patch @@ -0,0 +1,35 @@ +From 650633d4e956dc6b628da30c868e39fba76a0b29 Mon Sep 17 00:00:00 2001 +From: Steve Dickson +Date: Mon, 9 Feb 2015 08:54:54 -0500 +Subject: [PATCH] rpc-statd-notify: Don't wait for the network to come up + +rpc-statd-notify only needs to wait for the network +interface to be configured not to be connected since +it forks into background and will wait 15mins for +the network to come up. + +This decrease boot times when networks are not +and will not be connected. + +Signed-off-by: Steve Dickson +Reported-By: Eric Work +--- + systemd/rpc-statd-notify.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service +index 941afe5..a655445 100644 +--- a/systemd/rpc-statd-notify.service ++++ b/systemd/rpc-statd-notify.service +@@ -1,7 +1,7 @@ + [Unit] + Description=Notify NFS peers of a restart + Requires=network-online.target +-After=network-online.target nss-lookup.target ++After=network.target nss-lookup.target + + # if we run an nfs server, it needs to be running before we + # tell clients that it has restarted. +-- +2.1.0 + diff --git a/nfsidmap/PKGBUILD b/nfsidmap/PKGBUILD index 57e73c036..42b8b3dba 100644 --- a/nfsidmap/PKGBUILD +++ b/nfsidmap/PKGBUILD @@ -1,28 +1,25 @@ -# $Id: PKGBUILD 52311 2009-09-17 07:29:57Z allan $ -# Maintainer: -# Contributor: Judd pkgname=nfsidmap -pkgver=0.23 -pkgrel=4 +pkgver=0.26 +pkgrel=1 pkgdesc="Library to help mapping IDs, mainly for NFSv4" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.citi.umich.edu/projects/nfsv4/linux/" depends=('glibc' 'libldap>=2.4.18') license=('custom:nfsidmap') -options=(!libtool) -source=(http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-$pkgver.tar.gz) -md5sums=('28f3ece648c1dc5d25e8d623d55f8bd6') +source=(https://fedorapeople.org/~steved/libnfsidmap/$pkgver/libnfsidmap-$pkgver.tar.bz2) +md5sums=('2c0cf0e2b1665d51fa9a783679494888') build() { cd $srcdir/lib$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 - make DESTDIR=$pkgdir install || return 1 - # remove idmap manpage provided by nfs-utils! - rm $pkgdir/usr/share/man/man5/idmapd.conf.5 || return 1 - # install license - install -Dm644 COPYING \ - $pkgdir/usr/share/licenses/nfsidmap/LICENSE || return 1 + make } +package() { + cd $srcdir/lib$pkgname-$pkgver + make DESTDIR=$pkgdir install + + # install license + install -Dm644 COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE +} \ No newline at end of file diff --git a/openmpi/PKGBUILD b/openmpi/PKGBUILD index 04e72dde5..a703b9663 100644 --- a/openmpi/PKGBUILD +++ b/openmpi/PKGBUILD @@ -1,30 +1,23 @@ -# Maintainer: Manuel Tortosa pkgname=openmpi -pkgver=1.8.2 +pkgver=1.8.5 pkgmin="${pkgver%.*}" pkgrel=1 pkgdesc='High performance message passing library (MPI)' -arch=(i686 x86_64) +arch=('x86_64') url='http://www.open-mpi.org' license=(custom) -depends=(libltdl 'hwloc>=1.9') -makedepends=(inetutils valgrind gcc-fortran) +depends=('libltdl' 'hwloc>=1.9') +makedepends=('inetutils' 'valgrind' 'gcc-fortran') optdepends=('gcc-fortran: fortran support') options=(staticlibs) source=(http://www.open-mpi.org/software/ompi/v${pkgmin}/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('55067856b351cbeb5ebe8a430bfe0656115a04ed') - -prepare() { - cd $pkgname-$pkgver - - # Make sure we use the system ltdl library rather than the ones in the tarball - rm -r opal/libltdl -} +sha1sums=('2e0408dbb033b0df21d1f95fffb872f2a8237de6') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver + ./autogen.pl ./configure --prefix=/usr \ --sysconfdir=/etc/${pkgname} \ --enable-mpi-fortran=all \ @@ -33,7 +26,6 @@ build() { --enable-smp-locks \ --with-valgrind \ --enable-memchecker \ - --enable-debug \ --enable-pretty-print-stacktrace \ --without-slurm \ --with-hwloc=/usr \ @@ -44,6 +36,12 @@ build() { make } +check() { + cd $pkgname-$pkgver + + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/openssl/PKGBUILD b/openssl/PKGBUILD index c89de377c..4b733eb67 100644 --- a/openssl/PKGBUILD +++ b/openssl/PKGBUILD @@ -1,5 +1,5 @@ pkgname=openssl -_ver=1.0.1m +_ver=1.0.1p # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 @@ -15,11 +15,14 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc" 'no-rpath.patch' 'ca-dir.patch') -md5sums=('d143d1555d842a069cb7cc34ba745a06' +md5sums=('7563e92327199e0067ccd0f79f436976' 'SKIP' 'dc78d3d06baffc16217519242ce92478' '3bf51be3a1bbd262be46dc619f92aa90') +# Matt Caswell +validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491') + prepare() { cd $srcdir/$pkgname-$_ver diff --git a/p11-kit/PKGBUILD b/p11-kit/PKGBUILD index e81126fc3..d6e28b5f5 100644 --- a/p11-kit/PKGBUILD +++ b/p11-kit/PKGBUILD @@ -1,14 +1,29 @@ pkgname=p11-kit -pkgver=0.22.1 +pkgver=0.23.1 pkgrel=1 pkgdesc="Library to work with PKCS#11 modules" arch=('x86_64') url="http://p11-glue.freedesktop.org" license=('BSD') depends=('glibc' 'libtasn1' 'libffi') -source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('4e9bea1106628ffb820bdad24a819fac' - 'SKIP') +source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig} + libnssckbi-compat.patch) +md5sums=('96f073270c489c9a594e1c9413f42db8' + 'SKIP' + '8c3f119005908cf4a3e0ef0a0a310f14') +validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF') + +prepare() { + cd $pkgname-$pkgver + + # Build and install an additional library (libnssckbi-p11-kit.so) which + # is a copy of p11-kit-trust.so but uses the same label for root certs as + # libnssckbi.so ("Builtin Object Token" instead of "Default Trust") + # https://bugs.freedesktop.org/show_bug.cgi?id=66161 + patch -Np1 -i ../libnssckbi-compat.patch + + autoreconf -vi +} build() { cd $pkgname-$pkgver diff --git a/p11-kit/libnssckbi-compat.patch b/p11-kit/libnssckbi-compat.patch new file mode 100644 index 000000000..d1b70a3bb --- /dev/null +++ b/p11-kit/libnssckbi-compat.patch @@ -0,0 +1,57 @@ +diff -upr p11-kit-0.23.1.orig/trust/Makefile.am p11-kit-0.23.1/trust/Makefile.am +--- p11-kit-0.23.1.orig/trust/Makefile.am 2014-11-12 12:58:50.000000000 +0200 ++++ p11-kit-0.23.1/trust/Makefile.am 2015-03-30 16:43:35.275993032 +0300 +@@ -61,6 +61,20 @@ p11_kit_trust_la_LDFLAGS = \ + + p11_kit_trust_la_SOURCES = $(TRUST_SRCS) + ++libnssckbi_compatdir = $(libdir) ++libnssckbi_compat_LTLIBRARIES = \ ++ libnssckbi-p11-kit.la ++ ++libnssckbi_p11_kit_la_CFLAGS = \ ++ -DLIBNSSCKBI_COMPAT \ ++ $(p11_kit_trust_la_CFLAGS) ++ ++libnssckbi_p11_kit_la_LIBADD = $(p11_kit_trust_la_LIBADD) ++ ++libnssckbi_p11_kit_la_LDFLAGS = $(p11_kit_trust_la_LDFLAGS) ++ ++libnssckbi_p11_kit_la_SOURCES = $(p11_kit_trust_la_SOURCES) ++ + libtrust_testable_la_LDFLAGS = \ + -no-undefined + +diff -upr p11-kit-0.23.1.orig/trust/module.c p11-kit-0.23.1/trust/module.c +--- p11-kit-0.23.1.orig/trust/module.c 2014-12-16 12:24:01.000000000 +0200 ++++ p11-kit-0.23.1/trust/module.c 2015-03-30 16:48:41.370360130 +0300 +@@ -196,7 +196,11 @@ create_tokens_inlock (p11_array *tokens, + const char *label; + } labels[] = { + { "~/", "User Trust" }, ++#ifdef LIBNSSCKBI_COMPAT ++ { DATA_DIR, "Builtin Object Token" }, ++#else + { DATA_DIR, "Default Trust" }, ++#endif + { SYSCONFDIR, "System Trust" }, + { NULL }, + }; +@@ -521,9 +525,15 @@ sys_C_GetSlotInfo (CK_SLOT_ID id, + info->flags = CKF_TOKEN_PRESENT; + strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); + +- /* If too long, copy the first 64 characters into buffer */ +- path = p11_token_get_path (token); ++#ifdef LIBNSSCKBI_COMPAT ++ /* Change description to match libnssckbi so HPKP works in Chromium */ ++ if (strcmp (p11_token_get_label (token), "Builtin Object Token" ) == 0) ++ path = "NSS Builtin Objects"; ++ else ++#endif ++ path = p11_token_get_path (token); + length = strlen (path); ++ /* If too long, copy the first 64 characters into buffer */ + if (length > sizeof (info->slotDescription)) + length = sizeof (info->slotDescription); + memset (info->slotDescription, ' ', sizeof (info->slotDescription)); diff --git a/patch/PKGBUILD b/patch/PKGBUILD index 2410b5ed5..40ce5a92a 100644 --- a/patch/PKGBUILD +++ b/patch/PKGBUILD @@ -1,10 +1,6 @@ -# -# Core Packages for Chakra, part of chakra-project.org -# -# maintainer: abveritas@chakra-project.org pkgname=patch -pkgver=2.7.1 +pkgver=2.7.5 pkgrel=1 pkgdesc="A utility to apply patch files to original sources" arch=('x86_64') @@ -14,7 +10,7 @@ groups=('base-devel') depends=('glibc') optdepends=('ed: Interpret the patch as an ed script') source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz") -md5sums=('e9ae5393426d3ad783a300a338c09b72') +md5sums=('e3da7940431633fb65a01b91d3b7a27a') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/pciutils/PKGBUILD b/pciutils/PKGBUILD index 8dd1e23f9..781239214 100644 --- a/pciutils/PKGBUILD +++ b/pciutils/PKGBUILD @@ -1,6 +1,6 @@ pkgname=pciutils -pkgver=3.3.0 -pkgrel=2 +pkgver=3.3.1 +pkgrel=1 pkgdesc="PCI bus configuration space access library and tools" arch=('x86_64') license=('GPL2') @@ -10,7 +10,7 @@ optdepends=('sh: required by update-pciids') makedepends=('wget') depends=('glibc' 'hwids') source=(ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('3c19adf32a8457983b71ff376ef7dafe') +md5sums=('4c340a317987d61a11ee2cf139ef1191') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/pcre/001-fix-heap-overflow.patch b/pcre/001-fix-heap-overflow.patch deleted file mode 100644 index ff6b9333d..000000000 --- a/pcre/001-fix-heap-overflow.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/code/trunk/pcre_exec.c 2014/11/05 15:08:03 1510 -+++ b/code/trunk/pcre_exec.c 2014/11/19 20:57:13 1513 -@@ -1404,8 +1404,11 @@ - condition = TRUE; - - /* Advance ecode past the assertion to the start of the first branch, -- but adjust it so that the general choosing code below works. */ -- -+ but adjust it so that the general choosing code below works. If the -+ assertion has a quantifier that allows zero repeats we must skip over -+ the BRAZERO. This is a lunatic thing to do, but somebody did! */ -+ -+ if (*ecode == OP_BRAZERO) ecode++; - ecode += GET(ecode, 1); - while (*ecode == OP_ALT) ecode += GET(ecode, 1); - ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode]; diff --git a/pcre/01-seven-security-patches.patch b/pcre/01-seven-security-patches.patch new file mode 100644 index 000000000..f5705e63f --- /dev/null +++ b/pcre/01-seven-security-patches.patch @@ -0,0 +1,1250 @@ +Index: pcre/configure.ac +=================================================================== +--- pcre/configure.ac (revision 1553) ++++ pcre/configure.ac (working copy) +@@ -9,9 +9,9 @@ + dnl be defined as -RC2, for example. For real releases, it should be empty. + + m4_define(pcre_major, [8]) +-m4_define(pcre_minor, [37]) +-m4_define(pcre_prerelease, []) +-m4_define(pcre_date, [2015-04-28]) ++m4_define(pcre_minor, [38]) ++m4_define(pcre_prerelease, [-RC1]) ++m4_define(pcre_date, [2015-05-03]) + + # NOTE: The CMakeLists.txt file searches for the above variables in the first + # 50 lines of this file. Please update that if the variables above are moved. +Index: pcre/sljit/sljitConfig.h +=================================================================== +--- pcre/sljit/sljitConfig.h (revision 1553) ++++ pcre/sljit/sljitConfig.h (working copy) +@@ -96,6 +96,15 @@ + #define SLJIT_EXECUTABLE_ALLOCATOR 1 + #endif + ++/* Force cdecl calling convention even if a better calling ++ convention (e.g. fastcall) is supported by the C compiler. ++ If this option is enabled, C functions without ++ SLJIT_CALL can also be called from JIT code. */ ++#ifndef SLJIT_USE_CDECL_CALLING_CONVENTION ++/* Disabled by default */ ++#define SLJIT_USE_CDECL_CALLING_CONVENTION 0 ++#endif ++ + /* Return with error when an invalid argument is passed. */ + #ifndef SLJIT_ARGUMENT_CHECKS + /* Disabled by default */ +Index: pcre/sljit/sljitLir.c +=================================================================== +--- pcre/sljit/sljitLir.c (revision 1553) ++++ pcre/sljit/sljitLir.c (working copy) +@@ -845,8 +845,8 @@ + } + + static SLJIT_CONST char* op0_names[] = { +- (char*)"breakpoint", (char*)"nop", +- (char*)"lumul", (char*)"lsmul", (char*)"ludiv", (char*)"lsdiv", ++ (char*)"breakpoint", (char*)"nop", (char*)"lumul", (char*)"lsmul", ++ (char*)"udivmod", (char*)"sdivmod", (char*)"udivi", (char*)"sdivi" + }; + + static SLJIT_CONST char* op1_names[] = { +@@ -1036,7 +1036,7 @@ + { + #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) + CHECK_ARGUMENT((op >= SLJIT_BREAKPOINT && op <= SLJIT_LSMUL) +- || ((op & ~SLJIT_INT_OP) >= SLJIT_LUDIV && (op & ~SLJIT_INT_OP) <= SLJIT_LSDIV)); ++ || ((op & ~SLJIT_INT_OP) >= SLJIT_UDIVMOD && (op & ~SLJIT_INT_OP) <= SLJIT_SDIVI)); + CHECK_ARGUMENT(op < SLJIT_LUMUL || compiler->scratches >= 2); + #endif + #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) +@@ -1447,6 +1447,8 @@ + + static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_get_local_base(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw offset) + { ++ SLJIT_UNUSED_ARG(offset); ++ + #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) + FUNCTION_CHECK_DST(dst, dstw); + #endif +@@ -1462,6 +1464,8 @@ + + static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_const(struct sljit_compiler *compiler, sljit_si dst, sljit_sw dstw, sljit_sw init_value) + { ++ SLJIT_UNUSED_ARG(init_value); ++ + #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) + FUNCTION_CHECK_DST(dst, dstw); + #endif +Index: pcre/sljit/sljitNativeMIPS_common.c +=================================================================== +--- pcre/sljit/sljitNativeMIPS_common.c (revision 1553) ++++ pcre/sljit/sljitNativeMIPS_common.c (working copy) +@@ -1053,8 +1053,11 @@ + #endif + FAIL_IF(push_inst(compiler, MFLO | D(SLJIT_R0), DR(SLJIT_R0))); + return push_inst(compiler, MFHI | D(SLJIT_R1), DR(SLJIT_R1)); +- case SLJIT_LUDIV: +- case SLJIT_LSDIV: ++ case SLJIT_UDIVMOD: ++ case SLJIT_SDIVMOD: ++ case SLJIT_UDIVI: ++ case SLJIT_SDIVI: ++ SLJIT_COMPILE_ASSERT((SLJIT_UDIVMOD & 0x2) == 0 && SLJIT_UDIVI - 0x2 == SLJIT_UDIVMOD, bad_div_opcode_assignments); + #if !(defined SLJIT_MIPS_R1 && SLJIT_MIPS_R1) + FAIL_IF(push_inst(compiler, NOP, UNMOVABLE_INS)); + FAIL_IF(push_inst(compiler, NOP, UNMOVABLE_INS)); +@@ -1062,15 +1065,15 @@ + + #if (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64) + if (int_op) +- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? DIVU : DIV) | S(SLJIT_R0) | T(SLJIT_R1), MOVABLE_INS)); ++ FAIL_IF(push_inst(compiler, ((op | 0x2) == SLJIT_UDIVI ? DIVU : DIV) | S(SLJIT_R0) | T(SLJIT_R1), MOVABLE_INS)); + else +- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? DDIVU : DDIV) | S(SLJIT_R0) | T(SLJIT_R1), MOVABLE_INS)); ++ FAIL_IF(push_inst(compiler, ((op | 0x2) == SLJIT_UDIVI ? DDIVU : DDIV) | S(SLJIT_R0) | T(SLJIT_R1), MOVABLE_INS)); + #else +- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? DIVU : DIV) | S(SLJIT_R0) | T(SLJIT_R1), MOVABLE_INS)); ++ FAIL_IF(push_inst(compiler, ((op | 0x2) == SLJIT_UDIVI ? DIVU : DIV) | S(SLJIT_R0) | T(SLJIT_R1), MOVABLE_INS)); + #endif + + FAIL_IF(push_inst(compiler, MFLO | D(SLJIT_R0), DR(SLJIT_R0))); +- return push_inst(compiler, MFHI | D(SLJIT_R1), DR(SLJIT_R1)); ++ return (op >= SLJIT_UDIVI) ? SLJIT_SUCCESS : push_inst(compiler, MFHI | D(SLJIT_R1), DR(SLJIT_R1)); + } + + return SLJIT_SUCCESS; +Index: pcre/sljit/sljitNativeSPARC_common.c +=================================================================== +--- pcre/sljit/sljitNativeSPARC_common.c (revision 1553) ++++ pcre/sljit/sljitNativeSPARC_common.c (working copy) +@@ -777,20 +777,25 @@ + #else + #error "Implementation required" + #endif +- case SLJIT_LUDIV: +- case SLJIT_LSDIV: ++ case SLJIT_UDIVMOD: ++ case SLJIT_SDIVMOD: ++ case SLJIT_UDIVI: ++ case SLJIT_SDIVI: ++ SLJIT_COMPILE_ASSERT((SLJIT_UDIVMOD & 0x2) == 0 && SLJIT_UDIVI - 0x2 == SLJIT_UDIVMOD, bad_div_opcode_assignments); + #if (defined SLJIT_CONFIG_SPARC_32 && SLJIT_CONFIG_SPARC_32) +- if (op == SLJIT_LUDIV) ++ if ((op | 0x2) == SLJIT_UDIVI) + FAIL_IF(push_inst(compiler, WRY | S1(0), MOVABLE_INS)); + else { + FAIL_IF(push_inst(compiler, SRA | D(TMP_REG1) | S1(SLJIT_R0) | IMM(31), DR(TMP_REG1))); + FAIL_IF(push_inst(compiler, WRY | S1(TMP_REG1), MOVABLE_INS)); + } +- FAIL_IF(push_inst(compiler, OR | D(TMP_REG2) | S1(0) | S2(SLJIT_R0), DR(TMP_REG2))); +- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? UDIV : SDIV) | D(SLJIT_R0) | S1(SLJIT_R0) | S2(SLJIT_R1), DR(SLJIT_R0))); ++ if (op <= SLJIT_SDIVMOD) ++ FAIL_IF(push_inst(compiler, OR | D(TMP_REG2) | S1(0) | S2(SLJIT_R0), DR(TMP_REG2))); ++ FAIL_IF(push_inst(compiler, ((op | 0x2) == SLJIT_UDIVI ? UDIV : SDIV) | D(SLJIT_R0) | S1(SLJIT_R0) | S2(SLJIT_R1), DR(SLJIT_R0))); ++ if (op >= SLJIT_UDIVI) ++ return SLJIT_SUCCESS; + FAIL_IF(push_inst(compiler, SMUL | D(SLJIT_R1) | S1(SLJIT_R0) | S2(SLJIT_R1), DR(SLJIT_R1))); +- FAIL_IF(push_inst(compiler, SUB | D(SLJIT_R1) | S1(TMP_REG2) | S2(SLJIT_R1), DR(SLJIT_R1))); +- return SLJIT_SUCCESS; ++ return push_inst(compiler, SUB | D(SLJIT_R1) | S1(TMP_REG2) | S2(SLJIT_R1), DR(SLJIT_R1)); + #else + #error "Implementation required" + #endif +Index: pcre/sljit/sljitNativeARM_32.c +=================================================================== +--- pcre/sljit/sljitNativeARM_32.c (revision 1553) ++++ pcre/sljit/sljitNativeARM_32.c (working copy) +@@ -1833,18 +1833,33 @@ + | (reg_map[SLJIT_R0] << 8) + | reg_map[TMP_REG1]); + #endif +- case SLJIT_LUDIV: +- case SLJIT_LSDIV: +- if (compiler->scratches >= 3) ++ case SLJIT_UDIVMOD: ++ case SLJIT_SDIVMOD: ++ case SLJIT_UDIVI: ++ case SLJIT_SDIVI: ++ SLJIT_COMPILE_ASSERT((SLJIT_UDIVMOD & 0x2) == 0 && SLJIT_UDIVI - 0x2 == SLJIT_UDIVMOD, bad_div_opcode_assignments); ++ SLJIT_COMPILE_ASSERT(reg_map[2] == 1 && reg_map[3] == 2, bad_register_mapping); ++ ++ if ((op >= SLJIT_UDIVI) && (compiler->scratches >= 3)) { + FAIL_IF(push_inst(compiler, 0xe52d2008 /* str r2, [sp, #-8]! */)); ++ FAIL_IF(push_inst(compiler, 0xe58d1004 /* str r1, [sp, #4] */)); ++ } ++ else if ((op >= SLJIT_UDIVI) || (compiler->scratches >= 3)) ++ FAIL_IF(push_inst(compiler, 0xe52d0008 | (op >= SLJIT_UDIVI ? 0x1000 : 0x2000) /* str r1/r2, [sp, #-8]! */)); ++ + #if defined(__GNUC__) + FAIL_IF(sljit_emit_ijump(compiler, SLJIT_FAST_CALL, SLJIT_IMM, +- (op == SLJIT_LUDIV ? SLJIT_FUNC_OFFSET(__aeabi_uidivmod) : SLJIT_FUNC_OFFSET(__aeabi_idivmod)))); ++ ((op | 0x2) == SLJIT_UDIVI ? SLJIT_FUNC_OFFSET(__aeabi_uidivmod) : SLJIT_FUNC_OFFSET(__aeabi_idivmod)))); + #else + #error "Software divmod functions are needed" + #endif +- if (compiler->scratches >= 3) +- return push_inst(compiler, 0xe49d2008 /* ldr r2, [sp], #8 */); ++ ++ if ((op >= SLJIT_UDIVI) && (compiler->scratches >= 3)) { ++ FAIL_IF(push_inst(compiler, 0xe59d1004 /* ldr r1, [sp, #4] */)); ++ FAIL_IF(push_inst(compiler, 0xe49d2008 /* ldr r2, [sp], #8 */)); ++ } ++ else if ((op >= SLJIT_UDIVI) || (compiler->scratches >= 3)) ++ return push_inst(compiler, 0xe49d0008 | (op >= SLJIT_UDIVI ? 0x1000 : 0x2000) /* ldr r1/r2, [sp], #8 */); + return SLJIT_SUCCESS; + } + +Index: pcre/sljit/sljitLir.h +=================================================================== +--- pcre/sljit/sljitLir.h (revision 1553) ++++ pcre/sljit/sljitLir.h (working copy) +@@ -687,7 +687,7 @@ + #define SLJIT_OP0_BASE 0 + + /* Flags: - (never set any flags) +- Note: breakpoint instruction is not supported by all architectures (namely ppc) ++ Note: breakpoint instruction is not supported by all architectures (e.g. ppc) + It falls back to SLJIT_NOP in those cases. */ + #define SLJIT_BREAKPOINT (SLJIT_OP0_BASE + 0) + /* Flags: - (never set any flags) +@@ -696,24 +696,42 @@ + #define SLJIT_NOP (SLJIT_OP0_BASE + 1) + /* Flags: - (may destroy flags) + Unsigned multiplication of SLJIT_R0 and SLJIT_R1. +- Result goes to SLJIT_R1:SLJIT_R0 (high:low) word */ ++ Result is placed into SLJIT_R1:SLJIT_R0 (high:low) word */ + #define SLJIT_LUMUL (SLJIT_OP0_BASE + 2) + /* Flags: - (may destroy flags) + Signed multiplication of SLJIT_R0 and SLJIT_R1. +- Result goes to SLJIT_R1:SLJIT_R0 (high:low) word */ ++ Result is placed into SLJIT_R1:SLJIT_R0 (high:low) word */ + #define SLJIT_LSMUL (SLJIT_OP0_BASE + 3) + /* Flags: I - (may destroy flags) + Unsigned divide of the value in SLJIT_R0 by the value in SLJIT_R1. +- The result is placed in SLJIT_R0 and the remainder goes to SLJIT_R1. +- Note: if SLJIT_R1 contains 0, the behaviour is undefined. */ +-#define SLJIT_LUDIV (SLJIT_OP0_BASE + 4) +-#define SLJIT_ILUDIV (SLJIT_LUDIV | SLJIT_INT_OP) ++ The result is placed into SLJIT_R0 and the remainder into SLJIT_R1. ++ Note: if SLJIT_R1 is 0, the behaviour is undefined. */ ++#define SLJIT_UDIVMOD (SLJIT_OP0_BASE + 4) ++#define SLJIT_IUDIVMOD (SLJIT_UDIVMOD | SLJIT_INT_OP) + /* Flags: I - (may destroy flags) + Signed divide of the value in SLJIT_R0 by the value in SLJIT_R1. +- The result is placed in SLJIT_R0 and the remainder goes to SLJIT_R1. +- Note: if SLJIT_R1 contains 0, the behaviour is undefined. */ +-#define SLJIT_LSDIV (SLJIT_OP0_BASE + 5) +-#define SLJIT_ILSDIV (SLJIT_LSDIV | SLJIT_INT_OP) ++ The result is placed into SLJIT_R0 and the remainder into SLJIT_R1. ++ Note: if SLJIT_R1 is 0, the behaviour is undefined. ++ Note: if SLJIT_R1 is -1 and SLJIT_R0 is integer min (0x800..00), ++ the behaviour is undefined. */ ++#define SLJIT_SDIVMOD (SLJIT_OP0_BASE + 5) ++#define SLJIT_ISDIVMOD (SLJIT_SDIVMOD | SLJIT_INT_OP) ++/* Flags: I - (may destroy flags) ++ Unsigned divide of the value in SLJIT_R0 by the value in SLJIT_R1. ++ The result is placed into SLJIT_R0. SLJIT_R1 preserves its value. ++ Note: if SLJIT_R1 is 0, the behaviour is undefined. ++ Note: SLJIT_SDIV is single precision divide. */ ++#define SLJIT_UDIVI (SLJIT_OP0_BASE + 6) ++#define SLJIT_IUDIVI (SLJIT_UDIVI | SLJIT_INT_OP) ++/* Flags: I - (may destroy flags) ++ Signed divide of the value in SLJIT_R0 by the value in SLJIT_R1. ++ The result is placed into SLJIT_R0. SLJIT_R1 preserves its value. ++ Note: if SLJIT_R1 is 0, the behaviour is undefined. ++ Note: if SLJIT_R1 is -1 and SLJIT_R0 is integer min (0x800..00), ++ the behaviour is undefined. ++ Note: SLJIT_SDIV is single precision divide. */ ++#define SLJIT_SDIVI (SLJIT_OP0_BASE + 7) ++#define SLJIT_ISDIVI (SLJIT_SDIVI | SLJIT_INT_OP) + + SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op0(struct sljit_compiler *compiler, sljit_si op); + +Index: pcre/sljit/sljitNativeARM_T2_32.c +=================================================================== +--- pcre/sljit/sljitNativeARM_T2_32.c (revision 1553) ++++ pcre/sljit/sljitNativeARM_T2_32.c (working copy) +@@ -1239,6 +1239,9 @@ + + SLJIT_API_FUNC_ATTRIBUTE sljit_si sljit_emit_op0(struct sljit_compiler *compiler, sljit_si op) + { ++ sljit_sw saved_reg_list[3]; ++ sljit_sw saved_reg_count; ++ + CHECK_ERROR(); + CHECK(check_sljit_emit_op0(compiler, op)); + +@@ -1255,24 +1258,53 @@ + | (reg_map[SLJIT_R0] << 12) + | (reg_map[SLJIT_R0] << 16) + | reg_map[SLJIT_R1]); +- case SLJIT_LUDIV: +- case SLJIT_LSDIV: +- if (compiler->scratches >= 4) { +- FAIL_IF(push_inst32(compiler, 0xf84d2d04 /* str r2, [sp, #-4]! */)); +- FAIL_IF(push_inst32(compiler, 0xf84dcd04 /* str ip, [sp, #-4]! */)); +- } else if (compiler->scratches >= 3) +- FAIL_IF(push_inst32(compiler, 0xf84d2d08 /* str r2, [sp, #-8]! */)); ++ case SLJIT_UDIVMOD: ++ case SLJIT_SDIVMOD: ++ case SLJIT_UDIVI: ++ case SLJIT_SDIVI: ++ SLJIT_COMPILE_ASSERT((SLJIT_UDIVMOD & 0x2) == 0 && SLJIT_UDIVI - 0x2 == SLJIT_UDIVMOD, bad_div_opcode_assignments); ++ SLJIT_COMPILE_ASSERT(reg_map[2] == 1 && reg_map[3] == 2 && reg_map[4] == 12, bad_register_mapping); ++ ++ saved_reg_count = 0; ++ if (compiler->scratches >= 4) ++ saved_reg_list[saved_reg_count++] = 12; ++ if (compiler->scratches >= 3) ++ saved_reg_list[saved_reg_count++] = 2; ++ if (op >= SLJIT_UDIVI) ++ saved_reg_list[saved_reg_count++] = 1; ++ ++ if (saved_reg_count > 0) { ++ FAIL_IF(push_inst32(compiler, 0xf84d0d00 | (saved_reg_count >= 3 ? 16 : 8) ++ | (saved_reg_list[0] << 12) /* str rX, [sp, #-8/-16]! */)); ++ if (saved_reg_count >= 2) { ++ SLJIT_ASSERT(saved_reg_list[1] < 8); ++ FAIL_IF(push_inst16(compiler, 0x9001 | (saved_reg_list[1] << 8) /* str rX, [sp, #4] */)); ++ } ++ if (saved_reg_count >= 3) { ++ SLJIT_ASSERT(saved_reg_list[2] < 8); ++ FAIL_IF(push_inst16(compiler, 0x9002 | (saved_reg_list[2] << 8) /* str rX, [sp, #8] */)); ++ } ++ } ++ + #if defined(__GNUC__) + FAIL_IF(sljit_emit_ijump(compiler, SLJIT_FAST_CALL, SLJIT_IMM, +- (op == SLJIT_LUDIV ? SLJIT_FUNC_OFFSET(__aeabi_uidivmod) : SLJIT_FUNC_OFFSET(__aeabi_idivmod)))); ++ ((op | 0x2) == SLJIT_UDIVI ? SLJIT_FUNC_OFFSET(__aeabi_uidivmod) : SLJIT_FUNC_OFFSET(__aeabi_idivmod)))); + #else + #error "Software divmod functions are needed" + #endif +- if (compiler->scratches >= 4) { +- FAIL_IF(push_inst32(compiler, 0xf85dcb04 /* ldr ip, [sp], #4 */)); +- return push_inst32(compiler, 0xf85d2b04 /* ldr r2, [sp], #4 */); +- } else if (compiler->scratches >= 3) +- return push_inst32(compiler, 0xf85d2b08 /* ldr r2, [sp], #8 */); ++ ++ if (saved_reg_count > 0) { ++ if (saved_reg_count >= 3) { ++ SLJIT_ASSERT(saved_reg_list[2] < 8); ++ FAIL_IF(push_inst16(compiler, 0x9802 | (saved_reg_list[2] << 8) /* ldr rX, [sp, #8] */)); ++ } ++ if (saved_reg_count >= 2) { ++ SLJIT_ASSERT(saved_reg_list[1] < 8); ++ FAIL_IF(push_inst16(compiler, 0x9801 | (saved_reg_list[1] << 8) /* ldr rX, [sp, #4] */)); ++ } ++ return push_inst32(compiler, 0xf85d0b00 | (saved_reg_count >= 3 ? 16 : 8) ++ | (saved_reg_list[0] << 12) /* ldr rX, [sp], #8/16 */); ++ } + return SLJIT_SUCCESS; + } + +Index: pcre/sljit/sljitNativeARM_64.c +=================================================================== +--- pcre/sljit/sljitNativeARM_64.c (revision 1553) ++++ pcre/sljit/sljitNativeARM_64.c (working copy) +@@ -1087,14 +1087,20 @@ + saved_regs_size += sizeof(sljit_sw); + } + local_size -= saved_regs_size + SLJIT_LOCALS_OFFSET; +- FAIL_IF(push_inst(compiler, SUBI | RD(TMP_SP) | RN(TMP_SP) | (saved_regs_size << 10))); ++ if (saved_regs_size > 0) ++ FAIL_IF(push_inst(compiler, SUBI | RD(TMP_SP) | RN(TMP_SP) | (saved_regs_size << 10))); + } + + tmp = saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? (SLJIT_S0 + 1 - saveds) : SLJIT_FIRST_SAVED_REG; + prev = -1; + for (i = SLJIT_S0; i >= tmp; i--) { + if (prev == -1) { +- prev = i; ++ if (!(offs & (1 << 15))) { ++ prev = i; ++ continue; ++ } ++ FAIL_IF(push_inst(compiler, STRI | RT(i) | RN(TMP_SP) | (offs >> 5))); ++ offs += 1 << 15; + continue; + } + FAIL_IF(push_inst(compiler, STP | RT(prev) | RT2(i) | RN(TMP_SP) | offs)); +@@ -1104,7 +1110,12 @@ + + for (i = scratches; i >= SLJIT_FIRST_SAVED_REG; i--) { + if (prev == -1) { +- prev = i; ++ if (!(offs & (1 << 15))) { ++ prev = i; ++ continue; ++ } ++ FAIL_IF(push_inst(compiler, STRI | RT(i) | RN(TMP_SP) | (offs >> 5))); ++ offs += 1 << 15; + continue; + } + FAIL_IF(push_inst(compiler, STP | RT(prev) | RT2(i) | RN(TMP_SP) | offs)); +@@ -1112,8 +1123,7 @@ + prev = -1; + } + +- if (prev != -1) +- FAIL_IF(push_inst(compiler, STRI | RT(prev) | RN(TMP_SP) | (offs >> 5))); ++ SLJIT_ASSERT(prev == -1); + + if (compiler->local_size > (63 * sizeof(sljit_sw))) { + /* The local_size is already adjusted by the saved registers. */ +@@ -1188,7 +1198,12 @@ + prev = -1; + for (i = SLJIT_S0; i >= tmp; i--) { + if (prev == -1) { +- prev = i; ++ if (!(offs & (1 << 15))) { ++ prev = i; ++ continue; ++ } ++ FAIL_IF(push_inst(compiler, LDRI | RT(i) | RN(TMP_SP) | (offs >> 5))); ++ offs += 1 << 15; + continue; + } + FAIL_IF(push_inst(compiler, LDP | RT(prev) | RT2(i) | RN(TMP_SP) | offs)); +@@ -1198,7 +1213,12 @@ + + for (i = compiler->scratches; i >= SLJIT_FIRST_SAVED_REG; i--) { + if (prev == -1) { +- prev = i; ++ if (!(offs & (1 << 15))) { ++ prev = i; ++ continue; ++ } ++ FAIL_IF(push_inst(compiler, LDRI | RT(i) | RN(TMP_SP) | (offs >> 5))); ++ offs += 1 << 15; + continue; + } + FAIL_IF(push_inst(compiler, LDP | RT(prev) | RT2(i) | RN(TMP_SP) | offs)); +@@ -1206,13 +1226,12 @@ + prev = -1; + } + +- if (prev != -1) +- FAIL_IF(push_inst(compiler, LDRI | RT(prev) | RN(TMP_SP) | (offs >> 5))); ++ SLJIT_ASSERT(prev == -1); + + if (compiler->local_size <= (63 * sizeof(sljit_sw))) { + FAIL_IF(push_inst(compiler, LDP_PST | 29 | RT2(TMP_LR) + | RN(TMP_SP) | (((local_size >> 3) & 0x7f) << 15))); +- } else { ++ } else if (saved_regs_size > 0) { + FAIL_IF(push_inst(compiler, ADDI | RD(TMP_SP) | RN(TMP_SP) | (saved_regs_size << 10))); + } + +@@ -1242,12 +1261,15 @@ + FAIL_IF(push_inst(compiler, ORR | RD(TMP_REG1) | RN(TMP_ZERO) | RM(SLJIT_R0))); + FAIL_IF(push_inst(compiler, MADD | RD(SLJIT_R0) | RN(SLJIT_R0) | RM(SLJIT_R1) | RT2(TMP_ZERO))); + return push_inst(compiler, (op == SLJIT_LUMUL ? UMULH : SMULH) | RD(SLJIT_R1) | RN(TMP_REG1) | RM(SLJIT_R1)); +- case SLJIT_LUDIV: +- case SLJIT_LSDIV: ++ case SLJIT_UDIVMOD: ++ case SLJIT_SDIVMOD: + FAIL_IF(push_inst(compiler, (ORR ^ inv_bits) | RD(TMP_REG1) | RN(TMP_ZERO) | RM(SLJIT_R0))); +- FAIL_IF(push_inst(compiler, ((op == SLJIT_LUDIV ? UDIV : SDIV) ^ inv_bits) | RD(SLJIT_R0) | RN(SLJIT_R0) | RM(SLJIT_R1))); ++ FAIL_IF(push_inst(compiler, ((op == SLJIT_UDIVMOD ? UDIV : SDIV) ^ inv_bits) | RD(SLJIT_R0) | RN(SLJIT_R0) | RM(SLJIT_R1))); + FAIL_IF(push_inst(compiler, (MADD ^ inv_bits) | RD(SLJIT_R1) | RN(SLJIT_R0) | RM(SLJIT_R1) | RT2(TMP_ZERO))); + return push_inst(compiler, (SUB ^ inv_bits) | RD(SLJIT_R1) | RN(TMP_REG1) | RM(SLJIT_R1)); ++ case SLJIT_UDIVI: ++ case SLJIT_SDIVI: ++ return push_inst(compiler, ((op == SLJIT_UDIVI ? UDIV : SDIV) ^ inv_bits) | RD(SLJIT_R0) | RN(SLJIT_R0) | RM(SLJIT_R1)); + } + + return SLJIT_SUCCESS; +Index: pcre/sljit/sljitNativePPC_common.c +=================================================================== +--- pcre/sljit/sljitNativePPC_common.c (revision 1553) ++++ pcre/sljit/sljitNativePPC_common.c (working copy) +@@ -1267,22 +1267,23 @@ + FAIL_IF(push_inst(compiler, MULLW | D(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R1))); + return push_inst(compiler, (op == SLJIT_LUMUL ? MULHWU : MULHW) | D(SLJIT_R1) | A(TMP_REG1) | B(SLJIT_R1)); + #endif +- case SLJIT_LUDIV: +- case SLJIT_LSDIV: ++ case SLJIT_UDIVMOD: ++ case SLJIT_SDIVMOD: + FAIL_IF(push_inst(compiler, OR | S(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R0))); + #if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) +- if (int_op) { +- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? DIVWU : DIVW) | D(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R1))); +- FAIL_IF(push_inst(compiler, MULLW | D(SLJIT_R1) | A(SLJIT_R0) | B(SLJIT_R1))); +- } else { +- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? DIVDU : DIVD) | D(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R1))); +- FAIL_IF(push_inst(compiler, MULLD | D(SLJIT_R1) | A(SLJIT_R0) | B(SLJIT_R1))); +- } +- return push_inst(compiler, SUBF | D(SLJIT_R1) | A(SLJIT_R1) | B(TMP_REG1)); ++ FAIL_IF(push_inst(compiler, (int_op ? (op == SLJIT_UDIVMOD ? DIVWU : DIVW) : (op == SLJIT_UDIVMOD ? DIVDU : DIVD)) | D(SLJIT_R0) | A(SLJIT_R0) | B(SLJIT_R1))); ++ FAIL_IF(push_inst(compiler, (int_op ? MULLW : MULLD) | D(SLJIT_R1) | A(SLJIT_R0) | B(SLJIT_R1))); + #else +- FAIL_IF(push_inst(compiler, (op == SLJIT_LUDIV ? DIVWU : DIVW) | D(SLJIT_R0) | A(TMP_REG1) | B(SLJIT_R1))); ++ FAIL_IF(push_inst(compiler, (op == SLJIT_UDIVMOD ? DIVWU : DIVW) | D(SLJIT_R0) | A(SLJIT_R0) | B(SLJIT_R1))); + FAIL_IF(push_inst(compiler, MULLW | D(SLJIT_R1) | A(SLJIT_R0) | B(SLJIT_R1))); ++#endif + return push_inst(compiler, SUBF | D(SLJIT_R1) | A(SLJIT_R1) | B(TMP_REG1)); ++ case SLJIT_UDIVI: ++ case SLJIT_SDIVI: ++#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) ++ return push_inst(compiler, (int_op ? (op == SLJIT_UDIVI ? DIVWU : DIVW) : (op == SLJIT_UDIVI ? DIVDU : DIVD)) | D(SLJIT_R0) | A(SLJIT_R0) | B(SLJIT_R1)); ++#else ++ return push_inst(compiler, (op == SLJIT_UDIVI ? DIVWU : DIVW) | D(SLJIT_R0) | A(SLJIT_R0) | B(SLJIT_R1)); + #endif + } + +Index: pcre/sljit/sljitNativeX86_common.c +=================================================================== +--- pcre/sljit/sljitNativeX86_common.c (revision 1553) ++++ pcre/sljit/sljitNativeX86_common.c (working copy) +@@ -742,8 +742,10 @@ + break; + case SLJIT_LUMUL: + case SLJIT_LSMUL: +- case SLJIT_LUDIV: +- case SLJIT_LSDIV: ++ case SLJIT_UDIVMOD: ++ case SLJIT_SDIVMOD: ++ case SLJIT_UDIVI: ++ case SLJIT_SDIVI: + compiler->flags_saved = 0; + #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) + #ifdef _WIN64 +@@ -761,9 +763,10 @@ + #endif + compiler->mode32 = op & SLJIT_INT_OP; + #endif ++ SLJIT_COMPILE_ASSERT((SLJIT_UDIVMOD & 0x2) == 0 && SLJIT_UDIVI - 0x2 == SLJIT_UDIVMOD, bad_div_opcode_assignments); + + op = GET_OPCODE(op); +- if (op == SLJIT_LUDIV) { ++ if ((op | 0x2) == SLJIT_UDIVI) { + #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) || defined(_WIN64) + EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_R1, 0); + inst = emit_x86_instruction(compiler, 1, SLJIT_R1, 0, SLJIT_R1, 0); +@@ -774,7 +777,7 @@ + *inst = XOR_r_rm; + } + +- if (op == SLJIT_LSDIV) { ++ if ((op | 0x2) == SLJIT_SDIVI) { + #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) || defined(_WIN64) + EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_R1, 0); + #endif +@@ -805,10 +808,10 @@ + FAIL_IF(!inst); + INC_SIZE(2); + *inst++ = GROUP_F7; +- *inst = MOD_REG | ((op >= SLJIT_LUDIV) ? reg_map[TMP_REG1] : reg_map[SLJIT_R1]); ++ *inst = MOD_REG | ((op >= SLJIT_UDIVMOD) ? reg_map[TMP_REG1] : reg_map[SLJIT_R1]); + #else + #ifdef _WIN64 +- size = (!compiler->mode32 || op >= SLJIT_LUDIV) ? 3 : 2; ++ size = (!compiler->mode32 || op >= SLJIT_UDIVMOD) ? 3 : 2; + #else + size = (!compiler->mode32) ? 3 : 2; + #endif +@@ -817,11 +820,11 @@ + INC_SIZE(size); + #ifdef _WIN64 + if (!compiler->mode32) +- *inst++ = REX_W | ((op >= SLJIT_LUDIV) ? REX_B : 0); +- else if (op >= SLJIT_LUDIV) ++ *inst++ = REX_W | ((op >= SLJIT_UDIVMOD) ? REX_B : 0); ++ else if (op >= SLJIT_UDIVMOD) + *inst++ = REX_B; + *inst++ = GROUP_F7; +- *inst = MOD_REG | ((op >= SLJIT_LUDIV) ? reg_lmap[TMP_REG1] : reg_lmap[SLJIT_R1]); ++ *inst = MOD_REG | ((op >= SLJIT_UDIVMOD) ? reg_lmap[TMP_REG1] : reg_lmap[SLJIT_R1]); + #else + if (!compiler->mode32) + *inst++ = REX_W; +@@ -836,15 +839,21 @@ + case SLJIT_LSMUL: + *inst |= IMUL; + break; +- case SLJIT_LUDIV: ++ case SLJIT_UDIVMOD: ++ case SLJIT_UDIVI: + *inst |= DIV; + break; +- case SLJIT_LSDIV: ++ case SLJIT_SDIVMOD: ++ case SLJIT_SDIVI: + *inst |= IDIV; + break; + } + #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) && !defined(_WIN64) +- EMIT_MOV(compiler, SLJIT_R1, 0, TMP_REG1, 0); ++ if (op <= SLJIT_SDIVMOD) ++ EMIT_MOV(compiler, SLJIT_R1, 0, TMP_REG1, 0); ++#else ++ if (op >= SLJIT_UDIVI) ++ EMIT_MOV(compiler, SLJIT_R1, 0, TMP_REG1, 0); + #endif + break; + } +@@ -1905,60 +1914,62 @@ + return SLJIT_SUCCESS; + } + +- if (FAST_IS_REG(src1)) { ++ if (!(src1 & SLJIT_IMM)) { + if (src2 & SLJIT_IMM) { + #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) + if (IS_HALFWORD(src2w) || compiler->mode32) { +- inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src2w, src1, 0); ++ inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src2w, src1, src1w); + FAIL_IF(!inst); + *inst = GROUP_F7; + } + else { + FAIL_IF(emit_load_imm64(compiler, TMP_REG2, src2w)); +- inst = emit_x86_instruction(compiler, 1, TMP_REG2, 0, src1, 0); ++ inst = emit_x86_instruction(compiler, 1, TMP_REG2, 0, src1, src1w); + FAIL_IF(!inst); + *inst = TEST_rm_r; + } + #else +- inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src2w, src1, 0); ++ inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src2w, src1, src1w); + FAIL_IF(!inst); + *inst = GROUP_F7; + #endif ++ return SLJIT_SUCCESS; + } +- else { ++ else if (FAST_IS_REG(src1)) { + inst = emit_x86_instruction(compiler, 1, src1, 0, src2, src2w); + FAIL_IF(!inst); + *inst = TEST_rm_r; ++ return SLJIT_SUCCESS; + } +- return SLJIT_SUCCESS; + } + +- if (FAST_IS_REG(src2)) { ++ if (!(src2 & SLJIT_IMM)) { + if (src1 & SLJIT_IMM) { + #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64) + if (IS_HALFWORD(src1w) || compiler->mode32) { +- inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src1w, src2, 0); ++ inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src1w, src2, src2w); + FAIL_IF(!inst); + *inst = GROUP_F7; + } + else { + FAIL_IF(emit_load_imm64(compiler, TMP_REG2, src1w)); +- inst = emit_x86_instruction(compiler, 1, TMP_REG2, 0, src2, 0); ++ inst = emit_x86_instruction(compiler, 1, TMP_REG2, 0, src2, src2w); + FAIL_IF(!inst); + *inst = TEST_rm_r; + } + #else +- inst = emit_x86_instruction(compiler, 1, src1, src1w, src2, 0); ++ inst = emit_x86_instruction(compiler, 1, src1, src1w, src2, src2w); + FAIL_IF(!inst); + *inst = GROUP_F7; + #endif ++ return SLJIT_SUCCESS; + } +- else { ++ else if (FAST_IS_REG(src2)) { + inst = emit_x86_instruction(compiler, 1, src2, 0, src1, src1w); + FAIL_IF(!inst); + *inst = TEST_rm_r; ++ return SLJIT_SUCCESS; + } +- return SLJIT_SUCCESS; + } + + EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w); +Index: pcre/sljit/sljitConfigInternal.h +=================================================================== +--- pcre/sljit/sljitConfigInternal.h (revision 1553) ++++ pcre/sljit/sljitConfigInternal.h (working copy) +@@ -468,7 +468,12 @@ + + #ifndef SLJIT_CALL + +-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) ++#if (defined SLJIT_USE_CDECL_CALLING_CONVENTION && SLJIT_USE_CDECL_CALLING_CONVENTION) ++ ++/* Force cdecl. */ ++#define SLJIT_CALL ++ ++#elif (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) + + #if defined(__GNUC__) && !defined(__APPLE__) + +Index: pcre/ChangeLog +=================================================================== +--- pcre/ChangeLog (revision 1553) ++++ pcre/ChangeLog (working copy) +@@ -1,6 +1,46 @@ + ChangeLog for PCRE + ------------------ + ++Note that the PCRE 8.xx series (PCRE1) is now in a bugfix-only state. All ++development is happening in the PCRE2 10.xx series. ++ ++Version 8.38 xx-xxx-xxxx ++------------------------ ++ ++1. If a group that contained a recursive back reference also contained a ++ forward reference subroutine call followed by a non-forward-reference ++ subroutine call, for example /.((?2)(?R)\1)()/, pcre2_compile() failed to ++ compile correct code, leading to undefined behaviour or an internally ++ detected error. This bug was discovered by the LLVM fuzzer. ++ ++2. Quantification of certain items (e.g. atomic back references) could cause ++ incorrect code to be compiled when recursive forward references were ++ involved. For example, in this pattern: /(?1)()((((((\1++))\x85)+)|))/. ++ This bug was discovered by the LLVM fuzzer. ++ ++3. A repeated conditional group whose condition was a reference by name caused ++ a buffer overflow if there was more than one group with the given name. ++ This bug was discovered by the LLVM fuzzer. ++ ++4. A recursive back reference by name within a group that had the same name as ++ another group caused a buffer overflow. For example: ++ /(?J)(?'d'(?'d'\g{d}))/. This bug was discovered by the LLVM fuzzer. ++ ++5. A forward reference by name to a group whose number is the same as the ++ current group, for example in this pattern: /(?|(\k'Pm')|(?'Pm'))/, caused ++ a buffer overflow at compile time. This bug was discovered by the LLVM ++ fuzzer. ++ ++6. A lookbehind assertion within a set of mutually recursive subpatterns could ++ provoke a buffer overflow. This bug was discovered by the LLVM fuzzer. ++ ++7. Another buffer overflow bug involved duplicate named groups with a ++ reference between their definition, with a group that reset capture ++ numbers, for example: /(?J:(?|(?'R')(\k'R')|((?'R'))))/. This has been ++ fixed by always allowing for more memory, even if not needed. (A proper fix ++ is implemented in PCRE2, but it involves more refactoring.) ++ ++ + Version 8.37 28-April-2015 + -------------------------- + +Index: pcre/testdata/testoutput1 +=================================================================== +--- pcre/testdata/testoutput1 (revision 1553) ++++ pcre/testdata/testoutput1 (working copy) +@@ -9429,4 +9429,9 @@ + 0: aaaaaaaaa + 1: a + ++"(?|(\k'Pm')|(?'Pm'))" ++ abcd ++ 0: ++ 1: ++ + /-- End of testinput1 --/ +Index: pcre/testdata/testoutput2 +=================================================================== +--- pcre/testdata/testoutput2 (revision 1553) ++++ pcre/testdata/testoutput2 (working copy) +@@ -14423,4 +14423,42 @@ + + /((?2){73}(?2))((?1))/ + ++/.((?2)(?R)\1)()/BZ ++------------------------------------------------------------------ ++ Bra ++ Any ++ Once ++ CBra 1 ++ Recurse ++ Recurse ++ \1 ++ Ket ++ Ket ++ CBra 2 ++ Ket ++ Ket ++ End ++------------------------------------------------------------------ ++ ++/(?1)()((((((\1++))\x85)+)|))/ ++ ++/(\9*+(?2);\3++()2|)++{/ ++Failed: reference to non-existent subpattern at offset 22 ++ ++/\V\x85\9*+((?2)\3++()2)*:2/ ++Failed: reference to non-existent subpattern at offset 26 ++ ++/(((?(R)){0,2}) (?''((?'R')((?'R')))))/J ++ ++/(((?(X)){0,2}) (?''((?'X')((?'X')))))/J ++ ++/(((?(R)){0,2}) (?''((?'X')((?'R')))))/ ++ ++"(?J)(?'d'(?'d'\g{d}))" ++ ++".*?\h.+.\.+\R*?\xd(?i)(?=!(?=b`b`b`\`b\xa9b!)`\a`bbbbbbbbbbbbb`bbbbbbbbbbbb*R\x85bbbbbbb\C?{((?2)(?))(( ++\H){8(?<=(?1){29}\xa8bbbb\x16\xd\xc6^($(?a)...(?P=a)bbb(?P>a)d/BM +-Memory allocation (code space): 61 ++Memory allocation (code space): 77 + ------------------------------------------------------------------ + 0 24 Bra + 2 5 CBra 1 +@@ -748,4 +748,21 @@ + 22 End + ------------------------------------------------------------------ + ++/.((?2)(?R)\1)()/B ++------------------------------------------------------------------ ++ 0 23 Bra ++ 2 Any ++ 3 13 Once ++ 5 9 CBra 1 ++ 8 18 Recurse ++ 10 0 Recurse ++ 12 \1 ++ 14 9 Ket ++ 16 13 Ket ++ 18 3 CBra 2 ++ 21 3 Ket ++ 23 23 Ket ++ 25 End ++------------------------------------------------------------------ ++ + /-- End of testinput11 --/ +Index: pcre/testdata/testinput11 +=================================================================== +--- pcre/testdata/testinput11 (revision 1553) ++++ pcre/testdata/testinput11 (working copy) +@@ -136,4 +136,6 @@ + + /((?+1)(\1))/B + ++/.((?2)(?R)\1)()/B ++ + /-- End of testinput11 --/ +Index: pcre/testdata/testoutput11-8 +=================================================================== +--- pcre/testdata/testoutput11-8 (revision 1553) ++++ pcre/testdata/testoutput11-8 (working copy) +@@ -231,7 +231,7 @@ + ------------------------------------------------------------------ + + /(?Pa)...(?P=a)bbb(?P>a)d/BM +-Memory allocation (code space): 38 ++Memory allocation (code space): 50 + ------------------------------------------------------------------ + 0 30 Bra + 3 7 CBra 1 +@@ -748,4 +748,21 @@ + 34 End + ------------------------------------------------------------------ + ++/.((?2)(?R)\1)()/B ++------------------------------------------------------------------ ++ 0 35 Bra ++ 3 Any ++ 4 20 Once ++ 7 14 CBra 1 ++ 12 27 Recurse ++ 15 0 Recurse ++ 18 \1 ++ 21 14 Ket ++ 24 20 Ket ++ 27 5 CBra 2 ++ 32 5 Ket ++ 35 35 Ket ++ 38 End ++------------------------------------------------------------------ ++ + /-- End of testinput11 --/ +Index: pcre/testdata/testinput1 +=================================================================== +--- pcre/testdata/testinput1 (revision 1553) ++++ pcre/testdata/testinput1 (working copy) +@@ -5730,4 +5730,7 @@ + "(?1)(?#?'){8}(a)" + baaaaaaaaac + ++"(?|(\k'Pm')|(?'Pm'))" ++ abcd ++ + /-- End of testinput1 --/ +Index: pcre/testdata/testinput2 +=================================================================== +--- pcre/testdata/testinput2 (revision 1553) ++++ pcre/testdata/testinput2 (working copy) +@@ -4152,4 +4152,25 @@ + + /((?2){73}(?2))((?1))/ + ++/.((?2)(?R)\1)()/BZ ++ ++/(?1)()((((((\1++))\x85)+)|))/ ++ ++/(\9*+(?2);\3++()2|)++{/ ++ ++/\V\x85\9*+((?2)\3++()2)*:2/ ++ ++/(((?(R)){0,2}) (?''((?'R')((?'R')))))/J ++ ++/(((?(X)){0,2}) (?''((?'X')((?'X')))))/J ++ ++/(((?(R)){0,2}) (?''((?'X')((?'R')))))/ ++ ++"(?J)(?'d'(?'d'\g{d}))" ++ ++".*?\h.+.\.+\R*?\xd(?i)(?=!(?=b`b`b`\`b\xa9b!)`\a`bbbbbbbbbbbbb`bbbbbbbbbbbb*R\x85bbbbbbb\C?{((?2)(?))(( ++\H){8(?<=(?1){29}\xa8bbbb\x16\xd\xc6^($(?a)...(?P=a)bbb(?P>a)d/BM +-Memory allocation (code space): 125 ++Memory allocation (code space): 157 + ------------------------------------------------------------------ + 0 24 Bra + 2 5 CBra 1 +@@ -748,4 +748,21 @@ + 22 End + ------------------------------------------------------------------ + ++/.((?2)(?R)\1)()/B ++------------------------------------------------------------------ ++ 0 23 Bra ++ 2 Any ++ 3 13 Once ++ 5 9 CBra 1 ++ 8 18 Recurse ++ 10 0 Recurse ++ 12 \1 ++ 14 9 Ket ++ 16 13 Ket ++ 18 3 CBra 2 ++ 21 3 Ket ++ 23 23 Ket ++ 25 End ++------------------------------------------------------------------ ++ + /-- End of testinput11 --/ +Index: pcre/pcre_compile.c +=================================================================== +--- pcre/pcre_compile.c (revision 1553) ++++ pcre/pcre_compile.c (working copy) +@@ -1799,7 +1799,7 @@ + case OP_ASSERTBACK: + case OP_ASSERTBACK_NOT: + do cc += GET(cc, 1); while (*cc == OP_ALT); +- cc += PRIV(OP_lengths)[*cc]; ++ cc += 1 + LINK_SIZE; + break; + + /* Skip over things that don't match chars */ +@@ -3985,11 +3985,12 @@ + is called, the partially compiled regex must be temporarily terminated with + OP_END. + +-This function has been extended with the possibility of forward references for +-recursions and subroutine calls. It must also check the list of such references +-for the group we are dealing with. If it finds that one of the recursions in +-the current group is on this list, it adjusts the offset in the list, not the +-value in the reference (which is a group number). ++This function has been extended to cope with forward references for recursions ++and subroutine calls. It must check the list of such references for the ++group we are dealing with. If it finds that one of the recursions in the ++current group is on this list, it does not adjust the value in the reference ++(which is a group number). After the group has been scanned, all the offsets in ++the forward reference list for the group are adjusted. + + Arguments: + group points to the start of the group +@@ -4005,29 +4006,21 @@ + adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd, + size_t save_hwm_offset) + { ++int offset; ++pcre_uchar *hc; + pcre_uchar *ptr = group; + + while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL) + { +- int offset; +- pcre_uchar *hc; +- +- /* See if this recursion is on the forward reference list. If so, adjust the +- reference. */ +- + for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm; + hc += LINK_SIZE) + { + offset = (int)GET(hc, 0); +- if (cd->start_code + offset == ptr + 1) +- { +- PUT(hc, 0, offset + adjust); +- break; +- } ++ if (cd->start_code + offset == ptr + 1) break; + } + +- /* Otherwise, adjust the recursion offset if it's after the start of this +- group. */ ++ /* If we have not found this recursion on the forward reference list, adjust ++ the recursion's offset if it's after the start of this group. */ + + if (hc >= cd->hwm) + { +@@ -4037,6 +4030,15 @@ + + ptr += 1 + LINK_SIZE; + } ++ ++/* Now adjust all forward reference offsets for the group. */ ++ ++for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm; ++ hc += LINK_SIZE) ++ { ++ offset = (int)GET(hc, 0); ++ PUT(hc, 0, offset + adjust); ++ } + } + + +@@ -4465,7 +4467,7 @@ + const pcre_uchar *nestptr = NULL; + pcre_uchar *previous = NULL; + pcre_uchar *previous_callout = NULL; +-size_t save_hwm_offset = 0; ++size_t item_hwm_offset = 0; + pcre_uint8 classbits[32]; + + /* We can fish out the UTF-8 setting once and for all into a BOOL, but we +@@ -4767,6 +4769,7 @@ + zeroreqchar = reqchar; + zeroreqcharflags = reqcharflags; + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY; + break; + +@@ -4818,6 +4821,7 @@ + /* Handle a real character class. */ + + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + + /* PCRE supports POSIX class stuff inside a class. Perl gives an error if + they are encountered at the top level, so we'll do that too. */ +@@ -5930,7 +5934,7 @@ + { + register int i; + int len = (int)(code - previous); +- size_t base_hwm_offset = save_hwm_offset; ++ size_t base_hwm_offset = item_hwm_offset; + pcre_uchar *bralink = NULL; + pcre_uchar *brazeroptr = NULL; + +@@ -5985,7 +5989,7 @@ + if (repeat_max <= 1) /* Covers 0, 1, and unlimited */ + { + *code = OP_END; +- adjust_recurse(previous, 1, utf, cd, save_hwm_offset); ++ adjust_recurse(previous, 1, utf, cd, item_hwm_offset); + memmove(previous + 1, previous, IN_UCHARS(len)); + code++; + if (repeat_max == 0) +@@ -6009,7 +6013,7 @@ + { + int offset; + *code = OP_END; +- adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, save_hwm_offset); ++ adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, item_hwm_offset); + memmove(previous + 2 + LINK_SIZE, previous, IN_UCHARS(len)); + code += 2 + LINK_SIZE; + *previous++ = OP_BRAZERO + repeat_type; +@@ -6267,7 +6271,7 @@ + { + int nlen = (int)(code - bracode); + *code = OP_END; +- adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, save_hwm_offset); ++ adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, item_hwm_offset); + memmove(bracode + 1 + LINK_SIZE, bracode, IN_UCHARS(nlen)); + code += 1 + LINK_SIZE; + nlen += 1 + LINK_SIZE; +@@ -6401,7 +6405,7 @@ + else + { + *code = OP_END; +- adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm_offset); ++ adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset); + memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len)); + code += 1 + LINK_SIZE; + len += 1 + LINK_SIZE; +@@ -6450,7 +6454,7 @@ + + default: + *code = OP_END; +- adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm_offset); ++ adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset); + memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len)); + code += 1 + LINK_SIZE; + len += 1 + LINK_SIZE; +@@ -6623,7 +6627,7 @@ + newoptions = options; + skipbytes = 0; + bravalue = OP_CBRA; +- save_hwm_offset = cd->hwm - cd->start_workspace; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + reset_bracount = FALSE; + + /* Deal with the extended parentheses; all are introduced by '?', and the +@@ -6769,7 +6773,7 @@ + ptr++; + } + namelen = (int)(ptr - name); +- if (lengthptr != NULL) *lengthptr += IMM2_SIZE; ++ if (lengthptr != NULL) skipbytes += IMM2_SIZE; + } + + /* Check the terminator */ +@@ -7173,14 +7177,26 @@ + number. If the name is not found, set the value to 0 for a forward + reference. */ + ++ recno = 0; + ng = cd->named_groups; + for (i = 0; i < cd->names_found; i++, ng++) + { + if (namelen == ng->length && + STRNCMP_UC_UC(name, ng->name, namelen) == 0) +- break; ++ { ++ open_capitem *oc; ++ recno = ng->number; ++ if (is_recurse) break; ++ for (oc = cd->open_caps; oc != NULL; oc = oc->next) ++ { ++ if (oc->number == recno) ++ { ++ oc->flag = TRUE; ++ break; ++ } ++ } ++ } + } +- recno = (i < cd->names_found)? ng->number : 0; + + /* Count named back references. */ + +@@ -7191,6 +7207,19 @@ + 16-bit data item. */ + + *lengthptr += IMM2_SIZE; ++ ++ /* If this is a forward reference and we are within a (?|...) group, ++ the reference may end up as the number of a group which we are ++ currently inside, that is, it could be a recursive reference. In the ++ real compile this will be picked up and the reference wrapped with ++ OP_ONCE to make it atomic, so we must space in case this occurs. */ ++ ++ /* In fact, this can happen for a non-forward reference because ++ another group with the same number might be created later. This ++ issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance ++ only mode, we finesse the bug by allowing more memory always. */ ++ ++ /* if (recno == 0) */ *lengthptr += 2 + 2*LINK_SIZE; + } + + /* In the real compile, search the name table. We check the name +@@ -7247,6 +7276,7 @@ + { + if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE; + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + *code++ = ((options & PCRE_CASELESS) != 0)? OP_DNREFI : OP_DNREF; + PUT2INC(code, 0, index); + PUT2INC(code, 0, count); +@@ -7360,6 +7390,7 @@ + HANDLE_RECURSION: + + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + called = cd->start_code; + + /* When we are actually compiling, find the bracket that is being +@@ -7561,7 +7592,11 @@ + previous = NULL; + cd->iscondassert = FALSE; + } +- else previous = code; ++ else ++ { ++ previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; ++ } + + *code = bravalue; + tempcode = code; +@@ -7809,7 +7844,7 @@ + const pcre_uchar *p; + pcre_uint32 cf; + +- save_hwm_offset = cd->hwm - cd->start_workspace; /* Normally this is set when '(' is read */ ++ item_hwm_offset = cd->hwm - cd->start_workspace; /* Normally this is set when '(' is read */ + terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)? + CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE; + +@@ -7877,6 +7912,7 @@ + HANDLE_REFERENCE: + if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE; + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF; + PUT2INC(code, 0, recno); + cd->backref_map |= (recno < 32)? (1 << recno) : 1; +@@ -7906,6 +7942,7 @@ + if (!get_ucp(&ptr, &negated, &ptype, &pdata, errorcodeptr)) + goto FAILED; + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + *code++ = ((escape == ESC_p) != negated)? OP_PROP : OP_NOTPROP; + *code++ = ptype; + *code++ = pdata; +@@ -7946,6 +7983,7 @@ + + { + previous = (escape > ESC_b && escape < ESC_Z)? code : NULL; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + *code++ = (!utf && escape == ESC_C)? OP_ALLANY : escape; + } + } +@@ -7989,6 +8027,7 @@ + + ONE_CHAR: + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + + /* For caseless UTF-8 mode when UCP support is available, check whether + this character has more than one other case. If so, generate a special diff --git a/pcre/PKGBUILD b/pcre/PKGBUILD index ef41e801f..018eaa6fe 100644 --- a/pcre/PKGBUILD +++ b/pcre/PKGBUILD @@ -4,20 +4,22 @@ # maintainer (x86_64): AlmAck pkgname=pcre -pkgver=8.36 -pkgrel=1 +pkgver=8.37 +pkgrel=2 pkgdesc="A library that implements Perl 5-style regular expressions" arch=('x86_64') url="http://www.pcre.org/" license=('BSD') depends=('gcc-libs' 'readline' 'zlib' 'bzip2') -source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2" -'001-fix-heap-overflow.patch') -md5sums=('b767bc9af0c20bc9c1fe403b0d41ad97' - '44a7e4fca07eff04d07bef65c982de9a') +validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel +source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig} + '01-seven-security-patches.patch') +md5sums=('ed91be292cb01d21bc7e526816c26981' + 'SKIP' + '45df6737e61738cc8bb061e0b9c0fbb2') -prepare(){ - patch -d $pkgname-$pkgver < 001-fix-heap-overflow.patch +prepare() { + patch -p1 -d $pkgname-$pkgver < 01-seven-security-patches.patch } build() { diff --git a/perl-yaml-syck/PKGBUILD b/perl-yaml-syck/PKGBUILD index 604246922..f1246d4f6 100644 --- a/perl-yaml-syck/PKGBUILD +++ b/perl-yaml-syck/PKGBUILD @@ -2,7 +2,7 @@ pkgname=perl-yaml-syck _realname=YAML-Syck -pkgver=1.27 +pkgver=1.29 pkgrel=1 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('x86_64') @@ -11,7 +11,7 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) -md5sums=('8920091e68a078cfa9c42041e5759162') +md5sums=('0f906ae8b3747039b26c29c481cda607') build() { cd "${srcdir}/${_realname}-$pkgver" diff --git a/python2/PKGBUILD b/python2/PKGBUILD index 8161c4792..c098eed09 100644 --- a/python2/PKGBUILD +++ b/python2/PKGBUILD @@ -4,8 +4,8 @@ # A Boersma (abveritas) pkgname=python2 -pkgver=2.7.9 -pkgrel=2 +pkgver=2.7.10 +pkgrel=1 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('x86_64') @@ -21,7 +21,7 @@ replaces=('python-elementtree' 'python-ctypes' 'python') conflicts=('python') source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 'add-chakra-support.patch') -md5sums=('38d530f7efc373d64a8fb1637e3baaa7' +md5sums=('c685ef0b8e9f27b5e3db5db12b268ac6' '9b47a96ffa3d18cdc864481c178aef28') build() { diff --git a/quota-tools/PKGBUILD b/quota-tools/PKGBUILD index e0b6400fd..d31aecbdc 100644 --- a/quota-tools/PKGBUILD +++ b/quota-tools/PKGBUILD @@ -1,15 +1,15 @@ pkgname=quota-tools -pkgver=4.01 +pkgver=4.02 pkgrel=1 pkgdesc="Tools to manage kernel-level quotas in Linux" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://sourceforge.net/projects/linuxquota/" license=('GPL' 'BSD') depends=('e2fsprogs') backup=('etc/warnquota.conf' 'etc/quotatab' 'etc/quotagrpadmins') options=('!emptydirs') source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz) -sha1sums=('64d2ab8b039cfea1aa4bd9e77e8c373488a7f0bf') +sha1sums=('0b82c28033abc60cdfd00dabfe0313bbd5f7b9af') build() { cd ${pkgname} diff --git a/readline/PKGBUILD b/readline/PKGBUILD index 16310f1d7..cb35498ea 100644 --- a/readline/PKGBUILD +++ b/readline/PKGBUILD @@ -4,7 +4,7 @@ pkgname=readline _basever=6.3 -_patchlevel=006 #prepare for some patches +_patchlevel=008 #prepare for some patches pkgver=$_basever.$_patchlevel pkgrel=1 pkgdesc="GNU readline library" @@ -17,8 +17,9 @@ options=('!emptydirs') install='readline.install' source=("http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz" 'inputrc') +validpgpkeys=('7C0135FB088AAF6C66C650B9BB5869F064EA74AB') # Chet Ramey -if [[ $_patchlevel -gt 0 ]]; then +if [ $_patchlevel -gt 0 ]; then for (( _p=1; _p <= $((10#${_patchlevel})); _p++ )); do source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//.}-$(printf "%03d" $_p){,.sig}) done @@ -65,5 +66,8 @@ md5sums=('33c8fb279e981274f485fd91da77e94a' '93721c31cd225393f80cb3aadb165544' 'SKIP' '71dc6ecce66d1489b96595f55d142a52' + 'SKIP' + '062a08ed60679d3c4878710b3d595b65' + 'SKIP' + 'ee1c04072154826870848d8b218d7b04' 'SKIP') - diff --git a/rpcbind/PKGBUILD b/rpcbind/PKGBUILD index c7c2a386a..23b4136a0 100644 --- a/rpcbind/PKGBUILD +++ b/rpcbind/PKGBUILD @@ -1,12 +1,7 @@ -# -# Core Packages for Chakra, part of chakra-project.org -# -# maintainer Samir Benmendil -# maintainer abveritas[at]chakra-project[dot]org> pkgname=rpcbind -pkgver=0.2.1 -pkgrel=2 +pkgver=0.2.3 +pkgrel=1 pkgdesc="portmap replacement which supports RPC over various protocols" arch=('x86_64') depends=('bash' 'glibc' 'libtirpc') @@ -18,8 +13,8 @@ source=("http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-${pkgver}. 'rpcbind.socket' 'rpcbind.conf') install=rpcbind.install -md5sums=('0a5f9c2142af814c55d957aaab3bcc68' - 'c02ac36a98baac70b8a26190524b7b73' +md5sums=('c8875246b2688a1adfbd6ad43480278d' + '68f403f51b72619fecdc3d57550a2fdb' '0f493a590c250267034e230e7bf1f894' 'e5a205cd7402fedaf74a744b2a22f0ad' 'd4c74d1be9f98344af138a15ad3b6f8c') diff --git a/rpcbind/rpcbind-sunrpc.patch b/rpcbind/rpcbind-sunrpc.patch index 76cf54ba9..099e83391 100644 --- a/rpcbind/rpcbind-sunrpc.patch +++ b/rpcbind/rpcbind-sunrpc.patch @@ -1,6 +1,6 @@ ---- rpcbind-0.1.7/src/rpcbind.c.orig 2008-11-19 14:17:34.000000000 +0100 -+++ rpcbind-0.1.7/src/rpcbind.c 2010-01-07 13:03:37.416632894 +0100 -@@ -114,7 +114,7 @@ +--- rpcbind-0.2.3/src/rpcbind.c 2015-04-27 16:07:43.000000000 +0200 ++++ rpcbind-0.2.3/src/rpcbind.c.new 2015-04-27 19:48:44.518124944 +0200 +@@ -132,7 +132,7 @@ char *udp_uaddr; /* Universal UDP address */ char *tcp_uaddr; /* Universal TCP address */ #endif @@ -9,14 +9,3 @@ static char superuser[] = "superuser"; int main __P((int, char *[])); ---- rpcbind-0.1.7/src/rpcinfo.c~ 2010-01-08 16:14:24.592156602 +0000 -+++ rpcbind-0.1.7/src/rpcinfo.c 2010-01-08 16:14:31.578838609 +0000 -@@ -633,7 +633,7 @@ - { - memset (&hints, 0, sizeof hints); - hints.ai_family = AF_INET; -- if ((error = getaddrinfo (host, "rpcbind", &hints, &res)) != 0 && -+ if ((error = getaddrinfo (host, "sunrpc", &hints, &res)) != 0 && - (error = getaddrinfo (host, "portmapper", &hints, &res)) != 0) - { - fprintf (stderr, "rpcinfo: %s: %s\n", diff --git a/run-parts/PKGBUILD b/run-parts/PKGBUILD index d1e78a79b..5497260cd 100644 --- a/run-parts/PKGBUILD +++ b/run-parts/PKGBUILD @@ -1,30 +1,26 @@ -# -# Core Packages for Chakra, part of chakra-project.org -# -# maintainer (x86_64): Manuel Tortosa pkgname=run-parts -pkgver=4.3.4 +pkgver=4.5 pkgrel=1 pkgdesc='run scripts or programs in a directory' -arch=('i686' 'x86_64') +arch=('x86_64') url='http://packages.qa.debian.org/d/debianutils.html' license=('GPL') depends=('glibc') -source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz") -sha256sums=('1739976cb62b85e641ee36859a87dfb8e4c3214e1043b6bb00b56b87e96a19f5') +source=("https://sources.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.xz") +sha256sums=('7cfaa53caaaaf36dad16fa69b30dd2b78b8dafebd766aacd53a3c7c78a9d441f') build() { - cd $srcdir/debianutils-$pkgver - ./configure --prefix=/usr - make run-parts + cd $srcdir/debianutils-$pkgver + ./configure --prefix=/usr + make run-parts } package() { - cd $srcdir/debianutils-$pkgver - install -D -m755 run-parts $pkgdir/usr/bin/run-parts - install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 - for l in po4a/*/run-parts.8; do - install -D -m644 ${l} $pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8 - done -} + cd $srcdir/debianutils-$pkgver + install -D -m755 run-parts $pkgdir/usr/bin/run-parts + install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 + for l in po4a/*/run-parts.8; do + install -D -m644 ${l} $pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8 + done +} \ No newline at end of file diff --git a/sdparm/PKGBUILD b/sdparm/PKGBUILD index 0f75f3a5d..e6a71c8aa 100644 --- a/sdparm/PKGBUILD +++ b/sdparm/PKGBUILD @@ -1,25 +1,28 @@ -# maintainer (x86_64): Manuel Tortosa pkgname=sdparm -pkgver=1.08 +pkgver=1.09 pkgrel=1 pkgdesc="An utility similar to hdparm but for SCSI devices" arch=('x86_64') url="http://sg.danny.cz/sg/sdparm.html" license=('BSD') -depends=('glibc') +depends=('glibc' 'bash') source=("http://sg.danny.cz/sg/p/$pkgname-$pkgver.tar.xz") -md5sums=('d290e6b45d690bfa2cc05700ec119073') +md5sums=('76b53e2be4c5b85e4af0887ce838c955') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir}/ install - - install -Dm644 COPYING $pkgdir/usr/share/licenses/${pkgname}/LICENSE +check() { + cd ${pkgname}-${pkgver} + make check } + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} \ No newline at end of file diff --git a/shared-mime-info/PKGBUILD b/shared-mime-info/PKGBUILD index c9fade707..a8023677b 100644 --- a/shared-mime-info/PKGBUILD +++ b/shared-mime-info/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer : Almack pkgname=shared-mime-info -pkgver=1.3 +pkgver=1.4 pkgrel=1 pkgdesc="Freedesktop.org Shared MIME Info" arch=('x86_64') @@ -14,7 +14,7 @@ makedepends=('intltool' 'pkgconfig') install=shared-mime-info.install url="http://freedesktop.org/Software/shared-mime-info" source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.xz) -md5sums=('743720bc4803dd69f55449013d350f31') +md5sums=('16c02f7b658fff2a9c207406d388ea31') options=(!makeflags) build() { diff --git a/sqlite3/PKGBUILD b/sqlite3/PKGBUILD index c07e7b084..b623a0711 100644 --- a/sqlite3/PKGBUILD +++ b/sqlite3/PKGBUILD @@ -4,10 +4,10 @@ # maintainer almack@chakraos.org pkgbase="sqlite3" -pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') -_amalgamationver=3080803 +pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') +_amalgamationver=3081002 _docver=${_amalgamationver} -pkgver=3.8.8.3 +pkgver=3.8.10.2 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('x86_64') @@ -15,12 +15,12 @@ license=('custom:Public Domain') url="http://www.sqlite.org/" makedepends=('tcl' 'readline') source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) - http://www.sqlite.org/2015/sqlite-autoconf-$_amalgamationver.tar.gz - http://www.sqlite.org/2015/sqlite-doc-${_docver}.zip - license.txt) + http://www.sqlite.org/2015/sqlite-autoconf-$_amalgamationver.tar.gz + http://www.sqlite.org/2015/sqlite-doc-${_docver}.zip + license.txt) options=('!emptydirs') -sha1sums=('2fe3f6226a2a08a2e814b97cd53e36bb3c597112' - '27c2cada8e663f694c0469bcae09eb0d8c55dd7c' +sha1sums=('c2f2c17d3dc4c4e179d35cc04e4420636d48a152' + '2e816999255e4fced7d93b6ad3650a361a446288' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { @@ -30,52 +30,49 @@ build() { cd "$srcdir"/sqlite-autoconf-$_amalgamationver ./configure --prefix=/usr \ - --disable-static - make - - # build the tcl extension - cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea - ./configure --prefix=/usr \ - --with-system-sqlite + --disable-static make + # build the tcl extension + cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea + ./configure --prefix=/usr \ + --with-system-sqlite + make } package_sqlite3() { - - pkgdesc="A C library that implements an SQL database engine" - depends=('readline') - conflicts=('sqlite') - replaces=('sqlite') - + pkgdesc="A C library that implements an SQL database engine" + depends=('readline') + conflicts=('sqlite') + replaces=('sqlite') + cd ${srcdir}/sqlite-autoconf-$_amalgamationver make DESTDIR=${pkgdir} install - + # license - no linking required because pkgbase=pkgname install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgbase}/license.txt } package_sqlite3-tcl() { - - pkgdesc="sqlite3 Tcl Extension Architecture (TEA)" - depends=('sqlite3>=3.7.5') + pkgdesc="sqlite3 Tcl Extension Architecture (TEA)" + depends=('sqlite3>=3.7.5') cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea make DESTDIR=${pkgdir} install - + # link license install -m755 -d ${pkgdir}/usr/share/licenses ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" } package_sqlite3-doc() { - pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation" + pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation" #cd ${srcdir}/sqlite-doc-${_amalgamationver} cd ${srcdir}/sqlite-doc-${_docver} mkdir -p ${pkgdir}/usr/share/doc/${pkgbase} cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/ - + # fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605 find ${pkgdir} -type f -perm 755 -exec ls -lha {} \; find ${pkgdir} -type f -perm 755 -exec chmod 644 {} \; diff --git a/sudo/PKGBUILD b/sudo/PKGBUILD index 408bbb6ac..b7d535c7d 100644 --- a/sudo/PKGBUILD +++ b/sudo/PKGBUILD @@ -1,25 +1,24 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas@chakra-project.org pkgname=sudo -_sudover=1.8.12 +_sudover=1.8.13 pkgver=${_sudover/p/.p} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root." -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.sudo.ws/sudo/" license=('custom') depends=('glibc' 'pam' 'libldap') backup=('etc/sudoers' 'etc/pam.d/sudo') -source=("ftp://ftp.sudo.ws/pub/sudo/${pkgname}-${_sudover}.tar.gz" - sudo.tmpfiles.conf +source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} + 'sudo.tmpfiles.conf' 'sudo.pam') -sha1sums=('b91ce01ab4da549b14df86d011f30e23815df22b' +sha1sums=('6ee1ceaeeb7baee6340f5f5b44aa2b4253931a19' + 'SKIP' 'b2a8594916f6920568cf6d7eada5684109cf5510' '2388e362dc31cc3d7270fe1c86b6be9e6d28470d') +validpgpkeys=('CCB24BE9E9481B15D34159535A89DFA27EE470C4') + build() { cd "$srcdir/$pkgname-$_sudover" @@ -55,6 +54,7 @@ package() { rmdir "$pkgdir/run/sudo" rmdir "$pkgdir/run" + # http://bugzilla.sudo.ws/show_bug.cgi?id=689 install -Dm644 "$srcdir/sudo.tmpfiles.conf" \ "$pkgdir/usr/lib/tmpfiles.d/sudo.conf" diff --git a/swig/PKGBUILD b/swig/PKGBUILD index 4c9b1af4a..439152d09 100644 --- a/swig/PKGBUILD +++ b/swig/PKGBUILD @@ -1,19 +1,15 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (x86_64): Manuel Tortosa pkgname=swig -pkgver=3.0.3 +pkgver=3.0.5 pkgrel=1 pkgdesc="A compiler that makes it easy to integrate C and C++ code with scripting languages" arch=('x86_64') url="http://www.swig.org/" license=('custom') depends=('pcre' 'gcc-libs') -checkdepends=('ruby' 'python2' 'java-environment' 'tcl' 'php' 'lua' 'ocaml' 'r' 'go') +checkdepends=('ruby' 'python2' 'java-environment' 'tcl' 'php' 'lua' 'ocaml' 'r' 'go' 'python2-cffi') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('e68e1fbdf92ae34c0949c9babef10c8800377b93') +sha1sums=('271813b317e4836853d2249fc8ce2df34c2a062a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/systemd/PKGBUILD b/systemd/PKGBUILD index 5a0b9229f..0c34154c1 100644 --- a/systemd/PKGBUILD +++ b/systemd/PKGBUILD @@ -1,16 +1,21 @@ # maintainer: Fabian Kosmale pkgname=systemd -pkgver=218 -pkgrel=3 -_fedora_patch=ea19761321f4e7f5e2cbdd66fe38388c93790c20 +pkgver=222 +pkgrel=1 pkgdesc="A system and service manager for Linux" arch=('x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') -depends=('acl' 'bash' 'glibc' 'glib2' 'hwids' 'util-linux' 'kbd' 'kmod>=19' 'libcap' 'libxslt' - 'linux-api-headers' 'lz4' 'pam' 'xz' 'libgcrypt' 'dbus-core' 'libidn' 'quota-tools' 'elfutils' 'curl') -makedepends=('docbook-xsl' 'cryptsetup' 'gobject-introspection' 'python2' 'python2-lxml' 'gperf' 'intltool' 'libmicrohttpd') +depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' + 'libgcrypt' 'glibc' 'libidn' 'lz4' 'pam' 'libseccomp' 'util-linux' + 'xz' + 'libxkbcommon>=0.5.0-2' 'gnutls' 'elfutils') +makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' + 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' + 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' + 'python' 'python2-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git' 'curl') optdepends=('python: systemd library bindings' + 'curl: upload journal and pull image' 'cryptsetup: required for encrypted block devices' 'libmicrohttpd: remote journald capabilities' 'quota-tools: kernel-level quota management' @@ -21,10 +26,14 @@ backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.locale1.conf etc/dbus-1/system.d/org.freedesktop.machine1.conf etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/dbus-1/system.d/org.freedesktop.import1.conf + etc/dbus-1/system.d/org.freedesktop.network1.conf etc/pam.d/systemd-user etc/systemd/bootchart.conf etc/systemd/coredump.conf etc/systemd/journald.conf + etc/systemd/journal-remote.conf + etc/systemd/journal-upload.conf etc/systemd/logind.conf etc/systemd/system.conf etc/systemd/timesyncd.conf @@ -35,70 +44,33 @@ provides=("udev=$pkgver") conflicts=('udev' 'sysvinit' 'initscripts' 'initscripts-systemd') replaces=('udev') install="systemd.install" -source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" -# "git://pkgs.fedoraproject.org/systemd.git#commit=${_fedora_patch}" +source=("git://github.com/systemd/systemd.git#tag=v$pkgver" 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev' - '99-default.preset') -md5sums=('4e2c511b0a7932d7fc9d79822273aac6' - '7a79eb3e4ce19906cfebfea75fb9f8bb' - 'a736284f0c8e549dd988522e75628ec0' - 'bde43090d4ac0ef048e3eaee8202a407' - 'a1bf25da736d3719e9720b2e4caea341') + '99-default.preset' + 'chakra.conf' + 'chakra_fallback.conf' + 'loader.conf' + 'splash-chakra.bmp') +md5sums=('SKIP' + '90ea67a7bb237502094914622a39e281' + '976c5511b6493715e381f43f16cdb151' + '1b3aa3a0551b08af9305d33f85b5c2fc' + 'a1bf25da736d3719e9720b2e4caea341' + '0fdb041cc891292162f6c2f7d1af830c' + 'bfccc8b2a9da47823e4dcef2206d4b1b' + '88949acaf49231fd01e9f0733c5dd812' + '3f1e033e9334e33d6e15f3bf7ce076e3') prepare() { - cd "$pkgname-$pkgver" - -# git init -# git config user.email "chakra-devel@googlegroups.com" -# git config user.name "Chakra Packager" -# git add . -# git commit -a -q -m "${pkgver}} baseline." -# -# git am \ -# --exclude .gitignore \ -# --exclude docs/.gitignore \ -# --exclude docs/gudev/.gitignore \ -# --exclude docs/libudev/.gitignore \ -# --exclude docs/sysvinit/.gitignore \ -# --exclude docs/var-log/.gitignore \ -# --exclude hwdb/.gitignore \ -# --exclude m4/.gitignore \ -# --exclude man/.gitignore \ -# --exclude po/.gitignore \ -# --exclude rules/.gitignore \ -# --exclude src/.gitignore \ -# --exclude src/analyze/.gitignore \ -# --exclude src/core/.gitignore \ -# --exclude src/gudev/.gitignore \ -# --exclude src/hostname/.gitignore \ -# --exclude src/journal/.gitignore \ -# --exclude src/libsystemd-daemon/.gitignore \ -# --exclude src/libsystemd-id128/.gitignore \ -# --exclude src/libudev/.gitignore \ -# --exclude src/locale/.gitignore \ -# --exclude src/login/.gitignore \ -# --exclude src/python-systemd/.gitignore \ -# --exclude src/python-systemd/docs/.gitignore \ -# --exclude src/timedate/.gitignore \ -# --exclude src/udev/.gitignore \ -# --exclude src/udev/scsi_id/.gitignore \ -# --exclude sysctl.d/.gitignore \ -# --exclude test/.gitignore \ -# --exclude units/.gitignore \ -# --exclude units/user/.gitignore \ -# --exclude src/libsystemd/sd-bus/PORTING-DBUS1 \ -# --exclude CODING_STYLE \ -# --exclude src/readahead/Makefile \ -# --exclude src/libsystemd-terminal/unifont-def.h \ -# ../systemd/00*-*.patch -# -# autoreconf -i + cd "$pkgname" + + ./autogen.sh } build() { - cd "$pkgname-$pkgver" + cd "$pkgname" ./configure \ PYTHON=python2 \ @@ -110,17 +82,17 @@ build() { --disable-gtk-doc \ --enable-lz4 \ --enable-compat-libs \ + --enable-gnuefi \ --disable-audit \ --disable-ima \ --disable-kdbus \ --with-sysvinit-path= \ - --with-sysvrcnd-path= \ - --with-firmware-path="/usr/lib/firmware/updates:/usr/lib/firmware" + --with-sysvrcnd-path= make } package() { - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + make -C "$pkgname" DESTDIR="$pkgdir" install install -dm755 "$pkgdir/usr/bin" ln -s ../../usr/lib/systemd/systemd "$pkgdir/usr/bin/systemd" @@ -140,19 +112,13 @@ package() { # don't write units to /etc by default. some of these will be re-enabled on # post_install. - rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" \ - "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-networkd.service" \ - "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-resolved.service" \ - "$pkgdir/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service" \ - "$pkgdir/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service" - rmdir "$pkgdir/etc/systemd/system/getty.target.wants" \ - "$pkgdir/etc/systemd/system/network-online.target.wants" + rm -r "$pkgdir/etc/systemd/system/"*.wants # get rid of RPM macros rm -r "$pkgdir/usr/lib/rpm" # add back tmpfiles.d/legacy.conf - install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" + install -m644 "$pkgname/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group sed -i 's#GROUP="dialout"#GROUP="uucp"#g; @@ -169,7 +135,10 @@ package() { # ensure proper permissions for /var/log/journal. This is only to placate chown root:systemd-journal "$pkgdir/var/log/journal" - chmod 2755 "$pkgdir/var/log/journal"{,/remote} + chmod 2755 "$pkgdir/var/log/journal" + + # we'll create this on installation + rmdir "$pkgdir/var/log/journal/remote" # fix pam file sed 's|system-auth|system-login|g' -i "$pkgdir/etc/pam.d/systemd-user" @@ -179,4 +148,10 @@ package() { # Make journalctl persistent install -dm755 "$pkgdir/var/log/journal" sed -i -e 's/#SystemMaxUse=/SystemMaxUse=25M/' ${pkgdir}/etc/systemd/journald.conf + + # add example bootctl configuration + install -Dm644 "$srcdir/chakra.conf" "$pkgdir"/usr/share/systemd/bootctl/chakra.conf + install -Dm644 "$srcdir/chakra_fallback.conf" "$pkgdir"/usr/share/systemd/bootctl/chakra_fallback.conf + install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf + install -Dm644 "$srcdir/splash-chakra.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-chakra.bmp } diff --git a/systemd/chakra.conf b/systemd/chakra.conf new file mode 100644 index 000000000..ba6057152 --- /dev/null +++ b/systemd/chakra.conf @@ -0,0 +1,7 @@ +## This is just an exmaple config file. +## Please edit the paths and kernel parameters according to your system. + +title Chakra Linux +linux /vmlinuz-linux +initrd /initramfs-linux.img +options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap diff --git a/systemd/chakra_fallback.conf b/systemd/chakra_fallback.conf new file mode 100644 index 000000000..1f86ce5ae --- /dev/null +++ b/systemd/chakra_fallback.conf @@ -0,0 +1,7 @@ +## This is just an exmaple config file. +## Please edit the paths and kernel parameters according to your system. + +title Chakra Linux FallBack +linux /vmlinuz-linux +initrd /initramfs-linux-fallback.img +options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap diff --git a/systemd/initcpio-hook-udev b/systemd/initcpio-hook-udev index ed9fb2294..ea9a11f8c 100644 --- a/systemd/initcpio-hook-udev +++ b/systemd/initcpio-hook-udev @@ -2,7 +2,7 @@ run_earlyhook() { kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf - systemd-tmpfiles --prefix=/dev --create + systemd-tmpfiles --prefix=/dev --create --boot /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never udevd_running=1 } @@ -19,3 +19,4 @@ run_cleanuphook() { udevadm info --cleanup-db } +# vim: set ft=sh ts=4 sw=4 et: diff --git a/systemd/initcpio-install-systemd b/systemd/initcpio-install-systemd index a71c1fb57..96df98ada 100644 --- a/systemd/initcpio-install-systemd +++ b/systemd/initcpio-install-systemd @@ -34,6 +34,7 @@ add_udev_rule() { strip_quotes 'value' # just take the first word as the binary name binary=${value%% *} + [[ ${binary:0:1} == '$' ]] && continue if [[ ${binary:0:1} != '/' ]]; then binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary") fi @@ -98,13 +99,16 @@ build() { # from base add_binary /bin/mount add_binary /usr/bin/kmod /usr/bin/modprobe - - # systemd add_binary /usr/lib/systemd/systemd /init - # generators - add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator" - add_file "/usr/lib/systemd/system-generators/systemd-gpt-auto-generator" + map add_binary \ + /usr/bin/systemd-tmpfiles \ + /usr/lib/systemd/systemd-hibernate-resume \ + /usr/lib/systemd/system-generators/systemd-fstab-generator \ + /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \ + /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator + + add_module "kdbus?" # udev rules and systemd units map add_udev_rule "$rules" \ @@ -112,15 +116,9 @@ build() { 60-persistent-storage.rules \ 64-btrfs.rules \ 80-drivers.rules \ - 99-systemd.rules \ + 99-systemd.rules map add_systemd_unit \ - systemd-udevd-control.socket \ - systemd-udevd-kernel.socket \ - sockets.target \ - systemd-journald.service \ - systemd-udevd.service \ - systemd-udev-trigger.service \ initrd-cleanup.service \ initrd-fs.target \ initrd-parse-etc.service \ @@ -129,18 +127,33 @@ build() { initrd-switch-root.target \ initrd-udevadm-cleanup-db.service \ initrd.target \ + kmod-static-nodes.service \ + local-fs.target \ + local-fs-pre.target \ + paths.target \ + reboot.target \ + slices.target \ + sockets.target \ + swap.target \ systemd-fsck@.service \ - ctrl-alt-del.target + systemd-hibernate-resume@.service \ + systemd-journald.service \ + systemd-journald-audit.socket \ + systemd-journald-dev-log.socket \ + systemd-tmpfiles-setup-dev.service \ + systemd-udev-trigger.service \ + systemd-udevd-control.socket \ + systemd-udevd-kernel.socket \ + systemd-udevd.service \ + timers.target add_symlink "/usr/lib/systemd/system/default.target" "initrd.target" - - # libdbus needs the passwd info of the root user - # TODO: make sure this is no longer necessary when systemctl moves to sd-bus - add_file "/etc/nsswitch.conf" - add_file "/etc/passwd" - add_binary "$(readlink -f /usr/lib/libnss_files.so)" + add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target" # udev wants /etc/group since it doesn't launch with --resolve-names=never + add_file "/etc/nsswitch.conf" + add_binary "$(readlink -f /usr/lib/libnss_files.so)" + add_file "/etc/passwd" add_file "/etc/group" } diff --git a/systemd/initcpio-install-timestamp b/systemd/initcpio-install-timestamp deleted file mode 100644 index 259cc705b..000000000 --- a/systemd/initcpio-install-timestamp +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -build() { - add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp -} - -help() { - cat </dev/null; then @@ -14,7 +13,7 @@ add_privs() { add_journal_acls() { # ignore errors, since the filesystem might not support ACLs - setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal/ 2>/dev/null + setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null : } @@ -38,19 +37,31 @@ _dir_empty() { post_common() { systemd-sysusers - systemd-tmpfiles --create udevadm hwdb --update journalctl --update-catalog + if which mkinitcpio >/dev/null 2>&1; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + echo ">>> If you are using non-default kernel, you should update kernel" + echo ">>> manually" + if [ -f etc/mkinitcpio.d/linux.preset ]; then + mkinitcpio -p linux + fi + if [ -f etc/mkinitcpio.d/linux-lts.preset ]; then + mkinitcpio -p linux-lts + fi + fi } _208_changes() { - if [ -e var/lib/backlight ] && [ ! -e var/lib/systemd/backlight ]; then + if [[ -e var/lib/backlight && ! -e var/lib/systemd/backlight ]]; then mv -T var/lib/backlight var/lib/systemd/backlight fi - if [ -e var/lib/random-seed ] && [ ! -e var/lib/systemd/random-seed ]; then + if [[ -e var/lib/random-seed && ! -e var/lib/systemd/random-seed ]]; then mv -T var/lib/random-seed var/lib/systemd/random-seed fi + + add_journal_acls } _209_changes() { @@ -60,8 +71,7 @@ _209_changes() { local new_rule=etc/udev/rules.d/80-net-setup-link.rules echo ":: Network device naming is now controlled by udev's net_setup_link" - echo " builtin. Refer to the NETWORK LINK CONFIGURATION section of the" - echo " udev manpage for a full description." + echo " builtin. Refer to the systemd.link manpage for a full description." # not clear what action we can take here, so don't do anything [[ -e $new_rule ]] && return 0 @@ -103,6 +113,10 @@ _214_changes() { fi fi fi + + echo ':: coredumps are no longer sent to the journal by default. To re-enable:' + echo ' echo >/etc/sysctl.d/50-coredump.conf \' + echo ' "kernel.core_pattern=|/usr/lib/systemd/systemd-coredump %p %u %g %s %t %e"' } _216_changes() { @@ -113,15 +127,29 @@ _216_changes() { echo ' tuned in /etc/systemd/coredump.conf.' } +_219_changes() { + if mkdir -m2755 var/log/journal/remote 2>/dev/null; then + chgrp systemd-journal-remote var/log/journal/remote + fi + + if ! systemctl is-enabled -q remote-fs.target; then + systemctl enable -q remote-fs.target + fi +} + post_install() { - systemd-firstboot --setup-machine-id - + systemd-machine-id-setup + post_common "$@" add_journal_acls - # enable getty@tty1 by default, but don't track the file - systemctl enable getty@tty1.service + # enable some services by default, but don't track them + systemctl enable getty@tty1.service remote-fs.target + + # group 'systemd-journal-remote' is created by systemd-sysusers + mkdir -m2755 var/log/journal/remote + chgrp systemd-journal-remote var/log/journal/remote } post_upgrade() { @@ -129,24 +157,16 @@ post_upgrade() { maybe_reexec "$@" - if [ "$(vercmp 210-1 "$2")" -eq 1 ]; then - printf '==> systemd >= 205 restructures the cgroup hierarchy and changes internal\n' - printf ' protocols. You should reboot at your earliest convenience.\n' - - _208_changes - - add_journal_acls - - _209_changes - fi - - if [ "$(vercmp 212-2 "$2")" -eq 1 ]; then - _213_changes - _214_changes - fi - - if [ "$(vercmp 214-1 "$2")" -eq 1 ]; then - _216_changes - fi + local v upgrades=(208 + 209 + 213 + 214 + 216 + 219) + for v in "${upgrades[@]}"; do + if [[ $(vercmp "$v" "$2") -eq 1 ]]; then + "_${v//-/_}_changes" + fi + done } diff --git a/tcl/PKGBUILD b/tcl/PKGBUILD index 45a6ce148..ebed9225a 100644 --- a/tcl/PKGBUILD +++ b/tcl/PKGBUILD @@ -1,10 +1,6 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas[at]chakra-project[dot]org> pkgname=tcl -pkgver=8.6.1 +pkgver=8.6.4 pkgrel=1 pkgdesc="The Tcl scripting language" arch=('x86_64') @@ -13,7 +9,7 @@ license=('custom') depends=('zlib') options=('staticlibs') source=("http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz") -md5sums=('aae4b701ee527c6e4e1a6f9c7399882e') +sha1sums=('33c5a083a23cf54f15e25a9e787dc39ef3fa0a2b') build() { cd tcl${pkgver}/unix @@ -46,14 +42,16 @@ package() -e "s#${srcdir}/tcl${pkgver}#/usr/include#" \ -i "${pkgdir}/usr/lib/tclConfig.sh" - sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/tdbc1.0.0#/usr/lib/tdbc1.0.0#" \ - -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.0/generic#/usr/include#" \ - -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.0/library#/usr/lib/tcl${pkgver%.*}#" \ - -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.0#/usr/include#" \ - -i "${pkgdir}/usr/lib/tdbc1.0.0/tdbcConfig.sh" + tdbcver=tdbc1.0.3 + sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$tdbcver#/usr/lib/$tdbcver#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/generic#/usr/include#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/library#/usr/lib/tcl${pkgver%.*}#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver#/usr/include#" \ + -i "${pkgdir}/usr/lib/$tdbcver/tdbcConfig.sh" - sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/itcl4.0.0#/usr/lib/itcl4.0.0#" \ - -e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.0.0/generic#/usr/include#" \ - -e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.0.0#/usr/include#" \ - -i "${pkgdir}/usr/lib/itcl4.0.0/itclConfig.sh" + itclver=itcl4.0.3 + sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$itclver#/usr/lib/$itclver#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver/generic#/usr/include#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver#/usr/include#" \ + -i "${pkgdir}/usr/lib/$itclver/itclConfig.sh" } \ No newline at end of file diff --git a/tk/PKGBUILD b/tk/PKGBUILD index b86fb6381..83cfce119 100644 --- a/tk/PKGBUILD +++ b/tk/PKGBUILD @@ -1,9 +1,6 @@ -# -# Core Packages for Chakra, part of chakra-project.org -# pkgname=tk -pkgver=8.6.1 +pkgver=8.6.4 pkgrel=1 pkgdesc="A windowing toolkit for use with tcl" arch=('x86_64') @@ -12,7 +9,7 @@ license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') options=('staticlibs') source=("http://downloads.sourceforge.net/sourceforge/tcl/${pkgname}${pkgver}-src.tar.gz") -md5sums=('63f21c3a0e0cefbd854b4eb29b129ac6') +sha1sums=('ad24c59ac2e7453d1ed2bad0d7d18a01eabc5226') build() { cd "${srcdir}/${pkgname}${pkgver}/unix" diff --git a/tzdata/PKGBUILD b/tzdata/PKGBUILD index 5bf6aef1a..097fccc9f 100644 --- a/tzdata/PKGBUILD +++ b/tzdata/PKGBUILD @@ -1,34 +1,27 @@ # maintainer: Manuel Tortosa pkgname=tzdata -pkgver=2014g +pkgver=2015d pkgrel=1 pkgdesc="Sources for time zone and daylight saving time data" arch=('any') url="http://www.iana.org/time-zones" license=('GPL') options=('!emptydirs') -source=(http://www.iana.org/time-zones/repository/releases/${pkgname}${pkgver}.tar.gz - # tzcodes is required for leapseconds.awk file that is not yet part of tzdata - http://www.iana.org/time-zones/repository/releases/tzcode${pkgver}.tar.gz) +source=(http://www.iana.org/time-zones/repository/releases/${pkgname}${pkgver}.tar.gz) timezones=('africa' 'antarctica' 'asia' 'australasia' 'europe' 'northamerica' 'southamerica' 'pacificnew' 'etcetera' 'backward' 'systemv' 'factory') -md5sums=('f9f59425e55b21d2e52bb3a95fc17b8d' - 'f154679d48b724fe191efc19b55abd24') +md5sums=('b595bdc4474b8fc1a15cffc67c66025b') package() { cd ${srcdir} zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo ${timezones[@]} zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo/posix ${timezones[@]} - - # generate leapseconds file - awk -f leapseconds.awk leap-seconds.list > leapseconds && echo "leapseconds file generated" zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo/right -L leapseconds ${timezones[@]} zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo -p America/New_York install -m444 -t ${pkgdir}/usr/share/zoneinfo iso3166.tab zone1970.tab zone.tab # zone.tab is depricated and will go soon } - diff --git a/util-linux/PKGBUILD b/util-linux/PKGBUILD index 5c897df01..52be61b90 100644 --- a/util-linux/PKGBUILD +++ b/util-linux/PKGBUILD @@ -1,12 +1,8 @@ # -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas[at]chakra-project[dog]org> -# maintainer Manuel Tortosa pkgname=util-linux -pkgver=2.25.1 -pkgrel=2 +pkgver=2.26.2 +pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('x86_64') @@ -17,23 +13,18 @@ conflicts=('util-linux-ng' 'eject') provides=("util-linux-ng=${pkgver}" 'eject') license=('GPL2') options=('strip' 'debug') -source=("ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.25/${pkgname}-${pkgver}.tar.xz" +source=("https://www.kernel.org/pub/linux/utils/util-linux/v2.26/$pkgname-$pkgver.tar."{xz,sign} uuidd.tmpfiles - pam-login - pam-common - pam-su - system-auth - system-local-login - system-login - system-remote-login - system-services) + pam-{login,common,su} + system-{auth,local-login,login,remote-login,services}) backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login etc/pam.d/su etc/pam.d/su-l) install=util-linux.install -md5sums=('2ff36a8f8ede70f66c5ad0fb09e40e79' +md5sums=('9bdf368c395f1b70325d0eb22c7f48fb' + 'SKIP' 'a39554bfd65cccfd8254bb46922f4a67' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' @@ -43,6 +34,7 @@ md5sums=('2ff36a8f8ede70f66c5ad0fb09e40e79' '17c691f2da319df8fe851bc47cc1d662' '477237985820117a0e6e1b13a86eb599' '30fe7d41e054ee43fab7855bf88a07e5') +validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak prepare() { cd "$pkgname-$pkgver" @@ -63,6 +55,7 @@ build() { --enable-chfn-chsh \ --enable-write \ --enable-mesg \ + --enable-libmount-force-mountinfo \ --enable-socket-activation \ --with-python=3 diff --git a/util-linux/util-linux.install b/util-linux/util-linux.install index 58c071c23..3d871be26 100644 --- a/util-linux/util-linux.install +++ b/util-linux/util-linux.install @@ -7,14 +7,5 @@ post_install() { } post_upgrade() { - if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then - if [ -f /var/lib/hwclock/adjtime ]; then - mv /var/lib/hwclock/adjtime /etc/adjtime - fi - if [ -d /var/lib/hwclock ]; then - rmdir /var/lib/hwclock - fi - fi - post_install } diff --git a/vhba-module-lts/PKGBUILD b/vhba-module-lts/PKGBUILD index edb823dfe..d0e3f606d 100644 --- a/vhba-module-lts/PKGBUILD +++ b/vhba-module-lts/PKGBUILD @@ -1,14 +1,14 @@ # -# Chakra Packages for Chakra, part of chakra-project.org +# Chakra Packages for Chakra, part of chakraos.org # -_extramodules=extramodules-3.2-lts +_extramodules=extramodules-3.14-CHAKRA-LTS _kver="$(cat /lib/modules/${_extramodules}/version)" -_kernelver=3.2.63 +_kernelver=3.14.44 pkgname=vhba-module-lts _pkgname=vhba-module -pkgver=20140629 +pkgver=20140928 pkgrel=2 pkgdesc="Kernel module that emulates SCSI devices" arch=('x86_64') @@ -19,7 +19,7 @@ makedepends=("linux-lts-headers=${_kernelver}") install=vhba-module.install source=("http://sourceforge.net/projects/cdemu/files/vhba-module/vhba-module-$pkgver.tar.bz2" '60-vhba.rules') -md5sums=('6b307a80df9c163768cc7ecb3ccebb71' +md5sums=('967007230bb028424216d9b35da422c0' '4dc37dc348b5a2c83585829bde790dcc') prepare() { diff --git a/vhba-module-lts/vhba-module.install b/vhba-module-lts/vhba-module.install index 4f7ee4f92..f522806de 100644 --- a/vhba-module-lts/vhba-module.install +++ b/vhba-module-lts/vhba-module.install @@ -1,7 +1,7 @@ post_install() { echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot." echo ">> This module needs to be recompiled for every kernel version upgrade." - EXTRAMODULES='extramodules-3.2-lts' + EXTRAMODULES='extramodules-3.14-CHAKRA-LTS' depmod $(cat /lib/modules/$EXTRAMODULES/version) } @@ -10,7 +10,7 @@ post_upgrade() { } post_remove() { - EXTRAMODULES='extramodules-3.2-lts' + EXTRAMODULES='extramodules-3.14-CHAKRA-LTS' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/vhba-module/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch b/vhba-module/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch deleted file mode 100644 index 8f4603ebc..000000000 --- a/vhba-module/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6545ad1e266f4eb2428e93ba0fdb43d8b87d5fcd Mon Sep 17 00:00:00 2001 -From: Rok Mandeljc -Date: Sat, 19 Apr 2014 12:06:23 +0200 -Subject: [PATCH] VHBA module: define scmd_dbg() and scmd_warn() macros only if - they are not defined already; fix for compilation on kernel 3.15 and newer - (bug #76) - ---- - vhba-module/vhba.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c -index ae9b554..eb1c5e6 100644 ---- a/vhba-module/vhba.c -+++ b/vhba-module/vhba.c -@@ -54,12 +54,16 @@ MODULE_LICENSE("GPL"); - #define DPRINTK(fmt, args...) - #endif - -+/* scmd_dbg was introduced in 3.15 */ -+#ifndef scmd_dbg - #define scmd_dbg(scmd, fmt, a...) \ - dev_dbg(&(scmd)->device->sdev_gendev, fmt, ##a) -+#endif - -+#ifndef scmd_warn - #define scmd_warn(scmd, fmt, a...) \ - dev_warn(&(scmd)->device->sdev_gendev, fmt, ##a) -- -+#endif - - #define VHBA_MAX_SECTORS_PER_IO 256 - #define VHBA_MAX_ID 32 -@@ -276,7 +280,7 @@ static void vhba_scan_devices (struct work_struct *work) - } - change = vhost->chgtype[id]; - exists = vhost->devices[id] != NULL; -- -+ - vhost->chgtype[id] = 0; - clear_bit(id, vhost->chgmap); - -@@ -289,7 +293,7 @@ static void vhba_scan_devices (struct work_struct *work) - dev_dbg(&vhost->shost->shost_gendev, "trying to add target 0:%d:0\n", id); - vhba_scan_devices_add(vhost, id); - } else { -- /* quick sequence of add/remove or remove/add; we determine -+ /* quick sequence of add/remove or remove/add; we determine - which one it was by checking if device structure exists */ - if (exists) { - /* remove followed by add: remove and (re)add */ --- -2.0.0 - diff --git a/vhba-module/PKGBUILD b/vhba-module/PKGBUILD index 01f30794b..3b96c7925 100644 --- a/vhba-module/PKGBUILD +++ b/vhba-module/PKGBUILD @@ -1,14 +1,14 @@ # -# Chakra Packages for Chakra, part of chakra-project.org +# Chakra Packages for Chakra, part of chakraos.org # -_extramodules=extramodules-3.19-CHAKRA +_extramodules=extramodules-4.0-CHAKRA _kver="$(cat /usr/lib/modules/${_extramodules}/version)" -_kernelver=3.19.4 +_kernelver=4.0.5 pkgname=vhba-module -pkgver=20140629 -pkgrel=12 +pkgver=20140928 +pkgrel=1 pkgdesc="Kernel module that emulates SCSI devices" arch=('x86_64') url="http://cdemu.sourceforge.net/" @@ -18,10 +18,9 @@ makedepends=("linux-headers=${_kernelver}") install=vhba-module.install source=("http://sourceforge.net/projects/cdemu/files/vhba-module/vhba-module-$pkgver.tar.bz2" '60-vhba.rules') -md5sums=('6b307a80df9c163768cc7ecb3ccebb71' +md5sums=('967007230bb028424216d9b35da422c0' '4dc37dc348b5a2c83585829bde790dcc') - prepare() { cd $pkgname-$pkgver } diff --git a/vhba-module/vhba-module.install b/vhba-module/vhba-module.install index af24d837b..ac65c1f79 100644 --- a/vhba-module/vhba-module.install +++ b/vhba-module/vhba-module.install @@ -1,5 +1,5 @@ post_install() { - EXTRAMODULES='extramodules-3.19-CHAKRA' + EXTRAMODULES='extramodules-4.0-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } @@ -8,7 +8,7 @@ post_upgrade() { } post_remove() { - EXTRAMODULES='extramodules-3.19-CHAKRA' + EXTRAMODULES='extramodules-4.0-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/wget/PKGBUILD b/wget/PKGBUILD index 21cde3688..d607c38b6 100644 --- a/wget/PKGBUILD +++ b/wget/PKGBUILD @@ -1,11 +1,10 @@ # -# Core Packages for Chakra, part of chakra-project.org +# Core Packages for Chakra, part of chakraos.org # # maintainer : -# contributor: pkgname=wget -pkgver=1.16.1 +pkgver=1.16.3 pkgrel=1 pkgdesc="A network utility to retrieve files from the Web" arch=('x86_64') @@ -18,8 +17,9 @@ optdepends=('ca-certificates: HTTPS downloads') backup=('etc/wgetrc') install=wget.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('78942cc0cce0a23e18114d982789e360' +md5sums=('d2e4455781a70140ae83b54ca594ce21' 'SKIP') +validpgpkeys=('AC404C1C0BF735C63FF4D562263D6DF2E163E1EA') prepare() { cd ${pkgname}-${pkgver} diff --git a/which/PKGBUILD b/which/PKGBUILD index 87688c1f9..6bf08dd54 100644 --- a/which/PKGBUILD +++ b/which/PKGBUILD @@ -1,20 +1,16 @@ -# -# Core Packages for Chakra, part of chakra-project.org -# -# maintainer: abveritas@chakra-project.org pkgname=which -pkgver=2.20 -pkgrel=6 +pkgver=2.21 +pkgrel=1 pkgdesc="A utility to show the full path of commands" arch=('x86_64') -url="http://www.xs4all.nl/~carlo17/which" +url='http://savannah.gnu.org/projects/which' license=('GPL3') -groups=('base') +groups=('base' 'base-devel') depends=('glibc' 'sh') install=which.install -source=("http://www.xs4all.nl/~carlo17/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('95be0501a466e515422cde4af46b2744') +source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('097ff1a324ae02e0a3b0369f07a7544a') build() { cd $srcdir/$pkgname-$pkgver diff --git a/wireless-regdb/PKGBUILD b/wireless-regdb/PKGBUILD index 1c3314ed1..49fd7cef8 100644 --- a/wireless-regdb/PKGBUILD +++ b/wireless-regdb/PKGBUILD @@ -4,7 +4,7 @@ # maintainer abveritas[at]chakra-project[dot]org> pkgname=wireless-regdb -pkgver=2014.06.02 +pkgver=2015.05.15 pkgrel=1 pkgdesc="Central Regulatory Domain Database" arch=('any') @@ -16,7 +16,7 @@ makedepends=('crda') install=wireless-regdb.install source=("https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'crda.conf.d') -md5sums=('7f2bdda89b79b759ebc0c435345dcb76' +md5sums=('2698615f0d871077a05849887e8fa80d' '2374dcf1c6530332f375e5362b80169b') package() { @@ -37,6 +37,10 @@ package() { warning "Crda is not installed, regulatory database could not be verified." fi + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/sforshee.key.pub.pem "${pkgdir}"/usr/lib/crda/pubkeys/sforshee.key.pub.pem + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/wireless-regdb/LICENSE + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.bin.5 "${pkgdir}"/usr/share/man/man5/regulatory.bin.5 + msg "Installing /etc/conf.d/wireless-regdom ..." install -D -m644 ${srcdir}/crda.conf.d ${pkgdir}/etc/conf.d/wireless-regdom for dom in $(grep ^country ${srcdir}/${pkgname}-${pkgver}/db.txt | cut -d' ' -f2 | sed 's|:||g'); do diff --git a/xfsprogs/PKGBUILD b/xfsprogs/PKGBUILD index 9ea09950c..3964ca18f 100644 --- a/xfsprogs/PKGBUILD +++ b/xfsprogs/PKGBUILD @@ -1,10 +1,6 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas[at]chakra-project[dot]org> pkgname=xfsprogs -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('x86_64') @@ -12,10 +8,10 @@ license=('LGPL') url="http://oss.sgi.com/projects/xfs/" groups=('base') depends=('util-linux') -options=('!makeflags' '!libtool') +options=('!makeflags') # We mirror the sources as upstream tends to move them once a new release is out -source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") -md5sums=('5c6905932029c8f9207fe5a0a8aac24b') +source=("https://sources.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") +md5sums=('b6b0db5e3ee71ceba26d0a5accbd0666') build() { cd "${srcdir}/${pkgname}-${pkgver}"