Development July 2021

development@lists.ipfire.org

12 participants
102 discussions

[PATCH] cdrom: Compress file system image using Zstandard
by Michael Tremer 13 Jul '21

13 Jul '21

This patch uses the new Zstandard algorithm to compress the file system image on the ISO image. This comes with these advantages: * Compression is about twice as fast than XZ with the parameters we have selected here * We use a lot less memory during compression and can therefore utilise all processor cores of the build machines * Decompression (when installing IPFire and when creating the flash-image) is substantically faster The downside is that the generated ISO image is slighty larger (~10MiB) which I am okay with as a trade-off for the points mentioned above. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- lfs/Config | 5 +++++ lfs/cdrom | 2 +- lfs/flash-images | 2 +- src/installer/dracut-module/module-setup.sh | 2 +- src/installer/main.c | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lfs/Config b/lfs/Config index f0139e1c5..a2d3cddc5 100644 --- a/lfs/Config +++ b/lfs/Config @@ -81,6 +81,11 @@ TAR_OPTIONS = \ --acls \ --xattrs --xattrs-include='*' +ZSTD_OPTIONS = \ + -T$(PARALLELISM) \ + -19 \ + --long + # URLs that are common sources of downloads. If you're having trouble with # a site you should change its URL to that of a suitable mirror site. # diff --git a/lfs/cdrom b/lfs/cdrom index c58fc0885..18c63c79b 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -165,7 +165,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -C / --files-from=$(DIR_TMP)/ROOTFILES | tar $(TAR_OPTIONS) -x -C $(DIR_TMP)/root rm -f $(DIR_TMP)/ROOTFILES mkdir $(DIR_TMP)/root/sys - cd $(DIR_TMP)/root && tar $(TAR_OPTIONS) -cf - * | xz $(XZ_OPT) > $(DIR_TMP)/cdrom/distro.img + cd $(DIR_TMP)/root && tar $(TAR_OPTIONS) -cf - * | zstd $(ZSTD_OPTIONS) > $(DIR_TMP)/cdrom/distro.img rm -rf $(DIR_TMP)/root # Other files diff --git a/lfs/flash-images b/lfs/flash-images index 15398d051..72e635073 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -152,7 +152,7 @@ endif # Install IPFire ifneq "$(BUILD_PLATFORM)" "arm" - tar $(TAR_OPTIONS) -x --xz -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img + tar $(TAR_OPTIONS) -x --zstd -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img else tar $(TAR_OPTIONS) -x -C $(MNThdd)/ -f $(DIR_TMP)/cdrom/distro.img endif diff --git a/src/installer/dracut-module/module-setup.sh b/src/installer/dracut-module/module-setup.sh index ef4b15bdc..29ec4c0d7 100755 --- a/src/installer/dracut-module/module-setup.sh +++ b/src/installer/dracut-module/module-setup.sh @@ -33,7 +33,7 @@ install() { instmods ext4 iso9660 reiserfs vfat xfs # Extraction - inst_multiple tar gzip lzma xz + inst_multiple tar gzip zstd # Networking inst_multiple dhcpcd ethtool hostname ip ping sort wget diff --git a/src/installer/main.c b/src/installer/main.c index 00d172888..7a172e4ae 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -781,7 +781,7 @@ int main(int argc, char *argv[]) { // Extract files... snprintf(commandstring, STRING_SIZE, - "/bin/tar --acls --xattrs --xattrs-include='*' -C /harddisk -xvf /cdrom/distro.img --xz 2>/dev/null"); + "/bin/tar --acls --xattrs --xattrs-include='*' -C /harddisk -xvf /cdrom/distro.img --zstd 2>/dev/null"); if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT, _("Installing the system..."), logfile)) { -- 2.20.1

1 0

[PATCH] installer: Fix reading /proc/cmdline when launched by GRUB
by Michael Tremer 13 Jul '21

13 Jul '21

The installer was reading the kernel command line and was looking for certain values which configured the installer. GRUB appended a trailing newline character which was not accounted for and caused that the last parameter was not correctly compared to the list of possible keys. Fixes: #12656 - core 157: unattended installation don't work as expected on EFI Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- src/installer/main.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/installer/main.c b/src/installer/main.c index 00d172888..fd20a1f37 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -290,18 +290,23 @@ static struct config { .language = DEFAULT_LANG, }; -static void parse_command_line(struct config* c) { +static void parse_command_line(FILE* flog, struct config* c) { char buffer[STRING_SIZE]; char cmdline[STRING_SIZE]; FILE* f = fopen("/proc/cmdline", "r"); - if (!f) + if (!f) { + fprintf(flog, "Could not open /proc/cmdline: %m"); return; + } int r = fread(&cmdline, 1, sizeof(cmdline) - 1, f); if (r > 0) { - char* token = strtok(cmdline, " "); + // Remove the trailing newline + if (cmdline[r-1] == '\n') + cmdline[r-1] = '\0'; + char* token = strtok(cmdline, " "); while (token) { strncpy(buffer, token, sizeof(buffer)); char* val = buffer; @@ -403,7 +408,7 @@ int main(int argc, char *argv[]) { snprintf(title, sizeof(title), "%s - %s", DISTRO_NAME, DISTRO_SLOGAN); // Parse parameters from the kernel command line - parse_command_line(&config); + parse_command_line(flog, &config); if (config.unattended) { splashWindow(title, _("Warning: Unattended installation will start in 10 seconds..."), 10); -- 2.20.1

1 0

[PATCH 1/3] ovpnmain.cgi: Join certificate output before &Header::cleanhtml();
by Michael Tremer 13 Jul '21

13 Jul '21

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- html/cgi-bin/ovpnmain.cgi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 7a2833ce6..3cd2f9381 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1532,8 +1532,8 @@ END &Header::openbigbox('100%', 'LEFT', '', $errormessage); &Header::openbox('100%', 'LEFT', "$Lang::tr{'ca certificate'}:"); my @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem"); - @output = &Header::cleanhtml(@output,"y"); - print "<pre>@output</pre>\n"; + my $output = &Header::cleanhtml(join("", @output),"y"); + print "<pre>$output</pre>\n"; &Header::closebox(); print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox(); @@ -1652,8 +1652,8 @@ END &Header::openbox('100%', 'LEFT', "$Lang::tr{'host certificate'}:"); @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/certs/servercert.pem"); } - @output = &Header::cleanhtml(@output,"y"); - print "<pre>@output</pre>\n"; + my $output = &Header::cleanhtml(join("", @output), "y"); + print "<pre>$output</pre>\n"; &Header::closebox(); print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox(); @@ -2616,8 +2616,8 @@ else &Header::openbigbox('100%', 'LEFT', '', ''); &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate'}:"); my @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); - @output = &Header::cleanhtml(@output,"y"); - print "<pre>@output</pre>\n"; + my $output = &Header::cleanhtml(join("", @output), "y"); + print "<pre>$output</pre>\n"; &Header::closebox(); print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox(); @@ -2638,8 +2638,8 @@ else &Header::openbigbox('100%', 'LEFT', '', ''); &Header::openbox('100%', 'LEFT', "$Lang::tr{'dh'}:"); my @output = &General::system_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem"); - @output = &Header::cleanhtml(@output,"y"); - print "<pre>@output</pre>\n"; + my $output = &Header::cleanhtml(join("", @output) ,"y"); + print "<pre>$output</pre>\n"; &Header::closebox(); print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox(); @@ -2664,8 +2664,8 @@ else my @output = <FILE>; close(FILE); - @output = &Header::cleanhtml(@output,"y"); - print "<pre>@output</pre>\n"; + my $output = &Header::cleanhtml(join("", @output),"y"); + print "<pre>$output</pre>\n"; &Header::closebox(); print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox(); @@ -2687,8 +2687,8 @@ else &Header::openbigbox('100%', 'LEFT', '', ''); &Header::openbox('100%', 'LEFT', "$Lang::tr{'crl'}:"); my @output = &General::system_output("/usr/bin/openssl", "crl", "-text", "-noout", "-in", "${General::swroot}/ovpn/crls/cacrl.pem"); - @output = &Header::cleanhtml(@output,"y"); - print "<pre>@output</pre>\n"; + my $output = &Header::cleanhtml(join("", @output), "y"); + print "<pre>$output</pre>\n"; &Header::closebox(); print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox(); -- 2.31.0

1 2

[PATCH] aws: Enable serial console by default
by Michael Tremer 13 Jul '21

13 Jul '21

AWS for some time now has a serial console feature which is enabled by default on all systems. The VGA console is not enabled for any new non-x86 instance types and not interactive. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- src/initscripts/system/partresize | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize index 20044b083..4fa1906d0 100644 --- a/src/initscripts/system/partresize +++ b/src/initscripts/system/partresize @@ -45,8 +45,9 @@ case "${1}" in esac fi - # Enable the serial console on all systems on Azure and Google Compute Platform - if running_on_azure || running_on_gcp; then + # Enable the serial console on all systems on AWS EC2, Azure + # and Google Compute Platform + if running_on_ec2 || running_on_azure || running_on_gcp; then scon="on" fi -- 2.20.1

1 0

[PATCH] make.sh: Explicitely call zstd to extract toolchain
by Michael Tremer 12 Jul '21

12 Jul '21

Some older versions of tar do not recognise Zstandard, yet. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 7bdeeaf62..13a48f461 100755 --- a/make.sh +++ b/make.sh @@ -1735,7 +1735,7 @@ build) PACKAGENAME=${PACKAGE%.tar.zst} print_build_stage "Packaged toolchain compilation" if [ `md5sum $PACKAGE | awk '{print $1}'` == `cat $PACKAGENAME.md5 | awk '{print $1}'` ]; then - tar axf $PACKAGE + zstd -d < "${PACKAGE}" | tar x prepareenv else exiterror "$PACKAGENAME md5 did not match, check downloaded package" -- 2.26.2

2 1

[PATCH] ddns: Update to 014.
by Stefan Schantl 12 Jul '21

12 Jul '21

This is a major update to the latest available version of ddns. Remove patches which are part of the upstream release. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- lfs/ddns | 11 +- ...13-add-option-to-list-token-provider.patch | 292 ------------------ src/patches/ddns-013-duckdns-new-api.patch | 83 ----- src/patches/ddns-013-dyfi-use-https.patch | 22 -- ...13-fix-argparse-list-token-providers.patch | 23 -- .../ddns-013-proper-encode-string.patch | 24 -- 6 files changed, 3 insertions(+), 452 deletions(-) delete mode 100644 src/patches/ddns-013-add-option-to-list-token-provider.patch delete mode 100644 src/patches/ddns-013-duckdns-new-api.patch delete mode 100644 src/patches/ddns-013-dyfi-use-https.patch delete mode 100644 src/patches/ddns-013-fix-argparse-list-token-providers.patch delete mode 100644 src/patches/ddns-013-proper-encode-string.patch diff --git a/lfs/ddns b/lfs/ddns index 538cf7256..b1d0f2dbb 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -24,7 +24,7 @@ include Config -VER = 013 +VER = 014 THISAPP = ddns-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a988a808a08c810c41964ac6b0febbeb +$(DL_FILE)_MD5 = f10f7dfb29bd159db10e7a52c0a91d72 install : $(TARGET) @@ -72,12 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) # Apply upstream patches. - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-dyfi-use-https.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-duckdns-new-api.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-add-option-to-list-token-provider.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-proper-encode-string.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-fix-argparse-list-token-providers.patch + # No upstream patches at the moment. cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure \ diff --git a/src/patches/ddns-013-add-option-to-list-token-provider.patch b/src/patches/ddns-013-add-option-to-list-token-provider.patch deleted file mode 100644 index 7603422a2..000000000 --- a/src/patches/ddns-013-add-option-to-list-token-provider.patch +++ /dev/null @@ -1,292 +0,0 @@ -commit 287b2bfe7bf5e0639da9227a8c7893ce40d298ae -Author: Stefan Schantl <stefan.schantl(a)ipfire.org> -Date: Wed Dec 2 20:31:19 2020 +0100 - - Add option to list provider with token support. - - This option can be used to get a list of all known provider which support - a token based authentication method. - - In order to provide this feature the provider details has been extended - to contain the information if a provider supports this authentication - method or not. - - Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> - -diff --git a/ddns.in b/ddns.in -old mode 100644 -new mode 100755 -index 0e377e7..538e4b0 ---- a/ddns.in -+++ b/ddns.in -@@ -49,6 +49,10 @@ def main(): - p_list_providers = subparsers.add_parser("list-providers", - help=_("List all available providers")) - -+ # list-token-provider -+ p_list_token_provider = subparsers.add_parser("list-token-provider", -+ help=_("List all providers which supports authentication via token")) -+ - # update - p_update = subparsers.add_parser("update", help=_("Update DNS record")) - p_update.add_argument("hostname") -@@ -85,6 +89,10 @@ def main(): - provider_names = d.get_provider_names() - print("\n".join(provider_names)) - -+ elif args.subparsers_name == "list-token-providers": -+ token_provider = d.get_provider_with_token_support() -+ print("\n".join(token_provider)) -+ - elif args.subparsers_name == "update": - d.updateone(hostname=args.hostname, force=args.force) - -diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py -index 3e43fa7..ca232bf 100644 ---- a/src/ddns/__init__.py -+++ b/src/ddns/__init__.py -@@ -86,6 +86,20 @@ class DDNSCore(object): - """ - return sorted(self.providers.keys()) - -+ def get_provider_with_token_support(self): -+ """ -+ Returns a list with names of all registered providers -+ which support token based authtentication. -+ """ -+ -+ token_provider = [] -+ -+ for handle, provider in sorted(self.providers.items()): -+ if provider.supports_token_auth is True: -+ token_provider.append(handle) -+ -+ return sorted(token_provider) -+ - def load_configuration(self, filename): - logger.debug(_("Loading configuration file %s") % filename) - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index a1ca3f3..b0066d5 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -73,6 +73,10 @@ class DDNSProvider(object): - # Required to remove AAAA records if IPv6 is absent again. - can_remove_records = True - -+ # True if the provider supports authentication via a random -+ # generated token instead of username and password. -+ supports_token_auth = True -+ - @staticmethod - def supported(): - """ -@@ -352,6 +356,10 @@ class DDNSProtocolDynDNS2(object): - # The DynDNS protocol version 2 does not allow to remove records - can_remove_records = False - -+ # The DynDNS protocol version 2 only supports authentication via -+ # username and password. -+ supports_token_auth = False -+ - def prepare_request_data(self, proto): - data = { - "hostname" : self.hostname, -@@ -440,6 +448,7 @@ class DDNSProviderAllInkl(DDNSProvider): - - url = "http://dyndns.kasserver.com" - can_remove_records = False -+ supports_token_auth = False - - def update(self): - # There is no additional data required so we directly can -@@ -464,6 +473,8 @@ class DDNSProviderBindNsupdate(DDNSProvider): - - DEFAULT_TTL = 60 - -+ supports_token_auth = False -+ - @staticmethod - def supported(): - # Search if the nsupdate utility is available -@@ -550,6 +561,7 @@ class DDNSProviderChangeIP(DDNSProvider): - - url = "https://nic.changeip.com/nic/update" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - data = { -@@ -616,6 +628,7 @@ class DDNSProviderDDNSS(DDNSProvider): - - url = "http://www.ddnss.de/upd.php" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - data = { -@@ -678,6 +691,7 @@ class DDNSProviderDHS(DDNSProvider): - - url = "http://members.dhs.org/nic/hosts" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - data = { -@@ -710,6 +724,7 @@ class DDNSProviderDNSpark(DDNSProvider): - - url = "https://control.dnspark.com/api/dynamic/update.php" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - data = { -@@ -758,6 +773,7 @@ class DDNSProviderDtDNS(DDNSProvider): - - url = "https://www.dtdns.com/api/autodns.cfm" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - data = { -@@ -813,6 +829,7 @@ class DDNSProviderDuckDNS(DDNSProvider): - - url = "https://www.duckdns.org/update" - can_remove_records = False -+ supports_token_auth = True - - def update(self): - # Raise an error if no auth details are given. -@@ -914,6 +931,7 @@ class DDNSProviderDynUp(DDNSProvider): - - url = "https://dynup.de/dyn.php" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - data = { -@@ -979,6 +997,8 @@ class DDNSProviderEasyDNS(DDNSProvider): - - url = "http://api.cp.easydns.com/dyn/tomato.php" - -+ supports_token_auth = False -+ - def update_protocol(self, proto): - data = { - "myip" : self.get_address(proto, "-"), -@@ -1032,6 +1052,7 @@ class DDNSProviderDynsNet(DDNSProvider): - website = "http://www.dyns.net/" - protocols = ("ipv4",) - can_remove_records = False -+ supports_token_auth = False - - # There is very detailed informatio about how to send the update request and - # the possible response codes. (Currently we are using the v1.1 proto) -@@ -1083,6 +1104,7 @@ class DDNSProviderEnomCom(DDNSResponseParserXML, DDNSProvider): - - url = "https://dynamic.name-services.com/interface.asp" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - data = { -@@ -1125,6 +1147,7 @@ class DDNSProviderEntryDNS(DDNSProvider): - # here: https://entrydns.net/help - url = "https://entrydns.net/records/modify" - can_remove_records = False -+ supports_token_auth = True - - def update_protocol(self, proto): - data = { -@@ -1165,6 +1188,7 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider): - # page. All used values have been collected by testing. - url = "https://freedns.afraid.org/dynamic/update.php" - can_remove_records = False -+ supports_token_auth = True - - def update_protocol(self, proto): - data = { -@@ -1246,6 +1270,7 @@ class DDNSProviderKEYSYSTEMS(DDNSProvider): - - url = "https://dynamicdns.key-systems.net/update.php" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - address = self.get_address(proto) -@@ -1297,6 +1322,8 @@ class DDNSProviderLightningWireLabs(DDNSProvider): - # Information about the format of the HTTPS request is to be found - # https://dns.lightningwirelabs.com/knowledge-base/api/ddns - -+ supports_token_auth = True -+ - url = "https://dns.lightningwirelabs.com/update" - - def update(self): -@@ -1365,6 +1392,7 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider): - - url = "https://dynamicdns.park-your-domain.com/update" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - # Namecheap requires the hostname splitted into a host and domain part. -@@ -1458,6 +1486,8 @@ class DDNSProviderNsupdateINFO(DDNSProtocolDynDNS2, DDNSProvider): - # has not been implemented here, yet. - can_remove_records = False - -+ supports_token_auth = True -+ - # After a failed update, there will be no retries - # https://bugzilla.ipfire.org/show_bug.cgi?id=10603 - holdoff_failure_days = None -@@ -1534,6 +1564,7 @@ class DDNSProviderRegfish(DDNSProvider): - - url = "https://dyndns.regfish.de/" - can_remove_records = False -+ supports_token_auth = True - - def update(self): - data = { -@@ -1630,6 +1661,7 @@ class DDNSProviderServercow(DDNSProvider): - - url = "https://www.servercow.de/dnsupdate/update.php" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - data = { -@@ -1671,6 +1703,8 @@ class DDNSProviderSPDNS(DDNSProtocolDynDNS2, DDNSProvider): - - url = "https://update.spdyn.de/nic/update" - -+ supports_token_auth = True -+ - @property - def username(self): - return self.get("username") or self.hostname -@@ -1774,6 +1808,8 @@ class DDNSProviderZoneedit(DDNSProvider): - website = "http://www.zoneedit.com" - protocols = ("ipv4",) - -+ supports_token_auth = False -+ - # Detailed information about the request and the response codes can be - # obtained here: - # http://www.zoneedit.com/doc/api/other.html -@@ -1821,6 +1857,7 @@ class DDNSProviderDNSmadeEasy(DDNSProvider): - - url = "https://cp.dnsmadeeasy.com/servlet/updateip?" - can_remove_records = False -+ supports_token_auth = False - - def update_protocol(self, proto): - data = { -@@ -1871,6 +1908,7 @@ class DDNSProviderZZZZ(DDNSProvider): - - url = "https://zzzz.io/api/v1/update" - can_remove_records = False -+ supports_token_auth = True - - def update_protocol(self, proto): - data = { diff --git a/src/patches/ddns-013-duckdns-new-api.patch b/src/patches/ddns-013-duckdns-new-api.patch deleted file mode 100644 index a671bf917..000000000 --- a/src/patches/ddns-013-duckdns-new-api.patch +++ /dev/null @@ -1,83 +0,0 @@ -commit ebdb37245e2033b065cce5a19597be4ef1c8875c -Author: Carl Mascott <cmascott(a)yahoo.com> -Date: Wed Dec 2 11:39:20 2020 +0100 - - DuckDNS: Update to use new API. - - The new API supports IPv6 and a token based auth. - - Reference #12415. - - Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index 46d8a67..a1ca3f3 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -802,16 +802,62 @@ class DDNSProviderDtDNS(DDNSProvider): - raise DDNSUpdateError - - --class DDNSProviderDuckDNS(DDNSProtocolDynDNS2, DDNSProvider): -+class DDNSProviderDuckDNS(DDNSProvider): - handle = "duckdns.org" - name = "Duck DNS" - website = "http://www.duckdns.org/" -- protocols = ("ipv4",) -+ protocols = ("ipv6", "ipv4",) - - # Information about the format of the request is to be found -- # https://www.duckdns.org/install.jsp -+ # https://www.duckdns.org/spec.jsp -+ -+ url = "https://www.duckdns.org/update" -+ can_remove_records = False -+ -+ def update(self): -+ # Raise an error if no auth details are given. -+ if not self.token: -+ raise DDNSConfigurationError -+ -+ data = { -+ "domains" : self.hostname, -+ "token" : self.token, -+ } -+ -+ # Check if we update an IPv4 address. -+ address4 = self.get_address("ipv4") -+ if address4: -+ data["ip"] = address4 - -- url = "https://www.duckdns.org/nic/update" -+ # Check if we update an IPv6 address. -+ address6 = self.get_address("ipv6") -+ if address6: -+ data["ipv6"] = address6 -+ -+ # Raise an error if no address is given. -+ if "ip" not in data and "ipv6" not in data: -+ raise DDNSConfigurationError -+ -+ # Send update to the server. -+ response = self.send_request(self.url, data=data) -+ -+ # Get the full response message. -+ output = response.read().decode() -+ -+ # Remove all leading and trailing whitespace. -+ output = output.strip() -+ -+ # Handle success messages. -+ if output == "OK": -+ return -+ -+ # The provider does not give detailed information -+ # if the update fails. Only a "KO" will be sent back. -+ if output == "KO": -+ raise DDNSUpdateError -+ -+ # If we got here, some other update error happened. -+ raise DDNSUpdateError - - - class DDNSProviderDyFi(DDNSProtocolDynDNS2, DDNSProvider): diff --git a/src/patches/ddns-013-dyfi-use-https.patch b/src/patches/ddns-013-dyfi-use-https.patch deleted file mode 100644 index f131c5b24..000000000 --- a/src/patches/ddns-013-dyfi-use-https.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit ce6e977f0ace7fe468411270ad07f1824a3aeaec -Author: Mauno Pirnes <mauno.pirnes(a)hotmail.com> -Date: Fri Feb 7 12:25:00 2020 +0100 - - dy.fi: Use HTTPS to perform updates. - - Signed-off-by: Mauno Pirnes <mauno.pirnes(a)hotmail.com> - Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index dcdc5da..f1fed22 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -826,7 +826,7 @@ class DDNSProviderDyFi(DDNSProtocolDynDNS2, DDNSProvider): - # https://www.dy.fi/page/clients?lang=en - # https://www.dy.fi/page/specification?lang=en - -- url = "http://www.dy.fi/nic/update" -+ url = "https://www.dy.fi/nic/update" - - # Please only send automatic updates when your IP address changes, - # or once per 5 to 6 days to refresh the address mapping (they will diff --git a/src/patches/ddns-013-fix-argparse-list-token-providers.patch b/src/patches/ddns-013-fix-argparse-list-token-providers.patch deleted file mode 100644 index 065dbb666..000000000 --- a/src/patches/ddns-013-fix-argparse-list-token-providers.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 5e075681008174839a47cae698ae459c0ea3a30a -Author: Stefan Schantl <stefan.schantl(a)ipfire.org> -Date: Wed May 12 19:59:01 2021 +0200 - - Fix argsparse string for listing token providers. - - Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> - -diff --git a/ddns.in b/ddns.in -index 538e4b0..20edd28 100755 ---- a/ddns.in -+++ b/ddns.in -@@ -49,8 +49,8 @@ def main(): - p_list_providers = subparsers.add_parser("list-providers", - help=_("List all available providers")) - -- # list-token-provider -- p_list_token_provider = subparsers.add_parser("list-token-provider", -+ # list-token-providers -+ p_list_token_provider = subparsers.add_parser("list-token-providers", - help=_("List all providers which supports authentication via token")) - - # update diff --git a/src/patches/ddns-013-proper-encode-string.patch b/src/patches/ddns-013-proper-encode-string.patch deleted file mode 100644 index b101913e8..000000000 --- a/src/patches/ddns-013-proper-encode-string.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 27aea61ba3c8e561c4a5921aeb0ea0986d4d234c -Author: Johannes Schwietzke <johannes.schwietzke(a)web.de> -Date: Tue Dec 29 12:07:19 2020 +0100 - - providers.py: Proper encode string. - - Python 3 memoryview requires an encoded string. - - Signed-off-by: Johannes Schwietzke <johannes.schwietzke(a)web.de> - Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index b0066d5..56e6620 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -547,7 +547,7 @@ class DDNSProviderBindNsupdate(DDNSProvider): - - logger.debug(" %s" % line) - -- return "\n".join(scriptlet) -+ return "\n".join(scriptlet).encode() - - - class DDNSProviderChangeIP(DDNSProvider): -- 2.30.2

1 0

[PATCH] ddns: Add upstream patch to add support for he.net
by Stefan Schantl 12 Jul '21

12 Jul '21

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- lfs/ddns | 1 + src/patches/ddns-013-add-he-net.patch | 36 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 src/patches/ddns-013-add-he-net.patch diff --git a/lfs/ddns b/lfs/ddns index 538cf7256..0ad7a3e92 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-add-option-to-list-token-provider.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-proper-encode-string.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-fix-argparse-list-token-providers.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-add-he-net.patch cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure \ diff --git a/src/patches/ddns-013-add-he-net.patch b/src/patches/ddns-013-add-he-net.patch new file mode 100644 index 000000000..752f32909 --- /dev/null +++ b/src/patches/ddns-013-add-he-net.patch @@ -0,0 +1,36 @@ +commit a026b2734b73ef177686ab36c66743ae58bdef56 +Author: Jhon Crowley <jcrowley(a)biznetix.net> +Date: Sun Jul 11 11:36:37 2021 +0200 + + Add support for he.net + + Signed-off-by: Jhon Crowley <jcrowley(a)biznetix.net> + Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> + +diff --git a/src/ddns/providers.py b/src/ddns/providers.py +index 56e6620..2f1804b 100644 +--- a/src/ddns/providers.py ++++ b/src/ddns/providers.py +@@ -1218,6 +1218,22 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider): + raise DDNSUpdateError + + ++class DDNSProviderHENet(DDNSProtocolDynDNS2, DDNSProvider): ++ handle = "he.net" ++ name = "he.net" ++ website = "https://he.net" ++ protocols = ("ipv6", "ipv4",) ++ ++ # Detailed information about the update api can be found here. ++ # http://dns.he.net/docs.html ++ ++ url = "https://dyn.dns.he.net/nic/update" ++ @property ++ def username(self): ++ return self.get("hostname") ++ ++ ++ + class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider): + handle = "inwx.com" + name = "INWX" -- 2.30.2

1 1

[PATCH 1/3] firewall.cgi: Remove faulty assignments for selected hash.
by Stefan Schantl 11 Jul '21

11 Jul '21

The removed assignments are wrong because both are trying to assign something different to the same key and will overwrite each other. Secondary the assignment to the hash is not needed at this place, so it safely can be removed. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- html/cgi-bin/firewall.cgi | 2 -- 1 file changed, 2 deletions(-) diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 70dee8d3c..d3cddfa23 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1022,8 +1022,6 @@ sub gen_dd_block $checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} = 'CHECKED'; $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected'; $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected'; - $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected'; - $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; print<<END; <table width='100%' border='0'> <tr><td width='50%' valign='top'> -- 2.30.2

1 2

Unable to build current "next" branch
by Peter Müller 11 Jul '21

11 Jul '21

Hello development folks, is anybody else unable to build current "next" branch as well? On my workstation, ./make.sh build requires a toolchain to be present (unless memories fail me, I thought it was possible to compile IPFire 2.x without a toolchain). After having executed ./make.sh gettoolchain, tar complains about the downloaded toolchain not looking like a tar archive - presumably because the toolchain archive uses zstd now, and tar does not recognise this format. In addition, some issues around chroot and env arise here as well: > Jul 11 11:33:07: Building stage2 chroot: failed to run command 'env': No such file or directory Cleaning cache directories and the entire ipfire-2.x Git repository accomplishes nothing. I guess this will be a lazy Sunday then... :-) Thanks, and best regards, Peter Müller

4 5

Doing a push to my user git repository
by Adolf Belka 11 Jul '21

11 Jul '21

Hi All, Sorry for my lack of activities over the last period but I had some non-computing issues to deal with. Back again now and starting to look through some previous stuff. The user git repository that I have available. Reading through the wiki it looks like I need to use ssh to access it and do a push of any local changes to my user repository. I have created an ssh key but the public file will need to be put into the git repository server. Do I just need to send the public key to this distribution list or is there some other process to get it added. Regards, Adolf.

2 8

← Newer
1
...
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development July 2021