[git.ipfire.org] IPFire 2.x development tree branch, master, updated. c9f30dc9fc9932da3c0aabd83dc260a5eeac9218

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. c9f30dc9fc9932da3c0aabd83dc260a5eeac9218

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2813 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, master has been updated
       via  c9f30dc9fc9932da3c0aabd83dc260a5eeac9218 (commit)
       via  b5c4c15af38479627ee20854de8529937de7f4ad (commit)
      from  c69c820025c21713cdb77eae3dd4fa61ca71b5fb (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 c9f30dc9fc9932da3c0aabd83dc260a5eeac9218
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Oct 14 13:51:25 2020 +0000

    core151: Do not ship the location database again
    
    This might potentially downgrade the database and is a waste
    of space in the update. Therefore we simply do not ship it here.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b5c4c15af38479627ee20854de8529937de7f4ad
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Oct 14 13:49:46 2020 +0000

    core151: Ship libloc again
    
    This is necessary because some installations have a version
    of Core Update 150 installed without the latest version.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/151/exclude                           | 2 ++
 config/rootfiles/{oldcore/148 => core/151}/filelists/libloc | 0
 2 files changed, 2 insertions(+)
 copy config/rootfiles/{oldcore/148 => core/151}/filelists/libloc (100%)

Difference in files:
diff --git a/config/rootfiles/core/151/exclude b/config/rootfiles/core/151/exclude
index e7500a03d..818039f4a 100644
--- a/config/rootfiles/core/151/exclude
+++ b/config/rootfiles/core/151/exclude
@@ -17,6 +17,7 @@ etc/sysconfig/firewall.local
 etc/sysconfig/rc.local
 etc/udev/rules.d/30-persistent-network.rules
 srv/web/ipfire/html/proxy.pac
+usr/share/xt_geoip
 var/ipfire/dma
 var/ipfire/time
 var/ipfire/firewall/locationblock
@@ -25,6 +26,7 @@ var/ipfire/ovpn
 var/ipfire/urlfilter/blacklist
 var/ipfire/urlfilter/settings
 var/lib/alternatives
+var/lib/location/database.db
 var/log/cache
 var/log/dhcpcd.log
 var/log/messages
diff --git a/config/rootfiles/core/151/filelists/libloc b/config/rootfiles/core/151/filelists/libloc
new file mode 120000
index 000000000..ff4a92429
--- /dev/null
+++ b/config/rootfiles/core/151/filelists/libloc
@@ -0,0 +1 @@
+../../../common/libloc
\ No newline at end of file


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