From 12527eb0213368347b970f55ff15b0fdfe8d0650 Mon Sep 17 00:00:00 2001
From: kris <kris@FreeBSD.org>
Date: Wed, 20 Sep 2000 21:10:29 +0000
Subject: Don't install a screen -> screen.x.y.z symlink, this will leave
 behind a setuid binary if people don't deinstall the old package properly.

Reviewed by:    ache (maintainer)
Submitted by:   Mike Silbersack <silby@silby.com>
---
 sysutils/screen/Makefile       |  2 +-
 sysutils/screen/files/patch-aa | 21 +++++++++++++++++++--
 sysutils/screen/pkg-plist      |  1 -
 3 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index 97bfcc464277..e59febeed226 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=       screen
 PORTVERSION=    3.9.8
-PORTREVISION=   1
+PORTREVISION=   2
 CATEGORIES=	misc
 MASTER_SITES=   ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
 		${MASTER_SITE_GNU}
diff --git a/sysutils/screen/files/patch-aa b/sysutils/screen/files/patch-aa
index c6f856c9ac65..d48e06506464 100644
--- a/sysutils/screen/files/patch-aa
+++ b/sysutils/screen/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Sep  1 20:07:26 2000
-+++ Makefile.in	Tue Sep  5 18:49:17 2000
+--- Makefile.in.orig	Fri Sep  1 09:07:26 2000
++++ Makefile.in	Sun Sep 17 18:29:18 2000
 @@ -21,7 +21,7 @@
  ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'`
  
@@ -9,3 +9,20 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS =
  LIBS = @LIBS@
+@@ -68,14 +68,8 @@
+ 	$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
+ 
+ install_bin: .version screen
+-	-if [ -f $(bindir)/$(SCREEN) ] && [ ! -f $(bindir)/$(SCREEN).old ]; \
+-		then mv $(bindir)/$(SCREEN) $(bindir)/$(SCREEN).old; fi
+-	$(INSTALL_PROGRAM) screen $(bindir)/$(SCREEN)
+-	-chown root $(bindir)/$(SCREEN) && chmod 4755 $(bindir)/$(SCREEN)
+-# This doesn't work if $(bindir)/screen is a symlink
+-	-if [ -f $(bindir)/screen ] && [ ! -f $(bindir)/screen.old ]; then mv $(bindir)/screen $(bindir)/screen.old; fi
+-	rm -f $(bindir)/screen
+-	ln -s $(SCREEN) $(bindir)/screen
++	$(INSTALL_PROGRAM) screen $(bindir)/screen
++	-chown root $(bindir)/screen && chmod 4755 $(bindir)/screen
+ 
+ ###############################################################################
+ install: installdirs install_bin
diff --git a/sysutils/screen/pkg-plist b/sysutils/screen/pkg-plist
index 52f72c344f4f..ebfd9dec55bc 100644
--- a/sysutils/screen/pkg-plist
+++ b/sysutils/screen/pkg-plist
@@ -1,5 +1,4 @@
 bin/screen
-bin/screen-3.9.8
 @unexec install-info --delete %D/info/screen.info %D/info/dir
 info/screen.info
 @exec install-info %D/info/screen.info %D/info/dir
-- 
cgit