diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0e4b4ce6..993915b9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,128 +1,218 @@ -# Contributing Guidelines +# Contributing Guidelines + Ref: 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: + 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 + `). 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 `). 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: ) -| 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 +``` diff --git a/admin/atop/Makefile b/admin/atop/Makefile index 4c3b4ff4..f7c0735e 100644 --- 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 +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 endef define Package/atop/description diff --git a/admin/atop/patches/010-makefile-missing-cflags.patch b/admin/atop/patches/010-makefile-missing-cflags.patch index 6754ff77..9d83c481 100644 --- 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 diff --git a/admin/atop/patches/020-limits.patch b/admin/atop/patches/020-limits.patch new file mode 100644 index 00000000..b1384b29 --- /dev/null +++ b/admin/atop/patches/020-limits.patch @@ -0,0 +1,10 @@ +--- a/photosyst.c ++++ b/photosyst.c +@@ -149,6 +149,7 @@ + ** + */ + ++#include + #include + #include + #include diff --git a/admin/backuppc/Makefile b/admin/backuppc/Makefile index 431e34bb..1217eb27 100644 --- 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 diff --git a/admin/backuppc/patches/001-debian-fixes.patch b/admin/backuppc/patches/001-debian-fixes.patch index 37017557..cd7de576 100644 --- 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 </ @@ -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 diff --git a/admin/debian-archive-keyring/Makefile b/admin/debian-archive-keyring/Makefile new file mode 100644 index 00000000..21c906af --- /dev/null +++ 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 +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)) diff --git a/admin/debootstrap/Makefile b/admin/debootstrap/Makefile index cf29b284..a00adcc0 100644 --- 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 PKG_LICENSE:=Unique diff --git a/admin/gkrellmd/patches/100-conf.patch b/admin/gkrellmd/patches/100-conf.patch index c4b9ea20..8716a31a 100644 --- 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 diff --git a/admin/ipmitool/Makefile b/admin/ipmitool/Makefile index 898e2e6c..bbe23494 100644 --- 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 \ diff --git 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 index 30948775..582e17d4 100644 --- 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 - diff --git 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 index cd4f7307..9690d879 100644 --- 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 - diff --git 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 index 91aed82f..db388e4e 100644 --- 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 - diff --git 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 index 65a40b02..c081cc53 100644 --- 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 - diff --git 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 index 7f2923fd..30807918 100644 --- 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 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 - diff --git 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 index 48fe5eeb..17341c98 100644 --- 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 - diff --git 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 index d694c925..2656dfcc 100644 --- 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 - diff --git 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 index 6d8cc154..00ecd427 100644 --- 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 - diff --git 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 index dd29993b..e4ea7734 100644 --- 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 - diff --git 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 index e7a79707..cf33f9d9 100644 --- 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 - diff --git 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 index 6cc5b7aa..2fd34d18 100644 --- 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 - diff --git a/admin/ipmitool/patches/0012-gcc10.patch b/admin/ipmitool/patches/0012-gcc10.patch new file mode 100644 index 00000000..1fba0b79 --- /dev/null +++ b/admin/ipmitool/patches/0012-gcc10.patch @@ -0,0 +1,33 @@ +From c3939dac2c060651361fc71516806f9ab8c38901 Mon Sep 17 00:00:00 2001 +From: Vaclav Dolezal +Date: Thu, 23 Jan 2020 11:26:32 +0100 +Subject: [PATCH] hpmfwupg: move variable definition to .c file + +Signed-off-by: Vaclav Dolezal +--- + 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); diff --git a/admin/monit/Makefile b/admin/monit/Makefile index 1c7d7195..f6ab3a43 100644 --- 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 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 endef define Package/monit/Default/description diff --git a/admin/muninlite/Makefile b/admin/muninlite/Makefile index 39e04307..f02a1083 100644 --- 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 PKG_LICENSE:=GPL-2.0-or-later diff --git a/admin/muninlite/files/etc/xinetd.d/muninlite b/admin/muninlite/files/etc/xinetd.d/muninlite index d62dc103..450a80d3 100644 --- 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 diff --git a/admin/netatop/patches/010-daemon-makefile-ldflags.patch b/admin/netatop/patches/010-daemon-makefile-ldflags.patch index 8601da87..5a9adc50 100644 --- 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) diff --git a/admin/netdata/Makefile b/admin/netdata/Makefile index d1b8d04e..d9361529 100644 --- 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 , Daniel Engberg @@ -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/ diff --git a/admin/netdata/patches/002-extra-patch-web_gui_index.html.patch b/admin/netdata/patches/002-extra-patch-web_gui_index.html.patch new file mode 100644 index 00000000..93f65376 --- /dev/null +++ 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 @@ + +