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 4bd8107bf940d5cbcb7ed0b7ddfe13f76190549f (commit) via 8ceaf358ae36764661c2a70432b78ff879ac845b (commit) via a3a5c4ee95289ebc906e4406e2f87a246f8acabc (commit) via 58179c1efdd08019c35e9ad2376b12929e1bbe40 (commit) via fad9bbe3348d2e45fc579801408f955fd89afe1c (commit) via 7b1ce94f5d9be804fd9ca24c87b42f4d5d310382 (commit) via 52487fb2a70485bc71f92fdfdf21e65d36354be1 (commit) from c6e9d9d9cb069c7b7b22ccd8bda120943c909dba (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 4bd8107bf940d5cbcb7ed0b7ddfe13f76190549f Merge: c6e9d9d9cb 8ceaf358ae Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Dec 30 19:00:07 2024 +0100
Merge remote-tracking branch 'origin/master' into next
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/mpd/mpd.conf | 11 +++++++++++ config/rootfiles/common/elinks | 6 +++--- config/rootfiles/oldcore/191/update.sh | 6 ++++++ lfs/elinks | 6 +++--- lfs/mpd | 2 +- lfs/samba | 4 ++-- lfs/tor | 6 +++--- 7 files changed, 29 insertions(+), 12 deletions(-)
Difference in files: diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf index c4aabdf0b..d051e641f 100644 --- a/config/mpd/mpd.conf +++ b/config/mpd/mpd.conf @@ -106,6 +106,17 @@ audio_buffer_size "2048" # ##########################################################
+########## DISABLE HTTPS HOST/PEER VERIFICATION ########## +# +# This is needed for myMPD that run a webserver on the +# localhost to update playlists for webradio streams. +# +input { + plugin "curl" + verify_host "no" + verify_peer "no" +} +##########################################################
################### HTTP PROXY ########################### # 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/oldcore/191/update.sh b/config/rootfiles/oldcore/191/update.sh index a2d61ec52..acfa01eb4 100644 --- a/config/rootfiles/oldcore/191/update.sh +++ b/config/rootfiles/oldcore/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) diff --git a/lfs/mpd b/lfs/mpd index 4ef453fb1..40b34b910 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 41 +PAK_VER = 42 # SUP_ARCH = aarch64 x86_64
DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr fmt diff --git a/lfs/samba b/lfs/samba index 1d5789c5e..39deef55b 100644 --- a/lfs/samba +++ b/lfs/samba @@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 106 +PAK_VER = 107
-DEPS = avahi cups perl-Parse-Yapp perl-JSON wsdd +DEPS = avahi cups libtalloc perl-Parse-Yapp perl-JSON wsdd
SERVICES = samba
diff --git a/lfs/tor b/lfs/tor index 7659c5212..914fde021 100644 --- a/lfs/tor +++ b/lfs/tor @@ -26,7 +26,7 @@ include Config
SUMMARY = Anonymizing overlay network for TCP (The onion router)
-VER = 0.4.8.12 +VER = 0.4.8.13
THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 86 +PAK_VER = 87
DEPS = libseccomp
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = adaf1f90c698ee373d7ef93c77e883b76a2d75932a50b2bf7a4f5a2d387f3f8cc00d83860ed61e1e2c1d224680d07828137cf4805adb9975d9cc7218c493d19d +$(DL_FILE)_BLAKE2 = b55b29b5b2d4aa391f8d9d22657833647064af354ac8b6751ddc096fa30d0b43399851d11b0e8a41c7537aa134b61aa65c9b94f2a1854eea7c01a2bfa63f1110
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree