[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ae49226866aef4b8ec700be2e739871c694d55c8

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ae49226866aef4b8ec700be2e739871c694d55c8

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 4243 bytes --]

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  ae49226866aef4b8ec700be2e739871c694d55c8 (commit)
       via  c799e441a447863ff94cd27eb418616bc1200855 (commit)
       via  e80e1fda2d8de851db1a489a89ab828061c671c2 (commit)
      from  ee1cfd760cc2851930ee8528b4d38b405d535d3c (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 ae49226866aef4b8ec700be2e739871c694d55c8
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Sep 19 12:37:45 2022 +0000

    Core Update 171: Ship backupiso
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit c799e441a447863ff94cd27eb418616bc1200855
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Sun Sep 18 13:45:17 2022 +0200

    backupiso: Update to ISO file naming - bug#12932
    
    - commit https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=fbd0608c2cb5372fff7857065ec7e605b1bf9cf7
       aligned the ISO file name to the image file name. This change also needed to be added
       to backupiso as the filename is used to download the iso from the IPFire server when
       creating an ISO backup.
    
    Fixes: Bug#12932
    Suggested-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

commit e80e1fda2d8de851db1a489a89ab828061c671c2
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Sep 18 20:55:51 2022 +0000

    Guardian: Bump package version for Perl changes
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/171/filelists/files | 1 +
 lfs/guardian                              | 4 ++--
 src/scripts/backupiso                     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/171/filelists/files b/config/rootfiles/core/171/filelists/files
index d5654ef6f..6ce89137f 100644
--- a/config/rootfiles/core/171/filelists/files
+++ b/config/rootfiles/core/171/filelists/files
@@ -131,3 +131,4 @@ lib/firmware/wfx/brd8022a.pds
 lib/firmware/wfx/brd8023a.pds
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/urlfilter.dat
+usr/local/bin/backupiso
diff --git a/lfs/guardian b/lfs/guardian
index 91d02a8bc..6eaa50aac 100644
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  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,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = guardian
-PAK_VER    = 26
+PAK_VER    = 27
 
 DEPS       = perl-inotify2 perl-Net-IP
 
diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index ef017e3be..2a016e067 100644
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -35,7 +35,7 @@ case "${arch}" in
 esac
 
 URL="https://downloads.ipfire.org/releases/ipfire-2.x/$IPFVER-core$COREVER/"
-ISO="ipfire-$IPFVER.$arch-full-core$COREVER.iso"
+ISO="ipfire-$IPFVER-core$COREVER-$arch.iso"
 
 makeiso() {
 	local dir="${1}"


hooks/post-receive
--
IPFire 2.x development tree