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 06966f3613b32af90619bc5cd0ee6aaadc9a29dd (commit) via 84578512f52e62bc994b944f88f1785c73b4d96a (commit) via 3045fd1b58758a1df5032cf34f465247ad99266b (commit) from 2eed2aaa509c6ae5a8f6d0fe7b6ffeeb52353ba5 (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 06966f3613b32af90619bc5cd0ee6aaadc9a29dd Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Aug 14 20:39:17 2018 +0100
core123: Ship updated backup.pl
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 84578512f52e62bc994b944f88f1785c73b4d96a Author: Matthias Fischer matthias.fischer@ipfire.org Date: Tue Aug 14 21:34:38 2018 +0200
Fixes for 'backup.pl' (Bug #11816)
Hi,
Fixes #11816 (https://bugzilla.ipfire.org/show_bug.cgi?id=11816 and https://bugzilla.ipfire.org/attachment.cgi?id=608):
"[root@ipfire ~]# backupctrl exclude ... tar: The following options were used after any non-optional arguments in archive create or update mode. These options are positional and affect only arguments that follow them. Please, rearrange them properly. tar: --exclude-from '/var/ipfire/backup/exclude.user' has no effect tar: Exiting with failure status due to previous errors"
Please test - I got no errors anymore.
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3045fd1b58758a1df5032cf34f465247ad99266b Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Aug 14 20:37:54 2018 +0100
core123: Ship openssl-compat, too
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/backup/backup.pl | 6 +++--- config/rootfiles/core/123/filelists/files | 1 + config/rootfiles/{oldcore/120 => core/123}/filelists/openssl-compat | 0 3 files changed, 4 insertions(+), 3 deletions(-) copy config/rootfiles/{oldcore/120 => core/123}/filelists/openssl-compat (100%)
Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index d430f3467..ce16e7f42 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -46,7 +46,7 @@ if (($ARGV[0] eq 'include') || ($ARGV[0] eq 'iso')) { print DATEI @include; print "/var/log/messages"; close(DATEI); - system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude' --files-from='/var/ipfire/backup/include.user' --exclude-from='/var/ipfire/backup/exclude.user'"); + system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --exclude-from='/var/ipfire/backup/exclude' --exclude-from='/var/ipfire/backup/exclude.user' --files-from='/tmp/include' --files-from='/var/ipfire/backup/include.user'"); system("rm /tmp/include"); if ($ARGV[0] eq 'iso') { system("/usr/local/bin/backupiso $Jahr$Monat$Monatstag-$Stunden$Minuten &"); @@ -57,7 +57,7 @@ elsif ($ARGV[0] eq 'exclude') { open(DATEI, ">/tmp/include") || die "Could not save temp include file"; print DATEI @include; close(DATEI); - system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude' --files-from='/var/ipfire/backup/include.user' --exclude-from='/var/ipfire/backup/exclude.user'"); + system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --exclude-from='/var/ipfire/backup/exclude' --exclude-from='/var/ipfire/backup/exclude.user' --files-from='/tmp/include' --files-from='/var/ipfire/backup/include.user'"); system("rm /tmp/include"); } elsif ($ARGV[0] eq 'restore') { @@ -158,7 +158,7 @@ sub createinclude(){ open(DATEI, "<${General::swroot}/backup/include") || die "Can not open include file"; my @Zeilen = <DATEI>; close(DATEI); - + foreach (@Zeilen){ chomp($_); my @files = `find $_ -maxdepth 0 2>/dev/null`; diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files index 48f2e0e67..a32f0a86f 100644 --- a/config/rootfiles/core/123/filelists/files +++ b/config/rootfiles/core/123/filelists/files @@ -13,6 +13,7 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi usr/local/bin/backupiso usr/sbin/dhclient usr/share/GeoIP/GeoIP.dat +var/ipfire/backup/bin/backup.pl var/ipfire/backup/exclude var/ipfire/langs var/ipfire/aws-functions.pl diff --git a/config/rootfiles/core/123/filelists/openssl-compat b/config/rootfiles/core/123/filelists/openssl-compat new file mode 120000 index 000000000..c9fa42132 --- /dev/null +++ b/config/rootfiles/core/123/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file
hooks/post-receive -- IPFire 2.x development tree