packages: merge upstream

2025-01-05 09:26:51 +08:00 · 2021-06-15 17:47:11 +08:00 · 2021-06-15 17:47:11 +08:00 · 49b7495639
commit 49b7495639
parent 95bfd01f74
2106 changed files with 58763 additions and 42060 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,128 +1,218 @@
-# Contributing Guidelines  
+# Contributing Guidelines
+
 Ref: <https://openwrt.org/docs/guide-developer/packages> for overall format and construction

+## Basic guidelines

-### Basic guidelines
+All packages you commit or submit by pull-request should follow these simple
+guidelines:

-All packages you commit or submit by pull-request should follow these simple guidelines:
+- Package a version which is still maintained by the upstream author and will
+  be updated regularly with supported versions.
+- Have no dependencies outside the OpenWrt core packages or this repository
+  feed.
+- Have been tested to compile with the correct includes and dependencies.
+  Please also test with "Compile with full language support" found under
+  "General Build Settings" set if language support is relevant to your package.
+- Best of all -- it works as expected!

-* Package a version which is still maintained by the upstream author and will be updated regularly with supported versions.
-* Have no dependencies outside the OpenWrt core packages or this repository feed.
-* Have been tested to compile with the correct includes and dependencies. Please also test with "Compile with full language support" found under "General Build Settings" set if language support is relevant to your package.
-* Best of all -- it works as expected!
+## Package Sources (archives and repositories)

-### Package Sources (archives and repositories)
+- PKG_SOURCE should reference the smallest available archive. In order of
+  preference: xz (most compressed), bzip2, gz and zip. As a last resort,
+  downloads from source repositories can be used.
+- PKG_SOURCE_URL should link to an official release archive. Use of HTTPS&#x3A;
+  is preferred. If a source archive is not available, a locally generated
+  archive fetched using git, svn, cvs or in rare circumstances, hg or bzr.
+- Convenience macros for popular mirrors are defined. Using these macros will
+  make your package downloads more robust by mapping to a list of possible
+  source mirrors for archive availability.
+  - @SF - Sourceforge (downloads.sourceforge.net) with 5 retries due to
+    re-directs
+  - @GITHUB - Github (raw.githubusercontent.com) with 5 retries due to
+    re-directs
+  - @GNU - 8 regional servers
+  - @GNOME - 8 regional servers
+  - @SAVANNAH - 8 regional servers
+  - @APACHE - 8 regional servers
+  - @KERNEL - Linux kernel archives & mirrors
+- Please _DO NOT_ use an archive which changes over time. A version labeled
+  "latest" is not constant each download. Also, using the head of a branch will
+  create unpredictable results which can be different each build.

-* PKG_SOURCE should reference the smallest available archive. In order of preference: xz (most compressed), bzip2, gz and zip. As a last resort, downloads from source repositories can be used.
-* PKG_SOURCE_URL should link to an official release archive. Use of HTTPS: is preferred. If a source archive is not available, a locally generated archive fetched using git, svn, cvs or in rare circumstances, hg or bzr.
-* Convenience macros for popular mirrors are defined. Using these macros will make your package downloads more robust by mapping to a list of possible source mirrors for archive availability.
-    - @SF - Sourceforge (downloads.sourceforge.net) with 5 retries due to re-directs
-    - @GITHUB - Github (raw.githubusercontent.com) with 5 retries due to re-directs
-    - @GNU - 8 regional servers
-    - @GNOME - 8 regional servers
-    - @SAVANNAH - 8 regional servers
-    - @APACHE - 8 regional servers
-    - @KERNEL - Linux kernel archives & mirrors
-* Please *DO NOT* use an archive which changes over time. A version labeled "latest" is not constant each download. Also, using the head of a branch will create unpredictable results which can be different each build.
+### Makefile contents should contain

-#### Makefile contents should contain:
+- Provide an up-to-date Copyright notice or **none**. Copyright should not be
+  assigned to OpenWrt unless you are explicitly requested by or working under
+  contract to OpenWrt. Assigning a Copyright to yourself or organization you
+  represent is acceptable.
+- A (PKG\_)MAINTAINER definition listing either yourself and/or another person
+  responsible for this package (E.g.: PKG_MAINTAINER:= Joe D. Hacker
+  `<jdh@jdhs-email-provider.org`>). Listing multiple maintainers is encouraged in
+  order to keep the package active and up-to-date. Leaving this blank will also
+  be accepted, however the review process may not be as quick as one with a
+  maintainer.
+- A PKG_LICENSE tag declaring the main license of the package.  (E.g.:
+  PKG_LICENSE:=GPL-2.0-or-later) Please use SPDX identifiers if possible (see
+  list at the bottom).
+- An optional PKG_LICENSE_FILES tag including the filenames of the
+  license-files in the source-package.  (E.g.: PKG_LICENSE_FILES:=COPYING)
+- PKG_RELEASE should be initially set to 1 or reset to 1 if the software
+  version is changed. You should increment it if the package itself has
+  changed. For example, modifying a support script, changing configure options
+  like --disable_ or --enable\_ switches, or if you changed something in the
+  package which causes the resulting binaries to be different. Changes like
+  correcting md5sums, changing mirror URLs, adding a maintainer field or updating
+  a comment or copyright year in a Makefile do not require a change to
+  PKG_RELEASE.
+- Avoid reuse of PKG_NAME in call, define and eval lines to improve
+  readability.

-* Provide an up-to-date Copyright notice or **none**. Copyright should not be assigned to OpenWrt unless you are explicitly requested by or working under contract to OpenWrt. Assigning a Copyright to yourself or organization you represent is acceptable.
-* A (PKG_)MAINTAINER definition listing either yourself and/or another person responsible for this package (E.g.: PKG_MAINTAINER:= Joe D. Hacker `<jdh@jdhs-email-provider.org`>). Listing multiple maintainers is encouraged in order to keep the package active and up-to-date. Leaving this blank will also be accepted, however the review process may not be as quick as one with a maintainer.
-* A PKG_LICENSE tag declaring the main license of the package.
-    (E.g.: PKG_LICENSE:=GPL-2.0-or-later) Please use SPDX identifiers if possible (see list at the bottom).
-* An optional PKG_LICENSE_FILES tag including the filenames of the license-files in the source-package.
-    (E.g.: PKG_LICENSE_FILES:=COPYING)
-* PKG_RELEASE should be initially set to 1 or reset to 1 if the software version is changed. You should increment it if the package itself has changed. For example, modifying a support script, changing configure options like --disable* or --enable* switches, or if you changed something in the package which causes the resulting binaries to be different. Changes like correcting md5sums, changing mirror URLs, adding a maintainer field or updating a comment or copyright year in a Makefile do not require a change to PKG_RELEASE.
-* Avoid reuse of PKG_NAME in call, define and eval lines to improve readability.
+### Commits in your pull-requests should

+- Have a useful description prefixed with the package name (E.g.: "foopkg: Add
+  libzot dependency")
+- Include Signed-off-by tag in the commit comments.  See: [Sign your
+  work](https://openwrt.org/submitting-patches#sign_your_work)

-#### Commits in your pull-requests should:
+## Advice on pull requests

-* Have a useful description prefixed with the package name
-    (E.g.: "foopkg: Add libzot dependency")
-* Include Signed-off-by tag in the commit comments.
-    See: [Sign your work](https://openwrt.org/submitting-patches#sign_your_work)
+Pull requests are the easiest way to contribute changes to git repos at Github.
+They are the preferred contribution method, as they offer a nice way for
+commenting and amending the proposed changes.

-### Advice on pull requests:
+- You need a local "fork" of the Github repo.

-Pull requests are the easiest way to contribute changes to git repos at Github. They are the preferred contribution method, as they offer a nice way for commenting and amending the proposed changes.
-
-* You need a local "fork" of the Github repo.
-* Use a "feature branch" for your changes. That separates the changes in the pull request from your other changes and makes it easy to edit/amend commits in the pull request. Workflow using "feature_x" as the example:
+- Use a "feature branch" for your changes. That separates the changes in the
+  pull request from your other changes and makes it easy to edit/amend commits
+  in the pull request. Workflow using "feature_x" as the example:
  - Update your local git fork to the tip (of the master, usually)
  - Create the feature branch with `git checkout -b feature_x`
  - Edit changes and commit them locally
-  - Push them to your Github fork by `git push -u origin feature_x`. That creates the "feature_x" branch at your Github fork and sets it as the remote of this branch
-  - When you now visit Github, you should see a proposal to create a pull request
+  - Push them to your Github fork by `git push -u origin feature_x`. That
+    creates the "feature_x" branch at your Github fork and sets it as the
+    remote of this branch
+  - When you now visit Github, you should see a proposal to create a pull
+    request

-* If you later need to add new commits to the pull request, you can simply commit the changes to the local branch and then use `git push` to automatically update the pull request.
+- If you later need to add new commits to the pull request, you can simply
+  commit the changes to the local branch and then use `git push` to
+  automatically update the pull request.

-* If you need to change something in the existing pull request (e.g. to add a missing signed-off-by line to the commit message), you can use `git push -f` to overwrite the original commits. That is easy and safe when using a feature branch. Example workflow:
+- If you need to change something in the existing pull request (e.g. to add a
+  missing signed-off-by line to the commit message), you can use `git push -f`
+  to overwrite the original commits. That is easy and safe when using a feature
+  branch. Example workflow:
  - Checkout the feature branch by `git checkout feature_x`
-  - Edit changes and commit them locally. If you are just updating the commit message in the last commit, you can use `git commit --amend` to do that
-  - If you added several new commits or made other changes that require cleaning up, you can use `git rebase -i HEAD~X` (X = number of commits to edit) to possibly squash some commits
-  - Push the changed commits to Github with `git push -f` to overwrite the original commits in the "feature_x" branch with the new ones. The pull request gets automatically updated
+  - Edit changes and commit them locally. If you are just updating the commit
+    message in the last commit, you can use `git commit --amend` to do that
+  - If you added several new commits or made other changes that require
+    cleaning up, you can use `git rebase -i HEAD~X` (X = number of commits to
+    edit) to possibly squash some commits
+  - Push the changed commits to Github with `git push -f` to overwrite the
+    original commits in the "feature_x" branch with the new ones. The pull
+    request gets automatically updated

-### If you have commit access:
+## If you have commit access

-* Do NOT use git push --force.
-* Do NOT commit to other maintainer's packages without their consent.
-* Use Pull Requests if you are unsure and to suggest changes to other maintainers.
+- Do NOT use git push --force.
+- Do NOT commit to other maintainer's packages without their consent.
+- Use Pull Requests if you are unsure and to suggest changes to other
+  maintainers.

-#### Gaining commit access:
+### Gaining commit access

-* We will gladly grant commit access to responsible contributors who have made
+- We will gladly grant commit access to responsible contributors who have made
  useful pull requests and / or feedback or patches to this repository or
-  OpenWrt in general. Please include your request for commit access in your
-  next pull request or ticket.
+  OpenWrt in general. Please include your request for commit access in your next
+  pull request or ticket.

-### Release Branches:
+## Release Branches

-* Branches named "for-XX.YY" (e.g. for-14.07) are release branches.
-* These branches are built with the respective OpenWrt release and are created
+- Old stable branches were named after the following pattern "for-XX.YY" (e.g.
+  for-14.07) before the LEDE split.  During the LEDE split there was only one
+  release branch with the name "lede-17.01".  After merging the LEDE fork with
+  OpenWrt the release branches are named according to the following pattern
+  "openwrt-XX.YY" (e.g. openwrt-18.06).
+- These branches are built with the respective OpenWrt release and are created
  during the release stabilisation phase.
-* Please ONLY cherry-pick or commit security and bug-fixes to these branches.
-* Do NOT add new packages and do NOT do major upgrades of packages here.
-* If you are unsure if your change is suitable, please use a pull request.
+- Please ONLY cherry-pick or commit security and bug-fixes to these branches.
+- Do NOT add new packages and do NOT do major upgrades of packages here.
+- If you are unsure if your change is suitable, please use a pull request.
+
+## Common LICENSE tags (short list)

-### Common LICENSE tags (short list)  
 (Complete list can be found at: <https://spdx.org/licenses>)

-| Full Name | Identifier  |
-|---|:---|
-|Apache License 1.0|Apache-1.0|
-|Apache License 1.1|Apache-1.1|
-|Apache License 2.0|Apache-2.0|
-|Artistic License 1.0|Artistic-1.0|
-|Artistic License 1.0 w/clause 8|Artistic-1.0-cl8|
-|Artistic License 1.0 (Perl)|Artistic-1.0-Perl|
-|Artistic License 2.0|Artistic-2.0|
-|BSD 2-Clause "Simplified" License|BSD-2-Clause|
-|BSD 2-Clause FreeBSD License|BSD-2-Clause-FreeBSD|
-|BSD 2-Clause NetBSD License|BSD-2-Clause-NetBSD|
-|BSD 3-Clause "New" or "Revised" License|BSD-3-Clause|
-|BSD with attribution|BSD-3-Clause-Attribution|
-|BSD 3-Clause Clear License|BSD-3-Clause-Clear|
-|BSD 4-Clause "Original" or "Old" License|BSD-4-Clause|
-|BSD-4-Clause (University of California-Specific)|BSD-4-Clause-UC|
-|BSD Protection License|BSD-Protection|
-|GNU General Public License v1.0 only|GPL-1.0-only|
-|GNU General Public License v1.0 or later|GPL-1.0-or-later|
-|GNU General Public License v2.0 only|GPL-2.0-only|
-|GNU General Public License v2.0 or later|GPL-2.0-or-later|
-|GNU General Public License v3.0 only|GPL-3.0-only|
-|GNU General Public License v3.0 or later|GPL-3.0-or-later|
-|GNU Lesser General Public License v2.1 only|LGPL-2.1-only|
-|GNU Lesser General Public License v2.1 or later|LGPL-2.1-or-later|
-|GNU Lesser General Public License v3.0 only|LGPL-3.0-only|
-|GNU Lesser General Public License v3.0 or later|LGPL-3.0-or-later|
-|GNU Library General Public License v2 only|LGPL-2.0-only|
-|GNU Library General Public License v2 or later|LGPL-2.0-or-later|
-|Fair License|Fair|
-|ISC License|ISC|
-|MIT License|MIT|
-|No Limit Public License|NLPL|
-|OpenSSL License|OpenSSL|
-|X11 License|X11|
-|zlib License|Zlib|
+| Full Name                                        | Identifier               |
+| ------------------------------------------------ | :----------------------- |
+| Apache License 1.0                               | Apache-1.0               |
+| Apache License 1.1                               | Apache-1.1               |
+| Apache License 2.0                               | Apache-2.0               |
+| Artistic License 1.0                             | Artistic-1.0             |
+| Artistic License 1.0 w/clause 8                  | Artistic-1.0-cl8         |
+| Artistic License 1.0 (Perl)                      | Artistic-1.0-Perl        |
+| Artistic License 2.0                             | Artistic-2.0             |
+| BSD 2-Clause "Simplified" License                | BSD-2-Clause             |
+| BSD 2-Clause FreeBSD License                     | BSD-2-Clause-FreeBSD     |
+| BSD 2-Clause NetBSD License                      | BSD-2-Clause-NetBSD      |
+| BSD 3-Clause "New" or "Revised" License          | BSD-3-Clause             |
+| BSD with attribution                             | BSD-3-Clause-Attribution |
+| BSD 3-Clause Clear License                       | BSD-3-Clause-Clear       |
+| BSD 4-Clause "Original" or "Old" License         | BSD-4-Clause             |
+| BSD-4-Clause (University of California-Specific) | BSD-4-Clause-UC          |
+| BSD Protection License                           | BSD-Protection           |
+| GNU General Public License v1.0 only             | GPL-1.0-only             |
+| GNU General Public License v1.0 or later         | GPL-1.0-or-later         |
+| GNU General Public License v2.0 only             | GPL-2.0-only             |
+| GNU General Public License v2.0 or later         | GPL-2.0-or-later         |
+| GNU General Public License v3.0 only             | GPL-3.0-only             |
+| GNU General Public License v3.0 or later         | GPL-3.0-or-later         |
+| GNU Lesser General Public License v2.1 only      | LGPL-2.1-only            |
+| GNU Lesser General Public License v2.1 or later  | LGPL-2.1-or-later        |
+| GNU Lesser General Public License v3.0 only      | LGPL-3.0-only            |
+| GNU Lesser General Public License v3.0 or later  | LGPL-3.0-or-later        |
+| GNU Library General Public License v2 only       | LGPL-2.0-only            |
+| GNU Library General Public License v2 or later   | LGPL-2.0-or-later        |
+| Fair License                                     | Fair                     |
+| ISC License                                      | ISC                      |
+| MIT License                                      | MIT                      |
+| No Limit Public License                          | NLPL                     |
+| OpenSSL License                                  | OpenSSL                  |
+| X11 License                                      | X11                      |
+| zlib License                                     | Zlib                     |
+
+## Continuous Integration
+
+To simplify review and require less human resources, a CI tests all packages.
+Passing CI tests are not a hard requirement but a good indicator what the
+Buildbots will think about the proposed patch.
+
+The CI builds modified packages for multiple architectures using the latest
+snapshot SDK. For supported architectures (`aarch64_generic`,
+`arm_cortex-a15_neon-vfpv4`, `i386_pentium4` and `x86_64`) an additional
+runtime test is executed. A running OpenWrt is simulated which tries to install
+created packages and runs a script called `test.sh` located next to the package
+Makefile. The script is executed with the two arguments `PKG_NAME` and
+`PKG_VERSION`. The `PKG_NAME` can be used to distinguish package variants, e.g.
+`foobar` vs. `foobar-full`. The `PKG_VERSION` can be used for a trivial test
+checking if `foobar --version` prints the correct version. `PKG_VERSION` is the
+OpenWrt version and therefore includes the `PKG_RELEASE`, which isn't usually
+part of the running programs version.
+
+The following snippet show a script that tests different binaries, depending
+what IPK package was installed. The `gpsd` Makefile produces both a `gpsd` and
+a `gpsd-clients` IPK package.
+
+```shell
+ #!/bin/sh
+
+case "$1" in
+    "gpsd")
+        gpsd -V 2>&1 | grep "$2"
+        ;;
+    "gpsd-clients")
+        cgps -V 2>&1 | grep "$2"
+        ;;
+esac
+```
--- a/admin/atop/Makefile
+++ b/admin/atop/Makefile
@ -7,13 +7,15 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=atop
 PKG_RELEASE:=1
-PKG_VERSION:=2.5.0
-PKG_LICENSE:=GPL-2.0-or-later
-PKG_SOURCE_URL:=https://www.atoptool.nl/download/
-PKG_HASH:=4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33
+PKG_VERSION:=2.6.0

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://www.atoptool.nl/download/
+PKG_HASH:=9ec2ca3a571692f7efaa095f99a5106432bcb71cc22cd6c49597ef0481058f72
+
 PKG_MAINTAINER:=Toni Uhlig <matzeton@googlemail.com>
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_LICENSE_FILES:=COPYING

 include $(INCLUDE_DIR)/package.mk

@ -23,7 +25,6 @@ define Package/atop
  TITLE:=System and process monitor for Linux
  DEPENDS:=+zlib +libncurses
  URL:=https://www.atoptool.nl/
-  MAINTAINER:=Toni Uhlig <matzeton@googlemail.com>
 endef

 define Package/atop/description
--- a/admin/atop/patches/010-makefile-missing-cflags.patch
+++ b/admin/atop/patches/010-makefile-missing-cflags.patch
@ -1,22 +1,11 @@
-diff --git a/Makefile b/Makefile
-index 3bf5929..e065577 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -32,7 +32,7 @@ VERS     = $(shell ./atop -V 2>/dev/null| sed -e 's/^[^ ]* //' -e 's/ .*//')
- all: 		atop atopsar atopacctd atopconvert
+@@ -33,7 +33,7 @@ VERS     = $(shell ./atop -V 2>/dev/null
+ all: 		atop atopsar atopacctd atopconvert atopcat
 
 atop:		atop.o    $(ALLMODS) Makefile
-		$(CC) -c version.c
-+		$(CC) $(CFLAGS) -c version.c
- 		$(CC) atop.o $(ALLMODS) -o atop -lncurses -lz -lm -lrt $(LDFLAGS)
+-		$(CC) atop.o $(ALLMODS) -o atop -lncursesw -lz -lm -lrt $(LDFLAGS)
+		$(CC) $(CFLAGS) atop.o $(ALLMODS) -o atop -lncursesw -lz -lm -lrt $(LDFLAGS)
 
 atopsar:	atop
-@@ -45,7 +45,7 @@ atopconvert:	atopconvert.o
- 		$(CC) atopconvert.o -o atopconvert -lz $(LDFLAGS)
- 
- netlink.o:	netlink.c
-		$(CC) -I. -Wall -c netlink.c
-+		$(CC) $(CFLAGS) -I. -Wall -c netlink.c
- 
- clean:
- 		rm -f *.o atop atopacctd atopconvert
+ 		ln -sf atop atopsar
--- a/admin/atop/patches/020-limits.patch
+++ b/admin/atop/patches/020-limits.patch
@ -0,0 +1,10 @@
+--- a/photosyst.c
+++ b/photosyst.c
+@@ -149,6 +149,7 @@
+ **
+ */
+ 
+#include <limits.h>
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <string.h>
--- a/admin/backuppc/Makefile
+++ b/admin/backuppc/Makefile
@ -54,7 +54,8 @@ define Package/backuppc/install
 	    --bin-path smbclient=/usr/sbin/smbclient --bin-path nmblookup=/usr/sbin/nmblookup \
 	    --bin-path rsync=/usr/bin/rsync --bin-path ping=/usr/bin/ping --bin-path df=/bin/df \
 	    --bin-path ssh=/usr/bin/ssh --bin-path gzip=/bin/gzip \
-	    --bin-path sendmail=/usr/sbin/sendmail --bin-path bzip2=/usr/bin/bzip2
+	    --bin-path sendmail=/usr/sbin/sendmail --bin-path bzip2=/usr/bin/bzip2 \
+	    --bin-path par2=
 	$(INSTALL_DIR) $(strip $(1))/usr/share/backuppc/conf
 	chmod 755 $(strip $(1))/data
 	mv $(strip $(1))/data/backuppc/conf/config.pl $(strip $(1))/usr/share/backuppc/conf/config.pl
--- a/admin/backuppc/patches/001-debian-fixes.patch
+++ b/admin/backuppc/patches/001-debian-fixes.patch
@ -1,6 +1,6 @@
--- a/bin/BackupPC_archive	2017-01-26 02:31:24.000000000 +0100
-+++ b/bin/BackupPC_archive	2018-04-05 21:11:14.428000000 +0200
-@@ -299,7 +299,7 @@
+--- a/bin/BackupPC_archive
+++ b/bin/BackupPC_archive
+@@ -299,7 +299,7 @@ sub ArchiveCleanup
     if ( $NeedPostCmd ) {
         UserCommandRun("ArchivePostUserCmd");
         if ( $? && $Conf{UserCmdCheckStatus} ) {
@ -9,9 +9,9 @@
             $stat{xferOK} = 0;
         }
     }
--- a/bin/BackupPC_dump	2017-01-26 02:31:24.000000000 +0100
-+++ b/bin/BackupPC_dump	2018-04-05 21:12:23.640000000 +0200
-@@ -1067,7 +1067,7 @@
+--- a/bin/BackupPC_dump
+++ b/bin/BackupPC_dump
+@@ -1067,7 +1067,7 @@ sub catch_signal
 	    # Send ALRMs to BackupPC_tarExtract if we are using it
 	    #
 	    if ( $tarPid > 0 ) {
@ -20,9 +20,9 @@
 	    }
 
 	    #
--- a/configure.pl	2017-01-26 02:31:24.000000000 +0100
-+++ b/configure.pl	2018-04-05 21:39:24.668000000 +0200
-@@ -333,7 +333,10 @@
+--- a/configure.pl
+++ b/configure.pl
+@@ -333,7 +333,10 @@ while ( 1 ) {
                                  $Conf{BackupPCUser} || "backuppc",
                                  "backuppc-user");
     if ( $opts{"set-perms"} ) {
@ -34,7 +34,7 @@
         last if ( $name ne "" );
         print <<EOF;
 
-@@ -800,6 +803,7 @@
+@@ -800,6 +803,7 @@ $Conf{ParPath} = '' if ( $Conf{ParPath}
 #
 # Figure out sensible arguments for the ping command
 #
@ -42,9 +42,9 @@
 if ( defined($Conf{PingArgs}) ) {
     $Conf{PingCmd} = '$pingPath ' . $Conf{PingArgs};
 } elsif ( !defined($Conf{PingCmd}) ) {
--- a/lib/BackupPC/CGI/View.pm	2017-01-26 02:31:24.000000000 +0100
-+++ b/lib/BackupPC/CGI/View.pm	2018-04-05 21:46:22.664000000 +0200
-@@ -46,7 +46,7 @@
+--- a/lib/BackupPC/CGI/View.pm
+++ b/lib/BackupPC/CGI/View.pm
+@@ -46,7 +46,7 @@ sub action
     my $compress = 0;
     my $fh;
     my $host = $In{host};
@ -53,7 +53,7 @@
     my $type = $In{type};
     my $linkHosts = 0;
     my($file, $comment);
-@@ -136,6 +136,10 @@
+@@ -136,6 +136,10 @@ sub action
 		    }
 		    $s =~ s/[\n\r]+//g;
 		    if ( $s =~ /smb: \\>/
@ -64,9 +64,9 @@
 			    || $s =~ /^\s*(\d+) \(\s*\d+\.\d kb\/s\) (.*)$/
 			    || $s =~ /^tar: dumped \d+ files/
 			    || $s =~ /^\s*added interface/i
--- a/lib/BackupPC/Lib.pm	2017-01-26 02:31:24.000000000 +0100
-+++ b/lib/BackupPC/Lib.pm	2018-04-05 21:48:38.048000000 +0200
-@@ -512,7 +512,8 @@
+--- a/lib/BackupPC/Lib.pm
+++ b/lib/BackupPC/Lib.pm
+@@ -512,7 +512,8 @@ sub dirRead
     }
     if ( $IODirentOk ) {
         @entries = sort({ $a->{inode} <=> $b->{inode} } readdirent($fh));
@ -76,9 +76,9 @@
     } else {
         @entries = map { { name => $_} } readdir($fh);
     }
--- a/lib/BackupPC/Xfer/Smb.pm	2017-01-26 02:31:24.000000000 +0100
-+++ b/lib/BackupPC/Xfer/Smb.pm	2018-04-05 21:57:16.616000000 +0200
-@@ -219,7 +219,7 @@
+--- a/lib/BackupPC/Xfer/Smb.pm
+++ b/lib/BackupPC/Xfer/Smb.pm
+@@ -219,7 +219,7 @@ sub readOutput
         #
         # MAKSYM 14082016: The next regex will never match on Samba-4.3, as
         # smbclient doesn't produce output required; keeping it for older Sambas
@ -87,7 +87,7 @@
             my $sambaFileSize = $1;
             my $pcFileName    = $2;
             (my $fileName = $pcFileName) =~ s/\\/\//g;
-@@ -281,6 +281,9 @@
+@@ -281,6 +281,9 @@ sub readOutput
         } elsif ( /smb: \\>/
                 || /^\s*tar:\d+/ # MAKSYM 14082016: ignoring 2 more Samba-4.3 specific lines
                 || /^\s*WARNING:/i
--- a/admin/debian-archive-keyring/Makefile
+++ b/admin/debian-archive-keyring/Makefile
@ -0,0 +1,42 @@
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=debian-archive-keyring
+PKG_VERSION:=2021.1.1
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE:=debian-archive-keyring_2021.1.1_all.deb
+PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/d/debian-archive-keyring/
+PKG_HASH:=56beca470dcd9b6d7e6c3c9e9d702101e01e9467e62810a8c357bd7b9c26251d
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+PKG_LICENSE:=Unique
+PKG_LICENSE_FILES:=usr/share/doc/debian-archive-keyring/copyright
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/debian-archive-keyring
+  SECTION:=admin
+  CATEGORY:=Administration
+  TITLE:=Debian Archive keyring
+  URL:=https://salsa.debian.org/release-team/debian-archive-keyring
+  PKGARCH:=all
+endef
+
+define Build/Prepare
+	$(AR) p $(DL_DIR)/$(PKG_SOURCE) data.tar.xz | $(TAR) -xJC $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/debian-archive-keyring/install
+	$(INSTALL_DIR) $(1)/usr/share/keyrings
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/usr/share/keyrings/*.gpg $(1)/usr/share/keyrings
+endef
+
+$(eval $(call BuildPackage,debian-archive-keyring))
--- a/admin/debootstrap/Makefile
+++ b/admin/debootstrap/Makefile
@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=debootstrap
-PKG_VERSION:=1.0.119~bpo10+1
+PKG_VERSION:=1.0.123
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_VERSION)_all.udeb
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/d/debootstrap
-PKG_HASH:=b48aeb76533f233ac45c8b5ddd452550b3998e67e32dba4137f320a1a7b3519e
+PKG_HASH:=df537297f212a7ffab3bb033065a466887e552a579d4f7115f2d042a86ba811f

 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=Unique
--- a/admin/gkrellmd/patches/100-conf.patch
+++ b/admin/gkrellmd/patches/100-conf.patch
@ -1,7 +1,5 @@
-Index: gkrellm-2.3.10/server/gkrellmd.conf
-===================================================================
--- gkrellm-2.3.10.orig/server/gkrellmd.conf	2008-03-09 10:19:26.000000000 +0100
-+++ gkrellm-2.3.10/server/gkrellmd.conf	2008-03-09 10:19:26.000000000 +0100
+--- a/server/gkrellmd.conf
+++ b/server/gkrellmd.conf
@@ -4,7 +4,7 @@
 # the client update frequency.  Values may be from 1 to 10 and should be
 # smaller values to reduce network traffic.
@ -31,5 +29,5 @@ Index: gkrellm-2.3.10/server/gkrellmd.conf
 -#detach
 +detach
 
- # Time interval between checks for various monitors.  If nfs-interval
- # is <= 0 then gkrellmd will not read data for nfs file system types.
+ # Enable writing logging message to the system syslog file
+ # NOTE: On windows this enables logging to the windows event log
--- a/admin/ipmitool/Makefile
+++ b/admin/ipmitool/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=ipmitool
 PKG_VERSION:=1.8.18
-PKG_RELEASE:=4
+PKG_RELEASE:=5

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
@ -39,9 +39,6 @@ define Package/ipmitool/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ipmitool $(1)/usr/sbin/
 endef

-define Package/ipmitool/conffiles
-endef
-
 CONFIGURE_ARGS += \
 	--enable-intf-lan \
 	--enable-intf-lanplus \
--- a/admin/ipmitool/patches/0001-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch
+++ b/admin/ipmitool/patches/0001-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch
@ -11,11 +11,9 @@ Fixes: ID:461
 src/plugins/lanplus/lanplus_crypt_impl.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

-diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
-index d5fac37..3c0df23 100644
 --- a/src/plugins/lanplus/lanplus_crypt_impl.c
 +++ b/src/plugins/lanplus/lanplus_crypt_impl.c
-@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
 							uint8_t       * output,
 							uint32_t        * bytes_written)
 {
@ -30,7 +28,7 @@ index d5fac37..3c0df23 100644
 	
 
 	*bytes_written = 0;
-@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
 
 
@ -39,7 +37,7 @@ index d5fac37..3c0df23 100644
 	{
 		/* Error */
 		*bytes_written = 0;
-@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
 	{
 		uint32_t tmplen;
 
@ -48,7 +46,7 @@ index d5fac37..3c0df23 100644
 		{
 			*bytes_written = 0;
 			return; /* Error */
-@@ -210,7 +210,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -210,7 +210,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
 		{
 			/* Success */
 			*bytes_written += tmplen;
@ -57,7 +55,7 @@ index d5fac37..3c0df23 100644
 		}
 	}
 }
-@@ -239,10 +239,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -239,10 +239,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
 							uint8_t       * output,
 							uint32_t        * bytes_written)
 {
@ -72,7 +70,7 @@ index d5fac37..3c0df23 100644
 
 
 	if (verbose >= 5)
-@@ -266,7 +266,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -266,7 +266,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
 
 
@ -81,7 +79,7 @@ index d5fac37..3c0df23 100644
 	{
 		/* Error */
 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
-@@ -277,7 +277,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -277,7 +277,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
 	{
 		uint32_t tmplen;
 
@ -90,7 +88,7 @@ index d5fac37..3c0df23 100644
 		{
 			char buffer[1000];
 			ERR_error_string(ERR_get_error(), buffer);
-@@ -290,7 +290,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -290,7 +290,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
 		{
 			/* Success */
 			*bytes_written += tmplen;
@ -99,6 +97,3 @@ index d5fac37..3c0df23 100644
 		}
 	}
 
-- 
-2.16.1
-
--- a/admin/ipmitool/patches/0002-ID-461-Make-compiler-happier-about-changes-related-t.patch
+++ b/admin/ipmitool/patches/0002-ID-461-Make-compiler-happier-about-changes-related-t.patch
@ -9,11 +9,9 @@ Complaint was that ctx isn't initialized.
 src/plugins/lanplus/lanplus_crypt_impl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
-index 3c0df23..d12d0e3 100644
 --- a/src/plugins/lanplus/lanplus_crypt_impl.c
 +++ b/src/plugins/lanplus/lanplus_crypt_impl.c
-@@ -164,7 +164,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -164,7 +164,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
 							uint8_t       * output,
 							uint32_t        * bytes_written)
 {
@ -22,7 +20,7 @@ index 3c0df23..d12d0e3 100644
 	EVP_CIPHER_CTX_init(ctx);
 	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
 	EVP_CIPHER_CTX_set_padding(ctx, 0);
-@@ -239,7 +239,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -239,7 +239,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
 							uint8_t       * output,
 							uint32_t        * bytes_written)
 {
@ -31,6 +29,3 @@ index 3c0df23..d12d0e3 100644
 	EVP_CIPHER_CTX_init(ctx);
 	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
 	EVP_CIPHER_CTX_set_padding(ctx, 0);
-- 
-2.16.1
-
--- a/admin/ipmitool/patches/0003-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch
+++ b/admin/ipmitool/patches/0003-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch
@ -11,11 +11,9 @@ deprecated, and by checking return value of call to former function.
 src/plugins/lanplus/lanplus_crypt_impl.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

-diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
-index d12d0e3..0e330c1 100644
 --- a/src/plugins/lanplus/lanplus_crypt_impl.c
 +++ b/src/plugins/lanplus/lanplus_crypt_impl.c
-@@ -165,10 +165,13 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -165,10 +165,13 @@ lanplus_encrypt_aes_cbc_128(const uint8_
 							uint32_t        * bytes_written)
 {
 	EVP_CIPHER_CTX *ctx = NULL;
@ -31,7 +29,7 @@ index d12d0e3..0e330c1 100644
 
 	*bytes_written = 0;
 
-@@ -240,11 +243,14 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -240,11 +243,14 @@ lanplus_decrypt_aes_cbc_128(const uint8_
 							uint32_t        * bytes_written)
 {
 	EVP_CIPHER_CTX *ctx = NULL;
@ -48,6 +46,3 @@ index d12d0e3..0e330c1 100644
 	if (verbose >= 5)
 	{
 		printbuf(iv,  16, "decrypting with this IV");
-- 
-2.16.1
-
--- a/admin/ipmitool/patches/0004-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch
+++ b/admin/ipmitool/patches/0004-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch
@ -10,11 +10,9 @@ leak.
 src/plugins/lanplus/lanplus_crypt_impl.c | 44 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 21 deletions(-)

-diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
-index 0e330c1..9652a5e 100644
 --- a/src/plugins/lanplus/lanplus_crypt_impl.c
 +++ b/src/plugins/lanplus/lanplus_crypt_impl.c
-@@ -165,13 +165,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -165,13 +165,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_
 							uint32_t        * bytes_written)
 {
 	EVP_CIPHER_CTX *ctx = NULL;
@ -28,7 +26,7 @@ index 0e330c1..9652a5e 100644
 
 	*bytes_written = 0;
 
-@@ -185,6 +178,14 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -185,6 +178,14 @@ lanplus_encrypt_aes_cbc_128(const uint8_
 		printbuf(input, input_length, "encrypting this data");
 	}
 
@ -43,7 +41,7 @@ index 0e330c1..9652a5e 100644
 
 	/*
 	 * The default implementation adds a whole block of padding if the input
-@@ -198,7 +199,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -198,7 +199,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_
 	{
 		/* Error */
 		*bytes_written = 0;
@ -51,7 +49,7 @@ index 0e330c1..9652a5e 100644
 	}
 	else
 	{
-@@ -206,16 +206,17 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -206,16 +206,17 @@ lanplus_encrypt_aes_cbc_128(const uint8_
 
 		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
 		{
@ -71,7 +69,7 @@ index 0e330c1..9652a5e 100644
 }
 
 
-@@ -243,13 +244,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -243,13 +244,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_
 							uint32_t        * bytes_written)
 {
 	EVP_CIPHER_CTX *ctx = NULL;
@ -85,7 +83,7 @@ index 0e330c1..9652a5e 100644
 
 	if (verbose >= 5)
 	{
-@@ -258,12 +252,20 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -258,12 +252,20 @@ lanplus_decrypt_aes_cbc_128(const uint8_
 		printbuf(input, input_length, "decrypting this data");
 	}
 
@ -107,7 +105,7 @@ index 0e330c1..9652a5e 100644
 	/*
 	 * The default implementation adds a whole block of padding if the input
 	 * data is perfectly aligned.  We would like to keep that from happening.
-@@ -277,7 +279,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -277,7 +279,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_
 		/* Error */
 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
 		*bytes_written = 0;
@ -115,7 +113,7 @@ index 0e330c1..9652a5e 100644
 	}
 	else
 	{
-@@ -285,20 +286,21 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -285,20 +286,21 @@ lanplus_decrypt_aes_cbc_128(const uint8_
 
 		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
 		{
@ -139,6 +137,3 @@ index 0e330c1..9652a5e 100644
 
 	if (verbose >= 5)
 	{
-- 
-2.16.1
-
--- a/admin/ipmitool/patches/0005-ipmitool-Fix-compile-with-deprecated-APIs-disabled.patch
+++ b/admin/ipmitool/patches/0005-ipmitool-Fix-compile-with-deprecated-APIs-disabled.patch
@ -14,11 +14,9 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
 src/plugins/lanplus/lanplus_crypt_impl.c | 8 ++++++++
 1 file changed, 8 insertions(+)

-diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
-index 9652a5e..e94401e 100644
 --- a/src/plugins/lanplus/lanplus_crypt_impl.c
 +++ b/src/plugins/lanplus/lanplus_crypt_impl.c
-@@ -183,7 +183,11 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -183,7 +183,11 @@ lanplus_encrypt_aes_cbc_128(const uint8_
 		lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");
 		return;
 	}
@ -30,7 +28,7 @@ index 9652a5e..e94401e 100644
 	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
 	EVP_CIPHER_CTX_set_padding(ctx, 0);
 
-@@ -262,7 +266,11 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -262,7 +266,11 @@ lanplus_decrypt_aes_cbc_128(const uint8_
 		lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");
 		return;
 	}
@ -42,6 +40,3 @@ index 9652a5e..e94401e 100644
 	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
 	EVP_CIPHER_CTX_set_padding(ctx, 0);
 
-- 
-2.7.4
-
--- a/admin/ipmitool/patches/0006-CVE-2020-5208-fru-Fix-buffer-overflow-vulnerabilities.patch
+++ b/admin/ipmitool/patches/0006-CVE-2020-5208-fru-Fix-buffer-overflow-vulnerabilities.patch
@ -17,8 +17,6 @@ The same issue affects the `read_fru_area` function.
 lib/ipmi_fru.c | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

-diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
-index cf00effc82a2..af99aa99444c 100644
 --- a/lib/ipmi_fru.c
 +++ b/lib/ipmi_fru.c
@@ -615,7 +615,10 @@ int
@ -33,7 +31,7 @@ index cf00effc82a2..af99aa99444c 100644
 	struct ipmi_rs * rsp;
 	struct ipmi_rq req;
 	uint8_t msg_data[4];
-@@ -628,10 +631,12 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -628,10 +631,12 @@ read_fru_area(struct ipmi_intf * intf, s
 
 	finish = offset + length;
 	if (finish > fru->size) {
@ -46,7 +44,7 @@ index cf00effc82a2..af99aa99444c 100644
 	}
 
 	memset(&req, 0, sizeof(req));
-@@ -667,6 +672,7 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -667,6 +672,7 @@ read_fru_area(struct ipmi_intf * intf, s
 		}
 	}
 
@ -54,7 +52,7 @@ index cf00effc82a2..af99aa99444c 100644
 	do {
 		tmp = fru->access ? off >> 1 : off;
 		msg_data[0] = id;
-@@ -707,9 +713,18 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -707,9 +713,18 @@ read_fru_area(struct ipmi_intf * intf, s
 		}
 
 		tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0];
@ -73,7 +71,7 @@ index cf00effc82a2..af99aa99444c 100644
 		/* sometimes the size returned in the Info command
 		* is too large.  return 0 so higher level function
 		* still attempts to parse what was returned */
-@@ -742,7 +757,9 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -742,7 +757,9 @@ read_fru_area_section(struct ipmi_intf *
 			uint32_t offset, uint32_t length, uint8_t *frubuf)
 {
 	static uint32_t fru_data_rqst_size = 20;
@ -84,7 +82,7 @@ index cf00effc82a2..af99aa99444c 100644
 	struct ipmi_rs * rsp;
 	struct ipmi_rq req;
 	uint8_t msg_data[4];
-@@ -755,10 +772,12 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -755,10 +772,12 @@ read_fru_area_section(struct ipmi_intf *
 
 	finish = offset + length;
 	if (finish > fru->size) {
@ -97,7 +95,7 @@ index cf00effc82a2..af99aa99444c 100644
 	}
 
 	memset(&req, 0, sizeof(req));
-@@ -773,6 +792,8 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -773,6 +792,8 @@ read_fru_area_section(struct ipmi_intf *
 	if (fru->access && fru_data_rqst_size > 16)
 #endif
 		fru_data_rqst_size = 16;
@ -106,7 +104,7 @@ index cf00effc82a2..af99aa99444c 100644
 	do {
 		tmp = fru->access ? off >> 1 : off;
 		msg_data[0] = id;
-@@ -804,8 +825,16 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -804,8 +825,16 @@ read_fru_area_section(struct ipmi_intf *
 		}
 
 		tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0];
@ -123,6 +121,3 @@ index cf00effc82a2..af99aa99444c 100644
 
 		/* sometimes the size returned in the Info command
 		* is too large.  return 0 so higher level function
-- 
-2.27.0
-
--- a/admin/ipmitool/patches/0007-CVE-2020-5208-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch
+++ b/admin/ipmitool/patches/0007-CVE-2020-5208-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch
@ -16,11 +16,9 @@ copy into the buffer.
 lib/dimm_spd.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

-diff --git a/lib/dimm_spd.c b/lib/dimm_spd.c
-index 41e30dbb4bda..68f3b4fa1eff 100644
 --- a/lib/dimm_spd.c
 +++ b/lib/dimm_spd.c
-@@ -1621,7 +1621,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
+@@ -1621,7 +1621,7 @@ ipmi_spd_print_fru(struct ipmi_intf * in
 	struct ipmi_rq req;
 	struct fru_info fru;
 	uint8_t *spd_data, msg_data[4];
@ -29,7 +27,7 @@ index 41e30dbb4bda..68f3b4fa1eff 100644
 
 	msg_data[0] = id;
 
-@@ -1697,6 +1697,13 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
+@@ -1697,6 +1697,13 @@ ipmi_spd_print_fru(struct ipmi_intf * in
 		}
 
 		len = rsp->data[0];
@ -43,6 +41,3 @@ index 41e30dbb4bda..68f3b4fa1eff 100644
 		memcpy(&spd_data[offset], rsp->data + 1, len);
 		offset += len;
 	} while (offset < fru.size);
-- 
-2.27.0
-
--- a/admin/ipmitool/patches/0008-CVE-2020-5208-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch
+++ b/admin/ipmitool/patches/0008-CVE-2020-5208-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch
@ -13,11 +13,9 @@ overflow.
 lib/ipmi_session.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

-diff --git a/lib/ipmi_session.c b/lib/ipmi_session.c
-index 141f0f4ec8dd..b9af1fd75d40 100644
 --- a/lib/ipmi_session.c
 +++ b/lib/ipmi_session.c
-@@ -309,8 +309,10 @@ ipmi_get_session_info(struct ipmi_intf         * intf,
+@@ -309,8 +309,10 @@ ipmi_get_session_info(struct ipmi_intf
 		}
 		else
 		{
@ -30,7 +28,7 @@ index 141f0f4ec8dd..b9af1fd75d40 100644
 		}
 		break;
 		
-@@ -341,8 +343,10 @@ ipmi_get_session_info(struct ipmi_intf         * intf,
+@@ -341,8 +343,10 @@ ipmi_get_session_info(struct ipmi_intf
 				break;
 			}
 
@ -43,6 +41,3 @@ index 141f0f4ec8dd..b9af1fd75d40 100644
 			
 		} while (i <= session_info.session_slot_count);
 		break;
-- 
-2.27.0
-
--- a/admin/ipmitool/patches/0009-CVE-2020-5208-channel-Fix-buffer-overflow.patch
+++ b/admin/ipmitool/patches/0009-CVE-2020-5208-channel-Fix-buffer-overflow.patch
@ -16,11 +16,9 @@ on the final copy.
 lib/ipmi_channel.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c
-index fab2e5483d12..8cd7c59a4273 100644
 --- a/lib/ipmi_channel.c
 +++ b/lib/ipmi_channel.c
-@@ -413,7 +413,10 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
+@@ -413,7 +413,10 @@ ipmi_get_channel_cipher_suites(struct ip
 			lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites");
 			return -1;
 		}
@ -32,6 +30,3 @@ index fab2e5483d12..8cd7c59a4273 100644
 			lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s",
 					val2str(rsp->ccode, completion_code_vals));
 			return -1;
-- 
-2.27.0
-
--- a/admin/ipmitool/patches/0010-CVE-2020-5208-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch
+++ b/admin/ipmitool/patches/0010-CVE-2020-5208-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch
@ -16,11 +16,9 @@ stack buffer overflow can occur.
 lib/ipmi_lanp.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

-diff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c
-index 65d881bc5890..022c7f1605ed 100644
 --- a/lib/ipmi_lanp.c
 +++ b/lib/ipmi_lanp.c
-@@ -1809,7 +1809,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1809,7 +1809,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
 		if (p == NULL) {
 			return (-1);
 		}
@ -29,7 +27,7 @@ index 65d881bc5890..022c7f1605ed 100644
 		/* set new ipaddr */
 		memcpy(data+3, temp, 4);
 		printf("Setting LAN Alert %d IP Address to %d.%d.%d.%d\n", alert,
-@@ -1824,7 +1824,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1824,7 +1824,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
 		if (p == NULL) {
 			return (-1);
 		}
@ -38,7 +36,7 @@ index 65d881bc5890..022c7f1605ed 100644
 		/* set new macaddr */
 		memcpy(data+7, temp, 6);
 		printf("Setting LAN Alert %d MAC Address to "
-@@ -1838,7 +1838,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1838,7 +1838,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
 		if (p == NULL) {
 			return (-1);
 		}
@ -47,7 +45,7 @@ index 65d881bc5890..022c7f1605ed 100644
 
 		if (strncasecmp(argv[1], "def", 3) == 0 ||
 		    strncasecmp(argv[1], "default", 7) == 0) {
-@@ -1864,7 +1864,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1864,7 +1864,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
 		if (p == NULL) {
 			return (-1);
 		}
@ -56,7 +54,7 @@ index 65d881bc5890..022c7f1605ed 100644
 
 		if (strncasecmp(argv[1], "on", 2) == 0 ||
 		    strncasecmp(argv[1], "yes", 3) == 0) {
-@@ -1889,7 +1889,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1889,7 +1889,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
 		if (p == NULL) {
 			return (-1);
 		}
@ -65,7 +63,7 @@ index 65d881bc5890..022c7f1605ed 100644
 
 		if (strncasecmp(argv[1], "pet", 3) == 0) {
 			printf("Setting LAN Alert %d destination to PET Trap\n", alert);
-@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
 		if (p == NULL) {
 			return (-1);
 		}
@ -74,7 +72,7 @@ index 65d881bc5890..022c7f1605ed 100644
 
 		if (str2uchar(argv[1], &data[2]) != 0) {
 			lprintf(LOG_ERR, "Invalid time: %s", argv[1]);
-@@ -1933,7 +1933,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1933,7 +1933,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
 		if (p == NULL) {
 			return (-1);
 		}
@ -83,6 +81,3 @@ index 65d881bc5890..022c7f1605ed 100644
 
 		if (str2uchar(argv[1], &data[3]) != 0) {
 			lprintf(LOG_ERR, "Invalid retry: %s", argv[1]);
-- 
-2.27.0
-
--- a/admin/ipmitool/patches/0011-CVE-2020-5208-fru-sdr-Fix-id_string-buffer-overflows.patch
+++ b/admin/ipmitool/patches/0011-CVE-2020-5208-fru-sdr-Fix-id_string-buffer-overflows.patch
@ -23,11 +23,9 @@ into fixed buffer of size `17` bytes from this calculated length.
 lib/ipmi_sdr.c | 40 ++++++++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 17 deletions(-)

-diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
-index af99aa99444c..98bc9840955a 100644
 --- a/lib/ipmi_fru.c
 +++ b/lib/ipmi_fru.c
-@@ -3062,7 +3062,7 @@ ipmi_fru_print(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru)
+@@ -3062,7 +3062,7 @@ ipmi_fru_print(struct ipmi_intf * intf,
 		return 0;
 
 	memset(desc, 0, sizeof(desc));
@ -36,11 +34,9 @@ index af99aa99444c..98bc9840955a 100644
 	desc[fru->id_code & 0x01f] = 0;
 	printf("FRU Device Description : %s (ID %d)\n", desc, fru->device_id);
 
-diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
-index 2a9cbe3087af..62aac08a9002 100644
 --- a/lib/ipmi_sdr.c
 +++ b/lib/ipmi_sdr.c
-@@ -2084,7 +2084,7 @@ ipmi_sdr_print_sensor_eventonly(struct ipmi_intf *intf,
+@@ -2084,7 +2084,7 @@ ipmi_sdr_print_sensor_eventonly(struct i
 		return -1;
 
 	memset(desc, 0, sizeof (desc));
@ -49,7 +45,7 @@ index 2a9cbe3087af..62aac08a9002 100644
 
 	if (verbose) {
 		printf("Sensor ID              : %s (0x%x)\n",
-@@ -2135,7 +2135,7 @@ ipmi_sdr_print_sensor_mc_locator(struct ipmi_intf *intf,
+@@ -2135,7 +2135,7 @@ ipmi_sdr_print_sensor_mc_locator(struct
 		return -1;
 
 	memset(desc, 0, sizeof (desc));
@ -58,7 +54,7 @@ index 2a9cbe3087af..62aac08a9002 100644
 
 	if (verbose == 0) {
 		if (csv_output)
-@@ -2228,7 +2228,7 @@ ipmi_sdr_print_sensor_generic_locator(struct ipmi_intf *intf,
+@@ -2228,7 +2228,7 @@ ipmi_sdr_print_sensor_generic_locator(st
 	char desc[17];
 
 	memset(desc, 0, sizeof (desc));
@ -67,7 +63,7 @@ index 2a9cbe3087af..62aac08a9002 100644
 
 	if (!verbose) {
 		if (csv_output)
-@@ -2285,7 +2285,7 @@ ipmi_sdr_print_sensor_fru_locator(struct ipmi_intf *intf,
+@@ -2285,7 +2285,7 @@ ipmi_sdr_print_sensor_fru_locator(struct
 	char desc[17];
 
 	memset(desc, 0, sizeof (desc));
@ -76,7 +72,7 @@ index 2a9cbe3087af..62aac08a9002 100644
 
 	if (!verbose) {
 		if (csv_output)
-@@ -2489,35 +2489,43 @@ ipmi_sdr_print_name_from_rawentry(struct ipmi_intf *intf, uint16_t id,
+@@ -2489,35 +2489,43 @@ ipmi_sdr_print_name_from_rawentry(struct
 
    int rc =0;
    char desc[17];
@ -132,6 +128,3 @@ index 2a9cbe3087af..62aac08a9002 100644
    return rc;
 }
 
-- 
-2.27.0
-
--- a/admin/ipmitool/patches/0012-gcc10.patch
+++ b/admin/ipmitool/patches/0012-gcc10.patch
@ -0,0 +1,33 @@
+From c3939dac2c060651361fc71516806f9ab8c38901 Mon Sep 17 00:00:00 2001
+From: Vaclav Dolezal <vdolezal@redhat.com>
+Date: Thu, 23 Jan 2020 11:26:32 +0100
+Subject: [PATCH] hpmfwupg: move variable definition to .c file
+
+Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
+---
+ include/ipmitool/ipmi_hpmfwupg.h | 2 +-
+ lib/ipmi_hpmfwupg.c              | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- a/include/ipmitool/ipmi_hpmfwupg.h
+++ b/include/ipmitool/ipmi_hpmfwupg.h
+@@ -800,7 +800,7 @@ typedef struct _VERSIONINFO {
+ 	char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
+ }VERSIONINFO, *PVERSIONINFO;
+ 
+-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+extern VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+ 
+ #define TARGET_VER (0x01)
+ #define ROLLBACK_VER (0x02)
+--- a/lib/ipmi_hpmfwupg.c
+++ b/lib/ipmi_hpmfwupg.c
+@@ -58,6 +58,8 @@ ipmi_intf_get_max_request_data_size(stru
+ 
+ extern int verbose;
+ 
+VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+
+ int HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename,
+ 		int activate, int, int);
+ int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx *pFwupgCtx);
--- a/admin/monit/Makefile
+++ b/admin/monit/Makefile
@ -9,18 +9,20 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=monit
 PKG_VERSION:=5.26.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://mmonit.com/monit/dist
 PKG_HASH:=87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2

+PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
 PKG_LICENSE:=AGPL-3.0
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:tildeslash:monit

-PKG_BUILD_PARALLEL:=1
+PKG_FIXUP:=libtool
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1

 include $(INCLUDE_DIR)/package.mk

@ -30,7 +32,6 @@ define Package/monit/Default
  DEPENDS:= +libpthread +zlib
  TITLE:=System services monitoring utility
  URL:=https://mmonit.com/monit/
-  MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
 endef

 define Package/monit/Default/description
--- a/admin/muninlite/Makefile
+++ b/admin/muninlite/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=muninlite
-PKG_VERSION:=2.0.1
+PKG_VERSION:=2.1.1
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/munin-monitoring/$(PKG_NAME)/releases/download/$(PKG_VERSION)/
-PKG_HASH:=8277ccd146b4fc5b57602dba3f5612c7d6f840b4c3ee2ff3756ff4b3d8527966
+PKG_HASH:=427295fe29ac9a7d99d31aa98f3d5dfd382b7e131d0e1193899d54487ca589af

 PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later
--- a/admin/muninlite/files/etc/xinetd.d/muninlite
+++ b/admin/muninlite/files/etc/xinetd.d/muninlite
@ -1,4 +1,4 @@
-service muninlite
+service munin
 {
 	socket_type	= stream
 	protocol	= tcp
--- a/admin/netatop/patches/010-daemon-makefile-ldflags.patch
+++ b/admin/netatop/patches/010-daemon-makefile-ldflags.patch
@ -1,5 +1,3 @@
-diff --git a/daemon/Makefile b/daemon/Makefile
-index e028e95..1233855 100644
 --- a/daemon/Makefile
 +++ b/daemon/Makefile
@@ -6,7 +6,7 @@ THISDIR  = $(shell pwd)
--- a/admin/netdata/Makefile
+++ b/admin/netdata/Makefile
@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=netdata
-PKG_VERSION:=1.23.2
+PKG_VERSION:=1.30.1
 PKG_RELEASE:=1

 PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>, Daniel Engberg <daniel.engberg.lists@pyret.net>
@ -18,7 +18,7 @@ PKG_CPE_ID:=cpe:/a:my-netdata:netdata

 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/netdata/netdata/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=b6dd13292e0b1fb4137b1f7c0dc3d7c5e8a1bf408b82c2b8394f3751800e0eb5
+PKG_HASH:=e05f8b59d283fb2844280455b9481a2f9104730fd77f535312ff2fec40a6bc11

 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
@ -52,7 +52,7 @@ CONFIGURE_ARGS += \
 	--with-math \
 	--disable-x86-sse \
 	--enable-lto \
-        --disable-cloud\
+	--disable-ebpf \
 	--without-libcap \
 	--disable-https \
 	--disable-dbengine \
@ -61,7 +61,8 @@ CONFIGURE_ARGS += \
 	--disable-plugin-cups \
 	--disable-plugin-xenstat \
 	--disable-backend-prometheus-remote-write \
-	--enable-jsonc
+	--disable-unit-tests \
+	--disable-cloud

 define Package/netdata/conffiles
 /etc/netdata/
--- a/admin/netdata/patches/002-extra-patch-web_gui_index.html.patch
+++ b/admin/netdata/patches/002-extra-patch-web_gui_index.html.patch
@ -0,0 +1,28 @@
+--- a/web/gui/index.html
+++ b/web/gui/index.html
+@@ -90,7 +90,9 @@
+             </div>
+             <nav class="collapse navbar-collapse navbar-right" role="navigation">
+                 <ul class="nav navbar-nav">
+                    <!--
+                     <li title="Nodes view" data-toggle="tooltip" data-placement="bottom"><a onclick="openAuthenticatedUrl('console.html');" class="btn" target="_blank"><i class="fas fa-tv"></i>&nbsp;<span class="hidden-sm hidden-md">Nodes<sup class="beta"> beta</sup></span></a></li>
+                    -->
+                     <li id="alarmsButton"  title="check the health monitoring alarms and their log" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal"><i class="fas fa-bell"></i>&nbsp;<span class="hidden-sm hidden-md">Alarms&nbsp;</span><span id="alarms_count_badge" class="badge"></span></a></li>
+                     <li title="change dashboard settings" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal"><i class="fas fa-cog"></i>&nbsp;<span class="hidden-sm hidden-md">Settings</span></a></li>
+                     <li title="check for netdata updates<br/>you should keep your netdata updated" data-toggle="tooltip" data-placement="bottom" class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal"><i class="fas fa-cloud-download-alt"></i> <span class="hidden-sm hidden-md">Update </span><span id="update_badge" class="badge"></span></a></li>
+@@ -110,6 +112,7 @@
+         <div id="navbar-highlight-content" class="navbar-highlight-content"></div>
+     </div>
+ 
+<!--
+     <div id="sign-in-banner" style="display: none">
+         <div class="container">
+             Like what you see? 
+@@ -120,6 +123,7 @@
+             </div>
+         </div>
+     </div>
+-->
+     
+     <div id="masthead" style="display: none;">
+         <div class="container">
--- a/admin/netdata/patches/003-extra-patch-web_gui_main.js.patch
+++ b/admin/netdata/patches/003-extra-patch-web_gui_main.js.patch
@ -0,0 +1,15 @@
+--- a/web/gui/main.js
+++ b/web/gui/main.js
+@@ -759,11 +759,7 @@ function renderMyNetdataMenu(machinesArr
+     if (!isSignedIn()) {
+         if (!NETDATA.registry.isRegistryEnabled()) {
+             html += (
+-                `<div class="info-item" style="white-space: nowrap">
+-                    <span>Please <a href="#" onclick="signInDidClick(event); return false">sign in to netdata.cloud</a> to view your nodes!</span>
+-                    <div></div>
+-                </div>
+-                <hr />`
+                ``
+             );
+         }
+     }
--- a/admin/netdata/patches/004-patch-collectors_python.d.plugin_Makefile.am.patch
+++ b/admin/netdata/patches/004-patch-collectors_python.d.plugin_Makefile.am.patch
@ -0,0 +1,112 @@
+--- a/collectors/python.d.plugin/Makefile.am
+++ b/collectors/python.d.plugin/Makefile.am
+@@ -145,109 +145,3 @@ dist_third_party_DATA = \
+     python_modules/third_party/monotonic.py \
+     python_modules/third_party/filelock.py \
+     $(NULL)
+-
+-pythonyaml2dir=$(pythonmodulesdir)/pyyaml2
+-dist_pythonyaml2_DATA = \
+-    python_modules/pyyaml2/__init__.py \
+-    python_modules/pyyaml2/composer.py \
+-    python_modules/pyyaml2/constructor.py \
+-    python_modules/pyyaml2/cyaml.py \
+-    python_modules/pyyaml2/dumper.py \
+-    python_modules/pyyaml2/emitter.py \
+-    python_modules/pyyaml2/error.py \
+-    python_modules/pyyaml2/events.py \
+-    python_modules/pyyaml2/loader.py \
+-    python_modules/pyyaml2/nodes.py \
+-    python_modules/pyyaml2/parser.py \
+-    python_modules/pyyaml2/reader.py \
+-    python_modules/pyyaml2/representer.py \
+-    python_modules/pyyaml2/resolver.py \
+-    python_modules/pyyaml2/scanner.py \
+-    python_modules/pyyaml2/serializer.py \
+-    python_modules/pyyaml2/tokens.py \
+-    $(NULL)
+-
+-pythonyaml3dir=$(pythonmodulesdir)/pyyaml3
+-dist_pythonyaml3_DATA = \
+-    python_modules/pyyaml3/__init__.py \
+-    python_modules/pyyaml3/composer.py \
+-    python_modules/pyyaml3/constructor.py \
+-    python_modules/pyyaml3/cyaml.py \
+-    python_modules/pyyaml3/dumper.py \
+-    python_modules/pyyaml3/emitter.py \
+-    python_modules/pyyaml3/error.py \
+-    python_modules/pyyaml3/events.py \
+-    python_modules/pyyaml3/loader.py \
+-    python_modules/pyyaml3/nodes.py \
+-    python_modules/pyyaml3/parser.py \
+-    python_modules/pyyaml3/reader.py \
+-    python_modules/pyyaml3/representer.py \
+-    python_modules/pyyaml3/resolver.py \
+-    python_modules/pyyaml3/scanner.py \
+-    python_modules/pyyaml3/serializer.py \
+-    python_modules/pyyaml3/tokens.py \
+-    $(NULL)
+-
+-python_urllib3dir=$(pythonmodulesdir)/urllib3
+-dist_python_urllib3_DATA = \
+-    python_modules/urllib3/__init__.py \
+-    python_modules/urllib3/_collections.py \
+-    python_modules/urllib3/connection.py \
+-    python_modules/urllib3/connectionpool.py \
+-    python_modules/urllib3/exceptions.py \
+-    python_modules/urllib3/fields.py \
+-    python_modules/urllib3/filepost.py \
+-    python_modules/urllib3/response.py \
+-    python_modules/urllib3/poolmanager.py \
+-    python_modules/urllib3/request.py \
+-    $(NULL)
+-
+-python_urllib3_utildir=$(python_urllib3dir)/util
+-dist_python_urllib3_util_DATA = \
+-    python_modules/urllib3/util/__init__.py \
+-    python_modules/urllib3/util/connection.py \
+-    python_modules/urllib3/util/request.py \
+-    python_modules/urllib3/util/response.py \
+-    python_modules/urllib3/util/retry.py \
+-    python_modules/urllib3/util/selectors.py \
+-    python_modules/urllib3/util/ssl_.py \
+-    python_modules/urllib3/util/timeout.py \
+-    python_modules/urllib3/util/url.py \
+-    python_modules/urllib3/util/wait.py \
+-    $(NULL)
+-
+-python_urllib3_packagesdir=$(python_urllib3dir)/packages
+-dist_python_urllib3_packages_DATA = \
+-    python_modules/urllib3/packages/__init__.py \
+-    python_modules/urllib3/packages/ordered_dict.py \
+-    python_modules/urllib3/packages/six.py \
+-    $(NULL)
+-
+-python_urllib3_backportsdir=$(python_urllib3_packagesdir)/backports
+-dist_python_urllib3_backports_DATA = \
+-    python_modules/urllib3/packages/backports/__init__.py \
+-    python_modules/urllib3/packages/backports/makefile.py \
+-    $(NULL)
+-
+-python_urllib3_ssl_match_hostnamedir=$(python_urllib3_packagesdir)/ssl_match_hostname
+-dist_python_urllib3_ssl_match_hostname_DATA = \
+-    python_modules/urllib3/packages/ssl_match_hostname/__init__.py \
+-    python_modules/urllib3/packages/ssl_match_hostname/_implementation.py \
+-    $(NULL)
+-
+-python_urllib3_contribdir=$(python_urllib3dir)/contrib
+-dist_python_urllib3_contrib_DATA = \
+-    python_modules/urllib3/contrib/__init__.py \
+-    python_modules/urllib3/contrib/appengine.py \
+-    python_modules/urllib3/contrib/ntlmpool.py \
+-    python_modules/urllib3/contrib/pyopenssl.py \
+-    python_modules/urllib3/contrib/securetransport.py \
+-    python_modules/urllib3/contrib/socks.py \
+-    $(NULL)
+-
+-python_urllib3_securetransportdir=$(python_urllib3_contribdir)/_securetransport
+-dist_python_urllib3_securetransport_DATA = \
+-    python_modules/urllib3/contrib/_securetransport/__init__.py \
+-    python_modules/urllib3/contrib/_securetransport/bindings.py \
+-    python_modules/urllib3/contrib/_securetransport/low_level.py \
+-    $(NULL)
--- a/admin/netdata/patches/005-patch-collectors_python.d.plugin_python__modules_bases_loaders.py.patch
+++ b/admin/netdata/patches/005-patch-collectors_python.d.plugin_python__modules_bases_loaders.py.patch
@ -0,0 +1,14 @@
+--- a/collectors/python.d.plugin/python_modules/bases/loaders.py
+++ b/collectors/python.d.plugin/python_modules/bases/loaders.py
+@@ -10,9 +10,9 @@ PY_VERSION = version_info[:2]
+ 
+ try:
+     if PY_VERSION > (3, 1):
+-        from pyyaml3 import SafeLoader as YamlSafeLoader
+        from yaml import SafeLoader as YamlSafeLoader
+     else:
+-        from pyyaml2 import SafeLoader as YamlSafeLoader
+        from yaml import SafeLoader as YamlSafeLoader
+ except ImportError:
+     from yaml import SafeLoader as YamlSafeLoader
+ 
--- a/admin/netdata/patches/006-patch-web_gui_index.html.patch
+++ b/admin/netdata/patches/006-patch-web_gui_index.html.patch
@ -0,0 +1,17 @@
+--- a/web/gui/index.html
+++ b/web/gui/index.html
+@@ -95,10 +95,14 @@
+                     -->
+                     <li id="alarmsButton"  title="check the health monitoring alarms and their log" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal"><i class="fas fa-bell"></i>&nbsp;<span class="hidden-sm hidden-md">Alarms&nbsp;</span><span id="alarms_count_badge" class="badge"></span></a></li>
+                     <li title="change dashboard settings" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal"><i class="fas fa-cog"></i>&nbsp;<span class="hidden-sm hidden-md">Settings</span></a></li>
+                    <!--
+                     <li title="check for netdata updates<br/>you should keep your netdata updated" data-toggle="tooltip" data-placement="bottom" class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal"><i class="fas fa-cloud-download-alt"></i> <span class="hidden-sm hidden-md">Update </span><span id="update_badge" class="badge"></span></a></li>
+                    -->
+                    <!--
+                     <li title="the netdata wiki home at github<br/>remember to <b>give netdata a <i class=&quot;fas fa-star&quot;></i></b> !" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://github.com/netdata/netdata" class="btn" target="_blank"><i class="fab fa-github"></i></a></li>
+                     <li title="follow netdata on twitter" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://twitter.com/linuxnetdata" class="btn" target="_blank"><i class="fab fa-twitter"></i></a></li>
+                     <li title="like netdata on facebook" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://www.facebook.com/linuxnetdata/" class="btn" target="_blank"><i class="fab fa-facebook"></i></a></li>
+                    -->
+                     <li title="import / load a netdata snapshot" data-toggle="tooltip" data-placement="bottom" id="loadButton"><a href="#" class="btn" data-toggle="modal" data-target="#loadSnapshotModal"><i class="fas fa-download"></i>&nbsp;<span class="hidden-sm hidden-md hidden-lg">Import</span></a></li>
+                     <li title="export / save a netdata snapshot" data-toggle="tooltip" data-placement="bottom" id="saveButton"><a href="#" class="btn" data-toggle="modal" data-target="#saveSnapshotModal"><i class="fas fa-upload"></i>&nbsp;<span class="hidden-sm hidden-md hidden-lg">Export</span></a></li>
+                     <li title="print this dashboard to PDF" data-toggle="tooltip" data-placement="bottom" id="printButton"><a href="#" class="btn" data-toggle="modal" data-target="#printPreflightModal"><i class="fas fa-print"></i>&nbsp;<span class="hidden-sm hidden-md hidden-lg">Print</span></a></li>
--- a/admin/netdata/test.sh
+++ b/admin/netdata/test.sh
@ -0,0 +1,3 @@
+#!/bin/sh
+
+netdata -version 2>&1 | grep "$2"
--- a/admin/openwisp-config/Makefile
+++ b/admin/openwisp-config/Makefile
@ -5,16 +5,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=openwisp-config
-PKG_VERSION:=0.4.5
-PKG_RELEASE:=2
+PKG_SOURCE_VERSION:=0.5.0
+PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/openwisp/openwisp-config.git
-PKG_SOURCE_VERSION:=0.4.5
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
-PKG_MIRROR_HASH:=017a8ed35ebfda2805426e7da02559d5cc2845ee9ded60fdae8e848d377424fb
-PKG_LICENSE:=GPL-3.0
+PKG_MIRROR_HASH:=337a3a9542a0898da9f951256b0d19b6bc87ced98f4ec6dc9646172b551880ef
+PKG_MAINTAINER:=Federico Capoano <f.capoano@openwisp.io>
+PKG_LICENSE:=GPL3.0-or-later
 PKGARCH:=all

 include $(INCLUDE_DIR)/package.mk
@ -23,16 +21,16 @@ define Package/openwisp-config/default
 	TITLE:=Remote configuration management agent ($(2) variant)
 	CATEGORY:=Administration
 	SECTION:=admin
-	SUBMENU:=OpenWISP
-	DEPENDS:=+curl +lua +libuci-lua +luafilesystem $(3)
+	SUBMENU:=openwisp
+	DEPENDS:=+curl +lua +libuci-lua +luafilesystem +luci-lib-nixio $(3)
 	VARIANT:=$(1)
-	MAINTAINER:=Federico Capoano <f.capoano@cineca.it>
+	PKGARCH:=all
 	URL:=http://openwisp.org
 endef

 Package/openwisp-config-openssl=$(call Package/openwisp-config/default,openssl,OpenSSL,+ca-certificates +libopenssl)
 Package/openwisp-config-mbedtls=$(call Package/openwisp-config/default,mbedtls,mbedTLS,+ca-certificates +libmbedtls)
-Package/openwisp-config-cyassl=$(call Package/openwisp-config/default,cyassl,CyaSSL,+ca-certificates +libcyassl)
+Package/openwisp-config-wolfssl=$(call Package/openwisp-config/default,wolfssl,WolfSSL,+ca-certificates +libwolfssl)
 Package/openwisp-config-nossl=$(call Package/openwisp-config/default,nossl,No SSL)

 define Build/Compile
@ -42,19 +40,11 @@ define Package/openwisp-config-$(BUILD_VARIANT)/conffiles
 /etc/config/openwisp
 endef

-ifeq ($(BUILD_VARIANT),openssl)
 CONFIG_OPENWISP_UCI:=ssl
-endif
-ifeq ($(BUILD_VARIANT),mbedtls)
-CONFIG_OPENWISP_UCI:=ssl
-endif
-ifeq ($(BUILD_VARIANT),cyassl)
-CONFIG_OPENWISP_UCI:=ssl
-endif
-ifeq ($(BUILD_VARIANT),nossl)
-CONFIG_OPENWISP_UCI:=nossl
-endif

+ifeq ($(BUILD_VARIANT),nossl)
+    CONFIG_OPENWISP_UCI:=nossl
+endif

 define Package/openwisp-config-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) \
@ -83,6 +73,10 @@ define Package/openwisp-config-$(BUILD_VARIANT)/install
 		$(PKG_BUILD_DIR)/openwisp-config/files/lib/openwisp/utils.lua \
 		$(1)/usr/lib/lua/openwisp/utils.lua

+	$(INSTALL_BIN) \
+		$(PKG_BUILD_DIR)/openwisp-config/files/lib/openwisp/net.lua \
+		$(1)/usr/lib/lua/openwisp/net.lua
+
 	$(INSTALL_BIN) \
 		$(PKG_BUILD_DIR)/openwisp-config/files/sbin/openwisp-store-unmanaged.lua \
 		$(1)/usr/sbin/openwisp-store-unmanaged
@ -103,10 +97,14 @@ define Package/openwisp-config-$(BUILD_VARIANT)/install
 		$(PKG_BUILD_DIR)/openwisp-config/files/sbin/openwisp-update-config.lua \
 		$(1)/usr/sbin/openwisp-update-config

+	$(INSTALL_BIN) \
+		$(PKG_BUILD_DIR)/openwisp-config/files/sbin/openwisp-get-address.lua \
+		$(1)/usr/sbin/openwisp-get-address
+
 	$(CP) $(PKG_BUILD_DIR)/VERSION $(1)/etc/openwisp/
 endef

 $(eval $(call BuildPackage,openwisp-config-openssl))
 $(eval $(call BuildPackage,openwisp-config-mbedtls))
-$(eval $(call BuildPackage,openwisp-config-cyassl))
+$(eval $(call BuildPackage,openwisp-config-wolfssl))
 $(eval $(call BuildPackage,openwisp-config-nossl))
--- a/admin/schroot/Makefile
+++ b/admin/schroot/Makefile
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=schroot
 PKG_VERSION:=1.6.10
-PKG_RELEASE:=1
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.xz
 PKG_SOURCE_URL:=http://deb.debian.org/debian/pool/main/s/schroot
@ -28,7 +28,8 @@ define Package/schroot
 	+SCHROOT_BTRFS:btrfs-progs \
 	+SCHROOT_LOOPBACK:losetup \
 	+SCHROOT_LVM:lvm2 \
-	+SCHROOT_UUID:libuuid
+	+SCHROOT_UUID:libuuid \
+	$(INTL_DEPENDS)
  URL:=https://salsa.debian.org/debian/schroot
 endef

@ -36,7 +37,7 @@ define Package/schroot/description
  Securely enter a chroot and run a command or login shell.
 endef

-define Package/sudo/conffiles
+define Package/schroot/conffiles
 /etc/schroot/
 endef

--- a/admin/schroot/patches/01-openwrt.patch
+++ b/admin/schroot/patches/01-openwrt.patch
@ -1,5 +1,5 @@
--- ./configure.ac-orig	2019-12-09 12:56:45.217308628 +0100
-+++ ./configure.ac	2019-12-09 12:57:18.667492923 +0100
+--- a/configure.ac
+++ b/configure.ac
@@ -284,22 +284,8 @@ if test -z "$DOXYGEN"; then
   HAVE_DOXYGEN="no"
 fi
@ -91,8 +91,8 @@
 
 AC_MSG_CHECKING([for boost::iostreams in -lboost_iostreams])
 saved_LIBS="${LIBS}"
--- ./bin/schroot-base/schroot-base-run.h-orig	2019-12-09 04:23:51.881428446 +0100
-+++ ./bin/schroot-base/schroot-base-run.h	2019-12-09 04:24:14.934887089 +0100
+--- a/bin/schroot-base/schroot-base-run.h
+++ b/bin/schroot-base/schroot-base-run.h
@@ -61,8 +61,8 @@ namespace schroot_base
         std::cout.imbue(std::locale());
         std::cerr.imbue(std::locale());
@ -104,8 +104,8 @@
 
         typename options_type::ptr opts(new options_type);
         main_type kit(opts);
--- ./sbuild/sbuild-feature.h-orig	2019-12-09 04:23:51.881428446 +0100
-+++ ./sbuild/sbuild-feature.h	2019-12-09 04:24:14.934887089 +0100
+--- a/sbuild/sbuild-feature.h
+++ b/sbuild/sbuild-feature.h
@@ -24,6 +24,7 @@
 #include <string>
 
@ -114,8 +114,8 @@
 
 namespace sbuild
 {
--- ./etc/setup.d/20copyfiles-orig	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/setup.d/20copyfiles	2019-12-09 13:56:45.277145648 +0100
+--- a/etc/setup.d/20copyfiles
+++ b/etc/setup.d/20copyfiles
@@ -39,9 +39,9 @@ copy_file()
         if [ -e "$2" ]; then
 
@ -128,8 +128,8 @@
 
             if [ "$da" = "$db" ]; then
                 COPY="false"
--- ./etc/setup.d/20nssdatabases-orig	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/setup.d/20nssdatabases	2019-12-09 13:57:34.397419039 +0100
+--- a/etc/setup.d/20nssdatabases
+++ b/etc/setup.d/20nssdatabases
@@ -29,7 +29,7 @@ set -e
 dup_nss()
 {
@ -151,47 +151,44 @@
 
                 # If the database inside and outside the chroot is the
                 # same, it's very likely that dup_nss would blank the
-diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/all/all/nssdatabases ./etc/profile-templates/all/all/nssdatabases
--- ./etc/profile-templates/all/all/nssdatabases	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/profile-templates/all/all/nssdatabases	2019-12-09 14:03:12.799297723 +0100
-@@ -4,4 +4,4 @@
+--- a/etc/profile-templates/all/all/nssdatabases
+++ b/etc/profile-templates/all/all/nssdatabases
+@@ -3,5 +3,5 @@
+ # <database name>
 passwd
 shadow
 -group
 -gshadow
 +#group
 +#gshadow
-diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/buildd/all/nssdatabases ./etc/profile-templates/buildd/all/nssdatabases
--- ./etc/profile-templates/buildd/all/nssdatabases	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/profile-templates/buildd/all/nssdatabases	2019-12-09 14:03:12.802631074 +0100
-@@ -4,4 +4,4 @@
+--- a/etc/profile-templates/buildd/all/nssdatabases
+++ b/etc/profile-templates/buildd/all/nssdatabases
+@@ -3,5 +3,5 @@
+ # <database name>
 passwd
 shadow
 -group
 -gshadow
 +#group
 +#gshadow
-diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/default/all/nssdatabases ./etc/profile-templates/default/all/nssdatabases
--- ./etc/profile-templates/default/all/nssdatabases	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/profile-templates/default/all/nssdatabases	2019-12-09 14:03:12.809297778 +0100
+--- a/etc/profile-templates/default/all/nssdatabases
+++ b/etc/profile-templates/default/all/nssdatabases
@@ -1,4 +1,4 @@
 services
 protocols
 -networks
 +#networks
 hosts
-diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/desktop/all/nssdatabases ./etc/profile-templates/desktop/all/nssdatabases
--- ./etc/profile-templates/desktop/all/nssdatabases	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/profile-templates/desktop/all/nssdatabases	2019-12-09 14:03:12.812631129 +0100
+--- a/etc/profile-templates/desktop/all/nssdatabases
+++ b/etc/profile-templates/desktop/all/nssdatabases
@@ -1,4 +1,4 @@
 services
 protocols
 -networks
 +#networks
 hosts
-diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/default/linux/fstab ./etc/profile-templates/default/linux/fstab
--- ./etc/profile-templates/default/linux/fstab	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/profile-templates/default/linux/fstab	2019-12-09 14:18:46.970887080 +0100
+--- a/etc/profile-templates/default/linux/fstab
+++ b/etc/profile-templates/default/linux/fstab
@@ -7,7 +7,7 @@
 # to run additional services in the chroot.  However, note that this
 # may potentially cause undesirable behaviour on upgrades, such as
@ -203,9 +200,8 @@ diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/default/linux/f
 -#/run/shm       /run/shm        none    rw,bind         0       0
 +/tmp/shm       /dev/shm        none    rw,bind         0       0
 +/tmp/shm       /run/shm        none    rw,bind         0       0
-diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/desktop/linux/fstab ./etc/profile-templates/desktop/linux/fstab
--- ./etc/profile-templates/desktop/linux/fstab	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/profile-templates/desktop/linux/fstab	2019-12-09 14:22:14.148555674 +0100
+--- a/etc/profile-templates/desktop/linux/fstab
+++ b/etc/profile-templates/desktop/linux/fstab
@@ -12,7 +12,7 @@
 # to run additional services in the chroot.  However, note that this
 # may potentially cause undesirable behaviour on upgrades, such as
--- a/admin/syslog-ng/Makefile
+++ b/admin/syslog-ng/Makefile
@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=syslog-ng
-PKG_VERSION:=3.27.1
-PKG_RELEASE:=2
+PKG_VERSION:=3.32.1
+PKG_RELEASE:=$(AUTORELEASE)

 PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>
 PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later
@ -11,7 +11,7 @@ PKG_CPE_ID:=cpe:/a:balabit:syslog-ng

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/syslog-ng/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_HASH:=c54c633c97f7fd8dd68261cfd784a76211e6e52965178e3aa4d0e32b899d61b3
+PKG_HASH:=19e3b76552d82c71c04230526925402c9f05fa5e6ea19b912b061850929b712d

 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
--- a/admin/syslog-ng/files/scl/network_localhost/detect.sh
+++ b/admin/syslog-ng/files/scl/network_localhost/detect.sh
@ -1,5 +1,5 @@
 #!/bin/sh
-if [ "$(sysctl net.ipv6.conf.lo.disable_ipv6 | cut -d' ' -f 3)" = "0" ]; then
+if [ "$(sysctl -n net.ipv6.conf.lo.disable_ipv6)" = "0" ]; then
 	echo 'network(ip("::1") port(514) transport(udp) ip-protocol(6) )'
 else
 	echo 'network(ip("127.0.0.1") port(514) transport(udp) ip-protocol(4) )'
--- a/admin/syslog-ng/files/syslog-ng.conf
+++ b/admin/syslog-ng/files/syslog-ng.conf
@ -4,7 +4,7 @@
 # More details about these settings can be found here:
 # https://www.syslog-ng.com/technical-documents/list/syslog-ng-open-source-edition

-@version: 3.26
+@version: 3.31
@include "scl.conf"

 options {
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=zabbix
-PKG_VERSION:=5.0.1
+PKG_VERSION:=5.0.7
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://cdn.zabbix.com/zabbix/sources/stable/5.0/
-PKG_HASH:=20a19e5cf2354ffcbbe24521b04becfc9875e57289c00da71999de60c4a853b6
+PKG_HASH:=d762f8a9aa9e8717d2e85d2a82d27316ea5c2b214eb00aff41b6e9b06107916a

 PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
 PKG_LICENSE:=GPL-2.0
--- a/admin/zabbix/patches/002-uclibc_loadavg.patch
+++ b/admin/zabbix/patches/002-uclibc_loadavg.patch
@ -1,48 +0,0 @@
--- a/src/libs/zbxsysinfo/linux/cpu.c
-+++ b/src/libs/zbxsysinfo/linux/cpu.c
-@@ -22,6 +22,45 @@
- #include "stats.h"
- #include "log.h"
- 
-+
-+/* uclibc and dietlibc do not have this junk -ReneR */
-+#if defined (__UCLIBC__) || defined (__dietlibc__)
-+static int getloadavg (double loadavg[], int nelem)
-+{
-+  int fd;
-+
-+  fd = open ("/proc/loadavg", O_RDONLY);
-+  if (fd < 0)
-+    return -1;
-+  else
-+    {
-+      char buf[65], *p;
-+      ssize_t nread;
-+      int i;
-+
-+      nread = read (fd, buf, sizeof buf - 1);
-+      close (fd);
-+      if (nread <= 0)
-+	return -1;
-+      buf[nread - 1] = '\0';
-+
-+      if (nelem > 3)
-+	nelem = 3;
-+      p = buf;
-+      for (i = 0; i < nelem; ++i)
-+	{
-+	  char *endp;
-+	  loadavg[i] = strtod (p, &endp);
-+	  if (endp == p)
-+	    return -1;
-+	  p = endp;
-+	}
-+
-+      return i;
-+    }
-+}
-+#endif
-+
- int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
- {
- 	char	*type;
--- a/admin/zabbix/patches/010-change-agentd-config.patch
+++ b/admin/zabbix/patches/010-change-agentd-config.patch
@ -27,7 +27,7 @@
 ### Option: LogFileSize
 #	Maximum size of log file in MB.
 #	0 - disable automatic log rotation.
-@@ -138,6 +135,7 @@ Server=127.0.0.1
+@@ -136,6 +133,7 @@ Server=127.0.0.1
 # Range: 0-100
 # Default:
 # StartAgents=3
@ -35,7 +35,7 @@
 
 ##### Active checks related
 
-@@ -153,8 +151,6 @@ Server=127.0.0.1
+@@ -151,8 +149,6 @@ Server=127.0.0.1
 # Default:
 # ServerActive=
 
@ -44,7 +44,7 @@
 ### Option: Hostname
 #	Unique, case sensitive hostname.
 #	Required for active checks and must match hostname as configured on the server.
-@@ -164,8 +160,6 @@ ServerActive=127.0.0.1
+@@ -162,8 +158,6 @@ ServerActive=127.0.0.1
 # Default:
 # Hostname=
 
@ -53,7 +53,7 @@
 ### Option: HostnameItem
 #	Item used for generating Hostname if it is undefined. Ignored if Hostname is defined.
 #	Does not support UserParameters or aliases.
-@@ -305,8 +299,8 @@ Hostname=Zabbix server
+@@ -303,8 +297,8 @@ Hostname=Zabbix server
 # Include=
 
 # Include=/usr/local/etc/zabbix_agentd.userparams.conf
--- a/devel/asu/Makefile
+++ b/devel/asu/Makefile
@ -1,56 +0,0 @@
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=asu
-PKG_VERSION:=0.2.3
-PKG_RELEASE:=3
-
-PKG_LICENSE:=GPL-3.0
-
-PYPI_NAME:=$(PKG_NAME)
-PKG_HASH:=e60027cd531cc5b9b20d3321acc06fdf0cdd894004919800575b8235343ba8ef
-
-PKG_BUILD_DEPENDS:=python3
-
-include ../../lang/python/pypi.mk
-include $(INCLUDE_DIR)/package.mk
-include ../../lang/python/python3-package.mk
-
-IMAGEBUILDER_DEPENDS:= \
-    @x86_64 +bash +bzip2 +coreutils +coreutils-stat +diffutils +file \
-    +gawk +gcc +getopt +git +git-http +libncurses +make +patch +perl \
-    +perlbase-attributes +perlbase-findbin +perlbase-getopt \
-    +perlbase-thread +python3-light +tar +unzip +wget +xz +xzdiff \
-    +xzgrep +xzless +xz-utils +zlib-dev
-
-define Package/asu
-    SECTION:=devel
-    CATEGORY:=Development
-    TITLE:=attended sysupgrade image server
-    MAINTAINER:=Paul Spooren <paul@spooren.de>
-    URL:=http://github.com/aparcar/gsoc17-attended-sysupgrade/
-    DEPENDS:=$(IMAGEBUILDER_DEPENDS) +pgsql-server +psqlodbcw \
-             +python3-ctypes +python3-distutils +python3-flask \
-             +gunicorn3 +python3-openssl +python3-pyodbc +python3-yaml \
-             +libustream-mbedtls +ca-certificates +gnupg
-    USERID:=asu:asu
-endef
-
-define Package/asu/description
-   Build server to deliver OpenWrt/LEDE sysupgrade images
-endef
-
-define Py3Package/asu/install
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/asu.defaults $(1)/etc/uci-defaults/99-asu
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/asu.init $(1)/etc/init.d/asu
-	$(INSTALL_DIR) $(1)/etc/asu
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/asu/utils/config.yml.default $(1)/etc/asu/config.yml
-endef
-
-$(eval $(call Py3Package,asu))
-$(eval $(call BuildPackage,asu))
--- a/devel/asu/files/asu.defaults
+++ b/devel/asu/files/asu.defaults
@ -1,22 +0,0 @@
-#!/bin/sh
-
-asu_password=$(dd if=/dev/urandom bs=16 count=1 2>/dev/null | sha256sum | cut -d' ' -f1)
-asu_tables="$(ls -1 /usr/lib/python*/site-packages/asu/utils/tables.sql | head -n 1)"
-
-uci -q batch <<EOF
-	del postgresql.asu
-	set postgresql.asu=postgres-db
-	set postgresql.asu.name=asu
-	set postgresql.asu.user=asu
-	set postgresql.asu.pass='$asu_password'
-	set postgresql.asu.script='$asu_tables'
-	commit postgresql
-EOF
-
-sed -i "s/database_user.*/database_user: asu/" /etc/asu/config.yml
-sed -i "s/database_pass.*/database_pass: $asu_password/" /etc/asu/config.yml
-
-cp -r /usr/lib/python*/site-packages/asu/utils/distributions /etc/asu/
-
-chown -R root:asu /etc/asu
-chmod -R g+rX /etc/asu
--- a/devel/asu/files/asu.init
+++ b/devel/asu/files/asu.init
@ -1,40 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=01
-
-USE_PROCD=1
-PROG=/usr/bin/flask
-
-start_service() {
-    . /lib/functions/postgresql.sh
-
-    local pgdata=$(uci get postgresql.config.PGDATA)
-    local i=0
-
-    while ! pg_server_ready "$pgdata"; do
-      sleep 1
-      [ $((i++)) -gt 30 ] && return 1
-    done
-
-    i=0
-    while ! pg_test_db asu asu; do
-      sleep 1
-      [ $((i++)) -gt 30 ] && return 1
-    done
-
-    FLASK_APP=asu $PROG loaddb
-
-    procd_open_instance asu_main
-    procd_set_param user asu
-    procd_set_param group asu
-    procd_set_param command gunicorn3 asu:app
-    procd_close_instance
-
-    procd_open_instance main_worker
-    procd_set_param user asu
-    procd_set_param group asu
-    procd_set_param env FLASK_APP=asu
-    procd_set_param command $PROG run_worker
-    procd_close_instance
-}
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@ -8,21 +8,21 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=autoconf
-PKG_VERSION:=2.69
-PKG_RELEASE:=3
+PKG_VERSION:=2.70
+PKG_RELEASE:=1

 PKG_SOURCE_URL:=@GNU/autoconf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684
+PKG_HASH:=fa9e227860d9d845c0a07f63b88c8d7a2ae1aa2345fb619384bb8accc19fecc6
+
 PKG_MAINTAINER:=Heinrich Schuchardt <xypron.glpk@gmx.de>
 PKG_LICENSE:=GPL-3.0-or-later

 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1

 include $(INCLUDE_DIR)/package.mk

-CONFIGURE_VARS += M4=m4 EMACS=no
-
 define Package/autoconf
  SECTION:=devel
  CATEGORY:=Development
@ -37,10 +37,7 @@ define Package/autoconf/description
  automatically configure software source code packages.
 endef

-define Build/Install
-	$(SED) 's/@PERL@/\/usr\/bin\/perl/g' $(PKG_BUILD_DIR)/bin/Makefile.in
-	$(call Build/Install/Default)
-endef
+CONFIGURE_VARS += M4=m4 EMACS=no

 define Package/autoconf/install
 	$(INSTALL_DIR) $(1)/usr/bin
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=automake
-PKG_VERSION:=1.16.2
+PKG_VERSION:=1.16.3
 PKG_RELEASE:=1

 PKG_SOURCE_URL:=@GNU/automake
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=ccc459de3d710e066ab9e12d2f119bd164a08c9341ca24ba22c9adaa179eedd0
+PKG_HASH:=ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a

 PKG_MAINTAINER:=Heinrich Schuchardt <xypron.glpk@gmx.de>
 PKG_LICENSE:=GPL-3.0-or-later
--- a/devel/diffutils/Makefile
+++ b/devel/diffutils/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=diffutils
 PKG_VERSION:=3.7
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/diffutils
@ -31,9 +31,8 @@ define Package/diffutils
  TITLE:=diffutils
  URL:=http://www.gnu.org/software/diffutils/
  ALTERNATIVES:=\
-    200:/usr/bin/cmp:/usr/bin/gnu-cmp \
-    200:/usr/bin/diff:/usr/bin/gnu-diff \
-
+    200:/usr/bin/cmp:/usr/libexec/cmp-gnu \
+    200:/usr/bin/diff:/usr/libexec/diff-gnu
 endef

 define Package/diffutils/description
@ -48,8 +47,9 @@ CONFIGURE_VARS += \
 define Package/diffutils/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sdiff,diff3} $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/diff $(1)/usr/bin/gnu-diff
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cmp $(1)/usr/bin/gnu-cmp
+	$(INSTALL_DIR) $(1)/usr/libexec
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/diff $(1)/usr/libexec/diff-gnu
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cmp $(1)/usr/libexec/cmp-gnu
 endef

 $(eval $(call BuildPackage,diffutils))
--- a/devel/gcc/Makefile
+++ b/devel/gcc/Makefile
@ -24,7 +24,7 @@ endef
 PKG_NAME:=gcc
 # PKG_VERSION=7.3.0
 PKG_VERSION=7.4.0
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_INSTALL:=1
@ -192,6 +192,7 @@ define Package/gcc/install
 	ln -s $(REAL_GNU_TARGET_NAME)-g++ $(1)/usr/bin/g++
 	ln -s $(REAL_GNU_TARGET_NAME)-g++ $(1)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++
 	ln -s $(REAL_GNU_TARGET_NAME)-gcc $(1)/usr/bin/gcc
+	ln -s $(REAL_GNU_TARGET_NAME)-gcc $(1)/usr/bin/cc
 	ln -s $(REAL_GNU_TARGET_NAME)-gcc $(1)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc-$(PKG_VERSION)
 	cp -ar $(PKG_INSTALL_DIR)/usr/lib/gcc $(1)/usr/lib
 	cp -ar $(TOOLCHAIN_DIR)/include $(1)/usr
--- a/devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch
+++ b/devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch
@ -1,6 +1,6 @@
 --- a/gcc/real.h
 +++ b/gcc/real.h
-@@ -75,9 +75,10 @@
+@@ -70,9 +70,10 @@ struct GTY(()) real_value {
    + (REAL_VALUE_TYPE_SIZE%HOST_BITS_PER_WIDE_INT ? 1 : 0)) /* round up */
 
 /* Verify the guess.  */
--- a/devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch
+++ b/devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch
@ -1,12 +1,10 @@
@@ -0,0 +1,45 @@
-diff --git a/gcc/configure b/gcc/configure
-index 3793681..bcda752 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -26876,19 +26876,6 @@ $as_echo "#define TARGET_LIBC_PROVIDES_SSP 1" >>confdefs.h
-
+@@ -29036,19 +29036,6 @@ $as_echo "#define ENABLE_DEFAULT_SSP 1"
 fi
-
+ 
+ 
 -# Test for <sys/sdt.h> on the target.
 -
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
@ -20,17 +18,15 @@ index 3793681..bcda752 100755
 -fi
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
 -$as_echo "$have_sys_sdt_h" >&6; }
-
+ 
 # Check if TFmode long double should be used by default or not.
 # Some glibc targets used DFmode long double, but with glibc 2.4
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 3ee1d67..e321218 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -4796,16 +4796,6 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then
- 	    [Define if your target C library provides stack protector support])
+@@ -5787,16 +5787,6 @@ if test x$enable_default_ssp = xyes ; th
 fi
-
+ AC_SUBST([enable_default_ssp])
+ 
 -# Test for <sys/sdt.h> on the target.
 -GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
 -AC_MSG_CHECKING(sys/sdt.h in the target C library)
@ -41,6 +37,6 @@ index 3ee1d67..e321218 100644
 -            [Define if your target C library provides sys/sdt.h])
 -fi
 -AC_MSG_RESULT($have_sys_sdt_h)
-
+ 
 # Check if TFmode long double should be used by default or not.
 # Some glibc targets used DFmode long double, but with glibc 2.4
--- a/devel/gcc/patches/260-musl-add-unwind-fix.patch
+++ b/devel/gcc/patches/260-musl-add-unwind-fix.patch
@ -19,7 +19,7 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222328 138bc75d-0d04-0410-961f-8

 --- a/libgcc/unwind-dw2-fde-dip.c
 +++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -59,6 +59,12 @@
+@@ -65,6 +65,12 @@
 
 #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
     && defined(TARGET_DL_ITERATE_PHDR) \
--- a/devel/gcc/patches/931-libffi-fix-MIPS-softfloat-build-issue.patch
+++ b/devel/gcc/patches/931-libffi-fix-MIPS-softfloat-build-issue.patch
@ -12,8 +12,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
 libffi/src/mips/o32.S | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

-diff --git a/libffi/src/mips/n32.S b/libffi/src/mips/n32.S
-index c6985d30a6f..8f25994773c 100644
 --- a/libffi/src/mips/n32.S
 +++ b/libffi/src/mips/n32.S
@@ -107,6 +107,16 @@ loadregs:
@ -89,8 +87,6 @@ index c6985d30a6f..8f25994773c 100644
 	
 cls_retstruct_small2:	
 	REG_L	v0, V0_OFF2($sp)
-diff --git a/libffi/src/mips/o32.S b/libffi/src/mips/o32.S
-index eb279813a76..1aff4b14814 100644
 --- a/libffi/src/mips/o32.S
 +++ b/libffi/src/mips/o32.S
@@ -82,13 +82,16 @@ sixteen:
@ -170,6 +166,3 @@ index eb279813a76..1aff4b14814 100644
 1:	
 	REG_L	$3, V1_OFF2($fp)
 	REG_L	$2, V0_OFF2($fp)
-- 
-2.16.3
-
--- a/devel/gcc/patches/960-gotools-fix-compilation-when-making-cross-compiler.patch
+++ b/devel/gcc/patches/960-gotools-fix-compilation-when-making-cross-compiler.patch
@ -25,8 +25,6 @@ at gcc pass3
 gotools/Makefile.in | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

-diff --git a/gotools/Makefile.am b/gotools/Makefile.am
-index 5f3940a278b..9c22f5df103 100644
 --- a/gotools/Makefile.am
 +++ b/gotools/Makefile.am
@@ -26,6 +26,7 @@ PWD_COMMAND = $${PWDCMD-pwd}
@ -47,11 +45,9 @@ index 5f3940a278b..9c22f5df103 100644
 GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
 
 cmdsrcdir = $(srcdir)/../libgo/go/cmd
-diff --git a/gotools/Makefile.in b/gotools/Makefile.in
-index 4386576b011..0bdd9290e01 100644
 --- a/gotools/Makefile.in
 +++ b/gotools/Makefile.in
-@@ -252,13 +252,15 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
+@@ -252,13 +252,15 @@ mkinstalldirs = $(SHELL) $(toplevel_srcd
 PWD_COMMAND = $${PWDCMD-pwd}
 STAMP = echo timestamp >
 libgodir = ../$(target_noncanonical)/libgo
@ -68,6 +64,3 @@ index 4386576b011..0bdd9290e01 100644
 GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
 cmdsrcdir = $(srcdir)/../libgo/go/cmd
 go_cmd_go_files = \
-- 
-2.16.3
-
--- a/devel/gcc/patches/970-replace-memcpy-memset.patch
+++ b/devel/gcc/patches/970-replace-memcpy-memset.patch
@ -1,7 +1,6 @@
-diff --recursive -u gcc-7.4.0-vanilla/libitm/beginend.cc gcc-7.4.0/libitm/beginend.cc
--- gcc-7.4.0-vanilla/libitm/beginend.cc	2017-01-01 07:07:43.905435000 -0500
-+++ gcc-7.4.0/libitm/beginend.cc	2019-11-09 00:31:10.093128945 -0500
-@@ -431,7 +431,7 @@
+--- a/libitm/beginend.cc
+++ b/libitm/beginend.cc
+@@ -431,7 +431,7 @@ GTM::gtm_transaction_cp::save(gtm_thread
   // Save everything that we might have to restore on restarts or aborts.
   jb = tx->jb;
   undolog_size = tx->undolog.size();
@ -10,7 +9,7 @@ diff --recursive -u gcc-7.4.0-vanilla/libitm/beginend.cc gcc-7.4.0/libitm/begine
   user_actions_size = tx->user_actions.size();
   id = tx->id;
   prop = tx->prop;
-@@ -449,7 +449,7 @@
+@@ -449,7 +449,7 @@ GTM::gtm_transaction_cp::commit(gtm_thre
   // commits of nested transactions. Allocation actions must be committed
   // before committing the snapshot.
   tx->jb = jb;
@ -19,7 +18,7 @@ diff --recursive -u gcc-7.4.0-vanilla/libitm/beginend.cc gcc-7.4.0/libitm/begine
   tx->id = id;
   tx->prop = prop;
 }
-@@ -485,7 +485,7 @@
+@@ -485,7 +485,7 @@ GTM::gtm_thread::rollback (gtm_transacti
       prop = cp->prop;
       if (cp->disp != abi_disp())
 	set_abi_disp(cp->disp);
@ -28,10 +27,9 @@ diff --recursive -u gcc-7.4.0-vanilla/libitm/beginend.cc gcc-7.4.0/libitm/begine
       nesting = cp->nesting;
     }
   else
-diff --recursive -u gcc-7.4.0-vanilla/libitm/method-ml.cc gcc-7.4.0/libitm/method-ml.cc
--- gcc-7.4.0-vanilla/libitm/method-ml.cc	2017-01-01 07:07:43.905435000 -0500
-+++ gcc-7.4.0/libitm/method-ml.cc	2019-11-09 01:12:58.674388557 -0500
-@@ -138,7 +138,9 @@
+--- a/libitm/method-ml.cc
+++ b/libitm/method-ml.cc
+@@ -138,7 +138,9 @@ struct ml_mg : public method_group
     // This store is only executed while holding the serial lock, so relaxed
     // memory order is sufficient here.  Same holds for the memset.
     time.store(0, memory_order_relaxed);
--- a/devel/gitlab-runner/Makefile
+++ b/devel/gitlab-runner/Makefile
@ -0,0 +1,45 @@
+#
+# Copyright (C) 2020-2021 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gitlab-runner
+PKG_VERSION:=13.12.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$(PKG_VERSION)
+PKG_HASH:=5cf7c2af3a3682f1044ef374dfe7f014febba6e5a53fa442b7f114b10811831e
+
+PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/gitlab-runner-v$(PKG_VERSION)
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+GO_PKG:=gitlab.com/gitlab-org/gitlab-runner
+
+include $(INCLUDE_DIR)/package.mk
+include ../../lang/golang/golang-package.mk
+
+define Package/gitlab-runner
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=Runner for CI/CD
+  URL:=https://docs.gitlab.com/runner
+  DEPENDS:=$(GO_ARCH_DEPENDS)
+endef
+
+define Package/gitlab-runner/description
+  GitLab Runner is an application that works with
+  GitLab CI/CD to run jobs in a pipeline.
+endef
+
+$(eval $(call GoBinPackage,gitlab-runner))
+$(eval $(call BuildPackage,gitlab-runner))
--- a/devel/gitlab-runner/patches/010-test.patch
+++ b/devel/gitlab-runner/patches/010-test.patch
@ -0,0 +1,11 @@
+--- a/common/buildtest/masking.go
+++ b/common/buildtest/masking.go
+@@ -39,7 +39,7 @@ func RunBuildWithMasking(t *testing.T, c
+ 
+ 	buf.Finish()
+ 
+-	contents, err := buf.Bytes(0, math.MaxInt64)
+	contents, err := buf.Bytes(0, math.MaxInt32)
+ 	assert.NoError(t, err)
+ 
+ 	assert.NotContains(t, string(contents), "MASKED_KEY=MASKED_VALUE")
--- a/devel/lpc21isp/Makefile
+++ b/devel/lpc21isp/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=lpc21isp
 PKG_VERSION:=197
-PKG_RELEASE:=3
+PKG_RELEASE:=5
 PKG_LICENSE:=LGPL-3.0-or-later
 PKG_LICENSE_FILES:=README gpl.txt lgpl-3.0.txt

@ -34,6 +34,8 @@ define Package/lpc21isp/description
 and Analog Devices ADUC70xx.
 endef

+TARGET_CFLAGS += $(if $(CONFIG_USE_GLIBC),-lc -lgcc_eh)
+
 define Package/lpc21isp/install
 		$(INSTALL_DIR) $(1)/usr/sbin
 		$(INSTALL_BIN) $(PKG_BUILD_DIR)/lpc21isp $(1)/usr/sbin/
--- a/devel/lpc21isp/patches/100-fix-reproducible-builds.patch
+++ b/devel/lpc21isp/patches/100-fix-reproducible-builds.patch
@ -1,8 +1,6 @@
-Index: lpc21isp_197/lpc21isp.c
-===================================================================
--- lpc21isp_197.orig/lpc21isp.c	2017-12-03 06:01:05.854070061 +0100
-+++ lpc21isp_197/lpc21isp.c	2017-12-03 06:01:23.326431659 +0100
-@@ -1549,7 +1549,7 @@
+--- a/lpc21isp.c
+++ b/lpc21isp.c
+@@ -1549,7 +1549,7 @@ static void ReadArguments(ISP_ENVIRONMEN
         DebugPrintf(2, "\n"
                        "Portable command line ISP\n"
                        "for NXP LPC family and Analog Devices ADUC 70xx\n"
--- a/devel/lpc21isp/patches/110-bzero.patch
+++ b/devel/lpc21isp/patches/110-bzero.patch
@ -0,0 +1,11 @@
+--- a/lpc21isp.c
+++ b/lpc21isp.c
+@@ -533,7 +533,7 @@ static void OpenSerialPort(ISP_ENVIRONME
+ 
+     tcgetattr(IspEnvironment->fdCom, &IspEnvironment->oldtio); /* save current port settings */
+ 
+-    bzero(&IspEnvironment->newtio, sizeof(IspEnvironment->newtio));
+    memset(&IspEnvironment->newtio, 0, sizeof(IspEnvironment->newtio));
+     IspEnvironment->newtio.c_cflag = CS8 | CLOCAL | CREAD;
+ 
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
--- a/devel/lpc21isp/patches/120-nanosleep.patch
+++ b/devel/lpc21isp/patches/120-nanosleep.patch
@ -0,0 +1,12 @@
+--- a/lpc21isp.c
+++ b/lpc21isp.c
+@@ -1130,7 +1130,8 @@ void ClearSerialPortBuffers(ISP_ENVIRONM
+ */
+ void Sleep(unsigned long MilliSeconds)
+ {
+-    usleep(MilliSeconds*1000); //convert to microseconds
+    struct timespec m = { MilliSeconds / 1000 , (MilliSeconds % 1000 ) * 1000 * 1000};
+    nanosleep(&m, &m); //convert to nanoseconds
+ }
+ #endif // defined COMPILE_FOR_LINUX
+ 
--- a/devel/lttng-tools/Makefile
+++ b/devel/lttng-tools/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=lttng-tools
-PKG_VERSION:=2.10.6
+PKG_VERSION:=2.12.1
 PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)/
-PKG_HASH:=f05df52bbebf8ce88d1b29e9e98cfc957d2ed738a345118018237ebdb581537c
+PKG_HASH:=0de7afc1f40a5acbede933cdfd6cf47b32ff84d02e170a1321f7fc86141585b8

 PKG_MAINTAINER:=
 PKG_LICENSE:=LGPL-2.1 GPL-2.0
@ -24,21 +24,26 @@ PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1

 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk

 define Package/lttng-tools
  SECTION:=devel
  CATEGORY:=Development
  TITLE:=Linux Trace Toolkit: next generation (tools)
  URL:=https://lttng.org/
-  DEPENDS:= +lttng-ust +libpopt +libxml2
+  DEPENDS:= +lttng-ust +libpopt +libxml2 $(ICONV_DEPENDS)
 endef

-TARGET_CFLAGS += $(FPIC)
-
 CONFIGURE_ARGS += \
 	--enable-epoll \
+	--disable-man-pages \
+	--disable-python-bindings \
+	--disable-test-python-agent-all \
+	--disable-test-sdt-uprobe \
+	--disable-bin-lttng-consumerd \
+	--disable-extras \
 	--without-kmod \
-	--without-pic
+	--with-pic

 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
@ -52,7 +57,6 @@ endef
 define Package/lttng-tools/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblttng-ctl*.so.* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lttng $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lttng* $(1)/usr/bin/
 endef
--- a/devel/lttng-tools/patches/010-fix-compile-fails-for-x32-arch.patch
+++ b/devel/lttng-tools/patches/010-fix-compile-fails-for-x32-arch.patch
@ -1,45 +0,0 @@
-From e0212fb3278ca54ac6d3beecf990297670f2612f Mon Sep 17 00:00:00 2001
-From: Kai Kang <kai.kang@windriver.com>
-Date: Thu, 13 Dec 2018 10:55:36 +0800
-Subject: [PATCH] Fix: compile fails for x32 arch
-
-It fails to compile for x32 arch:
-
-| .../src/common/utils.c: Assembler messages:
-| .../src/common/utils.c:1026: Error: register type mismatch for `bsr'
-| .../src/common/utils.c:1028: Error: operand type mismatch for `movq'
-
-Add macro check that not to define that fls_u64() for x32.
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
- src/bin/lttng/utils.c | 2 +-
- src/common/utils.c    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
-index 0e96ef0c3..5c79c8c7e 100644
--- a/src/bin/lttng/utils.c
-+++ b/src/bin/lttng/utils.c
-@@ -158,7 +158,7 @@ unsigned int fls_u32(uint32_t x)
- #define HAS_FLS_U32
- #endif
- 
-#if defined(__x86_64)
-+#if defined(__x86_64) && !defined(__ILP32__)
- static inline
- unsigned int fls_u64(uint64_t x)
- {
-diff --git a/src/common/utils.c b/src/common/utils.c
-index 08139e5e2..3c3899819 100644
--- a/src/common/utils.c
-+++ b/src/common/utils.c
-@@ -1223,7 +1223,7 @@ static inline unsigned int fls_u32(uint32_t x)
- #define HAS_FLS_U32
- #endif
- 
-#if defined(__x86_64)
-+#if defined(__x86_64) && !defined(__ILP32__)
- static inline
- unsigned int fls_u64(uint64_t x)
- {
--- a/devel/lttng-tools/patches/020-Fix-getgrnam-is-not-MT-Safe-use-getgrnam_r.patch
+++ b/devel/lttng-tools/patches/020-Fix-getgrnam-is-not-MT-Safe-use-getgrnam_r.patch
@ -1,345 +0,0 @@
-From 10e8001ad876d8cb3b5a17c7492e713bbc047975 Mon Sep 17 00:00:00 2001
-From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
-Date: Thu, 28 Mar 2019 18:31:29 -0400
-Subject: [PATCH] Fix: getgrnam is not MT-Safe, use getgrnam_r
-
-Running the test suite under a Yocto musl build resulted in musl
-coredump due to double freeing.
-
-We get the following backtraces:
-
-0  a_crash () at ./arch/x86_64/atomic_arch.h:108
-1  unmap_chunk (self=<optimized out>) at src/malloc/malloc.c:515
-2  free (p=<optimized out>) at src/malloc/malloc.c:526
-3  0x00007f46d9dc3849 in __getgrent_a (f=f@entry=0x7f46d9d1f7e0, gr=gr@entry=0x7f46d9e24460 <gr>, line=line@entry=0x7f46d9e26058 <line>, size=size@entry=0x7f46d92db550, mem=mem@entry=0x7f46d9e26050 <mem>, nmem=nmem@entry=0x7f46d92db558, res=0x7f46d92db548) at src/passwd/getgrent_a.c:45
-4  0x00007f46d9dc2e6b in __getgr_a (name=0x487242 "tracing", gid=gid@entry=0, gr=gr@entry=0x7f46d9e24460 <gr>, buf=buf@entry=0x7f46d9e26058 <line>, size=size@entry=0x7f46d92db550, mem=mem@entry=0x7f46d9e26050 <mem>, nmem=0x7f46d92db558, res=0x7f46d92db548) at src/passwd/getgr_a.c:30
-5  0x00007f46d9dc3733 in getgrnam (name=<optimized out>) at src/passwd/getgrent.c:37
-6  0x0000000000460b29 in utils_get_group_id (name=<optimized out>) at ../../../lttng-tools-2.10.6/src/common/utils.c:1241
-7  0x000000000044ee69 in thread_manage_health (data=<optimized out>) at ../../../../lttng-tools-2.10.6/src/bin/lttng-sessiond/main.c:4115
-8  0x00007f46d9de1541 in start (p=<optimized out>) at src/thread/pthread_create.c:195
-9  0x00007f46d9dee661 in __clone () at src/thread/x86_64/clone.s:22
-
-From another run:
-
-0  a_crash () at ./arch/x86_64/atomic_arch.h:108
-1  unmap_chunk (self=<optimized out>) at src/malloc/malloc.c:515
-2  free (p=<optimized out>) at src/malloc/malloc.c:526
-3  0x00007f5abc210849 in __getgrent_a (f=f@entry=0x7f5abc2733e0, gr=gr@entry=0x7f5abc271460 <gr>, line=line@entry=0x7f5abc273058 <line>, size=size@entry=0x7f5abaef5510, mem=mem@entry=0x7f5abc273050 <mem>, nmem=nmem@entry=0x7f5abaef5518, res=0x7f5abaef5508) at src/passwd/getgrent_a.c:45
-4  0x00007f5abc20fe6b in __getgr_a (name=0x487242 "tracing", gid=gid@entry=0, gr=gr@entry=0x7f5abc271460 <gr>, buf=buf@entry=0x7f5abc273058 <line>, size=size@entry=0x7f5abaef5510, mem=mem@entry=0x7f5abc273050 <mem>, nmem=0x7f5abaef5518, res=0x7f5abaef5508) at src/passwd/getgr_a.c:30
-5  0x00007f5abc210733 in getgrnam (name=<optimized out>) at src/passwd/getgrent.c:37
-6  0x0000000000460b29 in utils_get_group_id (name=<optimized out>) at ../../../lttng-tools-2.10.6/src/common/utils.c:1241
-7  0x000000000042dee4 in notification_channel_socket_create () at ../../../../lttng-tools-2.10.6/src/bin/lttng-sessiond/notification-thread.c:238
-8  init_thread_state (state=0x7f5abaef5560, handle=0x7f5abbf9be40) at ../../../../lttng-tools-2.10.6/src/bin/lttng-sessiond/notification-thread.c:375
-9  thread_notification (data=0x7f5abbf9be40) at ../../../../lttng-tools-2.10.6/src/bin/lttng-sessiond/notification-thread.c:495
-10 0x00007f5abc22e541 in start (p=<optimized out>) at src/thread/pthread_create.c:195
-11 0x00007f5abc23b661 in __clone () at src/thread/x86_64/clone.s:22
-
-The problem was easily reproducible (~6 crash on ~300 runs). A prototype fix
-using mutex around the getgrnam yielded no crash in over 1000 runs. This
-patch yielded the same results as the prototype fix.
-
-Unfortunately we cannot rely on a mutex in liblttng-ctl since we cannot
-enforce the locking for the application using the lib.
-
-Use getgrnam_r instead.
-
-The previous implementation of utils_get_group_id returned the gid of
-the root group (0) on error/not found. lttng_check_tracing_group needs
-to know if an error/not found occured, returning the root group is not
-enough. We now return the gid via the passed parameter. The caller is
-responsible for either defaulting to the root group or propagating the
-error.
-
-We also do not want to warn when used in liblttng-ctl context. We might
-want to move the warning elsewhere in the future. For now, pass a bool
-if we need to warn or not.
-
-Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---
- src/bin/lttng-consumerd/health-consumerd.c   | 10 ++-
- src/bin/lttng-relayd/health-relayd.c         | 20 ++++--
- src/bin/lttng-sessiond/main.c                | 24 +++++--
- src/bin/lttng-sessiond/notification-thread.c | 10 ++-
- src/common/utils.c                           | 75 +++++++++++++++++---
- src/common/utils.h                           |  4 +-
- src/lib/lttng-ctl/lttng-ctl.c                |  8 +--
- 7 files changed, 122 insertions(+), 29 deletions(-)
-
-diff --git a/src/bin/lttng-consumerd/health-consumerd.c b/src/bin/lttng-consumerd/health-consumerd.c
-index 1e2f31e4..6045401a 100644
--- a/src/bin/lttng-consumerd/health-consumerd.c
-+++ b/src/bin/lttng-consumerd/health-consumerd.c
-@@ -184,8 +184,14 @@ void *thread_manage_health(void *data)
- 	is_root = !getuid();
- 	if (is_root) {
- 		/* lttng health client socket path permissions */
-		ret = chown(health_unix_sock_path, 0,
-				utils_get_group_id(tracing_group_name));
-+		gid_t gid;
-+
-+		ret = utils_get_group_id(tracing_group_name, true, &gid);
-+		if (ret) {
-+			gid = 0; /* Default to root group. */
-+		}
-+
-+		ret = chown(health_unix_sock_path, 0, gid);
- 		if (ret < 0) {
- 			ERR("Unable to set group on %s", health_unix_sock_path);
- 			PERROR("chown");
-diff --git a/src/bin/lttng-relayd/health-relayd.c b/src/bin/lttng-relayd/health-relayd.c
-index ba996621..962e88c4 100644
--- a/src/bin/lttng-relayd/health-relayd.c
-+++ b/src/bin/lttng-relayd/health-relayd.c
-@@ -105,8 +105,14 @@ static int create_lttng_rundir_with_perm(const char *rundir)
- 		int is_root = !getuid();
- 
- 		if (is_root) {
-			ret = chown(rundir, 0,
-					utils_get_group_id(tracing_group_name));
-+			gid_t gid;
-+
-+			ret = utils_get_group_id(tracing_group_name, true, &gid);
-+			if (ret) {
-+				gid = 0; /* Default to root group.*/
-+			}
-+
-+			ret = chown(rundir, 0, gid);
- 			if (ret < 0) {
- 				ERR("Unable to set group on %s", rundir);
- 				PERROR("chown");
-@@ -256,8 +262,14 @@ void *thread_manage_health(void *data)
- 	is_root = !getuid();
- 	if (is_root) {
- 		/* lttng health client socket path permissions */
-		ret = chown(health_unix_sock_path, 0,
-				utils_get_group_id(tracing_group_name));
-+		gid_t gid;
-+
-+		ret = utils_get_group_id(tracing_group_name, true, &gid);
-+		if (ret) {
-+			gid = 0; /* Default to root group */
-+		}
-+
-+		ret = chown(health_unix_sock_path, 0, gid);
- 		if (ret < 0) {
- 			ERR("Unable to set group on %s", health_unix_sock_path);
- 			PERROR("chown");
-diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
-index fa6fa483..49307064 100644
--- a/src/bin/lttng-sessiond/main.c
-+++ b/src/bin/lttng-sessiond/main.c
-@@ -4112,8 +4112,14 @@ static void *thread_manage_health(void *data)
- 
- 	if (is_root) {
- 		/* lttng health client socket path permissions */
-		ret = chown(config.health_unix_sock_path.value, 0,
-				utils_get_group_id(config.tracing_group_name.value));
-+		gid_t gid;
-+
-+		ret = utils_get_group_id(config.tracing_group_name.value, true, &gid);
-+		if (ret) {
-+			gid = 0; /* Default to root group */
-+		}
-+
-+		ret = chown(config.health_unix_sock_path.value, 0, &gid);
- 		if (ret < 0) {
- 			ERR("Unable to set group on %s", config.health_unix_sock_path.value);
- 			PERROR("chown");
-@@ -5238,7 +5244,10 @@ static int set_permissions(char *rundir)
- 	int ret;
- 	gid_t gid;
- 
-	gid = utils_get_group_id(config.tracing_group_name.value);
-+	ret = utils_get_group_id(config.tracing_group_name.value, true, &gid);
-+	if (ret) {
-+		gid = 0; /* Default to root group */
-+	}
- 
- 	/* Set lttng run dir */
- 	ret = chown(rundir, 0, gid);
-@@ -5349,7 +5358,14 @@ static int set_consumer_sockets(struct consumer_data *consumer_data)
- 		goto error;
- 	}
- 	if (is_root) {
-		ret = chown(path, 0, utils_get_group_id(config.tracing_group_name.value));
-+		gid_t gid;
-+
-+		ret = utils_get_group_id(config.tracing_group_name.value, true, &gid);
-+		if (ret) {
-+			gid = 0; /* Default to root group */
-+		}
-+
-+		ret = chown(path, 0, gid);
- 		if (ret < 0) {
- 			ERR("Unable to set group on %s", path);
- 			PERROR("chown");
-diff --git a/src/bin/lttng-sessiond/notification-thread.c b/src/bin/lttng-sessiond/notification-thread.c
-index 92ac597f..18a264d9 100644
--- a/src/bin/lttng-sessiond/notification-thread.c
-+++ b/src/bin/lttng-sessiond/notification-thread.c
-@@ -235,8 +235,14 @@ int notification_channel_socket_create(void)
- 	}
- 
- 	if (getuid() == 0) {
-		ret = chown(sock_path, 0,
-				utils_get_group_id(config.tracing_group_name.value));
-+		gid_t gid;
-+
-+		ret =  utils_get_group_id(config.tracing_group_name.value, true, &gid);
-+		if (ret) {
-+			gid = 0; /* Default to root group. */
-+		}
-+
-+		ret = chown(sock_path, 0, gid);
- 		if (ret) {
- 			ERR("Failed to set the notification channel socket's group");
- 			ret = -1;
-diff --git a/src/common/utils.c b/src/common/utils.c
-index c0bb031e..778bc00f 100644
--- a/src/common/utils.c
-+++ b/src/common/utils.c
-@@ -1231,24 +1231,77 @@ size_t utils_get_current_time_str(const char *format, char *dst, size_t len)
- }
- 
- /*
- * Return the group ID matching name, else 0 if it cannot be found.
-+ * Return 0 on success and set *gid to the group_ID matching the passed name.
-+ * Else -1 if it cannot be found or an error occurred.
-  */
- LTTNG_HIDDEN
-gid_t utils_get_group_id(const char *name)
-+int utils_get_group_id(const char *name, bool warn, gid_t *gid)
- {
-	struct group *grp;
-+	static volatile int warn_once;
- 
-	grp = getgrnam(name);
-	if (!grp) {
-		static volatile int warn_once;
-+	int ret;
-+	long sys_len;
-+	size_t len;
-+	struct group grp;
-+	struct group *result;
-+	char *buffer = NULL;
- 
-		if (!warn_once) {
-			WARN("No tracing group detected");
-			warn_once = 1;
-+	/* Get the system limit if it exists */
-+	sys_len = sysconf(_SC_GETGR_R_SIZE_MAX);
-+	if (sys_len == -1) {
-+		len = 1024;
-+	} else {
-+		len = (size_t) sys_len;
-+	}
-+
-+	buffer = malloc(len);
-+	if (!buffer) {
-+		PERROR("getgrnam_r malloc");
-+		ret = -1;
-+		goto error;
-+	}
-+
-+	while ((ret = getgrnam_r(name, &grp, buffer, len, &result)) == ERANGE)
-+	{
-+		/* Buffer is not big enough, increase its size. */
-+		size_t new_len = 2 * len;
-+		char *new_buffer = NULL;
-+		if (new_len < len) {
-+			ERR("getgrnam_r buffer size overflow");
-+			ret = -1;
-+			goto error;
-+		}
-+		len = new_len;
-+		new_buffer = realloc(buffer, len);
-+		if (!new_buffer) {
-+			PERROR("getgrnam_r realloc");
-+			ret = -1;
-+			goto error;
- 		}
-		return 0;
-+		buffer = new_buffer;
-+	}
-+	if (ret != 0) {
-+		PERROR("getgrnam_r");
-+		ret = -1;
-+		goto error;
-+	}
-+
-+	/* Group not found. */
-+	if (!result) {
-+		ret = -1;
-+		goto error;
-+	}
-+
-+	*gid = result->gr_gid;
-+	ret = 0;
-+
-+error:
-+	free(buffer);
-+	if (ret && warn && !warn_once) {
-+		WARN("No tracing group detected");
-+		warn_once = 1;
- 	}
-	return grp->gr_gid;
-+	return ret;
- }
- 
- /*
-diff --git a/src/common/utils.h b/src/common/utils.h
-index 18f19ef1..9c72431d 100644
--- a/src/common/utils.h
-+++ b/src/common/utils.h
-@@ -22,6 +22,8 @@
- #include <unistd.h>
- #include <stdint.h>
- #include <getopt.h>
-+#include <stdbool.h>
-+#include <sys/types.h>
- 
- #define KIBI_LOG2 10
- #define MEBI_LOG2 20
-@@ -52,7 +54,7 @@ int utils_get_count_order_u64(uint64_t x);
- char *utils_get_home_dir(void);
- char *utils_get_user_home_dir(uid_t uid);
- size_t utils_get_current_time_str(const char *format, char *dst, size_t len);
-gid_t utils_get_group_id(const char *name);
-+int utils_get_group_id(const char *name, bool warn, gid_t *gid);
- char *utils_generate_optstring(const struct option *long_options,
- 		size_t opt_count);
- int utils_create_lock_file(const char *filepath);
-diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
-index 2d84aad9..561b0bcf 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
-+++ b/src/lib/lttng-ctl/lttng-ctl.c
-@@ -208,15 +208,13 @@ end:
- LTTNG_HIDDEN
- int lttng_check_tracing_group(void)
- {
-	struct group *grp_tracing;	/* no free(). See getgrnam(3) */
-	gid_t *grp_list;
-+	gid_t *grp_list, tracing_gid;
- 	int grp_list_size, grp_id, i;
- 	int ret = -1;
- 	const char *grp_name = tracing_group;
- 
- 	/* Get GID of group 'tracing' */
-	grp_tracing = getgrnam(grp_name);
-	if (!grp_tracing) {
-+	if (utils_get_group_id(grp_name, false, &tracing_gid)) {
- 		/* If grp_tracing is NULL, the group does not exist. */
- 		goto end;
- 	}
-@@ -241,7 +239,7 @@ int lttng_check_tracing_group(void)
- 	}
- 
- 	for (i = 0; i < grp_list_size; i++) {
-		if (grp_list[i] == grp_tracing->gr_gid) {
-+		if (grp_list[i] == tracing_gid) {
- 			ret = 1;
- 			break;
- 		}
-- 
-2.17.1
-
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=m4
 PKG_VERSION:=1.4.18
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE_URL:=@GNU/m4
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
--- a/devel/m4/patches/010-glibc.patch
+++ b/devel/m4/patches/010-glibc.patch
@ -0,0 +1,116 @@
+update for glibc libio.h removal in 2.28+
+
+see
+https://src.fedoraproject.org/rpms/m4/c/814d592134fad36df757f9a61422d164ea2c6c9b?branch=master
+
+Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a718]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/lib/fflush.c
+++ b/lib/fflush.c
+@@ -33,7 +33,7 @@
+ #undef fflush
+ 
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
+ static void
+@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
+ 
+ #endif
+ 
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+ 
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
+   if (stream == NULL || ! freading (stream))
+     return fflush (stream);
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+   clear_ungetc_buffer_preserving_position (stream);
+ 
+--- a/lib/fpending.c
+++ b/lib/fpending.c
+@@ -32,7 +32,7 @@ __fpending (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   return fp->_IO_write_ptr - fp->_IO_write_base;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+--- a/lib/fpurge.c
+++ b/lib/fpurge.c
+@@ -62,7 +62,7 @@ fpurge (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   fp->_IO_read_end = fp->_IO_read_ptr;
+   fp->_IO_write_ptr = fp->_IO_write_base;
+   /* Avoid memory leak when there is an active ungetc buffer.  */
+--- a/lib/freadahead.c
+++ b/lib/freadahead.c
+@@ -25,7 +25,7 @@
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_write_ptr > fp->_IO_write_base)
+     return 0;
+   return (fp->_IO_read_end - fp->_IO_read_ptr)
+--- a/lib/freading.c
+++ b/lib/freading.c
+@@ -31,7 +31,7 @@ freading (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   return ((fp->_flags & _IO_NO_WRITES) != 0
+           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+               && fp->_IO_read_base != NULL));
+--- a/lib/fseeko.c
+++ b/lib/fseeko.c
+@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+       && fp->_IO_write_ptr == fp->_IO_write_base
+       && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when
+           return -1;
+         }
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+--- a/lib/stdio-impl.h
+++ b/lib/stdio-impl.h
+@@ -18,6 +18,12 @@
+    the same implementation of stdio extension API, except that some fields
+    have different naming conventions, or their access requires some casts.  */
+ 
+/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
+   problem by defining it ourselves.  FIXME: Do not rely on glibc
+   internals.  */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
+ 
+ /* BSD stdio derived implementations.  */
+ 
--- a/devel/meson/Makefile
+++ b/devel/meson/Makefile
@ -1,17 +1,17 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=meson
-PKG_VERSION:=0.54.3
-PKG_RELEASE:=1
+PKG_VERSION:=0.57.2
+PKG_RELEASE:=$(AUTORELEASE)

 PYPI_NAME:=meson
-PKG_HASH:=f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662
+PKG_HASH:=3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5

 PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com>
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=COPYING

-HOST_BUILD_DEPENDS:=ninja/host python3/host
+HOST_BUILD_DEPENDS:=ninja/host

 include ../../lang/python/pypi.mk
 include $(INCLUDE_DIR)/host-build.mk
--- a/devel/meson/meson.mk
+++ b/devel/meson/meson.mk
@ -36,8 +36,31 @@ MESON_BUILD_DIR:=$(PKG_BUILD_DIR)/openwrt-build
 MESON_VARS:=
 MESON_ARGS:=

+ifneq ($(findstring i386,$(CONFIG_ARCH)),)
+MESON_ARCH:="x86"
+else ifneq ($(findstring powerpc64,$(CONFIG_ARCH)),)
+MESON_ARCH:="ppc64"
+else ifneq ($(findstring powerpc,$(CONFIG_ARCH)),)
+MESON_ARCH:="ppc"
+else ifneq ($(findstring mips64el,$(CONFIG_ARCH)),)
+MESON_ARCH:="mips64"
+else ifneq ($(findstring mipsel,$(CONFIG_ARCH)),)
+MESON_ARCH:="mips"
+else ifneq ($(findstring armeb,$(CONFIG_ARCH)),)
+MESON_ARCH:="arm"
+else
+MESON_ARCH:=$(CONFIG_ARCH)
+endif
+
+# this is undefined for just x64_64
+ifeq ($(origin CPU_TYPE),undefined)
+MESON_CPU:="generic"
+else
+MESON_CPU:="$(CPU_TYPE)$(if $(CPU_SUBTYPE),+$(CPU_SUBTYPE))"
+endif
+
 define Meson
-	$(2) $(HOST_PYTHON3_BIN) $(MESON_DIR)/meson.py $(1)
+	$(2) $(STAGING_DIR_HOST)/bin/$(PYTHON) $(MESON_DIR)/meson.py $(1)
 endef

 define Meson/CreateNativeFile
@ -60,13 +83,12 @@ define Meson/CreateCrossFile
 		-e "s|@AR@|$(TARGET_AR)|" \
 		-e "s|@STRIP@|$(TARGET_CROSS)strip|" \
 		-e "s|@NM@|$(TARGET_NM)|" \
-		-e "s|@LD@|$(TARGET_CROSS)ld|" \
 		-e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \
 		-e "s|@CFLAGS@|$(foreach FLAG,$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
 		-e "s|@CXXFLAGS@|$(foreach FLAG,$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
 		-e "s|@LDFLAGS@|$(foreach FLAG,$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS),'$(FLAG)',)|" \
-		-e "s|@ARCH@|$(ARCH)|" \
-		-e "s|@CPU@|$(CONFIG_TARGET_SUBTARGET)|" \
+		-e "s|@ARCH@|$(MESON_ARCH)|" \
+		-e "s|@CPU@|$(MESON_CPU)|" \
 		-e "s|@ENDIAN@|$(if $(CONFIG_BIG_ENDIAN),big,little)|" \
 		< $(MESON_DIR)/openwrt-cross.txt.in \
 		> $(1)
--- a/devel/meson/patches/010-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
+++ b/devel/meson/patches/010-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
@ -1,34 +0,0 @@
-From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001
-From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Date: Sat, 14 Jul 2018 11:18:45 +0200
-Subject: [PATCH] Only fix RPATH if install_rpath is not empty
-
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-[Fix: remove leftover from original/unconditional code]
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
- mesonbuild/minstall.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
-index 8ac6aab1..7ef04116 100644
--- a/mesonbuild/minstall.py
-+++ b/mesonbuild/minstall.py
-@@ -508,8 +508,14 @@ class Installer:
-             if file_copied:
-                 self.did_install_something = True
-                 try:
-                    depfixer.fix_rpath(outname, install_rpath, final_path,
-                                       install_name_mappings, verbose=False)
-+                    # Buildroot check-host-rpath script expects RPATH
-+                    # But if install_rpath is empty, it will stripped.
-+                    # So, preserve it in this case
-+                    if install_rpath:
-+                        depfixer.fix_rpath(outname, install_rpath, final_path,
-+                                           install_name_mappings, verbose=False)
-+                    else:
-+                        print("Skipping RPATH fixing")
-                 except SystemExit as e:
-                     if isinstance(e.code, int) and e.code == 0:
-                         pass
-
--- a/devel/meson/src/openwrt-cross.txt.in
+++ b/devel/meson/src/openwrt-cross.txt.in
@ -4,15 +4,14 @@ cpp = [@CXX@]
 ar = '@AR@'
 strip = '@STRIP@'
 nm = '@NM@'
-ld = '@LD@'
 pkgconfig = '@PKGCONFIG@'

-[properties]
+[built-in options]
 c_args = [@CFLAGS@]
 c_link_args = [@LDFLAGS@]
 cpp_args = [@CXXFLAGS@]
 cpp_link_args = [@LDFLAGS@]
-needs_exe_wrapper = true
+prefix = '/usr'

 [host_machine]
 system = 'linux'
@ -20,6 +19,5 @@ cpu_family = '@ARCH@'
 cpu = '@CPU@'
 endian = '@ENDIAN@'

-[paths]
-prefix = '/usr'
-libdir = 'lib'
+[properties]
+needs_exe_wrapper = true
--- a/devel/meson/src/openwrt-native.txt.in
+++ b/devel/meson/src/openwrt-native.txt.in
@ -3,13 +3,11 @@ c = [@CC@]
 cpp = [@CXX@]
 pkgconfig = '@PKGCONFIG@'

-[properties]
+[built-in options]
 c_args = [@CFLAGS@]
 c_link_args = [@LDFLAGS@]
 cpp_args = [@CXXFLAGS@]
 cpp_link_args = [@LDFLAGS@]
-
-[paths]
 prefix = '@PREFIX@'
 sbindir = 'bin'
 libdir = 'lib'
--- a/devel/packr/Makefile
+++ b/devel/packr/Makefile
@ -0,0 +1,55 @@
+#
+# Copyright (C) 2020 Jeffery To
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=packr
+PKG_VERSION:=1.30.1
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/gobuffalo/packr.git
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_MIRROR_HASH:=fe199299e6b7236cf9538c06d27ab1a4efd93cda2b3ea85bab9154be364760c8
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE.txt
+PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
+
+HOST_BUILD_DEPENDS:=golang/host
+HOST_BUILD_PARALLEL:=1
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/gobuffalo/packr
+GO_PKG_BUILD_PKG:=github.com/gobuffalo/packr/packr
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+include ../../lang/golang/golang-host-build.mk
+include ../../lang/golang/golang-package.mk
+
+define Package/packr
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=Embed static files into Go binaries
+  URL:=https://github.com/gobuffalo/packr
+  DEPENDS:=$(GO_ARCH_DEPENDS)
+endef
+
+define Package/packr/description
+  Packr is a simple solution for bundling static assets inside of Go
+  binaries. Most importantly it does it in a way that is friendly to
+  developers while they are developing.
+endef
+
+$(eval $(call GoBinHostBuild))
+$(eval $(call HostBuild))
+$(eval $(call GoBinPackage,packr))
+$(eval $(call BuildPackage,packr))
--- a/devel/patch/patches/010-CVE-2018-6951.patch
+++ b/devel/patch/patches/010-CVE-2018-6951.patch
@ -10,11 +10,9 @@ for renames and copies (fix the existing check).
 src/pch.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-diff --git a/src/pch.c b/src/pch.c
-index ff9ed2c..bc6278c 100644
 --- a/src/pch.c
 +++ b/src/pch.c
-@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type)
+@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode
     if ((pch_rename () || pch_copy ())
 	&& ! inname
 	&& ! ((i == OLD || i == NEW) &&
@ -24,6 +22,3 @@ index ff9ed2c..bc6278c 100644
 	      name_is_valid (p_name[! reverse])))
       {
 	say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy");
-- 
-2.19.1
-
--- a/devel/patch/patches/020-CVE-2018-1000156.patch
+++ b/devel/patch/patches/020-CVE-2018-1000156.patch
@ -16,8 +16,6 @@ instead of rejecting them and carrying on.
 3 files changed, 108 insertions(+), 23 deletions(-)
 create mode 100644 tests/ed-style

-diff --git a/src/pch.c b/src/pch.c
-index bc6278c..4fd5a05 100644
 --- a/src/pch.c
 +++ b/src/pch.c
@@ -33,6 +33,7 @@
@ -28,7 +26,7 @@ index bc6278c..4fd5a05 100644
 
 #define INITHUNKMAX 125			/* initial dynamic allocation size */
 
-@@ -2389,22 +2390,28 @@ do_ed_script (char const *inname, char const *outname,
+@@ -2389,22 +2390,28 @@ do_ed_script (char const *inname, char c
     static char const editor_program[] = EDITOR_PROGRAM;
 
     file_offset beginning_of_this_line;
@ -71,7 +69,7 @@ index bc6278c..4fd5a05 100644
     for (;;) {
 	char ed_command_letter;
 	beginning_of_this_line = file_tell (pfp);
-@@ -2415,14 +2422,14 @@ do_ed_script (char const *inname, char const *outname,
+@@ -2415,14 +2422,14 @@ do_ed_script (char const *inname, char c
 	}
 	ed_command_letter = get_ed_command_letter (buf);
 	if (ed_command_letter) {
@ -90,7 +88,7 @@ index bc6278c..4fd5a05 100644
 			    write_fatal ();
 		    if (chars_read == 2  &&  strEQ (buf, ".\n"))
 			break;
-@@ -2435,13 +2442,49 @@ do_ed_script (char const *inname, char const *outname,
+@@ -2435,13 +2442,49 @@ do_ed_script (char const *inname, char c
 	    break;
 	}
     }
@ -145,8 +143,6 @@ index bc6278c..4fd5a05 100644
 
     if (ofp)
       {
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 6b6df63..16f8693 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
@@ -32,6 +32,7 @@ TESTS = \
@ -157,9 +153,6 @@ index 6b6df63..16f8693 100644
 	empty-files \
 	false-match \
 	fifo \
-diff --git a/tests/ed-style b/tests/ed-style
-new file mode 100644
-index 0000000..d8c0689
 --- /dev/null
 +++ b/tests/ed-style
@@ -0,0 +1,41 @@
@ -204,6 +197,3 @@ index 0000000..d8c0689
 +check 'cat foo' <<EOF
 +foo
 +EOF
-- 
-2.19.1
-
--- a/devel/patch/patches/030-CVE-2018-6952.patch
+++ b/devel/patch/patches/030-CVE-2018-6952.patch
@ -12,8 +12,6 @@ Fixes: https://savannah.gnu.org/bugs/index.php?53133
 src/pch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/src/pch.c b/src/pch.c
-index 4fd5a05..b0dd14d 100644
 --- a/src/pch.c
 +++ b/src/pch.c
@@ -2115,7 +2115,7 @@ pch_swap (void)
@ -25,6 +23,3 @@ index 4fd5a05..b0dd14d 100644
 	else
 	    n = -i;
 	p_efake += n;
-- 
-2.19.1
-
--- a/devel/patch/patches/050-CVE-2019-13636.patch
+++ b/devel/patch/patches/050-CVE-2019-13636.patch
@ -14,8 +14,6 @@ with O_CREAT | O_EXCL to avoid following symlinks in that case as well.
 src/util.c | 14 +++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

-diff --git a/src/inp.c b/src/inp.c
-index 32d0919..22d7473 100644
 --- a/src/inp.c
 +++ b/src/inp.c
@@ -238,8 +238,13 @@ plan_a (char const *filename)
@ -52,11 +50,9 @@ index 32d0919..22d7473 100644
       || ! (ifp = fdopen (ifd, binary_transput ? "rb" : "r")))
     pfatal ("Can't open file %s", quotearg (filename));
   if (TMPINNAME_needs_removal)
-diff --git a/src/util.c b/src/util.c
-index 1cc08ba..fb38307 100644
 --- a/src/util.c
 +++ b/src/util.c
-@@ -388,7 +388,7 @@ create_backup (char const *to, const struct stat *to_st, bool leave_original)
+@@ -388,7 +388,7 @@ create_backup (char const *to, const str
 
 	  try_makedirs_errno = ENOENT;
 	  safe_unlink (bakname);
@ -65,7 +61,7 @@ index 1cc08ba..fb38307 100644
 	    {
 	      if (errno != try_makedirs_errno)
 		pfatal ("Can't create file %s", quotearg (bakname));
-@@ -579,10 +579,13 @@ create_file (char const *file, int open_flags, mode_t mode,
+@@ -579,10 +579,13 @@ create_file (char const *file, int open_
 static void
 copy_to_fd (const char *from, int tofd)
 {
@ -80,7 +76,7 @@ index 1cc08ba..fb38307 100644
     pfatal ("Can't reopen file %s", quotearg (from));
   while ((i = read (fromfd, buf, bufsize)) != 0)
     {
-@@ -625,6 +628,8 @@ copy_file (char const *from, char const *to, struct stat *tost,
+@@ -625,6 +628,8 @@ copy_file (char const *from, char const
   else
     {
       assert (S_ISREG (mode));
@ -89,7 +85,7 @@ index 1cc08ba..fb38307 100644
       tofd = create_file (to, O_WRONLY | O_BINARY | to_flags, mode,
 			  to_dir_known_to_exist);
       copy_to_fd (from, tofd);
-@@ -640,9 +645,12 @@ copy_file (char const *from, char const *to, struct stat *tost,
+@@ -640,9 +645,12 @@ copy_file (char const *from, char const
 void
 append_to_file (char const *from, char const *to)
 {
@ -103,6 +99,3 @@ index 1cc08ba..fb38307 100644
     pfatal ("Can't reopen file %s", quotearg (to));
   copy_to_fd (from, tofd);
   if (close (tofd) != 0)
-- 
-cgit v1.0-41-gc330
-
--- a/devel/patch/patches/060-CVE-2018-20969-CVE-2019-13638.patch
+++ b/devel/patch/patches/060-CVE-2018-20969-CVE-2019-13638.patch
@ -9,11 +9,9 @@ command to avoid quoting vulnerabilities.
 src/pch.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

-diff --git a/src/pch.c b/src/pch.c
-index 4fd5a05..16e001a 100644
 --- a/src/pch.c
 +++ b/src/pch.c
-@@ -2459,9 +2459,6 @@ do_ed_script (char const *inname, char const *outname,
+@@ -2459,9 +2459,6 @@ do_ed_script (char const *inname, char c
 	    *outname_needs_removal = true;
 	    copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
 	  }
@ -23,7 +21,7 @@ index 4fd5a05..16e001a 100644
 	fflush (stdout);
 
 	pid = fork();
-@@ -2470,7 +2467,8 @@ do_ed_script (char const *inname, char const *outname,
+@@ -2470,7 +2467,8 @@ do_ed_script (char const *inname, char c
 	else if (pid == 0)
 	  {
 	    dup2 (tmpfd, 0);
@ -33,6 +31,3 @@ index 4fd5a05..16e001a 100644
 	    _exit (2);
 	  }
 	else
-- 
-cgit v1.0-41-gc330
-
--- a/devel/pkgconf/Makefile
+++ b/devel/pkgconf/Makefile
@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=pkgconf
-PKG_VERSION:=1.7.3
-PKG_RELEASE:=1
+PKG_VERSION:=1.7.4
+PKG_RELEASE:=$(AUTORELEASE)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://distfiles.dereferenced.org/pkgconf
-PKG_HASH:=b846aea51cf696c3392a0ae58bef93e2e72f8e7073ca6ad1ed8b01c85871f9c0
+PKG_HASH:=d73f32c248a4591139a6b17777c80d4deab6b414ec2b3d21d0a24be348c476ab

 PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
 PKG_LICENSE:=MIT
@ -57,7 +57,7 @@ MESON_ARGS += \

 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/libpkgconf
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libpkgconf/*.h $(1)/usr/include/libpkgconf/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/pkgconf/libpkgconf/*.h $(1)/usr/include/libpkgconf
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpkgconf.so* $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/share/aclocal/
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@ -8,15 +8,19 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=scons
-PKG_VERSION:=3.1.2
+PKG_VERSION:=4.0.1
+PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-local-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/scons
-PKG_HASH:=642e90860b746fa18fac08c7a22de6bfa86110ae7c56d7f136f7e5fb0d8f4f44
+PKG_HASH:=23c9d37a008b525bdedfe2666a28b9466c4c945d8ba379873cfd0b9006a3d618

+PKG_MAINTAINER:=
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=scons-LICENSE
-PKG_MAINTAINER:=
+
+PKG_HOST_ONLY:=1
+HOST_BUILD_PARALLEL:=1

 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
@ -27,7 +31,8 @@ define Package/scons
  SECTION:=devel
  CATEGORY:=Development
  TITLE:=scons
-  HIDDEN:=1
+  URL:=https://scons.org/
+  BUILDONLY:=1
 endef

 define Package/scons/description
--- a/devel/scons/patches/001-platform_env.patch
+++ b/devel/scons/patches/001-platform_env.patch
@ -1,6 +1,6 @@
--- a/scons-local-3.1.2/SCons/Platform/__init__.py
-+++ b/scons-local-3.1.2/SCons/Platform/__init__.py
-@@ -65,6 +65,8 @@ def platform_default():
+--- a/scons-local-4.0.1/SCons/Platform/__init__.py
+++ b/scons-local-4.0.1/SCons/Platform/__init__.py
+@@ -63,6 +63,8 @@ def platform_default():
     care about the machine architecture.
     """
     osname = os.name
--- a/devel/scons/patches/002-fix-import-path.patch
+++ b/devel/scons/patches/002-fix-import-path.patch
@ -0,0 +1,10 @@
+--- a/scons.py
+++ b/scons.py
+@@ -56,6 +56,7 @@ if script_path in sys.path:
+     sys.path.remove(script_path)
+ 
+ libs = []
+libs = [os.path.join(os.path.dirname(script_dir), 'lib', 'scons')]
+ 
+ if "SCONS_LIB_DIR" in os.environ:
+     libs.append(os.environ["SCONS_LIB_DIR"])
--- a/ipv6/generate-ipv6-address/Makefile
+++ b/ipv6/generate-ipv6-address/Makefile
@ -0,0 +1,38 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=generate-ipv6-address
+PKG_VERSION:=0.1
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE:=generate-ipv6-address-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/
+PKG_HASH:=e1356d245d5f891fa39b796a8a2deefdaa89f08130dc97a378738ca5ed9a20fa
+
+PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
+PKG_LICENSE:=MIT
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/generate-ipv6-address
+	SECTION:=net
+	CATEGORY:=Network
+	TITLE:=Generate IPv6 Addresses
+	URL:=https://www.irif.fr/~jch/
+	DEPENDS:=@IPV6
+endef
+
+define Package/generate-ipv6-address/description
+ Generates IPv6 addresses from a given prefix and either a given MAC-48
+ address (an Ethernet hardware address) or a randomly drawn host number.
+endef
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) $(PKG_BUILD_DIR)/generate-ipv6-address.c -o $(PKG_BUILD_DIR)/generate-ipv6-address
+endef
+
+define Package/generate-ipv6-address/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generate-ipv6-address $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,generate-ipv6-address))
--- a/ipv6/miredo/Makefile
+++ b/ipv6/miredo/Makefile
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=miredo
 PKG_VERSION:=1.2.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=miredo-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.remlab.net/files/miredo/
--- a/ipv6/miredo/patches/001-fix-musl-pthread-non-portable.patch
+++ b/ipv6/miredo/patches/001-fix-musl-pthread-non-portable.patch
@ -1,6 +1,6 @@
--- a/libteredo/debug.h	2009-02-28 23:17:14.000000000 +0300
-+++ b/libteredo/debug.h	2019-04-07 01:46:48.235087395 +0300
-@@ -43,8 +43,10 @@
+--- a/libteredo/debug.h
+++ b/libteredo/debug.h
+@@ -43,8 +43,10 @@ static inline void debug (const char *st
 #  ifdef __linux__
 #   include <errno.h>
 #   include <assert.h>
@ -13,7 +13,7 @@
 
 static inline int
 d_pthread_mutex_init (pthread_mutex_t *mutex, pthread_mutexattr_t *pattr)
-@@ -57,7 +59,7 @@
+@@ -57,7 +59,7 @@ d_pthread_mutex_init (pthread_mutex_t *m
 		pthread_mutexattr_init (&attr);
 	}
 
--- a/ipv6/miredo/patches/002-fix-redefinition-ethadr.patch
+++ b/ipv6/miredo/patches/002-fix-redefinition-ethadr.patch
@ -1,5 +1,5 @@
--- a/libtun6/tun6.c	2012-09-12 17:03:59.000000000 +0400
-+++ b/libtun6/tun6.c	2019-04-07 02:21:07.439952535 +0300
+--- a/libtun6/tun6.c
+++ b/libtun6/tun6.c
@@ -53,7 +53,7 @@
 const char os_driver[] = "Linux";
 # define USE_LINUX 1
@ -9,7 +9,7 @@
 /*
  * <linux/ipv6.h> conflicts with <netinet/in.h> and <arpa/inet.h>,
  * so we've got to declare this structure by hand.
-@@ -65,7 +65,7 @@
+@@ -65,7 +65,7 @@ struct in6_ifreq {
 };
 
 # include <net/route.h> // struct in6_rtmsg
@ -18,4 +18,3 @@
 
 typedef struct
 {
-
--- a/ipv6/miredo/patches/003-fix-warnings-portable-defined.patch
+++ b/ipv6/miredo/patches/003-fix-warnings-portable-defined.patch
@ -1,6 +1,6 @@
--- a/include/gettext.h	2012-09-12 16:57:52.000000000 +0400
-+++ b/include/gettext.h	2019-04-07 01:11:52.492519796 +0300
-@@ -182,7 +182,7 @@
+--- a/include/gettext.h
+++ b/include/gettext.h
+@@ -182,7 +182,7 @@ npgettext_aux (const char *domain,
   (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined(__STRICT_ANSI__)) \
    /* || __STDC_VERSION__ >= 199901L */ )
 
@ -9,7 +9,7 @@
 #include <stdlib.h>
 #endif
 
-@@ -206,7 +206,7 @@
+@@ -206,7 +206,7 @@ dcpgettext_expr (const char *domain,
   size_t msgctxt_len = strlen (msgctxt) + 1;
   size_t msgid_len = strlen (msgid) + 1;
   const char *translation;
@ -18,7 +18,7 @@
   char msg_ctxt_id[msgctxt_len + msgid_len];
 #else
   char buf[1024];
-@@ -221,7 +221,7 @@
+@@ -221,7 +221,7 @@ dcpgettext_expr (const char *domain,
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcgettext (domain, msg_ctxt_id, category);
@ -27,7 +27,7 @@
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-@@ -252,7 +252,7 @@
+@@ -252,7 +252,7 @@ dcnpgettext_expr (const char *domain,
   size_t msgctxt_len = strlen (msgctxt) + 1;
   size_t msgid_len = strlen (msgid) + 1;
   const char *translation;
@ -36,7 +36,7 @@
   char msg_ctxt_id[msgctxt_len + msgid_len];
 #else
   char buf[1024];
-@@ -267,7 +267,7 @@
+@@ -267,7 +267,7 @@ dcnpgettext_expr (const char *domain,
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
--- a/ipv6/miredo/patches/004-reproducible.patch
+++ b/ipv6/miredo/patches/004-reproducible.patch
@ -0,0 +1,26 @@
+From: Tomasz Buchert <tomasz@debian.org>
+Date: Fri, 6 Feb 2015 11:33:20 +0100
+Subject: Fix reproducibility issues
+
+We replace unreproducible CC macros with
+N/A placeholders. This fixes #776716.
+---
+ src/main.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/src/main.c
+++ b/src/main.c
+@@ -92,10 +92,11 @@ miredo_version (void)
+ #ifndef VERSION
+ # define VERSION "unknown version"
+ #endif
+	const char* UNKNOWN = "N/A";
+ 	printf (_("Miredo: Teredo IPv6 tunneling software %s (%s)\n"
+ 	          " built %s on %s (%s)\n"),
+-	        VERSION, PACKAGE_HOST, __DATE__,
+-	        PACKAGE_BUILD_HOSTNAME, PACKAGE_BUILD);
+	        VERSION, UNKNOWN, UNKNOWN,
+	        UNKNOWN, UNKNOWN);
+ 	printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
+ 	puts (_("Written by Remi Denis-Courmont.\n"));
+ 
--- a/ipv6/tayga/Makefile
+++ b/ipv6/tayga/Makefile
@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=tayga
 PKG_VERSION:=0.9.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=tayga-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.litech.org/tayga/
--- a/ipv6/tayga/patches/003-RFC8215.patch
+++ b/ipv6/tayga/patches/003-RFC8215.patch
@ -0,0 +1,13 @@
+--- a/addrmap.c
+++ b/addrmap.c
+@@ -44,7 +44,9 @@ int validate_ip4_addr(const struct in_ad
+ int validate_ip6_addr(const struct in6_addr *a)
+ {
+ 	/* Well-known prefix for NAT64 */
+-	if (a->s6_addr32[0] == WKPF && !a->s6_addr32[1] && !a->s6_addr32[2])
+        if (a->s6_addr32[0] == WKPF &&
+	   (!a->s6_addr32[1] || (a->s6_addr16[2] == htonl(0x0001)))
+	    && !a->s6_addr32[2])
+ 		return 0;
+ 
+ 	/* Reserved per RFC 2373 */
--- a/kernel/exfat-nofuse/Makefile
+++ b/kernel/exfat-nofuse/Makefile
@ -1,46 +0,0 @@
-#
-# Copyright (C) 2014 Bruno Randolf <br1@einfach.org>
-# Copyright (C) 2019 Yousong Zhou <yszhou4tech@gmail.com>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=exfat-nofuse
-PKG_RELEASE:=3
-
-PKG_SOURCE_URL:=https://github.com/dorimanx/exfat-nofuse.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2018-04-17
-PKG_SOURCE_VERSION:=01c30ad52625a7261e1b0d874553b6ca7af25966
-PKG_MIRROR_HASH:=47e3b6b8384e4beaa07dc762f4e0cce9a067750cbb4b2fb4ba18d2348038c270
-
-PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/fs-exfat0
-	SUBMENU:=Filesystems
-	TITLE:=ExFAT Kernel driver (deprecated)
-	FILES:=$(PKG_BUILD_DIR)/exfat.ko
-	AUTOLOAD:=$(call AutoLoad,30,exfat,1)
-	DEPENDS:=+kmod-nls-base @(LINUX_4_14||LINUX_4_19)
-endef
-
-define KernelPackage/fs-exfat0/description
-	Kernel module for ExFAT Filesytems
-endef
-
-define Build/Compile
-	$(KERNEL_MAKE) \
-		CONFIG_EXFAT_FS=m \
-		M="$(PKG_BUILD_DIR)" \
-		modules
-endef
-
-$(eval $(call KernelPackage,fs-exfat0))
--- a/kernel/exfat-nofuse/patches/0001-exfat_oal-use-get_seconds-directly.patch
+++ b/kernel/exfat-nofuse/patches/0001-exfat_oal-use-get_seconds-directly.patch
@ -1,31 +0,0 @@
-From c0d3452e0366e2ab4fc51e7981e48636facdf486 Mon Sep 17 00:00:00 2001
-From: Yousong Zhou <yszhou4tech@gmail.com>
-Date: Tue, 8 Jan 2019 15:45:26 +0000
-Subject: [PATCH 1/2] exfat_oal: use get_seconds() directly
-
---
- exfat_oal.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/exfat_oal.c b/exfat_oal.c
-index 7435442..83f8e4b 100644
--- a/exfat_oal.c
-+++ b/exfat_oal.c
-@@ -128,16 +128,9 @@ static time_t accum_days_in_year[] = {
- 
- TIMESTAMP_T *tm_current(TIMESTAMP_T *tp)
- {
-	struct timespec ts;
- 	time_t second, day, leap_day, month, year;
- 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
-	ts = CURRENT_TIME_SEC;
-#else
-	ktime_get_real_ts(&ts);
-#endif
-
-	second = ts.tv_sec;
-+	second = get_seconds();
- 	second -= sys_tz.tz_minuteswest * SECS_PER_MIN;
- 
- 	/* Jan 1 GMT 00:00:00 1980. But what about another time zone? */
--- a/kernel/exfat-nofuse/patches/0002-4.18.patch.patch
+++ b/kernel/exfat-nofuse/patches/0002-4.18.patch.patch
@ -1,42 +0,0 @@
-From 4b9607d6fd4a35d9bb35527fae7aac23d848c0ce Mon Sep 17 00:00:00 2001
-From: Yousong Zhou <yszhou4tech@gmail.com>
-Date: Tue, 8 Jan 2019 15:45:24 +0000
-Subject: [PATCH 2/2] 4.18.patch
-
-Imported from https://aur.archlinux.org/cgit/aur.git/plain/4.18.patch?h=exfat-dkms-git
---
- exfat_super.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/exfat_super.c b/exfat_super.c
-index 312de36..3ac18b0 100644
--- a/exfat_super.c
-+++ b/exfat_super.c
-@@ -147,8 +147,13 @@ static time_t accum_days_in_year[] = {
- static void _exfat_truncate(struct inode *inode, loff_t old_size);
- 
- /* Convert a FAT time/date pair to a UNIX date (seconds since 1 1 70). */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,01)
-+void exfat_time_fat2unix(struct exfat_sb_info *sbi, struct timespec64 *ts,
-+						 DATE_TIME_T *tp)
-+#else
- void exfat_time_fat2unix(struct exfat_sb_info *sbi, struct timespec *ts,
- 						 DATE_TIME_T *tp)
-+#endif
- {
- 	time_t year = tp->Year;
- 	time_t ld;
-@@ -166,8 +171,13 @@ void exfat_time_fat2unix(struct exfat_sb_info *sbi, struct timespec *ts,
- }
- 
- /* Convert linear UNIX date to a FAT time/date pair. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,01)
-+void exfat_time_unix2fat(struct exfat_sb_info *sbi, struct timespec64 *ts,
-+						 DATE_TIME_T *tp)
-+#else
- void exfat_time_unix2fat(struct exfat_sb_info *sbi, struct timespec *ts,
- 						 DATE_TIME_T *tp)
-+#endif	
- {
- 	time_t second = ts->tv_sec;
- 	time_t day, month, year;
--- a/kernel/ksmbd/Makefile
+++ b/kernel/ksmbd/Makefile
@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ksmbd
-PKG_VERSION:=3.2.2
+PKG_VERSION:=3.3.9
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/cifsd-team/cifsd/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=16ad304c09d5f04ddbe99d21ca9df8a9a6d8e35b21ff0e205f212f8c545b979b
+PKG_HASH:=c196d1773b9f89221133780fd189b550acbc56ac93c2e79260a70eab9853b3e1

 PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later
@ -37,7 +37,8 @@ define KernelPackage/fs-ksmbd
 		+kmod-crypto-sha512 \
 		+kmod-crypto-aead \
 		+kmod-crypto-ccm \
-		+kmod-crypto-gcm
+		+kmod-crypto-gcm \
+		+kmod-lib-crc32c
 endef

 define KernelPackage/fs-ksmbd/description
--- a/kernel/macremapper/Makefile
+++ b/kernel/macremapper/Makefile
@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=macremapper
 PKG_VERSION:=1.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/ewsi/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)?
--- a/kernel/macremapper/patches/02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch
+++ b/kernel/macremapper/patches/02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch
@ -0,0 +1,59 @@
+From 6126f8efebf659708245ba99df6b85d7c1260668 Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Sun, 31 Jan 2021 20:53:32 -0800
+Subject: [PATCH] mrm_ctlfile.c: compatibility with linux >= 5.6
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ kernelmod/mrm_ctlfile.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+--- a/kernelmod/mrm_ctlfile.c
+++ b/kernelmod/mrm_ctlfile.c
+@@ -13,6 +13,7 @@
+ #include "./macremapper_ioctl.h"
+ #include "./bufprintf.h"
+ 
+#include <linux/version.h>
+ #include <linux/proc_fs.h>
+ #include <linux/uaccess.h>
+ #include <linux/mutex.h>
+@@ -80,13 +81,14 @@ mrm_handle_read(struct file *f, char __u
+ }
+ 
+ static long
+-mrm_handle_ioctl(struct file *f, unsigned int type, void __user *param) {
+mrm_handle_ioctl(struct file *f, unsigned int type, unsigned long arg) {
+   union {
+     struct mrm_filter_config  filt_conf;
+     struct mrm_remap_entry    remap_entry;
+     unsigned                  count;
+   } u;
+   int rv;
+  void __user *param = (void __user *)arg;
+ 
+   mutex_lock(&_ctrl_mutex);
+ 
+@@ -159,6 +161,14 @@ fail_fault:
+ }
+ 
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
+static const struct proc_ops _fops = {
+	.proc_open	= mrm_handle_open,
+	.proc_release	= mrm_handle_release,
+	.proc_read	= mrm_handle_read,
+	.proc_ioctl	= mrm_handle_ioctl,
+};
+#else
+ static const struct file_operations _fops = {
+   owner:           THIS_MODULE,
+   open:            &mrm_handle_open,
+@@ -166,6 +176,7 @@ static const struct file_operations _fop
+   read:            &mrm_handle_read,
+   unlocked_ioctl:  (void*)&mrm_handle_ioctl,
+ };
+#endif
+ 
+ int mrm_init_ctlfile( void ) {
+   struct proc_dir_entry *pde;
--- a/kernel/mtd-rw/Makefile
+++ b/kernel/mtd-rw/Makefile
@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=mtd-rw
 PKG_VERSION:=git-20160214
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=c44db17c3e05079116a1704f277642c9ce6f5ca4fa380c60f7e6d44509dc16be
@ -29,6 +29,7 @@ define KernelPackage/mtd-rw
 	SUBMENU:=Other modules
 	TITLE:=Write-enabler for MTD partitions
 	FILES:=$(PKG_BUILD_DIR)/mtd-rw.ko
+	DEPENDS:=@!(TARGET_x86||TARGET_bcm27xx||TARGET_octeontx)
 endef

 define KernelPackage/mtd-rw/description
--- a/kernel/mtd-rw/patches/0001-mtd-disabled.patch
+++ b/kernel/mtd-rw/patches/0001-mtd-disabled.patch
@ -0,0 +1,24 @@
+--- a/mtd-rw.c
+++ b/mtd-rw.c
+@@ -54,7 +54,11 @@ MODULE_PARM_DESC(i_want_a_brick, "Make a
+ 
+ static int set_writeable(unsigned n, bool w)
+ {
+#ifndef CONFIG_MTD
+	struct mtd_info *mtd = -ENOSYS;
+#else
+ 	struct mtd_info *mtd = get_mtd_device(NULL, n);
+#endif
+ 	int err;
+ 
+ 	if (IS_ERR(mtd)) {
+@@ -76,7 +80,9 @@ static int set_writeable(unsigned n, boo
+ 		err = 0;
+ 	}
+ 
+#ifdef CONFIG_MTD
+ 	put_mtd_device(mtd);
+#endif
+ 	return err;
+ }
+ 
--- a/lang/node/Makefile
+++ b/lang/node/Makefile
@ -71,7 +71,7 @@ define Package/node/config
 	if PACKAGE_node
 	choice
 		prompt "i18n features"
-		default NODEJS_ICU_NONE
+		default NODEJS_ICU_SMALL
 		help
 		 Select i18n features

--- a/libs/alsa-lib/Makefile
+++ b/libs/alsa-lib/Makefile
@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=alsa-lib
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.2.4
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
 		http://distfiles.gentoo.org/distfiles/
-PKG_HASH:=d8e853d8805574777bbe40937812ad1419c9ea7210e176f0def3e6ed255ab3ec
+PKG_HASH:=f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7

 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
 		Peter Wagner <tripolar@gmx.at>
--- a/libs/alsa-lib/patches/300-snd_plugin.patch
+++ b/libs/alsa-lib/patches/300-snd_plugin.patch
@ -0,0 +1,27 @@
+From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Thu, 22 Oct 2020 20:57:32 +0200
+Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be
+ declared even for \!DL_ORIGIN_AVAILABLE
+
+Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
+BugLink: https://github.com/alsa-project/alsa-lib/issues/91
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ src/dlmisc.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/src/dlmisc.c
+++ b/src/dlmisc.c
+@@ -42,11 +42,9 @@
+ #ifndef PIC
+ struct snd_dlsym_link *snd_dlsym_start = NULL;
+ #endif
+-#ifdef DL_ORIGIN_AVAILABLE
+ static int snd_plugin_dir_set = 0;
+ static char *snd_plugin_dir = NULL;
+ #endif
+-#endif
+ 
+ #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
+ static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;
--- a/Show More
+++ b/Show More