* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4cdd12789fa1868efc94eb5b70bc6562dc072e22
@ 2021-07-23 6:24 Arne Fitzenreiter
0 siblings, 0 replies; only message in thread
From: Arne Fitzenreiter @ 2021-07-23 6:24 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7967 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 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-07-23 6:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-23 6:24 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4cdd12789fa1868efc94eb5b70bc6562dc072e22 Arne Fitzenreiter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox