mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
4b4a8f0fff
Rebased patch 0001. No CVE entries are found but these commits are part of the bump: TOCTOU + chown-follows-symlink in socket directory creation: https://cgit.git.savannah.gnu.org/cgit/screen.git/commit/?h=v.5.0.2&id=3dea5ff20c58ad497062d094b6a9b80a7535a7db fix potential null pointer dereference: https://cgit.git.savannah.gnu.org/cgit/screen.git/commit/?h=v.5.0.2&id=ff9d98b8e39f33b07156995188ca55f3459f4d53 Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From fd002bd3ab730a0976dc000477f7dd9e162c0269 Mon Sep 17 00:00:00 2001
|
|
From: Maarten ter Huurne <maarten@treewalker.org>
|
|
Date: Sun, 14 Sep 2014 23:58:34 +0200
|
|
Subject: [PATCH] Do not create backup of old installed binary
|
|
|
|
This is a rather unusual feature that packagers will not expect.
|
|
|
|
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
|
|
[baruch: update for 4.6.2]
|
|
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
[Julien: rebase on top of 4.9.1]
|
|
[Julien: rebase on top of 5.0.0]
|
|
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
|
[Bernd: rebase on top of 5.0.2]
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
---
|
|
Makefile.in | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index 92f434a..860ecd7 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -85,12 +85,8 @@ tests/test-detach-cli: tests/integration-detach.c tests/macros.h screen
|
|
$(CC) $(CPPFLAGS) $(CFLAGS) $< -o $@
|
|
|
|
install_bin: screen installdirs
|
|
- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
|
|
- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
|
|
$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
|
|
-chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
|
|
-# This doesn't work if $(bindir)/screen is a symlink
|
|
- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
|
|
rm -f $(DESTDIR)$(bindir)/screen
|
|
(cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen)
|
|
cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
|
|
@@ -115,7 +111,6 @@ installdirs:
|
|
uninstall:
|
|
rm -f $(DESTDIR)$(bindir)/$(SCREEN)
|
|
rm -f $(DESTDIR)$(bindir)/screen
|
|
- -mv $(DESTDIR)$(bindir)/screen.old $(DESTDIR)$(bindir)/screen
|
|
rm -f $(DESTDIR)$(ETCSCREENRC)
|
|
cd doc; $(MAKE) uninstall
|
|
|
|
--
|
|
2.46.2
|
|
|