Development September 2017

development@lists.ipfire.org

12 participants
43 discussions

[PATCH] tcpick: Renewed version with several patches.
by Erik Kapfer 25 Sep '17

25 Sep '17

Patches has been included for: - Fix for CVE-2006-0048 - Fix for build with GCC 5. - Fix for double free error. - Fix for man invocation. - Fix for timestamp pcap header structure. --- config/rootfiles/packages/tcpick | 3 + lfs/tcpick | 94 +++++++++ make.sh | 1 + src/patches/tcpick/001-CVE-2006-0048.patch | 19 ++ src/patches/tcpick/002-fix-build-with-gcc5.patch | 233 +++++++++++++++++++++ src/patches/tcpick/003-fix-double-free-error.patch | 40 ++++ src/patches/tcpick/004-fix-man-invocation.patch | 22 ++ .../005-set-timestamp-pcap-header-structure.patch | 77 +++++++ .../006-avoid-implicitly-converted-pointers.patch | 107 ++++++++++ 9 files changed, 596 insertions(+) create mode 100644 config/rootfiles/packages/tcpick create mode 100644 lfs/tcpick create mode 100644 src/patches/tcpick/001-CVE-2006-0048.patch create mode 100644 src/patches/tcpick/002-fix-build-with-gcc5.patch create mode 100644 src/patches/tcpick/003-fix-double-free-error.patch create mode 100644 src/patches/tcpick/004-fix-man-invocation.patch create mode 100644 src/patches/tcpick/005-set-timestamp-pcap-header-structure.patch create mode 100644 src/patches/tcpick/006-avoid-implicitly-converted-pointers.patch diff --git a/config/rootfiles/packages/tcpick b/config/rootfiles/packages/tcpick new file mode 100644 index 0000000..d0bc1b1 --- /dev/null +++ b/config/rootfiles/packages/tcpick @@ -0,0 +1,3 @@ +usr/bin/tcpick +#usr/share/man/man8/tcpick.8 +#usr/share/man/man8/tcpick_italian.8 diff --git a/lfs/tcpick b/lfs/tcpick new file mode 100644 index 0000000..55d11b0 --- /dev/null +++ b/lfs/tcpick @@ -0,0 +1,94 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.2.1 + +THISAPP = tcpick-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = tcpick +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = bb94f2f9ea81aeb645619fbe9b3b9a29 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpick/001-CVE-2006-0048.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpick/002-fix-build-with-gcc5.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpick/003-fix-double-free-error.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpick/004-fix-man-invocation.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpick/005-set-timestamp-pcap-header-structure.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpick/006-avoid-implicitly-converted-pointers.patch + + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index f79f627..239add8 100755 --- a/make.sh +++ b/make.sh @@ -887,6 +887,7 @@ buildipfire() { lfsmake2 perl-Net-IP lfsmake2 wio lfsmake2 iftop + lfsmake2 tcpick } buildinstaller() { diff --git a/src/patches/tcpick/001-CVE-2006-0048.patch b/src/patches/tcpick/001-CVE-2006-0048.patch new file mode 100644 index 0000000..29ba2e1 --- /dev/null +++ b/src/patches/tcpick/001-CVE-2006-0048.patch @@ -0,0 +1,19 @@ +Description: Fix for CVE-2006-0048 +Author: Cédric Delfosse <cedric(a)debian.org> +Origin: vendor +Bug-Debian: http://bugs.debian.org/360571 +Last-Update: 2006-04-14 + +diff -Nur tcpick-0.2.1_orig/src/write.c tcpick-0.2.1/src/write.c +--- tcpick-0.2.1_orig/src/write.c 2005-01-09 00:54:47.000000000 +0100 ++++ tcpick-0.2.1/src/write.c 2017-09-20 12:31:14.735311570 +0200 +@@ -241,6 +241,9 @@ + if( flags.separator && ( out == stdout ) ) /* FIXME: sucks? */ + color( c_SEPARATOR, stdout, SEPARATOR "\n" ); + ++ /* Temporary fix for CVE-2006-0048 */ ++ if (buflen < 0) buflen = 0; ++ + switch ( flavour ) { + case HEX_ASCII_DUMP: + out_xa( out, buf, buflen ); diff --git a/src/patches/tcpick/002-fix-build-with-gcc5.patch b/src/patches/tcpick/002-fix-build-with-gcc5.patch new file mode 100644 index 0000000..eefc56f --- /dev/null +++ b/src/patches/tcpick/002-fix-build-with-gcc5.patch @@ -0,0 +1,233 @@ +Description: Fix build with GCC 5 + GCC 5 is more picky with external references which are not properly + declared with forward references. Add all relevant functions to tcpick.h + to avoid this problem and fix the problems put into light by this change + (some invalid function calls). +Author: Raphaël Hertzog <hertzog(a)debian.org> +Bug-Debian: http://bugs.debian.org/778141 +Origin: vendor +Last-Update: 2015-07-13 + +--- a/src/tcpick.h ++++ b/src/tcpick.h +@@ -10,10 +10,12 @@ + */ + + #include "config.h" ++#define _GNU_SOURCE + + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> ++#include <ctype.h> + + #ifdef HAVE_SIGNAL_H + # include <signal.h> +@@ -114,3 +116,102 @@ + #include "flags.h" + #include "lookup.h" + #include "timer.h" ++ ++/* From args.c */ ++void parse_args(int argc, char ** argv); ++ ++/* From colors.c */ ++void textcolor(FILE * out, int attr, int fg, int bg); ++void resetcolor(FILE * out); ++void color(int attr, int fg, FILE * out, char *fmt, ...); ++ ++/* From datalink.c */ ++char *datalink2str(int dl_id); ++int datalink2off(int dl_id); ++ ++/* From display.c */ ++char * status2str(enum STATUS status); ++int display_status( FILE * out, struct CONN * conn, enum STATUS status ); ++int display_header( FILE * out ); ++int out_h( FILE * out, u_char * buf, int buflen ); ++int out_hn( FILE * out, u_char * buf, int buflen ); ++int out_p( FILE * out, u_char * buf, int buflen ); ++int out_xa (FILE * out, u_char * buf, int buflen); ++int out_x (FILE * out, u_char * buf, int buflen); ++ ++/* From fragments.c */ ++int ++addfr( struct FRAGMENT ** first, ++ int wlen, ++ u_int32_t data_off, ++ u_char * payload, ++ int payload_len ); ++ ++int ++flush_ack( struct HOST_DESC * desc, ++ struct CONN * conn_ptr, ++ int ack_num ); ++ ++/* From lookup_query.c */ ++char * lookup_new(struct in_addr ia); ++char * lookup(struct in_addr ia); ++char * getportname(u_int16_t port); ++ ++/* From lookup_tree.c */ ++struct _l_node *_l_alloc(struct in_addr, char *); ++char *_l_get(struct in_addr); ++int _l_insert(struct _l_node * new); ++ ++/* Form msg.c */ ++void err(char *fmt, ...); ++void msg(int v, int attr, int fg, char *fmt, ...); ++void sorry(char * func, char * desc); ++ ++/* From quit.c */ ++void fault(char * func, char * desc); ++void suicide(char * func, char * fmt, ...); ++void print_statistics(); ++void cleanup(); ++void exit_signal(int sig_type); ++ ++/* From tcpick.c */ ++void signal_setup(int sig, void (*handler)( )); ++ ++/* From time.c */ ++char * time_ascii(char * ret); ++ ++/* From timer.c */ ++void set_timer(); ++void check_expired(); ++void sigalrm_callback(int sig_type); ++ ++/* From tracker.c */ ++int status_switch(struct CONN * prev, enum STATUS status); ++int newconn( struct CONN * prev_ring ); ++int rmconn( struct CONN * prev_ring ); ++int free_desc( struct HOST_DESC * desc, int freedescfilename ); ++ ++/* From verify.c */ ++int ++verify(); ++ ++/* From write.c */ ++char * ++avail_filename(struct CONN * conn_ptr, ++ enum PART side, char * ext); ++ ++void ++open_file(struct CONN * conn_ptr, ++ struct HOST_DESC * desc); ++ ++int ++flowflush(struct CONN * conn_ptr, ++ struct HOST_DESC * desc, ++ u_char * buf, ++ int buflen); ++ ++int ++out_flavour(enum FLAVOUR flavour, ++ FILE * out, ++ u_char * buf, ++ int buflen); +--- a/src/loop.c ++++ b/src/loop.c +@@ -95,8 +95,7 @@ got_packet (u_char * useless, + #endif /* TCPICK_DEBUG */ + + if( flags.header > 0 ) +- display_header( stdout, ippacket, tcppacket, +- payload_len ); ++ display_header(stdout); + + verify(); /* call the core to manage the packet */ + +--- a/src/display.c ++++ b/src/display.c +@@ -297,7 +297,7 @@ out_x (FILE * out, u_char * buf, int buf + color( c_NONPRINT, out, pos % 2 ? "%2.2x " : "%2.2x", *( buf + pos ) ); + else + /* hex space fill */ +- fprintf(out, pos % 2 ? " " : " ", *( buf + pos ) ); ++ fprintf(out, pos % 2 ? " " : " "); + pos++; + } while ( pos % 16 ); + +--- a/src/tcpick.c ++++ b/src/tcpick.c +@@ -50,10 +50,10 @@ + #include "tcpick.h" + #include "globals.h" + +-char *errbuf[PCAP_ERRBUF_SIZE]; ++char errbuf[PCAP_ERRBUF_SIZE]; + struct bpf_program filter_compiled; + bpf_u_int32 netp; /* ip */ +-bpf_u_int32 maskp; /* subnet mask */ ++bpf_u_int32 maskp = PCAP_NETMASK_UNKNOWN; /* subnet mask */ + struct in_addr addr; + char *other_args = NULL; + pcap_t *descr; +@@ -238,7 +238,7 @@ int main(int argc, char **argv) + &filter_compiled, + filter, + 0, +- (int)net ++ maskp + ) == -1) ) + err("error compiling filter \"%s\"",filter); + +--- a/src/time.c ++++ b/src/time.c +@@ -42,7 +42,7 @@ char * time_ascii(char * ret) + tzp = (struct timezone * ) S_malloc( sizeof(struct timezone) ); + + memset(tp, 0, sizeof(struct timeval)); +- memset(tzp, 0, sizeof(struct timeval)); ++ memset(tzp, 0, sizeof(struct timezone)); + + if(gettimeofday(tp, tzp)) { + +@@ -58,7 +58,7 @@ char * time_ascii(char * ret) + brokentime->tm_hour, + brokentime->tm_min, + brokentime->tm_sec, +- tp->tv_usec ++ (int)tp->tv_usec + ); + break; + +@@ -79,7 +79,7 @@ char * time_ascii(char * ret) + brokentime->tm_hour, + brokentime->tm_min, + brokentime->tm_sec, +- tp->tv_usec ++ (int)tp->tv_usec + ); + break; + +@@ -99,7 +99,7 @@ char * time_ascii(char * ret) + return ret; + + retNULL: +- sprintf(ret,""); ++ ret[0] = '\0'; + return NULL; + + } +--- a/src/debug.c ++++ b/src/debug.c +@@ -32,7 +32,7 @@ void + print_conn_chain (struct CONN * f) + { + while (f) { +- printf ("%x->",f); ++ printf ("%p->",f); + + if (f == f->next) { + printf ("inf\n"); +@@ -48,7 +48,7 @@ int + print_fragment_chain(struct FRAGMENT * f) + { + while (f) { +- printf ("%x(%i,%i)->",f,f->off,f->len); ++ printf ("%p(%i,%i)->",f,f->off,f->len); + + if (f == f->next) { + printf ("inf\n"); diff --git a/src/patches/tcpick/003-fix-double-free-error.patch b/src/patches/tcpick/003-fix-double-free-error.patch new file mode 100644 index 0000000..c5d934b --- /dev/null +++ b/src/patches/tcpick/003-fix-double-free-error.patch @@ -0,0 +1,40 @@ +Description: Fix double-free error + tcpick try to free twice the pointer to the filename it uses to write + the data. This patches fixes that. +Author: Cedric Delfosse <cedric(a)debian.org> +Bug-Debian: http://bugs.debian.org/319864 +Last-Update: 2005-07-26 +Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=319864#19 + +--- a/src/tracker.c ++++ b/src/tracker.c +@@ -99,8 +99,9 @@ int rmconn( struct CONN * prev_ring ) + if( curr->next == NULL ) + last_conn = prev_ring; + +- free_desc( &(curr->client) ); +- free_desc( &(curr->server) ); ++ free_desc( &(curr->client), 1); ++ if (flags.writer.type == UNIQUE) free_desc( &(curr->server), 0); ++ else free_desc( &(curr->server), 1); + S_free( curr ); + + conn = first_conn; +@@ -124,7 +125,7 @@ int rmconn( struct CONN * prev_ring ) + count_opened--; + } + +-int free_desc( struct HOST_DESC * desc ) ++int free_desc( struct HOST_DESC * desc, int freedescfilename ) + /* frees the host descriptor and closes the file */ + { + struct FRAGMENT * tmp; +@@ -134,7 +135,7 @@ int free_desc( struct HOST_DESC * desc ) + if (flags.writer.type == UNIQUE) + desc->oth->file = NULL; + } +- if( desc->filename ) { ++ if( desc->filename && freedescfilename ) { + S_free( desc->filename ); + desc->filename = NULL; + } diff --git a/src/patches/tcpick/004-fix-man-invocation.patch b/src/patches/tcpick/004-fix-man-invocation.patch new file mode 100644 index 0000000..411cfd8 --- /dev/null +++ b/src/patches/tcpick/004-fix-man-invocation.patch @@ -0,0 +1,22 @@ +Description: Fix man invocation + Upon startup, tcpick says: + . + important: `man 1 tcpick' explains all options available + . + but the man page is in section 8, not 1. This patch fixes that. +Bug-Debian: http://bugs.debian.org/265067 +Origin: vendor +Author: Cédric Delfosse <cedric(a)debian.org> +Last-Update: 2004-08-18 + +--- a/src/args.c ++++ b/src/args.c +@@ -386,7 +386,7 @@ parse_args(int argc, char ** argv) + if(flags.versionandquit) { + color( c_USAGE, stdout, PACKAGE_STRING "\n" + " Author: " AUTHOR "\n" +- " for other info try `man 1 tcpick', or `%s --help'\n\n" ++ " for other info try `man tcpick', or `%s --help'\n\n" + TERMS ,TCPICK_NAME); + exit( TCPICK_SUCCESS ); + } diff --git a/src/patches/tcpick/005-set-timestamp-pcap-header-structure.patch b/src/patches/tcpick/005-set-timestamp-pcap-header-structure.patch new file mode 100644 index 0000000..288887b --- /dev/null +++ b/src/patches/tcpick/005-set-timestamp-pcap-header-structure.patch @@ -0,0 +1,77 @@ +Description:Tcpick can display timestamps in the output with the -t and -td switch. It currently computes a timestamp on the fly which has the following consequences +* Inaccurate timestamps when it is operated in real time mode (-i switch) +* Nonsense when reassembling off-line captures / when reading pcap files +Author: Gerard Wagener +Bug-Ubuntu:https://bugs.launchpad.net/ubuntu/+source/tcpick/+bug/364688 + +--- a/src/extern.h ++++ b/src/extern.h +@@ -13,6 +13,7 @@ + extern struct ip *ippacket; + extern struct tcphdr *tcppacket; + extern struct udphdr *udppacket; ++extern struct pcap_pkthdr* phdr; + extern u_char *payload; + extern int payload_len; + extern struct FLAGS flags; +--- a/src/globals.h ++++ b/src/globals.h +@@ -12,6 +12,7 @@ + struct ip *ippacket; + struct tcphdr *tcppacket; + struct udphdr *udppacket; ++struct pcap_pkthdr* phdr = NULL; + u_char *payload; + int payload_len = 0; + struct FLAGS flags; +--- a/src/loop.c ++++ b/src/loop.c +@@ -38,6 +38,9 @@ + + { /* FIXME: this function is too long */ + ++/* Keep track of the original pcap header in order to put correct timestamps */ ++ phdr=(struct pcap_pkthdr *)hdr; ++ + /* check if the flag for checking for expired connections + is turned on */ + +--- a/src/time.c ++++ b/src/time.c +@@ -32,22 +32,16 @@ + { + + struct timeval *tp; +- struct timezone *tzp; + struct tm * brokentime; + + if(flags.displaytime == NOTHING_TIME) + goto retNULL; + +- tp = (struct timeval * ) S_malloc( sizeof(struct timeval) ); +- tzp = (struct timezone * ) S_malloc( sizeof(struct timezone) ); ++ tp = &phdr->ts; ++ if(!tp) { + +- memset(tp, 0, sizeof(struct timeval)); +- memset(tzp, 0, sizeof(struct timezone)); +- +- if(gettimeofday(tp, tzp)) { +- +- perror("gettimeofday returned not 0!"); +- goto retNULL; ++ perror("No timestamp was available!"); ++ goto retNULL; + + } else { + brokentime = localtime(&(tp->tv_sec)); +@@ -93,9 +87,6 @@ + } + } + +- S_free ( tp ); +- S_free ( tzp ); +- + return ret; + + retNULL: diff --git a/src/patches/tcpick/006-avoid-implicitly-converted-pointers.patch b/src/patches/tcpick/006-avoid-implicitly-converted-pointers.patch new file mode 100644 index 0000000..635ce2c --- /dev/null +++ b/src/patches/tcpick/006-avoid-implicitly-converted-pointers.patch @@ -0,0 +1,107 @@ +Description: Avoid implicitly converted pointers + Implicitly converted pointers will cause segfault on architectures where + the size of a pointer is greater than the size of an integer, such as + ia64. +Author: dann frazier <dannf(a)dannf.org> +Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=326927#5 +Bug-Debian: http://bugs.debian.org/326927 +Last-Update: 2005-09-06 +Modified: 2017-09-20 +Author: Erik Kapfer <erik.kapfer(a)ipfire.org> +Description: Added avoid-implicitly-converted-pointers.patch again to + prevent hunk with set-timestamp-header-structure.patch + +diff -Nur tcpick-0.2.1_orig/src/datalink.h tcpick-0.2.1/src/datalink.h +--- tcpick-0.2.1_orig/src/datalink.h 1970-01-01 01:00:00.000000000 +0100 ++++ tcpick-0.2.1/src/datalink.h 2017-09-20 12:43:25.711276936 +0200 +@@ -0,0 +1,29 @@ ++/* ++ * datalink.h -- calculates datalink offsets ++ * Part of the tcpick project ++ * ++ * Author: Francesco Stablum <duskdruid @ despammed.com> ++ * ++ * Copyright (C) 2003, 2004 Francesco Stablum ++ * Licensed under the GPL ++ * ++ */ ++ ++/* ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at you option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ * See the GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, ++ * USA. ++ */ ++ ++char *datalink2str(int dl_id); +\ Kein Zeilenumbruch am Dateiende. +diff -Nur tcpick-0.2.1_orig/src/display.c tcpick-0.2.1/src/display.c +--- tcpick-0.2.1_orig/src/display.c 2017-09-20 12:40:04.803286455 +0200 ++++ tcpick-0.2.1/src/display.c 2017-09-20 12:43:54.719275562 +0200 +@@ -28,6 +28,7 @@ + /* FIXME: most code is duplicated: find a better solution! */ + + #include "tcpick.h" ++#include "lookup.h" + #include "extern.h" + + char * +diff -Nur tcpick-0.2.1_orig/src/lookup.h tcpick-0.2.1/src/lookup.h +--- tcpick-0.2.1_orig/src/lookup.h 2004-12-31 14:53:30.000000000 +0100 ++++ tcpick-0.2.1/src/lookup.h 2017-09-20 12:44:38.719273477 +0200 +@@ -26,6 +26,8 @@ + * USA. + */ + ++#ifndef _LOOKUP_H ++#define _LOOKUP_H + + struct _l_node /* the node/leaf of the tree */ + { +@@ -40,3 +42,9 @@ + char * name; + struct in_addr ip; + }; ++ ++char *lookup(struct in_addr ia); ++struct _l_node *_l_alloc(struct in_addr, char *); ++char *_l_get(struct in_addr); ++ ++#endif +\ Kein Zeilenumbruch am Dateiende. +diff -Nur tcpick-0.2.1_orig/src/tcpick.c tcpick-0.2.1/src/tcpick.c +--- tcpick-0.2.1_orig/src/tcpick.c 2017-09-20 12:40:36.319284962 +0200 ++++ tcpick-0.2.1/src/tcpick.c 2017-09-20 12:45:07.895272095 +0200 +@@ -49,6 +49,7 @@ + + #include "tcpick.h" + #include "globals.h" ++#include "datalink.h" + + char errbuf[PCAP_ERRBUF_SIZE]; + struct bpf_program filter_compiled; +diff -Nur tcpick-0.2.1_orig/src/write.c tcpick-0.2.1/src/write.c +--- tcpick-0.2.1_orig/src/write.c 2017-09-20 12:39:56.783286835 +0200 ++++ tcpick-0.2.1/src/write.c 2017-09-20 12:46:49.223267294 +0200 +@@ -25,8 +25,11 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#define _GNU_SOURCE ++#include <string.h> + #include "tcpick.h" + #include "extern.h" ++#include "lookup.h" + + __inline__ char * + avail_filename(struct CONN * conn_ptr, -- 2.7.4

2 1

[PATCH 3/3] generate ECDSA certificate and key on existing installations
by Peter Müller 25 Sep '17

25 Sep '17

Generate ECDSA certificate and key file on existing installations via the update.sh script. This is required since Apache crashes if some Certificate(Key)File directives point to non-existing files: Restarting Apache daemon... Syntax error on line 17 of /etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf: SSLCertificateFile: file '/etc/httpd/server-ecdsa.crt' does not exist or is empty Key generation only takes a few seconds even on legacy systems. Also existing installations will then use ECDSA/RSA certificate dual-stack. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- diff --git a/config/rootfiles/core/114/update.sh b/config/rootfiles/core/114/update.sh index 6d7a10b5e..c5d945b21 100644 --- a/config/rootfiles/core/114/update.sh +++ b/config/rootfiles/core/114/update.sh @@ -60,6 +60,14 @@ rm -f /usr/sbin/htpasswd # Update Language cache /usr/local/bin/update-lang-cache +# Generate ECDSA certificate and key file to prevent Apache from crashing on existing installations +/usr/bin/openssl ecparam -genkey -name secp384r1 | openssl ec -out /etc/httpd/server-ecdsa.key +/bin/cat /etc/certparams | sed "s/HOSTNAME/`hostname -f`/" | /usr/bin/openssl \ + req -new -key /etc/httpd/server-ecdsa.key -out /etc/httpd/server-ecdsa.csr +/usr/bin/openssl x509 -req -days 999999 -sha256 -in \ + /etc/httpd/server-ecdsa.csr -signkey /etc/httpd/server-ecdsa.key -out \ + /etc/httpd/server-ecdsa.crt + # Start services /etc/init.d/unbound start /etc/init.d/apache start

2 2

[PATCH 1/3] add ECDSA key generation to httpscert
by Peter Müller 25 Sep '17

25 Sep '17

Add ECDSA server certificate and key generation to httpscert. The key has a length of 384 bits, which equals > 4096 bits RSA and should be sufficient. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- diff --git a/src/scripts/httpscert b/src/scripts/httpscert index e20f789ed..b38db9fbb 100644 --- a/src/scripts/httpscert +++ b/src/scripts/httpscert @@ -7,16 +7,23 @@ case "$1" in new) if [ ! -f /etc/httpd/server.key ]; then - echo "Generating https server key." + echo "Generating https RSA server key." /usr/bin/openssl genrsa -out /etc/httpd/server.key 4096 + echo "Generating https ECDSA server key." + /usr/bin/openssl ecparam -genkey -name secp384r1 | openssl ec -out /etc/httpd/server-ecdsa.key fi - echo "Generating CSR" + echo "Generating CSRs" /bin/cat /etc/certparams | sed "s/HOSTNAME/`hostname -f`/" | /usr/bin/openssl \ req -new -key /etc/httpd/server.key -out /etc/httpd/server.csr - echo "Signing certificate" + /bin/cat /etc/certparams | sed "s/HOSTNAME/`hostname -f`/" | /usr/bin/openssl \ + req -new -key /etc/httpd/server-ecdsa.key -out /etc/httpd/server-ecdsa.csr + echo "Signing certificates" /usr/bin/openssl x509 -req -days 999999 -sha256 -in \ /etc/httpd/server.csr -signkey /etc/httpd/server.key -out \ /etc/httpd/server.crt + /usr/bin/openssl x509 -req -days 999999 -sha256 -in \ + /etc/httpd/server-ecdsa.csr -signkey /etc/httpd/server-ecdsa.key -out \ + /etc/httpd/server-ecdsa.crt ;; read) if [ -f /etc/httpd/server.key -a -f /etc/httpd/server.crt -a -f /etc/httpd/server.csr ]; then

2 2

collectd 5.7.2 desperately misses 'automake 1.14' ;-)
by Matthias Fischer 24 Sep '17

24 Sep '17

Hi, I'm trying to build 'collectd 5.7.2' for some testing, but it always fails with the following warning: ... make[2]: Entering directory '/usr/src/collectd-5.7.2/src' cd .. && /bin/sh /usr/src/collectd-5.7.2/libltdl/config/missing automake-1.14 --foreign src/Makefile /usr/src/collectd-5.7.2/libltdl/config/missing: line 81: automake-1.14: command not found WARNING: 'automake-1.14' is missing on your system. ... This is right, because current 'next' uses 'automake 1.15'. I tested with 1.15.1, tried several lfs-changes, but still no luck. Does anyone got a tip? Best, Matthias

2 3

Core 114-Upgrade
by Matthias Fischer 24 Sep '17

24 Sep '17

Hi, Another one - sorry if its only me. ;-) At the risk of overseeing something or being dumb: I just checked the contents of the last Core-upgrade I built this afternoon: 'core-upgrade-2.19-114.ipfire'. And as far I as I know, the containing Apache-Update to 2.4.27 was bundled with some changes in 'php 5.3.27' (see list.ipfire.org, 15.8.2017, [PATCH 2/2] from Wolfgang Apolinarski). But I can't find any of these changes in this package (e.g., 'libphp5.so'). Is it only me or...? The corresponding 'next' is at: ... commit 6ec860b8d2f538fc28c8b56e45d82b1bd88514d3 (origin/next) Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Sep 23 10:37:02 2017 +0200 finish core114 ... And looking at '.../config/rootfiles/core/114/filelists/i586/' I see: ... root@Devel: /home/matz/ipfire-2.x/config/rootfiles/core/114/filelists # ls -l total 8 lrwxrwxrwx 1 root root 23 Sep 23 21:54 apache2 -> ../../../common/apache2 lrwxrwxrwx 1 root root 19 Sep 23 21:54 apr -> ../../../common/apr lrwxrwxrwx 1 root root 23 Sep 23 21:54 aprutil -> ../../../common/aprutil -rw-r--r-- 1 root root 70 Sep 23 21:54 files lrwxrwxrwx 1 root root 22 Sep 23 21:54 gnutls -> ../../../common/gnutls lrwxrwxrwx 1 root root 22 Sep 23 21:54 hdparm -> ../../../common/hdparm drwxr-xr-x 2 root root 4096 Sep 23 21:54 i586 lrwxrwxrwx 1 root root 21 Sep 23 21:54 squid -> ../../../common/squid lrwxrwxrwx 1 root root 26 Sep 23 21:54 strongswan -> ../../../common/strongswan lrwxrwxrwx 1 root root 23 Sep 23 21:54 unbound -> ../../../common/unbound ... But nothing concerning 'php 5.3.27'. Is it me or...? Best, Matthias

2 2

[PATCH] force transport encryption for WebUI logins
by Peter Müller 24 Sep '17

24 Sep '17

Force SSL/TLS for any WebUI directory which requires an authentication. This prevents credentials from being transmitted in plaintext, which is an information leak. Scenario: A MITM attacker might block all encrypted traffic to the firewall's web interface, making the administrator using an unencrypted connection (i.e. via port 81). Username and password can be easily logged in transit then. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> --- diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf index 6f353962e..5ceaa1f32 100644 --- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf +++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf @@ -24,6 +26,7 @@ AuthType Basic AuthUserFile /var/ipfire/auth/users Require user admin + Require ssl </DirectoryMatch> ScriptAlias /cgi-bin/ /srv/web/ipfire/cgi-bin/ <Directory /srv/web/ipfire/cgi-bin> @@ -33,6 +36,7 @@ AuthType Basic AuthUserFile /var/ipfire/auth/users Require user admin + Require ssl <Files chpasswd.cgi> Require all granted </Files> @@ -50,6 +54,7 @@ AuthType Basic AuthUserFile /var/ipfire/auth/users Require user dial admin + Require ssl </Directory> <Files ~ "\.(cgi|shtml?)$"> SSLOptions +StdEnvVars @@ -86,5 +91,6 @@ AuthType Basic AuthUserFile /var/ipfire/auth/users Require user admin + Require ssl </Directory> </VirtualHost> diff --git a/config/httpd/vhosts.d/ipfire-interface.conf b/config/httpd/vhosts.d/ipfire-interface.conf index 619f90fcc..58d1b54cd 100644 --- a/config/httpd/vhosts.d/ipfire-interface.conf +++ b/config/httpd/vhosts.d/ipfire-interface.conf @@ -16,6 +16,7 @@ AuthType Basic AuthUserFile /var/ipfire/auth/users Require user admin + Require ssl </DirectoryMatch> ScriptAlias /cgi-bin/ /srv/web/ipfire/cgi-bin/ <Directory /srv/web/ipfire/cgi-bin> @@ -25,6 +26,7 @@ AuthType Basic AuthUserFile /var/ipfire/auth/users Require user admin + Require ssl <Files chpasswd.cgi> Require all granted </Files> @@ -42,6 +44,7 @@ AuthType Basic AuthUserFile /var/ipfire/auth/users Require user dial admin + Require ssl </Directory> Alias /updatecache/ /var/updatecache/ <Directory /var/updatecache>

5 11

[PATCH] wpa_supplicant: Update to 2.6
by Matthias Fischer 22 Sep '17

22 Sep '17

For details see: https://w1.fi/cgit/hostap/plain/wpa_supplicant/ChangeLog Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/wpa_supplicant | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant index 76aa6c673..02e78ea35 100644 --- a/lfs/wpa_supplicant +++ b/lfs/wpa_supplicant @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2017 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.5 +VER = 2.6 THISAPP = wpa_supplicant-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 96ff75c3a514f1f324560a2376f13110 +$(DL_FILE)_MD5 = 091569eb4440b7d7f2b4276dbfc03c3c install : $(TARGET) @@ -51,7 +51,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### -- 2.14.1

1 0

[PATCH] kernel: update to 4.13.3
by Arne Fitzenreiter 21 Sep '17

21 Sep '17

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- kernel/config-arm-generic | 27 +++++++-- kernel/config-arm32-generic | 117 +++++++++++++++++++++--------------- kernel/config-arm64-generic | 47 +++++++++++---- kernel/config-generic | 141 ++++++++++++++++++++++++++++---------------- kernel/config-x86-generic | 53 +++++++++++++---- kernel/kernel.nm | 4 +- 6 files changed, 263 insertions(+), 126 deletions(-) diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic index 130c530..f72679b 100644 --- a/kernel/config-arm-generic +++ b/kernel/config-arm-generic @@ -12,8 +12,6 @@ CONFIG_ARCH_HAS_TICK_BROADCAST=y # # RCU Subsystem # -CONFIG_RCU_NOCB_CPU_NONE=y -# CONFIG_RCU_NOCB_CPU_ALL is not set CONFIG_GENERIC_SCHED_CLOCK=y # CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set @@ -26,6 +24,7 @@ CONFIG_CLONE_BACKWARDS=y # # Platform selection # +# CONFIG_ARCH_ACTIONS is not set # CONFIG_ARCH_ALPINE is not set # CONFIG_ARCH_BCM2835 is not set CONFIG_ARCH_MESON=y @@ -63,6 +62,7 @@ CONFIG_PCI_HOST_GENERIC=y CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_HW_PERF_EVENTS=y CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 +# CONFIG_ARCH_WANTS_THP_SWAP is not set # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set @@ -115,6 +115,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_MAX is not set CONFIG_CMA_ALIGNMENT=8 +CONFIG_GENERIC_ARCH_TOPOLOGY=y # # Bus devices @@ -277,6 +278,8 @@ CONFIG_I2C_SIS630=m # # I2C system bus drivers (mostly embedded / system-on-chip) # +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_MESON=m CONFIG_I2C_VERSATILE=m @@ -299,6 +302,7 @@ CONFIG_GPIO_PL061=y # # USB GPIO expanders # +CONFIG_POWER_RESET_BRCMSTB=y CONFIG_POWER_RESET_VEXPRESS=y # CONFIG_MAX8925_POWER is not set # CONFIG_WM831X_BACKUP is not set @@ -426,6 +430,7 @@ CONFIG_DRM_MALI_DISPLAY=m CONFIG_DRM_DW_HDMI_I2S_AUDIO=m CONFIG_DRM_MESON=m CONFIG_DRM_MESON_DW_HDMI=m +CONFIG_DRM_PL111=m # # Frame buffer Devices @@ -471,6 +476,10 @@ CONFIG_SND_SOC_FSL_ESAI=m CONFIG_SND_SOC_IMX_AUDMUX=m CONFIG_SND_I2S_HI6210_I2S=m # CONFIG_SND_SOC_IMG is not set + +# +# STMicroelectronics STM32 SOC audio support +# CONFIG_ZX_TDM=m CONFIG_SND_SOC_I2C_AND_SPI=m @@ -511,6 +520,7 @@ CONFIG_SND_SOC_CS53L30=m CONFIG_SND_SOC_DIO2125=m CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_ES7134=m +CONFIG_SND_SOC_ES8316=m CONFIG_SND_SOC_ES8328=m CONFIG_SND_SOC_ES8328_I2C=m CONFIG_SND_SOC_GTM601=m @@ -572,6 +582,7 @@ CONFIG_SND_SOC_WM8962=m CONFIG_SND_SOC_WM8974=m CONFIG_SND_SOC_WM8978=m CONFIG_SND_SOC_WM8985=m +CONFIG_SND_SOC_ZX_AUD96P22=m CONFIG_SND_SOC_NAU8540=m CONFIG_SND_SOC_NAU8810=m CONFIG_SND_SOC_NAU8824=m @@ -579,6 +590,8 @@ CONFIG_SND_SOC_TPA6130A2=m CONFIG_SND_SIMPLE_CARD_UTILS=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_SCU_CARD=m +CONFIG_SND_AUDIO_GRAPH_CARD=m +CONFIG_SND_AUDIO_GRAPH_SCU_CARD=m # # USB Physical Layer drivers @@ -643,8 +656,8 @@ CONFIG_COMMON_CLK_AMLOGIC=y # # Clock Source drivers # -CONFIG_CLKSRC_OF=y -CONFIG_CLKSRC_PROBE=y +CONFIG_TIMER_OF=y +CONFIG_TIMER_PROBE=y CONFIG_CLKSRC_MMIO=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y @@ -697,6 +710,7 @@ CONFIG_RESET_MESON=y # PHY Subsystem # CONFIG_PHY_MESON8B_USB2=y +CONFIG_PHY_MESON_GXL_USB2=y # # Performance monitor support @@ -718,6 +732,11 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=m # CONFIG_DEBUG_RODATA_TEST is not set # +# Debug Lockups and Hangs +# +# CONFIG_SOFTLOCKUP_DETECTOR is not set + +# # RCU Debugging # CONFIG_RCU_CPU_STALL_TIMEOUT=21 diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic index 5ec6fcd..88dd345 100644 --- a/kernel/config-arm32-generic +++ b/kernel/config-arm32-generic @@ -359,6 +359,7 @@ CONFIG_PCIE_IPROC_MSI=y CONFIG_PCIE_ALTERA=y # CONFIG_PCIE_ALTERA_MSI is not set # CONFIG_PCIE_ROCKCHIP is not set +# CONFIG_PCIE_MEDIATEK is not set # # PCI switch controller drivers @@ -571,6 +572,7 @@ CONFIG_DWMAC_IPQ806X=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_DWMAC_STI=m CONFIG_DWMAC_SUNXI=m +CONFIG_DWMAC_SUN8I=m CONFIG_TI_DAVINCI_EMAC=m CONFIG_TI_DAVINCI_MDIO=m CONFIG_TI_DAVINCI_CPDMA=m @@ -623,6 +625,11 @@ CONFIG_INPUT_HISI_POWERKEY=m CONFIG_SERIO_SUN4I_PS2=m # +# Character devices +# +CONFIG_DEVKMEM=y + +# # Serial drivers # CONFIG_SERIAL_8250_EM=m @@ -692,7 +699,7 @@ CONFIG_SPMI_MSM_PMIC_ARB=m CONFIG_OMAP_SSI=m # -# PPS support +# HSI clients # CONFIG_PPS=y @@ -707,6 +714,7 @@ CONFIG_PTP_1588_CLOCK_GIANFAR=m # # CONFIG_PINCTRL_AS3722 is not set CONFIG_PINCTRL_AMD=y +# CONFIG_PINCTRL_MCP23S08 is not set CONFIG_PINCTRL_ROCKCHIP=y CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_SIRF=y @@ -738,6 +746,7 @@ CONFIG_PINCTRL_APQ8064=y CONFIG_PINCTRL_APQ8084=y CONFIG_PINCTRL_IPQ4019=y CONFIG_PINCTRL_IPQ8064=y +CONFIG_PINCTRL_IPQ8074=m CONFIG_PINCTRL_MSM8660=m CONFIG_PINCTRL_MSM8960=m CONFIG_PINCTRL_MDM9615=m @@ -749,16 +758,17 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=m CONFIG_PINCTRL_QCOM_SSBI_PMIC=m CONFIG_PINCTRL_SAMSUNG=y CONFIG_PINCTRL_EXYNOS=y +CONFIG_PINCTRL_EXYNOS_ARM=y CONFIG_PINCTRL_EXYNOS5440=y CONFIG_PINCTRL_SUNXI=y CONFIG_PINCTRL_SUN4I_A10=y CONFIG_PINCTRL_SUN5I=y CONFIG_PINCTRL_SUN6I_A31=y CONFIG_PINCTRL_SUN6I_A31_R=y -CONFIG_PINCTRL_SUN7I_A20=y CONFIG_PINCTRL_SUN8I_A23=y CONFIG_PINCTRL_SUN8I_A33=y CONFIG_PINCTRL_SUN8I_A83T=y +CONFIG_PINCTRL_SUN8I_A83T_R=y CONFIG_PINCTRL_SUN8I_A23_R=y CONFIG_PINCTRL_SUN8I_H3=y CONFIG_PINCTRL_SUN8I_H3_R=y @@ -777,7 +787,7 @@ CONFIG_PINCTRL_TEGRA_XUSB=y CONFIG_PINCTRL_TI_IODELAY=m # CONFIG_PINCTRL_WM8850 is not set CONFIG_PINCTRL_MTK=y -CONFIG_PINCTRL_MT7623=y +# CONFIG_PINCTRL_MT2701 is not set CONFIG_PINCTRL_MT8135=y CONFIG_PINCTRL_MT8127=y CONFIG_PINCTRL_MT6397=y @@ -813,7 +823,6 @@ CONFIG_GPIO_TS4900=m # # CONFIG_ROCKCHIP_IODOMAIN is not set CONFIG_POWER_RESET_BRCMKONA=y -CONFIG_POWER_RESET_BRCMSTB=y CONFIG_POWER_RESET_HISI=y CONFIG_POWER_RESET_IMX=y # CONFIG_POWER_RESET_MSM is not set @@ -923,6 +932,7 @@ CONFIG_REGULATOR_88PM8607=y CONFIG_REGULATOR_DBX500_PRCMU=y CONFIG_REGULATOR_DB8500_PRCMU=y CONFIG_REGULATOR_GPIO=y +# CONFIG_REGULATOR_HI6421V530 is not set CONFIG_REGULATOR_HI655X=m CONFIG_REGULATOR_LP872X=y CONFIG_REGULATOR_LP8788=y @@ -965,6 +975,7 @@ CONFIG_VIDEO_STI_DELTA=m CONFIG_VIDEO_STI_DELTA_MJPEG=y CONFIG_VIDEO_STI_DELTA_DRIVER=m # CONFIG_VIDEO_TI_VPE is not set +# CONFIG_VIDEO_QCOM_VENUS is not set CONFIG_DVB_C8SECTPFE=m # @@ -1016,6 +1027,9 @@ CONFIG_ROCKCHIP_INNO_HDMI=y CONFIG_DRM_ARMADA=m CONFIG_DRM_ATMEL_HLCDC=m CONFIG_DRM_SUN4I=m +CONFIG_DRM_SUN4I_HDMI=m +CONFIG_DRM_SUN4I_BACKEND=m +CONFIG_DRM_SUN8I_MIXER=m CONFIG_DRM_OMAP=m CONFIG_OMAP2_DSS_INIT=y CONFIG_OMAP_DSS_BASE=m @@ -1057,6 +1071,7 @@ CONFIG_DRM_MSM_DSI_14NM_PHY=y CONFIG_DRM_FSL_DCU=m CONFIG_DRM_TEGRA=m # CONFIG_DRM_TEGRA_DEBUG is not set +# CONFIG_DRM_STM is not set # # Display Interface Bridges @@ -1064,6 +1079,7 @@ CONFIG_DRM_TEGRA=m CONFIG_DRM_ANALOGIX_DP=m # CONFIG_DRM_STI is not set # CONFIG_DRM_IMX is not set +CONFIG_DRM_VC4=m CONFIG_DRM_ETNAVIV=m # CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set CONFIG_DRM_MEDIATEK=m @@ -1125,6 +1141,7 @@ CONFIG_SND_SOC_STORM=m CONFIG_SND_SOC_APQ8016_SBC=m CONFIG_SND_SOC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP_I2S=m +CONFIG_SND_SOC_ROCKCHIP_PDM=m CONFIG_SND_SOC_ROCKCHIP_SPDIF=m CONFIG_SND_SOC_ROCKCHIP_MAX98090=m CONFIG_SND_SOC_ROCKCHIP_RT5645=m @@ -1269,6 +1286,7 @@ CONFIG_RTC_MC146818_LIB=y # I2C RTC drivers # CONFIG_RTC_DRV_AC100=m +CONFIG_RTC_DRV_BRCMSTB=y # # Platform RTC drivers @@ -1329,11 +1347,11 @@ CONFIG_CHROME_PLATFORMS=y CONFIG_ICST=y CONFIG_COMMON_CLK_HI655X=m # CONFIG_COMMON_CLK_AXI_CLKGEN is not set -CONFIG_COMMON_CLK_KEYSTONE=y CONFIG_CLK_BCM_63XX=y CONFIG_COMMON_CLK_IPROC=y CONFIG_CLK_BCM_NSP=y CONFIG_CLK_BCM_NS2=y +CONFIG_CLK_BCM_SR=y CONFIG_COMMON_CLK_HI3516CV300=y CONFIG_COMMON_CLK_HI3519=y CONFIG_COMMON_CLK_HI3660=y @@ -1341,6 +1359,8 @@ CONFIG_COMMON_CLK_HI3798CV200=y CONFIG_COMMON_CLK_HI6220=y CONFIG_RESET_HISI=y CONFIG_STUB_CLK_HI6220=y +CONFIG_COMMON_CLK_KEYSTONE=y +CONFIG_TI_SCI_CLK=m CONFIG_COMMON_CLK_MEDIATEK=y CONFIG_COMMON_CLK_MT2701=y # CONFIG_COMMON_CLK_MT2701_MMSYS is not set @@ -1361,6 +1381,7 @@ CONFIG_APQ_MMCC_8084=m CONFIG_IPQ_GCC_4019=m CONFIG_IPQ_GCC_806X=m CONFIG_IPQ_LCC_806X=m +CONFIG_IPQ_GCC_8074=m CONFIG_MSM_GCC_8660=m CONFIG_MSM_GCC_8916=m CONFIG_MSM_GCC_8960=m @@ -1376,32 +1397,18 @@ CONFIG_MSM_MMCC_8996=m CONFIG_COMMON_CLK_SAMSUNG=y CONFIG_EXYNOS_AUDSS_CLK_CON=y CONFIG_SUNXI_CCU=y -CONFIG_SUNXI_CCU_DIV=y -CONFIG_SUNXI_CCU_FRAC=y -CONFIG_SUNXI_CCU_GATE=y -CONFIG_SUNXI_CCU_MUX=y -CONFIG_SUNXI_CCU_MULT=y -CONFIG_SUNXI_CCU_PHASE=y -CONFIG_SUNXI_CCU_NK=y -CONFIG_SUNXI_CCU_NKM=y -CONFIG_SUNXI_CCU_NKMP=y -CONFIG_SUNXI_CCU_NM=y -CONFIG_SUNXI_CCU_MP=y CONFIG_SUN5I_CCU=y CONFIG_SUN6I_A31_CCU=y CONFIG_SUN8I_A23_CCU=y CONFIG_SUN8I_A33_CCU=y +CONFIG_SUN8I_A83T_CCU=y CONFIG_SUN8I_H3_CCU=y CONFIG_SUN8I_V3S_CCU=y +CONFIG_SUN8I_DE2_CCU=y CONFIG_SUN9I_A80_CCU=y CONFIG_SUN8I_R_CCU=y CONFIG_TEGRA_CLK_EMC=y CONFIG_COMMON_CLK_TI_ADPLL=m -CONFIG_HWSPINLOCK=m - -# -# Hardware Spinlock drivers -# # CONFIG_HWSPINLOCK_OMAP is not set CONFIG_HWSPINLOCK_QCOM=m CONFIG_HWSPINLOCK_SIRF=m @@ -1440,6 +1447,7 @@ CONFIG_ROCKCHIP_MBOX=y CONFIG_STI_MBOX=m CONFIG_TI_MESSAGE_MANAGER=m CONFIG_HI6220_MBOX=m +# CONFIG_QCOM_APCS_IPC is not set CONFIG_BCM_PDC_MBOX=m # @@ -1461,6 +1469,7 @@ CONFIG_MTK_IOMMU_V1=y CONFIG_REMOTEPROC=m CONFIG_OMAP_REMOTEPROC=m CONFIG_WKUP_M3_RPROC=m +CONFIG_KEYSTONE_REMOTEPROC=m CONFIG_QCOM_ADSP_PIL=m CONFIG_QCOM_RPROC_COMMON=m CONFIG_QCOM_Q6V5_PIL=m @@ -1534,6 +1543,7 @@ CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m # # Extcon Device Drivers # +CONFIG_EXTCON_QCOM_SPMI_MISC=m # CONFIG_TI_AEMIF is not set # CONFIG_TI_EMIF is not set CONFIG_OMAP_GPMC=y @@ -1591,6 +1601,7 @@ CONFIG_IRQ_CROSSBAR=y CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_RESET_BERLIN=y CONFIG_RESET_SUNXI=y +CONFIG_RESET_TI_SCI=m CONFIG_RESET_ZYNQ=y CONFIG_STI_RESET_SYSCFG=y CONFIG_STIH407_RESET=y @@ -1600,41 +1611,42 @@ CONFIG_COMMON_RESET_HI6220=m # # PHY Subsystem # -CONFIG_PHY_BCM_NS_USB2=m -CONFIG_PHY_BCM_NS_USB3=m -CONFIG_PHY_BERLIN_USB=m -CONFIG_PHY_BERLIN_SATA=m -CONFIG_PHY_DM816X_USB=m -CONFIG_PHY_EXYNOS_MIPI_VIDEO=y -CONFIG_PHY_MIPHY28LP=m -CONFIG_OMAP_CONTROL_PHY=m -CONFIG_TWL4030_USB=m -CONFIG_PHY_EXYNOS_DP_VIDEO=y -CONFIG_PHY_EXYNOS5250_SATA=m -CONFIG_PHY_HIX5HD2_SATA=m CONFIG_PHY_MT65XX_USB3=m CONFIG_PHY_SUN4I_USB=m CONFIG_PHY_SUN9I_USB=m -CONFIG_PHY_EXYNOS4210_USB2=y -CONFIG_PHY_EXYNOS4X12_USB2=y -CONFIG_PHY_EXYNOS5250_USB2=y -CONFIG_PHY_EXYNOS5_USBDRD=m -CONFIG_PHY_EXYNOS_PCIE=y +CONFIG_PHY_BCM_NS_USB2=m +CONFIG_PHY_BCM_NS_USB3=m +CONFIG_PHY_NS2_PCIE=y +CONFIG_PHY_NS2_USB_DRD=y +CONFIG_PHY_BRCM_SATA=y +CONFIG_PHY_HIX5HD2_SATA=m +CONFIG_PHY_BERLIN_SATA=m +CONFIG_PHY_BERLIN_USB=m CONFIG_PHY_QCOM_APQ8064_SATA=m CONFIG_PHY_QCOM_IPQ806X_SATA=m -CONFIG_PHY_ROCKCHIP_USB=m -CONFIG_PHY_ROCKCHIP_INNO_USB2=m -CONFIG_PHY_ROCKCHIP_EMMC=m +CONFIG_PHY_QCOM_QMP=m +CONFIG_PHY_QCOM_QUSB2=m +CONFIG_PHY_QCOM_UFS=m CONFIG_PHY_ROCKCHIP_DP=m +CONFIG_PHY_ROCKCHIP_EMMC=m +CONFIG_PHY_ROCKCHIP_INNO_USB2=m CONFIG_PHY_ROCKCHIP_PCIE=m CONFIG_PHY_ROCKCHIP_TYPEC=m +CONFIG_PHY_ROCKCHIP_USB=m +CONFIG_PHY_EXYNOS_DP_VIDEO=y +CONFIG_PHY_EXYNOS_MIPI_VIDEO=y +CONFIG_PHY_EXYNOS_PCIE=y +CONFIG_PHY_EXYNOS4210_USB2=y +CONFIG_PHY_EXYNOS4X12_USB2=y +CONFIG_PHY_EXYNOS5250_USB2=y +CONFIG_PHY_EXYNOS5_USBDRD=m +CONFIG_PHY_EXYNOS5250_SATA=m +CONFIG_PHY_MIPHY28LP=m CONFIG_PHY_STIH407_USB=m -CONFIG_PHY_QCOM_QMP=m -CONFIG_PHY_QCOM_QUSB2=m -CONFIG_PHY_QCOM_UFS=m -CONFIG_PHY_BRCM_SATA=y CONFIG_PHY_TEGRA_XUSB=m -CONFIG_PHY_NS2_PCIE=y +CONFIG_PHY_DM816X_USB=m +CONFIG_OMAP_CONTROL_PHY=m +CONFIG_TWL4030_USB=m # # Android @@ -1654,6 +1666,13 @@ CONFIG_NVMEM_VF610_OCOTP=m # CONFIG_TEE is not set # +# Multiplexer drivers +# +# CONFIG_MUX_ADG792A is not set +# CONFIG_MUX_GPIO is not set +# CONFIG_MUX_MMIO is not set + +# # Firmware Drivers # CONFIG_QCOM_SCM=y @@ -1678,6 +1697,11 @@ CONFIG_PROC_VMCORE=y # CONFIG_DEBUG_HIGHMEM is not set # +# RCU Debugging +# +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y + +# # Runtime Testing # # CONFIG_ARM_PTDUMP is not set @@ -1708,6 +1732,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m CONFIG_CRYPTO_DEV_FSL_CAAM_IMX=y # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m +CONFIG_CRYPTO_DEV_OMAP=m CONFIG_CRYPTO_DEV_OMAP_SHAM=m CONFIG_CRYPTO_DEV_OMAP_AES=m CONFIG_CRYPTO_DEV_OMAP_DES=m diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic index ef5aca3..d256fe6 100644 --- a/kernel/config-arm64-generic +++ b/kernel/config-arm64-generic @@ -11,6 +11,7 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_CSUM=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_ARCH_PROC_KCORE_TEXT=y CONFIG_THREAD_INFO_IN_TASK=y # @@ -29,6 +30,7 @@ CONFIG_SYSCTL_EXCEPTION_TRACE=y # # Kernel Performance Events And Counters # +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_MODULES_USE_ELF_RELA=y CONFIG_ARCH_MMAP_RND_BITS=27 @@ -60,6 +62,7 @@ CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_ARCH_HISI is not set # CONFIG_ARCH_MEDIATEK is not set # CONFIG_ARCH_QCOM is not set +# CONFIG_ARCH_REALTEK is not set # CONFIG_ARCH_ROCKCHIP is not set CONFIG_ARCH_SEATTLE=y # CONFIG_ARCH_STRATIX10 is not set @@ -83,6 +86,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=y # DesignWare PCI Core Support # CONFIG_PCI_HISI=y +# CONFIG_PCIE_KIRIN is not set # # PCI host controller drivers @@ -107,6 +111,7 @@ CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y +CONFIG_CAVIUM_ERRATUM_30115=y CONFIG_QCOM_FALKOR_ERRATUM_1003=y CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_QDF2400_ERRATUM_0065=y @@ -138,8 +143,9 @@ CONFIG_NEED_MULTIPLE_NODES=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_VMEMMAP=y -# CONFIG_MOVABLE_NODE is not set CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +# CONFIG_MEMORY_FAILURE is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_CRASH_DUMP is not set CONFIG_FORCE_MAX_ZONEORDER=11 @@ -165,6 +171,7 @@ CONFIG_ARM64_MODULE_CMODEL_LARGE=y CONFIG_ARM64_MODULE_PLTS=y CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y +CONFIG_RANDOMIZE_MODULE_REGION_FULL=y # # Boot options @@ -203,6 +210,7 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y # # Bus devices # +# CONFIG_BRCMSTB_GISB_ARB is not set CONFIG_OF_NUMA=y CONFIG_PNP=y # CONFIG_PNP_DEBUG_MESSAGES is not set @@ -222,6 +230,7 @@ CONFIG_BLK_DEV_SKD=m # SCSI Transports # CONFIG_SCSI_HISI_SAS=m +CONFIG_SCSI_HISI_SAS_PCI=m # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set CONFIG_ATA_ACPI=y CONFIG_SATA_ZPODD=y @@ -245,6 +254,7 @@ CONFIG_AMD_XGBE=m CONFIG_NET_XGENE=m CONFIG_NET_XGENE_V2=m CONFIG_MACB=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MACB_PCI=m CONFIG_THUNDER_NIC_PF=m CONFIG_THUNDER_NIC_VF=m @@ -283,6 +293,7 @@ CONFIG_SERIAL_8250_PNP=y # Non-8250 serial port support # CONFIG_HVC_DCC=y +CONFIG_IPMI_DMI_DECODE=y CONFIG_HW_RANDOM_XGENE=m CONFIG_HW_RANDOM_CAVIUM=y @@ -314,7 +325,7 @@ CONFIG_I2C_THUNDERX=m CONFIG_I2C_XGENE_SLIMPRO=m # -# PPS support +# HSI clients # CONFIG_PPS=m @@ -328,12 +339,14 @@ CONFIG_PTP_1588_CLOCK=m # CONFIG_PINCTRL_AS3722=m CONFIG_PINCTRL_AMD=m +CONFIG_PINCTRL_MCP23S08=m CONFIG_PINCTRL_SINGLE=m CONFIG_PINCTRL_PALMAS=m CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_CHERRYVIEW=m CONFIG_PINCTRL_INTEL=m CONFIG_PINCTRL_BROXTON=m +CONFIG_PINCTRL_CANNONLAKE=m CONFIG_PINCTRL_GEMINILAKE=m CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_GPIO_ACPI=y @@ -379,6 +392,7 @@ CONFIG_ARM_SBSA_WATCHDOG=m # # CONFIG_REGULATOR_88PM8607 is not set # CONFIG_REGULATOR_GPIO is not set +CONFIG_REGULATOR_HI6421V530=m # CONFIG_REGULATOR_LP872X is not set # CONFIG_REGULATOR_LP8788 is not set # CONFIG_REGULATOR_TWL4030 is not set @@ -415,7 +429,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25 # CONFIG_SND_DESIGNWARE_PCM is not set # -# Common SoC Audio options for Freescale CPUs: +# STMicroelectronics STM32 SOC audio support # # CONFIG_SND_SOC_XTFPGA_I2S is not set @@ -430,11 +444,6 @@ CONFIG_MUSB_PIO_ONLY=y CONFIG_USB_DWC3_PCI=m # -# USB Miscellaneous drivers -# -CONFIG_UCSI=m - -# # MMC/SD/SDIO Host Controller Drivers # CONFIG_MMC_SDHCI_ACPI=m @@ -464,6 +473,7 @@ CONFIG_RTC_DRV_XGENE=m # CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y CONFIG_DMA_ACPI=y +CONFIG_BCM_SBA_RAID=m CONFIG_MV_XOR_V2=y CONFIG_XGENE_DMA=m @@ -486,7 +496,7 @@ CONFIG_COMMON_CLK_GXBB=y # # Clock Source drivers # -CONFIG_CLKSRC_ACPI=y +CONFIG_TIMER_ACPI=y CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y CONFIG_FSL_ERRATUM_A008585=y CONFIG_HISILICON_ERRATUM_161010101=y @@ -508,6 +518,11 @@ CONFIG_ARM_SMMU_V3=y # CONFIG_REMOTEPROC is not set # +# Broadcom SoC drivers +# +# CONFIG_SOC_BRCMSTB is not set + +# # i.MX SoC drivers # # CONFIG_SUNXI_SRAM is not set @@ -533,10 +548,10 @@ CONFIG_DEVFREQ_GOV_PASSIVE=m # # PHY Subsystem # +CONFIG_PHY_XGENE=m # CONFIG_PHY_EXYNOS4210_USB2 is not set # CONFIG_PHY_EXYNOS4X12_USB2 is not set # CONFIG_PHY_EXYNOS5250_USB2 is not set -CONFIG_PHY_XGENE=m # # Performance monitor support @@ -565,6 +580,13 @@ CONFIG_TEE=m CONFIG_OPTEE=m # +# Multiplexer drivers +# +CONFIG_MUX_ADG792A=m +CONFIG_MUX_GPIO=m +CONFIG_MUX_MMIO=m + +# # Firmware Drivers # CONFIG_DMIID=y @@ -677,6 +699,9 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y # Security options # CONFIG_KEYS_COMPAT=y +CONFIG_FORTIFY_SOURCE=y +CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y +CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y # # Random Number Generation @@ -685,6 +710,8 @@ CONFIG_KEYS_COMPAT=y CONFIG_CRYPTO_DEV_CCP=y CONFIG_CRYPTO_DEV_CCP_DD=m CONFIG_CRYPTO_DEV_CCP_CRYPTO=m +CONFIG_CRYPTO_DEV_NITROX=m +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m # CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set # diff --git a/kernel/config-generic b/kernel/config-generic index c151769..876ef6b 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -50,6 +50,7 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y +# CONFIG_GENERIC_IRQ_DEBUGFS is not set CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -64,7 +65,6 @@ CONFIG_NO_HZ_COMMON=y # CONFIG_NO_HZ_IDLE is not set CONFIG_NO_HZ_FULL=y # CONFIG_NO_HZ_FULL_ALL is not set -# CONFIG_NO_HZ_FULL_SYSIDLE is not set CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -92,9 +92,7 @@ CONFIG_TREE_SRCU=y CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_CONTEXT_TRACKING=y -# CONFIG_TREE_RCU_TRACE is not set CONFIG_RCU_NOCB_CPU=y -# CONFIG_RCU_NOCB_CPU_ZERO is not set # CONFIG_BUILD_BIN2C is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=18 @@ -184,6 +182,7 @@ CONFIG_VM_EVENT_COUNTERS=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set +CONFIG_SLAB_MERGE_DEFAULT=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_SYSTEM_DATA_VERIFICATION is not set @@ -216,11 +215,14 @@ CONFIG_GCC_PLUGINS=y CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y CONFIG_GCC_PLUGIN_STRUCTLEAK=y # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set +CONFIG_GCC_PLUGIN_RANDSTRUCT=y +CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE=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_THIN_ARCHIVES=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -234,6 +236,7 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y +CONFIG_REFCOUNT_FULL=y # # GCOV-based kernel profiling @@ -363,6 +366,7 @@ CONFIG_ZPOOL=m CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_IDLE_PAGE_TRACKING=y CONFIG_FRAME_VECTOR=y +# CONFIG_PERCPU_STATS is not set CONFIG_SECCOMP=y # CONFIG_HZ_250 is not set # CONFIG_HZ_1000 is not set @@ -496,6 +500,7 @@ CONFIG_PACKET=y CONFIG_PACKET_DIAG=y CONFIG_UNIX=y CONFIG_UNIX_DIAG=m +CONFIG_TLS=m CONFIG_XFRM=y CONFIG_XFRM_OFFLOAD=y CONFIG_XFRM_ALGO=y @@ -929,10 +934,10 @@ CONFIG_NET_DSA=y CONFIG_NET_DSA_TAG_BRCM=y CONFIG_NET_DSA_TAG_DSA=y CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_LAN9303=y +CONFIG_NET_DSA_TAG_MTK=y CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_NET_DSA_TAG_QCA=y -CONFIG_NET_DSA_TAG_MTK=y -CONFIG_NET_DSA_TAG_LAN9303=y CONFIG_VLAN_8021Q=y CONFIG_VLAN_8021Q_GVRP=y # CONFIG_VLAN_8021Q_MVRP is not set @@ -1095,7 +1100,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_BCM=y @@ -1200,6 +1204,7 @@ CONFIG_DMA_SHARED_BUFFER=y # # Bus devices # +# CONFIG_SIMPLE_PM_BUS is not set CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y # CONFIG_MTD is not set @@ -1234,7 +1239,6 @@ CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK_SCSI=y # CONFIG_BLK_DEV_RBD is not set CONFIG_NVME_CORE=m -CONFIG_BLK_DEV_NVME_SCSI=y CONFIG_NVME_FABRICS=m CONFIG_NVME_FC=m CONFIG_NVME_TARGET=m @@ -1321,6 +1325,7 @@ CONFIG_ALTERA_STAPL=m # CONFIG_ECHO is not set # CONFIG_CXL_BASE is not set # CONFIG_CXL_AFU_DRIVER_OPS is not set +# CONFIG_CXL_LIB is not set # # SCSI device support @@ -1635,17 +1640,18 @@ CONFIG_ATM_TCP=m # # Distributed Switch Architecture drivers # -CONFIG_NET_DSA_MV88E6060=y -CONFIG_NET_DSA_BCM_SF2=m CONFIG_B53=m CONFIG_B53_MDIO_DRIVER=m CONFIG_B53_MMAP_DRIVER=m CONFIG_B53_SRAB_DRIVER=m +CONFIG_NET_DSA_BCM_SF2=m +CONFIG_NET_DSA_LOOP=m +CONFIG_NET_DSA_MT7530=m +CONFIG_NET_DSA_MV88E6060=y +# CONFIG_MICROCHIP_KSZ is not set CONFIG_NET_DSA_MV88E6XXX=y CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y CONFIG_NET_DSA_QCA8K=m -CONFIG_NET_DSA_LOOP=m -CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m @@ -1760,6 +1766,7 @@ CONFIG_MLXSW_SWITCHIB=m CONFIG_MLXSW_SWITCHX2=m CONFIG_MLXSW_SPECTRUM=m CONFIG_MLXSW_MINIMAL=m +CONFIG_MLXFW=m CONFIG_NET_VENDOR_MICREL=y # CONFIG_KS8842 is not set # CONFIG_KS8851_MLL is not set @@ -1772,6 +1779,7 @@ CONFIG_NATSEMI=m CONFIG_NS83820=m CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NFP=m +# CONFIG_NFP_APP_FLOWER is not set # CONFIG_NFP_DEBUG is not set CONFIG_NET_VENDOR_8390=y CONFIG_NE2K_PCI=m @@ -1854,6 +1862,7 @@ CONFIG_DWC_XLGMAC_PCI=m # CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_BUS=y CONFIG_MDIO_BCM_UNIMAC=m CONFIG_MDIO_BITBANG=m CONFIG_MDIO_BUS_MUX_GPIO=m @@ -1875,6 +1884,7 @@ CONFIG_BCM87XX_PHY=m CONFIG_BCM_NET_PHYLIB=m CONFIG_BROADCOM_PHY=m CONFIG_CICADA_PHY=m +CONFIG_CORTINA_PHY=m CONFIG_DAVICOM_PHY=m CONFIG_DP83848_PHY=m CONFIG_DP83867_PHY=m @@ -1884,6 +1894,7 @@ CONFIG_INTEL_XWAY_PHY=m CONFIG_LSI_ET1011C_PHY=m CONFIG_LXT_PHY=m CONFIG_MARVELL_PHY=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MICREL_PHY=m CONFIG_MICROCHIP_PHY=m CONFIG_MICROSEMI_PHY=m @@ -1989,6 +2000,7 @@ CONFIG_WIL6210_ISR_COR=y CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m CONFIG_ATH10K_AHB=y +CONFIG_ATH10K_SDIO=m # CONFIG_ATH10K_DEBUG is not set # CONFIG_ATH10K_DEBUGFS is not set # CONFIG_ATH10K_TRACING is not set @@ -2156,6 +2168,9 @@ CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set +CONFIG_WLAN_VENDOR_QUANTENNA=y +CONFIG_QTNFMAC=m +CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_MAC80211_HWSIM=m CONFIG_USB_NET_RNDIS_WLAN=m @@ -2285,6 +2300,7 @@ CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_QT1070 is not set # CONFIG_KEYBOARD_QT2160 is not set +# CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_GPIO_POLLED=m @@ -2419,7 +2435,6 @@ CONFIG_N_HDLC=m CONFIG_N_GSM=m # CONFIG_TRACE_SINK is not set # CONFIG_DEVMEM is not set -CONFIG_DEVKMEM=y # # Serial drivers @@ -2436,6 +2451,7 @@ CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_ASPEED_VUART=m CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set CONFIG_SERIAL_8250_RSA=y @@ -2491,6 +2507,7 @@ CONFIG_I2C_MUX=y # Multiplexer I2C Chip support # CONFIG_I2C_MUX_GPIO=m +CONFIG_I2C_MUX_GPMUX=m CONFIG_I2C_MUX_LTC4306=m CONFIG_I2C_MUX_PCA9541=m CONFIG_I2C_MUX_PCA954x=m @@ -2528,8 +2545,7 @@ CONFIG_I2C_VIAPRO=m # I2C system bus drivers (mostly embedded / system-on-chip) # CONFIG_I2C_CBUS_GPIO=m -CONFIG_I2C_DESIGNWARE_CORE=m -CONFIG_I2C_DESIGNWARE_PLATFORM=m +# CONFIG_I2C_DESIGNWARE_SLAVE is not set # CONFIG_I2C_DESIGNWARE_PCI is not set CONFIG_I2C_EMEV2=m # CONFIG_I2C_GPIO is not set @@ -2573,10 +2589,6 @@ CONFIG_HSI_BOARDINFO=y # HSI clients # CONFIG_HSI_CHAR=m - -# -# PPS support -# # CONFIG_PPS_DEBUG is not set # @@ -2676,11 +2688,6 @@ CONFIG_GPIO_PCI_IDIO_16=m # CONFIG_GPIO_RDC321X is not set # -# SPI or I2C GPIO expanders -# -CONFIG_GPIO_MCP23S08=m - -# # USB GPIO expanders # CONFIG_GPIO_VIPERBOARD=m @@ -2719,6 +2726,7 @@ CONFIG_AXP288_FUEL_GAUGE=m # CONFIG_CHARGER_LP8727 is not set # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_MANAGER is not set +# CONFIG_CHARGER_LTC3651 is not set CONFIG_CHARGER_MAX14577=m CONFIG_CHARGER_DETECTOR_MAX14656=m CONFIG_CHARGER_MAX77693=m @@ -2824,6 +2832,7 @@ CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_ADM1275=m +# CONFIG_SENSORS_IR35221 is not set CONFIG_SENSORS_LM25066=m # CONFIG_SENSORS_LTC2978 is not set CONFIG_SENSORS_LTC3815=m @@ -2915,6 +2924,7 @@ CONFIG_GENERIC_ADC_THERMAL=m CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_NOWAYOUT=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y CONFIG_WATCHDOG_SYSFS=y # @@ -3017,7 +3027,6 @@ CONFIG_MFD_HI6421_PMIC=m # CONFIG_HTC_PASIC3 is not set CONFIG_HTC_I2CPLD=y CONFIG_LPC_SCH=m -CONFIG_INTEL_SOC_PMIC=y # CONFIG_MFD_JANZ_CMODIO is not set CONFIG_MFD_KEMPLD=m CONFIG_MFD_88PM800=m @@ -3069,6 +3078,7 @@ CONFIG_MFD_TPS65086=m CONFIG_MFD_TPS65090=y # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TI_LP873X is not set +# CONFIG_MFD_TI_LP87565 is not set CONFIG_MFD_TPS65218=m CONFIG_MFD_TPS6586X=y CONFIG_MFD_TPS65910=y @@ -3191,6 +3201,7 @@ CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_TUNER=m CONFIG_V4L2_MEM2MEM_DEV=m CONFIG_V4L2_FLASH_LED_CLASS=m +CONFIG_V4L2_FWNODE=m CONFIG_VIDEOBUF_GEN=m CONFIG_VIDEOBUF_VMALLOC=m CONFIG_VIDEOBUF_DVB=m @@ -3431,6 +3442,7 @@ CONFIG_DVB_PT3=m CONFIG_DVB_SMIPCIE=m CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_VIDEO_CAFE_CCIC is not set +# CONFIG_VIDEO_MUX is not set CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_PLATFORM=m # CONFIG_VIDEO_XILINX is not set @@ -3440,6 +3452,7 @@ CONFIG_VIDEO_SH_VEU=m # CONFIG_V4L_TEST_DRIVERS is not set CONFIG_DVB_PLATFORM_DRIVERS=y # CONFIG_CEC_PLATFORM_DRIVERS is not set +# CONFIG_SDR_PLATFORM_DRIVERS is not set # # Supported MMC/SDIO adapters @@ -3514,6 +3527,10 @@ CONFIG_VIDEO_MT9V011=m # # +# SDR tuner chips +# + +# # Miscellaneous helper chips # @@ -3751,6 +3768,7 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_LVDS=m CONFIG_DRM_PANEL_SIMPLE=m +CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m CONFIG_DRM_PANEL_JDI_LT070ME05000=m CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m @@ -3758,6 +3776,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m CONFIG_DRM_BRIDGE=y +CONFIG_DRM_PANEL_BRIDGE=y # # Display Interface Bridges @@ -3897,19 +3916,16 @@ CONFIG_SND_PCM=m CONFIG_SND_PCM_ELD=y CONFIG_SND_PCM_IEC958=y CONFIG_SND_HWDEP=m +CONFIG_SND_SEQ_DEVICE=m CONFIG_SND_RAWMIDI=m CONFIG_SND_JACK=y CONFIG_SND_JACK_INPUT_DEV=y -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_TIMER=y -CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_HRTIMER=m -CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_MAX_CARDS=32 # CONFIG_SND_SUPPORT_OLD_API is not set @@ -3918,13 +3934,18 @@ CONFIG_SND_VERBOSE_PROCFS=y CONFIG_SND_VERBOSE_PRINTK=y # CONFIG_SND_DEBUG is not set CONFIG_SND_VMASTER=y -CONFIG_SND_RAWMIDI_SEQ=m -CONFIG_SND_OPL3_LIB_SEQ=m -# CONFIG_SND_OPL4_LIB_SEQ is not set -# CONFIG_SND_SBAWE_SEQ is not set -CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_SEQUENCER_OSS=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_SEQ_MIDI_EVENT=m +CONFIG_SND_SEQ_MIDI=m +CONFIG_SND_SEQ_MIDI_EMUL=m +CONFIG_SND_SEQ_VIRMIDI=m CONFIG_SND_MPU401_UART=m CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL3_LIB_SEQ=m +# CONFIG_SND_OPL4_LIB_SEQ is not set CONFIG_SND_VX_LIB=m CONFIG_SND_AC97_CODEC=m CONFIG_SND_DRIVERS=y @@ -3971,6 +3992,7 @@ CONFIG_SND_INDIGODJ=m CONFIG_SND_INDIGOIOX=m CONFIG_SND_INDIGODJX=m CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1_SEQ=m CONFIG_SND_EMU10K1X=m CONFIG_SND_ENS1370=m CONFIG_SND_ENS1371=m @@ -4039,6 +4061,7 @@ CONFIG_SND_BCD2000=m # CONFIG_SND_USB_PODHD is not set # CONFIG_SND_USB_TONEPORT is not set # CONFIG_SND_USB_VARIAX is not set +CONFIG_SND_SYNTH_EMUX=m CONFIG_AC97_BUS=m # @@ -4084,6 +4107,7 @@ CONFIG_HID_KYE=y # CONFIG_HID_WALTOP is not set CONFIG_HID_GYRATION=m # CONFIG_HID_ICADE is not set +CONFIG_HID_ITE=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=y CONFIG_HID_LCPOWER=m @@ -4115,6 +4139,7 @@ CONFIG_HID_PICOLCD_LEDS=y CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PLANTRONICS=m # CONFIG_HID_PRIMAX is not set +CONFIG_HID_RETRODE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m @@ -4387,6 +4412,7 @@ CONFIG_USB_ISP1301=m # # USB Power Delivery and Type-C drivers # +# CONFIG_TYPEC_UCSI is not set CONFIG_USB_LED_TRIG=y CONFIG_USB_ULPI_BUS=m # CONFIG_UWB is not set @@ -4397,7 +4423,6 @@ CONFIG_PWRSEQ_SD8787=m CONFIG_PWRSEQ_SIMPLE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set @@ -4521,6 +4546,7 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0" CONFIG_RTC_SYSTOHC=y CONFIG_RTC_SYSTOHC_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set +CONFIG_RTC_NVMEM=y # # RTC interfaces @@ -4589,6 +4615,7 @@ CONFIG_RTC_I2C_AND_SPI=y # SPI and I2C RTC drivers # CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_DS3232_HWMON=y CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_RV3029C2=m CONFIG_RTC_DRV_RV3029_HWMON=y @@ -4627,6 +4654,7 @@ CONFIG_RTC_DRV_ZYNQMP=m # # on-CPU RTC drivers # +CONFIG_RTC_DRV_FTRTC010=m CONFIG_RTC_DRV_SNVS=m CONFIG_RTC_DRV_MT6397=m CONFIG_RTC_DRV_R7301=m @@ -4707,10 +4735,7 @@ CONFIG_COMMON_CLK_PALMAS=m # CONFIG_COMMON_CLK_PXA is not set # CONFIG_COMMON_CLK_PIC32 is not set CONFIG_COMMON_CLK_VC5=m - -# -# Hardware Spinlock drivers -# +CONFIG_HWSPINLOCK=m # # Clock Source drivers @@ -4740,6 +4765,7 @@ CONFIG_OF_IOMMU=y # # Rpmsg drivers # +# CONFIG_RPMSG_QCOM_GLINK_RPM is not set # # SOC (System On Chip) specific Drivers @@ -4753,7 +4779,6 @@ CONFIG_OF_IOMMU=y # i.MX SoC drivers # CONFIG_SOC_TI=y -# CONFIG_SOC_ZTE is not set CONFIG_PM_DEVFREQ=y # @@ -4767,7 +4792,7 @@ CONFIG_DEVFREQ_GOV_USERSPACE=m # DEVFREQ Drivers # CONFIG_PM_DEVFREQ_EVENT=y -CONFIG_EXTCON=m +CONFIG_EXTCON=y # # Extcon Device Drivers @@ -4781,7 +4806,6 @@ CONFIG_EXTCON_MAX77693=m CONFIG_EXTCON_MAX77843=m CONFIG_EXTCON_MAX8997=m CONFIG_EXTCON_PALMAS=m -CONFIG_EXTCON_QCOM_SPMI_MISC=m CONFIG_EXTCON_RT8973A=m CONFIG_EXTCON_SM5502=m CONFIG_EXTCON_USB_GPIO=m @@ -4964,6 +4988,7 @@ CONFIG_CM32181=m # CONFIG_CM36651 is not set # CONFIG_GP2AP020A00F is not set # CONFIG_SENSORS_ISL29018 is not set +# CONFIG_SENSORS_ISL29028 is not set # CONFIG_ISL29125 is not set # CONFIG_HID_SENSOR_ALS is not set # CONFIG_HID_SENSOR_PROX is not set @@ -5000,6 +5025,11 @@ CONFIG_CM32181=m # CONFIG_SENSORS_HMC5843_I2C is not set # +# Multiplexers +# +# CONFIG_IIO_MUX is not set + +# # Inclinometer sensors # CONFIG_HID_SENSOR_INCLINOMETER_3D=m @@ -5070,12 +5100,13 @@ CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y # CONFIG_RESET_ATH79 is not set +# CONFIG_RESET_GEMINI is not set # CONFIG_RESET_IMX7 is not set # CONFIG_RESET_LPC18XX is not set # CONFIG_RESET_PISTACHIO is not set # CONFIG_RESET_SOCFPGA is not set # CONFIG_RESET_STM32 is not set -# CONFIG_TI_SYSCON_RESET is not set +CONFIG_RESET_TI_SYSCON=m # CONFIG_RESET_TEGRA_BPMP is not set # CONFIG_FMC is not set @@ -5083,12 +5114,13 @@ CONFIG_RESET_CONTROLLER=y # PHY Subsystem # CONFIG_GENERIC_PHY=y +CONFIG_BCM_KONA_USB2_PHY=m CONFIG_PHY_PXA_28NM_HSIC=m CONFIG_PHY_PXA_28NM_USB2=m -CONFIG_BCM_KONA_USB2_PHY=m -CONFIG_PHY_SAMSUNG_USB2=m +CONFIG_PHY_CPCAP_USB=m CONFIG_PHY_QCOM_USB_HS=m CONFIG_PHY_QCOM_USB_HSIC=m +CONFIG_PHY_SAMSUNG_USB2=m CONFIG_PHY_TUSB1210=m # CONFIG_POWERCAP is not set # CONFIG_MCB is not set @@ -5103,7 +5135,7 @@ CONFIG_RAS=y # # CONFIG_ANDROID is not set CONFIG_DAX=y -CONFIG_NVMEM=m +CONFIG_NVMEM=y # CONFIG_STM is not set CONFIG_INTEL_TH=m CONFIG_INTEL_TH_PCI=m @@ -5121,6 +5153,11 @@ CONFIG_INTEL_TH_PTI=m # FSI support # # CONFIG_FSI is not set +CONFIG_MULTIPLEXER=m + +# +# Multiplexer drivers +# # # Firmware Drivers @@ -5189,6 +5226,7 @@ CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set +# CONFIG_OVERLAY_FS_INDEX is not set # # Caches @@ -5315,7 +5353,6 @@ CONFIG_CIFS_POSIX=y CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG is not set CONFIG_CIFS_DFS_UPCALL=y -CONFIG_CIFS_SMB2=y CONFIG_CIFS_SMB311=y CONFIG_CIFS_FSCACHE=y # CONFIG_NCP_FS is not set @@ -5434,9 +5471,6 @@ CONFIG_DEBUG_SHIRQ=y # # Debug Lockups and Hangs # -CONFIG_LOCKUP_DETECTOR=y -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 # CONFIG_DETECT_HUNG_TASK is not set # CONFIG_WQ_WATCHDOG is not set # CONFIG_PANIC_ON_OOPS is not set @@ -5463,6 +5497,7 @@ CONFIG_SCHED_STACK_END_CHECK=y # CONFIG_LOCK_TORTURE_TEST is not set # CONFIG_WW_MUTEX_SELFTEST is not set CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_LIST=y @@ -5475,7 +5510,6 @@ CONFIG_DEBUG_LIST=y # RCU Debugging # # CONFIG_PROVE_RCU is not set -# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_TORTURE_TEST is not set # CONFIG_RCU_PERF_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set @@ -5523,7 +5557,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_TRACEPOINT_BENCHMARK is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set -# CONFIG_TRACE_ENUM_MAP_FILE is not set +# CONFIG_TRACE_EVAL_MAP_FILE is not set CONFIG_TRACING_EVENTS_GPIO=y # @@ -5552,10 +5586,12 @@ CONFIG_ASYNC_RAID6_TEST=m # CONFIG_TEST_USER_COPY is not set # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set # CONFIG_MEMTEST is not set # CONFIG_TEST_STATIC_KEYS is not set # CONFIG_BUG_ON_DATA_CORRUPTION is not set +# CONFIG_TEST_KMOD is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set @@ -5783,6 +5819,7 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_BIT is not set +CONFIG_CRC4=m CONFIG_CRC7=m CONFIG_LIBCRC32C=y CONFIG_CRC8=m @@ -5791,7 +5828,7 @@ CONFIG_842_COMPRESS=m CONFIG_842_DECOMPRESS=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y -CONFIG_LZO_COMPRESS=y +CONFIG_LZO_COMPRESS=m CONFIG_LZO_DECOMPRESS=y CONFIG_LZ4_COMPRESS=m CONFIG_LZ4HC_COMPRESS=m diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic index 1ed2ee2..d715536 100644 --- a/kernel/config-x86-generic +++ b/kernel/config-x86-generic @@ -38,7 +38,9 @@ CONFIG_KERNEL_XZ=y # # IRQ subsystem # +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_GENERIC_IRQ_MIGRATION=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y @@ -48,8 +50,6 @@ CONFIG_GENERIC_CMOS_UPDATE=y # RCU Subsystem # CONFIG_CONTEXT_TRACKING_FORCE=y -# CONFIG_RCU_NOCB_CPU_NONE is not set -CONFIG_RCU_NOCB_CPU_ALL=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_ARCH_SUPPORTS_INT128=y @@ -65,6 +65,7 @@ CONFIG_PCSPKR_PLATFORM=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y @@ -151,6 +152,7 @@ CONFIG_X86_MCE=y CONFIG_X86_MCE_INTEL=y CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y # @@ -191,7 +193,6 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y -# CONFIG_MOVABLE_NODE is not set # CONFIG_MEMORY_HOTPLUG is not set CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_PHYS_ADDR_T_64BIT=y @@ -203,8 +204,11 @@ CONFIG_MEMORY_FAILURE=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_ARCH_WANTS_THP_SWAP=y +CONFIG_THP_SWAP=y CONFIG_TRANSPARENT_HUGE_PAGECACHE=y CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y +CONFIG_ARCH_HAS_ZONE_DEVICE=y CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y CONFIG_ARCH_HAS_PKEYS=y CONFIG_X86_PMEM_LEGACY_DEVICE=y @@ -341,6 +345,7 @@ CONFIG_PCI_BUS_ADDR_T_64BIT=y CONFIG_PCI_STUB=y CONFIG_HT_IRQ=y CONFIG_PCI_ATS=y +CONFIG_PCI_LOCKLESS_CONFIG=y CONFIG_PCI_IOV=y CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y @@ -552,6 +557,7 @@ CONFIG_AMD_XGBE=m CONFIG_AMD_XGBE_HAVE_ECC=y CONFIG_AQTION=m CONFIG_MACB=m +CONFIG_MACB_USE_HWSTAMP=y CONFIG_MACB_PCI=m CONFIG_BNX2X_SRIOV=y CONFIG_BNXT_SRIOV=y @@ -654,6 +660,7 @@ CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYNCLINK_GT=m CONFIG_NOZOMI=m +CONFIG_DEVKMEM=y # # Serial drivers @@ -677,6 +684,7 @@ CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m +CONFIG_IPMI_DMI_DECODE=y CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_VIA=m @@ -717,6 +725,8 @@ CONFIG_I2C_SCMI=m # # I2C system bus drivers (mostly embedded / system-on-chip) # +CONFIG_I2C_DESIGNWARE_CORE=y +CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_DESIGNWARE_BAYTRAIL=y # @@ -730,7 +740,7 @@ CONFIG_I2C_PARPORT=m CONFIG_I2C_MLXCPLD=m # -# PPS support +# HSI clients # CONFIG_PPS=m @@ -754,12 +764,14 @@ CONFIG_PTP_1588_CLOCK_KVM=m # # CONFIG_PINCTRL_AS3722 is not set CONFIG_PINCTRL_AMD=y +CONFIG_PINCTRL_MCP23S08=m CONFIG_PINCTRL_SINGLE=m CONFIG_PINCTRL_PALMAS=y # CONFIG_PINCTRL_BAYTRAIL is not set CONFIG_PINCTRL_CHERRYVIEW=m CONFIG_PINCTRL_INTEL=m CONFIG_PINCTRL_BROXTON=m +CONFIG_PINCTRL_CANNONLAKE=m CONFIG_PINCTRL_GEMINILAKE=m CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_GPIO_ACPI=y @@ -901,7 +913,9 @@ CONFIG_WDTPCI=m CONFIG_MFD_ATMEL_HLCDC=m CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m CONFIG_LPC_ICH=m +CONFIG_INTEL_SOC_PMIC=y CONFIG_INTEL_SOC_PMIC_BXTWC=m +CONFIG_INTEL_SOC_PMIC_CHTWC=m CONFIG_MFD_INTEL_LPSS=m CONFIG_MFD_INTEL_LPSS_ACPI=m CONFIG_MFD_INTEL_LPSS_PCI=m @@ -917,6 +931,7 @@ CONFIG_REGULATOR_VIRTUAL_CONSUMER=m CONFIG_REGULATOR_USERSPACE_CONSUMER=m CONFIG_REGULATOR_88PM8607=m CONFIG_REGULATOR_GPIO=m +CONFIG_REGULATOR_HI6421V530=m CONFIG_REGULATOR_LP872X=m CONFIG_REGULATOR_LP8788=m CONFIG_REGULATOR_TWL4030=m @@ -1093,6 +1108,7 @@ CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_I915_WERROR is not set # CONFIG_DRM_I915_DEBUG is not set # CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set +# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set # CONFIG_DRM_I915_SELFTEST is not set # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set @@ -1177,11 +1193,6 @@ CONFIG_USB_USS720=m CONFIG_USB_SERIAL_MOS7715_PARPORT=y # -# USB Miscellaneous drivers -# -CONFIG_UCSI=m - -# # MMC/SD/SDIO Host Controller Drivers # CONFIG_MMC_RICOH_MMC=y @@ -1282,7 +1293,6 @@ CONFIG_DELL_WMI_LED=m CONFIG_DELL_SMO8800=m # CONFIG_DELL_RBTN is not set CONFIG_FUJITSU_LAPTOP=m -# CONFIG_FUJITSU_LAPTOP_DEBUG is not set # CONFIG_FUJITSU_TABLET is not set CONFIG_AMILO_RFKILL=m CONFIG_HP_ACCEL=m @@ -1309,7 +1319,9 @@ CONFIG_ASUS_NB_WMI=m CONFIG_EEEPC_WMI=m CONFIG_ASUS_WIRELESS=m CONFIG_ACPI_WMI=m +CONFIG_WMI_BMOF=m CONFIG_MSI_WMI=m +CONFIG_PEAQ_WMI=m CONFIG_TOPSTAR_LAPTOP=m CONFIG_ACPI_TOSHIBA=m CONFIG_TOSHIBA_BT_RFKILL=m @@ -1317,6 +1329,7 @@ CONFIG_TOSHIBA_HAPS=m CONFIG_TOSHIBA_WMI=m CONFIG_ACPI_CMPC=m CONFIG_INTEL_CHT_INT33FE=m +CONFIG_INTEL_INT0002_VGPIO=m CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_VBTN=m CONFIG_INTEL_IPS=m @@ -1391,6 +1404,7 @@ CONFIG_DEVFREQ_GOV_PASSIVE=m # Extcon Device Drivers # # CONFIG_EXTCON_INTEL_INT3496 is not set +CONFIG_EXTCON_INTEL_CHT_WC=m # # Analog to digital converters @@ -1422,7 +1436,6 @@ CONFIG_TWL6030_GPADC=m # # Performance monitor support # -# CONFIG_MCE_AMD_INJ is not set # CONFIG_RAS_CEC is not set CONFIG_THUNDERBOLT=m @@ -1438,6 +1451,13 @@ CONFIG_BTT=y # CONFIG_DEV_DAX is not set # +# Multiplexer drivers +# +# CONFIG_MUX_ADG792A is not set +# CONFIG_MUX_GPIO is not set +# CONFIG_MUX_MMIO is not set + +# # Firmware Drivers # CONFIG_EDD=m @@ -1487,7 +1507,6 @@ CONFIG_EFIVAR_FS=m # # Compile-time checks and compiler options # -CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y CONFIG_STACK_VALIDATION=y @@ -1504,9 +1523,15 @@ CONFIG_ARCH_HAS_KCOV=y # # Debug Lockups and Hangs # +CONFIG_LOCKUP_DETECTOR=y +CONFIG_SOFTLOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR_PERF=y +CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y CONFIG_HARDLOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 # # RCU Debugging @@ -1559,6 +1584,7 @@ CONFIG_OPTIMIZE_INLINING=y # CONFIG_KEYS_COMPAT=y CONFIG_INTEL_TXT=y +CONFIG_FORTIFY_SOURCE=y # # Crypto core or helper @@ -1626,6 +1652,8 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m CONFIG_CRYPTO_DEV_QAT_C62XVF=m +CONFIG_CRYPTO_DEV_NITROX=m +CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m # # Certificates for signature checking @@ -1651,4 +1679,5 @@ CONFIG_RADIX_TREE_MULTIORDER=y CONFIG_HAS_IOPORT_MAP=y CONFIG_UCS2_STRING=y CONFIG_ARCH_HAS_PMEM_API=y +CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y CONFIG_ARCH_HAS_MMIO_FLUSH=y diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 257e9c4..11f7fab 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -4,7 +4,7 @@ ############################################################################### name = kernel -version = 4.12.11 +version = 4.13.3 release = 1 thisapp = linux-%{version} @@ -105,7 +105,7 @@ build sed -e "/^COLORIZE_PLUGIN_CFLAGS/d" \ -i Makefile - sed -e "s/^HOSTCFLAGS.*=.*/& -fPIC/g" -i Makefile + sed -e "s/\$(HOST_LFS_CFLAGS)/& -fPIC/g" -i Makefile cp -vf %{kernel_logo} \ drivers/video/logo/logo_linux_clut224.ppm -- 2.6.3

1 0

[PATCH] proxy.cgi: Some cosmetics for the absolutely lazy ones (V2)
by Matthias Fischer 20 Sep '17

20 Sep '17

Added clickable links for 'URL filter' and 'Update accelerator' for faster access, this time without the need to alter the language-files. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/proxy.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 0b7d36c3c..dd83bba73 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -1054,11 +1054,11 @@ if ( -e "/usr/bin/squidclamav" ) { } else { print "<td></td>"; } -print "<td class='base'>".$Lang::tr{'advproxy url filter'}." "; +print "<td class='base'><a href='/cgi-bin/urlfilter.cgi'>".$Lang::tr{'advproxy url filter'}."</a> "; print $Lang::tr{'advproxy enabled'}."<input type='checkbox' name='ENABLE_FILTER' ".$checked{'ENABLE_FILTER'}{'on'}." /> "; print "+ ".int(($count**(1/3)) * 6); print "</td>"; -print "<td class='base'>".$Lang::tr{'advproxy update accelerator'}." "; +print "<td class='base'><a href='/cgi-bin/updatexlrator.cgi'>".$Lang::tr{'advproxy update accelerator'}."</a> "; print $Lang::tr{'advproxy enabled'}."<input type='checkbox' name='ENABLE_UPDXLRATOR' ".$checked{'ENABLE_UPDXLRATOR'}{'on'}." /> "; print "+ ".int(($count**(1/3)) * 5); print "</td></tr>"; -- 2.14.1

1 0

[PATCH] proxy.cgi: Some cosmetics for the absolutely lazy ones... ; -)
by Matthias Fischer 20 Sep '17

20 Sep '17

Added clickable links for 'URL filter' and 'Update accelerator' for faster access. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/proxy.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 0b7d36c3c..1a5985d17 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -1054,11 +1054,11 @@ if ( -e "/usr/bin/squidclamav" ) { } else { print "<td></td>"; } -print "<td class='base'>".$Lang::tr{'advproxy url filter'}." "; +print "<td class='base'>".$Lang::tr{'advproxy url filter link'}." "; print $Lang::tr{'advproxy enabled'}."<input type='checkbox' name='ENABLE_FILTER' ".$checked{'ENABLE_FILTER'}{'on'}." /> "; print "+ ".int(($count**(1/3)) * 6); print "</td>"; -print "<td class='base'>".$Lang::tr{'advproxy update accelerator'}." "; +print "<td class='base'>".$Lang::tr{'advproxy update accelerator link'}." "; print $Lang::tr{'advproxy enabled'}."<input type='checkbox' name='ENABLE_UPDXLRATOR' ".$checked{'ENABLE_UPDXLRATOR'}{'on'}." /> "; print "+ ".int(($count**(1/3)) * 5); print "</td></tr>"; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 7bc1c495d..45e45aa2e 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -327,12 +327,14 @@ 'advproxy unrestricted ip clients' => 'Uneingeschränkte IP-Adressen (eine pro Zeile)', 'advproxy unrestricted mac clients' => 'Uneingeschränkte MAC-Adressen (eine pro Zeile)', 'advproxy update accelerator' => 'Update-Accelerator', +'advproxy update accelerator link' => '<a href="/cgi-bin/updatexlrator.cgi">Update-Accelerator</a>', 'advproxy update notification' => 'Update-Benachrichtigung!', 'advproxy upstream password' => 'Proxy-Passwort', 'advproxy upstream proxy' => 'Vorgelagerter Proxy', 'advproxy upstream proxy host:port' => 'Vorgelagerter Proxy (Host:Port)', 'advproxy upstream username' => 'Proxy-Benutzername', 'advproxy url filter' => 'URL-Filter', +'advproxy url filter link' => '<a href="/cgi-bin/urlfilter.cgi">URL-Filter</a>', 'advproxy username forwarding' => ' Benutzernamen weiterleiten', 'advproxy via forwarding' => 'Proxy-Adresse weiterleiten', 'advproxy visible hostname' => 'Sichtbarer Hostname', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 9732a6e9d..adebbf4b4 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -327,6 +327,7 @@ 'advproxy unrestricted ip clients' => 'Unrestricted IP addresses (one per line)', 'advproxy unrestricted mac clients' => 'Unrestricted MAC addresses (one per line)', 'advproxy update accelerator' => 'Update accelerator', +'advproxy update accelerator link' => '<a href="/cgi-bin/updatexlrator.cgi">Update accelerator</a>', 'advproxy update information' => 'There is an updated version available for download. Visit <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> for more information.', 'advproxy update notification' => 'Update notification!', 'advproxy upstream password' => 'Upstream password', @@ -334,6 +335,7 @@ 'advproxy upstream proxy host:port' => 'Upstream proxy (host:port)', 'advproxy upstream username' => 'Upstream username', 'advproxy url filter' => 'URL filter', +'advproxy url filter link' => '<a href="/cgi-bin/urlfilter.cgi">URL filter</a>', 'advproxy username forwarding' => 'Username forwarding', 'advproxy via forwarding' => 'Proxy address forwarding', 'advproxy visible hostname' => 'Visible hostname', -- 2.14.1

2 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development September 2017