IPFire-SCM July 2021

ipfire-scm@lists.ipfire.org

1 participants
43 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 06c3030bc6550d76f08590e6a2dc8cb20f7ab1e8
by Arne Fitzenreiter 31 Jul '21

31 Jul '21

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 06c3030bc6550d76f08590e6a2dc8cb20f7ab1e8 (commit) via c9517c7bbb570b393be7f42da2b5f697776fda5d (commit) via 8c5865abc48424012dceb285bc1ae335bc0c680e (commit) from 06104d4e6f8293b0d695f94df06a9e94eb21d72d (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 06c3030bc6550d76f08590e6a2dc8cb20f7ab1e8 Merge: c9517c7bb 06104d4e6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 31 18:52:02 2021 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-3.x into next commit c9517c7bbb570b393be7f42da2b5f697776fda5d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 31 18:51:22 2021 +0200 core159: add libusb Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 8c5865abc48424012dceb285bc1ae335bc0c680e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 31 13:27:54 2021 +0200 Revert "libusb: update to 0.0.24" This reverts commit 937d8dbcb19fcfbdfc0d914b769c93b5cffdba65. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libusb | 2 +- config/rootfiles/{oldcore/145 => core/159}/filelists/libusb | 0 config/rootfiles/core/159/update.sh | 1 + lfs/libusb | 6 +++--- 4 files changed, 5 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/145 => core/159}/filelists/libusb (100%) Difference in files: diff --git a/config/rootfiles/common/libusb b/config/rootfiles/common/libusb index db0215195..232574159 100644 --- a/config/rootfiles/common/libusb +++ b/config/rootfiles/common/libusb @@ -5,5 +5,5 @@ etc/udev/rules.d/23-usb.rules #usr/lib/libusb-1.0.la #usr/lib/libusb-1.0.so usr/lib/libusb-1.0.so.0 -usr/lib/libusb-1.0.so.0.3.0 +usr/lib/libusb-1.0.so.0.2.0 #usr/lib/pkgconfig/libusb-1.0.pc diff --git a/config/rootfiles/core/159/filelists/libusb b/config/rootfiles/core/159/filelists/libusb new file mode 120000 index 000000000..edbe8c215 --- /dev/null +++ b/config/rootfiles/core/159/filelists/libusb @@ -0,0 +1 @@ +../../../common/libusb \ No newline at end of file diff --git a/config/rootfiles/core/159/update.sh b/config/rootfiles/core/159/update.sh index 89ce31111..b5a80fcf4 100644 --- a/config/rootfiles/core/159/update.sh +++ b/config/rootfiles/core/159/update.sh @@ -95,6 +95,7 @@ rm -rf /usr/share/u-boot/rpi* # Remove files rm -rf /opt/pakfire/db/meta/meta-libstatgrab rm -rf /opt/pakfire/db/installed/meta-libstatgrab +rm -rf /usr/lib/libusb-1.0.so.0.3.0 # Stop services /etc/init.d/ipsec stop diff --git a/lfs/libusb b/lfs/libusb index 9c8a9ac9a..4b99a6d18 100644 --- a/lfs/libusb +++ b/lfs/libusb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.0.24 +VER = 1.0.23 THISAPP = libusb-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5bc27df16155302f308d409e73589872 +$(DL_FILE)_MD5 = 1e29700f6a134766d32b36b8d1d61a95 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 06104d4e6f8293b0d695f94df06a9e94eb21d72d
by Arne Fitzenreiter 30 Jul '21

30 Jul '21

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 06104d4e6f8293b0d695f94df06a9e94eb21d72d (commit) via 18eb75aac9d7e268844655c4ec1f3bc42f8b7284 (commit) via 853d70e97117ae9146b89fbbe94823a0a33f17ef (commit) from 4e6052e9376f401027b81372ff9597d69d452b0f (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 06104d4e6f8293b0d695f94df06a9e94eb21d72d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 30 19:58:56 2021 +0000 u-boot-friendlyarm: add armv6l rootfile Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 18eb75aac9d7e268844655c4ec1f3bc42f8b7284 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 30 11:29:18 2021 +0000 u-boot: remove uneeded cflags and a unused rpi patch Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 853d70e97117ae9146b89fbbe94823a0a33f17ef Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 30 11:28:03 2021 +0000 u-boot-friendlyarm: update to 5e8607b Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv6l/u-boot-friendlyarm | 2 ++ .../core/159/filelists/armv6l/u-boot-friendlyarm | 1 + lfs/u-boot | 2 -- lfs/u-boot-friendlyarm | 11 ++++------- .../u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch | 15 --------------- 5 files changed, 7 insertions(+), 24 deletions(-) create mode 100644 config/rootfiles/common/armv6l/u-boot-friendlyarm create mode 120000 config/rootfiles/core/159/filelists/armv6l/u-boot-friendlyarm delete mode 100644 src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch Difference in files: diff --git a/config/rootfiles/common/armv6l/u-boot-friendlyarm b/config/rootfiles/common/armv6l/u-boot-friendlyarm new file mode 100644 index 000000000..41f6956bc --- /dev/null +++ b/config/rootfiles/common/armv6l/u-boot-friendlyarm @@ -0,0 +1,2 @@ +#usr/share/u-boot/nanopi-r1 +usr/share/u-boot/nanopi-r1/u-boot-sunxi-with-spl.bin diff --git a/config/rootfiles/core/159/filelists/armv6l/u-boot-friendlyarm b/config/rootfiles/core/159/filelists/armv6l/u-boot-friendlyarm new file mode 120000 index 000000000..d382d1fce --- /dev/null +++ b/config/rootfiles/core/159/filelists/armv6l/u-boot-friendlyarm @@ -0,0 +1 @@ +../../../../common/armv6l/u-boot-friendlyarm \ No newline at end of file diff --git a/lfs/u-boot b/lfs/u-boot index 8b1f18a0e..9f3addd29 100644 --- a/lfs/u-boot +++ b/lfs/u-boot @@ -33,8 +33,6 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)-$(MKIMAGE) SUP_ARCH = armv6l aarch64 -CFLAGS += -fcommon - ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/u-boot-friendlyarm b/lfs/u-boot-friendlyarm index 89145487a..c69f97018 100644 --- a/lfs/u-boot-friendlyarm +++ b/lfs/u-boot-friendlyarm @@ -24,17 +24,14 @@ include Config -VER = 1ee53f5 +VER = 5e8607b THISAPP = u-boot-friendlyarm-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/u-boot-$(VER)* TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = none -#armv5tel - -CFLAGS += -fcommon +SUP_ARCH = armv6l ############################################################################### # Top-level Rules @@ -44,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a329359aa0e9211f02526548eb6a6208 +$(DL_FILE)_MD5 = fa7bb610b17df6b884f6c88f19ce258e install : $(TARGET) @@ -78,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) -ifeq "${BUILD_ARCH}" "armv5tel" +ifeq "${BUILD_ARCH}" "armv6l" # Nanopi-R1 eMMC -mkdir -pv /usr/share/u-boot/nanopi-r1 cd $(DIR_APP) && cp arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts arch/arm/dts/sun8i-h3-nanopi-r1.dts diff --git a/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch b/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch deleted file mode 100644 index fceef7738..000000000 --- a/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur u-boot-2018.03.org/board/raspberrypi/rpi/rpi.c u-boot-2018.03/board/raspberrypi/rpi/rpi.c ---- u-boot-2018.03.org/board/raspberrypi/rpi/rpi.c 2018-03-13 13:02:19.000000000 +0100 -+++ u-boot-2018.03/board/raspberrypi/rpi/rpi.c 2018-05-14 13:40:38.418660145 +0200 -@@ -111,6 +111,11 @@ - DTB_DIR "bcm2835-rpi-zero-w.dtb", - false, - }, -+ [0xD] = { -+ "3 Model B+", -+ DTB_DIR "bcm2837-rpi-3-b-plus.dtb", -+ true, -+ }, - }; - - static const struct rpi_model rpi_models_old_scheme[] = { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4e6052e9376f401027b81372ff9597d69d452b0f
by Arne Fitzenreiter 28 Jul '21

28 Jul '21

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bcea5712116c173ff2b8a414f076414c1b74a919
by Arne Fitzenreiter 25 Jul '21

25 Jul '21

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 672783030e9a82c9d965e59bc6af1310ed2c8bde
by Arne Fitzenreiter 23 Jul '21

23 Jul '21

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4cdd12789fa1868efc94eb5b70bc6562dc072e22
by Arne Fitzenreiter 23 Jul '21

23 Jul '21

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 4cdd12789fa1868efc94eb5b70bc6562dc072e22 (commit) via eaad1d562cafa29e79083ebe82c135972afa9cba (commit) via f8447c9d23f7c1280444bd189d41dba8a7c85517 (commit) via d0a93015a9079c0c4b105b5d225b49b4f0ae1777 (commit) via e3eb960c9a4b828a951dadd1658d5b6f5f58caea (commit) from cf66ba1bbf171eb49a64e530027f1bab2ba4550d (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 4cdd12789fa1868efc94eb5b70bc6562dc072e22 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 21 14:41:58 2021 +0000 cups: Reload dbus to load/unload policy Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit eaad1d562cafa29e79083ebe82c135972afa9cba Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 21 14:41:57 2021 +0000 avahi: Reload dbus to load/unload policy Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f8447c9d23f7c1280444bd189d41dba8a7c85517 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 21 14:41:56 2021 +0000 dbus: Add reload to initscript Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d0a93015a9079c0c4b105b5d225b49b4f0ae1777 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 21 15:45:00 2021 +0000 core159: Fix permissions after extraction There seems to be a bug in tar (which should be gone by now), but on affected systems, we might need to reset directory permissions just in case. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e3eb960c9a4b828a951dadd1658d5b6f5f58caea Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 23 06:11:48 2021 +0000 vdr: cleanup unused patch Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/159/update.sh | 9 +++++++++ lfs/avahi | 2 +- lfs/dbus | 2 +- lfs/vdr | 2 -- src/initscripts/packages/messagebus | 7 ++++++- src/paks/avahi/install.sh | 4 ++++ src/paks/avahi/uninstall.sh | 1 + src/paks/cups/install.sh | 1 + src/paks/cups/uninstall.sh | 1 + src/patches/vdr-2.4-gcc-11.patch | 24 ------------------------ 10 files changed, 24 insertions(+), 29 deletions(-) delete mode 100644 src/patches/vdr-2.4-gcc-11.patch Difference in files: diff --git a/config/rootfiles/core/159/update.sh b/config/rootfiles/core/159/update.sh index 9582c3ece..89ce31111 100644 --- a/config/rootfiles/core/159/update.sh +++ b/config/rootfiles/core/159/update.sh @@ -104,6 +104,15 @@ rm -rf /opt/pakfire/db/installed/meta-libstatgrab # Extract files extract_files +# Fix permissions just in case they broke again +chmod -v 755 \ + /usr \ + /usr/bin \ + /usr/lib \ + /usr/sbin \ + /var \ + /var/ipfire + # update linker config ldconfig diff --git a/lfs/avahi b/lfs/avahi index 4b2b79ded..ae166a88c 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = avahi -PAK_VER = 7 +PAK_VER = 8 DEPS = dbus libdaemon diff --git a/lfs/dbus b/lfs/dbus index 06431b4b5..09f4a541b 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dbus -PAK_VER = 3 +PAK_VER = 4 DEPS = diff --git a/lfs/vdr b/lfs/vdr index 95196bbed..5c7c1ac15 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -101,8 +101,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-2.4-gcc-11.patch - # Compile main package. cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir diff --git a/src/initscripts/packages/messagebus b/src/initscripts/packages/messagebus index fc719c99a..3ea80bc92 100644 --- a/src/initscripts/packages/messagebus +++ b/src/initscripts/packages/messagebus @@ -32,7 +32,12 @@ case "$1" in $0 start ;; - status) + reload) + boot_mesg "Reloading the D-Bus Messagebus Daemon..." + reloadproc /usr/bin/dbus-daemon + ;; + + status) statusproc -p $pidfile /usr/bin/dbus-daemon ;; diff --git a/src/paks/avahi/install.sh b/src/paks/avahi/install.sh index cb0266bae..9ec3050a1 100644 --- a/src/paks/avahi/install.sh +++ b/src/paks/avahi/install.sh @@ -34,4 +34,8 @@ ln -svf ../init.d/avahi /etc/rc.d/rc3.d/S65avahi ln -svf ../init.d/avahi /etc/rc.d/rc0.d/K35avahi ln -svf ../init.d/avahi /etc/rc.d/rc6.d/K35avahi restore_backup ${NAME} + +# Reload dbus to load avahi configuration +/etc/init.d/messagebus reload + start_service --background ${NAME} diff --git a/src/paks/avahi/uninstall.sh b/src/paks/avahi/uninstall.sh index 1c8e67c9a..1a5d7a620 100644 --- a/src/paks/avahi/uninstall.sh +++ b/src/paks/avahi/uninstall.sh @@ -26,3 +26,4 @@ stop_service ${NAME} make_backup ${NAME} remove_files rm -rf /etc/rc.d/rc*.d/*avahi +/etc/init.d/messagebus reload diff --git a/src/paks/cups/install.sh b/src/paks/cups/install.sh index 38715f9e8..b3f0f1368 100644 --- a/src/paks/cups/install.sh +++ b/src/paks/cups/install.sh @@ -23,6 +23,7 @@ # . /opt/pakfire/lib/functions.sh extract_files +/etc/init.d/messagebus reload start_service --delay 300 --background ${NAME} ln -svf ../init.d/cups /etc/rc.d/rc0.d/K00cups ln -svf ../init.d/cups /etc/rc.d/rc3.d/S25cups diff --git a/src/paks/cups/uninstall.sh b/src/paks/cups/uninstall.sh index 744c2062d..01b13de76 100644 --- a/src/paks/cups/uninstall.sh +++ b/src/paks/cups/uninstall.sh @@ -25,3 +25,4 @@ stop_service ${NAME} remove_files rm -rf /etc/rc.d/rc*.d/*cups +/etc/init.d/messagebus reload diff --git a/src/patches/vdr-2.4-gcc-11.patch b/src/patches/vdr-2.4-gcc-11.patch deleted file mode 100644 index 1c56b5a83..000000000 --- a/src/patches/vdr-2.4-gcc-11.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 46b480c798c2d5f4acb8874f25e5129f2cf7f224 Mon Sep 17 00:00:00 2001 -From: Klaus Schmidinger <vdr(a)tvdr.de> -Date: Wed, 16 Sep 2020 13:30:59 +0200 -Subject: [PATCH] Fixed checking the return value of the Open() call in - cFileName::SetOffset() - -diff --git a/recording.c b/recording.c -index 810ef80..1fc34cd 100644 ---- a/recording.c -+++ b/recording.c -@@ -3025,8 +3025,8 @@ cUnbufferedFile *cFileName::SetOffset(int Number, off_t Offset) - } - // found a non existing file suffix - } -- if (Open() >= 0) { -- if (!record && Offset >= 0 && file && file->Seek(Offset, SEEK_SET) != Offset) { -+ if (Open()) { -+ if (!record && Offset >= 0 && file->Seek(Offset, SEEK_SET) != Offset) { - LOG_ERROR_STR(fileName); - return NULL; - } --- -2.26.2 - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cf66ba1bbf171eb49a64e530027f1bab2ba4550d
by Arne Fitzenreiter 22 Jul '21

22 Jul '21

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 19473c97ddf844ef7e706aa075327f68597007d0
by Arne Fitzenreiter 22 Jul '21

22 Jul '21

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f56e93b9b43d21885b09ecc7c451a63693ca890d
by Arne Fitzenreiter 21 Jul '21

21 Jul '21

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 f56e93b9b43d21885b09ecc7c451a63693ca890d (commit) from ec13fae9d43636c6a7e5e08e0293b510f1bcccd0 (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 f56e93b9b43d21885b09ecc7c451a63693ca890d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jul 21 21:49:19 2021 +0200 vdr: update to 2.4.7 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/aarch64/vdr_dvbapi | 2 +- config/rootfiles/packages/armv6l/vdr_dvbapi | 2 +- config/rootfiles/packages/i586/vdr_dvbapi | 4 ++-- config/rootfiles/packages/vdr_eepg | 2 +- config/rootfiles/packages/vdr_epgsearch | 8 ++++---- config/rootfiles/packages/vdr_streamdev | 2 +- config/rootfiles/packages/x86_64/vdr_dvbapi | 2 +- lfs/vdr | 10 +++++----- lfs/vdr_dvbapi | 4 ++-- lfs/vdr_eepg | 4 ++-- lfs/vdr_epgsearch | 4 ++-- lfs/vdr_streamdev | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/aarch64/vdr_dvbapi b/config/rootfiles/packages/aarch64/vdr_dvbapi index 4c5b98c94..b874d9e7e 100644 --- a/config/rootfiles/packages/aarch64/vdr_dvbapi +++ b/config/rootfiles/packages/aarch64/vdr_dvbapi @@ -1,3 +1,3 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.4.3 +usr/lib/vdr/libvdr-dvbapi.so.2.4.7 diff --git a/config/rootfiles/packages/armv6l/vdr_dvbapi b/config/rootfiles/packages/armv6l/vdr_dvbapi index 4c5b98c94..b874d9e7e 100644 --- a/config/rootfiles/packages/armv6l/vdr_dvbapi +++ b/config/rootfiles/packages/armv6l/vdr_dvbapi @@ -1,3 +1,3 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.4.3 +usr/lib/vdr/libvdr-dvbapi.so.2.4.7 diff --git a/config/rootfiles/packages/i586/vdr_dvbapi b/config/rootfiles/packages/i586/vdr_dvbapi index 0545463fa..011e69fa3 100644 --- a/config/rootfiles/packages/i586/vdr_dvbapi +++ b/config/rootfiles/packages/i586/vdr_dvbapi @@ -1,4 +1,4 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.4.3 -usr/lib/vdr/libvdr-dvbapi.so.2.4.3-sse +usr/lib/vdr/libvdr-dvbapi.so.2.4.7 +usr/lib/vdr/libvdr-dvbapi.so.2.4.7-sse diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg index 9c30b1a83..4f8389cc9 100644 --- a/config/rootfiles/packages/vdr_eepg +++ b/config/rootfiles/packages/vdr_eepg @@ -1,2 +1,2 @@ etc/vdr/plugins/eepg -usr/lib/vdr/libvdr-eepg.so.2.4.3 +usr/lib/vdr/libvdr-eepg.so.2.4.7 diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch index 9cbe89afa..9143aec02 100644 --- a/config/rootfiles/packages/vdr_epgsearch +++ b/config/rootfiles/packages/vdr_epgsearch @@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf etc/vdr/plugins/epgsearch etc/vdr/plugins/epgsearch/conf.d usr/bin/createcats -usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.3 -usr/lib/vdr/libvdr-epgsearch.so.2.4.3 -usr/lib/vdr/libvdr-epgsearchonly.so.2.4.3 -usr/lib/vdr/libvdr-quickepgsearch.so.2.4.3 +usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.7 +usr/lib/vdr/libvdr-epgsearch.so.2.4.7 +usr/lib/vdr/libvdr-epgsearchonly.so.2.4.7 +usr/lib/vdr/libvdr-quickepgsearch.so.2.4.7 #var/lib/vdr #var/lib/vdr/data var/lib/vdr/data/epgsearch diff --git a/config/rootfiles/packages/vdr_streamdev b/config/rootfiles/packages/vdr_streamdev index c7edbb180..3cd8440f0 100644 --- a/config/rootfiles/packages/vdr_streamdev +++ b/config/rootfiles/packages/vdr_streamdev @@ -4,4 +4,4 @@ etc/vdr/plugins/streamdev-server etc/vdr/plugins/streamdev-server/streamdevhosts.conf #usr/lib/vdr/bin usr/lib/vdr/bin/externremux.sh -usr/lib/vdr/libvdr-streamdev-server.so.2.4.3 +usr/lib/vdr/libvdr-streamdev-server.so.2.4.7 diff --git a/config/rootfiles/packages/x86_64/vdr_dvbapi b/config/rootfiles/packages/x86_64/vdr_dvbapi index 4c5b98c94..b874d9e7e 100644 --- a/config/rootfiles/packages/x86_64/vdr_dvbapi +++ b/config/rootfiles/packages/x86_64/vdr_dvbapi @@ -1,3 +1,3 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.4.3 +usr/lib/vdr/libvdr-dvbapi.so.2.4.7 diff --git a/lfs/vdr b/lfs/vdr index a3eebfacd..ad68636bf 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 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 # @@ -24,11 +24,11 @@ include Config -VER = 2.4.4 +VER = 2.4.7 # VDRPLUGVER must match with APIVERSION! in config.h # after change this update also all vdr plugins -VDRPLUGVER = 2.4.3 +VDRPLUGVER = 2.4.7 THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -67,7 +67,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ccf724c157740b2b153ca41ad38f1217 +$(DL_FILE)_MD5 = 24ff672a7c73118a912bd8c6cdd0aae4 install : $(TARGET) @@ -101,7 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-2.4-gcc-11.patch +# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-2.4-gcc-11.patch # Compile main package. cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi index 6be8cbe91..adf60b39d 100644 --- a/lfs/vdr_dvbapi +++ b/lfs/vdr_dvbapi @@ -33,11 +33,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_dvbapi -PAK_VER = 4 +PAK_VER = 5 DEPS = -VDRPLUGVER = 2.4.3 +VDRPLUGVER = 2.4.7 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg index 2fc83dc96..40b7811aa 100644 --- a/lfs/vdr_eepg +++ b/lfs/vdr_eepg @@ -36,11 +36,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_eepg -PAK_VER = 4 +PAK_VER = 5 DEPS = -VDRPLUGVER = 2.4.3 +VDRPLUGVER = 2.4.7 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch index a719336dd..f2a88f87b 100644 --- a/lfs/vdr_epgsearch +++ b/lfs/vdr_epgsearch @@ -33,11 +33,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/vdr-plugin-epgsearch TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_epgsearch -PAK_VER = 10 +PAK_VER = 11 DEPS = -VDRPLUGVER = 2.4.3 +VDRPLUGVER = 2.4.7 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev index c3c8d04ca..58c5a6438 100644 --- a/lfs/vdr_streamdev +++ b/lfs/vdr_streamdev @@ -34,11 +34,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_streamdev -PAK_VER = 5 +PAK_VER = 6 DEPS = -VDRPLUGVER = 2.4.3 +VDRPLUGVER = 2.4.7 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ec13fae9d43636c6a7e5e08e0293b510f1bcccd0
by Arne Fitzenreiter 21 Jul '21

21 Jul '21

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM July 2021