[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a7b4f847119660fd58a0da2652d56d5ffeff5e69
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via a7b4f847119660fd58a0da2652d56d5ffeff5e69 (commit) via 95539a589e51dc2b0793ae58c1cd35f5fe858320 (commit) via 642318cbaaea173d50315e8cbe3720ea1e79bb05 (commit) via 9d72f4b05932ef53f95b621ea9a40cfd7255cee7 (commit) from b88f6c476b45c173db54ce31d59dc42202c56e34 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit a7b4f847119660fd58a0da2652d56d5ffeff5e69 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Oct 25 16:59:08 2021 +0000
general-functions: remove comment that system_output also in speed.cgi
this functions was removed from speed.cgi by reading kernel netowrk statistics instead of parsing ip -s show ...
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 95539a589e51dc2b0793ae58c1cd35f5fe858320 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Oct 23 14:44:56 2021 +0200
Remove orphaned ddns patches
These are no longer necessary, since ddns 0.14 comes with both of them applied.
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 642318cbaaea173d50315e8cbe3720ea1e79bb05 Author: Adolf Belka adolf.belka@ipfire.org Date: Sat Oct 23 18:49:01 2021 +0200
git: Update to version 2.33.1
- Update from 2.31.0 to 2.33.1 - Update rootfile - Changelog is too long to show here. The details can be found in the 2.31.1.txt, 2.32.0.txt, 2.33.0.txt and 2.33.1.txt files in the Documentation/RelNotes directory in the source tarball
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 9d72f4b05932ef53f95b621ea9a40cfd7255cee7 Author: Adolf Belka adolf.belka@ipfire.org Date: Sat Oct 23 18:49:32 2021 +0200
htop: Update to version 3.1.1
- Update from 3.0.5 to 3.1.1 - Update of rootfile not required - Changelog is too long to include here. Full details can be found at https://github.com/htop-dev/htop/blob/main/ChangeLog
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/cfgroot/general-functions.pl | 1 - config/rootfiles/packages/git | 1 + lfs/git | 6 ++--- lfs/htop | 7 ++--- ...11-ddnss-fix-unhandled-exeption-on-update-patch | 30 ---------------------- ...13-ddnss-fix-unhandled-exeption-on-update-patch | 30 ---------------------- 6 files changed, 8 insertions(+), 67 deletions(-) delete mode 100644 src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch delete mode 100644 src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch
Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index c10a04faa..2f26ca12f 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -53,7 +53,6 @@ sub system_background($) { }
# Returns the output of a shell command -# if you change this also check speed.cgi that include a local copy for systemload reasons sub system_output($) { my @command = @_; my $pid; diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index 508e87f70..67e2015bc 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -26,6 +26,7 @@ usr/libexec/git-core/git-check-ignore usr/libexec/git-core/git-check-mailmap usr/libexec/git-core/git-check-ref-format usr/libexec/git-core/git-checkout +usr/libexec/git-core/git-checkout--worker usr/libexec/git-core/git-checkout-index usr/libexec/git-core/git-cherry usr/libexec/git-core/git-cherry-pick diff --git a/lfs/git b/lfs/git index 2290c6e99..59610a6a1 100644 --- a/lfs/git +++ b/lfs/git @@ -24,7 +24,7 @@
include Config
-VER = 2.31.0 +VER = 2.33.1
THISAPP = git-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 19 +PAK_VER = 20
DEPS = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c7f808ab107b666af45fccb56b9d9676 +$(DL_FILE)_MD5 = 3462f34d9c17288eee854b7645f6a0a1
install : $(TARGET)
diff --git a/lfs/htop b/lfs/htop index 0dfdf011f..277b6532e 100644 --- a/lfs/htop +++ b/lfs/htop @@ -24,7 +24,7 @@
include Config
-VER = 3.0.5 +VER = 3.1.1
THISAPP = htop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = htop -PAK_VER = 16 +PAK_VER = 17
DEPS =
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 780b79322cfc576a762c2dadb5575d04 +$(DL_FILE)_MD5 = 76ad907a6d43cf38c089e3e9b0100590
install : $(TARGET)
@@ -79,6 +79,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch b/src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch deleted file mode 100644 index 95f6391be..000000000 --- a/src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 7d0956d14ff8d823551ccd47ccf1492c9da9aac9 -Author: Stefan Schantl stefan.schantl@ipfire.org -Date: Mon May 25 18:00:51 2020 +0200 - - ProviderDDNSS: Fix unhandled exception on update - - In python > 3.3 the getheader() attribute is not longer part of the - urllib.response response.info() object. It is part of response object - and so directly can be accessed. - - Fixes #12328 - - Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index f1fed22..46d8a67 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -642,10 +642,8 @@ class DDNSProviderDDNSS(DDNSProvider): - response = self.send_request(self.url, data=data) - - # This provider sends the response code as part of the header. -- header = response.info() -- - # Get status information from the header. -- output = header.getheader('ddnss-response') -+ output = response.getheader('ddnss-response') - - # Handle success messages. - if output == "good" or output == "nochg": diff --git a/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch b/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch deleted file mode 100644 index 95f6391be..000000000 --- a/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 7d0956d14ff8d823551ccd47ccf1492c9da9aac9 -Author: Stefan Schantl stefan.schantl@ipfire.org -Date: Mon May 25 18:00:51 2020 +0200 - - ProviderDDNSS: Fix unhandled exception on update - - In python > 3.3 the getheader() attribute is not longer part of the - urllib.response response.info() object. It is part of response object - and so directly can be accessed. - - Fixes #12328 - - Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index f1fed22..46d8a67 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -642,10 +642,8 @@ class DDNSProviderDDNSS(DDNSProvider): - response = self.send_request(self.url, data=data) - - # This provider sends the response code as part of the header. -- header = response.info() -- - # Get status information from the header. -- output = header.getheader('ddnss-response') -+ output = response.getheader('ddnss-response') - - # Handle success messages. - if output == "good" or output == "nochg":
hooks/post-receive -- IPFire 2.x development tree
-
Arne Fitzenreiter