IPFire-SCM July 2021

ipfire-scm@lists.ipfire.org

1 participants
43 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5621b0ef0a6b7e36966d9183979538ab5a0b08b5
by Arne Fitzenreiter 14 Jul '21

14 Jul '21

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 5621b0ef0a6b7e36966d9183979538ab5a0b08b5 (commit) from 646d6b0670e2b56d007675ad2db1ac7670850382 (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 5621b0ef0a6b7e36966d9183979538ab5a0b08b5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 13 16:27:59 2021 +0000 cdrom: Compress file system image using Zstandard 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> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: 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(-) Difference in files: 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 fd20a1f37..bc0fdaa67 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -786,7 +786,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)) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 646d6b0670e2b56d007675ad2db1ac7670850382
by Arne Fitzenreiter 14 Jul '21

14 Jul '21

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 646d6b0670e2b56d007675ad2db1ac7670850382 (commit) via 618b9f3a7650b9f9d41dd0b5b34bf0758146e410 (commit) from faec72df5d9f18703bdcd5d655171558b671a4bc (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 646d6b0670e2b56d007675ad2db1ac7670850382 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 13 15:44:20 2021 +0000 installer: Fix reading /proc/cmdline when launched by GRUB 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> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 618b9f3a7650b9f9d41dd0b5b34bf0758146e410 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 13 10:11:31 2021 +0000 aws: Enable serial console by default 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> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/system/partresize | 5 +++-- src/installer/main.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) Difference in files: 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 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); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. faec72df5d9f18703bdcd5d655171558b671a4bc
by Arne Fitzenreiter 14 Jul '21

14 Jul '21

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 faec72df5d9f18703bdcd5d655171558b671a4bc (commit) via 3212dcddbae64a36af3d82bb0bb555e410d533a4 (commit) via 023f43ff404d133717afe403c3085567450c8445 (commit) from 839bc5527a236db38ea234633e3cff1215259a97 (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 faec72df5d9f18703bdcd5d655171558b671a4bc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jul 14 10:20:23 2021 +0200 core159: add makegraphs and hddshutdown cronjob Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 3212dcddbae64a36af3d82bb0bb555e410d533a4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jul 14 08:14:21 2021 +0200 crontab: dont run makegraphs and hddshutdown to the same time Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 023f43ff404d133717afe403c3085567450c8445 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jul 14 08:12:16 2021 +0200 makegraphs: fix status collection for hddshutdown with kernel 5.10.x also the reading of s.m.a.r.t. data to update the temperatur graphs is countet as disk read so update the stored value after reading. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cron/crontab | 2 +- config/rootfiles/core/159/filelists/files | 1 + config/rootfiles/core/159/update.sh | 5 +++++ src/scripts/makegraphs | 9 +++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/cron/crontab b/config/cron/crontab index f1ac3666d..d94dd65c2 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -36,7 +36,7 @@ HOME=/ find /var/log/logwatch/ -ctime +${LOGWATCH_KEEP=56} -exec rm -f '{}' ';' # hddshutdown -*/30 * * * * /usr/local/bin/hddshutdown >/dev/null +2,32 * * * * /usr/local/bin/hddshutdown >/dev/null # connection-scheduler */5 * * * * /usr/local/bin/connscheduler timer > /dev/null diff --git a/config/rootfiles/core/159/filelists/files b/config/rootfiles/core/159/filelists/files index 0fa6cd7fb..a788f2c3b 100644 --- a/config/rootfiles/core/159/filelists/files +++ b/config/rootfiles/core/159/filelists/files @@ -2,3 +2,4 @@ etc/rc.d/init.d/firewall etc/rc.d/init.d/leds etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/sysctl +usr/local/bin/makegraphs diff --git a/config/rootfiles/core/159/update.sh b/config/rootfiles/core/159/update.sh index a6e93a606..9582c3ece 100644 --- a/config/rootfiles/core/159/update.sh +++ b/config/rootfiles/core/159/update.sh @@ -127,6 +127,11 @@ fi /usr/local/bin/openvpnctrl -s /usr/local/bin/openvpnctrl -sn2n +# Update hddshutdown cronjob +sed -e "s|^.*/usr/local/bin/hddshutdown.*$|2,32 * * * * \t/usr/local/bin/hddshutdown >/dev/null|g" \ + -i /var/spool/cron/root.orig +fcrontab -z + # remove lm_sensor config after collectd was started # to reserch sensors at next boot with updated kernel rm -f /etc/sysconfig/lm_sensors diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs index f8f6f70a9..5bfb05d2a 100644 --- a/src/scripts/makegraphs +++ b/src/scripts/makegraphs @@ -137,4 +137,13 @@ foreach (@disks){ close(DATEI); updatehdddata($disk); + + if ( $diskstats eq $newdiskstats ) { + # update diskstat because read temp change the status + my $newdiskstats = `/usr/bin/iostat -d -t $disk | tail -2 | head -1 | awk '{ print \$5","\$6}'`; + chomp $newdiskstats; + open(DATEI, ">/var/run/hddstats-$array[$#array]") || die "Datei nicht gefunden"; + print DATEI $newdiskstats; + close(DATEI); + } } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 131cfcf223f97a00375489f9a001a6a1dc23e972
by Michael Tremer 13 Jul '21

13 Jul '21

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, master has been updated via 131cfcf223f97a00375489f9a001a6a1dc23e972 (commit) via c64dc3bef5562448f8ed1e7d40a5174028370f32 (commit) via b71a7fb97dfa9bc041d6782a2b2cd0dd5e9cd66e (commit) via 8c946d1c0afc79808c9f1c8ec14c1ae917c64cdd (commit) from dd2c09fd6bf60c5659e41109d7fbad3f99e228c3 (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 131cfcf223f97a00375489f9a001a6a1dc23e972 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 13 15:34:59 2021 +0000 strip: Silence any warnings for files without capabilities Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c64dc3bef5562448f8ed1e7d40a5174028370f32 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 13 15:30:53 2021 +0000 vpnmain.cgi: Join certificate output before &Header::cleanhtml(); Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b71a7fb97dfa9bc041d6782a2b2cd0dd5e9cd66e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 13 15:30:52 2021 +0000 Partially revert "vpnmain.cgi: Use new system methods" This reverts commit a81cbf61273536ee36f3d26504aabdcd65d39cca. It was no longer possible to generate the root/host certificates. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8c946d1c0afc79808c9f1c8ec14c1ae917c64cdd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 13 15:30:51 2021 +0000 ovpnmain.cgi: Join certificate output before &Header::cleanhtml(); Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 24 +++++++++--------- html/cgi-bin/vpnmain.cgi | 64 ++++++++++++++++------------------------------- src/stripper | 2 +- 3 files changed, 35 insertions(+), 55 deletions(-) Difference in files: 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(); diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 8f13cf51f..d54b56577 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -226,13 +226,9 @@ sub newcleanssldatabase { ### sub callssl ($) { my $opt = shift; - - # Split the given argument string into single pieces and assign them to an array. - my @opts = split(/ /, $opt); - - my @retssl = &General::system_output("/usr/bin/openssl", @opts); #redirect stderr + my $retssl = `/usr/bin/openssl $opt 2>&1`; #redirect stderr my $ret = ''; - foreach my $line (split (/\n/, @retssl)) { + foreach my $line (split (/\n/, $retssl)) { &General::log("ipsec", "$line") if (0); # 1 for verbose logging $ret .= '<br>'.$line if ( $line =~ /error|unknown/ ); } @@ -246,21 +242,13 @@ sub callssl ($) { ### sub getCNfromcert ($) { #&General::log("ipsec", "Extracting name from $_[0]..."); - my @temp = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "$_[0]"); - my $temp; - - foreach my $line (@temp) { - if ($line =~ /Subject:.*CN = (.*)[\n]/) { - $temp = $1; - $temp =~ s+/Email+, E+; - $temp =~ s/ ST = / S = /; - $temp =~ s/,//g; - $temp =~ s/\'//g; - - last; - } - } - + my $temp = `/usr/bin/openssl x509 -text -in $_[0]`; + $temp =~ /Subject:.*CN = (.*)[\n]/; + $temp = $1; + $temp =~ s+/Email+, E+; + $temp =~ s/ ST = / S = /; + $temp =~ s/,//g; + $temp =~ s/\'//g; return $temp; } ### @@ -268,19 +256,11 @@ sub getCNfromcert ($) { ### sub getsubjectfromcert ($) { #&General::log("ipsec", "Extracting subject from $_[0]..."); - my @temp = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "$_[0]"); - my $temp; - - foreach my $line (@temp) { - if($line =~ /Subject: (.*)[\n]/) { - $temp = $1; - $temp =~ s+/Email+, E+; - $temp =~ s/ ST = / S = /; - - last; - } - } - + my $temp = `/usr/bin/openssl x509 -text -in $_[0]`; + $temp =~ /Subject: (.*)[\n]/; + $temp = $1; + $temp =~ s+/Email+, E+; + $temp =~ s/ ST = / S = /; return $temp; } ### @@ -689,8 +669,8 @@ END $errormessage = $!; goto UPLOADCA_ERROR; } - my @temp = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "$filename"); - if (! grep(/CA:TRUE/, @temp)) { + my $temp = `/usr/bin/openssl x509 -text -in $filename`; + if ($temp !~ /CA:TRUE/i) { $errormessage = $Lang::tr{'not a valid ca certificate'}; unlink ($filename); goto UPLOADCA_ERROR; @@ -725,8 +705,8 @@ END &Header::openbigbox('100%', 'left', '', ''); &Header::openbox('100%', 'left', "$Lang::tr{'ca certificate'}:"); my @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/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/vpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox(); @@ -852,8 +832,8 @@ END &Header::openbox('100%', 'left', "$Lang::tr{'host certificate'}:"); @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/certs/hostcert.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/vpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox(); @@ -1541,8 +1521,8 @@ END &Header::openbigbox('100%', 'left', '', ''); &Header::openbox('100%', 'left', "$Lang::tr{'cert'}:"); my @output = &General::system_output("/usr/bin/openssl", "x509", "-text", "-in", "${General::swroot}/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/vpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox(); diff --git a/src/stripper b/src/stripper index e51463c69..6f449bb39 100755 --- a/src/stripper +++ b/src/stripper @@ -29,7 +29,7 @@ function _strip() { # Fetch any capabilities local capabilities="$(getfattr --no-dereference --name="security.capability" \ - --absolute-names --dump "${file}")" + --absolute-names --dump "${file}" 2>/dev/null)" local cmd=( "${strip}" ) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. dd2c09fd6bf60c5659e41109d7fbad3f99e228c3
by Michael Tremer 12 Jul '21

12 Jul '21

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, master has been updated via dd2c09fd6bf60c5659e41109d7fbad3f99e228c3 (commit) from 37ef9fe4e07a97d3597b9d9e7895652fcfe79150 (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 dd2c09fd6bf60c5659e41109d7fbad3f99e228c3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 12 16:23:54 2021 +0000 core158: Ship etherwake Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/154 => core/158}/filelists/etherwake | 0 1 file changed, 0 insertions(+), 0 deletions(-) copy config/rootfiles/{oldcore/154 => core/158}/filelists/etherwake (100%) Difference in files: diff --git a/config/rootfiles/core/158/filelists/etherwake b/config/rootfiles/core/158/filelists/etherwake new file mode 120000 index 000000000..1bf1e6a54 --- /dev/null +++ b/config/rootfiles/core/158/filelists/etherwake @@ -0,0 +1 @@ +../../../common/etherwake \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 839bc5527a236db38ea234633e3cff1215259a97
by Arne Fitzenreiter 10 Jul '21

10 Jul '21

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 839bc5527a236db38ea234633e3cff1215259a97 (commit) via 6a21e9646fb6c8d232aed8fd4d31cdd2852e2a77 (commit) via 37ef9fe4e07a97d3597b9d9e7895652fcfe79150 (commit) via db7ef52a91e925a5097d064ebea6723d035e28e8 (commit) via d0ba077ed3851346b1dd6d82867103df8446aea8 (commit) via a26986a3b059beeb3f9c37867575dd932f1aa23e (commit) via c639ab1d31d51b534539ea27516c672cb9f3ec41 (commit) via b6cad4d231086bb95b47563aac75b6321dd70c8e (commit) via 6f15b0cbe0765cc9be1b133a070325998bf28f77 (commit) via 124926ee86efc861167f07c22f66a42ce4eecb1e (commit) via 75ee0279ecaa8e5a8ee77d99ab466b4333b071a6 (commit) via 0fd28c360e123d770017207b434ff1de0cb7ed38 (commit) via 1d32c50e0306b7b9d304bd0037a99252f9e6eb9a (commit) from 918065d2949b091b5ab295063bc942814c610548 (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 839bc5527a236db38ea234633e3cff1215259a97 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 10 17:53:08 2021 +0000 dnsdist: build only for x86_64 32bit archs fail because time_t is only 4 bytes and aarch64 not build on builders with 2GB ram. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 6a21e9646fb6c8d232aed8fd4d31cdd2852e2a77 Merge: 918065d29 37ef9fe4e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 10 17:51:41 2021 +0000 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/oldcore/158/filelists/files | 1 + config/rootfiles/oldcore/158/update.sh | 3 +++ html/cgi-bin/ddns.cgi | 32 +++++++++++++++++----------- html/cgi-bin/fireinfo.cgi | 4 ++-- html/cgi-bin/pakfire.cgi | 19 +++++++++-------- lfs/dnsdist | 4 +++- src/pakfire/lib/functions.sh | 19 +++++++++++++---- src/stripper | 9 ++++++++ 8 files changed, 63 insertions(+), 28 deletions(-) Difference in files: diff --git a/config/rootfiles/oldcore/158/filelists/files b/config/rootfiles/oldcore/158/filelists/files index 903ae9450..299ce1e2e 100644 --- a/config/rootfiles/oldcore/158/filelists/files +++ b/config/rootfiles/oldcore/158/filelists/files @@ -1,6 +1,7 @@ etc/rc.d/init.d/firewall etc/ssh/sshd_config opt/pakfire/lib/functions.pl +opt/pakfire/lib/functions.sh opt/pakfire/pakfire usr/lib/firewall/ipsec-policy var/ipfire/backup/bin/backup.pl diff --git a/config/rootfiles/oldcore/158/update.sh b/config/rootfiles/oldcore/158/update.sh index 42744e2a7..a0e8d842f 100644 --- a/config/rootfiles/oldcore/158/update.sh +++ b/config/rootfiles/oldcore/158/update.sh @@ -74,6 +74,9 @@ ldconfig # Filesytem cleanup /usr/local/bin/filesystem-cleanup +# Apply local configuration to sshd_config +/usr/local/bin/sshctrl + # Start services /etc/init.d/vnstat restart /etc/init.d/rngd restart diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index e30aa3d4f..0e3ccbe45 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -171,20 +171,28 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang:: $errormessage = $Lang::tr{'invalid domain name'}; } - # Check if a username has been sent. - if ($settings{'LOGIN'} eq '') { - $errormessage = $Lang::tr{'username not set'}; - } + # Check if the choosen provider supports token based authentication. + if ($settings{'SERVICE'} ~~ @token_provider) { + # Check if a token has been given. + unless ($settings{'TOKEN'}) { + $errormessage = $Lang::tr{'token not set'}; + } - # Check if a password has been typed in. - # freedns.afraid.org does not require this field. - if (($settings{'PASSWORD'} eq '') && ($settings{'SERVICE'} ne 'freedns.afraid.org') && ($settings{'SERVICE'} ne 'regfish.com')) { - $errormessage = $Lang::tr{'password not set'}; - } + # Automatically set the username to token. + $settings{'LOGIN'} = "token"; - # Check if a token has been given for provider which support tokens. - if (($settings{'SERVICE'} ~~ @token_provider) && ($settings{'TOKEN'} eq '')) { - $errormessage = $Lang::tr{'token not set'}; + # A provider without token support has been choosen. + } else { + # Check if a username has been sent. + if ($settings{'LOGIN'} eq '') { + $errormessage = $Lang::tr{'username not set'}; + } + + # Check if a password has been typed in. + # freedns.afraid.org does not require this field. + if (($settings{'PASSWORD'} eq '') && ($settings{'SERVICE'} ne 'freedns.afraid.org') && ($settings{'SERVICE'} ne 'regfish.com')) { + $errormessage = $Lang::tr{'password not set'}; + } } # Go furter if there was no error. diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi index e0221c5be..04e36faf4 100644 --- a/html/cgi-bin/fireinfo.cgi +++ b/html/cgi-bin/fireinfo.cgi @@ -94,7 +94,7 @@ my $ipfire_version = <FILE>; close(FILE); my $pakfire_version = &Pakfire::make_version(); -my $kernel_version = &General::system_output("uname", "-a"); +my @kernel_version = &General::system_output("uname", "-a"); &Header::openbox('100%', 'left', $Lang::tr{'fireinfo system version'}); print <<END; @@ -109,7 +109,7 @@ print <<END; </tr> <tr> <td align='center' bgcolor='#F0F0F0' width='15%'>$Lang::tr{'fireinfo kernel version'}</td> - <td bgcolor='#F0F0F0'><code>$kernel_version</code></td> + <td bgcolor='#F0F0F0'><code>@kernel_version</code></td> </tr> </table> END diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 631587ce2..0cf522ba1 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -55,14 +55,15 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont &Header::openbigbox('100%', 'left', '', $errormessage); if (($cgiparams{'ACTION'} eq 'install') && (! -e $Pakfire::lockfile)) { - $cgiparams{'INSPAKS'} =~ s/\|/\ /g; + my @pkgs = split(/\|/, $cgiparams{'INSPAKS'}); if ("$cgiparams{'FORCE'}" eq "on") { - &General::system_background("/usr/local/bin/pakfire", "install", "--non-interactive", "--no-colors", $cgiparams{'INSPAKS'}); + &General::system_background("/usr/local/bin/pakfire", "install", "--non-interactive", "--no-colors", @pkgs); + sleep(2); } else { &Header::openbox("100%", "center", $Lang::tr{'request'}); - my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", $cgiparams{'INSPAKS'}); + my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs); print <<END; - <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$cgiparams{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'} + <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'} @pkgs $Lang::tr{'pakfire possible dependency'} <pre> END foreach (@output) { @@ -92,15 +93,15 @@ END exit; } } elsif (($cgiparams{'ACTION'} eq 'remove') && (! -e $Pakfire::lockfile)) { - - $cgiparams{'DELPAKS'} =~ s/\|/\ /g; + my @pkgs = split(/\|/, $cgiparams{'DELPAKS'}); if ("$cgiparams{'FORCE'}" eq "on") { - &General::system_background("/usr/local/bin/pakfire", "remove", "--non-interactive", "--no-colors", $cgiparams{'DELPAKS'}); + &General::system_background("/usr/local/bin/pakfire", "remove", "--non-interactive", "--no-colors", @pkgs); + sleep(2); } else { &Header::openbox("100%", "center", $Lang::tr{'request'}); - my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", $cgiparams{'DELPAKS'}); + my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs); print <<END; - <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'}.$cgiparams{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'} + <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'} @pkgs $Lang::tr{'pakfire possible dependency'} <pre> END foreach (@output) { diff --git a/lfs/dnsdist b/lfs/dnsdist index 96e775a37..7d0e55e57 100644 --- a/lfs/dnsdist +++ b/lfs/dnsdist @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -34,6 +34,8 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = dnsdist PAK_VER = 9 +SUP_ARCH = x86_64 + DEPS = MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 2048 ))) diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index 5918649db..67986e20e 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -22,17 +22,28 @@ . /etc/sysconfig/rc . $rc_functions +TAR_OPTIONS=( + --acls + --xattrs + --xattrs-include='*' + --no-overwrite-dir + --no-delay-directory-restore + --preserve-permissions + --numeric-owner +) + extract_files() { echo "Extracting files..." - tar --acls --xattrs --xattrs-include='*' \ - -xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + tar -xavf /opt/pakfire/tmp/files* "${TAR_OPTIONS[@]}" -C / + sync echo "...Finished." } extract_backup_includes() { echo "Extracting backup includes..." - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / \ + tar xavf /opt/pakfire/tmp/files* "${TAR_OPTIONS[@]}" -C / \ var/ipfire/backup/addons/includes + sync echo "...Finished." } diff --git a/src/stripper b/src/stripper index ac5f58ca5..e51463c69 100755 --- a/src/stripper +++ b/src/stripper @@ -27,6 +27,10 @@ function _strip() { fi done + # Fetch any capabilities + local capabilities="$(getfattr --no-dereference --name="security.capability" \ + --absolute-names --dump "${file}")" + local cmd=( "${strip}" ) case "$(file -bi ${file})" in @@ -40,6 +44,11 @@ function _strip() { echo "Stripping ${file}..." ${cmd[*]} ${file} + + # Restore capabilities + if [ -n "${capabilities}" ]; then + setfattr --no-dereference --restore=<(echo "${capabilities}") + fi } for dir in ${dirs}; do hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 37ef9fe4e07a97d3597b9d9e7895652fcfe79150
by Michael Tremer 10 Jul '21

10 Jul '21

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, master has been updated via 37ef9fe4e07a97d3597b9d9e7895652fcfe79150 (commit) from db7ef52a91e925a5097d064ebea6723d035e28e8 (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 37ef9fe4e07a97d3597b9d9e7895652fcfe79150 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 9 16:17:43 2021 +0000 stripper: Handle capabilities During the build process, we set capabilities to elevate privileges of certain progrems (e.g. ping). These have been removed during the build process because of strip. This patch collects any capabilities from all files that are being stripped and restores them after calling strip. Fixes: #12652 Reported-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Acked-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/stripper | 9 +++++++++ 1 file changed, 9 insertions(+) Difference in files: diff --git a/src/stripper b/src/stripper index ac5f58ca5..e51463c69 100755 --- a/src/stripper +++ b/src/stripper @@ -27,6 +27,10 @@ function _strip() { fi done + # Fetch any capabilities + local capabilities="$(getfattr --no-dereference --name="security.capability" \ + --absolute-names --dump "${file}")" + local cmd=( "${strip}" ) case "$(file -bi ${file})" in @@ -40,6 +44,11 @@ function _strip() { echo "Stripping ${file}..." ${cmd[*]} ${file} + + # Restore capabilities + if [ -n "${capabilities}" ]; then + setfattr --no-dereference --restore=<(echo "${capabilities}") + fi } for dir in ${dirs}; do hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. db7ef52a91e925a5097d064ebea6723d035e28e8
by Michael Tremer 09 Jul '21

09 Jul '21

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, master has been updated via db7ef52a91e925a5097d064ebea6723d035e28e8 (commit) from d0ba077ed3851346b1dd6d82867103df8446aea8 (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 db7ef52a91e925a5097d064ebea6723d035e28e8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 9 15:24:33 2021 +0000 core158: Run sshctrl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/158/update.sh | 3 +++ 1 file changed, 3 insertions(+) Difference in files: diff --git a/config/rootfiles/core/158/update.sh b/config/rootfiles/core/158/update.sh index 42744e2a7..a0e8d842f 100644 --- a/config/rootfiles/core/158/update.sh +++ b/config/rootfiles/core/158/update.sh @@ -74,6 +74,9 @@ ldconfig # Filesytem cleanup /usr/local/bin/filesystem-cleanup +# Apply local configuration to sshd_config +/usr/local/bin/sshctrl + # Start services /etc/init.d/vnstat restart /etc/init.d/rngd restart hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. d0ba077ed3851346b1dd6d82867103df8446aea8
by Michael Tremer 09 Jul '21

09 Jul '21

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, master has been updated via d0ba077ed3851346b1dd6d82867103df8446aea8 (commit) from a26986a3b059beeb3f9c37867575dd932f1aa23e (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 d0ba077ed3851346b1dd6d82867103df8446aea8 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Wed Jul 7 19:27:14 2021 +0200 Pakfire: call "sync" in function.sh after having extracted archives After upgrading to Core Update 157, a few number of users reported their systems to be unworkable after a reboot. Most of them (the systems, not the users) were apparently missing the new Linux kernel in their Grub configuration, causing a non-functional bootloader written to disk. While we seem to be able to rule out issues related to poor storage (SDDs, flash cards, etc.) or very high I/O load, it occurred to me we are not calling "sync" after having extracted a Core Update's .tar.gz file. This patch therefore proposes to do so. It is a somewhat homeopathic approach, though, but might ensure all parts of the system to have properly processed the contents of an extracted archive. While we cannot even reasonably guess it will solve the problem(s) mentioned initially, doing so cannot hurt either. See also: https://community.ipfire.org/t/after-update-ipfire-to-157-no-boot/5641/45 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/pakfire/lib/functions.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Difference in files: diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index f784cf792..67986e20e 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -35,6 +35,7 @@ TAR_OPTIONS=( extract_files() { echo "Extracting files..." tar -xavf /opt/pakfire/tmp/files* "${TAR_OPTIONS[@]}" -C / + sync echo "...Finished." } @@ -42,6 +43,7 @@ extract_backup_includes() { echo "Extracting backup includes..." tar xavf /opt/pakfire/tmp/files* "${TAR_OPTIONS[@]}" -C / \ var/ipfire/backup/addons/includes + sync echo "...Finished." } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. a26986a3b059beeb3f9c37867575dd932f1aa23e
by Michael Tremer 09 Jul '21

09 Jul '21

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, master has been updated via a26986a3b059beeb3f9c37867575dd932f1aa23e (commit) via c639ab1d31d51b534539ea27516c672cb9f3ec41 (commit) via b6cad4d231086bb95b47563aac75b6321dd70c8e (commit) via 6f15b0cbe0765cc9be1b133a070325998bf28f77 (commit) via 124926ee86efc861167f07c22f66a42ce4eecb1e (commit) via 75ee0279ecaa8e5a8ee77d99ab466b4333b071a6 (commit) via 0fd28c360e123d770017207b434ff1de0cb7ed38 (commit) from 1d32c50e0306b7b9d304bd0037a99252f9e6eb9a (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 a26986a3b059beeb3f9c37867575dd932f1aa23e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 9 13:25:41 2021 +0000 core158: Ship pakfire functions.sh Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c639ab1d31d51b534539ea27516c672cb9f3ec41 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 9 13:25:00 2021 +0000 pakfire: Do not delay directory restore https://www.gnu.org/software/tar/manual/tar.html#Directory-Modification-Tim… Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b6cad4d231086bb95b47563aac75b6321dd70c8e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 9 13:23:56 2021 +0000 pakfire: Put tar options into an array Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6f15b0cbe0765cc9be1b133a070325998bf28f77 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 9 13:19:08 2021 +0000 pakfire.cgi: Sleep after running a pakfire command This is required to have better chances in the race of showing the log output afterwards. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 124926ee86efc861167f07c22f66a42ce4eecb1e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 9 13:05:13 2021 +0000 pakfire.cgi: Remove confusing dots in install message Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 75ee0279ecaa8e5a8ee77d99ab466b4333b071a6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 9 13:04:14 2021 +0000 pakfire.cgi: Pass packages to install/uninstall as array Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0fd28c360e123d770017207b434ff1de0cb7ed38 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 9 12:56:17 2021 +0000 fireinfo.cgi: Fix kernel version Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/158/filelists/files | 1 + html/cgi-bin/fireinfo.cgi | 4 ++-- html/cgi-bin/pakfire.cgi | 19 ++++++++++--------- src/pakfire/lib/functions.sh | 15 ++++++++++++--- 4 files changed, 25 insertions(+), 14 deletions(-) Difference in files: diff --git a/config/rootfiles/core/158/filelists/files b/config/rootfiles/core/158/filelists/files index 903ae9450..299ce1e2e 100644 --- a/config/rootfiles/core/158/filelists/files +++ b/config/rootfiles/core/158/filelists/files @@ -1,6 +1,7 @@ etc/rc.d/init.d/firewall etc/ssh/sshd_config opt/pakfire/lib/functions.pl +opt/pakfire/lib/functions.sh opt/pakfire/pakfire usr/lib/firewall/ipsec-policy var/ipfire/backup/bin/backup.pl diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi index e0221c5be..04e36faf4 100644 --- a/html/cgi-bin/fireinfo.cgi +++ b/html/cgi-bin/fireinfo.cgi @@ -94,7 +94,7 @@ my $ipfire_version = <FILE>; close(FILE); my $pakfire_version = &Pakfire::make_version(); -my $kernel_version = &General::system_output("uname", "-a"); +my @kernel_version = &General::system_output("uname", "-a"); &Header::openbox('100%', 'left', $Lang::tr{'fireinfo system version'}); print <<END; @@ -109,7 +109,7 @@ print <<END; </tr> <tr> <td align='center' bgcolor='#F0F0F0' width='15%'>$Lang::tr{'fireinfo kernel version'}</td> - <td bgcolor='#F0F0F0'><code>$kernel_version</code></td> + <td bgcolor='#F0F0F0'><code>@kernel_version</code></td> </tr> </table> END diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 631587ce2..0cf522ba1 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -55,14 +55,15 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont &Header::openbigbox('100%', 'left', '', $errormessage); if (($cgiparams{'ACTION'} eq 'install') && (! -e $Pakfire::lockfile)) { - $cgiparams{'INSPAKS'} =~ s/\|/\ /g; + my @pkgs = split(/\|/, $cgiparams{'INSPAKS'}); if ("$cgiparams{'FORCE'}" eq "on") { - &General::system_background("/usr/local/bin/pakfire", "install", "--non-interactive", "--no-colors", $cgiparams{'INSPAKS'}); + &General::system_background("/usr/local/bin/pakfire", "install", "--non-interactive", "--no-colors", @pkgs); + sleep(2); } else { &Header::openbox("100%", "center", $Lang::tr{'request'}); - my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", $cgiparams{'INSPAKS'}); + my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs); print <<END; - <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$cgiparams{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'} + <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'} @pkgs $Lang::tr{'pakfire possible dependency'} <pre> END foreach (@output) { @@ -92,15 +93,15 @@ END exit; } } elsif (($cgiparams{'ACTION'} eq 'remove') && (! -e $Pakfire::lockfile)) { - - $cgiparams{'DELPAKS'} =~ s/\|/\ /g; + my @pkgs = split(/\|/, $cgiparams{'DELPAKS'}); if ("$cgiparams{'FORCE'}" eq "on") { - &General::system_background("/usr/local/bin/pakfire", "remove", "--non-interactive", "--no-colors", $cgiparams{'DELPAKS'}); + &General::system_background("/usr/local/bin/pakfire", "remove", "--non-interactive", "--no-colors", @pkgs); + sleep(2); } else { &Header::openbox("100%", "center", $Lang::tr{'request'}); - my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", $cgiparams{'DELPAKS'}); + my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs); print <<END; - <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'}.$cgiparams{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'} + <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'} @pkgs $Lang::tr{'pakfire possible dependency'} <pre> END foreach (@output) { diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index 5918649db..f784cf792 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -22,16 +22,25 @@ . /etc/sysconfig/rc . $rc_functions +TAR_OPTIONS=( + --acls + --xattrs + --xattrs-include='*' + --no-overwrite-dir + --no-delay-directory-restore + --preserve-permissions + --numeric-owner +) + extract_files() { echo "Extracting files..." - tar --acls --xattrs --xattrs-include='*' \ - -xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + tar -xavf /opt/pakfire/tmp/files* "${TAR_OPTIONS[@]}" -C / echo "...Finished." } extract_backup_includes() { echo "Extracting backup includes..." - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / \ + tar xavf /opt/pakfire/tmp/files* "${TAR_OPTIONS[@]}" -C / \ var/ipfire/backup/addons/includes echo "...Finished." } hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM July 2021