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

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

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 4012 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  fad9bbe3348d2e45fc579801408f955fd89afe1c (commit)
       via  7b1ce94f5d9be804fd9ca24c87b42f4d5d310382 (commit)
       via  52487fb2a70485bc71f92fdfdf21e65d36354be1 (commit)
      from  1069e68709ce9ea5f294b3cfb9aeb2672f5f9d7b (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 fad9bbe3348d2e45fc579801408f955fd89afe1c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Dec 30 18:43:52 2024 +0100

    core191: move existing elinks configuration
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 7b1ce94f5d9be804fd9ca24c87b42f4d5d310382
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Dec 30 18:37:23 2024 +0100

    elinks: fix config directory
    
    the new version has moved the config directioy from ~/.elinks to
    ~/.config/.elinks
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 52487fb2a70485bc71f92fdfdf21e65d36354be1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Dec 30 18:32:41 2024 +0100

    core191: ship ntp
    
    ntp is build against OpenSSl and checks if it is linked against the
    correct version. So ship it to get rid of the ugly message.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/common/elinks                           | 6 +++---
 config/rootfiles/{oldcore/100 => core/191}/filelists/ntp | 0
 config/rootfiles/core/191/update.sh                      | 6 ++++++
 lfs/elinks                                               | 6 +++---
 4 files changed, 12 insertions(+), 6 deletions(-)
 copy config/rootfiles/{oldcore/100 => core/191}/filelists/ntp (100%)

Difference in files:
diff --git a/config/rootfiles/common/elinks b/config/rootfiles/common/elinks
index c8c79f114..3c4ad031a 100644
--- a/config/rootfiles/common/elinks
+++ b/config/rootfiles/common/elinks
@@ -1,6 +1,6 @@
-#root/.elinks
-root/.elinks/bookmarks
-root/.elinks/globhist
+#root/.config/.elinks
+root/.config/.elinks/bookmarks
+root/.config/.elinks/globhist
 usr/local/bin/elinks
 #usr/local/etc
 #usr/local/etc/elinks
diff --git a/config/rootfiles/core/191/filelists/ntp b/config/rootfiles/core/191/filelists/ntp
new file mode 120000
index 000000000..7542d86cb
--- /dev/null
+++ b/config/rootfiles/core/191/filelists/ntp
@@ -0,0 +1 @@
+../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/core/191/update.sh b/config/rootfiles/core/191/update.sh
index a2d61ec52..acfa01eb4 100644
--- a/config/rootfiles/core/191/update.sh
+++ b/config/rootfiles/core/191/update.sh
@@ -47,6 +47,12 @@ if [ -e /var/lib/ipblocklist/FEODO_AGGRESSIVE.conf ]; then
 	rm /var/lib/ipblocklist/FEODO_AGGRESSIVE.conf
 fi
 
+# move elinks config to new dir
+if [ -e /root/.elinks/* ]; then
+	mv /root/.elinks/* /root/.config/.elinks/
+	rm -rf /root/.elinks
+fi
+
 # Remove files
 
 # update linker config
diff --git a/lfs/elinks b/lfs/elinks
index bf76343a1..64b7b7fce 100644
--- a/lfs/elinks
+++ b/lfs/elinks
@@ -87,9 +87,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# Suppress first welcome dialog by creating bookmark
 	# and history files for root
-	mkdir -p /root/.elinks
-	touch /root/.elinks/bookmarks
-	touch /root/.elinks/globhist
+	mkdir -p /root/.config/.elinks
+	touch /root/.config/.elinks/bookmarks
+	touch /root/.config/.elinks/globhist
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)


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