upgrade to screen 3.9.8;
-- fixes a format string bug, possible root compromise Pointed out by: markus@, deraadt@ and Gregor Longariva <longariva@informatik.uni-erlangen.de>
This commit is contained in:
brad
parent
bff89039ca
commit
f53d86ae65
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.28 2000/08/25 04:17:44 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.29 2000/09/01 19:37:52 brad Exp $
|
||||
|
||||
VERSION= 3.9.5
|
||||
VERSION= 3.9.8
|
||||
DISTNAME= screen-${VERSION}
|
||||
PKGNAME= screen-${VERSION}p1
|
||||
CATEGORIES= misc
|
||||
NEED_VERSION= 1.320
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
NEED_VERSION= 1.322
|
||||
MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
|
||||
${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= screen
|
||||
|
||||
MAINTAINER= brad@openbsd.org
|
||||
@ -18,6 +18,7 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
SUBST_VARS= SYSCONFDIR VERSION
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= --with-sys-screenrc="${SYSCONFDIR}/screenrc"
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/screen
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (screen-3.9.5.tar.gz) = ac7dd525b0920bc98e4af75b0f73c73e
|
||||
RMD160 (screen-3.9.5.tar.gz) = e061c787228b962b92d187740f292b183c63e87c
|
||||
SHA1 (screen-3.9.5.tar.gz) = 47550db71fe9e386b96ef452ec195825f5ebaf79
|
||||
MD5 (screen-3.9.8.tar.gz) = 8ddfebe32c2d45410ce89ea9779bb1cf
|
||||
RMD160 (screen-3.9.8.tar.gz) = 31605acadc4817583f0b46c2d278c484f56846ff
|
||||
SHA1 (screen-3.9.8.tar.gz) = 9f0c93d3f1f84e4d23cd58c9c62a8fb525f71f6c
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- Makefile.in.orig Wed Sep 1 18:50:31 1999
|
||||
+++ Makefile.in Thu Aug 24 23:07:52 2000
|
||||
--- Makefile.in.orig Fri Sep 1 14:43:54 2000
|
||||
+++ Makefile.in Fri Sep 1 14:47:58 2000
|
||||
@@ -7,6 +7,8 @@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
@ -9,18 +9,19 @@
|
||||
# Where to install screen.
|
||||
|
||||
prefix = @prefix@
|
||||
@@ -21,8 +23,8 @@
|
||||
@@ -21,9 +23,9 @@
|
||||
ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'`
|
||||
|
||||
CC = @CC@
|
||||
-CFLAGS = -O
|
||||
-LDFLAGS =
|
||||
+CFLAGS = @CFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
-LDFLAGS =
|
||||
+LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
|
||||
CPP_DEPEND=$(CC) -MM
|
||||
@@ -62,7 +64,7 @@
|
||||
CPP=@CPP@
|
||||
@@ -59,7 +61,7 @@
|
||||
kmapdef.o acls.o braille.o braille_tsi.o logfile.o layer.o \
|
||||
sched.o teln.o nethack.o
|
||||
|
||||
@ -29,7 +30,7 @@
|
||||
|
||||
screen: $(OFILES)
|
||||
$(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
|
||||
@@ -71,18 +73,18 @@
|
||||
@@ -68,14 +70,14 @@
|
||||
$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
|
||||
|
||||
install_bin: .version screen
|
||||
@ -47,48 +48,27 @@
|
||||
- ln -s $(SCREEN) $(bindir)/screen
|
||||
+ -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 -fs $(SCREEN) screen
|
||||
+ cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen
|
||||
|
||||
###############################################################################
|
||||
install: installdirs install_bin
|
||||
- cd doc ; $(MAKE) install
|
||||
+ cd doc ; $(MAKE) $(AM_MAKEFLAGS) install
|
||||
-if [ -d /usr/lib/terminfo ]; then \
|
||||
PATH="$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
|
||||
chmod 644 /usr/lib/terminfo/s/screen*; \
|
||||
@@ -94,15 +96,15 @@
|
||||
@@ -91,14 +93,14 @@
|
||||
|
||||
installdirs:
|
||||
# Path leading to ETCSCREENRC and Socketdirectory not checked.
|
||||
- $(srcdir)/etc/mkinstalldirs $(bindir)
|
||||
- cd doc ; $(MAKE) installdirs
|
||||
+ $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir)
|
||||
+ cd doc ; $(MAKE) $(AM_MAKEFLAGS) installdirs
|
||||
cd doc ; $(MAKE) installdirs
|
||||
|
||||
uninstall: .version
|
||||
- rm -f $(bindir)/$(SCREEN)
|
||||
- rm -f $(bindir)/screen
|
||||
- -mv $(bindir)/screen.old $(bindir)/screen
|
||||
- rm -f $(ETCSCREENRC)
|
||||
- cd doc; $(MAKE) 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) $(AM_MAKEFLAGS) uninstall
|
||||
cd doc; $(MAKE) uninstall
|
||||
|
||||
shadow:
|
||||
mkdir shadow;
|
||||
@@ -127,10 +129,10 @@
|
||||
CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh
|
||||
|
||||
docs:
|
||||
- cd doc; $(MAKE) dvi screen.info
|
||||
+ cd doc; $(MAKE) $(AM_MAKEFLAGS) dvi screen.info
|
||||
|
||||
dvi info screen.info:
|
||||
- -cd doc; $(MAKE) $@
|
||||
+ -cd doc; $(MAKE) $(AM_MAKEFLAGS) $@
|
||||
|
||||
mostlyclean:
|
||||
rm -f $(OFILES) screen config.cache osdef0.c osdef1.sed osdef2.sed
|
||||
@ -1,14 +0,0 @@
|
||||
--- process.c.orig Tue Nov 9 21:30:23 1999
|
||||
+++ process.c Tue Nov 9 21:50:11 1999
|
||||
@@ -3615,6 +3615,11 @@
|
||||
struct canvas *cv;
|
||||
int gotone;
|
||||
|
||||
+#if defined(__OpenBSD__)
|
||||
+ /* First try killing off the window's process group... */
|
||||
+ killpg(wi->w_pid, SIGKILL);
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* Remove window from linked list.
|
||||
*/
|
||||
@ -1,11 +0,0 @@
|
||||
--- configure.orig Tue Nov 9 21:52:13 1999
|
||||
+++ configure Tue Nov 9 21:59:36 1999
|
||||
@@ -3524,7 +3524,7 @@
|
||||
|
||||
if test -n "$prefix"; then
|
||||
cat >> confdefs.h <<EOF
|
||||
-#define ETCSCREENRC "$prefix/etc/screenrc"
|
||||
+#define ETCSCREENRC "$sysconfdir/screenrc"
|
||||
EOF
|
||||
|
||||
fi
|
||||
@ -1,5 +1,5 @@
|
||||
--- doc/Makefile.in.orig Wed Sep 1 18:50:32 1999
|
||||
+++ doc/Makefile.in Thu Aug 24 18:08:30 2000
|
||||
--- doc/Makefile.in.orig Fri Sep 1 14:48:22 2000
|
||||
+++ doc/Makefile.in Fri Sep 1 14:50:30 2000
|
||||
@@ -3,13 +3,15 @@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
Loading…
x
Reference in New Issue
Block a user